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

Do not draw twice the second pass instanced mesh

Browse Source
This commit is contained in:
Vincent Lejeune 2014-08-25 02:17:23 +02:00
parent 55346185d7
commit 805d35a5e6
1 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/graphics/stkinstancedscenenode.cpp
View File

@ -196,29 +196,32 @@ void STKInstancedSceneNode::render()
setFirstTimeMaterial(); setFirstTimeMaterial();
for(unsigned i = 0; i < MeshSolidMaterial[MAT_DEFAULT].size(); i++) if (irr_driver->getPhase() == SOLID_NORMAL_AND_DEPTH_PASS || irr_driver->getPhase() == SHADOW_PASS)
{ {
GLMesh *mesh = MeshSolidMaterial[MAT_DEFAULT][i]; for (unsigned i = 0; i < MeshSolidMaterial[MAT_DEFAULT].size(); i++)
ListInstancedMatDefault::getInstance()->push_back(STK::make_tuple(mesh, instanceData[0].size())); {
} GLMesh *mesh = MeshSolidMaterial[MAT_DEFAULT][i];
ListInstancedMatDefault::getInstance()->push_back(STK::make_tuple(mesh, instanceData[0].size()));
}
for(unsigned i = 0; i < MeshSolidMaterial[MAT_ALPHA_REF].size(); i++) for (unsigned i = 0; i < MeshSolidMaterial[MAT_ALPHA_REF].size(); i++)
{ {
GLMesh *mesh = MeshSolidMaterial[MAT_ALPHA_REF][i]; GLMesh *mesh = MeshSolidMaterial[MAT_ALPHA_REF][i];
ListInstancedMatAlphaRef::getInstance()->push_back(STK::make_tuple(mesh, instanceData[0].size())); ListInstancedMatAlphaRef::getInstance()->push_back(STK::make_tuple(mesh, instanceData[0].size()));
} }
windDir = getWind(); windDir = getWind();
SunLightProvider * const cb = (SunLightProvider *)irr_driver->getCallback(ES_SUNLIGHT); SunLightProvider * const cb = (SunLightProvider *)irr_driver->getCallback(ES_SUNLIGHT);
for(unsigned i = 0; i < MeshSolidMaterial[MAT_GRASS].size(); i++) for (unsigned i = 0; i < MeshSolidMaterial[MAT_GRASS].size(); i++)
{ {
GLMesh *mesh = MeshSolidMaterial[MAT_GRASS][i]; GLMesh *mesh = MeshSolidMaterial[MAT_GRASS][i];
ListInstancedMatGrass::getInstance()->push_back(STK::make_tuple(mesh, instanceData[0].size(), windDir, cb->getPosition())); ListInstancedMatGrass::getInstance()->push_back(STK::make_tuple(mesh, instanceData[0].size(), windDir, cb->getPosition()));
} }
for(unsigned i = 0; i < MeshSolidMaterial[MAT_NORMAL_MAP].size(); i++) for (unsigned i = 0; i < MeshSolidMaterial[MAT_NORMAL_MAP].size(); i++)
{ {
GLMesh *mesh = MeshSolidMaterial[MAT_NORMAL_MAP][i]; GLMesh *mesh = MeshSolidMaterial[MAT_NORMAL_MAP][i];
ListInstancedMatNormalMap::getInstance()->push_back(STK::make_tuple(mesh, instanceData[0].size())); ListInstancedMatNormalMap::getInstance()->push_back(STK::make_tuple(mesh, instanceData[0].size()));
}
} }
} }