Update colors when changing qounters color scheme

Author: kodenamekrak

include/ColorManager.hpp

@@ -1,8 +1,15 @@
+#pragma once
+
+#include "UnityEngine/Color.hpp"
+
 namespace QonsistentSaberColors {
+
+    UnityEngine::Color get_LeftColor();
+    UnityEngine::Color get_RightColor();
 
     void UpdatePointers();
 
-    void UpdateControllerColors();
+    void UpdateControllerColors(const UnityEngine::Color& leftColor = get_LeftColor(), const UnityEngine::Color& rightColor = get_RightColor());
 
-    void UpdateLaserColor();
+    void UpdateLaserColor(const UnityEngine::Color& leftColor = get_LeftColor(), const UnityEngine::Color& rightColor = get_RightColor());
 }

src/ColorManager.cpp

@@ -51,13 +51,13 @@ namespace QonsistentSaberColors {
         return colorSchemesSettings->GetSelectedColorScheme()->saberBColor;
     }
 
-    UnityEngine::Color get_LaserColor()
+    UnityEngine::Color get_LaserColor(const UnityEngine::Color& leftColor = get_LeftColor(), const UnityEngine::Color& rightColor = get_RightColor())
     {
         if(!inputModule || !getModConfig().Enabled.GetValue() || !getModConfig().ColoredLasers.GetValue())
             return defaultLaserColor;
 
         auto parent = inputModule->_vrPointer->_laserPointer->transform->parent->parent->name;
-        return parent == "ControllerLeft" ? get_LeftColor() : get_RightColor();
+        return parent == "ControllerLeft" ? leftColor : rightColor;
     }
 
     void UpdatePointers()
@@ -102,21 +102,21 @@ namespace QonsistentSaberColors {
         }
     }
 
-    void UpdateControllerColors()
+    void UpdateControllerColors(const UnityEngine::Color& leftColor, const UnityEngine::Color& rightColor)
     {
         if(!inputModule || !colorSchemesSettings)
             return;
 
-        SetControllerColor(inputModule->_vrPointer->_leftVRController, get_LeftColor());
-        SetControllerColor(inputModule->_vrPointer->_rightVRController, get_RightColor());
+        SetControllerColor(inputModule->_vrPointer->_leftVRController, leftColor);
+        SetControllerColor(inputModule->_vrPointer->_rightVRController, rightColor);
     }
 
-    void UpdateLaserColor()
+    void UpdateLaserColor(const UnityEngine::Color& leftColor, const UnityEngine::Color& rightColor)
     {
         if(!inputModule)
             return;
 
-        UnityEngine::Color color = get_LaserColor();
+        UnityEngine::Color color = get_LaserColor(leftColor, rightColor);
         color.a = 0;
 
         SetLaserColor(inputModule->_vrPointer->_laserPointer, color);

src/main.cpp

@@ -6,6 +6,8 @@
 #include "GlobalNamespace/MainMenuViewController.hpp"
 #include "GlobalNamespace/ColorsOverrideSettingsPanelController.hpp"
 #include "GlobalNamespace/MenuEnvironmentManager.hpp"
+#include "GlobalNamespace/EnvironmentColorManager.hpp"
+#include "GlobalNamespace/ColorScheme.hpp"
 
 #include "VRUIControls/VRPointer.hpp"
 
@@ -15,16 +17,22 @@ static modloader::ModInfo modInfo {MOD_ID, VERSION, 0};
 
 using namespace QonsistentSaberColors;
 
-inline void UpdateColors()
+inline void UpdateColors(const UnityEngine::Color& leftColor = get_LeftColor(), const UnityEngine::Color& rightColor = get_RightColor())
 {
     if(getModConfig().Enabled.GetValue())
     {
-        UpdateControllerColors();
+        UpdateControllerColors(leftColor, rightColor);
         if(getModConfig().ColoredLasers.GetValue())
-            UpdateLaserColor();
+            UpdateLaserColor(leftColor, rightColor);
     }
 }
 
+MAKE_HOOK_MATCH(EnvironmentColorManager_InitColors, &GlobalNamespace::EnvironmentColorManager::InitColors, void, GlobalNamespace::EnvironmentColorManager* self)
+{
+    EnvironmentColorManager_InitColors(self);
+    UpdateColors(self->_colorScheme->get_saberAColor(), self->_colorScheme->get_saberBColor());
+}
+
 MAKE_HOOK_MATCH(VRPointer_CreateLaserPointerAndLaserHit, &VRUIControls::VRPointer::RefreshLaserPointerAndLaserHit, void, VRUIControls::VRPointer* self, UnityEngine::EventSystems::PointerEventData* pointerData)
 {
     VRPointer_CreateLaserPointerAndLaserHit(self, pointerData);
@@ -82,6 +90,7 @@ MOD_EXPORT void late_load() {
     BSML::Register::RegisterMainMenu<QonsistentSaberColors::SettingsViewController*>("QonsistentSaberColors", "QonsistentSaberColors", "QonsistentSaberColors mod settings");
 
     INFO("Installing hooks...");
+    INSTALL_HOOK(Logger, EnvironmentColorManager_InitColors);
     INSTALL_HOOK(Logger, VRPointer_CreateLaserPointerAndLaserHit);
     INSTALL_HOOK(Logger, MainMenuViewController_DidActivate);
     INSTALL_HOOK(Logger, ColorsOverrideSettingsPanelController_HandleOverrideColorsToggleValueChanged);