From f1d7b2c645a49de28bfc981841e8bd6440a0e9dc Mon Sep 17 00:00:00 2001 From: Rod Kay Date: Wed, 31 May 2023 07:08:51 +1000 Subject: [PATCH] opengl: Rename 'openGL.texture_Set.texture_Set' to 'openGL.texture_Set.Item'. --- .../opengl-geometry-lit_colored_textured.ads | 2 +- .../lean/geometry/opengl-geometry-lit_textured.adb | 2 +- .../lean/geometry/opengl-geometry-lit_textured.ads | 2 +- .../lean/geometry/opengl-geometry-textured.ads | 2 +- 3-mid/opengl/source/lean/opengl-texture_set.adb | 10 +++++----- 3-mid/opengl/source/lean/opengl-texture_set.ads | 12 ++++++------ 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/3-mid/opengl/source/lean/geometry/opengl-geometry-lit_colored_textured.ads b/3-mid/opengl/source/lean/geometry/opengl-geometry-lit_colored_textured.ads index 084633b..51c3bfa 100644 --- a/3-mid/opengl/source/lean/geometry/opengl-geometry-lit_colored_textured.ads +++ b/3-mid/opengl/source/lean/geometry/opengl-geometry-lit_colored_textured.ads @@ -61,7 +61,7 @@ private type Item is new Geometry.item with record - Textures : texture_Set.texture_Set; + Textures : texture_Set.Item; end record; diff --git a/3-mid/opengl/source/lean/geometry/opengl-geometry-lit_textured.adb b/3-mid/opengl/source/lean/geometry/opengl-geometry-lit_textured.adb index 5c42858..3d76d57 100644 --- a/3-mid/opengl/source/lean/geometry/opengl-geometry-lit_textured.adb +++ b/3-mid/opengl/source/lean/geometry/opengl-geometry-lit_textured.adb @@ -408,7 +408,7 @@ is procedure enable_Texturing (for_Model : in openGL.Model.view; texturing_Uniforms : in texture_fade_Uniform_pairs; - texture_Set : in openGL.texture_Set.texture_Set) + texture_Set : in openGL.texture_Set.Item) is begin for i in 1 .. texture_Id (for_Model.texture_Count) diff --git a/3-mid/opengl/source/lean/geometry/opengl-geometry-lit_textured.ads b/3-mid/opengl/source/lean/geometry/opengl-geometry-lit_textured.ads index 6d0a39e..70e8dc6 100644 --- a/3-mid/opengl/source/lean/geometry/opengl-geometry-lit_textured.ads +++ b/3-mid/opengl/source/lean/geometry/opengl-geometry-lit_textured.ads @@ -64,7 +64,7 @@ private type Item is new Geometry.item with record - texture_Set : openGL.texture_Set.texture_Set; + texture_Set : openGL.texture_Set.Item; end record; diff --git a/3-mid/opengl/source/lean/geometry/opengl-geometry-textured.ads b/3-mid/opengl/source/lean/geometry/opengl-geometry-textured.ads index ae67eba..b151715 100644 --- a/3-mid/opengl/source/lean/geometry/opengl-geometry-textured.ads +++ b/3-mid/opengl/source/lean/geometry/opengl-geometry-textured.ads @@ -61,7 +61,7 @@ private type Item is new Geometry.item with record - Textures : texture_Set.texture_Set; + Textures : texture_Set.Item; end record; diff --git a/3-mid/opengl/source/lean/opengl-texture_set.adb b/3-mid/opengl/source/lean/opengl-texture_set.adb index b66ab7a..75a45a6 100644 --- a/3-mid/opengl/source/lean/opengl-texture_set.adb +++ b/3-mid/opengl/source/lean/opengl-texture_set.adb @@ -12,7 +12,7 @@ with ada.Text_IO; use ada.Text_IO; package body openGL.texture_Set is - procedure Texture_is (in_Set : in out texture_Set; Which : texture_ID; Now : in openGL.Texture.Object) + procedure Texture_is (in_Set : in out Item; Which : texture_ID; Now : in openGL.Texture.Object) is begin in_Set.Textures (Which) := (0.0, @@ -32,7 +32,7 @@ is - function Texture (in_Set : in texture_Set; Which : texture_ID) return openGL.Texture.Object + function Texture (in_Set : in Item; Which : texture_ID) return openGL.Texture.Object is begin return in_Set.Textures (Which).Object; @@ -41,7 +41,7 @@ is - function Texture (in_Set : in texture_Set) return openGL.Texture.Object + function Texture (in_Set : in Item) return openGL.Texture.Object is begin return in_Set.Textures (1).Object; @@ -50,7 +50,7 @@ is - procedure Texture_is (in_Set : in out texture_Set; Now : in openGL.Texture.Object) + procedure Texture_is (in_Set : in out Item; Now : in openGL.Texture.Object) is begin in_Set.Textures (1).Object := Now; @@ -65,7 +65,7 @@ is - procedure enable (the_Textures : in out texture_Set; + procedure enable (the_Textures : in out Item; Program : in openGL.Program.view) is use GL, diff --git a/3-mid/opengl/source/lean/opengl-texture_set.ads b/3-mid/opengl/source/lean/opengl-texture_set.ads index 6fe1bc5..b54e042 100644 --- a/3-mid/opengl/source/lean/opengl-texture_set.ads +++ b/3-mid/opengl/source/lean/opengl-texture_set.ads @@ -31,7 +31,7 @@ is type fadeable_Textures is array (texture_Id range 1 .. max_Textures) of fadeable_Texture; - type texture_Set is + type Item is record Textures : fadeable_Textures; Count : Natural := 0; @@ -39,16 +39,16 @@ is initialised : Boolean := False; end record; - procedure enable (the_Textures : in out texture_Set; + procedure enable (the_Textures : in out Item; Program : in openGL.Program.view); - procedure Texture_is (in_Set : in out texture_Set; Which : texture_ID; Now : in openGL.Texture.Object); - function Texture (in_Set : in texture_Set; Which : texture_ID) return openGL.Texture.Object; + procedure Texture_is (in_Set : in out Item; Which : texture_ID; Now : in openGL.Texture.Object); + function Texture (in_Set : in Item; Which : texture_ID) return openGL.Texture.Object; - procedure Texture_is (in_Set : in out texture_Set; Now : in openGL.Texture.Object); - function Texture (in_Set : in texture_Set) return openGL.Texture.Object; + procedure Texture_is (in_Set : in out Item; Now : in openGL.Texture.Object); + function Texture (in_Set : in Item) return openGL.Texture.Object; end openGL.texture_Set;