mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-11 15:40:39 +00:00
Code Issues Projects Releases Wiki Activity

Only loads ESM4::reference when they are needed

Browse Source 
and only those from the cell they are a part of.
The cell stores where it starts in the file for quick access later.
This commit is contained in:
florent.teppe 2023-03-04 23:40:41 +01:00
parent 31ae1cd339
commit 214cb8d8fe
4 changed files with 46 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
apps/openmw/mwworld/cellstore.cpp
View File

@ -42,7 +42,10 @@
#include <components/esm4/loadligh.hpp>
#include <components/esm4/loadrefr.hpp>
#include <components/esm4/loadstat.hpp>
#include <components/esm4/readerutils.hpp>
#include <components/files/openfile.hpp>
#include <components/misc/tuplehelpers.hpp>
#include <components/resource/resourcesystem.hpp>
#include "../mwbase/environment.hpp"
#include "../mwbase/luamanager.hpp"
@ -756,17 +759,44 @@ namespace MWWorld
}
}
template <typename ReferenceInvlocable>
static void visitCell4References(const ESM4::Cell& cell, ReferenceInvlocable&& invocable)
{
auto stream = Files::openBinaryInputFileStream(cell.mReaderContext.filename);
ESM4::Reader readerESM4(
std::move(stream), cell.mReaderContext.filename, MWBase::Environment::get().getResourceSystem()->getVFS());
readerESM4.setEncoder(nullptr);
readerESM4.restoreContext(cell.mReaderContext);
bool continueRead = true;
while (ESM::RefId::formIdRefId(readerESM4.getContext().currCell) == cell.mId && readerESM4.hasMoreRecs()
&& continueRead)
{
continueRead = ESM4::ReaderUtils::readItem(
readerESM4,
[&](ESM4::Reader& reader) {
auto recordType = static_cast<ESM4::RecordTypes>(reader.hdr().record.typeId);
ESM::RecNameInts esm4RecName = static_cast<ESM::RecNameInts>(ESM::esm4Recname(recordType));
if (esm4RecName == ESM::RecNameInts::REC_REFR4)
{
ESM4::Reference ref;
ref.load(reader);
invocable(ref);
return true;
}
else if (esm4RecName == ESM::RecNameInts::REC_CELL4)
{
ESM4::Cell cellToLoad;
cellToLoad.load(reader); // This is necessary to exit
}
return false;
},
[&](ESM4::Reader& reader) {});
}
}
void CellStore::listRefs(const ESM4::Cell& cell)
{
auto& refs = MWBase::Environment::get().getWorld()->getStore().get<ESM4::Reference>();
for (const auto& ref : refs)
{
if (ref.mParent == cell.mId)
{
mIds.push_back(ref.mBaseObj);
}
}
visitCell4References(cell, [&](ESM4::Reference& ref) { mIds.push_back(ref.mBaseObj); });
}
void CellStore::listRefs()
@ -830,15 +860,7 @@ namespace MWWorld
void CellStore::loadRefs(const ESM4::Cell& cell, std::map<ESM::RefNum, ESM::RefId>& refNumToID)
{
auto& refs = MWBase::Environment::get().getWorld()->getStore().get<ESM4::Reference>();
for (const auto& ref : refs)
{
if (ref.mParent == cell.mId)
{
loadRef(ref, false);
}
}
visitCell4References(cell, [&](ESM4::Reference& ref) { loadRef(ref, false); });
}
void CellStore::loadRefs()

3
apps/openmw/mwworld/esmstore.hpp
View File

@ -29,7 +29,6 @@ namespace ESM4
class Reader;
struct Static;
struct Cell;
struct Reference;
struct Light;
}
@ -106,7 +105,7 @@ namespace MWWorld
// Special entry which is hardcoded and not loaded from an ESM
Store<ESM::Attribute>,
Store<ESM4::Static>, Store<ESM4::Cell>, Store<ESM4::Reference>, Store<ESM4::Light>>;
Store<ESM4::Static>, Store<ESM4::Cell>, Store<ESM4::Light>>;
private:
template <typename T>

2
components/esm4/loadcell.cpp
View File

@ -240,6 +240,8 @@ void ESM4::Cell::load(ESM4::Reader& reader)
throw std::runtime_error("ESM4::CELL::load - Unknown subrecord " + ESM::printName(subHdr.typeId));
}
}
mReaderContext = reader.getContext();
}
// void ESM4::Cell::save(ESM4::Writer& writer) const

3
components/esm4/loadcell.hpp
View File

@ -37,6 +37,7 @@
#include <components/esm/defs.hpp>
#include <components/esm/refid.hpp>
#include <components/esm3/cellid.hpp>
#include <components/esm4/reader.hpp>
namespace ESM4
{
@ -96,6 +97,8 @@ namespace ESM4
CellGroup* mCellGroup;
ESM4::ReaderContext mReaderContext;
void load(ESM4::Reader& reader);
// void save(ESM4::Writer& writer) const;