diff options
| author | Ray <[email protected]> | 2022-09-19 18:29:08 +0200 |
|---|---|---|
| committer | Ray <[email protected]> | 2022-09-19 18:29:08 +0200 |
| commit | 0e5cd442be3b90c041a5874fbec52659f214827e (patch) | |
| tree | 7def991aa569252531d990b61726fa50b5851bc0 | |
| parent | 5530a3ceb88962066affa5db8e13b00b64444b37 (diff) | |
| download | raylib-0e5cd442be3b90c041a5874fbec52659f214827e.tar.gz raylib-0e5cd442be3b90c041a5874fbec52659f214827e.zip | |
REVIEWED: Renamed some shaders, fix #2707
| -rw-r--r-- | examples/shaders/resources/shaders/glsl100/lighting.vs (renamed from examples/shaders/resources/shaders/glsl100/base_lighting.vs) | 0 | ||||
| -rw-r--r-- | examples/shaders/resources/shaders/glsl100/lighting_instanced.vs (renamed from examples/shaders/resources/shaders/glsl100/base_lighting_instanced.vs) | 0 | ||||
| -rw-r--r-- | examples/shaders/resources/shaders/glsl120/lighting.vs (renamed from examples/shaders/resources/shaders/glsl120/base_lighting.vs) | 0 | ||||
| -rw-r--r-- | examples/shaders/resources/shaders/glsl330/lighting.vs (renamed from examples/shaders/resources/shaders/glsl330/base_lighting.vs) | 0 | ||||
| -rw-r--r-- | examples/shaders/shaders_basic_lighting.c | 2 | ||||
| -rw-r--r-- | examples/shaders/shaders_fog.c | 2 |
6 files changed, 2 insertions, 2 deletions
diff --git a/examples/shaders/resources/shaders/glsl100/base_lighting.vs b/examples/shaders/resources/shaders/glsl100/lighting.vs index 5245c615..5245c615 100644 --- a/examples/shaders/resources/shaders/glsl100/base_lighting.vs +++ b/examples/shaders/resources/shaders/glsl100/lighting.vs diff --git a/examples/shaders/resources/shaders/glsl100/base_lighting_instanced.vs b/examples/shaders/resources/shaders/glsl100/lighting_instanced.vs index eb47bb91..eb47bb91 100644 --- a/examples/shaders/resources/shaders/glsl100/base_lighting_instanced.vs +++ b/examples/shaders/resources/shaders/glsl100/lighting_instanced.vs diff --git a/examples/shaders/resources/shaders/glsl120/base_lighting.vs b/examples/shaders/resources/shaders/glsl120/lighting.vs index b1140939..b1140939 100644 --- a/examples/shaders/resources/shaders/glsl120/base_lighting.vs +++ b/examples/shaders/resources/shaders/glsl120/lighting.vs diff --git a/examples/shaders/resources/shaders/glsl330/base_lighting.vs b/examples/shaders/resources/shaders/glsl330/lighting.vs index f8ec45f1..f8ec45f1 100644 --- a/examples/shaders/resources/shaders/glsl330/base_lighting.vs +++ b/examples/shaders/resources/shaders/glsl330/lighting.vs diff --git a/examples/shaders/shaders_basic_lighting.c b/examples/shaders/shaders_basic_lighting.c index 42910a51..c557ecf7 100644 --- a/examples/shaders/shaders_basic_lighting.c +++ b/examples/shaders/shaders_basic_lighting.c @@ -57,7 +57,7 @@ int main(void) Model cube = LoadModelFromMesh(GenMeshCube(2.0f, 4.0f, 2.0f)); // 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)); // Get some required shader locations shader.locs[SHADER_LOC_VECTOR_VIEW] = GetShaderLocation(shader, "viewPos"); diff --git a/examples/shaders/shaders_fog.c b/examples/shaders/shaders_fog.c index 5cd68d2c..de5c23df 100644 --- a/examples/shaders/shaders_fog.c +++ b/examples/shaders/shaders_fog.c @@ -63,7 +63,7 @@ int main(void) modelC.materials[0].maps[MATERIAL_MAP_DIFFUSE].texture = texture; // 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)); shader.locs[SHADER_LOC_MATRIX_MODEL] = GetShaderLocation(shader, "matModel"); shader.locs[SHADER_LOC_VECTOR_VIEW] = GetShaderLocation(shader, "viewPos"); |