mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-10 15:45:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'terrainfix' into graphics

Browse Source
This commit is contained in:
scrawl 2013-02-04 23:16:11 +01:00
commit bb1f23875d
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,6 +3,7 @@
#include <OgreTerrain.h> #include <OgreTerrain.h>
#include <OgreTerrainGroup.h> #include <OgreTerrainGroup.h>
#include <OgreHardwarePixelBuffer.h> #include <OgreHardwarePixelBuffer.h>
#include <OgreRoot.h>
#include "../mwworld/esmstore.hpp" #include "../mwworld/esmstore.hpp"
@ -151,6 +152,16 @@ 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,