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

SceneToolController AppState is now always after the CameraController in the AppState list in the SceneApplication

Browse Source
This commit is contained in:
Nehon 2015-02-18 00:27:13 +01:00
parent 52ebd9090c
commit c3ab5b3748
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sdk/jme3-core/src/com/jme3/gde/core/scene/controller/AbstractCameraController.java
View File

@ -97,7 +97,14 @@ public abstract class AbstractCameraController extends AbstractAppState implemen
}
public void enable() {
SceneApplication.getApplication().getStateManager().attach(this);
SceneToolController c = SceneApplication.getApplication().getStateManager().getState(SceneToolController.class);
if(c != null){
SceneApplication.getApplication().getStateManager().detach(c);
SceneApplication.getApplication().getStateManager().attach(this);
SceneApplication.getApplication().getStateManager().attach(c);
}else{
SceneApplication.getApplication().getStateManager().attach(this);
}
final AbstractCameraController cc = SceneApplication.getApplication().getActiveCameraController();
SceneApplication.getApplication().setActiveCameraController(this);

9
sdk/jme3-core/src/com/jme3/gde/core/scene/controller/SceneToolController.java
View File

@ -53,7 +53,7 @@ public class SceneToolController implements AppState {
public SceneToolController(AssetManager manager) {
this.toolsNode = new Node("ToolsNode");
initTools();
initTools();
SceneApplication.getApplication().getStateManager().attach(this);
}
@ -416,17 +416,16 @@ public class SceneToolController implements AppState {
// throw new UnsupportedOperationException("Not supported yet.");
}
public void update(float f) {
public void update(float f) {
if (selected == null || selectionShape == null) {
return;
}
selectionShape.setLocalTranslation(selected.getWorldTranslation());
selectionShape.setLocalRotation(selected.getWorldRotation());
//selectionShape.setLocalScale(selected.getWorldScale());
selectionShape.setLocalScale(selected.getWorldScale());
}
public void render(RenderManager rm) {
// throw new UnsupportedOperationException("Not supported yet.");
}