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

Corrected bug on OpenGL 1.1

Browse source 
Set makefile to default OpenGL 3.3 compilation
This commit is contained in:
raysan5 2016-07-16 14:58:53 +02:00
parent b7b51569e2
commit 0fbd48a889
2 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/Makefile
View file

@ -49,10 +49,10 @@ ifeq ($(PLATFORM),PLATFORM_RPI)
# define raylib graphics api to use (on RPI, OpenGL ES 2.0 must be used) # define raylib graphics api to use (on RPI, OpenGL ES 2.0 must be used)
GRAPHICS = GRAPHICS_API_OPENGL_ES2 GRAPHICS = GRAPHICS_API_OPENGL_ES2
else else
# define raylib graphics api to use (OpenGL 1.1 by default) # define raylib graphics api to use (OpenGL 3.3 by default)
GRAPHICS ?= GRAPHICS_API_OPENGL_11 GRAPHICS ?= GRAPHICS_API_OPENGL_33
#GRAPHICS = GRAPHICS_API_OPENGL_11 # Uncomment to use OpenGL 1.1
#GRAPHICS = GRAPHICS_API_OPENGL_21 # Uncomment to use OpenGL 2.1 #GRAPHICS = GRAPHICS_API_OPENGL_21 # Uncomment to use OpenGL 2.1
#GRAPHICS = GRAPHICS_API_OPENGL_33 # Uncomment to use OpenGL 3.3
endif endif
ifeq ($(PLATFORM),PLATFORM_WEB) ifeq ($(PLATFORM),PLATFORM_WEB)
GRAPHICS = GRAPHICS_API_OPENGL_ES2 GRAPHICS = GRAPHICS_API_OPENGL_ES2

6
src/rlgl.c
View file

@ -2645,6 +2645,10 @@ void InitVrDevice(int hmdDevice)
vrEnabled = true; vrEnabled = true;
} }
#endif #endif
#if defined(GRAPHICS_API_OPENGL_11)
TraceLog(WARNING, "VR device or simulator not supported on OpenGL 1.1");
#endif
} }
// Close VR device (or simulator) // Close VR device (or simulator)
@ -2672,6 +2676,7 @@ bool IsVrDeviceReady(void)
// Enable/Disable VR experience (device or simulator) // Enable/Disable VR experience (device or simulator)
void ToggleVrMode(void) void ToggleVrMode(void)
{ {
#if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2)
if (vrDeviceReady || vrSimulator) vrEnabled = !vrEnabled; if (vrDeviceReady || vrSimulator) vrEnabled = !vrEnabled;
else vrEnabled = false; else vrEnabled = false;
@ -2683,6 +2688,7 @@ void ToggleVrMode(void)
MatrixTranspose(&projection); MatrixTranspose(&projection);
modelview = MatrixIdentity(); modelview = MatrixIdentity();
} }
#endif
} }
// Update VR tracking (position and orientation) // Update VR tracking (position and orientation)