opengl.texture_set: Initial work on renaming 'Details' to 'Item'.
This commit is contained in:
@@ -70,6 +70,69 @@ is
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
-- function to_Set (texture_Assets : in asset_Names;
|
||||||
|
-- Animation : in Animation_view := null) return Item
|
||||||
|
-- is
|
||||||
|
-- Result : Item (Count => texture_Assets'Length);
|
||||||
|
--
|
||||||
|
-- begin
|
||||||
|
-- for i in 1 .. Result.Count
|
||||||
|
-- loop
|
||||||
|
-- Result.Details (i).Object := texture.null_Object;
|
||||||
|
-- Result.Details (i).Texture := texture_Assets (Integer (i));
|
||||||
|
-- Result.Details (i).Fade := 0.0;
|
||||||
|
-- Result.Details (i).texture_Tiling := (S => 1.0, T => 1.0);
|
||||||
|
--
|
||||||
|
-- if i = 1
|
||||||
|
-- then
|
||||||
|
-- Result.Details (i).texture_Apply := True;
|
||||||
|
-- else
|
||||||
|
-- Result.Details (i).texture_Apply := False;
|
||||||
|
-- end if;
|
||||||
|
-- end loop;
|
||||||
|
--
|
||||||
|
-- Result.Animation := Animation;
|
||||||
|
--
|
||||||
|
-- return Result;
|
||||||
|
-- end to_Set;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
--------------
|
||||||
|
--- Attributes
|
||||||
|
--
|
||||||
|
|
||||||
|
-- function get_Details (Self : in Item) return Detail_array
|
||||||
|
-- is
|
||||||
|
-- begin
|
||||||
|
-- return Self.Details;
|
||||||
|
-- end get_Details;
|
||||||
|
--
|
||||||
|
--
|
||||||
|
--
|
||||||
|
-- procedure Details_are (Self : in out Item; Now : in Detail_array)
|
||||||
|
-- is
|
||||||
|
-- begin
|
||||||
|
-- Self.Details := Now;
|
||||||
|
-- end Details_are;
|
||||||
|
--
|
||||||
|
--
|
||||||
|
--
|
||||||
|
-- function get_Animation (Self : in Item) return Animation_view
|
||||||
|
-- is
|
||||||
|
-- begin
|
||||||
|
-- return Self.Animation;
|
||||||
|
-- end get_Animation;
|
||||||
|
--
|
||||||
|
--
|
||||||
|
--
|
||||||
|
-- procedure Animation_is (Self : in out Item; Now : in Animation_view)
|
||||||
|
-- is
|
||||||
|
-- begin
|
||||||
|
-- Self.Animation := Now;
|
||||||
|
-- end Animation_is;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
-----------
|
-----------
|
||||||
--- Streams
|
--- Streams
|
||||||
|
|||||||
@@ -15,16 +15,28 @@ package openGL.texture_Set
|
|||||||
--
|
--
|
||||||
is
|
is
|
||||||
|
|
||||||
|
max_Textures : constant := 16; -- 32;
|
||||||
|
|
||||||
|
|
||||||
|
type detail_Count is range 0 .. max_Textures;
|
||||||
|
|
||||||
|
|
||||||
|
-- type Item (Count : detail_Count := 1) is private;
|
||||||
|
--
|
||||||
|
-- null_Set : constant Item;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
---------------
|
---------------
|
||||||
--- Texture Ids
|
--- Texture Ids
|
||||||
--
|
--
|
||||||
|
|
||||||
max_Textures : constant := 16; -- 32;
|
|
||||||
|
|
||||||
type texture_Id is range 1 .. max_Textures;
|
type texture_Id is range 1 .. max_Textures;
|
||||||
type texture_Ids is array (Positive range <>) of texture_Id;
|
type texture_Ids is array (Positive range <>) of texture_Id;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
----------
|
----------
|
||||||
--- Tiling
|
--- Tiling
|
||||||
--
|
--
|
||||||
@@ -88,6 +100,20 @@ is
|
|||||||
texture_Applies : in out texture_Apply_array);
|
texture_Applies : in out texture_Apply_array);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
type Detail is
|
||||||
|
record
|
||||||
|
Object : texture.Object;
|
||||||
|
Texture : asset_Name;
|
||||||
|
Fade : fade_Level;
|
||||||
|
texture_Tiling : Tiling;
|
||||||
|
texture_Apply : Boolean; -- If the textures is to be applied to the visual.
|
||||||
|
end record;
|
||||||
|
|
||||||
|
type Detail_array is array (detail_Count range <>) of Detail;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
-----------
|
-----------
|
||||||
--- Details
|
--- Details
|
||||||
--
|
--
|
||||||
@@ -105,15 +131,43 @@ is
|
|||||||
end record;
|
end record;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
---------
|
||||||
|
--- Forge
|
||||||
|
--
|
||||||
|
|
||||||
function to_Details (texture_Assets : in asset_Names;
|
function to_Details (texture_Assets : in asset_Names;
|
||||||
Animation : in Animation_view := null) return Details;
|
Animation : in Animation_view := null) return Details;
|
||||||
|
|
||||||
no_Details : constant Details;
|
no_Details : constant Details;
|
||||||
|
|
||||||
|
|
||||||
|
-- function to_Set (texture_Assets : in asset_Names;
|
||||||
|
-- Animation : in Animation_view := null) return Item;
|
||||||
|
|
||||||
|
|
||||||
|
--------------
|
||||||
|
--- Attributes
|
||||||
|
--
|
||||||
|
|
||||||
|
-- function get_Details (Self : in Item) return Detail_array;
|
||||||
|
-- procedure Details_are (Self : in out Item; Now : in Detail_array);
|
||||||
|
--
|
||||||
|
-- function get_Animation (Self : in Item) return Animation_view;
|
||||||
|
-- procedure Animation_is (Self : in out Item; Now : in Animation_view);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
|
-- type Item (Count : detail_Count := 1) is
|
||||||
|
-- record
|
||||||
|
-- Details : Detail_array (1 .. Count);
|
||||||
|
-- Animation : Animation_view;
|
||||||
|
-- end record;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
-----------
|
-----------
|
||||||
--- Streams
|
--- Streams
|
||||||
--
|
--
|
||||||
@@ -129,6 +183,7 @@ private
|
|||||||
|
|
||||||
|
|
||||||
no_Details : constant Details := (others => <>);
|
no_Details : constant Details := (others => <>);
|
||||||
|
-- null_Set : constant Item := (Count => 0,
|
||||||
|
-- others => <>);
|
||||||
|
|
||||||
end openGL.texture_Set;
|
end openGL.texture_Set;
|
||||||
|
|||||||
Reference in New Issue
Block a user