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

opengl.geometry: Rename 'enable_Texture' to 'enable_Textures'.

Browse Source
This commit is contained in:
Rod Kay
2023-05-29 21:40:17 +10:00
parent 3783591ed1
commit c29d50f544
16 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
3-mid/opengl/source/lean/geometry/opengl-geometry-colored_textured.adb
View File

@@ -192,7 +192,7 @@ is
overriding overriding
procedure enable_Texture (Self : in out Item) procedure enable_Textures (Self : in out Item)
is is
use GL, use GL,
GL.Binding, GL.Binding,
@@ -207,7 +207,7 @@ is
then enable (white_Texture); then enable (white_Texture);
else enable (Self.Texture); else enable (Self.Texture);
end if; end if;
end enable_Texture; end enable_Textures;
end openGL.Geometry.colored_textured; end openGL.Geometry.colored_textured;

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

@@ -43,6 +43,6 @@ private
overriding overriding
procedure enable_Texture (Self : in out Item); procedure enable_Textures (Self : in out Item);
end openGL.Geometry.colored_textured; end openGL.Geometry.colored_textured;

4
3-mid/opengl/source/lean/geometry/opengl-geometry-lit_colored_skinned.adb
View File

@@ -258,11 +258,11 @@ is
overriding overriding
procedure enable_Texture (Self : in out Item) procedure enable_Textures (Self : in out Item)
is is
begin begin
null; null;
end enable_Texture; end enable_Textures;
end openGL.Geometry.lit_colored_skinned; end openGL.Geometry.lit_colored_skinned;

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

@@ -53,6 +53,6 @@ private
overriding overriding
procedure enable_Texture (Self : in out Item); procedure enable_Textures (Self : in out Item);
end openGL.Geometry.lit_colored_skinned; end openGL.Geometry.lit_colored_skinned;

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

@@ -337,11 +337,11 @@ is
overriding overriding
procedure enable_Texture (Self : in out Item) procedure enable_Textures (Self : in out Item)
is is
begin begin
enable (Self.Textures, Self.Program); enable (Self.Textures, Self.Program);
end enable_Texture; end enable_Textures;

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

@@ -66,6 +66,6 @@ private
overriding overriding
procedure enable_Texture (Self : in out Item); procedure enable_Textures (Self : in out Item);
end openGL.Geometry.lit_colored_textured; end openGL.Geometry.lit_colored_textured;

4
3-mid/opengl/source/lean/geometry/opengl-geometry-lit_colored_textured_skinned.adb
View File

@@ -288,7 +288,7 @@ is
overriding overriding
procedure enable_Texture (Self : in out Item) procedure enable_Textures (Self : in out Item)
is is
use GL, use GL,
GL.Binding, GL.Binding,
@@ -315,7 +315,7 @@ is
else else
Self.Texture.enable; Self.Texture.enable;
end if; end if;
end enable_Texture; end enable_Textures;
end openGL.Geometry.lit_colored_textured_skinned; end openGL.Geometry.lit_colored_textured_skinned;

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

@@ -53,6 +53,6 @@ private
type Item is new Geometry.item with null record; type Item is new Geometry.item with null record;
overriding overriding
procedure enable_Texture (Self : in out Item); procedure enable_Textures (Self : in out Item);
end openGL.Geometry.lit_colored_textured_skinned; end openGL.Geometry.lit_colored_textured_skinned;

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

@@ -403,7 +403,7 @@ is
overriding overriding
procedure enable_Texture (Self : in out Item) procedure enable_Textures (Self : in out Item)
is is
begin begin
for i in 1 .. texture_Id (Self.Model.texture_Count) for i in 1 .. texture_Id (Self.Model.texture_Count)
@@ -418,7 +418,7 @@ is
end loop; end loop;
the_texture_count_Uniform.Value_is (Self.texture_Set.Count); the_texture_count_Uniform.Value_is (Self.texture_Set.Count);
end enable_Texture; end enable_Textures;
end openGL.Geometry.lit_textured; end openGL.Geometry.lit_textured;

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

@@ -69,6 +69,6 @@ private
overriding overriding
procedure enable_Texture (Self : in out Item); procedure enable_Textures (Self : in out Item);
end openGL.Geometry.lit_textured; end openGL.Geometry.lit_textured;

4
3-mid/opengl/source/lean/geometry/opengl-geometry-lit_textured_skinned.adb
View File

@@ -262,7 +262,7 @@ is
overriding overriding
procedure enable_Texture (Self : in out Item) procedure enable_Textures (Self : in out Item)
is is
use GL, use GL,
GL.Binding, GL.Binding,
@@ -289,7 +289,7 @@ is
else else
Self.Texture.enable; Self.Texture.enable;
end if; end if;
end enable_Texture; end enable_Textures;
end openGL.Geometry.lit_textured_skinned; end openGL.Geometry.lit_textured_skinned;

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

@@ -52,6 +52,6 @@ private
type Item is new Geometry.item with null record; type Item is new Geometry.item with null record;
overriding overriding
procedure enable_Texture (Self : in out Item); procedure enable_Textures (Self : in out Item);
end openGL.Geometry.lit_textured_skinned; end openGL.Geometry.lit_textured_skinned;

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

@@ -225,11 +225,11 @@ is
overriding overriding
procedure enable_Texture (Self : in out Item) procedure enable_Textures (Self : in out Item)
is is
begin begin
enable (Self.Textures, Self.Program); enable (Self.Textures, Self.Program);
end enable_Texture; end enable_Textures;

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

@@ -66,6 +66,6 @@ private
overriding overriding
procedure enable_Texture (Self : in out Item); procedure enable_Textures (Self : in out Item);
end openGL.Geometry.textured; end openGL.Geometry.textured;

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

@@ -184,7 +184,7 @@ is
raise Error with "Unable to render geometry with no primitives."; raise Error with "Unable to render geometry with no primitives.";
end if; end if;
Self .enable_Texture; Self .enable_Textures;
Self.Program .set_Uniforms; Self.Program .set_Uniforms;
Self.Vertices.enable; Self.Vertices.enable;
Self.Program .enable_Attributes; Self.Program .enable_Attributes;

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

@@ -82,8 +82,8 @@ is
-- Operations -- Operations
-- --
procedure render (Self : in out Item'Class); procedure render (Self : in out Item'Class);
procedure enable_Texture (Self : in out Item) is null; procedure enable_Textures (Self : in out Item) is null;
----------- -----------