From c0bcf2d671edf84008f3a99c557809b6a4ab5c33 Mon Sep 17 00:00:00 2001 From: chemguerra Date: Mon, 12 Jun 2023 06:57:55 +0200 Subject: [PATCH] Amends to the WebGL2 PR --- src/Makefile | 7 +++---- src/raylib.h | 1 - src/rcore.c | 5 ----- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/Makefile b/src/Makefile index 21b343d15..fc4c5b0c7 100644 --- a/src/Makefile +++ b/src/Makefile @@ -245,8 +245,8 @@ ifeq ($(PLATFORM),PLATFORM_DRM) endif ifeq ($(PLATFORM),PLATFORM_WEB) # On HTML5 OpenGL ES 2.0 is used, emscripten translates it to WebGL 1.0 - #GRAPHICS = GRAPHICS_API_OPENGL_ES2 - GRAPHICS = GRAPHICS_API_OPENGL_ES3 # Uncomment to use ES3/WebGL2 (preliminary support). + GRAPHICS = GRAPHICS_API_OPENGL_ES2 + #GRAPHICS = GRAPHICS_API_OPENGL_ES3 # Uncomment to use ES3/WebGL2 (preliminary support). endif ifeq ($(PLATFORM),PLATFORM_ANDROID) # By default use OpenGL ES 2.0 on Android @@ -345,8 +345,7 @@ endif ifeq ($(RAYLIB_BUILD_MODE),RELEASE) ifeq ($(PLATFORM),PLATFORM_WEB) - #CFLAGS += -Os - CFLAGS += -O3 + CFLAGS += -Os endif ifeq ($(PLATFORM),PLATFORM_DESKTOP) CFLAGS += -O1 diff --git a/src/raylib.h b/src/raylib.h index ad920ed48..f6a48bc73 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -1149,7 +1149,6 @@ RLAPI int GetTouchX(void); // Get touch posit RLAPI int GetTouchY(void); // Get touch position Y for touch point 0 (relative to screen size) RLAPI Vector2 GetTouchPosition(int index); // Get touch position XY for a touch point index (relative to screen size) RLAPI int GetTouchPointId(int index); // Get touch point identifier for given index -RLAPI bool GetTouchPointState(int index); // Patch for touch events in web browsers RLAPI int GetTouchPointCount(void); // Get number of touch points //------------------------------------------------------------------------------------ diff --git a/src/rcore.c b/src/rcore.c index 5cbdade44..ee682e8b0 100644 --- a/src/rcore.c +++ b/src/rcore.c @@ -4022,11 +4022,6 @@ int GetTouchPointId(int index) return id; } -bool GetTouchPointState(int index) -{ - return ( (index < MAX_TOUCH_POINTS) && (CORE.Input.Touch.currentTouchState[index] != 0) ); -} - // Get number of touch points int GetTouchPointCount(void) {