diff --git a/3-mid/opengl/private/gl/source/gl-safe.ads b/3-mid/opengl/private/gl/source/gl-safe.ads index a53fe1e..bc1eec7 100644 --- a/3-mid/opengl/private/gl/source/gl-safe.ads +++ b/3-mid/opengl/private/gl/source/gl-safe.ads @@ -1,5 +1,7 @@ with - Interfaces.C.Pointers; + Interfaces.C.Pointers, + System; + package GL.safe -- @@ -42,7 +44,7 @@ is package GLvoid_Pointers is new C.Pointers (Index => C.size_t, Element => GLvoid, Element_Array => GLvoid_array, - Default_Terminator => 0); + Default_Terminator => system.null_Address); subtype GLvoid_Pointer is GLvoid_Pointers.Pointer; diff --git a/3-mid/physics/implement/box2d/source/thin/box2d_c-pointers.ads b/3-mid/physics/implement/box2d/source/thin/box2d_c-pointers.ads index a1f1207..73c75be 100644 --- a/3-mid/physics/implement/box2d/source/thin/box2d_c-pointers.ads +++ b/3-mid/physics/implement/box2d/source/thin/box2d_c-pointers.ads @@ -1,22 +1,22 @@ -- This file is generated by SWIG. Please do not modify by hand. -- -with Interfaces.C; - -use Interfaces.C; -with interfaces.C.Pointers; +with interfaces.C.Pointers, + System; -package box2d_c.Pointers is - +package box2d_c.Pointers +is + use System; + -- Shape_Pointer -- package C_Shape_Pointers is new interfaces.c.Pointers (Index => interfaces.c.size_t, - Element => box2d_c.Shape, - element_Array => box2d_c.Shape_Array, - default_Terminator => 0); + Element => box2d_c.Shape, + element_Array => box2d_c.Shape_Array, + default_Terminator => null_Address); subtype Shape_Pointer is C_Shape_Pointers.Pointer; @@ -29,9 +29,9 @@ subtype Shape_Pointer is C_Shape_Pointers.Pointer; -- Object_Pointer -- package C_Object_Pointers is new interfaces.c.Pointers (Index => interfaces.c.size_t, - Element => box2d_c.Object, - element_Array => box2d_c.Object_Array, - default_Terminator => 0); + Element => box2d_c.Object, + element_Array => box2d_c.Object_Array, + default_Terminator => null_Address); subtype Object_Pointer is C_Object_Pointers.Pointer; @@ -44,9 +44,9 @@ subtype Object_Pointer is C_Object_Pointers.Pointer; -- Joint_Pointer -- package C_Joint_Pointers is new interfaces.c.Pointers (Index => interfaces.c.size_t, - Element => box2d_c.Joint, - element_Array => box2d_c.Joint_Array, - default_Terminator => 0); + Element => box2d_c.Joint, + element_Array => box2d_c.Joint_Array, + default_Terminator => null_Address); subtype Joint_Pointer is C_Joint_Pointers.Pointer; @@ -59,9 +59,9 @@ subtype Joint_Pointer is C_Joint_Pointers.Pointer; -- Space_Pointer -- package C_Space_Pointers is new interfaces.c.Pointers (Index => interfaces.c.size_t, - Element => box2d_c.Space, - element_Array => box2d_c.Space_Array, - default_Terminator => 0); + Element => box2d_c.Space, + element_Array => box2d_c.Space_Array, + default_Terminator => null_Address); subtype Space_Pointer is C_Space_Pointers.Pointer; @@ -74,9 +74,9 @@ subtype Space_Pointer is C_Space_Pointers.Pointer; -- b2Joint_Pointer -- package C_b2Joint_Pointers is new interfaces.c.Pointers (Index => interfaces.c.size_t, - Element => box2d_c.b2Joint, - element_Array => box2d_c.b2Joint_Array, - default_Terminator => 0); + Element => box2d_c.b2Joint, + element_Array => box2d_c.b2Joint_Array, + default_Terminator => null_Address); subtype b2Joint_Pointer is C_b2Joint_Pointers.Pointer; diff --git a/4-high/gel/applet/demo/sprite/chains_2d/launch_chains_2d.adb b/4-high/gel/applet/demo/sprite/chains_2d/launch_chains_2d.adb index b617547..a6e56de 100644 --- a/4-high/gel/applet/demo/sprite/chains_2d/launch_chains_2d.adb +++ b/4-high/gel/applet/demo/sprite/chains_2d/launch_chains_2d.adb @@ -26,6 +26,7 @@ is space_Kind => physics.Box2D); the_Ground : constant gel.Sprite.view := new_rectangle_Sprite (the_Applet.gui_World, + Name => "the_Ground", Mass => 0.0, Width => 100.0, Height => 1.0, @@ -43,8 +44,8 @@ begin -- declare ball_Count : constant := 39; - the_root_Ball : constant gel.Sprite.view := new_circle_Sprite (the_Applet.gui_World, Mass => 0.0); - the_Balls : constant gel.Sprite.views := [1 .. ball_Count => new_circle_Sprite (the_Applet.gui_World, Mass => 1.0)]; + the_root_Ball : constant gel.Sprite.view := new_circle_Sprite (the_Applet.gui_World, Name => "the_root_Ball", Mass => 0.0); + the_Balls : constant gel.Sprite.views := [1 .. ball_Count => new_circle_Sprite (the_Applet.gui_World, Name => "the_Balls", Mass => 1.0)]; Parent : gel.Sprite.view := the_root_Ball; new_Joint : gel.Joint .view; diff --git a/4-high/gel/applet/demo/sprite/mixed_joints_2d/launch_mixed_joints_2d.adb b/4-high/gel/applet/demo/sprite/mixed_joints_2d/launch_mixed_joints_2d.adb index e7ca2ae..5a73f3c 100644 --- a/4-high/gel/applet/demo/sprite/mixed_joints_2d/launch_mixed_joints_2d.adb +++ b/4-high/gel/applet/demo/sprite/mixed_joints_2d/launch_mixed_joints_2d.adb @@ -47,8 +47,8 @@ begin -- Hinge -- declare - the_hinge_Box_1 : constant gel.Sprite.view := new_circle_Sprite (the_Applet.gui_World, mass => 0.0); - the_hinge_Box_2 : constant gel.Sprite.view := new_circle_Sprite (the_Applet.gui_World, mass => 1.0); + the_hinge_Box_1 : constant gel.Sprite.view := new_circle_Sprite (the_Applet.gui_World, Name => "the_hinge_Box_1", mass => 0.0); + the_hinge_Box_2 : constant gel.Sprite.view := new_circle_Sprite (the_Applet.gui_World, Name => "the_hinge_Box_2", mass => 1.0); new_Joint : gel. Joint .view; Frame_A : constant math.Matrix_4x4 := math.Identity_4x4; diff --git a/5-all/applet/build_all/build_all_lace.adb b/5-all/applet/build_all/build_all_lace.adb index b10ecb0..b81e57a 100644 --- a/5-all/applet/build_all/build_all_lace.adb +++ b/5-all/applet/build_all/build_all_lace.adb @@ -49,7 +49,7 @@ with launch_Client, launch_Server, - launch_Pong, +-- launch_Pong, launch_Hello_gel, launch_opengl_Model, launch_Mouse_motion, @@ -122,7 +122,7 @@ begin launch_Client; launch_Server; - launch_Pong; +-- launch_Pong; launch_Hello_gel; launch_opengl_Model; launch_Mouse_motion; diff --git a/5-all/applet/build_all/build_all_lace.gpr b/5-all/applet/build_all/build_all_lace.gpr index 814c794..efd3495 100644 --- a/5-all/applet/build_all/build_all_lace.gpr +++ b/5-all/applet/build_all/build_all_lace.gpr @@ -80,7 +80,7 @@ with "../../../4-high/gel/applet/demo/distributed/dsa/demo_dsa", "../../../4-high/gel/applet/demo/distributed/fused/gel_fused", "../../../4-high/gel/applet/demo/game/box2d_test/gel_box2d_test", - "../../../4-high/gel/applet/demo/game/pong-gtk/pong", +-- "../../../4-high/gel/applet/demo/game/pong-gtk/pong", "../../../4-high/gel/applet/demo/hello_gel/hello_sdl_gel", "../../../4-high/gel/applet/demo/models/opengl_model/opengl_model", "../../../4-high/gel/applet/demo/mouse/mouse_motion/mouse_motion",