Bring back advanced fps counter

Author: FrozenAlex

assets/SettingsView.bsml

@@ -20,7 +20,7 @@
 				<increment-setting id="shockwaveParticlesCountElement" text='Shockwave particles' value="shockwaveParticlesValue" bind-value="true" apply-on-change="true" increment="1" min="0" max="3" hover-hint="Max Shockwave Particles &lt;br> (distortions on impact)" on-change="UpdateGraphicsSettings" />
 				<bool-setting id="burnMarksSetting" text='Burn marks' value="burnMarksValue"  bind-value="true" apply-on-change="true" on-change="UpdateGraphicsSettings" hover-hint="Allows you to see cuts in the platform you stand on" />
 				<bool-setting text='FPS Counter' value="FPSCounterValue"  bind-value="true" apply-on-change="true" on-change="UpdateGraphicsSettings" hover-hint="Minimal FPS counter pinned next to the standing platform" />
-				<!-- <bool-setting text='Advanced FPS Counter' value="FPSCounterAdvancedValue" bind-value="true" apply-on-change="true" on-change="UpdateGraphicsSettings" hover-hint="FPS counter with more information for debugging frame times. &lt;br> Not recommended to keep it on, as it can cause more crashes and could reduce your overall performance" /> -->
+				<bool-setting text='Advanced FPS Counter' value="FPSCounterAdvancedValue" bind-value="true" apply-on-change="true" on-change="UpdateGraphicsSettings" hover-hint="FPS counter with more information for debugging frame times. &lt;br> Not recommended to keep it on, as it can cause more crashes and could reduce your overall performance" />
 				<list-setting value="colorSpaceValue" bind-value="true" apply-on-change="true" text='Color Space' choices="colorSpaceOptions" on-change="UpdateGraphicsSettings" />
 				<!-- <bool-setting id="screenDistortionSetting" text='Passthrough' value="screenDistortionValue"  active="false" bind-value="true" apply-on-change="true" hover-hint="This feature requires patching BeatSaber with passthrough support" on-change="UpdateGraphicsSettings" /> -->
 			</vertical>

include/GraphicsTweaksConfig.hpp

@@ -19,7 +19,7 @@ DECLARE_CONFIG(GraphicsTweaksConfig) {
     CONFIG_VALUE(FpsCounterAdvanced, bool, "FpsCounterAdvanced", false);
     CONFIG_VALUE(MenuFoveatedRenderingLevel, int, "MenuFoveatedRenderingLevel", 0);
     CONFIG_VALUE(InGameFoveatedRenderingLevel, int, "InGameFoveatedRenderingLevel", 4);
-    CONFIG_VALUE(ColorSpace, int, "ColorSpace", 6);
+    CONFIG_VALUE(ColorSpace, int, "ColorSpace", 6); // 0 = Unknown, 1 = Unmanaged, 2 = Rec_2020, 3 = Rec_709, 4 = Rift_CV1, 5 = Rift_S, 6 = Quest, 7 = P3, 8 = Adobe_RGB
     CONFIG_VALUE(CpuPerfLevel, int, "CpuPerfLevel", 1); // 0 = Low, 1 = SustainedLow, 2 = SustainedHigh
     CONFIG_VALUE(GpuPerfLevel, int, "GpuPerfLevel", 2); // 0 = Low, 1 = SustainedLow, 2 = SustainedHigh
     CONFIG_VALUE(Burnmarks, bool, "Burnmarks", false);

scripts/start-logging.ps1

@@ -38,7 +38,7 @@ $command = "adb logcat "
 
 # if ($all -eq $false) {
     $loops = 0
-    while ([string]::IsNullOrEmpty($bspid) -and $loops -lt 3) {
+    while ([string]::IsNullOrEmpty($bspid) -and $loops -lt 6) {
         Start-Sleep -Milliseconds 100
         $bspid = adb shell pidof com.beatgames.beatsaber
         $loops += 1

src/main.cpp

@@ -48,6 +48,7 @@
 #include "GlobalNamespace/SettingsApplicatorSO.hpp"
 #include "BeatSaber/Settings/QualitySettings.hpp"
 #include "GraphicsTweaksConfig.hpp"
+#include "FPSCounter.hpp"
 
 #include "UnityEngine/Graphics.hpp"
 #include "PlatformDetector.hpp"
@@ -434,6 +435,12 @@ MAKE_HOOK_MATCH(GameplayCoreInstaller_InstallBindings,
 
   if (isInRender) {
     DEBUG("In render, skipping FPS counter installation");
+
+    // Disable the Advanced FPS counter if it's enabled
+    auto counter =  GraphicsTweaks::FPSCounter::counter;
+    if (counter) {
+      counter->SetActive(false);
+    }
     return;
   }
 
@@ -456,12 +463,18 @@ MAKE_HOOK_MATCH(MainFlowCoordinator_DidActivate,
   DEBUG("MainFlowCoordinator_DidActivate");
 
   // Do not load the FPS counter if it's not needed
-  // if (getGraphicsTweaksConfig().FpsCounterAdvanced.GetValue() &&
-  //     !GraphicsTweaks::FPSCounter::counter) {
-  //   // Load the FPS counter
-  //   self->StartCoroutine(custom_types::Helpers::CoroutineHelper::New(
-  //       GraphicsTweaks::FPSCounter::LoadBund()));
-  // }
+  if (getGraphicsTweaksConfig().FpsCounterAdvanced.GetValue() &&
+      !GraphicsTweaks::FPSCounter::counter) {
+    // Load the FPS counter
+    self->StartCoroutine(custom_types::Helpers::CoroutineHelper::New(
+        GraphicsTweaks::FPSCounter::LoadBund()));
+  }
+
+  // If the FPS counter is loaded, set its active state
+  if (GraphicsTweaks::FPSCounter::counter) {
+    GraphicsTweaks::FPSCounter::counter->SetActive(
+        getGraphicsTweaksConfig().FpsCounterAdvanced.GetValue());
+  }
 }
 
 // Called later on in the game loading - a good time to install function hooks

src/ui/SettingsView.cpp

@@ -507,14 +507,14 @@ void GraphicsTweaks::UI::SettingsView::set_FPSCounterAdvancedValue(bool value) {
     getGraphicsTweaksConfig().FpsCounterAdvanced.SetValue(value, instantlySave);
 
     // Load the FPS counter if it's not loaded 
-    // if (value && !FPSCounter::counter) {
-    //     BSML::SharedCoroutineStarter::get_instance()->StartCoroutine(custom_types::Helpers::CoroutineHelper::New(FPSCounter::LoadBund()));
-    // }
-
-    // // If the counter is not loaded, it will set the active state when it's loaded, otherwise set it now
-    // if (FPSCounter::counter) {
-    //     FPSCounter::counter->SetActive(value);
-    // }
+    if (value && !FPSCounter::counter) {
+        BSML::SharedCoroutineStarter::get_instance()->StartCoroutine(custom_types::Helpers::CoroutineHelper::New(FPSCounter::LoadBund()));
+    }
+
+    // If the counter is not loaded, it will set the active state when it's loaded, otherwise set it now
+    if (FPSCounter::counter) {
+        FPSCounter::counter->SetActive(value);
+    }
 }
 
 // colorSpaceValue