krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

Removed composite maps, fixes to texture sizes and unloading

Browse source
This commit is contained in:
Jacob Essex 2012-02-07 12:41:08 +00:00
parent 5e3e6f9165
commit 9cc3af34e5
1 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -16,7 +16,20 @@ namespace MWRender
mTerrainGlobals = OGRE_NEW Ogre::TerrainGlobalOptions(); mTerrainGlobals = OGRE_NEW Ogre::TerrainGlobalOptions();
mTerrainGlobals->setMaxPixelError(8); mTerrainGlobals->setMaxPixelError(8);
mTerrainGlobals->setLayerBlendMapSize(SPLIT_TERRAIN ? 1024 : 256); mTerrainGlobals->setLayerBlendMapSize(SPLIT_TERRAIN ? 256 : 1024);
mTerrainGlobals->setLightMapSize(SPLIT_TERRAIN ? 256 : 1024);
mTerrainGlobals->setCompositeMapSize(SPLIT_TERRAIN ? 256 : 1024);
mTerrainGlobals->setDefaultGlobalColourMapSize(256);
//10 (default) didn't seem to be quite enough
mTerrainGlobals->setSkirtSize(32);
/*
* Here we are pushing the composite map distance beyond the edge
* of the rendered terrain due to light issues (the lighting differs
* so much that it is very noticable
*/
mTerrainGlobals->setCompositeMapDistance(ESM::Land::REAL_SIZE*4);
Ogre::TerrainMaterialGenerator::Profile* const activeProfile = Ogre::TerrainMaterialGenerator::Profile* const activeProfile =
mTerrainGlobals->getDefaultMaterialGenerator() mTerrainGlobals->getDefaultMaterialGenerator()
@ -27,6 +40,7 @@ namespace MWRender
matProfile->setLightmapEnabled(false); matProfile->setLightmapEnabled(false);
matProfile->setReceiveDynamicShadowsEnabled(false); matProfile->setReceiveDynamicShadowsEnabled(false);
//scale the land size if required
mLandSize = ESM::Land::LAND_SIZE; mLandSize = ESM::Land::LAND_SIZE;
mRealSize = ESM::Land::REAL_SIZE; mRealSize = ESM::Land::REAL_SIZE;
if ( SPLIT_TERRAIN ) if ( SPLIT_TERRAIN )
@ -109,6 +123,8 @@ namespace MWRender
x * numTextures, y * numTextures, x * numTextures, y * numTextures,
numTextures, indexes); numTextures, indexes);
assert( mTerrainGroup->getTerrain(cellX, cellY) == NULL &&
"The terrain for this cell already existed" );
mTerrainGroup->defineTerrain(terrainX, terrainY, &terrainData); mTerrainGroup->defineTerrain(terrainX, terrainY, &terrainData);
mTerrainGroup->loadTerrain(terrainX, terrainY, true); mTerrainGroup->loadTerrain(terrainX, terrainY, true);
@ -143,6 +159,7 @@ namespace MWRender
ESM::Land::LAND_TEXTURE_SIZE, indexes); ESM::Land::LAND_TEXTURE_SIZE, indexes);
} }
mTerrainGroup->freeTemporaryResources();
} }
//---------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------
@ -155,14 +172,14 @@ namespace MWRender
{ {
for ( int y = 0; y < 2; y++ ) for ( int y = 0; y < 2; y++ )
{ {
mTerrainGroup->removeTerrain(store->cell->getGridX() * 2 + x, mTerrainGroup->unloadTerrain(store->cell->getGridX() * 2 + x,
store->cell->getGridY() * 2 + y); store->cell->getGridY() * 2 + y);
} }
} }
} }
else else
{ {
mTerrainGroup->removeTerrain(store->cell->getGridX(), mTerrainGroup->unloadTerrain(store->cell->getGridX(),
store->cell->getGridY()); store->cell->getGridY());
} }
} }