sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

SDK:

Browse Source 
- small fixes

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8034 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
nor..67 2011-08-17 22:28:22 +00:00
parent c3b870fae3
commit cffe66ac9a
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sdk/jme3-core/src/com/jme3/gde/core/scene/SceneApplication.java
View File

@ -39,7 +39,6 @@ import com.jme3.input.controls.MouseAxisTrigger;
import com.jme3.input.controls.MouseButtonTrigger; import com.jme3.input.controls.MouseButtonTrigger;
import com.jme3.light.PointLight; import com.jme3.light.PointLight;
import com.jme3.math.ColorRGBA; import com.jme3.math.ColorRGBA;
import com.jme3.math.FastMath;
import com.jme3.math.Vector3f; import com.jme3.math.Vector3f;
import com.jme3.renderer.RenderManager; import com.jme3.renderer.RenderManager;
import com.jme3.renderer.ViewPort; import com.jme3.renderer.ViewPort;
@ -90,7 +89,7 @@ public class SceneApplication extends Application implements LookupProvider, Loo
private Node statsGuiNode = new Node("Stats Gui Node"); private Node statsGuiNode = new Node("Stats Gui Node");
protected Node toolsNode = new Node("Tools Node"); protected Node toolsNode = new Node("Tools Node");
private SceneCameraController camController; private SceneCameraController camController;
private AbstractCameraController activeCamController=null; private AbstractCameraController activeCamController = null;
//preview variables //preview variables
protected float secondCounter = 0.0f; protected float secondCounter = 0.0f;
protected BitmapText fpsText; protected BitmapText fpsText;
@ -136,9 +135,6 @@ public class SceneApplication extends Application implements LookupProvider, Loo
} }
} }
private void loadFPSText() { private void loadFPSText() {
BitmapFont font = assetManager.loadFont("Interface/Fonts/Default.fnt"); BitmapFont font = assetManager.loadFont("Interface/Fonts/Default.fnt");
@ -324,6 +320,8 @@ public class SceneApplication extends Application implements LookupProvider, Loo
currentSceneRequest = request; currentSceneRequest = request;
if (request.getDataObject() != null) { if (request.getDataObject() != null) {
setCurrentFileNode(request.getDataObject().getNodeDelegate()); setCurrentFileNode(request.getDataObject().getNodeDelegate());
} else {
setCurrentFileNode(null);
} }
setHelpContext(request.getHelpCtx()); setHelpContext(request.getHelpCtx());
getCurrentSceneRequest().setDisplayed(true); getCurrentSceneRequest().setDisplayed(true);
@ -381,8 +379,8 @@ public class SceneApplication extends Application implements LookupProvider, Loo
} }
toolsNode.detachAllChildren(); toolsNode.detachAllChildren();
rootNode.detachAllChildren(); rootNode.detachAllChildren();
setHelpContext(null); setHelpContext(null);
// resetCam(); // resetCam();
currentSceneRequest = null; currentSceneRequest = null;
lastError = ""; lastError = "";
java.awt.EventQueue.invokeLater(new Runnable() { java.awt.EventQueue.invokeLater(new Runnable() {
@ -421,7 +419,7 @@ public class SceneApplication extends Application implements LookupProvider, Loo
} else { } else {
SceneViewerTopComponent.findInstance().setActivatedNodes(new org.openide.nodes.Node[]{node}); SceneViewerTopComponent.findInstance().setActivatedNodes(new org.openide.nodes.Node[]{node});
SceneViewerTopComponent.findInstance().open(); SceneViewerTopComponent.findInstance().open();
SceneViewerTopComponent.findInstance().requestActive(); SceneViewerTopComponent.findInstance().requestVisible();
} }
} }
}); });
@ -539,6 +537,4 @@ public class SceneApplication extends Application implements LookupProvider, Loo
public void setActiveCameraController(AbstractCameraController activeCamController) { public void setActiveCameraController(AbstractCameraController activeCamController) {
this.activeCamController = activeCamController; this.activeCamController = activeCamController;
} }
} }