Merge remote-tracking branch 'origin/0.9.2'

Author: JavaSaBr

.idea/runConfigurations/Editor.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.1.2" />
+    <property name="editor.version" value="0.9.2" />
 
     <target name="init-fx-tasks">
         <path id="fxant">
@@ -245,6 +245,7 @@
                 <fx:jvmarg value="-XX:+UseTLAB"/>
                 <fx:jvmarg value="-Dprism.lcdtext=false"/>
                 <fx:jvmarg value="-Dprism.text=t2k"/>
+                <fx:jvmarg value="-Djavafx.animation.fullspeed=true"/>
                 <!--<fx:jvmarg value="-agentlib:jdwp=transport=dt_socket,server=n,address=192.168.94.210:6005,suspend=y"/>-->
             </fx:platform>
 

build-native.xml

@@ -4,6 +4,7 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />

jme3-spaceshift-extension/jme3-spaceshift-extension.iml

@@ -1,6 +1,7 @@
 package com.ss.extension.loader;
 
 import com.jme3.app.Application;
+import com.jme3.app.state.AppStateManager;
 import com.jme3.asset.AssetInfo;
 import com.jme3.asset.AssetManager;
 import com.jme3.export.InputCapsule;
@@ -11,6 +12,7 @@
 import org.jetbrains.annotations.NotNull;
 
 import java.io.IOException;
