diff options
| author | victorfisac <[email protected]> | 2016-07-06 17:13:19 +0200 |
|---|---|---|
| committer | victorfisac <[email protected]> | 2016-07-06 17:13:19 +0200 |
| commit | 9fea631bfbe3d24565d100b55bbb0c43ae737374 (patch) | |
| tree | c649a47b83ac949f1abaea255ebbd30214e88711 /src/core.c | |
| parent | 1aecd5be072083e27e4289499865b5681f1ea656 (diff) | |
| parent | 09cc27ca7a6d29434bd5f6274788d5a6a8de4ad6 (diff) | |
| download | raylib-9fea631bfbe3d24565d100b55bbb0c43ae737374.tar.gz raylib-9fea631bfbe3d24565d100b55bbb0c43ae737374.zip | |
Merge remote-tracking branch 'refs/remotes/raysan5/develop' into develop
Diffstat (limited to 'src/core.c')
| -rw-r--r-- | src/core.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -521,8 +521,6 @@ void BeginDrawing(void) updateTime = currentTime - previousTime; previousTime = currentTime; - //if (IsOculusReady()) BeginOculusDrawing(); - rlClearScreenBuffers(); // Clear current framebuffers rlLoadIdentity(); // Reset current matrix (MODELVIEW) rlMultMatrixf(MatrixToFloat(downscaleView)); // If downscale required, apply it here @@ -535,8 +533,6 @@ void BeginDrawing(void) void EndDrawing(void) { rlglDraw(); // Draw Buffers (Only OpenGL 3+ and ES2) - - //if (IsOculusReady()) EndOculusDrawing(); SwapBuffers(); // Copy back buffer to front buffer PollInputEvents(); // Poll user events @@ -590,6 +586,8 @@ void End2dMode(void) void Begin3dMode(Camera camera) { rlglDraw(); // Draw Buffers (Only OpenGL 3+ and ES2) + + if (IsVrDeviceReady()) BeginVrDrawing(); rlMatrixMode(RL_PROJECTION); // Switch to projection matrix @@ -618,6 +616,8 @@ void Begin3dMode(Camera camera) void End3dMode(void) { rlglDraw(); // Process internal buffers (update + draw) + + if (IsVrDeviceReady()) EndVrDrawing(); rlMatrixMode(RL_PROJECTION); // Switch to projection matrix rlPopMatrix(); // Restore previous matrix (PROJECTION) from matrix stack |
