diff options
| author | victorfisac <[email protected]> | 2016-07-18 23:24:12 +0200 |
|---|---|---|
| committer | victorfisac <[email protected]> | 2016-07-18 23:24:12 +0200 |
| commit | 3e1321ac24743cf3df1c2bb923023f9c222aa250 (patch) | |
| tree | 91d8f15379f494ba1875862f3b7fe0e87f507280 /src/rlgl.h | |
| parent | 7a09043cba1b7d0d59587f82cb0627c965d557b9 (diff) | |
| parent | af46222b1257049abd17df6e9e57a8d041845c5f (diff) | |
| download | raylib-3e1321ac24743cf3df1c2bb923023f9c222aa250.tar.gz raylib-3e1321ac24743cf3df1c2bb923023f9c222aa250.zip | |
Merge remote-tracking branch 'refs/remotes/raysan5/develop' into develop
Diffstat (limited to 'src/rlgl.h')
| -rw-r--r-- | src/rlgl.h | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -4,10 +4,11 @@ * * raylib now uses OpenGL 1.1 style functions (rlVertex) that are mapped to selected OpenGL version: * OpenGL 1.1 - Direct map rl* -> gl* +* OpenGL 2.1 - Vertex data is stored in VBOs, call rlglDraw() to render * OpenGL 3.3 - Vertex data is stored in VAOs, call rlglDraw() to render * OpenGL ES 2 - Vertex data is stored in VBOs or VAOs (when available), call rlglDraw() to render * -* Copyright (c) 2014 Ramon Santamaria (@raysan5) +* Copyright (c) 2014-2016 Ramon Santamaria (@raysan5) * * This software is provided "as-is", without any express or implied warranty. In no event * will the authors be held liable for any damages arising from the use of this software. @@ -240,7 +241,7 @@ typedef enum { OPENGL_11 = 1, OPENGL_21, OPENGL_33, OPENGL_ES_20 } GlVersion; // TraceLog message types typedef enum { INFO = 0, ERROR, WARNING, DEBUG, OTHER } TraceLogType; - // Head Mounted Display devices + // VR Head Mounted Display devices typedef enum { HMD_DEFAULT_DEVICE = 0, HMD_OCULUS_RIFT_DK2, @@ -251,7 +252,7 @@ typedef enum { OPENGL_11 = 1, OPENGL_21, OPENGL_33, OPENGL_ES_20 } GlVersion; HMD_SONY_PLAYSTATION_VR, HMD_RAZER_OSVR, HMD_FOVE_VR, - } HmdDevice; + } VrDevice; #endif #ifdef __cplusplus @@ -365,7 +366,7 @@ void DestroyLight(Light light); // Destroy a void TraceLog(int msgType, const char *text, ...); float *MatrixToFloat(Matrix mat); -void InitVrDevice(int hmdDevice); // Init VR device +void InitVrDevice(int vrDevice); // Init VR device void CloseVrDevice(void); // Close VR device void UpdateVrTracking(void); // Update VR tracking (position and orientation) void BeginVrDrawing(void); // Begin VR drawing configuration |
