kneesox/NAK_CVR_Mods
1
0
Fork 0
mirror of https://github.com/NotAKidoS/NAK_CVR_Mods.git synced 2025-09-02 06:19:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

tweaks

Browse source
This commit is contained in:
NotAKidoS 2023-02-18 09:30:16 -06:00
parent 23e5e9c366
commit e62efc714e
2 changed files with 38 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

43
DesktopVRSwitch/DesktopVRSwitch.cs
View file

@ -45,14 +45,11 @@ public class DesktopVRSwitch : MonoBehaviour
private IEnumerator StartVRSystem() private IEnumerator StartVRSystem()
{ {
BeforeVRModeSwitch(true);
PreVRModeSwitch(true);
XRSettings.LoadDeviceByName("OpenVR"); XRSettings.LoadDeviceByName("OpenVR");
yield return null; yield return null; //wait a frame before checking
if (string.IsNullOrEmpty(XRSettings.loadedDeviceName)) if (!string.IsNullOrEmpty(XRSettings.loadedDeviceName))
{
DesktopVRSwitchMod.Logger.Error("Initializing VR Failed. Is there no VR device connected?");
}
else
{ {
DesktopVRSwitchMod.Logger.Msg("Starting SteamVR..."); DesktopVRSwitchMod.Logger.Msg("Starting SteamVR...");
XRSettings.enabled = true; XRSettings.enabled = true;
@ -62,48 +59,60 @@ public class DesktopVRSwitch : MonoBehaviour
//which in ChilloutVR, it is, because all those settings are default //which in ChilloutVR, it is, because all those settings are default
SteamVR_Input.Initialize(true); SteamVR_Input.Initialize(true);
yield return null; yield return null;
AfterVRModeSwitch(true); PostVRModeSwitch(true);
yield break;
} }
DesktopVRSwitchMod.Logger.Error("Initializing VR Failed. Is there no VR device connected?");
FailedVRModeSwitch(true);
yield break; yield break;
} }
private IEnumerator StopVR() private IEnumerator StopVR()
{ {
BeforeVRModeSwitch(false); PreVRModeSwitch(false);
yield return null; yield return null;
if (!string.IsNullOrEmpty(XRSettings.loadedDeviceName)) if (!string.IsNullOrEmpty(XRSettings.loadedDeviceName))
{ {
//SteamVR.SafeDispose(); //might fuck with SteamVRTrackingModule
//deactivate the action set so SteamVR_Input.Initialize can reactivate //deactivate the action set so SteamVR_Input.Initialize can reactivate
SteamVR_Input.actionSets[0].Deactivate(SteamVR_Input_Sources.Any); SteamVR_Input.actionSets[0].Deactivate(SteamVR_Input_Sources.Any);
SteamVR.SafeDispose(); //idk
XRSettings.LoadDeviceByName(""); XRSettings.LoadDeviceByName("");
XRSettings.enabled = false; XRSettings.enabled = false;
yield return null; yield return null;
//reset physics time to Desktop default Time.fixedDeltaTime = 0.02f; //reset physics time to Desktop default
Time.fixedDeltaTime = 0.02f; PostVRModeSwitch(false);
AfterVRModeSwitch(false); yield break;
} }
DesktopVRSwitchMod.Logger.Error("Attempted to exit VR without a VR device loaded.");
FailedVRModeSwitch(true);
yield break; yield break;
} }
//one frame after switch attempt
public void FailedVRModeSwitch(bool enterVR)
{
//let tracked objects know a switch failed
VRModeSwitchTracker.FailVRModeSwitch(enterVR);
}
//one frame before switch attempt //one frame before switch attempt
public void BeforeVRModeSwitch(bool enterVR) public void PreVRModeSwitch(bool enterVR)
{ {
//let tracked objects know we are attempting to switch //let tracked objects know we are attempting to switch
VRModeSwitchTracker.PreVRModeSwitch(enterVR); VRModeSwitchTracker.PreVRModeSwitch(enterVR);
} }
//one frame after switch attempt //one frame after switch attempt
public void AfterVRModeSwitch(bool enterVR) public void PostVRModeSwitch(bool enterVR)
{ {
//close the menus //close the menus
TryCatchHell.CloseCohtmlMenus(); TryCatchHell.CloseCohtmlMenus();
//these two must come first //the base of VR checks
TryCatchHell.SetCheckVR(enterVR); TryCatchHell.SetCheckVR(enterVR);
TryCatchHell.SetMetaPort(enterVR); TryCatchHell.SetMetaPort(enterVR);
//the bulk of funni changes //game basics for functional gameplay post switch
TryCatchHell.RepositionCohtmlHud(enterVR); TryCatchHell.RepositionCohtmlHud(enterVR);
TryCatchHell.UpdateHudOperations(enterVR); TryCatchHell.UpdateHudOperations(enterVR);
TryCatchHell.DisableMirrorCanvas(); TryCatchHell.DisableMirrorCanvas();

12
DesktopVRSwitch/Patches/VRModeSwitchTracker.cs
View file

@ -8,6 +8,7 @@ public class VRModeSwitchTracker
{ {
public static event UnityAction<bool, Camera> OnPreVRModeSwitch; public static event UnityAction<bool, Camera> OnPreVRModeSwitch;
public static event UnityAction<bool, Camera> OnPostVRModeSwitch; public static event UnityAction<bool, Camera> OnPostVRModeSwitch;
public static event UnityAction<bool, Camera> OnFailVRModeSwitch;
public static void PreVRModeSwitch(bool enterVR) public static void PreVRModeSwitch(bool enterVR)
{ {
@ -30,4 +31,15 @@ public class VRModeSwitchTracker
}, },
"Error while invoking VRModeSwitchTracker.OnPostVRModeSwitch. Did someone do a fucky?"); "Error while invoking VRModeSwitchTracker.OnPostVRModeSwitch. Did someone do a fucky?");
} }
public static void FailVRModeSwitch(bool enterVR)
{
TryCatchHell.TryCatchWrapper(() =>
{
DesktopVRSwitchMod.Logger.Msg("Invoking VRModeSwitchTracker.OnFailVRModeSwitch.");
Camera activeCamera = PlayerSetup.Instance.GetActiveCamera().GetComponent<Camera>();
VRModeSwitchTracker.OnFailVRModeSwitch?.Invoke(enterVR, activeCamera);
},
"Error while invoking OnFailVRModeSwitch.OnPreVRModeSwitch. Did someone do a fucky?");
}
} }