Merge branch 'loadingesm4' into 'master'

Track ESM4 file loading progress See merge request OpenMW/openmw!4516
OpenMW · Jan 17, 2025 · e515e99 · e515e99
2 parents fe047d9 + 9fc62be
commit e515e99
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/apps/openmw/mwworld/esmloader.cpp b/apps/openmw/mwworld/esmloader.cpp
@@ -70,7 +70,7 @@ namespace MWWorld
                     mEncoder != nullptr ? &mEncoder->getStatelessEncoder() : nullptr);
                 reader.setModIndex(index);
                 reader.updateModIndices(mNameToIndex);
-                mStore.loadESM4(reader);
+                mStore.loadESM4(reader, listener);
                 break;
             }
         }

diff --git a/apps/openmw/mwworld/esmstore.cpp b/apps/openmw/mwworld/esmstore.cpp
@@ -468,9 +468,16 @@ namespace MWWorld
         }
     }
 
-    void ESMStore::loadESM4(ESM4::Reader& reader)
+    void ESMStore::loadESM4(ESM4::Reader& reader, Loading::Listener* listener)
     {
-        auto visitorRec = [this](ESM4::Reader& reader) { return ESMStoreImp::readRecord(reader, *this); };
+        if (listener != nullptr)
+            listener->setProgressRange(::EsmLoader::fileProgress);
+        auto visitorRec = [this, listener](ESM4::Reader& reader) {
+            bool result = ESMStoreImp::readRecord(reader, *this);
+            if (listener != nullptr)
+                listener->setProgress(::EsmLoader::fileProgress * reader.getFileOffset() / reader.getFileSize());
+            return result;
+        };
         ESM4::ReaderUtils::readAll(reader, visitorRec, [](ESM4::Reader&) {});
     }
 

diff --git a/apps/openmw/mwworld/esmstore.hpp b/apps/openmw/mwworld/esmstore.hpp
@@ -219,7 +219,7 @@ namespace MWWorld
         void validateDynamic();
 
         void load(ESM::ESMReader& esm, Loading::Listener* listener, ESM::Dialogue*& dialogue);
-        void loadESM4(ESM4::Reader& esm);
+        void loadESM4(ESM4::Reader& esm, Loading::Listener* listener);
 
         template <class T>
         const Store<T>& get() const

diff --git a/components/esm4/reader.hpp b/components/esm4/reader.hpp
@@ -217,7 +217,7 @@ namespace ESM4
 
         // Methods added for updating loading progress bars
         inline std::size_t getFileSize() const { return mFileSize; }
-        inline std::size_t getFileOffset() const { return mStream->tellg(); }
+        inline std::size_t getFileOffset() const { return mSavedStream ? mSavedStream->tellg() : mStream->tellg(); }
 
         // Methods added for saving/restoring context
         ReaderContext getContext(); // WARN: must be called immediately after reading the record header