finished implementing improvements with layers.

JavaSaBr · JavaSaBr · commit 8a95a2466ff0 · 2017-02-04T21:03:11.000+03:00
diff --git a/src/com/ss/editor/ui/component/editor/impl/scene/AbstractSceneFileEditor.java b/src/com/ss/editor/ui/component/editor/impl/scene/AbstractSceneFileEditor.java
@@ -679,6 +679,12 @@ public void selectNodeFromTree(@Nullable final Object object) {
             final ModelNode parentNode = modelNode.getParent();
             parent = parentNode == null ? null : parentNode.getElement();
             element = modelNode.getElement();
+        } else {
+            element = object;
+        }
+
+        if (element instanceof SceneLayer || element instanceof SceneNode) {
+            element = null;
         }
 
         Spatial spatial = null;
diff --git a/src/com/ss/editor/ui/component/editor/impl/scene/SceneFileEditor.java b/src/com/ss/editor/ui/component/editor/impl/scene/SceneFileEditor.java
@@ -289,12 +289,11 @@ private void selectAppStateFromList(@Nullable final EditableSceneAppState appSta
             final FilterList filterList = getFilterList();
             filterList.clearSelection();
 
+            super.selectNodeFromTree(appState);
+
         } finally {
             setNeedSyncSelection(true);
         }
