From 51c16154fd97c493ecba053de521afb7d07fdd0b Mon Sep 17 00:00:00 2001 From: Rod Kay Date: Fri, 10 Nov 2023 18:39:29 +1100 Subject: [PATCH] Cosmetics. --- .../applet/demo/game/pong-gtk/launch_pong.adb | 11 +++++----- 4-high/gel/source/forge/gel-forge.adb | 20 ++++++++++++------- 4-high/gel/source/forge/gel-forge.ads | 2 ++ 4-high/gel/source/world/gel-world-client.adb | 3 +++ 4-high/gel/source/world/gel-world-server.adb | 8 ++++++-- 5 files changed, 30 insertions(+), 14 deletions(-) diff --git a/4-high/gel/applet/demo/game/pong-gtk/launch_pong.adb b/4-high/gel/applet/demo/game/pong-gtk/launch_pong.adb index 316da54..18fef26 100644 --- a/4-high/gel/applet/demo/game/pong-gtk/launch_pong.adb +++ b/4-high/gel/applet/demo/game/pong-gtk/launch_pong.adb @@ -197,7 +197,7 @@ begin is pragma Unreferenced (Self); the_Event : gel.Keyboard.key_press_Event renames gel.Keyboard.key_press_Event (to_Event); - the_Key : constant gel.keyboard.Key := the_Event.modified_Key.Key; + the_Key : constant gel.keyboard.Key := the_Event.modified_Key.Key; begin case the_Key is @@ -220,7 +220,7 @@ begin is pragma Unreferenced (Self); the_Event : gel.Keyboard.key_release_Event renames gel.Keyboard.key_release_Event (to_Event); - the_Key : constant gel.keyboard.Key := the_Event.modified_Key.Key; + the_Key : constant gel.keyboard.Key := the_Event.modified_Key.Key; begin case the_Key is @@ -247,16 +247,17 @@ begin the_key_release_Response : aliased key_release_Response; begin + ------------------- --- Setup the game. -- Box.pack_Start (window_gl_Area); - -- Show the window and present it. + -- Show the window. -- - top_Window.Show_All; - top_Window.Present; + top_Window.show_All; + -- top_Window.present; the_Applet.Camera. Site_is ([0.0, 0.0, 20.0]); the_Applet.World.Gravity_is ([0.0, 0.0, 0.0]); diff --git a/4-high/gel/source/forge/gel-forge.adb b/4-high/gel/source/forge/gel-forge.adb index 926df80..7b139a0 100644 --- a/4-high/gel/source/forge/gel-forge.adb +++ b/4-high/gel/source/forge/gel-forge.adb @@ -108,10 +108,13 @@ is end new_client_Applet; + + ----------- --- Sprites -- + ----- -- 2D -- @@ -161,12 +164,13 @@ is function new_polygon_Sprite (in_World : in gel.World.view; - Site : in math.Vector_2 := math.Origin_2D; - Mass : in math.Real := 1.0; - Friction : in math.Real := 0.5; - Bounce : in math.Real := 0.5; - Vertices : in Geometry_2d.Sites; - Color : in openGL.Color := opengl.Palette.White; + Site : in math.Vector_2 := math.Origin_2D; + Mass : in math.Real := 1.0; + Friction : in math.Real := 0.5; + Bounce : in math.Real := 0.5; + Vertices : in Geometry_2d.Sites; + Color : in openGL.Color := opengl.Palette.White; + Texture : in openGL.asset_Name := openGL.null_Asset; user_Data : in any_user_Data_view := null) return gel.Sprite.view is use Math; @@ -208,6 +212,7 @@ is Width, Height : in math.Real; Color : in openGL.Color := opengl.Palette.White; + Texture : in openGL.asset_Name := openGL.null_Asset; user_Data : in any_user_Data_view := null) return gel.Sprite.view is use Math; @@ -220,11 +225,12 @@ is [ half_Width, half_Height], [-half_Width, half_Height]]; begin - return new_polygon_Sprite (in_World, Site, Mass, Friction, Bounce, the_Vertices, Color, user_Data); + return new_polygon_Sprite (in_World, Site, Mass, Friction, Bounce, the_Vertices, Color, Texture, user_Data); end new_rectangle_Sprite; + ----- -- 3D -- diff --git a/4-high/gel/source/forge/gel-forge.ads b/4-high/gel/source/forge/gel-forge.ads index 7e19192..75183c4 100644 --- a/4-high/gel/source/forge/gel-forge.ads +++ b/4-high/gel/source/forge/gel-forge.ads @@ -70,6 +70,7 @@ is Bounce : in math.Real := 0.5; Vertices : in Geometry_2d.Sites; Color : in openGL.Color := opengl.Palette.White; + Texture : in openGL.asset_Name := openGL.null_Asset; user_Data : in any_user_Data_view := null) return gel.Sprite.view; function new_rectangle_Sprite (in_World : in gel.World.view; @@ -80,6 +81,7 @@ is Width, Height : in math.Real; Color : in openGL.Color := opengl.Palette.White; + Texture : in openGL.asset_Name := openGL.null_Asset; user_Data : in any_user_Data_view := null) return gel.Sprite.view; -- 3D -- diff --git a/4-high/gel/source/world/gel-world-client.adb b/4-high/gel/source/world/gel-world-client.adb index ed304f9..a13bef3 100644 --- a/4-high/gel/source/world/gel-world-client.adb +++ b/4-high/gel/source/world/gel-world-client.adb @@ -365,6 +365,9 @@ is end loop; end; end; + + of_World.register (the_Mirror => Self, + Mirror_as_observer => Self); end is_a_Mirror; diff --git a/4-high/gel/source/world/gel-world-server.adb b/4-high/gel/source/world/gel-world-server.adb index 657108a..dc4e406 100644 --- a/4-high/gel/source/world/gel-world-server.adb +++ b/4-high/gel/source/world/gel-world-server.adb @@ -19,7 +19,7 @@ is procedure log (Message : in String) renames ada.text_IO.put_Line; - pragma Unreferenced (log); + -- pragma Unreferenced (log); --------- @@ -80,7 +80,7 @@ is Self : constant gel.World.server.view := new gel.World.server.item' (to_Subject_and_Observer (name => Name & " world" & Id'Image) - with others => <>); + with others => <>); begin Self.define (Name, Id, space_Kind, Renderer); return Self; @@ -127,6 +127,7 @@ is return the_Sprite; end to_Sprite; + pragma Unreferenced (to_Sprite); @@ -186,6 +187,8 @@ is while has_Element (Cursor) loop the_Sprite := Sprite.view (Element (Cursor)); + -- the_Sprite.apply_Force ([0.0, 1.0, 0.0]); + -- the_Sprite.apply_Torque_impulse ([0.0, 1.0, 0.0]); updates_Count := updates_Count + 1; the_motion_Updates (updates_Count) := (Id => the_Sprite.Id, @@ -194,6 +197,7 @@ is -- Spin => the_Sprite.Spin); -- log (Image (Quaternion' (refined (the_motion_Updates (updates_Count).Spin)))); + ada.Text_IO.put (refined (the_motion_Updates (updates_Count).Site)'Image); next (Cursor); end loop;