small improvements

Author: JavaSaBr

src/com/ss/editor/control/transform/SceneEditorControl.java

@@ -15,6 +15,8 @@
  */
 public interface SceneEditorControl {
 
+    public static final String LOADED_MODEL_KEY = SceneEditorControl.class.getName() + ".loadedModel";
+
     enum TransformType {
         MOVE_TOOL,
         ROTATE_TOOL,

src/com/ss/editor/state/editor/impl/model/ModelEditorUtils.java

@@ -1,5 +1,6 @@
 package com.ss.editor.state.editor.impl.model;
 
+import static com.ss.editor.control.transform.SceneEditorControl.LOADED_MODEL_KEY;
 import static com.ss.editor.util.NodeUtils.findParent;
 
 import com.jme3.scene.Geometry;
@@ -34,11 +35,19 @@ public static <T extends FileEditor & ModelChangeConsumer, M extends Spatial> Ob
         }
 
         if (object instanceof Geometry) {
-            final Spatial parent = NodeUtils.findParent((Spatial) object, 2);
+
+            final Spatial spatial = (Spatial) object;
+
+            Spatial parent = NodeUtils.findParent(spatial, 2);
+
             final EditorLightNode lightNode = parent == null ? null : state.getLightNode(parent);
             if (lightNode != null) return lightNode;
+
             final EditorAudioNode audioNode = parent == null ? null : state.getAudioNode(parent);
             if (audioNode != null) return audioNode;
+
+            parent = NodeUtils.findParent(spatial, p -> p.getUserData(LOADED_MODEL_KEY) == Boolean.TRUE);
+            if (parent != null) return parent;
         }
 
         if (object instanceof Spatial && !((Spatial) object).isVisible()) {

src/com/ss/editor/ui/component/editor/impl/scene/AbstractSceneFileEditor.java

@@ -14,13 +14,15 @@
 import com.jme3.light.Light;
 import com.jme3.material.Material;
 import com.jme3.math.Vector3f;
+import com.jme3.renderer.Camera;
 import com.jme3.scene.Geometry;
 import com.jme3.scene.Node;
 import com.jme3.scene.Spatial;
 import com.ss.editor.FileExtensions;
 import com.ss.editor.Messages;
 import com.ss.editor.annotation.FXThread;
 import com.ss.editor.annotation.FromAnyThread;
+import com.ss.editor.control.transform.SceneEditorControl;
 import com.ss.editor.control.transform.SceneEditorControl.TransformType;
 import com.ss.editor.manager.WorkspaceManager;
 import com.ss.editor.model.undo.EditorOperation;
@@ -584,22 +586,34 @@ public void selectNodeFromTree(@Nullable final Object object) {
 
         updateSelection(spatial);
 
-        if (spatial != null && !isIgnoreCameraMove()) {
+        if (spatial != null && !isIgnoreCameraMove() && !isVisibleOnEditor(spatial)) {
             editorAppState.moveCameraTo(spatial.getWorldTranslation());
         }
 
         final ModelPropertyEditor modelPropertyEditor = getModelPropertyEditor();
         modelPropertyEditor.buildFor(element, parent);
     }
 
+    protected boolean isVisibleOnEditor(@NotNull final Spatial spatial) {
+
+        final Camera camera = EDITOR.getCamera();
+
+        final Vector3f position = spatial.getWorldTranslation();
+        final Vector3f coordinates = camera.getScreenCoordinates(position, new Vector3f());
+
+        boolean invisible = coordinates.getZ() < 0;
+        invisible = invisible || !isInside(coordinates.getX(), camera.getHeight() - coordinates.getY());
+
+        return !invisible;
+    }
+
     /**
      * Update selection to 3D state.
      *
      * @param spatial the new selected object.
      */
     protected void updateSelection(@Nullable final Spatial spatial) {
 
-        //FIXME
         final Array<Spatial> selection = ArrayFactory.newArray(Spatial.class);
         if (spatial != null) selection.add(spatial);
 
@@ -826,6 +840,7 @@ protected void dragDropped(@NotNull final DragEvent dragEvent) {
             EXECUTOR_MANAGER.addEditorThreadTask(() -> {
 
                 final Spatial loadedModel = assetManager.loadModel(modelKey);
+                loadedModel.setUserData(SceneEditorControl.LOADED_MODEL_KEY, true);
                 loadedModel.setLocalTranslation(editorAppState.getCurrentCursorPosOnScene(sceneX, sceneY));
 
                 execute(new AddChildOperation(loadedModel, (Node) currentModel));

src/com/ss/editor/ui/control/model/property/builder/impl/SpatialPropertyBuilder.java

@@ -9,6 +9,7 @@
 import com.jme3.scene.Spatial;
 import com.jme3.scene.Spatial.CullHint;
 import com.ss.editor.Messages;
+import com.ss.editor.control.transform.SceneEditorControl;
 import com.ss.editor.model.undo.editor.ModelChangeConsumer;
 import com.ss.editor.model.undo.editor.SceneChangeConsumer;
 import com.ss.editor.ui.control.model.property.control.BooleanModelPropertyControl;
@@ -140,6 +141,7 @@ protected void buildForImpl(@NotNull final Object object, @Nullable final Object
 
         for (final String key : sortedKeys) {
             if (SceneLayer.KEY.equals(key)) continue;
+            if (SceneEditorControl.LOADED_MODEL_KEY.equals(key)) continue;
 
             final Object data = spatial.getUserData(key);
 

src/com/ss/editor/ui/control/tree/AbstractNodeTree.java

@@ -353,7 +353,7 @@ public void notifyAdded(@Nullable final ModelNode<?> parent, @Nullable final Mod
         parentItem.setExpanded(true);
         parent.notifyChildAdded(child);
 
-        fill(childItem, true, -1);
+        fill(childItem, false, -1);
     }
 
     /**