-
-        final ModelPropertyEditor modelPropertyEditor = getModelPropertyEditor();
-        modelPropertyEditor.buildFor(appState, null);
     }
 
     /**
@@ -316,8 +315,7 @@ private void selectFilterFromList(@Nullable final EditableSceneFilter<?> sceneFi
             final AppStateList appStateList = getAppStateList();
             appStateList.clearSelection();
 
-            final ModelPropertyEditor modelPropertyEditor = getModelPropertyEditor();
-            modelPropertyEditor.buildFor(sceneFilter, null);
+            super.selectNodeFromTree(sceneFilter);
 
         } finally {
             setNeedSyncSelection(true);
@@ -343,8 +341,7 @@ private void selectNodeFromLayersTree(@Nullable final Object object) {
             final FilterList filterList = getFilterList();
             filterList.clearSelection();
 
-            final ModelPropertyEditor modelPropertyEditor = getModelPropertyEditor();
-            modelPropertyEditor.buildFor(object, null);
+            super.selectNodeFromTree(object);
 
         } finally {
             setNeedSyncSelection(true);
@@ -353,8 +350,6 @@ private void selectNodeFromLayersTree(@Nullable final Object object) {
 
     @Override
     public void selectNodeFromTree(@Nullable final Object object) {
-        super.selectNodeFromTree(object);
-
         if (!isNeedSyncSelection()) return;
 
         setNeedSyncSelection(false);
@@ -369,6 +364,8 @@ public void selectNodeFromTree(@Nullable final Object object) {
             final FilterList filterList = getFilterList();
             filterList.clearSelection();
 
+            super.selectNodeFromTree(object);
+
         } finally {
             setNeedSyncSelection(true);
         }
diff --git a/src/com/ss/editor/ui/control/layer/LayerNodeTreeCell.java b/src/com/ss/editor/ui/control/layer/LayerNodeTreeCell.java
@@ -1,8 +1,15 @@
 package com.ss.editor.ui.control.layer;
 
+import static java.util.Objects.requireNonNull;
+import com.jme3.scene.Spatial;
+import com.ss.editor.model.undo.editor.ModelChangeConsumer;
 import com.ss.editor.model.undo.editor.SceneChangeConsumer;
+import com.ss.editor.ui.control.layer.node.SceneLayerModelNode;
+import com.ss.editor.ui.control.model.property.operation.ModelPropertyOperation;
 import com.ss.editor.ui.control.tree.AbstractNodeTreeCell;
-
+import com.ss.editor.ui.control.tree.node.ModelNode;
+import com.ss.extension.scene.SceneLayer;
+import javafx.scene.control.TreeItem;
 import org.jetbrains.annotations.NotNull;
 
 /**
@@ -12,7 +19,35 @@
  */
 public class LayerNodeTreeCell extends AbstractNodeTreeCell<SceneChangeConsumer, LayerNodeTree> {
 
-    public LayerNodeTreeCell(@NotNull final LayerNodeTree nodeTree) {
+    LayerNodeTreeCell(@NotNull final LayerNodeTree nodeTree) {
         super(nodeTree);
     }
+
+    @Override
+    protected boolean processDragDropped(@NotNull final TreeItem<ModelNode<?>> dragTreeItem,
+                                         @NotNull final ModelNode<?> dragItem, @NotNull final ModelNode<?> item,
+                                         final boolean isCopy, @NotNull final TreeItem<ModelNode<?>> newParentItem,
+                                         @NotNull final Object element) {
+
+        final ModelNode<?> newParent = newParentItem.getValue();
+
+        if (element instanceof Spatial && newParent instanceof SceneLayerModelNode) {
+
+            final LayerNodeTree nodeTree = getNodeTree();
+            final ModelChangeConsumer changeConsumer = requireNonNull(nodeTree.getChangeConsumer());
+
+            final Spatial spatial = (Spatial) element;
+            final SceneLayer targetLayer = ((SceneLayerModelNode) newParent).getElement();
+            final SceneLayer currentLayer = SceneLayer.getLayer(spatial);
+
+            final ModelPropertyOperation<Spatial, SceneLayer> operation =
+                    new ModelPropertyOperation<>(spatial, SceneLayer.KEY, targetLayer, currentLayer);
+            operation.setApplyHandler((sp, layer) -> SceneLayer.setLayer(layer, sp));
+
+            changeConsumer.execute(operation);
+            return false;
+        }
+
+        return super.processDragDropped(dragTreeItem, dragItem, item, isCopy, newParentItem, element);
+    }
 }
diff --git a/src/com/ss/editor/ui/control/layer/node/SceneLayerModelNode.java b/src/com/ss/editor/ui/control/layer/node/SceneLayerModelNode.java
@@ -1,13 +1,13 @@
 package com.ss.editor.ui.control.layer.node;
 
 import static java.util.Objects.requireNonNull;
-
 import com.jme3.scene.Spatial;
 import com.ss.editor.model.undo.editor.ChangeConsumer;
 import com.ss.editor.model.undo.editor.ModelChangeConsumer;
 import com.ss.editor.model.undo.editor.SceneChangeConsumer;
 import com.ss.editor.ui.Icons;
 import com.ss.editor.ui.control.model.node.spatial.NodeModelNode;
+import com.ss.editor.ui.control.model.node.spatial.SpatialModelNode;
 import com.ss.editor.ui.control.model.tree.action.RenameNodeAction;
 import com.ss.editor.ui.control.model.tree.action.operation.RenameNodeOperation;
 import com.ss.editor.ui.control.model.tree.action.operation.scene.ChangeVisibleSceneLayerOperation;
@@ -17,18 +17,14 @@
 import com.ss.editor.ui.control.tree.node.ModelNode;
 import com.ss.editor.ui.control.tree.node.ModelNodeFactory;
 import com.ss.extension.scene.SceneLayer;
-
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
 import javafx.collections.ObservableList;
 import javafx.scene.control.MenuItem;
 import javafx.scene.image.Image;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import rlib.util.array.Array;
 import rlib.util.array.ArrayFactory;
 
-import java.util.concurrent.atomic.AtomicInteger;
-
 /**
  * The implementation of the {@link NodeModelNode} for representing the {@link SceneLayer} in the editor.
  *
@@ -74,7 +70,7 @@ public Array<ModelNode<?>> getChildren(@NotNull final AbstractNodeTree<?> nodeTr
 
         final Array<ModelNode<?>> result = ArrayFactory.newArray(ModelNode.class);
         final ModelChangeConsumer changeConsumer = (ModelChangeConsumer) requireNonNull(nodeTree.getChangeConsumer());
-        
+
         final Spatial currentModel = changeConsumer.getCurrentModel();
         currentModel.depthFirstTraversal(spatial -> {
             final SceneLayer layer = SceneLayer.getLayer(spatial);
@@ -86,6 +82,14 @@ public Array<ModelNode<?>> getChildren(@NotNull final AbstractNodeTree<?> nodeTr
         return result;
     }
 
+    @Override
+    public boolean canAccept(@NotNull final ModelNode<?> child) {
+        if (!(child instanceof SpatialModelNode<?>)) return false;
+        final SpatialModelNode<?> spatialNode = (SpatialModelNode<?>) child;
+        final Spatial element = spatialNode.getElement();
+        return SceneLayer.getLayer(element) != getElement();
+    }
+
     @NotNull
     @Override
     public String getName() {
diff --git a/src/com/ss/editor/ui/control/model/node/spatial/SpatialModelNode.java b/src/com/ss/editor/ui/control/model/node/spatial/SpatialModelNode.java
@@ -49,7 +49,7 @@
  */
 public class SpatialModelNode<T extends Spatial> extends ModelNode<T> {
 
-    public SpatialModelNode(@NotNull final T element, final long objectId) {
+    SpatialModelNode(@NotNull final T element, final long objectId) {
         super(element, objectId);
     }
 
diff --git a/src/com/ss/editor/ui/control/model/property/ModelPropertyEditor.java b/src/com/ss/editor/ui/control/model/property/ModelPropertyEditor.java
@@ -7,6 +7,7 @@
 import com.ss.editor.util.NodeUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import rlib.ui.util.FXUtils;
 import tonegod.emitter.ParticleEmitterNode;
 import tonegod.emitter.node.ParticleNode;
 
diff --git a/src/com/ss/editor/ui/control/model/property/builder/impl/SpatialPropertyBuilder.java b/src/com/ss/editor/ui/control/model/property/builder/impl/SpatialPropertyBuilder.java
@@ -134,6 +134,18 @@ protected void buildForImpl(@NotNull final Object object, @Nullable final Object
         final Collection<String> userDataKeys = spatial.getUserDataKeys();
         if (userDataKeys.isEmpty()) return;
 
+        int count = 0;
+
+        for (final String key : userDataKeys) {
+            if (SceneLayer.KEY.equals(key)) continue;
+            if (SceneEditorControl.LOADED_MODEL_KEY.equals(key)) continue;
+            count++;
+        }
+
+        if(count < 1) {
+            return;
+        }
+
         addSplitLine(container);
 
         final Array<String> sortedKeys = ArrayFactory.newSortedArray(String.class);
diff --git a/src/com/ss/editor/ui/control/model/tree/ModelNodeTreeCell.java b/src/com/ss/editor/ui/control/model/tree/ModelNodeTreeCell.java
@@ -1,5 +1,6 @@
 package com.ss.editor.ui.control.model.tree;
 
+import static java.util.Objects.requireNonNull;
 import com.jme3.scene.Node;
 import com.jme3.scene.Spatial;
 import com.ss.editor.model.undo.editor.ModelChangeConsumer;
@@ -20,7 +21,7 @@
  */
 public class ModelNodeTreeCell extends AbstractNodeTreeCell<ModelChangeConsumer, ModelNodeTree> {
 
-    public ModelNodeTreeCell(@NotNull final ModelNodeTree nodeTree) {
+    ModelNodeTreeCell(@NotNull final ModelNodeTree nodeTree) {
         super(nodeTree);
     }
 
@@ -32,7 +33,7 @@ protected boolean processDragDropped(@NotNull final TreeItem<ModelNode<?>> dragT
         if (element instanceof Spatial) {
 
             final ModelNodeTree nodeTree = getNodeTree();
-            final ModelChangeConsumer changeConsumer = Objects.requireNonNull(nodeTree.getChangeConsumer());
+            final ModelChangeConsumer changeConsumer = requireNonNull(nodeTree.getChangeConsumer());
 
             final TreeItem<ModelNode<?>> parent = dragTreeItem.getParent();
 
diff --git a/src/com/ss/editor/ui/control/tree/AbstractNodeTreeCell.java b/src/com/ss/editor/ui/control/tree/AbstractNodeTreeCell.java
@@ -55,7 +55,7 @@ public abstract class AbstractNodeTreeCell<C extends ChangeConsumer, M extends A
 
     private static final Insets VISIBLE_ICON_OFFSET = new Insets(0, 0, 0, 2);
 
-    public final StringConverter<ModelNode<?>> stringConverter = new StringConverter<ModelNode<?>>() {
+    private final StringConverter<ModelNode<?>> stringConverter = new StringConverter<ModelNode<?>>() {
 
         @Override
         public String toString(@NotNull final ModelNode<?> object) {
@@ -185,14 +185,14 @@ public void startEdit() {
     /**
      * @return true if need to ignore update.
      */
-    public boolean isIgnoreUpdate() {
+    private boolean isIgnoreUpdate() {
         return ignoreUpdate;
     }
 
     /**
      * @param ignoreUpdate the flag of ignoring updates.
      */
-    public void setIgnoreUpdate(final boolean ignoreUpdate) {
+    private void setIgnoreUpdate(final boolean ignoreUpdate) {
         this.ignoreUpdate = ignoreUpdate;
     }
 
@@ -205,7 +205,7 @@ public void cancelEdit() {
     }
 
     @Override
-    public void commitEdit(final ModelNode<?> newValue) {
+    public void commitEdit(@NotNull final ModelNode<?> newValue) {
         super.commitEdit(newValue);
         final TreeItem<ModelNode<?>> treeItem = getTreeItem();
         if (treeItem != null) treeItem.setGraphic(content);
@@ -273,7 +273,7 @@ protected M getNodeTree() {
     /**
      * Handle a mouse click.
      */
-    private void processClick(final MouseEvent event) {
+    private void processClick(@NotNull final MouseEvent event) {
 
         final ModelNode<?> item = getItem();
         if (item == null) return;
@@ -291,7 +291,7 @@ private void processClick(final MouseEvent event) {
     /**
      * Handle stopping dragging.
      */
-    private void stopDrag(final DragEvent event) {
+    private void stopDrag(@NotNull final DragEvent event) {
         setId(CSSIds.MODEL_NODE_TREE_CELL);
         setCursor(Cursor.DEFAULT);
         event.consume();
@@ -300,7 +300,7 @@ private void stopDrag(final DragEvent event) {
     /**
      * Handle starting dragging.
      */
-    private void startDrag(final MouseEvent mouseEvent) {
+    private void startDrag(@NotNull final MouseEvent mouseEvent) {
 
         final ModelNode<?> item = getItem();
         if (item == null) return;
@@ -328,7 +328,7 @@ private void startDrag(final MouseEvent mouseEvent) {
     /**
      * Handle dropping a dragged element.
      */
-    protected void dragDropped(@NotNull final DragEvent dragEvent) {
+    private void dragDropped(@NotNull final DragEvent dragEvent) {
 
         final Dragboard dragboard = dragEvent.getDragboard();
         final Long objectId = (Long) dragboard.getContent(DATA_FORMAT);
@@ -376,14 +376,11 @@ protected boolean processDragDropped(@NotNull final TreeItem<ModelNode<?>> dragT
     /**
      * Handle entering a dragged element.
      */
-    private void dragOver(final DragEvent dragEvent) {
+    private void dragOver(@NotNull final DragEvent dragEvent) {
 
         final Dragboard dragboard = dragEvent.getDragboard();
         final Long objectId = (Long) dragboard.getContent(DATA_FORMAT);
-
-        if (objectId == null) {
-            return;
-        }
+        if (objectId == null) return;
 
         final TreeView<ModelNode<?>> treeView = getTreeView();
         final TreeItem<ModelNode<?>> dragTreeItem = findItem(treeView, objectId);
@@ -405,7 +402,7 @@ private void dragOver(final DragEvent dragEvent) {
     /**
      * Handle exiting a dragged element.
      */
-    private void dragExited(final DragEvent dragEvent) {
+    private void dragExited(@NotNull final DragEvent dragEvent) {
         setId(CSSIds.MODEL_NODE_TREE_CELL);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@`
`49`	`49`	`*/`
`50`	`50`	`public class SpatialModelNode<T extends Spatial> extends ModelNode<T> {`
`51`	`51`
`52`		`- public SpatialModelNode(@NotNull final T element, final long objectId) {`
	`52`	`+ SpatialModelNode(@NotNull final T element, final long objectId) {`
`53`	`53`	`super(element, objectId);`
`54`	`54`	`}`
`55`	`55`