xio/dungeons
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

upgrade to unity 6.1

Browse Source
This commit is contained in:
Jan Švec
2025-07-17 15:57:56 +02:00
parent 702b766981
commit eea0e3ffad
1167 changed files with 62538 additions and 8659 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Assets/HurricaneVR/Framework/Scripts/ControllerInput/HVRInputManager.cs
View File

@@ -263,7 +263,6 @@ namespace HurricaneVR.Framework.ControllerInput
return false;
#if USING_XR_MANAGEMENT
//https://forum.unity.com/threads/commonusages-userpresence-doesnt-report-correctly.818766/
//this features requires XR Management
//might be active but not rendering due to headset not on
@@ -285,7 +284,7 @@ namespace HurricaneVR.Framework.ControllerInput
//https://docs.unity3d.com/ScriptReference/XR.XRDevice-isPresent.html
_displaySubsystems.Clear();
SubsystemManager.GetInstances<XRDisplaySubsystem>(_displaySubsystems);
SubsystemManager.GetSubsystems<XRDisplaySubsystem>(_displaySubsystems);
foreach (var xrDisplay in _displaySubsystems)
{
if (xrDisplay.running)
@@ -890,15 +889,14 @@ namespace HurricaneVR.Framework.ControllerInput
if (isXRPlugin)
{
var loader = XRPluginLoader.ToLower();
if (loader == OculusLoader.ToLower())
var loaderNoSpace = loader.Replace(" ", "");
if (loader == OculusLoader.ToLower() || loaderNoSpace == OculusLoader.ToLower().Replace(" ", ""))
{
CurrentSDK = UseOVRInputs ? InputSDK.Oculus : InputSDK.XRInput;
return;
}
#if ENABLE_INPUT_SYSTEM
var loaderNoSpace = loader.Replace(" ", "");
if (loader == OpenXRLoader.ToLower() || loaderNoSpace == OpenXRLoader.ToLower().Replace(" ", ""))
{
CurrentSDK = InputSDK.InputSystem;
@@ -906,7 +904,7 @@ namespace HurricaneVR.Framework.ControllerInput
}
#endif
if (loader == OpenVRLoader.ToLower())
if (loader == OpenVRLoader.ToLower() || loaderNoSpace == OpenVRLoader.ToLower().Replace(" ", ""))
{
if (!steamvrFound)
{
@@ -981,7 +979,6 @@ namespace HurricaneVR.Framework.ControllerInput
private void CheckXRStatus()
{
#if USING_XR_MANAGEMENT
VRPlugin = VRMode.XRPlugin;
XRPluginLoader = XRGeneralSettings.Instance.Manager.activeLoader?.name ?? "";
@@ -993,7 +990,7 @@ namespace HurricaneVR.Framework.ControllerInput
#else
loaders = string.Join(",", XRGeneralSettings.Instance.Manager.loaders.Select(e => e.name));
#endif
//Debug.Log($"{XRGeneralSettings.Instance.Manager.automaticLoading}");
Debug.Log($"{XRGeneralSettings.Instance.Manager.automaticLoading}");
Debug.Log($"XRGeneralSettings.Instance.Manager.isInitializationComplete {XRGeneralSettings.Instance.Manager.isInitializationComplete}");
Debug.Log($"XRPlugin Detected | XRSettings.enabled {XRSettings.enabled} | Loader : {XRPluginLoader} | Loaders Enabled: {loaders}");
@@ -1198,7 +1195,7 @@ namespace HurricaneVR.Framework.ControllerInput
#if USING_XR_MANAGEMENT
var subsystems = new List<XRInputSubsystem>();
SubsystemManager.GetInstances<XRInputSubsystem>(subsystems);
SubsystemManager.GetSubsystems<XRInputSubsystem>(subsystems);
Debug.Log("Found " + subsystems.Count + " input subsystems.");
for (int i = 0; i < subsystems.Count; i++)