UObjectHook: Fix other persistent states not getting destroyed

praydog · Nov 29, 2023 · 4e98f6a · 4e98f6a
1 parent 28c9714
commit 4e98f6a
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 8 deletions.
diff --git a/src/mods/UObjectHook.cpp b/src/mods/UObjectHook.cpp
@@ -148,9 +148,7 @@ void UObjectHook::hook() {
     SPDLOG_INFO("[UObjectHook] Added {} existing objects", m_objects.size());
 
     SPDLOG_INFO("[UObjectHook] Deserializing persistent states");
-    m_persistent_states = deserialize_all_mc_states();
-    m_persistent_camera_state = deserialize_camera_state();
-    m_persistent_properties = deserialize_all_persistent_properties();
+    reload_persistent_states();
     SPDLOG_INFO("[UObjectHook] Deserialized {} persistent states", m_persistent_states.size());
 
     m_fully_hooked = true;
@@ -1412,15 +1410,13 @@ void UObjectHook::on_draw_ui() {
     std::shared_lock _{m_mutex};
 
     if (ImGui::Button("Reload Persistent States")) {
-        m_persistent_states = deserialize_all_mc_states();
-        m_persistent_camera_state = deserialize_camera_state();
-        m_persistent_properties = deserialize_all_persistent_properties();
+        reload_persistent_states();
     }
 
     ImGui::SameLine();
 
     if (ImGui::Button("Destroy Persistent States")) {
-        m_persistent_states.clear();
+        reset_persistent_states();
 
         const auto uobjecthook_dir = get_persistent_dir();
 
@@ -1436,7 +1432,6 @@ void UObjectHook::on_draw_ui() {
     ImGui::Separator();
 
     if (!m_motion_controller_attached_components.empty()) {
-        ImGui::SetNextItemOpen(true, ImGuiCond_Once);
         const auto made = ImGui::TreeNode("Attached Components");
 
         if (made) {
@@ -1466,6 +1461,20 @@ void UObjectHook::on_draw_ui() {
         }
     }
 
+    const auto made2 = m_camera_attach.object != nullptr && ImGui::TreeNode("Attached Camera Object");
+
+    if (made2) {
+        if (ImGui::Button("Detach Camera")) {
+            m_camera_attach.object = nullptr;
+            m_camera_attach.offset = glm::vec3{0.0f, 0.0f, 0.0f};
+            m_persistent_camera_state.reset();
+        }
+
+        ui_handle_object(m_camera_attach.object);
+
+        ImGui::TreePop();
+    }
+
     if (m_overlap_detection_actor == nullptr) {
         if (ImGui::Button("Spawn Overlapper")) {
             spawn_overlapper(0);
@@ -1979,6 +1988,7 @@ void UObjectHook::ui_handle_scene_component(sdk::USceneComponent* comp) {
             if (ImGui::Button("Detach")) {
                 m_camera_attach.object = nullptr;
                 m_camera_attach.offset = glm::vec3{0.0f, 0.0f, 0.0f};
+                m_persistent_camera_state.reset();
             }
 
             ImGui::SameLine();
@@ -2140,6 +2150,7 @@ void UObjectHook::ui_handle_actor(sdk::UObject* object) {
         if (ImGui::Button("Detach")) {
             m_camera_attach.object = nullptr;
             m_camera_attach.offset = glm::vec3{0.0f, 0.0f, 0.0f};
+            m_persistent_camera_state.reset();
         }
 
         if (ImGui::Button("Save state")) {

diff --git a/src/mods/UObjectHook.hpp b/src/mods/UObjectHook.hpp
@@ -314,5 +314,17 @@ class UObjectHook : public Mod {
     std::vector<std::shared_ptr<PersistentState>> m_persistent_states{};
     std::vector<std::shared_ptr<PersistentProperties>> m_persistent_properties{};
 
+    void reload_persistent_states() {
+        m_persistent_states = deserialize_all_mc_states();
+        m_persistent_camera_state = deserialize_camera_state();
+        m_persistent_properties = deserialize_all_persistent_properties();
+    }
+
+    void reset_persistent_states() {
+        m_persistent_states.clear();
+        m_persistent_properties.clear();
+        m_persistent_camera_state.reset();
+    }
+
     std::vector<std::shared_ptr<PersistentProperties>> deserialize_all_persistent_properties() const;
 };