fixed selecting nodes from scene when opened other editor tools.

Author: JavaSaBr

src/main/java/com/ss/editor/model/EditorCamera.java

@@ -452,9 +452,13 @@ protected void verticalRotateCamera(final float value) {
      * @param tpf the tpf
      */
     public void updateCamera(float tpf) {
-        if (!enabled) return;
 
-        targetLocation.set(target.getWorldTranslation()).addLocal(lookAtOffset);
+        if (!enabled) {
+            return;
+        }
+
+        targetLocation.set(target.getWorldTranslation())
+                .addLocal(lookAtOffset);
 
         if (smoothMotion) {
 

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

@@ -2010,16 +2010,46 @@ public void moveCameraTo(@NotNull final Vector3f location) {
     }
 
     /**
-     * Look at the position from the camera.
+     * Look at the spatial.
      *
-     * @param location the location.
+     * @param spatial the spatial.
      */
     @FromAnyThread
-    public void cameraLookAt(@NotNull final Vector3f location) {
+    public void cameraLookAt(@NotNull final Spatial spatial) {
         EXECUTOR_MANAGER.addJmeTask(() -> {
+
             final EditorCamera editorCamera = notNull(getEditorCamera());
-            editorCamera.setTargetDistance(location.distance(getCamera().getLocation()));
-            getNodeForCamera().setLocalTranslation(location);
+
+            final LocalObjects local = LocalObjects.get();
+            float distance;
+
+            final BoundingVolume worldBound = spatial.getWorldBound();
+
+            if (worldBound != null) {
+                distance = worldBound.getVolume();
+
+                if (worldBound instanceof BoundingBox) {
+                    final BoundingBox boundingBox = (BoundingBox) worldBound;
+                    distance = boundingBox.getXExtent();
+                    distance = Math.max(distance, boundingBox.getYExtent());
+                    distance = Math.max(distance, boundingBox.getZExtent());
+                    distance *= 2F;
+                } else if (worldBound instanceof BoundingSphere) {
+                    distance = ((BoundingSphere) worldBound).getRadius() * 2F;
+                }
+
+            } else {
+
+               distance = getCamera().getLocation()
+                       .distance(spatial.getWorldTranslation());
+            }
+
+            editorCamera.setTargetDistance(distance);
+
+            final Vector3f position = local.nextVector()
+                    .set(spatial.getWorldTranslation());
+
+            getNodeForCamera().setLocalTranslation(position);
         });
     }
 

src/main/java/com/ss/editor/plugin/api/editor/Advanced3DFileEditorWithRightTool.java

@@ -64,7 +64,9 @@ protected void createContent(@NotNull final StackPane root) {
         editorToolComponent.addChangeListener((observable, oldValue, newValue) -> processChangeTool(oldValue, newValue));
         editorToolComponent.getSelectionModel().selectedIndexProperty().addListener((observable, oldValue, newValue) -> {
             final S editorState = getEditorState();
-            if (editorState != null) editorState.setOpenedTool(newValue.intValue());
+            if (editorState != null) {
+                editorState.setOpenedTool(newValue.intValue());
+            }
         });
 
         mainSplitContainer.initFor(editorToolComponent, getEditorAreaPane());
@@ -112,8 +114,10 @@ protected void loadState() {
             return;
         }
 
-        editorToolComponent.getSelectionModel().select(editorState.getOpenedTool());
-        mainSplitContainer.updateFor(editorState);
+        getEditorToolComponent().getSelectionModel()
+                .select(editorState.getOpenedTool());
+
+        getMainSplitContainer().updateFor(editorState);
     }
 
     @Override
@@ -123,13 +127,35 @@ protected void loadState() {
     }
 
     /**
+     * Get the pane of editor area.
+     *
      * @return the pane of editor area.
      */
     @FxThread
     protected @NotNull StackPane getEditorAreaPane() {
         return notNull(editorAreaPane);
     }
 
+    /**
+     * Get the editor tool component.
+     *
+     * @return the editor tool component.
+     */
+    @FxThread
+    protected @NotNull ScrollableEditorToolComponent getEditorToolComponent() {
+        return notNull(editorToolComponent);
+    }
+
+    /**
+     * Get the main split container.
+     *
+     * @return the main split container.
+     */
+    @FxThread
+    protected @NotNull EditorToolSplitPane getMainSplitContainer() {
+        return notNull(mainSplitContainer);
+    }
+
     /**
      * Create and add tool components to the container.
      *

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

@@ -106,8 +106,9 @@
 public abstract class AbstractSceneFileEditor<M extends Spatial, MA extends AbstractSceneEditor3DPart, ES extends BaseEditorSceneEditorState> extends
         Advanced3DFileEditorWithSplitRightTool<MA, ES> implements ModelChangeConsumer, ModelEditingProvider {
 
-    private static final int OBJECTS_TOOL = 0;
-    private static final int PAINTING_TOOL = 1;
+    protected static final int OBJECTS_TOOL = 0;
+    protected static final int PAINTING_TOOL = 1;
+    protected static final int SCRIPTING_TOOL = 2;
 
     @NotNull
     private static final Array<String> ACCEPTED_FILES = ArrayFactory.asArray(
@@ -727,13 +728,31 @@ public void notifySelected(@Nullable Object object) {
 
         setIgnoreCameraMove(true);
         try {
+
             final ModelNodeTree modelNodeTree = getModelNodeTree();
             modelNodeTree.selectSingle(object);
+
+            final SingleSelectionModel<Tab> selectionModel = getEditorToolComponent().getSelectionModel();
+            if (isNeedToOpenObjectsTool(selectionModel.getSelectedIndex())) {
+                selectionModel.select(OBJECTS_TOOL);
+            }
+
         } finally {
             setIgnoreCameraMove(false);
         }
     }
 
+    /**
+     * Return true if need to open objects tool.
+     *
+     * @param current the current opened tool.
+     * @return true if need to open objects tool.
+     */
+    @FxThread
+    protected boolean isNeedToOpenObjectsTool(final int current) {
+        return !(current == OBJECTS_TOOL || current == SCRIPTING_TOOL);
+    }
+
     /**
      * Return true of the spatial can be selected.
      *
@@ -880,14 +899,12 @@ protected void singleSelectNodesFromTree(@NotNull final Array<?> objects, @NotNu
             spatial = null;
         }
 
-        if (spatial != null) {
+        if (spatial != null && canSelect(spatial)) {
 
-            if (canSelect(spatial)) {
-                editor3DPart.select(spatial);
-            }
+            editor3DPart.select(spatial);
 
             if (!isIgnoreCameraMove() && !isVisibleOnEditor(spatial)) {
-                editor3DPart.cameraLookAt(spatial.getWorldTranslation());
+                editor3DPart.cameraLookAt(spatial);
             }
         }
 
@@ -1322,7 +1339,7 @@ private void addNewModel(@NotNull final DragEvent dragEvent, @NotNull final Path
                     camera.getHeight() - (float) areaPoint.getY());
             final Vector3f result = local.nextVector(scenePoint)
                     .subtractLocal(parent.getWorldTranslation());
-            
+
             final boolean isPhysics = NodeUtils.children(loadedModel)
                     .flatMap(ControlUtils::controls)
                     .anyMatch(PhysicsControl.class::isInstance);

src/main/java/com/ss/editor/ui/component/editor/impl/scene/SceneFileEditor.java

@@ -253,6 +253,12 @@ private void updateVisibility(@NotNull final Spatial spatial) {
         return notNull(propertyEditorFiltersContainer);
     }
 
+    @Override
+    @FxThread
+    protected boolean isNeedToOpenObjectsTool(final int current) {
+        return !(current == OBJECTS_TOOL || current == LAYERS_TOOL || current == SCRIPTING_TOOL);
+    }
+
     /**
      * Get the container of property editor in app states tool.
      *