Amends to the WebGL2 PR
This commit is contained in:
parent
f45e0cf5a8
commit
c0bcf2d671
|
|
@ -245,8 +245,8 @@ ifeq ($(PLATFORM),PLATFORM_DRM)
|
||||||
endif
|
endif
|
||||||
ifeq ($(PLATFORM),PLATFORM_WEB)
|
ifeq ($(PLATFORM),PLATFORM_WEB)
|
||||||
# On HTML5 OpenGL ES 2.0 is used, emscripten translates it to WebGL 1.0
|
# On HTML5 OpenGL ES 2.0 is used, emscripten translates it to WebGL 1.0
|
||||||
#GRAPHICS = GRAPHICS_API_OPENGL_ES2
|
GRAPHICS = GRAPHICS_API_OPENGL_ES2
|
||||||
GRAPHICS = GRAPHICS_API_OPENGL_ES3 # Uncomment to use ES3/WebGL2 (preliminary support).
|
#GRAPHICS = GRAPHICS_API_OPENGL_ES3 # Uncomment to use ES3/WebGL2 (preliminary support).
|
||||||
endif
|
endif
|
||||||
ifeq ($(PLATFORM),PLATFORM_ANDROID)
|
ifeq ($(PLATFORM),PLATFORM_ANDROID)
|
||||||
# By default use OpenGL ES 2.0 on Android
|
# By default use OpenGL ES 2.0 on Android
|
||||||
|
|
@ -345,8 +345,7 @@ endif
|
||||||
|
|
||||||
ifeq ($(RAYLIB_BUILD_MODE),RELEASE)
|
ifeq ($(RAYLIB_BUILD_MODE),RELEASE)
|
||||||
ifeq ($(PLATFORM),PLATFORM_WEB)
|
ifeq ($(PLATFORM),PLATFORM_WEB)
|
||||||
#CFLAGS += -Os
|
CFLAGS += -Os
|
||||||
CFLAGS += -O3
|
|
||||||
endif
|
endif
|
||||||
ifeq ($(PLATFORM),PLATFORM_DESKTOP)
|
ifeq ($(PLATFORM),PLATFORM_DESKTOP)
|
||||||
CFLAGS += -O1
|
CFLAGS += -O1
|
||||||
|
|
|
||||||
|
|
@ -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 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 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 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
|
RLAPI int GetTouchPointCount(void); // Get number of touch points
|
||||||
|
|
||||||
//------------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------------
|
||||||
|
|
|
||||||
|
|
@ -4022,11 +4022,6 @@ int GetTouchPointId(int index)
|
||||||
return id;
|
return id;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool GetTouchPointState(int index)
|
|
||||||
{
|
|
||||||
return ( (index < MAX_TOUCH_POINTS) && (CORE.Input.Touch.currentTouchState[index] != 0) );
|
|
||||||
}
|
|
||||||
|
|
||||||
// Get number of touch points
|
// Get number of touch points
|
||||||
int GetTouchPointCount(void)
|
int GetTouchPointCount(void)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user