Finish 0.9.12

Author: JavaSaBr

README.md

@@ -1,4 +1,4 @@
-# jMonkeyEngine 3 SpaceShift Editor 0.9.11 #
+# jMonkeyEngine 3 SpaceShift Editor 0.9.12 #
 ## License: Apache Version 2.0 ##
 
 [![Join the chat at https://gitter.im/jME3-SpaceShift-Editor/Lobby](https://badges.gitter.im/jME3-SpaceShift-Editor/Lobby.svg)](https://gitter.im/jME3-SpaceShift-Editor/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
@@ -11,6 +11,11 @@
 
 ## [Video about this editor](https://youtu.be/h6azH-D28qk) ##
 
+## ver. 0.9.12 ##
+* -Downgraded tonegod.emitter to java 7
+* -Added possibility to work with light probes in the Scene Editor.
+* -Fixed major problems with saving/loading app states/filters in a scene node.
+
 ## ver. 0.9.11 ##
 * -The project was migrated to gradle.
 * -Implemented a plugin system. Now you can develop your own plugin for the Editor.

app.version

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

build-native.xml

@@ -2,7 +2,7 @@
 <project name="jME SpaceShift Editor" default="do-deploy" basedir="native-build"
          xmlns:fx="javafx:com.sun.javafx.tools.ant">
 
-    <property name="editor.version" value="0.9.11"/>
+    <property name="editor.version" value="0.9.12"/>
     <property environment="env"/>
 
     <condition property="gradle.executable" value="${env.GRADLE_HOME}/bin/gradle.bat"

build.gradle

@@ -1,15 +1,46 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+    dependencies {
+        classpath 'org.junit.platform:junit-platform-gradle-plugin:1.0.0-RC2'
+    }
+}
+
 apply plugin: 'java'
 apply plugin: 'maven'
+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
 
+compileTestJava {
+    sourceCompatibility = 1.8
+    targetCompatibility = 1.8
+    options.compilerArgs += '-parameters'
+}
+
 ext.jmeVersion = "3.2_branch-SNAPSHOT"
 ext.jme3_xbuf_version = '0.9.1'
 ext.lwjglVersion = "3.1.2"
+ext.junitPlatformVersion = "1.0.0-M5"
+ext.junitJupiterVersion = "5.0.0-M5"
+ext.log4jVersion = '2.6.2'
+
+junitPlatform {
+    filters {
+        engines {
+        }
+        tags {
+        }
+    }
+    logManager 'org.apache.logging.log4j.jul.LogManager'
+}
+
 
 repositories {
     mavenCentral()
@@ -94,17 +125,30 @@ 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.2.4') {
+    compile ('com.github.JavaSaBr:tonegodemitter:2.3.0') {
         exclude group: 'org.jmonkeyengine'
     }
 
     compile "org.xbuf.jme3_xbuf:jme3_xbuf_loader:${jme3_xbuf_version}"
 
     // https://mvnrepository.com/artifact/org.codehaus.groovy/groovy-all
     compile group: 'org.codehaus.groovy', name: 'groovy-all', version: '2.5.0-beta-1'
+
+    // TESTS
+    testCompile "org.junit.platform:junit-platform-commons:$junitPlatformVersion"
+    testRuntime "org.junit.platform:junit-platform-engine:$junitPlatformVersion"
+
+    testCompile "org.junit.jupiter:junit-jupiter-api:$junitJupiterVersion"
+    testRuntime "org.junit.jupiter:junit-jupiter-engine:$junitJupiterVersion"
+
+    testRuntime "org.apache.logging.log4j:log4j-core:$log4jVersion"
+    testRuntime "org.apache.logging.log4j:log4j-jul:$log4jVersion"
+
+    // Only needed to run tests in an (IntelliJ) IDE(A) that bundles an older version
+    testCompile "org.junit.platform:junit-platform-launcher:$junitPlatformVersion"
 }
 
 task copyToLib(type: Copy) {

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/model/node/Toneg0dParticleInfluencers.java

@@ -1,11 +1,11 @@
 package com.ss.editor.model.node;
 
 import org.jetbrains.annotations.NotNull;
-
-import com.ss.rlib.util.array.Array;
 import tonegod.emitter.ParticleEmitterNode;
 import tonegod.emitter.influencers.ParticleInfluencer;
 
+import java.util.List;
+
 /**
  * The type Particle influencers.
  *
@@ -44,7 +44,7 @@ public ParticleEmitterNode getEmitterNode() {
      * @return the array of influencers.
      */
     @NotNull
-    public Array<ParticleInfluencer> getInfluencers() {
+    public List<ParticleInfluencer> getInfluencers() {
         return emitterNode.getInfluencers();
     }
 

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