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

Moved GrassPass1Shader into render_geometry; fixed up coding style

Browse Source 
somewhat.
This commit is contained in:
hiker 2015-05-11 09:14:43 +10:00
parent 400f9c612b
commit f3f30a8057
3 changed files with 336 additions and 168 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

488
src/graphics/render_geometry.cpp
View File

File diff suppressed because it is too large Load Diff

10
src/graphics/shaders.cpp
View File

@ -565,16 +565,6 @@ namespace MeshShader
1, "glosstex",ST_TRILINEAR_ANISOTROPIC_FILTERED);
}
GrassPass1Shader::GrassPass1Shader()
{
loadProgram(OBJECT,
GL_VERTEX_SHADER, "grass_pass.vert",
GL_FRAGMENT_SHADER, "utils/encode_normal.frag",
GL_FRAGMENT_SHADER, "objectref_pass1.frag");
assignUniforms("ModelMatrix", "InverseModelMatrix", "windDir");
assignSamplerNames(m_program, 0, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED,
1, "glosstex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
}
NormalMapShader::NormalMapShader()
{

6
src/graphics/shaders.hpp
View File

@ -57,12 +57,6 @@ public:
ObjectRefPass1Shader();
};
class GrassPass1Shader : public Shader<GrassPass1Shader, core::matrix4, core::matrix4, core::vector3df>,
public TextureReadNew<ST_TRILINEAR_ANISOTROPIC_FILTERED, ST_TRILINEAR_ANISOTROPIC_FILTERED>
{
public:
GrassPass1Shader();
};
class NormalMapShader : public Shader<NormalMapShader, core::matrix4, core::matrix4>,
public TextureReadNew<ST_TRILINEAR_ANISOTROPIC_FILTERED, ST_TRILINEAR_ANISOTROPIC_FILTERED>