Merge pull request #42 from XuYicong/2.0-UI

Improve camera control
PlayCover · Oct 11, 2022 · b9a929e · b9a929e
2 parents 153c70a + 95072f4
commit b9a929e
Showing 1 changed file with 13 additions and 35 deletions.
diff --git a/PlayTools/Controls/PlayMice.swift b/PlayTools/Controls/PlayMice.swift
@@ -178,40 +178,22 @@ final class CameraControl {
         Toucher.touchQueue.asyncAfter(deadline: when, execute: closure)
     }
 
-    // if max speed of this touch is high
-    var movingFast = false
     // like sequence but resets when touch begins. Used to calc touch duration
     var counter = 0
     // if should wait before beginning next touch
     var cooldown = false
-    // if the touch point had been prevented from lifting off because of moving slow
-    var idled = false
     // in how many tests has this been identified as stationary
     var stationaryCount = 0
     let stationaryThreshold = 2
 
     @objc func checkEnded() {
         // if been stationary for enough time
-        if self.stationaryCount < self.stationaryThreshold {
+        if self.stationaryCount < self.stationaryThreshold || (self.stationaryCount < 20 - self.counter) {
             self.stationaryCount += 1
-            self.delay(0.1, closure: checkEnded)
+            self.delay(0.04, closure: checkEnded)
             return
         }
-        // and slow touch lasts for sufficient time
-        if self.movingFast || self.counter > 64 {
-            self.doLiftOff()
-        } else {
-            self.idled = true
-            // idle for at most 4 seconds
-            self.delay(4) {
-                if self.stationaryCount < self.stationaryThreshold {
-                    self.stationaryCount += 1
-                    self.delay(0.1, closure: self.checkEnded)
-                    return
-                }
-                self.doLiftOff()
-            }
-        }
+        self.doLiftOff()
      }
 
     @objc func updated(_ deltaX: CGFloat, _ deltaY: CGFloat) {
@@ -222,30 +204,23 @@ final class CameraControl {
         counter += 1
         if !isMoving {
             isMoving = true
-            movingFast = false
-            idled = false
             location = center
             counter = 0
             stationaryCount = 0
             Toucher.touchcam(point: self.center, phase: UITouch.Phase.began, tid: 1)
 
-            delay(0.1, closure: checkEnded)
+            delay(0.01, closure: checkEnded)
         }
-        // if not moving fast, regard the user fine-tuning the camera(e.g. aiming)
-        // so hold the touch for longer to avoid cold startup
-        if deltaX.magnitude + deltaY.magnitude > 12 {
-            // if we had mistaken this as player aiming
-            if self.idled {
-//                Toast.showOver(msg: "idled")
-                // since not aiming, re-touch to re-gain control
-                self.doLiftOff()
-                return
-            }
-            movingFast = true
+        if self.counter == 120 {
+            self.doLiftOff()
+            return
         }
         self.location.x += deltaX * CGFloat(PlaySettings.shared.sensitivity)
         self.location.y -= deltaY * CGFloat(PlaySettings.shared.sensitivity)
         Toucher.touchcam(point: self.location, phase: UITouch.Phase.moved, tid: 1)
+        if stationaryCount > self.stationaryThreshold {
+            self.counter = 0
+        }
         stationaryCount = 0
     }
 
@@ -254,6 +229,9 @@ final class CameraControl {
             return
         }
         Toucher.touchcam(point: self.location, phase: UITouch.Phase.ended, tid: 1)
+//        DispatchQueue.main.async {
+//            Toast.showOver(msg: "mouse released")
+//        }
         self.isMoving = false
         // ending and beginning too frequently leads to the beginning event not recognized
         // so let the beginning event wait some time