defer to existing meshes

MarginallyClever · May 22, 2024 · fc4bb2d · fc4bb2d
1 parent 04520d9
commit fc4bb2d
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 5 deletions.
diff --git a/src/main/java/com/marginallyclever/ro3/node/nodes/odenode/odebody/odebodies/ODEBox.java b/src/main/java/com/marginallyclever/ro3/node/nodes/odenode/odebody/odebodies/ODEBox.java
@@ -87,7 +87,10 @@ private void updateSize() {
 
         var meshInstance = findFirstChild(MeshInstance.class);
         if(meshInstance!=null) {
-            meshInstance.setMesh(new Box(size.x,size.y,size.z));
+            var mesh = meshInstance.getMesh();
+            if(mesh==null || mesh instanceof Box) {
+                meshInstance.setMesh(new Box(size.x, size.y, size.z));
+            }
         }
     }
 

diff --git a/src/main/java/com/marginallyclever/ro3/node/nodes/odenode/odebody/odebodies/ODECapsule.java b/src/main/java/com/marginallyclever/ro3/node/nodes/odenode/odebody/odebodies/ODECapsule.java
@@ -79,7 +79,10 @@ private void updateSize() {
 
         MeshInstance meshInstance = findFirstChild(MeshInstance.class);
         if(null != meshInstance) {
-            meshInstance.setMesh(new Capsule(length, radius));
+            var mesh = meshInstance.getMesh();
+            if(mesh==null || mesh instanceof Capsule) {
+                meshInstance.setMesh(new Capsule(length, radius));
+            }
         }
 
         MeshInstance b1 = findNodeByPath("Ball1/MeshInstance",MeshInstance.class);

diff --git a/src/main/java/com/marginallyclever/ro3/node/nodes/odenode/odebody/odebodies/ODECylinder.java b/src/main/java/com/marginallyclever/ro3/node/nodes/odenode/odebody/odebodies/ODECylinder.java
@@ -76,8 +76,11 @@ private void updateSize() {
         body.setMass(mass);
 
         MeshInstance meshInstance = findFirstChild(MeshInstance.class);
-        if(meshInstance!=null) {
-            meshInstance.setMesh(new Cylinder(length, radius, radius));
+        if(null != meshInstance) {
+            var mesh = meshInstance.getMesh();
+            if(mesh==null || mesh instanceof Cylinder) {
+                meshInstance.setMesh(new Cylinder(length, radius, radius));
+            }
         }
     }
 

diff --git a/src/main/java/com/marginallyclever/ro3/node/nodes/odenode/odebody/odebodies/ODESphere.java b/src/main/java/com/marginallyclever/ro3/node/nodes/odenode/odebody/odebodies/ODESphere.java
@@ -67,7 +67,10 @@ private void updateSize() {
 
         var meshInstance = findFirstChild(MeshInstance.class);
         if(meshInstance!=null) {
-            meshInstance.setMesh(new Sphere((float) radius));
+            var mesh = meshInstance.getMesh();
+            if(mesh==null || mesh instanceof Sphere) {
+                meshInstance.setMesh(new Sphere((float) radius));
+            }
         }
     }