diff options
| author | Ray <[email protected]> | 2017-10-18 00:12:27 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-10-18 00:12:27 +0200 |
| commit | 53280a56e3f4ab576fafeb75a68031fcdc4089fa (patch) | |
| tree | 919a4dc7f5623df04ab316c855e43eb32a051cc9 /src/core.c | |
| parent | 4a63e5dfb3006483cace85c8161d12057a9e8488 (diff) | |
| parent | 5b71e5b3d1cb87d7ed764d6be82bd6fcb9fa875f (diff) | |
| download | raylib-53280a56e3f4ab576fafeb75a68031fcdc4089fa.tar.gz raylib-53280a56e3f4ab576fafeb75a68031fcdc4089fa.zip | |
Merge pull request #367 from raysan5/develop
Integrate Develop branch
Diffstat (limited to 'src/core.c')
| -rw-r--r-- | src/core.c | 17 |
1 files changed, 10 insertions, 7 deletions
@@ -105,8 +105,8 @@ #endif #if defined(SUPPORT_GIF_RECORDING) - #define GIF_IMPLEMENTATION - #include "external/gif.h" // Support GIF recording + #define RGIF_IMPLEMENTATION + #include "external/rgif.h" // Support GIF recording #endif #if defined(__linux__) || defined(PLATFORM_WEB) @@ -314,9 +314,7 @@ static Vector2 mousePosition; // Mouse position on screen static bool toggleCursorLock = false; // Ask for cursor pointer lock on next click #endif -#if defined(SUPPORT_GESTURES_SYSTEM) static Vector2 touchPosition[MAX_TOUCH_POINTS]; // Touch position on screen -#endif #if defined(PLATFORM_DESKTOP) static char **dropFilesPath; // Store dropped files paths as strings @@ -477,8 +475,6 @@ void InitWindow(int width, int height, void *state) { TraceLog(LOG_INFO, "Initializing raylib (v1.8.0)"); - app_dummy(); - screenWidth = width; screenHeight = height; @@ -1495,6 +1491,7 @@ bool IsMouseButtonPressed(int button) { bool pressed = false; +// TODO: Review, gestures could be not supported despite being on Android platform! #if defined(PLATFORM_ANDROID) if (IsGestureDetected(GESTURE_TAP)) pressed = true; #else @@ -2748,6 +2745,7 @@ static int32_t AndroidInputCallback(struct android_app *app, AInputEvent *event) int32_t action = AMotionEvent_getAction(event); unsigned int flags = action & AMOTION_EVENT_ACTION_MASK; +#if defined(SUPPORT_GESTURES_SYSTEM) GestureEvent gestureEvent; // Register touch actions @@ -2776,8 +2774,13 @@ static int32_t AndroidInputCallback(struct android_app *app, AInputEvent *event) // Gesture data is sent to gestures system for processing ProcessGestureEvent(gestureEvent); +#else + + // TODO: Support only simple touch position + +#endif - return 0; // return 1; + return 0; } #endif |