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

SDK SceneComposer : bugfix in the ShortcutManager, prevent from setting the currentShorcut to NULL when there are no new activable shortcuts

Browse Source
This commit is contained in:
Maselbas 2015-05-14 19:02:35 +02:00
parent 92ab8b8060
commit e27b8a5739
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sdk/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/tools/shortcuts/ShortcutManager.java
View File

@ -66,8 +66,11 @@ public class ShortcutManager {
} }
public boolean activateShortcut(KeyInputEvent kie) { public boolean activateShortcut(KeyInputEvent kie) {
currentShortcut = getActivableShortcut(kie); ShortcutTool newShortcut = getActivableShortcut(kie);
return isActive(); if(newShortcut != null){
currentShortcut = newShortcut;
}
return newShortcut != null;
} }
public void doKeyPressed(KeyInputEvent kie) { public void doKeyPressed(KeyInputEvent kie) {
@ -182,13 +185,13 @@ public class ShortcutManager {
public static boolean checkAxisKey(KeyInputEvent kie, Vector3f axisStore) { public static boolean checkAxisKey(KeyInputEvent kie, Vector3f axisStore) {
if (kie.getKeyCode() == KeyInput.KEY_X) { if (kie.getKeyCode() == KeyInput.KEY_X) {
axisStore = Vector3f.UNIT_X; axisStore.set(Vector3f.UNIT_X);
return true; return true;
} else if (kie.getKeyCode() == KeyInput.KEY_Y) { } else if (kie.getKeyCode() == KeyInput.KEY_Y) {
axisStore = Vector3f.UNIT_Y; axisStore.set(Vector3f.UNIT_Y);
return true; return true;
} else if (kie.getKeyCode() == KeyInput.KEY_Z) { } else if (kie.getKeyCode() == KeyInput.KEY_Z) {
axisStore = Vector3f.UNIT_Z; axisStore.set(Vector3f.UNIT_Z);
return true; return true;
} }
return false; return false;