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

Prevented scaling to kick in when pressing ctrl+S in the SDK to save the scene.

Browse Source
This commit is contained in:
Nehon 2015-02-17 20:35:37 +01:00
parent 9f4d72cfc0
commit 52ebd9090c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sdk/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/tools/SelectTool.java
View File

@ -93,7 +93,7 @@ public class SelectTool extends SceneEditTool {
return; // only do anything if a spatial is selected return; // only do anything if a spatial is selected
} }
// key released // key released
if (kie.isReleased()) { if (kie.isPressed()) {
boolean commandUsed = checkCommandKey(kie); boolean commandUsed = checkCommandKey(kie);
boolean stateChange = checkStateKey(kie); boolean stateChange = checkStateKey(kie);
boolean axisChange = checkAxisKey(kie); boolean axisChange = checkAxisKey(kie);
@ -268,7 +268,7 @@ public class SelectTool extends SceneEditTool {
private boolean checkStateKey(KeyInputEvent kie) { private boolean checkStateKey(KeyInputEvent kie) {
Spatial selected = toolController.getSelectedSpatial(); Spatial selected = toolController.getSelectedSpatial();
if (kie.getKeyCode() == KeyInput.KEY_G) { if (kie.getKeyCode() == KeyInput.KEY_G && !ctrlDown) {
currentState = State.translate; currentState = State.translate;
MoveManager moveManager = Lookup.getDefault().lookup(MoveManager.class); MoveManager moveManager = Lookup.getDefault().lookup(MoveManager.class);
moveManager.reset(); moveManager.reset();
@ -276,10 +276,10 @@ public class SelectTool extends SceneEditTool {
moveManager.initiateMove(selected, rot, false); moveManager.initiateMove(selected, rot, false);
moving = moveManager.makeUndo(); moving = moveManager.makeUndo();
return true; return true;
} else if (kie.getKeyCode() == KeyInput.KEY_R) { } else if (kie.getKeyCode() == KeyInput.KEY_R && !ctrlDown) {
currentState = State.rotate; currentState = State.rotate;
return true; return true;
} else if (kie.getKeyCode() == KeyInput.KEY_S) { } else if (kie.getKeyCode() == KeyInput.KEY_S && !ctrlDown) {
currentState = State.scale; currentState = State.scale;
return true; return true;
} }