opengl: Rename 'openGL.texture_Set.texture_Set' to 'openGL.texture_Set.Item'.
This commit is contained in:
@@ -61,7 +61,7 @@ private
|
|||||||
|
|
||||||
type Item is new Geometry.item with
|
type Item is new Geometry.item with
|
||||||
record
|
record
|
||||||
Textures : texture_Set.texture_Set;
|
Textures : texture_Set.Item;
|
||||||
end record;
|
end record;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -408,7 +408,7 @@ is
|
|||||||
|
|
||||||
procedure enable_Texturing (for_Model : in openGL.Model.view;
|
procedure enable_Texturing (for_Model : in openGL.Model.view;
|
||||||
texturing_Uniforms : in texture_fade_Uniform_pairs;
|
texturing_Uniforms : in texture_fade_Uniform_pairs;
|
||||||
texture_Set : in openGL.texture_Set.texture_Set)
|
texture_Set : in openGL.texture_Set.Item)
|
||||||
is
|
is
|
||||||
begin
|
begin
|
||||||
for i in 1 .. texture_Id (for_Model.texture_Count)
|
for i in 1 .. texture_Id (for_Model.texture_Count)
|
||||||
|
|||||||
@@ -64,7 +64,7 @@ private
|
|||||||
|
|
||||||
type Item is new Geometry.item with
|
type Item is new Geometry.item with
|
||||||
record
|
record
|
||||||
texture_Set : openGL.texture_Set.texture_Set;
|
texture_Set : openGL.texture_Set.Item;
|
||||||
end record;
|
end record;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -61,7 +61,7 @@ private
|
|||||||
|
|
||||||
type Item is new Geometry.item with
|
type Item is new Geometry.item with
|
||||||
record
|
record
|
||||||
Textures : texture_Set.texture_Set;
|
Textures : texture_Set.Item;
|
||||||
end record;
|
end record;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ with ada.Text_IO; use ada.Text_IO;
|
|||||||
package body openGL.texture_Set
|
package body openGL.texture_Set
|
||||||
is
|
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
|
is
|
||||||
begin
|
begin
|
||||||
in_Set.Textures (Which) := (0.0,
|
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
|
is
|
||||||
begin
|
begin
|
||||||
return in_Set.Textures (Which).Object;
|
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
|
is
|
||||||
begin
|
begin
|
||||||
return in_Set.Textures (1).Object;
|
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
|
is
|
||||||
begin
|
begin
|
||||||
in_Set.Textures (1).Object := Now;
|
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)
|
Program : in openGL.Program.view)
|
||||||
is
|
is
|
||||||
use GL,
|
use GL,
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ is
|
|||||||
|
|
||||||
type fadeable_Textures is array (texture_Id range 1 .. max_Textures) of fadeable_Texture;
|
type fadeable_Textures is array (texture_Id range 1 .. max_Textures) of fadeable_Texture;
|
||||||
|
|
||||||
type texture_Set is
|
type Item is
|
||||||
record
|
record
|
||||||
Textures : fadeable_Textures;
|
Textures : fadeable_Textures;
|
||||||
Count : Natural := 0;
|
Count : Natural := 0;
|
||||||
@@ -39,16 +39,16 @@ is
|
|||||||
initialised : Boolean := False;
|
initialised : Boolean := False;
|
||||||
end record;
|
end record;
|
||||||
|
|
||||||
procedure enable (the_Textures : in out texture_Set;
|
procedure enable (the_Textures : in out Item;
|
||||||
Program : in openGL.Program.view);
|
Program : in openGL.Program.view);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
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);
|
||||||
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;
|
||||||
|
|
||||||
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);
|
||||||
function Texture (in_Set : in texture_Set) return openGL.Texture.Object;
|
function Texture (in_Set : in Item) return openGL.Texture.Object;
|
||||||
|
|
||||||
|
|
||||||
end openGL.texture_Set;
|
end openGL.texture_Set;
|
||||||
|
|||||||
Reference in New Issue
Block a user