mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-06 10:45:33 +00:00
Code Issues Releases Wiki Activity

readers cache keep a stateless encoder

Browse source 
to keep access to the current encoding configuration

build linux
This commit is contained in:
florent.teppe 2023-03-06 20:28:55 +01:00
parent 214cb8d8fe
commit 170b732854
4 changed files with 23 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
apps/openmw/mwworld/cellstore.cpp
View file

@ -2,6 +2,7 @@
#include "magiceffects.hpp"
#include <algorithm>
#include <fstream>
#include <components/debug/debuglog.hpp>
@ -759,13 +760,14 @@ namespace MWWorld
}
}
template <typename ReferenceInvlocable>
static void visitCell4References(const ESM4::Cell& cell, ReferenceInvlocable&& invocable)
template <typename ReferenceInvocable>
static void visitCell4References(const ESM4::Cell& cell, ESM::ReadersCache& readers, ReferenceInvocable&& 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.setEncoder(readers.getStatelessEncoder());
readerESM4.restoreContext(cell.mReaderContext);
bool continueRead = true;
while (ESM::RefId::formIdRefId(readerESM4.getContext().currCell) == cell.mId && readerESM4.hasMoreRecs()
@ -796,7 +798,7 @@ namespace MWWorld
void CellStore::listRefs(const ESM4::Cell& cell)
{
visitCell4References(cell, [&](ESM4::Reference& ref) { mIds.push_back(ref.mBaseObj); });
visitCell4References(cell, mReaders, [&](ESM4::Reference& ref) { mIds.push_back(ref.mBaseObj); });
}
void CellStore::listRefs()
@ -860,7 +862,7 @@ namespace MWWorld
void CellStore::loadRefs(const ESM4::Cell& cell, std::map<ESM::RefNum, ESM::RefId>& refNumToID)
{
visitCell4References(cell, [&](ESM4::Reference& ref) { loadRef(ref, false); });
visitCell4References(cell, mReaders, [&](ESM4::Reference& ref) { loadRef(ref, false); });
}
void CellStore::loadRefs()

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

@ -65,8 +65,7 @@ namespace MWWorld
{
ESM4::Reader readerESM4(
std::move(stream), filepath, MWBase::Environment::get().getResourceSystem()->getVFS());
auto statelessEncoder = mEncoder->getStatelessEncoder();
readerESM4.setEncoder(&statelessEncoder);
readerESM4.setEncoder(mReaders.getStatelessEncoder());
mStore.loadESM4(readerESM4);
break;
}

2
apps/openmw/mwworld/worldimp.cpp
View file

@ -184,6 +184,8 @@ namespace MWWorld
, mPlayerInJail(false)
, mSpellPreloadTimer(0.f)
{
if (encoder)
mReaders.setStatelessEncoder(encoder->getStatelessEncoder());
mESMVersions.resize(mContentFiles.size(), -1);
Loading::Listener* listener = MWBase::Environment::get().getWindowManager()->getLoadingScreen();
listener->loadingOn();

14
components/esm3/readerscache.hpp
View file

@ -9,6 +9,8 @@
#include <optional>
#include <string>
#include <components/to_utf8/to_utf8.hpp>
namespace ESM
{
class ReadersCache
@ -55,13 +57,23 @@ namespace ESM
BusyItem get(std::size_t index);
void setStatelessEncoder(const ToUTF8::StatelessUtf8Encoder& statelessEncoderPtr)
{
mStatelessEncoder.emplace(statelessEncoderPtr);
}
const ToUTF8::StatelessUtf8Encoder* getStatelessEncoder()
{
return mStatelessEncoder.has_value() ? &mStatelessEncoder.value() : nullptr;
}
private:
const std::size_t mCapacity;
std::map<std::size_t, std::list<Item>::iterator> mIndex;
std::list<Item> mBusyItems;
std::list<Item> mFreeItems;
std::list<Item> mClosedItems;
std::optional<ToUTF8::StatelessUtf8Encoder> mStatelessEncoder;
inline void closeExtraReaders();
inline void releaseItem(std::list<Item>::iterator it) noexcept;