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

Cosmetics.

Browse Source
This commit is contained in:
Rod Kay
2025-04-11 21:43:02 +10:00
parent 0e3e3c1d3d
commit 9693041373
10 changed files with 20 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
3-mid/opengl/source/lean/geometry/opengl-geometry-textured.adb
View File

@@ -24,6 +24,7 @@ is
Interfaces, Interfaces,
System; System;
----------- -----------
-- Globals -- Globals
-- --

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

@@ -15,11 +15,6 @@ is
type Face is type Face is
record record
texture_Details : texture_Set.Details; 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; end record;

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

@@ -20,27 +20,9 @@ is
type Face is type Face is
record record
texture_Details : texture_Set.Details; 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; 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
-- --

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

@@ -62,17 +62,6 @@ is
----------- -----------
--- Details --- 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; function to_Details (texture_Assets : in asset_Names;
Animation : in Animation_view := null) return Details Animation : in Animation_view := null) return Details

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

@@ -45,8 +45,6 @@ is
Fade : fade_Level := 0.0; Fade : fade_Level := 0.0;
Object : openGL.Texture.Object := openGL.Texture.null_Object; Object : openGL.Texture.Object := openGL.Texture.null_Object;
Applied : Boolean := True; -- Whether this texture is painted on or not. Applied : Boolean := True; -- Whether this texture is painted on or not.
-- texture_Uniform : openGL.Variable.uniform.sampler2D;
-- fade_Uniform : openGL.Variable.uniform.float;
end record; end record;
type fadeable_Textures is array (texture_Id range 1 .. max_Textures) of fadeable_Texture; type fadeable_Textures is array (texture_Id range 1 .. max_Textures) of fadeable_Texture;

2
3-mid/opengl/source/opengl.ads
View File

@@ -362,7 +362,7 @@ is
private private
-- NB: Packing these arrays forces compiler to use the correct size for the element type, rather than the most efficient size. -- NB: Packing these arrays forces compiler to use the correct size for the element type, rather than the most efficient size. -- TODO: Use 'Size' aspect clauses, instead of 'Pack'.
-- --
pragma Pack (short_Indices); pragma Pack (short_Indices);
pragma Pack ( Indices); pragma Pack ( Indices);

2
3-mid/physics/interface/source/physics-model.ads
View File

@@ -69,7 +69,6 @@ is
Mass : Real; Mass : Real;
Friction : Real; Friction : Real;
Restitution : Real; -- Bounce Restitution : Real; -- Bounce
-- Site : Vector_3;
is_Tangible : Boolean := True; is_Tangible : Boolean := True;
end record; end record;
@@ -89,7 +88,6 @@ is
Mass : in Real := 0.0; Mass : in Real := 0.0;
Friction : in Real := 0.1; Friction : in Real := 0.1;
Restitution : in Real := 0.1; Restitution : in Real := 0.1;
-- Site : in Vector_3 := Origin_3d;
is_Tangible : in Boolean := True) return View; is_Tangible : in Boolean := True) return View;
end Forge; end Forge;

3
3-mid/physics/interface/source/physics-shape.ads
View File

@@ -6,7 +6,8 @@ is
type Item is limited interface; type Item is limited interface;
type View is access all Item'Class; type View is access all Item'Class;
procedure define (Self : in out Item) is abstract;
procedure define (Self : in out Item) is abstract;
procedure free (Self : in out View); procedure free (Self : in out View);

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

