bugfix: logic error in CollisionShape.nativeMargin()

stephengold · Jul 25, 2024 · 6256b87 · 6256b87
1 parent 06fe9c6
commit 6256b87
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/MinieLibrary/src/main/java/com/jme3/bullet/collision/shapes/CollisionShape.java b/MinieLibrary/src/main/java/com/jme3/bullet/collision/shapes/CollisionShape.java
@@ -604,7 +604,7 @@ final protected float nativeMargin() {
         float result = getMargin(shapeId);
 
         assert result >= 0f : result;
-        return margin;
+        return result;
     }
 
     /**

diff --git a/MinieLibrary/src/test/java/jme3utilities/minie/test/TestSetMargin.java b/MinieLibrary/src/test/java/jme3utilities/minie/test/TestSetMargin.java
@@ -202,16 +202,16 @@ public void testSetMargin() { // TODO split off testSetMarginConvex()
         // MinkowskiSum of sphere + cone
         ConvexShape sphere1 = new SphereCollisionShape(1f);
         CollisionShape sum1 = new MinkowskiSum(sphere1, cone1);
-        Assert.assertEquals(0.04f, sum1.getMargin(), 0f);
+        Assert.assertEquals(1.04f, sum1.getMargin(), 0f);
         sum1.setMargin(0.195f); // cannot directly alter margin
-        Assert.assertEquals(0.04f, sum1.getMargin(), 0f);
+        Assert.assertEquals(1.04f, sum1.getMargin(), 0f);
 
         // MinkowskiSum of sphere + capsule
         ConvexShape capsule1 = new CapsuleCollisionShape(1f, 1f);
         CollisionShape sum2 = new MinkowskiSum(sphere1, capsule1);
-        Assert.assertEquals(0f, sum2.getMargin(), 0f);
+        Assert.assertEquals(2f, sum2.getMargin(), 0f);
         sum2.setMargin(0.196f); // cannot directly alter margin
-        Assert.assertEquals(0f, sum2.getMargin(), 0f);
+        Assert.assertEquals(2f, sum2.getMargin(), 0f);
 
         // MultiSphere
         List<Float> radii = new ArrayList<>(3);