From c29d50f5449220c64c2aa77058f3ef1e3b780e5c Mon Sep 17 00:00:00 2001 From: Rod Kay Date: Mon, 29 May 2023 21:40:17 +1000 Subject: [PATCH] opengl.geometry: Rename 'enable_Texture' to 'enable_Textures'. --- .../source/lean/geometry/opengl-geometry-colored_textured.adb | 4 ++-- .../source/lean/geometry/opengl-geometry-colored_textured.ads | 2 +- .../lean/geometry/opengl-geometry-lit_colored_skinned.adb | 4 ++-- .../lean/geometry/opengl-geometry-lit_colored_skinned.ads | 2 +- .../lean/geometry/opengl-geometry-lit_colored_textured.adb | 4 ++-- .../lean/geometry/opengl-geometry-lit_colored_textured.ads | 2 +- .../geometry/opengl-geometry-lit_colored_textured_skinned.adb | 4 ++-- .../geometry/opengl-geometry-lit_colored_textured_skinned.ads | 2 +- .../source/lean/geometry/opengl-geometry-lit_textured.adb | 4 ++-- .../source/lean/geometry/opengl-geometry-lit_textured.ads | 2 +- .../lean/geometry/opengl-geometry-lit_textured_skinned.adb | 4 ++-- .../lean/geometry/opengl-geometry-lit_textured_skinned.ads | 2 +- .../opengl/source/lean/geometry/opengl-geometry-textured.adb | 4 ++-- .../opengl/source/lean/geometry/opengl-geometry-textured.ads | 2 +- 3-mid/opengl/source/lean/geometry/opengl-geometry.adb | 2 +- 3-mid/opengl/source/lean/geometry/opengl-geometry.ads | 4 ++-- 16 files changed, 24 insertions(+), 24 deletions(-) diff --git a/3-mid/opengl/source/lean/geometry/opengl-geometry-colored_textured.adb b/3-mid/opengl/source/lean/geometry/opengl-geometry-colored_textured.adb index 9ff00af..47f0f68 100644 --- a/3-mid/opengl/source/lean/geometry/opengl-geometry-colored_textured.adb +++ b/3-mid/opengl/source/lean/geometry/opengl-geometry-colored_textured.adb @@ -192,7 +192,7 @@ is overriding - procedure enable_Texture (Self : in out Item) + procedure enable_Textures (Self : in out Item) is use GL, GL.Binding, @@ -207,7 +207,7 @@ is then enable (white_Texture); else enable (Self.Texture); end if; - end enable_Texture; + end enable_Textures; end openGL.Geometry.colored_textured; diff --git a/3-mid/opengl/source/lean/geometry/opengl-geometry-colored_textured.ads b/3-mid/opengl/source/lean/geometry/opengl-geometry-colored_textured.ads index f30c804..5c91512 100644 --- a/3-mid/opengl/source/lean/geometry/opengl-geometry-colored_textured.ads +++ b/3-mid/opengl/source/lean/geometry/opengl-geometry-colored_textured.ads @@ -43,6 +43,6 @@ private overriding - procedure enable_Texture (Self : in out Item); + procedure enable_Textures (Self : in out Item); end openGL.Geometry.colored_textured; diff --git a/3-mid/opengl/source/lean/geometry/opengl-geometry-lit_colored_skinned.adb b/3-mid/opengl/source/lean/geometry/opengl-geometry-lit_colored_skinned.adb index d2424a6..8484a62 100644 --- a/3-mid/opengl/source/lean/geometry/opengl-geometry-lit_colored_skinned.adb +++ b/3-mid/opengl/source/lean/geometry/opengl-geometry-lit_colored_skinned.adb @@ -258,11 +258,11 @@ is overriding - procedure enable_Texture (Self : in out Item) + procedure enable_Textures (Self : in out Item) is begin null; - end enable_Texture; + end enable_Textures; end openGL.Geometry.lit_colored_skinned; diff --git a/3-mid/opengl/source/lean/geometry/opengl-geometry-lit_colored_skinned.ads b/3-mid/opengl/source/lean/geometry/opengl-geometry-lit_colored_skinned.ads index 67b4a4e..0103101 100644 --- a/3-mid/opengl/source/lean/geometry/opengl-geometry-lit_colored_skinned.ads +++ b/3-mid/opengl/source/lean/geometry/opengl-geometry-lit_colored_skinned.ads @@ -53,6 +53,6 @@ private overriding - procedure enable_Texture (Self : in out Item); + procedure enable_Textures (Self : in out Item); end openGL.Geometry.lit_colored_skinned; diff --git a/3-mid/opengl/source/lean/geometry/opengl-geometry-lit_colored_textured.adb b/3-mid/opengl/source/lean/geometry/opengl-geometry-lit_colored_textured.adb index aa00452..c255eae 100644 --- a/3-mid/opengl/source/lean/geometry/opengl-geometry-lit_colored_textured.adb +++ b/3-mid/opengl/source/lean/geometry/opengl-geometry-lit_colored_textured.adb @@ -337,11 +337,11 @@ is overriding - procedure enable_Texture (Self : in out Item) + procedure enable_Textures (Self : in out Item) is begin enable (Self.Textures, Self.Program); - end enable_Texture; + end enable_Textures; 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 71526d4..6990d3b 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 @@ -66,6 +66,6 @@ private overriding - procedure enable_Texture (Self : in out Item); + procedure enable_Textures (Self : in out Item); end openGL.Geometry.lit_colored_textured; diff --git a/3-mid/opengl/source/lean/geometry/opengl-geometry-lit_colored_textured_skinned.adb b/3-mid/opengl/source/lean/geometry/opengl-geometry-lit_colored_textured_skinned.adb index 8ac6238..d421a4f 100644 --- a/3-mid/opengl/source/lean/geometry/opengl-geometry-lit_colored_textured_skinned.adb +++ b/3-mid/opengl/source/lean/geometry/opengl-geometry-lit_colored_textured_skinned.adb @@ -288,7 +288,7 @@ is overriding - procedure enable_Texture (Self : in out Item) + procedure enable_Textures (Self : in out Item) is use GL, GL.Binding, @@ -315,7 +315,7 @@ is else Self.Texture.enable; end if; - end enable_Texture; + end enable_Textures; end openGL.Geometry.lit_colored_textured_skinned; diff --git a/3-mid/opengl/source/lean/geometry/opengl-geometry-lit_colored_textured_skinned.ads b/3-mid/opengl/source/lean/geometry/opengl-geometry-lit_colored_textured_skinned.ads index 4625941..cc6f980 100644 --- a/3-mid/opengl/source/lean/geometry/opengl-geometry-lit_colored_textured_skinned.ads +++ b/3-mid/opengl/source/lean/geometry/opengl-geometry-lit_colored_textured_skinned.ads @@ -53,6 +53,6 @@ private type Item is new Geometry.item with null record; overriding - procedure enable_Texture (Self : in out Item); + procedure enable_Textures (Self : in out Item); end openGL.Geometry.lit_colored_textured_skinned; 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 5f4accb..b39f2d8 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 @@ -403,7 +403,7 @@ is overriding - procedure enable_Texture (Self : in out Item) + procedure enable_Textures (Self : in out Item) is begin for i in 1 .. texture_Id (Self.Model.texture_Count) @@ -418,7 +418,7 @@ is end loop; the_texture_count_Uniform.Value_is (Self.texture_Set.Count); - end enable_Texture; + end enable_Textures; end openGL.Geometry.lit_textured; 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 32e7e23..5cdb147 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 @@ -69,6 +69,6 @@ private overriding - procedure enable_Texture (Self : in out Item); + procedure enable_Textures (Self : in out Item); end openGL.Geometry.lit_textured; diff --git a/3-mid/opengl/source/lean/geometry/opengl-geometry-lit_textured_skinned.adb b/3-mid/opengl/source/lean/geometry/opengl-geometry-lit_textured_skinned.adb index 6c6146d..af646b5 100644 --- a/3-mid/opengl/source/lean/geometry/opengl-geometry-lit_textured_skinned.adb +++ b/3-mid/opengl/source/lean/geometry/opengl-geometry-lit_textured_skinned.adb @@ -262,7 +262,7 @@ is overriding - procedure enable_Texture (Self : in out Item) + procedure enable_Textures (Self : in out Item) is use GL, GL.Binding, @@ -289,7 +289,7 @@ is else Self.Texture.enable; end if; - end enable_Texture; + end enable_Textures; end openGL.Geometry.lit_textured_skinned; diff --git a/3-mid/opengl/source/lean/geometry/opengl-geometry-lit_textured_skinned.ads b/3-mid/opengl/source/lean/geometry/opengl-geometry-lit_textured_skinned.ads index 3b3bee0..537e2a9 100644 --- a/3-mid/opengl/source/lean/geometry/opengl-geometry-lit_textured_skinned.ads +++ b/3-mid/opengl/source/lean/geometry/opengl-geometry-lit_textured_skinned.ads @@ -52,6 +52,6 @@ private type Item is new Geometry.item with null record; overriding - procedure enable_Texture (Self : in out Item); + procedure enable_Textures (Self : in out Item); end openGL.Geometry.lit_textured_skinned; diff --git a/3-mid/opengl/source/lean/geometry/opengl-geometry-textured.adb b/3-mid/opengl/source/lean/geometry/opengl-geometry-textured.adb index a13961c..8d0e577 100644 --- a/3-mid/opengl/source/lean/geometry/opengl-geometry-textured.adb +++ b/3-mid/opengl/source/lean/geometry/opengl-geometry-textured.adb @@ -225,11 +225,11 @@ is overriding - procedure enable_Texture (Self : in out Item) + procedure enable_Textures (Self : in out Item) is begin enable (Self.Textures, Self.Program); - end enable_Texture; + end enable_Textures; 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 c2a15b7..bad1a47 100644 --- a/3-mid/opengl/source/lean/geometry/opengl-geometry-textured.ads +++ b/3-mid/opengl/source/lean/geometry/opengl-geometry-textured.ads @@ -66,6 +66,6 @@ private overriding - procedure enable_Texture (Self : in out Item); + procedure enable_Textures (Self : in out Item); end openGL.Geometry.textured; diff --git a/3-mid/opengl/source/lean/geometry/opengl-geometry.adb b/3-mid/opengl/source/lean/geometry/opengl-geometry.adb index 9e7fc98..048017c 100644 --- a/3-mid/opengl/source/lean/geometry/opengl-geometry.adb +++ b/3-mid/opengl/source/lean/geometry/opengl-geometry.adb @@ -184,7 +184,7 @@ is raise Error with "Unable to render geometry with no primitives."; end if; - Self .enable_Texture; + Self .enable_Textures; Self.Program .set_Uniforms; Self.Vertices.enable; Self.Program .enable_Attributes; diff --git a/3-mid/opengl/source/lean/geometry/opengl-geometry.ads b/3-mid/opengl/source/lean/geometry/opengl-geometry.ads index fabf0e7..fa58c12 100644 --- a/3-mid/opengl/source/lean/geometry/opengl-geometry.ads +++ b/3-mid/opengl/source/lean/geometry/opengl-geometry.ads @@ -82,8 +82,8 @@ is -- Operations -- - procedure render (Self : in out Item'Class); - procedure enable_Texture (Self : in out Item) is null; + procedure render (Self : in out Item'Class); + procedure enable_Textures (Self : in out Item) is null; -----------