From 9d6f5961c1031923f6cc16b913a29ac08f36693e Mon Sep 17 00:00:00 2001 From: loloppe Date: Sat, 31 Aug 2024 20:05:25 -0400 Subject: [PATCH] 1.37.3 --- Camera2.csproj | 500 ++++++++++++-------------- HarmonyPatches/HookRoomAdjust.cs | 9 +- HarmonyPatches/InitOnMainAvailable.cs | 7 +- manifest.json | 2 +- 4 files changed, 241 insertions(+), 277 deletions(-) diff --git a/Camera2.csproj b/Camera2.csproj index 6eaff7a..e38aace 100644 --- a/Camera2.csproj +++ b/Camera2.csproj @@ -1,268 +1,236 @@  - - - net472 - Library - 8 - false - Camera2 - ..\Refs - $(LocalRefsDir) - $(MSBuildProjectDirectory)\ - disable - Camera2 - - Kinsi55 - Kinsi55 - - https://github.com/kinsi55/CS_BeatSaber_Camera2 - - x64 - true - false - Debug;Release;Dev - - - - - - TRACE;DEBUG - true - portable - bin\Debug - - - - TRACE;DEBUG;DEV - - - - none - bin\ - - - - True - - - - True - True - - - - - - - - - - - - - - - $(BeatSaberDir)\Libs\0Harmony.dll - - - - False - $(BeatSaberDir)\Beat Saber_Data\Managed\BeatmapCore.dll - - - - $(BeatSaberDir)\Beat Saber_Data\Managed\BeatSaber.GameSettings.dll - - - $(BeatSaberDir)\Beat Saber_Data\Managed\BeatSaber.PerformancePresets.dll - - - $(BeatSaberDir)\Beat Saber_Data\Managed\BGLib.AppFlow.dll - False - - - $(BeatSaberDir)\Beat Saber_Data\Managed\BGLib.SaveDataCore.dll - - - $(BeatSaberDir)\Beat Saber_Data\Managed\BGLib.UnityExtension.dll - False - - - $(BeatSaberDir)\Beat Saber_Data\Managed\BGNetCore.dll - False - False - - - $(BeatSaberDir)\Beat Saber_Data\Managed\Colors.dll - False - False - - - $(BeatSaberDir)\Beat Saber_Data\Managed\DataModels.dll - False - False - - - $(BeatSaberDir)\Beat Saber_Data\Managed\MediaLoader.dll - False - False - - - $(BeatSaberDir)\Plugins\BSML.dll - - - - $(BeatSaberDir)\Beat Saber_Data\Managed\GameplayCore.dll - - - - $(BeatSaberDir)\Libs\Hive.Versioning.dll - - - $(BeatSaberDir)\Beat Saber_Data\Managed\HMRendering.dll - - - - - $(BeatSaberDir)\Libs\Newtonsoft.Json.dll - - - - $(BeatSaberDir)\Beat Saber_Data\Managed\Oculus.VR.dll - - - - $(BeatSaberDir)\Beat Saber_Data\Managed\Rendering.dll - - - - $(BeatSaberDir)\Libs\SemVer.dll - - - $(BeatSaberDir)\Plugins\SongCore.dll - - - - - - - - $(BeatSaberDir)\Beat Saber_Data\Managed\Main.dll - - - - $(BeatSaberDir)\Beat Saber_Data\Managed\HMLib.dll - - - - $(BeatSaberDir)\Beat Saber_Data\Managed\HMUI.dll - - - - $(BeatSaberDir)\Beat Saber_Data\Managed\IPA.Loader.dll - - - - $(BeatSaberDir)\Beat Saber_Data\Managed\Unity.TextMeshPro.dll - - - - $(BeatSaberDir)\Beat Saber_Data\Managed\UnityEngine.dll - - - - $(BeatSaberDir)\Beat Saber_Data\Managed\UnityEngine.AssetBundleModule.dll - - - - $(BeatSaberDir)\Beat Saber_Data\Managed\UnityEngine.CoreModule.dll - - - - $(BeatSaberDir)\Beat Saber_Data\Managed\UnityEngine.InputLegacyModule.dll - - - - $(BeatSaberDir)\Beat Saber_Data\Managed\UnityEngine.PhysicsModule.dll - - - - $(BeatSaberDir)\Beat Saber_Data\Managed\UnityEngine.ScreenCaptureModule.dll - - - $(BeatSaberDir)\Beat Saber_Data\Managed\UnityEngine.SubsystemsModule.dll - - - $(BeatSaberDir)\Beat Saber_Data\Managed\UnityEngine.UI.dll - - - - $(BeatSaberDir)\Beat Saber_Data\Managed\UnityEngine.UIElementsModule.dll - - - - $(BeatSaberDir)\Beat Saber_Data\Managed\UnityEngine.UIModule.dll - - - - $(BeatSaberDir)\Beat Saber_Data\Managed\UnityEngine.VRModule.dll - - - - $(BeatSaberDir)\Beat Saber_Data\Managed\UnityEngine.XRModule.dll - - - $(BeatSaberDir)\Beat Saber_Data\Managed\VRUI.dll - - - - - - - - - - - - - - - - - - - - - all - build; native; contentfiles; analyzers; buildtransitive - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - - - - - - - - - - - - - - - - - - - - + + net472 + Library + 8 + false + Camera2 + ..\Refs + $(LocalRefsDir) + $(MSBuildProjectDirectory)\ + disable + Camera2 + + Kinsi55 + Kinsi55 + + https://github.com/kinsi55/CS_BeatSaber_Camera2 + + x64 + true + false + Debug;Release;Dev + + + + TRACE;DEBUG + true + portable + bin\Debug + + + TRACE;DEBUG;DEV + + + none + bin\ + + + True + + + True + True + + + + + + + + + + + + $(BeatSaberDir)\Libs\0Harmony.dll + + + False + $(BeatSaberDir)\Beat Saber_Data\Managed\BeatmapCore.dll + + + $(BeatSaberDir)\Beat Saber_Data\Managed\BeatSaber.Settings.dll + + + $(BeatSaberDir)\Beat Saber_Data\Managed\BGLib.AppFlow.dll + False + + + $(BeatSaberDir)\Beat Saber_Data\Managed\BGLib.SaveDataCore.dll + + + $(BeatSaberDir)\Beat Saber_Data\Managed\BGLib.UnityExtension.dll + False + + + $(BeatSaberDir)\Beat Saber_Data\Managed\BGNetCore.dll + False + False + + + $(BeatSaberDir)\Beat Saber_Data\Managed\Colors.dll + False + False + + + $(BeatSaberDir)\Beat Saber_Data\Managed\DataModels.dll + False + False + + + $(BeatSaberDir)\Beat Saber_Data\Managed\MediaLoader.dll + False + False + + + $(BeatSaberDir)\Plugins\BSML.dll + + + $(BeatSaberDir)\Beat Saber_Data\Managed\GameplayCore.dll + + + $(BeatSaberDir)\Libs\Hive.Versioning.dll + + + $(BeatSaberDir)\Beat Saber_Data\Managed\HMRendering.dll + + + + + $(BeatSaberDir)\Libs\Newtonsoft.Json.dll + + + $(BeatSaberDir)\Beat Saber_Data\Managed\Oculus.VR.dll + + + $(BeatSaberDir)\Beat Saber_Data\Managed\Rendering.dll + + + $(BeatSaberDir)\Libs\SemVer.dll + + + $(BeatSaberDir)\Plugins\SongCore.dll + + + + + + + + + + + $(BeatSaberDir)\Beat Saber_Data\Managed\Main.dll + + + $(BeatSaberDir)\Beat Saber_Data\Managed\HMLib.dll + + + $(BeatSaberDir)\Beat Saber_Data\Managed\HMUI.dll + + + $(BeatSaberDir)\Beat Saber_Data\Managed\IPA.Loader.dll + + + $(BeatSaberDir)\Beat Saber_Data\Managed\Unity.Mathematics.dll + + + $(BeatSaberDir)\Beat Saber_Data\Managed\Unity.TextMeshPro.dll + + + $(BeatSaberDir)\Beat Saber_Data\Managed\UnityEngine.dll + + + $(BeatSaberDir)\Beat Saber_Data\Managed\UnityEngine.AssetBundleModule.dll + + + $(BeatSaberDir)\Beat Saber_Data\Managed\UnityEngine.CoreModule.dll + + + $(BeatSaberDir)\Beat Saber_Data\Managed\UnityEngine.InputLegacyModule.dll + + + $(BeatSaberDir)\Beat Saber_Data\Managed\UnityEngine.PhysicsModule.dll + + + $(BeatSaberDir)\Beat Saber_Data\Managed\UnityEngine.ScreenCaptureModule.dll + + + $(BeatSaberDir)\Beat Saber_Data\Managed\UnityEngine.SubsystemsModule.dll + + + $(BeatSaberDir)\Beat Saber_Data\Managed\UnityEngine.UI.dll + + + $(BeatSaberDir)\Beat Saber_Data\Managed\UnityEngine.UIElementsModule.dll + + + $(BeatSaberDir)\Beat Saber_Data\Managed\UnityEngine.UIModule.dll + + + $(BeatSaberDir)\Beat Saber_Data\Managed\UnityEngine.VRModule.dll + + + $(BeatSaberDir)\Beat Saber_Data\Managed\UnityEngine.XRModule.dll + + + $(BeatSaberDir)\Beat Saber_Data\Managed\VRUI.dll + + + + + + + + + + + + + + + + + all + build; native; contentfiles; analyzers; buildtransitive + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/HarmonyPatches/HookRoomAdjust.cs b/HarmonyPatches/HookRoomAdjust.cs index c0c4095..be34862 100644 --- a/HarmonyPatches/HookRoomAdjust.cs +++ b/HarmonyPatches/HookRoomAdjust.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.Reflection; using UnityEngine; -using BeatSaber.GameSettings; namespace Camera2.HarmonyPatches { [HarmonyPatch] @@ -17,10 +16,10 @@ static class HookRoomAdjust { [HarmonyPatch(typeof(VRCenterAdjust), nameof(VRCenterAdjust.Start))] [HarmonyPatch(typeof(VRCenterAdjust), nameof(VRCenterAdjust.SetRoomTransformOffset))] [HarmonyPatch(typeof(VRCenterAdjust), nameof(VRCenterAdjust.ResetRoom))] - static void Postfix(MainSettingsHandler ____mainSettingsHandler, MethodBase __originalMethod) { - if(____mainSettingsHandler != null) { - position = ____mainSettingsHandler.instance.roomCenter; - eulerAngles = new Vector3(0, ____mainSettingsHandler.instance.roomRotation, 0); + static void Postfix(SettingsManager ____settingsManager, MethodBase __originalMethod) { + if(____settingsManager != null) { + position = ____settingsManager.settings.room.center; + eulerAngles = new Vector3(0, ____settingsManager.settings.room.rotation, 0); } else { position = Vector3.zero; eulerAngles = Vector3.zero; diff --git a/HarmonyPatches/InitOnMainAvailable.cs b/HarmonyPatches/InitOnMainAvailable.cs index 6003fa1..e88dd7c 100644 --- a/HarmonyPatches/InitOnMainAvailable.cs +++ b/HarmonyPatches/InitOnMainAvailable.cs @@ -2,7 +2,6 @@ using HarmonyLib; using UnityEngine; using System.Linq; -using BeatSaber.GameSettings; using Camera2.Utils; namespace Camera2.HarmonyPatches { @@ -12,10 +11,8 @@ static class InitOnMainAvailable { public static bool useDepthTexture { get; private set; } static void Postfix(SmoothCameraController __instance) { if(!isInited) { - useDepthTexture = false; - - if(SceneUtil.GetMainCameraButReally().GetComponent()._handler.TryGetCurrentPerformancePreset(out var pp)) - useDepthTexture = pp.smokeGraphics; // TODO: Change to .depthTexture when they fixed that its true even with smoke off + // IDK + useDepthTexture = SceneUtil.GetMainCameraButReally().GetComponent()._settingsManager.settings.quality.smokeGraphics; if(CamManager.baseCullingMask == 0) CamManager.baseCullingMask = Camera.main.cullingMask; diff --git a/manifest.json b/manifest.json index a75cf3b..082659c 100644 --- a/manifest.json +++ b/manifest.json @@ -5,7 +5,7 @@ "author": "Kinsi55", "version": "0.6.111", "description": "If Camera Plus is so good, why is there no Camera Plus 2?", - "gameVersion": "1.36.2", + "gameVersion": "1.37.3", "dependsOn": { "BSIPA": "^4.1.4", "BeatSaberMarkupLanguage": "^1.4.5"