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

Work on texturing and animation.

Browse Source
This commit is contained in:
Rod Kay
2025-04-09 00:19:38 +10:00
parent 1612ddf208
commit 0e3e3c1d3d
7 changed files with 141 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
3-mid/opengl/source/lean/model/opengl-model-circle-lit_textured.adb
View File

@@ -39,7 +39,7 @@ is
Now : in texture_Set.fade_Level) Now : in texture_Set.fade_Level)
is is
begin begin
Self.Face.Fades (which) := Now; Self.Face.texture_Details.Fades (which) := Now;
end Fade_is; end Fade_is;
@@ -48,7 +48,7 @@ is
function Fade (Self : in Item; Which : in texture_Set.texture_Id) return texture_Set.fade_Level function Fade (Self : in Item; Which : in texture_Set.texture_Id) return texture_Set.fade_Level
is is
begin begin
return Self.Face.Fades (which); return Self.Face.texture_Details.Fades (which);
end Fade; end Fade;
@@ -57,7 +57,7 @@ is
Now : in openGL.asset_Name) Now : in openGL.asset_Name)
is is
begin begin
Self.Face.Textures (Positive (which)) := Now; Self.Face.texture_Details.Textures (Positive (which)) := Now;
end Texture_is; end Texture_is;
@@ -67,7 +67,7 @@ is
function texture_Count (Self : in Item) return Natural function texture_Count (Self : in Item) return Natural
is is
begin begin
return Self.Face.texture_Count; return Self.Face.texture_Details.texture_Count;
end texture_Count; end texture_Count;
@@ -76,7 +76,7 @@ is
function texture_Applied (Self : in Item; Which : in texture_Set.texture_Id) return Boolean function texture_Applied (Self : in Item; Which : in texture_Set.texture_Id) return Boolean
is is
begin begin
return Self.Face.texture_Applies (Which); return Self.Face.texture_Details.texture_Applies (Which);
end texture_Applied; end texture_Applied;
@@ -86,7 +86,7 @@ is
Now : in Boolean) Now : in Boolean)
is is
begin begin
Self.Face.texture_Applies (Which) := Now; Self.Face.texture_Details.texture_Applies (Which) := Now;
end texture_Applied_is; end texture_Applied_is;
@@ -96,13 +96,13 @@ is
is is
use type texture_Set.Animation_view; use type texture_Set.Animation_view;
begin begin
if Self.Face.Animation = null if Self.Face.texture_Details.Animation = null
then then
return; return;
end if; end if;
texture_Set.animate (Self.Face.Animation.all, texture_Set.animate (Self.Face.texture_Details.Animation.all,
Self.Face.texture_Applies); Self.Face.texture_Details.texture_Applies);
end animate; end animate;
@@ -142,7 +142,7 @@ is
Self.Sides); 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 is
use Primitive, use Primitive,
texture_Set; texture_Set;
@@ -158,15 +158,15 @@ is
the_Geometry.Vertices_are (Vertices); the_Geometry.Vertices_are (Vertices);
the_Geometry.add (Primitive.view (the_Primitive)); 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 loop
Id := texture_Id (i); Id := texture_Id (i);
the_Geometry.Fade_is (which => Id, the_Geometry.Fade_is (which => Id,
now => Self.Face.Fades (Id)); now => Self.Face.texture_Details.Fades (Id));
the_Geometry.Texture_is (which => 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); the_Geometry.is_Transparent (now => the_Geometry.Texture.is_Transparent);
end loop; end loop;
@@ -174,13 +174,13 @@ is
the_Geometry.Model_is (Self.all'unchecked_Access); the_Geometry.Model_is (Self.all'unchecked_Access);
return the_Geometry; return the_Geometry;
end new_Face; end new_Geometry;
upper_Face : Geometry.lit_textured.view; face_Geometry : Geometry.lit_textured.view;
begin begin
-- Upper Face -- Geometry.
-- --
declare declare
use Texture.Coordinates; use Texture.Coordinates;
@@ -194,7 +194,7 @@ is
Normal => Normal, Normal => Normal,
Coords => (0.50, 0.50), Coords => (0.50, 0.50),
Shine => default_Shine); Shine => default_Shine);
-- Circumference -- Circumference.
-- --
for i in 2 .. the_Vertices'Last for i in 2 .. the_Vertices'Last
loop loop
@@ -204,10 +204,10 @@ is
Shine => default_Shine); Shine => default_Shine);
end loop; end loop;
upper_Face := new_Face (Vertices => the_Vertices); face_Geometry := new_Geometry (Vertices => the_Vertices);
end; end;
return [1 => upper_Face.all'Access]; return [1 => face_Geometry.all'Access];
end to_GL_Geometries; end to_GL_Geometries;

11
3-mid/opengl/source/lean/model/opengl-model-circle-lit_textured.ads
View File

