From 4f2e2331ee9981c097533387715a2961e3345226 Mon Sep 17 00:00:00 2001 From: Benau Date: Sun, 18 Dec 2016 14:59:37 +0800 Subject: [PATCH] Correct the spelling of shader files --- ...edgrassshadow.vert => instanced_grassshadow.vert} | 0 .../{instanciedshadow.vert => instanced_shadow.vert} | 0 src/graphics/materials.hpp | 12 ++++++------ 3 files changed, 6 insertions(+), 6 deletions(-) rename data/shaders/{instanciedgrassshadow.vert => instanced_grassshadow.vert} (100%) rename data/shaders/{instanciedshadow.vert => instanced_shadow.vert} (100%) diff --git a/data/shaders/instanciedgrassshadow.vert b/data/shaders/instanced_grassshadow.vert similarity index 100% rename from data/shaders/instanciedgrassshadow.vert rename to data/shaders/instanced_grassshadow.vert diff --git a/data/shaders/instanciedshadow.vert b/data/shaders/instanced_shadow.vert similarity index 100% rename from data/shaders/instanciedshadow.vert rename to data/shaders/instanced_shadow.vert diff --git a/src/graphics/materials.hpp b/src/graphics/materials.hpp index 239a97ad1..aa5805af4 100644 --- a/src/graphics/materials.hpp +++ b/src/graphics/materials.hpp @@ -150,12 +150,12 @@ public: return; if (CVS->isAMDVertexShaderLayerUsable()) { - loadProgram(OBJECT, GL_VERTEX_SHADER, "instanciedshadow.vert", + loadProgram(OBJECT, GL_VERTEX_SHADER, "instanced_shadow.vert", GL_FRAGMENT_SHADER, "shadow.frag"); } else { - loadProgram(OBJECT, GL_VERTEX_SHADER, "instanciedshadow.vert", + loadProgram(OBJECT, GL_VERTEX_SHADER, "instanced_shadow.vert", GL_GEOMETRY_SHADER, "instanced_shadow.geom", GL_FRAGMENT_SHADER, "shadow.frag"); } @@ -390,12 +390,12 @@ public: return; if (CVS->isAMDVertexShaderLayerUsable()) { - loadProgram(OBJECT,GL_VERTEX_SHADER, "instanciedshadow.vert", + loadProgram(OBJECT,GL_VERTEX_SHADER, "instanced_shadow.vert", GL_FRAGMENT_SHADER, "instanced_shadowref.frag"); } else { - loadProgram(OBJECT,GL_VERTEX_SHADER, "instanciedshadow.vert", + loadProgram(OBJECT,GL_VERTEX_SHADER, "instanced_shadow.vert", GL_GEOMETRY_SHADER, "instanced_shadow.geom", GL_FRAGMENT_SHADER, "instanced_shadowref.frag"); } @@ -522,12 +522,12 @@ public: return; if (CVS->isAMDVertexShaderLayerUsable()) { - loadProgram(OBJECT, GL_VERTEX_SHADER, "instanciedgrassshadow.vert", + loadProgram(OBJECT, GL_VERTEX_SHADER, "instanced_grassshadow.vert", GL_FRAGMENT_SHADER, "instanced_shadowref.frag"); } else { - loadProgram(OBJECT, GL_VERTEX_SHADER, "instanciedgrassshadow.vert", + loadProgram(OBJECT, GL_VERTEX_SHADER, "instanced_grassshadow.vert", GL_GEOMETRY_SHADER, "instanced_shadow.geom", GL_FRAGMENT_SHADER, "instanced_shadowref.frag"); }