upgrade to unity 6.1
This commit is contained in:
@@ -9,3 +9,10 @@ MonoImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/ControllerInput/HVRControllerEvents.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -9,3 +9,10 @@ MonoImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/ControllerInput/HVRGlobalInputs.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -1,3 +1,10 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 0a934dfe7ddf4fb2a1ec98943c4bcd57
|
||||
timeCreated: 1604448529
|
||||
timeCreated: 1604448529
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/ControllerInput/HVRInputAction.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -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++)
|
||||
|
||||
@@ -1,3 +1,10 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 94e2703aa70f47be808cc7d516fced77
|
||||
timeCreated: 1600342873
|
||||
timeCreated: 1600342873
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/ControllerInput/HVRInputManager.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -9,3 +9,10 @@ MonoImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/ControllerInput/HVRInputSystemController.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -1,3 +1,10 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 7033fdbdef534aeaaad3c868224922db
|
||||
timeCreated: 1718677714
|
||||
timeCreated: 1718677714
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/ControllerInput/HVROpenXRFingerCurls.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -1,3 +1,10 @@
|
||||
fileFormatVersion: 2
|
||||
guid: f258b67bcfea4b9782cfcdcd54058670
|
||||
timeCreated: 1603043879
|
||||
timeCreated: 1603043879
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/ControllerInput/HVRPlayerInputs.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -1,3 +1,10 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 44ea0e34f99846a4824b42b44d2e35cd
|
||||
timeCreated: 1600355474
|
||||
timeCreated: 1600355474
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/ControllerInput/HVRTrackedController.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -1,3 +1,10 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 783ea3a1358f4960b7aafcc2c2778559
|
||||
timeCreated: 1597711347
|
||||
timeCreated: 1597711347
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/ControllerInput/HVRXRInputController.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -9,3 +9,10 @@ MonoImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/ControllerInput/InputEvents/HVRGripButtonEvents.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -9,3 +9,10 @@ MonoImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/ControllerInput/InputEvents/HVRJoystickButtonEvents.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -9,3 +9,10 @@ MonoImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/ControllerInput/InputEvents/HVRJoystickTouchEvents.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -9,3 +9,10 @@ MonoImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/ControllerInput/InputEvents/HVRMenuButtonEvents.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -9,3 +9,10 @@ MonoImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/ControllerInput/InputEvents/HVRPrimaryButtonEvents.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -9,3 +9,10 @@ MonoImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/ControllerInput/InputEvents/HVRPrimaryTouchButtonEvents.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -9,3 +9,10 @@ MonoImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/ControllerInput/InputEvents/HVRSecondaryButtonEvents.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -9,3 +9,10 @@ MonoImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/ControllerInput/InputEvents/HVRSecondaryTouchButtonEvents.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -9,3 +9,10 @@ MonoImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/ControllerInput/InputEvents/HVRThumbTouchEvents.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -9,3 +9,10 @@ MonoImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/ControllerInput/InputEvents/HVRTrackPadDownEvents.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -9,3 +9,10 @@ MonoImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/ControllerInput/InputEvents/HVRTrackPadLeftEvents.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -9,3 +9,10 @@ MonoImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/ControllerInput/InputEvents/HVRTrackPadRightEvents.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -9,3 +9,10 @@ MonoImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/ControllerInput/InputEvents/HVRTrackPadTouchEvents.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -9,3 +9,10 @@ MonoImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/ControllerInput/InputEvents/HVRTrackPadUpEvents.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -9,3 +9,10 @@ MonoImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/ControllerInput/InputEvents/HVRTrackpadButtonEvents.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -9,3 +9,10 @@ MonoImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/ControllerInput/InputEvents/HVRTriggerButtonEvents.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -9,3 +9,10 @@ MonoImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/ControllerInput/InputEvents/HVRTriggerTouchEvents.cs
|
||||
uploadId: 736929
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -9,3 +9,10 @@ MonoImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/ControllerInput/InputSystem/HVRInputActions.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -12,3 +12,10 @@ ScriptedImporter:
|
||||
wrapperCodePath: Assets/HurricaneVR/Framework/Scripts/ControllerInput/InputSystem/HVRInputActions.cs
|
||||
wrapperClassName:
|
||||
wrapperCodeNamespace:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/ControllerInput/InputSystem/HVRInputActions.inputactions
|
||||
uploadId: 736929
|
||||
|
||||
@@ -1,3 +1,10 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 590ae77d131f4448894cbe1df6373c2b
|
||||
timeCreated: 1635272558
|
||||
timeCreated: 1635272558
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/ControllerInput/InputSystem/HVRTrackedPoseDriver.cs
|
||||
uploadId: 736929
|
||||
|
||||
Reference in New Issue
Block a user