Merge branch '0.9.3'

Author: JavaSaBr

.idea/codeStyleSettings.xml

@@ -2,7 +2,7 @@
 <project name="jME SpaceShift Editor" default="do-deploy" basedir="build"
          xmlns:fx="javafx:com.sun.javafx.tools.ant">
 
-    <property name="editor.version" value="0.9.2" />
+    <property name="editor.version" value="0.9.3" />
 
     <target name="init-fx-tasks">
         <path id="fxant">

.idea/misc.xml

@@ -8,7 +8,6 @@
 import com.jme3.export.JmeImporter;
 import com.jme3.export.Savable;
 import com.jme3.export.binary.BinaryImporter;
-
 import org.jetbrains.annotations.NotNull;
 
 import java.io.IOException;
@@ -40,12 +39,14 @@ public static void install(@NotNull final Application application) {
 
     @NotNull
     public static AssetManager tryToGetAssetManager() {
-        return Objects.requireNonNull(application).getAssetManager();
+        return Objects.requireNonNull(application)
+                      .getAssetManager();
     }
 
     @NotNull
     public static AppStateManager tryToGetStateManager() {
-        return Objects.requireNonNull(application).getStateManager();
+        return Objects.requireNonNull(application)
+                      .getStateManager();
     }
 
     @NotNull

build-native.xml

@@ -16,6 +16,7 @@ public class SimpleProperty<T, O> implements EditableProperty<T, O> {
     /**
      * The type of this property.
      */
+    @NotNull
     private final EditablePropertyType type;
 
     /**
@@ -63,7 +64,8 @@ public SimpleProperty(@NotNull final EditablePropertyType type, @NotNull final S
     }
 
     public SimpleProperty(@NotNull final EditablePropertyType type, @NotNull final String name, final float scrollPower,
-                          @NotNull final O object, @NotNull final Function<O, T> getter, @NotNull final BiConsumer<O, T> setter) {
+                          @NotNull final O object, @NotNull final Function<O, T> getter,
+                          @NotNull final BiConsumer<O, T> setter) {
         this(type, name, scrollPower, Integer.MIN_VALUE, Integer.MAX_VALUE, object, getter, setter);
     }
 
@@ -126,15 +128,8 @@ public void setValue(@Nullable final T value) {
 
     @Override
     public String toString() {
-        return "SimpleProperty{" +
-                "type=" + type +
-                ", name='" + name + '\'' +
-                ", getter=" + getter +
-                ", setter=" + setter +
-                ", object=" + object +
-                ", scrollPower=" + scrollPower +
-                ", minValue=" + minValue +
-                ", maxValue=" + maxValue +
-                '}';
+        return "SimpleProperty{" + "type=" + type + ", name='" + name + '\'' + ", getter=" + getter + ", setter=" +
+                setter + ", object=" + object + ", scrollPower=" + scrollPower + ", minValue=" + minValue +
+                ", maxValue=" + maxValue + '}';
     }
 }

jme3-spaceshift-extension/src/com/ss/extension/loader/SceneLoader.java

@@ -6,7 +6,6 @@
 import com.jme3.export.OutputCapsule;
 import com.jme3.scene.Node;
 import com.jme3.scene.Spatial;
-
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -17,6 +16,7 @@
  *
  * @author JavaSaBr
  */
+@SuppressWarnings("WeakerAccess")
 public class SceneLayer extends Node {
 
     public static final String KEY = SceneLayer.class.getName();

jme3-spaceshift-extension/src/com/ss/extension/property/SimpleProperty.java

@@ -1,27 +1,22 @@
 package com.ss.extension.scene;
 
-import com.jme3.export.InputCapsule;
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.export.OutputCapsule;
-import com.jme3.export.Savable;
+import com.jme3.export.*;
 import com.jme3.scene.Node;
 import com.jme3.util.clone.Cloner;
 import com.ss.extension.scene.app.state.SceneAppState;
 import com.ss.extension.scene.filter.SceneFilter;
-
 import org.jetbrains.annotations.NotNull;
-
-import java.io.IOException;
-
 import rlib.util.array.Array;
 import rlib.util.array.ArrayFactory;
 
+import java.io.IOException;
+
 /**
  * The implementation of a scene node.
  *
  * @author JavaSaBr
  */
+@SuppressWarnings("WeakerAccess")
 public class SceneNode extends Node {
 
     public static final SceneLayer[] EMPTY_LAYERS = new SceneLayer[0];
@@ -199,4 +194,22 @@ public void cloneFields(final Cloner cloner, final Object original) {
             filters.set(i, cloner.clone(filters.get(i)));
         }
     }
+
+    /**
+     * Notify a scene node about added an object to this scene.
+     *
+     * @param object the added object.
+     */
+    public void notifyAdded(@NotNull final Object object) {
+        getAppStates().forEach(object, SceneAppState::notifyAdded);
+    }
+
+    /**
+     * Notify a scene node about removed an object from this scene.
+     *
+     * @param object the removed object.
+     */
+    public void notifyRemoved(@NotNull final Object object) {
+        getAppStates().forEach(object, SceneAppState::notifyRemoved);
+    }
 }

jme3-spaceshift-extension/src/com/ss/extension/scene/SceneLayer.java

@@ -2,10 +2,8 @@
 
 import com.ss.extension.property.EditableProperty;
 import com.ss.extension.scene.filter.SceneFilter;
-
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-
 import rlib.util.array.Array;
 import rlib.util.array.ArrayFactory;
 
@@ -16,6 +14,7 @@
  */
 public interface EditableSceneAppState extends SceneAppState {
 
+    @NotNull
     Array<EditableProperty<?, ?>> EMPTY_PROPERTIES = ArrayFactory.newArray(EditableProperty.class);
 
     /**

jme3-spaceshift-extension/src/com/ss/extension/scene/SceneNode.java

@@ -4,7 +4,6 @@
 import com.jme3.export.Savable;
 import com.jme3.util.clone.JmeCloneable;
 import com.ss.extension.scene.SceneNode;
-
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -28,5 +27,21 @@ public interface SceneAppState extends AppState, Savable, Cloneable, JmeCloneabl
      */
     default void setSceneNode(@Nullable final SceneNode sceneNode) {
     }
+
+    /**
+     * Notify a scene node about added an object to a scene node.
+     *
+     * @param object the added object.
+     */
+    default void notifyAdded(@NotNull final Object object) {
+    }
+
+    /**
+     * Notify a scene node about removed an object from a scene node.
+     *
+     * @param object the removed object.
+     */
+    default void notifyRemoved(@NotNull final Object object) {
+    }
 }
 

jme3-spaceshift-extension/src/com/ss/extension/scene/app/state/EditableSceneAppState.java

@@ -5,9 +5,7 @@
 import com.ss.extension.property.EditablePropertyType;
 import com.ss.extension.property.SimpleProperty;
 import com.ss.extension.scene.app.state.EditableSceneAppState;
-
 import org.jetbrains.annotations.NotNull;
-
 import rlib.util.array.Array;
 import rlib.util.array.ArrayFactory;
 
@@ -35,13 +33,17 @@ public String getName() {
         final Array<EditableProperty<?, ?>> result = ArrayFactory.newArray(EditableProperty.class);
 
         result.add(new SimpleProperty<>(EditablePropertyType.COLOR, "Ambient color", this,
-                LightingState::getAmbientColor, LightingState::setAmbientColor));
+                                        LightingState::getAmbientColor,
+                                        LightingState::setAmbientColor));
         result.add(new SimpleProperty<>(EditablePropertyType.COLOR, "Sun color", this,
-                LightingState::getSunColor, LightingState::setSunColor));
+                                        LightingState::getSunColor,
+                                        LightingState::setSunColor));
         result.add(new SimpleProperty<>(EditablePropertyType.FLOAT, "Time of day", 0.1F, -0.300F, 1.300F, this,
-                LightingState::getTimeOfDay, LightingState::setTimeOfDay));
+                                        LightingState::getTimeOfDay,
+                                        LightingState::setTimeOfDay));
         result.add(new SimpleProperty<>(EditablePropertyType.FLOAT, "Orientation", 0.1F, 0F, 6.283F, this,
-                LightingState::getOrientation, LightingState::setOrientation));
+                                        LightingState::getOrientation,
+                                        LightingState::setOrientation));
 
         return result;
     }