From c9d1717acc4c1f19e51a4a8f06461652f3354306 Mon Sep 17 00:00:00 2001 From: milan Date: Tue, 16 May 2023 08:00:37 +0200 Subject: [PATCH] vive focus3 support --- Assets/Samples/XR Interaction Toolkit.meta | 8 - .../Samples/XR Interaction Toolkit/2.0.4.meta | 8 - .../2.0.4/Starter Assets.meta | 8 - .../2.0.4/Starter Assets/.sample.json | 4 - .../XRI Default Continuous Move.preset | 125 -- .../XRI Default Continuous Move.preset.meta | 8 - .../XRI Default Continuous Turn.preset | 109 -- .../XRI Default Continuous Turn.preset.meta | 8 - .../XRI Default Snap Turn.preset | 121 -- .../XRI Default Snap Turn.preset.meta | 8 - Assets/VR/Assets/Prefabs/XR Origin.prefab | 45 +- .../{Samples.meta => VR/Input Actions.meta} | 2 +- .../XRI Default Input Actions.inputactions | 1445 ++++++++++------- ...RI Default Input Actions.inputactions.meta | 0 .../XRI Default Left Controller.preset | 99 +- .../XRI Default Left Controller.preset.meta | 0 .../XRI Default Right Controller.preset | 113 +- .../XRI Default Right Controller.preset.meta | 0 Assets/XR/Loaders/Mock HMD Loader.asset | 14 - Assets/XR/Loaders/Mock HMD Loader.asset.meta | 8 - .../XR/Settings/Mock HMD Build Settings.asset | 15 - .../Mock HMD Build Settings.asset.meta | 8 - .../XR/Settings/OpenXR Editor Settings.asset | 5 +- .../XR/Settings/OpenXR Package Settings.asset | 179 ++ Packages/manifest.json | 9 +- Packages/packages-lock.json | 21 +- ProjectSettings/PackageManagerSettings.asset | 12 +- 27 files changed, 1251 insertions(+), 1131 deletions(-) delete mode 100644 Assets/Samples/XR Interaction Toolkit.meta delete mode 100644 Assets/Samples/XR Interaction Toolkit/2.0.4.meta delete mode 100644 Assets/Samples/XR Interaction Toolkit/2.0.4/Starter Assets.meta delete mode 100644 Assets/Samples/XR Interaction Toolkit/2.0.4/Starter Assets/.sample.json delete mode 100644 Assets/Samples/XR Interaction Toolkit/2.0.4/Starter Assets/XRI Default Continuous Move.preset delete mode 100644 Assets/Samples/XR Interaction Toolkit/2.0.4/Starter Assets/XRI Default Continuous Move.preset.meta delete mode 100644 Assets/Samples/XR Interaction Toolkit/2.0.4/Starter Assets/XRI Default Continuous Turn.preset delete mode 100644 Assets/Samples/XR Interaction Toolkit/2.0.4/Starter Assets/XRI Default Continuous Turn.preset.meta delete mode 100644 Assets/Samples/XR Interaction Toolkit/2.0.4/Starter Assets/XRI Default Snap Turn.preset delete mode 100644 Assets/Samples/XR Interaction Toolkit/2.0.4/Starter Assets/XRI Default Snap Turn.preset.meta rename Assets/{Samples.meta => VR/Input Actions.meta} (77%) rename Assets/{Samples/XR Interaction Toolkit/2.0.4/Starter Assets => VR/Input Actions}/XRI Default Input Actions.inputactions (55%) rename Assets/{Samples/XR Interaction Toolkit/2.0.4/Starter Assets => VR/Input Actions}/XRI Default Input Actions.inputactions.meta (100%) rename Assets/{Samples/XR Interaction Toolkit/2.0.4/Starter Assets => VR/Input Actions}/XRI Default Left Controller.preset (84%) rename Assets/{Samples/XR Interaction Toolkit/2.0.4/Starter Assets => VR/Input Actions}/XRI Default Left Controller.preset.meta (100%) rename Assets/{Samples/XR Interaction Toolkit/2.0.4/Starter Assets => VR/Input Actions}/XRI Default Right Controller.preset (82%) rename Assets/{Samples/XR Interaction Toolkit/2.0.4/Starter Assets => VR/Input Actions}/XRI Default Right Controller.preset.meta (100%) delete mode 100644 Assets/XR/Loaders/Mock HMD Loader.asset delete mode 100644 Assets/XR/Loaders/Mock HMD Loader.asset.meta delete mode 100644 Assets/XR/Settings/Mock HMD Build Settings.asset delete mode 100644 Assets/XR/Settings/Mock HMD Build Settings.asset.meta diff --git a/Assets/Samples/XR Interaction Toolkit.meta b/Assets/Samples/XR Interaction Toolkit.meta deleted file mode 100644 index 19e6614..0000000 --- a/Assets/Samples/XR Interaction Toolkit.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c7fc78bdac76c1b499e46e0ee39e7175 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Samples/XR Interaction Toolkit/2.0.4.meta b/Assets/Samples/XR Interaction Toolkit/2.0.4.meta deleted file mode 100644 index e9b1378..0000000 --- a/Assets/Samples/XR Interaction Toolkit/2.0.4.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 6c162b36b4d6cd742a1d011ccd2514a0 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Samples/XR Interaction Toolkit/2.0.4/Starter Assets.meta b/Assets/Samples/XR Interaction Toolkit/2.0.4/Starter Assets.meta deleted file mode 100644 index 53e0311..0000000 --- a/Assets/Samples/XR Interaction Toolkit/2.0.4/Starter Assets.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 379602638c757a549994872671d06fbb -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Samples/XR Interaction Toolkit/2.0.4/Starter Assets/.sample.json b/Assets/Samples/XR Interaction Toolkit/2.0.4/Starter Assets/.sample.json deleted file mode 100644 index 4f89a74..0000000 --- a/Assets/Samples/XR Interaction Toolkit/2.0.4/Starter Assets/.sample.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "displayName": "Starter Assets", - "description": "Assets to streamline setup of behaviors, including a default set of input actions and presets for use with XR Interaction Toolkit behaviors that use the Input System." -} diff --git a/Assets/Samples/XR Interaction Toolkit/2.0.4/Starter Assets/XRI Default Continuous Move.preset b/Assets/Samples/XR Interaction Toolkit/2.0.4/Starter Assets/XRI Default Continuous Move.preset deleted file mode 100644 index 86824ec..0000000 --- a/Assets/Samples/XR Interaction Toolkit/2.0.4/Starter Assets/XRI Default Continuous Move.preset +++ /dev/null @@ -1,125 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!181963792 &2655988077585873504 -Preset: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: XRI Default Continuous Move - m_TargetType: - m_NativeTypeID: 114 - m_ManagedTypePPtr: {fileID: 11500000, guid: 0bf296fc962d7184ab14ad1841598d5f, - type: 3} - m_ManagedTypeFallback: - m_Properties: - - target: {fileID: 0} - propertyPath: m_Enabled - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_EditorHideFlags - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_EditorClassIdentifier - value: - objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_System - value: - objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_MoveSpeed - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_EnableStrafe - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_UseGravity - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_GravityApplicationMode - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_ForwardSource - value: - objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_LeftHandMoveAction.m_UseReference - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_LeftHandMoveAction.m_Action.m_Name - value: Left Hand Move - objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_LeftHandMoveAction.m_Action.m_Type - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_LeftHandMoveAction.m_Action.m_ExpectedControlType - value: - objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_LeftHandMoveAction.m_Action.m_Id - value: 75f1b245-c357-48c8-9acb-8967bec9dda2 - objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_LeftHandMoveAction.m_Action.m_Processors - value: - objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_LeftHandMoveAction.m_Action.m_Interactions - value: - objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_LeftHandMoveAction.m_Action.m_SingletonActionBindings.Array.size - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_LeftHandMoveAction.m_Reference - value: - objectReference: {fileID: 6972639530819350904, guid: c348712bda248c246b8c49b3db54643f, - type: 3} - - target: {fileID: 0} - propertyPath: m_RightHandMoveAction.m_UseReference - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_RightHandMoveAction.m_Action.m_Name - value: Right Hand Move - objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_RightHandMoveAction.m_Action.m_Type - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_RightHandMoveAction.m_Action.m_ExpectedControlType - value: - objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_RightHandMoveAction.m_Action.m_Id - value: 6bf6c732-e011-46b1-acc5-b649a4ec5f10 - objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_RightHandMoveAction.m_Action.m_Processors - value: - objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_RightHandMoveAction.m_Action.m_Interactions - value: - objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_RightHandMoveAction.m_Action.m_SingletonActionBindings.Array.size - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_RightHandMoveAction.m_Reference - value: - objectReference: {fileID: -8198699208435500284, guid: c348712bda248c246b8c49b3db54643f, - type: 3} diff --git a/Assets/Samples/XR Interaction Toolkit/2.0.4/Starter Assets/XRI Default Continuous Move.preset.meta b/Assets/Samples/XR Interaction Toolkit/2.0.4/Starter Assets/XRI Default Continuous Move.preset.meta deleted file mode 100644 index 6ec78be..0000000 --- a/Assets/Samples/XR Interaction Toolkit/2.0.4/Starter Assets/XRI Default Continuous Move.preset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 91f9da00cfdac5d49955df2d2d820b9c -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Samples/XR Interaction Toolkit/2.0.4/Starter Assets/XRI Default Continuous Turn.preset b/Assets/Samples/XR Interaction Toolkit/2.0.4/Starter Assets/XRI Default Continuous Turn.preset deleted file mode 100644 index 06059a7..0000000 --- a/Assets/Samples/XR Interaction Toolkit/2.0.4/Starter Assets/XRI Default Continuous Turn.preset +++ /dev/null @@ -1,109 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!181963792 &2655988077585873504 -Preset: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: XRI Default Continuous Turn - m_TargetType: - m_NativeTypeID: 114 - m_ManagedTypePPtr: {fileID: 11500000, guid: 919e39492806b334982b6b84c90dd927, - type: 3} - m_ManagedTypeFallback: - m_Properties: - - target: {fileID: 0} - propertyPath: m_Enabled - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_EditorHideFlags - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_EditorClassIdentifier - value: - objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_System - value: - objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_TurnSpeed - value: 60 - objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_LeftHandTurnAction.m_UseReference - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_LeftHandTurnAction.m_Action.m_Name - value: Left Hand Turn - objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_LeftHandTurnAction.m_Action.m_Type - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_LeftHandTurnAction.m_Action.m_ExpectedControlType - value: - objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_LeftHandTurnAction.m_Action.m_Id - value: b9ac2485-f305-451c-9106-d1d25cc235dc - objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_LeftHandTurnAction.m_Action.m_Processors - value: - objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_LeftHandTurnAction.m_Action.m_Interactions - value: - objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_LeftHandTurnAction.m_Action.m_SingletonActionBindings.Array.size - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_LeftHandTurnAction.m_Reference - value: - objectReference: {fileID: 1010738217276881514, guid: c348712bda248c246b8c49b3db54643f, - type: 3} - - target: {fileID: 0} - propertyPath: m_RightHandTurnAction.m_UseReference - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_RightHandTurnAction.m_Action.m_Name - value: Right Hand Turn - objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_RightHandTurnAction.m_Action.m_Type - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_RightHandTurnAction.m_Action.m_ExpectedControlType - value: - objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_RightHandTurnAction.m_Action.m_Id - value: 93119ec4-ae3b-41c0-8fb4-7ff4c5e6f732 - objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_RightHandTurnAction.m_Action.m_Processors - value: - objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_RightHandTurnAction.m_Action.m_Interactions - value: - objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_RightHandTurnAction.m_Action.m_SingletonActionBindings.Array.size - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_RightHandTurnAction.m_Reference - value: - objectReference: {fileID: -6493913391331992944, guid: c348712bda248c246b8c49b3db54643f, - type: 3} diff --git a/Assets/Samples/XR Interaction Toolkit/2.0.4/Starter Assets/XRI Default Continuous Turn.preset.meta b/Assets/Samples/XR Interaction Toolkit/2.0.4/Starter Assets/XRI Default Continuous Turn.preset.meta deleted file mode 100644 index a7e1626..0000000 --- a/Assets/Samples/XR Interaction Toolkit/2.0.4/Starter Assets/XRI Default Continuous Turn.preset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 0caad3af14f9a414dbdf25ed41e5aa47 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Samples/XR Interaction Toolkit/2.0.4/Starter Assets/XRI Default Snap Turn.preset b/Assets/Samples/XR Interaction Toolkit/2.0.4/Starter Assets/XRI Default Snap Turn.preset deleted file mode 100644 index 1467a2c..0000000 --- a/Assets/Samples/XR Interaction Toolkit/2.0.4/Starter Assets/XRI Default Snap Turn.preset +++ /dev/null @@ -1,121 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!181963792 &2655988077585873504 -Preset: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: XRI Default Snap Turn - m_TargetType: - m_NativeTypeID: 114 - m_ManagedTypePPtr: {fileID: 11500000, guid: 2213c36610e3b1c4bbf886810ed9db12, - type: 3} - m_ManagedTypeFallback: - m_Properties: - - target: {fileID: 0} - propertyPath: m_Enabled - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_EditorHideFlags - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_EditorClassIdentifier - value: - objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_System - value: - objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_TurnAmount - value: 45 - objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_DebounceTime - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_EnableTurnLeftRight - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_EnableTurnAround - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_LeftHandSnapTurnAction.m_UseReference - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_LeftHandSnapTurnAction.m_Action.m_Name - value: Left Hand Snap Turn - objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_LeftHandSnapTurnAction.m_Action.m_Type - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_LeftHandSnapTurnAction.m_Action.m_ExpectedControlType - value: - objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_LeftHandSnapTurnAction.m_Action.m_Id - value: a1d07c24-ca50-422a-a23f-685d9fabf63b - objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_LeftHandSnapTurnAction.m_Action.m_Processors - value: - objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_LeftHandSnapTurnAction.m_Action.m_Interactions - value: - objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_LeftHandSnapTurnAction.m_Action.m_SingletonActionBindings.Array.size - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_LeftHandSnapTurnAction.m_Reference - value: - objectReference: {fileID: 1010738217276881514, guid: c348712bda248c246b8c49b3db54643f, - type: 3} - - target: {fileID: 0} - propertyPath: m_RightHandSnapTurnAction.m_UseReference - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_RightHandSnapTurnAction.m_Action.m_Name - value: Right Hand Snap Turn - objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_RightHandSnapTurnAction.m_Action.m_Type - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_RightHandSnapTurnAction.m_Action.m_ExpectedControlType - value: - objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_RightHandSnapTurnAction.m_Action.m_Id - value: a7b54797-6974-4f75-81d0-42b9c15ef1e0 - objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_RightHandSnapTurnAction.m_Action.m_Processors - value: - objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_RightHandSnapTurnAction.m_Action.m_Interactions - value: - objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_RightHandSnapTurnAction.m_Action.m_SingletonActionBindings.Array.size - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_RightHandSnapTurnAction.m_Reference - value: - objectReference: {fileID: -6493913391331992944, guid: c348712bda248c246b8c49b3db54643f, - type: 3} diff --git a/Assets/Samples/XR Interaction Toolkit/2.0.4/Starter Assets/XRI Default Snap Turn.preset.meta b/Assets/Samples/XR Interaction Toolkit/2.0.4/Starter Assets/XRI Default Snap Turn.preset.meta deleted file mode 100644 index db24715..0000000 --- a/Assets/Samples/XR Interaction Toolkit/2.0.4/Starter Assets/XRI Default Snap Turn.preset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 18697d253d848974aa7052cba872c9f0 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/VR/Assets/Prefabs/XR Origin.prefab b/Assets/VR/Assets/Prefabs/XR Origin.prefab index ff9e527..a077b5b 100644 --- a/Assets/VR/Assets/Prefabs/XR Origin.prefab +++ b/Assets/VR/Assets/Prefabs/XR Origin.prefab @@ -95,6 +95,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: camera: {fileID: 419816428804372198} + sphereFollow: {fileID: 0} leftEye: {fileID: 419816428871882043} rightEye: {fileID: 419816428230682310} leftHand: {fileID: 419816429261119717} @@ -786,7 +787,7 @@ MonoBehaviour: m_Reference: {fileID: -6131295136447488360, guid: c348712bda248c246b8c49b3db54643f, type: 3} m_SelectActionValue: - m_UseReference: 1 + m_UseReference: 0 m_Action: m_Name: Select Action Value m_Type: 0 @@ -799,7 +800,7 @@ MonoBehaviour: m_Reference: {fileID: 6558622148059887818, guid: c348712bda248c246b8c49b3db54643f, type: 3} m_ActivateAction: - m_UseReference: 1 + m_UseReference: 0 m_Action: m_Name: Activate m_Type: 0 @@ -812,7 +813,7 @@ MonoBehaviour: m_Reference: {fileID: -5982496924579745919, guid: c348712bda248c246b8c49b3db54643f, type: 3} m_ActivateActionValue: - m_UseReference: 1 + m_UseReference: 0 m_Action: m_Name: Activate Action Value m_Type: 0 @@ -825,7 +826,7 @@ MonoBehaviour: m_Reference: {fileID: -4289430672226363583, guid: c348712bda248c246b8c49b3db54643f, type: 3} m_UIPressAction: - m_UseReference: 1 + m_UseReference: 0 m_Action: m_Name: UI Press m_Type: 0 @@ -838,7 +839,7 @@ MonoBehaviour: m_Reference: {fileID: -6395602842196007441, guid: c348712bda248c246b8c49b3db54643f, type: 3} m_UIPressActionValue: - m_UseReference: 1 + m_UseReference: 0 m_Action: m_Name: UI Press Action Value m_Type: 0 @@ -879,10 +880,10 @@ MonoBehaviour: m_DirectionalAnchorRotationAction: m_UseReference: 0 m_Action: - m_Name: + m_Name: Directional Anchor Rotation m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: 752b551a-2441-4ecc-be73-81ba5550c7c5 m_Processors: m_Interactions: m_SingletonActionBindings: [] @@ -922,7 +923,6 @@ MonoBehaviour: m_Bits: 4294967295 m_AttachTransform: {fileID: 0} m_KeepSelectedTargetValid: 1 - m_DisableVisualsWhenBlockedInGroup: 1 m_StartingSelectedInteractable: {fileID: 0} m_StartingTargetFilter: {fileID: 0} m_HoverEntered: @@ -1139,7 +1139,7 @@ MonoBehaviour: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - m_Reference: {fileID: -3326005586356538449, guid: c348712bda248c246b8c49b3db54643f, + m_Reference: {fileID: 7591305567120256655, guid: c348712bda248c246b8c49b3db54643f, type: 3} m_RotationAction: m_UseReference: 1 @@ -1152,7 +1152,7 @@ MonoBehaviour: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - m_Reference: {fileID: 5101698808175986029, guid: c348712bda248c246b8c49b3db54643f, + m_Reference: {fileID: -4961508489343616639, guid: c348712bda248c246b8c49b3db54643f, type: 3} m_TrackingStateAction: m_UseReference: 1 @@ -1165,7 +1165,7 @@ MonoBehaviour: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - m_Reference: {fileID: -1277054153949319361, guid: c348712bda248c246b8c49b3db54643f, + m_Reference: {fileID: 8693926412496843269, guid: c348712bda248c246b8c49b3db54643f, type: 3} m_SelectAction: m_UseReference: 1 @@ -1178,10 +1178,10 @@ MonoBehaviour: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - m_Reference: {fileID: 187161793506945269, guid: c348712bda248c246b8c49b3db54643f, + m_Reference: {fileID: -2678721674014572571, guid: c348712bda248c246b8c49b3db54643f, type: 3} m_SelectActionValue: - m_UseReference: 1 + m_UseReference: 0 m_Action: m_Name: Select Action Value m_Type: 0 @@ -1194,7 +1194,7 @@ MonoBehaviour: m_Reference: {fileID: -1758520528963094988, guid: c348712bda248c246b8c49b3db54643f, type: 3} m_ActivateAction: - m_UseReference: 1 + m_UseReference: 0 m_Action: m_Name: Activate m_Type: 0 @@ -1207,7 +1207,7 @@ MonoBehaviour: m_Reference: {fileID: 83097790271614945, guid: c348712bda248c246b8c49b3db54643f, type: 3} m_ActivateActionValue: - m_UseReference: 1 + m_UseReference: 0 m_Action: m_Name: Activate Action Value m_Type: 0 @@ -1220,7 +1220,7 @@ MonoBehaviour: m_Reference: {fileID: 7904272356298805229, guid: c348712bda248c246b8c49b3db54643f, type: 3} m_UIPressAction: - m_UseReference: 1 + m_UseReference: 0 m_Action: m_Name: UI Press m_Type: 0 @@ -1233,7 +1233,7 @@ MonoBehaviour: m_Reference: {fileID: 3279264004350380116, guid: c348712bda248c246b8c49b3db54643f, type: 3} m_UIPressActionValue: - m_UseReference: 1 + m_UseReference: 0 m_Action: m_Name: UI Press Action Value m_Type: 0 @@ -1256,7 +1256,7 @@ MonoBehaviour: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - m_Reference: {fileID: -8222252007134549311, guid: c348712bda248c246b8c49b3db54643f, + m_Reference: {fileID: -2193628291226162665, guid: c348712bda248c246b8c49b3db54643f, type: 3} m_RotateAnchorAction: m_UseReference: 1 @@ -1269,15 +1269,15 @@ MonoBehaviour: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - m_Reference: {fileID: -5913262927076077117, guid: c348712bda248c246b8c49b3db54643f, + m_Reference: {fileID: 4287056457703237747, guid: c348712bda248c246b8c49b3db54643f, type: 3} m_DirectionalAnchorRotationAction: m_UseReference: 0 m_Action: - m_Name: + m_Name: Directional Anchor Rotation m_Type: 0 m_ExpectedControlType: - m_Id: + m_Id: 29328737-c407-4754-b0ee-d5acc960f39f m_Processors: m_Interactions: m_SingletonActionBindings: [] @@ -1294,7 +1294,7 @@ MonoBehaviour: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - m_Reference: {fileID: 875253871413052681, guid: c348712bda248c246b8c49b3db54643f, + m_Reference: {fileID: -1559342238498912292, guid: c348712bda248c246b8c49b3db54643f, type: 3} m_ButtonPressPoint: 0.5 --- !u!114 &419816429507230468 @@ -1317,7 +1317,6 @@ MonoBehaviour: m_Bits: 4294967295 m_AttachTransform: {fileID: 0} m_KeepSelectedTargetValid: 1 - m_DisableVisualsWhenBlockedInGroup: 1 m_StartingSelectedInteractable: {fileID: 0} m_StartingTargetFilter: {fileID: 0} m_HoverEntered: diff --git a/Assets/Samples.meta b/Assets/VR/Input Actions.meta similarity index 77% rename from Assets/Samples.meta rename to Assets/VR/Input Actions.meta index 1cfc0bd..661430d 100644 --- a/Assets/Samples.meta +++ b/Assets/VR/Input Actions.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d4d4dcda1ce0df14fa644dc2426de0ef +guid: 985e5daa4d363cc41bff848605af4475 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Samples/XR Interaction Toolkit/2.0.4/Starter Assets/XRI Default Input Actions.inputactions b/Assets/VR/Input Actions/XRI Default Input Actions.inputactions similarity index 55% rename from Assets/Samples/XR Interaction Toolkit/2.0.4/Starter Assets/XRI Default Input Actions.inputactions rename to Assets/VR/Input Actions/XRI Default Input Actions.inputactions index 3ccd756..730a842 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.0.4/Starter Assets/XRI Default Input Actions.inputactions +++ b/Assets/VR/Input Actions/XRI Default Input Actions.inputactions @@ -31,7 +31,7 @@ "path": "/centerEyePosition", "interactions": "", "processors": "", - "groups": "Generic XR Controller", + "groups": "Index Controller;HTC Vive Controller;HTC Vive Cosmos Controller;HTC Vive Focus3 Controller", "action": "Position", "isComposite": false, "isPartOfComposite": false @@ -42,7 +42,7 @@ "path": "/centerEyeRotation", "interactions": "", "processors": "", - "groups": "Generic XR Controller", + "groups": "Index Controller;HTC Vive Controller;HTC Vive Cosmos Controller;HTC Vive Focus3 Controller", "action": "Rotation", "isComposite": false, "isPartOfComposite": false @@ -92,7 +92,7 @@ ], "bindings": [ { - "name": "Quaternion Fallback", + "name": "Index", "id": "61466a56-4ee4-47b1-aa6a-4806de1de5f2", "path": "QuaternionFallback", "interactions": "", @@ -108,7 +108,7 @@ "path": "{LeftHand}/pointerRotation", "interactions": "", "processors": "", - "groups": "Generic XR Controller", + "groups": "Index Controller", "action": "Rotation", "isComposite": false, "isPartOfComposite": true @@ -119,7 +119,7 @@ "path": "{LeftHand}/deviceRotation", "interactions": "", "processors": "", - "groups": "Generic XR Controller", + "groups": "Index Controller", "action": "Rotation", "isComposite": false, "isPartOfComposite": true @@ -130,13 +130,145 @@ "path": "{LeftHand}/devicePose/rotation", "interactions": "", "processors": "", - "groups": "Generic XR Controller", + "groups": "Index Controller", "action": "Rotation", "isComposite": false, "isPartOfComposite": true }, { - "name": "Vector 3 Fallback", + "name": "HTC Vive", + "id": "014f4a83-21ce-45c1-964a-552b63880ee3", + "path": "QuaternionFallback", + "interactions": "", + "processors": "", + "groups": "", + "action": "Rotation", + "isComposite": true, + "isPartOfComposite": false + }, + { + "name": "first", + "id": "271da624-4af4-4ff9-92bf-4df8147541fc", + "path": "{LeftHand}/pointerRotation", + "interactions": "", + "processors": "", + "groups": "HTC Vive Controller", + "action": "Rotation", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "second", + "id": "20b64ec3-03b8-4d1b-8137-a1d49ef8f0ee", + "path": "{LeftHand}/deviceRotation", + "interactions": "", + "processors": "", + "groups": "HTC Vive Controller", + "action": "Rotation", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "third", + "id": "343091a2-306a-4390-a2cc-408c40556b00", + "path": "{LeftHand}/deviceRotation", + "interactions": "", + "processors": "", + "groups": "HTC Vive Controller", + "action": "Rotation", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "HTC Vive Cosmos", + "id": "44f73df7-4b2f-4c63-be2d-4e706ca7cc7c", + "path": "QuaternionFallback", + "interactions": "", + "processors": "", + "groups": "", + "action": "Rotation", + "isComposite": true, + "isPartOfComposite": false + }, + { + "name": "first", + "id": "35d60daa-8c92-471c-8d26-1ebef6659d35", + "path": "{LeftHand}/pointerRotation", + "interactions": "", + "processors": "", + "groups": "HTC Vive Cosmos Controller", + "action": "Rotation", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "second", + "id": "2faec01e-7d18-41e7-925c-eec1b1d81dab", + "path": "{LeftHand}/deviceRotation", + "interactions": "", + "processors": "", + "groups": "HTC Vive Cosmos Controller", + "action": "Rotation", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "third", + "id": "38455d42-6b28-40a6-bffa-57e58a2bc271", + "path": "{LeftHand}/deviceRotation", + "interactions": "", + "processors": "", + "groups": "HTC Vive Cosmos Controller", + "action": "Rotation", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "HTC Vive Focus3", + "id": "4439b79a-fc39-453e-a742-d6ba45a79262", + "path": "QuaternionFallback", + "interactions": "", + "processors": "", + "groups": "", + "action": "Rotation", + "isComposite": true, + "isPartOfComposite": false + }, + { + "name": "first", + "id": "d94c2743-e8f3-46fb-8bf8-ee6321fd26b4", + "path": "{LeftHand}/pointerRotation", + "interactions": "", + "processors": "", + "groups": "HTC Vive Focus3 Controller", + "action": "Rotation", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "second", + "id": "dc821062-07bc-47df-8c4f-d178360b7368", + "path": "{LeftHand}/deviceRotation", + "interactions": "", + "processors": "", + "groups": "HTC Vive Focus3 Controller", + "action": "Rotation", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "third", + "id": "8895fec1-4baa-41d9-93dd-3cbf4481a627", + "path": "{LeftHand}/deviceRotation", + "interactions": "", + "processors": "", + "groups": "HTC Vive Focus3 Controller", + "action": "Rotation", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "Index", "id": "14aeff85-d719-43ff-a124-b1cd7ca8686d", "path": "Vector3Fallback", "interactions": "", @@ -152,7 +284,7 @@ "path": "{LeftHand}/pointerPosition", "interactions": "", "processors": "", - "groups": "Generic XR Controller", + "groups": "Index Controller", "action": "Position", "isComposite": false, "isPartOfComposite": true @@ -163,7 +295,7 @@ "path": "{LeftHand}/devicePosition", "interactions": "", "processors": "", - "groups": "Generic XR Controller", + "groups": "Index Controller", "action": "Position", "isComposite": false, "isPartOfComposite": true @@ -174,7 +306,139 @@ "path": "{LeftHand}/devicePose/position", "interactions": "", "processors": "", - "groups": "Generic XR Controller", + "groups": "Index Controller", + "action": "Position", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "HTC Vive", + "id": "1c77e7f3-1790-4d56-930a-3ed6f1440d49", + "path": "Vector3Fallback", + "interactions": "", + "processors": "", + "groups": "", + "action": "Position", + "isComposite": true, + "isPartOfComposite": false + }, + { + "name": "first", + "id": "9d15b045-829f-4c95-bc27-c6fc6d418d0b", + "path": "{LeftHand}/pointerPosition", + "interactions": "", + "processors": "", + "groups": "HTC Vive Controller", + "action": "Position", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "second", + "id": "2ec46745-b221-4beb-ad7e-5b7428202b92", + "path": "{LeftHand}/devicePosition", + "interactions": "", + "processors": "", + "groups": "HTC Vive Controller", + "action": "Position", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "third", + "id": "7ba84e89-0ce1-4ebf-bc2e-982de1854007", + "path": "{LeftHand}/devicePosition", + "interactions": "", + "processors": "", + "groups": "HTC Vive Controller", + "action": "Position", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "HTC Vive Cosmos", + "id": "7ef1a3b3-4120-446a-bc6e-cc55ad58d21e", + "path": "Vector3Fallback", + "interactions": "", + "processors": "", + "groups": "", + "action": "Position", + "isComposite": true, + "isPartOfComposite": false + }, + { + "name": "first", + "id": "ba64aee1-3160-48d2-a4a3-da38fb4cca9f", + "path": "{LeftHand}/pointerPosition", + "interactions": "", + "processors": "", + "groups": "HTC Vive Cosmos Controller", + "action": "Position", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "second", + "id": "f21ceeda-4326-4cc1-8aad-8e0a01be45d0", + "path": "{LeftHand}/devicePosition", + "interactions": "", + "processors": "", + "groups": "HTC Vive Cosmos Controller", + "action": "Position", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "third", + "id": "d06e1ec8-33be-4de5-bbab-21156951d902", + "path": "{LeftHand}/devicePosition", + "interactions": "", + "processors": "", + "groups": "HTC Vive Cosmos Controller", + "action": "Position", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "HTC Vive Focus3", + "id": "7918a85b-e25d-4570-8f5d-ae2f421b2262", + "path": "Vector3Fallback", + "interactions": "", + "processors": "", + "groups": "", + "action": "Position", + "isComposite": true, + "isPartOfComposite": false + }, + { + "name": "first", + "id": "abc5b54f-66f2-412b-bfd7-f0cd807222f5", + "path": "{LeftHand}/pointerPosition", + "interactions": "", + "processors": "", + "groups": "HTC Vive Focus3 Controller", + "action": "Position", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "second", + "id": "96c1ae48-c89a-47af-89ee-0c62eba40a0a", + "path": "{LeftHand}/devicePosition", + "interactions": "", + "processors": "", + "groups": "HTC Vive Focus3 Controller", + "action": "Position", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "third", + "id": "17b89946-06e0-479d-a3b9-f52890bb2e7d", + "path": "{LeftHand}/devicePosition", + "interactions": "", + "processors": "", + "groups": "HTC Vive Focus3 Controller", "action": "Position", "isComposite": false, "isPartOfComposite": true @@ -185,7 +449,7 @@ "path": "{LeftHand}/*", "interactions": "", "processors": "", - "groups": "Generic XR Controller", + "groups": "Index Controller;HTC Vive Controller;HTC Vive Cosmos Controller;HTC Vive Focus3 Controller", "action": "Haptic Device", "isComposite": false, "isPartOfComposite": false @@ -196,13 +460,431 @@ "path": "{LeftHand}/trackingState", "interactions": "", "processors": "", - "groups": "Generic XR Controller", + "groups": "Index Controller;HTC Vive Controller;HTC Vive Cosmos Controller;HTC Vive Focus3 Controller", "action": "Tracking State", "isComposite": false, "isPartOfComposite": false } ] }, + { + "name": "XRI RightHand", + "id": "d4369c60-0d72-4ab9-a4ef-b9789c95eeb6", + "actions": [ + { + "name": "Position", + "type": "Value", + "id": "a8cfd737-757c-4329-900e-86e5a5a5e838", + "expectedControlType": "Vector3", + "processors": "", + "interactions": "", + "initialStateCheck": true + }, + { + "name": "Rotation", + "type": "Value", + "id": "fef8ef8f-4d40-48a5-b473-b53efaf4e96f", + "expectedControlType": "Quaternion", + "processors": "", + "interactions": "", + "initialStateCheck": true + }, + { + "name": "Tracking State", + "type": "Value", + "id": "28fbd98c-2694-432f-8ce7-ecaf048e0483", + "expectedControlType": "Integer", + "processors": "", + "interactions": "", + "initialStateCheck": true + }, + { + "name": "Haptic Device", + "type": "PassThrough", + "id": "0fee745e-3066-45aa-85c3-22446e321f4c", + "expectedControlType": "", + "processors": "", + "interactions": "", + "initialStateCheck": false + } + ], + "bindings": [ + { + "name": "Index", + "id": "e85be0db-bd7f-43b3-a34b-3e5e12779839", + "path": "QuaternionFallback", + "interactions": "", + "processors": "", + "groups": "", + "action": "Rotation", + "isComposite": true, + "isPartOfComposite": false + }, + { + "name": "first", + "id": "63f0f4c4-adb5-4ea7-be04-5e44adf9421a", + "path": "{RightHand}/pointerRotation", + "interactions": "", + "processors": "", + "groups": "Index Controller", + "action": "Rotation", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "second", + "id": "f5847a22-7d53-4580-853d-7c40a653151c", + "path": "{RightHand}/deviceRotation", + "interactions": "", + "processors": "", + "groups": "Index Controller", + "action": "Rotation", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "third", + "id": "60e5501b-fab3-4452-9dcd-b19954dfa0f8", + "path": "{RightHand}/devicePose/rotation", + "interactions": "", + "processors": "", + "groups": "Index Controller", + "action": "Rotation", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "HTC Vive", + "id": "489f533f-ef48-455d-a490-e5bb3c62e062", + "path": "QuaternionFallback", + "interactions": "", + "processors": "", + "groups": "", + "action": "Rotation", + "isComposite": true, + "isPartOfComposite": false + }, + { + "name": "first", + "id": "c2a1e0bd-082b-43c0-8832-a4048b9b686e", + "path": "{RightHand}/pointerRotation", + "interactions": "", + "processors": "", + "groups": "HTC Vive Controller", + "action": "Rotation", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "second", + "id": "554a9fae-0e83-45ea-a28f-b6e8c5f914bb", + "path": "{RightHand}/deviceRotation", + "interactions": "", + "processors": "", + "groups": "HTC Vive Controller", + "action": "Rotation", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "third", + "id": "21a85390-edfb-4e10-bb16-30d97ff283e9", + "path": "{RightHand}/deviceRotation", + "interactions": "", + "processors": "", + "groups": "HTC Vive Controller", + "action": "Rotation", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "HTC Vive Cosmos", + "id": "8318076b-6839-47e4-898a-2f80a20e751f", + "path": "QuaternionFallback", + "interactions": "", + "processors": "", + "groups": "", + "action": "Rotation", + "isComposite": true, + "isPartOfComposite": false + }, + { + "name": "first", + "id": "e741227d-ef82-42ea-8d33-16cacb1ff629", + "path": "{RightHand}/pointerRotation", + "interactions": "", + "processors": "", + "groups": "HTC Vive Cosmos Controller", + "action": "Rotation", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "second", + "id": "dc45b4c0-9aca-48eb-b975-ea7070192bdf", + "path": "{RightHand}/deviceRotation", + "interactions": "", + "processors": "", + "groups": "HTC Vive Cosmos Controller", + "action": "Rotation", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "third", + "id": "a433c490-69e2-49fd-837a-6ffe0c74be68", + "path": "{RightHand}/deviceRotation", + "interactions": "", + "processors": "", + "groups": "HTC Vive Cosmos Controller", + "action": "Rotation", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "HTC Vive Focus3", + "id": "b0de8b2f-1890-41ee-948b-6a2891ff7a70", + "path": "QuaternionFallback", + "interactions": "", + "processors": "", + "groups": "", + "action": "Rotation", + "isComposite": true, + "isPartOfComposite": false + }, + { + "name": "first", + "id": "04a1f255-eb4f-4e1b-851b-9fa03ba3e268", + "path": "{RightHand}/pointerRotation", + "interactions": "", + "processors": "", + "groups": "HTC Vive Focus3 Controller", + "action": "Rotation", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "second", + "id": "070cb796-9a2b-46b3-b4af-e7b049a041d4", + "path": "{RightHand}/deviceRotation", + "interactions": "", + "processors": "", + "groups": "HTC Vive Focus3 Controller", + "action": "Rotation", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "third", + "id": "776046e7-115c-474b-8b22-3d35f7ea20de", + "path": "{RightHand}/deviceRotation", + "interactions": "", + "processors": "", + "groups": "HTC Vive Focus3 Controller", + "action": "Rotation", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "Index", + "id": "2a940cc0-f0e9-4c45-923b-1e96f00658c2", + "path": "Vector3Fallback", + "interactions": "", + "processors": "", + "groups": "", + "action": "Position", + "isComposite": true, + "isPartOfComposite": false + }, + { + "name": "first", + "id": "dd5bb63a-f86f-45b9-9e09-32428d0af7f8", + "path": "{RightHand}/pointerPosition", + "interactions": "", + "processors": "", + "groups": "Index Controller", + "action": "Position", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "second", + "id": "ff625a0c-b0fd-4328-84cd-e5e54212f3e0", + "path": "{RightHand}/devicePosition", + "interactions": "", + "processors": "", + "groups": "Index Controller", + "action": "Position", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "third", + "id": "14f1fbc8-209d-434f-905a-7c68c1b672f3", + "path": "{RightHand}/devicePose/position", + "interactions": "", + "processors": "", + "groups": "Index Controller", + "action": "Position", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "HTC Vive", + "id": "7c3c6ee7-eaf9-4e1e-ae18-bca8b19ec036", + "path": "Vector3Fallback", + "interactions": "", + "processors": "", + "groups": "", + "action": "Position", + "isComposite": true, + "isPartOfComposite": false + }, + { + "name": "first", + "id": "3d82b7fe-3f7f-4d85-ac61-087f745cb73f", + "path": "{RightHand}/pointerPosition", + "interactions": "", + "processors": "", + "groups": "HTC Vive Controller", + "action": "Position", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "second", + "id": "252dfef0-7a6f-411f-a820-2ab547965479", + "path": "{RightHand}/devicePosition", + "interactions": "", + "processors": "", + "groups": "HTC Vive Controller", + "action": "Position", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "third", + "id": "b3c8408f-3213-46a4-8ccf-4a5ae96abdb3", + "path": "{RightHand}/devicePosition", + "interactions": "", + "processors": "", + "groups": "HTC Vive Controller", + "action": "Position", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "HTC Vive Cosmos", + "id": "5ec71904-50d9-4f80-84bf-f94e4482e31b", + "path": "Vector3Fallback", + "interactions": "", + "processors": "", + "groups": "", + "action": "Position", + "isComposite": true, + "isPartOfComposite": false + }, + { + "name": "first", + "id": "e4fa1780-e3df-4013-a6e5-1f5a1aacf29c", + "path": "{RightHand}/pointerPosition", + "interactions": "", + "processors": "", + "groups": "HTC Vive Cosmos Controller", + "action": "Position", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "second", + "id": "c2b16baa-09ac-44c5-9265-a14d0f8ccbf8", + "path": "{RightHand}/devicePosition", + "interactions": "", + "processors": "", + "groups": "HTC Vive Cosmos Controller", + "action": "Position", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "third", + "id": "5fefadbe-4d6e-4b6a-af36-57322d629e8c", + "path": "{RightHand}/devicePosition", + "interactions": "", + "processors": "", + "groups": "HTC Vive Cosmos Controller", + "action": "Position", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "HTC Vive Focus3", + "id": "7e9df227-1b50-4717-b19b-39de4e49949d", + "path": "Vector3Fallback", + "interactions": "", + "processors": "", + "groups": "", + "action": "Position", + "isComposite": true, + "isPartOfComposite": false + }, + { + "name": "first", + "id": "e56dc10c-59a8-4c7c-aee1-fa80c05dd5b6", + "path": "{RightHand}/pointerPosition", + "interactions": "", + "processors": "", + "groups": "HTC Vive Focus3 Controller", + "action": "Position", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "second", + "id": "6aa2f83b-45ab-48f0-aac2-2a1f1f025659", + "path": "{RightHand}/devicePosition", + "interactions": "", + "processors": "", + "groups": "HTC Vive Focus3 Controller", + "action": "Position", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "third", + "id": "2b1e4e94-dcee-4d0e-8c2d-7aed60c42b1e", + "path": "{RightHand}/devicePosition", + "interactions": "", + "processors": "", + "groups": "HTC Vive Focus3 Controller", + "action": "Position", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "", + "id": "55347e3c-8d15-4224-b1df-6af8338ede67", + "path": "{RightHand}/trackingState", + "interactions": "", + "processors": "", + "groups": "Index Controller;HTC Vive Controller;HTC Vive Cosmos Controller;HTC Vive Focus3 Controller", + "action": "Tracking State", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "a5256baf-770c-4983-a71a-ee43727a9cd6", + "path": "{RightHand}/*", + "interactions": "", + "processors": "", + "groups": "Index Controller;HTC Vive Controller;HTC Vive Cosmos Controller;HTC Vive Focus3 Controller", + "action": "Haptic Device", + "isComposite": false, + "isPartOfComposite": false + } + ] + }, { "name": "XRI LeftHand Interaction", "id": "7a5e7537-cc30-4eb1-a544-6946baa8f3eb", @@ -216,51 +898,6 @@ "interactions": "", "initialStateCheck": false }, - { - "name": "Select Value", - "type": "Value", - "id": "e6005f29-e4c1-4f3b-8bf7-3a28bab5ca9c", - "expectedControlType": "Axis", - "processors": "", - "interactions": "", - "initialStateCheck": true - }, - { - "name": "Activate", - "type": "Button", - "id": "0c0991c5-d329-4afc-8892-1076b440477c", - "expectedControlType": "Button", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "Activate Value", - "type": "Value", - "id": "0c3d0ec9-85a1-45b3-839b-1ca43f859ecd", - "expectedControlType": "Axis", - "processors": "", - "interactions": "", - "initialStateCheck": true - }, - { - "name": "UI Press", - "type": "Button", - "id": "7e1eced7-c774-4fe5-be8f-d8711f646d9e", - "expectedControlType": "Button", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "UI Press Value", - "type": "Value", - "id": "f241c1aa-1050-4338-b2bf-a4a47776693d", - "expectedControlType": "Axis", - "processors": "", - "interactions": "", - "initialStateCheck": true - }, { "name": "Rotate Anchor", "type": "Value", @@ -283,22 +920,22 @@ "bindings": [ { "name": "", - "id": "71a4d23f-3e9a-4513-923b-ba388c5e84bf", - "path": "{LeftHand}/gripPressed", + "id": "ebba1d02-1b2b-44ea-bd06-4119a8786cfa", + "path": "{LeftHand}/triggerPressed", "interactions": "", "processors": "", - "groups": "Generic XR Controller", + "groups": "HTC Vive Controller;HTC Vive Cosmos Controller;HTC Vive Focus3 Controller;Index Controller", "action": "Select", "isComposite": false, "isPartOfComposite": false }, { "name": "", - "id": "ebba1d02-1b2b-44ea-bd06-4119a8786cfa", - "path": "{LeftHand}/triggerPressed", + "id": "71a4d23f-3e9a-4513-923b-ba388c5e84bf", + "path": "{LeftHand}/gripPressed", "interactions": "", "processors": "", - "groups": "Generic XR Controller", + "groups": "HTC Vive Controller;HTC Vive Cosmos Controller;HTC Vive Focus3 Controller", "action": "Select", "isComposite": false, "isPartOfComposite": false @@ -309,85 +946,74 @@ "path": "{LeftHand}/triggerPressed", "interactions": "", "processors": "", - "groups": "Generic XR Controller", + "groups": "Index Controller", "action": "Select", "isComposite": false, "isPartOfComposite": false }, { "name": "", - "id": "49a23327-a116-48c0-8af9-0d2c50c15a88", - "path": "{LeftHand}/grip", + "id": "6b947fe9-c3a9-4aa2-a7a1-98aa5b39021f", + "path": "{LeftHand}/triggerPressed", "interactions": "", "processors": "", - "groups": "Generic XR Controller", - "action": "Select Value", + "groups": "HTC Vive Controller", + "action": "Select", "isComposite": false, "isPartOfComposite": false }, { "name": "", - "id": "487f4f2e-9e9b-49aa-b0f2-4037a24624f5", - "path": "{LeftHand}/triggerPressed", + "id": "6a683349-7f8b-445d-b84e-45578773023a", + "path": "{LeftHand}/gripPressed", "interactions": "", "processors": "", - "groups": "Generic XR Controller", - "action": "Activate", + "groups": "HTC Vive Controller", + "action": "Select", "isComposite": false, "isPartOfComposite": false }, { "name": "", - "id": "f6063498-4e99-46b5-a275-c0729f91e65f", - "path": "{LeftHand}/gripPressed", + "id": "db6f44ed-905a-4594-b7cf-fc6bc737cda2", + "path": "{LeftHand}/triggerPressed", "interactions": "", "processors": "", - "groups": "Generic XR Controller", - "action": "Activate", + "groups": "HTC Vive Cosmos Controller", + "action": "Select", "isComposite": false, "isPartOfComposite": false }, { "name": "", - "id": "cf5081b7-7c19-497f-a4c7-70012d4834dc", - "path": "{LeftHand}/triggerPressed", + "id": "d0af70e0-853c-41dd-9a5d-74d7973cc4bb", + "path": "{LeftHand}/gripPressed", "interactions": "", "processors": "", - "groups": "Generic XR Controller", - "action": "Activate", + "groups": "HTC Vive Cosmos Controller", + "action": "Select", "isComposite": false, "isPartOfComposite": false }, { "name": "", - "id": "3b8b1b59-2fdc-4998-8259-50341075d9a2", - "path": "{LeftHand}/trigger", + "id": "4bb07120-9665-4ee8-9c1f-c759259a80d9", + "path": "{LeftHand}/triggerTouched", "interactions": "", "processors": "", - "groups": "Generic XR Controller", - "action": "Activate Value", + "groups": "HTC Vive Focus3 Controller", + "action": "Select", "isComposite": false, "isPartOfComposite": false }, { "name": "", - "id": "b34c79c1-ab5e-4851-87ac-abc43705eae0", - "path": "{LeftHand}/triggerPressed", + "id": "0d8fd1ba-6095-4fd4-ad1e-637c7a14cc49", + "path": "{LeftHand}/gripPressed", "interactions": "", "processors": "", - "groups": "Generic XR Controller", - "action": "UI Press", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "71d94579-1bf4-4034-ab9e-e7166842128f", - "path": "{LeftHand}/trigger", - "interactions": "", - "processors": "", - "groups": "Generic XR Controller", - "action": "UI Press Value", + "groups": "HTC Vive Focus3 Controller", + "action": "Select", "isComposite": false, "isPartOfComposite": false }, @@ -408,7 +1034,7 @@ "path": "", "interactions": "", "processors": "", - "groups": "Generic XR Controller", + "groups": "", "action": "Rotate Anchor", "isComposite": false, "isPartOfComposite": true @@ -419,7 +1045,7 @@ "path": "", "interactions": "", "processors": "", - "groups": "Generic XR Controller", + "groups": "", "action": "Rotate Anchor", "isComposite": false, "isPartOfComposite": true @@ -430,7 +1056,7 @@ "path": "{LeftHand}/Primary2DAxis/x", "interactions": "", "processors": "Clamp(min=-1),Invert", - "groups": "Generic XR Controller", + "groups": "", "action": "Rotate Anchor", "isComposite": false, "isPartOfComposite": true @@ -441,7 +1067,7 @@ "path": "{LeftHand}/Primary2DAxis/x", "interactions": "", "processors": "Clamp(max=1)", - "groups": "Generic XR Controller", + "groups": "", "action": "Rotate Anchor", "isComposite": false, "isPartOfComposite": true @@ -463,7 +1089,7 @@ "path": "{LeftHand}/Primary2DAxis/y", "interactions": "", "processors": "Clamp(max=1)", - "groups": "Generic XR Controller", + "groups": "", "action": "Translate Anchor", "isComposite": false, "isPartOfComposite": true @@ -474,7 +1100,7 @@ "path": "{LeftHand}/Primary2DAxis/y", "interactions": "", "processors": "Clamp(min=-1),Invert", - "groups": "Generic XR Controller", + "groups": "", "action": "Translate Anchor", "isComposite": false, "isPartOfComposite": true @@ -485,7 +1111,7 @@ "path": "", "interactions": "", "processors": "", - "groups": "Generic XR Controller", + "groups": "", "action": "Translate Anchor", "isComposite": false, "isPartOfComposite": true @@ -496,337 +1122,30 @@ "path": "", "interactions": "", "processors": "", - "groups": "Generic XR Controller", + "groups": "", "action": "Translate Anchor", "isComposite": false, "isPartOfComposite": true } ] }, - { - "name": "XRI LeftHand Locomotion", - "id": "22336389-9fb1-4c2c-8635-0ed30db0d29e", - "actions": [ - { - "name": "Teleport Select", - "type": "Value", - "id": "cbeaf823-3b69-4004-8ec8-13ea2ca3fc31", - "expectedControlType": "Vector2", - "processors": "", - "interactions": "", - "initialStateCheck": true - }, - { - "name": "Teleport Mode Activate", - "type": "Value", - "id": "a21db72c-4843-4839-b4d0-3ce8d287cb86", - "expectedControlType": "Vector2", - "processors": "", - "interactions": "", - "initialStateCheck": true - }, - { - "name": "Teleport Mode Cancel", - "type": "Button", - "id": "89ce8348-6001-41a3-85b9-f8f2e2dcad7c", - "expectedControlType": "Button", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "Turn", - "type": "Value", - "id": "9164e093-ebd4-4923-af32-1b52f31c2d66", - "expectedControlType": "Vector2", - "processors": "", - "interactions": "", - "initialStateCheck": true - }, - { - "name": "Move", - "type": "Value", - "id": "9693e25f-8a4f-4aed-842f-3961243c69a1", - "expectedControlType": "Vector2", - "processors": "", - "interactions": "", - "initialStateCheck": true - } - ], - "bindings": [ - { - "name": "", - "id": "95fa1419-ca7b-4c8a-8d15-7d46e58d82e3", - "path": "{LeftHand}/Primary2DAxis", - "interactions": "Sector(directions=-1,sweepBehavior=3)", - "processors": "", - "groups": "Noncontinuous Move", - "action": "Teleport Select", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "8da6ed3a-f621-49fe-8c76-1f6b7d7754d6", - "path": "{LeftHand}/Primary2DAxis", - "interactions": "Sector(directions=1)", - "processors": "", - "groups": "Noncontinuous Move", - "action": "Teleport Mode Activate", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "b8aebee7-fa03-43d4-bfb7-77a3f87452cc", - "path": "{LeftHand}/gripPressed", - "interactions": "", - "processors": "", - "groups": "Generic XR Controller", - "action": "Teleport Mode Cancel", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "99cb7ad1-51ec-4611-af68-92a85f2c17d6", - "path": "{LeftHand}/Primary2DAxis", - "interactions": "Sector(directions=12,sweepBehavior=1),Sector(directions=2,sweepBehavior=2)", - "processors": "", - "groups": "Noncontinuous Move", - "action": "Turn", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "8e383b1a-270f-4c20-819b-89a59cffb498", - "path": "{LeftHand}/Primary2DAxis", - "interactions": "", - "processors": "StickDeadzone", - "groups": "Continuous Move", - "action": "Move", - "isComposite": false, - "isPartOfComposite": false - } - ] - }, - { - "name": "XRI RightHand", - "id": "7960f8ef-2bf3-4281-aecc-4c03809d6c8c", - "actions": [ - { - "name": "Position", - "type": "Value", - "id": "c4990d70-7b8a-4ce1-b03c-da86716b8352", - "expectedControlType": "Vector3", - "processors": "", - "interactions": "", - "initialStateCheck": true - }, - { - "name": "Rotation", - "type": "Value", - "id": "ee6bf5bf-bb0a-4a50-8327-cb654b19e298", - "expectedControlType": "Quaternion", - "processors": "", - "interactions": "", - "initialStateCheck": true - }, - { - "name": "Tracking State", - "type": "Value", - "id": "167ea203-5bfb-4d74-bde9-8026b7483102", - "expectedControlType": "Integer", - "processors": "", - "interactions": "", - "initialStateCheck": true - }, - { - "name": "Haptic Device", - "type": "PassThrough", - "id": "57b2a1b4-3290-46d6-ac07-4854ee8f91b1", - "expectedControlType": "", - "processors": "", - "interactions": "", - "initialStateCheck": false - } - ], - "bindings": [ - { - "name": "Quaternion Fallback", - "id": "84e51e1c-1b95-4f3e-a61f-29da6c1f0816", - "path": "QuaternionFallback", - "interactions": "", - "processors": "", - "groups": "", - "action": "Rotation", - "isComposite": true, - "isPartOfComposite": false - }, - { - "name": "first", - "id": "3722d501-eb80-4f61-9361-08a5ea7a1394", - "path": "{RightHand}/pointerRotation", - "interactions": "", - "processors": "", - "groups": "Generic XR Controller", - "action": "Rotation", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "second", - "id": "2e6ad191-d5aa-4919-aac6-295c83387a72", - "path": "{RightHand}/deviceRotation", - "interactions": "", - "processors": "", - "groups": "Generic XR Controller", - "action": "Rotation", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "third", - "id": "b9ecb60d-341e-47cf-b50a-41d5815af8b0", - "path": "{RightHand}/devicePose/rotation", - "interactions": "", - "processors": "", - "groups": "Generic XR Controller", - "action": "Rotation", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "Vector 3 Fallback", - "id": "74e968f1-ad08-4a82-a68d-764517faecef", - "path": "Vector3Fallback", - "interactions": "", - "processors": "", - "groups": "", - "action": "Position", - "isComposite": true, - "isPartOfComposite": false - }, - { - "name": "first", - "id": "9717e367-64a4-440a-9974-1e641d753eb2", - "path": "{RightHand}/pointerPosition", - "interactions": "", - "processors": "", - "groups": "Generic XR Controller", - "action": "Position", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "second", - "id": "0794a41d-29ef-48ec-a452-6b7de29b52fa", - "path": "{RightHand}/devicePosition", - "interactions": "", - "processors": "", - "groups": "Generic XR Controller", - "action": "Position", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "third", - "id": "3ef0a781-60c5-48bc-a584-f95553f8ae0a", - "path": "{RightHand}/devicePose/position", - "interactions": "", - "processors": "", - "groups": "Generic XR Controller", - "action": "Position", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "", - "id": "6011e1e6-b2dd-4cb1-8da5-29b03868f2c5", - "path": "{RightHand}/*", - "interactions": "", - "processors": "", - "groups": "Generic XR Controller", - "action": "Haptic Device", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "03ccbaec-eeca-4fc4-8281-ee1758b4eb9b", - "path": "{RightHand}/trackingState", - "interactions": "", - "processors": "", - "groups": "Generic XR Controller", - "action": "Tracking State", - "isComposite": false, - "isPartOfComposite": false - } - ] - }, { "name": "XRI RightHand Interaction", - "id": "461bce25-7762-40c5-b639-f190649be6d6", + "id": "fa96e963-1429-4a0b-bc0c-ce9248d8c8ec", "actions": [ { "name": "Select", "type": "Button", - "id": "ac96c10b-c955-4a46-8e67-bf16bc069b53", + "id": "2fcac8f4-ef95-400a-9b4b-550e0d190d7e", "expectedControlType": "Button", "processors": "", "interactions": "", "initialStateCheck": false }, - { - "name": "Select Value", - "type": "Value", - "id": "39bbf1ac-21a3-413d-90f6-6dbf6efeaabe", - "expectedControlType": "Axis", - "processors": "", - "interactions": "", - "initialStateCheck": true - }, - { - "name": "Activate", - "type": "Button", - "id": "41976d89-60de-4deb-bff9-16b4af96b290", - "expectedControlType": "Button", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "Activate Value", - "type": "Value", - "id": "c3ca6ed7-3d25-44a2-b1d8-5be4eb699370", - "expectedControlType": "Axis", - "processors": "", - "interactions": "", - "initialStateCheck": true - }, - { - "name": "UI Press", - "type": "Button", - "id": "65174b45-c2ee-4f90-93bb-fb4084eaaab3", - "expectedControlType": "Button", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "UI Press Value", - "type": "Value", - "id": "962ac033-ec42-4981-88a4-551ad9be6ecb", - "expectedControlType": "Axis", - "processors": "", - "interactions": "", - "initialStateCheck": true - }, { "name": "Rotate Anchor", "type": "Value", - "id": "9b5d8312-f609-4895-b70f-81a722b2ae11", + "id": "e1206ea0-f9cc-4aac-a746-612e5ea9afff", "expectedControlType": "Vector2", "processors": "", "interactions": "", @@ -835,7 +1154,7 @@ { "name": "Translate Anchor", "type": "Value", - "id": "6f7cf253-7062-443b-b10f-2be48a33f027", + "id": "85deed91-bf22-4dcc-828b-446a00a999b1", "expectedControlType": "Vector2", "processors": "", "interactions": "", @@ -845,117 +1164,106 @@ "bindings": [ { "name": "", - "id": "1ce80054-410d-4112-a332-50faa7fb4f23", + "id": "9391b0c4-193b-4fa2-8efa-0a0a2bee0257", + "path": "{RightHand}/triggerPressed", + "interactions": "", + "processors": "", + "groups": "HTC Vive Controller;HTC Vive Cosmos Controller;HTC Vive Focus3 Controller;Index Controller", + "action": "Select", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "efa149d4-d134-4f59-85f2-ac4e3b9c6e3b", "path": "{RightHand}/gripPressed", "interactions": "", "processors": "", - "groups": "Generic XR Controller", + "groups": "HTC Vive Controller;HTC Vive Cosmos Controller;HTC Vive Focus3 Controller", "action": "Select", "isComposite": false, "isPartOfComposite": false }, { "name": "", - "id": "2148d269-925c-46b3-ac7e-603e7db245fc", - "path": "{RightHand}/triggerPressed", - "interactions": "", - "processors": "", - "groups": "Generic XR Controller", - "action": "Select", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "47c96f90-8ca7-4dff-be85-40b592874e20", + "id": "1c6071b2-a53e-4835-8018-434d59e8e509", "path": "{RightHand}/triggerPressed", "interactions": "", "processors": "", - "groups": "Generic XR Controller", + "groups": "Index Controller", "action": "Select", "isComposite": false, "isPartOfComposite": false }, { "name": "", - "id": "dd433817-216c-46b9-8dd3-f3a4ea1767b9", - "path": "{RightHand}/grip", + "id": "6f7e9c78-1713-4857-ab81-7c6f65c32796", + "path": "{RightHand}/triggerPressed", "interactions": "", "processors": "", - "groups": "Generic XR Controller", - "action": "Select Value", + "groups": "HTC Vive Controller", + "action": "Select", "isComposite": false, "isPartOfComposite": false }, { "name": "", - "id": "fa59aed1-ae0b-4074-a58c-294b85f46228", - "path": "{RightHand}/triggerPressed", + "id": "c58461fe-d408-4622-a7a1-e4b358619ac3", + "path": "{RightHand}/gripPressed", "interactions": "", "processors": "", - "groups": "Generic XR Controller", - "action": "Activate", + "groups": "HTC Vive Controller", + "action": "Select", "isComposite": false, "isPartOfComposite": false }, { "name": "", - "id": "f3a72be0-2ae1-4123-8dd1-87e32739b9ec", - "path": "{RightHand}/gripPressed", + "id": "e0e2e925-6d69-4d9f-ae3e-4e16af0dc0fe", + "path": "{RightHand}/triggerPressed", "interactions": "", "processors": "", - "groups": "Generic XR Controller", - "action": "Activate", + "groups": "HTC Vive Cosmos Controller", + "action": "Select", "isComposite": false, "isPartOfComposite": false }, { "name": "", - "id": "55192c51-55d2-40c8-9fbc-2ef1500bfdd6", - "path": "{RightHand}/triggerPressed", + "id": "b21261cb-e3a1-47fa-b57c-c756f8cbc43d", + "path": "{RightHand}/gripPressed", "interactions": "", "processors": "", - "groups": "Generic XR Controller", - "action": "Activate", + "groups": "HTC Vive Cosmos Controller", + "action": "Select", "isComposite": false, "isPartOfComposite": false }, { "name": "", - "id": "150f414f-61bf-47b1-b4f8-f772a2a40565", - "path": "{RightHand}/trigger", + "id": "4a0bc96e-4d3c-46ed-8e50-92aba99971f4", + "path": "{RightHand}/triggerTouched", "interactions": "", "processors": "", - "groups": "Generic XR Controller", - "action": "Activate Value", + "groups": "HTC Vive Focus3 Controller", + "action": "Select", "isComposite": false, "isPartOfComposite": false }, { "name": "", - "id": "92bb5b8f-bf48-4dab-af05-50a865773895", - "path": "{RightHand}/triggerPressed", + "id": "731b4ad7-1074-434a-90bd-db9a3c13a82a", + "path": "{RightHand}/gripPressed", "interactions": "", "processors": "", - "groups": "Generic XR Controller", - "action": "UI Press", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "5b4ef08d-9ddd-4f0a-8539-d1114d14d143", - "path": "{RightHand}/trigger", - "interactions": "", - "processors": "", - "groups": "Generic XR Controller", - "action": "UI Press Value", + "groups": "HTC Vive Focus3 Controller", + "action": "Select", "isComposite": false, "isPartOfComposite": false }, { "name": "2D Vector", - "id": "61502e80-1b21-4116-890c-c0bc31c9dffd", + "id": "237dedd8-95f6-4d3b-a9a0-ded7fd258068", "path": "2DVector(mode=2)", "interactions": "", "processors": "StickDeadzone", @@ -966,51 +1274,51 @@ }, { "name": "up", - "id": "2b466c01-134f-40f2-b376-f7e9684e423b", + "id": "8e719115-cc7a-499e-a4b6-1a2b9f5fce3d", "path": "", "interactions": "", "processors": "", - "groups": "Generic XR Controller", + "groups": "", "action": "Rotate Anchor", "isComposite": false, "isPartOfComposite": true }, { "name": "down", - "id": "79757cb3-5b81-4a3d-bc3c-d2582f85d5db", + "id": "8199af2c-86ea-433d-88a6-fae49bf58bbc", "path": "", "interactions": "", "processors": "", - "groups": "Generic XR Controller", + "groups": "", "action": "Rotate Anchor", "isComposite": false, "isPartOfComposite": true }, { - "name": "left", - "id": "76425f70-54b8-4f8e-ad52-94debc75962c", + "name": "Right", + "id": "18e54590-6cef-4264-ab6f-3d8cd93a9915", "path": "{RightHand}/Primary2DAxis/x", "interactions": "", "processors": "Clamp(min=-1),Invert", - "groups": "Generic XR Controller", + "groups": "", "action": "Rotate Anchor", "isComposite": false, "isPartOfComposite": true }, { "name": "right", - "id": "8df952de-cf29-4b5e-9a90-a6b4eee7f52c", + "id": "f0a3d8b9-e868-4481-9659-c5158efd82a7", "path": "{RightHand}/Primary2DAxis/x", "interactions": "", "processors": "Clamp(max=1)", - "groups": "Generic XR Controller", + "groups": "", "action": "Rotate Anchor", "isComposite": false, "isPartOfComposite": true }, { "name": "2D Vector", - "id": "a4b1434f-f204-49c4-bcea-c25e321e93eb", + "id": "fe13b9e6-633a-4b13-bdf0-8d049abb6b70", "path": "2DVector(mode=2)", "interactions": "", "processors": "StickDeadzone", @@ -1021,202 +1329,91 @@ }, { "name": "up", - "id": "4ced8328-f738-4bbd-937a-c09019acd234", + "id": "dc33477a-a538-4d31-acf7-94f0c86c9dfc", "path": "{RightHand}/Primary2DAxis/y", "interactions": "", "processors": "Clamp(max=1)", - "groups": "Generic XR Controller", + "groups": "", "action": "Translate Anchor", "isComposite": false, "isPartOfComposite": true }, { "name": "down", - "id": "f7e89e7c-f5a9-4f42-914f-945815a49033", + "id": "b4173c4e-2859-4a69-9d03-b1f7da00dd1a", "path": "{RightHand}/Primary2DAxis/y", "interactions": "", "processors": "Clamp(min=-1),Invert", - "groups": "Generic XR Controller", + "groups": "", "action": "Translate Anchor", "isComposite": false, "isPartOfComposite": true }, { - "name": "left", - "id": "df3b3e57-34c6-4200-b00e-6617123a9680", + "name": "Right", + "id": "77ee9c8b-4bfb-49db-b079-95c0802e93f3", "path": "", "interactions": "", "processors": "", - "groups": "Generic XR Controller", + "groups": "", "action": "Translate Anchor", "isComposite": false, "isPartOfComposite": true }, { "name": "right", - "id": "54ddc99c-3e9a-4c3a-9fdd-f5fb15952af4", + "id": "a5ab70f5-c365-47c1-9d61-9f8929fbe0df", "path": "", "interactions": "", "processors": "", - "groups": "Generic XR Controller", + "groups": "", "action": "Translate Anchor", "isComposite": false, "isPartOfComposite": true } ] - }, - { - "name": "XRI RightHand Locomotion", - "id": "99ce76d3-82c5-4289-9670-2ecffa6833fd", - "actions": [ - { - "name": "Teleport Select", - "type": "Value", - "id": "02e43582-8973-4940-af06-dff6158e3df2", - "expectedControlType": "Vector2", - "processors": "", - "interactions": "", - "initialStateCheck": true - }, - { - "name": "Teleport Mode Activate", - "type": "Value", - "id": "a6c7231d-c55d-4dd4-9e87-877bb5522ef5", - "expectedControlType": "Vector2", - "processors": "", - "interactions": "", - "initialStateCheck": true - }, - { - "name": "Teleport Mode Cancel", - "type": "Button", - "id": "d587b60c-39a0-4365-8075-477ce484ba0f", - "expectedControlType": "Button", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "Turn", - "type": "Value", - "id": "9fb2eb2b-2fb6-4328-8167-10a1bf11b424", - "expectedControlType": "Vector2", - "processors": "", - "interactions": "", - "initialStateCheck": true - }, - { - "name": "Move", - "type": "Value", - "id": "00a4dc9f-1ee6-4349-b0e9-72d5dccaadd6", - "expectedControlType": "Vector2", - "processors": "", - "interactions": "", - "initialStateCheck": true - } - ], - "bindings": [ - { - "name": "", - "id": "919c4a6c-22ed-4083-8e14-f30e91ff59fe", - "path": "{RightHand}/Primary2DAxis", - "interactions": "Sector(directions=-1,sweepBehavior=3)", - "processors": "", - "groups": "Generic XR Controller", - "action": "Teleport Select", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "62690862-4688-4010-975b-b3d9c6062157", - "path": "{RightHand}/Primary2DAxis", - "interactions": "Sector(directions=1)", - "processors": "", - "groups": "Generic XR Controller", - "action": "Teleport Mode Activate", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "de466e6e-12bf-46a1-b0fd-ffbc343f3399", - "path": "{RightHand}/gripPressed", - "interactions": "", - "processors": "", - "groups": "Generic XR Controller", - "action": "Teleport Mode Cancel", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "d6c08c3d-3d41-4695-994d-1ac9016a5a9e", - "path": "{RightHand}/Primary2DAxis", - "interactions": "Sector(directions=12,sweepBehavior=1),Sector(directions=2,sweepBehavior=2)", - "processors": "", - "groups": "Generic XR Controller", - "action": "Turn", - "isComposite": false, - "isPartOfComposite": false - } - ] } ], "controlSchemes": [ { - "name": "Generic XR Controller", - "bindingGroup": "Generic XR Controller", + "name": "Index Controller", + "bindingGroup": "Index Controller", "devices": [ { - "devicePath": "{LeftHand}", - "isOptional": true, - "isOR": false - }, - { - "devicePath": "{RightHand}", - "isOptional": true, - "isOR": false - }, - { - "devicePath": "", - "isOptional": true, - "isOR": false - }, - { - "devicePath": "", - "isOptional": true, - "isOR": false - } - ] - }, - { - "name": "Continuous Move", - "bindingGroup": "Continuous Move", - "devices": [ - { - "devicePath": "{LeftHand}", - "isOptional": false, - "isOR": false - }, - { - "devicePath": "{RightHand}", + "devicePath": "", "isOptional": false, "isOR": false } ] }, { - "name": "Noncontinuous Move", - "bindingGroup": "Noncontinuous Move", + "name": "HTC Vive Controller", + "bindingGroup": "HTC Vive Controller", "devices": [ { - "devicePath": "{LeftHand}", + "devicePath": "", "isOptional": false, "isOR": false - }, + } + ] + }, + { + "name": "HTC Vive Cosmos Controller", + "bindingGroup": "HTC Vive Cosmos Controller", + "devices": [ { - "devicePath": "{RightHand}", + "devicePath": "", + "isOptional": false, + "isOR": false + } + ] + }, + { + "name": "HTC Vive Focus3 Controller", + "bindingGroup": "HTC Vive Focus3 Controller", + "devices": [ + { + "devicePath": "", "isOptional": false, "isOR": false } diff --git a/Assets/Samples/XR Interaction Toolkit/2.0.4/Starter Assets/XRI Default Input Actions.inputactions.meta b/Assets/VR/Input Actions/XRI Default Input Actions.inputactions.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.0.4/Starter Assets/XRI Default Input Actions.inputactions.meta rename to Assets/VR/Input Actions/XRI Default Input Actions.inputactions.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.0.4/Starter Assets/XRI Default Left Controller.preset b/Assets/VR/Input Actions/XRI Default Left Controller.preset similarity index 84% rename from Assets/Samples/XR Interaction Toolkit/2.0.4/Starter Assets/XRI Default Left Controller.preset rename to Assets/VR/Input Actions/XRI Default Left Controller.preset index e9b69b8..0608004 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.0.4/Starter Assets/XRI Default Left Controller.preset +++ b/Assets/VR/Input Actions/XRI Default Left Controller.preset @@ -93,6 +93,10 @@ Preset: propertyPath: m_PositionAction.m_Action.m_SingletonActionBindings.Array.size value: 0 objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_PositionAction.m_Action.m_Flags + value: 0 + objectReference: {fileID: 0} - target: {fileID: 0} propertyPath: m_PositionAction.m_Reference value: @@ -130,6 +134,10 @@ Preset: propertyPath: m_RotationAction.m_Action.m_SingletonActionBindings.Array.size value: 0 objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_RotationAction.m_Action.m_Flags + value: 0 + objectReference: {fileID: 0} - target: {fileID: 0} propertyPath: m_RotationAction.m_Reference value: @@ -167,6 +175,10 @@ Preset: propertyPath: m_TrackingStateAction.m_Action.m_SingletonActionBindings.Array.size value: 0 objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_TrackingStateAction.m_Action.m_Flags + value: 0 + objectReference: {fileID: 0} - target: {fileID: 0} propertyPath: m_TrackingStateAction.m_Reference value: @@ -204,6 +216,10 @@ Preset: propertyPath: m_SelectAction.m_Action.m_SingletonActionBindings.Array.size value: 0 objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SelectAction.m_Action.m_Flags + value: 0 + objectReference: {fileID: 0} - target: {fileID: 0} propertyPath: m_SelectAction.m_Reference value: @@ -211,7 +227,7 @@ Preset: type: 3} - target: {fileID: 0} propertyPath: m_SelectActionValue.m_UseReference - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 0} propertyPath: m_SelectActionValue.m_Action.m_Name @@ -241,6 +257,10 @@ Preset: propertyPath: m_SelectActionValue.m_Action.m_SingletonActionBindings.Array.size value: 0 objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SelectActionValue.m_Action.m_Flags + value: 0 + objectReference: {fileID: 0} - target: {fileID: 0} propertyPath: m_SelectActionValue.m_Reference value: @@ -248,7 +268,7 @@ Preset: type: 3} - target: {fileID: 0} propertyPath: m_ActivateAction.m_UseReference - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 0} propertyPath: m_ActivateAction.m_Action.m_Name @@ -278,6 +298,10 @@ Preset: propertyPath: m_ActivateAction.m_Action.m_SingletonActionBindings.Array.size value: 0 objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_ActivateAction.m_Action.m_Flags + value: 0 + objectReference: {fileID: 0} - target: {fileID: 0} propertyPath: m_ActivateAction.m_Reference value: @@ -285,7 +309,7 @@ Preset: type: 3} - target: {fileID: 0} propertyPath: m_ActivateActionValue.m_UseReference - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 0} propertyPath: m_ActivateActionValue.m_Action.m_Name @@ -315,6 +339,10 @@ Preset: propertyPath: m_ActivateActionValue.m_Action.m_SingletonActionBindings.Array.size value: 0 objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_ActivateActionValue.m_Action.m_Flags + value: 0 + objectReference: {fileID: 0} - target: {fileID: 0} propertyPath: m_ActivateActionValue.m_Reference value: @@ -322,7 +350,7 @@ Preset: type: 3} - target: {fileID: 0} propertyPath: m_UIPressAction.m_UseReference - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 0} propertyPath: m_UIPressAction.m_Action.m_Name @@ -352,6 +380,10 @@ Preset: propertyPath: m_UIPressAction.m_Action.m_SingletonActionBindings.Array.size value: 0 objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_UIPressAction.m_Action.m_Flags + value: 0 + objectReference: {fileID: 0} - target: {fileID: 0} propertyPath: m_UIPressAction.m_Reference value: @@ -359,7 +391,7 @@ Preset: type: 3} - target: {fileID: 0} propertyPath: m_UIPressActionValue.m_UseReference - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 0} propertyPath: m_UIPressActionValue.m_Action.m_Name @@ -389,6 +421,10 @@ Preset: propertyPath: m_UIPressActionValue.m_Action.m_SingletonActionBindings.Array.size value: 0 objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_UIPressActionValue.m_Action.m_Flags + value: 0 + objectReference: {fileID: 0} - target: {fileID: 0} propertyPath: m_UIPressActionValue.m_Reference value: @@ -426,6 +462,10 @@ Preset: propertyPath: m_HapticDeviceAction.m_Action.m_SingletonActionBindings.Array.size value: 0 objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_HapticDeviceAction.m_Action.m_Flags + value: 0 + objectReference: {fileID: 0} - target: {fileID: 0} propertyPath: m_HapticDeviceAction.m_Reference value: @@ -463,11 +503,55 @@ Preset: propertyPath: m_RotateAnchorAction.m_Action.m_SingletonActionBindings.Array.size value: 0 objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_RotateAnchorAction.m_Action.m_Flags + value: 0 + objectReference: {fileID: 0} - target: {fileID: 0} propertyPath: m_RotateAnchorAction.m_Reference value: objectReference: {fileID: -7363382999065477798, guid: c348712bda248c246b8c49b3db54643f, type: 3} + - target: {fileID: 0} + propertyPath: m_DirectionalAnchorRotationAction.m_UseReference + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_DirectionalAnchorRotationAction.m_Action.m_Name + value: Directional Anchor Rotation + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_DirectionalAnchorRotationAction.m_Action.m_Type + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_DirectionalAnchorRotationAction.m_Action.m_ExpectedControlType + value: + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_DirectionalAnchorRotationAction.m_Action.m_Id + value: e6c131df-99e5-4e88-bbcc-8ef9b2472a2d + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_DirectionalAnchorRotationAction.m_Action.m_Processors + value: + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_DirectionalAnchorRotationAction.m_Action.m_Interactions + value: + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_DirectionalAnchorRotationAction.m_Action.m_SingletonActionBindings.Array.size + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_DirectionalAnchorRotationAction.m_Action.m_Flags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_DirectionalAnchorRotationAction.m_Reference + value: + objectReference: {fileID: 0} - target: {fileID: 0} propertyPath: m_TranslateAnchorAction.m_UseReference value: 1 @@ -500,6 +584,10 @@ Preset: propertyPath: m_TranslateAnchorAction.m_Action.m_SingletonActionBindings.Array.size value: 0 objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_TranslateAnchorAction.m_Action.m_Flags + value: 0 + objectReference: {fileID: 0} - target: {fileID: 0} propertyPath: m_TranslateAnchorAction.m_Reference value: @@ -509,3 +597,4 @@ Preset: propertyPath: m_ButtonPressPoint value: 0.5 objectReference: {fileID: 0} + m_ExcludedProperties: [] diff --git a/Assets/Samples/XR Interaction Toolkit/2.0.4/Starter Assets/XRI Default Left Controller.preset.meta b/Assets/VR/Input Actions/XRI Default Left Controller.preset.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.0.4/Starter Assets/XRI Default Left Controller.preset.meta rename to Assets/VR/Input Actions/XRI Default Left Controller.preset.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.0.4/Starter Assets/XRI Default Right Controller.preset b/Assets/VR/Input Actions/XRI Default Right Controller.preset similarity index 82% rename from Assets/Samples/XR Interaction Toolkit/2.0.4/Starter Assets/XRI Default Right Controller.preset rename to Assets/VR/Input Actions/XRI Default Right Controller.preset index ebca9ff..2ee8250 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.0.4/Starter Assets/XRI Default Right Controller.preset +++ b/Assets/VR/Input Actions/XRI Default Right Controller.preset @@ -93,10 +93,14 @@ Preset: propertyPath: m_PositionAction.m_Action.m_SingletonActionBindings.Array.size value: 0 objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_PositionAction.m_Action.m_Flags + value: 0 + objectReference: {fileID: 0} - target: {fileID: 0} propertyPath: m_PositionAction.m_Reference value: - objectReference: {fileID: -3326005586356538449, guid: c348712bda248c246b8c49b3db54643f, + objectReference: {fileID: 7591305567120256655, guid: c348712bda248c246b8c49b3db54643f, type: 3} - target: {fileID: 0} propertyPath: m_RotationAction.m_UseReference @@ -130,10 +134,14 @@ Preset: propertyPath: m_RotationAction.m_Action.m_SingletonActionBindings.Array.size value: 0 objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_RotationAction.m_Action.m_Flags + value: 0 + objectReference: {fileID: 0} - target: {fileID: 0} propertyPath: m_RotationAction.m_Reference value: - objectReference: {fileID: 5101698808175986029, guid: c348712bda248c246b8c49b3db54643f, + objectReference: {fileID: -4961508489343616639, guid: c348712bda248c246b8c49b3db54643f, type: 3} - target: {fileID: 0} propertyPath: m_TrackingStateAction.m_UseReference @@ -167,10 +175,14 @@ Preset: propertyPath: m_TrackingStateAction.m_Action.m_SingletonActionBindings.Array.size value: 0 objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_TrackingStateAction.m_Action.m_Flags + value: 0 + objectReference: {fileID: 0} - target: {fileID: 0} propertyPath: m_TrackingStateAction.m_Reference value: - objectReference: {fileID: -1277054153949319361, guid: c348712bda248c246b8c49b3db54643f, + objectReference: {fileID: 8693926412496843269, guid: c348712bda248c246b8c49b3db54643f, type: 3} - target: {fileID: 0} propertyPath: m_SelectAction.m_UseReference @@ -204,14 +216,18 @@ Preset: propertyPath: m_SelectAction.m_Action.m_SingletonActionBindings.Array.size value: 0 objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SelectAction.m_Action.m_Flags + value: 0 + objectReference: {fileID: 0} - target: {fileID: 0} propertyPath: m_SelectAction.m_Reference value: - objectReference: {fileID: 187161793506945269, guid: c348712bda248c246b8c49b3db54643f, + objectReference: {fileID: -2678721674014572571, guid: c348712bda248c246b8c49b3db54643f, type: 3} - target: {fileID: 0} propertyPath: m_SelectActionValue.m_UseReference - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 0} propertyPath: m_SelectActionValue.m_Action.m_Name @@ -241,6 +257,10 @@ Preset: propertyPath: m_SelectActionValue.m_Action.m_SingletonActionBindings.Array.size value: 0 objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SelectActionValue.m_Action.m_Flags + value: 0 + objectReference: {fileID: 0} - target: {fileID: 0} propertyPath: m_SelectActionValue.m_Reference value: @@ -248,7 +268,7 @@ Preset: type: 3} - target: {fileID: 0} propertyPath: m_ActivateAction.m_UseReference - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 0} propertyPath: m_ActivateAction.m_Action.m_Name @@ -278,6 +298,10 @@ Preset: propertyPath: m_ActivateAction.m_Action.m_SingletonActionBindings.Array.size value: 0 objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_ActivateAction.m_Action.m_Flags + value: 0 + objectReference: {fileID: 0} - target: {fileID: 0} propertyPath: m_ActivateAction.m_Reference value: @@ -285,7 +309,7 @@ Preset: type: 3} - target: {fileID: 0} propertyPath: m_ActivateActionValue.m_UseReference - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 0} propertyPath: m_ActivateActionValue.m_Action.m_Name @@ -315,6 +339,10 @@ Preset: propertyPath: m_ActivateActionValue.m_Action.m_SingletonActionBindings.Array.size value: 0 objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_ActivateActionValue.m_Action.m_Flags + value: 0 + objectReference: {fileID: 0} - target: {fileID: 0} propertyPath: m_ActivateActionValue.m_Reference value: @@ -322,7 +350,7 @@ Preset: type: 3} - target: {fileID: 0} propertyPath: m_UIPressAction.m_UseReference - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 0} propertyPath: m_UIPressAction.m_Action.m_Name @@ -352,6 +380,10 @@ Preset: propertyPath: m_UIPressAction.m_Action.m_SingletonActionBindings.Array.size value: 0 objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_UIPressAction.m_Action.m_Flags + value: 0 + objectReference: {fileID: 0} - target: {fileID: 0} propertyPath: m_UIPressAction.m_Reference value: @@ -359,7 +391,7 @@ Preset: type: 3} - target: {fileID: 0} propertyPath: m_UIPressActionValue.m_UseReference - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 0} propertyPath: m_UIPressActionValue.m_Action.m_Name @@ -389,6 +421,10 @@ Preset: propertyPath: m_UIPressActionValue.m_Action.m_SingletonActionBindings.Array.size value: 0 objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_UIPressActionValue.m_Action.m_Flags + value: 0 + objectReference: {fileID: 0} - target: {fileID: 0} propertyPath: m_UIPressActionValue.m_Reference value: @@ -426,10 +462,14 @@ Preset: propertyPath: m_HapticDeviceAction.m_Action.m_SingletonActionBindings.Array.size value: 0 objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_HapticDeviceAction.m_Action.m_Flags + value: 0 + objectReference: {fileID: 0} - target: {fileID: 0} propertyPath: m_HapticDeviceAction.m_Reference value: - objectReference: {fileID: -8222252007134549311, guid: c348712bda248c246b8c49b3db54643f, + objectReference: {fileID: -2193628291226162665, guid: c348712bda248c246b8c49b3db54643f, type: 3} - target: {fileID: 0} propertyPath: m_RotateAnchorAction.m_UseReference @@ -463,11 +503,55 @@ Preset: propertyPath: m_RotateAnchorAction.m_Action.m_SingletonActionBindings.Array.size value: 0 objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_RotateAnchorAction.m_Action.m_Flags + value: 0 + objectReference: {fileID: 0} - target: {fileID: 0} propertyPath: m_RotateAnchorAction.m_Reference value: - objectReference: {fileID: -5913262927076077117, guid: c348712bda248c246b8c49b3db54643f, + objectReference: {fileID: 4287056457703237747, guid: c348712bda248c246b8c49b3db54643f, type: 3} + - target: {fileID: 0} + propertyPath: m_DirectionalAnchorRotationAction.m_UseReference + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_DirectionalAnchorRotationAction.m_Action.m_Name + value: Directional Anchor Rotation + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_DirectionalAnchorRotationAction.m_Action.m_Type + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_DirectionalAnchorRotationAction.m_Action.m_ExpectedControlType + value: + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_DirectionalAnchorRotationAction.m_Action.m_Id + value: 1433afb8-239d-42c1-9d8f-f341739aef74 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_DirectionalAnchorRotationAction.m_Action.m_Processors + value: + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_DirectionalAnchorRotationAction.m_Action.m_Interactions + value: + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_DirectionalAnchorRotationAction.m_Action.m_SingletonActionBindings.Array.size + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_DirectionalAnchorRotationAction.m_Action.m_Flags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_DirectionalAnchorRotationAction.m_Reference + value: + objectReference: {fileID: 0} - target: {fileID: 0} propertyPath: m_TranslateAnchorAction.m_UseReference value: 1 @@ -500,12 +584,17 @@ Preset: propertyPath: m_TranslateAnchorAction.m_Action.m_SingletonActionBindings.Array.size value: 0 objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_TranslateAnchorAction.m_Action.m_Flags + value: 0 + objectReference: {fileID: 0} - target: {fileID: 0} propertyPath: m_TranslateAnchorAction.m_Reference value: - objectReference: {fileID: 875253871413052681, guid: c348712bda248c246b8c49b3db54643f, + objectReference: {fileID: -1559342238498912292, guid: c348712bda248c246b8c49b3db54643f, type: 3} - target: {fileID: 0} propertyPath: m_ButtonPressPoint value: 0.5 objectReference: {fileID: 0} + m_ExcludedProperties: [] diff --git a/Assets/Samples/XR Interaction Toolkit/2.0.4/Starter Assets/XRI Default Right Controller.preset.meta b/Assets/VR/Input Actions/XRI Default Right Controller.preset.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.0.4/Starter Assets/XRI Default Right Controller.preset.meta rename to Assets/VR/Input Actions/XRI Default Right Controller.preset.meta diff --git a/Assets/XR/Loaders/Mock HMD Loader.asset b/Assets/XR/Loaders/Mock HMD Loader.asset deleted file mode 100644 index f7b4662..0000000 --- a/Assets/XR/Loaders/Mock HMD Loader.asset +++ /dev/null @@ -1,14 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0660e8fc444734757ae6f6c40c2d33a0, type: 3} - m_Name: Mock HMD Loader - m_EditorClassIdentifier: diff --git a/Assets/XR/Loaders/Mock HMD Loader.asset.meta b/Assets/XR/Loaders/Mock HMD Loader.asset.meta deleted file mode 100644 index 28cb83b..0000000 --- a/Assets/XR/Loaders/Mock HMD Loader.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: df4ed463f699a594593b8eb5ed412658 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/XR/Settings/Mock HMD Build Settings.asset b/Assets/XR/Settings/Mock HMD Build Settings.asset deleted file mode 100644 index 5cd2a32..0000000 --- a/Assets/XR/Settings/Mock HMD Build Settings.asset +++ /dev/null @@ -1,15 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c8bf066bf8a4947a1be502d267edb82f, type: 3} - m_Name: Mock HMD Build Settings - m_EditorClassIdentifier: - renderMode: 0 diff --git a/Assets/XR/Settings/Mock HMD Build Settings.asset.meta b/Assets/XR/Settings/Mock HMD Build Settings.asset.meta deleted file mode 100644 index 913d049..0000000 --- a/Assets/XR/Settings/Mock HMD Build Settings.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: d3188622f79ccb44db3e51adc5a9beb1 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/XR/Settings/OpenXR Editor Settings.asset b/Assets/XR/Settings/OpenXR Editor Settings.asset index 1cb89fc..8d6c175 100644 --- a/Assets/XR/Settings/OpenXR Editor Settings.asset +++ b/Assets/XR/Settings/OpenXR Editor Settings.asset @@ -12,5 +12,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 975057b4fdcfb8142b3080d19a5cc712, type: 3} m_Name: OpenXR Editor Settings m_EditorClassIdentifier: - Keys: - Values: [] + Keys: 01000000 + Values: + - featureSets: [] diff --git a/Assets/XR/Settings/OpenXR Package Settings.asset b/Assets/XR/Settings/OpenXR Package Settings.asset index 0955798..3f7d862 100644 --- a/Assets/XR/Settings/OpenXR Package Settings.asset +++ b/Assets/XR/Settings/OpenXR Package Settings.asset @@ -61,6 +61,26 @@ MonoBehaviour: company: Unity priority: 0 required: 0 +--- !u!114 &-6295922909374069616 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 83c497f94dca8f442b93bafe87fe9590, type: 3} + m_Name: HtcViveFocus3InputFeature Standalone + m_EditorClassIdentifier: + m_enabled: 1 + nameUi: HTC Vive Focus3 Controller Support + version: 0.0.2 + featureIdInternal: com.htc.openxr.feature.input.htcvivefocus3 + openxrExtensionStrings: XR_HTC_vive_focus3_controller_interaction XR_EXT_palm_pose + company: HTC + priority: 0 + required: 0 --- !u!114 &-5760303697926728946 MonoBehaviour: m_ObjectHideFlags: 0 @@ -116,7 +136,10 @@ MonoBehaviour: features: - {fileID: -5645428411790280417} - {fileID: -9065768356830197223} + - {fileID: -4063311878580091470} - {fileID: -2952216973661141114} + - {fileID: -3630208235491696974} + - {fileID: -6295922909374069616} - {fileID: -4179021495097340258} - {fileID: 8995873766301033308} - {fileID: -3465480095234910706} @@ -124,7 +147,9 @@ MonoBehaviour: - {fileID: -9064719246138345788} - {fileID: 8829524859106569533} - {fileID: -2735733284642257967} + - {fileID: 2626892015113126974} - {fileID: -1692072991545479379} + - {fileID: 2505612726939275868} m_renderMode: 0 m_depthSubmissionMode: 0 --- !u!114 &-4179021495097340258 @@ -147,6 +172,72 @@ MonoBehaviour: company: Unity priority: 0 required: 0 +--- !u!114 &-4063311878580091470 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2fbc139556062114b840c0209eebde8d, type: 3} + m_Name: HandTracking_OpenXR_API Standalone + m_EditorClassIdentifier: + m_enabled: 0 + nameUi: Hand Tracking + version: 0.0.1 + featureIdInternal: com.company.openxr.handtracking.feature + openxrExtensionStrings: XR_EXT_hand_tracking + company: HTC + priority: 0 + required: 0 + m_space: 0 + m_leftHandle: 0 + m_rightHandle: 0 +--- !u!114 &-3630208235491696974 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 78ab78586c10ef544a7086ea0dcdcf46, type: 3} + m_Name: HtcViveCosmosInputFeature Standalone + m_EditorClassIdentifier: + m_enabled: 1 + nameUi: HTC Vive Cosmos Controller Support + version: 0.0.2 + featureIdInternal: com.htc.openxr.feature.input.htcvivecosmos + openxrExtensionStrings: XR_HTC_vive_cosmos_controller_interaction XR_EXT_palm_pose + company: HTC + priority: 0 + required: 0 +--- !u!114 &-3601545987831357755 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bb0f8bc7ffa73114397349c4888bab44, type: 3} + m_Name: SceneUnderstanding_OpenXR_API WSA + m_EditorClassIdentifier: + m_enabled: 0 + nameUi: Scene Understanding + version: 0.0.1 + featureIdInternal: com.htc.openxr.sceneunderstanding.feature + openxrExtensionStrings: XR_MSFT_scene_understanding + company: HTC + priority: 0 + required: 0 + m_XrInstance: 0 + m_XrSession: 0 + m_systemid: 0 --- !u!114 &-3596709507277034392 MonoBehaviour: m_ObjectHideFlags: 0 @@ -365,6 +456,71 @@ MonoBehaviour: company: Unity priority: 0 required: 0 +--- !u!114 &2354319517743609179 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 78ab78586c10ef544a7086ea0dcdcf46, type: 3} + m_Name: HtcViveCosmosInputFeature WSA + m_EditorClassIdentifier: + m_enabled: 0 + nameUi: HTC Vive Cosmos Controller Support + version: 0.0.2 + featureIdInternal: com.htc.openxr.feature.input.htcvivecosmos + openxrExtensionStrings: XR_HTC_vive_cosmos_controller_interaction XR_EXT_palm_pose + company: HTC + priority: 0 + required: 0 +--- !u!114 &2505612726939275868 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 78a47d9a95f0613439910fb469f4ee28, type: 3} + m_Name: VIVE_FacialTracking_OpenXR_API Standalone + m_EditorClassIdentifier: + m_enabled: 0 + nameUi: Facial Tracking + version: 0.0.1 + featureIdInternal: com.htc.openxr.facialtracking.feature + openxrExtensionStrings: XR_HTC_facial_tracking + company: HTC + priority: 0 + required: 0 + m_expressionHandle: 0 + m_expressionHandle_Lip: 0 +--- !u!114 &2626892015113126974 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bb0f8bc7ffa73114397349c4888bab44, type: 3} + m_Name: SceneUnderstanding_OpenXR_API Standalone + m_EditorClassIdentifier: + m_enabled: 0 + nameUi: Scene Understanding + version: 0.0.1 + featureIdInternal: com.htc.openxr.sceneunderstanding.feature + openxrExtensionStrings: XR_MSFT_scene_understanding + company: HTC + priority: 0 + required: 0 + m_XrInstance: 0 + m_XrSession: 0 + m_systemid: 0 --- !u!114 &3846928703558156887 MonoBehaviour: m_ObjectHideFlags: 0 @@ -381,12 +537,15 @@ MonoBehaviour: - {fileID: 2289670083675959570} - {fileID: 1173906867656648867} - {fileID: 5315868764271356596} + - {fileID: 2354319517743609179} + - {fileID: 7789757789461589872} - {fileID: -5760303697926728946} - {fileID: -3596709507277034392} - {fileID: -2525753227810615796} - {fileID: 10505211265528180} - {fileID: -3246497391830789495} - {fileID: 4642398570395311329} + - {fileID: -3601545987831357755} - {fileID: -8052587150971810870} m_renderMode: 1 m_depthSubmissionMode: 0 @@ -432,6 +591,26 @@ MonoBehaviour: company: Unity priority: 0 required: 0 +--- !u!114 &7789757789461589872 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 83c497f94dca8f442b93bafe87fe9590, type: 3} + m_Name: HtcViveFocus3InputFeature WSA + m_EditorClassIdentifier: + m_enabled: 0 + nameUi: HTC Vive Focus3 Controller Support + version: 0.0.2 + featureIdInternal: com.htc.openxr.feature.input.htcvivefocus3 + openxrExtensionStrings: XR_HTC_vive_focus3_controller_interaction XR_EXT_palm_pose + company: HTC + priority: 0 + required: 0 --- !u!114 &8610061585994297492 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Packages/manifest.json b/Packages/manifest.json index d8e268f..70f0df5 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,6 +1,7 @@ { "dependencies": { "com.dbrizov.naughtyattributes": "https://github.com/dbrizov/NaughtyAttributes.git#upm", + "com.htc.upm.vive.openxr": "1.0.10", "com.unity.ide.rider": "3.0.21", "com.unity.render-pipelines.universal": "14.0.7", "com.unity.textmeshpro": "3.0.6", @@ -8,7 +9,6 @@ "com.unity.ugui": "1.0.0", "com.unity.visualscripting": "1.8.0", "com.unity.xr.interaction.toolkit": "2.2.0", - "com.unity.xr.mock-hmd": "1.3.1-preview.1", "com.unity.xr.openxr": "1.7.0", "io.realm.unity": "10.21.1", "com.unity.modules.ai": "1.0.0", @@ -50,6 +50,13 @@ "scopes": [ "io.realm.unity" ] + }, + { + "name": "VIVE", + "url": "https://npm-registry.vive.com", + "scopes": [ + "com.htc.upm" + ] } ] } diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index a6d8c86..fac475c 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -7,6 +7,18 @@ "dependencies": {}, "hash": "8a8fa5a9659a6d63f196391c71e06c4286c8acd7" }, + "com.htc.upm.vive.openxr": { + "version": "1.0.10", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.xr.management": "3.2.16", + "com.unity.xr.legacyinputhelpers": "2.1.2", + "com.unity.inputsystem": "1.1.0-preview.1", + "com.unity.xr.openxr": "1.4.2" + }, + "url": "https://npm-registry.vive.com" + }, "com.unity.burst": { "version": "1.8.4", "depth": 1, @@ -182,15 +194,6 @@ }, "url": "https://packages.unity.com" }, - "com.unity.xr.mock-hmd": { - "version": "1.3.1-preview.1", - "depth": 0, - "source": "registry", - "dependencies": { - "com.unity.xr.management": "4.0.1" - }, - "url": "https://packages.unity.com" - }, "com.unity.xr.openxr": { "version": "1.7.0", "depth": 0, diff --git a/ProjectSettings/PackageManagerSettings.asset b/ProjectSettings/PackageManagerSettings.asset index 7bf0abd..26cc7e4 100644 --- a/ProjectSettings/PackageManagerSettings.asset +++ b/ProjectSettings/PackageManagerSettings.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 13964, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: - m_EnablePreReleasePackages: 1 + m_EnablePreReleasePackages: 0 m_AdvancedSettingsExpanded: 1 m_ScopedRegistriesSettingsExpanded: 1 m_SeeAllPackageVersions: 0 @@ -34,7 +34,15 @@ MonoBehaviour: m_IsDefault: 0 m_Capabilities: 0 m_ConfigSource: 4 - m_UserSelectedRegistryName: NPM + - m_Id: scoped:project:VIVE + m_Name: VIVE + m_Url: https://npm-registry.vive.com + m_Scopes: + - com.htc.upm + m_IsDefault: 0 + m_Capabilities: 0 + m_ConfigSource: 4 + m_UserSelectedRegistryName: VIVE m_UserAddingNewScopedRegistry: 0 m_RegistryInfoDraft: m_Modified: 0