mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-02 09:15:33 +00:00
Code Issues Releases Wiki Activity

disabled the composite map, improves loading time a lot

Browse source
This commit is contained in:
scrawl 2012-03-04 00:08:56 +01:00
parent b882c03adc
commit a8939bc318
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
apps/openmw/mwrender/terrain.cpp
View file

@ -51,6 +51,7 @@ namespace MWRender
mActiveProfile->setLayerNormalMappingEnabled(false); mActiveProfile->setLayerNormalMappingEnabled(false);
mActiveProfile->setLayerParallaxMappingEnabled(false); mActiveProfile->setLayerParallaxMappingEnabled(false);
mActiveProfile->setReceiveDynamicShadowsEnabled(false); mActiveProfile->setReceiveDynamicShadowsEnabled(false);
mActiveProfile->setCompositeMapEnabled(false);
mTerrainGroup = OGRE_NEW Ogre::TerrainGroup(mgr, mTerrainGroup = OGRE_NEW Ogre::TerrainGroup(mgr,
Ogre::Terrain::ALIGN_X_Z, Ogre::Terrain::ALIGN_X_Z,
@ -160,10 +161,6 @@ namespace MWRender
else else
mActiveProfile->setGlobalColourMapEnabled(false); mActiveProfile->setGlobalColourMapEnabled(false);
/// \todo are we possibly generating the materials twice?
mActiveProfile->generate(terrain);
mActiveProfile->generateForCompositeMap(terrain);
if ( store->land[1][1]->landData->usingColours ) if ( store->land[1][1]->landData->usingColours )
{ {
Ogre::TexturePtr vertex = getVertexColours(store, Ogre::TexturePtr vertex = getVertexColours(store,
@ -173,10 +170,10 @@ namespace MWRender
//this is a hack to get around the fact that Ogre seems to //this is a hack to get around the fact that Ogre seems to
//corrupt the global colour map leading to rendering errors //corrupt the global colour map leading to rendering errors
MaterialPtr mat = terrain->_getMaterial(); MaterialPtr mat = terrain->getMaterial();
mat->getTechnique(0)->getPass(0)->getTextureUnitState(1)->setTextureName( vertex->getName() );
mat = terrain->_getCompositeMapMaterial();
mat->getTechnique(0)->getPass(0)->getTextureUnitState(1)->setTextureName( vertex->getName() ); mat->getTechnique(0)->getPass(0)->getTextureUnitState(1)->setTextureName( vertex->getName() );
//mat = terrain->_getCompositeMapMaterial();
//mat->getTechnique(0)->getPass(0)->getTextureUnitState(1)->setTextureName( vertex->getName() );
} }
} }
} }