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

Issue #312: Implemented ID-search caching to speed up some badly written scripts

Browse source
This commit is contained in:
Marc Zinnschlag 2012-06-21 11:43:18 +02:00
parent 6a2bcddef5
commit 89ac0fa232
2 changed files with 39 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
apps/openmw/mwworld/cells.cpp
View file

@ -70,8 +70,26 @@ void MWWorld::Cells::fillContainers (Ptr::CellStore& cellStore)
} }
} }
MWWorld::Ptr MWWorld::Cells::getPtrAndCache (const std::string& name, Ptr::CellStore& cellStore)
{
Ptr ptr = getPtr (name, cellStore);
if (!ptr.isEmpty())
{
mIdCache[mIdCacheIndex].first = name;
mIdCache[mIdCacheIndex].second = &cellStore;
if (++mIdCacheIndex>=mIdCache.size())
mIdCacheIndex = 0;
}
return ptr;
}
MWWorld::Cells::Cells (const ESMS::ESMStore& store, ESM::ESMReader& reader, MWWorld::World& world) MWWorld::Cells::Cells (const ESMS::ESMStore& store, ESM::ESMReader& reader, MWWorld::World& world)
: mStore (store), mReader (reader), mWorld (world) {} : mStore (store), mReader (reader), mWorld (world),
mIdCache (20, std::pair<std::string, Ptr::CellStore *> ("", 0)), /// \todo make cache size configurable
mIdCacheIndex (0)
{}
MWWorld::Ptr::CellStore *MWWorld::Cells::getExterior (int x, int y) MWWorld::Ptr::CellStore *MWWorld::Cells::getExterior (int x, int y)
{ {
@ -215,19 +233,29 @@ MWWorld::Ptr MWWorld::Cells::getPtr (const std::string& name, Ptr::CellStore& ce
MWWorld::Ptr MWWorld::Cells::getPtr (const std::string& name) MWWorld::Ptr MWWorld::Cells::getPtr (const std::string& name)
{ {
// First check cells that are already listed // First check the cache
for (std::vector<std::pair<std::string, Ptr::CellStore *> >::iterator iter (mIdCache.begin());
iter!=mIdCache.end(); ++iter)
if (iter->first==name && iter->second)
{
Ptr ptr = getPtr (name, *iter->second);
if (!ptr.isEmpty())
return ptr;
}
// Then check cells that are already listed
for (std::map<std::string, Ptr::CellStore>::iterator iter = mInteriors.begin(); for (std::map<std::string, Ptr::CellStore>::iterator iter = mInteriors.begin();
iter!=mInteriors.end(); ++iter) iter!=mInteriors.end(); ++iter)
{ {
Ptr ptr = getPtr (name, iter->second); Ptr ptr = getPtrAndCache (name, iter->second);
if (!ptr.isEmpty()) if (!ptr.isEmpty())
return ptr; return ptr;
} }
for (std::map<std::pair<int, int>, Ptr::CellStore>::iterator iter = mExteriors.begin(); for (std::map<std::pair<int, int>, Ptr::CellStore>::iterator iter = mExteriors.begin();
iter!=mExteriors.end(); ++iter) iter!=mExteriors.end(); ++iter)
{ {
Ptr ptr = getPtr (name, iter->second); Ptr ptr = getPtrAndCache (name, iter->second);
if (!ptr.isEmpty()) if (!ptr.isEmpty())
return ptr; return ptr;
} }
@ -238,7 +266,7 @@ MWWorld::Ptr MWWorld::Cells::getPtr (const std::string& name)
{ {
Ptr::CellStore *cellStore = getCellStore (iter->second); Ptr::CellStore *cellStore = getCellStore (iter->second);
Ptr ptr = getPtr (name, *cellStore); Ptr ptr = getPtrAndCache (name, *cellStore);
if (!ptr.isEmpty()) if (!ptr.isEmpty())
return ptr; return ptr;
@ -249,7 +277,7 @@ MWWorld::Ptr MWWorld::Cells::getPtr (const std::string& name)
{ {
Ptr::CellStore *cellStore = getCellStore (iter->second); Ptr::CellStore *cellStore = getCellStore (iter->second);
Ptr ptr = getPtr (name, *cellStore); Ptr ptr = getPtrAndCache (name, *cellStore);
if (!ptr.isEmpty()) if (!ptr.isEmpty())
return ptr; return ptr;

4
apps/openmw/mwworld/cells.hpp
View file

@ -28,6 +28,8 @@ namespace MWWorld
std::map<std::string, Ptr::CellStore> mInteriors; std::map<std::string, Ptr::CellStore> mInteriors;
std::map<std::pair<int, int>, Ptr::CellStore> mExteriors; std::map<std::pair<int, int>, Ptr::CellStore> mExteriors;
MWWorld::World& mWorld; MWWorld::World& mWorld;
std::vector<std::pair<std::string, Ptr::CellStore *> > mIdCache;
std::size_t mIdCacheIndex;
Cells (const Cells&); Cells (const Cells&);
Cells& operator= (const Cells&); Cells& operator= (const Cells&);
@ -36,6 +38,8 @@ namespace MWWorld
void fillContainers (Ptr::CellStore& cellStore); void fillContainers (Ptr::CellStore& cellStore);
Ptr getPtrAndCache (const std::string& name, Ptr::CellStore& cellStore);
public: public:
Cells (const ESMS::ESMStore& store, ESM::ESMReader& reader, MWWorld::World& world); Cells (const ESMS::ESMStore& store, ESM::ESMReader& reader, MWWorld::World& world);