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

Remove cand's water-wave node for now and revert back to irrlicht's for the moment. The problem with cand's is that it ignores all our material flags, which is not acceptable

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14713 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria 2013-12-12 00:50:27 +00:00
parent 22d6dd56ea
commit ae337751de
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/graphics/irr_driver.cpp
View File

@ -834,16 +834,18 @@ scene::ISceneNode* IrrDriver::addWaterNode(scene::IMesh *mesh,
->createMeshWelded(mesh); ->createMeshWelded(mesh);
scene::ISceneNode* out = NULL; scene::ISceneNode* out = NULL;
if (!m_glsl) // TODO: using cand's new WaterNode would be better, but it does not
{ // support our material flags (like transparency, etc.)
//if (!m_glsl)
//{
out = m_scene_manager->addWaterSurfaceSceneNode(welded_mesh, out = m_scene_manager->addWaterSurfaceSceneNode(welded_mesh,
wave_height, wave_speed, wave_height, wave_speed,
wave_length); wave_length);
} else //} else
{ //{
out = new WaterNode(m_scene_manager, welded_mesh, wave_height, wave_speed, // out = new WaterNode(m_scene_manager, welded_mesh, wave_height, wave_speed,
wave_length); // wave_length);
} //}
out->getMaterial(0).setFlag(video::EMF_GOURAUD_SHADING, true); out->getMaterial(0).setFlag(video::EMF_GOURAUD_SHADING, true);
welded_mesh->drop(); // The scene node keeps a reference welded_mesh->drop(); // The scene node keeps a reference
@ -2043,7 +2045,12 @@ void IrrDriver::applyObjectPassShader(scene::ISceneNode * const node, bool rimli
viamb = ((scene::IMeshSceneNode *) node)->isReadOnlyMaterials(); viamb = ((scene::IMeshSceneNode *) node)->isReadOnlyMaterials();
mesh = ((scene::IMeshSceneNode *) node)->getMesh(); mesh = ((scene::IMeshSceneNode *) node)->getMesh();
} }
else if (node->getType() == scene::ESNT_WATER_SURFACE)
{
viamb = (dynamic_cast<scene::IMeshSceneNode*>(node))->isReadOnlyMaterials();
mesh = (dynamic_cast<scene::IMeshSceneNode*>(node))->getMesh();
}
for (i = 0; i < mcount; i++) for (i = 0; i < mcount; i++)
{ {
video::SMaterial &nodemat = node->getMaterial(i); video::SMaterial &nodemat = node->getMaterial(i);