iOS Controllers: implemented isVibrating and cancelVibration, linking…

… GameController framework instead of GameKit
libgdx · Jan 26, 2021 · 602edd1 · 602edd1
1 parent 5893a3f
commit 602edd1
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@ The recommended way to use gdx-controllers is via dependency management with Gra
 *project-root/build.gradle:*
 
     ext {
-        gdxControllersVersion = '2.0.0'
+        gdxControllersVersion = '2.0.1' // see badges above for latest versions
     }
 
 Add the following dependencies:
@@ -57,9 +57,9 @@ implementation "com.badlogicgames.gdx-controllers:gdx-controllers-ios:$gdxContro
 ```
 <pattern>com.badlogic.gdx.controllers.IosControllerManager</pattern> 
 ....
-	<framework>GameKit</framework>
+	<framework>GameController</framework>
 ```
-If you forget to explicitly link GameKit framework, no game controller will show up.
+If you forget to explicitly link the framework, no game controller will show up.
 
 #### html:
 ```

diff --git a/gdx-controllers-ios/src/com/badlogic/gdx/controllers/IosController.java b/gdx-controllers-ios/src/com/badlogic/gdx/controllers/IosController.java
@@ -10,6 +10,7 @@
 import org.robovm.apple.corehaptic.CHHapticEventType;
 import org.robovm.apple.corehaptic.CHHapticParameterCurve;
 import org.robovm.apple.corehaptic.CHHapticPattern;
+import org.robovm.apple.corehaptic.CHHapticPatternPlayer;
 import org.robovm.apple.foundation.Foundation;
 import org.robovm.apple.foundation.NSArray;
 import org.robovm.apple.foundation.NSErrorException;
@@ -44,6 +45,8 @@ public class IosController extends AbstractController {
     private long lastPausePressedMs = 0;
 
     private CHHapticEngine hapticEngine;
+    private CHHapticPatternPlayer playingHapticPattern;
+    private long vibrationEndMs;
 
     public IosController(GCController controller) {
         this.controller = controller;
@@ -379,13 +382,29 @@ public void startVibration(int duration, float strength) {
         if (canVibrate()) {
             try {
                 hapticEngine.start(null);
-                hapticEngine.createPlayer(constructRumbleEvent((float) duration / 1000, strength)).start(0, null);
+                playingHapticPattern = hapticEngine.createPlayer(constructRumbleEvent((float) duration / 1000, strength));
+                playingHapticPattern.start(0, null);
+                vibrationEndMs = TimeUtils.millis() + duration;
             } catch (Throwable t) {
                 Gdx.app.error("Controllers", "Vibration failed", t);
             }
         }
     }
 
+    @Override
+    public boolean isVibrating() {
+        return canVibrate() && TimeUtils.millis() < vibrationEndMs && playingHapticPattern != null;
+    }
+
+    @Override
+    public void cancelVibration() {
+        if (isVibrating()) {
+            playingHapticPattern.cancelAndReturnError(null);
+            playingHapticPattern = null;
+            vibrationEndMs = 0;
+        }
+    }
+
     @Override
     public ControllerMapping getMapping() {
         return MfiMapping.getInstance();

diff --git a/test/core/src/main/java/com/badlogic/gdx/controllers/test/ControllersTest.java b/test/core/src/main/java/com/badlogic/gdx/controllers/test/ControllersTest.java
@@ -180,7 +180,11 @@ public void changed(ChangeEvent event, Actor actor) {
             @Override
             public void changed(ChangeEvent event, Actor actor) {
                 if (selectedController != null) {
-                    selectedController.startVibration(1000, 1f);
+                    if (!selectedController.isVibrating()) {
+                        selectedController.startVibration(1000, 1f);
+                    } else {
+                        selectedController.cancelVibration();
+                    }
                 }
             }
         });

diff --git a/test/ios/robovm.xml b/test/ios/robovm.xml
@@ -42,7 +42,7 @@
 		<framework>OpenGLES</framework>
 		<framework>QuartzCore</framework>
 		<framework>CoreGraphics</framework>
-		<framework>GameKit</framework>
+		<framework>GameController</framework>
 		<framework>OpenAL</framework>
 		<framework>AudioToolbox</framework>
 		<framework>AVFoundation</framework>