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

[DesktopVRSwitch] Reworked SteamVR Initialization

Browse source 
New SteamVR initialization to avoid warnings/errors on switch.
This commit is contained in:
NotAKidoS 2023-06-19 21:26:57 -05:00
parent 61a45f97bc
commit 5f95755ad2
8 changed files with 39 additions and 306 deletions
Download patch file Download diff file Expand all files Collapse all files

6
DesktopVRSwitch/VRModeTrackers/CohtmlHudTracker.cs
View file

@ -1,4 +1,4 @@
using ABI_RC.Core.Player;
using ABI_RC.Core;
using ABI_RC.Core.UI;
using UnityEngine;
@ -26,9 +26,9 @@ public class CohtmlHudTracker : VRModeTracker
}
DesktopVRSwitch.Logger.Msg("Configuring new hud affinity for CohtmlHud.");
_cohtmlHud.gameObject.transform.parent = intoVR ? PlayerSetup.Instance.vrCamera.transform : PlayerSetup.Instance.desktopCamera.transform;
_cohtmlHud.gameObject.transform.parent = Utils.GetPlayerCameraObject(intoVR).transform;
// This handles rotation and position
ABI_RC.Core.CVRTools.ConfigureHudAffinity();
CVRTools.ConfigureHudAffinity();
_cohtmlHud.gameObject.transform.localScale = new Vector3(1.2f, 1f, 1.2f);
}
}

4
DesktopVRSwitch/VRModeTrackers/MovementSystemTracker.cs
View file

@ -25,9 +25,7 @@ public class MovementSystemTracker : VRModeTracker
{
_movementSystem = MovementSystem.Instance;
Vector3 position = _movementSystem.rotationPivot.transform.position;
position.y = _movementSystem.transform.position.y;
preSwitchWorldPosition = position;
preSwitchWorldPosition = Utils.GetPlayerRootPosition();
preSwitchWorldRotation = _movementSystem.rotationPivot.transform.rotation;
_movementSystem.ChangeCrouch(false);

49
DesktopVRSwitch/VRModeTrackers/VRModeSwitchManager.cs
View file

@ -22,12 +22,13 @@ public class VRModeSwitchManager : MonoBehaviour
{
public static VRModeSwitchManager Instance { get; private set; }
// I don't think I *need* this. Only using cause I don't want stuff just floating off.
// I don't think I *need* this. Only using cause I don't want stuff just existing.
private static readonly List<VRModeTracker> _vrModeTrackers = new List<VRModeTracker>();
public static event UnityAction<bool> OnPreVRModeSwitch;
public static event UnityAction<bool> OnPostVRModeSwitch;
public static event UnityAction<bool> OnFailVRModeSwitch;
const string XRSETTINGS_DEVICE = "OpenVR";
public static void RegisterVRModeTracker(VRModeTracker observer)
{
@ -55,7 +56,6 @@ public class VRModeSwitchManager : MonoBehaviour
DestroyImmediate(this);
return;
}
Instance = this;
}
@ -85,11 +85,11 @@ public class VRModeSwitchManager : MonoBehaviour
// Start switch
if (!isUsingVr)
{
yield return StartCoroutine(StartOpenVR());
yield return StartCoroutine(StartSteamVR());
}
else
{
yield return StartCoroutine(StopOpenVR());
StopSteamVR();
}
// Check for updated VR mode
@ -143,43 +143,36 @@ public class VRModeSwitchManager : MonoBehaviour
public bool IsInVR() => XRSettings.enabled;
private IEnumerator StartOpenVR()
private IEnumerator StartSteamVR()
{
XRSettings.LoadDeviceByName("OpenVR");
yield return null; //wait a frame before checking
XRSettings.LoadDeviceByName(XRSETTINGS_DEVICE);
yield return null; // wait a frame before checking
if (!string.IsNullOrEmpty(XRSettings.loadedDeviceName))
{
DesktopVRSwitch.Logger.Msg("Starting SteamVR...");
XRSettings.enabled = true;
SteamVR_Input.Initialize(true);
yield return null;
yield break;
//SteamVR.Initialize is fucking useless
SteamVR_Behaviour.Initialize(true);
SteamVR_Behaviour.instance.InitializeSteamVR(true);
}
DesktopVRSwitch.Logger.Error("Initializing VR Failed. Is there no VR device connected?");
yield return null;
yield break;
}
private IEnumerator StopOpenVR()
private void StopSteamVR()
{
SteamVR_Behaviour.instance.enabled = false;
// Forces SteamVR to reinitialize SteamVR_Input next switch
SteamVR_ActionSet_Manager.DisableAllActionSets();
SteamVR_Input.initialized = false;
yield return null;
// Remove SteamVR
DestroyImmediate(SteamVR_Behaviour.instance.gameObject);
SteamVR.enabled = false;
if (!string.IsNullOrEmpty(XRSettings.loadedDeviceName))
{
SteamVR_Input.actionSets[0].Deactivate(SteamVR_Input_Sources.Any);
XRSettings.LoadDeviceByName("");
XRSettings.enabled = false;
// Disable UnityXR
XRSettings.LoadDeviceByName("");
XRSettings.enabled = false;
yield return null;
yield break;
}
DesktopVRSwitch.Logger.Error("Attempted to exit VR without a VR device loaded.");
yield return null;
yield break;
// We don't really need to wait on Stop()
}
}

2
DesktopVRSwitch/VRModeTrackers/VRTrackerManagerTracker.cs
View file

@ -22,7 +22,7 @@ public class VRTrackerManagerTracker : VRModeTracker
DesktopVRSwitch.Logger.Error("Error while getting VRTrackerManager!");
return;
}
DesktopVRSwitch.Logger.Msg($"Resetting VRTrackerManager.");
DesktopVRSwitch.Logger.Msg("Resetting VRTrackerManager.");
_vrTrackerManager.poses = null;
_vrTrackerManager.leftHand = null;