Updated some comments

This commit is contained in:
raysan5 2015-09-01 23:15:26 +02:00
parent acc322b3e1
commit 94a1fdc2ae
5 changed files with 14 additions and 8 deletions

View file

@ -2,7 +2,7 @@
#
# raylib makefile for desktop platforms, Raspberry Pi and HTML5 (emscripten)
#
# Copyright (c) 2014 Ramon Santamaria (Ray San - raysan@raysanweb.com)
# Copyright (c) 2014 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.

View file

@ -4,7 +4,7 @@
*
* Some useful functions to work with Vector3, Matrix and Quaternions
*
* Copyright (c) 2014 Ramon Santamaria (Ray San - raysan@raysanweb.com)
* Copyright (c) 2015 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.

View file

@ -4,7 +4,7 @@
*
* Some useful functions to work with Vector3, Matrix and Quaternions
*
* Copyright (c) 2014 Ramon Santamaria (Ray San - raysan@raysanweb.com)
* Copyright (c) 2015 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.

View file

@ -2020,6 +2020,8 @@ Shader LoadShader(char *vsFileName, char *fsFileName)
{
Shader shader;
shader.id = 0; // Default value in case of loading failure
#if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2)
// Shaders loading from external text file
char *vShaderStr = TextFileRead(vsFileName);
@ -2180,9 +2182,11 @@ unsigned int LoadShaderProgram(char *vShaderStr, char *fShaderStr)
// Unload a custom shader from memory
void UnloadShader(Shader shader)
{
if (shader.id != 0)
{
rlDeleteShader(shader.id);
TraceLog(INFO, "[SHDR ID %i] Unloaded shader program data", shader.id);
}
}
// Set custom shader to be used on batch draw
@ -2242,7 +2246,7 @@ void SetPostproShader(Shader shader)
//TraceLog(DEBUG, "Postproquad shader diffuse map id: %i", postproQuad.shader.texDiffuseId);
//TraceLog(DEBUG, "Shader diffuse map id: %i", shader.texDiffuseId);
#elif defined(GRAPHICS_API_OPENGL_11)
TraceLog(WARNING, "Postprocessing shaders not supported on OpenGL 1.1");
TraceLog(WARNING, "Shaders not supported on OpenGL 1.1");
#endif
}
@ -2287,6 +2291,8 @@ void SetModelShader(Model *model, Shader shader)
// NOTE: If SetModelTexture() is called previously, texture is not assigned to new shader
if (model->texture.id > 0) model->shader.texDiffuseId = model->texture.id;
#elif (GRAPHICS_API_OPENGL_11)
TraceLog(WARNING, "Shaders not supported on OpenGL 1.1");
#endif
}

View file

@ -4,7 +4,7 @@
*
* Some utility functions: rRES files data decompression
*
* Copyright (c) 2014 Ramon Santamaria (Ray San - raysan@raysanweb.com)
* Copyright (c) 2014 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.