From 68df630377a877c52349a495cb51fff958032530 Mon Sep 17 00:00:00 2001 From: Rod Kay Date: Sun, 31 Dec 2023 21:25:38 +1100 Subject: [PATCH] physics.box2d_physics.object: Cosmetics. --- .../source/private/box2d/box2d_physics-object.adb | 12 +++++------- .../source/private/box2d/box2d_physics-object.ads | 5 ++++- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/3-mid/physics/interface/source/private/box2d/box2d_physics-object.adb b/3-mid/physics/interface/source/private/box2d/box2d_physics-object.adb index f2438a8..c688ac3 100644 --- a/3-mid/physics/interface/source/private/box2d/box2d_physics-object.adb +++ b/3-mid/physics/interface/source/private/box2d/box2d_physics-object.adb @@ -1,7 +1,5 @@ with box2d_c.Binding, - box2d_c.Pointers, - box2d_physics.Shape, c_math_c.Vector_2, @@ -15,6 +13,7 @@ with ada.unchecked_Deallocation, ada.Unchecked_Conversion; + package body box2d_Physics.Object is use @@ -46,9 +45,8 @@ is Restitution : in Real; at_Site : in Vector_3) is - Self_as_any : constant Any_limited_view := Any_limited_view (Self); - c_Site : aliased c_math_c.Vector_2.item := (c_math_c.Real (at_Site (1)), - c_math_c.Real (at_Site (2))); + c_Site : aliased c_math_c.Vector_2.item := (c_math_c.Real (at_Site (1)), + c_math_c.Real (at_Site (2))); begin Self.C := b2d_new_Object (c_Site'unchecked_Access, c_math_c.Real (Mass), @@ -56,8 +54,8 @@ is c_math_c.Real (Restitution), box2d_physics.Shape.view (Shape).C); Self.Shape := Shape; - b2d_Object_user_Data_is (box2d_c.Pointers.Object_pointer (Self.C), - to_void_ptr (Self_as_any)); + b2d_Object_user_Data_is (Self.C, + to_void_ptr (Self)); Self.Site_is (at_Site); Self.update_Dynamics; end define; diff --git a/3-mid/physics/interface/source/private/box2d/box2d_physics-object.ads b/3-mid/physics/interface/source/private/box2d/box2d_physics-object.ads index cc30a04..6ddd970 100644 --- a/3-mid/physics/interface/source/private/box2d/box2d_physics-object.ads +++ b/3-mid/physics/interface/source/private/box2d/box2d_physics-object.ads @@ -3,6 +3,7 @@ with physics.Shape, physics.Model, box2d_C; +with box2d_c.Pointers; private with @@ -55,7 +56,9 @@ private type Item is limited new physics.Object.item with record - C : access box2d_C.Object; + -- C : access box2d_C.Object; + C : box2d_c.Pointers.Object_pointer; + Shape : physics.Shape.view; Model : physics.Model.view; user_Data : access lace.Any.limited_item'Class;