nichkara/lace
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

opengl.texture_set: Cosmetics.

Browse Source
This commit is contained in:
Rod Kay
2025-09-25 15:28:47 +10:00
parent 5a003202bf
commit 914c096e9f
3 changed files with 13 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
3-mid/opengl/source/lean/opengl-texture_set.adb
View File

@@ -71,36 +71,6 @@ is
--------
--- Item
--
procedure Texture_is (in_Set : in out Item; Which : texture_ID := 1; Now : in openGL.Texture.Object)
is
begin
in_Set.Textures (Which).Object := Now;
in_Set.is_Transparent := in_Set.is_Transparent
or Now .is_Transparent;
if Natural (Which) > in_Set.Count
then
in_Set.Count := Natural (Which);
end if;
end Texture_is;
function Texture (in_Set : in Item; Which : texture_ID := 1) return openGL.Texture.Object
is
begin
return in_Set.Textures (Which).Object;
end Texture;
----------- -----------
--- Streams --- Streams
-- --

42
3-mid/opengl/source/lean/opengl-texture_set.ads
View File

@@ -25,6 +25,10 @@ is
type texture_Ids is array (Positive range <>) of texture_Id; type texture_Ids is array (Positive range <>) of texture_Id;
----------
--- Tiling
--
type Tiling is -- The number of times the texture should be wrapped. type Tiling is -- The number of times the texture should be wrapped.
record record
S : Real; S : Real;
@@ -44,21 +48,13 @@ is
type fade_Levels is array (texture_Id range <>) of fade_Level; type fade_Levels is array (texture_Id range <>) of fade_Level;
---------
--- Apply
--
type texture_Apply_array is array (texture_Set.texture_Id) of Boolean; type texture_Apply_array is array (texture_Set.texture_Id) of Boolean;
type fadeable_Texture is
record
-- 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);
end record;
type fadeable_Textures is array (texture_Id range 1 .. max_Textures) of fadeable_Texture;
------------- -------------
--- Animation --- Animation
-- --
@@ -92,18 +88,16 @@ is
texture_Applies : in out texture_Apply_array); texture_Applies : in out texture_Apply_array);
----------- -----------
--- Details --- Details
-- --
type Details is type Details is
record record
texture_Count : Natural := 0;
Fades : fade_Levels (texture_Id) := [others => 0.0]; Fades : fade_Levels (texture_Id) := [others => 0.0];
Textures : asset_Names (1 .. Positive (texture_Id'Last)) := [others => null_Asset]; Textures : asset_Names (1 .. Positive (texture_Id'Last)) := [others => null_Asset];
Objects : texture.Objects (1 .. Positive (texture_Id'Last)) := [others => texture.null_Object]; Objects : texture.Objects (1 .. Positive (texture_Id'Last)) := [others => texture.null_Object];
texture_Count : Natural := 0;
texture_Tilings : Tilings := [others => (S => 1.0, texture_Tilings : Tilings := [others => (S => 1.0,
T => 1.0)]; T => 1.0)];
texture_Applies : texture_Apply_array := [1 => True, others => False]; -- The textures to be applied to the visual. texture_Applies : texture_Apply_array := [1 => True, others => False]; -- The textures to be applied to the visual.
@@ -118,24 +112,6 @@ is
--------
--- Item
--
type Item is
record
Textures : fadeable_Textures;
Count : Natural := 0;
is_Transparent : Boolean := False; -- Any of the textures contains lucid colors.
-- 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;
private private
----------- -----------