implemented working with PBR in the scene editor.

Author: JavaSaBr

app.version

@@ -1 +1 @@
-0.9.11
+0.9.12

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') {

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();

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.

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++;

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();
 

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++;

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

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();
         }
 

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();