From 0e5cd442be3b90c041a5874fbec52659f214827e Mon Sep 17 00:00:00 2001 From: Ray Date: Mon, 19 Sep 2022 18:29:08 +0200 Subject: [PATCH] REVIEWED: Renamed some shaders, fix #2707 --- .../resources/shaders/glsl100/{base_lighting.vs => lighting.vs} | 0 .../{base_lighting_instanced.vs => lighting_instanced.vs} | 0 .../resources/shaders/glsl120/{base_lighting.vs => lighting.vs} | 0 .../resources/shaders/glsl330/{base_lighting.vs => lighting.vs} | 0 examples/shaders/shaders_basic_lighting.c | 2 +- examples/shaders/shaders_fog.c | 2 +- 6 files changed, 2 insertions(+), 2 deletions(-) rename examples/shaders/resources/shaders/glsl100/{base_lighting.vs => lighting.vs} (100%) rename examples/shaders/resources/shaders/glsl100/{base_lighting_instanced.vs => lighting_instanced.vs} (100%) rename examples/shaders/resources/shaders/glsl120/{base_lighting.vs => lighting.vs} (100%) rename examples/shaders/resources/shaders/glsl330/{base_lighting.vs => lighting.vs} (100%) diff --git a/examples/shaders/resources/shaders/glsl100/base_lighting.vs b/examples/shaders/resources/shaders/glsl100/lighting.vs similarity index 100% rename from examples/shaders/resources/shaders/glsl100/base_lighting.vs rename to 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 similarity index 100% rename from examples/shaders/resources/shaders/glsl100/base_lighting_instanced.vs rename to 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 similarity index 100% rename from examples/shaders/resources/shaders/glsl120/base_lighting.vs rename to 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 similarity index 100% rename from examples/shaders/resources/shaders/glsl330/base_lighting.vs rename to examples/shaders/resources/shaders/glsl330/lighting.vs diff --git a/examples/shaders/shaders_basic_lighting.c b/examples/shaders/shaders_basic_lighting.c index 42910a516..c557ecf73 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 5cd68d2c5..de5c23df5 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");