diff --git a/jme3-android/src/main/java/com/jme3/input/android/AndroidInputHandler.java b/jme3-android/src/main/java/com/jme3/input/android/AndroidInputHandler.java index be5989f32..592baecaf 100644 --- a/jme3-android/src/main/java/com/jme3/input/android/AndroidInputHandler.java +++ b/jme3-android/src/main/java/com/jme3/input/android/AndroidInputHandler.java @@ -242,10 +242,6 @@ public class AndroidInputHandler implements TouchInput { return mouseEventsEnabled; } - public boolean getSimulateMouse() { - return mouseEventsEnabled; - } - public boolean isMouseEventsInvertX() { return mouseEventsInvertX; } diff --git a/jme3-core/src/main/java/com/jme3/input/InputManager.java b/jme3-core/src/main/java/com/jme3/input/InputManager.java index f9667a2d7..660731a08 100644 --- a/jme3-core/src/main/java/com/jme3/input/InputManager.java +++ b/jme3-core/src/main/java/com/jme3/input/InputManager.java @@ -764,12 +764,25 @@ public class InputManager implements RawInputListener { } } /** + * @deprecated Use isSimulateMouse * Returns state of simulation of mouse events. Used for touchscreen input only. * */ public boolean getSimulateMouse() { if (touch != null) { - return touch.getSimulateMouse(); + return touch.isSimulateMouse(); + } else { + return false; + } + } + + /** + * Returns state of simulation of mouse events. Used for touchscreen input only. + * + */ + public boolean isSimulateMouse() { + if (touch != null) { + return touch.isSimulateMouse(); } else { return false; } @@ -786,6 +799,18 @@ public class InputManager implements RawInputListener { } } + /** + * Returns state of simulation of key events. Used for touchscreen input only. + * + */ + public boolean isSimulateKeyboard() { + if (touch != null) { + return touch.isSimulateKeyboard(); + } else { + return false; + } + } + private void processQueue() { int queueSize = inputQueue.size(); RawInputListener[] array = getRawListenerArray(); diff --git a/jme3-core/src/main/java/com/jme3/input/TouchInput.java b/jme3-core/src/main/java/com/jme3/input/TouchInput.java index 3a1dadbde..ddc5be484 100644 --- a/jme3-core/src/main/java/com/jme3/input/TouchInput.java +++ b/jme3-core/src/main/java/com/jme3/input/TouchInput.java @@ -73,13 +73,6 @@ public interface TouchInput extends Input { */ public void setSimulateMouse(boolean simulate); - /** - * Get if mouse events are generated - * @deprecated Use {@link #isSimulateMouse() }. - */ - @Deprecated - public boolean getSimulateMouse(); - /** * @return true if mouse event simulation is enabled, false otherwise. */ diff --git a/jme3-ios/src/main/java/com/jme3/input/ios/IosInputHandler.java b/jme3-ios/src/main/java/com/jme3/input/ios/IosInputHandler.java index be28e6689..725fe1454 100644 --- a/jme3-ios/src/main/java/com/jme3/input/ios/IosInputHandler.java +++ b/jme3-ios/src/main/java/com/jme3/input/ios/IosInputHandler.java @@ -97,11 +97,6 @@ public class IosInputHandler implements TouchInput { this.mouseEventsEnabled = simulate; } - @Override - public boolean getSimulateMouse() { - return mouseEventsEnabled; - } - @Override public boolean isSimulateMouse() { return mouseEventsEnabled;