mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-01 02:15:34 +00:00
Code Issues Releases Wiki Activity

Merge branch 'cleanup_esm3_readers_cache' into 'master'

Browse source 
Remove stateless encoder from ReadersCache

See merge request OpenMW/openmw!3823
This commit is contained in:
psi29a 2024-01-31 10:49:53 +00:00
commit c9489bad9b
3 changed files with 7 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -64,11 +64,12 @@ namespace MWWorld
} }
case ESM::Format::Tes4: case ESM::Format::Tes4:
{ {
ESM4::Reader readerESM4(std::move(stream), filepath, ESM4::Reader reader(std::move(stream), filepath,
MWBase::Environment::get().getResourceSystem()->getVFS(), mReaders.getStatelessEncoder()); MWBase::Environment::get().getResourceSystem()->getVFS(),
readerESM4.setModIndex(index); mEncoder != nullptr ? &mEncoder->getStatelessEncoder() : nullptr);
readerESM4.updateModIndices(mNameToIndex); reader.setModIndex(index);
mStore.loadESM4(readerESM4); reader.updateModIndices(mNameToIndex);
mStore.loadESM4(reader);
break; break;
} }
} }

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

@ -274,8 +274,6 @@ namespace MWWorld
const std::vector<std::string>& groundcoverFiles, ToUTF8::Utf8Encoder* encoder, Loading::Listener* listener) const std::vector<std::string>& groundcoverFiles, ToUTF8::Utf8Encoder* encoder, Loading::Listener* listener)
{ {
mContentFiles = contentFiles; mContentFiles = contentFiles;
if (encoder)
mReaders.setStatelessEncoder(encoder->getStatelessEncoder());
mESMVersions.resize(mContentFiles.size(), -1); mESMVersions.resize(mContentFiles.size(), -1);
loadContentFiles(fileCollections, contentFiles, encoder, listener); loadContentFiles(fileCollections, contentFiles, encoder, listener);

14
components/esm3/readerscache.hpp
View file

@ -9,8 +9,6 @@
#include <optional> #include <optional>
#include <string> #include <string>
#include <components/to_utf8/to_utf8.hpp>
namespace ESM namespace ESM
{ {
class ReadersCache class ReadersCache
@ -57,23 +55,13 @@ namespace ESM
BusyItem get(std::size_t index); 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: private:
const std::size_t mCapacity; const std::size_t mCapacity;
std::map<std::size_t, std::list<Item>::iterator> mIndex; std::map<std::size_t, std::list<Item>::iterator> mIndex;
std::list<Item> mBusyItems; std::list<Item> mBusyItems;
std::list<Item> mFreeItems; std::list<Item> mFreeItems;
std::list<Item> mClosedItems; std::list<Item> mClosedItems;
std::optional<ToUTF8::StatelessUtf8Encoder> mStatelessEncoder;
inline void closeExtraReaders(); inline void closeExtraReaders();
inline void releaseItem(std::list<Item>::iterator it) noexcept; inline void releaseItem(std::list<Item>::iterator it) noexcept;