updated applying scale to physics and to box shapes.

Author: JavaSaBr

src/main/java/com/jme3/bullet/util/DebugShapeFactory.java

@@ -0,0 +1,132 @@
+/*
+ * Copyright (c) 2009-2017 jMonkeyEngine
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'jMonkeyEngine' nor the names of its contributors
+ *   may be used to endorse or promote products derived from this software
+ *   without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package com.jme3.bullet.util;
+
+import com.jme3.bullet.collision.shapes.CollisionShape;
+import com.jme3.bullet.collision.shapes.CompoundCollisionShape;
+import com.jme3.bullet.collision.shapes.infos.ChildCollisionShape;
+import com.jme3.math.Matrix3f;
+import com.jme3.math.Vector3f;
+import com.jme3.scene.Geometry;
+import com.jme3.scene.Mesh;
+import com.jme3.scene.Node;
+import com.jme3.scene.Spatial;
+import com.jme3.scene.VertexBuffer.Type;
+import com.jme3.util.TempVars;
+import java.util.Iterator;
+import java.util.List;
+
+/**
+ *
+ * @author CJ Hare, normenhansen
+ */
+public class DebugShapeFactory {
+
+    /** The maximum corner for the aabb used for triangles to include in ConcaveShape processing.*/
+    //    private static final Vector3f aabbMax = new Vector3f(1e30f, 1e30f, 1e30f);
+    /** The minimum corner for the aabb used for triangles to include in ConcaveShape processing.*/
+    //    private static final Vector3f aabbMin = new Vector3f(-1e30f, -1e30f, -1e30f);
+
+    /**
+     * Creates a debug shape from the given collision shape. This is mostly used internally.<br>
+     * To attach a debug shape to a physics object, call <code>attachDebugShape(AssetManager manager);</code> on it.
+     * @param collisionShape
+     * @return
+     */
+    public static Spatial getDebugShape(CollisionShape collisionShape) {
+        if (collisionShape == null) {
+            return null;
+        }
+        Spatial debugShape;
+        if (collisionShape instanceof CompoundCollisionShape) {
+            CompoundCollisionShape shape = (CompoundCollisionShape) collisionShape;
+            List<ChildCollisionShape> children = shape.getChildren();
+            Node node = new Node("DebugShapeNode");
+            for (Iterator<ChildCollisionShape> it = children.iterator(); it.hasNext();) {
+                ChildCollisionShape childCollisionShape = it.next();
+                CollisionShape ccollisionShape = childCollisionShape.shape;
+                Geometry geometry = createDebugShape(ccollisionShape);
+
+                // apply translation
+                geometry.setLocalTranslation(childCollisionShape.location);
+
+                // apply rotation
+                TempVars vars = TempVars.get();
+                Matrix3f tempRot = vars.tempMat3;
+
+                tempRot.set(geometry.getLocalRotation());
+                childCollisionShape.rotation.mult(tempRot, tempRot);
+                geometry.setLocalRotation(tempRot);
+                geometry.setLocalScale(ccollisionShape.getScale());
+
+                vars.release();
+
+                node.attachChild(geometry);
+            }
+            debugShape = node;
+        } else {
+            debugShape = createDebugShape(collisionShape);
+        }
+        if (debugShape == null) {
+            return null;
+        }
+        debugShape.updateGeometricState();
+        return debugShape;
+    }
+
+    private static Geometry createDebugShape(CollisionShape shape) {
+        Geometry geom = new Geometry();
+        geom.setMesh(DebugShapeFactory.getDebugMesh(shape));
+        //        geom.setLocalScale(shape.getScale());
+        geom.updateModelBound();
+        return geom;
+    }
+
+    public static Mesh getDebugMesh(CollisionShape shape) {
+        Mesh mesh = new Mesh();
+        DebugMeshCallback callback = new DebugMeshCallback();
+        /*
+         * Populate the mesh based on an unscaled shape;
+         * the shape's scale will be applied later, to the geometry.
+         */
+        Vector3f savedScale = shape.getScale().clone();
+        shape.setScale(Vector3f.UNIT_XYZ);
+        getVertices(shape.getObjectId(), callback);
+        shape.setScale(savedScale);
+
+        mesh.setBuffer(Type.Position, 3, callback.getVertices());
+        mesh.getFloatBuffer(Type.Position).clear();
+        return mesh;
+    }
+
+    private static native void getVertices(long shapeId, DebugMeshCallback buffer);
+}

src/main/java/com/ss/editor/part3d/editor/impl/scene/AbstractSceneEditor3DPart.java

@@ -2,8 +2,6 @@
 
 import static com.ss.editor.util.NodeUtils.findParent;
 import static com.ss.rlib.util.ObjectUtils.notNull;
-import static java.util.stream.Collectors.toMap;
-
 import com.jme3.app.state.AppState;
 import com.jme3.asset.AssetManager;
 import com.jme3.asset.AssetNotFoundException;
@@ -82,6 +80,7 @@ public abstract class AbstractSceneEditor3DPart<T extends AbstractSceneFileEdito
     public static final String KEY_IGNORE_RAY_CAST = "jMB.sceneEditor.ignoreRayCast";
     public static final String KEY_MODEL_NODE = "jMB.sceneEditor.modelNode";
     public static final String KEY_SHAPE_CENTER = "jMB.sceneEditor.shapeCenter";
+    public static final String KEY_SHAPE_INIT_SCALE = "jMB.sceneEditor.initScale";
 
     private static final String KEY_S = "SSEditor.sceneEditorState.S";
     private static final String KEY_G = "SSEditor.sceneEditorState.G";
