Merge pull request #268 from reco1I/input

Run touch input in its own thread to reduce possible delay
osudroid · Aug 14, 2023 · 4a4f1ab · 4a4f1ab
2 parents 2e408fd + d7c614c
commit 4a4f1ab
Showing 1 changed file with 17 additions and 6 deletions.
diff --git a/src/ru/nsu/ccfit/zuev/osu/game/GameScene.java b/src/ru/nsu/ccfit/zuev/osu/game/GameScene.java
@@ -26,6 +26,7 @@
 import org.anddev.andengine.engine.Engine;
 import org.anddev.andengine.engine.camera.SmoothCamera;
 import org.anddev.andengine.engine.handler.IUpdateHandler;
+import org.anddev.andengine.engine.options.TouchOptions;
 import org.anddev.andengine.entity.IEntity;
 import org.anddev.andengine.entity.modifier.DelayModifier;
 import org.anddev.andengine.entity.modifier.FadeOutModifier;
@@ -1285,11 +1286,7 @@ else if (stat.getMod().contains(GameMod.MOD_PERFECT)) {
             RoomAPI.INSTANCE.notifyBeatmapLoaded();
             return;
         }
-
-        leadOut = 0;
-        musicStarted = false;
-        engine.setScene(scene);
-        scene.registerUpdateHandler(this);
+        start();
     }
 
     // This is used by the multiplayer system, is called once all players in the room completes beatmap loading.
@@ -1300,6 +1297,12 @@ public void start() {
 
         leadOut = 0;
         musicStarted = false;
+
+        // Handle input in its own thread
+        var touchOptions = new TouchOptions();
+        touchOptions.setRunOnUpdateThread(false);
+        engine.getTouchController().applyTouchOptions(touchOptions);
+
         engine.setScene(scene);
         scene.registerUpdateHandler(this);
     }
@@ -1964,6 +1967,11 @@ public void onModifierFinished(IModifier<IEntity> iModifier, IEntity iEntity) {
                 engine.setScene(oldScene);
             }
 
+            // Handle input back in update thread
+            var touchOptions = new TouchOptions();
+            touchOptions.setRunOnUpdateThread(true);
+            engine.getTouchController().applyTouchOptions(touchOptions);
+
             if (storyboardSprite != null) {
                 storyboardSprite.releaseStoryboard();
                 storyboardSprite = null;
@@ -2089,7 +2097,10 @@ private void onExit() {
 
     public void quit() {
 
-        //游戏中退出，通过暂停菜单
+        // Handle input back in update thread
+        var touchOptions = new TouchOptions();
+        touchOptions.setRunOnUpdateThread(true);
+        engine.getTouchController().applyTouchOptions(touchOptions);
 
         if (!replaying) {
             EdExtensionHelper.onQuitGame(lastTrack);