Home Explore Help
Sign In
c
/
raysan5.raylib
mirror of https://github.com/raysan5/raylib.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

REVIEWED: Renamed some shaders, fix #2707

Ray 2 years ago
parent
5530a3ceb8
commit
0e5cd442be
6 changed files with 2 additions and 2 deletions
Unified View Show Diff Stats
  1. 0 0
      examples/shaders/resources/shaders/glsl100/lighting.vs
  2. 0 0
      examples/shaders/resources/shaders/glsl100/lighting_instanced.vs
  3. 0 0
      examples/shaders/resources/shaders/glsl120/lighting.vs
  4. 0 0
      examples/shaders/resources/shaders/glsl330/lighting.vs
  5. 1 1
      examples/shaders/shaders_basic_lighting.c
  6. 1 1
      examples/shaders/shaders_fog.c

+ 0 - 0
examples/shaders/resources/shaders/glsl100/base_lighting.vs → examples/shaders/resources/shaders/glsl100/lighting.vs
View File


+ 0 - 0
examples/shaders/resources/shaders/glsl100/base_lighting_instanced.vs → examples/shaders/resources/shaders/glsl100/lighting_instanced.vs
View File


+ 0 - 0
examples/shaders/resources/shaders/glsl120/base_lighting.vs → examples/shaders/resources/shaders/glsl120/lighting.vs
View File


+ 0 - 0
examples/shaders/resources/shaders/glsl330/base_lighting.vs → examples/shaders/resources/shaders/glsl330/lighting.vs
View File


+ 1 - 1
examples/shaders/shaders_basic_lighting.c
View File 

@@ -57,7 +57,7 @@ int main(void)
 
     Model cube = LoadModelFromMesh(GenMeshCube(2.0f, 4.0f, 2.0f));
 
     Model cube = LoadModelFromMesh(GenMeshCube(2.0f, 4.0f, 2.0f));
 
     
     
     // Load basic lighting shader
 
     // Load basic lighting shader
 
-    Shader shader = LoadShader(TextFormat("resources/shaders/glsl%i/base_lighting.vs", GLSL_VERSION),
 
+    Shader shader = LoadShader(TextFormat("resources/shaders/glsl%i/lighting.vs", GLSL_VERSION),
 
                                TextFormat("resources/shaders/glsl%i/lighting.fs", GLSL_VERSION));
 
                                TextFormat("resources/shaders/glsl%i/lighting.fs", GLSL_VERSION));
 
     // Get some required shader locations
 
     // Get some required shader locations
 
     shader.locs[SHADER_LOC_VECTOR_VIEW] = GetShaderLocation(shader, "viewPos");
 
     shader.locs[SHADER_LOC_VECTOR_VIEW] = GetShaderLocation(shader, "viewPos");

+ 1 - 1
examples/shaders/shaders_fog.c
View File 

@@ -63,7 +63,7 @@ int main(void)
 
     modelC.materials[0].maps[MATERIAL_MAP_DIFFUSE].texture = texture;
 
     modelC.materials[0].maps[MATERIAL_MAP_DIFFUSE].texture = texture;
 
 
 
     // Load shader and set up some uniforms
 
     // Load shader and set up some uniforms
 
-    Shader shader = LoadShader(TextFormat("resources/shaders/glsl%i/base_lighting.vs", GLSL_VERSION),
 
+    Shader shader = LoadShader(TextFormat("resources/shaders/glsl%i/lighting.vs", GLSL_VERSION),
 
                                TextFormat("resources/shaders/glsl%i/fog.fs", GLSL_VERSION));
 
                                TextFormat("resources/shaders/glsl%i/fog.fs", GLSL_VERSION));
 
     shader.locs[SHADER_LOC_MATRIX_MODEL] = GetShaderLocation(shader, "matModel");
 
     shader.locs[SHADER_LOC_MATRIX_MODEL] = GetShaderLocation(shader, "matModel");
 
     shader.locs[SHADER_LOC_VECTOR_VIEW] = GetShaderLocation(shader, "viewPos");
 
     shader.locs[SHADER_LOC_VECTOR_VIEW] = GetShaderLocation(shader, "viewPos");