Merge remote-tracking branch 'github/develop' into develop

Author: JavaSaBr

build.gradle

@@ -28,7 +28,7 @@ ext.applicationMainClass = "com.ss.editor.JfxApplication"
 ext.applicationVendor = "[email protected]"
 ext.applicationTitle = "jMonkeyBuilder"
 ext.jmeVersion = "v3.3.dev-SNAPSHOT"
-ext.jmbExtVersion = "2.1.0"
+ext.jmbExtVersion = "develop-SNAPSHOT"
 ext.jme3_xbuf_version = '0.9.1'
 ext.junitPlatformVersion = "1.0.0"
 ext.junitJupiterVersion = "5.0.0"

embedded-plugins/jmb-tree-generator/jmb-tree-generator-1.1.0.jar renamed to embedded-plugins/jmb-tree-generator/jmb-tree-generator-1.1.1.jar

@@ -1,10 +1,7 @@
 package com.ss.editor.part3d.editor.impl.scene.handler;
 
-import com.jme3.bullet.control.PhysicsControl;
-import com.jme3.bullet.control.RigidBodyControl;
 import com.jme3.scene.Spatial;
-import com.ss.editor.util.ControlUtils;
-import com.ss.editor.util.NodeUtils;
+import com.ss.editor.extension.util.JmbExtUtils;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.function.Consumer;
@@ -18,22 +15,6 @@ public class PhysicsControlTransformationHandler implements Consumer<Spatial> {
 
     @Override
     public void accept(@NotNull final Spatial spatial) {
-        NodeUtils.children(spatial)
-            .flatMap(ControlUtils::controls)
-            .filter(PhysicsControl.class::isInstance)
-            .filter(ControlUtils::isEnabled)
-            .forEach(control -> {
-                if (control instanceof RigidBodyControl) {
-                    final RigidBodyControl bodyControl = (RigidBodyControl) control;
-                    final boolean kinematic = bodyControl.isKinematic();
-                    final boolean kinematicSpatial = bodyControl.isKinematicSpatial();
-                    bodyControl.setKinematic(true);
-                    bodyControl.setKinematicSpatial(true);
-                    bodyControl.clearForces();
-                    bodyControl.update(0);
-                    bodyControl.setKinematic(kinematic);
-                    bodyControl.setKinematicSpatial(kinematicSpatial);
-                }
-            });
+        JmbExtUtils.resetPhysicsControlPositions(spatial);
     }
 }

src/main/java/com/ss/editor/part3d/editor/impl/scene/handler/PhysicsControlTransformationHandler.java

@@ -23,6 +23,7 @@ public void accept(@NotNull final Spatial spatial) {
                 .filter(RigidBodyControl.class::isInstance)
                 .map(RigidBodyControl.class::cast)
                 .filter(RigidBodyControl::isEnabled)
+                .filter(control -> Float.compare(control.getMass(), 0.0F) != 0)
                 .filter(control -> !control.isActive())
                 .forEach(PhysicsRigidBody::activate);
     }

src/main/java/com/ss/editor/part3d/editor/impl/scene/handler/ReactivatePhysicsControlsTransformationHandler.java

@@ -44,19 +44,6 @@
 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.
      */
@@ -156,7 +143,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 MaterialSettingsNodeTree<>(this::selectedFromTree, getChangeConsumer());
+        settingsTree = new NodeTree<>(this::selectedFromTree, getChangeConsumer(), SelectionMode.SINGLE);
         propertyEditor = new PropertyEditor<>(getChangeConsumer());
         propertyEditor.prefHeightProperty().bind(root.heightProperty());
 

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

@@ -27,12 +27,6 @@ public LayerNodeTree(@NotNull final Consumer<Array<Object>> selectionHandler, @N
         super(selectionHandler, consumer);
     }
 
