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

13
3-mid/opengl/source/lean/model/opengl-model-hexagon-lit_textured.adb
View File

@@ -33,8 +33,8 @@ is
--
overriding
procedure Fade_is (Self : in out Item; Which : in Geometry.texture_Id;
Now : in Geometry.Texturing.fade_Level)
procedure Fade_is (Self : in out Item; Which : in texturing.texture_Id;
Now : in texturing.fade_Level)
is
begin
Self.Face.Fades (which) := Now;
@@ -43,7 +43,7 @@ is
overriding
function Fade (Self : in Item; Which : in Geometry.texture_Id) return Geometry.Texturing.fade_Level
function Fade (Self : in Item; Which : in texturing.texture_Id) return texturing.fade_Level
is
begin
return Self.Face.Fades (which);
@@ -51,7 +51,7 @@ is
procedure Texture_is (Self : in out Item; Which : in Geometry.texture_Id;
procedure Texture_is (Self : in out Item; Which : in texturing.texture_Id;
Now : in openGL.asset_Name)
is
begin
@@ -87,7 +87,8 @@ is
function new_Face (Vertices : in geometry.lit_textured.Vertex_array) return Geometry.lit_textured.view
is
use Primitive;
use Primitive,
texturing;
the_Geometry : constant Geometry.lit_textured.view
:= Geometry.lit_textured.new_Geometry;
@@ -95,7 +96,7 @@ is
the_Primitive : constant Primitive.indexed.view
:= Primitive.indexed.new_Primitive (triangle_Fan, the_Indices);
Id : texture_Id;
Id : texturing.texture_Id;
begin
the_Geometry.Vertices_are (Vertices);
the_Geometry.add (Primitive.view (the_Primitive));

16
3-mid/opengl/source/lean/model/opengl-model-hexagon-lit_textured.ads
View File

@@ -1,5 +1,5 @@
with
openGL.Geometry.texturing,
openGL.texturing,
openGL.Texture;
@@ -14,8 +14,8 @@ is
type Face is
record
Fades : Geometry.texturing.fade_Levels (Geometry.texture_Id) := [others => 0.0];
Textures : openGL.asset_Names (1 .. Positive (Geometry.texture_Id'Last)) := [others => null_Asset]; -- The textures to be applied to the hex.
Fades : texturing.fade_Levels (texturing.texture_Id) := [others => 0.0];
Textures : openGL.asset_Names (1 .. Positive (texturing.texture_Id'Last)) := [others => null_Asset]; -- The textures to be applied to the hex.
texture_Count : Natural := 0;
end record;
@@ -41,14 +41,14 @@ is
--
overriding
function Fade (Self : in Item; Which : in Geometry.texture_Id) return Geometry.Texturing.fade_Level;
function Fade (Self : in Item; Which : in texturing.texture_Id) return texturing.fade_Level;
overriding
procedure Fade_is (Self : in out Item; Which : in Geometry.texture_Id;
Now : in Geometry.Texturing.fade_Level);
procedure Fade_is (Self : in out Item; Which : in texturing.texture_Id;
Now : in texturing.fade_Level);
procedure Texture_is (Self : in out Item; Which : in Geometry.texture_Id;
Now : in openGL.asset_Name);
procedure Texture_is (Self : in out Item; Which : in texturing.texture_Id;
Now : in asset_Name);
overriding
function texture_Count (Self : in Item) return Natural;

6
3-mid/opengl/source/lean/model/opengl-model.adb
View File

@@ -218,8 +218,8 @@ is
-- Texturing
--
procedure Fade_is (Self : in out Item; Which : in Geometry.texture_Id;
Now : in Geometry.Texturing.fade_Level)
procedure Fade_is (Self : in out Item; which : in texturing.texture_Id;
now : in texturing.fade_Level)
is
begin
raise program_Error with "Model does not support texturing.";
@@ -227,7 +227,7 @@ is
function Fade (Self : in Item; Which : in Geometry.texture_Id) return Geometry.Texturing.fade_Level
function Fade (Self : in Item; which : in texturing.texture_Id) return texturing.fade_Level
is
begin
raise program_Error with "Model does not support texturing.";

9
3-mid/opengl/source/lean/model/opengl-model.ads
View File

@@ -2,7 +2,8 @@ with
openGL.remote_Model,
openGL.Font,
openGL.Texture,
openGL.Geometry.texturing;
openGL.Geometry,
openGL.texturing;
package openGL.Model
@@ -73,9 +74,9 @@ is
-- Texturing
--
function Fade (Self : in Item; Which : in Geometry.texture_Id) return Geometry.Texturing.fade_Level;
procedure Fade_is (Self : in out Item; Which : in Geometry.texture_Id;
Now : in Geometry.Texturing.fade_Level);
function Fade (Self : in Item; Which : in texturing.texture_Id) return texturing.fade_Level;
procedure Fade_is (Self : in out Item; Which : in texturing.texture_Id;
Now : in texturing.fade_Level);
function texture_Count (Self : in Item) return Natural;