@@ -211,7 +210,7 @@ public static void registerPostTransformHandler(@NotNull final Consumer<Spatial>
      * The selection models of selected models.
      */
     @NotNull
-    private final ObjectDictionary<Spatial, Spatial> selectionShape;
+    private final ObjectDictionary<Spatial, Geometry> selectionShape;
 
     /**
      * The array of selected models.
@@ -873,8 +872,8 @@ protected void postCameraUpdate(final float tpf) {
 
             state.updateTransformNode(spatial.getWorldTransform());
 
-            final ObjectDictionary<Spatial, Spatial> selectionShape = state.getSelectionShape();
-            final Spatial shape = selectionShape.get(spatial);
+            final ObjectDictionary<Spatial, Geometry> selectionShape = state.getSelectionShape();
+            final Geometry shape = selectionShape.get(spatial);
             if (shape == null) {
                 return;
             }
@@ -883,13 +882,31 @@ protected void postCameraUpdate(final float tpf) {
             position.set(spatial.getWorldTranslation());
 
             final Vector3f center = shape.getUserData(KEY_SHAPE_CENTER);
+            final Vector3f initScale = shape.getUserData(KEY_SHAPE_INIT_SCALE);
 
             if (center != null) {
+
+                if (!initScale.equals(spatial.getLocalScale())) {
+
+                    initScale.set(spatial.getLocalScale());
+
+                    NodeUtils.updateWorldBound(spatial);
+
+                    final BoundingBox bound = (BoundingBox) spatial.getWorldBound();
+                    bound.getCenter().subtract(spatial.getWorldTranslation(), center);
+
+                    final WireBox mesh = (WireBox) shape.getMesh();
+                    mesh.updatePositions(bound.getXExtent(), bound.getYExtent(), bound.getZExtent());
+                }
+
                 position.addLocal(center);
+
+            } else {
+                shape.setLocalRotation(spatial.getWorldRotation());
+                shape.setLocalScale(spatial.getWorldScale());
             }
 
             shape.setLocalTranslation(position);
-            shape.setLocalRotation(spatial.getWorldRotation());
         });
 
         transformToolNode.detachAllChildren();
@@ -1028,7 +1045,7 @@ private void updateTransformNode(@Nullable final Transform transform) {
      * @return the selection models of selected models.
      */
     @FromAnyThread
-    private @NotNull ObjectDictionary<Spatial, Spatial> getSelectionShape() {
+    private @NotNull ObjectDictionary<Spatial, Geometry> getSelectionShape() {
         return selectionShape;
     }
 
@@ -1213,7 +1230,7 @@ private void addToSelection(@NotNull final Spatial spatial) {
             return;
         }
 
-        Spatial shape;
+        Geometry shape;
 
         if (spatial instanceof ParticleEmitter) {
             shape = buildBoxSelection(spatial);
@@ -1232,7 +1249,7 @@ private void addToSelection(@NotNull final Spatial spatial) {
             toolNode.attachChild(shape);
         }
 
-        final ObjectDictionary<Spatial, Spatial> selectionShape = getSelectionShape();
+        final ObjectDictionary<Spatial, Geometry> selectionShape = getSelectionShape();
         selectionShape.put(spatial, shape);
     }
 
@@ -1244,7 +1261,7 @@ private void removeFromSelection(@NotNull final Spatial spatial) {
         setTransformCenter(null);
         setToTransform(null);
 
-        final ObjectDictionary<Spatial, Spatial> selectionShape = getSelectionShape();
+        final ObjectDictionary<Spatial, Geometry> selectionShape = getSelectionShape();
 
         final Spatial shape = selectionShape.remove(spatial);
         if (shape != null) {
@@ -1260,7 +1277,7 @@ private void removeFromSelection(@NotNull final Spatial spatial) {
      * Build the selection box for the spatial.
      */
     @JmeThread
-    private Spatial buildBoxSelection(@NotNull final Spatial spatial) {
+    private Geometry buildBoxSelection(@NotNull final Spatial spatial) {
         NodeUtils.updateWorldBound(spatial);
 
         final BoundingVolume bound = spatial.getWorldBound();
@@ -1269,11 +1286,13 @@ private Spatial buildBoxSelection(@NotNull final Spatial spatial) {
 
             final BoundingBox boundingBox = (BoundingBox) bound;
             final Vector3f center = boundingBox.getCenter().subtract(spatial.getWorldTranslation());
+            final Vector3f initScale = spatial.getLocalScale().clone();
 
             final Geometry geometry = WireBox.makeGeometry(boundingBox);
             geometry.setName("SelectionShape");
             geometry.setMaterial(getSelectionMaterial());
             geometry.setUserData(KEY_SHAPE_CENTER, center);
+            geometry.setUserData(KEY_SHAPE_INIT_SCALE, initScale);
 
             final Vector3f position = geometry.getLocalTranslation();
             position.addLocal(center);
@@ -1308,10 +1327,12 @@ private Spatial buildBoxSelection(@NotNull final Spatial spatial) {
      * Build selection grid for the geometry.
      */
     @JmeThread
-    private Spatial buildGeometrySelection(@NotNull final Geometry geom) {
+    private Geometry buildGeometrySelection(@NotNull final Geometry geom) {
 
         final Mesh mesh = geom.getMesh();
-        if (mesh == null) return null;
+        if (mesh == null) {
+            return null;
+        }
 
         final Geometry geometry = new Geometry("SelectionShape", mesh);
         geometry.setMaterial(getSelectionMaterial());
@@ -1380,7 +1401,7 @@ private void updateShowSelectionImpl(final boolean showSelection) {
             return;
         }
 
-        final ObjectDictionary<Spatial, Spatial> selectionShape = getSelectionShape();
+        final ObjectDictionary<Spatial, Geometry> selectionShape = getSelectionShape();
         final Node toolNode = getToolNode();
 
         if (showSelection && !selectionShape.isEmpty()) {