@@ -200,14 +200,8 @@ is
use type Geometry_2d.Sites, use type Geometry_2d.Sites,
openGL.asset_Name; openGL.asset_Name;
-- the_graphics_Model : constant openGL.Model.polygon.lit_colored.view the_graphics_Model : openGL.Model.view;
-- := openGL.Model.polygon.lit_colored.new_Polygon (openGL.Vector_2_array (Vertices),
-- (Color, openGL.Opaque));
the_graphics_Model : openGL.Model.view;
Padding : constant Geometry_2d.Sites (1 .. 8 - Vertices'Length) := (others => <>); Padding : constant Geometry_2d.Sites (1 .. 8 - Vertices'Length) := (others => <>);
the_physics_Model : constant physics.Model.view the_physics_Model : constant physics.Model.view
:= physics.Model.Forge.new_physics_Model (shape_Info => (physics.Model.Polygon, := physics.Model.Forge.new_physics_Model (shape_Info => (physics.Model.Polygon,
vertex_Count => Vertices'Length, vertex_Count => Vertices'Length,
@@ -393,7 +387,6 @@ is
the_box_physics_Model : constant physics.Model.view the_box_physics_Model : constant physics.Model.view
:= physics.Model.Forge.new_physics_Model (shape_Info => (Kind => physics.Model.Cube, := physics.Model.Forge.new_physics_Model (shape_Info => (Kind => physics.Model.Cube,
half_Extents => Size / 2.0), half_Extents => Size / 2.0),
-- half_Extents => the_box_Model.Scale / 2.0),
Mass => Mass); Mass => Mass);
the_Box : constant gel.Sprite.view the_Box : constant gel.Sprite.view
:= gel.Sprite.Forge.new_Sprite ("demo.Box", := gel.Sprite.Forge.new_Sprite ("demo.Box",
@@ -432,7 +425,6 @@ is
the_box_physics_Model : constant physics.Model.view the_box_physics_Model : constant physics.Model.view
:= physics.Model.Forge.new_physics_Model (shape_Info => (Kind => physics.Model.Cube, := physics.Model.Forge.new_physics_Model (shape_Info => (Kind => physics.Model.Cube,
half_Extents => Size / 2.0), half_Extents => Size / 2.0),
-- half_Extents => the_box_Model.Scale / 2.0),
Mass => Mass); Mass => Mass);
the_Box : constant gel.Sprite.view the_Box : constant gel.Sprite.view
:= gel.Sprite.forge.new_Sprite ("demo.Box", := gel.Sprite.forge.new_Sprite ("demo.Box",
@@ -468,7 +460,6 @@ is
the_billboard_physics_Model : constant physics.Model.view the_billboard_physics_Model : constant physics.Model.view
:= physics.Model.Forge.new_physics_Model (shape_Info => (Kind => physics.Model.Cube, := physics.Model.Forge.new_physics_Model (shape_Info => (Kind => physics.Model.Cube,
half_Extents => Size / 2.0), half_Extents => Size / 2.0),
-- half_Extents => the_billboard_Model.Scale / 2.0),
Mass => Mass); Mass => Mass);
the_Billboard : constant gel.Sprite.view the_Billboard : constant gel.Sprite.view
@@ -506,7 +497,6 @@ is
the_billboard_physics_Model : constant physics.Model.view the_billboard_physics_Model : constant physics.Model.view
:= physics.Model.Forge.new_physics_Model (shape_Info => (Kind => physics.Model.Cube, := physics.Model.Forge.new_physics_Model (shape_Info => (Kind => physics.Model.Cube,
half_Extents => Size / 2.0), half_Extents => Size / 2.0),
-- half_Extents => the_billboard_Model.Scale / 2.0),
Mass => Mass); Mass => Mass);
the_Billboard : constant gel.Sprite.view the_Billboard : constant gel.Sprite.view
:= gel.Sprite.forge.new_Sprite ("Billboard", := gel.Sprite.forge.new_Sprite ("Billboard",
@@ -525,12 +515,12 @@ is
function new_arrow_Sprite (in_World : in gel.World.view; function new_arrow_Sprite (in_World : in gel.World.view;
Site : in math.Vector_3 := math.Origin_3D; Site : in math.Vector_3 := math.Origin_3D;
Mass : in math.Real := 0.0; Mass : in math.Real := 0.0;
Size : in math.Vector_3 := [1.0, 1.0, 1.0]; Size : in math.Vector_3 := [1.0, 1.0, 1.0];
Texture : in openGL.asset_Name := openGL.null_Asset; Texture : in openGL.asset_Name := openGL.null_Asset;
Color : in openGL.lucid_Color := (openGL.Palette.Black, openGL.Opaque); Color : in openGL.lucid_Color := (openGL.Palette.Black, openGL.Opaque);
line_Width : in openGL.Real := openGL.Primitive.unused_line_Width; line_Width : in openGL.Real := openGL.Primitive.unused_line_Width;
user_Data : in any_user_Data_view := null) return gel.Sprite.view user_Data : in any_user_Data_view := null) return gel.Sprite.view
is is
pragma Unreferenced (Texture); pragma Unreferenced (Texture);
@@ -543,7 +533,6 @@ is
the_physics_Model : constant physics.Model.view the_physics_Model : constant physics.Model.view
:= physics.Model.Forge.new_physics_Model (shape_Info => (Kind => physics.Model.Cube, := physics.Model.Forge.new_physics_Model (shape_Info => (Kind => physics.Model.Cube,
half_Extents => Size / 2.0), half_Extents => Size / 2.0),
-- half_Extents => the_graphics_Model.Scale / 2.0),
Mass => Mass); Mass => Mass);
the_Arrow : constant gel.Sprite.view the_Arrow : constant gel.Sprite.view
:= gel.Sprite.forge.new_Sprite ("Arrow", := gel.Sprite.forge.new_Sprite ("Arrow",
@@ -562,12 +551,12 @@ is
function new_line_Sprite (in_World : in gel.World.view; function new_line_Sprite (in_World : in gel.World.view;
Site : in math.Vector_3 := math.Origin_3D; Site : in math.Vector_3 := math.Origin_3D;
Mass : in math.Real := 0.0; Mass : in math.Real := 0.0;
Size : in math.Vector_3 := [1.0, 1.0, 1.0]; Size : in math.Vector_3 := [1.0, 1.0, 1.0];
Texture : in openGL.asset_Name := openGL.null_Asset; Texture : in openGL.asset_Name := openGL.null_Asset;
Color : in openGL.lucid_Color := (openGL.Palette.Black, openGL.Opaque); Color : in openGL.lucid_Color := (openGL.Palette.Black, openGL.Opaque);
line_Width : in openGL.Real := openGL.Primitive.unused_line_Width; line_Width : in openGL.Real := openGL.Primitive.unused_line_Width;
user_Data : in any_user_Data_view := null) return gel.Sprite.view user_Data : in any_user_Data_view := null) return gel.Sprite.view
is is
pragma Unreferenced (Texture, line_Width); pragma Unreferenced (Texture, line_Width);
@@ -579,7 +568,6 @@ is
the_physics_Model : constant physics.Model.view the_physics_Model : constant physics.Model.view
:= physics.Model.Forge.new_physics_Model (shape_Info => (Kind => physics.Model.Cube, := physics.Model.Forge.new_physics_Model (shape_Info => (Kind => physics.Model.Cube,
half_Extents => Size / 2.0), half_Extents => Size / 2.0),
-- half_Extents => the_graphics_Model.Scale / 2.0),
Mass => Mass); Mass => Mass);
the_Line : constant gel.Sprite.view the_Line : constant gel.Sprite.view
:= gel.Sprite.forge.new_Sprite ("Line", := gel.Sprite.forge.new_Sprite ("Line",
@@ -672,7 +660,6 @@ is
else else
the_physics_Model := physics.Model.Forge.new_physics_Model (shape_Info => (Kind => physics.Model.Cube, the_physics_Model := physics.Model.Forge.new_physics_Model (shape_Info => (Kind => physics.Model.Cube,
half_Extents => Size / 2.0)); half_Extents => Size / 2.0));
-- half_Extents => the_graphics_Model.Scale));
end if; end if;
return gel.Sprite.Forge.new_Sprite ("text_Sprite", return gel.Sprite.Forge.new_Sprite ("text_Sprite",

3
4-high/gel/source/world/gel-world-server.adb
View File

@@ -90,6 +90,9 @@ is
-- TODO: Rid this ...
function to_Sprite (the_Pair : in remote.World.sprite_model_Pair; function to_Sprite (the_Pair : in remote.World.sprite_model_Pair;
the_graphics_Models : in Id_Maps_of_graphics_Model.Map; the_graphics_Models : in Id_Maps_of_graphics_Model.Map;
the_physics_Models : in Id_Maps_of_physics_Model .Map; the_physics_Models : in Id_Maps_of_physics_Model .Map;