updated control property builder, fixed shapes of selected nodes.

Author: JavaSaBr

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

@@ -81,6 +81,7 @@ public abstract class AbstractSceneEditor3DPart<T extends AbstractSceneFileEdito
     public static final String KEY_LOADED_MODEL = "jMB.sceneEditor.loadedModel";
     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";
 
     private static final String KEY_S = "SSEditor.sceneEditorState.S";
     private static final String KEY_G = "SSEditor.sceneEditorState.G";
@@ -878,9 +879,17 @@ protected void postCameraUpdate(final float tpf) {
                 return;
             }
 
-            shape.setLocalTranslation(spatial.getWorldTranslation());
+            final Vector3f position = shape.getLocalTranslation();
+            position.set(spatial.getWorldTranslation());
+
+            final Vector3f center = shape.getUserData(KEY_SHAPE_CENTER);
+
+            if (center != null) {
+                position.addLocal(center);
+            }
+
+            shape.setLocalTranslation(position);
             shape.setLocalRotation(spatial.getWorldRotation());
-            shape.setLocalScale(spatial.getWorldScale());
         });
 
         transformToolNode.detachAllChildren();
@@ -1252,18 +1261,24 @@ private void removeFromSelection(@NotNull final Spatial spatial) {
      */
     @JmeThread
     private Spatial buildBoxSelection(@NotNull final Spatial spatial) {
-        spatial.updateModelBound();
+        NodeUtils.updateWorldBound(spatial);
 
         final BoundingVolume bound = spatial.getWorldBound();
 
         if (bound instanceof BoundingBox) {
 
             final BoundingBox boundingBox = (BoundingBox) bound;
+            final Vector3f center = boundingBox.getCenter().subtract(spatial.getWorldTranslation());
 
             final Geometry geometry = WireBox.makeGeometry(boundingBox);
             geometry.setName("SelectionShape");
             geometry.setMaterial(getSelectionMaterial());
-            geometry.setLocalTranslation(spatial.getWorldTranslation());
+            geometry.setUserData(KEY_SHAPE_CENTER, center);
+
+            final Vector3f position = geometry.getLocalTranslation();
+            position.addLocal(center);
+
+            geometry.setLocalTranslation(position);
 
             return geometry;
 

src/main/java/com/ss/editor/plugin/api/editor/material/BaseMaterialFileEditor.java

@@ -23,6 +23,7 @@
 import com.ss.editor.ui.css.CssClasses;
 import com.ss.editor.ui.util.DynamicIconSupport;
 import com.ss.rlib.ui.util.FXUtils;
+import com.ss.rlib.util.array.Array;
 import javafx.collections.ObservableList;
 import javafx.scene.control.*;
 import javafx.scene.image.ImageView;
@@ -32,6 +33,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.function.Consumer;
 import java.util.function.Supplier;
 
 /**
@@ -42,6 +44,19 @@
 public abstract class BaseMaterialFileEditor<T extends BaseMaterialEditor3DPart, S extends EditorMaterialEditorState, C extends ChangeConsumer> extends
         Advanced3DFileEditorWithSplitRightTool<T, S> {
 
+    private static class MaterialSettingsNodeTree<C extends ChangeConsumer> extends NodeTree<C> {
+
+        public MaterialSettingsNodeTree(@NotNull final Consumer<Array<Object>> selectionHandler, @Nullable final C consumer) {
+            super(selectionHandler, consumer);
+        }
+
+        @Override
+        @FxThread
+        protected @NotNull SelectionMode getSelectionMode() {
+            return SelectionMode.SINGLE;
+        }
+    }
+
     /**
      * The default state of editor light.
      */
@@ -141,7 +156,7 @@ protected boolean handleKeyActionImpl(@NotNull final KeyCode keyCode, final bool
     protected void createToolComponents(@NotNull final EditorToolComponent container, @NotNull final StackPane root) {
         super.createToolComponents(container, root);
 
-        settingsTree = new NodeTree<>(this::selectedFromTree, getChangeConsumer());
+        settingsTree = new MaterialSettingsNodeTree<>(this::selectedFromTree, getChangeConsumer());
         propertyEditor = new PropertyEditor<>(getChangeConsumer());
         propertyEditor.prefHeightProperty().bind(root.heightProperty());
 
@@ -177,12 +192,14 @@ protected void createToolComponents(@NotNull final EditorToolComponent container
     }
 
     /**
-     * Handle selected object from tree.
+     * Handle selected objects from tree.
      *
-     * @param object the selected object.
+     * @param objects the selected objects.
      */
     @FxThread
-    private void selectedFromTree(@Nullable final Object object) {
+    private void selectedFromTree(@NotNull final Array<Object> objects) {
+
+        final Object object = objects.first();
 
         Object parent = null;
         Object element;