input: update grabbing touched points to default to POINTER1 if none …

…are available (#224)
littlektframework · Jan 22, 2024 · db64e6d · db64e6d
1 parent 98b9d5a
commit db64e6d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 12 deletions.
diff --git a/core/src/jsMain/kotlin/com/lehaine/littlekt/input/JsInput.kt b/core/src/jsMain/kotlin/com/lehaine/littlekt/input/JsInput.kt
@@ -101,7 +101,7 @@ class JsInput(val canvas: HTMLCanvasElement) : Input {
             val rect = canvas.getBoundingClientRect()
             val x = touchEvent.clientX.toFloat() - rect.left.toFloat()
             val y = touchEvent.clientY.toFloat() - rect.top.toFloat()
-            inputCache.onMove(x, y, touchedPointers.last())
+            inputCache.onMove(x, y, touchedPointers.lastOrNull() ?: Pointer.POINTER1)
         }
     }
 
@@ -146,11 +146,7 @@ class JsInput(val canvas: HTMLCanvasElement) : Input {
         logicalMouseX = mouseX
         logicalMouseY = mouseY
 
-        if (touchedPointers.isNotEmpty()) {
-            inputCache.onMove(mouseX, mouseY, touchedPointers.last())
-        } else {
-            inputCache.onMove(mouseX, mouseY, Pointer.POINTER1)
-        }
+        inputCache.onMove(mouseX, mouseY, touchedPointers.lastOrNull() ?: Pointer.POINTER1)
     }
 
 

diff --git a/core/src/jvmMain/kotlin/com/lehaine/littlekt/input/LwjglInput.kt b/core/src/jvmMain/kotlin/com/lehaine/littlekt/input/LwjglInput.kt
@@ -83,12 +83,7 @@ class LwjglInput(private val context: LwjglContext) : Input {
                 mouseY *= yScale
             }
 
-
-            if (touchedPointers.size > 0) {
-                inputCache.onMove(mouseX, mouseY, touchedPointers.last())
-            } else {
-                inputCache.onMove(mouseX, mouseY, Pointer.POINTER1)
-            }
+            inputCache.onMove(mouseX, mouseY, touchedPointers.lastOrNull() ?: Pointer.POINTER1)
         }
 
         glfwSetMouseButtonCallback(windowHandle) { window, button, action, mods ->