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

Add a time threshold to the removing of preloaded cells when the maximum cache size is reached (Bug #3273)

Browse source
This commit is contained in:
scrawl 2016-03-29 00:44:57 +02:00
parent 4ac276b06c
commit 83f1ab6d25
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/openmw/mwworld/cellpreloader.cpp
View file

@ -204,6 +204,7 @@ namespace MWWorld
// throw out oldest cell to make room // throw out oldest cell to make room
PreloadMap::iterator oldestCell = mPreloadCells.begin(); PreloadMap::iterator oldestCell = mPreloadCells.begin();
double oldestTimestamp = DBL_MAX; double oldestTimestamp = DBL_MAX;
double threshold = 1.0; // seconds
for (PreloadMap::iterator it = mPreloadCells.begin(); it != mPreloadCells.end(); ++it) for (PreloadMap::iterator it = mPreloadCells.begin(); it != mPreloadCells.end(); ++it)
{ {
if (it->second.mTimeStamp < oldestTimestamp) if (it->second.mTimeStamp < oldestTimestamp)
@ -213,7 +214,10 @@ namespace MWWorld
} }
} }
if (oldestTimestamp + threshold < timestamp)
mPreloadCells.erase(oldestCell); mPreloadCells.erase(oldestCell);
else
return;
} }
osg::ref_ptr<PreloadItem> item (new PreloadItem(cell, mResourceSystem->getSceneManager(), mBulletShapeManager, mResourceSystem->getKeyframeManager(), mTerrain)); osg::ref_ptr<PreloadItem> item (new PreloadItem(cell, mResourceSystem->getSceneManager(), mBulletShapeManager, mResourceSystem->getKeyframeManager(), mTerrain));