nichkara/lace
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

opengl: Rename 'openGL.Geometry.texturing' to 'openGL.texturing'.

Browse Source
This commit is contained in:
Rod Kay
2023-05-16 17:17:28 +10:00
parent 65ac65b204
commit 640c3f4790
15 changed files with 312 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
3-mid/opengl/source/lean/geometry/opengl-geometry-lit_colored_textured.adb
View File

@@ -18,7 +18,8 @@ with
package body openGL.Geometry.lit_colored_textured
is
use GL.lean,
use openGL.texturing,
GL.lean,
GL.Pointers,
Interfaces,
System;
@@ -280,14 +281,14 @@ is
--- Texturing
--
procedure Fade_is (Self : in out Item; Which : texture_ID; Now : in Geometry.texturing.fade_Level)
procedure Fade_is (Self : in out Item; Which : texturing.texture_ID; Now : in texturing.fade_Level)
is
begin
Self.Textures.Textures (Which).Fade := Now;
end Fade_is;
function Fade (Self : in Item; Which : texture_ID) return Geometry.texturing.fade_Level
function Fade (Self : in Item; Which : texturing.texture_ID) return texturing.fade_Level
is
begin
return Self.Textures.Textures (Which).Fade;
@@ -299,7 +300,6 @@ is
procedure Texture_is (Self : in out Item; Which : texture_ID; Now : in openGL.Texture.Object)
is
use openGL.Geometry.texturing;
begin
Texture_is (in_Set => Self.Textures,
Which => Which,
@@ -311,8 +311,8 @@ is
function Texture (Self : in Item; Which : texture_ID) return openGL.Texture.Object
is
begin
return openGL.Geometry.texturing.Texture (in_Set => Self.Textures,
Which => Which);
return openGL.texturing.Texture (in_Set => Self.Textures,
which => Which);
end Texture;
@@ -320,7 +320,6 @@ is
overriding
procedure Texture_is (Self : in out Item; Now : in openGL.Texture.Object)
is
use openGL.Geometry.texturing;
begin
Texture_is (in_Set => Self.Textures,
Now => Now);
@@ -331,8 +330,8 @@ is
function Texture (Self : in Item) return openGL.Texture.Object
is
begin
return openGL.Geometry.texturing.Texture (in_Set => Self.Textures,
Which => 1);
return openGL.texturing.Texture (in_Set => Self.Textures,
which => 1);
end Texture;
@@ -340,7 +339,6 @@ is
overriding
procedure enable_Texture (Self : in out Item)
is
use openGL.Geometry.texturing;
begin
enable (Self.Textures, Self.Program);
end enable_Texture;

12
3-mid/opengl/source/lean/geometry/opengl-geometry-lit_colored_textured.ads
View File

@@ -1,5 +1,5 @@
with
openGL.Geometry.texturing;
openGL.texturing;
package openGL.Geometry.lit_colored_textured
@@ -42,12 +42,12 @@ is
--- Texturing.
--
procedure Fade_is (Self : in out Item; Which : texture_ID; Now : in Geometry.texturing.fade_Level);
function Fade (Self : in Item; Which : texture_ID) return Geometry.texturing.fade_Level;
procedure Fade_is (Self : in out Item; Which : texturing.texture_ID; Now : in texturing.fade_Level);
function Fade (Self : in Item; Which : texturing.texture_ID) return texturing.fade_Level;
procedure Texture_is (Self : in out Item; Which : texture_ID; Now : in openGL.Texture.Object);
function Texture (Self : in Item; Which : texture_ID) return openGL.Texture.Object;
procedure Texture_is (Self : in out Item; Which : texturing.texture_ID; Now : in openGL.Texture.Object);
function Texture (Self : in Item; Which : texturing.texture_ID) return openGL.Texture.Object;
overriding
procedure Texture_is (Self : in out Item; Now : in openGL.Texture.Object);
@@ -61,7 +61,7 @@ private
type Item is new Geometry.item with
record
Textures : Geometry.texturing.texture_Set;
Textures : texturing.texture_Set;
end record;

15
3-mid/opengl/source/lean/geometry/opengl-geometry-lit_textured.adb
View File

@@ -25,6 +25,7 @@ package body openGL.Geometry.lit_textured
is
use GL.lean,
GL.Pointers,
openGL.texturing,
Interfaces;
-----------
@@ -304,7 +305,7 @@ is
--- Texturing
--
procedure Fade_is (Self : in out Item; Which : texture_ID; Now : in Geometry.texturing.fade_Level)
procedure Fade_is (Self : in out Item; Which : texture_ID; Now : in texturing.fade_Level)
is
begin
Self.Textures.Textures (which).Fade := Now;
@@ -312,7 +313,7 @@ is
function Fade (Self : in Item; Which : texture_ID) return Geometry.texturing.fade_Level
function Fade (Self : in Item; Which : texturing.texture_ID) return texturing.fade_Level
is
begin
return Self.Textures.Textures (which).Fade;
@@ -322,7 +323,6 @@ is
procedure Texture_is (Self : in out Item; Which : texture_ID; Now : in openGL.Texture.Object)
is
use openGL.Geometry.texturing;
begin
Texture_is (in_Set => Self.Textures,
Which => Which,
@@ -334,8 +334,8 @@ is
function Texture (Self : in Item; Which : texture_ID) return openGL.Texture.Object
is
begin
return openGL.Geometry.texturing.Texture (in_Set => Self.Textures,
Which => Which);
return openGL.texturing.Texture (in_Set => Self.Textures,
Which => Which);
end Texture;
@@ -343,7 +343,6 @@ is
overriding
procedure Texture_is (Self : in out Item; Now : in openGL.Texture.Object)
is
use openGL.Geometry.texturing;
begin
Texture_is (in_Set => Self.Textures,
Now => Now);
@@ -355,8 +354,8 @@ is
function Texture (Self : in Item) return openGL.Texture.Object
is
begin
return openGL.Geometry.texturing.Texture (in_Set => Self.Textures,
Which => 1);
return texturing.Texture (in_Set => Self.Textures,
Which => 1);
end Texture;

12
3-mid/opengl/source/lean/geometry/opengl-geometry-lit_textured.ads
View File

@@ -1,5 +1,5 @@
with
openGL.Geometry.texturing;
openGL.texturing;
package openGL.Geometry.lit_textured
@@ -45,12 +45,12 @@ is
--- Texturing.
--
procedure Fade_is (Self : in out Item; Which : texture_ID; Now : in Geometry.texturing.fade_Level);
function Fade (Self : in Item; Which : texture_ID) return Geometry.texturing.fade_Level;
procedure Fade_is (Self : in out Item; Which : texturing.texture_ID; Now : in texturing.fade_Level);
function Fade (Self : in Item; Which : texturing.texture_ID) return texturing.fade_Level;
procedure Texture_is (Self : in out Item; Which : texture_ID; Now : in openGL.Texture.Object);
function Texture (Self : in Item; Which : texture_ID) return openGL.Texture.Object;
procedure Texture_is (Self : in out Item; Which : texturing.texture_ID; Now : in openGL.Texture.Object);
function Texture (Self : in Item; Which : texturing.texture_ID) return openGL.Texture.Object;
overriding
procedure Texture_is (Self : in out Item; Now : in openGL.Texture.Object);
@@ -64,7 +64,7 @@ private
type Item is new Geometry.item with
record
Textures : Geometry.texturing.texture_Set;
Textures : texturing.texture_Set;
end record;

17
3-mid/opengl/source/lean/geometry/opengl-geometry-textured.adb
View File

@@ -19,6 +19,8 @@ is
use GL.lean,
GL.Pointers,
openGL.texturing,
Interfaces,
System;
@@ -167,7 +169,7 @@ is
--- Texturing
--
procedure Fade_is (Self : in out Item; Which : texture_ID; Now : in Geometry.texturing.fade_Level)
procedure Fade_is (Self : in out Item; Which : texturing.texture_ID; Now : in texturing.fade_Level)
is
begin
Self.Textures.Textures (Which).Fade := Now;
@@ -175,7 +177,7 @@ is
function Fade (Self : in Item; Which : texture_ID) return Geometry.texturing.fade_Level
function Fade (Self : in Item; Which : texturing.texture_ID) return texturing.fade_Level
is
begin
return Self.Textures.Textures (Which).Fade;
@@ -185,7 +187,6 @@ is
procedure Texture_is (Self : in out Item; Which : texture_ID; Now : in openGL.Texture.Object)
is
use openGL.Geometry.texturing;
begin
Texture_is (in_Set => Self.Textures,
Which => Which,
@@ -197,8 +198,8 @@ is
function Texture (Self : in Item; Which : texture_ID) return openGL.Texture.Object
is
begin
return openGL.Geometry.texturing.Texture (in_Set => Self.Textures,
Which => Which);
return openGL.texturing.Texture (in_Set => Self.Textures,
Which => Which);
end Texture;
@@ -206,7 +207,6 @@ is
overriding
procedure Texture_is (Self : in out Item; Now : in openGL.Texture.Object)
is
use openGL.Geometry.texturing;
begin
Texture_is (in_Set => Self.Textures,
Now => Now);
@@ -218,8 +218,8 @@ is
function Texture (Self : in Item) return openGL.Texture.Object
is
begin
return openGL.Geometry.texturing.Texture (in_Set => Self.Textures,
Which => 1);
return openGL.texturing.Texture (in_Set => Self.Textures,
which => 1);
end Texture;
@@ -227,7 +227,6 @@ is
overriding
procedure enable_Texture (Self : in out Item)
is
use openGL.Geometry.texturing;
begin
enable (Self.Textures, Self.Program);
end enable_Texture;

12
3-mid/opengl/source/lean/geometry/opengl-geometry-textured.ads
View File

@@ -1,5 +1,5 @@
with
openGL.Geometry.texturing;
openGL.texturing;
package openGL.Geometry.textured
@@ -42,12 +42,12 @@ is
--- Texturing.
--
procedure Fade_is (Self : in out Item; Which : texture_ID; Now : in Geometry.texturing.fade_Level);
function Fade (Self : in Item; Which : texture_ID) return Geometry.texturing.fade_Level;
procedure Fade_is (Self : in out Item; Which : texturing.texture_ID; Now : in texturing.fade_Level);
function Fade (Self : in Item; Which : texturing.texture_ID) return texturing.fade_Level;
procedure Texture_is (Self : in out Item; Which : texture_ID; Now : in openGL.Texture.Object);
function Texture (Self : in Item; Which : texture_ID) return openGL.Texture.Object;
procedure Texture_is (Self : in out Item; Which : texturing.texture_ID; Now : in openGL.Texture.Object);
function Texture (Self : in Item; Which : texturing.texture_ID) return openGL.Texture.Object;
overriding
procedure Texture_is (Self : in out Item; Now : in openGL.Texture.Object);
@@ -61,7 +61,7 @@ private
type Item is new Geometry.item with
record
Textures : Geometry.texturing.texture_Set;
Textures : texturing.texture_Set;
end record;

0
3-mid/opengl/source/lean/geometry/opengl-geometry-texturing.adb → 3-mid/opengl/source/lean/geometry/opengl-geometry-texturing (copy 1).adb-1
View File

0
3-mid/opengl/source/lean/geometry/opengl-geometry-texturing.ads → 3-mid/opengl/source/lean/geometry/opengl-geometry-texturing (copy 1).ads-1
View File

15
3-mid/opengl/source/lean/geometry/opengl-geometry.ads
View File

@@ -2,7 +2,8 @@ with
openGL.Primitive,
openGL.Buffer,
openGL.Program,
openGL.Texture;
openGL.Texture,
openGL.texturing;
limited
with
@@ -51,11 +52,11 @@ is
max_Textures : constant := 32;
type texture_Id is range 1 .. max_Textures;
-- max_Textures : constant := 32;
--
-- type texture_Id is range 1 .. max_Textures;
--
--
procedure Texture_is (Self : in out Item; Now : in openGL.Texture.Object) is null;
function Texture (Self : in Item) return openGL.Texture.Object;
@@ -102,7 +103,7 @@ is
private
use ada.Strings.unbounded;
type Textures is array (texture_Id) of openGL.Texture.Object;
type Textures is array (texturing.texture_Id) of openGL.Texture.Object;
type Item is abstract tagged limited