diff options
| author | victorfisac <[email protected]> | 2017-04-06 15:28:04 +0200 |
|---|---|---|
| committer | victorfisac <[email protected]> | 2017-04-06 15:28:04 +0200 |
| commit | 54f070a0f421798dca911b48223a67ae6dc51956 (patch) | |
| tree | 07eefb8740d05754dcd875f49ea193eee1c79555 /src/rlgl.c | |
| parent | 256bc6e1dccfd021239dd0e5a66c377a402c3c59 (diff) | |
| parent | c47b04a2c673f3073e2cc5a47d5aa1bce029e93e (diff) | |
| download | raylib-54f070a0f421798dca911b48223a67ae6dc51956.tar.gz raylib-54f070a0f421798dca911b48223a67ae6dc51956.zip | |
Merge remote-tracking branch 'refs/remotes/raysan5/develop' into develop
Diffstat (limited to 'src/rlgl.c')
| -rw-r--r-- | src/rlgl.c | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -57,6 +57,7 @@ // Default configuration flags (supported features) //------------------------------------------------- #define SUPPORT_VR_SIMULATION +#define SUPPORT_DISTORTION_SHADER //------------------------------------------------- #include "rlgl.h" @@ -2240,7 +2241,7 @@ void *rlglReadTexturePixels(Texture2D texture) pixels = (unsigned char *)malloc(texture.width*texture.height*4*sizeof(unsigned char)); - // NOTE: Despite FBO color texture is RGB, we read data as RGBA... reading as RGB doesn't work... o__O + // NOTE: We read data as RGBA because FBO texture is configured as RGBA, despite binding a RGB texture... glReadPixels(0, 0, texture.width, texture.height, GL_RGBA, GL_UNSIGNED_BYTE, pixels); // Re-attach internal FBO color texture before deleting it @@ -2558,7 +2559,7 @@ void InitVrSimulator(int vrDevice) hmd.chromaAbCorrection[2] = 1.014f; // HMD chromatic aberration correction parameter 2 hmd.chromaAbCorrection[3] = 0.0f; // HMD chromatic aberration correction parameter 3 - TraceLog(WARNING, "Initializing VR Simulator (Oculus Rift DK2)"); + TraceLog(INFO, "Initializing VR Simulator (Oculus Rift DK2)"); } else if ((vrDevice == HMD_DEFAULT_DEVICE) || (vrDevice == HMD_OCULUS_RIFT_CV1)) { @@ -2585,11 +2586,11 @@ void InitVrSimulator(int vrDevice) hmd.chromaAbCorrection[2] = 1.014f; // HMD chromatic aberration correction parameter 2 hmd.chromaAbCorrection[3] = 0.0f; // HMD chromatic aberration correction parameter 3 - TraceLog(WARNING, "Initializing VR Simulator (Oculus Rift CV1)"); + TraceLog(INFO, "Initializing VR Simulator (Oculus Rift CV1)"); } else { - TraceLog(WARNING, "VR Simulator doesn't support current device yet,"); + TraceLog(WARNING, "VR Simulator doesn't support selected device parameters,"); TraceLog(WARNING, "using default VR Simulator parameters"); } |
