diff --git a/3-mid/opengl/source/lean/geometry/opengl-geometry-textured.adb b/3-mid/opengl/source/lean/geometry/opengl-geometry-textured.adb index 31f74a9..f6dd1a8 100644 --- a/3-mid/opengl/source/lean/geometry/opengl-geometry-textured.adb +++ b/3-mid/opengl/source/lean/geometry/opengl-geometry-textured.adb @@ -24,6 +24,7 @@ is Interfaces, System; + ----------- -- Globals -- 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 2311ff3..8639083 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 @@ -15,11 +15,6 @@ is type Face is record 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.ads b/3-mid/opengl/source/lean/model/opengl-model-polygon-lit_textured.ads index 8018199..b003425 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 @@ -20,27 +20,9 @@ is type Face is record 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 -- diff --git a/3-mid/opengl/source/lean/opengl-texture_set.adb b/3-mid/opengl/source/lean/opengl-texture_set.adb index 1118fe1..d9ca92d 100644 --- a/3-mid/opengl/source/lean/opengl-texture_set.adb +++ b/3-mid/opengl/source/lean/opengl-texture_set.adb @@ -62,17 +62,6 @@ 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 diff --git a/3-mid/opengl/source/lean/opengl-texture_set.ads b/3-mid/opengl/source/lean/opengl-texture_set.ads index fab6a5d..d0ff991 100644 --- a/3-mid/opengl/source/lean/opengl-texture_set.ads +++ b/3-mid/opengl/source/lean/opengl-texture_set.ads @@ -45,8 +45,6 @@ is Fade : fade_Level := 0.0; Object : openGL.Texture.Object := openGL.Texture.null_Object; 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; type fadeable_Textures is array (texture_Id range 1 .. max_Textures) of fadeable_Texture; diff --git a/3-mid/opengl/source/opengl.ads b/3-mid/opengl/source/opengl.ads index 8327ae3..2579a21 100644 --- a/3-mid/opengl/source/opengl.ads +++ b/3-mid/opengl/source/opengl.ads @@ -362,7 +362,7 @@ is 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 ( Indices); diff --git a/3-mid/physics/interface/source/physics-model.ads b/3-mid/physics/interface/source/physics-model.ads index 2b15be6..07f3ff1 100644 --- a/3-mid/physics/interface/source/physics-model.ads +++ b/3-mid/physics/interface/source/physics-model.ads @@ -69,7 +69,6 @@ is Mass : Real; Friction : Real; Restitution : Real; -- Bounce - -- Site : Vector_3; is_Tangible : Boolean := True; end record; @@ -89,7 +88,6 @@ is Mass : in Real := 0.0; Friction : in Real := 0.1; Restitution : in Real := 0.1; - -- Site : in Vector_3 := Origin_3d; is_Tangible : in Boolean := True) return View; end Forge; diff --git a/3-mid/physics/interface/source/physics-shape.ads b/3-mid/physics/interface/source/physics-shape.ads index 5d6c90b..320633d 100644 --- a/3-mid/physics/interface/source/physics-shape.ads +++ b/3-mid/physics/interface/source/physics-shape.ads @@ -6,7 +6,8 @@ is type Item is limited interface; 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); diff --git a/4-high/gel/source/forge/gel-forge.adb b/4-high/gel/source/forge/gel-forge.adb index fbbf49a..46cc99f 100644 --- a/4-high/gel/source/forge/gel-forge.adb +++ b/4-high/gel/source/forge/gel-forge.adb @@ -200,14 +200,8 @@ is use type Geometry_2d.Sites, openGL.asset_Name; - -- the_graphics_Model : constant openGL.Model.polygon.lit_colored.view - -- := openGL.Model.polygon.lit_colored.new_Polygon (openGL.Vector_2_array (Vertices), - -- (Color, openGL.Opaque)); - - the_graphics_Model : openGL.Model.view; - + the_graphics_Model : openGL.Model.view; Padding : constant Geometry_2d.Sites (1 .. 8 - Vertices'Length) := (others => <>); - the_physics_Model : constant physics.Model.view := physics.Model.Forge.new_physics_Model (shape_Info => (physics.Model.Polygon, vertex_Count => Vertices'Length, @@ -393,7 +387,6 @@ is the_box_physics_Model : constant physics.Model.view := physics.Model.Forge.new_physics_Model (shape_Info => (Kind => physics.Model.Cube, half_Extents => Size / 2.0), - -- half_Extents => the_box_Model.Scale / 2.0), Mass => Mass); the_Box : constant gel.Sprite.view := gel.Sprite.Forge.new_Sprite ("demo.Box", @@ -432,7 +425,6 @@ is the_box_physics_Model : constant physics.Model.view := physics.Model.Forge.new_physics_Model (shape_Info => (Kind => physics.Model.Cube, half_Extents => Size / 2.0), - -- half_Extents => the_box_Model.Scale / 2.0), Mass => Mass); the_Box : constant gel.Sprite.view := gel.Sprite.forge.new_Sprite ("demo.Box", @@ -468,7 +460,6 @@ is the_billboard_physics_Model : constant physics.Model.view := physics.Model.Forge.new_physics_Model (shape_Info => (Kind => physics.Model.Cube, half_Extents => Size / 2.0), - -- half_Extents => the_billboard_Model.Scale / 2.0), Mass => Mass); the_Billboard : constant gel.Sprite.view @@ -506,7 +497,6 @@ is the_billboard_physics_Model : constant physics.Model.view := physics.Model.Forge.new_physics_Model (shape_Info => (Kind => physics.Model.Cube, half_Extents => Size / 2.0), - -- half_Extents => the_billboard_Model.Scale / 2.0), Mass => Mass); the_Billboard : constant gel.Sprite.view := gel.Sprite.forge.new_Sprite ("Billboard", @@ -525,12 +515,12 @@ is function new_arrow_Sprite (in_World : in gel.World.view; - Site : in math.Vector_3 := math.Origin_3D; - Mass : in math.Real := 0.0; - Size : in math.Vector_3 := [1.0, 1.0, 1.0]; - Texture : in openGL.asset_Name := openGL.null_Asset; - Color : in openGL.lucid_Color := (openGL.Palette.Black, openGL.Opaque); - line_Width : in openGL.Real := openGL.Primitive.unused_line_Width; + Site : in math.Vector_3 := math.Origin_3D; + Mass : in math.Real := 0.0; + Size : in math.Vector_3 := [1.0, 1.0, 1.0]; + Texture : in openGL.asset_Name := openGL.null_Asset; + Color : in openGL.lucid_Color := (openGL.Palette.Black, openGL.Opaque); + line_Width : in openGL.Real := openGL.Primitive.unused_line_Width; user_Data : in any_user_Data_view := null) return gel.Sprite.view is pragma Unreferenced (Texture); @@ -543,7 +533,6 @@ is the_physics_Model : constant physics.Model.view := physics.Model.Forge.new_physics_Model (shape_Info => (Kind => physics.Model.Cube, half_Extents => Size / 2.0), - -- half_Extents => the_graphics_Model.Scale / 2.0), Mass => Mass); the_Arrow : constant gel.Sprite.view := gel.Sprite.forge.new_Sprite ("Arrow", @@ -562,12 +551,12 @@ is function new_line_Sprite (in_World : in gel.World.view; - Site : in math.Vector_3 := math.Origin_3D; - Mass : in math.Real := 0.0; - Size : in math.Vector_3 := [1.0, 1.0, 1.0]; - Texture : in openGL.asset_Name := openGL.null_Asset; - Color : in openGL.lucid_Color := (openGL.Palette.Black, openGL.Opaque); - line_Width : in openGL.Real := openGL.Primitive.unused_line_Width; + Site : in math.Vector_3 := math.Origin_3D; + Mass : in math.Real := 0.0; + Size : in math.Vector_3 := [1.0, 1.0, 1.0]; + Texture : in openGL.asset_Name := openGL.null_Asset; + Color : in openGL.lucid_Color := (openGL.Palette.Black, openGL.Opaque); + line_Width : in openGL.Real := openGL.Primitive.unused_line_Width; user_Data : in any_user_Data_view := null) return gel.Sprite.view is pragma Unreferenced (Texture, line_Width); @@ -579,7 +568,6 @@ is the_physics_Model : constant physics.Model.view := physics.Model.Forge.new_physics_Model (shape_Info => (Kind => physics.Model.Cube, half_Extents => Size / 2.0), - -- half_Extents => the_graphics_Model.Scale / 2.0), Mass => Mass); the_Line : constant gel.Sprite.view := gel.Sprite.forge.new_Sprite ("Line", @@ -672,7 +660,6 @@ is else the_physics_Model := physics.Model.Forge.new_physics_Model (shape_Info => (Kind => physics.Model.Cube, half_Extents => Size / 2.0)); - -- half_Extents => the_graphics_Model.Scale)); end if; return gel.Sprite.Forge.new_Sprite ("text_Sprite", diff --git a/4-high/gel/source/world/gel-world-server.adb b/4-high/gel/source/world/gel-world-server.adb index 3b1d715..dccfb21 100644 --- a/4-high/gel/source/world/gel-world-server.adb +++ b/4-high/gel/source/world/gel-world-server.adb @@ -90,6 +90,9 @@ is + + -- TODO: Rid this ... + function to_Sprite (the_Pair : in remote.World.sprite_model_Pair; the_graphics_Models : in Id_Maps_of_graphics_Model.Map; the_physics_Models : in Id_Maps_of_physics_Model .Map;