UnrealXR/raylib
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added touch points id to gestures

Browse source 
Required by ProcessGestureEvent()
This commit is contained in:
raysan5 2016-01-28 10:03:37 +01:00
parent c21ca3ca1a
commit ac475f46b9
2 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/camera.c
View file

@ -2,7 +2,7 @@
* *
* raylib Camera System - Camera Modes Setup and Control Functions * 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 * 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. * will the authors be held liable for any damages arising from the use of this software.

8
src/core.c
View file

@ -1916,6 +1916,10 @@ static int32_t AndroidInputCallback(struct android_app *app, AInputEvent *event)
// Register touch points count // Register touch points count
gestureEvent.pointCount = AMotionEvent_getPointerCount(event); 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 // Register touch points position
// NOTE: Only two points registered // NOTE: Only two points registered
gestureEvent.position[0] = (Vector2){ AMotionEvent_getX(event, 0), AMotionEvent_getY(event, 0) }; 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 // Register touch points count
gestureEvent.pointCount = touchEvent->numTouches; 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 // Register touch points position
// NOTE: Only two points registered // NOTE: Only two points registered
// TODO: Touch data should be scaled accordingly! // TODO: Touch data should be scaled accordingly!