@@ -14,11 +14,12 @@ is
type Face is type Face is
record record
Fades : texture_Set.fade_Levels (texture_Set.texture_Id) := [others => 0.0]; texture_Details : texture_Set.Details;
Textures : openGL.asset_Names (1 .. Positive (texture_Set.texture_Id'Last)) := [others => null_Asset]; -- The textures to be applied to the hex. -- Fades : texture_Set.fade_Levels (texture_Set.texture_Id) := [others => 0.0];
texture_Count : Natural := 0; -- Textures : openGL.asset_Names (1 .. Positive (texture_Set.texture_Id'Last)) := [others => null_Asset]; -- The textures to be applied to the hex.
texture_Applies : texture_Set.texture_Apply_array := [others => True]; -- texture_Count : Natural := 0;
Animation : texture_Set.Animation_view; -- texture_Applies : texture_Set.texture_Apply_array := [others => True];
-- Animation : texture_Set.Animation_view;
end record; end record;

49
3-mid/opengl/source/lean/model/opengl-model-polygon-lit_textured.adb
View File

@@ -1,9 +1,7 @@
with with
openGL.Geometry.lit_textured, openGL.Geometry.lit_textured,
openGL.Primitive.indexed, openGL.Primitive.indexed,
openGL.Texture.Coordinates, openGL.Texture.Coordinates;
ada.Calendar;
package body openGL.Model.polygon.lit_textured package body openGL.Model.polygon.lit_textured
@@ -42,7 +40,7 @@ is
Now : in texture_Set.fade_Level) Now : in texture_Set.fade_Level)
is is
begin begin
Self.Face.Fades (which) := Now; Self.Face.texture_Details.Fades (which) := Now;
end Fade_is; end Fade_is;
@@ -51,7 +49,7 @@ is
function Fade (Self : in Item; Which : in texture_Set.texture_Id) return texture_Set.fade_Level function Fade (Self : in Item; Which : in texture_Set.texture_Id) return texture_Set.fade_Level
is is
begin begin
return Self.Face.Fades (which); return Self.Face.texture_Details.Fades (which);
end Fade; end Fade;
@@ -60,7 +58,7 @@ is
Now : in openGL.asset_Name) Now : in openGL.asset_Name)
is is
begin begin
Self.Face.Textures (Positive (which)) := Now; Self.Face.texture_Details.Textures (Positive (which)) := Now;
end Texture_is; end Texture_is;
@@ -70,7 +68,7 @@ is
function texture_Count (Self : in Item) return Natural function texture_Count (Self : in Item) return Natural
is is
begin begin
return Self.Face.texture_Count; return Self.Face.texture_Details.texture_Count;
end texture_Count; end texture_Count;
@@ -79,7 +77,7 @@ is
function texture_Applied (Self : in Item; Which : in texture_Set.texture_Id) return Boolean function texture_Applied (Self : in Item; Which : in texture_Set.texture_Id) return Boolean
is is
begin begin
return Self.Face.texture_Applies (Which); return Self.Face.texture_Details.texture_Applies (Which);
end texture_Applied; end texture_Applied;
@@ -89,7 +87,7 @@ is
Now : in Boolean) Now : in Boolean)
is is
begin begin
Self.Face.texture_Applies (Which) := Now; Self.Face.texture_Details.texture_Applies (Which) := Now;
end texture_Applied_is; end texture_Applied_is;
@@ -100,13 +98,13 @@ is
is is
use type texture_Set.Animation_view; use type texture_Set.Animation_view;
begin begin
if Self.Face.Animation = null if Self.Face.texture_Details.Animation = null
then then
return; return;
end if; end if;
texture_Set.animate (Self.Face.Animation.all, texture_Set.animate (Self.Face.texture_Details.Animation.all,
Self.Face.texture_Applies); Self.Face.texture_Details.texture_Applies);
end animate; end animate;
@@ -128,7 +126,7 @@ is
the_Sites : Vector_2_array renames Self.vertex_Sites (1 .. Self.vertex_Count); 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 is
use Primitive, use Primitive,
texture_Set; texture_Set;
@@ -154,19 +152,20 @@ is
:= Primitive.indexed.new_Primitive (triangle_Fan, the_Indices); := Primitive.indexed.new_Primitive (triangle_Fan, the_Indices);
Id : texture_Set.texture_Id; Id : texture_Set.texture_Id;
begin begin
the_Geometry.Vertices_are (Vertices); the_Geometry.Vertices_are (Vertices);
the_Geometry.add (Primitive.view (the_Primitive)); 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 loop
Id := texture_Id (i); Id := texture_Id (i);
the_Geometry.Fade_is (which => Id, the_Geometry.Fade_is (which => Id,
now => Self.Face.Fades (Id)); now => Self.Face.texture_Details.Fades (Id));
the_Geometry.Texture_is (which => 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); the_Geometry.is_Transparent (now => the_Geometry.Texture.is_Transparent);
end loop; end loop;
@@ -174,13 +173,13 @@ is
the_Geometry.Model_is (Self.all'unchecked_Access); the_Geometry.Model_is (Self.all'unchecked_Access);
return the_Geometry; return the_Geometry;
end new_Face; end new_Geometry;
the_Face : Geometry.lit_textured.view; face_Geometry : Geometry.lit_textured.view;
begin begin
-- Face -- Geometry
-- --
declare declare
use openGL.Texture.Coordinates; use openGL.Texture.Coordinates;
@@ -192,21 +191,21 @@ is
loop loop
the_Vertices (Index_t (i)) := (Site => Vector_3 (the_Sites (i) & 0.0), the_Vertices (Index_t (i)) := (Site => Vector_3 (the_Sites (i) & 0.0),
Normal => Normal, Normal => Normal,
Coords => (Coords_and_Centroid.Coords (Index_t (i)).S * 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_Tiling), Coords_and_Centroid.Coords (Index_t (i)).T * Self.Face.texture_Details.texture_Tiling),
Shine => default_Shine); Shine => default_Shine);
end loop; end loop;
the_Vertices (the_Vertices'Last) := (Site => Vector_3 (Coords_and_Centroid.Centroid & 0.0), the_Vertices (the_Vertices'Last) := (Site => Vector_3 (Coords_and_Centroid.Centroid & 0.0),
Normal => Normal, Normal => Normal,
Coords => (S => 0.5 * Self.Face.texture_Tiling, Coords => (S => 0.5 * Self.Face.texture_Details.texture_Tiling,
T => 0.5 * Self.Face.texture_Tiling), T => 0.5 * Self.Face.texture_Details.texture_Tiling),
Shine => default_Shine); Shine => default_Shine);
the_Face := new_Face (Vertices => the_Vertices); face_Geometry := new_Geometry (Vertices => the_Vertices);
end; end;
return [1 => the_Face.all'Access]; return [1 => face_Geometry.all'Access];
end to_GL_Geometries; end to_GL_Geometries;