-    @Override
-    @FxThread
-    protected @NotNull SelectionMode getSelectionMode() {
-        return SelectionMode.SINGLE;
-    }
-
     @Override
     @FxThread
     protected @NotNull NodeTreeCell<SceneChangeConsumer, ?> createNodeTreeCell() {

src/main/java/com/ss/editor/ui/control/layer/LayerNodeTree.java

@@ -4,6 +4,7 @@
 import com.ss.editor.ui.control.tree.NodeTree;
 import com.ss.editor.ui.control.tree.action.impl.multi.RemoveElementsAction;
 import com.ss.rlib.util.array.Array;
+import javafx.scene.control.SelectionMode;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -22,6 +23,6 @@ public class ModelNodeTree extends NodeTree<ModelChangeConsumer> {
 
     public ModelNodeTree(@NotNull final Consumer<Array<Object>> selectionHandler,
                          @Nullable final ModelChangeConsumer consumer) {
-        super(selectionHandler, consumer);
+        super(selectionHandler, consumer, SelectionMode.MULTIPLE);
     }
 }

src/main/java/com/ss/editor/ui/control/model/ModelNodeTree.java

@@ -33,9 +33,9 @@
 /**
  * The base implementation of the property control.
  *
- * @param <C> the type of a change consumer
- * @param <D> the type of an editing object
- * @param <T> the type of an editing property
+ * @param <C> the type of a change consumer.
+ * @param <D> the type of an editing object.
+ * @param <T> the type of an editing property.
  * @author JavaSaBr
  */
 public class PropertyControl<C extends ChangeConsumer, D, T> extends VBox implements UpdatableControl {
@@ -171,10 +171,11 @@ public PropertyControl(@Nullable final T propertyValue, @NotNull final String pr
      * @return the six object consumer
      */
     @FromAnyThread
-    public @NotNull SixObjectConsumer<@NotNull C, @NotNull D, @NotNull String, @Nullable T, @Nullable T, @NotNull BiConsumer<D, T>> newChangeHandler() {
+    public @NotNull SixObjectConsumer<C, D, String, T,  T, BiConsumer<D, T>> newChangeHandler() {
         return (changeConsumer, object, propName, newValue, oldValue, handler) -> {
 
-            final PropertyOperation<ChangeConsumer, D, T> operation = new PropertyOperation<>(object, propName, newValue, oldValue);
+            final PropertyOperation<ChangeConsumer, D, T> operation =
+                new PropertyOperation<>(object, propName, newValue, oldValue);
             operation.setApplyHandler(handler);
 
             changeConsumer.execute(operation);
@@ -200,7 +201,11 @@ public void setEditObject(@NotNull final D editObject) {
     @FxThread
     public void setEditObject(@NotNull final D editObject, final boolean needReload) {
         setEditObject(editObject);
-        if (!needReload) return;
+
+        if (!needReload) {
+            return;
+        }
+
         setIgnoreListener(true);
         try {
             reload();

src/main/java/com/ss/editor/ui/control/property/PropertyControl.java

@@ -32,6 +32,7 @@
 /**
  * The implementation of the {@link PropertyControl} to edit the {@link AudioData}.
  *
+ * @param <C> the change consumer's type.
  * @author JavaSaBr
  */
 public class AudioKeyPropertyControl<C extends ChangeConsumer> extends PropertyControl<C, AudioNode, AudioKey> {
@@ -148,14 +149,18 @@ private void addAudioData(@NotNull final Path file) {
     protected void processOpen() {
 
         final AudioKey element = getPropertyValue();
-        if (element == null) return;
+        if (element == null) {
+            return;
+        }
 
         final String assetPath = element.getName();
         if (StringUtils.isEmpty(assetPath)) return;
 
         final Path assetFile = Paths.get(assetPath);
         final Path realFile = notNull(getRealFile(assetFile));
-        if (!Files.exists(realFile)) return;
+        if (!Files.exists(realFile)) {
+            return;
+        }
 
         final RequestedOpenFileEvent event = new RequestedOpenFileEvent();
         event.setFile(realFile);

src/main/java/com/ss/editor/ui/control/property/impl/AudioKeyPropertyControl.java

@@ -21,8 +21,8 @@
 /**
  * The implementation of the {@link PropertyControl} to change boolean values.
  *
- * @param <C> the type of a {@link ChangeConsumer}
- * @param <T> the type of an editing object
+ * @param <C> the type of a {@link ChangeConsumer}.
+ * @param <T> the type of an editing object.
  * @author JavaSaBr
  */
 public class BooleanPropertyControl<C extends ChangeConsumer, T> extends PropertyControl<C, T, Boolean> {