diff --git a/3-mid/opengl/source/lean/model/opengl-model-circle-lit_textured.adb b/3-mid/opengl/source/lean/model/opengl-model-circle-lit_textured.adb index 082eebb..7c92af2 100644 --- a/3-mid/opengl/source/lean/model/opengl-model-circle-lit_textured.adb +++ b/3-mid/opengl/source/lean/model/opengl-model-circle-lit_textured.adb @@ -39,7 +39,7 @@ is Now : in texture_Set.fade_Level) is begin - Self.Face.Fades (which) := Now; + Self.Face.texture_Details.Fades (which) := Now; end Fade_is; @@ -48,7 +48,7 @@ is function Fade (Self : in Item; Which : in texture_Set.texture_Id) return texture_Set.fade_Level is begin - return Self.Face.Fades (which); + return Self.Face.texture_Details.Fades (which); end Fade; @@ -57,7 +57,7 @@ is Now : in openGL.asset_Name) is begin - Self.Face.Textures (Positive (which)) := Now; + Self.Face.texture_Details.Textures (Positive (which)) := Now; end Texture_is; @@ -67,7 +67,7 @@ is function texture_Count (Self : in Item) return Natural is begin - return Self.Face.texture_Count; + return Self.Face.texture_Details.texture_Count; end texture_Count; @@ -76,7 +76,7 @@ is function texture_Applied (Self : in Item; Which : in texture_Set.texture_Id) return Boolean is begin - return Self.Face.texture_Applies (Which); + return Self.Face.texture_Details.texture_Applies (Which); end texture_Applied; @@ -86,7 +86,7 @@ is Now : in Boolean) is begin - Self.Face.texture_Applies (Which) := Now; + Self.Face.texture_Details.texture_Applies (Which) := Now; end texture_Applied_is; @@ -96,13 +96,13 @@ is is use type texture_Set.Animation_view; begin - if Self.Face.Animation = null + if Self.Face.texture_Details.Animation = null then return; end if; - texture_Set.animate (Self.Face.Animation.all, - Self.Face.texture_Applies); + texture_Set.animate (Self.Face.texture_Details.Animation.all, + Self.Face.texture_Details.texture_Applies); end animate; @@ -142,7 +142,7 @@ is Self.Sides); - function new_Face (Vertices : in geometry.lit_textured.Vertex_array) return Geometry.lit_textured.view + function new_Geometry (Vertices : in geometry.lit_textured.Vertex_array) return Geometry.lit_textured.view is use Primitive, texture_Set; @@ -158,15 +158,15 @@ is the_Geometry.Vertices_are (Vertices); the_Geometry.add (Primitive.view (the_Primitive)); - for i in 1 .. Self.Face.texture_Count + for i in 1 .. Self.Face.texture_Details.texture_Count loop Id := texture_Id (i); the_Geometry.Fade_is (which => Id, - now => Self.Face.Fades (Id)); + now => Self.Face.texture_Details.Fades (Id)); the_Geometry.Texture_is (which => Id, - now => Textures.fetch (Self.Face.Textures (i))); + now => Textures.fetch (Self.Face.texture_Details.Textures (i))); the_Geometry.is_Transparent (now => the_Geometry.Texture.is_Transparent); end loop; @@ -174,13 +174,13 @@ is the_Geometry.Model_is (Self.all'unchecked_Access); return the_Geometry; - end new_Face; + end new_Geometry; - upper_Face : Geometry.lit_textured.view; + face_Geometry : Geometry.lit_textured.view; begin - -- Upper Face + -- Geometry. -- declare use Texture.Coordinates; @@ -194,7 +194,7 @@ is Normal => Normal, Coords => (0.50, 0.50), Shine => default_Shine); - -- Circumference + -- Circumference. -- for i in 2 .. the_Vertices'Last loop @@ -204,10 +204,10 @@ is Shine => default_Shine); end loop; - upper_Face := new_Face (Vertices => the_Vertices); + face_Geometry := new_Geometry (Vertices => the_Vertices); end; - return [1 => upper_Face.all'Access]; + return [1 => face_Geometry.all'Access]; end to_GL_Geometries; diff --git a/3-mid/opengl/source/lean/model/opengl-model-circle-lit_textured.ads b/3-mid/opengl/source/lean/model/opengl-model-circle-lit_textured.ads index fd40aac..2311ff3 100644 --- a/3-mid/opengl/source/lean/model/opengl-model-circle-lit_textured.ads +++ b/3-mid/opengl/source/lean/model/opengl-model-circle-lit_textured.ads @@ -14,11 +14,12 @@ is type Face is record - Fades : texture_Set.fade_Levels (texture_Set.texture_Id) := [others => 0.0]; - Textures : openGL.asset_Names (1 .. Positive (texture_Set.texture_Id'Last)) := [others => null_Asset]; -- The textures to be applied to the hex. - texture_Count : Natural := 0; - texture_Applies : texture_Set.texture_Apply_array := [others => True]; - Animation : texture_Set.Animation_view; + texture_Details : texture_Set.Details; + -- Fades : texture_Set.fade_Levels (texture_Set.texture_Id) := [others => 0.0]; + -- Textures : openGL.asset_Names (1 .. Positive (texture_Set.texture_Id'Last)) := [others => null_Asset]; -- The textures to be applied to the hex. + -- texture_Count : Natural := 0; + -- texture_Applies : texture_Set.texture_Apply_array := [others => True]; + -- Animation : texture_Set.Animation_view; end record; diff --git a/3-mid/opengl/source/lean/model/opengl-model-polygon-lit_textured.adb b/3-mid/opengl/source/lean/model/opengl-model-polygon-lit_textured.adb index b54406b..4c435c9 100644 --- a/3-mid/opengl/source/lean/model/opengl-model-polygon-lit_textured.adb +++ b/3-mid/opengl/source/lean/model/opengl-model-polygon-lit_textured.adb @@ -1,9 +1,7 @@ with openGL.Geometry.lit_textured, openGL.Primitive.indexed, - openGL.Texture.Coordinates, - - ada.Calendar; + openGL.Texture.Coordinates; package body openGL.Model.polygon.lit_textured @@ -42,7 +40,7 @@ is Now : in texture_Set.fade_Level) is begin - Self.Face.Fades (which) := Now; + Self.Face.texture_Details.Fades (which) := Now; end Fade_is; @@ -51,7 +49,7 @@ is function Fade (Self : in Item; Which : in texture_Set.texture_Id) return texture_Set.fade_Level is begin - return Self.Face.Fades (which); + return Self.Face.texture_Details.Fades (which); end Fade; @@ -60,7 +58,7 @@ is Now : in openGL.asset_Name) is begin - Self.Face.Textures (Positive (which)) := Now; + Self.Face.texture_Details.Textures (Positive (which)) := Now; end Texture_is; @@ -70,7 +68,7 @@ is function texture_Count (Self : in Item) return Natural is begin - return Self.Face.texture_Count; + return Self.Face.texture_Details.texture_Count; end texture_Count; @@ -79,7 +77,7 @@ is function texture_Applied (Self : in Item; Which : in texture_Set.texture_Id) return Boolean is begin - return Self.Face.texture_Applies (Which); + return Self.Face.texture_Details.texture_Applies (Which); end texture_Applied; @@ -89,7 +87,7 @@ is Now : in Boolean) is begin - Self.Face.texture_Applies (Which) := Now; + Self.Face.texture_Details.texture_Applies (Which) := Now; end texture_Applied_is; @@ -100,13 +98,13 @@ is is use type texture_Set.Animation_view; begin - if Self.Face.Animation = null + if Self.Face.texture_Details.Animation = null then return; end if; - texture_Set.animate (Self.Face.Animation.all, - Self.Face.texture_Applies); + texture_Set.animate (Self.Face.texture_Details.Animation.all, + Self.Face.texture_Details.texture_Applies); end animate; @@ -128,7 +126,7 @@ is the_Sites : Vector_2_array renames Self.vertex_Sites (1 .. Self.vertex_Count); - function new_Face (Vertices : in geometry.lit_textured.Vertex_array) return Geometry.lit_textured.view + function new_Geometry (Vertices : in geometry.lit_textured.Vertex_array) return Geometry.lit_textured.view is use Primitive, texture_Set; @@ -154,19 +152,20 @@ is := Primitive.indexed.new_Primitive (triangle_Fan, the_Indices); Id : texture_Set.texture_Id; + begin the_Geometry.Vertices_are (Vertices); the_Geometry.add (Primitive.view (the_Primitive)); - for i in 1 .. Self.Face.texture_Count + for i in 1 .. Self.Face.texture_Details.texture_Count loop Id := texture_Id (i); the_Geometry.Fade_is (which => Id, - now => Self.Face.Fades (Id)); + now => Self.Face.texture_Details.Fades (Id)); the_Geometry.Texture_is (which => Id, - now => Textures.fetch (Self.Face.Textures (i))); + now => Textures.fetch (Self.Face.texture_Details.Textures (i))); the_Geometry.is_Transparent (now => the_Geometry.Texture.is_Transparent); end loop; @@ -174,13 +173,13 @@ is the_Geometry.Model_is (Self.all'unchecked_Access); return the_Geometry; - end new_Face; + end new_Geometry; - the_Face : Geometry.lit_textured.view; + face_Geometry : Geometry.lit_textured.view; begin - -- Face + -- Geometry -- declare use openGL.Texture.Coordinates; @@ -192,21 +191,21 @@ is loop the_Vertices (Index_t (i)) := (Site => Vector_3 (the_Sites (i) & 0.0), Normal => Normal, - Coords => (Coords_and_Centroid.Coords (Index_t (i)).S * Self.Face.texture_Tiling, - Coords_and_Centroid.Coords (Index_t (i)).T * Self.Face.texture_Tiling), + Coords => (Coords_and_Centroid.Coords (Index_t (i)).S * Self.Face.texture_Details.texture_Tiling, + Coords_and_Centroid.Coords (Index_t (i)).T * Self.Face.texture_Details.texture_Tiling), Shine => default_Shine); end loop; the_Vertices (the_Vertices'Last) := (Site => Vector_3 (Coords_and_Centroid.Centroid & 0.0), Normal => Normal, - Coords => (S => 0.5 * Self.Face.texture_Tiling, - T => 0.5 * Self.Face.texture_Tiling), + Coords => (S => 0.5 * Self.Face.texture_Details.texture_Tiling, + T => 0.5 * Self.Face.texture_Details.texture_Tiling), Shine => default_Shine); - the_Face := new_Face (Vertices => the_Vertices); + face_Geometry := new_Geometry (Vertices => the_Vertices); end; - return [1 => the_Face.all'Access]; + return [1 => face_Geometry.all'Access]; end to_GL_Geometries; diff --git a/3-mid/opengl/source/lean/model/opengl-model-polygon-lit_textured.ads b/3-mid/opengl/source/lean/model/opengl-model-polygon-lit_textured.ads index 8aa775a..8018199 100644 --- a/3-mid/opengl/source/lean/model/opengl-model-polygon-lit_textured.ads +++ b/3-mid/opengl/source/lean/model/opengl-model-polygon-lit_textured.ads @@ -19,15 +19,28 @@ is type Face is record - Fades : texture_Set.fade_Levels (texture_Set.texture_Id) := [others => 0.0]; - Textures : openGL.asset_Names (1 .. Positive (texture_Set.texture_Id'Last)) := [others => null_Asset]; -- The textures to be applied to the hex. - texture_Count : Natural := 0; - texture_Tiling : openGL.Real := 1.0; -- The number of times the texture should be wrapped. - texture_Applies : texture_Set.texture_Apply_array := [others => True]; - Animation : texture_Set.Animation_view; + texture_Details : texture_Set.Details; + -- Fades : texture_Set.fade_Levels (texture_Set.texture_Id) := [others => 0.0]; + -- Textures : openGL.asset_Names (1 .. Positive (texture_Set.texture_Id'Last)) := [others => null_Asset]; -- The textures to be applied to the hex. + -- texture_Count : Natural := 0; + -- texture_Tiling : openGL.Real := 1.0; -- The number of times the texture should be wrapped. + -- texture_Applies : texture_Set.texture_Apply_array := [others => True]; + -- Animation : texture_Set.Animation_view; end record; + + -- type Face is + -- record + -- Fades : texture_Set.fade_Levels (texture_Set.texture_Id) := [others => 0.0]; + -- Textures : openGL.asset_Names (1 .. Positive (texture_Set.texture_Id'Last)) := [others => null_Asset]; -- The textures to be applied to the hex. + -- texture_Count : Natural := 0; + -- texture_Applies : texture_Set.texture_Apply_array := [others => True]; + -- Animation : texture_Set.Animation_view; + -- end record; + + + --------- --- Forge -- @@ -81,7 +94,7 @@ private vertex_Sites : Vector_2_array (1 .. 8); vertex_Count : Positive; - Face : lit_textured.Face; + Face : lit_textured.Face; end record; diff --git a/3-mid/opengl/source/lean/opengl-texture_set.adb b/3-mid/opengl/source/lean/opengl-texture_set.adb index d16d520..1118fe1 100644 --- a/3-mid/opengl/source/lean/opengl-texture_set.adb +++ b/3-mid/opengl/source/lean/opengl-texture_set.adb @@ -59,6 +59,42 @@ is + ----------- + --- Details + -- + -- + -- 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 hex. + -- texture_Count : Natural := 0; + -- texture_Tiling : Real := 1.0; -- The number of times the texture should be wrapped. + -- texture_Applies : texture_Apply_array := [others => True]; + -- Animation : Animation_view; + -- end record; + -- + + function to_Details (texture_Assets : in asset_Names; + Animation : in Animation_view := null) return Details + is + Result : Details; + begin + Result.texture_Count := texture_Assets'Length; + + for i in 1 .. texture_Assets'Length + loop + Result.Textures (i) := texture_Assets (i); + end loop; + + Result.Animation := Animation; + + return Result; + end to_Details; + + + + + -------- --- Item -- diff --git a/3-mid/opengl/source/lean/opengl-texture_set.ads b/3-mid/opengl/source/lean/opengl-texture_set.ads index 9a5c905..fab6a5d 100644 --- a/3-mid/opengl/source/lean/opengl-texture_set.ads +++ b/3-mid/opengl/source/lean/opengl-texture_set.ads @@ -87,6 +87,29 @@ is + + ----------- + --- Details + -- + + 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 hex. + texture_Count : Natural := 0; + texture_Tiling : Real := 1.0; -- The number of times the texture should be wrapped. + texture_Applies : texture_Apply_array := [1 => True, others => False]; + Animation : Animation_view; + end record; + + + function to_Details (texture_Assets : in asset_Names; + Animation : in Animation_view := null) return Details; + + + + + -------- --- Item -- diff --git a/4-high/gel/source/forge/gel-forge.adb b/4-high/gel/source/forge/gel-forge.adb index 14d9fc9..fbbf49a 100644 --- a/4-high/gel/source/forge/gel-forge.adb +++ b/4-high/gel/source/forge/gel-forge.adb @@ -163,11 +163,12 @@ is else the_graphics_Model := openGL.Model.circle.lit_textured.new_Circle (Radius, - Face => (Fades => [1 => 0.0, others => <>], - texture_Applies => [1 => True, others => <>], - Textures => [1 => Texture, others => <>], - texture_Count => 1, - Animation => null)).all'Access; + Face => (texture_Details => (Fades => [1 => 0.0, others => <>], + texture_Applies => [1 => True, others => <>], + Textures => [1 => Texture, others => <>], + texture_Count => 1, + texture_Tiling => 1.0, + Animation => null))).all'Access; end if; return gel.Sprite.Forge.new_Sprite (Name, @@ -221,13 +222,13 @@ is the_graphics_Model := openGL.Model.polygon.lit_colored.new_Polygon (openGL.Vector_2_array (Vertices), (Color, openGL.Opaque)).all'Access; else - the_graphics_Model := openGL.Model.polygon.lit_textured.new_Polygon (openGL.Vector_2_array (Vertices), - Face => (Fades => [1 => 0.0, others => <>], - Textures => [1 => Texture, others => <>], - texture_Count => 1, - texture_Tiling => texture_Tiling, - texture_Applies => [others => True], - Animation => null)).all'Access; + the_graphics_Model := openGL.Model.polygon.lit_textured.new_Polygon (vertex_Sites => openGL.Vector_2_array (Vertices), + Face => (texture_Details => ((Fades => [1 => 0.0, others => <>], + Textures => [1 => Texture, others => <>], + texture_Count => 1, + texture_Tiling => texture_Tiling, + texture_Applies => [others => True], + Animation => null)))).all'Access; end if; return gel.Sprite.Forge.new_Sprite (Name,