VR: Migrate object storage to Framework class

Author: praydog

src/Framework.cpp

@@ -188,7 +188,8 @@ void Framework::command_thread() {
 Framework::Framework(HMODULE framework_module)
     : m_framework_module{framework_module}
     , m_game_module{GetModuleHandle(0)},
-    m_logger{spdlog::basic_logger_mt("UnrealVR", (get_persistent_dir() / "log.txt").string(), true)} 
+    m_logger{spdlog::basic_logger_mt("UnrealVR", (get_persistent_dir() / "log.txt").string(), true)},
+    m_vr{std::make_shared<VR>()}
 {
     std::scoped_lock __{m_constructor_mutex};
 

src/Framework.hpp

@@ -2,6 +2,7 @@
 
 #include <array>
 #include <unordered_set>
+#include <memory>
 #include <filesystem>
 
 #include <spdlog/spdlog.h>
@@ -16,6 +17,7 @@
 #include <mods/vr/d3d12/CommandContext.hpp>
 
 class Mods;
+class VR;
 
 #include "hooks/D3D11Hook.hpp"
 #include "hooks/D3D12Hook.hpp"
@@ -69,6 +71,9 @@ struct SidebarEntryInfo {
 
 // Global facilitator
 class Framework {
+private:
+    std::shared_ptr<VR> m_vr{};
+
 private:
     void hook_monitor();
     void command_thread();
@@ -78,6 +83,7 @@ class Framework {
     virtual ~Framework();
 
     auto get_framework_module() const { return m_framework_module; }
+    auto& vr() { return m_vr; }
 
     bool is_valid() const { return m_valid; }
 

src/mods/VR.cpp

@@ -26,8 +26,8 @@
 #include "VR.hpp"
 
 std::shared_ptr<VR>& VR::get() {
-    static std::shared_ptr<VR> instance = std::make_shared<VR>();
-    return instance;
+    //static std::shared_ptr<VR> instance = std::make_shared<VR>();
+    return g_framework->vr();
 }
 
 // Called when the mod is initialized