25
3-mid/opengl/source/lean/model/opengl-model-polygon-lit_textured.ads
View File

@@ -19,15 +19,28 @@ is
type Face is type Face is
record record
Fades : texture_Set.fade_Levels (texture_Set.texture_Id) := [others => 0.0]; texture_Details : texture_Set.Details;
Textures : openGL.asset_Names (1 .. Positive (texture_Set.texture_Id'Last)) := [others => null_Asset]; -- The textures to be applied to the hex. -- Fades : texture_Set.fade_Levels (texture_Set.texture_Id) := [others => 0.0];
texture_Count : Natural := 0; -- Textures : openGL.asset_Names (1 .. Positive (texture_Set.texture_Id'Last)) := [others => null_Asset]; -- The textures to be applied to the hex.
texture_Tiling : openGL.Real := 1.0; -- The number of times the texture should be wrapped. -- texture_Count : Natural := 0;
texture_Applies : texture_Set.texture_Apply_array := [others => True]; -- texture_Tiling : openGL.Real := 1.0; -- The number of times the texture should be wrapped.
Animation : texture_Set.Animation_view; -- texture_Applies : texture_Set.texture_Apply_array := [others => True];
-- Animation : texture_Set.Animation_view;
end record; 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 --- Forge
-- --

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

@@ -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 --- Item
-- --

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

@@ -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 --- Item
-- --

11
4-high/gel/source/forge/gel-forge.adb
View File

@@ -163,11 +163,12 @@ is
else else
the_graphics_Model := openGL.Model.circle.lit_textured.new_Circle (Radius, the_graphics_Model := openGL.Model.circle.lit_textured.new_Circle (Radius,
Face => (Fades => [1 => 0.0, others => <>], Face => (texture_Details => (Fades => [1 => 0.0, others => <>],
texture_Applies => [1 => True, others => <>], texture_Applies => [1 => True, others => <>],
Textures => [1 => Texture, others => <>], Textures => [1 => Texture, others => <>],
texture_Count => 1, texture_Count => 1,
Animation => null)).all'Access; texture_Tiling => 1.0,
Animation => null))).all'Access;
end if; end if;
return gel.Sprite.Forge.new_Sprite (Name, 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), the_graphics_Model := openGL.Model.polygon.lit_colored.new_Polygon (openGL.Vector_2_array (Vertices),
(Color, openGL.Opaque)).all'Access; (Color, openGL.Opaque)).all'Access;
else else
the_graphics_Model := openGL.Model.polygon.lit_textured.new_Polygon (openGL.Vector_2_array (Vertices), the_graphics_Model := openGL.Model.polygon.lit_textured.new_Polygon (vertex_Sites => openGL.Vector_2_array (Vertices),
Face => (Fades => [1 => 0.0, others => <>], Face => (texture_Details => ((Fades => [1 => 0.0, others => <>],
Textures => [1 => Texture, others => <>], Textures => [1 => Texture, others => <>],
texture_Count => 1, texture_Count => 1,
texture_Tiling => texture_Tiling, texture_Tiling => texture_Tiling,
texture_Applies => [others => True], texture_Applies => [others => True],
Animation => null)).all'Access; Animation => null)))).all'Access;
end if; end if;
return gel.Sprite.Forge.new_Sprite (Name, return gel.Sprite.Forge.new_Sprite (Name,