fixed removing lights, fixed working with vector 2 parameters in material editor.

Author: JavaSaBr

src/main/java/com/ss/editor/model/node/material/MaterialSettings.java

@@ -1,6 +1,7 @@
 package com.ss.editor.model.node.material;
 
 import com.jme3.material.Material;
+import com.ss.editor.annotation.FromAnyThread;
 import org.jetbrains.annotations.NotNull;
 
 /**
@@ -20,7 +21,8 @@ public MaterialSettings(@NotNull final Material material) {
     /**
      * @return the material.
      */
-    public  @NotNull Material getMaterial() {
+    @FromAnyThread
+    public @NotNull Material getMaterial() {
         return material;
     }
 }

src/main/java/com/ss/editor/serializer/MaterialSerializer.java

@@ -6,6 +6,7 @@
 import com.jme3.material.MaterialDef;
 import com.jme3.material.RenderState;
 import com.jme3.math.ColorRGBA;
+import com.jme3.math.Vector2f;
 import com.jme3.math.Vector3f;
 import com.jme3.math.Vector4f;
 import com.jme3.shader.VarType;
@@ -95,6 +96,10 @@ private static String toString(@NotNull final VarType varType, @NotNull final Ob
 
                 break;
             }
+            case Vector2: {
+                final Vector2f vector2f = (Vector2f) value;
+                return vector2f.getX() + " " + vector2f.getY();
+            }
             case Vector3: {
                 final Vector3f vector3f = (Vector3f) value;
                 return vector3f.getX() + " " + vector3f.getY() + " " + vector3f.getZ();

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

@@ -615,8 +615,8 @@ public void notifyFXRemovedChild(@NotNull final Object parent, @NotNull final Ob
         }
     }
 
-    @FXThread
     @Override
+    @FXThread
     public void notifyFXReplaced(@NotNull final Object parent, @Nullable final Object oldChild,
                                  @Nullable final Object newChild, final boolean needExpand,
                                  final boolean needDeepExpand) {
@@ -625,8 +625,18 @@ public void notifyFXReplaced(@NotNull final Object parent, @Nullable final Objec
         final Spatial currentModel = getCurrentModel();
 
         if (currentModel == oldChild && newChild != null) {
-            setCurrentModel(unsafeCast(newChild));
+            handleRemovedObject(currentModel);
             editor3DState.openModel(unsafeCast(newChild));
+            handleAddedObject((Spatial) newChild);
+        } else {
+
+            if (oldChild instanceof Spatial) {
+                handleRemovedObject((Spatial) oldChild);
+            }
+
+            if (newChild instanceof Spatial) {
+                handleAddedObject((Spatial) newChild);
+            }
         }
 
         final ModelNodeTree modelNodeTree = getModelNodeTree();

src/main/java/com/ss/editor/ui/control/material/tree/factory/MaterialSettingsTreeNodeFactory.java

@@ -15,8 +15,8 @@
  */
 public class MaterialSettingsTreeNodeFactory implements TreeNodeFactory {
 
-    @FXThread
     @Override
+    @FXThread
     public <T, V extends TreeNode<T>> @Nullable V createFor(@Nullable final T element, final long objectId) {
 
         if (element instanceof RootMaterialSettings) {

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

@@ -156,6 +156,10 @@ protected void applyParam(@NotNull final MatParam param, @NotNull final Material
                 return EditablePropertyType.INTEGER;
             case Vector4:
                 return EditablePropertyType.COLOR;
+            case Vector3:
+                return EditablePropertyType.VECTOR_3F;
+            case Vector2:
+                return EditablePropertyType.VECTOR_2F;
             case Texture2D:
                 return EditablePropertyType.TEXTURE_2D;
         }

src/main/java/com/ss/editor/ui/control/model/tree/action/operation/OptimizeGeometryOperation.java

@@ -2,6 +2,8 @@
 
 import com.jme3.scene.Node;
 import com.jme3.scene.Spatial;
+import com.ss.editor.annotation.FXThread;
+import com.ss.editor.annotation.JMEThread;
 import com.ss.editor.model.undo.editor.ModelChangeConsumer;
 import com.ss.editor.model.undo.impl.AbstractEditorOperation;
 import org.jetbrains.annotations.NotNull;
@@ -31,13 +33,6 @@ public class OptimizeGeometryOperation extends AbstractEditorOperation<ModelChan
     @NotNull
     private final Node parent;
 
-    /**
-     * Instantiates a new Optimize geometry operation.
-     *
-     * @param newSpatial the new spatial
-     * @param oldSpatial the old spatial
-     * @param parent     the parent
-     */
     public OptimizeGeometryOperation(@NotNull final Spatial newSpatial, @NotNull final Spatial oldSpatial,
                                      @NotNull final Node parent) {
         this.newSpatial = newSpatial;
@@ -46,11 +41,13 @@ public OptimizeGeometryOperation(@NotNull final Spatial newSpatial, @NotNull fin
     }
 
     @Override
+    @FXThread
     protected void redoImpl(@NotNull final ModelChangeConsumer editor) {
         EXECUTOR_MANAGER.addJMETask(() -> apply(editor, oldSpatial, newSpatial));
     }
 
     @Override
+    @FXThread
     protected void undoImpl(@NotNull final ModelChangeConsumer editor) {
         EXECUTOR_MANAGER.addJMETask(() -> apply(editor, newSpatial, oldSpatial));
     }
@@ -62,6 +59,7 @@ protected void undoImpl(@NotNull final ModelChangeConsumer editor) {
      * @param newSpatial the new spatial.
      * @param oldSpatial the new old spatial.
      */
+    @JMEThread
     private void apply(@NotNull final ModelChangeConsumer consumer, @NotNull final Spatial newSpatial,
                        @NotNull final Spatial oldSpatial) {