From dcde01c2a9a5ef66411cc679ff2f4b6a874a8aff Mon Sep 17 00:00:00 2001 From: NotAKidoS <37721153+NotAKidOnSteam@users.noreply.github.com> Date: Sat, 18 Feb 2023 09:49:38 -0600 Subject: [PATCH] ocd --- DesktopVRSwitch/DesktopVRSwitch.cs | 22 +++++++++---------- .../Patches/CVRPickupObjectTracker.cs | 2 +- .../Patches/CameraFacingObjectTracker.cs | 2 +- DesktopVRSwitch/Patches/IKSystemTracker.cs | 4 ++-- .../Patches/MovementSystemTracker.cs | 6 ++--- .../Patches/VRModeSwitchTracker.cs | 12 +++++----- .../Patches/VRTrackerManagerTracker.cs | 2 +- DesktopVRSwitch/Properties/AssemblyInfo.cs | 2 +- DesktopVRSwitch/TryCatchHell.cs | 1 - 9 files changed, 26 insertions(+), 27 deletions(-) diff --git a/DesktopVRSwitch/DesktopVRSwitch.cs b/DesktopVRSwitch/DesktopVRSwitch.cs index aca9c01..736bf0d 100644 --- a/DesktopVRSwitch/DesktopVRSwitch.cs +++ b/DesktopVRSwitch/DesktopVRSwitch.cs @@ -89,40 +89,40 @@ public class DesktopVRSwitch : MonoBehaviour } //one frame after switch attempt - public void FailedVRModeSwitch(bool enterVR) + public void FailedVRModeSwitch(bool isVR) { //let tracked objects know a switch failed - VRModeSwitchTracker.FailVRModeSwitch(enterVR); + VRModeSwitchTracker.FailVRModeSwitch(isVR); } //one frame before switch attempt - public void PreVRModeSwitch(bool enterVR) + public void PreVRModeSwitch(bool isVR) { //let tracked objects know we are attempting to switch - VRModeSwitchTracker.PreVRModeSwitch(enterVR); + VRModeSwitchTracker.PreVRModeSwitch(isVR); } //one frame after switch attempt - public void PostVRModeSwitch(bool enterVR) + public void PostVRModeSwitch(bool isVR) { //close the menus TryCatchHell.CloseCohtmlMenus(); //the base of VR checks - TryCatchHell.SetCheckVR(enterVR); - TryCatchHell.SetMetaPort(enterVR); + TryCatchHell.SetCheckVR(isVR); + TryCatchHell.SetMetaPort(isVR); //game basics for functional gameplay post switch - TryCatchHell.RepositionCohtmlHud(enterVR); - TryCatchHell.UpdateHudOperations(enterVR); + TryCatchHell.RepositionCohtmlHud(isVR); + TryCatchHell.UpdateHudOperations(isVR); TryCatchHell.DisableMirrorCanvas(); - TryCatchHell.SwitchActiveCameraRigs(enterVR); + TryCatchHell.SwitchActiveCameraRigs(isVR); TryCatchHell.ResetCVRInputManager(); TryCatchHell.UpdateRichPresence(); TryCatchHell.UpdateGestureReconizerCam(); //let tracked objects know we switched - VRModeSwitchTracker.PostVRModeSwitch(enterVR); + VRModeSwitchTracker.PostVRModeSwitch(isVR); //reload avatar by default, optional for debugging if (_reloadLocalAvatar) diff --git a/DesktopVRSwitch/Patches/CVRPickupObjectTracker.cs b/DesktopVRSwitch/Patches/CVRPickupObjectTracker.cs index 3f73d51..20cb1c6 100644 --- a/DesktopVRSwitch/Patches/CVRPickupObjectTracker.cs +++ b/DesktopVRSwitch/Patches/CVRPickupObjectTracker.cs @@ -20,7 +20,7 @@ public class CVRPickupObjectTracker : MonoBehaviour VRModeSwitchTracker.OnPostVRModeSwitch -= PostVRModeSwitch; } - public void PostVRModeSwitch(bool enterVR, Camera activeCamera) + public void PostVRModeSwitch(bool isVR, Camera activeCamera) { if (pickupObject != null) { diff --git a/DesktopVRSwitch/Patches/CameraFacingObjectTracker.cs b/DesktopVRSwitch/Patches/CameraFacingObjectTracker.cs index 918e925..e3d59ca 100644 --- a/DesktopVRSwitch/Patches/CameraFacingObjectTracker.cs +++ b/DesktopVRSwitch/Patches/CameraFacingObjectTracker.cs @@ -17,7 +17,7 @@ public class CameraFacingObjectTracker : MonoBehaviour VRModeSwitchTracker.OnPostVRModeSwitch -= PostVRModeSwitch; } - public void PostVRModeSwitch(bool enterVR, Camera activeCamera) + public void PostVRModeSwitch(bool isVR, Camera activeCamera) { cameraFacingObject.m_Camera = activeCamera; } diff --git a/DesktopVRSwitch/Patches/IKSystemTracker.cs b/DesktopVRSwitch/Patches/IKSystemTracker.cs index 7258a41..a8b9a22 100644 --- a/DesktopVRSwitch/Patches/IKSystemTracker.cs +++ b/DesktopVRSwitch/Patches/IKSystemTracker.cs @@ -22,13 +22,13 @@ public class IKSystemTracker : MonoBehaviour VRModeSwitchTracker.OnPostVRModeSwitch -= PostVRModeSwitch; } - public void PostVRModeSwitch(bool enterVR, Camera activeCamera) + public void PostVRModeSwitch(bool isVR, Camera activeCamera) { var _trackingModules = _traverseModules.GetValue>(); SteamVRTrackingModule openVRTrackingModule = _trackingModules.FirstOrDefault(m => m is SteamVRTrackingModule) as SteamVRTrackingModule; if (openVRTrackingModule != null) { - if (enterVR) + if (isVR) { openVRTrackingModule.ModuleStart(); } diff --git a/DesktopVRSwitch/Patches/MovementSystemTracker.cs b/DesktopVRSwitch/Patches/MovementSystemTracker.cs index a54c07d..b20e249 100644 --- a/DesktopVRSwitch/Patches/MovementSystemTracker.cs +++ b/DesktopVRSwitch/Patches/MovementSystemTracker.cs @@ -22,7 +22,7 @@ public class MovementSystemTracker : MonoBehaviour VRModeSwitchTracker.OnPostVRModeSwitch -= PostVRModeSwitch; } - public void PreVRModeSwitch(bool enterVR, Camera activeCamera) + public void PreVRModeSwitch(bool isVR, Camera activeCamera) { //correct rotationPivot y position, so we dont teleport up/down Vector3 position = movementSystem.rotationPivot.transform.position; @@ -36,11 +36,11 @@ public class MovementSystemTracker : MonoBehaviour //so the user can still switch even if avatar is null (if it failed to load for example). } - public void PostVRModeSwitch(bool enterVR, Camera activeCamera) + public void PostVRModeSwitch(bool isVR, Camera activeCamera) { //lazy way of correcting Desktop & VR offset issue (game does the maths) movementSystem.TeleportToPosRot(preSwitchWorldPosition, preSwitchWorldRotation, false); //recenter desktop collision to player object - if (!enterVR) movementSystem.UpdateColliderCenter(movementSystem.transform.position); + if (!isVR) movementSystem.UpdateColliderCenter(movementSystem.transform.position); } } \ No newline at end of file diff --git a/DesktopVRSwitch/Patches/VRModeSwitchTracker.cs b/DesktopVRSwitch/Patches/VRModeSwitchTracker.cs index 4e4bd4e..a1a78d9 100644 --- a/DesktopVRSwitch/Patches/VRModeSwitchTracker.cs +++ b/DesktopVRSwitch/Patches/VRModeSwitchTracker.cs @@ -10,35 +10,35 @@ public class VRModeSwitchTracker public static event UnityAction OnPostVRModeSwitch; public static event UnityAction OnFailVRModeSwitch; - public static void PreVRModeSwitch(bool enterVR) + public static void PreVRModeSwitch(bool isVR) { TryCatchHell.TryCatchWrapper(() => { DesktopVRSwitchMod.Logger.Msg("Invoking VRModeSwitchTracker.OnPreVRModeSwitch."); Camera activeCamera = PlayerSetup.Instance.GetActiveCamera().GetComponent(); - VRModeSwitchTracker.OnPreVRModeSwitch?.Invoke(enterVR, activeCamera); + VRModeSwitchTracker.OnPreVRModeSwitch?.Invoke(isVR, activeCamera); }, "Error while invoking VRModeSwitchTracker.OnPreVRModeSwitch. Did someone do a fucky?"); } - public static void PostVRModeSwitch(bool enterVR) + public static void PostVRModeSwitch(bool isVR) { TryCatchHell.TryCatchWrapper(() => { DesktopVRSwitchMod.Logger.Msg("Invoking VRModeSwitchTracker.OnPostVRModeSwitch."); Camera activeCamera = PlayerSetup.Instance.GetActiveCamera().GetComponent(); - VRModeSwitchTracker.OnPostVRModeSwitch?.Invoke(enterVR, activeCamera); + VRModeSwitchTracker.OnPostVRModeSwitch?.Invoke(isVR, activeCamera); }, "Error while invoking VRModeSwitchTracker.OnPostVRModeSwitch. Did someone do a fucky?"); } - public static void FailVRModeSwitch(bool enterVR) + public static void FailVRModeSwitch(bool isVR) { TryCatchHell.TryCatchWrapper(() => { DesktopVRSwitchMod.Logger.Msg("Invoking VRModeSwitchTracker.OnFailVRModeSwitch."); Camera activeCamera = PlayerSetup.Instance.GetActiveCamera().GetComponent(); - VRModeSwitchTracker.OnFailVRModeSwitch?.Invoke(enterVR, activeCamera); + VRModeSwitchTracker.OnFailVRModeSwitch?.Invoke(isVR, activeCamera); }, "Error while invoking OnFailVRModeSwitch.OnPreVRModeSwitch. Did someone do a fucky?"); } diff --git a/DesktopVRSwitch/Patches/VRTrackerManagerTracker.cs b/DesktopVRSwitch/Patches/VRTrackerManagerTracker.cs index 8ef5e50..f19d579 100644 --- a/DesktopVRSwitch/Patches/VRTrackerManagerTracker.cs +++ b/DesktopVRSwitch/Patches/VRTrackerManagerTracker.cs @@ -22,7 +22,7 @@ public class VRTrackerManagerTracker : MonoBehaviour VRModeSwitchTracker.OnPostVRModeSwitch -= PostVRModeSwitch; } - public void PostVRModeSwitch(bool enterVR, Camera activeCamera) + public void PostVRModeSwitch(bool isVR, Camera activeCamera) { //force the VRTrackerManager to reset anything its stored //this makes it get correct Left/Right hand if entering VR with different controllers diff --git a/DesktopVRSwitch/Properties/AssemblyInfo.cs b/DesktopVRSwitch/Properties/AssemblyInfo.cs index dd5b9f7..91846c5 100644 --- a/DesktopVRSwitch/Properties/AssemblyInfo.cs +++ b/DesktopVRSwitch/Properties/AssemblyInfo.cs @@ -25,6 +25,6 @@ using System.Reflection; namespace NAK.Melons.DesktopVRSwitch.Properties; internal static class AssemblyInfoParams { - public const string Version = "4.3.1"; + public const string Version = "4.3.2"; public const string Author = "NotAKidoS"; } \ No newline at end of file diff --git a/DesktopVRSwitch/TryCatchHell.cs b/DesktopVRSwitch/TryCatchHell.cs index 9a1a332..effaf29 100644 --- a/DesktopVRSwitch/TryCatchHell.cs +++ b/DesktopVRSwitch/TryCatchHell.cs @@ -177,4 +177,3 @@ internal class TryCatchHell "Failed to update CVRGestureRecognizer camera."); } } -