ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Correct the spelling of shader files

Browse Source
This commit is contained in:
Benau 2016-12-18 14:59:37 +08:00
parent 4477dbb0fb
commit 4f2e2331ee
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
data/shaders/instanciedgrassshadow.vert → data/shaders/instanced_grassshadow.vert
View File

0
data/shaders/instanciedshadow.vert → data/shaders/instanced_shadow.vert
View File

12
src/graphics/materials.hpp
View File

@ -150,12 +150,12 @@ public:
return; return;
if (CVS->isAMDVertexShaderLayerUsable()) if (CVS->isAMDVertexShaderLayerUsable())
{ {
loadProgram(OBJECT, GL_VERTEX_SHADER, "instanciedshadow.vert", loadProgram(OBJECT, GL_VERTEX_SHADER, "instanced_shadow.vert",
GL_FRAGMENT_SHADER, "shadow.frag"); GL_FRAGMENT_SHADER, "shadow.frag");
} }
else else
{ {
loadProgram(OBJECT, GL_VERTEX_SHADER, "instanciedshadow.vert", loadProgram(OBJECT, GL_VERTEX_SHADER, "instanced_shadow.vert",
GL_GEOMETRY_SHADER, "instanced_shadow.geom", GL_GEOMETRY_SHADER, "instanced_shadow.geom",
GL_FRAGMENT_SHADER, "shadow.frag"); GL_FRAGMENT_SHADER, "shadow.frag");
} }
@ -390,12 +390,12 @@ public:
return; return;
if (CVS->isAMDVertexShaderLayerUsable()) if (CVS->isAMDVertexShaderLayerUsable())
{ {
loadProgram(OBJECT,GL_VERTEX_SHADER, "instanciedshadow.vert", loadProgram(OBJECT,GL_VERTEX_SHADER, "instanced_shadow.vert",
GL_FRAGMENT_SHADER, "instanced_shadowref.frag"); GL_FRAGMENT_SHADER, "instanced_shadowref.frag");
} }
else else
{ {
loadProgram(OBJECT,GL_VERTEX_SHADER, "instanciedshadow.vert", loadProgram(OBJECT,GL_VERTEX_SHADER, "instanced_shadow.vert",
GL_GEOMETRY_SHADER, "instanced_shadow.geom", GL_GEOMETRY_SHADER, "instanced_shadow.geom",
GL_FRAGMENT_SHADER, "instanced_shadowref.frag"); GL_FRAGMENT_SHADER, "instanced_shadowref.frag");
} }
@ -522,12 +522,12 @@ public:
return; return;
if (CVS->isAMDVertexShaderLayerUsable()) if (CVS->isAMDVertexShaderLayerUsable())
{ {
loadProgram(OBJECT, GL_VERTEX_SHADER, "instanciedgrassshadow.vert", loadProgram(OBJECT, GL_VERTEX_SHADER, "instanced_grassshadow.vert",
GL_FRAGMENT_SHADER, "instanced_shadowref.frag"); GL_FRAGMENT_SHADER, "instanced_shadowref.frag");
} }
else else
{ {
loadProgram(OBJECT, GL_VERTEX_SHADER, "instanciedgrassshadow.vert", loadProgram(OBJECT, GL_VERTEX_SHADER, "instanced_grassshadow.vert",
GL_GEOMETRY_SHADER, "instanced_shadow.geom", GL_GEOMETRY_SHADER, "instanced_shadow.geom",
GL_FRAGMENT_SHADER, "instanced_shadowref.frag"); GL_FRAGMENT_SHADER, "instanced_shadowref.frag");
} }