opengl.geometry.lit_textured: Rename 'Textures' record component to 'texture_Set'.
This commit is contained in:
@@ -308,7 +308,7 @@ is
|
|||||||
procedure Fade_is (Self : in out Item; Which : texture_ID; Now : in texturing.fade_Level)
|
procedure Fade_is (Self : in out Item; Which : texture_ID; Now : in texturing.fade_Level)
|
||||||
is
|
is
|
||||||
begin
|
begin
|
||||||
Self.Textures.Textures (which).Fade := Now;
|
Self.texture_Set.Textures (which).Fade := Now;
|
||||||
end Fade_is;
|
end Fade_is;
|
||||||
|
|
||||||
|
|
||||||
@@ -316,7 +316,7 @@ is
|
|||||||
function Fade (Self : in Item; Which : texturing.texture_ID) return texturing.fade_Level
|
function Fade (Self : in Item; Which : texturing.texture_ID) return texturing.fade_Level
|
||||||
is
|
is
|
||||||
begin
|
begin
|
||||||
return Self.Textures.Textures (which).Fade;
|
return Self.texture_Set.Textures (which).Fade;
|
||||||
end Fade;
|
end Fade;
|
||||||
|
|
||||||
|
|
||||||
@@ -324,7 +324,7 @@ is
|
|||||||
procedure Texture_is (Self : in out Item; Which : texture_ID; Now : in openGL.Texture.Object)
|
procedure Texture_is (Self : in out Item; Which : texture_ID; Now : in openGL.Texture.Object)
|
||||||
is
|
is
|
||||||
begin
|
begin
|
||||||
Texture_is (in_Set => Self.Textures,
|
Texture_is (in_Set => Self.texture_Set,
|
||||||
Which => Which,
|
Which => Which,
|
||||||
Now => Now);
|
Now => Now);
|
||||||
end Texture_is;
|
end Texture_is;
|
||||||
@@ -334,7 +334,7 @@ is
|
|||||||
function Texture (Self : in Item; Which : texture_ID) return openGL.Texture.Object
|
function Texture (Self : in Item; Which : texture_ID) return openGL.Texture.Object
|
||||||
is
|
is
|
||||||
begin
|
begin
|
||||||
return openGL.texturing.Texture (in_Set => Self.Textures,
|
return openGL.texturing.Texture (in_Set => Self.texture_Set,
|
||||||
Which => Which);
|
Which => Which);
|
||||||
end Texture;
|
end Texture;
|
||||||
|
|
||||||
@@ -344,7 +344,7 @@ is
|
|||||||
procedure Texture_is (Self : in out Item; Now : in openGL.Texture.Object)
|
procedure Texture_is (Self : in out Item; Now : in openGL.Texture.Object)
|
||||||
is
|
is
|
||||||
begin
|
begin
|
||||||
Texture_is (in_Set => Self.Textures,
|
Texture_is (in_Set => Self.texture_Set,
|
||||||
Now => Now);
|
Now => Now);
|
||||||
end Texture_is;
|
end Texture_is;
|
||||||
|
|
||||||
@@ -354,7 +354,7 @@ is
|
|||||||
function Texture (Self : in Item) return openGL.Texture.Object
|
function Texture (Self : in Item) return openGL.Texture.Object
|
||||||
is
|
is
|
||||||
begin
|
begin
|
||||||
return texturing.Texture (in_Set => Self.Textures,
|
return texturing.Texture (in_Set => Self.texture_Set,
|
||||||
Which => 1);
|
Which => 1);
|
||||||
end Texture;
|
end Texture;
|
||||||
|
|
||||||
@@ -414,10 +414,10 @@ is
|
|||||||
GLint (i) - 1);
|
GLint (i) - 1);
|
||||||
glActiveTexture (all_texture_Units (i));
|
glActiveTexture (all_texture_Units (i));
|
||||||
glBindTexture (GL_TEXTURE_2D,
|
glBindTexture (GL_TEXTURE_2D,
|
||||||
Self.Textures.Textures (i).Object.Name);
|
Self.texture_Set.Textures (i).Object.Name);
|
||||||
end loop;
|
end loop;
|
||||||
|
|
||||||
the_texture_count_Uniform.Value_is (Self.Textures.Count);
|
the_texture_count_Uniform.Value_is (Self.texture_Set.Count);
|
||||||
end enable_Texture;
|
end enable_Texture;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -64,7 +64,7 @@ private
|
|||||||
|
|
||||||
type Item is new Geometry.item with
|
type Item is new Geometry.item with
|
||||||
record
|
record
|
||||||
Textures : texturing.texture_Set;
|
texture_Set : texturing.texture_Set;
|
||||||
end record;
|
end record;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user