all: Fix simple warnings and cosmetics.
This commit is contained in:
@@ -1,4 +1,3 @@
|
||||
with openGL.texture_Set;
|
||||
with
|
||||
gel.Applet.gui_World,
|
||||
gel.Window.setup,
|
||||
@@ -8,8 +7,8 @@ with
|
||||
physics.Model,
|
||||
|
||||
openGL.Model.any,
|
||||
openGL.Light,
|
||||
openGL.texture_Set,
|
||||
openGL.Light,
|
||||
|
||||
ada.Calendar,
|
||||
ada.Text_IO,
|
||||
@@ -86,7 +85,7 @@ begin
|
||||
the_Human.Site_is ([0.0, 5.0, 0.0]); --
|
||||
|
||||
-- the_Applet.gui_World.add (the_Cobra); -- Add cobra.
|
||||
the_Cobra.Site_is ((0.0, 5.0, 0.0)); --
|
||||
the_Cobra.Site_is ([0.0, 5.0, 0.0]); --
|
||||
|
||||
the_Applet.gui_Camera.Site_is ([0.0, 1.5, 2.6]); -- Position the camera.
|
||||
-- the_Applet.gui_Camera.Site_is ((0.0, 100.0, 0.0)); -- Position the camera.
|
||||
|
||||
@@ -17,8 +17,7 @@ procedure launch_text_sprite_Demo
|
||||
-- Shows a few text sprites.
|
||||
--
|
||||
is
|
||||
use gel.Math,
|
||||
openGL.Palette;
|
||||
use openGL.Palette;
|
||||
|
||||
the_Applet : constant gel.Applet.gui_World.view := gel.Forge.new_gui_Applet ("text sprite Demo",
|
||||
space_Kind => physics.Bullet);
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
with
|
||||
gel.Events,
|
||||
gel.Camera.forge,
|
||||
lace.Event.utility,
|
||||
ada.unchecked_Deallocation;
|
||||
|
||||
|
||||
@@ -11,8 +9,6 @@ is
|
||||
procedure define (Self : in gel.Applet.client_world.view; Name : in String;
|
||||
space_Kind : in physics.space_Kind)
|
||||
is
|
||||
use lace.Event.utility;
|
||||
|
||||
the_world_Info : constant world_Info_view := new world_Info;
|
||||
the_Camera : constant gel.Camera.View := gel.Camera.forge.new_Camera;
|
||||
begin
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
with
|
||||
gel.Events,
|
||||
gel.Camera.forge,
|
||||
lace.Event.utility,
|
||||
ada.unchecked_Deallocation;
|
||||
|
||||
|
||||
@@ -11,8 +9,6 @@ is
|
||||
procedure define (Self : in gel.Applet.server_world.view; Name : in String;
|
||||
space_Kind : in physics.space_Kind)
|
||||
is
|
||||
use lace.Event.utility;
|
||||
|
||||
the_world_Info : constant world_Info_view := new world_Info;
|
||||
the_Camera : constant gel.Camera.View := gel.Camera.forge.new_Camera;
|
||||
begin
|
||||
|
||||
@@ -1,9 +1,6 @@
|
||||
with
|
||||
gel.World.simple,
|
||||
gel.Camera.forge,
|
||||
gel.Events,
|
||||
|
||||
lace.Event.utility;
|
||||
gel.Camera.forge;
|
||||
|
||||
|
||||
package body gel.Applet.gui_and_sim_world
|
||||
@@ -13,7 +10,6 @@ is
|
||||
use_Window : in gel.Window.view)
|
||||
is
|
||||
pragma Unreferenced (use_Window);
|
||||
use lace.Event.utility;
|
||||
begin
|
||||
declare
|
||||
the_world_Info : constant world_Info_view := new world_Info;
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
with
|
||||
gel.World.simple,
|
||||
gel.Events,
|
||||
gel.Camera.forge,
|
||||
lace.Event.utility,
|
||||
ada.unchecked_Deallocation;
|
||||
|
||||
|
||||
@@ -12,8 +10,6 @@ is
|
||||
procedure define (Self : in gel.Applet.gui_world.view; Name : in String;
|
||||
space_Kind : in physics.space_Kind)
|
||||
is
|
||||
use lace.Event.utility;
|
||||
|
||||
the_world_Info : constant world_Info_view := new world_Info;
|
||||
the_Camera : constant gel.Camera.View := gel.Camera.forge.new_Camera;
|
||||
begin
|
||||
|
||||
@@ -11,7 +11,6 @@ with
|
||||
|
||||
lace.Event.utility,
|
||||
|
||||
ada.unchecked_Conversion,
|
||||
ada.unchecked_Deallocation,
|
||||
ada.Text_IO;
|
||||
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
with openGL.texture_Set;
|
||||
with
|
||||
openGL.Model.text .lit_colored,
|
||||
|
||||
@@ -23,12 +22,8 @@ with
|
||||
openGL.Model.line .colored,
|
||||
openGL.Model.segment_line,
|
||||
|
||||
openGL.Palette,
|
||||
openGL.texture_Set,
|
||||
|
||||
physics.Model,
|
||||
gel.Window;
|
||||
-- float_Math.Random;
|
||||
|
||||
|
||||
package body gel.Forge
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
with any_math.any_Algebra.any_linear.any_d3;
|
||||
with
|
||||
gel.Events,
|
||||
|
||||
|
||||
@@ -90,51 +90,6 @@ 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;
|
||||
the_World : in gel.World.view) return gel.Sprite.view
|
||||
is
|
||||
the_graphics_Model : access openGL .Model.item'Class;
|
||||
the_physics_Model : access physics.Model.item'Class;
|
||||
the_Sprite : gel.Sprite.view;
|
||||
|
||||
use openGL;
|
||||
begin
|
||||
the_graphics_Model := openGL .Model.view (the_graphics_Models .Element (the_Pair.graphics_Model_Id));
|
||||
the_physics_Model := physics.Model.view (the_physics_Models.Element (the_Pair. physics_Model_Id));
|
||||
|
||||
the_Sprite := gel.Sprite.forge.new_Sprite ("2Sprite" & the_Pair.sprite_Id'Image,
|
||||
sprite.World_view (the_World),
|
||||
get_Translation (the_Pair.Transform),
|
||||
get_Rotation (the_Pair.Transform),
|
||||
the_graphics_Model,
|
||||
the_physics_Model,
|
||||
owns_Graphics => False,
|
||||
owns_Physics => False,
|
||||
is_Kinematic => the_Pair.Mass /= 0.0);
|
||||
|
||||
the_Sprite.Id_is (Now => the_Pair.sprite_Id);
|
||||
the_Sprite.is_Visible (Now => the_Pair.is_Visible);
|
||||
|
||||
the_Sprite.Site_is (get_Translation (the_Pair.Transform));
|
||||
the_Sprite.Spin_is (get_Rotation (the_Pair.Transform));
|
||||
|
||||
the_Sprite.desired_Dynamics_are (Site => the_Sprite.Site,
|
||||
Spin => to_Quaternion (get_Rotation (the_Sprite.Transform)));
|
||||
|
||||
-- the_Sprite.desired_Site_is (the_Sprite.Site);
|
||||
-- the_Sprite.desired_Spin_is (to_Quaternion (get_Rotation (the_Sprite.Transform)));
|
||||
|
||||
return the_Sprite;
|
||||
end to_Sprite;
|
||||
|
||||
-- pragma Unreferenced (to_Sprite);
|
||||
|
||||
|
||||
----------
|
||||
--- Define
|
||||
--
|
||||
|
||||
@@ -1,6 +1,3 @@
|
||||
with
|
||||
ada.unchecked_Conversion;
|
||||
|
||||
limited
|
||||
with
|
||||
openGL.Renderer.lean;
|
||||
|
||||
@@ -1,7 +1,4 @@
|
||||
with any_math.any_Algebra.any_linear.any_d3;
|
||||
with
|
||||
gel.Events,
|
||||
|
||||
physics.Object,
|
||||
physics.Forge,
|
||||
|
||||
@@ -9,6 +6,7 @@ with
|
||||
|
||||
lace.Response,
|
||||
lace.Text.Forge,
|
||||
lace.Event,
|
||||
|
||||
ada.Text_IO,
|
||||
ada.Exceptions,
|
||||
@@ -1045,8 +1043,7 @@ is
|
||||
overriding
|
||||
function Sprites (Self : in out Item) return remote.World.sprite_model_Pairs
|
||||
is
|
||||
use id_Maps_of_sprite,
|
||||
lace.Text;
|
||||
use id_Maps_of_sprite;
|
||||
|
||||
all_Sprites : id_Maps_of_sprite.Map renames Item'Class (Self).all_Sprites.fetch;
|
||||
Cursor : id_Maps_of_sprite.Cursor := all_Sprites.First;
|
||||
|
||||
@@ -8,14 +8,11 @@ with
|
||||
physics.Space,
|
||||
physics.Model,
|
||||
|
||||
lace.Event,
|
||||
lace.Observer,
|
||||
lace.Subject,
|
||||
lace.Subject_and_deferred_Observer,
|
||||
lace.Any,
|
||||
|
||||
ada.Streams,
|
||||
ada.Tags.generic_dispatching_Constructor,
|
||||
ada.unchecked_Conversion,
|
||||
ada.Containers.hashed_Maps;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user