implemented working with PBR in the scene editor.

JavaSaBr · JavaSaBr · commit 95533147d02a · 2017-08-04T16:33:45.000+03:00
diff --git a/app.version b/app.version
@@ -1 +1 @@
-0.9.11
+0.9.12
diff --git a/build.gradle b/build.gradle
@@ -13,7 +13,7 @@ apply plugin: 'idea'
 apply plugin: 'org.junit.platform.gradle.plugin'
 
 group = 'com.spaceshift'
-version = '0.9.11'
+version = '0.9.12'
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
@@ -125,7 +125,7 @@ dependencies {
     compile group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.3'
 
     // extensions
-    compile ('com.github.JavaSaBr:jme3-spaceshift-extension:1.4.2') {
+    compile ('com.github.JavaSaBr:jme3-spaceshift-extension:1.5.0') {
         exclude group: 'org.jmonkeyengine'
     }
     compile ('com.github.JavaSaBr:tonegodemitter:2.3.0') {
diff --git a/src/main/java/com/ss/editor/Editor.java b/src/main/java/com/ss/editor/Editor.java
@@ -13,6 +13,7 @@
 import com.jme3.environment.LightProbeFactory;
 import com.jme3.environment.generation.JobProgressAdapter;
 import com.jme3.font.BitmapFont;
+import com.jme3.light.LightList;
 import com.jme3.light.LightProbe;
 import com.jme3.material.Material;
 import com.jme3.material.TechniqueDef;
@@ -258,7 +259,7 @@ public Camera getCamera() {
     @Override
     public void simpleInitApp() {
         renderManager.setPreferredLightMode(TechniqueDef.LightMode.SinglePass);
-        renderManager.setSinglePassLightBatchSize(5);
+        renderManager.setSinglePassLightBatchSize(15);
 
         assetManager.registerLoader(XbufLoader.class, FileExtensions.MODEL_XBUF);
 
@@ -325,7 +326,7 @@ public void simpleInitApp() {
             stateManager.attach(previewEnvironmentCamera);
         }
 
-        createProbe();
+        createLightProbes();
 
         new EditorThread(new ThreadGroup("JavaFX"), JFXApplication::start, "JavaFX Launch").start();
     }
@@ -430,9 +431,9 @@ public FilterPostProcessor getPostProcessor() {
     }
 
     /**
-     * Create the light probe for the PBR render.
+     * Create the light probes for the PBR render.
      */
-    private void createProbe() {
+    private void createLightProbes() {
 
         final EnvironmentCamera environmentCamera = getEnvironmentCamera();
         final EnvironmentCamera previewEnvironmentCamera = getPreviewEnvironmentCamera();
@@ -443,7 +444,7 @@ private void createProbe() {
 
         if (environmentCamera.getApplication() == null) {
             final JMEThreadExecutor gameThreadExecutor = JMEThreadExecutor.getInstance();
-            gameThreadExecutor.addToExecute(this::createProbe);
+            gameThreadExecutor.addToExecute(this::createLightProbes);
             return;
         }
 
@@ -465,7 +466,7 @@ private void createProbe() {
      *
      * @param progressAdapter the progress adapter
      */
-    public void updateProbe(@NotNull final JobProgressAdapter<LightProbe> progressAdapter) {
+    public void updateLightProbe(@NotNull final JobProgressAdapter<LightProbe> progressAdapter) {
 
         final LightProbe lightProbe = getLightProbe();
         final EnvironmentCamera environmentCamera = getEnvironmentCamera();
@@ -478,12 +479,46 @@ public void updateProbe(@NotNull final JobProgressAdapter<LightProbe> progressAd
         LightProbeFactory.updateProbe(lightProbe, environmentCamera, rootNode, progressAdapter);
     }
 
+    /**
+     * Disable PBR Light probe.
+     */
+    public void disableLightProbe() {
+
+        final LightProbe lightProbe = getLightProbe();
+
+        if (lightProbe != null) {
+            rootNode.removeLight(lightProbe);
+        }
+    }
+
+    /**
+     * Enable PBR Light probe.
+     */
+    public void enableLightProbe() {
+
+        final LightProbe lightProbe = getLightProbe();
+
+        if (lightProbe == null) {
+            return;
+        }
+
+        final LightList lightList = rootNode.getLocalLightList();
+
+        for (int i = 0; i < lightList.size(); i++) {
+            if (lightList.get(i) == lightProbe) {
+                return;
+            }
+        }
+
+        rootNode.addLight(lightProbe);
+    }
+
     /**
      * Update the light probe.
      *
      * @param progressAdapter the progress adapter
      */
-    public void updatePreviewProbe(@NotNull final JobProgressAdapter<LightProbe> progressAdapter) {
+    public void updatePreviewLightProbe(@NotNull final JobProgressAdapter<LightProbe> progressAdapter) {
 
         final LightProbe lightProbe = getPreviewLightProbe();
         final EnvironmentCamera environmentCamera = getPreviewEnvironmentCamera();
diff --git a/src/main/java/com/ss/editor/config/Config.java b/src/main/java/com/ss/editor/config/Config.java
@@ -36,7 +36,7 @@ public abstract class Config {
      * The constant APP_VERSION.
      */
     @NotNull
-    public static final Version APP_VERSION = new Version("0.9.11");
+    public static final Version APP_VERSION = new Version("0.9.12");
 
     /**
      * The constant STRING_VERSION.
diff --git a/src/main/java/com/ss/editor/manager/JMEFilePreviewManager.java b/src/main/java/com/ss/editor/manager/JMEFilePreviewManager.java
@@ -191,7 +191,7 @@ protected void controlUpdate(final float tpf) {
 
         if (frame == 2) {
             final Editor editor = Editor.getInstance();
-            editor.updatePreviewProbe(probeHandler);
+            editor.updatePreviewLightProbe(probeHandler);
         }
 
         frame++;
diff --git a/src/main/java/com/ss/editor/state/editor/impl/material/MaterialEditor3DState.java b/src/main/java/com/ss/editor/state/editor/impl/material/MaterialEditor3DState.java
@@ -409,7 +409,7 @@ private void updateLightEnabledImpl(boolean enabled) {
     public void update(float tpf) {
         super.update(tpf);
 
-        if (frame == 2) EDITOR.updateProbe(probeHandler);
+        if (frame == 2) EDITOR.updateLightProbe(probeHandler);
 
         final Geometry testQuad = getTestQuad();
 
diff --git a/src/main/java/com/ss/editor/state/editor/impl/model/ModelEditor3DState.java b/src/main/java/com/ss/editor/state/editor/impl/model/ModelEditor3DState.java
@@ -165,7 +165,7 @@ public void update(final float tpf) {
             final Array<Spatial> customSky = getCustomSky();
             customSky.forEach(spatial -> customSkyNode.attachChild(spatial.clone(false)));
 
-            EDITOR.updateProbe(probeHandler);
+            EDITOR.updateLightProbe(probeHandler);
         }
 
         frame++;
diff --git a/src/main/java/com/ss/editor/state/editor/impl/scene/SceneEditor3DState.java b/src/main/java/com/ss/editor/state/editor/impl/scene/SceneEditor3DState.java
@@ -66,7 +66,7 @@ protected void redo() {
     }
 
     @Override
-    protected void attachModel(final @NotNull SceneNode model, @NotNull final Node modelNode) {
+    protected void attachModel(@NotNull final SceneNode model, @NotNull final Node modelNode) {
     }
 
     @Override
diff --git a/src/main/java/com/ss/editor/ui/component/editor/impl/scene/AbstractSceneFileEditor.java b/src/main/java/com/ss/editor/ui/component/editor/impl/scene/AbstractSceneFileEditor.java
@@ -1508,7 +1508,7 @@ private void notifyTransformedImpl(@NotNull final Spatial spatial) {
 
         Object toUpdate = spatial;
 
-        if(spatial instanceof WrapperNode) {
+        if (spatial instanceof WrapperNode) {
             toUpdate = ((WrapperNode) spatial).getWrappedObject();
         }
 
diff --git a/src/main/java/com/ss/editor/ui/component/editor/impl/scene/SceneFileEditor.java b/src/main/java/com/ss/editor/ui/component/editor/impl/scene/SceneFileEditor.java
@@ -685,6 +685,20 @@ public void notifyChangedFilter(@NotNull final SceneFilter sceneFilter) {
         getFilterList().fill(getCurrentModel());
     }
 
+    @FXThread
+    @Override
+    public void notifyHided() {
+        super.notifyHided();
+        EXECUTOR_MANAGER.addJMETask(EDITOR::enableLightProbe);
+    }
+
+    @FXThread
+    @Override
+    public void notifyShowed() {
+        super.notifyShowed();
+        EXECUTOR_MANAGER.addJMETask(EDITOR::disableLightProbe);
+    }
+
     @Override
     public String toString() {
         return "SceneFileEditor{} " + super.toString();
diff --git a/src/main/java/com/ss/editor/ui/control/app/state/dialog/CreateSceneAppStateDialog.java b/src/main/java/com/ss/editor/ui/control/app/state/dialog/CreateSceneAppStateDialog.java
@@ -11,6 +11,7 @@
 import com.ss.editor.extension.scene.app.state.impl.EditableLightingSceneAppState;
 import com.ss.editor.extension.scene.app.state.impl.EditableSkySceneAppState;
 import com.ss.editor.extension.scene.app.state.impl.bullet.EditableBulletSceneAppState;
+import com.ss.editor.extension.scene.app.state.impl.pbr.StaticLightProbeSceneAppState;
 import com.ss.editor.extension.scene.filter.SceneFilter;
 import com.ss.editor.model.undo.editor.SceneChangeConsumer;
 import com.ss.editor.ui.control.app.state.operation.AddAppStateOperation;
@@ -48,6 +49,7 @@ public class CreateSceneAppStateDialog extends AbstractSimpleEditorDialog {
         register(new EditableLightingSceneAppState());
         register(new EditableSkySceneAppState());
         register(new EditableBulletSceneAppState());
+        register(new StaticLightProbeSceneAppState());
     }
 
     private static void register(@NotNull final EditableSceneAppState appState) {
diff --git a/src/main/java/com/ss/editor/ui/control/app/state/property/builder/impl/AppStatePropertyBuilder.java b/src/main/java/com/ss/editor/ui/control/app/state/property/builder/impl/AppStatePropertyBuilder.java
@@ -4,6 +4,7 @@
 import com.jme3.math.ColorRGBA;
 import com.jme3.math.Vector2f;
 import com.jme3.math.Vector3f;
+import com.jme3.scene.Node;
 import com.ss.editor.extension.property.EditableProperty;
 import com.ss.editor.extension.property.EditablePropertyType;
 import com.ss.editor.extension.scene.app.state.EditableSceneAppState;
@@ -156,6 +157,17 @@ protected void buildForImpl(@NotNull final Object object, @Nullable final Object
                     addControl(container, property, propertyControl);
                     break;
                 }
+                case NODE_FROM_SCENE: {
+
+                    final EditableProperty<Node, ?> property = cast(editableProperty);
+                    final Node value = property.getValue();
+
+                    final NodeElementAppStatePropertyControl<EditableProperty<Node, ?>> propertyControl =
+                            new NodeElementAppStatePropertyControl<>(value, property.getName(), changeConsumer);
+
+                    addControl(container, property, propertyControl);
+                    break;
+                }
                 default: {
                     break;
                 }
diff --git a/src/main/java/com/ss/editor/ui/control/app/state/property/control/AbstractElementAppStatePropertyControl.java b/src/main/java/com/ss/editor/ui/control/app/state/property/control/AbstractElementAppStatePropertyControl.java
@@ -0,0 +1,61 @@
+package com.ss.editor.ui.control.app.state.property.control;
+
+import static com.ss.editor.ui.control.filter.property.control.FilterPropertyControl.newChangeHandler;
+import com.ss.editor.model.undo.editor.SceneChangeConsumer;
+import com.ss.editor.ui.control.model.tree.dialog.NodeSelectorDialog;
+import com.ss.editor.ui.control.property.impl.AbstractElementPropertyControl;
+import com.ss.editor.ui.scene.EditorFXScene;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * The implementation of the {@link AbstractElementPropertyControl} to edit an elements from scene.
+ *
+ * @param <D> the type parameter
+ * @param <T> the type parameter
+ * @author JavaSaBr
+ */
+public abstract class AbstractElementAppStatePropertyControl<D, T> extends AbstractElementPropertyControl<SceneChangeConsumer, D, T> {
+
+    /**
+     * Instantiates a new Abstract element filter property control.
+     *
+     * @param type           the type
+     * @param propertyValue  the property value
+     * @param propertyName   the property name
+     * @param changeConsumer the change consumer
+     */
+    public AbstractElementAppStatePropertyControl(@NotNull final Class<T> type, @Nullable final T propertyValue,
+                                                  @NotNull final String propertyName,
+                                                  @NotNull final SceneChangeConsumer changeConsumer) {
+        super(type, propertyValue, propertyName, changeConsumer, newChangeHandler());
+    }
+
+    @Override
+    protected void processAdd() {
+
+        final EditorFXScene scene = JFX_APPLICATION.getScene();
+        final NodeSelectorDialog<T> dialog = createNodeSelectorDialog();
+        dialog.show(scene.getWindow());
+    }
+
+    /**
+     * Create node selector dialog node selector dialog.
+     *
+     * @return the node selector dialog
+     */
+    @NotNull
+    protected NodeSelectorDialog<T> createNodeSelectorDialog() {
+        final SceneChangeConsumer changeConsumer = getChangeConsumer();
+        return new NodeSelectorDialog<>(changeConsumer.getCurrentModel(), type, this::processAdd);
+    }
+
+    /**
+     * Process add.
+     *
+     * @param newElement the new element
+     */
+    protected void processAdd(@NotNull final T newElement) {
+        changed(newElement, getPropertyValue());
+    }
+}
diff --git a/src/main/java/com/ss/editor/ui/control/app/state/property/control/NodeElementAppStatePropertyControl.java b/src/main/java/com/ss/editor/ui/control/app/state/property/control/NodeElementAppStatePropertyControl.java
@@ -0,0 +1,48 @@
+package com.ss.editor.ui.control.app.state.property.control;
+
+import com.jme3.scene.Node;
+import com.jme3.scene.Spatial;
+import com.ss.editor.model.undo.editor.SceneChangeConsumer;
+import com.ss.editor.ui.control.model.tree.dialog.NodeSelectorDialog;
+import javafx.scene.control.Label;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * The implementation of the {@link AbstractElementAppStatePropertyControl} to edit a spatial from a scene.
+ *
+ * @param <D> the type parameter
+ * @author JavaSaBr
+ */
+public class NodeElementAppStatePropertyControl<D> extends AbstractElementAppStatePropertyControl<D, Node> {
+
+    /**
+     * Instantiates a new Point light element filter property control.
+     *
+     * @param propertyValue  the property value
+     * @param propertyName   the property name
+     * @param changeConsumer the change consumer
+     */
+    public NodeElementAppStatePropertyControl(@Nullable final Node propertyValue, @NotNull final String propertyName,
+                                              @NotNull final SceneChangeConsumer changeConsumer) {
+        super(Node.class, propertyValue, propertyName, changeConsumer);
+    }
+
+    @NotNull
+    protected NodeSelectorDialog<Node> createNodeSelectorDialog() {
+        final SceneChangeConsumer changeConsumer = getChangeConsumer();
+        return new NodeSelectorDialog<>(changeConsumer.getCurrentModel(), type, this::processAdd);
+    }
+
+    @Override
+    protected void reload() {
+
+        final Spatial spatial = getPropertyValue();
+        final Label elementLabel = getElementLabel();
+
+        String name = spatial == null ? null : spatial.getName();
+        name = name == null && spatial != null ? spatial.getClass().getSimpleName() : name;
+
+        elementLabel.setText(name == null ? NO_ELEMENT : name);
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,7 @@ protected void controlUpdate(final float tpf) {`
`191`	`191`
`192`	`192`	`if (frame == 2) {`
`193`	`193`	`final Editor editor = Editor.getInstance();`
`194`		`- editor.updatePreviewProbe(probeHandler);`
	`194`	`+ editor.updatePreviewLightProbe(probeHandler);`
`195`	`195`	`}`
`196`	`196`
`197`	`197`	`frame++;`
Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ public void update(final float tpf) {`
`165`	`165`	`final Array<Spatial> customSky = getCustomSky();`
`166`	`166`	`customSky.forEach(spatial -> customSkyNode.attachChild(spatial.clone(false)));`
`167`	`167`
`168`		`- EDITOR.updateProbe(probeHandler);`
	`168`	`+ EDITOR.updateLightProbe(probeHandler);`
`169`	`169`	`}`
`170`	`170`
`171`	`171`	`frame++;`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ protected void redo() {`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`@Override`
`69`		`- protected void attachModel(final @NotNull SceneNode model, @NotNull final Node modelNode) {`
	`69`	`+ protected void attachModel(@NotNull final SceneNode model, @NotNull final Node modelNode) {`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -1508,7 +1508,7 @@ private void notifyTransformedImpl(@NotNull final Spatial spatial) {`
`1508`	`1508`
`1509`	`1509`	`Object toUpdate = spatial;`
`1510`	`1510`
`1511`		`- if(spatial instanceof WrapperNode) {`
	`1511`	`+ if (spatial instanceof WrapperNode) {`
`1512`	`1512`	`toUpdate = ((WrapperNode) spatial).getWrappedObject();`
`1513`	`1513`	`}`
`1514`	`1514`