mirrors/raylib
1
0
Fork 0
mirror of https://github.com/raysan5/raylib.git synced 2025-09-18 09:18:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

REVIEWED: Renamed some shaders, fix #2707

Browse Source
This commit is contained in:
Ray
2022-09-19 18:29:08 +02:00
parent 5530a3ceb8
commit 0e5cd442be
6 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

2
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");

2
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");