Merge branch 'string_ref_id_count' into 'master'

Report number of StringRefIds to osg stats

See merge request OpenMW/openmw!5072

Author: Assumeru

apps/openmw/engine.cpp

@@ -333,6 +333,8 @@ bool OMW::Engine::frame(unsigned frameNumber, float frametime)
         mMechanicsManager->reportStats(frameNumber, *stats);
         mWorld->reportStats(frameNumber, *stats);
         mLuaManager->reportStats(frameNumber, *stats);
+
+        stats->setAttribute(frameNumber, "StringRefId Count", static_cast<double>(ESM::StringRefId::totalCount()));
     }
 
     mStereoManager->updateSettings(Settings::camera().mNearClip, Settings::camera().mViewingDistance);

components/esm/refid.cpp

@@ -4,11 +4,8 @@
 
 #include "components/misc/strings/lower.hpp"
 
-#include <charconv>
-#include <ostream>
 #include <sstream>
 #include <stdexcept>
-#include <system_error>
 #include <variant>
 
 namespace ESM

components/esm/stringrefid.cpp

@@ -2,10 +2,7 @@
 #include "serializerefid.hpp"
 
 #include <charconv>
-#include <iomanip>
-#include <mutex>
 #include <ostream>
-#include <sstream>
 #include <system_error>
 #include <unordered_set>
 
@@ -145,4 +142,9 @@ namespace ESM
         id.mValue = &*it;
         return id;
     }
+
+    std::size_t StringRefId::totalCount()
+    {
+        return getRefIds().lock()->size();
+    }
 }

components/esm/stringrefid.hpp

@@ -6,7 +6,6 @@
 #include <optional>
 #include <string>
 #include <string_view>
-#include <variant>
 
 #include <components/misc/notnullptr.hpp>
 
@@ -50,6 +49,8 @@ namespace ESM
         // Similar to the constructor but only returns preexisting ids
         static std::optional<StringRefId> deserializeExisting(std::string_view value);
 
+        static std::size_t totalCount();
+
     private:
         Misc::NotNullPtr<const std::string> mValue;
     };

components/esm3/loadcell.cpp

@@ -40,7 +40,7 @@ namespace ESM
 
 namespace ESM
 {
-    const StringRefId Cell::sDefaultWorldspaceId = StringRefId("sys::default");
+    const StringRefId Cell::sDefaultWorldspaceId("sys::default");
 
     template <Misc::SameAsWithoutCvref<Cell::DATAstruct> T>
     void decompose(T&& v, const auto& f)

components/resource/stats.cpp

@@ -74,7 +74,7 @@ namespace Resource
                 "",
                 "Lua UsedMemory",
                 "",
-                "",
+                "StringRefId Count",
                 "",
             };