Merge branch 'main' into canvas-scaling

ConnorDY · Aug 21, 2022 · d4b232e · d4b232e
2 parents 5eea923 + 9fa93db
commit d4b232e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,8 @@
 
 - Fix a potential process lingering issue when the renderer fails to load &ndash; [#119](https://github.com/ConnorDY/OSRS-Environment-Exporter/pull/119) @ScoreUnder
 
+- Fix camera flickering when mouse warping is enabled but the warp destination is outside of the screen &ndash; [#124](https://github.com/ConnorDY/OSRS-Environment-Exporter/pull/124) @ScoreUnder
+
 - Scale canvas correctly even under high-DPI modes &ndash; [#125](https://github.com/ConnorDY/OSRS-Environment-Exporter/pull/125) @ScoreUnder
 
 ## 2.2.0

diff --git a/src/main/kotlin/controllers/worldRenderer/InputHandler.kt b/src/main/kotlin/controllers/worldRenderer/InputHandler.kt
@@ -161,7 +161,7 @@ class InputHandler internal constructor(
         }
     }
 
-    private fun warpMouse(x: Int, y: Int) {
+    private fun warpMouse(x: Int, y: Int): Boolean {
         val screen = GraphicsEnvironment.getLocalGraphicsEnvironment().screenDevices.find { device ->
             device.configurations.find { it.bounds.contains(x, y) } != null
         }
@@ -173,6 +173,7 @@ class InputHandler internal constructor(
             }
             robot.mouseMove(x, y)
         }
+        return screen != null
     }
 
     override fun mouseMoved(e: MouseEvent) {
@@ -215,8 +216,17 @@ class InputHandler internal constructor(
                 }
 
                 if (warp) {
-                    warpMouse(offsetX + x, offsetY + y)
-                    discardUntil = System.currentTimeMillis()
+                    val warpSuccess = warpMouse(offsetX + x, offsetY + y)
+                    if (warpSuccess) {
+                        // Discard queued events if we warped the mouse successfully
+                        // because the old events will be relative to the old mouse position
+                        discardUntil = System.currentTimeMillis()
+                    } else {
+                        // If the mouse failed to warp, set x and y back to normal
+                        // so that the camera doesn't jump around
+                        x = e.x
+                        y = e.y
+                    }
                 }
             }