aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorraysan5 <raysan5@gmail.com>2016-01-28 10:03:37 +0100
committerraysan5 <raysan5@gmail.com>2016-01-28 10:03:37 +0100
commitac475f46b9609235a9db4f3057271f609c39db7b (patch)
treee8b48281f8db55bec94ef99fd8e3062b4f8946cc /src
parentc21ca3ca1a3c68459cf75fc27bc73430228e3f0b (diff)
downloadraylib-ac475f46b9609235a9db4f3057271f609c39db7b.tar.gz
raylib-ac475f46b9609235a9db4f3057271f609c39db7b.zip
Added touch points id to gestures
Required by ProcessGestureEvent()
Diffstat (limited to 'src')
-rw-r--r--src/camera.c2
-rw-r--r--src/core.c8
2 files changed, 9 insertions, 1 deletions
diff --git a/src/camera.c b/src/camera.c
index 4768b176..1e7ac2ff 100644
--- a/src/camera.c
+++ b/src/camera.c
@@ -2,7 +2,7 @@
*
* raylib Camera System - Camera Modes Setup and Control Functions
*
-* Copyright (c) 2015 Marc Palau and Ramon Santamaria
+* Copyright (c) 2015 Marc Palau and Ramon Santamaria (@raysan5)
*
* This software is provided "as-is", without any express or implied warranty. In no event
* will the authors be held liable for any damages arising from the use of this software.
diff --git a/src/core.c b/src/core.c
index df380552..8b36e1ea 100644
--- a/src/core.c
+++ b/src/core.c
@@ -1916,6 +1916,10 @@ static int32_t AndroidInputCallback(struct android_app *app, AInputEvent *event)
// Register touch points count
gestureEvent.pointCount = AMotionEvent_getPointerCount(event);
+ // Register touch points id DESKTOP
+ gestureEvent.pointerId[0] = AMotionEvent_getPointerId(event, 0);
+ gestureEvent.pointerId[1] = AMotionEvent_getPointerId(event, 1);
+
// Register touch points position
// NOTE: Only two points registered
gestureEvent.position[0] = (Vector2){ AMotionEvent_getX(event, 0), AMotionEvent_getY(event, 0) };
@@ -2474,6 +2478,10 @@ static EM_BOOL EmscriptenInputCallback(int eventType, const EmscriptenTouchEvent
// Register touch points count
gestureEvent.pointCount = touchEvent->numTouches;
+ // Register touch points id WEB
+ gestureEvent.pointerId[0] = touchEvent->touches[0].identifier;
+ gestureEvent.pointerId[1] = touchEvent->touches[1].identifier;
+
// Register touch points position
// NOTE: Only two points registered
// TODO: Touch data should be scaled accordingly!