+import java.util.Objects;
 
 /**
  * The implementation of jME Importer to load scenes.
@@ -33,6 +35,17 @@ public static void install(@NotNull final Application application) {
         final AssetManager assetManager = application.getAssetManager();
         assetManager.unregisterLoader(BinaryImporter.class);
         assetManager.registerLoader(SceneLoader.class, "j3o", "j3f", "j3s");
+        SceneLoader.application = application;
+    }
+
+    @NotNull
+    public static AssetManager tryToGetAssetManager() {
+        return Objects.requireNonNull(application).getAssetManager();
+    }
+
+    @NotNull
+    public static AppStateManager tryToGetStateManager() {
+        return Objects.requireNonNull(application).getStateManager();
     }
 
     @NotNull

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

@@ -1,4 +1,4 @@
-package com.ss.extension.scene.app.state.property;
+package com.ss.extension.property;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

jme3-spaceshift-extension/src/com/ss/extension/scene/app/state/property/EditableProperty.java renamed to jme3-spaceshift-extension/src/com/ss/extension/property/EditableProperty.java

@@ -1,4 +1,4 @@
-package com.ss.extension.scene.app.state.property;
+package com.ss.extension.property;
 
 /**
  * The enum with list editable property types.
@@ -12,7 +12,11 @@ public enum EditablePropertyType {
     VECTOR_2F,
     VECTOR_3F,
     QUATERNION,
-    COLOR,;
+    COLOR,
+    ENUM,
+    STRING,
+    DIRECTION_LIGHT_FROM_SCENE,
+    POINT_LIGHT_FROM_SCENE;
 
     private static final EditablePropertyType[] TYPES = values();
 

jme3-spaceshift-extension/src/com/ss/extension/scene/app/state/property/EditablePropertyType.java renamed to jme3-spaceshift-extension/src/com/ss/extension/property/EditablePropertyType.java

@@ -1,4 +1,4 @@
-package com.ss.extension.scene.app.state.property;
+package com.ss.extension.property;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

jme3-spaceshift-extension/src/com/ss/extension/scene/app/state/property/SimpleProperty.java renamed to jme3-spaceshift-extension/src/com/ss/extension/property/SimpleProperty.java

@@ -5,13 +5,12 @@
 import com.jme3.export.JmeImporter;
 import com.jme3.export.OutputCapsule;
 import com.jme3.scene.Node;
-import com.jme3.util.clone.Cloner;
+import com.jme3.scene.Spatial;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.io.IOException;
-import java.util.Objects;
 
 /**
  * The implementation of a scene layer.
@@ -20,11 +19,30 @@
  */
 public class SceneLayer extends Node {
 
+    public static final String KEY = SceneLayer.class.getName();
+
+    public static final SceneLayer NO_LAYER = new SceneLayer();
+
     /**
-     * The parent scene node.
+     * Get a layer of a spatial.
+     *
+     * @param spatial the spatial.
+     * @return the layer or null.
      */
     @Nullable
-    private SceneNode sceneNode;
+    public static SceneLayer getLayer(@NotNull final Spatial spatial) {
+        return spatial.getUserData(KEY);
+    }
+
+    /**
+     * Set a layer to a spatial.
+     *
+     * @param layer   the layer.
+     * @param spatial the spatial.
+     */
+    public static void setLayer(@Nullable final SceneLayer layer, @NotNull final Spatial spatial) {
+        spatial.setUserData(KEY, layer == NO_LAYER ? null : layer);
+    }
 
     /**
      * The flag that layer is builtin.
@@ -73,27 +91,11 @@ public boolean isShowed() {
         return showed;
     }
 
-    /**
-     * @param sceneNode The parent scene node.
-     */
-    public void setSceneNode(@Nullable final SceneNode sceneNode) {
-        this.sceneNode = sceneNode;
-    }
-
-    /**
-     * @return the parent scene node.
-     */
-    @NotNull
-    public SceneNode getSceneNode() {
-        return Objects.requireNonNull(sceneNode);
-    }
-
     /**
      * Hide this layer.
      */
     public void hide() {
         if (!isShowed()) return;
-        removeFromParent();
         setShowed(false);
     }
 
@@ -102,7 +104,6 @@ public void hide() {
      */
     public void show() {
         if (isShowed()) return;
-        getSceneNode().attachChild(this);
         setShowed(true);
     }
 
@@ -123,11 +124,4 @@ public void read(@NotNull final JmeImporter importer) throws IOException {
         setShowed(capsule.readBoolean("showed", false));
         setBuiltIn(capsule.readBoolean("builtIn", false));
     }
-
-    @Override
-    public void cloneFields(@NotNull final Cloner cloner, @NotNull final Object original) {
-        super.cloneFields(cloner, original);
-
-        sceneNode = cloner.clone(sceneNode);
-    }
 }

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

@@ -8,6 +8,7 @@
 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;
 
@@ -25,6 +26,7 @@ public class SceneNode extends Node {
 
     public static final SceneLayer[] EMPTY_LAYERS = new SceneLayer[0];
     public static final SceneAppState[] EMPTY_STATES = new SceneAppState[0];
+    public static final SceneFilter<?>[] EMPTY_FILTERS = new SceneFilter[0];
 
     /**
      * The scene layers.
@@ -38,10 +40,17 @@ public class SceneNode extends Node {
     @NotNull
     private Array<SceneAppState> appStates;
 
+    /**
+     * The scene filters.
+     */
+    @NotNull
+    private Array<SceneFilter<?>> filters;
+
     public SceneNode() {
         super("Empty scene");
         this.layers = ArrayFactory.newArray(SceneLayer.class);
         this.appStates = ArrayFactory.newArray(SceneAppState.class);
+        this.filters = ArrayFactory.newArray(SceneFilter.class);
     }
 
     /**
@@ -50,7 +59,6 @@ public SceneNode() {
      * @param layer the layer.
      */
     public void addLayer(@NotNull final SceneLayer layer) {
-        layer.setSceneNode(this);
         layers.add(layer);
     }
 
@@ -60,9 +68,6 @@ public void addLayer(@NotNull final SceneLayer layer) {
      * @param layer the layer.
      */
     public void removeLayer(@NotNull final SceneLayer layer) {
-        if (layer.getSceneNode() == this) {
-            layer.setSceneNode(null);
-        }
         layers.slowRemove(layer);
     }
 
@@ -81,6 +86,7 @@ public Array<SceneLayer> getLayers() {
      */
     public void addAppState(@NotNull final SceneAppState appState) {
         appStates.add(appState);
+        appState.setSceneNode(this);
     }
 
     /**
@@ -90,6 +96,7 @@ public void addAppState(@NotNull final SceneAppState appState) {
      */
     public void removeAppState(@NotNull final SceneAppState appState) {
         appStates.slowRemove(appState);
+        appState.setSceneNode(null);
     }
 
     /**
@@ -100,50 +107,74 @@ public Array<SceneAppState> getAppStates() {
         return appStates;
     }
 
+    /**
+     * Add a new filter.
+     *
+     * @param filter the scene filter.
+     */
+    public void addFilter(@NotNull final SceneFilter filter) {
+        filters.add(filter);
+    }
+
+    /**
+     * Remove an old filter.
+     *
+     * @param filter the scene filter.
+     */
+    public void removeFilter(@NotNull final SceneFilter filter) {
+        filters.slowRemove(filter);
+    }
+
+    /**
+     * Get a list of filters.
+     *
+     * @return the list of filters.
+     */
+    @NotNull
+    public Array<SceneFilter<?>> getFilters() {
+        return filters;
+    }
+
     @Override
     public void write(@NotNull final JmeExporter exporter) throws IOException {
 
         final OutputCapsule capsule = exporter.getCapsule(this);
         final SceneLayer[] layers = getLayers().toArray(SceneLayer.class);
         final SceneAppState[] appStates = getAppStates().toArray(SceneAppState.class);
+        final SceneFilter<?>[] filters = getFilters().toArray(SceneFilter.class);
 
-        for (final SceneLayer layer : layers) {
-            if (!layer.isShowed()) continue;
-            detachChild(layer);
-        }
+        capsule.write(layers, "layers", EMPTY_LAYERS);
 
         super.write(exporter);
 
-        for (final SceneLayer layer : layers) {
-            if (!layer.isShowed()) continue;
-            attachChild(layer);
-        }
-
-        capsule.write(layers, "layers", EMPTY_LAYERS);
         capsule.write(appStates, "appStates", EMPTY_STATES);
+        capsule.write(filters, "filters", EMPTY_FILTERS);
     }
 
     @Override
     public void read(@NotNull final JmeImporter importer) throws IOException {
 
         final InputCapsule capsule = importer.getCapsule(this);
 
-        super.read(importer);
-
         final Savable[] importedLayers = capsule.readSavableArray("layers", EMPTY_LAYERS);
 
         for (final Savable savable : importedLayers) {
-            final SceneLayer layer = (SceneLayer) savable;
-            layer.setSceneNode(this);
-            layers.add(layer);
-            if (layer.isShowed()) attachChild(layer);
+            layers.add((SceneLayer) savable);
         }
 
+        super.read(importer);
+
         final Savable[] importedAppStates = capsule.readSavableArray("appStates", EMPTY_STATES);
 
         for (final Savable savable : importedAppStates) {
             appStates.add((SceneAppState) savable);
         }
+
+        final Savable[] importedFilters = capsule.readSavableArray("filters", EMPTY_FILTERS);
+
+        for (final Savable savable : importedFilters) {
+            filters.add((SceneFilter) savable);
+        }
     }
 
     @Override
@@ -161,5 +192,11 @@ public void cloneFields(final Cloner cloner, final Object original) {
         for (int i = 0; i < appStates.size(); i++) {
             appStates.set(i, cloner.clone(appStates.get(i)));
         }
+
+        filters = cloner.clone(filters);
+
+        for (int i = 0; i < filters.size(); i++) {
+            filters.set(i, cloner.clone(filters.get(i)));
+        }
     }
 }

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

@@ -1,6 +1,7 @@
 package com.ss.extension.scene.app.state;
 
-import com.ss.extension.scene.app.state.property.EditableProperty;
+import com.ss.extension.property.EditableProperty;
+import com.ss.extension.scene.filter.SceneFilter;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -34,7 +35,18 @@ public interface EditableSceneAppState extends SceneAppState {
      * @return null of can create or message with description.
      */
     @Nullable
-    default String canCreate(@NotNull final Array<SceneAppState> exists) {
+    default String checkStates(@NotNull final Array<SceneAppState> exists) {
+        return null;
+    }
+
+    /**
+     * Check filter dependencies.
+     *
+     * @param exists the current exists filters.
+     * @return null of can create or message with description.
+     */
+    @Nullable
+    default String checkFilters(@NotNull final Array<SceneFilter<?>> exists) {
         return null;
     }
 }