better rumble

Author: riccardobl

jme3-ios-examples/src/main/java/jme3test/ios/IosTestChooserLauncher.java

@@ -191,6 +191,7 @@ private static void invokeSetShowSettings(Application application) {
     private static void configureIosSettings(Application application) {
         AppSettings settings = new AppSettings(true);
         settings.setUseJoysticks(true);
+        settings.setOnDeviceJoystickRumble(true);
         application.setSettings(settings);
     }
 

jme3-ios/src/main/java/com/jme3/input/ios/IosJoyInput.java

@@ -121,17 +121,26 @@ public long getInputTimeNanos() {
     }
 
     @Override
-    public void setJoyRumble(int joyId, float amount) {
+    public void setJoyRumble(int joyId, float amountHigh, float amountLow, float duration) {
         if (onDeviceJoystickRumble && JmeSystem.isDeviceRumbleSupported()) {
-            JmeSystem.setDeviceRumble(amount);
+            JmeSystem.rumble(amountHigh, amountLow, duration);
             return;
         }
-        float rumble = FastMath.clamp(amount, 0f, 1f);
-        int amplitude = (int) (rumble * 0xffff);
+
         IosJoystick joystick = joysticks.get(joyId);
         if (joystick != null) {
-            joystick.rumble(amplitude, amplitude, 100);
+            joystick.rumble(toRumbleAmplitude(amountLow), toRumbleAmplitude(amountHigh),
+                    toRumbleDurationMillis(duration));
+        }
+    }
+
+    @Override
+    public void stopJoyRumble(int joyId) {
+        if (onDeviceJoystickRumble && JmeSystem.isDeviceRumbleSupported()) {
+            JmeSystem.stopRumble();
+            return;
         }
+        setJoyRumble(joyId, 0f, 0f, 0f);
     }
 
     public void loadSettings(AppSettings settings) {
@@ -275,6 +284,19 @@ private static String displayName(String sdlName, String fallback, int id) {
         return sdlName;
     }
 
+    private static int toRumbleAmplitude(float amount) {
+        return (int) (FastMath.clamp(amount, 0f, 1f) * 0xffff);
+    }
+
+    private static int toRumbleDurationMillis(float duration) {
+        if (duration == Float.POSITIVE_INFINITY) {
+            return 21 * 24 * 60 * 60 * 1000;
+        } else if (duration <= 0f) {
+            return 0;
+        }
+        return Math.max(1, (int) (duration * 1000f));
+    }
+
     private static final class IosJoystick extends AbstractJoystick {
         private final Map<Integer, JoystickAxis> axes = new HashMap<>();
         private final Map<Integer, JoystickButton> buttons = new HashMap<>();

jme3-ios/src/main/java/com/jme3/system/ios/JmeIosSystem.java

@@ -31,17 +31,17 @@
  */
 package com.jme3.system.ios;
 
+import com.jme3.audio.AudioRenderer;
+import com.jme3.audio.ios.IosAL;
+import com.jme3.audio.ios.IosALC;
+import com.jme3.audio.ios.IosEFX;
+import com.jme3.audio.openal.ALAudioRenderer;
 import com.jme3.system.AppSettings;
 import com.jme3.system.JmeContext;
 import com.jme3.system.JmeSystemDelegate;
 import com.jme3.system.NullContext;
 import com.jme3.system.Platform;
 import com.jme3.util.res.Resources;
-import com.jme3.audio.AudioRenderer;
-import com.jme3.audio.ios.IosAL;
-import com.jme3.audio.ios.IosALC;
-import com.jme3.audio.ios.IosEFX;
-import com.jme3.audio.openal.ALAudioRenderer;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.net.URL;
@@ -145,9 +145,22 @@ public boolean isDeviceRumbleSupported() {
     }
 
     @Override
-    public void setDeviceRumble(float amount) {
+    public void rumble(float amountHigh, float amountLow, float duration) {
+        if (duration <= 0f) {
+            stopRumble();
+            return;
+        }
+        try {
+            LibJGLIOSDeviceBridge.rumble(amountHigh, amountLow, duration);
+        } catch (UnsatisfiedLinkError | NoClassDefFoundError ignored) {
+            // Desktop/unit-test runs may load this delegate without the iOS launcher.
+        }
+    }
+
+    @Override
+    public void stopRumble() {
         try {
-            LibJGLIOSDeviceBridge.setRumble(amount);
+            LibJGLIOSDeviceBridge.stopRumble();
         } catch (UnsatisfiedLinkError | NoClassDefFoundError ignored) {
             // Desktop/unit-test runs may load this delegate without the iOS launcher.
         }