From 72eb2632cc3a16b08ef5875faccbe3b9b55cb52e Mon Sep 17 00:00:00 2001 From: Ray Date: Sun, 5 Jun 2016 23:51:41 +0200 Subject: Corrected compilation bug on OpenGL 1.1 --- src/rlgl.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/rlgl.c') diff --git a/src/rlgl.c b/src/rlgl.c index 6beececb..756fba75 100644 --- a/src/rlgl.c +++ b/src/rlgl.c @@ -2253,13 +2253,17 @@ void SetShaderValueMatrix(Shader shader, int uniformLoc, Matrix mat) // Set a custom projection matrix (replaces internal projection matrix) void SetMatrixProjection(Matrix proj) { +#if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) projection = proj; +#endif } // Set a custom modelview matrix (replaces internal modelview matrix) void SetMatrixModelview(Matrix view) { +#if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) modelview = view; +#endif } // Begin blending mode (alpha, additive, multiplied) -- cgit v1.2.3 From 29d505c98e6b24882927347cf24f5736d5f8c849 Mon Sep 17 00:00:00 2001 From: Ray Date: Mon, 6 Jun 2016 14:34:43 +0200 Subject: Reorganize external libraries - BREAKING CHANGE - Moved all external libraries used by raylib to external folder inside raylib src. Makefile has already been update and also the different includes in raylib modules. --- src/rlgl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/rlgl.c') diff --git a/src/rlgl.c b/src/rlgl.c index 756fba75..9a102c01 100644 --- a/src/rlgl.c +++ b/src/rlgl.c @@ -48,7 +48,7 @@ #ifdef __APPLE__ #include // OpenGL 3 library for OSX #else - #include "glad.h" // GLAD library, includes OpenGL headers + #include "external/glad.h" // GLAD library, includes OpenGL headers #endif #endif -- cgit v1.2.3 From 522af9f477247be0a1ac6f079ec155c699a0c5c0 Mon Sep 17 00:00:00 2001 From: Ray Date: Mon, 6 Jun 2016 23:16:14 +0200 Subject: Fallback to default shader --- src/rlgl.c | 1 + 1 file changed, 1 insertion(+) (limited to 'src/rlgl.c') diff --git a/src/rlgl.c b/src/rlgl.c index 9a102c01..f21f8075 100644 --- a/src/rlgl.c +++ b/src/rlgl.c @@ -2579,6 +2579,7 @@ static Shader LoadStandardShader(void) else TraceLog(WARNING, "[SHDR ID %i] Standard shader could not be loaded", shader.id); if (shader.id != 0) LoadDefaultShaderLocations(&shader); + else shader = GetDefaultShader(); return shader; } -- cgit v1.2.3 From 1bcf500ecac076892c4eac0594b997add6dcac71 Mon Sep 17 00:00:00 2001 From: Ray Date: Mon, 6 Jun 2016 23:19:40 +0200 Subject: Review fallback mechanism --- src/rlgl.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'src/rlgl.c') diff --git a/src/rlgl.c b/src/rlgl.c index f21f8075..8d230550 100644 --- a/src/rlgl.c +++ b/src/rlgl.c @@ -2575,11 +2575,16 @@ static Shader LoadStandardShader(void) // Load standard shader (TODO: rewrite as char pointers) Shader shader = LoadShader("resources/shaders/standard.vs", "resources/shaders/standard.fs"); - if (shader.id != 0) TraceLog(INFO, "[SHDR ID %i] Standard shader loaded successfully", shader.id); - else TraceLog(WARNING, "[SHDR ID %i] Standard shader could not be loaded", shader.id); - - if (shader.id != 0) LoadDefaultShaderLocations(&shader); - else shader = GetDefaultShader(); + if (shader.id != 0) + { + LoadDefaultShaderLocations(&shader); + TraceLog(INFO, "[SHDR ID %i] Standard shader loaded successfully", shader.id); + } + else + { + TraceLog(WARNING, "[SHDR ID %i] Standard shader could not be loaded, using default shader", shader.id); + shader = GetDefaultShader(); + } return shader; } -- cgit v1.2.3