Reviewed shader loading message
This commit is contained in:
parent
da8a08006a
commit
557d071fa2
2 changed files with 3 additions and 1 deletions
|
@ -57,7 +57,7 @@ int main(void)
|
||||||
// NOTE: Defining 0 (NULL) for vertex shader forces usage of internal default vertex shader
|
// NOTE: Defining 0 (NULL) for vertex shader forces usage of internal default vertex shader
|
||||||
Shader shader = LoadShader(0, TextFormat("resources/shaders/glsl%i/grayscale.fs", GLSL_VERSION));
|
Shader shader = LoadShader(0, TextFormat("resources/shaders/glsl%i/grayscale.fs", GLSL_VERSION));
|
||||||
|
|
||||||
model.materials[0].shader = shader; // Set shader effect to 3d model
|
model.materials[0].shader = shader; // Set shader effect to 3d model
|
||||||
model.materials[0].maps[MATERIAL_MAP_DIFFUSE].texture = texture; // Bind texture to model
|
model.materials[0].maps[MATERIAL_MAP_DIFFUSE].texture = texture; // Bind texture to model
|
||||||
|
|
||||||
Vector3 position = { 0.0f, 0.0f, 0.0f }; // Set model position
|
Vector3 position = { 0.0f, 0.0f, 0.0f }; // Set model position
|
||||||
|
|
|
@ -1315,6 +1315,8 @@ Shader LoadShader(const char *vsFileName, const char *fsFileName)
|
||||||
if (vsFileName != NULL) vShaderStr = LoadFileText(vsFileName);
|
if (vsFileName != NULL) vShaderStr = LoadFileText(vsFileName);
|
||||||
if (fsFileName != NULL) fShaderStr = LoadFileText(fsFileName);
|
if (fsFileName != NULL) fShaderStr = LoadFileText(fsFileName);
|
||||||
|
|
||||||
|
if ((vShaderStr == NULL) && (fShaderStr == NULL)) TraceLog(LOG_WARNING, "SHADER: Shader files provided are not valid, using default shader");
|
||||||
|
|
||||||
shader = LoadShaderFromMemory(vShaderStr, fShaderStr);
|
shader = LoadShaderFromMemory(vShaderStr, fShaderStr);
|
||||||
|
|
||||||
UnloadFileText(vShaderStr);
|
UnloadFileText(vShaderStr);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue