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

Simplify shader, removing the need to make a fallback mesh

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12565 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria 2013-03-18 00:21:28 +00:00
parent 7a81d37f69
commit 98d8ef74ac
2 changed files with 51 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
data/shaders/splatting.frag
View File

@ -12,12 +12,12 @@ varying vec4 vertex_color;
void main()
{
vec4 splatting = texture2D(tex_layout, gl_TexCoord[0].st);
vec4 detail0 = texture2D(tex_detail0, gl_TexCoord[1].st);
vec4 detail1 = texture2D(tex_detail1, gl_TexCoord[1].st);
vec4 detail2 = texture2D(tex_detail2, gl_TexCoord[1].st);
vec4 detail3 = texture2D(tex_detail3, gl_TexCoord[1].st);
vec4 detail4 = texture2D(tex_detail4, gl_TexCoord[1].st);
vec4 splatting = texture2D(tex_layout, gl_TexCoord[1].st);
vec4 detail0 = texture2D(tex_detail0, gl_TexCoord[0].st);
vec4 detail1 = texture2D(tex_detail1, gl_TexCoord[0].st);
vec4 detail2 = texture2D(tex_detail2, gl_TexCoord[0].st);
vec4 detail3 = texture2D(tex_detail3, gl_TexCoord[0].st);
vec4 detail4 = texture2D(tex_detail4, gl_TexCoord[0].st);
gl_FragColor = (splatting.r * detail0 +
splatting.g * detail1 +

83
src/graphics/material.cpp
View File

@ -198,19 +198,19 @@ public:
m_light_direction = -World::getWorld()->getTrack()->getSunRotation().rotationToDirection();
}
s32 tex_layout = 0;
s32 tex_layout = 1;
services->setPixelShaderConstant("tex_layout", &tex_layout, 1);
s32 tex_detail0 = 1;
s32 tex_detail0 = 2;
services->setPixelShaderConstant("tex_detail0", &tex_detail0, 1);
s32 tex_detail1 = 2;
s32 tex_detail1 = 3;
services->setPixelShaderConstant("tex_detail1", &tex_detail1, 1);
s32 tex_detail2 = 3;
s32 tex_detail2 = 4;
services->setPixelShaderConstant("tex_detail2", &tex_detail2, 1);
s32 tex_detail3 = 4;
s32 tex_detail3 = 5;
services->setPixelShaderConstant("tex_detail3", &tex_detail3, 1);
services->setVertexShaderConstant("lightdir", &m_light_direction.X, 3);
@ -1055,44 +1055,51 @@ void Material::setMaterialProperties(video::SMaterial *m, scene::IMeshBuffer* m
m->SpecularColor.set(0,0,0,0);
modes++;
}
if (m_splatting && irr_driver->supportsSplatting())
if (m_splatting)
{
ITexture* tex = irr_driver->getTexture(m_splatting_texture_1);
m->setTexture(1, tex);
if (m_splatting_texture_2.size() > 0)
if (irr_driver->supportsSplatting())
{
tex = irr_driver->getTexture(m_splatting_texture_2);
ITexture* tex = irr_driver->getTexture(m_splatting_texture_1);
m->setTexture(2, tex);
if (m_splatting_texture_2.size() > 0)
{
tex = irr_driver->getTexture(m_splatting_texture_2);
}
m->setTexture(3, tex);
if (m_splatting_texture_3.size() > 0)
{
tex = irr_driver->getTexture(m_splatting_texture_3);
}
m->setTexture(4, tex);
if (m_splatting_texture_4.size() > 0)
{
tex = irr_driver->getTexture(m_splatting_texture_4);
}
m->setTexture(5, tex);
if (m_shaders[SPLATTING] == NULL)
{
m_shaders[SPLATTING] = new SplattingProvider();
}
// Material and shaders
IGPUProgrammingServices* gpu =
irr_driver->getVideoDriver()->getGPUProgrammingServices();
s32 material_type = gpu->addHighLevelShaderMaterialFromFiles(
(file_manager->getShaderDir() + "splatting.vert").c_str(),
"main",video::EVST_VS_2_0,
(file_manager->getShaderDir() + "splatting.frag").c_str(),
"main",video::EPST_PS_2_0,
m_shaders[SPLATTING], video::EMT_SOLID );
m->MaterialType = (E_MATERIAL_TYPE)material_type;
}
m->setTexture(2, tex);
if (m_splatting_texture_3.size() > 0)
else
{
tex = irr_driver->getTexture(m_splatting_texture_3);
m->MaterialType = video::EMT_SOLID;
}
m->setTexture(3, tex);
if (m_splatting_texture_4.size() > 0)
{
tex = irr_driver->getTexture(m_splatting_texture_4);
}
m->setTexture(4, tex);
if (m_shaders[SPLATTING] == NULL)
{
m_shaders[SPLATTING] = new SplattingProvider();
}
// Material and shaders
IGPUProgrammingServices* gpu =
irr_driver->getVideoDriver()->getGPUProgrammingServices();
s32 material_type = gpu->addHighLevelShaderMaterialFromFiles(
(file_manager->getShaderDir() + "splatting.vert").c_str(),
"main",video::EVST_VS_2_0,
(file_manager->getShaderDir() + "splatting.frag").c_str(),
"main",video::EPST_PS_2_0,
m_shaders[SPLATTING], video::EMT_SOLID_2_LAYER );
m->MaterialType = (E_MATERIAL_TYPE)material_type;
}