Merge branch 'master' of https://github.com/kinsi55/CS_BeatSaber_Camera2

kinsi55 · Oct 10, 2024 · 6d2e8c4 · 6d2e8c4
2 parents 92c841d + a58f9c6
commit 6d2e8c4
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/Behaviours/Cam.cs b/Behaviours/Cam.cs
@@ -103,7 +103,7 @@ internal void ShowWorldCamIfNecessary() {
 
 		internal void UpdateDepthTextureActive() {
 			if(UCamera != null)
-				UCamera.depthTextureMode = InitOnMainAvailable.useDepthTexture || settings?.PostProcessing.forceDepthTexture == true ? DepthTextureMode.Depth : DepthTextureMode.None;
+				UCamera.depthTextureMode = HookSettingsManager.useDepthTexture || settings?.PostProcessing.forceDepthTexture == true ? DepthTextureMode.Depth : DepthTextureMode.None;
 		}
 
 		static readonly HashSet<string> CameraBehavioursToDestroy = new HashSet<string>() { 

diff --git a/HarmonyPatches/HookSettingsManager.cs b/HarmonyPatches/HookSettingsManager.cs
@@ -0,0 +1,13 @@
+using HarmonyLib;
+
+namespace Camera2.HarmonyPatches {
+	[HarmonyPatch(typeof(DepthTextureController), nameof(DepthTextureController.Init))]
+	static class HookSettingsManager {
+		public static SettingsManager settingsManager { get; private set; }
+		public static bool useDepthTexture { get; private set; }
+		static void Postfix(SettingsManager settingsManager) {
+			HookSettingsManager.settingsManager = settingsManager;
+			useDepthTexture = settingsManager.settings.quality.smokeGraphics;
+		}
+	}
+}
diff --git a/HarmonyPatches/InitOnMainAvailable.cs b/HarmonyPatches/InitOnMainAvailable.cs
@@ -8,12 +8,8 @@ namespace Camera2.HarmonyPatches {
 	[HarmonyPatch(typeof(SmoothCameraController), nameof(SmoothCameraController.ActivateSmoothCameraIfNeeded))]
 	static class InitOnMainAvailable {
 		static bool isInited = false;
-		public static bool useDepthTexture { get; private set; }
 		static void Postfix(SmoothCameraController __instance) {
 			if(!isInited) {
-				// IDK
-				useDepthTexture = SceneUtil.GetMainCameraButReally().GetComponent<DepthTextureController>()._settingsManager.settings.quality.smokeGraphics;
-
 				if(CamManager.baseCullingMask == 0)
 					CamManager.baseCullingMask = Camera.main.cullingMask;