opengl: Rid 'Texture' and 'Texture_is' for texture_Sets.
This commit is contained in:
@@ -49,10 +49,10 @@ is
|
||||
|
||||
type fadeable_Texture is
|
||||
record
|
||||
Fade : fade_Level := 0.0;
|
||||
-- Fade : fade_Level := 0.0;
|
||||
Object : openGL.Texture.Object := openGL.Texture.null_Object;
|
||||
Applied : Boolean := True; -- Whether this texture is painted on or not.
|
||||
Tiling : texture_Set.Tiling := (1.0, 1.0);
|
||||
-- Applied : Boolean := True; -- Whether this texture is painted on or not.
|
||||
-- Tiling : texture_Set.Tiling := (1.0, 1.0);
|
||||
end record;
|
||||
|
||||
type fadeable_Textures is array (texture_Id range 1 .. max_Textures) of fadeable_Texture;
|
||||
@@ -100,12 +100,13 @@ is
|
||||
|
||||
type Details is
|
||||
record
|
||||
Fades : fade_Levels (texture_Id) := [others => 0.0];
|
||||
Textures : asset_Names (1 .. Positive (texture_Id'Last)) := [others => null_Asset]; -- The textures to be applied to the visual.
|
||||
texture_Count : Natural := 0;
|
||||
texture_Tilings : Tilings := [others => (S => 1.0,
|
||||
T => 1.0)];
|
||||
texture_Applies : texture_Apply_array := [1 => True, others => False];
|
||||
Fades : fade_Levels (texture_Id) := [others => 0.0];
|
||||
Textures : asset_Names (1 .. Positive (texture_Id'Last)) := [others => null_Asset];
|
||||
Objects : texture.Objects (1 .. Positive (texture_Id'Last)) := [others => texture.null_Object];
|
||||
texture_Count : Natural := 0;
|
||||
texture_Tilings : Tilings := [others => (S => 1.0,
|
||||
T => 1.0)];
|
||||
texture_Applies : texture_Apply_array := [1 => True, others => False]; -- The textures to be applied to the visual.
|
||||
Animation : Animation_view;
|
||||
end record;
|
||||
|
||||
@@ -126,12 +127,12 @@ is
|
||||
Textures : fadeable_Textures;
|
||||
Count : Natural := 0;
|
||||
is_Transparent : Boolean := False; -- Any of the textures contains lucid colors.
|
||||
initialised : Boolean := False;
|
||||
-- initialised : Boolean := False;
|
||||
end record;
|
||||
|
||||
|
||||
procedure Texture_is (in_Set : in out Item; Which : texture_ID := 1; Now : in openGL.Texture.Object);
|
||||
function Texture (in_Set : in Item; Which : texture_ID := 1) return openGL.Texture.Object;
|
||||
-- procedure Texture_is (in_Set : in out Item; Which : texture_ID := 1; Now : in openGL.Texture.Object);
|
||||
-- function Texture (in_Set : in Item; Which : texture_ID := 1) return openGL.Texture.Object;
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user