- remove planet from welcome screen

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8035 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
3.0
nor..67 14 years ago
parent cffe66ac9a
commit 9f221b5801
  1. 8
      sdk/jme3-welcome-screen/nbproject/genfiles.properties
  2. 8
      sdk/jme3-welcome-screen/nbproject/project.xml
  3. BIN
      sdk/jme3-welcome-screen/release/modules/ext/assets.jar
  4. BIN
      sdk/jme3-welcome-screen/release/modules/ext/jme3-atmosphere-scattering.jar
  5. 12
      sdk/jme3-welcome-screen/src/com/jme3/gde/welcome/WelcomeScreen.java

@ -1,8 +1,8 @@
build.xml.data.CRC32=dc88386f build.xml.data.CRC32=d333c959
build.xml.script.CRC32=e68af6b0 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. # 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. # 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.script.CRC32=5d3b3399
nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.42.2 nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.46.1

@ -89,18 +89,10 @@
<runtime-relative-path>ext/nifty-style-black-1.2.jar</runtime-relative-path> <runtime-relative-path>ext/nifty-style-black-1.2.jar</runtime-relative-path>
<binary-origin>release/modules/ext/nifty-style-black-1.2.jar</binary-origin> <binary-origin>release/modules/ext/nifty-style-black-1.2.jar</binary-origin>
</class-path-extension> </class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/assets.jar</runtime-relative-path>
<binary-origin>release/modules/ext/assets.jar</binary-origin>
</class-path-extension>
<class-path-extension> <class-path-extension>
<runtime-relative-path>ext/nifty-default-controls-1.2.jar</runtime-relative-path> <runtime-relative-path>ext/nifty-default-controls-1.2.jar</runtime-relative-path>
<binary-origin>release/modules/ext/nifty-default-controls-1.2.jar</binary-origin> <binary-origin>release/modules/ext/nifty-default-controls-1.2.jar</binary-origin>
</class-path-extension> </class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/jme3-atmosphere-scattering.jar</runtime-relative-path>
<binary-origin>release/modules/ext/jme3-atmosphere-scattering.jar</binary-origin>
</class-path-extension>
</data> </data>
</configuration> </configuration>
</project> </project>

@ -4,8 +4,8 @@
*/ */
package com.jme3.gde.welcome; package com.jme3.gde.welcome;
import atmosphere.Planet; //import atmosphere.Planet;
import atmosphere.PlanetRendererState; //import atmosphere.PlanetRendererState;
import com.jme3.gde.core.assets.ProjectAssetManager; import com.jme3.gde.core.assets.ProjectAssetManager;
import com.jme3.gde.core.scene.PreviewRequest; import com.jme3.gde.core.scene.PreviewRequest;
import com.jme3.gde.core.scene.SceneApplication; import com.jme3.gde.core.scene.SceneApplication;
@ -45,7 +45,7 @@ import org.openide.util.NbPreferences;
*/ */
public class WelcomeScreen implements ScreenController { public class WelcomeScreen implements ScreenController {
PlanetRendererState planetView; // PlanetRendererState planetView;
SceneRequest request; SceneRequest request;
NiftyJmeDisplay niftyDisplay; NiftyJmeDisplay niftyDisplay;
Nifty nifty; Nifty nifty;
@ -96,9 +96,9 @@ public class WelcomeScreen implements ScreenController {
skyBox.removeFromParent(); skyBox.removeFromParent();
SceneApplication.getApplication().getGuiViewPort().removeProcessor(niftyDisplay); SceneApplication.getApplication().getGuiViewPort().removeProcessor(niftyDisplay);
nifty.exit(); nifty.exit();
if (planetView != null) { // if (planetView != null) {
SceneApplication.getApplication().getStateManager().detach(planetView); // SceneApplication.getApplication().getStateManager().detach(planetView);
} // }
SceneApplication.getApplication().removeSceneListener(this); SceneApplication.getApplication().removeSceneListener(this);
return true; return true;
} }

Loading…
Cancel
Save