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

Merge branch 'terrainfix' into graphics

Browse source
This commit is contained in:
scrawl 2013-02-05 00:28:59 +01:00
commit 35b5fdab5d
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -152,16 +152,6 @@ namespace MWRender
mTerrainGroup.loadTerrain(terrainX, terrainY, true); mTerrainGroup.loadTerrain(terrainX, terrainY, true);
// when loading from a heightmap, Ogre::Terrain does not update the derived data (normal map, LOD)
// synchronously, even if we supply synchronous = true parameter to loadTerrain.
// the following to be the only way to make sure derived data is ready when rendering the next frame.
while (mTerrainGroup.isDerivedDataUpdateInProgress())
{
// we need to wait for this to finish
OGRE_THREAD_SLEEP(5);
Root::getSingleton().getWorkQueue()->processResponses();
}
Terrain* terrain = mTerrainGroup.getTerrain(terrainX, terrainY); Terrain* terrain = mTerrainGroup.getTerrain(terrainX, terrainY);
initTerrainBlendMaps(terrain, initTerrainBlendMaps(terrain,
cellX, cellY, cellX, cellY,
@ -189,6 +179,16 @@ namespace MWRender
} }
} }
// when loading from a heightmap, Ogre::Terrain does not update the derived data (normal map, LOD)
// synchronously, even if we supply synchronous = true parameter to loadTerrain.
// the following to be the only way to make sure derived data is ready when rendering the next frame.
while (mTerrainGroup.isDerivedDataUpdateInProgress())
{
// we need to wait for this to finish
OGRE_THREAD_SLEEP(5);
Root::getSingleton().getWorkQueue()->processResponses();
}
mTerrainGroup.freeTemporaryResources(); mTerrainGroup.freeTemporaryResources();
} }