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

Don't attempt to preload more exterior cells than the cache can hold (Bug #3273)

Browse source
This commit is contained in:
scrawl 2016-03-29 00:48:47 +02:00
parent 83f1ab6d25
commit 5cda89c15d
3 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -260,6 +260,11 @@ namespace MWWorld
mMaxCacheSize = num; mMaxCacheSize = num;
} }
unsigned int CellPreloader::getMaxCacheSize() const
{
return mMaxCacheSize;
}
void CellPreloader::setWorkQueue(osg::ref_ptr<SceneUtil::WorkQueue> workQueue) void CellPreloader::setWorkQueue(osg::ref_ptr<SceneUtil::WorkQueue> workQueue)
{ {
mWorkQueue = workQueue; mWorkQueue = workQueue;

2
apps/openmw/mwworld/cellpreloader.hpp
View file

@ -44,6 +44,8 @@ namespace MWWorld
/// The maximum number of preloaded cells. /// The maximum number of preloaded cells.
void setMaxCacheSize(unsigned int num); void setMaxCacheSize(unsigned int num);
unsigned int getMaxCacheSize() const;
void setWorkQueue(osg::ref_ptr<SceneUtil::WorkQueue> workQueue); void setWorkQueue(osg::ref_ptr<SceneUtil::WorkQueue> workQueue);
private: private:

3
apps/openmw/mwworld/scene.cpp
View file

@ -737,11 +737,14 @@ namespace MWWorld
{ {
int x = cell->getCell()->getGridX(); int x = cell->getCell()->getGridX();
int y = cell->getCell()->getGridY(); int y = cell->getCell()->getGridY();
unsigned int numpreloaded = 0;
for (int dx = -mHalfGridSize; dx <= mHalfGridSize; ++dx) for (int dx = -mHalfGridSize; dx <= mHalfGridSize; ++dx)
{ {
for (int dy = -mHalfGridSize; dy <= mHalfGridSize; ++dy) for (int dy = -mHalfGridSize; dy <= mHalfGridSize; ++dy)
{ {
mPreloader->preload(MWBase::Environment::get().getWorld()->getExterior(x+dx, y+dy), mRendering.getReferenceTime()); mPreloader->preload(MWBase::Environment::get().getWorld()->getExterior(x+dx, y+dy), mRendering.getReferenceTime());
if (++numpreloaded >= mPreloader->getMaxCacheSize())
break;
} }
} }
} }