samples: stop using the single-arg Body constructor

Author: stephengold

src/test/java/testjoltjni/app/samples/SamplesContactListener.java

@@ -26,6 +26,7 @@ of this software and associated documentation files (the "Software"), to deal
 import com.github.stephengold.joltjni.ContactManifold;
 import com.github.stephengold.joltjni.ContactSettings;
 import com.github.stephengold.joltjni.CustomContactListener;
+import com.github.stephengold.joltjni.PhysicsSystem;
 import com.github.stephengold.joltjni.RVec3;
 import com.github.stephengold.joltjni.SubShapeIdPair;
 import com.github.stephengold.joltjni.enumerate.ValidateResult;
@@ -72,10 +73,11 @@ public class SamplesContactListener extends CustomContactListener {
      * @param settingsVa the virtual address of the contact settings (not zero)
      */
     @Override
-    public void onContactAdded(long body1Va, long body2Va,
-            long manifoldVa, long settingsVa) {
-        ConstBody body1 = new Body(body1Va);
-        ConstBody body2 = new Body(body2Va);
+    public void onContactAdded(
+            long body1Va, long body2Va, long manifoldVa, long settingsVa) {
+        PhysicsSystem system = test.GetPhysicsSystem();
+        ConstBody body1 = new Body(system, body1Va);
+        ConstBody body2 = new Body(system, body2Va);
         ConstContactManifold manifold = new ContactManifold(manifoldVa);
         ContactSettings settings = new ContactSettings(settingsVa);
         test.OnContactAdded(body1, body2, manifold, settings);
@@ -92,10 +94,11 @@ public void onContactAdded(long body1Va, long body2Va,
      * @param settingsVa the virtual address of the contact settings (not zero)
      */
     @Override
-    public void onContactPersisted(long body1Va, long body2Va,
-            long manifoldVa, long settingsVa) {
-        ConstBody body1 = new Body(body1Va);
-        ConstBody body2 = new Body(body2Va);
+    public void onContactPersisted(
+            long body1Va, long body2Va, long manifoldVa, long settingsVa) {
+        PhysicsSystem system = test.GetPhysicsSystem();
+        ConstBody body1 = new Body(system, body1Va);
+        ConstBody body2 = new Body(system, body2Va);
         ConstContactManifold manifold = new ContactManifold(manifoldVa);
         ContactSettings settings = new ContactSettings(settingsVa);
         test.OnContactPersisted(body1, body2, manifold, settings);
@@ -131,11 +134,12 @@ public void onContactRemoved(long pairVa) {
      * {@code ValidateResult})
      */
     @Override
-    public int onContactValidate(long body1Va, long body2Va,
-            double baseOffsetX, double baseOffsetY, double baseOffsetZ,
-            long collisionResultVa) {
-        ConstBody body1 = new Body(body1Va);
-        ConstBody body2 = new Body(body2Va);
+    public int onContactValidate(
+            long body1Va, long body2Va, double baseOffsetX, double baseOffsetY,
+            double baseOffsetZ, long collisionResultVa) {
+        PhysicsSystem system = test.GetPhysicsSystem();
+        ConstBody body1 = new Body(system, body1Va);
+        ConstBody body2 = new Body(system, body2Va);
         RVec3Arg baseOffset
                 = new RVec3(baseOffsetX, baseOffsetY, baseOffsetZ);
         CollideShapeResult collisionResult

src/test/java/testjoltjni/app/samples/character/CharacterSpaceShipTest.java

@@ -65,7 +65,7 @@ public void Initialize()
 	settings.setSupportingVolume (new Plane(Vec3.sAxisY(), -cCharacterRadiusStanding)); // Accept contacts that touch the lower sphere of the capsule
 	mCharacter = new CharacterVirtual(settings, plus(cShipInitialPosition ,new Vec3(0, cSpaceShipHeight, 0)), Quat.sIdentity(), 0, mPhysicsSystem).toRef();
 	mCharacter.getPtr().setListener(new CustomCharacterContactListener() {
-            public void onAdjustBodyVelocity(long characterVa, long body2Va, float[] velocities) {OnAdjustBodyVelocity(new CharacterVirtual(characterVa, mPhysicsSystem), new Body(body2Va), new Vec3(), new Vec3());}
+            public void onAdjustBodyVelocity(long characterVa, long body2Va, float[] velocities) {OnAdjustBodyVelocity(new CharacterVirtual(characterVa, mPhysicsSystem), new Body(mPhysicsSystem,body2Va), new Vec3(), new Vec3());}
         });
 
 	// Create the space ship

src/test/java/testjoltjni/app/samples/softbody/SoftBodyContactListenerTest.java

@@ -42,8 +42,8 @@ public void Initialize()
 {
 	// Install contact listener for soft bodies
 	mPhysicsSystem.setSoftBodyContactListener(new CustomSoftBodyContactListener(){
-            public void onSoftBodyContactAdded(long bodyVa,long manifoldVa){OnSoftBodyContactAdded(new Body(bodyVa),new SoftBodyManifold(manifoldVa));}
-            public int onSoftBodyContactValidate(long softBodyVa,long otherBodyVa,long settingsVa){return OnSoftBodyContactValidate(new Body(softBodyVa),new Body(otherBodyVa),new SoftBodyContactSettings(settingsVa)).ordinal();}
+            public void onSoftBodyContactAdded(long bodyVa,long manifoldVa){OnSoftBodyContactAdded(new Body(mPhysicsSystem,bodyVa),new SoftBodyManifold(manifoldVa));}
+            public int onSoftBodyContactValidate(long softBodyVa,long otherBodyVa,long settingsVa){return OnSoftBodyContactValidate(new Body(mPhysicsSystem,softBodyVa),new Body(mPhysicsSystem,otherBodyVa),new SoftBodyContactSettings(settingsVa)).ordinal();}
         });
 
 	// Floor

src/test/java/testjoltjni/app/samples/softbody/SoftBodySensorTest.java

@@ -39,7 +39,7 @@ public void Initialize()
 	// Install contact listener for soft bodies
 	mPhysicsSystem.setSoftBodyContactListener(new CustomSoftBodyContactListener(){
             public void onSoftBodyContactAdded(long bodyVa,long manifoldVa) {
-                SoftBodySensorTest.this.OnSoftBodyContactAdded(new Body(bodyVa), new SoftBodyManifold(manifoldVa));
+                SoftBodySensorTest.this.OnSoftBodyContactAdded(new Body(mPhysicsSystem,bodyVa), new SoftBodyManifold(manifoldVa));
             }
             public int onSoftBodyContactValidate(long softBodyVa,long otherBodyVa,long settingsVa){return SoftBodyValidateResult.AcceptContact.ordinal();}
         });