Merge pull request #278 from lucasnlm/update-strings

Unlock camera after touch for a long distance
lucasnlm · May 12, 2021 · 0da1326 · 0da1326
2 parents 3524eab + 0155ac2
commit 0da1326
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -14,8 +14,8 @@ android {
 
     defaultConfig {
         // versionCode and versionName must be hardcoded to support F-droid
-        versionCode 1001051
-        versionName '10.1.5'
+        versionCode 1001061
+        versionName '10.1.6'
         minSdkVersion 21
         targetSdkVersion 30
         multiDexEnabled true

diff --git a/gdx/src/main/java/dev/lucasnlm/antimine/gdx/controller/CameraController.kt b/gdx/src/main/java/dev/lucasnlm/antimine/gdx/controller/CameraController.kt
@@ -12,6 +12,7 @@ class CameraController(
 ) {
     private val velocity: Vector2 = Vector2.Zero.cpy()
     private var touch: Vector2? = null
+    private var unlockTouch = false
 
     private fun limitSpeed(minefieldSize: SizeF) {
         val padding = renderSettings.internalPadding
@@ -60,6 +61,7 @@ class CameraController(
             velocity.add(dx * Gdx.graphics.deltaTime, dy * Gdx.graphics.deltaTime)
         }
         touch = null
+        unlockTouch = false
     }
 
     fun startTouch(x: Float, y: Float) {
@@ -70,12 +72,13 @@ class CameraController(
 
     fun translate(dx: Float, dy: Float, x: Float, y: Float) {
         touch?.let {
-            if (Vector2(x, y).sub(it.x, it.y).len() > renderSettings.areaSize) {
+            if (Vector2(x, y).sub(it.x, it.y).len() > renderSettings.areaSize || unlockTouch) {
                 camera.run {
                     translate(dx, dy, 0f)
                     update(true)
                     Gdx.graphics.requestRendering()
                 }
+                unlockTouch = true
             }
         }
     }