opengl.geometry: Rename 'enable_Texture' to 'enable_Textures'.
This commit is contained in:
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -66,6 +66,6 @@ private
|
||||
|
||||
|
||||
overriding
|
||||
procedure enable_Texture (Self : in out Item);
|
||||
procedure enable_Textures (Self : in out Item);
|
||||
|
||||
end openGL.Geometry.textured;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
-----------
|
||||
|
||||
Reference in New Issue
Block a user