diff --git a/sdk/jme3-welcome-screen/nbproject/genfiles.properties b/sdk/jme3-welcome-screen/nbproject/genfiles.properties index 1ca1d7451..2bf22d544 100644 --- a/sdk/jme3-welcome-screen/nbproject/genfiles.properties +++ b/sdk/jme3-welcome-screen/nbproject/genfiles.properties @@ -1,8 +1,8 @@ -build.xml.data.CRC32=dc88386f +build.xml.data.CRC32=d333c959 build.xml.script.CRC32=e68af6b0 -build.xml.stylesheet.CRC32=a56c6a5b@1.42.2 +build.xml.stylesheet.CRC32=a56c6a5b@1.46.1 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=dc88386f +nbproject/build-impl.xml.data.CRC32=d333c959 nbproject/build-impl.xml.script.CRC32=5d3b3399 -nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.42.2 +nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.46.1 diff --git a/sdk/jme3-welcome-screen/nbproject/project.xml b/sdk/jme3-welcome-screen/nbproject/project.xml index ec76ce908..1445a4298 100644 --- a/sdk/jme3-welcome-screen/nbproject/project.xml +++ b/sdk/jme3-welcome-screen/nbproject/project.xml @@ -89,18 +89,10 @@ ext/nifty-style-black-1.2.jar release/modules/ext/nifty-style-black-1.2.jar - - ext/assets.jar - release/modules/ext/assets.jar - ext/nifty-default-controls-1.2.jar release/modules/ext/nifty-default-controls-1.2.jar - - ext/jme3-atmosphere-scattering.jar - release/modules/ext/jme3-atmosphere-scattering.jar - diff --git a/sdk/jme3-welcome-screen/release/modules/ext/assets.jar b/sdk/jme3-welcome-screen/release/modules/ext/assets.jar deleted file mode 100644 index b70261df5..000000000 Binary files a/sdk/jme3-welcome-screen/release/modules/ext/assets.jar and /dev/null differ diff --git a/sdk/jme3-welcome-screen/release/modules/ext/jme3-atmosphere-scattering.jar b/sdk/jme3-welcome-screen/release/modules/ext/jme3-atmosphere-scattering.jar deleted file mode 100644 index 646ccf051..000000000 Binary files a/sdk/jme3-welcome-screen/release/modules/ext/jme3-atmosphere-scattering.jar and /dev/null differ diff --git a/sdk/jme3-welcome-screen/src/com/jme3/gde/welcome/WelcomeScreen.java b/sdk/jme3-welcome-screen/src/com/jme3/gde/welcome/WelcomeScreen.java index c04742f56..a85467789 100644 --- a/sdk/jme3-welcome-screen/src/com/jme3/gde/welcome/WelcomeScreen.java +++ b/sdk/jme3-welcome-screen/src/com/jme3/gde/welcome/WelcomeScreen.java @@ -4,8 +4,8 @@ */ package com.jme3.gde.welcome; -import atmosphere.Planet; -import atmosphere.PlanetRendererState; +//import atmosphere.Planet; +//import atmosphere.PlanetRendererState; import com.jme3.gde.core.assets.ProjectAssetManager; import com.jme3.gde.core.scene.PreviewRequest; import com.jme3.gde.core.scene.SceneApplication; @@ -45,7 +45,7 @@ import org.openide.util.NbPreferences; */ public class WelcomeScreen implements ScreenController { - PlanetRendererState planetView; +// PlanetRendererState planetView; SceneRequest request; NiftyJmeDisplay niftyDisplay; Nifty nifty; @@ -96,9 +96,9 @@ public class WelcomeScreen implements ScreenController { skyBox.removeFromParent(); SceneApplication.getApplication().getGuiViewPort().removeProcessor(niftyDisplay); nifty.exit(); - if (planetView != null) { - SceneApplication.getApplication().getStateManager().detach(planetView); - } +// if (planetView != null) { +// SceneApplication.getApplication().getStateManager().detach(planetView); +// } SceneApplication.getApplication().removeSceneListener(this); return true; }