diff --git a/3-mid/opengl/source/lean/model/opengl-model-billboard-textured.ads b/3-mid/opengl/source/lean/model/opengl-model-billboard-textured.ads index 50dc4e3..82793cf 100644 --- a/3-mid/opengl/source/lean/model/opengl-model-billboard-textured.ads +++ b/3-mid/opengl/source/lean/model/opengl-model-billboard-textured.ads @@ -24,11 +24,11 @@ is package Forge is - function new_Billboard (Size : in Size_t := default_Size; - Plane : in billboard.Plane; - Texture : in asset_Name; + function new_Billboard (Size : in Size_t := default_Size; + Plane : in billboard.Plane; + Texture : in asset_Name; texture_Details : in texture_Set.Details; - Lucid : in Boolean := False) return View; + Lucid : in Boolean := False) return View; end Forge; diff --git a/3-mid/opengl/source/lean/opengl-texture_set.adb b/3-mid/opengl/source/lean/opengl-texture_set.adb index 926d7db..911b71e 100644 --- a/3-mid/opengl/source/lean/opengl-texture_set.adb +++ b/3-mid/opengl/source/lean/opengl-texture_set.adb @@ -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 -- diff --git a/3-mid/opengl/source/lean/opengl-texture_set.ads b/3-mid/opengl/source/lean/opengl-texture_set.ads index 3b8b6a4..a3fbbb0 100644 --- a/3-mid/opengl/source/lean/opengl-texture_set.ads +++ b/3-mid/opengl/source/lean/opengl-texture_set.ads @@ -25,6 +25,10 @@ is type texture_Ids is array (Positive range <>) of texture_Id; + ---------- + --- Tiling + -- + type Tiling is -- The number of times the texture should be wrapped. record S : Real; @@ -44,21 +48,13 @@ is 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 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 -- @@ -92,18 +88,16 @@ is texture_Applies : in out texture_Apply_array); - - ----------- --- Details -- type Details is record + texture_Count : Natural := 0; 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. @@ -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 -----------