From dbf8dd01eb1df59da57783fbf562aceafa6fd425 Mon Sep 17 00:00:00 2001 From: Dino Fejzagic Date: Mon, 27 Apr 2020 15:46:22 +0200 Subject: [PATCH 01/78] Move SDK asm definition to correct plact --- XRTK.SDK/Packages/com.xrtk.sdk/{ => Runtime}/XRTK.SDK.asmdef | 0 XRTK.SDK/Packages/com.xrtk.sdk/{ => Runtime}/XRTK.SDK.asmdef.meta | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename XRTK.SDK/Packages/com.xrtk.sdk/{ => Runtime}/XRTK.SDK.asmdef (100%) rename XRTK.SDK/Packages/com.xrtk.sdk/{ => Runtime}/XRTK.SDK.asmdef.meta (100%) diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/XRTK.SDK.asmdef b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/XRTK.SDK.asmdef similarity index 100% rename from XRTK.SDK/Packages/com.xrtk.sdk/XRTK.SDK.asmdef rename to XRTK.SDK/Packages/com.xrtk.sdk/Runtime/XRTK.SDK.asmdef diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/XRTK.SDK.asmdef.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/XRTK.SDK.asmdef.meta similarity index 100% rename from XRTK.SDK/Packages/com.xrtk.sdk/XRTK.SDK.asmdef.meta rename to XRTK.SDK/Packages/com.xrtk.sdk/Runtime/XRTK.SDK.asmdef.meta From a680deebb7c4eac57de712661179fce4b0b1c61a Mon Sep 17 00:00:00 2001 From: Dino Fejzagic Date: Mon, 27 Apr 2020 16:09:02 +0200 Subject: [PATCH 02/78] Fix recorded poses assets --- .../HandControllers/RecordedPoses/FlatHandPose.asset | 3 ++- .../HandControllers/RecordedPoses/GrabHandPose.asset | 3 ++- .../HandControllers/RecordedPoses/OpenHandPose.asset | 5 +++-- .../HandControllers/RecordedPoses/PinchHandPose.asset | 5 +++-- .../RecordedPoses/PinchSteadyWristHandPose.asset | 7 ++++--- .../HandControllers/RecordedPoses/PokeHandPose.asset | 5 +++-- .../HandControllers/RecordedPoses/ThumbsUpHandPose.asset | 7 ++++--- .../HandControllers/RecordedPoses/VictoryHandPose.asset | 5 +++-- 8 files changed, 24 insertions(+), 16 deletions(-) diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/RecordedPoses/FlatHandPose.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/RecordedPoses/FlatHandPose.asset index 9049d2de..a335326c 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/RecordedPoses/FlatHandPose.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/RecordedPoses/FlatHandPose.asset @@ -9,11 +9,12 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e575260027d17dc41a06f78eb50d0132, type: 3} + m_Script: {fileID: 11500000, guid: 67355724a5b4fd841bbf691ac44ad25d, type: 3} m_Name: FlatHandPose m_EditorClassIdentifier: id: flat description: Flat hand with fingers spread out. isDefault: 0 + isSelectionPose: 0 keyCode: 49 data: {fileID: 4900000, guid: e7d04f951437f78409ca4c7a29bf4f4d, type: 3} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/RecordedPoses/GrabHandPose.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/RecordedPoses/GrabHandPose.asset index 89317587..da4a9462 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/RecordedPoses/GrabHandPose.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/RecordedPoses/GrabHandPose.asset @@ -9,11 +9,12 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e575260027d17dc41a06f78eb50d0132, type: 3} + m_Script: {fileID: 11500000, guid: 67355724a5b4fd841bbf691ac44ad25d, type: 3} m_Name: GrabHandPose m_EditorClassIdentifier: id: grab description: Grab with whole hand, fist shape. isDefault: 0 + isSelectionPose: 0 keyCode: 50 data: {fileID: 4900000, guid: 26804200b794ba145a05c73b28c1134d, type: 3} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/RecordedPoses/OpenHandPose.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/RecordedPoses/OpenHandPose.asset index 0c51fe83..ad83f0f9 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/RecordedPoses/OpenHandPose.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/RecordedPoses/OpenHandPose.asset @@ -9,11 +9,12 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e575260027d17dc41a06f78eb50d0132, type: 3} + m_Script: {fileID: 11500000, guid: 67355724a5b4fd841bbf691ac44ad25d, type: 3} m_Name: OpenHandPose m_EditorClassIdentifier: id: open description: Relaxed hand pose. isDefault: 1 - keyCode: 0 + isSelectionPose: 0 + keyCode: 51 data: {fileID: 4900000, guid: 09df9528e8b9f6549a5f0989692b84ed, type: 3} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/RecordedPoses/PinchHandPose.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/RecordedPoses/PinchHandPose.asset index e2cf84e0..3466714e 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/RecordedPoses/PinchHandPose.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/RecordedPoses/PinchHandPose.asset @@ -9,11 +9,12 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e575260027d17dc41a06f78eb50d0132, type: 3} + m_Script: {fileID: 11500000, guid: 67355724a5b4fd841bbf691ac44ad25d, type: 3} m_Name: PinchHandPose m_EditorClassIdentifier: id: pinch description: Index finger and Thumb touching, index tip does not move. isDefault: 0 - keyCode: 323 + isSelectionPose: 0 + keyCode: 52 data: {fileID: 4900000, guid: 00711cdd19e18a74db7fc25c63d9a0bf, type: 3} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/RecordedPoses/PinchSteadyWristHandPose.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/RecordedPoses/PinchSteadyWristHandPose.asset index 8490d077..6974b128 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/RecordedPoses/PinchSteadyWristHandPose.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/RecordedPoses/PinchSteadyWristHandPose.asset @@ -9,11 +9,12 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e575260027d17dc41a06f78eb50d0132, type: 3} + m_Script: {fileID: 11500000, guid: 67355724a5b4fd841bbf691ac44ad25d, type: 3} m_Name: PinchSteadyWristHandPose m_EditorClassIdentifier: - id: pinch-steady + id: pinch-steady-wrist description: Index finger and Thumb touching, wrist does not move. isDefault: 0 - keyCode: 51 + isSelectionPose: 0 + keyCode: 53 data: {fileID: 4900000, guid: 6bcf1fd0588649141811cbcb8135da00, type: 3} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/RecordedPoses/PokeHandPose.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/RecordedPoses/PokeHandPose.asset index 3a6d8e14..521a0458 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/RecordedPoses/PokeHandPose.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/RecordedPoses/PokeHandPose.asset @@ -9,11 +9,12 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e575260027d17dc41a06f78eb50d0132, type: 3} + m_Script: {fileID: 11500000, guid: 67355724a5b4fd841bbf691ac44ad25d, type: 3} m_Name: PokeHandPose m_EditorClassIdentifier: id: poke description: Index finger stretched out. isDefault: 0 - keyCode: 324 + isSelectionPose: 0 + keyCode: 54 data: {fileID: 4900000, guid: 22b97ff789b664c4f9b9ee223c29eee7, type: 3} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/RecordedPoses/ThumbsUpHandPose.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/RecordedPoses/ThumbsUpHandPose.asset index 407e6c59..6934fd90 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/RecordedPoses/ThumbsUpHandPose.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/RecordedPoses/ThumbsUpHandPose.asset @@ -9,11 +9,12 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e575260027d17dc41a06f78eb50d0132, type: 3} + m_Script: {fileID: 11500000, guid: 67355724a5b4fd841bbf691ac44ad25d, type: 3} m_Name: ThumbsUpHandPose m_EditorClassIdentifier: - id: ok + id: thumbs-up description: OK sign. isDefault: 0 - keyCode: 52 + isSelectionPose: 0 + keyCode: 55 data: {fileID: 4900000, guid: 71175c7404cbaee408470b929ff3ae1f, type: 3} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/RecordedPoses/VictoryHandPose.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/RecordedPoses/VictoryHandPose.asset index ede8b7e4..44c8f7a1 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/RecordedPoses/VictoryHandPose.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/RecordedPoses/VictoryHandPose.asset @@ -9,11 +9,12 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e575260027d17dc41a06f78eb50d0132, type: 3} + m_Script: {fileID: 11500000, guid: 67355724a5b4fd841bbf691ac44ad25d, type: 3} m_Name: VictoryHandPose m_EditorClassIdentifier: id: victory description: Victory sign. isDefault: 0 - keyCode: 53 + isSelectionPose: 0 + keyCode: 56 data: {fileID: 4900000, guid: 21f98e595bbf7294c96c87c187f41196, type: 3} From d786a97c5d2d6a1d0f7840c15a844cf3a6128b2a Mon Sep 17 00:00:00 2001 From: Dino Fejzagic Date: Tue, 28 Apr 2020 21:50:52 +0200 Subject: [PATCH 03/78] Fix simulation profiles --- .../Left/MoveAway(Depth)Profile.asset.meta | 2 +- .../Left/MoveCloser(Depth)Profile.asset.meta | 2 +- .../Left/PitchClockwiseProfile.asset.meta | 2 +- .../PitchCounterClockwiseProfile.asset.meta | 2 +- .../Left/RollClockwiseProfile.asset.meta | 2 +- .../RollCounterClockwiseProfile.asset.meta | 2 +- .../Left/SpatialPointerProfile.asset | 30 +++++++++++++++++++ .../Left/SpatialPointerProfile.asset.meta | 8 +++++ .../Left/YawClockwiseProfile.asset.meta | 2 +- .../YawCounterClockwiseProfile.asset.meta | 2 +- .../LeftSimulatedHandControllerProfile.asset | 17 ++++++----- ...tSimulatedHandControllerProfile.asset.meta | 2 +- .../Right/MoveAway(Depth)Profile.asset.meta | 2 +- .../Right/MoveCloser(Depth)Profile.asset.meta | 2 +- .../Right/PitchClockwiseProfile.asset.meta | 2 +- .../PitchCounterClockwiseProfile.asset.meta | 2 +- .../Right/RollClockwiseProfile.asset.meta | 2 +- .../RollCounterClockwiseProfile.asset.meta | 2 +- .../Right/SpatialPointerProfile.asset | 30 +++++++++++++++++++ .../Right/SpatialPointerProfile.asset.meta | 8 +++++ .../Right/YawClockwiseProfile.asset.meta | 2 +- .../YawCounterClockwiseProfile.asset.meta | 2 +- .../RightSimulatedHandControllerProfile.asset | 17 ++++++----- ...tSimulatedHandControllerProfile.asset.meta | 2 +- ...tedHandControllerDataProviderProfile.asset | 14 ++------- 25 files changed, 115 insertions(+), 45 deletions(-) create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Left/SpatialPointerProfile.asset create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Left/SpatialPointerProfile.asset.meta create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Right/SpatialPointerProfile.asset create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Right/SpatialPointerProfile.asset.meta diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Left/MoveAway(Depth)Profile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Left/MoveAway(Depth)Profile.asset.meta index b3c294ef..fe609c97 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Left/MoveAway(Depth)Profile.asset.meta +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Left/MoveAway(Depth)Profile.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7c7175d2c832a1d4795b54f95310082e +guid: d66ff6bdac77e284a9b56cd8ff7588f8 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Left/MoveCloser(Depth)Profile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Left/MoveCloser(Depth)Profile.asset.meta index 48902589..8ccd771d 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Left/MoveCloser(Depth)Profile.asset.meta +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Left/MoveCloser(Depth)Profile.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 212e13dbdd5de81429f1a8e127154c43 +guid: e001f5e0dec2fdc4e8f7361051c16285 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Left/PitchClockwiseProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Left/PitchClockwiseProfile.asset.meta index 3524dbac..9bae3d7a 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Left/PitchClockwiseProfile.asset.meta +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Left/PitchClockwiseProfile.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5cbd8750552cd9a469234791978a7d9f +guid: d41a902589d58634c91da2d0bddc63a2 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Left/PitchCounterClockwiseProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Left/PitchCounterClockwiseProfile.asset.meta index 84894e69..d93fb275 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Left/PitchCounterClockwiseProfile.asset.meta +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Left/PitchCounterClockwiseProfile.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1b20f6af9b5a4b04db68d0d3360f22b3 +guid: 02740da3b13d2504d8d707db21806544 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Left/RollClockwiseProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Left/RollClockwiseProfile.asset.meta index f303d7f6..24758509 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Left/RollClockwiseProfile.asset.meta +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Left/RollClockwiseProfile.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e27d24f02c2a18644b3779d7cdbe558d +guid: 2aed84cf960b4a44e945ade98bcd6a46 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Left/RollCounterClockwiseProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Left/RollCounterClockwiseProfile.asset.meta index b574aae0..cc0f60e3 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Left/RollCounterClockwiseProfile.asset.meta +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Left/RollCounterClockwiseProfile.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 77425eb492db9f841be8429a707cac85 +guid: 5147df11251971d49bad06a892acb4b8 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Left/SpatialPointerProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Left/SpatialPointerProfile.asset new file mode 100644 index 00000000..4d395916 --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Left/SpatialPointerProfile.asset @@ -0,0 +1,30 @@ +%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: e3fb79524faca40478c0844c24e542f7, type: 3} + m_Name: SpatialPointerProfile + m_EditorClassIdentifier: + interactionMapping: + description: Spatial Pointer + stateChangeType: 0 + axisType: 7 + inputType: 3 + inputAction: + profileGuid: 00000000000000000000000000000000 + id: 0 + description: None + axisConstraint: 0 + keyCode: 0 + inputName: + axisCodeX: + axisCodeY: + inputProcessors: [] + pointerProfiles: [] diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Left/SpatialPointerProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Left/SpatialPointerProfile.asset.meta new file mode 100644 index 00000000..52a2d08f --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Left/SpatialPointerProfile.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f44a8ca60623dae40ab7bb587b25f9a4 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Left/YawClockwiseProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Left/YawClockwiseProfile.asset.meta index dcff0873..3060d755 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Left/YawClockwiseProfile.asset.meta +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Left/YawClockwiseProfile.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 840c6c58517905a438509123ade977c9 +guid: 75cc1e0a54a5fe648a4cde0278665293 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Left/YawCounterClockwiseProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Left/YawCounterClockwiseProfile.asset.meta index 2c34a532..f6309b3b 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Left/YawCounterClockwiseProfile.asset.meta +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Left/YawCounterClockwiseProfile.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b7a023ed9a50a624691ad0b5a440cb3c +guid: 17f3fbe848f439d42b507e772d4815f2 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/LeftSimulatedHandControllerProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/LeftSimulatedHandControllerProfile.asset index a61e9935..f10ea4db 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/LeftSimulatedHandControllerProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/LeftSimulatedHandControllerProfile.asset @@ -19,11 +19,12 @@ MonoBehaviour: type: 2} useCustomInteractions: 0 interactionMappingProfiles: - - {fileID: 11400000, guid: 840c6c58517905a438509123ade977c9, type: 2} - - {fileID: 11400000, guid: b7a023ed9a50a624691ad0b5a440cb3c, type: 2} - - {fileID: 11400000, guid: 5cbd8750552cd9a469234791978a7d9f, type: 2} - - {fileID: 11400000, guid: 1b20f6af9b5a4b04db68d0d3360f22b3, type: 2} - - {fileID: 11400000, guid: e27d24f02c2a18644b3779d7cdbe558d, type: 2} - - {fileID: 11400000, guid: 77425eb492db9f841be8429a707cac85, type: 2} - - {fileID: 11400000, guid: 7c7175d2c832a1d4795b54f95310082e, type: 2} - - {fileID: 11400000, guid: 212e13dbdd5de81429f1a8e127154c43, type: 2} + - {fileID: 11400000, guid: f44a8ca60623dae40ab7bb587b25f9a4, type: 2} + - {fileID: 11400000, guid: 75cc1e0a54a5fe648a4cde0278665293, type: 2} + - {fileID: 11400000, guid: 17f3fbe848f439d42b507e772d4815f2, type: 2} + - {fileID: 11400000, guid: d41a902589d58634c91da2d0bddc63a2, type: 2} + - {fileID: 11400000, guid: 02740da3b13d2504d8d707db21806544, type: 2} + - {fileID: 11400000, guid: 2aed84cf960b4a44e945ade98bcd6a46, type: 2} + - {fileID: 11400000, guid: 5147df11251971d49bad06a892acb4b8, type: 2} + - {fileID: 11400000, guid: d66ff6bdac77e284a9b56cd8ff7588f8, type: 2} + - {fileID: 11400000, guid: e001f5e0dec2fdc4e8f7361051c16285, type: 2} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/LeftSimulatedHandControllerProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/LeftSimulatedHandControllerProfile.asset.meta index e548ea59..dda578e4 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/LeftSimulatedHandControllerProfile.asset.meta +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/LeftSimulatedHandControllerProfile.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9d52d9ee430adf349a30a99f58db3621 +guid: db8d37cbb21a4af498ee7f59d7428f91 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Right/MoveAway(Depth)Profile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Right/MoveAway(Depth)Profile.asset.meta index 8d0e3248..85a7d80a 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Right/MoveAway(Depth)Profile.asset.meta +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Right/MoveAway(Depth)Profile.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7ad3d1e6ebebff74bb20f5d563a8f314 +guid: 5691c80c2458e4242950430e18fcae51 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Right/MoveCloser(Depth)Profile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Right/MoveCloser(Depth)Profile.asset.meta index 9368c7b8..54b55e34 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Right/MoveCloser(Depth)Profile.asset.meta +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Right/MoveCloser(Depth)Profile.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c8bf5e99ebbae504db3efffd3c0b4973 +guid: f817aacf575e5ff46afcc79914a029a1 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Right/PitchClockwiseProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Right/PitchClockwiseProfile.asset.meta index 57f6dbad..b7090c00 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Right/PitchClockwiseProfile.asset.meta +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Right/PitchClockwiseProfile.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 976e5a4ce8807fc479f4ef74a886341c +guid: 2aee855545b476e4b89c55f2e9709de4 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Right/PitchCounterClockwiseProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Right/PitchCounterClockwiseProfile.asset.meta index 0da6ce1e..620d776c 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Right/PitchCounterClockwiseProfile.asset.meta +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Right/PitchCounterClockwiseProfile.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9247e3a5e0780c845964e1a66dc545fc +guid: 7bf68e10b5b034b4bb27ecaf05d2e9d7 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Right/RollClockwiseProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Right/RollClockwiseProfile.asset.meta index d2c1fc42..4319683e 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Right/RollClockwiseProfile.asset.meta +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Right/RollClockwiseProfile.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6ff868448fabeaa4e8cdd47927868fde +guid: 2b5f27dd676066d47a6b689e3644e40a NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Right/RollCounterClockwiseProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Right/RollCounterClockwiseProfile.asset.meta index ccb78a0b..8cbf8347 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Right/RollCounterClockwiseProfile.asset.meta +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Right/RollCounterClockwiseProfile.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3e279bf4d42c07d4eaf934f7d044446c +guid: 676aa2247838c8f429d7458323b83d78 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Right/SpatialPointerProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Right/SpatialPointerProfile.asset new file mode 100644 index 00000000..4d395916 --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Right/SpatialPointerProfile.asset @@ -0,0 +1,30 @@ +%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: e3fb79524faca40478c0844c24e542f7, type: 3} + m_Name: SpatialPointerProfile + m_EditorClassIdentifier: + interactionMapping: + description: Spatial Pointer + stateChangeType: 0 + axisType: 7 + inputType: 3 + inputAction: + profileGuid: 00000000000000000000000000000000 + id: 0 + description: None + axisConstraint: 0 + keyCode: 0 + inputName: + axisCodeX: + axisCodeY: + inputProcessors: [] + pointerProfiles: [] diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Right/SpatialPointerProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Right/SpatialPointerProfile.asset.meta new file mode 100644 index 00000000..2f7c7dec --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Right/SpatialPointerProfile.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e54f3b1cd9a54284a9fdbdf19cbc4dbe +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Right/YawClockwiseProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Right/YawClockwiseProfile.asset.meta index 835a2e4a..6b918544 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Right/YawClockwiseProfile.asset.meta +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Right/YawClockwiseProfile.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 50d3bae1663773240a303ab41d01585e +guid: c811bb700747c1c4e98ad88949df2b54 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Right/YawCounterClockwiseProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Right/YawCounterClockwiseProfile.asset.meta index 4c0b9964..3edfecad 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Right/YawCounterClockwiseProfile.asset.meta +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/Right/YawCounterClockwiseProfile.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f65555517fc561a43b71b6071b152a81 +guid: 9ca2333c70b50404d9e2071a2a8ecf67 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/RightSimulatedHandControllerProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/RightSimulatedHandControllerProfile.asset index 079a716e..e719288c 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/RightSimulatedHandControllerProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/RightSimulatedHandControllerProfile.asset @@ -19,11 +19,12 @@ MonoBehaviour: type: 2} useCustomInteractions: 0 interactionMappingProfiles: - - {fileID: 11400000, guid: 50d3bae1663773240a303ab41d01585e, type: 2} - - {fileID: 11400000, guid: f65555517fc561a43b71b6071b152a81, type: 2} - - {fileID: 11400000, guid: 976e5a4ce8807fc479f4ef74a886341c, type: 2} - - {fileID: 11400000, guid: 9247e3a5e0780c845964e1a66dc545fc, type: 2} - - {fileID: 11400000, guid: 6ff868448fabeaa4e8cdd47927868fde, type: 2} - - {fileID: 11400000, guid: 3e279bf4d42c07d4eaf934f7d044446c, type: 2} - - {fileID: 11400000, guid: 7ad3d1e6ebebff74bb20f5d563a8f314, type: 2} - - {fileID: 11400000, guid: c8bf5e99ebbae504db3efffd3c0b4973, type: 2} + - {fileID: 11400000, guid: e54f3b1cd9a54284a9fdbdf19cbc4dbe, type: 2} + - {fileID: 11400000, guid: c811bb700747c1c4e98ad88949df2b54, type: 2} + - {fileID: 11400000, guid: 9ca2333c70b50404d9e2071a2a8ecf67, type: 2} + - {fileID: 11400000, guid: 2aee855545b476e4b89c55f2e9709de4, type: 2} + - {fileID: 11400000, guid: 7bf68e10b5b034b4bb27ecaf05d2e9d7, type: 2} + - {fileID: 11400000, guid: 2b5f27dd676066d47a6b689e3644e40a, type: 2} + - {fileID: 11400000, guid: 676aa2247838c8f429d7458323b83d78, type: 2} + - {fileID: 11400000, guid: 5691c80c2458e4242950430e18fcae51, type: 2} + - {fileID: 11400000, guid: f817aacf575e5ff46afcc79914a029a1, type: 2} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/RightSimulatedHandControllerProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/RightSimulatedHandControllerProfile.asset.meta index c0e39f89..ca4329eb 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/RightSimulatedHandControllerProfile.asset.meta +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/Simulated/RightSimulatedHandControllerProfile.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: fcf8f57e29a91354d9eaf8ce36dce0c1 +guid: bc5b8bebbe1a1ee4b8ba8916077368ed NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/SimulatedHandControllerDataProviderProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/SimulatedHandControllerDataProviderProfile.asset index 69f81af3..b838c35a 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/SimulatedHandControllerDataProviderProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/SimulatedHandControllerDataProviderProfile.asset @@ -14,8 +14,8 @@ MonoBehaviour: m_EditorClassIdentifier: hasSetupDefaults: 1 controllerMappingProfiles: - - {fileID: 11400000, guid: 9d52d9ee430adf349a30a99f58db3621, type: 2} - - {fileID: 11400000, guid: fcf8f57e29a91354d9eaf8ce36dce0c1, type: 2} + - {fileID: 11400000, guid: db8d37cbb21a4af498ee7f59d7428f91, type: 2} + - {fileID: 11400000, guid: bc5b8bebbe1a1ee4b8ba8916077368ed, type: 2} simulatedUpdateFrequency: 0 controllerHideTimeout: 0.2 defaultDistance: 0.5 @@ -26,17 +26,9 @@ MonoBehaviour: toggleRightPersistentKey: 121 rightControllerTrackedKey: 32 rotationSpeed: 100 - poseDefinitions: - - {fileID: 11400000, guid: 287ec39181134fc4eaee0a3a5e47ab9f, type: 2} - - {fileID: 11400000, guid: d3d67de686d952849b6771a111518e0d, type: 2} - - {fileID: 11400000, guid: 5269abf28f233044d9ec71f10b94552d, type: 2} - - {fileID: 11400000, guid: 0ece078ec16cbbd44bb7eba974dca862, type: 2} - - {fileID: 11400000, guid: 9fba060de129a9d4ea929a0d74fdc3fa, type: 2} - - {fileID: 11400000, guid: 1251200226ad995498472e45aaf12178, type: 2} - - {fileID: 11400000, guid: 5e6bcc3863bdc634d82a8a59598a070b, type: 2} - - {fileID: 11400000, guid: 2f6c29c72cd30c74f9717c932bd87a4a, type: 2} handPoseAnimationSpeed: 8 handMeshingEnabled: 0 handPhysicsEnabled: 0 useTriggers: 0 boundsMode: 0 + trackedPoses: [] From ffb9529373ee07e8a7aad9a95c4151e3284ff0e7 Mon Sep 17 00:00:00 2001 From: Dino Fejzagic Date: Tue, 28 Apr 2020 21:59:24 +0200 Subject: [PATCH 04/78] Assign default tracked poses --- .../Input/DefaultMixedRealityInputSystemProfile.asset | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DefaultMixedRealityInputSystemProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DefaultMixedRealityInputSystemProfile.asset index ec6b28e1..399b11f6 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DefaultMixedRealityInputSystemProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DefaultMixedRealityInputSystemProfile.asset @@ -151,6 +151,15 @@ MonoBehaviour: handPhysicsEnabled: 0 useTriggers: 0 boundsMode: 0 + trackedPoses: + - {fileID: 11400000, guid: 287ec39181134fc4eaee0a3a5e47ab9f, type: 2} + - {fileID: 11400000, guid: d3d67de686d952849b6771a111518e0d, type: 2} + - {fileID: 11400000, guid: 5269abf28f233044d9ec71f10b94552d, type: 2} + - {fileID: 11400000, guid: 0ece078ec16cbbd44bb7eba974dca862, type: 2} + - {fileID: 11400000, guid: 9fba060de129a9d4ea929a0d74fdc3fa, type: 2} + - {fileID: 11400000, guid: 1251200226ad995498472e45aaf12178, type: 2} + - {fileID: 11400000, guid: 5e6bcc3863bdc634d82a8a59598a070b, type: 2} + - {fileID: 11400000, guid: 2f6c29c72cd30c74f9717c932bd87a4a, type: 2} inputActionsProfile: {fileID: 11400000, guid: 399335ccc89c4d12b79f3539ca7771db, type: 2} speechCommandsProfile: {fileID: 11400000, guid: 89759c8b9c98420794a5d650ce3b2f90, From dd96378471036279a463a33ad154fa5ee588680c Mon Sep 17 00:00:00 2001 From: Dino Fejzagic Date: Tue, 28 Apr 2020 22:16:39 +0200 Subject: [PATCH 05/78] Copy over SDK changes --- .../RecordedPoses/OpenHandPose.asset | 2 +- .../RecordedPoses/PinchHandPose.asset | 2 +- .../PinchSteadyWristHandPose.asset | 2 +- .../RecordedPoses/PokeHandPose.asset | 2 +- .../RecordedPoses/ThumbsUpHandPose.asset | 2 +- .../RecordedPoses/VictoryHandPose.asset | 2 +- .../UX/Prefabs/Hands/HandJointGizmo.prefab | 3 +- .../UX/Prefabs/Hands/HandLeft_Joints.prefab | 68 +++++++++++++++++- .../UX/Prefabs/Hands/HandLeft_Mesh.prefab | 67 +++++++++++++++++- .../UX/Prefabs/Hands/HandRight_Joints.prefab | 69 ++++++++++++++++++- .../UX/Prefabs/Hands/HandRight_Mesh.prefab | 67 +++++++++++++++++- .../Hands/BaseHandControllerVisualizer.cs | 4 +- .../Hands/HandControllerJointsVisualizer.cs | 14 +++- 13 files changed, 288 insertions(+), 16 deletions(-) diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/RecordedPoses/OpenHandPose.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/RecordedPoses/OpenHandPose.asset index ad83f0f9..dc649e36 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/RecordedPoses/OpenHandPose.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/RecordedPoses/OpenHandPose.asset @@ -16,5 +16,5 @@ MonoBehaviour: description: Relaxed hand pose. isDefault: 1 isSelectionPose: 0 - keyCode: 51 + keyCode: 0 data: {fileID: 4900000, guid: 09df9528e8b9f6549a5f0989692b84ed, type: 3} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/RecordedPoses/PinchHandPose.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/RecordedPoses/PinchHandPose.asset index 3466714e..627117eb 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/RecordedPoses/PinchHandPose.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/RecordedPoses/PinchHandPose.asset @@ -16,5 +16,5 @@ MonoBehaviour: description: Index finger and Thumb touching, index tip does not move. isDefault: 0 isSelectionPose: 0 - keyCode: 52 + keyCode: 323 data: {fileID: 4900000, guid: 00711cdd19e18a74db7fc25c63d9a0bf, type: 3} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/RecordedPoses/PinchSteadyWristHandPose.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/RecordedPoses/PinchSteadyWristHandPose.asset index 6974b128..b99c33f1 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/RecordedPoses/PinchSteadyWristHandPose.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/RecordedPoses/PinchSteadyWristHandPose.asset @@ -16,5 +16,5 @@ MonoBehaviour: description: Index finger and Thumb touching, wrist does not move. isDefault: 0 isSelectionPose: 0 - keyCode: 53 + keyCode: 51 data: {fileID: 4900000, guid: 6bcf1fd0588649141811cbcb8135da00, type: 3} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/RecordedPoses/PokeHandPose.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/RecordedPoses/PokeHandPose.asset index 521a0458..6c0d4c49 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/RecordedPoses/PokeHandPose.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/RecordedPoses/PokeHandPose.asset @@ -16,5 +16,5 @@ MonoBehaviour: description: Index finger stretched out. isDefault: 0 isSelectionPose: 0 - keyCode: 54 + keyCode: 324 data: {fileID: 4900000, guid: 22b97ff789b664c4f9b9ee223c29eee7, type: 3} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/RecordedPoses/ThumbsUpHandPose.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/RecordedPoses/ThumbsUpHandPose.asset index 6934fd90..93154d20 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/RecordedPoses/ThumbsUpHandPose.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/RecordedPoses/ThumbsUpHandPose.asset @@ -16,5 +16,5 @@ MonoBehaviour: description: OK sign. isDefault: 0 isSelectionPose: 0 - keyCode: 55 + keyCode: 52 data: {fileID: 4900000, guid: 71175c7404cbaee408470b929ff3ae1f, type: 3} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/RecordedPoses/VictoryHandPose.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/RecordedPoses/VictoryHandPose.asset index 44c8f7a1..6d34ce35 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/RecordedPoses/VictoryHandPose.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/DefaultProfiles/Input/DataProviders/HandControllers/RecordedPoses/VictoryHandPose.asset @@ -16,5 +16,5 @@ MonoBehaviour: description: Victory sign. isDefault: 0 isSelectionPose: 0 - keyCode: 56 + keyCode: 53 data: {fileID: 4900000, guid: 21f98e595bbf7294c96c87c187f41196, type: 3} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Prefabs/Hands/HandJointGizmo.prefab b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Prefabs/Hands/HandJointGizmo.prefab index 5028b707..86da0c46 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Prefabs/Hands/HandJointGizmo.prefab +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Prefabs/Hands/HandJointGizmo.prefab @@ -195,7 +195,6 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 - m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -508,7 +507,7 @@ Transform: m_GameObject: {fileID: 1370450866519632} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} + m_LocalScale: {x: 0.3, y: 0.3, z: 0.3} m_Children: - {fileID: 4831455789484130} - {fileID: 4487561386526946} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Prefabs/Hands/HandLeft_Joints.prefab b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Prefabs/Hands/HandLeft_Joints.prefab index 89290754..c8bb380b 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Prefabs/Hands/HandLeft_Joints.prefab +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Prefabs/Hands/HandLeft_Joints.prefab @@ -27,7 +27,8 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] + m_Children: + - {fileID: 6562379902637120251} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -51,6 +52,8 @@ MonoBehaviour: id: 0 description: None axisConstraint: 0 + wristPrefab: {fileID: 3141352679402889276, guid: ecbaba8bdbeef32459e87a1ce06bfd36, + type: 3} jointPrefab: {fileID: 3141352679402889276, guid: ecbaba8bdbeef32459e87a1ce06bfd36, type: 3} palmPrefab: {fileID: 6797406804172968804, guid: 80997b0aa2ab2d7429bb5e7f1cddbace, @@ -58,3 +61,66 @@ MonoBehaviour: fingertipPrefab: {fileID: 4719395302953375155, guid: ceff11f7c8b644246b621c521c0ba767, type: 3} indexFingertipColor: {r: 0, g: 1, b: 1, a: 1} +--- !u!1001 &6557838890691165925 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 807390424017236910} + m_Modifications: + - target: {fileID: 1370450866519632, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + propertyPath: m_Name + value: HandJointGizmo + objectReference: {fileID: 0} + - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} +--- !u!4 &6562379902637120251 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, + type: 3} + m_PrefabInstance: {fileID: 6557838890691165925} + m_PrefabAsset: {fileID: 0} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Prefabs/Hands/HandLeft_Mesh.prefab b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Prefabs/Hands/HandLeft_Mesh.prefab index 9ad1d566..47fb3fbd 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Prefabs/Hands/HandLeft_Mesh.prefab +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Prefabs/Hands/HandLeft_Mesh.prefab @@ -27,7 +27,8 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] + m_Children: + - {fileID: 3291870944053985864} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -47,8 +48,72 @@ MonoBehaviour: destroyOnSourceLost: 1 useSourcePoseData: 1 poseAction: + profileGuid: 00000000000000000000000000000000 id: 0 description: None axisConstraint: 0 handMeshPrefab: {fileID: 1887883006053652, guid: 81cacd47fbb47714d8b19cffb1edf4af, type: 3} +--- !u!1001 &3296438492594103894 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 807390424017236910} + m_Modifications: + - target: {fileID: 1370450866519632, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + propertyPath: m_Name + value: HandJointGizmo + objectReference: {fileID: 0} + - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} +--- !u!4 &3291870944053985864 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, + type: 3} + m_PrefabInstance: {fileID: 3296438492594103894} + m_PrefabAsset: {fileID: 0} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Prefabs/Hands/HandRight_Joints.prefab b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Prefabs/Hands/HandRight_Joints.prefab index 316e345b..c755e7d9 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Prefabs/Hands/HandRight_Joints.prefab +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Prefabs/Hands/HandRight_Joints.prefab @@ -27,7 +27,8 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] + m_Children: + - {fileID: 2551293412768532935} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -47,9 +48,12 @@ MonoBehaviour: destroyOnSourceLost: 1 useSourcePoseData: 1 poseAction: + profileGuid: 00000000000000000000000000000000 id: 0 description: None axisConstraint: 0 + wristPrefab: {fileID: 3141352679402889276, guid: ecbaba8bdbeef32459e87a1ce06bfd36, + type: 3} jointPrefab: {fileID: 3141352679402889276, guid: ecbaba8bdbeef32459e87a1ce06bfd36, type: 3} palmPrefab: {fileID: 6797406804172968804, guid: 80997b0aa2ab2d7429bb5e7f1cddbace, @@ -57,3 +61,66 @@ MonoBehaviour: fingertipPrefab: {fileID: 4719395302953375155, guid: ceff11f7c8b644246b621c521c0ba767, type: 3} indexFingertipColor: {r: 0, g: 1, b: 1, a: 1} +--- !u!1001 &2555895791342759385 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 6214577301168553923} + m_Modifications: + - target: {fileID: 1370450866519632, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + propertyPath: m_Name + value: HandJointGizmo + objectReference: {fileID: 0} + - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} +--- !u!4 &2551293412768532935 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, + type: 3} + m_PrefabInstance: {fileID: 2555895791342759385} + m_PrefabAsset: {fileID: 0} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Prefabs/Hands/HandRight_Mesh.prefab b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Prefabs/Hands/HandRight_Mesh.prefab index 0e3777de..4542b480 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Prefabs/Hands/HandRight_Mesh.prefab +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Prefabs/Hands/HandRight_Mesh.prefab @@ -27,7 +27,8 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] + m_Children: + - {fileID: 1467966005019003541} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -47,8 +48,72 @@ MonoBehaviour: destroyOnSourceLost: 1 useSourcePoseData: 1 poseAction: + profileGuid: 00000000000000000000000000000000 id: 0 description: None axisConstraint: 0 handMeshPrefab: {fileID: 1887883006053652, guid: 81cacd47fbb47714d8b19cffb1edf4af, type: 3} +--- !u!1001 &1463420515438538379 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 6214577301168553923} + m_Modifications: + - target: {fileID: 1370450866519632, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + propertyPath: m_Name + value: HandJointGizmo + objectReference: {fileID: 0} + - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} +--- !u!4 &1467966005019003541 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, + type: 3} + m_PrefabInstance: {fileID: 1463420515438538379} + m_PrefabAsset: {fileID: 0} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/BaseHandControllerVisualizer.cs b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/BaseHandControllerVisualizer.cs index 37af3db1..46407dbf 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/BaseHandControllerVisualizer.cs +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/BaseHandControllerVisualizer.cs @@ -113,8 +113,8 @@ private void UpdateHandJointTransforms(HandData handData) { var jointTransform = GetOrCreateJointTransform(handJoint); var jointPose = jointPoses[handJoint]; - jointTransform.localPosition = jointPose.Position; - jointTransform.localRotation = jointPose.Rotation; + jointTransform.localPosition = jointTransform.parent.InverseTransformPoint(jointPose.Position); + jointTransform.localRotation = Quaternion.Inverse(jointPose.Rotation) * jointTransform.parent.rotation; } } } diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/HandControllerJointsVisualizer.cs b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/HandControllerJointsVisualizer.cs index 0c6e4c22..702a4626 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/HandControllerJointsVisualizer.cs +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/HandControllerJointsVisualizer.cs @@ -11,11 +11,14 @@ namespace XRTK.SDK.UX.Controllers.Hands /// /// Hand controller visualizer visualizing hand joints. /// - [System.Runtime.InteropServices.Guid("0B653537-D237-4622-ACC6-E351209A5882")] public class HandControllerJointsVisualizer : BaseHandControllerVisualizer { private readonly Dictionary jointVisualizations = new Dictionary(); + [SerializeField] + [Tooltip("The wrist prefab to use.")] + private GameObject wristPrefab = null; + [SerializeField] [Tooltip("The joint prefab to use.")] private GameObject jointPrefab = null; @@ -44,7 +47,11 @@ public override void OnInputChanged(InputEventData eventData) for (int i = 0; i < HandData.JointCount; i++) { - CreateJointVisualizerIfNotExists((TrackedHandJoint)i); + var joint = (TrackedHandJoint)i; + if (joint != TrackedHandJoint.None) + { + CreateJointVisualizerIfNotExists(joint); + } } } @@ -59,6 +66,9 @@ private void CreateJointVisualizerIfNotExists(TrackedHandJoint handJoint) switch (handJoint) { + case TrackedHandJoint.Wrist: + prefab = wristPrefab; + break; case TrackedHandJoint.Palm: prefab = palmPrefab; break; From 563db7bf4057f59b3c79dce4c68387680163964c Mon Sep 17 00:00:00 2001 From: Stephen Hodgson Date: Fri, 1 May 2020 09:22:25 -0400 Subject: [PATCH 06/78] fixed visualization references --- .../HandControllers/LeftHandVisualizationProfile.asset | 2 +- .../HandControllers/RightHandVisulaizationProfile.asset | 2 +- .../Scripts/Controllers/Hands/HandControllerJointsVisualizer.cs | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/LeftHandVisualizationProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/LeftHandVisualizationProfile.asset index eeba2d86..ce264b49 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/LeftHandVisualizationProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/LeftHandVisualizationProfile.asset @@ -13,7 +13,7 @@ MonoBehaviour: m_Name: LeftHandVisualizationProfile m_EditorClassIdentifier: controllerVisualizationType: - reference: 0b653537-d237-4622-acc6-e351209a5882 + reference: 9335e51f-52ab-48eb-a4dc-25832b6b56d6 useDefaultModels: 0 model: {fileID: 9173983480249558903, guid: 081f7848cfd94b34f9c774490cd7e2fb, type: 3} pointerPose: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RightHandVisulaizationProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RightHandVisulaizationProfile.asset index f73bd1c0..34314ca3 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RightHandVisulaizationProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RightHandVisulaizationProfile.asset @@ -13,7 +13,7 @@ MonoBehaviour: m_Name: RightHandVisulaizationProfile m_EditorClassIdentifier: controllerVisualizationType: - reference: 0b653537-d237-4622-acc6-e351209a5882 + reference: 9335e51f-52ab-48eb-a4dc-25832b6b56d6 useDefaultModels: 0 model: {fileID: 4856844564559928852, guid: 58cc7659d29f83f47b10dfd3bc4d1c97, type: 3} pointerPose: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/HandControllerJointsVisualizer.cs b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/HandControllerJointsVisualizer.cs index 702a4626..8f2e51a8 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/HandControllerJointsVisualizer.cs +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/HandControllerJointsVisualizer.cs @@ -11,6 +11,7 @@ namespace XRTK.SDK.UX.Controllers.Hands /// /// Hand controller visualizer visualizing hand joints. /// + [System.Runtime.InteropServices.Guid("9335E51F-52AB-48EB-A4DC-25832B6B56D6")] public class HandControllerJointsVisualizer : BaseHandControllerVisualizer { private readonly Dictionary jointVisualizations = new Dictionary(); From 0bdf1653347672d8474cd3a4b36748d11f02a8f3 Mon Sep 17 00:00:00 2001 From: Dino Fejzagic Date: Sat, 2 May 2020 13:58:51 +0200 Subject: [PATCH 07/78] Undo GUID change --- .../Scripts/Controllers/Hands/HandControllerJointsVisualizer.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/HandControllerJointsVisualizer.cs b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/HandControllerJointsVisualizer.cs index 8f2e51a8..4bb981a5 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/HandControllerJointsVisualizer.cs +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/HandControllerJointsVisualizer.cs @@ -11,7 +11,7 @@ namespace XRTK.SDK.UX.Controllers.Hands /// /// Hand controller visualizer visualizing hand joints. /// - [System.Runtime.InteropServices.Guid("9335E51F-52AB-48EB-A4DC-25832B6B56D6")] + [System.Runtime.InteropServices.Guid("0B653537-D237-4622-ACC6-E351209A5882")] public class HandControllerJointsVisualizer : BaseHandControllerVisualizer { private readonly Dictionary jointVisualizations = new Dictionary(); From 66168a2d3ae61cbd7bc172544b17f66b11918cb0 Mon Sep 17 00:00:00 2001 From: Dino Fejzagic Date: Sat, 2 May 2020 14:22:25 +0200 Subject: [PATCH 08/78] Restore recorded hand pose JSON assets lost by merge --- .../RecordedPoses/FlatHandPose.asset | 2 +- .../RecordedPoses/FlatHandPoseData.json | 436 ++++++++++++++++++ .../RecordedPoses/FlatHandPoseData.json.meta | 7 + .../RecordedPoses/GrabHandPose.asset | 2 +- .../RecordedPoses/GrabHandPoseData.json | 436 ++++++++++++++++++ .../RecordedPoses/GrabHandPoseData.json.meta | 7 + .../RecordedPoses/OpenHandPose.asset | 2 +- .../RecordedPoses/OpenHandPoseData.json | 436 ++++++++++++++++++ .../RecordedPoses/OpenHandPoseData.json.meta | 7 + .../OpenSteadyGrabPointHandPose.asset | 20 + .../OpenSteadyGrabPointHandPose.asset.meta | 8 + .../OpenSteadyGrabPointHandPoseData.json | 436 ++++++++++++++++++ .../OpenSteadyGrabPointHandPoseData.json.meta | 7 + .../RecordedPoses/PinchHandPose.asset | 2 +- .../RecordedPoses/PinchHandPoseData.json | 436 ++++++++++++++++++ .../RecordedPoses/PinchHandPoseData.json.meta | 7 + .../PinchSteadyWristHandPose.asset | 2 +- .../PinchSteadyWristHandPoseData.json | 436 ++++++++++++++++++ .../PinchSteadyWristHandPoseData.json.meta | 7 + .../RecordedPoses/PokeHandPose.asset | 2 +- .../RecordedPoses/PokeHandPoseData.json | 436 ++++++++++++++++++ .../RecordedPoses/PokeHandPoseData.json.meta | 7 + .../RecordedPoses/ThumbsUpHandPose.asset | 2 +- .../RecordedPoses/ThumbsUpHandPoseData.json | 436 ++++++++++++++++++ .../ThumbsUpHandPoseData.json.meta | 7 + .../RecordedPoses/VictoryHandPose.asset | 2 +- .../RecordedPoses/VictoryHandPoseData.json | 436 ++++++++++++++++++ .../VictoryHandPoseData.json.meta | 7 + 28 files changed, 4023 insertions(+), 8 deletions(-) create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/FlatHandPoseData.json create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/FlatHandPoseData.json.meta create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/GrabHandPoseData.json create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/GrabHandPoseData.json.meta create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/OpenHandPoseData.json create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/OpenHandPoseData.json.meta create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/OpenSteadyGrabPointHandPose.asset create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/OpenSteadyGrabPointHandPose.asset.meta create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/OpenSteadyGrabPointHandPoseData.json create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/OpenSteadyGrabPointHandPoseData.json.meta create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PinchHandPoseData.json create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PinchHandPoseData.json.meta create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PinchSteadyWristHandPoseData.json create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PinchSteadyWristHandPoseData.json.meta create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PokeHandPoseData.json create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PokeHandPoseData.json.meta create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/ThumbsUpHandPoseData.json create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/ThumbsUpHandPoseData.json.meta create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/VictoryHandPoseData.json create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/VictoryHandPoseData.json.meta diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/FlatHandPose.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/FlatHandPose.asset index a335326c..aaf4458d 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/FlatHandPose.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/FlatHandPose.asset @@ -17,4 +17,4 @@ MonoBehaviour: isDefault: 0 isSelectionPose: 0 keyCode: 49 - data: {fileID: 4900000, guid: e7d04f951437f78409ca4c7a29bf4f4d, type: 3} + data: {fileID: 4900000, guid: d01fab68eb29b1743b37beb044cfebe1, type: 3} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/FlatHandPoseData.json b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/FlatHandPoseData.json new file mode 100644 index 00000000..16645ce7 --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/FlatHandPoseData.json @@ -0,0 +1,436 @@ +{ + "items": [ + { + "joint": "None", + "pose": { + "position": { + "x": -0.0470723882317543, + "y": -0.18403607606887818, + "z": -0.5408412218093872 + }, + "rotation": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } + } + }, + { + "joint": "Wrist", + "pose": { + "position": { + "x": 0.06179157271981239, + "y": -0.15333214402198792, + "z": -0.0469515398144722 + }, + "rotation": { + "x": -0.5501163005828857, + "y": -0.11712269484996796, + "z": 0.001836930401623249, + "w": 0.8265576958656311 + } + } + }, + { + "joint": "Palm", + "pose": { + "position": { + "x": 0.05801215022802353, + "y": -0.1058567613363266, + "z": -0.02556976117193699 + }, + "rotation": { + "x": -0.5501163005828857, + "y": -0.11712269484996796, + "z": 0.001836930401623249, + "w": 0.8265576958656311 + } + } + }, + { + "joint": "ThumbMetacarpalJoint", + "pose": { + "position": { + "x": 0.03695414960384369, + "y": -0.1407443881034851, + "z": -0.03328647091984749 + }, + "rotation": { + "x": -0.5855690240859985, + "y": -0.10429229587316513, + "z": 0.5890942811965942, + "w": 0.547493577003479 + } + } + }, + { + "joint": "ThumbProximalJoint", + "pose": { + "position": { + "x": 0.00045104348100721836, + "y": -0.11720659583806992, + "z": -0.01997363194823265 + }, + "rotation": { + "x": -0.5386121273040772, + "y": 0.04485885053873062, + "z": 0.5422580242156982, + "w": 0.6437124609947205 + } + } + }, + { + "joint": "ThumbDistalJoint", + "pose": { + "position": { + "x": -0.016296127811074258, + "y": -0.09359179437160492, + "z": -0.006718119606375694 + }, + "rotation": { + "x": -0.6040476560592651, + "y": -0.08891747146844864, + "z": 0.5752687454223633, + "w": 0.5448194742202759 + } + } + }, + { + "joint": "ThumbTip", + "pose": { + "position": { + "x": -0.03216664865612984, + "y": -0.08244754374027252, + "z": -0.001603197306394577 + }, + "rotation": { + "x": -0.6040476560592651, + "y": -0.08891747146844864, + "z": 0.5752687454223633, + "w": 0.5448194742202759 + } + } + }, + { + "joint": "IndexMetacarpal", + "pose": { + "position": { + "x": 0.04794362187385559, + "y": -0.13700048625469209, + "z": -0.03438100963830948 + }, + "rotation": { + "x": -0.534980297088623, + "y": -0.28449201583862307, + "z": -0.061086010187864307, + "w": 0.7931764721870422 + } + } + }, + { + "joint": "IndexKnuckle", + "pose": { + "position": { + "x": 0.023209279403090478, + "y": -0.08038382232189179, + "z": -0.017351558431982995 + }, + "rotation": { + "x": -0.599485456943512, + "y": -0.1474478840827942, + "z": 0.04840812832117081, + "w": 0.7852058410644531 + } + } + }, + { + "joint": "IndexMiddleJoint", + "pose": { + "position": { + "x": 0.009743190370500088, + "y": -0.03727291524410248, + "z": -0.006295463070273399 + }, + "rotation": { + "x": -0.6344203948974609, + "y": -0.08629350364208222, + "z": 0.11939872056245804, + "w": 0.7588865756988525 + } + } + }, + { + "joint": "IndexDistalJoint", + "pose": { + "position": { + "x": 0.0026917937211692335, + "y": -0.013759316876530648, + "z": -0.0017971978522837163 + }, + "rotation": { + "x": -0.6451734304428101, + "y": -0.12336783856153488, + "z": 0.00809548981487751, + "w": 0.7542511224746704 + } + } + }, + { + "joint": "IndexTip", + "pose": { + "position": { + "x": -0.0002534952946007252, + "y": 0.0007631087210029364, + "z": 0.0002575620310381055 + }, + "rotation": { + "x": -0.6451734304428101, + "y": -0.12336783856153488, + "z": 0.00809548981487751, + "w": 0.7542511224746704 + } + } + }, + { + "joint": "MiddleMetacarpal", + "pose": { + "position": { + "x": 0.056570135056972507, + "y": -0.13634957373142243, + "z": -0.03486650064587593 + }, + "rotation": { + "x": -0.6017327308654785, + "y": -0.1049300879240036, + "z": 0.008752312511205674, + "w": 0.7917264699935913 + } + } + }, + { + "joint": "MiddleKnuckle", + "pose": { + "position": { + "x": 0.045069482177495959, + "y": -0.07444917410612107, + "z": -0.018345370888710023 + }, + "rotation": { + "x": -0.5885983109474182, + "y": -0.10035836696624756, + "z": 0.025189023464918138, + "w": 0.8017893433570862 + } + } + }, + { + "joint": "MiddleMiddleJoint", + "pose": { + "position": { + "x": 0.035030756145715716, + "y": -0.025001518428325654, + "z": -0.0032290546223521234 + }, + "rotation": { + "x": -0.6631931662559509, + "y": -0.09005288034677506, + "z": -0.0027521485462784769, + "w": 0.7431085109710693 + } + } + }, + { + "joint": "MiddleDistalJoint", + "pose": { + "position": { + "x": 0.031546302139759067, + "y": 0.0013798222644254566, + "z": -0.0004363078624010086 + }, + "rotation": { + "x": -0.6468731164932251, + "y": -0.11953263729810715, + "z": -0.06937266886234284, + "w": 0.7504633665084839 + } + } + }, + { + "joint": "MiddleTip", + "pose": { + "position": { + "x": 0.030048875138163568, + "y": 0.017790958285331727, + "z": 0.0018172836862504483 + }, + "rotation": { + "x": -0.6468731164932251, + "y": -0.11953263729810715, + "z": -0.06937266886234284, + "w": 0.7504633665084839 + } + } + }, + { + "joint": "RingMetacarpal", + "pose": { + "position": { + "x": 0.06806596368551254, + "y": -0.13525664806365968, + "z": -0.034837257117033008 + }, + "rotation": { + "x": -0.5803540945053101, + "y": 0.014031633734703064, + "z": 0.05480925738811493, + "w": 0.8123965859413147 + } + } + }, + { + "joint": "RingKnuckle", + "pose": { + "position": { + "x": 0.06544187664985657, + "y": -0.07453925907611847, + "z": -0.013881120830774308 + }, + "rotation": { + "x": -0.6466344594955444, + "y": -0.03600946068763733, + "z": 0.02467469871044159, + "w": 0.7615609765052795 + } + } + }, + { + "joint": "RingMiddleJoint", + "pose": { + "position": { + "x": 0.06159381568431854, + "y": -0.03093438223004341, + "z": -0.006733019836246967 + }, + "rotation": { + "x": -0.6550348401069641, + "y": -0.06099399924278259, + "z": -0.04121965169906616, + "w": 0.7520787715911865 + } + } + }, + { + "joint": "RingDistalJoint", + "pose": { + "position": { + "x": 0.06070023775100708, + "y": -0.007464663125574589, + "z": -0.003544492181390524 + }, + "rotation": { + "x": -0.6712727546691895, + "y": -0.05777180939912796, + "z": -0.05727298930287361, + "w": 0.7370488047599793 + } + } + }, + { + "joint": "RingTip", + "pose": { + "position": { + "x": 0.060552775859832767, + "y": 0.010114867240190506, + "z": -0.0019072332652285696 + }, + "rotation": { + "x": -0.6712727546691895, + "y": -0.05777180939912796, + "z": -0.05727298930287361, + "w": 0.7370488047599793 + } + } + }, + { + "joint": "PinkyMetacarpal", + "pose": { + "position": { + "x": 0.07710164040327072, + "y": -0.13650110363960267, + "z": -0.032643478363752368 + }, + "rotation": { + "x": -0.5344982147216797, + "y": 0.1545339822769165, + "z": 0.10820292681455612, + "w": 0.8238464593887329 + } + } + }, + { + "joint": "PinkyKnuckle", + "pose": { + "position": { + "x": 0.08530370891094208, + "y": -0.08254323154687882, + "z": -0.010162543505430222 + }, + "rotation": { + "x": -0.6702333688735962, + "y": 0.05704934149980545, + "z": 0.006686835549771786, + "w": 0.7399358749389648 + } + } + }, + { + "joint": "PinkyMiddleJoint", + "pose": { + "position": { + "x": 0.08779342472553253, + "y": -0.049793362617492679, + "z": -0.0070251524448394779 + }, + "rotation": { + "x": -0.6393072605133057, + "y": 0.030266048386693, + "z": -0.15569603443145753, + "w": 0.7524937987327576 + } + } + }, + { + "joint": "PinkyDistalJoint", + "pose": { + "position": { + "x": 0.09219621121883393, + "y": -0.03264733776450157, + "z": -0.0037694787606596948 + }, + "rotation": { + "x": -0.6555882692337036, + "y": -0.0018634665757417679, + "z": -0.09289215505123139, + "w": 0.7497090101242065 + } + } + }, + { + "joint": "PinkyTip", + "pose": { + "position": { + "x": 0.09392204880714417, + "y": -0.018381092697381974, + "z": -0.0017222119495272637 + }, + "rotation": { + "x": -0.6555882692337036, + "y": -0.0018634665757417679, + "z": -0.09289215505123139, + "w": 0.7497090101242065 + } + } + } + ] +} \ No newline at end of file diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/FlatHandPoseData.json.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/FlatHandPoseData.json.meta new file mode 100644 index 00000000..b93abeae --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/FlatHandPoseData.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d01fab68eb29b1743b37beb044cfebe1 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/GrabHandPose.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/GrabHandPose.asset index da4a9462..85b1d006 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/GrabHandPose.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/GrabHandPose.asset @@ -17,4 +17,4 @@ MonoBehaviour: isDefault: 0 isSelectionPose: 0 keyCode: 50 - data: {fileID: 4900000, guid: 26804200b794ba145a05c73b28c1134d, type: 3} + data: {fileID: 4900000, guid: 99870b188ec58c949b89786e62a77394, type: 3} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/GrabHandPoseData.json b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/GrabHandPoseData.json new file mode 100644 index 00000000..9fff898b --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/GrabHandPoseData.json @@ -0,0 +1,436 @@ +{ + "items": [ + { + "joint": "None", + "pose": { + "position": { + "x": -0.08690944314002991, + "y": 0.013536587357521057, + "z": -0.3781388998031616 + }, + "rotation": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } + } + }, + { + "joint": "Wrist", + "pose": { + "position": { + "x": 0.059647563844919208, + "y": -0.018170714378356935, + "z": -0.07320141047239304 + }, + "rotation": { + "x": -0.44069746136665347, + "y": -0.3151600956916809, + "z": -0.029152734205126764, + "w": 0.8398429155349731 + } + } + }, + { + "joint": "Palm", + "pose": { + "position": { + "x": 0.040150947868824008, + "y": 0.022433746606111528, + "z": -0.04928050562739372 + }, + "rotation": { + "x": -0.44069746136665347, + "y": -0.3151600956916809, + "z": -0.029152734205126764, + "w": 0.8398429155349731 + } + } + }, + { + "joint": "ThumbMetacarpalJoint", + "pose": { + "position": { + "x": 0.033823080360889438, + "y": -0.014000600203871727, + "z": -0.06483504176139832 + }, + "rotation": { + "x": 0.46251192688941958, + "y": 0.15892137587070466, + "z": -0.748396635055542, + "w": -0.44902268052101138 + } + } + }, + { + "joint": "ThumbProximalJoint", + "pose": { + "position": { + "x": -0.0048112208023667339, + "y": -0.005827075336128473, + "z": -0.04063580185174942 + }, + "rotation": { + "x": 0.32614850997924807, + "y": -0.017511412501335145, + "z": -0.7735356688499451, + "w": -0.5439797639846802 + } + } + }, + { + "joint": "ThumbDistalJoint", + "pose": { + "position": { + "x": -0.02188277430832386, + "y": 0.0075818500481545929, + "z": -0.01290540024638176 + }, + "rotation": { + "x": 0.22856087982654572, + "y": -0.09300848096609116, + "z": -0.7769821286201477, + "w": -0.5795565247535706 + } + } + }, + { + "joint": "ThumbTip", + "pose": { + "position": { + "x": -0.026505667716264726, + "y": 0.015197398141026497, + "z": 0.0034610535949468614 + }, + "rotation": { + "x": 0.22856087982654572, + "y": -0.09300848096609116, + "z": -0.7769821286201477, + "w": -0.5795565247535706 + } + } + }, + { + "joint": "IndexMetacarpal", + "pose": { + "position": { + "x": 0.04238410294055939, + "y": -0.007463002577424049, + "z": -0.06319385766983032 + }, + "rotation": { + "x": -0.420803427696228, + "y": -0.44982725381851199, + "z": -0.04907778277993202, + "w": 0.7862387895584106 + } + } + }, + { + "joint": "IndexKnuckle", + "pose": { + "position": { + "x": -0.0008817678317427635, + "y": 0.03838954120874405, + "z": -0.04752813279628754 + }, + "rotation": { + "x": 0.004830620251595974, + "y": 0.18448397517204286, + "z": -0.1560613363981247, + "w": -0.9703620672225952 + } + } + }, + { + "joint": "IndexMiddleJoint", + "pose": { + "position": { + "x": -0.014839660376310349, + "y": 0.03651837632060051, + "z": -0.01135229505598545 + }, + "rotation": { + "x": -0.5098936557769775, + "y": 0.03039226494729519, + "z": -0.30394697189331057, + "w": -0.8042332530021668 + } + } + }, + { + "joint": "IndexDistalJoint", + "pose": { + "position": { + "x": -0.008270945399999619, + "y": 0.015406630001962185, + "z": 0.0006891884841024876 + }, + "rotation": { + "x": -0.7222777009010315, + "y": -0.08202659338712692, + "z": -0.2391108274459839, + "w": -0.6440979242324829 + } + } + }, + { + "joint": "IndexTip", + "pose": { + "position": { + "x": -0.0009594520088285208, + "y": 0.000933439121581614, + "z": -0.00021468542399816215 + }, + "rotation": { + "x": -0.7222777009010315, + "y": -0.08202659338712692, + "z": -0.2391108274459839, + "w": -0.6440979242324829 + } + } + }, + { + "joint": "MiddleMetacarpal", + "pose": { + "position": { + "x": 0.04958740621805191, + "y": -0.004707379266619682, + "z": -0.06129273772239685 + }, + "rotation": { + "x": -0.5128890872001648, + "y": -0.29369285702705386, + "z": 0.018453821539878846, + "w": 0.8064419627189636 + } + } + }, + { + "joint": "MiddleKnuckle", + "pose": { + "position": { + "x": 0.020074930042028428, + "y": 0.04420189931988716, + "z": -0.04323747381567955 + }, + "rotation": { + "x": -0.07308150827884674, + "y": 0.17278942465782166, + "z": -0.10241489112377167, + "w": -0.9769001603126526 + } + } + }, + { + "joint": "MiddleMiddleJoint", + "pose": { + "position": { + "x": 0.005748542491346598, + "y": 0.0362907275557518, + "z": -0.001959702931344509 + }, + "rotation": { + "x": -0.7482351660728455, + "y": 0.06403420120477677, + "z": -0.2061866670846939, + "w": -0.6274414658546448 + } + } + }, + { + "joint": "MiddleDistalJoint", + "pose": { + "position": { + "x": 0.012452101334929467, + "y": 0.007901951670646668, + "z": -0.0057104239240288738 + }, + "rotation": { + "x": -0.9225407838821411, + "y": -0.07818678766489029, + "z": -0.1428528130054474, + "w": -0.3514384627342224 + } + } + }, + { + "joint": "MiddleTip", + "pose": { + "position": { + "x": 0.01802952028810978, + "y": -0.003061514813452959, + "z": -0.01820256933569908 + }, + "rotation": { + "x": -0.9225407838821411, + "y": -0.07818678766489029, + "z": -0.1428528130054474, + "w": -0.3514384627342224 + } + } + }, + { + "joint": "RingMetacarpal", + "pose": { + "position": { + "x": 0.05912885442376137, + "y": -0.0009383354336023331, + "z": -0.05809984356164932 + }, + "rotation": { + "x": -0.49521127343177798, + "y": -0.17924758791923524, + "z": 0.07874160259962082, + "w": 0.846425473690033 + } + } + }, + { + "joint": "RingKnuckle", + "pose": { + "position": { + "x": 0.038666337728500369, + "y": 0.04252086579799652, + "z": -0.03421220928430557 + }, + "rotation": { + "x": -0.1513676941394806, + "y": 0.15960678458213807, + "z": -0.05129222199320793, + "w": -0.9741657376289368 + } + } + }, + { + "joint": "RingMiddleJoint", + "pose": { + "position": { + "x": 0.02693704515695572, + "y": 0.030163494870066644, + "z": 0.0016453623538836837 + }, + "rotation": { + "x": -0.8552912473678589, + "y": 0.0920121893286705, + "z": -0.11032526195049286, + "w": -0.4979609251022339 + } + } + }, + { + "joint": "RingDistalJoint", + "pose": { + "position": { + "x": 0.029263043776154519, + "y": 0.009234108030796051, + "z": -0.009864533320069313 + }, + "rotation": { + "x": -0.9685380458831787, + "y": -0.018125316128134729, + "z": -0.094183549284935, + "w": -0.23075833916664124 + } + } + }, + { + "joint": "RingTip", + "pose": { + "position": { + "x": 0.032915160059928897, + "y": 0.0007288604974746704, + "z": -0.02667597308754921 + }, + "rotation": { + "x": -0.9685380458831787, + "y": -0.018125316128134729, + "z": -0.094183549284935, + "w": -0.23075833916664124 + } + } + }, + { + "joint": "PinkyMetacarpal", + "pose": { + "position": { + "x": 0.0675557404756546, + "y": -0.0004099104553461075, + "z": -0.05376683175563812 + }, + "rotation": { + "x": -0.44121748208999636, + "y": -0.05341072380542755, + "z": 0.14569664001464845, + "w": 0.8838818073272705 + } + } + }, + { + "joint": "PinkyKnuckle", + "pose": { + "position": { + "x": 0.05575947463512421, + "y": 0.04002845287322998, + "z": -0.02176406979560852 + }, + "rotation": { + "x": -0.2122899889945984, + "y": 0.1802181601524353, + "z": 0.03122050315141678, + "w": -0.959945559501648 + } + } + }, + { + "joint": "PinkyMiddleJoint", + "pose": { + "position": { + "x": 0.046450983732938769, + "y": 0.029760107398033143, + "z": 0.0001273825764656067 + }, + "rotation": { + "x": -0.8192430138587952, + "y": 0.16303858160972596, + "z": -0.0602981373667717, + "w": -0.5465834140777588 + } + } + }, + { + "joint": "PinkyDistalJoint", + "pose": { + "position": { + "x": 0.044868819415569308, + "y": 0.011532457545399666, + "z": -0.007741663604974747 + }, + "rotation": { + "x": -0.9710148572921753, + "y": 0.04234015569090843, + "z": 0.042903631925582889, + "w": -0.23259779810905457 + } + } + }, + { + "joint": "PinkyTip", + "pose": { + "position": { + "x": 0.04328276216983795, + "y": 0.004625056870281696, + "z": -0.0214386023581028 + }, + "rotation": { + "x": -0.9710148572921753, + "y": 0.04234015569090843, + "z": 0.042903631925582889, + "w": -0.23259779810905457 + } + } + } + ] +} \ No newline at end of file diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/GrabHandPoseData.json.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/GrabHandPoseData.json.meta new file mode 100644 index 00000000..0dafe8e0 --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/GrabHandPoseData.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 99870b188ec58c949b89786e62a77394 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/OpenHandPose.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/OpenHandPose.asset index dc649e36..39444563 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/OpenHandPose.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/OpenHandPose.asset @@ -17,4 +17,4 @@ MonoBehaviour: isDefault: 1 isSelectionPose: 0 keyCode: 0 - data: {fileID: 4900000, guid: 09df9528e8b9f6549a5f0989692b84ed, type: 3} + data: {fileID: 4900000, guid: f5a9db29d9d2bd741b793a18dac228d6, type: 3} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/OpenHandPoseData.json b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/OpenHandPoseData.json new file mode 100644 index 00000000..b63a2e64 --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/OpenHandPoseData.json @@ -0,0 +1,436 @@ +{ + "items": [ + { + "joint": "None", + "pose": { + "position": { + "x": -0.0780251994729042, + "y": -0.05990780144929886, + "z": -0.3291178047657013 + }, + "rotation": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } + } + }, + { + "joint": "Wrist", + "pose": { + "position": { + "x": 0.07397598028182984, + "y": -0.1239677220582962, + "z": -0.05636374652385712 + }, + "rotation": { + "x": -0.5306746959686279, + "y": -0.24036270380020142, + "z": -0.0010364949703216553, + "w": 0.8126773834228516 + } + } + }, + { + "joint": "Palm", + "pose": { + "position": { + "x": 0.06148417666554451, + "y": -0.08249785006046295, + "z": -0.04003134369850159 + }, + "rotation": { + "x": -0.5306746959686279, + "y": -0.24036270380020142, + "z": -0.0010364949703216553, + "w": 0.8126773834228516 + } + } + }, + { + "joint": "ThumbMetacarpalJoint", + "pose": { + "position": { + "x": 0.05004027485847473, + "y": -0.1168040931224823, + "z": -0.046657364815473559 + }, + "rotation": { + "x": -0.5606539249420166, + "y": -0.098196841776371, + "z": 0.670694887638092, + "w": 0.4761941432952881 + } + } + }, + { + "joint": "ThumbProximalJoint", + "pose": { + "position": { + "x": 0.014790681190788746, + "y": -0.1000247374176979, + "z": -0.031946491450071338 + }, + "rotation": { + "x": -0.5155644416809082, + "y": -0.0010041594505310059, + "z": 0.6619959473609924, + "w": 0.5445378422737122 + } + } + }, + { + "joint": "ThumbDistalJoint", + "pose": { + "position": { + "x": -0.0062080565840005878, + "y": -0.0828109011054039, + "z": -0.01753186620771885 + }, + "rotation": { + "x": -0.5490170121192932, + "y": -0.08343470841646195, + "z": 0.6728134751319885, + "w": 0.48939600586891177 + } + } + }, + { + "joint": "ThumbTip", + "pose": { + "position": { + "x": -0.02095535211265087, + "y": -0.07516473531723023, + "z": -0.010627731680870057 + }, + "rotation": { + "x": -0.5490170121192932, + "y": -0.08343470841646195, + "z": 0.6728134751319885, + "w": 0.48939600586891177 + } + } + }, + { + "joint": "IndexMetacarpal", + "pose": { + "position": { + "x": 0.058891069144010547, + "y": -0.11150021106004715, + "z": -0.047359079122543338 + }, + "rotation": { + "x": -0.5242606997489929, + "y": -0.3638727068901062, + "z": 0.0003723353147506714, + "w": 0.7699006795883179 + } + } + }, + { + "joint": "IndexKnuckle", + "pose": { + "position": { + "x": 0.025922514498233796, + "y": -0.06404880434274674, + "z": -0.036451879888772967 + }, + "rotation": { + "x": -0.5153175592422485, + "y": -0.13684964179992677, + "z": 0.0975230410695076, + "w": 0.840372622013092 + } + } + }, + { + "joint": "IndexMiddleJoint", + "pose": { + "position": { + "x": 0.012116845697164536, + "y": -0.028988275676965715, + "z": -0.0184309259057045 + }, + "rotation": { + "x": -0.5083625912666321, + "y": -0.08690404891967774, + "z": 0.1772240400314331, + "w": 0.8382880687713623 + } + } + }, + { + "joint": "IndexDistalJoint", + "pose": { + "position": { + "x": 0.0047910469584167, + "y": -0.01052884478121996, + "z": -0.007911253720521927 + }, + "rotation": { + "x": -0.4986042380332947, + "y": -0.10437075048685074, + "z": 0.07316453754901886, + "w": 0.8577484488487244 + } + } + }, + { + "joint": "IndexTip", + "pose": { + "position": { + "x": 0.0011067038867622614, + "y": 0.0017288230592384935, + "z": -0.0008905145805329084 + }, + "rotation": { + "x": -0.4986042380332947, + "y": -0.10437075048685074, + "z": 0.07316453754901886, + "w": 0.8577484488487244 + } + } + }, + { + "joint": "MiddleMetacarpal", + "pose": { + "position": { + "x": 0.06627093255519867, + "y": -0.1093648374080658, + "z": -0.04731958359479904 + }, + "rotation": { + "x": -0.5980523824691773, + "y": -0.19373856484889985, + "z": 0.061999037861824039, + "w": 0.7752125859260559 + } + } + }, + { + "joint": "MiddleKnuckle", + "pose": { + "position": { + "x": 0.04579643905162811, + "y": -0.05998942255973816, + "z": -0.035861626267433169 + }, + "rotation": { + "x": 0.07707051932811737, + "y": 0.09493987262248993, + "z": -0.06967925280332566, + "w": -0.9900561571121216 + } + } + }, + { + "joint": "MiddleMiddleJoint", + "pose": { + "position": { + "x": 0.03759719431400299, + "y": -0.054239436984062198, + "z": 0.004158938303589821 + }, + "rotation": { + "x": -0.5364435911178589, + "y": 0.035090312361717227, + "z": -0.1292860358953476, + "w": -0.8333183526992798 + } + } + }, + { + "joint": "MiddleDistalJoint", + "pose": { + "position": { + "x": 0.039636775851249698, + "y": -0.07725092768669129, + "z": 0.014920881018042565 + }, + "rotation": { + "x": -0.7898687720298767, + "y": -0.05351902171969414, + "z": -0.050689004361629489, + "w": -0.6095116138458252 + } + } + }, + { + "joint": "MiddleTip", + "pose": { + "position": { + "x": 0.04198702797293663, + "y": -0.09284322708845139, + "z": 0.010831182822585106 + }, + "rotation": { + "x": -0.7898687720298767, + "y": -0.05351902171969414, + "z": -0.050689004361629489, + "w": -0.6095116138458252 + } + } + }, + { + "joint": "RingMetacarpal", + "pose": { + "position": { + "x": 0.07596171647310257, + "y": -0.10612225532531738, + "z": -0.04667811840772629 + }, + "rotation": { + "x": -0.5675100088119507, + "y": -0.08019199222326279, + "z": 0.10617346316576004, + "w": 0.8125444054603577 + } + } + }, + { + "joint": "RingKnuckle", + "pose": { + "position": { + "x": 0.06377431005239487, + "y": -0.06213853880763054, + "z": -0.030012063682079316 + }, + "rotation": { + "x": -0.03975258022546768, + "y": 0.09559198468923569, + "z": -0.024301081895828248, + "w": -0.9943375587463379 + } + } + }, + { + "joint": "RingMiddleJoint", + "pose": { + "position": { + "x": 0.056988153606653216, + "y": -0.06515654176473618, + "z": 0.005276134237647057 + }, + "rotation": { + "x": -0.7588484287261963, + "y": 0.0701710507273674, + "z": -0.045488141477108, + "w": -0.6459669470787048 + } + } + }, + { + "joint": "RingDistalJoint", + "pose": { + "position": { + "x": 0.05652663856744766, + "y": -0.08611556887626648, + "z": 0.0018516592681407929 + }, + "rotation": { + "x": -0.9129649996757507, + "y": -0.005179869011044502, + "z": -0.007560268044471741, + "w": -0.408629447221756 + } + } + }, + { + "joint": "RingTip", + "pose": { + "position": { + "x": 0.056841082870960239, + "y": -0.09943331778049469, + "z": -0.010053567588329316 + }, + "rotation": { + "x": -0.9129649996757507, + "y": -0.005179869011044502, + "z": -0.007560268044471741, + "w": -0.408629447221756 + } + } + }, + { + "joint": "PinkyMetacarpal", + "pose": { + "position": { + "x": 0.08423660695552826, + "y": -0.10567539930343628, + "z": -0.044220417737960818 + }, + "rotation": { + "x": -0.5077040791511536, + "y": 0.04072892665863037, + "z": 0.1517779380083084, + "w": 0.8470779657363892 + } + } + }, + { + "joint": "PinkyKnuckle", + "pose": { + "position": { + "x": 0.0801829993724823, + "y": -0.06412312388420105, + "z": -0.021305494010448457 + }, + "rotation": { + "x": -0.08299122005701065, + "y": 0.1249239444732666, + "z": 0.04155319184064865, + "w": -0.9878235459327698 + } + } + }, + { + "joint": "PinkyMiddleJoint", + "pose": { + "position": { + "x": 0.07411551475524903, + "y": -0.0677957683801651, + "z": 0.0015332028269767762 + }, + "rotation": { + "x": -0.715654730796814, + "y": 0.1371033787727356, + "z": 0.001321159303188324, + "w": -0.6849520206451416 + } + } + }, + { + "joint": "PinkyDistalJoint", + "pose": { + "position": { + "x": 0.07075578719377518, + "y": -0.08515383303165436, + "z": 0.00044181570410728455 + }, + "rotation": { + "x": -0.8999292254447937, + "y": 0.06855495274066925, + "z": 0.11455988883972168, + "w": -0.41592133045196535 + } + } + }, + { + "joint": "PinkyTip", + "pose": { + "position": { + "x": 0.0670883059501648, + "y": -0.09537018835544586, + "z": -0.008319821208715439 + }, + "rotation": { + "x": -0.8999292254447937, + "y": 0.06855495274066925, + "z": 0.11455988883972168, + "w": -0.41592133045196535 + } + } + } + ] +} \ No newline at end of file diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/OpenHandPoseData.json.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/OpenHandPoseData.json.meta new file mode 100644 index 00000000..ef0464a3 --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/OpenHandPoseData.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f5a9db29d9d2bd741b793a18dac228d6 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/OpenSteadyGrabPointHandPose.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/OpenSteadyGrabPointHandPose.asset new file mode 100644 index 00000000..91088099 --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/OpenSteadyGrabPointHandPose.asset @@ -0,0 +1,20 @@ +%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: 67355724a5b4fd841bbf691ac44ad25d, type: 3} + m_Name: OpenSteadyGrabPointHandPose + m_EditorClassIdentifier: + id: open-steady-grab-point + description: Relaxed hand pose. + isDefault: 0 + isSelectionPose: 0 + keyCode: 54 + data: {fileID: 4900000, guid: 574d1cd3fada57744a97166ef77bdd45, type: 3} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/OpenSteadyGrabPointHandPose.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/OpenSteadyGrabPointHandPose.asset.meta new file mode 100644 index 00000000..0e606de0 --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/OpenSteadyGrabPointHandPose.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7f8c95a0360d2a04abee2a9b0863b6f5 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/OpenSteadyGrabPointHandPoseData.json b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/OpenSteadyGrabPointHandPoseData.json new file mode 100644 index 00000000..37c50cc9 --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/OpenSteadyGrabPointHandPoseData.json @@ -0,0 +1,436 @@ +{ + "items": [ + { + "joint": "None", + "pose": { + "position": { + "x": -0.0681008753599599, + "y": -0.023189845320302993, + "z": -0.32335868163499981 + }, + "rotation": { + "x": 0, + "y": 0, + "z": 0, + "w": 0 + } + } + }, + { + "joint": "Wrist", + "pose": { + "position": { + "x": 0.083900304394774139, + "y": -0.087249765929300338, + "z": -0.050604623393155634 + }, + "rotation": { + "x": -0.53067469596862793, + "y": -0.24036270380020142, + "z": -0.0010364949703216553, + "w": 0.81267738342285156 + } + } + }, + { + "joint": "Palm", + "pose": { + "position": { + "x": 0.071408500778488815, + "y": -0.045779893931467086, + "z": -0.034272220567800105 + }, + "rotation": { + "x": -0.53067469596862793, + "y": -0.24036270380020142, + "z": -0.0010364949703216553, + "w": 0.81267738342285156 + } + } + }, + { + "joint": "ThumbMetacarpalJoint", + "pose": { + "position": { + "x": 0.059964598971419036, + "y": -0.080086136993486434, + "z": -0.040898241684772074 + }, + "rotation": { + "x": -0.5606539249420166, + "y": -0.098196841776371, + "z": 0.670694887638092, + "w": 0.47619414329528809 + } + } + }, + { + "joint": "ThumbProximalJoint", + "pose": { + "position": { + "x": 0.024715005303733051, + "y": -0.063306781288702041, + "z": -0.026187368319369853 + }, + "rotation": { + "x": -0.5155644416809082, + "y": -0.0010041594505310059, + "z": 0.66199594736099243, + "w": 0.54453784227371216 + } + } + }, + { + "joint": "ThumbDistalJoint", + "pose": { + "position": { + "x": 0.0037162675289437175, + "y": -0.046092944976408035, + "z": -0.011772743077017367 + }, + "rotation": { + "x": -0.54901701211929321, + "y": -0.083434708416461945, + "z": 0.67281347513198853, + "w": 0.48939600586891174 + } + } + }, + { + "joint": "ThumbTip", + "pose": { + "position": { + "x": -0.011031027999706566, + "y": -0.038446779188234359, + "z": -0.0048686085501685739 + }, + "rotation": { + "x": -0.54901701211929321, + "y": -0.083434708416461945, + "z": 0.67281347513198853, + "w": 0.48939600586891174 + } + } + }, + { + "joint": "IndexMetacarpal", + "pose": { + "position": { + "x": 0.068815393256954849, + "y": -0.074782254931051284, + "z": -0.041599955991841853 + }, + "rotation": { + "x": -0.52426069974899292, + "y": -0.3638727068901062, + "z": 0.00037233531475067139, + "w": 0.76990067958831787 + } + } + }, + { + "joint": "IndexKnuckle", + "pose": { + "position": { + "x": 0.0358468386111781, + "y": -0.027330848213750869, + "z": -0.030692756758071482 + }, + "rotation": { + "x": -0.51531755924224854, + "y": -0.13684964179992676, + "z": 0.0975230410695076, + "w": 0.840372622013092 + } + } + }, + { + "joint": "IndexMiddleJoint", + "pose": { + "position": { + "x": 0.02204116981010884, + "y": 0.0077296804520301521, + "z": -0.012671802775003016 + }, + "rotation": { + "x": -0.50836259126663208, + "y": -0.086904048919677734, + "z": 0.17722404003143311, + "w": 0.8382880687713623 + } + } + }, + { + "joint": "IndexDistalJoint", + "pose": { + "position": { + "x": 0.014715371071361005, + "y": 0.026189111347775906, + "z": -0.0021521305898204446 + }, + "rotation": { + "x": -0.49860423803329468, + "y": -0.10437075048685074, + "z": 0.07316453754901886, + "w": 0.85774844884872437 + } + } + }, + { + "joint": "IndexTip", + "pose": { + "position": { + "x": 0.011031027999706566, + "y": 0.038446779188234359, + "z": 0.0048686085501685739 + }, + "rotation": { + "x": -0.49860423803329468, + "y": -0.10437075048685074, + "z": 0.07316453754901886, + "w": 0.85774844884872437 + } + } + }, + { + "joint": "MiddleMetacarpal", + "pose": { + "position": { + "x": 0.076195256668142974, + "y": -0.07264688127906993, + "z": -0.041560460464097559 + }, + "rotation": { + "x": -0.59805238246917725, + "y": -0.19373856484889984, + "z": 0.061999037861824036, + "w": 0.77521258592605591 + } + } + }, + { + "joint": "MiddleKnuckle", + "pose": { + "position": { + "x": 0.055720763164572418, + "y": -0.023271466430742294, + "z": -0.030102503136731684 + }, + "rotation": { + "x": 0.077070519328117371, + "y": 0.094939872622489929, + "z": -0.069679252803325653, + "w": -0.99005615711212158 + } + } + }, + { + "joint": "MiddleMiddleJoint", + "pose": { + "position": { + "x": 0.047521518426947296, + "y": -0.017521480855066329, + "z": 0.0099180614342913032 + }, + "rotation": { + "x": -0.53644359111785889, + "y": 0.035090312361717224, + "z": -0.1292860358953476, + "w": -0.83331835269927979 + } + } + }, + { + "joint": "MiddleDistalJoint", + "pose": { + "position": { + "x": 0.049561099964194, + "y": -0.040532971557695419, + "z": 0.020680004148744047 + }, + "rotation": { + "x": -0.78986877202987671, + "y": -0.053519021719694138, + "z": -0.050689004361629486, + "w": -0.6095116138458252 + } + } + }, + { + "joint": "MiddleTip", + "pose": { + "position": { + "x": 0.051911352085880935, + "y": -0.05612527095945552, + "z": 0.016590305953286588 + }, + "rotation": { + "x": -0.78986877202987671, + "y": -0.053519021719694138, + "z": -0.050689004361629486, + "w": -0.6095116138458252 + } + } + }, + { + "joint": "RingMetacarpal", + "pose": { + "position": { + "x": 0.085886040586046875, + "y": -0.069404299196321517, + "z": -0.040918995277024806 + }, + "rotation": { + "x": -0.56751000881195068, + "y": -0.080191992223262787, + "z": 0.10617346316576004, + "w": 0.81254440546035767 + } + } + }, + { + "joint": "RingKnuckle", + "pose": { + "position": { + "x": 0.073698634165339172, + "y": -0.025420582678634673, + "z": -0.024252940551377833 + }, + "rotation": { + "x": -0.039752580225467682, + "y": 0.095591984689235687, + "z": -0.024301081895828247, + "w": -0.99433755874633789 + } + } + }, + { + "joint": "RingMiddleJoint", + "pose": { + "position": { + "x": 0.066912477719597518, + "y": -0.02843858563574031, + "z": 0.011035257368348539 + }, + "rotation": { + "x": -0.75884842872619629, + "y": 0.0701710507273674, + "z": -0.045488141477108, + "w": -0.64596694707870483 + } + } + }, + { + "joint": "RingDistalJoint", + "pose": { + "position": { + "x": 0.066450962680391967, + "y": -0.049397612747270614, + "z": 0.0076107823988422751 + }, + "rotation": { + "x": -0.91296499967575073, + "y": -0.0051798690110445023, + "z": -0.0075602680444717407, + "w": -0.408629447221756 + } + } + }, + { + "joint": "RingTip", + "pose": { + "position": { + "x": 0.066765406983904541, + "y": -0.062715361651498824, + "z": -0.0042944444576278329 + }, + "rotation": { + "x": -0.91296499967575073, + "y": -0.0051798690110445023, + "z": -0.0075602680444717407, + "w": -0.408629447221756 + } + } + }, + { + "joint": "PinkyMetacarpal", + "pose": { + "position": { + "x": 0.094160931068472564, + "y": -0.068957443174440414, + "z": -0.038461294607259333 + }, + "rotation": { + "x": -0.50770407915115356, + "y": 0.040728926658630371, + "z": 0.15177793800830841, + "w": 0.84707796573638916 + } + } + }, + { + "joint": "PinkyKnuckle", + "pose": { + "position": { + "x": 0.0901073234854266, + "y": -0.027405167755205184, + "z": -0.015546370879746974 + }, + "rotation": { + "x": -0.082991220057010651, + "y": 0.1249239444732666, + "z": 0.041553191840648651, + "w": -0.98782354593276978 + } + } + }, + { + "joint": "PinkyMiddleJoint", + "pose": { + "position": { + "x": 0.084039838868193328, + "y": -0.031077812251169235, + "z": 0.0072923259576782584 + }, + "rotation": { + "x": -0.715654730796814, + "y": 0.1371033787727356, + "z": 0.001321159303188324, + "w": -0.6849520206451416 + } + } + }, + { + "joint": "PinkyDistalJoint", + "pose": { + "position": { + "x": 0.080680111306719482, + "y": -0.048435876902658492, + "z": 0.0062009388348087668 + }, + "rotation": { + "x": -0.8999292254447937, + "y": 0.06855495274066925, + "z": 0.11455988883972168, + "w": -0.41592133045196533 + } + } + }, + { + "joint": "PinkyTip", + "pose": { + "position": { + "x": 0.0770126300631091, + "y": -0.058652232226449996, + "z": -0.0025606980780139565 + }, + "rotation": { + "x": -0.8999292254447937, + "y": 0.06855495274066925, + "z": 0.11455988883972168, + "w": -0.41592133045196533 + } + } + } + ] +} \ No newline at end of file diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/OpenSteadyGrabPointHandPoseData.json.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/OpenSteadyGrabPointHandPoseData.json.meta new file mode 100644 index 00000000..2f432579 --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/OpenSteadyGrabPointHandPoseData.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 574d1cd3fada57744a97166ef77bdd45 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PinchHandPose.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PinchHandPose.asset index 627117eb..8f88a198 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PinchHandPose.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PinchHandPose.asset @@ -17,4 +17,4 @@ MonoBehaviour: isDefault: 0 isSelectionPose: 0 keyCode: 323 - data: {fileID: 4900000, guid: 00711cdd19e18a74db7fc25c63d9a0bf, type: 3} + data: {fileID: 4900000, guid: c39432faae5de8245a47d3fb3d0a6a3d, type: 3} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PinchHandPoseData.json b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PinchHandPoseData.json new file mode 100644 index 00000000..cd2adf5a --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PinchHandPoseData.json @@ -0,0 +1,436 @@ +{ + "items": [ + { + "joint": "None", + "pose": { + "position": { + "x": -0.055795830441638827, + "y": -0.050494263647124171, + "z": -0.31160801439546049 + }, + "rotation": { + "x": 0, + "y": 0, + "z": 0, + "w": 0 + } + } + }, + { + "joint": "Wrist", + "pose": { + "position": { + "x": 0.094970445381477475, + "y": -0.071920572547242045, + "z": -0.043240679195150733 + }, + "rotation": { + "x": -0.57126933336257935, + "y": -0.40886738896369934, + "z": -0.11714609712362289, + "w": 0.70179426670074463 + } + } + }, + { + "joint": "Palm", + "pose": { + "position": { + "x": 0.078446935163810849, + "y": -0.025236195651814342, + "z": -0.038608604809269309 + }, + "rotation": { + "x": -0.57126933336257935, + "y": -0.40886738896369934, + "z": -0.11714609712362289, + "w": 0.70179426670074463 + } + } + }, + { + "joint": "ThumbMetacarpalJoint", + "pose": { + "position": { + "x": 0.0704388425219804, + "y": -0.063463031081482768, + "z": -0.0446559542324394 + }, + "rotation": { + "x": 0.59957319498062134, + "y": 0.056990712881088257, + "z": -0.661469042301178, + "w": -0.44784826040267944 + } + } + }, + { + "joint": "ThumbProximalJoint", + "pose": { + "position": { + "x": 0.030931103276088834, + "y": -0.041895947186276317, + "z": -0.03173214360140264 + }, + "rotation": { + "x": 0.48144450783729553, + "y": -0.077987000346183777, + "z": -0.66726517677307129, + "w": -0.56365346908569336 + } + } + }, + { + "joint": "ThumbDistalJoint", + "pose": { + "position": { + "x": 0.011377685004845262, + "y": -0.0191096484195441, + "z": -0.013179950183257461 + }, + "rotation": { + "x": 0.48974254727363586, + "y": -0.04340343177318573, + "z": -0.678149402141571, + "w": -0.54698729515075684 + } + } + }, + { + "joint": "ThumbTip", + "pose": { + "position": { + "x": -0.00054007698781788349, + "y": -0.0076306506525725126, + "z": -0.0031634948682039976 + }, + "rotation": { + "x": 0.48974254727363586, + "y": -0.04340343177318573, + "z": -0.678149402141571, + "w": -0.54698729515075684 + } + } + }, + { + "joint": "IndexMetacarpal", + "pose": { + "position": { + "x": 0.079071666346862912, + "y": -0.057821920840069652, + "z": -0.042442125966772437 + }, + "rotation": { + "x": -0.54839807748794556, + "y": -0.5408281683921814, + "z": -0.10956580191850662, + "w": 0.6282992959022522 + } + } + }, + { + "joint": "IndexKnuckle", + "pose": { + "position": { + "x": 0.042313426034525037, + "y": -0.0047555731143802404, + "z": -0.054694456746801734 + }, + "rotation": { + "x": 0.33803752064704895, + "y": 0.34615525603294373, + "z": -0.075356766581535339, + "w": -0.87192034721374512 + } + } + }, + { + "joint": "IndexMiddleJoint", + "pose": { + "position": { + "x": 0.015641395235434175, + "y": 0.0171373023185879, + "z": -0.033025106182321906 + }, + "rotation": { + "x": 0.011520777828991413, + "y": 0.23532292246818543, + "z": -0.26723867654800415, + "w": -0.93442928791046143 + } + } + }, + { + "joint": "IndexDistalJoint", + "pose": { + "position": { + "x": 0.0043656446505337954, + "y": 0.014503426151350141, + "z": -0.01055326103232801 + }, + "rotation": { + "x": -0.18848013877868652, + "y": 0.1752738356590271, + "z": -0.23216751217842102, + "w": -0.938201367855072 + } + } + }, + { + "joint": "IndexTip", + "pose": { + "position": { + "x": 0.00054007698781788349, + "y": 0.0076306506525725126, + "z": 0.0031634948682039976 + }, + "rotation": { + "x": -0.18848013877868652, + "y": 0.1752738356590271, + "z": -0.23216751217842102, + "w": -0.938201367855072 + } + } + }, + { + "joint": "MiddleMetacarpal", + "pose": { + "position": { + "x": 0.085573996650055051, + "y": -0.055481004295870662, + "z": -0.039088224759325385 + }, + "rotation": { + "x": -0.64046329259872437, + "y": -0.373137503862381, + "z": -0.082113638520240784, + "w": 0.66620767116546631 + } + } + }, + { + "joint": "MiddleKnuckle", + "pose": { + "position": { + "x": 0.061702992068603635, + "y": 0.00021764193661510944, + "z": -0.04510785429738462 + }, + "rotation": { + "x": 0.1714177131652832, + "y": 0.3295632004737854, + "z": -0.056909773498773575, + "w": -0.92670679092407227 + } + } + }, + { + "joint": "MiddleMiddleJoint", + "pose": { + "position": { + "x": 0.033647007541731, + "y": 0.01268923026509583, + "z": -0.012882571434602141 + }, + "rotation": { + "x": -0.52955335378646851, + "y": 0.20503298938274384, + "z": -0.28541553020477295, + "w": -0.77215194702148438 + } + } + }, + { + "joint": "MiddleDistalJoint", + "pose": { + "position": { + "x": 0.033218997763469815, + "y": -0.014666470466181636, + "z": -0.00248397677205503 + }, + "rotation": { + "x": -0.80611693859100342, + "y": 0.037188127636909485, + "z": -0.25478187203407288, + "w": -0.5337793231010437 + } + } + }, + { + "joint": "MiddleTip", + "pose": { + "position": { + "x": 0.039724528091028333, + "y": -0.030166196404024959, + "z": -0.0077722163405269384 + }, + "rotation": { + "x": -0.80611693859100342, + "y": 0.037188127636909485, + "z": -0.25478187203407288, + "w": -0.5337793231010437 + } + } + }, + { + "joint": "RingMetacarpal", + "pose": { + "position": { + "x": 0.094046983169391751, + "y": -0.05198403331451118, + "z": -0.034078513970598578 + }, + "rotation": { + "x": -0.63099503517150879, + "y": -0.25767973065376282, + "z": -0.040025528520345688, + "w": 0.73064666986465454 + } + } + }, + { + "joint": "RingKnuckle", + "pose": { + "position": { + "x": 0.076233054744079709, + "y": -0.00047668232582509518, + "z": -0.030205076327547431 + }, + "rotation": { + "x": 0.061521425843238831, + "y": 0.32744783163070679, + "z": -0.026347285136580467, + "w": -0.94250476360321045 + } + } + }, + { + "joint": "RingMiddleJoint", + "pose": { + "position": { + "x": 0.051643508719280362, + "y": 0.003435472259297967, + "z": 0.00062574469484388828 + }, + "rotation": { + "x": -0.7006344199180603, + "y": 0.22492779791355133, + "z": -0.23193849623203278, + "w": -0.63627457618713379 + } + } + }, + { + "joint": "RingDistalJoint", + "pose": { + "position": { + "x": 0.0525671869982034, + "y": -0.0204183969181031, + "z": -0.0013549791183322668 + }, + "rotation": { + "x": -0.88947725296020508, + "y": 0.068172931671142578, + "z": -0.23703967034816742, + "w": -0.38538727164268494 + } + } + }, + { + "joint": "RingTip", + "pose": { + "position": { + "x": 0.0596969083417207, + "y": -0.034293188480660319, + "z": -0.0127856710460037 + }, + "rotation": { + "x": -0.88947725296020508, + "y": 0.068172931671142578, + "z": -0.23703967034816742, + "w": -0.38538727164268494 + } + } + }, + { + "joint": "PinkyMetacarpal", + "pose": { + "position": { + "x": 0.10081055318005383, + "y": -0.050989105133339763, + "z": -0.027507969876751304 + }, + "rotation": { + "x": -0.58761417865753174, + "y": -0.13647006452083588, + "z": 0.010980717837810516, + "w": 0.79747408628463745 + } + } + }, + { + "joint": "PinkyKnuckle", + "pose": { + "position": { + "x": 0.088435876416042447, + "y": -0.00084916572086513042, + "z": -0.01290042488835752 + }, + "rotation": { + "x": -0.015533886849880219, + "y": 0.36132562160491943, + "z": 0.044756371527910233, + "w": -0.9312441349029541 + } + } + }, + { + "joint": "PinkyMiddleJoint", + "pose": { + "position": { + "x": 0.071086059557273984, + "y": -0.000761339208111167, + "z": 0.0060971176717430353 + }, + "rotation": { + "x": -0.6863744854927063, + "y": 0.30161058902740479, + "z": -0.18428879976272583, + "w": -0.63567912578582764 + } + } + }, + { + "joint": "PinkyDistalJoint", + "pose": { + "position": { + "x": 0.068500611232593656, + "y": -0.02024311083368957, + "z": 0.0036448633763939142 + }, + "rotation": { + "x": -0.93071597814559937, + "y": 0.13045383989810944, + "z": -0.11257931590080261, + "w": -0.32351988554000854 + } + } + }, + { + "joint": "PinkyTip", + "pose": { + "position": { + "x": 0.070451776729896665, + "y": -0.030086855171248317, + "z": -0.00828781514428556 + }, + "rotation": { + "x": -0.93071597814559937, + "y": 0.13045383989810944, + "z": -0.11257931590080261, + "w": -0.32351988554000854 + } + } + } + ] +} \ No newline at end of file diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PinchHandPoseData.json.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PinchHandPoseData.json.meta new file mode 100644 index 00000000..a5052801 --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PinchHandPoseData.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c39432faae5de8245a47d3fb3d0a6a3d +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PinchSteadyWristHandPose.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PinchSteadyWristHandPose.asset index b99c33f1..4fbfb335 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PinchSteadyWristHandPose.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PinchSteadyWristHandPose.asset @@ -17,4 +17,4 @@ MonoBehaviour: isDefault: 0 isSelectionPose: 0 keyCode: 51 - data: {fileID: 4900000, guid: 6bcf1fd0588649141811cbcb8135da00, type: 3} + data: {fileID: 4900000, guid: 8eaebf41206ee3546aed07b9a58f6a40, type: 3} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PinchSteadyWristHandPoseData.json b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PinchSteadyWristHandPoseData.json new file mode 100644 index 00000000..627c670e --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PinchSteadyWristHandPoseData.json @@ -0,0 +1,436 @@ +{ + "items": [ + { + "joint": "None", + "pose": { + "position": { + "x": -0.06115446984767914, + "y": -0.09662134945392609, + "z": -0.2845369577407837 + }, + "rotation": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } + } + }, + { + "joint": "Wrist", + "pose": { + "position": { + "x": 0.09835253655910492, + "y": -0.13776640594005586, + "z": -0.039533719420433047 + }, + "rotation": { + "x": -0.5504903793334961, + "y": -0.3628506064414978, + "z": 0.009051494300365448, + "w": 0.7516400218009949 + } + } + }, + { + "joint": "Palm", + "pose": { + "position": { + "x": 0.0762285590171814, + "y": -0.0935618057847023, + "z": -0.03025330975651741 + }, + "rotation": { + "x": -0.5504903793334961, + "y": -0.3628506064414978, + "z": 0.009051494300365448, + "w": 0.7516400218009949 + } + } + }, + { + "joint": "ThumbMetacarpalJoint", + "pose": { + "position": { + "x": 0.0726172998547554, + "y": -0.13283079862594605, + "z": -0.03489827364683151 + }, + "rotation": { + "x": 0.5268919467926025, + "y": 0.07137523591518402, + "z": -0.7376347184181213, + "w": -0.4172084629535675 + } + } + }, + { + "joint": "ThumbProximalJoint", + "pose": { + "position": { + "x": 0.033425573259592059, + "y": -0.11720558255910874, + "z": -0.01445704698562622 + }, + "rotation": { + "x": 0.434413880109787, + "y": -0.0821000337600708, + "z": -0.7344200611114502, + "w": -0.5157689452171326 + } + } + }, + { + "joint": "ThumbDistalJoint", + "pose": { + "position": { + "x": 0.014360085129737854, + "y": -0.09762166440486908, + "z": 0.006609674543142319 + }, + "rotation": { + "x": 0.4773363769054413, + "y": 0.019135713577270509, + "z": -0.7483649849891663, + "w": -0.4610738456249237 + } + } + }, + { + "joint": "ThumbTip", + "pose": { + "position": { + "x": -0.00011064158752560616, + "y": -0.08949866145849228, + "z": 0.017393887042999269 + }, + "rotation": { + "x": 0.4773363769054413, + "y": 0.019135713577270509, + "z": -0.7483649849891663, + "w": -0.4610738456249237 + } + } + }, + { + "joint": "IndexMetacarpal", + "pose": { + "position": { + "x": 0.08073623478412628, + "y": -0.125896617770195, + "z": -0.034658633172512057 + }, + "rotation": { + "x": -0.5162340998649597, + "y": -0.5017301440238953, + "z": 0.006298713386058807, + "w": 0.6940672993659973 + } + } + }, + { + "joint": "IndexKnuckle", + "pose": { + "position": { + "x": 0.03474228084087372, + "y": -0.0794244259595871, + "z": -0.03704426437616348 + }, + "rotation": { + "x": 0.24844542145729066, + "y": 0.2553045451641083, + "z": -0.1957876831293106, + "w": -0.9136616587638855 + } + } + }, + { + "joint": "IndexMiddleJoint", + "pose": { + "position": { + "x": 0.011708781123161316, + "y": -0.06496208906173706, + "z": -0.006560325622558594 + }, + "rotation": { + "x": -0.07294681668281555, + "y": 0.11601599305868149, + "z": -0.3479400873184204, + "w": -0.9274918437004089 + } + } + }, + { + "joint": "IndexDistalJoint", + "pose": { + "position": { + "x": 0.007551820017397404, + "y": -0.07041776180267334, + "z": 0.017747312784194948 + }, + "rotation": { + "x": -0.23120707273483277, + "y": 0.04230353981256485, + "z": -0.283862441778183, + "w": -0.9298091530799866 + } + } + }, + { + "joint": "IndexTip", + "pose": { + "position": { + "x": 0.008366326801478863, + "y": -0.07753925025463104, + "z": 0.03171003982424736 + }, + "rotation": { + "x": -0.23120707273483277, + "y": 0.04230353981256485, + "z": -0.283862441778183, + "w": -0.9298091530799866 + } + } + }, + { + "joint": "MiddleMetacarpal", + "pose": { + "position": { + "x": 0.08751480281352997, + "y": -0.12250128388404846, + "z": -0.03293202817440033 + }, + "rotation": { + "x": -0.6167790293693543, + "y": -0.3379325270652771, + "z": 0.047245174646377566, + "w": 0.7093328237533569 + } + } + }, + { + "joint": "MiddleKnuckle", + "pose": { + "position": { + "x": 0.05473826080560684, + "y": -0.07110955566167832, + "z": -0.03227551281452179 + }, + "rotation": { + "x": 0.14497825503349305, + "y": 0.23276910185813905, + "z": -0.15017877519130708, + "w": -0.9498769640922546 + } + } + }, + { + "joint": "MiddleMiddleJoint", + "pose": { + "position": { + "x": 0.03288401663303375, + "y": -0.061863791197538379, + "z": 0.005947750061750412 + }, + "rotation": { + "x": -0.529046893119812, + "y": 0.08228799700737, + "z": -0.27945762872695925, + "w": -0.7971096038818359 + } + } + }, + { + "joint": "MiddleDistalJoint", + "pose": { + "position": { + "x": 0.03765859827399254, + "y": -0.08771546185016632, + "z": 0.018359089270234109 + }, + "rotation": { + "x": -0.7883356809616089, + "y": -0.06667964905500412, + "z": -0.20251651108264924, + "w": -0.5779290795326233 + } + } + }, + { + "joint": "MiddleTip", + "pose": { + "position": { + "x": 0.044593729078769687, + "y": -0.10324498265981674, + "z": 0.013978719711303711 + }, + "rotation": { + "x": -0.7883356809616089, + "y": -0.06667964905500412, + "z": -0.20251651108264924, + "w": -0.5779290795326233 + } + } + }, + { + "joint": "RingMetacarpal", + "pose": { + "position": { + "x": 0.09642073512077332, + "y": -0.11764736473560333, + "z": -0.03004951775074005 + }, + "rotation": { + "x": -0.6103544235229492, + "y": -0.2158902883529663, + "z": 0.09254944324493408, + "w": 0.756500780582428 + } + } + }, + { + "joint": "RingKnuckle", + "pose": { + "position": { + "x": 0.07221101969480515, + "y": -0.06899281591176987, + "z": -0.021143771708011628 + }, + "rotation": { + "x": 0.05531589314341545, + "y": 0.22126297652721406, + "z": -0.10504759848117829, + "w": -0.9679690599441528 + } + } + }, + { + "joint": "RingMiddleJoint", + "pose": { + "position": { + "x": 0.05479241907596588, + "y": -0.06659357994794846, + "z": 0.014326661825180054 + }, + "rotation": { + "x": -0.7176058888435364, + "y": 0.09858439117670059, + "z": -0.19834160804748536, + "w": -0.6603801846504211 + } + } + }, + { + "joint": "RingDistalJoint", + "pose": { + "position": { + "x": 0.05848679319024086, + "y": -0.09022481739521027, + "z": 0.013152096420526505 + }, + "rotation": { + "x": -0.902705729007721, + "y": -0.04138700291514397, + "z": -0.16108426451683045, + "w": -0.39749816060066225 + } + } + }, + { + "joint": "RingTip", + "pose": { + "position": { + "x": 0.0647393986582756, + "y": -0.10384124517440796, + "z": 0.000916551798582077 + }, + "rotation": { + "x": -0.902705729007721, + "y": -0.04138700291514397, + "z": -0.16108426451683045, + "w": -0.39749816060066225 + } + } + }, + { + "joint": "PinkyMetacarpal", + "pose": { + "position": { + "x": 0.10431554913520813, + "y": -0.11550788581371308, + "z": -0.02525215595960617 + }, + "rotation": { + "x": -0.5731514096260071, + "y": -0.08393544703722, + "z": 0.14239011704921723, + "w": 0.8026066422462463 + } + } + }, + { + "joint": "PinkyKnuckle", + "pose": { + "position": { + "x": 0.08813987672328949, + "y": -0.06685832887887955, + "z": -0.0073963552713394169 + }, + "rotation": { + "x": 0.004650826565921307, + "y": 0.2523718476295471, + "z": -0.022669829428195955, + "w": -0.967362105846405 + } + } + }, + { + "joint": "PinkyMiddleJoint", + "pose": { + "position": { + "x": 0.07569940388202667, + "y": -0.066920705139637, + "z": 0.014825716614723206 + }, + "rotation": { + "x": -0.6876563429832459, + "y": 0.1765523999929428, + "z": -0.14831064641475678, + "w": -0.6885376572608948 + } + } + }, + { + "joint": "PinkyDistalJoint", + "pose": { + "position": { + "x": 0.0749262273311615, + "y": -0.08663906902074814, + "z": 0.014672402292490006 + }, + "rotation": { + "x": -0.927348792552948, + "y": 0.0344926156103611, + "z": -0.02340996265411377, + "w": -0.37271565198898318 + } + } + }, + { + "joint": "PinkyTip", + "pose": { + "position": { + "x": 0.07520446181297302, + "y": -0.09743660688400269, + "z": 0.0034288540482521059 + }, + "rotation": { + "x": -0.927348792552948, + "y": 0.0344926156103611, + "z": -0.02340996265411377, + "w": -0.37271565198898318 + } + } + } + ] +} \ No newline at end of file diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PinchSteadyWristHandPoseData.json.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PinchSteadyWristHandPoseData.json.meta new file mode 100644 index 00000000..bd6f9de0 --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PinchSteadyWristHandPoseData.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 8eaebf41206ee3546aed07b9a58f6a40 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PokeHandPose.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PokeHandPose.asset index 6c0d4c49..5c5cf39e 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PokeHandPose.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PokeHandPose.asset @@ -17,4 +17,4 @@ MonoBehaviour: isDefault: 0 isSelectionPose: 0 keyCode: 324 - data: {fileID: 4900000, guid: 22b97ff789b664c4f9b9ee223c29eee7, type: 3} + data: {fileID: 4900000, guid: 5f148c90347c0dc47bbfd1ed7a2d4334, type: 3} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PokeHandPoseData.json b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PokeHandPoseData.json new file mode 100644 index 00000000..20ad07b8 --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PokeHandPoseData.json @@ -0,0 +1,436 @@ +{ + "items": [ + { + "joint": "None", + "pose": { + "position": { + "x": -0.0002162586897611618, + "y": -0.07638707756996155, + "z": -0.5826087594032288 + }, + "rotation": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } + } + }, + { + "joint": "Wrist", + "pose": { + "position": { + "x": 0.042526353150606158, + "y": -0.05274807661771774, + "z": -0.002824799157679081 + }, + "rotation": { + "x": -0.3676998019218445, + "y": -0.23572500050067902, + "z": -0.11507342755794525, + "w": 0.8920522332191467 + } + } + }, + { + "joint": "Palm", + "pose": { + "position": { + "x": 0.03201436251401901, + "y": -0.019188636913895608, + "z": 0.02868746407330036 + }, + "rotation": { + "x": -0.3676998019218445, + "y": -0.23572500050067902, + "z": -0.11507342755794525, + "w": 0.8920522332191467 + } + } + }, + { + "joint": "ThumbMetacarpalJoint", + "pose": { + "position": { + "x": 0.020570117980241777, + "y": -0.04709470272064209, + "z": 0.006985310930758715 + }, + "rotation": { + "x": 0.3615202307701111, + "y": 0.20331884920597077, + "z": -0.6839582324028015, + "w": -0.6008830666542053 + } + } + }, + { + "joint": "ThumbProximalJoint", + "pose": { + "position": { + "x": -0.009850621223449707, + "y": -0.04070408642292023, + "z": 0.034042149782180789 + }, + "rotation": { + "x": 0.21800242364406587, + "y": 0.02305757999420166, + "z": -0.7068297266960144, + "w": -0.673233151435852 + } + } + }, + { + "joint": "ThumbDistalJoint", + "pose": { + "position": { + "x": -0.02049688994884491, + "y": -0.03254491835832596, + "z": 0.06248035654425621 + }, + "rotation": { + "x": 0.258157342672348, + "y": 0.0635419636964798, + "z": -0.7039065957069397, + "w": -0.6593562960624695 + } + } + }, + { + "joint": "ThumbTip", + "pose": { + "position": { + "x": -0.028410332277417184, + "y": -0.028122693300247194, + "z": 0.07770571112632752 + }, + "rotation": { + "x": 0.258157342672348, + "y": 0.0635419636964798, + "z": -0.7039065957069397, + "w": -0.6593562960624695 + } + } + }, + { + "joint": "IndexMetacarpal", + "pose": { + "position": { + "x": 0.029027197510004045, + "y": -0.042809583246707919, + "z": 0.009094133973121643 + }, + "rotation": { + "x": -0.3631853759288788, + "y": -0.3677399158477783, + "z": -0.1473514586687088, + "w": 0.8432979583740234 + } + } + }, + { + "joint": "IndexKnuckle", + "pose": { + "position": { + "x": -0.0017803632654249669, + "y": 0.0004678480327129364, + "z": 0.03705211728811264 + }, + "rotation": { + "x": -0.27657586336135867, + "y": -0.15855258703231812, + "z": 0.0009860674617812038, + "w": 0.947831392288208 + } + } + }, + { + "joint": "IndexMiddleJoint", + "pose": { + "position": { + "x": -0.014122002758085728, + "y": 0.021943308413028718, + "z": 0.06970683485269547 + }, + "rotation": { + "x": -0.2553846836090088, + "y": -0.12617842853069306, + "z": 0.09538201987743378, + "w": 0.9538831114768982 + } + } + }, + { + "joint": "IndexDistalJoint", + "pose": { + "position": { + "x": -0.020550768822431566, + "y": 0.0322258397936821, + "z": 0.08830686658620835 + }, + "rotation": { + "x": -0.30963119864463808, + "y": -0.11118883639574051, + "z": -0.031351685523986819, + "w": 0.9441277980804443 + } + } + }, + { + "joint": "IndexTip", + "pose": { + "position": { + "x": -0.02332291379570961, + "y": 0.04081675410270691, + "z": 0.09968645870685578 + }, + "rotation": { + "x": -0.30963119864463808, + "y": -0.11118883639574051, + "z": -0.031351685523986819, + "w": 0.9441277980804443 + } + } + }, + { + "joint": "MiddleMetacarpal", + "pose": { + "position": { + "x": 0.035866666585206988, + "y": -0.041708216071128848, + "z": 0.010740639641880989 + }, + "rotation": { + "x": -0.43399062752723696, + "y": -0.2068476676940918, + "z": -0.05406999588012695, + "w": 0.8751816153526306 + } + } + }, + { + "joint": "MiddleKnuckle", + "pose": { + "position": { + "x": 0.018060242757201196, + "y": 0.002479703165590763, + "z": 0.04112553596496582 + }, + "rotation": { + "x": 0.005038086324930191, + "y": 0.1527022123336792, + "z": 0.021530797705054284, + "w": -0.9880359768867493 + } + } + }, + { + "joint": "MiddleMiddleJoint", + "pose": { + "position": { + "x": 0.005449346732348204, + "y": 0.0031707696616649629, + "z": 0.08099328726530075 + }, + "rotation": { + "x": -0.49786925315856936, + "y": 0.13922974467277528, + "z": -0.07507844269275665, + "w": -0.8527824878692627 + } + } + }, + { + "joint": "MiddleDistalJoint", + "pose": { + "position": { + "x": 0.0013555703917518259, + "y": -0.01869615726172924, + "z": 0.09269960224628449 + }, + "rotation": { + "x": -0.7163864970207214, + "y": 0.07041004300117493, + "z": -0.030646607279777528, + "w": -0.6939578652381897 + } + } + }, + { + "joint": "MiddleTip", + "pose": { + "position": { + "x": 0.0004728742642328143, + "y": -0.03479576110839844, + "z": 0.09213778376579285 + }, + "rotation": { + "x": -0.7163864970207214, + "y": 0.07041004300117493, + "z": -0.030646607279777528, + "w": -0.6939578652381897 + } + } + }, + { + "joint": "RingMetacarpal", + "pose": { + "position": { + "x": 0.044932689517736438, + "y": -0.04016602039337158, + "z": 0.013597620651125908 + }, + "rotation": { + "x": -0.3939853310585022, + "y": -0.10114617645740509, + "z": 0.016117071732878686, + "w": 0.9133923053741455 + } + } + }, + { + "joint": "RingKnuckle", + "pose": { + "position": { + "x": 0.03491469845175743, + "y": -0.003818823955953121, + "z": 0.047541361302137378 + }, + "rotation": { + "x": -0.11738020181655884, + "y": 0.15373656153678895, + "z": 0.05639626830816269, + "w": -0.9795019030570984 + } + } + }, + { + "joint": "RingMiddleJoint", + "pose": { + "position": { + "x": 0.023768775165081025, + "y": -0.01135534793138504, + "z": 0.08033758401870728 + }, + "rotation": { + "x": -0.7923092842102051, + "y": 0.16401034593582154, + "z": -0.02978098951280117, + "w": -0.5869977474212647 + } + } + }, + { + "joint": "RingDistalJoint", + "pose": { + "position": { + "x": 0.02067880891263485, + "y": -0.031320542097091678, + "z": 0.0737735852599144 + }, + "rotation": { + "x": -0.9346709847450256, + "y": 0.0874316394329071, + "z": -0.023773543536663057, + "w": -0.344605952501297 + } + } + }, + { + "joint": "RingTip", + "pose": { + "position": { + "x": 0.020386409014463426, + "y": -0.04289411008358002, + "z": 0.06018315628170967 + }, + "rotation": { + "x": -0.9346709847450256, + "y": 0.0874316394329071, + "z": -0.023773543536663057, + "w": -0.344605952501297 + } + } + }, + { + "joint": "PinkyMetacarpal", + "pose": { + "position": { + "x": 0.05288681760430336, + "y": -0.041848354041576388, + "z": 0.01654883660376072 + }, + "rotation": { + "x": -0.33144858479499819, + "y": 0.002071807160973549, + "z": 0.085218146443367, + "w": 0.9396145343780518 + } + } + }, + { + "joint": "PinkyKnuckle", + "pose": { + "position": { + "x": 0.050300415605306628, + "y": -0.011202438734471798, + "z": 0.054917603731155398 + }, + "rotation": { + "x": -0.16419324278831483, + "y": 0.1696346402168274, + "z": 0.12252454459667206, + "w": -0.9639865159988403 + } + } + }, + { + "joint": "PinkyMiddleJoint", + "pose": { + "position": { + "x": 0.04166591167449951, + "y": -0.017666997388005258, + "z": 0.07580538094043732 + }, + "rotation": { + "x": -0.7474591135978699, + "y": 0.20672142505645753, + "z": 0.04626481607556343, + "w": -0.6297129392623901 + } + } + }, + { + "joint": "PinkyDistalJoint", + "pose": { + "position": { + "x": 0.03587989881634712, + "y": -0.03386271744966507, + "z": 0.0722469910979271 + }, + "rotation": { + "x": -0.928327202796936, + "y": 0.13445810973644257, + "z": 0.1272566169500351, + "w": -0.3232197165489197 + } + } + }, + { + "joint": "PinkyTip", + "pose": { + "position": { + "x": 0.03135494887828827, + "y": -0.04178089275956154, + "z": 0.06164591759443283 + }, + "rotation": { + "x": -0.928327202796936, + "y": 0.13445810973644257, + "z": 0.1272566169500351, + "w": -0.3232197165489197 + } + } + } + ] +} \ No newline at end of file diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PokeHandPoseData.json.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PokeHandPoseData.json.meta new file mode 100644 index 00000000..f04b091d --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PokeHandPoseData.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5f148c90347c0dc47bbfd1ed7a2d4334 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/ThumbsUpHandPose.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/ThumbsUpHandPose.asset index 93154d20..6b6988a3 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/ThumbsUpHandPose.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/ThumbsUpHandPose.asset @@ -17,4 +17,4 @@ MonoBehaviour: isDefault: 0 isSelectionPose: 0 keyCode: 52 - data: {fileID: 4900000, guid: 71175c7404cbaee408470b929ff3ae1f, type: 3} + data: {fileID: 4900000, guid: f8236cb3fbe55ed499df0418bb28c0cd, type: 3} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/ThumbsUpHandPoseData.json b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/ThumbsUpHandPoseData.json new file mode 100644 index 00000000..4909c61a --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/ThumbsUpHandPoseData.json @@ -0,0 +1,436 @@ +{ + "items": [ + { + "joint": "None", + "pose": { + "position": { + "x": -0.01725071482360363, + "y": -0.08121182024478913, + "z": -0.47676876187324526 + }, + "rotation": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } + } + }, + { + "joint": "Wrist", + "pose": { + "position": { + "x": 0.08615099638700485, + "y": -0.024168234318494798, + "z": 0.034818120300769809 + }, + "rotation": { + "x": -0.24332590401172639, + "y": 0.6052875518798828, + "z": 0.5141062140464783, + "w": -0.5566452741622925 + } + } + }, + { + "joint": "Palm", + "pose": { + "position": { + "x": 0.03520287200808525, + "y": -0.010816145688295365, + "z": 0.04648737236857414 + }, + "rotation": { + "x": -0.24332590401172639, + "y": 0.6052875518798828, + "z": 0.5141062140464783, + "w": -0.5566452741622925 + } + } + }, + { + "joint": "ThumbMetacarpalJoint", + "pose": { + "position": { + "x": 0.06692907959222794, + "y": -0.0030839829705655576, + "z": 0.020349422469735147 + }, + "rotation": { + "x": 0.39406728744506838, + "y": 0.7213952541351318, + "z": 0.33115363121032717, + "w": -0.46385547518730166 + } + } + }, + { + "joint": "ThumbProximalJoint", + "pose": { + "position": { + "x": 0.048644911497831348, + "y": 0.034663256257772449, + "z": 0.004639927297830582 + }, + "rotation": { + "x": 0.34302714467048647, + "y": 0.719179630279541, + "z": 0.2980014383792877, + "w": -0.5261238217353821 + } + } + }, + { + "joint": "ThumbDistalJoint", + "pose": { + "position": { + "x": 0.030924495309591295, + "y": 0.05998371168971062, + "z": -0.004000300541520119 + }, + "rotation": { + "x": 0.4403221607208252, + "y": 0.6942930817604065, + "z": 0.3865111470222473, + "w": -0.4186002314090729 + } + } + }, + { + "joint": "ThumbTip", + "pose": { + "position": { + "x": 0.02607334591448307, + "y": 0.07819978147745133, + "z": -0.011070644482970238 + }, + "rotation": { + "x": 0.4403221607208252, + "y": 0.6942930817604065, + "z": 0.3865111470222473, + "w": -0.4186002314090729 + } + } + }, + { + "joint": "IndexMetacarpal", + "pose": { + "position": { + "x": 0.06430374830961228, + "y": -0.01019766554236412, + "z": 0.02929815649986267 + }, + "rotation": { + "x": -0.22792501747608186, + "y": 0.6316274404525757, + "z": 0.5866482257843018, + "w": -0.45270389318466189 + } + } + }, + { + "joint": "IndexKnuckle", + "pose": { + "position": { + "x": 0.011573880910873413, + "y": 0.02339656837284565, + "z": 0.03546718880534172 + }, + "rotation": { + "x": 0.3942926526069641, + "y": -0.7424762845039368, + "z": -0.21414896845817567, + "w": 0.49741214513778689 + } + } + }, + { + "joint": "IndexMiddleJoint", + "pose": { + "position": { + "x": -0.021892068907618524, + "y": 0.020658958703279496, + "z": 0.020219745114445688 + }, + "rotation": { + "x": 0.5834210515022278, + "y": -0.7061115503311157, + "z": 0.3634859323501587, + "w": 0.17027443647384644 + } + } + }, + { + "joint": "IndexDistalJoint", + "pose": { + "position": { + "x": -0.017463261261582376, + "y": 0.00348295527510345, + "z": 0.0038637774996459486 + }, + "rotation": { + "x": 0.6371655464172363, + "y": -0.4360961318016052, + "z": 0.6206539869308472, + "w": -0.13840782642364503 + } + } + }, + { + "joint": "IndexTip", + "pose": { + "position": { + "x": -0.001938387518748641, + "y": -0.0027357139624655248, + "z": 0.0005815188633278012 + }, + "rotation": { + "x": 0.6371655464172363, + "y": -0.4360961318016052, + "z": 0.6206539869308472, + "w": -0.13840782642364503 + } + } + }, + { + "joint": "MiddleMetacarpal", + "pose": { + "position": { + "x": 0.06397924572229386, + "y": -0.016921602189540864, + "z": 0.03521520271897316 + }, + "rotation": { + "x": -0.16760338842868806, + "y": 0.5928976535797119, + "z": 0.5015624761581421, + "w": -0.6073026657104492 + } + } + }, + { + "joint": "MiddleKnuckle", + "pose": { + "position": { + "x": 0.01083554606884718, + "y": 0.006482137367129326, + "z": 0.049619730561971667 + }, + "rotation": { + "x": 0.5027921199798584, + "y": -0.7059369087219238, + "z": -0.16476257145404817, + "w": 0.4708792269229889 + } + } + }, + { + "joint": "MiddleMiddleJoint", + "pose": { + "position": { + "x": -0.025254713371396066, + "y": -0.003984889946877956, + "z": 0.02779259905219078 + }, + "rotation": { + "x": 0.6809582710266113, + "y": -0.6233372688293457, + "z": 0.3824990391731262, + "w": -0.039771441370248798 + } + } + }, + { + "joint": "MiddleDistalJoint", + "pose": { + "position": { + "x": -0.00917090568691492, + "y": -0.015904264524579049, + "z": 0.007921875454485417 + }, + "rotation": { + "x": 0.6229440569877625, + "y": -0.2391648292541504, + "z": 0.642637312412262, + "w": -0.37781840562820437 + } + } + }, + { + "joint": "MiddleTip", + "pose": { + "position": { + "x": 0.008252275176346302, + "y": -0.013008372858166695, + "z": 0.009888304397463799 + }, + "rotation": { + "x": 0.6229440569877625, + "y": -0.2391648292541504, + "z": 0.642637312412262, + "w": -0.37781840562820437 + } + } + }, + { + "joint": "RingMetacarpal", + "pose": { + "position": { + "x": 0.06303475052118302, + "y": -0.02612213045358658, + "z": 0.04269380867481232 + }, + "rotation": { + "x": -0.18103565275669099, + "y": 0.5941647887229919, + "z": 0.39771339297294619, + "w": -0.6752913594245911 + } + } + }, + { + "joint": "RingKnuckle", + "pose": { + "position": { + "x": 0.010207276791334153, + "y": -0.013390008360147477, + "z": 0.055441394448280337 + }, + "rotation": { + "x": 0.5632884502410889, + "y": -0.6713510751724243, + "z": -0.15870888531208039, + "w": 0.45477786660194399 + } + } + }, + { + "joint": "RingMiddleJoint", + "pose": { + "position": { + "x": -0.01994304731488228, + "y": -0.024818312376737596, + "z": 0.03496982902288437 + }, + "rotation": { + "x": 0.7331446409225464, + "y": -0.5462665557861328, + "z": 0.3692132830619812, + "w": -0.16697438061237336 + } + } + }, + { + "joint": "RingDistalJoint", + "pose": { + "position": { + "x": -0.0031065356452018024, + "y": -0.028507214039564134, + "z": 0.019337791949510576 + }, + "rotation": { + "x": 0.6351615786552429, + "y": -0.23133434355258943, + "z": 0.5935887098312378, + "w": -0.43731656670570376 + } + } + }, + { + "joint": "RingTip", + "pose": { + "position": { + "x": 0.015546157956123352, + "y": -0.023027585819363595, + "z": 0.021024812012910844 + }, + "rotation": { + "x": 0.6351615786552429, + "y": -0.23133434355258943, + "z": 0.5935887098312378, + "w": -0.43731656670570376 + } + } + }, + { + "joint": "PinkyMetacarpal", + "pose": { + "position": { + "x": 0.06254640221595764, + "y": -0.034929849207401279, + "z": 0.04593820124864578 + }, + "rotation": { + "x": -0.19249169528484345, + "y": 0.581859290599823, + "z": 0.2601516842842102, + "w": -0.7461285591125488 + } + } + }, + { + "joint": "PinkyKnuckle", + "pose": { + "position": { + "x": 0.009921858087182045, + "y": -0.03408779203891754, + "z": 0.05945640057325363 + }, + "rotation": { + "x": 0.6286200881004334, + "y": -0.6190594434738159, + "z": -0.18423764407634736, + "w": 0.43321672081947329 + } + } + }, + { + "joint": "PinkyMiddleJoint", + "pose": { + "position": { + "x": -0.007876850664615631, + "y": -0.041423700749874118, + "z": 0.04655241593718529 + }, + "rotation": { + "x": 0.7744045257568359, + "y": -0.5470465421676636, + "z": 0.2698802649974823, + "w": -0.1682688444852829 + } + } + }, + { + "joint": "PinkyDistalJoint", + "pose": { + "position": { + "x": 0.0036155348643660547, + "y": -0.042087383568286899, + "z": 0.03132062032818794 + }, + "rotation": { + "x": 0.7368069291114807, + "y": -0.19751593470573426, + "z": 0.4435950815677643, + "w": -0.47120407223701479 + } + } + }, + { + "joint": "PinkyTip", + "pose": { + "position": { + "x": 0.016652610152959825, + "y": -0.034032851457595828, + "z": 0.02879030816257 + }, + "rotation": { + "x": 0.7368069291114807, + "y": -0.19751593470573426, + "z": 0.4435950815677643, + "w": -0.47120407223701479 + } + } + } + ] +} \ No newline at end of file diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/ThumbsUpHandPoseData.json.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/ThumbsUpHandPoseData.json.meta new file mode 100644 index 00000000..c57a2d04 --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/ThumbsUpHandPoseData.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f8236cb3fbe55ed499df0418bb28c0cd +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/VictoryHandPose.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/VictoryHandPose.asset index 6d34ce35..e8866811 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/VictoryHandPose.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/VictoryHandPose.asset @@ -17,4 +17,4 @@ MonoBehaviour: isDefault: 0 isSelectionPose: 0 keyCode: 53 - data: {fileID: 4900000, guid: 21f98e595bbf7294c96c87c187f41196, type: 3} + data: {fileID: 4900000, guid: f7b9fdc8704378f4a8e1f18c99edb3ac, type: 3} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/VictoryHandPoseData.json b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/VictoryHandPoseData.json new file mode 100644 index 00000000..52e498ec --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/VictoryHandPoseData.json @@ -0,0 +1,436 @@ +{ + "items": [ + { + "joint": "None", + "pose": { + "position": { + "x": 0.0021753902547061445, + "y": -0.13046418130397798, + "z": -0.45588064193725588 + }, + "rotation": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } + } + }, + { + "joint": "Wrist", + "pose": { + "position": { + "x": 0.07915662229061127, + "y": -0.13887012004852296, + "z": -0.010340530425310135 + }, + "rotation": { + "x": -0.5914298295974731, + "y": -0.2676140367984772, + "z": -0.06283169984817505, + "w": 0.7577439546585083 + } + } + }, + { + "joint": "Palm", + "pose": { + "position": { + "x": 0.06830108910799027, + "y": -0.09366560727357865, + "z": -0.0000256318598985672 + }, + "rotation": { + "x": -0.5914298295974731, + "y": -0.2676140367984772, + "z": -0.06283169984817505, + "w": 0.7577439546585083 + } + } + }, + { + "joint": "ThumbMetacarpalJoint", + "pose": { + "position": { + "x": 0.05787024274468422, + "y": -0.12883375585079194, + "z": -0.005382232367992401 + }, + "rotation": { + "x": 0.4801919758319855, + "y": -0.04491055756807327, + "z": -0.7443504333496094, + "w": -0.4627794027328491 + } + } + }, + { + "joint": "ThumbProximalJoint", + "pose": { + "position": { + "x": 0.030012525618076326, + "y": -0.10770050436258316, + "z": 0.016813457012176515 + }, + "rotation": { + "x": 0.312323659658432, + "y": -0.2742984890937805, + "z": -0.6935320496559143, + "w": -0.5894817113876343 + } + } + }, + { + "joint": "ThumbDistalJoint", + "pose": { + "position": { + "x": 0.026396021246910096, + "y": -0.08305369317531586, + "z": 0.03835996612906456 + }, + "rotation": { + "x": 0.26157766580581667, + "y": -0.3302468955516815, + "z": -0.6686716675758362, + "w": -0.6136223673820496 + } + } + }, + { + "joint": "ThumbTip", + "pose": { + "position": { + "x": 0.027343440800905229, + "y": -0.07000578194856644, + "z": 0.04939644783735275 + }, + "rotation": { + "x": 0.26157766580581667, + "y": -0.3302468955516815, + "z": -0.6686716675758362, + "w": -0.6136223673820496 + } + } + }, + { + "joint": "IndexMetacarpal", + "pose": { + "position": { + "x": 0.06611358374357224, + "y": -0.12426556646823883, + "z": -0.0055283233523368839 + }, + "rotation": { + "x": -0.5613270998001099, + "y": -0.42208683490753176, + "z": -0.06766947358846665, + "w": 0.7086432576179504 + } + } + }, + { + "joint": "IndexKnuckle", + "pose": { + "position": { + "x": 0.034438081085681918, + "y": -0.0725482851266861, + "z": -0.004708992317318916 + }, + "rotation": { + "x": -0.6286489963531494, + "y": -0.2787279188632965, + "z": 0.040076885372400287, + "w": 0.7249277830123901 + } + } + }, + { + "joint": "IndexMiddleJoint", + "pose": { + "position": { + "x": 0.015563697554171086, + "y": -0.03562714159488678, + "z": -0.0024565430358052255 + }, + "rotation": { + "x": -0.6645650863647461, + "y": -0.2075067013502121, + "z": 0.10458821058273316, + "w": 0.7102522253990173 + } + } + }, + { + "joint": "IndexDistalJoint", + "pose": { + "position": { + "x": 0.005756473168730736, + "y": -0.015270628966391087, + "z": -0.0017626225017011166 + }, + "rotation": { + "x": -0.6223592162132263, + "y": -0.24349386990070344, + "z": 0.01842544600367546, + "w": 0.7439839839935303 + } + } + }, + { + "joint": "IndexTip", + "pose": { + "position": { + "x": 0.00011674128472805023, + "y": -0.0018588211387395859, + "z": -0.00020025699632242322 + }, + "rotation": { + "x": -0.6223592162132263, + "y": -0.24349386990070344, + "z": 0.01842544600367546, + "w": 0.7439839839935303 + } + } + }, + { + "joint": "MiddleMetacarpal", + "pose": { + "position": { + "x": 0.07268297672271729, + "y": -0.12254584580659867, + "z": -0.004201311618089676 + }, + "rotation": { + "x": -0.6534333825111389, + "y": -0.22906279563903809, + "z": -0.018352244049310685, + "w": 0.7212615013122559 + } + } + }, + { + "joint": "MiddleKnuckle", + "pose": { + "position": { + "x": 0.054447855800390246, + "y": -0.06595612317323685, + "z": -0.0017550308257341385 + }, + "rotation": { + "x": -0.5899049043655396, + "y": -0.16088859736919404, + "z": -0.018363818526268007, + "w": 0.7910826206207275 + } + } + }, + { + "joint": "MiddleMiddleJoint", + "pose": { + "position": { + "x": 0.04355549067258835, + "y": -0.022029317915439607, + "z": 0.010043984279036522 + }, + "rotation": { + "x": -0.6020974516868591, + "y": -0.14070262014865876, + "z": -0.036361001431941989, + "w": 0.7852000594139099 + } + } + }, + { + "joint": "MiddleDistalJoint", + "pose": { + "position": { + "x": 0.03923114016652107, + "y": 0.0012873951345682145, + "z": 0.015791211277246476 + }, + "rotation": { + "x": -0.5366969108581543, + "y": -0.17153941094875337, + "z": -0.09987709671258927, + "w": 0.8206644058227539 + } + } + }, + { + "joint": "MiddleTip", + "pose": { + "position": { + "x": 0.03647539019584656, + "y": 0.015714645385742189, + "z": 0.021557386964559556 + }, + "rotation": { + "x": -0.5366969108581543, + "y": -0.17153941094875337, + "z": -0.09987709671258927, + "w": 0.8206644058227539 + } + } + }, + { + "joint": "RingMetacarpal", + "pose": { + "position": { + "x": 0.08137646317481995, + "y": -0.11985518038272858, + "z": -0.00190657377243042 + }, + "rotation": { + "x": -0.6267969012260437, + "y": -0.10518965870141983, + "z": 0.02498382329940796, + "w": 0.7716453075408936 + } + } + }, + { + "joint": "RingKnuckle", + "pose": { + "position": { + "x": 0.07067620009183884, + "y": -0.06669728457927704, + "z": 0.008708799257874489 + }, + "rotation": { + "x": 0.40646883845329287, + "y": 0.1807955503463745, + "z": 0.030094729736447336, + "w": -0.8951042294502258 + } + } + }, + { + "joint": "RingMiddleJoint", + "pose": { + "position": { + "x": 0.060088954865932468, + "y": -0.04056686535477638, + "z": 0.03008754923939705 + }, + "rotation": { + "x": -0.2107616662979126, + "y": 0.18913404643535615, + "z": -0.04620787873864174, + "w": -0.9580028653144836 + } + } + }, + { + "joint": "RingDistalJoint", + "pose": { + "position": { + "x": 0.0528024360537529, + "y": -0.0495174415409565, + "z": 0.047927625477313998 + }, + "rotation": { + "x": -0.449715256690979, + "y": 0.15903393924236298, + "z": -0.020673276856541635, + "w": -0.8789007067680359 + } + } + }, + { + "joint": "RingTip", + "pose": { + "position": { + "x": 0.048170287162065509, + "y": -0.06364263594150543, + "z": 0.05758979544043541 + }, + "rotation": { + "x": -0.449715256690979, + "y": 0.15903393924236298, + "z": -0.020673276856541635, + "w": -0.8789007067680359 + } + } + }, + { + "joint": "PinkyMetacarpal", + "pose": { + "position": { + "x": 0.08909709751605988, + "y": -0.11985252797603607, + "z": 0.001964922994375229 + }, + "rotation": { + "x": -0.5780324339866638, + "y": -0.0013396204449236394, + "z": 0.06318691372871399, + "w": 0.8135625720024109 + } + } + }, + { + "joint": "PinkyKnuckle", + "pose": { + "position": { + "x": 0.0851951465010643, + "y": -0.07107751816511154, + "z": 0.019172409549355508 + }, + "rotation": { + "x": 0.31776368618011477, + "y": 0.2502634525299072, + "z": 0.05463750660419464, + "w": -0.9129235744476318 + } + } + }, + { + "joint": "PinkyMiddleJoint", + "pose": { + "position": { + "x": 0.07433749735355377, + "y": -0.055455759167671207, + "z": 0.03647337108850479 + }, + "rotation": { + "x": -0.17528946697711945, + "y": 0.2344343513250351, + "z": 0.019245747476816179, + "w": -0.9560556411743164 + } + } + }, + { + "joint": "PinkyDistalJoint", + "pose": { + "position": { + "x": 0.06645255535840988, + "y": -0.06111001968383789, + "z": 0.050835996866226199 + }, + "rotation": { + "x": -0.4488738477230072, + "y": 0.26990553736686709, + "z": 0.08396486192941666, + "w": -0.8479632139205933 + } + } + }, + { + "joint": "PinkyTip", + "pose": { + "position": { + "x": 0.05911727994680405, + "y": -0.07095448672771454, + "z": 0.05705229192972183 + }, + "rotation": { + "x": -0.4488738477230072, + "y": 0.26990553736686709, + "z": 0.08396486192941666, + "w": -0.8479632139205933 + } + } + } + ] +} \ No newline at end of file diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/VictoryHandPoseData.json.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/VictoryHandPoseData.json.meta new file mode 100644 index 00000000..57825829 --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/VictoryHandPoseData.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f7b9fdc8704378f4a8e1f18c99edb3ac +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: From 0bbde1eda12ea8b64a030149810fe8945440a792 Mon Sep 17 00:00:00 2001 From: Dino Fejzagic Date: Sat, 2 May 2020 14:22:49 +0200 Subject: [PATCH 09/78] Fix NRE for spatial pointer mapping --- .../Simulated/LeftSimulatedHandControllerProfile.asset | 2 +- .../Simulated/RightSimulatedHandControllerProfile.asset | 2 +- ...SpatialPointerPose.asset => SpatialHandPointerProfile.asset} | 2 +- ...nterPose.asset.meta => SpatialHandPointerProfile.asset.meta} | 0 .../Profiles~/Input/MixedRealityInputSystemProfile.asset | 1 + 5 files changed, 4 insertions(+), 3 deletions(-) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/{SpatialPointerPose.asset => SpatialHandPointerProfile.asset} (95%) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/{SpatialPointerPose.asset.meta => SpatialHandPointerProfile.asset.meta} (100%) diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/LeftSimulatedHandControllerProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/LeftSimulatedHandControllerProfile.asset index f10ea4db..5893c3b7 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/LeftSimulatedHandControllerProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/LeftSimulatedHandControllerProfile.asset @@ -19,7 +19,7 @@ MonoBehaviour: type: 2} useCustomInteractions: 0 interactionMappingProfiles: - - {fileID: 11400000, guid: f44a8ca60623dae40ab7bb587b25f9a4, type: 2} + - {fileID: 11400000, guid: b7f65e3d3581e3d46ba01ecb4fedd827, type: 2} - {fileID: 11400000, guid: 75cc1e0a54a5fe648a4cde0278665293, type: 2} - {fileID: 11400000, guid: 17f3fbe848f439d42b507e772d4815f2, type: 2} - {fileID: 11400000, guid: d41a902589d58634c91da2d0bddc63a2, type: 2} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/RightSimulatedHandControllerProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/RightSimulatedHandControllerProfile.asset index e719288c..980b7b09 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/RightSimulatedHandControllerProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/RightSimulatedHandControllerProfile.asset @@ -19,7 +19,7 @@ MonoBehaviour: type: 2} useCustomInteractions: 0 interactionMappingProfiles: - - {fileID: 11400000, guid: e54f3b1cd9a54284a9fdbdf19cbc4dbe, type: 2} + - {fileID: 11400000, guid: b7f65e3d3581e3d46ba01ecb4fedd827, type: 2} - {fileID: 11400000, guid: c811bb700747c1c4e98ad88949df2b54, type: 2} - {fileID: 11400000, guid: 9ca2333c70b50404d9e2071a2a8ecf67, type: 2} - {fileID: 11400000, guid: 2aee855545b476e4b89c55f2e9709de4, type: 2} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/SpatialPointerPose.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/SpatialHandPointerProfile.asset similarity index 95% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/SpatialPointerPose.asset rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/SpatialHandPointerProfile.asset index 5199c59d..37be4e9d 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/SpatialPointerPose.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/SpatialHandPointerProfile.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: e3fb79524faca40478c0844c24e542f7, type: 3} - m_Name: SpatialPointerPose + m_Name: SpatialHandPointerProfile m_EditorClassIdentifier: interactionMapping: description: Index Spatial Pointer diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/SpatialPointerPose.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/SpatialHandPointerProfile.asset.meta similarity index 100% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/SpatialPointerPose.asset.meta rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/SpatialHandPointerProfile.asset.meta diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/MixedRealityInputSystemProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/MixedRealityInputSystemProfile.asset index 1caf389a..471f73e6 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/MixedRealityInputSystemProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/MixedRealityInputSystemProfile.asset @@ -106,6 +106,7 @@ MonoBehaviour: - {fileID: 11400000, guid: 1251200226ad995498472e45aaf12178, type: 2} - {fileID: 11400000, guid: 5e6bcc3863bdc634d82a8a59598a070b, type: 2} - {fileID: 11400000, guid: 2f6c29c72cd30c74f9717c932bd87a4a, type: 2} + - {fileID: 11400000, guid: 7f8c95a0360d2a04abee2a9b0863b6f5, type: 2} inputActionsProfile: {fileID: 11400000, guid: 399335ccc89c4d12b79f3539ca7771db, type: 2} speechCommandsProfile: {fileID: 11400000, guid: 89759c8b9c98420794a5d650ce3b2f90, From 2865f238e70e797c4cf58e8d223deec09584731e Mon Sep 17 00:00:00 2001 From: Dino Fejzagic Date: Sat, 2 May 2020 14:31:36 +0200 Subject: [PATCH 10/78] Re-init simulated hand defaults --- .../Simulated/Left/GrabProfile.asset | 30 +++++++++++++++++ .../GrabProfile.asset.meta} | 2 +- .../Left/IndexFingerPoseProfile.asset | 30 +++++++++++++++++ .../IndexFingerPoseProfile.asset.meta} | 2 +- .../Left/MoveAway(Depth)Profile.asset.meta | 2 +- .../Left/MoveCloser(Depth)Profile.asset.meta | 2 +- .../Left/PitchClockwiseProfile.asset.meta | 2 +- .../PitchCounterClockwiseProfile.asset.meta | 2 +- .../Left/RollClockwiseProfile.asset.meta | 2 +- .../RollCounterClockwiseProfile.asset.meta | 2 +- .../Simulated/Left/SelectProfile.asset | 30 +++++++++++++++++ .../Simulated/Left/SelectProfile.asset.meta | 8 +++++ .../Left/YawClockwiseProfile.asset.meta | 2 +- .../YawCounterClockwiseProfile.asset.meta | 2 +- .../LeftSimulatedHandControllerProfile.asset | 30 ----------------- ...tedMixedRealityHandControllerProfile.asset | 32 +++++++++++++++++++ ...xedRealityHandControllerProfile.asset.meta | 8 +++++ .../Simulated/Right/GrabProfile.asset | 30 +++++++++++++++++ .../Simulated/Right/GrabProfile.asset.meta | 8 +++++ .../Right/IndexFingerPoseProfile.asset | 30 +++++++++++++++++ .../Right/IndexFingerPoseProfile.asset.meta | 8 +++++ .../Right/MoveAway(Depth)Profile.asset.meta | 2 +- .../Right/MoveCloser(Depth)Profile.asset | 8 ++--- .../Right/MoveCloser(Depth)Profile.asset.meta | 2 +- .../Right/PitchClockwiseProfile.asset.meta | 2 +- .../PitchCounterClockwiseProfile.asset.meta | 2 +- .../Right/RollClockwiseProfile.asset.meta | 2 +- .../RollCounterClockwiseProfile.asset.meta | 2 +- .../Simulated/Right/SelectProfile.asset | 30 +++++++++++++++++ .../Simulated/Right/SelectProfile.asset.meta | 8 +++++ .../Right/YawClockwiseProfile.asset.meta | 2 +- .../YawCounterClockwiseProfile.asset.meta | 2 +- .../RightSimulatedHandControllerProfile.asset | 30 ----------------- ...tedMixedRealityHandControllerProfile.asset | 20 ++++++++++++ ...xedRealityHandControllerProfile.asset.meta | 8 +++++ ...tedHandControllerDataProviderProfile.asset | 5 ++- ...ndControllerDataProviderProfile.asset.meta | 0 37 files changed, 304 insertions(+), 85 deletions(-) create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/GrabProfile.asset rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/{LeftSimulatedHandControllerProfile.asset.meta => Left/GrabProfile.asset.meta} (79%) create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/IndexFingerPoseProfile.asset rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/{RightSimulatedHandControllerProfile.asset.meta => Left/IndexFingerPoseProfile.asset.meta} (79%) create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/SelectProfile.asset create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/SelectProfile.asset.meta delete mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/LeftSimulatedHandControllerProfile.asset create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/LeftSimulatedMixedRealityHandControllerProfile.asset create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/LeftSimulatedMixedRealityHandControllerProfile.asset.meta create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/GrabProfile.asset create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/GrabProfile.asset.meta create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/IndexFingerPoseProfile.asset create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/IndexFingerPoseProfile.asset.meta create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/SelectProfile.asset create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/SelectProfile.asset.meta delete mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/RightSimulatedHandControllerProfile.asset create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/RightSimulatedMixedRealityHandControllerProfile.asset create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/RightSimulatedMixedRealityHandControllerProfile.asset.meta rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/{ => HandControllers}/SimulatedHandControllerDataProviderProfile.asset (84%) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/{ => HandControllers}/SimulatedHandControllerDataProviderProfile.asset.meta (100%) diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/GrabProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/GrabProfile.asset new file mode 100644 index 00000000..40ed73d2 --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/GrabProfile.asset @@ -0,0 +1,30 @@ +%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: e3fb79524faca40478c0844c24e542f7, type: 3} + m_Name: GrabProfile + m_EditorClassIdentifier: + interactionMapping: + description: Grab + stateChangeType: 0 + axisType: 3 + inputType: 13 + inputAction: + profileGuid: 00000000000000000000000000000000 + id: 0 + description: None + axisConstraint: 0 + keyCode: 0 + inputName: + axisCodeX: + axisCodeY: + inputProcessors: [] + pointerProfiles: [] diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/LeftSimulatedHandControllerProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/GrabProfile.asset.meta similarity index 79% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/LeftSimulatedHandControllerProfile.asset.meta rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/GrabProfile.asset.meta index dda578e4..cb91b24b 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/LeftSimulatedHandControllerProfile.asset.meta +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/GrabProfile.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: db8d37cbb21a4af498ee7f59d7428f91 +guid: 0f1e943dcb760c142a76e3f571394b42 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/IndexFingerPoseProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/IndexFingerPoseProfile.asset new file mode 100644 index 00000000..e153dcc7 --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/IndexFingerPoseProfile.asset @@ -0,0 +1,30 @@ +%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: e3fb79524faca40478c0844c24e542f7, type: 3} + m_Name: IndexFingerPoseProfile + m_EditorClassIdentifier: + interactionMapping: + description: Index Finger Pose + stateChangeType: 0 + axisType: 7 + inputType: 33 + inputAction: + profileGuid: 00000000000000000000000000000000 + id: 0 + description: None + axisConstraint: 0 + keyCode: 0 + inputName: + axisCodeX: + axisCodeY: + inputProcessors: [] + pointerProfiles: [] diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/RightSimulatedHandControllerProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/IndexFingerPoseProfile.asset.meta similarity index 79% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/RightSimulatedHandControllerProfile.asset.meta rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/IndexFingerPoseProfile.asset.meta index ca4329eb..2a0ca347 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/RightSimulatedHandControllerProfile.asset.meta +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/IndexFingerPoseProfile.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: bc5b8bebbe1a1ee4b8ba8916077368ed +guid: 80556dee026997f4ba146ffda4710f79 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/MoveAway(Depth)Profile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/MoveAway(Depth)Profile.asset.meta index fe609c97..730b6e63 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/MoveAway(Depth)Profile.asset.meta +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/MoveAway(Depth)Profile.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d66ff6bdac77e284a9b56cd8ff7588f8 +guid: 903e62b0bf4b64c43bba8ac894bde493 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/MoveCloser(Depth)Profile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/MoveCloser(Depth)Profile.asset.meta index 8ccd771d..8c4e8065 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/MoveCloser(Depth)Profile.asset.meta +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/MoveCloser(Depth)Profile.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e001f5e0dec2fdc4e8f7361051c16285 +guid: 5f29f2281e568b64c8356f8b24aaa9e8 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/PitchClockwiseProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/PitchClockwiseProfile.asset.meta index 9bae3d7a..aa8e34f5 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/PitchClockwiseProfile.asset.meta +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/PitchClockwiseProfile.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d41a902589d58634c91da2d0bddc63a2 +guid: 1d100ad98538f674697c53fb406c5a47 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/PitchCounterClockwiseProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/PitchCounterClockwiseProfile.asset.meta index d93fb275..54a27d72 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/PitchCounterClockwiseProfile.asset.meta +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/PitchCounterClockwiseProfile.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 02740da3b13d2504d8d707db21806544 +guid: b7f7f573c0806e144ba65d8c46fb0443 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/RollClockwiseProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/RollClockwiseProfile.asset.meta index 24758509..9150096b 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/RollClockwiseProfile.asset.meta +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/RollClockwiseProfile.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2aed84cf960b4a44e945ade98bcd6a46 +guid: 99e0428a07202934193ab6678748a6bb NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/RollCounterClockwiseProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/RollCounterClockwiseProfile.asset.meta index cc0f60e3..59e399e4 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/RollCounterClockwiseProfile.asset.meta +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/RollCounterClockwiseProfile.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5147df11251971d49bad06a892acb4b8 +guid: b234687150647ee4b854b7208eb5794b NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/SelectProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/SelectProfile.asset new file mode 100644 index 00000000..cc1a7cf7 --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/SelectProfile.asset @@ -0,0 +1,30 @@ +%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: e3fb79524faca40478c0844c24e542f7, type: 3} + m_Name: SelectProfile + m_EditorClassIdentifier: + interactionMapping: + description: Select + stateChangeType: 0 + axisType: 2 + inputType: 25 + inputAction: + profileGuid: 00000000000000000000000000000000 + id: 0 + description: None + axisConstraint: 0 + keyCode: 0 + inputName: + axisCodeX: + axisCodeY: + inputProcessors: [] + pointerProfiles: [] diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/SelectProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/SelectProfile.asset.meta new file mode 100644 index 00000000..4452bab2 --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/SelectProfile.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1fd0c5cd50876514bb0027af902ed920 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/YawClockwiseProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/YawClockwiseProfile.asset.meta index 3060d755..9a6dd6da 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/YawClockwiseProfile.asset.meta +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/YawClockwiseProfile.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 75cc1e0a54a5fe648a4cde0278665293 +guid: 0a51a3da8723c99469a4cefb19c2a75b NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/YawCounterClockwiseProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/YawCounterClockwiseProfile.asset.meta index f6309b3b..c260157a 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/YawCounterClockwiseProfile.asset.meta +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/YawCounterClockwiseProfile.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 17f3fbe848f439d42b507e772d4815f2 +guid: 74befe0f3ef40d94f8930e361f6fa025 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/LeftSimulatedHandControllerProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/LeftSimulatedHandControllerProfile.asset deleted file mode 100644 index 5893c3b7..00000000 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/LeftSimulatedHandControllerProfile.asset +++ /dev/null @@ -1,30 +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: d420c170b42dfe0438e2aa2a829775ed, type: 3} - m_Name: LeftSimulatedHandControllerProfile - m_EditorClassIdentifier: - controllerType: - reference: 435c4f16-8e23-4228-b2b0-5fce09a97043 - handedness: 1 - visualizationProfile: {fileID: 11400000, guid: d03625d21fb0bfb41b6642f492e27754, - type: 2} - useCustomInteractions: 0 - interactionMappingProfiles: - - {fileID: 11400000, guid: b7f65e3d3581e3d46ba01ecb4fedd827, type: 2} - - {fileID: 11400000, guid: 75cc1e0a54a5fe648a4cde0278665293, type: 2} - - {fileID: 11400000, guid: 17f3fbe848f439d42b507e772d4815f2, type: 2} - - {fileID: 11400000, guid: d41a902589d58634c91da2d0bddc63a2, type: 2} - - {fileID: 11400000, guid: 02740da3b13d2504d8d707db21806544, type: 2} - - {fileID: 11400000, guid: 2aed84cf960b4a44e945ade98bcd6a46, type: 2} - - {fileID: 11400000, guid: 5147df11251971d49bad06a892acb4b8, type: 2} - - {fileID: 11400000, guid: d66ff6bdac77e284a9b56cd8ff7588f8, type: 2} - - {fileID: 11400000, guid: e001f5e0dec2fdc4e8f7361051c16285, type: 2} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/LeftSimulatedMixedRealityHandControllerProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/LeftSimulatedMixedRealityHandControllerProfile.asset new file mode 100644 index 00000000..716de0b1 --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/LeftSimulatedMixedRealityHandControllerProfile.asset @@ -0,0 +1,32 @@ +%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: d420c170b42dfe0438e2aa2a829775ed, type: 3} + m_Name: LeftSimulatedMixedRealityHandControllerProfile + m_EditorClassIdentifier: + controllerType: + reference: 435c4f16-8e23-4228-b2b0-5fce09a97043 + handedness: 1 + visualizationProfile: {fileID: 0} + useCustomInteractions: 0 + interactionMappingProfiles: + - {fileID: 11400000, guid: eb71a10d2248e2847b3551ab4d47217e, type: 2} + - {fileID: 11400000, guid: 1fd0c5cd50876514bb0027af902ed920, type: 2} + - {fileID: 11400000, guid: 0f1e943dcb760c142a76e3f571394b42, type: 2} + - {fileID: 11400000, guid: 80556dee026997f4ba146ffda4710f79, type: 2} + - {fileID: 11400000, guid: 0a51a3da8723c99469a4cefb19c2a75b, type: 2} + - {fileID: 11400000, guid: 74befe0f3ef40d94f8930e361f6fa025, type: 2} + - {fileID: 11400000, guid: 1d100ad98538f674697c53fb406c5a47, type: 2} + - {fileID: 11400000, guid: b7f7f573c0806e144ba65d8c46fb0443, type: 2} + - {fileID: 11400000, guid: 99e0428a07202934193ab6678748a6bb, type: 2} + - {fileID: 11400000, guid: b234687150647ee4b854b7208eb5794b, type: 2} + - {fileID: 11400000, guid: 903e62b0bf4b64c43bba8ac894bde493, type: 2} + - {fileID: 11400000, guid: 5f29f2281e568b64c8356f8b24aaa9e8, type: 2} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/LeftSimulatedMixedRealityHandControllerProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/LeftSimulatedMixedRealityHandControllerProfile.asset.meta new file mode 100644 index 00000000..f7b0e867 --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/LeftSimulatedMixedRealityHandControllerProfile.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e5de6ea5e8157aa46892ed4c81439f0c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/GrabProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/GrabProfile.asset new file mode 100644 index 00000000..40ed73d2 --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/GrabProfile.asset @@ -0,0 +1,30 @@ +%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: e3fb79524faca40478c0844c24e542f7, type: 3} + m_Name: GrabProfile + m_EditorClassIdentifier: + interactionMapping: + description: Grab + stateChangeType: 0 + axisType: 3 + inputType: 13 + inputAction: + profileGuid: 00000000000000000000000000000000 + id: 0 + description: None + axisConstraint: 0 + keyCode: 0 + inputName: + axisCodeX: + axisCodeY: + inputProcessors: [] + pointerProfiles: [] diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/GrabProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/GrabProfile.asset.meta new file mode 100644 index 00000000..2d87d922 --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/GrabProfile.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 43e9f87fa76d5554883940341589436b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/IndexFingerPoseProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/IndexFingerPoseProfile.asset new file mode 100644 index 00000000..e153dcc7 --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/IndexFingerPoseProfile.asset @@ -0,0 +1,30 @@ +%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: e3fb79524faca40478c0844c24e542f7, type: 3} + m_Name: IndexFingerPoseProfile + m_EditorClassIdentifier: + interactionMapping: + description: Index Finger Pose + stateChangeType: 0 + axisType: 7 + inputType: 33 + inputAction: + profileGuid: 00000000000000000000000000000000 + id: 0 + description: None + axisConstraint: 0 + keyCode: 0 + inputName: + axisCodeX: + axisCodeY: + inputProcessors: [] + pointerProfiles: [] diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/IndexFingerPoseProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/IndexFingerPoseProfile.asset.meta new file mode 100644 index 00000000..f34f067c --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/IndexFingerPoseProfile.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a96fb30df2bb6c24aa97a0e1468cd24a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/MoveAway(Depth)Profile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/MoveAway(Depth)Profile.asset.meta index 85a7d80a..c762804f 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/MoveAway(Depth)Profile.asset.meta +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/MoveAway(Depth)Profile.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5691c80c2458e4242950430e18fcae51 +guid: 6461093495593f1438fa08f8cf59e15c NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/MoveCloser(Depth)Profile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/MoveCloser(Depth)Profile.asset index ccc5d1c0..386a0a30 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/MoveCloser(Depth)Profile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/MoveCloser(Depth)Profile.asset @@ -13,16 +13,16 @@ MonoBehaviour: m_Name: MoveCloser(Depth)Profile m_EditorClassIdentifier: interactionMapping: - description: Move Closer (Depth) + description: None stateChangeType: 0 - axisType: 2 - inputType: 7 + axisType: 0 + inputType: 0 inputAction: profileGuid: 00000000000000000000000000000000 id: 0 description: None axisConstraint: 0 - keyCode: 281 + keyCode: 0 inputName: axisCodeX: axisCodeY: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/MoveCloser(Depth)Profile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/MoveCloser(Depth)Profile.asset.meta index 54b55e34..e52937e0 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/MoveCloser(Depth)Profile.asset.meta +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/MoveCloser(Depth)Profile.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f817aacf575e5ff46afcc79914a029a1 +guid: 74a71e8548cfeeb438cae2e36763e235 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/PitchClockwiseProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/PitchClockwiseProfile.asset.meta index b7090c00..4d0d7fd8 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/PitchClockwiseProfile.asset.meta +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/PitchClockwiseProfile.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2aee855545b476e4b89c55f2e9709de4 +guid: 6e32cf2e094311d4192e374843bc9623 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/PitchCounterClockwiseProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/PitchCounterClockwiseProfile.asset.meta index 620d776c..2ec039fe 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/PitchCounterClockwiseProfile.asset.meta +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/PitchCounterClockwiseProfile.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7bf68e10b5b034b4bb27ecaf05d2e9d7 +guid: cea22b7899ba53c46925c1857b5e6248 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/RollClockwiseProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/RollClockwiseProfile.asset.meta index 4319683e..9cd08c17 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/RollClockwiseProfile.asset.meta +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/RollClockwiseProfile.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2b5f27dd676066d47a6b689e3644e40a +guid: 74825e5640b18d747975fbc8e31bed01 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/RollCounterClockwiseProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/RollCounterClockwiseProfile.asset.meta index 8cbf8347..cc733086 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/RollCounterClockwiseProfile.asset.meta +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/RollCounterClockwiseProfile.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 676aa2247838c8f429d7458323b83d78 +guid: 781e927490acb8940949867800cb076d NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/SelectProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/SelectProfile.asset new file mode 100644 index 00000000..cc1a7cf7 --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/SelectProfile.asset @@ -0,0 +1,30 @@ +%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: e3fb79524faca40478c0844c24e542f7, type: 3} + m_Name: SelectProfile + m_EditorClassIdentifier: + interactionMapping: + description: Select + stateChangeType: 0 + axisType: 2 + inputType: 25 + inputAction: + profileGuid: 00000000000000000000000000000000 + id: 0 + description: None + axisConstraint: 0 + keyCode: 0 + inputName: + axisCodeX: + axisCodeY: + inputProcessors: [] + pointerProfiles: [] diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/SelectProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/SelectProfile.asset.meta new file mode 100644 index 00000000..06ead549 --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/SelectProfile.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cd23741cb70b7ae40b319a4ef6eee003 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/YawClockwiseProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/YawClockwiseProfile.asset.meta index 6b918544..fafdb23e 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/YawClockwiseProfile.asset.meta +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/YawClockwiseProfile.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c811bb700747c1c4e98ad88949df2b54 +guid: 0551abc69395db944b2dd5e53319b4f5 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/YawCounterClockwiseProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/YawCounterClockwiseProfile.asset.meta index 3edfecad..028a109b 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/YawCounterClockwiseProfile.asset.meta +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/YawCounterClockwiseProfile.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9ca2333c70b50404d9e2071a2a8ecf67 +guid: 13fd1b11dc0b10d408317dd2bfb18128 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/RightSimulatedHandControllerProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/RightSimulatedHandControllerProfile.asset deleted file mode 100644 index 980b7b09..00000000 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/RightSimulatedHandControllerProfile.asset +++ /dev/null @@ -1,30 +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: d420c170b42dfe0438e2aa2a829775ed, type: 3} - m_Name: RightSimulatedHandControllerProfile - m_EditorClassIdentifier: - controllerType: - reference: 435c4f16-8e23-4228-b2b0-5fce09a97043 - handedness: 2 - visualizationProfile: {fileID: 11400000, guid: 9adf8f0578d6fa24c82c170dfc36ae43, - type: 2} - useCustomInteractions: 0 - interactionMappingProfiles: - - {fileID: 11400000, guid: b7f65e3d3581e3d46ba01ecb4fedd827, type: 2} - - {fileID: 11400000, guid: c811bb700747c1c4e98ad88949df2b54, type: 2} - - {fileID: 11400000, guid: 9ca2333c70b50404d9e2071a2a8ecf67, type: 2} - - {fileID: 11400000, guid: 2aee855545b476e4b89c55f2e9709de4, type: 2} - - {fileID: 11400000, guid: 7bf68e10b5b034b4bb27ecaf05d2e9d7, type: 2} - - {fileID: 11400000, guid: 2b5f27dd676066d47a6b689e3644e40a, type: 2} - - {fileID: 11400000, guid: 676aa2247838c8f429d7458323b83d78, type: 2} - - {fileID: 11400000, guid: 5691c80c2458e4242950430e18fcae51, type: 2} - - {fileID: 11400000, guid: f817aacf575e5ff46afcc79914a029a1, type: 2} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/RightSimulatedMixedRealityHandControllerProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/RightSimulatedMixedRealityHandControllerProfile.asset new file mode 100644 index 00000000..3a129e5f --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/RightSimulatedMixedRealityHandControllerProfile.asset @@ -0,0 +1,20 @@ +%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: d420c170b42dfe0438e2aa2a829775ed, type: 3} + m_Name: RightSimulatedMixedRealityHandControllerProfile + m_EditorClassIdentifier: + controllerType: + reference: + handedness: 0 + visualizationProfile: {fileID: 0} + useCustomInteractions: 1 + interactionMappingProfiles: [] diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/RightSimulatedMixedRealityHandControllerProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/RightSimulatedMixedRealityHandControllerProfile.asset.meta new file mode 100644 index 00000000..4bc743f4 --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/RightSimulatedMixedRealityHandControllerProfile.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fab679676d59f77478f115d3091013aa +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/SimulatedHandControllerDataProviderProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/SimulatedHandControllerDataProviderProfile.asset similarity index 84% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/SimulatedHandControllerDataProviderProfile.asset rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/SimulatedHandControllerDataProviderProfile.asset index b838c35a..24945164 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/SimulatedHandControllerDataProviderProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/SimulatedHandControllerDataProviderProfile.asset @@ -12,10 +12,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 49a51e5acd0c6c547bfb8f97fcf09037, type: 3} m_Name: SimulatedHandControllerDataProviderProfile m_EditorClassIdentifier: - hasSetupDefaults: 1 + hasSetupDefaults: 0 controllerMappingProfiles: - - {fileID: 11400000, guid: db8d37cbb21a4af498ee7f59d7428f91, type: 2} - - {fileID: 11400000, guid: bc5b8bebbe1a1ee4b8ba8916077368ed, type: 2} + - {fileID: 11400000, guid: e5de6ea5e8157aa46892ed4c81439f0c, type: 2} simulatedUpdateFrequency: 0 controllerHideTimeout: 0.2 defaultDistance: 0.5 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/SimulatedHandControllerDataProviderProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/SimulatedHandControllerDataProviderProfile.asset.meta similarity index 100% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/SimulatedHandControllerDataProviderProfile.asset.meta rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/SimulatedHandControllerDataProviderProfile.asset.meta From 8bf5604f50bdd2bc56e17204fc1446e0c5259003 Mon Sep 17 00:00:00 2001 From: Dino Fejzagic Date: Sat, 2 May 2020 14:33:57 +0200 Subject: [PATCH 11/78] Remove open steady pose --- .../LeftHandVisualizationProfile.asset | 2 +- .../OpenSteadyGrabPointHandPose.asset | 20 - .../OpenSteadyGrabPointHandPose.asset.meta | 8 - .../OpenSteadyGrabPointHandPoseData.json | 436 ------------------ .../OpenSteadyGrabPointHandPoseData.json.meta | 7 - .../RightHandVisulaizationProfile.asset | 2 +- ...tedMixedRealityHandControllerProfile.asset | 5 +- .../Right/MoveCloser(Depth)Profile.asset | 8 +- ...tedMixedRealityHandControllerProfile.asset | 23 +- ...tedHandControllerDataProviderProfile.asset | 3 +- .../MixedRealityInputSystemProfile.asset | 1 - 11 files changed, 29 insertions(+), 486 deletions(-) delete mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/OpenSteadyGrabPointHandPose.asset delete mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/OpenSteadyGrabPointHandPose.asset.meta delete mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/OpenSteadyGrabPointHandPoseData.json delete mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/OpenSteadyGrabPointHandPoseData.json.meta diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/LeftHandVisualizationProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/LeftHandVisualizationProfile.asset index ce264b49..eeba2d86 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/LeftHandVisualizationProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/LeftHandVisualizationProfile.asset @@ -13,7 +13,7 @@ MonoBehaviour: m_Name: LeftHandVisualizationProfile m_EditorClassIdentifier: controllerVisualizationType: - reference: 9335e51f-52ab-48eb-a4dc-25832b6b56d6 + reference: 0b653537-d237-4622-acc6-e351209a5882 useDefaultModels: 0 model: {fileID: 9173983480249558903, guid: 081f7848cfd94b34f9c774490cd7e2fb, type: 3} pointerPose: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/OpenSteadyGrabPointHandPose.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/OpenSteadyGrabPointHandPose.asset deleted file mode 100644 index 91088099..00000000 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/OpenSteadyGrabPointHandPose.asset +++ /dev/null @@ -1,20 +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: 67355724a5b4fd841bbf691ac44ad25d, type: 3} - m_Name: OpenSteadyGrabPointHandPose - m_EditorClassIdentifier: - id: open-steady-grab-point - description: Relaxed hand pose. - isDefault: 0 - isSelectionPose: 0 - keyCode: 54 - data: {fileID: 4900000, guid: 574d1cd3fada57744a97166ef77bdd45, type: 3} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/OpenSteadyGrabPointHandPose.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/OpenSteadyGrabPointHandPose.asset.meta deleted file mode 100644 index 0e606de0..00000000 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/OpenSteadyGrabPointHandPose.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 7f8c95a0360d2a04abee2a9b0863b6f5 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/OpenSteadyGrabPointHandPoseData.json b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/OpenSteadyGrabPointHandPoseData.json deleted file mode 100644 index 37c50cc9..00000000 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/OpenSteadyGrabPointHandPoseData.json +++ /dev/null @@ -1,436 +0,0 @@ -{ - "items": [ - { - "joint": "None", - "pose": { - "position": { - "x": -0.0681008753599599, - "y": -0.023189845320302993, - "z": -0.32335868163499981 - }, - "rotation": { - "x": 0, - "y": 0, - "z": 0, - "w": 0 - } - } - }, - { - "joint": "Wrist", - "pose": { - "position": { - "x": 0.083900304394774139, - "y": -0.087249765929300338, - "z": -0.050604623393155634 - }, - "rotation": { - "x": -0.53067469596862793, - "y": -0.24036270380020142, - "z": -0.0010364949703216553, - "w": 0.81267738342285156 - } - } - }, - { - "joint": "Palm", - "pose": { - "position": { - "x": 0.071408500778488815, - "y": -0.045779893931467086, - "z": -0.034272220567800105 - }, - "rotation": { - "x": -0.53067469596862793, - "y": -0.24036270380020142, - "z": -0.0010364949703216553, - "w": 0.81267738342285156 - } - } - }, - { - "joint": "ThumbMetacarpalJoint", - "pose": { - "position": { - "x": 0.059964598971419036, - "y": -0.080086136993486434, - "z": -0.040898241684772074 - }, - "rotation": { - "x": -0.5606539249420166, - "y": -0.098196841776371, - "z": 0.670694887638092, - "w": 0.47619414329528809 - } - } - }, - { - "joint": "ThumbProximalJoint", - "pose": { - "position": { - "x": 0.024715005303733051, - "y": -0.063306781288702041, - "z": -0.026187368319369853 - }, - "rotation": { - "x": -0.5155644416809082, - "y": -0.0010041594505310059, - "z": 0.66199594736099243, - "w": 0.54453784227371216 - } - } - }, - { - "joint": "ThumbDistalJoint", - "pose": { - "position": { - "x": 0.0037162675289437175, - "y": -0.046092944976408035, - "z": -0.011772743077017367 - }, - "rotation": { - "x": -0.54901701211929321, - "y": -0.083434708416461945, - "z": 0.67281347513198853, - "w": 0.48939600586891174 - } - } - }, - { - "joint": "ThumbTip", - "pose": { - "position": { - "x": -0.011031027999706566, - "y": -0.038446779188234359, - "z": -0.0048686085501685739 - }, - "rotation": { - "x": -0.54901701211929321, - "y": -0.083434708416461945, - "z": 0.67281347513198853, - "w": 0.48939600586891174 - } - } - }, - { - "joint": "IndexMetacarpal", - "pose": { - "position": { - "x": 0.068815393256954849, - "y": -0.074782254931051284, - "z": -0.041599955991841853 - }, - "rotation": { - "x": -0.52426069974899292, - "y": -0.3638727068901062, - "z": 0.00037233531475067139, - "w": 0.76990067958831787 - } - } - }, - { - "joint": "IndexKnuckle", - "pose": { - "position": { - "x": 0.0358468386111781, - "y": -0.027330848213750869, - "z": -0.030692756758071482 - }, - "rotation": { - "x": -0.51531755924224854, - "y": -0.13684964179992676, - "z": 0.0975230410695076, - "w": 0.840372622013092 - } - } - }, - { - "joint": "IndexMiddleJoint", - "pose": { - "position": { - "x": 0.02204116981010884, - "y": 0.0077296804520301521, - "z": -0.012671802775003016 - }, - "rotation": { - "x": -0.50836259126663208, - "y": -0.086904048919677734, - "z": 0.17722404003143311, - "w": 0.8382880687713623 - } - } - }, - { - "joint": "IndexDistalJoint", - "pose": { - "position": { - "x": 0.014715371071361005, - "y": 0.026189111347775906, - "z": -0.0021521305898204446 - }, - "rotation": { - "x": -0.49860423803329468, - "y": -0.10437075048685074, - "z": 0.07316453754901886, - "w": 0.85774844884872437 - } - } - }, - { - "joint": "IndexTip", - "pose": { - "position": { - "x": 0.011031027999706566, - "y": 0.038446779188234359, - "z": 0.0048686085501685739 - }, - "rotation": { - "x": -0.49860423803329468, - "y": -0.10437075048685074, - "z": 0.07316453754901886, - "w": 0.85774844884872437 - } - } - }, - { - "joint": "MiddleMetacarpal", - "pose": { - "position": { - "x": 0.076195256668142974, - "y": -0.07264688127906993, - "z": -0.041560460464097559 - }, - "rotation": { - "x": -0.59805238246917725, - "y": -0.19373856484889984, - "z": 0.061999037861824036, - "w": 0.77521258592605591 - } - } - }, - { - "joint": "MiddleKnuckle", - "pose": { - "position": { - "x": 0.055720763164572418, - "y": -0.023271466430742294, - "z": -0.030102503136731684 - }, - "rotation": { - "x": 0.077070519328117371, - "y": 0.094939872622489929, - "z": -0.069679252803325653, - "w": -0.99005615711212158 - } - } - }, - { - "joint": "MiddleMiddleJoint", - "pose": { - "position": { - "x": 0.047521518426947296, - "y": -0.017521480855066329, - "z": 0.0099180614342913032 - }, - "rotation": { - "x": -0.53644359111785889, - "y": 0.035090312361717224, - "z": -0.1292860358953476, - "w": -0.83331835269927979 - } - } - }, - { - "joint": "MiddleDistalJoint", - "pose": { - "position": { - "x": 0.049561099964194, - "y": -0.040532971557695419, - "z": 0.020680004148744047 - }, - "rotation": { - "x": -0.78986877202987671, - "y": -0.053519021719694138, - "z": -0.050689004361629486, - "w": -0.6095116138458252 - } - } - }, - { - "joint": "MiddleTip", - "pose": { - "position": { - "x": 0.051911352085880935, - "y": -0.05612527095945552, - "z": 0.016590305953286588 - }, - "rotation": { - "x": -0.78986877202987671, - "y": -0.053519021719694138, - "z": -0.050689004361629486, - "w": -0.6095116138458252 - } - } - }, - { - "joint": "RingMetacarpal", - "pose": { - "position": { - "x": 0.085886040586046875, - "y": -0.069404299196321517, - "z": -0.040918995277024806 - }, - "rotation": { - "x": -0.56751000881195068, - "y": -0.080191992223262787, - "z": 0.10617346316576004, - "w": 0.81254440546035767 - } - } - }, - { - "joint": "RingKnuckle", - "pose": { - "position": { - "x": 0.073698634165339172, - "y": -0.025420582678634673, - "z": -0.024252940551377833 - }, - "rotation": { - "x": -0.039752580225467682, - "y": 0.095591984689235687, - "z": -0.024301081895828247, - "w": -0.99433755874633789 - } - } - }, - { - "joint": "RingMiddleJoint", - "pose": { - "position": { - "x": 0.066912477719597518, - "y": -0.02843858563574031, - "z": 0.011035257368348539 - }, - "rotation": { - "x": -0.75884842872619629, - "y": 0.0701710507273674, - "z": -0.045488141477108, - "w": -0.64596694707870483 - } - } - }, - { - "joint": "RingDistalJoint", - "pose": { - "position": { - "x": 0.066450962680391967, - "y": -0.049397612747270614, - "z": 0.0076107823988422751 - }, - "rotation": { - "x": -0.91296499967575073, - "y": -0.0051798690110445023, - "z": -0.0075602680444717407, - "w": -0.408629447221756 - } - } - }, - { - "joint": "RingTip", - "pose": { - "position": { - "x": 0.066765406983904541, - "y": -0.062715361651498824, - "z": -0.0042944444576278329 - }, - "rotation": { - "x": -0.91296499967575073, - "y": -0.0051798690110445023, - "z": -0.0075602680444717407, - "w": -0.408629447221756 - } - } - }, - { - "joint": "PinkyMetacarpal", - "pose": { - "position": { - "x": 0.094160931068472564, - "y": -0.068957443174440414, - "z": -0.038461294607259333 - }, - "rotation": { - "x": -0.50770407915115356, - "y": 0.040728926658630371, - "z": 0.15177793800830841, - "w": 0.84707796573638916 - } - } - }, - { - "joint": "PinkyKnuckle", - "pose": { - "position": { - "x": 0.0901073234854266, - "y": -0.027405167755205184, - "z": -0.015546370879746974 - }, - "rotation": { - "x": -0.082991220057010651, - "y": 0.1249239444732666, - "z": 0.041553191840648651, - "w": -0.98782354593276978 - } - } - }, - { - "joint": "PinkyMiddleJoint", - "pose": { - "position": { - "x": 0.084039838868193328, - "y": -0.031077812251169235, - "z": 0.0072923259576782584 - }, - "rotation": { - "x": -0.715654730796814, - "y": 0.1371033787727356, - "z": 0.001321159303188324, - "w": -0.6849520206451416 - } - } - }, - { - "joint": "PinkyDistalJoint", - "pose": { - "position": { - "x": 0.080680111306719482, - "y": -0.048435876902658492, - "z": 0.0062009388348087668 - }, - "rotation": { - "x": -0.8999292254447937, - "y": 0.06855495274066925, - "z": 0.11455988883972168, - "w": -0.41592133045196533 - } - } - }, - { - "joint": "PinkyTip", - "pose": { - "position": { - "x": 0.0770126300631091, - "y": -0.058652232226449996, - "z": -0.0025606980780139565 - }, - "rotation": { - "x": -0.8999292254447937, - "y": 0.06855495274066925, - "z": 0.11455988883972168, - "w": -0.41592133045196533 - } - } - } - ] -} \ No newline at end of file diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/OpenSteadyGrabPointHandPoseData.json.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/OpenSteadyGrabPointHandPoseData.json.meta deleted file mode 100644 index 2f432579..00000000 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/OpenSteadyGrabPointHandPoseData.json.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 574d1cd3fada57744a97166ef77bdd45 -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RightHandVisulaizationProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RightHandVisulaizationProfile.asset index 34314ca3..f73bd1c0 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RightHandVisulaizationProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RightHandVisulaizationProfile.asset @@ -13,7 +13,7 @@ MonoBehaviour: m_Name: RightHandVisulaizationProfile m_EditorClassIdentifier: controllerVisualizationType: - reference: 9335e51f-52ab-48eb-a4dc-25832b6b56d6 + reference: 0b653537-d237-4622-acc6-e351209a5882 useDefaultModels: 0 model: {fileID: 4856844564559928852, guid: 58cc7659d29f83f47b10dfd3bc4d1c97, type: 3} pointerPose: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/LeftSimulatedMixedRealityHandControllerProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/LeftSimulatedMixedRealityHandControllerProfile.asset index 716de0b1..c76cf91a 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/LeftSimulatedMixedRealityHandControllerProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/LeftSimulatedMixedRealityHandControllerProfile.asset @@ -15,10 +15,11 @@ MonoBehaviour: controllerType: reference: 435c4f16-8e23-4228-b2b0-5fce09a97043 handedness: 1 - visualizationProfile: {fileID: 0} + visualizationProfile: {fileID: 11400000, guid: d03625d21fb0bfb41b6642f492e27754, + type: 2} useCustomInteractions: 0 interactionMappingProfiles: - - {fileID: 11400000, guid: eb71a10d2248e2847b3551ab4d47217e, type: 2} + - {fileID: 11400000, guid: b7f65e3d3581e3d46ba01ecb4fedd827, type: 2} - {fileID: 11400000, guid: 1fd0c5cd50876514bb0027af902ed920, type: 2} - {fileID: 11400000, guid: 0f1e943dcb760c142a76e3f571394b42, type: 2} - {fileID: 11400000, guid: 80556dee026997f4ba146ffda4710f79, type: 2} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/MoveCloser(Depth)Profile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/MoveCloser(Depth)Profile.asset index 386a0a30..ccc5d1c0 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/MoveCloser(Depth)Profile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/MoveCloser(Depth)Profile.asset @@ -13,16 +13,16 @@ MonoBehaviour: m_Name: MoveCloser(Depth)Profile m_EditorClassIdentifier: interactionMapping: - description: None + description: Move Closer (Depth) stateChangeType: 0 - axisType: 0 - inputType: 0 + axisType: 2 + inputType: 7 inputAction: profileGuid: 00000000000000000000000000000000 id: 0 description: None axisConstraint: 0 - keyCode: 0 + keyCode: 281 inputName: axisCodeX: axisCodeY: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/RightSimulatedMixedRealityHandControllerProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/RightSimulatedMixedRealityHandControllerProfile.asset index 3a129e5f..bc547750 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/RightSimulatedMixedRealityHandControllerProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/RightSimulatedMixedRealityHandControllerProfile.asset @@ -13,8 +13,21 @@ MonoBehaviour: m_Name: RightSimulatedMixedRealityHandControllerProfile m_EditorClassIdentifier: controllerType: - reference: - handedness: 0 - visualizationProfile: {fileID: 0} - useCustomInteractions: 1 - interactionMappingProfiles: [] + reference: 435c4f16-8e23-4228-b2b0-5fce09a97043 + handedness: 2 + visualizationProfile: {fileID: 11400000, guid: 9adf8f0578d6fa24c82c170dfc36ae43, + type: 2} + useCustomInteractions: 0 + interactionMappingProfiles: + - {fileID: 11400000, guid: b7f65e3d3581e3d46ba01ecb4fedd827, type: 2} + - {fileID: 11400000, guid: cd23741cb70b7ae40b319a4ef6eee003, type: 2} + - {fileID: 11400000, guid: 43e9f87fa76d5554883940341589436b, type: 2} + - {fileID: 11400000, guid: a96fb30df2bb6c24aa97a0e1468cd24a, type: 2} + - {fileID: 11400000, guid: 0551abc69395db944b2dd5e53319b4f5, type: 2} + - {fileID: 11400000, guid: 13fd1b11dc0b10d408317dd2bfb18128, type: 2} + - {fileID: 11400000, guid: 6e32cf2e094311d4192e374843bc9623, type: 2} + - {fileID: 11400000, guid: cea22b7899ba53c46925c1857b5e6248, type: 2} + - {fileID: 11400000, guid: 74825e5640b18d747975fbc8e31bed01, type: 2} + - {fileID: 11400000, guid: 781e927490acb8940949867800cb076d, type: 2} + - {fileID: 11400000, guid: 6461093495593f1438fa08f8cf59e15c, type: 2} + - {fileID: 11400000, guid: 74a71e8548cfeeb438cae2e36763e235, type: 2} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/SimulatedHandControllerDataProviderProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/SimulatedHandControllerDataProviderProfile.asset index 24945164..06fe5959 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/SimulatedHandControllerDataProviderProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/SimulatedHandControllerDataProviderProfile.asset @@ -12,9 +12,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 49a51e5acd0c6c547bfb8f97fcf09037, type: 3} m_Name: SimulatedHandControllerDataProviderProfile m_EditorClassIdentifier: - hasSetupDefaults: 0 + hasSetupDefaults: 1 controllerMappingProfiles: - {fileID: 11400000, guid: e5de6ea5e8157aa46892ed4c81439f0c, type: 2} + - {fileID: 11400000, guid: fab679676d59f77478f115d3091013aa, type: 2} simulatedUpdateFrequency: 0 controllerHideTimeout: 0.2 defaultDistance: 0.5 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/MixedRealityInputSystemProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/MixedRealityInputSystemProfile.asset index 471f73e6..1caf389a 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/MixedRealityInputSystemProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/MixedRealityInputSystemProfile.asset @@ -106,7 +106,6 @@ MonoBehaviour: - {fileID: 11400000, guid: 1251200226ad995498472e45aaf12178, type: 2} - {fileID: 11400000, guid: 5e6bcc3863bdc634d82a8a59598a070b, type: 2} - {fileID: 11400000, guid: 2f6c29c72cd30c74f9717c932bd87a4a, type: 2} - - {fileID: 11400000, guid: 7f8c95a0360d2a04abee2a9b0863b6f5, type: 2} inputActionsProfile: {fileID: 11400000, guid: 399335ccc89c4d12b79f3539ca7771db, type: 2} speechCommandsProfile: {fileID: 11400000, guid: 89759c8b9c98420794a5d650ce3b2f90, From 0414f9d8c7b3e58db3768e14fdc4f0215500c905 Mon Sep 17 00:00:00 2001 From: Dino Fejzagic Date: Sat, 2 May 2020 16:57:08 +0200 Subject: [PATCH 12/78] Update hand pointer profile --- .../HandControllers/Simulated/Left/SelectProfile.asset | 8 ++++---- .../HandControllers/Simulated/Right/SelectProfile.asset | 8 ++++---- .../HandControllers/SpatialHandPointerProfile.asset | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/SelectProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/SelectProfile.asset index cc1a7cf7..79e34c7d 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/SelectProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/SelectProfile.asset @@ -18,10 +18,10 @@ MonoBehaviour: axisType: 2 inputType: 25 inputAction: - profileGuid: 00000000000000000000000000000000 - id: 0 - description: None - axisConstraint: 0 + profileGuid: 399335ccc89c4d12b79f3539ca7771db + id: 1 + description: Select + axisConstraint: 2 keyCode: 0 inputName: axisCodeX: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/SelectProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/SelectProfile.asset index cc1a7cf7..79e34c7d 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/SelectProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/SelectProfile.asset @@ -18,10 +18,10 @@ MonoBehaviour: axisType: 2 inputType: 25 inputAction: - profileGuid: 00000000000000000000000000000000 - id: 0 - description: None - axisConstraint: 0 + profileGuid: 399335ccc89c4d12b79f3539ca7771db + id: 1 + description: Select + axisConstraint: 2 keyCode: 0 inputName: axisCodeX: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/SpatialHandPointerProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/SpatialHandPointerProfile.asset index 37be4e9d..c27b62da 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/SpatialHandPointerProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/SpatialHandPointerProfile.asset @@ -16,7 +16,7 @@ MonoBehaviour: description: Index Spatial Pointer stateChangeType: 0 axisType: 7 - inputType: 0 + inputType: 3 inputAction: profileGuid: 399335ccc89c4d12b79f3539ca7771db id: 4 From 464060578325ec6172ba611ad06fc6d5d3dba9d0 Mon Sep 17 00:00:00 2001 From: Dino Fejzagic Date: Sat, 2 May 2020 17:04:00 +0200 Subject: [PATCH 13/78] Update defaults for runtime hands --- .../DataProviders/HandControllers/Left.meta | 8 +++++ .../HandControllers/Left/GrabProfile.asset | 30 +++++++++++++++++++ .../Left/GrabProfile.asset.meta | 8 +++++ .../Left/IndexFingerPoseProfile.asset | 30 +++++++++++++++++++ .../Left/IndexFingerPoseProfile.asset.meta | 8 +++++ .../HandControllers/Left/SelectProfile.asset | 30 +++++++++++++++++++ .../Left/SelectProfile.asset.meta | 8 +++++ ...eftMixedRealityHandControllerProfile.asset | 5 +++- ...xedRealityHandControllerProfile.asset.meta | 2 +- .../DataProviders/HandControllers/Right.meta | 8 +++++ .../HandControllers/Right/GrabProfile.asset | 30 +++++++++++++++++++ .../Right/GrabProfile.asset.meta | 8 +++++ .../Right/IndexFingerPoseProfile.asset | 30 +++++++++++++++++++ .../Right/IndexFingerPoseProfile.asset.meta | 8 +++++ .../HandControllers/Right/SelectProfile.asset | 30 +++++++++++++++++++ .../Right/SelectProfile.asset.meta | 8 +++++ ...ghtMixedRealityHandControllerProfile.asset | 5 +++- ...xedRealityHandControllerProfile.asset.meta | 2 +- ...ityHandControllerDataProviderProfile.asset | 5 ++-- ...ndControllerDataProviderProfile.asset.meta | 0 20 files changed, 257 insertions(+), 6 deletions(-) create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Left.meta create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Left/GrabProfile.asset create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Left/GrabProfile.asset.meta create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Left/IndexFingerPoseProfile.asset create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Left/IndexFingerPoseProfile.asset.meta create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Left/SelectProfile.asset create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Left/SelectProfile.asset.meta create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Right.meta create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Right/GrabProfile.asset create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Right/GrabProfile.asset.meta create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Right/IndexFingerPoseProfile.asset create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Right/IndexFingerPoseProfile.asset.meta create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Right/SelectProfile.asset create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Right/SelectProfile.asset.meta rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/{ => HandControllers}/WindowsMixedRealityHandControllerDataProviderProfile.asset (80%) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/{ => HandControllers}/WindowsMixedRealityHandControllerDataProviderProfile.asset.meta (100%) diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Left.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Left.meta new file mode 100644 index 00000000..e68e8edb --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Left.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9cd24cb72e6984c418a274e132f4281b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Left/GrabProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Left/GrabProfile.asset new file mode 100644 index 00000000..40ed73d2 --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Left/GrabProfile.asset @@ -0,0 +1,30 @@ +%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: e3fb79524faca40478c0844c24e542f7, type: 3} + m_Name: GrabProfile + m_EditorClassIdentifier: + interactionMapping: + description: Grab + stateChangeType: 0 + axisType: 3 + inputType: 13 + inputAction: + profileGuid: 00000000000000000000000000000000 + id: 0 + description: None + axisConstraint: 0 + keyCode: 0 + inputName: + axisCodeX: + axisCodeY: + inputProcessors: [] + pointerProfiles: [] diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Left/GrabProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Left/GrabProfile.asset.meta new file mode 100644 index 00000000..89576056 --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Left/GrabProfile.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 19c83b8e6eb6cd244a53e0edf4df46dd +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Left/IndexFingerPoseProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Left/IndexFingerPoseProfile.asset new file mode 100644 index 00000000..e153dcc7 --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Left/IndexFingerPoseProfile.asset @@ -0,0 +1,30 @@ +%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: e3fb79524faca40478c0844c24e542f7, type: 3} + m_Name: IndexFingerPoseProfile + m_EditorClassIdentifier: + interactionMapping: + description: Index Finger Pose + stateChangeType: 0 + axisType: 7 + inputType: 33 + inputAction: + profileGuid: 00000000000000000000000000000000 + id: 0 + description: None + axisConstraint: 0 + keyCode: 0 + inputName: + axisCodeX: + axisCodeY: + inputProcessors: [] + pointerProfiles: [] diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Left/IndexFingerPoseProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Left/IndexFingerPoseProfile.asset.meta new file mode 100644 index 00000000..96d99960 --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Left/IndexFingerPoseProfile.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6182ebd8567606448b5d4a695574424c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Left/SelectProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Left/SelectProfile.asset new file mode 100644 index 00000000..cc1a7cf7 --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Left/SelectProfile.asset @@ -0,0 +1,30 @@ +%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: e3fb79524faca40478c0844c24e542f7, type: 3} + m_Name: SelectProfile + m_EditorClassIdentifier: + interactionMapping: + description: Select + stateChangeType: 0 + axisType: 2 + inputType: 25 + inputAction: + profileGuid: 00000000000000000000000000000000 + id: 0 + description: None + axisConstraint: 0 + keyCode: 0 + inputName: + axisCodeX: + axisCodeY: + inputProcessors: [] + pointerProfiles: [] diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Left/SelectProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Left/SelectProfile.asset.meta new file mode 100644 index 00000000..5e43e94c --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Left/SelectProfile.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0c81fe4959ca49d4bae702f1cc8e16c4 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/LeftMixedRealityHandControllerProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/LeftMixedRealityHandControllerProfile.asset index c0983446..c8202cf5 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/LeftMixedRealityHandControllerProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/LeftMixedRealityHandControllerProfile.asset @@ -17,6 +17,9 @@ MonoBehaviour: handedness: 1 visualizationProfile: {fileID: 11400000, guid: d03625d21fb0bfb41b6642f492e27754, type: 2} - useCustomInteractions: 1 + useCustomInteractions: 0 interactionMappingProfiles: - {fileID: 11400000, guid: b7f65e3d3581e3d46ba01ecb4fedd827, type: 2} + - {fileID: 11400000, guid: 0c81fe4959ca49d4bae702f1cc8e16c4, type: 2} + - {fileID: 11400000, guid: 19c83b8e6eb6cd244a53e0edf4df46dd, type: 2} + - {fileID: 11400000, guid: 6182ebd8567606448b5d4a695574424c, type: 2} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/LeftMixedRealityHandControllerProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/LeftMixedRealityHandControllerProfile.asset.meta index 984e71a1..9f831a15 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/LeftMixedRealityHandControllerProfile.asset.meta +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/LeftMixedRealityHandControllerProfile.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b43ff1b6f37e65946b1abc7e50af105f +guid: e2ae1ca0318feab47a20524104ba0a94 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Right.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Right.meta new file mode 100644 index 00000000..97e4e68b --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Right.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ca355d7971693fb43bae4dfdf5fa131c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Right/GrabProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Right/GrabProfile.asset new file mode 100644 index 00000000..40ed73d2 --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Right/GrabProfile.asset @@ -0,0 +1,30 @@ +%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: e3fb79524faca40478c0844c24e542f7, type: 3} + m_Name: GrabProfile + m_EditorClassIdentifier: + interactionMapping: + description: Grab + stateChangeType: 0 + axisType: 3 + inputType: 13 + inputAction: + profileGuid: 00000000000000000000000000000000 + id: 0 + description: None + axisConstraint: 0 + keyCode: 0 + inputName: + axisCodeX: + axisCodeY: + inputProcessors: [] + pointerProfiles: [] diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Right/GrabProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Right/GrabProfile.asset.meta new file mode 100644 index 00000000..346eb5f8 --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Right/GrabProfile.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e96f0abf707ab5d41ae84182ba53f781 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Right/IndexFingerPoseProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Right/IndexFingerPoseProfile.asset new file mode 100644 index 00000000..e153dcc7 --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Right/IndexFingerPoseProfile.asset @@ -0,0 +1,30 @@ +%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: e3fb79524faca40478c0844c24e542f7, type: 3} + m_Name: IndexFingerPoseProfile + m_EditorClassIdentifier: + interactionMapping: + description: Index Finger Pose + stateChangeType: 0 + axisType: 7 + inputType: 33 + inputAction: + profileGuid: 00000000000000000000000000000000 + id: 0 + description: None + axisConstraint: 0 + keyCode: 0 + inputName: + axisCodeX: + axisCodeY: + inputProcessors: [] + pointerProfiles: [] diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Right/IndexFingerPoseProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Right/IndexFingerPoseProfile.asset.meta new file mode 100644 index 00000000..7ecac391 --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Right/IndexFingerPoseProfile.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9506b84a8ad9477459e1ed2a05aebd04 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Right/SelectProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Right/SelectProfile.asset new file mode 100644 index 00000000..cc1a7cf7 --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Right/SelectProfile.asset @@ -0,0 +1,30 @@ +%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: e3fb79524faca40478c0844c24e542f7, type: 3} + m_Name: SelectProfile + m_EditorClassIdentifier: + interactionMapping: + description: Select + stateChangeType: 0 + axisType: 2 + inputType: 25 + inputAction: + profileGuid: 00000000000000000000000000000000 + id: 0 + description: None + axisConstraint: 0 + keyCode: 0 + inputName: + axisCodeX: + axisCodeY: + inputProcessors: [] + pointerProfiles: [] diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Right/SelectProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Right/SelectProfile.asset.meta new file mode 100644 index 00000000..500e1e2c --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Right/SelectProfile.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 06fb341eff9637c41adca9843ab17fd1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RightMixedRealityHandControllerProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RightMixedRealityHandControllerProfile.asset index ff4a068f..fdb135ea 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RightMixedRealityHandControllerProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RightMixedRealityHandControllerProfile.asset @@ -17,6 +17,9 @@ MonoBehaviour: handedness: 2 visualizationProfile: {fileID: 11400000, guid: 9adf8f0578d6fa24c82c170dfc36ae43, type: 2} - useCustomInteractions: 1 + useCustomInteractions: 0 interactionMappingProfiles: - {fileID: 11400000, guid: b7f65e3d3581e3d46ba01ecb4fedd827, type: 2} + - {fileID: 11400000, guid: 06fb341eff9637c41adca9843ab17fd1, type: 2} + - {fileID: 11400000, guid: e96f0abf707ab5d41ae84182ba53f781, type: 2} + - {fileID: 11400000, guid: 9506b84a8ad9477459e1ed2a05aebd04, type: 2} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RightMixedRealityHandControllerProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RightMixedRealityHandControllerProfile.asset.meta index 634f63ac..a8cac279 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RightMixedRealityHandControllerProfile.asset.meta +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RightMixedRealityHandControllerProfile.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6c775257f26873e459a492f28125e129 +guid: fa146e915b7a500418bef3446a876138 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/WindowsMixedRealityHandControllerDataProviderProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/WindowsMixedRealityHandControllerDataProviderProfile.asset similarity index 80% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/WindowsMixedRealityHandControllerDataProviderProfile.asset rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/WindowsMixedRealityHandControllerDataProviderProfile.asset index 510a1c6f..877e8553 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/WindowsMixedRealityHandControllerDataProviderProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/WindowsMixedRealityHandControllerDataProviderProfile.asset @@ -14,9 +14,10 @@ MonoBehaviour: m_EditorClassIdentifier: hasSetupDefaults: 1 controllerMappingProfiles: - - {fileID: 11400000, guid: b43ff1b6f37e65946b1abc7e50af105f, type: 2} - - {fileID: 11400000, guid: 6c775257f26873e459a492f28125e129, type: 2} + - {fileID: 11400000, guid: e2ae1ca0318feab47a20524104ba0a94, type: 2} + - {fileID: 11400000, guid: fa146e915b7a500418bef3446a876138, type: 2} handMeshingEnabled: 0 handPhysicsEnabled: 0 useTriggers: 0 boundsMode: 0 + trackedPoses: [] diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/WindowsMixedRealityHandControllerDataProviderProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/WindowsMixedRealityHandControllerDataProviderProfile.asset.meta similarity index 100% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/WindowsMixedRealityHandControllerDataProviderProfile.asset.meta rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/WindowsMixedRealityHandControllerDataProviderProfile.asset.meta From 171b8e298611054ae6596429afc3175dc3bee065 Mon Sep 17 00:00:00 2001 From: Dino Fejzagic Date: Sat, 2 May 2020 17:09:35 +0200 Subject: [PATCH 14/78] Moved WMR hand data provider profile to WMR module --- ...ityHandControllerDataProviderProfile.asset | 23 ------------------- ...ndControllerDataProviderProfile.asset.meta | 8 ------- 2 files changed, 31 deletions(-) delete mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/WindowsMixedRealityHandControllerDataProviderProfile.asset delete mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/WindowsMixedRealityHandControllerDataProviderProfile.asset.meta diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/WindowsMixedRealityHandControllerDataProviderProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/WindowsMixedRealityHandControllerDataProviderProfile.asset deleted file mode 100644 index 877e8553..00000000 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/WindowsMixedRealityHandControllerDataProviderProfile.asset +++ /dev/null @@ -1,23 +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: 29a54eda3f140e7418c5cb5c2bccd329, type: 3} - m_Name: WindowsMixedRealityHandControllerDataProviderProfile - m_EditorClassIdentifier: - hasSetupDefaults: 1 - controllerMappingProfiles: - - {fileID: 11400000, guid: e2ae1ca0318feab47a20524104ba0a94, type: 2} - - {fileID: 11400000, guid: fa146e915b7a500418bef3446a876138, type: 2} - handMeshingEnabled: 0 - handPhysicsEnabled: 0 - useTriggers: 0 - boundsMode: 0 - trackedPoses: [] diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/WindowsMixedRealityHandControllerDataProviderProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/WindowsMixedRealityHandControllerDataProviderProfile.asset.meta deleted file mode 100644 index 7c460631..00000000 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/WindowsMixedRealityHandControllerDataProviderProfile.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 11ef7a331fa0a164bb9ac3e5cae510ff -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: From 02ca15f3d23cb5827f4d407178c4ce01c9fd3e03 Mon Sep 17 00:00:00 2001 From: Dino Fejzagic Date: Sat, 2 May 2020 19:05:48 +0200 Subject: [PATCH 15/78] Reduce profile redundancy a bit --- .../{Left.meta => Common.meta} | 2 +- .../HandGrabInteractionMappingProfile.asset} | 2 +- ...dGrabInteractionMappingProfile.asset.meta} | 0 ...FingerPoseInteractionMappingProfile.asset} | 2 +- ...rPoseInteractionMappingProfile.asset.meta} | 0 ...HandSelectInteractionMappingProfile.asset} | 2 +- ...electInteractionMappingProfile.asset.meta} | 0 ...ialPointerInteractionMappingProfile.asset} | 2 +- ...interInteractionMappingProfile.asset.meta} | 0 .../HandControllers/Left/GrabProfile.asset | 30 ------------------- .../Left/IndexFingerPoseProfile.asset | 30 ------------------- .../Left/IndexFingerPoseProfile.asset.meta | 8 ----- .../HandControllers/Left/SelectProfile.asset | 30 ------------------- .../Left/SelectProfile.asset.meta | 8 ----- ...eftMixedRealityHandControllerProfile.asset | 4 +-- .../DataProviders/HandControllers/Right.meta | 8 ----- .../HandControllers/Right/GrabProfile.asset | 30 ------------------- .../Right/GrabProfile.asset.meta | 8 ----- .../Right/IndexFingerPoseProfile.asset.meta | 8 ----- .../HandControllers/Right/SelectProfile.asset | 30 ------------------- .../Right/SelectProfile.asset.meta | 8 ----- ...ghtMixedRealityHandControllerProfile.asset | 6 ++-- .../Simulated/Left/GrabProfile.asset.meta | 8 ----- .../Left/IndexFingerPoseProfile.asset | 30 ------------------- ...tedMixedRealityHandControllerProfile.asset | 2 +- .../Simulated/Right/GrabProfile.asset | 30 ------------------- .../Simulated/Right/GrabProfile.asset.meta | 8 ----- .../Right/IndexFingerPoseProfile.asset | 30 ------------------- .../Right/IndexFingerPoseProfile.asset.meta | 8 ----- .../Simulated/Right/SelectProfile.asset | 30 ------------------- .../Simulated/Right/SelectProfile.asset.meta | 8 ----- ...tedMixedRealityHandControllerProfile.asset | 6 ++-- 32 files changed, 14 insertions(+), 364 deletions(-) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/{Left.meta => Common.meta} (77%) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/{Simulated/Left/GrabProfile.asset => Common/HandGrabInteractionMappingProfile.asset} (94%) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/{Left/GrabProfile.asset.meta => Common/HandGrabInteractionMappingProfile.asset.meta} (100%) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/{Right/IndexFingerPoseProfile.asset => Common/HandIndexFingerPoseInteractionMappingProfile.asset} (92%) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/{Simulated/Left/IndexFingerPoseProfile.asset.meta => Common/HandIndexFingerPoseInteractionMappingProfile.asset.meta} (100%) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/{Simulated/Left/SelectProfile.asset => Common/HandSelectInteractionMappingProfile.asset} (94%) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/{Simulated/Left/SelectProfile.asset.meta => Common/HandSelectInteractionMappingProfile.asset.meta} (100%) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/{SpatialHandPointerProfile.asset => Common/HandSpatialPointerInteractionMappingProfile.asset} (93%) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/{SpatialHandPointerProfile.asset.meta => Common/HandSpatialPointerInteractionMappingProfile.asset.meta} (100%) delete mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Left/GrabProfile.asset delete mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Left/IndexFingerPoseProfile.asset delete mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Left/IndexFingerPoseProfile.asset.meta delete mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Left/SelectProfile.asset delete mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Left/SelectProfile.asset.meta delete mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Right.meta delete mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Right/GrabProfile.asset delete mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Right/GrabProfile.asset.meta delete mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Right/IndexFingerPoseProfile.asset.meta delete mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Right/SelectProfile.asset delete mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Right/SelectProfile.asset.meta delete mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/GrabProfile.asset.meta delete mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/IndexFingerPoseProfile.asset delete mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/GrabProfile.asset delete mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/GrabProfile.asset.meta delete mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/IndexFingerPoseProfile.asset delete mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/IndexFingerPoseProfile.asset.meta delete mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/SelectProfile.asset delete mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/SelectProfile.asset.meta diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Left.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common.meta similarity index 77% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Left.meta rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common.meta index e68e8edb..f9fab82d 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Left.meta +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9cd24cb72e6984c418a274e132f4281b +guid: 0e7abf5aec7c6524fa57575b2d4d88d3 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/GrabProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandGrabInteractionMappingProfile.asset similarity index 94% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/GrabProfile.asset rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandGrabInteractionMappingProfile.asset index 40ed73d2..445d2960 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/GrabProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandGrabInteractionMappingProfile.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: e3fb79524faca40478c0844c24e542f7, type: 3} - m_Name: GrabProfile + m_Name: HandGrabInteractionMappingProfile m_EditorClassIdentifier: interactionMapping: description: Grab diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Left/GrabProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandGrabInteractionMappingProfile.asset.meta similarity index 100% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Left/GrabProfile.asset.meta rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandGrabInteractionMappingProfile.asset.meta diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Right/IndexFingerPoseProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandIndexFingerPoseInteractionMappingProfile.asset similarity index 92% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Right/IndexFingerPoseProfile.asset rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandIndexFingerPoseInteractionMappingProfile.asset index e153dcc7..05b98522 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Right/IndexFingerPoseProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandIndexFingerPoseInteractionMappingProfile.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: e3fb79524faca40478c0844c24e542f7, type: 3} - m_Name: IndexFingerPoseProfile + m_Name: HandIndexFingerPoseInteractionMappingProfile m_EditorClassIdentifier: interactionMapping: description: Index Finger Pose diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/IndexFingerPoseProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandIndexFingerPoseInteractionMappingProfile.asset.meta similarity index 100% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/IndexFingerPoseProfile.asset.meta rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandIndexFingerPoseInteractionMappingProfile.asset.meta diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/SelectProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandSelectInteractionMappingProfile.asset similarity index 94% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/SelectProfile.asset rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandSelectInteractionMappingProfile.asset index 79e34c7d..38dce412 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/SelectProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandSelectInteractionMappingProfile.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: e3fb79524faca40478c0844c24e542f7, type: 3} - m_Name: SelectProfile + m_Name: HandSelectInteractionMappingProfile m_EditorClassIdentifier: interactionMapping: description: Select diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/SelectProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandSelectInteractionMappingProfile.asset.meta similarity index 100% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/SelectProfile.asset.meta rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandSelectInteractionMappingProfile.asset.meta diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/SpatialHandPointerProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandSpatialPointerInteractionMappingProfile.asset similarity index 93% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/SpatialHandPointerProfile.asset rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandSpatialPointerInteractionMappingProfile.asset index c27b62da..1c23854e 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/SpatialHandPointerProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandSpatialPointerInteractionMappingProfile.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: e3fb79524faca40478c0844c24e542f7, type: 3} - m_Name: SpatialHandPointerProfile + m_Name: HandSpatialPointerInteractionMappingProfile m_EditorClassIdentifier: interactionMapping: description: Index Spatial Pointer diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/SpatialHandPointerProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandSpatialPointerInteractionMappingProfile.asset.meta similarity index 100% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/SpatialHandPointerProfile.asset.meta rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandSpatialPointerInteractionMappingProfile.asset.meta diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Left/GrabProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Left/GrabProfile.asset deleted file mode 100644 index 40ed73d2..00000000 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Left/GrabProfile.asset +++ /dev/null @@ -1,30 +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: e3fb79524faca40478c0844c24e542f7, type: 3} - m_Name: GrabProfile - m_EditorClassIdentifier: - interactionMapping: - description: Grab - stateChangeType: 0 - axisType: 3 - inputType: 13 - inputAction: - profileGuid: 00000000000000000000000000000000 - id: 0 - description: None - axisConstraint: 0 - keyCode: 0 - inputName: - axisCodeX: - axisCodeY: - inputProcessors: [] - pointerProfiles: [] diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Left/IndexFingerPoseProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Left/IndexFingerPoseProfile.asset deleted file mode 100644 index e153dcc7..00000000 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Left/IndexFingerPoseProfile.asset +++ /dev/null @@ -1,30 +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: e3fb79524faca40478c0844c24e542f7, type: 3} - m_Name: IndexFingerPoseProfile - m_EditorClassIdentifier: - interactionMapping: - description: Index Finger Pose - stateChangeType: 0 - axisType: 7 - inputType: 33 - inputAction: - profileGuid: 00000000000000000000000000000000 - id: 0 - description: None - axisConstraint: 0 - keyCode: 0 - inputName: - axisCodeX: - axisCodeY: - inputProcessors: [] - pointerProfiles: [] diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Left/IndexFingerPoseProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Left/IndexFingerPoseProfile.asset.meta deleted file mode 100644 index 96d99960..00000000 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Left/IndexFingerPoseProfile.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 6182ebd8567606448b5d4a695574424c -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Left/SelectProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Left/SelectProfile.asset deleted file mode 100644 index cc1a7cf7..00000000 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Left/SelectProfile.asset +++ /dev/null @@ -1,30 +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: e3fb79524faca40478c0844c24e542f7, type: 3} - m_Name: SelectProfile - m_EditorClassIdentifier: - interactionMapping: - description: Select - stateChangeType: 0 - axisType: 2 - inputType: 25 - inputAction: - profileGuid: 00000000000000000000000000000000 - id: 0 - description: None - axisConstraint: 0 - keyCode: 0 - inputName: - axisCodeX: - axisCodeY: - inputProcessors: [] - pointerProfiles: [] diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Left/SelectProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Left/SelectProfile.asset.meta deleted file mode 100644 index 5e43e94c..00000000 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Left/SelectProfile.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 0c81fe4959ca49d4bae702f1cc8e16c4 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/LeftMixedRealityHandControllerProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/LeftMixedRealityHandControllerProfile.asset index c8202cf5..5c8a91ee 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/LeftMixedRealityHandControllerProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/LeftMixedRealityHandControllerProfile.asset @@ -20,6 +20,6 @@ MonoBehaviour: useCustomInteractions: 0 interactionMappingProfiles: - {fileID: 11400000, guid: b7f65e3d3581e3d46ba01ecb4fedd827, type: 2} - - {fileID: 11400000, guid: 0c81fe4959ca49d4bae702f1cc8e16c4, type: 2} + - {fileID: 11400000, guid: 1fd0c5cd50876514bb0027af902ed920, type: 2} - {fileID: 11400000, guid: 19c83b8e6eb6cd244a53e0edf4df46dd, type: 2} - - {fileID: 11400000, guid: 6182ebd8567606448b5d4a695574424c, type: 2} + - {fileID: 11400000, guid: 80556dee026997f4ba146ffda4710f79, type: 2} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Right.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Right.meta deleted file mode 100644 index 97e4e68b..00000000 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Right.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ca355d7971693fb43bae4dfdf5fa131c -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Right/GrabProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Right/GrabProfile.asset deleted file mode 100644 index 40ed73d2..00000000 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Right/GrabProfile.asset +++ /dev/null @@ -1,30 +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: e3fb79524faca40478c0844c24e542f7, type: 3} - m_Name: GrabProfile - m_EditorClassIdentifier: - interactionMapping: - description: Grab - stateChangeType: 0 - axisType: 3 - inputType: 13 - inputAction: - profileGuid: 00000000000000000000000000000000 - id: 0 - description: None - axisConstraint: 0 - keyCode: 0 - inputName: - axisCodeX: - axisCodeY: - inputProcessors: [] - pointerProfiles: [] diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Right/GrabProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Right/GrabProfile.asset.meta deleted file mode 100644 index 346eb5f8..00000000 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Right/GrabProfile.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e96f0abf707ab5d41ae84182ba53f781 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Right/IndexFingerPoseProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Right/IndexFingerPoseProfile.asset.meta deleted file mode 100644 index 7ecac391..00000000 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Right/IndexFingerPoseProfile.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 9506b84a8ad9477459e1ed2a05aebd04 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Right/SelectProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Right/SelectProfile.asset deleted file mode 100644 index cc1a7cf7..00000000 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Right/SelectProfile.asset +++ /dev/null @@ -1,30 +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: e3fb79524faca40478c0844c24e542f7, type: 3} - m_Name: SelectProfile - m_EditorClassIdentifier: - interactionMapping: - description: Select - stateChangeType: 0 - axisType: 2 - inputType: 25 - inputAction: - profileGuid: 00000000000000000000000000000000 - id: 0 - description: None - axisConstraint: 0 - keyCode: 0 - inputName: - axisCodeX: - axisCodeY: - inputProcessors: [] - pointerProfiles: [] diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Right/SelectProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Right/SelectProfile.asset.meta deleted file mode 100644 index 500e1e2c..00000000 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Right/SelectProfile.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 06fb341eff9637c41adca9843ab17fd1 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RightMixedRealityHandControllerProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RightMixedRealityHandControllerProfile.asset index fdb135ea..bb720f70 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RightMixedRealityHandControllerProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RightMixedRealityHandControllerProfile.asset @@ -20,6 +20,6 @@ MonoBehaviour: useCustomInteractions: 0 interactionMappingProfiles: - {fileID: 11400000, guid: b7f65e3d3581e3d46ba01ecb4fedd827, type: 2} - - {fileID: 11400000, guid: 06fb341eff9637c41adca9843ab17fd1, type: 2} - - {fileID: 11400000, guid: e96f0abf707ab5d41ae84182ba53f781, type: 2} - - {fileID: 11400000, guid: 9506b84a8ad9477459e1ed2a05aebd04, type: 2} + - {fileID: 11400000, guid: 1fd0c5cd50876514bb0027af902ed920, type: 2} + - {fileID: 11400000, guid: 19c83b8e6eb6cd244a53e0edf4df46dd, type: 2} + - {fileID: 11400000, guid: 80556dee026997f4ba146ffda4710f79, type: 2} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/GrabProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/GrabProfile.asset.meta deleted file mode 100644 index cb91b24b..00000000 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/GrabProfile.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 0f1e943dcb760c142a76e3f571394b42 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/IndexFingerPoseProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/IndexFingerPoseProfile.asset deleted file mode 100644 index e153dcc7..00000000 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/IndexFingerPoseProfile.asset +++ /dev/null @@ -1,30 +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: e3fb79524faca40478c0844c24e542f7, type: 3} - m_Name: IndexFingerPoseProfile - m_EditorClassIdentifier: - interactionMapping: - description: Index Finger Pose - stateChangeType: 0 - axisType: 7 - inputType: 33 - inputAction: - profileGuid: 00000000000000000000000000000000 - id: 0 - description: None - axisConstraint: 0 - keyCode: 0 - inputName: - axisCodeX: - axisCodeY: - inputProcessors: [] - pointerProfiles: [] diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/LeftSimulatedMixedRealityHandControllerProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/LeftSimulatedMixedRealityHandControllerProfile.asset index c76cf91a..2da6416d 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/LeftSimulatedMixedRealityHandControllerProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/LeftSimulatedMixedRealityHandControllerProfile.asset @@ -21,7 +21,7 @@ MonoBehaviour: interactionMappingProfiles: - {fileID: 11400000, guid: b7f65e3d3581e3d46ba01ecb4fedd827, type: 2} - {fileID: 11400000, guid: 1fd0c5cd50876514bb0027af902ed920, type: 2} - - {fileID: 11400000, guid: 0f1e943dcb760c142a76e3f571394b42, type: 2} + - {fileID: 11400000, guid: 19c83b8e6eb6cd244a53e0edf4df46dd, type: 2} - {fileID: 11400000, guid: 80556dee026997f4ba146ffda4710f79, type: 2} - {fileID: 11400000, guid: 0a51a3da8723c99469a4cefb19c2a75b, type: 2} - {fileID: 11400000, guid: 74befe0f3ef40d94f8930e361f6fa025, type: 2} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/GrabProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/GrabProfile.asset deleted file mode 100644 index 40ed73d2..00000000 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/GrabProfile.asset +++ /dev/null @@ -1,30 +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: e3fb79524faca40478c0844c24e542f7, type: 3} - m_Name: GrabProfile - m_EditorClassIdentifier: - interactionMapping: - description: Grab - stateChangeType: 0 - axisType: 3 - inputType: 13 - inputAction: - profileGuid: 00000000000000000000000000000000 - id: 0 - description: None - axisConstraint: 0 - keyCode: 0 - inputName: - axisCodeX: - axisCodeY: - inputProcessors: [] - pointerProfiles: [] diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/GrabProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/GrabProfile.asset.meta deleted file mode 100644 index 2d87d922..00000000 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/GrabProfile.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 43e9f87fa76d5554883940341589436b -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/IndexFingerPoseProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/IndexFingerPoseProfile.asset deleted file mode 100644 index e153dcc7..00000000 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/IndexFingerPoseProfile.asset +++ /dev/null @@ -1,30 +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: e3fb79524faca40478c0844c24e542f7, type: 3} - m_Name: IndexFingerPoseProfile - m_EditorClassIdentifier: - interactionMapping: - description: Index Finger Pose - stateChangeType: 0 - axisType: 7 - inputType: 33 - inputAction: - profileGuid: 00000000000000000000000000000000 - id: 0 - description: None - axisConstraint: 0 - keyCode: 0 - inputName: - axisCodeX: - axisCodeY: - inputProcessors: [] - pointerProfiles: [] diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/IndexFingerPoseProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/IndexFingerPoseProfile.asset.meta deleted file mode 100644 index f34f067c..00000000 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/IndexFingerPoseProfile.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: a96fb30df2bb6c24aa97a0e1468cd24a -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/SelectProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/SelectProfile.asset deleted file mode 100644 index 79e34c7d..00000000 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/SelectProfile.asset +++ /dev/null @@ -1,30 +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: e3fb79524faca40478c0844c24e542f7, type: 3} - m_Name: SelectProfile - m_EditorClassIdentifier: - interactionMapping: - description: Select - stateChangeType: 0 - axisType: 2 - inputType: 25 - inputAction: - profileGuid: 399335ccc89c4d12b79f3539ca7771db - id: 1 - description: Select - axisConstraint: 2 - keyCode: 0 - inputName: - axisCodeX: - axisCodeY: - inputProcessors: [] - pointerProfiles: [] diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/SelectProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/SelectProfile.asset.meta deleted file mode 100644 index 06ead549..00000000 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/SelectProfile.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: cd23741cb70b7ae40b319a4ef6eee003 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/RightSimulatedMixedRealityHandControllerProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/RightSimulatedMixedRealityHandControllerProfile.asset index bc547750..c04df8b4 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/RightSimulatedMixedRealityHandControllerProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/RightSimulatedMixedRealityHandControllerProfile.asset @@ -20,9 +20,9 @@ MonoBehaviour: useCustomInteractions: 0 interactionMappingProfiles: - {fileID: 11400000, guid: b7f65e3d3581e3d46ba01ecb4fedd827, type: 2} - - {fileID: 11400000, guid: cd23741cb70b7ae40b319a4ef6eee003, type: 2} - - {fileID: 11400000, guid: 43e9f87fa76d5554883940341589436b, type: 2} - - {fileID: 11400000, guid: a96fb30df2bb6c24aa97a0e1468cd24a, type: 2} + - {fileID: 11400000, guid: 1fd0c5cd50876514bb0027af902ed920, type: 2} + - {fileID: 11400000, guid: 19c83b8e6eb6cd244a53e0edf4df46dd, type: 2} + - {fileID: 11400000, guid: 80556dee026997f4ba146ffda4710f79, type: 2} - {fileID: 11400000, guid: 0551abc69395db944b2dd5e53319b4f5, type: 2} - {fileID: 11400000, guid: 13fd1b11dc0b10d408317dd2bfb18128, type: 2} - {fileID: 11400000, guid: 6e32cf2e094311d4192e374843bc9623, type: 2} From 43ccbd8030af6653bc385cfa35d7eb428a783625 Mon Sep 17 00:00:00 2001 From: Dino Fejzagic Date: Sun, 3 May 2020 11:27:55 +0200 Subject: [PATCH 16/78] Fix visualized joint rotations --- .../Scripts/Controllers/Hands/BaseHandControllerVisualizer.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/BaseHandControllerVisualizer.cs b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/BaseHandControllerVisualizer.cs index 46407dbf..b6e5d156 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/BaseHandControllerVisualizer.cs +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/BaseHandControllerVisualizer.cs @@ -114,7 +114,7 @@ private void UpdateHandJointTransforms(HandData handData) var jointTransform = GetOrCreateJointTransform(handJoint); var jointPose = jointPoses[handJoint]; jointTransform.localPosition = jointTransform.parent.InverseTransformPoint(jointPose.Position); - jointTransform.localRotation = Quaternion.Inverse(jointPose.Rotation) * jointTransform.parent.rotation; + jointTransform.rotation = jointPose.Rotation; } } } From 7c07e024f67b07e1ff7d51f0b48f774d21a0fc62 Mon Sep 17 00:00:00 2001 From: Dino Fejzagic Date: Sun, 3 May 2020 12:25:08 +0200 Subject: [PATCH 17/78] Moved simulated hand data provider profile --- .../SimulatedHandControllerDataProviderProfile.asset | 0 .../SimulatedHandControllerDataProviderProfile.asset.meta | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/{ => Simulated}/SimulatedHandControllerDataProviderProfile.asset (100%) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/{ => Simulated}/SimulatedHandControllerDataProviderProfile.asset.meta (100%) diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/SimulatedHandControllerDataProviderProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/SimulatedHandControllerDataProviderProfile.asset similarity index 100% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/SimulatedHandControllerDataProviderProfile.asset rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/SimulatedHandControllerDataProviderProfile.asset diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/SimulatedHandControllerDataProviderProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/SimulatedHandControllerDataProviderProfile.asset.meta similarity index 100% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/SimulatedHandControllerDataProviderProfile.asset.meta rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/SimulatedHandControllerDataProviderProfile.asset.meta From d50e55a0e4d18bde5e47e05a832eebdc477da268 Mon Sep 17 00:00:00 2001 From: Dino Fejzagic Date: Sun, 3 May 2020 13:11:55 +0200 Subject: [PATCH 18/78] Moved WMR profile to WMR module --- .../WMRControllerDataProviderProfile.asset | 24 ------------------- ...MRControllerDataProviderProfile.asset.meta | 8 ------- 2 files changed, 32 deletions(-) delete mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/WMRControllerDataProviderProfile.asset delete mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/WMRControllerDataProviderProfile.asset.meta diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/WMRControllerDataProviderProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/WMRControllerDataProviderProfile.asset deleted file mode 100644 index 6d157447..00000000 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/WMRControllerDataProviderProfile.asset +++ /dev/null @@ -1,24 +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: fe9eeb08f95b1c1419ad17953d9a48ee, type: 3} - m_Name: WMRControllerDataProviderProfile - m_EditorClassIdentifier: - hasSetupDefaults: 1 - controllerMappingProfiles: - - {fileID: 11400000, guid: aaa9b82b55ce7834bb43c9d726ff893e, type: 2} - - {fileID: 11400000, guid: 752ece58d1e10d4458ac9d6ad664cc58, type: 2} - - {fileID: 11400000, guid: 87a124892ea548a4ea4cbba488e06b5a, type: 2} - manipulationGestures: 0 - navigationGestures: 0 - useRailsNavigation: 0 - railsNavigationGestures: 0 - windowsGestureAutoStart: 0 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/WMRControllerDataProviderProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/WMRControllerDataProviderProfile.asset.meta deleted file mode 100644 index 186230d1..00000000 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/WMRControllerDataProviderProfile.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 8e0139954c0b0ab41a6f5fce7c0594e1 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: From 81e2f334b6b7cc588459a6dee973b99facfa8dcf Mon Sep 17 00:00:00 2001 From: Dino Fejzagic Date: Sun, 3 May 2020 17:08:51 +0200 Subject: [PATCH 19/78] Update profiles --- ...GrabProfileInteractionMappingProfile.asset | 30 +++++++++++++++++++ ...rofileInteractionMappingProfile.asset.meta | 8 +++++ ...ointProfileInteractionMappingProfile.asset | 30 +++++++++++++++++++ ...rofileInteractionMappingProfile.asset.meta | 8 +++++ ...PoseProfileInteractionMappingProfile.asset | 30 +++++++++++++++++++ ...rofileInteractionMappingProfile.asset.meta | 8 +++++ ...eftMixedRealityHandControllerProfile.asset | 4 ++- ...xedRealityHandControllerProfile.asset.meta | 2 +- ...ghtMixedRealityHandControllerProfile.asset | 4 ++- ...xedRealityHandControllerProfile.asset.meta | 2 +- 10 files changed, 122 insertions(+), 4 deletions(-) create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandGrabProfileInteractionMappingProfile.asset create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandGrabProfileInteractionMappingProfile.asset.meta create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandPointProfileInteractionMappingProfile.asset create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandPointProfileInteractionMappingProfile.asset.meta create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandTrackedPoseProfileInteractionMappingProfile.asset create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandTrackedPoseProfileInteractionMappingProfile.asset.meta diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandGrabProfileInteractionMappingProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandGrabProfileInteractionMappingProfile.asset new file mode 100644 index 00000000..2c6606cc --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandGrabProfileInteractionMappingProfile.asset @@ -0,0 +1,30 @@ +%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: e3fb79524faca40478c0844c24e542f7, type: 3} + m_Name: HandGrabProfileInteractionMappingProfile + m_EditorClassIdentifier: + interactionMapping: + description: Grab + stateChangeType: 0 + axisType: 3 + inputType: 13 + inputAction: + profileGuid: 00000000000000000000000000000000 + id: 0 + description: None + axisConstraint: 0 + keyCode: 0 + inputName: + axisCodeX: + axisCodeY: + inputProcessors: [] + pointerProfiles: [] diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandGrabProfileInteractionMappingProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandGrabProfileInteractionMappingProfile.asset.meta new file mode 100644 index 00000000..5e6597d7 --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandGrabProfileInteractionMappingProfile.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b37f910a179e80c48a2c9970709f72f3 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandPointProfileInteractionMappingProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandPointProfileInteractionMappingProfile.asset new file mode 100644 index 00000000..b2770a26 --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandPointProfileInteractionMappingProfile.asset @@ -0,0 +1,30 @@ +%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: e3fb79524faca40478c0844c24e542f7, type: 3} + m_Name: HandPointProfileInteractionMappingProfile + m_EditorClassIdentifier: + interactionMapping: + description: Point + stateChangeType: 0 + axisType: 2 + inputType: 7 + inputAction: + profileGuid: 00000000000000000000000000000000 + id: 0 + description: None + axisConstraint: 0 + keyCode: 0 + inputName: + axisCodeX: + axisCodeY: + inputProcessors: [] + pointerProfiles: [] diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandPointProfileInteractionMappingProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandPointProfileInteractionMappingProfile.asset.meta new file mode 100644 index 00000000..74b98367 --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandPointProfileInteractionMappingProfile.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 118d8e619c1393b49bbf1d387651668c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandTrackedPoseProfileInteractionMappingProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandTrackedPoseProfileInteractionMappingProfile.asset new file mode 100644 index 00000000..5e57c62d --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandTrackedPoseProfileInteractionMappingProfile.asset @@ -0,0 +1,30 @@ +%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: e3fb79524faca40478c0844c24e542f7, type: 3} + m_Name: HandTrackedPoseProfileInteractionMappingProfile + m_EditorClassIdentifier: + interactionMapping: + description: Tracked Pose + stateChangeType: 0 + axisType: 1 + inputType: 28 + inputAction: + profileGuid: 00000000000000000000000000000000 + id: 0 + description: None + axisConstraint: 0 + keyCode: 0 + inputName: + axisCodeX: + axisCodeY: + inputProcessors: [] + pointerProfiles: [] diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandTrackedPoseProfileInteractionMappingProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandTrackedPoseProfileInteractionMappingProfile.asset.meta new file mode 100644 index 00000000..afc8744f --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandTrackedPoseProfileInteractionMappingProfile.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 84ae5012fb31f1945b5be6a71bedfd88 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/LeftMixedRealityHandControllerProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/LeftMixedRealityHandControllerProfile.asset index 5c8a91ee..008dd26b 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/LeftMixedRealityHandControllerProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/LeftMixedRealityHandControllerProfile.asset @@ -21,5 +21,7 @@ MonoBehaviour: interactionMappingProfiles: - {fileID: 11400000, guid: b7f65e3d3581e3d46ba01ecb4fedd827, type: 2} - {fileID: 11400000, guid: 1fd0c5cd50876514bb0027af902ed920, type: 2} - - {fileID: 11400000, guid: 19c83b8e6eb6cd244a53e0edf4df46dd, type: 2} + - {fileID: 11400000, guid: 118d8e619c1393b49bbf1d387651668c, type: 2} + - {fileID: 11400000, guid: b37f910a179e80c48a2c9970709f72f3, type: 2} - {fileID: 11400000, guid: 80556dee026997f4ba146ffda4710f79, type: 2} + - {fileID: 11400000, guid: 84ae5012fb31f1945b5be6a71bedfd88, type: 2} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/LeftMixedRealityHandControllerProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/LeftMixedRealityHandControllerProfile.asset.meta index 9f831a15..e6a8949d 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/LeftMixedRealityHandControllerProfile.asset.meta +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/LeftMixedRealityHandControllerProfile.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e2ae1ca0318feab47a20524104ba0a94 +guid: 777fb11f650654740825e1853e030405 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RightMixedRealityHandControllerProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RightMixedRealityHandControllerProfile.asset index bb720f70..309eec11 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RightMixedRealityHandControllerProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RightMixedRealityHandControllerProfile.asset @@ -21,5 +21,7 @@ MonoBehaviour: interactionMappingProfiles: - {fileID: 11400000, guid: b7f65e3d3581e3d46ba01ecb4fedd827, type: 2} - {fileID: 11400000, guid: 1fd0c5cd50876514bb0027af902ed920, type: 2} - - {fileID: 11400000, guid: 19c83b8e6eb6cd244a53e0edf4df46dd, type: 2} + - {fileID: 11400000, guid: 118d8e619c1393b49bbf1d387651668c, type: 2} + - {fileID: 11400000, guid: b37f910a179e80c48a2c9970709f72f3, type: 2} - {fileID: 11400000, guid: 80556dee026997f4ba146ffda4710f79, type: 2} + - {fileID: 11400000, guid: 84ae5012fb31f1945b5be6a71bedfd88, type: 2} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RightMixedRealityHandControllerProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RightMixedRealityHandControllerProfile.asset.meta index a8cac279..1bf733be 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RightMixedRealityHandControllerProfile.asset.meta +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RightMixedRealityHandControllerProfile.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: fa146e915b7a500418bef3446a876138 +guid: 094680cae747ccb438c376af7ec85f32 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 From b80ba4ff359c7192f1f2887656240363abb47696 Mon Sep 17 00:00:00 2001 From: Dino Fejzagic Date: Sun, 3 May 2020 17:24:08 +0200 Subject: [PATCH 20/78] Updated profiles --- .../HandGrabInteractionMappingProfile.asset | 30 ------------------- ...ndGrabInteractionMappingProfile.asset.meta | 8 ----- .../Simulated/{Left.meta => Common.meta} | 0 .../MoveAway(Depth)Profile.asset | 0 .../MoveAway(Depth)Profile.asset.meta | 2 +- .../MoveCloser(Depth)Profile.asset | 0 .../MoveCloser(Depth)Profile.asset.meta | 2 +- .../PitchClockwiseProfile.asset | 0 .../PitchClockwiseProfile.asset.meta | 2 +- .../PitchCounterClockwiseProfile.asset | 0 .../PitchCounterClockwiseProfile.asset.meta | 2 +- .../RollClockwiseProfile.asset | 0 .../RollClockwiseProfile.asset.meta | 2 +- .../RollCounterClockwiseProfile.asset | 0 .../RollCounterClockwiseProfile.asset.meta | 2 +- .../YawClockwiseProfile.asset | 0 .../YawClockwiseProfile.asset.meta | 2 +- .../YawCounterClockwiseProfile.asset | 0 .../YawCounterClockwiseProfile.asset.meta | 2 +- .../Left/MoveAway(Depth)Profile.asset.meta | 8 ----- .../Left/MoveCloser(Depth)Profile.asset.meta | 8 ----- ...tedMixedRealityHandControllerProfile.asset | 20 +++++++------ ...xedRealityHandControllerProfile.asset.meta | 2 +- .../HandControllers/Simulated/Right.meta | 8 ----- .../Right/MoveAway(Depth)Profile.asset | 30 ------------------- .../Right/MoveCloser(Depth)Profile.asset | 30 ------------------- .../Right/PitchClockwiseProfile.asset | 30 ------------------- .../Right/PitchClockwiseProfile.asset.meta | 8 ----- .../Right/PitchCounterClockwiseProfile.asset | 30 ------------------- .../PitchCounterClockwiseProfile.asset.meta | 8 ----- .../Right/RollClockwiseProfile.asset | 30 ------------------- .../Right/RollClockwiseProfile.asset.meta | 8 ----- .../Right/RollCounterClockwiseProfile.asset | 30 ------------------- .../RollCounterClockwiseProfile.asset.meta | 8 ----- .../Simulated/Right/YawClockwiseProfile.asset | 30 ------------------- .../Right/YawClockwiseProfile.asset.meta | 8 ----- .../Right/YawCounterClockwiseProfile.asset | 30 ------------------- .../YawCounterClockwiseProfile.asset.meta | 8 ----- ...tedMixedRealityHandControllerProfile.asset | 20 +++++++------ ...xedRealityHandControllerProfile.asset.meta | 2 +- ...tedHandControllerDataProviderProfile.asset | 4 +-- 41 files changed, 34 insertions(+), 380 deletions(-) delete mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandGrabInteractionMappingProfile.asset delete mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandGrabInteractionMappingProfile.asset.meta rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/{Left.meta => Common.meta} (100%) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/{Left => Common}/MoveAway(Depth)Profile.asset (100%) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/{Right => Common}/MoveAway(Depth)Profile.asset.meta (79%) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/{Left => Common}/MoveCloser(Depth)Profile.asset (100%) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/{Right => Common}/MoveCloser(Depth)Profile.asset.meta (79%) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/{Left => Common}/PitchClockwiseProfile.asset (100%) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/{Left => Common}/PitchClockwiseProfile.asset.meta (79%) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/{Left => Common}/PitchCounterClockwiseProfile.asset (100%) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/{Left => Common}/PitchCounterClockwiseProfile.asset.meta (79%) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/{Left => Common}/RollClockwiseProfile.asset (100%) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/{Left => Common}/RollClockwiseProfile.asset.meta (79%) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/{Left => Common}/RollCounterClockwiseProfile.asset (100%) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/{Left => Common}/RollCounterClockwiseProfile.asset.meta (79%) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/{Left => Common}/YawClockwiseProfile.asset (100%) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/{Left => Common}/YawClockwiseProfile.asset.meta (79%) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/{Left => Common}/YawCounterClockwiseProfile.asset (100%) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/{Left => Common}/YawCounterClockwiseProfile.asset.meta (79%) delete mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/MoveAway(Depth)Profile.asset.meta delete mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/MoveCloser(Depth)Profile.asset.meta delete mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right.meta delete mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/MoveAway(Depth)Profile.asset delete mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/MoveCloser(Depth)Profile.asset delete mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/PitchClockwiseProfile.asset delete mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/PitchClockwiseProfile.asset.meta delete mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/PitchCounterClockwiseProfile.asset delete mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/PitchCounterClockwiseProfile.asset.meta delete mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/RollClockwiseProfile.asset delete mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/RollClockwiseProfile.asset.meta delete mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/RollCounterClockwiseProfile.asset delete mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/RollCounterClockwiseProfile.asset.meta delete mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/YawClockwiseProfile.asset delete mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/YawClockwiseProfile.asset.meta delete mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/YawCounterClockwiseProfile.asset delete mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/YawCounterClockwiseProfile.asset.meta diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandGrabInteractionMappingProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandGrabInteractionMappingProfile.asset deleted file mode 100644 index 445d2960..00000000 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandGrabInteractionMappingProfile.asset +++ /dev/null @@ -1,30 +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: e3fb79524faca40478c0844c24e542f7, type: 3} - m_Name: HandGrabInteractionMappingProfile - m_EditorClassIdentifier: - interactionMapping: - description: Grab - stateChangeType: 0 - axisType: 3 - inputType: 13 - inputAction: - profileGuid: 00000000000000000000000000000000 - id: 0 - description: None - axisConstraint: 0 - keyCode: 0 - inputName: - axisCodeX: - axisCodeY: - inputProcessors: [] - pointerProfiles: [] diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandGrabInteractionMappingProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandGrabInteractionMappingProfile.asset.meta deleted file mode 100644 index 89576056..00000000 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandGrabInteractionMappingProfile.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 19c83b8e6eb6cd244a53e0edf4df46dd -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Common.meta similarity index 100% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left.meta rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Common.meta diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/MoveAway(Depth)Profile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Common/MoveAway(Depth)Profile.asset similarity index 100% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/MoveAway(Depth)Profile.asset rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Common/MoveAway(Depth)Profile.asset diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/MoveAway(Depth)Profile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Common/MoveAway(Depth)Profile.asset.meta similarity index 79% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/MoveAway(Depth)Profile.asset.meta rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Common/MoveAway(Depth)Profile.asset.meta index c762804f..28f85dfc 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/MoveAway(Depth)Profile.asset.meta +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Common/MoveAway(Depth)Profile.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6461093495593f1438fa08f8cf59e15c +guid: fe2c817c85de12f45862c078fc767994 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/MoveCloser(Depth)Profile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Common/MoveCloser(Depth)Profile.asset similarity index 100% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/MoveCloser(Depth)Profile.asset rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Common/MoveCloser(Depth)Profile.asset diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/MoveCloser(Depth)Profile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Common/MoveCloser(Depth)Profile.asset.meta similarity index 79% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/MoveCloser(Depth)Profile.asset.meta rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Common/MoveCloser(Depth)Profile.asset.meta index e52937e0..d619cd4c 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/MoveCloser(Depth)Profile.asset.meta +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Common/MoveCloser(Depth)Profile.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 74a71e8548cfeeb438cae2e36763e235 +guid: 8b71ccb1d13b24940886b9129cd99584 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/PitchClockwiseProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Common/PitchClockwiseProfile.asset similarity index 100% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/PitchClockwiseProfile.asset rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Common/PitchClockwiseProfile.asset diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/PitchClockwiseProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Common/PitchClockwiseProfile.asset.meta similarity index 79% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/PitchClockwiseProfile.asset.meta rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Common/PitchClockwiseProfile.asset.meta index aa8e34f5..6a67b7f2 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/PitchClockwiseProfile.asset.meta +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Common/PitchClockwiseProfile.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1d100ad98538f674697c53fb406c5a47 +guid: 3265960ea5cd94f499bf02eb746a79af NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/PitchCounterClockwiseProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Common/PitchCounterClockwiseProfile.asset similarity index 100% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/PitchCounterClockwiseProfile.asset rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Common/PitchCounterClockwiseProfile.asset diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/PitchCounterClockwiseProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Common/PitchCounterClockwiseProfile.asset.meta similarity index 79% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/PitchCounterClockwiseProfile.asset.meta rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Common/PitchCounterClockwiseProfile.asset.meta index 54a27d72..c2122684 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/PitchCounterClockwiseProfile.asset.meta +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Common/PitchCounterClockwiseProfile.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b7f7f573c0806e144ba65d8c46fb0443 +guid: 8d21414d16a88d647a33e521cfaf2d6e NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/RollClockwiseProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Common/RollClockwiseProfile.asset similarity index 100% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/RollClockwiseProfile.asset rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Common/RollClockwiseProfile.asset diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/RollClockwiseProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Common/RollClockwiseProfile.asset.meta similarity index 79% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/RollClockwiseProfile.asset.meta rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Common/RollClockwiseProfile.asset.meta index 9150096b..3333d6f9 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/RollClockwiseProfile.asset.meta +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Common/RollClockwiseProfile.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 99e0428a07202934193ab6678748a6bb +guid: ebcc386ca12a0f440b56ea95c751f7ee NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/RollCounterClockwiseProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Common/RollCounterClockwiseProfile.asset similarity index 100% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/RollCounterClockwiseProfile.asset rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Common/RollCounterClockwiseProfile.asset diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/RollCounterClockwiseProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Common/RollCounterClockwiseProfile.asset.meta similarity index 79% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/RollCounterClockwiseProfile.asset.meta rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Common/RollCounterClockwiseProfile.asset.meta index 59e399e4..0d9ecbd0 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/RollCounterClockwiseProfile.asset.meta +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Common/RollCounterClockwiseProfile.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b234687150647ee4b854b7208eb5794b +guid: baeb171c54652534f80427c4473e14c6 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/YawClockwiseProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Common/YawClockwiseProfile.asset similarity index 100% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/YawClockwiseProfile.asset rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Common/YawClockwiseProfile.asset diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/YawClockwiseProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Common/YawClockwiseProfile.asset.meta similarity index 79% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/YawClockwiseProfile.asset.meta rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Common/YawClockwiseProfile.asset.meta index 9a6dd6da..e9361180 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/YawClockwiseProfile.asset.meta +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Common/YawClockwiseProfile.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0a51a3da8723c99469a4cefb19c2a75b +guid: 65fe769960045eb4284e122669355d0f NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/YawCounterClockwiseProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Common/YawCounterClockwiseProfile.asset similarity index 100% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/YawCounterClockwiseProfile.asset rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Common/YawCounterClockwiseProfile.asset diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/YawCounterClockwiseProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Common/YawCounterClockwiseProfile.asset.meta similarity index 79% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/YawCounterClockwiseProfile.asset.meta rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Common/YawCounterClockwiseProfile.asset.meta index c260157a..9179e5ce 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/YawCounterClockwiseProfile.asset.meta +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Common/YawCounterClockwiseProfile.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 74befe0f3ef40d94f8930e361f6fa025 +guid: 7a31aa9670c8b0046ab22a9a8c86aabd NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/MoveAway(Depth)Profile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/MoveAway(Depth)Profile.asset.meta deleted file mode 100644 index 730b6e63..00000000 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/MoveAway(Depth)Profile.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 903e62b0bf4b64c43bba8ac894bde493 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/MoveCloser(Depth)Profile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/MoveCloser(Depth)Profile.asset.meta deleted file mode 100644 index 8c4e8065..00000000 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Left/MoveCloser(Depth)Profile.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 5f29f2281e568b64c8356f8b24aaa9e8 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/LeftSimulatedMixedRealityHandControllerProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/LeftSimulatedMixedRealityHandControllerProfile.asset index 2da6416d..b0e08c32 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/LeftSimulatedMixedRealityHandControllerProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/LeftSimulatedMixedRealityHandControllerProfile.asset @@ -21,13 +21,15 @@ MonoBehaviour: interactionMappingProfiles: - {fileID: 11400000, guid: b7f65e3d3581e3d46ba01ecb4fedd827, type: 2} - {fileID: 11400000, guid: 1fd0c5cd50876514bb0027af902ed920, type: 2} - - {fileID: 11400000, guid: 19c83b8e6eb6cd244a53e0edf4df46dd, type: 2} + - {fileID: 11400000, guid: 118d8e619c1393b49bbf1d387651668c, type: 2} + - {fileID: 11400000, guid: b37f910a179e80c48a2c9970709f72f3, type: 2} - {fileID: 11400000, guid: 80556dee026997f4ba146ffda4710f79, type: 2} - - {fileID: 11400000, guid: 0a51a3da8723c99469a4cefb19c2a75b, type: 2} - - {fileID: 11400000, guid: 74befe0f3ef40d94f8930e361f6fa025, type: 2} - - {fileID: 11400000, guid: 1d100ad98538f674697c53fb406c5a47, type: 2} - - {fileID: 11400000, guid: b7f7f573c0806e144ba65d8c46fb0443, type: 2} - - {fileID: 11400000, guid: 99e0428a07202934193ab6678748a6bb, type: 2} - - {fileID: 11400000, guid: b234687150647ee4b854b7208eb5794b, type: 2} - - {fileID: 11400000, guid: 903e62b0bf4b64c43bba8ac894bde493, type: 2} - - {fileID: 11400000, guid: 5f29f2281e568b64c8356f8b24aaa9e8, type: 2} + - {fileID: 11400000, guid: 84ae5012fb31f1945b5be6a71bedfd88, type: 2} + - {fileID: 11400000, guid: 65fe769960045eb4284e122669355d0f, type: 2} + - {fileID: 11400000, guid: 7a31aa9670c8b0046ab22a9a8c86aabd, type: 2} + - {fileID: 11400000, guid: 3265960ea5cd94f499bf02eb746a79af, type: 2} + - {fileID: 11400000, guid: 8d21414d16a88d647a33e521cfaf2d6e, type: 2} + - {fileID: 11400000, guid: ebcc386ca12a0f440b56ea95c751f7ee, type: 2} + - {fileID: 11400000, guid: baeb171c54652534f80427c4473e14c6, type: 2} + - {fileID: 11400000, guid: fe2c817c85de12f45862c078fc767994, type: 2} + - {fileID: 11400000, guid: 8b71ccb1d13b24940886b9129cd99584, type: 2} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/LeftSimulatedMixedRealityHandControllerProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/LeftSimulatedMixedRealityHandControllerProfile.asset.meta index f7b0e867..0ed7fca7 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/LeftSimulatedMixedRealityHandControllerProfile.asset.meta +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/LeftSimulatedMixedRealityHandControllerProfile.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e5de6ea5e8157aa46892ed4c81439f0c +guid: e7410f969234129419325b60dd7ef6b5 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right.meta deleted file mode 100644 index 0f974688..00000000 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f30d4b873a44fe94bb2ef401bdce851d -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/MoveAway(Depth)Profile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/MoveAway(Depth)Profile.asset deleted file mode 100644 index d9639f2e..00000000 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/MoveAway(Depth)Profile.asset +++ /dev/null @@ -1,30 +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: e3fb79524faca40478c0844c24e542f7, type: 3} - m_Name: MoveAway(Depth)Profile - m_EditorClassIdentifier: - interactionMapping: - description: Move Away (Depth) - stateChangeType: 0 - axisType: 2 - inputType: 7 - inputAction: - profileGuid: 00000000000000000000000000000000 - id: 0 - description: None - axisConstraint: 0 - keyCode: 280 - inputName: - axisCodeX: - axisCodeY: - inputProcessors: [] - pointerProfiles: [] diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/MoveCloser(Depth)Profile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/MoveCloser(Depth)Profile.asset deleted file mode 100644 index ccc5d1c0..00000000 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/MoveCloser(Depth)Profile.asset +++ /dev/null @@ -1,30 +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: e3fb79524faca40478c0844c24e542f7, type: 3} - m_Name: MoveCloser(Depth)Profile - m_EditorClassIdentifier: - interactionMapping: - description: Move Closer (Depth) - stateChangeType: 0 - axisType: 2 - inputType: 7 - inputAction: - profileGuid: 00000000000000000000000000000000 - id: 0 - description: None - axisConstraint: 0 - keyCode: 281 - inputName: - axisCodeX: - axisCodeY: - inputProcessors: [] - pointerProfiles: [] diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/PitchClockwiseProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/PitchClockwiseProfile.asset deleted file mode 100644 index e848a9d9..00000000 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/PitchClockwiseProfile.asset +++ /dev/null @@ -1,30 +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: e3fb79524faca40478c0844c24e542f7, type: 3} - m_Name: PitchClockwiseProfile - m_EditorClassIdentifier: - interactionMapping: - description: Pitch Clockwise - stateChangeType: 0 - axisType: 2 - inputType: 7 - inputAction: - profileGuid: 00000000000000000000000000000000 - id: 0 - description: None - axisConstraint: 0 - keyCode: 102 - inputName: - axisCodeX: - axisCodeY: - inputProcessors: [] - pointerProfiles: [] diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/PitchClockwiseProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/PitchClockwiseProfile.asset.meta deleted file mode 100644 index 4d0d7fd8..00000000 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/PitchClockwiseProfile.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 6e32cf2e094311d4192e374843bc9623 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/PitchCounterClockwiseProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/PitchCounterClockwiseProfile.asset deleted file mode 100644 index 2369785d..00000000 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/PitchCounterClockwiseProfile.asset +++ /dev/null @@ -1,30 +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: e3fb79524faca40478c0844c24e542f7, type: 3} - m_Name: PitchCounterClockwiseProfile - m_EditorClassIdentifier: - interactionMapping: - description: Pitch Counter Clockwise - stateChangeType: 0 - axisType: 2 - inputType: 7 - inputAction: - profileGuid: 00000000000000000000000000000000 - id: 0 - description: None - axisConstraint: 0 - keyCode: 114 - inputName: - axisCodeX: - axisCodeY: - inputProcessors: [] - pointerProfiles: [] diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/PitchCounterClockwiseProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/PitchCounterClockwiseProfile.asset.meta deleted file mode 100644 index 2ec039fe..00000000 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/PitchCounterClockwiseProfile.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: cea22b7899ba53c46925c1857b5e6248 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/RollClockwiseProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/RollClockwiseProfile.asset deleted file mode 100644 index 2a3e95a4..00000000 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/RollClockwiseProfile.asset +++ /dev/null @@ -1,30 +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: e3fb79524faca40478c0844c24e542f7, type: 3} - m_Name: RollClockwiseProfile - m_EditorClassIdentifier: - interactionMapping: - description: Roll Clockwise - stateChangeType: 0 - axisType: 2 - inputType: 7 - inputAction: - profileGuid: 00000000000000000000000000000000 - id: 0 - description: None - axisConstraint: 0 - keyCode: 120 - inputName: - axisCodeX: - axisCodeY: - inputProcessors: [] - pointerProfiles: [] diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/RollClockwiseProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/RollClockwiseProfile.asset.meta deleted file mode 100644 index 9cd08c17..00000000 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/RollClockwiseProfile.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 74825e5640b18d747975fbc8e31bed01 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/RollCounterClockwiseProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/RollCounterClockwiseProfile.asset deleted file mode 100644 index 6e73c67e..00000000 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/RollCounterClockwiseProfile.asset +++ /dev/null @@ -1,30 +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: e3fb79524faca40478c0844c24e542f7, type: 3} - m_Name: RollCounterClockwiseProfile - m_EditorClassIdentifier: - interactionMapping: - description: Roll Counter Clockwise - stateChangeType: 0 - axisType: 2 - inputType: 7 - inputAction: - profileGuid: 00000000000000000000000000000000 - id: 0 - description: None - axisConstraint: 0 - keyCode: 122 - inputName: - axisCodeX: - axisCodeY: - inputProcessors: [] - pointerProfiles: [] diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/RollCounterClockwiseProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/RollCounterClockwiseProfile.asset.meta deleted file mode 100644 index cc733086..00000000 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/RollCounterClockwiseProfile.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 781e927490acb8940949867800cb076d -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/YawClockwiseProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/YawClockwiseProfile.asset deleted file mode 100644 index bc836e6b..00000000 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/YawClockwiseProfile.asset +++ /dev/null @@ -1,30 +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: e3fb79524faca40478c0844c24e542f7, type: 3} - m_Name: YawClockwiseProfile - m_EditorClassIdentifier: - interactionMapping: - description: Yaw Clockwise - stateChangeType: 0 - axisType: 2 - inputType: 7 - inputAction: - profileGuid: 00000000000000000000000000000000 - id: 0 - description: None - axisConstraint: 0 - keyCode: 101 - inputName: - axisCodeX: - axisCodeY: - inputProcessors: [] - pointerProfiles: [] diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/YawClockwiseProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/YawClockwiseProfile.asset.meta deleted file mode 100644 index fafdb23e..00000000 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/YawClockwiseProfile.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 0551abc69395db944b2dd5e53319b4f5 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/YawCounterClockwiseProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/YawCounterClockwiseProfile.asset deleted file mode 100644 index 94f4db9d..00000000 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/YawCounterClockwiseProfile.asset +++ /dev/null @@ -1,30 +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: e3fb79524faca40478c0844c24e542f7, type: 3} - m_Name: YawCounterClockwiseProfile - m_EditorClassIdentifier: - interactionMapping: - description: Yaw Counter Clockwise - stateChangeType: 0 - axisType: 2 - inputType: 7 - inputAction: - profileGuid: 00000000000000000000000000000000 - id: 0 - description: None - axisConstraint: 0 - keyCode: 113 - inputName: - axisCodeX: - axisCodeY: - inputProcessors: [] - pointerProfiles: [] diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/YawCounterClockwiseProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/YawCounterClockwiseProfile.asset.meta deleted file mode 100644 index 028a109b..00000000 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Right/YawCounterClockwiseProfile.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 13fd1b11dc0b10d408317dd2bfb18128 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/RightSimulatedMixedRealityHandControllerProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/RightSimulatedMixedRealityHandControllerProfile.asset index c04df8b4..be692fd3 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/RightSimulatedMixedRealityHandControllerProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/RightSimulatedMixedRealityHandControllerProfile.asset @@ -21,13 +21,15 @@ MonoBehaviour: interactionMappingProfiles: - {fileID: 11400000, guid: b7f65e3d3581e3d46ba01ecb4fedd827, type: 2} - {fileID: 11400000, guid: 1fd0c5cd50876514bb0027af902ed920, type: 2} - - {fileID: 11400000, guid: 19c83b8e6eb6cd244a53e0edf4df46dd, type: 2} + - {fileID: 11400000, guid: 118d8e619c1393b49bbf1d387651668c, type: 2} + - {fileID: 11400000, guid: b37f910a179e80c48a2c9970709f72f3, type: 2} - {fileID: 11400000, guid: 80556dee026997f4ba146ffda4710f79, type: 2} - - {fileID: 11400000, guid: 0551abc69395db944b2dd5e53319b4f5, type: 2} - - {fileID: 11400000, guid: 13fd1b11dc0b10d408317dd2bfb18128, type: 2} - - {fileID: 11400000, guid: 6e32cf2e094311d4192e374843bc9623, type: 2} - - {fileID: 11400000, guid: cea22b7899ba53c46925c1857b5e6248, type: 2} - - {fileID: 11400000, guid: 74825e5640b18d747975fbc8e31bed01, type: 2} - - {fileID: 11400000, guid: 781e927490acb8940949867800cb076d, type: 2} - - {fileID: 11400000, guid: 6461093495593f1438fa08f8cf59e15c, type: 2} - - {fileID: 11400000, guid: 74a71e8548cfeeb438cae2e36763e235, type: 2} + - {fileID: 11400000, guid: 84ae5012fb31f1945b5be6a71bedfd88, type: 2} + - {fileID: 11400000, guid: 65fe769960045eb4284e122669355d0f, type: 2} + - {fileID: 11400000, guid: 7a31aa9670c8b0046ab22a9a8c86aabd, type: 2} + - {fileID: 11400000, guid: 3265960ea5cd94f499bf02eb746a79af, type: 2} + - {fileID: 11400000, guid: 8d21414d16a88d647a33e521cfaf2d6e, type: 2} + - {fileID: 11400000, guid: ebcc386ca12a0f440b56ea95c751f7ee, type: 2} + - {fileID: 11400000, guid: baeb171c54652534f80427c4473e14c6, type: 2} + - {fileID: 11400000, guid: fe2c817c85de12f45862c078fc767994, type: 2} + - {fileID: 11400000, guid: 8b71ccb1d13b24940886b9129cd99584, type: 2} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/RightSimulatedMixedRealityHandControllerProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/RightSimulatedMixedRealityHandControllerProfile.asset.meta index 4bc743f4..57c0ce4a 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/RightSimulatedMixedRealityHandControllerProfile.asset.meta +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/RightSimulatedMixedRealityHandControllerProfile.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: fab679676d59f77478f115d3091013aa +guid: 7c17bff23a6d6e44b9a2225f53257bba NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/SimulatedHandControllerDataProviderProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/SimulatedHandControllerDataProviderProfile.asset index 06fe5959..90c662fa 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/SimulatedHandControllerDataProviderProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/SimulatedHandControllerDataProviderProfile.asset @@ -14,8 +14,8 @@ MonoBehaviour: m_EditorClassIdentifier: hasSetupDefaults: 1 controllerMappingProfiles: - - {fileID: 11400000, guid: e5de6ea5e8157aa46892ed4c81439f0c, type: 2} - - {fileID: 11400000, guid: fab679676d59f77478f115d3091013aa, type: 2} + - {fileID: 11400000, guid: e7410f969234129419325b60dd7ef6b5, type: 2} + - {fileID: 11400000, guid: 7c17bff23a6d6e44b9a2225f53257bba, type: 2} simulatedUpdateFrequency: 0 controllerHideTimeout: 0.2 defaultDistance: 0.5 From 8fd1d7389668e5f3f0b6145b7cb852e27428532f Mon Sep 17 00:00:00 2001 From: Stephen Hodgson Date: Sun, 3 May 2020 18:13:13 -0400 Subject: [PATCH 21/78] changes for near pointer interactions using collision --- .../MixedRealityInputSystemProfile.asset | 2 +- .../Runtime/Features/Input/GazeProvider.cs | 6 +- .../Input/Handlers/ManipulationHandler.cs | 2 +- .../Scripts/Pointers/BaseControllerPointer.cs | 62 +++++++++++++++---- 4 files changed, 54 insertions(+), 18 deletions(-) diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/MixedRealityInputSystemProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/MixedRealityInputSystemProfile.asset index e5bd2e13..8e88b8f4 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/MixedRealityInputSystemProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/MixedRealityInputSystemProfile.asset @@ -87,7 +87,7 @@ MonoBehaviour: gazeCursorPrefab: {fileID: 1000012072213228, guid: 79f96834fcc44889b558cc13518979a0, type: 3} pointingExtent: 10 - pointingRaycastLayerMasks: + pointerRaycastLayerMasks: - serializedVersion: 2 m_Bits: 4294967291 drawDebugPointingRays: 1 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/Input/GazeProvider.cs b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/Input/GazeProvider.cs index 9d4c28fd..cac7c665 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/Input/GazeProvider.cs +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/Input/GazeProvider.cs @@ -30,7 +30,7 @@ public class GazeProvider : InputSystemGlobalListener, IMixedRealityGazeProvider private float maxGazeCollisionDistance = 10.0f; /// - /// The LayerMasks, in prioritized order, that are used to determine the GazeTarget when raycasting. + /// The Physics layers, in prioritized order, that are used to determine the GazeTarget when raycasting. /// /// Allow the cursor to hit SR, but first prioritize any DefaultRaycastLayers (potentially behind SR) /// /// [SerializeField] - [Tooltip("The LayerMasks, in prioritized order, that are used to determine the GazeTarget when raycasting.")] + [Tooltip("The Physics layers, in prioritized order, that are used to determine the GazeTarget when raycasting.")] private LayerMask[] raycastLayerMasks = { Physics.DefaultRaycastLayers }; /// @@ -146,7 +146,7 @@ public InternalGazePointer(GazeProvider gazeProvider, string pointerName, IMixed : base(pointerName, inputSourceParent) { this.gazeProvider = gazeProvider; - PrioritizedLayerMasksOverride = raycastLayerMasks; + PointerRaycastLayerMasksOverride = raycastLayerMasks; this.pointerExtent = pointerExtent; this.gazeTransform = gazeTransform; this.stabilizer = stabilizer; diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/Input/Handlers/ManipulationHandler.cs b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/Input/Handlers/ManipulationHandler.cs index ad5aa676..1fe75f89 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/Input/Handlers/ManipulationHandler.cs +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/Input/Handlers/ManipulationHandler.cs @@ -525,7 +525,7 @@ public Collider Collider /// /// The current valid layer mask for any associated pointers when interacting with this object. /// - protected LayerMask[] LayerMasks => PrimaryPointer?.PrioritizedLayerMasksOverride ?? MixedRealityToolkit.InputSystem.FocusProvider.FocusLayerMasks; + protected LayerMask[] LayerMasks => PrimaryPointer?.PointerRaycastLayerMasksOverride ?? MixedRealityToolkit.InputSystem.FocusProvider.GlobalPointerRaycastLayerMasks; #endregion Properties diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/BaseControllerPointer.cs b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/BaseControllerPointer.cs index 0a52fb66..0e4bbd0b 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/BaseControllerPointer.cs +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/BaseControllerPointer.cs @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. +// Copyright (c) XRTK. All rights reserved. // Licensed under the MIT License. See LICENSE in the project root for license information. using System; @@ -9,6 +9,7 @@ using XRTK.Definitions.Physics; using XRTK.EventDatum.Input; using XRTK.EventDatum.Teleport; +using XRTK.Extensions.XRTK.Extensions; using XRTK.Interfaces.InputSystem; using XRTK.Interfaces.InputSystem.Handlers; using XRTK.Interfaces.Physics; @@ -78,6 +79,8 @@ public abstract class BaseControllerPointer : ControllerPoseSynchronizer, private bool lateRegisterTeleport = true; + private GameObject capturedNearInteractionObject = null; + /// /// The forward direction of the targeting ray /// @@ -153,7 +156,7 @@ protected override async void Start() } catch (Exception e) { - Debug.LogError($"{e.ToString()}"); + Debug.LogError(e); return; } @@ -173,6 +176,36 @@ protected override async void Start() } } + protected virtual void OnCollisionEnter(Collision other) + { + if (nearInteractionCollider != null && + other.IsValidCollision(PointerRaycastLayerMasksOverride ?? + MixedRealityToolkit.InputSystem.FocusProvider.GlobalPointerRaycastLayerMasks)) + { + capturedNearInteractionObject = other.gameObject; + MixedRealityToolkit.InputSystem.RaiseOnInputDown(InputSourceParent, Handedness, pointerAction); + } + } + + protected virtual void OnCollisionStay(Collision other) + { + if (nearInteractionCollider != null && + capturedNearInteractionObject == other.gameObject) + { + MixedRealityToolkit.InputSystem.RaiseOnInputPressed(InputSourceParent, Handedness, pointerAction); + } + } + + protected virtual void OnCollisionExit(Collision other) + { + if (nearInteractionCollider != null && + capturedNearInteractionObject == other.gameObject) + { + capturedNearInteractionObject = null; + MixedRealityToolkit.InputSystem.RaiseOnInputUp(InputSourceParent, Handedness, pointerAction); + } + } + protected override void OnDisable() { base.OnDisable(); @@ -257,6 +290,16 @@ public ICursorModifier CursorModifier /// public IMixedRealityTeleportHotSpot TeleportHotSpot { get; set; } + [SerializeField] + private Collider nearInteractionCollider = null; + + /// + public Collider NearInteractionCollider + { + get => nearInteractionCollider; + protected set => nearInteractionCollider = value; + } + /// public virtual bool IsInteractionEnabled { @@ -386,7 +429,6 @@ public float PointerExtent [Min(0.01f)] [SerializeField] - [FormerlySerializedAs("pointerExtent")] private float defaultPointerExtent = 10f; /// @@ -396,7 +438,7 @@ public float PointerExtent public RayStep[] Rays { get; protected set; } = { new RayStep(Vector3.zero, Vector3.forward) }; /// - public LayerMask[] PrioritizedLayerMasksOverride { get; set; } = null; + public LayerMask[] PointerRaycastLayerMasksOverride { get; set; } = null; /// public IMixedRealityFocusHandler FocusHandler { get; set; } @@ -465,11 +507,6 @@ public virtual bool TryGetPointerRotation(out Quaternion rotation) #region IEquality Implementation - private static bool Equals(IMixedRealityPointer left, IMixedRealityPointer right) - { - return left.Equals(right); - } - /// bool IEqualityComparer.Equals(object left, object right) { @@ -479,11 +516,10 @@ bool IEqualityComparer.Equals(object left, object right) /// public override bool Equals(object obj) { - if (ReferenceEquals(null, obj)) { return false; } + if (obj is null) { return false; } + if (this == null) { return false; } if (ReferenceEquals(this, obj)) { return true; } - if (obj.GetType() != GetType()) { return false; } - - return Equals((IMixedRealityPointer)obj); + return obj.GetType() == GetType() && Equals((IMixedRealityPointer)obj); } private bool Equals(IMixedRealityPointer other) From dd27aaf66cac07fd58e4144761081b99235f73a2 Mon Sep 17 00:00:00 2001 From: Stephen Hodgson Date: Mon, 4 May 2020 09:28:25 -0400 Subject: [PATCH 22/78] removed unused reference --- .../Features/UX/Scripts/Pointers/BaseControllerPointer.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/BaseControllerPointer.cs b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/BaseControllerPointer.cs index 0e4bbd0b..de832dc6 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/BaseControllerPointer.cs +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/BaseControllerPointer.cs @@ -4,7 +4,6 @@ using System; using System.Collections; using UnityEngine; -using UnityEngine.Serialization; using XRTK.Definitions.InputSystem; using XRTK.Definitions.Physics; using XRTK.EventDatum.Input; From f56cbc12cfc99ec967bb54f80d61671a6f7e131f Mon Sep 17 00:00:00 2001 From: Dino Fejzagic Date: Tue, 5 May 2020 20:56:58 +0200 Subject: [PATCH 23/78] Update BaseControllerPointerInspector.cs (#175) --- .../Editor/UX/Pointers/BaseControllerPointerInspector.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Editor/UX/Pointers/BaseControllerPointerInspector.cs b/XRTK.SDK/Packages/com.xrtk.sdk/Editor/UX/Pointers/BaseControllerPointerInspector.cs index dc14898c..0ac6fd64 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Editor/UX/Pointers/BaseControllerPointerInspector.cs +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Editor/UX/Pointers/BaseControllerPointerInspector.cs @@ -24,6 +24,7 @@ public class BaseControllerPointerInspector : ControllerPoseSynchronizerInspecto private SerializedProperty pointerOrientation; private SerializedProperty requiresHoldAction; private SerializedProperty enablePointerOnStart; + private SerializedProperty nearInteractionCollider; protected bool DrawBasePointerActions = true; @@ -41,6 +42,7 @@ protected override void OnEnable() pointerOrientation = serializedObject.FindProperty(nameof(pointerOrientation)); requiresHoldAction = serializedObject.FindProperty(nameof(requiresHoldAction)); enablePointerOnStart = serializedObject.FindProperty(nameof(enablePointerOnStart)); + nearInteractionCollider = serializedObject.FindProperty(nameof(nearInteractionCollider)); DrawHandednessProperty = false; } @@ -60,6 +62,7 @@ public override void OnInspectorGUI() EditorGUILayout.PropertyField(setCursorVisibilityOnSourceDetected); EditorGUILayout.PropertyField(enablePointerOnStart); EditorGUILayout.PropertyField(raycastOrigin); + EditorGUILayout.PropertyField(nearInteractionCollider); EditorGUILayout.PropertyField(defaultPointerExtent); EditorGUILayout.PropertyField(pointerOrientation); EditorGUILayout.PropertyField(pointerAction); @@ -80,4 +83,4 @@ public override void OnInspectorGUI() serializedObject.ApplyModifiedProperties(); } } -} \ No newline at end of file +} From cd41e35eb481d7177e48bf81c1208e950f38644a Mon Sep 17 00:00:00 2001 From: Dino Fejzagic Date: Sat, 9 May 2020 08:17:59 +0200 Subject: [PATCH 24/78] Update index finger pose mapping for hands --- ...xFingerPoseInteractionMappingProfile.asset | 11 +++++---- .../MixedRealityInputActionsProfile.asset | 4 ++++ .../HandControllerNearPointerProfile.asset | 23 +++++++++++++++++++ ...andControllerNearPointerProfile.asset.meta | 8 +++++++ 4 files changed, 41 insertions(+), 5 deletions(-) create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/Pointers/HandControllerNearPointerProfile.asset create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/Pointers/HandControllerNearPointerProfile.asset.meta diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandIndexFingerPoseInteractionMappingProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandIndexFingerPoseInteractionMappingProfile.asset index 05b98522..c91474a8 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandIndexFingerPoseInteractionMappingProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandIndexFingerPoseInteractionMappingProfile.asset @@ -18,13 +18,14 @@ MonoBehaviour: axisType: 7 inputType: 33 inputAction: - profileGuid: 00000000000000000000000000000000 - id: 0 - description: None - axisConstraint: 0 + profileGuid: 399335ccc89c4d12b79f3539ca7771db + id: 15 + description: Index Finger Pose + axisConstraint: 7 keyCode: 0 inputName: axisCodeX: axisCodeY: inputProcessors: [] - pointerProfiles: [] + pointerProfiles: + - {fileID: 11400000, guid: 57fc2b172a8871344b147342d8444217, type: 2} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/MixedRealityInputActionsProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/MixedRealityInputActionsProfile.asset index b041860e..247124b4 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/MixedRealityInputActionsProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/MixedRealityInputActionsProfile.asset @@ -69,3 +69,7 @@ MonoBehaviour: id: 14 description: Rotation Direction axisConstraint: 4 + - profileGuid: 399335ccc89c4d12b79f3539ca7771db + id: 15 + description: Index Finger Pose + axisConstraint: 7 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/Pointers/HandControllerNearPointerProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/Pointers/HandControllerNearPointerProfile.asset new file mode 100644 index 00000000..ad9ef039 --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/Pointers/HandControllerNearPointerProfile.asset @@ -0,0 +1,23 @@ +%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: c156ea3e1a7a493dac236ed84c4a819a, type: 3} + m_Name: HandControllerNearPointerProfile + m_EditorClassIdentifier: + pointerPrefab: {fileID: 1247086986094436, guid: 6afb18f878e375741bf9f53520baedf2, + type: 3} + pointingExtent: 10 + pointingRaycastLayerMasks: + - serializedVersion: 2 + m_Bits: 4294967291 + drawDebugPointingRays: 0 + debugPointingRayColors: + - {r: 0, g: 1, b: 0, a: 1} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/Pointers/HandControllerNearPointerProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/Pointers/HandControllerNearPointerProfile.asset.meta new file mode 100644 index 00000000..f81823ed --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/Pointers/HandControllerNearPointerProfile.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 57fc2b172a8871344b147342d8444217 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: From 8ae654541e21805450121a03847f86f7c28ae9f5 Mon Sep 17 00:00:00 2001 From: Dino Fejzagic Date: Sat, 9 May 2020 08:18:42 +0200 Subject: [PATCH 25/78] Use triggers instead of physics colliders --- .../Features/UX/Scripts/Pointers/BaseControllerPointer.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/BaseControllerPointer.cs b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/BaseControllerPointer.cs index de832dc6..663782e4 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/BaseControllerPointer.cs +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/BaseControllerPointer.cs @@ -175,7 +175,7 @@ protected override async void Start() } } - protected virtual void OnCollisionEnter(Collision other) + protected virtual void OnTriggerEnter(Collider other) { if (nearInteractionCollider != null && other.IsValidCollision(PointerRaycastLayerMasksOverride ?? @@ -186,7 +186,7 @@ protected virtual void OnCollisionEnter(Collision other) } } - protected virtual void OnCollisionStay(Collision other) + protected virtual void OnTriggerStay(Collider other) { if (nearInteractionCollider != null && capturedNearInteractionObject == other.gameObject) @@ -195,7 +195,7 @@ protected virtual void OnCollisionStay(Collision other) } } - protected virtual void OnCollisionExit(Collision other) + protected virtual void OnTriggerExit(Collider other) { if (nearInteractionCollider != null && capturedNearInteractionObject == other.gameObject) From d5594bdff7032c6b67a0632b6d859adce4487c73 Mon Sep 17 00:00:00 2001 From: Dino Fejzagic Date: Sat, 9 May 2020 08:27:34 +0200 Subject: [PATCH 26/78] Update BaseControllerPointer.cs --- .../Features/UX/Scripts/Pointers/BaseControllerPointer.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/BaseControllerPointer.cs b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/BaseControllerPointer.cs index de832dc6..b5bebc14 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/BaseControllerPointer.cs +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/BaseControllerPointer.cs @@ -1,4 +1,4 @@ -// Copyright (c) XRTK. All rights reserved. +// Copyright (c) XRTK. All rights reserved. // Licensed under the MIT License. See LICENSE in the project root for license information. using System; @@ -175,7 +175,7 @@ protected override async void Start() } } - protected virtual void OnCollisionEnter(Collision other) + protected virtual void OnTriggerEnter(Collider other) { if (nearInteractionCollider != null && other.IsValidCollision(PointerRaycastLayerMasksOverride ?? @@ -186,7 +186,7 @@ protected virtual void OnCollisionEnter(Collision other) } } - protected virtual void OnCollisionStay(Collision other) + protected virtual void OnTriggerStay(Collider other) { if (nearInteractionCollider != null && capturedNearInteractionObject == other.gameObject) @@ -195,7 +195,7 @@ protected virtual void OnCollisionStay(Collision other) } } - protected virtual void OnCollisionExit(Collision other) + protected virtual void OnTriggerExit(Collider other) { if (nearInteractionCollider != null && capturedNearInteractionObject == other.gameObject) From 10c72d6ae5b77ae11b130c62b6b3af8521c830e5 Mon Sep 17 00:00:00 2001 From: Dino Fejzagic Date: Sat, 9 May 2020 15:43:30 +0200 Subject: [PATCH 27/78] Create hand near poniter prefab (temp?) --- .../UX/Pointers/SurfaceTouchPointer.prefab | 104 ++++++++++++++++++ .../Pointers/SurfaceTouchPointer.prefab.meta | 8 ++ .../HandControllerNearPointerProfile.asset | 2 +- .../Scripts/Pointers/SurfaceTouchPointer.cs | 16 +++ .../Pointers/SurfaceTouchPointer.cs.meta | 11 ++ 5 files changed, 140 insertions(+), 1 deletion(-) create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/SurfaceTouchPointer.prefab create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/SurfaceTouchPointer.prefab.meta create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/SurfaceTouchPointer.cs create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/SurfaceTouchPointer.cs.meta diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/SurfaceTouchPointer.prefab b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/SurfaceTouchPointer.prefab new file mode 100644 index 00000000..6a6cfd26 --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/SurfaceTouchPointer.prefab @@ -0,0 +1,104 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1247086986094436 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4215223911988956} + - component: {fileID: 3992546869686969999} + - component: {fileID: 393477741524359060} + - component: {fileID: 8484670041705914173} + m_Layer: 0 + m_Name: SurfaceTouchPointer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4215223911988956 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1247086986094436} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3992546869686969999 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1247086986094436} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cf31a69c011196e4284aa3715a1e20a4, type: 3} + m_Name: + m_EditorClassIdentifier: + handedness: 1 + destroyOnSourceLost: 1 + useSourcePoseData: 0 + poseAction: + profileGuid: 399335ccc89c4d12b79f3539ca7771db + id: 15 + description: Index Finger Pose + axisConstraint: 7 + cursorPrefab: {fileID: 0} + disableCursorOnStart: 0 + setCursorVisibilityOnSourceDetected: 0 + raycastOrigin: {fileID: 0} + activeHoldAction: + profileGuid: 00000000000000000000000000000000 + id: 0 + description: None + axisConstraint: 0 + pointerAction: + profileGuid: 00000000000000000000000000000000 + id: 0 + description: None + axisConstraint: 0 + requiresHoldAction: 0 + enablePointerOnStart: 1 + nearInteractionCollider: {fileID: 393477741524359060} + overrideGlobalPointerExtent: 1 + defaultPointerExtent: 0.05 + pointerOrientation: 0 +--- !u!135 &393477741524359060 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1247086986094436} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.01 + m_Center: {x: 0, y: 0, z: 0} +--- !u!54 &8484670041705914173 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1247086986094436} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/SurfaceTouchPointer.prefab.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/SurfaceTouchPointer.prefab.meta new file mode 100644 index 00000000..c5ba8e67 --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/SurfaceTouchPointer.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f143e0104678be940bc5579e8fd02b9a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/Pointers/HandControllerNearPointerProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/Pointers/HandControllerNearPointerProfile.asset index ad9ef039..5f1ae2d5 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/Pointers/HandControllerNearPointerProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/Pointers/HandControllerNearPointerProfile.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c156ea3e1a7a493dac236ed84c4a819a, type: 3} m_Name: HandControllerNearPointerProfile m_EditorClassIdentifier: - pointerPrefab: {fileID: 1247086986094436, guid: 6afb18f878e375741bf9f53520baedf2, + pointerPrefab: {fileID: 1247086986094436, guid: f143e0104678be940bc5579e8fd02b9a, type: 3} pointingExtent: 10 pointingRaycastLayerMasks: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/SurfaceTouchPointer.cs b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/SurfaceTouchPointer.cs new file mode 100644 index 00000000..275adee7 --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/SurfaceTouchPointer.cs @@ -0,0 +1,16 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See LICENSE in the project root for license information. + +using UnityEngine; +using XRTK.Definitions.Physics; + +namespace XRTK.SDK.UX.Pointers +{ + /// + /// A pointer for touching surfaces in 3D space. + /// + public class SurfaceTouchPointer : BaseControllerPointer + { + + } +} \ No newline at end of file diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/SurfaceTouchPointer.cs.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/SurfaceTouchPointer.cs.meta new file mode 100644 index 00000000..9781903b --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/SurfaceTouchPointer.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: cf31a69c011196e4284aa3715a1e20a4 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {fileID: 2800000, guid: 08c0fd91bdca45afa09ec64323cf3848, type: 3} + userData: + assetBundleName: + assetBundleVariant: From 96658843f2a407b153b6276d46a396a2b2437cca Mon Sep 17 00:00:00 2001 From: Stephen Hodgson Date: Sat, 9 May 2020 11:41:07 -0400 Subject: [PATCH 28/78] only raise pointer events if we have a valid pointer target --- .../Features/UX/Scripts/Pointers/BaseControllerPointer.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/BaseControllerPointer.cs b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/BaseControllerPointer.cs index dae20da2..d66df2a2 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/BaseControllerPointer.cs +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/BaseControllerPointer.cs @@ -580,6 +580,8 @@ public override void OnInputUp(InputEventData eventData) { base.OnInputUp(eventData); + if (Result.CurrentPointerTarget == null) { return; } + if (eventData.SourceId == InputSourceParent.SourceId) { if (requiresHoldAction && eventData.MixedRealityInputAction == activeHoldAction) @@ -601,6 +603,8 @@ public override void OnInputDown(InputEventData eventData) { base.OnInputDown(eventData); + if (Result.CurrentPointerTarget == null) { return; } + if (eventData.SourceId == InputSourceParent.SourceId) { if (requiresHoldAction && eventData.MixedRealityInputAction == activeHoldAction) From 28c552c5ec2c97d6b20467061fd3e979aa8ad5cf Mon Sep 17 00:00:00 2001 From: Stephen Hodgson Date: Sat, 9 May 2020 11:44:45 -0400 Subject: [PATCH 29/78] revert --- .../Features/UX/Scripts/Pointers/BaseControllerPointer.cs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/BaseControllerPointer.cs b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/BaseControllerPointer.cs index d66df2a2..dae20da2 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/BaseControllerPointer.cs +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/BaseControllerPointer.cs @@ -580,8 +580,6 @@ public override void OnInputUp(InputEventData eventData) { base.OnInputUp(eventData); - if (Result.CurrentPointerTarget == null) { return; } - if (eventData.SourceId == InputSourceParent.SourceId) { if (requiresHoldAction && eventData.MixedRealityInputAction == activeHoldAction) @@ -603,8 +601,6 @@ public override void OnInputDown(InputEventData eventData) { base.OnInputDown(eventData); - if (Result.CurrentPointerTarget == null) { return; } - if (eventData.SourceId == InputSourceParent.SourceId) { if (requiresHoldAction && eventData.MixedRealityInputAction == activeHoldAction) From da98884826dfea7ee11e476f3ab96df8dca94e17 Mon Sep 17 00:00:00 2001 From: Dino Fejzagic Date: Sat, 9 May 2020 17:59:54 +0200 Subject: [PATCH 30/78] Delete surface touch prefab --- .../Prefabs~/UX/Pointers/NearPointer.prefab | 583 ++++++++++++++++++ ...er.prefab.meta => NearPointer.prefab.meta} | 2 +- .../UX/Pointers/SurfaceTouchPointer.prefab | 104 ---- 3 files changed, 584 insertions(+), 105 deletions(-) create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/NearPointer.prefab rename XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/{SurfaceTouchPointer.prefab.meta => NearPointer.prefab.meta} (79%) delete mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/SurfaceTouchPointer.prefab diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/NearPointer.prefab b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/NearPointer.prefab new file mode 100644 index 00000000..5432ff7c --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/NearPointer.prefab @@ -0,0 +1,583 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1247086986094436 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4215223911988956} + - component: {fileID: 6863193991115524521} + - component: {fileID: 1307499967629831868} + - component: {fileID: 2507312044101632756} + - component: {fileID: 3080660041806603478} + - component: {fileID: 1526809385130449531} + - component: {fileID: 1086284894102221750} + - component: {fileID: 8469257271998696798} + m_Layer: 0 + m_Name: NearPointer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4215223911988956 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1247086986094436} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6863193991115524521 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1247086986094436} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c85a4527bbdd25647a62ec06e8d2daf3, type: 3} + m_Name: + m_EditorClassIdentifier: + lineStartClamp: 0.0001 + lineEndClamp: 0.9999 + customLineTransform: {fileID: 0} + loops: 0 + transformMode: 1 + rotationMode: 1 + flipUpVector: 0 + originOffset: {x: 0, y: 0, z: 0} + manualUpVectorBlend: 0 + manualUpVectors: + - {x: 0, y: 1, z: 0} + - {x: 0, y: 1, z: 0} + - {x: 0, y: 1, z: 0} + velocitySearchRange: 0.02 + distorters: + - {fileID: 1307499967629831868} + distortionMode: 0 + distortionStrength: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + uniformDistortionStrength: 1 + inertia: + inertia: 10 + dampen: 6 + seekTargetStrength: 1.5 + p1Target: {x: 0, y: 0, z: 0.33} + p2Target: {x: 0, y: 0, z: 0.66} + controlPoints: + Point1: {x: 0, y: 0, z: 0} + Point2: {x: 0, y: 0, z: 0.33} + Point3: {x: 0, y: 0, z: 0.66} + Point4: {x: 0, y: 0, z: 1} + useLocalTangentPoints: 0 +--- !u!114 &1307499967629831868 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1247086986094436} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 61988acbae5840069797ec6d990d8f50, type: 3} + m_Name: + m_EditorClassIdentifier: + distortOrder: 0 + distortStrength: 1 + localCenterOfGravity: {x: 0, y: 0, z: 0} + axisStrength: {x: 1, y: 1, z: 1} + radius: 0.5 + gravityStrength: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!114 &2507312044101632756 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1247086986094436} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5757f43d086c4d228b8793da4f53aba3, type: 3} + m_Name: + m_EditorClassIdentifier: + handedness: 1 + destroyOnSourceLost: 1 + useSourcePoseData: 0 + poseAction: + profileGuid: 399335ccc89c4d12b79f3539ca7771db + id: 15 + description: Index Finger Pose + axisConstraint: 7 + cursorPrefab: {fileID: 0} + disableCursorOnStart: 0 + setCursorVisibilityOnSourceDetected: 0 + raycastOrigin: {fileID: 0} + activeHoldAction: + profileGuid: 00000000000000000000000000000000 + id: 0 + description: None + axisConstraint: 0 + pointerAction: + profileGuid: 399335ccc89c4d12b79f3539ca7771db + id: 1 + description: Select + axisConstraint: 2 + requiresHoldAction: 0 + enablePointerOnStart: 0 + nearInteractionCollider: {fileID: 1086284894102221750} + overrideGlobalPointerExtent: 0 + defaultPointerExtent: 0.5 + pointerOrientation: 0 + lineColorSelected: + serializedVersion: 2 + key0: {r: 0.8490566, g: 0.8490566, b: 0.8490566, a: 0} + key1: {r: 0.8490566, g: 0.8490566, b: 0.8490566, a: 0} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 65535 + atime3: 65535 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + lineColorValid: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 0} + key1: {r: 0.14122522, g: 1, b: 0, a: 1} + key2: {r: 0, g: 0, b: 0, a: 1} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 3277 + atime2: 49151 + atime3: 65535 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 4 + lineColorInvalid: + serializedVersion: 2 + key0: {r: 0.8490566, g: 0.8490566, b: 0.8490566, a: 0} + key1: {r: 0.8490566, g: 0.8490566, b: 0.8490566, a: 0} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 65535 + atime3: 65535 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + lineColorNoTarget: + serializedVersion: 2 + key0: {r: 0.8490566, g: 0.8490566, b: 0.8490566, a: 0} + key1: {r: 0.8490566, g: 0.8490566, b: 0.8490566, a: 0} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 65535 + atime3: 65535 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + lineColorLockFocus: + serializedVersion: 2 + key0: {r: 0.8490566, g: 0.8490566, b: 0.8490566, a: 0} + key1: {r: 0.8490566, g: 0.8490566, b: 0.8490566, a: 0} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 65535 + atime3: 65535 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + lineCastResolution: 2 + lineBase: {fileID: 6863193991115524521} + lineRenderers: + - {fileID: 1526809385130449531} +--- !u!120 &3080660041806603478 +LineRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1247086986094436} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 0 + m_MotionVectors: 0 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 49bbec7a7ebd47c786bf06ad0977ec1c, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Positions: + - {x: 0, y: 0, z: 0.00009899999} + - {x: 0, y: 0, z: 0.06608878} + - {x: 0, y: 0, z: 0.13209635} + - {x: 0, y: 0, z: 0.19813946} + - {x: 0, y: 0, z: 0.26423594} + - {x: 0, y: 0, z: 0.3304035} + - {x: 0, y: 0, z: 0.3966599} + - {x: 0, y: 0, z: 0.46302295} + - {x: 0, y: 0, z: 0.52951044} + - {x: 0, y: 0, z: 0.59614} + - {x: 0, y: 0, z: 0.66292953} + - {x: 0, y: 0, z: 0.7298968} + - {x: 0, y: 0, z: 0.7970595} + - {x: 0, y: 0, z: 0.8644354} + - {x: 0, y: 0, z: 0.93204236} + - {x: 0, y: 0, z: 0.999898} + m_Parameters: + serializedVersion: 3 + widthMultiplier: 0.01 + widthCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.2 + inSlope: 0 + outSlope: 0 + tangentMode: 34 + weightedMode: 0 + inWeight: 0 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0.2 + inSlope: 0 + outSlope: 0 + tangentMode: 34 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + colorGradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 0} + key1: {r: 0.4716981, g: 0.4716981, b: 0.4716981, a: 1} + key2: {r: 0, g: 0, b: 0, a: 1} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 1} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 9638 + atime2: 53970 + atime3: 65535 + atime4: 65535 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 4 + numCornerVertices: 8 + numCapVertices: 8 + alignment: 0 + textureMode: 3 + shadowBias: 0 + generateLightingData: 0 + m_UseWorldSpace: 1 + m_Loop: 0 +--- !u!114 &1526809385130449531 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1247086986094436} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 01f6e868e3234547a04741fe2c20bd0d, type: 3} + m_Name: + m_EditorClassIdentifier: + lineDataSource: {fileID: 6863193991115524521} + lineColor: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 0} + key1: {r: 0.4716981, g: 0.4716981, b: 0.4716981, a: 1} + key2: {r: 0, g: 0, b: 0, a: 1} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 1} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 9638 + atime2: 53970 + atime3: 65535 + atime4: 65535 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 4 + lineWidth: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.2 + inSlope: 0 + outSlope: 0 + tangentMode: 34 + weightedMode: 0 + inWeight: 0 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0.2 + inSlope: 0 + outSlope: 0 + tangentMode: 34 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + widthMultiplier: 0.01 + colorOffset: 0 + widthOffset: 0 + stepMode: 0 + lineStepCount: 16 + pointDistributionMode: 1 + customPointDistributionLength: 0.1 + customPointDistributionCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 1 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 1 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + lineMaterial: {fileID: 2100000, guid: 49bbec7a7ebd47c786bf06ad0977ec1c, type: 2} + roundedEdges: 1 + roundedCaps: 1 + lineRenderer: {fileID: 3080660041806603478} +--- !u!135 &1086284894102221750 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1247086986094436} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.01 + m_Center: {x: 0, y: 0, z: 0} +--- !u!54 &8469257271998696798 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1247086986094436} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 2 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/SurfaceTouchPointer.prefab.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/NearPointer.prefab.meta similarity index 79% rename from XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/SurfaceTouchPointer.prefab.meta rename to XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/NearPointer.prefab.meta index c5ba8e67..72de9a47 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/SurfaceTouchPointer.prefab.meta +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/NearPointer.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f143e0104678be940bc5579e8fd02b9a +guid: cbcbde03df75adf4ea8aa23a9ba2b3b0 NativeFormatImporter: externalObjects: {} mainObjectFileID: 100100000 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/SurfaceTouchPointer.prefab b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/SurfaceTouchPointer.prefab deleted file mode 100644 index 6a6cfd26..00000000 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/SurfaceTouchPointer.prefab +++ /dev/null @@ -1,104 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &1247086986094436 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4215223911988956} - - component: {fileID: 3992546869686969999} - - component: {fileID: 393477741524359060} - - component: {fileID: 8484670041705914173} - m_Layer: 0 - m_Name: SurfaceTouchPointer - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4215223911988956 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1247086986094436} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &3992546869686969999 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1247086986094436} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cf31a69c011196e4284aa3715a1e20a4, type: 3} - m_Name: - m_EditorClassIdentifier: - handedness: 1 - destroyOnSourceLost: 1 - useSourcePoseData: 0 - poseAction: - profileGuid: 399335ccc89c4d12b79f3539ca7771db - id: 15 - description: Index Finger Pose - axisConstraint: 7 - cursorPrefab: {fileID: 0} - disableCursorOnStart: 0 - setCursorVisibilityOnSourceDetected: 0 - raycastOrigin: {fileID: 0} - activeHoldAction: - profileGuid: 00000000000000000000000000000000 - id: 0 - description: None - axisConstraint: 0 - pointerAction: - profileGuid: 00000000000000000000000000000000 - id: 0 - description: None - axisConstraint: 0 - requiresHoldAction: 0 - enablePointerOnStart: 1 - nearInteractionCollider: {fileID: 393477741524359060} - overrideGlobalPointerExtent: 1 - defaultPointerExtent: 0.05 - pointerOrientation: 0 ---- !u!135 &393477741524359060 -SphereCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1247086986094436} - m_Material: {fileID: 0} - m_IsTrigger: 1 - m_Enabled: 1 - serializedVersion: 2 - m_Radius: 0.01 - m_Center: {x: 0, y: 0, z: 0} ---- !u!54 &8484670041705914173 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1247086986094436} - serializedVersion: 2 - m_Mass: 1 - m_Drag: 0 - m_AngularDrag: 0.05 - m_UseGravity: 0 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 0 From 36f4f69ae7a147a8c63c6bda434464d9c98bbb79 Mon Sep 17 00:00:00 2001 From: Dino Fejzagic Date: Sat, 9 May 2020 18:37:11 +0200 Subject: [PATCH 31/78] Create near pointer prefab variant --- .../Prefabs~/UX/Pointers/NearPointer.prefab | 954 +++++++----------- .../UX/Pointers/NearPointer.prefab.meta | 5 +- .../HandControllerNearPointerProfile.asset | 2 +- 3 files changed, 393 insertions(+), 568 deletions(-) diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/NearPointer.prefab b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/NearPointer.prefab index 5432ff7c..a6469f09 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/NearPointer.prefab +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/NearPointer.prefab @@ -1,583 +1,409 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &1247086986094436 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4215223911988956} - - component: {fileID: 6863193991115524521} - - component: {fileID: 1307499967629831868} - - component: {fileID: 2507312044101632756} - - component: {fileID: 3080660041806603478} - - component: {fileID: 1526809385130449531} - - component: {fileID: 1086284894102221750} - - component: {fileID: 8469257271998696798} - m_Layer: 0 - m_Name: NearPointer - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4215223911988956 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1247086986094436} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &6863193991115524521 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1247086986094436} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c85a4527bbdd25647a62ec06e8d2daf3, type: 3} - m_Name: - m_EditorClassIdentifier: - lineStartClamp: 0.0001 - lineEndClamp: 0.9999 - customLineTransform: {fileID: 0} - loops: 0 - transformMode: 1 - rotationMode: 1 - flipUpVector: 0 - originOffset: {x: 0, y: 0, z: 0} - manualUpVectorBlend: 0 - manualUpVectors: - - {x: 0, y: 1, z: 0} - - {x: 0, y: 1, z: 0} - - {x: 0, y: 1, z: 0} - velocitySearchRange: 0.02 - distorters: - - {fileID: 1307499967629831868} - distortionMode: 0 - distortionStrength: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - uniformDistortionStrength: 1 - inertia: - inertia: 10 - dampen: 6 - seekTargetStrength: 1.5 - p1Target: {x: 0, y: 0, z: 0.33} - p2Target: {x: 0, y: 0, z: 0.66} - controlPoints: - Point1: {x: 0, y: 0, z: 0} - Point2: {x: 0, y: 0, z: 0.33} - Point3: {x: 0, y: 0, z: 0.66} - Point4: {x: 0, y: 0, z: 1} - useLocalTangentPoints: 0 ---- !u!114 &1307499967629831868 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1247086986094436} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 61988acbae5840069797ec6d990d8f50, type: 3} - m_Name: - m_EditorClassIdentifier: - distortOrder: 0 - distortStrength: 1 - localCenterOfGravity: {x: 0, y: 0, z: 0} - axisStrength: {x: 1, y: 1, z: 1} - radius: 0.5 - gravityStrength: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 ---- !u!114 &2507312044101632756 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1247086986094436} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5757f43d086c4d228b8793da4f53aba3, type: 3} - m_Name: - m_EditorClassIdentifier: - handedness: 1 - destroyOnSourceLost: 1 - useSourcePoseData: 0 - poseAction: - profileGuid: 399335ccc89c4d12b79f3539ca7771db - id: 15 - description: Index Finger Pose - axisConstraint: 7 - cursorPrefab: {fileID: 0} - disableCursorOnStart: 0 - setCursorVisibilityOnSourceDetected: 0 - raycastOrigin: {fileID: 0} - activeHoldAction: - profileGuid: 00000000000000000000000000000000 - id: 0 - description: None - axisConstraint: 0 - pointerAction: - profileGuid: 399335ccc89c4d12b79f3539ca7771db - id: 1 - description: Select - axisConstraint: 2 - requiresHoldAction: 0 - enablePointerOnStart: 0 - nearInteractionCollider: {fileID: 1086284894102221750} - overrideGlobalPointerExtent: 0 - defaultPointerExtent: 0.5 - pointerOrientation: 0 - lineColorSelected: - serializedVersion: 2 - key0: {r: 0.8490566, g: 0.8490566, b: 0.8490566, a: 0} - key1: {r: 0.8490566, g: 0.8490566, b: 0.8490566, a: 0} - key2: {r: 0, g: 0, b: 0, a: 0} - key3: {r: 0, g: 0, b: 0, a: 0} - key4: {r: 0, g: 0, b: 0, a: 0} - key5: {r: 0, g: 0, b: 0, a: 0} - key6: {r: 0, g: 0, b: 0, a: 0} - key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 - ctime1: 65535 - ctime2: 0 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 65535 - atime2: 65535 - atime3: 65535 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_Mode: 0 - m_NumColorKeys: 2 - m_NumAlphaKeys: 2 - lineColorValid: - serializedVersion: 2 - key0: {r: 1, g: 1, b: 1, a: 0} - key1: {r: 0.14122522, g: 1, b: 0, a: 1} - key2: {r: 0, g: 0, b: 0, a: 1} - key3: {r: 0, g: 0, b: 0, a: 0} - key4: {r: 0, g: 0, b: 0, a: 0} - key5: {r: 0, g: 0, b: 0, a: 0} - key6: {r: 0, g: 0, b: 0, a: 0} - key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 - ctime1: 65535 - ctime2: 0 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 3277 - atime2: 49151 - atime3: 65535 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_Mode: 0 - m_NumColorKeys: 2 - m_NumAlphaKeys: 4 - lineColorInvalid: - serializedVersion: 2 - key0: {r: 0.8490566, g: 0.8490566, b: 0.8490566, a: 0} - key1: {r: 0.8490566, g: 0.8490566, b: 0.8490566, a: 0} - key2: {r: 0, g: 0, b: 0, a: 0} - key3: {r: 0, g: 0, b: 0, a: 0} - key4: {r: 0, g: 0, b: 0, a: 0} - key5: {r: 0, g: 0, b: 0, a: 0} - key6: {r: 0, g: 0, b: 0, a: 0} - key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 - ctime1: 65535 - ctime2: 0 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 65535 - atime2: 65535 - atime3: 65535 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_Mode: 0 - m_NumColorKeys: 2 - m_NumAlphaKeys: 2 - lineColorNoTarget: - serializedVersion: 2 - key0: {r: 0.8490566, g: 0.8490566, b: 0.8490566, a: 0} - key1: {r: 0.8490566, g: 0.8490566, b: 0.8490566, a: 0} - key2: {r: 0, g: 0, b: 0, a: 0} - key3: {r: 0, g: 0, b: 0, a: 0} - key4: {r: 0, g: 0, b: 0, a: 0} - key5: {r: 0, g: 0, b: 0, a: 0} - key6: {r: 0, g: 0, b: 0, a: 0} - key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 - ctime1: 65535 - ctime2: 0 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 65535 - atime2: 65535 - atime3: 65535 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_Mode: 0 - m_NumColorKeys: 2 - m_NumAlphaKeys: 2 - lineColorLockFocus: - serializedVersion: 2 - key0: {r: 0.8490566, g: 0.8490566, b: 0.8490566, a: 0} - key1: {r: 0.8490566, g: 0.8490566, b: 0.8490566, a: 0} - key2: {r: 0, g: 0, b: 0, a: 0} - key3: {r: 0, g: 0, b: 0, a: 0} - key4: {r: 0, g: 0, b: 0, a: 0} - key5: {r: 0, g: 0, b: 0, a: 0} - key6: {r: 0, g: 0, b: 0, a: 0} - key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 - ctime1: 65535 - ctime2: 0 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 65535 - atime2: 65535 - atime3: 65535 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_Mode: 0 - m_NumColorKeys: 2 - m_NumAlphaKeys: 2 - lineCastResolution: 2 - lineBase: {fileID: 6863193991115524521} - lineRenderers: - - {fileID: 1526809385130449531} ---- !u!120 &3080660041806603478 -LineRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1247086986094436} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 0 - m_MotionVectors: 0 - m_LightProbeUsage: 0 - m_ReflectionProbeUsage: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 49bbec7a7ebd47c786bf06ad0977ec1c, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Positions: - - {x: 0, y: 0, z: 0.00009899999} - - {x: 0, y: 0, z: 0.06608878} - - {x: 0, y: 0, z: 0.13209635} - - {x: 0, y: 0, z: 0.19813946} - - {x: 0, y: 0, z: 0.26423594} - - {x: 0, y: 0, z: 0.3304035} - - {x: 0, y: 0, z: 0.3966599} - - {x: 0, y: 0, z: 0.46302295} - - {x: 0, y: 0, z: 0.52951044} - - {x: 0, y: 0, z: 0.59614} - - {x: 0, y: 0, z: 0.66292953} - - {x: 0, y: 0, z: 0.7298968} - - {x: 0, y: 0, z: 0.7970595} - - {x: 0, y: 0, z: 0.8644354} - - {x: 0, y: 0, z: 0.93204236} - - {x: 0, y: 0, z: 0.999898} - m_Parameters: - serializedVersion: 3 - widthMultiplier: 0.01 - widthCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0.2 - inSlope: 0 - outSlope: 0 - tangentMode: 34 - weightedMode: 0 - inWeight: 0 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0.2 - inSlope: 0 - outSlope: 0 - tangentMode: 34 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - colorGradient: - serializedVersion: 2 - key0: {r: 1, g: 1, b: 1, a: 0} - key1: {r: 0.4716981, g: 0.4716981, b: 0.4716981, a: 1} - key2: {r: 0, g: 0, b: 0, a: 1} - key3: {r: 0, g: 0, b: 0, a: 0} - key4: {r: 0, g: 0, b: 0, a: 1} - key5: {r: 0, g: 0, b: 0, a: 0} - key6: {r: 0, g: 0, b: 0, a: 0} - key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 - ctime1: 65535 - ctime2: 0 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 9638 - atime2: 53970 - atime3: 65535 - atime4: 65535 - atime5: 0 - atime6: 0 - atime7: 0 - m_Mode: 0 - m_NumColorKeys: 2 - m_NumAlphaKeys: 4 - numCornerVertices: 8 - numCapVertices: 8 - alignment: 0 - textureMode: 3 - shadowBias: 0 - generateLightingData: 0 - m_UseWorldSpace: 1 - m_Loop: 0 ---- !u!114 &1526809385130449531 -MonoBehaviour: +--- !u!54 &3826619884932593450 +Rigidbody: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1247086986094436} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 01f6e868e3234547a04741fe2c20bd0d, type: 3} - m_Name: - m_EditorClassIdentifier: - lineDataSource: {fileID: 6863193991115524521} - lineColor: - serializedVersion: 2 - key0: {r: 1, g: 1, b: 1, a: 0} - key1: {r: 0.4716981, g: 0.4716981, b: 0.4716981, a: 1} - key2: {r: 0, g: 0, b: 0, a: 1} - key3: {r: 0, g: 0, b: 0, a: 0} - key4: {r: 0, g: 0, b: 0, a: 1} - key5: {r: 0, g: 0, b: 0, a: 0} - key6: {r: 0, g: 0, b: 0, a: 0} - key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 - ctime1: 65535 - ctime2: 0 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 9638 - atime2: 53970 - atime3: 65535 - atime4: 65535 - atime5: 0 - atime6: 0 - atime7: 0 - m_Mode: 0 - m_NumColorKeys: 2 - m_NumAlphaKeys: 4 - lineWidth: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0.2 - inSlope: 0 - outSlope: 0 - tangentMode: 34 - weightedMode: 0 - inWeight: 0 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0.2 - inSlope: 0 - outSlope: 0 - tangentMode: 34 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - widthMultiplier: 0.01 - colorOffset: 0 - widthOffset: 0 - stepMode: 0 - lineStepCount: 16 - pointDistributionMode: 1 - customPointDistributionLength: 0.1 - customPointDistributionCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 1 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 1 - inSlope: 1 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - lineMaterial: {fileID: 2100000, guid: 49bbec7a7ebd47c786bf06ad0977ec1c, type: 2} - roundedEdges: 1 - roundedCaps: 1 - lineRenderer: {fileID: 3080660041806603478} ---- !u!135 &1086284894102221750 + m_GameObject: {fileID: 6198175003172875473} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 2 +--- !u!135 &-3199221569884269083 SphereCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1247086986094436} + m_GameObject: {fileID: 6198175003172875473} m_Material: {fileID: 0} m_IsTrigger: 1 m_Enabled: 1 serializedVersion: 2 m_Radius: 0.01 m_Center: {x: 0, y: 0, z: 0} ---- !u!54 &8469257271998696798 -Rigidbody: +--- !u!1001 &6197016220715994037 +PrefabInstance: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1247086986094436} serializedVersion: 2 - m_Mass: 1 - m_Drag: 0 - m_AngularDrag: 0.05 - m_UseGravity: 0 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1247086986094436, guid: 54d78dc3333741c5b7f30fe3506096ba, type: 3} + propertyPath: m_Name + value: NearPointer + objectReference: {fileID: 0} + - target: {fileID: 4215223911988956, guid: 54d78dc3333741c5b7f30fe3506096ba, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4215223911988956, guid: 54d78dc3333741c5b7f30fe3506096ba, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4215223911988956, guid: 54d78dc3333741c5b7f30fe3506096ba, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4215223911988956, guid: 54d78dc3333741c5b7f30fe3506096ba, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4215223911988956, guid: 54d78dc3333741c5b7f30fe3506096ba, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4215223911988956, guid: 54d78dc3333741c5b7f30fe3506096ba, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4215223911988956, guid: 54d78dc3333741c5b7f30fe3506096ba, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4215223911988956, guid: 54d78dc3333741c5b7f30fe3506096ba, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4215223911988956, guid: 54d78dc3333741c5b7f30fe3506096ba, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4215223911988956, guid: 54d78dc3333741c5b7f30fe3506096ba, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4215223911988956, guid: 54d78dc3333741c5b7f30fe3506096ba, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6863193991115524521, guid: 54d78dc3333741c5b7f30fe3506096ba, + type: 3} + propertyPath: controlPoints.Point2.z + value: 0.33 + objectReference: {fileID: 0} + - target: {fileID: 6863193991115524521, guid: 54d78dc3333741c5b7f30fe3506096ba, + type: 3} + propertyPath: controlPoints.Point3.z + value: 0.66 + objectReference: {fileID: 0} + - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, + type: 3} + propertyPath: lineColorLockFocus.key0.r + value: 0.8490566 + objectReference: {fileID: 0} + - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, + type: 3} + propertyPath: lineColorLockFocus.key0.g + value: 0.8490566 + objectReference: {fileID: 0} + - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, + type: 3} + propertyPath: lineColorLockFocus.key0.b + value: 0.8490566 + objectReference: {fileID: 0} + - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, + type: 3} + propertyPath: lineColorLockFocus.key1.r + value: 0.8490566 + objectReference: {fileID: 0} + - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, + type: 3} + propertyPath: lineColorLockFocus.key1.g + value: 0.8490566 + objectReference: {fileID: 0} + - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, + type: 3} + propertyPath: lineColorLockFocus.key1.b + value: 0.8490566 + objectReference: {fileID: 0} + - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, + type: 3} + propertyPath: lineColorLockFocus.key1.a + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, + type: 3} + propertyPath: lineColorLockFocus.key2.a + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, + type: 3} + propertyPath: lineColorLockFocus.atime1 + value: 65535 + objectReference: {fileID: 0} + - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, + type: 3} + propertyPath: lineColorLockFocus.atime2 + value: 65535 + objectReference: {fileID: 0} + - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, + type: 3} + propertyPath: lineColorLockFocus.m_NumAlphaKeys + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, + type: 3} + propertyPath: lineColorNoTarget.key0.r + value: 0.8490566 + objectReference: {fileID: 0} + - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, + type: 3} + propertyPath: lineColorNoTarget.key0.g + value: 0.8490566 + objectReference: {fileID: 0} + - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, + type: 3} + propertyPath: lineColorNoTarget.key0.b + value: 0.8490566 + objectReference: {fileID: 0} + - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, + type: 3} + propertyPath: lineColorNoTarget.key1.r + value: 0.8490566 + objectReference: {fileID: 0} + - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, + type: 3} + propertyPath: lineColorNoTarget.key1.g + value: 0.8490566 + objectReference: {fileID: 0} + - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, + type: 3} + propertyPath: lineColorNoTarget.key1.b + value: 0.8490566 + objectReference: {fileID: 0} + - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, + type: 3} + propertyPath: lineColorNoTarget.key1.a + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, + type: 3} + propertyPath: lineColorNoTarget.atime1 + value: 65535 + objectReference: {fileID: 0} + - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, + type: 3} + propertyPath: lineColorNoTarget.atime3 + value: 65535 + objectReference: {fileID: 0} + - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, + type: 3} + propertyPath: lineColorNoTarget.m_NumAlphaKeys + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, + type: 3} + propertyPath: lineColorInvalid.key0.r + value: 0.8490566 + objectReference: {fileID: 0} + - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, + type: 3} + propertyPath: lineColorInvalid.key0.g + value: 0.8490566 + objectReference: {fileID: 0} + - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, + type: 3} + propertyPath: lineColorInvalid.key0.b + value: 0.8490566 + objectReference: {fileID: 0} + - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, + type: 3} + propertyPath: lineColorInvalid.key1.r + value: 0.8490566 + objectReference: {fileID: 0} + - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, + type: 3} + propertyPath: lineColorInvalid.key1.g + value: 0.8490566 + objectReference: {fileID: 0} + - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, + type: 3} + propertyPath: lineColorInvalid.key1.b + value: 0.8490566 + objectReference: {fileID: 0} + - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, + type: 3} + propertyPath: lineColorInvalid.key1.a + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, + type: 3} + propertyPath: lineColorInvalid.key2.a + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, + type: 3} + propertyPath: lineColorInvalid.atime1 + value: 65535 + objectReference: {fileID: 0} + - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, + type: 3} + propertyPath: lineColorInvalid.atime2 + value: 65535 + objectReference: {fileID: 0} + - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, + type: 3} + propertyPath: lineColorInvalid.m_NumAlphaKeys + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, + type: 3} + propertyPath: lineColorSelected.key0.r + value: 0.8490566 + objectReference: {fileID: 0} + - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, + type: 3} + propertyPath: lineColorSelected.key0.g + value: 0.8490566 + objectReference: {fileID: 0} + - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, + type: 3} + propertyPath: lineColorSelected.key0.b + value: 0.8490566 + objectReference: {fileID: 0} + - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, + type: 3} + propertyPath: lineColorSelected.key1.a + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, + type: 3} + propertyPath: lineColorSelected.key2.a + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, + type: 3} + propertyPath: lineColorSelected.atime1 + value: 65535 + objectReference: {fileID: 0} + - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, + type: 3} + propertyPath: lineColorSelected.atime2 + value: 65535 + objectReference: {fileID: 0} + - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, + type: 3} + propertyPath: lineColorSelected.m_NumAlphaKeys + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, + type: 3} + propertyPath: nearInteractionCollider + value: + objectReference: {fileID: -3199221569884269083} + - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, + type: 3} + propertyPath: defaultPointerExtent + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, + type: 3} + propertyPath: cursorPrefab + value: + objectReference: {fileID: 0} + - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, + type: 3} + propertyPath: poseAction.id + value: 15 + objectReference: {fileID: 0} + - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, + type: 3} + propertyPath: poseAction.description + value: Index Finger Pose + objectReference: {fileID: 0} + - target: {fileID: 3080660041806603478, guid: 54d78dc3333741c5b7f30fe3506096ba, + type: 3} + propertyPath: m_Positions.Array.data[0].z + value: 0.00009899999 + objectReference: {fileID: 0} + - target: {fileID: 3080660041806603478, guid: 54d78dc3333741c5b7f30fe3506096ba, + type: 3} + propertyPath: m_Positions.Array.data[1].z + value: 0.06608878 + objectReference: {fileID: 0} + - target: {fileID: 3080660041806603478, guid: 54d78dc3333741c5b7f30fe3506096ba, + type: 3} + propertyPath: m_Positions.Array.data[2].z + value: 0.13209635 + objectReference: {fileID: 0} + - target: {fileID: 3080660041806603478, guid: 54d78dc3333741c5b7f30fe3506096ba, + type: 3} + propertyPath: m_Positions.Array.data[3].z + value: 0.19813946 + objectReference: {fileID: 0} + - target: {fileID: 3080660041806603478, guid: 54d78dc3333741c5b7f30fe3506096ba, + type: 3} + propertyPath: m_Positions.Array.data[4].z + value: 0.26423594 + objectReference: {fileID: 0} + - target: {fileID: 3080660041806603478, guid: 54d78dc3333741c5b7f30fe3506096ba, + type: 3} + propertyPath: m_Positions.Array.data[5].z + value: 0.3304035 + objectReference: {fileID: 0} + - target: {fileID: 3080660041806603478, guid: 54d78dc3333741c5b7f30fe3506096ba, + type: 3} + propertyPath: m_Positions.Array.data[6].z + value: 0.3966599 + objectReference: {fileID: 0} + - target: {fileID: 3080660041806603478, guid: 54d78dc3333741c5b7f30fe3506096ba, + type: 3} + propertyPath: m_Positions.Array.data[7].z + value: 0.46302295 + objectReference: {fileID: 0} + - target: {fileID: 3080660041806603478, guid: 54d78dc3333741c5b7f30fe3506096ba, + type: 3} + propertyPath: m_Positions.Array.data[8].z + value: 0.52951044 + objectReference: {fileID: 0} + - target: {fileID: 3080660041806603478, guid: 54d78dc3333741c5b7f30fe3506096ba, + type: 3} + propertyPath: m_Positions.Array.data[9].z + value: 0.59614 + objectReference: {fileID: 0} + - target: {fileID: 3080660041806603478, guid: 54d78dc3333741c5b7f30fe3506096ba, + type: 3} + propertyPath: m_Positions.Array.data[10].z + value: 0.66292953 + objectReference: {fileID: 0} + - target: {fileID: 3080660041806603478, guid: 54d78dc3333741c5b7f30fe3506096ba, + type: 3} + propertyPath: m_Positions.Array.data[11].z + value: 0.7298968 + objectReference: {fileID: 0} + - target: {fileID: 3080660041806603478, guid: 54d78dc3333741c5b7f30fe3506096ba, + type: 3} + propertyPath: m_Positions.Array.data[12].z + value: 0.7970595 + objectReference: {fileID: 0} + - target: {fileID: 3080660041806603478, guid: 54d78dc3333741c5b7f30fe3506096ba, + type: 3} + propertyPath: m_Positions.Array.data[13].z + value: 0.8644354 + objectReference: {fileID: 0} + - target: {fileID: 3080660041806603478, guid: 54d78dc3333741c5b7f30fe3506096ba, + type: 3} + propertyPath: m_Positions.Array.data[14].z + value: 0.93204236 + objectReference: {fileID: 0} + - target: {fileID: 3080660041806603478, guid: 54d78dc3333741c5b7f30fe3506096ba, + type: 3} + propertyPath: m_Positions.Array.data[15].z + value: 0.999898 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 54d78dc3333741c5b7f30fe3506096ba, type: 3} +--- !u!1 &6198175003172875473 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1247086986094436, guid: 54d78dc3333741c5b7f30fe3506096ba, + type: 3} + m_PrefabInstance: {fileID: 6197016220715994037} + m_PrefabAsset: {fileID: 0} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/NearPointer.prefab.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/NearPointer.prefab.meta index 72de9a47..085f2842 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/NearPointer.prefab.meta +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/NearPointer.prefab.meta @@ -1,8 +1,7 @@ fileFormatVersion: 2 -guid: cbcbde03df75adf4ea8aa23a9ba2b3b0 -NativeFormatImporter: +guid: 1fd3fff0f4e00844ea0cc05dbcbac113 +PrefabImporter: externalObjects: {} - mainObjectFileID: 100100000 userData: assetBundleName: assetBundleVariant: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/Pointers/HandControllerNearPointerProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/Pointers/HandControllerNearPointerProfile.asset index 5f1ae2d5..6de3e8f1 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/Pointers/HandControllerNearPointerProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/Pointers/HandControllerNearPointerProfile.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c156ea3e1a7a493dac236ed84c4a819a, type: 3} m_Name: HandControllerNearPointerProfile m_EditorClassIdentifier: - pointerPrefab: {fileID: 1247086986094436, guid: f143e0104678be940bc5579e8fd02b9a, + pointerPrefab: {fileID: 6198175003172875473, guid: 1fd3fff0f4e00844ea0cc05dbcbac113, type: 3} pointingExtent: 10 pointingRaycastLayerMasks: From 6b1bffba937066137bbbc5ac8cb51ead5eb81c18 Mon Sep 17 00:00:00 2001 From: Dino Fejzagic Date: Sun, 10 May 2020 09:51:02 +0200 Subject: [PATCH 32/78] Introduce hand rendering mode --- .../Hands/HandControllerMeshVisualizer.cs | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/HandControllerMeshVisualizer.cs b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/HandControllerMeshVisualizer.cs index e0874dae..a6ce4056 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/HandControllerMeshVisualizer.cs +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/HandControllerMeshVisualizer.cs @@ -18,29 +18,17 @@ public class HandControllerMeshVisualizer : BaseHandControllerVisualizer [Tooltip("If this is not null and hand system supports hand meshes, use this mesh to render hand mesh.")] private GameObject handMeshPrefab = null; - /// - protected override void OnEnable() - { - base.OnEnable(); - - if (!HandControllerDataProvider.HandMeshingEnabled) - { - Debug.LogWarning("Hand meshing is disabled but a hand mesh visualizer was assigned in the visualization profile."); - } - } - /// public override void OnInputChanged(InputEventData eventData) { base.OnInputChanged(eventData); - if (eventData.Handedness != Controller.ControllerHandedness) + var handMeshData = eventData.InputData.Mesh; + if (eventData.Handedness != Controller.ControllerHandedness || handMeshData.Empty) { return; } - var handMeshData = eventData.InputData.Mesh; - if (meshFilter != null || CreateMeshFilter()) { Mesh mesh = meshFilter.mesh; From c3666c5199e9edb3ebb7e454a7b60ad78d8f7e28 Mon Sep 17 00:00:00 2001 From: Dino Fejzagic Date: Sun, 10 May 2020 10:51:37 +0200 Subject: [PATCH 33/78] Implement visuailzation runtime switch and update prefabs --- ...DefaultLeftHandControllerVisualizer.prefab | 121 +++++++++++++++ ...tLeftHandControllerVisualizer.prefab.meta} | 2 +- ...efaultRightHandControllerVisualizer.prefab | 53 +++++++ ...tRightHandControllerVisualizer.prefab.meta | 7 + .../Prefabs~/UX/Hands/HandLeft_Joints.prefab | 74 +--------- .../Prefabs~/UX/Hands/HandLeft_Mesh.prefab | 138 +++++++----------- .../Prefabs~/UX/Hands/HandMesh.prefab | 79 ---------- .../Prefabs~/UX/Hands/HandRight_Joints.prefab | 118 ++------------- .../UX/Hands/HandRight_Joints.prefab.meta | 2 +- .../Prefabs~/UX/Hands/HandRight_Mesh.prefab | 106 ++------------ .../UX/Hands/HandRight_Mesh.prefab.meta | 2 +- .../LeftHandVisualizationProfile.asset | 2 +- .../RightHandVisulaizationProfile.asset | 2 +- ....cs => DefaultHandControllerVisualizer.cs} | 66 ++++++++- ...> DefaultHandControllerVisualizer.cs.meta} | 0 .../Hands/HandControllerJointsVisualizer.cs | 28 ++-- .../Hands/HandControllerMeshVisualizer.cs | 38 ++--- 17 files changed, 354 insertions(+), 484 deletions(-) create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/DefaultLeftHandControllerVisualizer.prefab rename XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/{HandMesh.prefab.meta => DefaultLeftHandControllerVisualizer.prefab.meta} (74%) create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/DefaultRightHandControllerVisualizer.prefab create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/DefaultRightHandControllerVisualizer.prefab.meta delete mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/HandMesh.prefab rename XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/{BaseHandControllerVisualizer.cs => DefaultHandControllerVisualizer.cs} (84%) rename XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/{BaseHandControllerVisualizer.cs.meta => DefaultHandControllerVisualizer.cs.meta} (100%) diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/DefaultLeftHandControllerVisualizer.prefab b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/DefaultLeftHandControllerVisualizer.prefab new file mode 100644 index 00000000..5e30fb14 --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/DefaultLeftHandControllerVisualizer.prefab @@ -0,0 +1,121 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &7398244499265140811 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1355368130211572882} + - component: {fileID: 3076132558849983539} + m_Layer: 0 + m_Name: DefaultLeftHandControllerVisualizer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1355368130211572882 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7398244499265140811} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 4821403235424470471} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3076132558849983539 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7398244499265140811} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: aaa953e22a23b764ebaedb977c249dfd, type: 3} + m_Name: + m_EditorClassIdentifier: + handedness: 1 + destroyOnSourceLost: 1 + useSourcePoseData: 1 + poseAction: + profileGuid: 00000000000000000000000000000000 + id: 0 + description: None + axisConstraint: 0 + jointsModePrefab: {fileID: 9173983480249558903, guid: 081f7848cfd94b34f9c774490cd7e2fb, + type: 3} + meshModePrefab: {fileID: 1887883006053652, guid: 81cacd47fbb47714d8b19cffb1edf4af, + type: 3} +--- !u!1001 &4825975113153208793 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1355368130211572882} + m_Modifications: + - target: {fileID: 1370450866519632, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + propertyPath: m_Name + value: HandJointGizmo + objectReference: {fileID: 0} + - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} +--- !u!4 &4821403235424470471 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, + type: 3} + m_PrefabInstance: {fileID: 4825975113153208793} + m_PrefabAsset: {fileID: 0} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/HandMesh.prefab.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/DefaultLeftHandControllerVisualizer.prefab.meta similarity index 74% rename from XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/HandMesh.prefab.meta rename to XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/DefaultLeftHandControllerVisualizer.prefab.meta index abb42bd1..2961d396 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/HandMesh.prefab.meta +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/DefaultLeftHandControllerVisualizer.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 81cacd47fbb47714d8b19cffb1edf4af +guid: 61feeca21178ba54682d3c61ff5f89a1 PrefabImporter: externalObjects: {} userData: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/DefaultRightHandControllerVisualizer.prefab b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/DefaultRightHandControllerVisualizer.prefab new file mode 100644 index 00000000..b65a6038 --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/DefaultRightHandControllerVisualizer.prefab @@ -0,0 +1,53 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &888890962389326207 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 7398244499265140811, guid: 61feeca21178ba54682d3c61ff5f89a1, + type: 3} + propertyPath: m_Name + value: DefaultRightHandControllerVisualizer + objectReference: {fileID: 0} + - target: {fileID: 1355368130211572882, guid: 61feeca21178ba54682d3c61ff5f89a1, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1355368130211572882, guid: 61feeca21178ba54682d3c61ff5f89a1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1355368130211572882, guid: 61feeca21178ba54682d3c61ff5f89a1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1355368130211572882, guid: 61feeca21178ba54682d3c61ff5f89a1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3076132558849983539, guid: 61feeca21178ba54682d3c61ff5f89a1, + type: 3} + propertyPath: handedness + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3076132558849983539, guid: 61feeca21178ba54682d3c61ff5f89a1, + type: 3} + propertyPath: jointsModePrefab + value: + objectReference: {fileID: 359003569130992022, guid: 1d9336d86c602194bb2bd581c9389ce7, + type: 3} + - target: {fileID: 3076132558849983539, guid: 61feeca21178ba54682d3c61ff5f89a1, + type: 3} + propertyPath: meshModePrefab + value: + objectReference: {fileID: 5177809551914790478, guid: e7441264aa8569b4aae36828878435af, + type: 3} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 61feeca21178ba54682d3c61ff5f89a1, type: 3} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/DefaultRightHandControllerVisualizer.prefab.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/DefaultRightHandControllerVisualizer.prefab.meta new file mode 100644 index 00000000..687b936f --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/DefaultRightHandControllerVisualizer.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 79eeb06cd1ed4224eb6387ce28855a3c +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/HandLeft_Joints.prefab b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/HandLeft_Joints.prefab index c8bb380b..e0f51c7f 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/HandLeft_Joints.prefab +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/HandLeft_Joints.prefab @@ -27,8 +27,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 6562379902637120251} + m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -44,14 +43,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 71894c53357d52a44b03004f02e70846, type: 3} m_Name: m_EditorClassIdentifier: - handedness: 1 - destroyOnSourceLost: 1 - useSourcePoseData: 1 - poseAction: - profileGuid: 00000000000000000000000000000000 - id: 0 - description: None - axisConstraint: 0 wristPrefab: {fileID: 3141352679402889276, guid: ecbaba8bdbeef32459e87a1ce06bfd36, type: 3} jointPrefab: {fileID: 3141352679402889276, guid: ecbaba8bdbeef32459e87a1ce06bfd36, @@ -61,66 +52,3 @@ MonoBehaviour: fingertipPrefab: {fileID: 4719395302953375155, guid: ceff11f7c8b644246b621c521c0ba767, type: 3} indexFingertipColor: {r: 0, g: 1, b: 1, a: 1} ---- !u!1001 &6557838890691165925 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 807390424017236910} - m_Modifications: - - target: {fileID: 1370450866519632, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} - propertyPath: m_Name - value: HandJointGizmo - objectReference: {fileID: 0} - - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} ---- !u!4 &6562379902637120251 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, - type: 3} - m_PrefabInstance: {fileID: 6557838890691165925} - m_PrefabAsset: {fileID: 0} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/HandLeft_Mesh.prefab b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/HandLeft_Mesh.prefab index 47fb3fbd..be93bee2 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/HandLeft_Mesh.prefab +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/HandLeft_Mesh.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &9173983480249558903 +--- !u!1 &1887883006053652 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,8 +8,10 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 807390424017236910} - - component: {fileID: 7059414244795525261} + - component: {fileID: 4948917796815494} + - component: {fileID: 33106465735047394} + - component: {fileID: 23983223512971934} + - component: {fileID: 6134017444622410916} m_Layer: 0 m_Name: HandLeft_Mesh m_TagString: Untagged @@ -17,103 +19,75 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &807390424017236910 +--- !u!4 &4948917796815494 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9173983480249558903} + m_GameObject: {fileID: 1887883006053652} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 3291870944053985864} + m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &7059414244795525261 +--- !u!33 &33106465735047394 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1887883006053652} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &23983223512971934 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1887883006053652} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RenderingLayerMask: 4294967295 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: cc7d7542bfb388946a8765a44cfa392c, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 1 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!114 &6134017444622410916 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9173983480249558903} + m_GameObject: {fileID: 1887883006053652} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 57c0d58f2329ea049bddab9f316fb39b, type: 3} m_Name: m_EditorClassIdentifier: - handedness: 1 - destroyOnSourceLost: 1 - useSourcePoseData: 1 - poseAction: - profileGuid: 00000000000000000000000000000000 - id: 0 - description: None - axisConstraint: 0 - handMeshPrefab: {fileID: 1887883006053652, guid: 81cacd47fbb47714d8b19cffb1edf4af, - type: 3} ---- !u!1001 &3296438492594103894 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 807390424017236910} - m_Modifications: - - target: {fileID: 1370450866519632, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} - propertyPath: m_Name - value: HandJointGizmo - objectReference: {fileID: 0} - - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} ---- !u!4 &3291870944053985864 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, - type: 3} - m_PrefabInstance: {fileID: 3296438492594103894} - m_PrefabAsset: {fileID: 0} + meshFilter: {fileID: 33106465735047394} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/HandMesh.prefab b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/HandMesh.prefab deleted file mode 100644 index 3426a2c6..00000000 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/HandMesh.prefab +++ /dev/null @@ -1,79 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &1887883006053652 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4948917796815494} - - component: {fileID: 33106465735047394} - - component: {fileID: 23983223512971934} - m_Layer: 0 - m_Name: ArticulatedHandMesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4948917796815494 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1887883006053652} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &33106465735047394 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1887883006053652} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &23983223512971934 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1887883006053652} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 0 - m_ReflectionProbeUsage: 0 - m_RenderingLayerMask: 4294967295 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: cc7d7542bfb388946a8765a44cfa392c, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 1 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/HandRight_Joints.prefab b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/HandRight_Joints.prefab index c755e7d9..93905054 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/HandRight_Joints.prefab +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/HandRight_Joints.prefab @@ -1,126 +1,36 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &4856844564559928852 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6214577301168553923} - - component: {fileID: -8765537145706239952} - m_Layer: 0 - m_Name: HandRight_Joints - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &6214577301168553923 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4856844564559928852} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 2551293412768532935} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &-8765537145706239952 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4856844564559928852} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 71894c53357d52a44b03004f02e70846, type: 3} - m_Name: - m_EditorClassIdentifier: - handedness: 2 - destroyOnSourceLost: 1 - useSourcePoseData: 1 - poseAction: - profileGuid: 00000000000000000000000000000000 - id: 0 - description: None - axisConstraint: 0 - wristPrefab: {fileID: 3141352679402889276, guid: ecbaba8bdbeef32459e87a1ce06bfd36, - type: 3} - jointPrefab: {fileID: 3141352679402889276, guid: ecbaba8bdbeef32459e87a1ce06bfd36, - type: 3} - palmPrefab: {fileID: 6797406804172968804, guid: 80997b0aa2ab2d7429bb5e7f1cddbace, - type: 3} - fingertipPrefab: {fileID: 4719395302953375155, guid: ceff11f7c8b644246b621c521c0ba767, - type: 3} - indexFingertipColor: {r: 0, g: 1, b: 1, a: 1} ---- !u!1001 &2555895791342759385 +--- !u!1001 &8911469753042065121 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 6214577301168553923} + m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 1370450866519632, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + - target: {fileID: 9173983480249558903, guid: 081f7848cfd94b34f9c774490cd7e2fb, + type: 3} propertyPath: m_Name - value: HandJointGizmo - objectReference: {fileID: 0} - - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} - propertyPath: m_LocalRotation.w - value: 1 + value: HandLeft_Joints objectReference: {fileID: 0} - - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + - target: {fileID: 807390424017236910, guid: 081f7848cfd94b34f9c774490cd7e2fb, + type: 3} propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} - - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + - target: {fileID: 807390424017236910, guid: 081f7848cfd94b34f9c774490cd7e2fb, + type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + - target: {fileID: 807390424017236910, guid: 081f7848cfd94b34f9c774490cd7e2fb, + type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + - target: {fileID: 807390424017236910, guid: 081f7848cfd94b34f9c774490cd7e2fb, + type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} ---- !u!4 &2551293412768532935 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, - type: 3} - m_PrefabInstance: {fileID: 2555895791342759385} - m_PrefabAsset: {fileID: 0} + m_SourcePrefab: {fileID: 100100000, guid: 081f7848cfd94b34f9c774490cd7e2fb, type: 3} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/HandRight_Joints.prefab.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/HandRight_Joints.prefab.meta index 250fa1c9..40cb5234 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/HandRight_Joints.prefab.meta +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/HandRight_Joints.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 58cc7659d29f83f47b10dfd3bc4d1c97 +guid: 1d9336d86c602194bb2bd581c9389ce7 PrefabImporter: externalObjects: {} userData: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/HandRight_Mesh.prefab b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/HandRight_Mesh.prefab index 4542b480..7ab17da5 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/HandRight_Mesh.prefab +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/HandRight_Mesh.prefab @@ -1,119 +1,31 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &4856844564559928852 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6214577301168553923} - - component: {fileID: 7285137842568704461} - m_Layer: 0 - m_Name: HandRight_Mesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &6214577301168553923 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4856844564559928852} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 1467966005019003541} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &7285137842568704461 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4856844564559928852} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 57c0d58f2329ea049bddab9f316fb39b, type: 3} - m_Name: - m_EditorClassIdentifier: - handedness: 2 - destroyOnSourceLost: 1 - useSourcePoseData: 1 - poseAction: - profileGuid: 00000000000000000000000000000000 - id: 0 - description: None - axisConstraint: 0 - handMeshPrefab: {fileID: 1887883006053652, guid: 81cacd47fbb47714d8b19cffb1edf4af, - type: 3} ---- !u!1001 &1463420515438538379 +--- !u!1001 &5178562738904195930 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 6214577301168553923} + m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 1370450866519632, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + - target: {fileID: 1887883006053652, guid: 81cacd47fbb47714d8b19cffb1edf4af, type: 3} propertyPath: m_Name - value: HandJointGizmo - objectReference: {fileID: 0} - - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} - propertyPath: m_LocalRotation.w - value: 1 + value: HandLeft_Mesh objectReference: {fileID: 0} - - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + - target: {fileID: 4948917796815494, guid: 81cacd47fbb47714d8b19cffb1edf4af, type: 3} propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} - - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + - target: {fileID: 4948917796815494, guid: 81cacd47fbb47714d8b19cffb1edf4af, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + - target: {fileID: 4948917796815494, guid: 81cacd47fbb47714d8b19cffb1edf4af, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + - target: {fileID: 4948917796815494, guid: 81cacd47fbb47714d8b19cffb1edf4af, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} ---- !u!4 &1467966005019003541 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, - type: 3} - m_PrefabInstance: {fileID: 1463420515438538379} - m_PrefabAsset: {fileID: 0} + m_SourcePrefab: {fileID: 100100000, guid: 81cacd47fbb47714d8b19cffb1edf4af, type: 3} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/HandRight_Mesh.prefab.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/HandRight_Mesh.prefab.meta index e22f23ac..75ec5ac8 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/HandRight_Mesh.prefab.meta +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/HandRight_Mesh.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 17bda3d41a5c5bf4d8ea2220004b496f +guid: e7441264aa8569b4aae36828878435af PrefabImporter: externalObjects: {} userData: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/LeftHandVisualizationProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/LeftHandVisualizationProfile.asset index eeba2d86..a054046e 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/LeftHandVisualizationProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/LeftHandVisualizationProfile.asset @@ -15,7 +15,7 @@ MonoBehaviour: controllerVisualizationType: reference: 0b653537-d237-4622-acc6-e351209a5882 useDefaultModels: 0 - model: {fileID: 9173983480249558903, guid: 081f7848cfd94b34f9c774490cd7e2fb, type: 3} + model: {fileID: 7398244499265140811, guid: 61feeca21178ba54682d3c61ff5f89a1, type: 3} pointerPose: profileGuid: 00000000000000000000000000000000 id: 0 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RightHandVisulaizationProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RightHandVisulaizationProfile.asset index f73bd1c0..d1879d10 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RightHandVisulaizationProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RightHandVisulaizationProfile.asset @@ -15,7 +15,7 @@ MonoBehaviour: controllerVisualizationType: reference: 0b653537-d237-4622-acc6-e351209a5882 useDefaultModels: 0 - model: {fileID: 4856844564559928852, guid: 58cc7659d29f83f47b10dfd3bc4d1c97, type: 3} + model: {fileID: 7709636661657395508, guid: 79eeb06cd1ed4224eb6387ce28855a3c, type: 3} pointerPose: profileGuid: 00000000000000000000000000000000 id: 0 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/BaseHandControllerVisualizer.cs b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/DefaultHandControllerVisualizer.cs similarity index 84% rename from XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/BaseHandControllerVisualizer.cs rename to XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/DefaultHandControllerVisualizer.cs index 0014b33e..c28ba66e 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/BaseHandControllerVisualizer.cs +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/DefaultHandControllerVisualizer.cs @@ -16,11 +16,22 @@ namespace XRTK.SDK.UX.Controllers.Hands /// /// Base hand controller visualizer implementation. /// - public class BaseHandControllerVisualizer : ControllerPoseSynchronizer, IMixedRealityControllerVisualizer + [System.Runtime.InteropServices.Guid("5d844e0b-f913-46b8-bc3b-fa6429e62c60")] + public class DefaultHandControllerVisualizer : ControllerPoseSynchronizer, IMixedRealityControllerVisualizer { private readonly Dictionary jointTransforms = new Dictionary(); private const float fingerColliderRadius = .007f; private const int capsuleColliderZAxis = 2; + HandControllerJointsVisualizer jointsVisualizer; + private HandControllerMeshVisualizer meshVisualizer; + + [SerializeField] + [Tooltip("Visualization prefab instantiated once joint rendering mode is enabled for the first time.")] + private GameObject jointsModePrefab = null; + + [SerializeField] + [Tooltip("Visualization prefab instantiated once mesh rendering mode is enabled for the first time.")] + private GameObject meshModePrefab = null; /// public GameObject GameObject @@ -50,7 +61,7 @@ public GameObject GameObject /// /// The actual game object that is parent to all controller visualization of this hand controller. /// - protected GameObject HandVisualizationGameObject => ((IMixedRealityHandControllerDataProvider)Controller.ControllerDataProvider).HandPhysicsEnabled ? PhysicsCompanionGameObject : GameObject; + public GameObject HandVisualizationGameObject => ((IMixedRealityHandControllerDataProvider)Controller.ControllerDataProvider).HandPhysicsEnabled ? PhysicsCompanionGameObject : GameObject; private IMixedRealityHandControllerDataProvider handControllerDataProvider; @@ -101,6 +112,9 @@ public override void OnInputChanged(InputEventData eventData) // With joints updated, we can update colliders. UpdateHandColliders(); + + // Update visualizers depending on the current mode. + UpdateRendering(handData); } private void UpdateHandJointTransforms(HandData handData) @@ -292,7 +306,7 @@ private void ConfigureCapsuleCollider(CapsuleCollider collider, Bounds bounds, T /// /// The hand joint a transform should be returned for. /// Joint transform. - protected Transform GetOrCreateJointTransform(TrackedHandJoint handJoint) + public Transform GetOrCreateJointTransform(TrackedHandJoint handJoint) { if (jointTransforms.TryGetValue(handJoint, out Transform existingJointTransform)) { @@ -306,5 +320,51 @@ protected Transform GetOrCreateJointTransform(TrackedHandJoint handJoint) return jointTransform; } + + private void UpdateRendering(HandData handData) + { + var renderingMode = HandControllerDataProvider.RenderingMode; + if (renderingMode != HandRenderingMode.None) + { + // Fallback to joints rendering if the platform did not provide + // any mesh data. + if (renderingMode == HandRenderingMode.Mesh && + handData.Mesh.Empty) + { + renderingMode = HandRenderingMode.Joints; + } + + if (renderingMode == HandRenderingMode.Joints) + { + if (meshVisualizer != null) + { + meshVisualizer.gameObject.SetActive(false); + } + + if (jointsVisualizer == null) + { + jointsVisualizer = Instantiate(jointsModePrefab, HandVisualizationGameObject.transform).GetComponent(); + } + + jointsVisualizer.gameObject.SetActive(true); + jointsVisualizer.UpdateVisualization(this); + } + else if (renderingMode == HandRenderingMode.Mesh) + { + if (jointsVisualizer != null) + { + jointsVisualizer.gameObject.SetActive(false); + } + + if (meshVisualizer == null) + { + meshVisualizer = Instantiate(meshModePrefab, HandVisualizationGameObject.transform).GetComponent(); + } + + meshVisualizer.gameObject.SetActive(true); + meshVisualizer.UpdateVisualization(handData); + } + } + } } } \ No newline at end of file diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/BaseHandControllerVisualizer.cs.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/DefaultHandControllerVisualizer.cs.meta similarity index 100% rename from XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/BaseHandControllerVisualizer.cs.meta rename to XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/DefaultHandControllerVisualizer.cs.meta diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/HandControllerJointsVisualizer.cs b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/HandControllerJointsVisualizer.cs index 4bb981a5..57518484 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/HandControllerJointsVisualizer.cs +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/HandControllerJointsVisualizer.cs @@ -4,17 +4,13 @@ using System.Collections.Generic; using UnityEngine; using XRTK.Definitions.Controllers.Hands; -using XRTK.EventDatum.Input; namespace XRTK.SDK.UX.Controllers.Hands { - /// - /// Hand controller visualizer visualizing hand joints. - /// - [System.Runtime.InteropServices.Guid("0B653537-D237-4622-ACC6-E351209A5882")] - public class HandControllerJointsVisualizer : BaseHandControllerVisualizer + public class HandControllerJointsVisualizer : MonoBehaviour { private readonly Dictionary jointVisualizations = new Dictionary(); + private DefaultHandControllerVisualizer mainVisualizer; [SerializeField] [Tooltip("The wrist prefab to use.")] @@ -36,15 +32,21 @@ public class HandControllerJointsVisualizer : BaseHandControllerVisualizer [Tooltip("Material tint color for index fingertip.")] private Color indexFingertipColor = Color.cyan; - /// - public override void OnInputChanged(InputEventData eventData) + private void OnDisable() { - base.OnInputChanged(eventData); - - if (eventData.Handedness != Controller.ControllerHandedness) + foreach (var jointVisualization in jointVisualizations) { - return; + jointVisualization.Value.SetActive(false); } + } + + /// + /// Updates the joints visuailzation. + /// + /// The managing visuailzer component. + public void UpdateVisualization(DefaultHandControllerVisualizer mainVisualizer) + { + this.mainVisualizer = mainVisualizer; for (int i = 0; i < HandData.JointCount; i++) { @@ -84,7 +86,7 @@ private void CreateJointVisualizerIfNotExists(TrackedHandJoint handJoint) if (prefab != null) { - var jointVisualization = Instantiate(prefab, GetOrCreateJointTransform(handJoint)); + var jointVisualization = Instantiate(prefab, mainVisualizer.GetOrCreateJointTransform(handJoint)); if (handJoint == TrackedHandJoint.IndexTip) { diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/HandControllerMeshVisualizer.cs b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/HandControllerMeshVisualizer.cs index a6ce4056..edc11430 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/HandControllerMeshVisualizer.cs +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/HandControllerMeshVisualizer.cs @@ -3,33 +3,27 @@ using UnityEngine; using XRTK.Definitions.Controllers.Hands; -using XRTK.EventDatum.Input; namespace XRTK.SDK.UX.Controllers.Hands { - /// - /// Hand controller visualizer visualizing hand mesh data. - /// - public class HandControllerMeshVisualizer : BaseHandControllerVisualizer + public class HandControllerMeshVisualizer : MonoBehaviour { - private MeshFilter meshFilter; - [SerializeField] - [Tooltip("If this is not null and hand system supports hand meshes, use this mesh to render hand mesh.")] - private GameObject handMeshPrefab = null; + private MeshFilter meshFilter = null; - /// - public override void OnInputChanged(InputEventData eventData) + /// + /// Updates the mesh visuailzation using latest hand data. + /// + /// New hand data. + public void UpdateVisualization(HandData handData) { - base.OnInputChanged(eventData); - - var handMeshData = eventData.InputData.Mesh; - if (eventData.Handedness != Controller.ControllerHandedness || handMeshData.Empty) + var handMeshData = handData.Mesh; + if (handMeshData.Empty) { return; } - if (meshFilter != null || CreateMeshFilter()) + if (meshFilter != null) { Mesh mesh = meshFilter.mesh; @@ -46,17 +40,5 @@ public override void OnInputChanged(InputEventData eventData) meshFilter.transform.rotation = handMeshData.Rotation; } } - - private bool CreateMeshFilter() - { - if (handMeshPrefab != null) - { - meshFilter = Instantiate(handMeshPrefab, HandVisualizationGameObject.transform).GetComponent(); - return true; - } - - Debug.LogError("Failed to create mesh filter for hand mesh visualization. No prefab assigned."); - return false; - } } } \ No newline at end of file From 3458be25e157402f451c733b8fe5cc40556ec6b2 Mon Sep 17 00:00:00 2001 From: Dino Fejzagic Date: Sun, 10 May 2020 19:50:28 +0200 Subject: [PATCH 34/78] Fix none rendering mode --- .../Hands/DefaultHandControllerVisualizer.cs | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/DefaultHandControllerVisualizer.cs b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/DefaultHandControllerVisualizer.cs index c28ba66e..65a0f82d 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/DefaultHandControllerVisualizer.cs +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/DefaultHandControllerVisualizer.cs @@ -365,6 +365,18 @@ private void UpdateRendering(HandData handData) meshVisualizer.UpdateVisualization(handData); } } + else + { + if (jointsVisualizer != null) + { + jointsVisualizer.gameObject.SetActive(false); + } + + if (meshVisualizer != null) + { + meshVisualizer.gameObject.SetActive(false); + } + } } } } \ No newline at end of file From a68c75101cff71af2457ee8646670ac0ec21091d Mon Sep 17 00:00:00 2001 From: Dino Fejzagic Date: Sun, 10 May 2020 19:50:42 +0200 Subject: [PATCH 35/78] Fix existing joints not enabled on enable --- .../Controllers/Hands/HandControllerJointsVisualizer.cs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/HandControllerJointsVisualizer.cs b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/HandControllerJointsVisualizer.cs index 57518484..f4d148c6 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/HandControllerJointsVisualizer.cs +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/HandControllerJointsVisualizer.cs @@ -32,6 +32,14 @@ public class HandControllerJointsVisualizer : MonoBehaviour [Tooltip("Material tint color for index fingertip.")] private Color indexFingertipColor = Color.cyan; + private void OnEnable() + { + foreach (var jointVisualization in jointVisualizations) + { + jointVisualization.Value.SetActive(true); + } + } + private void OnDisable() { foreach (var jointVisualization in jointVisualizations) From 1fb735228cd732bd8b95d0408593e4acaaca856c Mon Sep 17 00:00:00 2001 From: Dino Fejzagic Date: Sun, 10 May 2020 20:08:29 +0200 Subject: [PATCH 36/78] Update prefabs --- ...DefaultLeftHandControllerVisualizer.prefab | 66 +------------------ .../Prefabs~/UX/Hands/HandJointGizmo.prefab | 2 +- .../Prefabs~/UX/Hands/HandLeft_Joints.prefab | 2 +- .../Hands/HandControllerMeshVisualizer.cs | 33 ++++++++-- 4 files changed, 32 insertions(+), 71 deletions(-) diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/DefaultLeftHandControllerVisualizer.prefab b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/DefaultLeftHandControllerVisualizer.prefab index 5e30fb14..ac5cbaf6 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/DefaultLeftHandControllerVisualizer.prefab +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/DefaultLeftHandControllerVisualizer.prefab @@ -27,8 +27,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 4821403235424470471} + m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -56,66 +55,3 @@ MonoBehaviour: type: 3} meshModePrefab: {fileID: 1887883006053652, guid: 81cacd47fbb47714d8b19cffb1edf4af, type: 3} ---- !u!1001 &4825975113153208793 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1355368130211572882} - m_Modifications: - - target: {fileID: 1370450866519632, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} - propertyPath: m_Name - value: HandJointGizmo - objectReference: {fileID: 0} - - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} ---- !u!4 &4821403235424470471 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, - type: 3} - m_PrefabInstance: {fileID: 4825975113153208793} - m_PrefabAsset: {fileID: 0} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/HandJointGizmo.prefab b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/HandJointGizmo.prefab index 86da0c46..6b7bec77 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/HandJointGizmo.prefab +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/HandJointGizmo.prefab @@ -507,7 +507,7 @@ Transform: m_GameObject: {fileID: 1370450866519632} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.3, y: 0.3, z: 0.3} + m_LocalScale: {x: 0.2, y: 0.2, z: 0.2} m_Children: - {fileID: 4831455789484130} - {fileID: 4487561386526946} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/HandLeft_Joints.prefab b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/HandLeft_Joints.prefab index e0f51c7f..1bb5321c 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/HandLeft_Joints.prefab +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/HandLeft_Joints.prefab @@ -43,7 +43,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 71894c53357d52a44b03004f02e70846, type: 3} m_Name: m_EditorClassIdentifier: - wristPrefab: {fileID: 3141352679402889276, guid: ecbaba8bdbeef32459e87a1ce06bfd36, + wristPrefab: {fileID: 1370450866519632, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} jointPrefab: {fileID: 3141352679402889276, guid: ecbaba8bdbeef32459e87a1ce06bfd36, type: 3} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/HandControllerMeshVisualizer.cs b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/HandControllerMeshVisualizer.cs index edc11430..03b2ae0c 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/HandControllerMeshVisualizer.cs +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/HandControllerMeshVisualizer.cs @@ -8,6 +8,8 @@ namespace XRTK.SDK.UX.Controllers.Hands { public class HandControllerMeshVisualizer : MonoBehaviour { + private Vector3[] lastHandMeshVertices; + [SerializeField] private MeshFilter meshFilter = null; @@ -26,17 +28,40 @@ public void UpdateVisualization(HandData handData) if (meshFilter != null) { Mesh mesh = meshFilter.mesh; + if (lastHandMeshVertices == null) + { + lastHandMeshVertices = mesh.vertices; + } + + bool meshChanged = false; + // On some platforms, mesh length counts may change as the hand mesh is updated. + // In order to update the vertices when the array sizes change, the mesh + // must be cleared per instructions here: + // https://docs.unity3d.com/ScriptReference/Mesh.html + if (lastHandMeshVertices != null && + lastHandMeshVertices.Length != 0 && + lastHandMeshVertices.Length != handMeshData.Vertices.Length) + { + meshChanged = true; + mesh.Clear(); + } mesh.vertices = handMeshData.Vertices; mesh.normals = handMeshData.Normals; - mesh.triangles = handMeshData.Triangles; + lastHandMeshVertices = mesh.vertices; - if (handMeshData.Uvs != null && handMeshData.Uvs.Length > 0) + if (meshChanged) { - mesh.uv = handMeshData.Uvs; + mesh.triangles = handMeshData.Triangles; + if (handMeshData.Uvs != null && handMeshData.Uvs.Length > 0) + { + mesh.uv = handMeshData.Uvs; + } + + mesh.RecalculateBounds(); } - meshFilter.transform.position = handMeshData.Position; + //meshFilter.transform.position = handMeshData.Position; meshFilter.transform.rotation = handMeshData.Rotation; } } From 9122d1cc1487133363aaac2a50c4402787ba5294 Mon Sep 17 00:00:00 2001 From: Dino Fejzagic Date: Sun, 10 May 2020 22:16:55 +0200 Subject: [PATCH 37/78] Remove redundant check --- .../UX/Scripts/Controllers/Hands/HandControllerMeshVisualizer.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/HandControllerMeshVisualizer.cs b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/HandControllerMeshVisualizer.cs index 03b2ae0c..1ff2284d 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/HandControllerMeshVisualizer.cs +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/HandControllerMeshVisualizer.cs @@ -39,7 +39,6 @@ public void UpdateVisualization(HandData handData) // must be cleared per instructions here: // https://docs.unity3d.com/ScriptReference/Mesh.html if (lastHandMeshVertices != null && - lastHandMeshVertices.Length != 0 && lastHandMeshVertices.Length != handMeshData.Vertices.Length) { meshChanged = true; From ce77dfb63dba0de1d0ca1254a44f649bb881de9f Mon Sep 17 00:00:00 2001 From: Dino Fejzagic Date: Mon, 18 May 2020 15:18:19 +0200 Subject: [PATCH 38/78] Create custom pointer prefab for hands --- .../UX/Pointers/HandRayPointerInspector.cs | 14 + .../Pointers/HandRayPointerInspector.cs.meta | 11 + .../Pointers/HandControllerFarPointer.prefab | 553 ++++++++++++++++++ .../HandControllerFarPointer.prefab.meta | 8 + ...refab => HandControllerNearPointer.prefab} | 0 ... => HandControllerNearPointer.prefab.meta} | 0 ...tialPointerInteractionMappingProfile.asset | 2 +- .../HandControllerFarPointerProfile.asset | 23 + ...HandControllerFarPointerProfile.asset.meta | 8 + .../UX/Scripts/Pointers/HandRayPointer.cs | 34 ++ .../Scripts/Pointers/HandRayPointer.cs.meta | 11 + 11 files changed, 663 insertions(+), 1 deletion(-) create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Editor/UX/Pointers/HandRayPointerInspector.cs create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Editor/UX/Pointers/HandRayPointerInspector.cs.meta create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/HandControllerFarPointer.prefab create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/HandControllerFarPointer.prefab.meta rename XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/{NearPointer.prefab => HandControllerNearPointer.prefab} (100%) rename XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/{NearPointer.prefab.meta => HandControllerNearPointer.prefab.meta} (100%) create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/Pointers/HandControllerFarPointerProfile.asset create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/Pointers/HandControllerFarPointerProfile.asset.meta create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandRayPointer.cs create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandRayPointer.cs.meta diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Editor/UX/Pointers/HandRayPointerInspector.cs b/XRTK.SDK/Packages/com.xrtk.sdk/Editor/UX/Pointers/HandRayPointerInspector.cs new file mode 100644 index 00000000..26b5840d --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Editor/UX/Pointers/HandRayPointerInspector.cs @@ -0,0 +1,14 @@ +// Copyright (c) XRTK. All rights reserved. +// Licensed under the MIT License. See LICENSE in the project root for license information. + +using UnityEditor; +using XRTK.SDK.UX.Pointers; + +namespace XRTK.SDK.Editor.UX.Pointers +{ + [CustomEditor(typeof(HandRayPointer))] + public class HandRayPointerInspector : LinePointerInspector + { + + } +} \ No newline at end of file diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Editor/UX/Pointers/HandRayPointerInspector.cs.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Editor/UX/Pointers/HandRayPointerInspector.cs.meta new file mode 100644 index 00000000..5c7dc099 --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Editor/UX/Pointers/HandRayPointerInspector.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 093455e9322f71b48aeadb22f85abc7a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {fileID: 2800000, guid: 8ac5213854cf4dbabd140decf8df1946, type: 3} + userData: + assetBundleName: + assetBundleVariant: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/HandControllerFarPointer.prefab b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/HandControllerFarPointer.prefab new file mode 100644 index 00000000..f10d82da --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/HandControllerFarPointer.prefab @@ -0,0 +1,553 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1247086986094436 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4215223911988956} + - component: {fileID: 6863193991115524521} + - component: {fileID: 1307499967629831868} + - component: {fileID: 2271079586809481026} + - component: {fileID: 3080660041806603478} + - component: {fileID: 1526809385130449531} + m_Layer: 0 + m_Name: HandControllerFarPointer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4215223911988956 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1247086986094436} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6863193991115524521 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1247086986094436} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c85a4527bbdd25647a62ec06e8d2daf3, type: 3} + m_Name: + m_EditorClassIdentifier: + lineStartClamp: 0.0001 + lineEndClamp: 0.9999 + customLineTransform: {fileID: 0} + loops: 0 + transformMode: 1 + rotationMode: 1 + flipUpVector: 0 + originOffset: {x: 0, y: 0, z: 0} + manualUpVectorBlend: 0 + manualUpVectors: + - {x: 0, y: 1, z: 0} + - {x: 0, y: 1, z: 0} + - {x: 0, y: 1, z: 0} + velocitySearchRange: 0.02 + distorters: + - {fileID: 1307499967629831868} + distortionMode: 0 + distortionStrength: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + uniformDistortionStrength: 1 + inertia: + inertia: 10 + dampen: 6 + seekTargetStrength: 1.5 + p1Target: {x: 0, y: 0, z: 0.33} + p2Target: {x: 0, y: 0, z: 0.66} + controlPoints: + Point1: {x: 0, y: 0, z: 0} + Point2: {x: 0, y: 0, z: 0.33} + Point3: {x: 0, y: 0, z: 0.66} + Point4: {x: 0, y: 0, z: 1} + useLocalTangentPoints: 0 +--- !u!114 &1307499967629831868 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1247086986094436} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 61988acbae5840069797ec6d990d8f50, type: 3} + m_Name: + m_EditorClassIdentifier: + distortOrder: 0 + distortStrength: 1 + localCenterOfGravity: {x: 0, y: 0, z: 0} + axisStrength: {x: 1, y: 1, z: 1} + radius: 0.5 + gravityStrength: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!114 &2271079586809481026 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1247086986094436} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9804cfa462754d0469b3fcb7e1dbf234, type: 3} + m_Name: + m_EditorClassIdentifier: + handedness: 1 + destroyOnSourceLost: 1 + useSourcePoseData: 0 + poseAction: + profileGuid: 399335ccc89c4d12b79f3539ca7771db + id: 4 + description: Pointer Pose + axisConstraint: 7 + cursorPrefab: {fileID: 1000012072213228, guid: 79f96834fcc44889b558cc13518979a0, + type: 3} + disableCursorOnStart: 0 + setCursorVisibilityOnSourceDetected: 0 + raycastOrigin: {fileID: 0} + activeHoldAction: + profileGuid: 00000000000000000000000000000000 + id: 0 + description: None + axisConstraint: 0 + pointerAction: + profileGuid: 399335ccc89c4d12b79f3539ca7771db + id: 1 + description: Select + axisConstraint: 2 + requiresHoldAction: 0 + enablePointerOnStart: 0 + nearInteractionCollider: {fileID: 0} + overrideGlobalPointerExtent: 0 + defaultPointerExtent: 10 + pointerOrientation: 0 + lineColorSelected: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 0} + key1: {r: 0.8490566, g: 0.8490566, b: 0.8490566, a: 1} + key2: {r: 0, g: 0, b: 0, a: 1} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 3277 + atime2: 49151 + atime3: 65535 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 4 + lineColorValid: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 0} + key1: {r: 0.14122522, g: 1, b: 0, a: 1} + key2: {r: 0, g: 0, b: 0, a: 1} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 3277 + atime2: 49151 + atime3: 65535 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 4 + lineColorInvalid: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 0} + key1: {r: 1, g: 0, b: 0, a: 1} + key2: {r: 0, g: 0, b: 0, a: 1} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 3277 + atime2: 49151 + atime3: 65535 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 4 + lineColorNoTarget: + serializedVersion: 2 + key0: {r: 0.754717, g: 0.754717, b: 0.754717, a: 0} + key1: {r: 0.754717, g: 0.754717, b: 0.754717, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 3277 + atime2: 65535 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 3 + lineColorLockFocus: + serializedVersion: 2 + key0: {r: 0, g: 0.9806142, b: 1, a: 0} + key1: {r: 0, g: 0.9806142, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 1} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 3277 + atime2: 49151 + atime3: 65535 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 4 + lineCastResolution: 10 + lineBase: {fileID: 6863193991115524521} + lineRenderers: + - {fileID: 1526809385130449531} +--- !u!120 &3080660041806603478 +LineRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1247086986094436} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 0 + m_MotionVectors: 0 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 49bbec7a7ebd47c786bf06ad0977ec1c, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Positions: + - {x: 0, y: 0, z: 0.00009899999} + - {x: 0, y: 0, z: 0.06608878} + - {x: 0, y: 0, z: 0.13209635} + - {x: 0, y: 0, z: 0.19813946} + - {x: 0, y: 0, z: 0.26423594} + - {x: 0, y: 0, z: 0.3304035} + - {x: 0, y: 0, z: 0.3966599} + - {x: 0, y: 0, z: 0.46302295} + - {x: 0, y: 0, z: 0.52951044} + - {x: 0, y: 0, z: 0.59614} + - {x: 0, y: 0, z: 0.66292953} + - {x: 0, y: 0, z: 0.7298968} + - {x: 0, y: 0, z: 0.7970595} + - {x: 0, y: 0, z: 0.8644354} + - {x: 0, y: 0, z: 0.93204236} + - {x: 0, y: 0, z: 0.999898} + m_Parameters: + serializedVersion: 3 + widthMultiplier: 0.01 + widthCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.2 + inSlope: 0 + outSlope: 0 + tangentMode: 34 + weightedMode: 0 + inWeight: 0 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0.2 + inSlope: 0 + outSlope: 0 + tangentMode: 34 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + colorGradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 0} + key1: {r: 0.4716981, g: 0.4716981, b: 0.4716981, a: 1} + key2: {r: 0, g: 0, b: 0, a: 1} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 1} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 9638 + atime2: 53970 + atime3: 65535 + atime4: 65535 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 4 + numCornerVertices: 8 + numCapVertices: 8 + alignment: 0 + textureMode: 3 + shadowBias: 0 + generateLightingData: 0 + m_UseWorldSpace: 1 + m_Loop: 0 +--- !u!114 &1526809385130449531 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1247086986094436} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 01f6e868e3234547a04741fe2c20bd0d, type: 3} + m_Name: + m_EditorClassIdentifier: + lineDataSource: {fileID: 6863193991115524521} + lineColor: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 0} + key1: {r: 0.4716981, g: 0.4716981, b: 0.4716981, a: 1} + key2: {r: 0, g: 0, b: 0, a: 1} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 1} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 9638 + atime2: 53970 + atime3: 65535 + atime4: 65535 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 4 + lineWidth: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.2 + inSlope: 0 + outSlope: 0 + tangentMode: 34 + weightedMode: 0 + inWeight: 0 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0.2 + inSlope: 0 + outSlope: 0 + tangentMode: 34 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + widthMultiplier: 0.01 + colorOffset: 0 + widthOffset: 0 + stepMode: 0 + lineStepCount: 16 + pointDistributionMode: 1 + customPointDistributionLength: 0.1 + customPointDistributionCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 1 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 1 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + lineMaterial: {fileID: 2100000, guid: 49bbec7a7ebd47c786bf06ad0977ec1c, type: 2} + roundedEdges: 1 + roundedCaps: 1 + lineRenderer: {fileID: 3080660041806603478} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/HandControllerFarPointer.prefab.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/HandControllerFarPointer.prefab.meta new file mode 100644 index 00000000..21470633 --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/HandControllerFarPointer.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3c6b5e276e9a37446b574ff0ee1eee58 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/NearPointer.prefab b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/HandControllerNearPointer.prefab similarity index 100% rename from XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/NearPointer.prefab rename to XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/HandControllerNearPointer.prefab diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/NearPointer.prefab.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/HandControllerNearPointer.prefab.meta similarity index 100% rename from XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/NearPointer.prefab.meta rename to XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/HandControllerNearPointer.prefab.meta diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandSpatialPointerInteractionMappingProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandSpatialPointerInteractionMappingProfile.asset index 1c23854e..d510d6b1 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandSpatialPointerInteractionMappingProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandSpatialPointerInteractionMappingProfile.asset @@ -28,4 +28,4 @@ MonoBehaviour: axisCodeY: inputProcessors: [] pointerProfiles: - - {fileID: 11400000, guid: 9e0e4acc675a18b4b9c65e9ff85cfe58, type: 2} + - {fileID: 11400000, guid: aa72cf2eb48c6fe44a827f7d68ce3e44, type: 2} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/Pointers/HandControllerFarPointerProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/Pointers/HandControllerFarPointerProfile.asset new file mode 100644 index 00000000..b2086a80 --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/Pointers/HandControllerFarPointerProfile.asset @@ -0,0 +1,23 @@ +%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: c156ea3e1a7a493dac236ed84c4a819a, type: 3} + m_Name: HandControllerFarPointerProfile + m_EditorClassIdentifier: + pointerPrefab: {fileID: 1247086986094436, guid: 3c6b5e276e9a37446b574ff0ee1eee58, + type: 3} + pointingExtent: 10 + pointingRaycastLayerMasks: + - serializedVersion: 2 + m_Bits: 4294967291 + drawDebugPointingRays: 0 + debugPointingRayColors: + - {r: 0, g: 1, b: 0, a: 1} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/Pointers/HandControllerFarPointerProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/Pointers/HandControllerFarPointerProfile.asset.meta new file mode 100644 index 00000000..aeaece32 --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/Pointers/HandControllerFarPointerProfile.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: aa72cf2eb48c6fe44a827f7d68ce3e44 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandRayPointer.cs b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandRayPointer.cs new file mode 100644 index 00000000..c9e9d242 --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandRayPointer.cs @@ -0,0 +1,34 @@ +// Copyright (c) XRTK. All rights reserved. +// Licensed under the MIT License. See LICENSE in the project root for license information. + +using UnityEngine; +using XRTK.Definitions.Controllers.Hands; +using XRTK.EventDatum.Input; +using XRTK.Interfaces.Providers.Controllers.Hands; + +namespace XRTK.SDK.UX.Pointers +{ + /// + /// Extends the simple line pointer for drawing lines from the input source origin to the current pointer position, + /// by adding visual state + /// + public class HandRayPointer : LinePointer + { + /// + public override void OnInputChanged(InputEventData eventData) + { + base.OnInputChanged(eventData); + + // We listen for hand data changes here, so we can adjust the pointer's + // state if needed. + if (Controller is IMixedRealityHandController handController) + { + enabled = handController.IsPointing; + } + else + { + Debug.LogError($"{typeof(HandRayPointer).Name} is only for use with {typeof(IMixedRealityHandController).Name} controllers!", this); + } + } + } +} \ No newline at end of file diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandRayPointer.cs.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandRayPointer.cs.meta new file mode 100644 index 00000000..c69026f5 --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandRayPointer.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9804cfa462754d0469b3fcb7e1dbf234 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {fileID: 2800000, guid: 08c0fd91bdca45afa09ec64323cf3848, type: 3} + userData: + assetBundleName: + assetBundleVariant: From 154136e18fc7010762aeb15023910c7b67bc1451 Mon Sep 17 00:00:00 2001 From: Dino Fejzagic Date: Tue, 19 May 2020 19:33:04 +0200 Subject: [PATCH 39/78] Implement runtime physics toggle --- .../UX/Pointers/HandRayPointerInspector.cs | 2 +- ...DefaultLeftHandControllerVisualizer.prefab | 2 +- ...efaultRightHandControllerVisualizer.prefab | 2 +- ...ab => HandControllerSpatialPointer.prefab} | 6 +- ... HandControllerSpatialPointer.prefab.meta} | 0 ...> HandGrabInteractionMappingProfile.asset} | 2 +- ...dGrabInteractionMappingProfile.asset.meta} | 0 ... HandPointInteractionMappingProfile.asset} | 2 +- ...PointInteractionMappingProfile.asset.meta} | 0 ...ointerPoseInteractionMappingProfile.asset} | 4 +- ...rPoseInteractionMappingProfile.asset.meta} | 0 ...rackedPoseInteractionMappingProfile.asset} | 2 +- ...dPoseInteractionMappingProfile.asset.meta} | 0 ...HandControllerSpatialPointerProfile.asset} | 2 +- ...ontrollerSpatialPointerProfile.asset.meta} | 0 .../Hands/DefaultHandControllerVisualizer.cs | 16 +++-- .../Hands/HandControllerJointsVisualizer.cs | 3 +- .../UX/Scripts/Pointers/HandRayPointer.cs | 34 ---------- .../UX/Scripts/Pointers/HandSpatialPointer.cs | 64 +++++++++++++++++++ ...ter.cs.meta => HandSpatialPointer.cs.meta} | 2 +- .../Scripts/Pointers/SurfaceTouchPointer.cs | 16 ----- .../Pointers/SurfaceTouchPointer.cs.meta | 11 ---- 22 files changed, 91 insertions(+), 79 deletions(-) rename XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/{HandControllerFarPointer.prefab => HandControllerSpatialPointer.prefab} (98%) rename XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/{HandControllerFarPointer.prefab.meta => HandControllerSpatialPointer.prefab.meta} (100%) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/{HandGrabProfileInteractionMappingProfile.asset => HandGrabInteractionMappingProfile.asset} (93%) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/{HandGrabProfileInteractionMappingProfile.asset.meta => HandGrabInteractionMappingProfile.asset.meta} (100%) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/{HandPointProfileInteractionMappingProfile.asset => HandPointInteractionMappingProfile.asset} (93%) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/{HandPointProfileInteractionMappingProfile.asset.meta => HandPointInteractionMappingProfile.asset.meta} (100%) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/{HandSpatialPointerInteractionMappingProfile.asset => HandSpatialPointerPoseInteractionMappingProfile.asset} (88%) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/{HandSpatialPointerInteractionMappingProfile.asset.meta => HandSpatialPointerPoseInteractionMappingProfile.asset.meta} (100%) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/{HandTrackedPoseProfileInteractionMappingProfile.asset => HandTrackedPoseInteractionMappingProfile.asset} (92%) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/{HandTrackedPoseProfileInteractionMappingProfile.asset.meta => HandTrackedPoseInteractionMappingProfile.asset.meta} (100%) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/Pointers/{HandControllerFarPointerProfile.asset => HandControllerSpatialPointerProfile.asset} (93%) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/Pointers/{HandControllerFarPointerProfile.asset.meta => HandControllerSpatialPointerProfile.asset.meta} (100%) delete mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandRayPointer.cs create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandSpatialPointer.cs rename XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/{HandRayPointer.cs.meta => HandSpatialPointer.cs.meta} (86%) delete mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/SurfaceTouchPointer.cs delete mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/SurfaceTouchPointer.cs.meta diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Editor/UX/Pointers/HandRayPointerInspector.cs b/XRTK.SDK/Packages/com.xrtk.sdk/Editor/UX/Pointers/HandRayPointerInspector.cs index 26b5840d..499e0973 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Editor/UX/Pointers/HandRayPointerInspector.cs +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Editor/UX/Pointers/HandRayPointerInspector.cs @@ -6,7 +6,7 @@ namespace XRTK.SDK.Editor.UX.Pointers { - [CustomEditor(typeof(HandRayPointer))] + [CustomEditor(typeof(HandSpatialPointer))] public class HandRayPointerInspector : LinePointerInspector { diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/DefaultLeftHandControllerVisualizer.prefab b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/DefaultLeftHandControllerVisualizer.prefab index ac5cbaf6..3d861bc6 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/DefaultLeftHandControllerVisualizer.prefab +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/DefaultLeftHandControllerVisualizer.prefab @@ -53,5 +53,5 @@ MonoBehaviour: axisConstraint: 0 jointsModePrefab: {fileID: 9173983480249558903, guid: 081f7848cfd94b34f9c774490cd7e2fb, type: 3} - meshModePrefab: {fileID: 1887883006053652, guid: 81cacd47fbb47714d8b19cffb1edf4af, + meshModePrefab: {fileID: 1887883006053652, guid: 12df5e0d0c33a444a985de4e29533a24, type: 3} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/DefaultRightHandControllerVisualizer.prefab b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/DefaultRightHandControllerVisualizer.prefab index b65a6038..c2ce4346 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/DefaultRightHandControllerVisualizer.prefab +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/DefaultRightHandControllerVisualizer.prefab @@ -47,7 +47,7 @@ PrefabInstance: type: 3} propertyPath: meshModePrefab value: - objectReference: {fileID: 5177809551914790478, guid: e7441264aa8569b4aae36828878435af, + objectReference: {fileID: -6863652107527007305, guid: e7441264aa8569b4aae36828878435af, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 61feeca21178ba54682d3c61ff5f89a1, type: 3} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/HandControllerFarPointer.prefab b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/HandControllerSpatialPointer.prefab similarity index 98% rename from XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/HandControllerFarPointer.prefab rename to XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/HandControllerSpatialPointer.prefab index f10d82da..c2801792 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/HandControllerFarPointer.prefab +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/HandControllerSpatialPointer.prefab @@ -15,7 +15,7 @@ GameObject: - component: {fileID: 3080660041806603478} - component: {fileID: 1526809385130449531} m_Layer: 0 - m_Name: HandControllerFarPointer + m_Name: HandControllerSpatialPointer m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -151,7 +151,7 @@ MonoBehaviour: m_GameObject: {fileID: 1247086986094436} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9804cfa462754d0469b3fcb7e1dbf234, type: 3} + m_Script: {fileID: 11500000, guid: 3d1a1d7915ba964419ef4bddb15415ac, type: 3} m_Name: m_EditorClassIdentifier: handedness: 1 @@ -328,7 +328,7 @@ MonoBehaviour: m_Mode: 0 m_NumColorKeys: 2 m_NumAlphaKeys: 4 - lineCastResolution: 10 + lineCastResolution: 2 lineBase: {fileID: 6863193991115524521} lineRenderers: - {fileID: 1526809385130449531} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/HandControllerFarPointer.prefab.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/HandControllerSpatialPointer.prefab.meta similarity index 100% rename from XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/HandControllerFarPointer.prefab.meta rename to XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/HandControllerSpatialPointer.prefab.meta diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandGrabProfileInteractionMappingProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandGrabInteractionMappingProfile.asset similarity index 93% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandGrabProfileInteractionMappingProfile.asset rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandGrabInteractionMappingProfile.asset index 2c6606cc..445d2960 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandGrabProfileInteractionMappingProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandGrabInteractionMappingProfile.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: e3fb79524faca40478c0844c24e542f7, type: 3} - m_Name: HandGrabProfileInteractionMappingProfile + m_Name: HandGrabInteractionMappingProfile m_EditorClassIdentifier: interactionMapping: description: Grab diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandGrabProfileInteractionMappingProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandGrabInteractionMappingProfile.asset.meta similarity index 100% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandGrabProfileInteractionMappingProfile.asset.meta rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandGrabInteractionMappingProfile.asset.meta diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandPointProfileInteractionMappingProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandPointInteractionMappingProfile.asset similarity index 93% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandPointProfileInteractionMappingProfile.asset rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandPointInteractionMappingProfile.asset index b2770a26..18821173 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandPointProfileInteractionMappingProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandPointInteractionMappingProfile.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: e3fb79524faca40478c0844c24e542f7, type: 3} - m_Name: HandPointProfileInteractionMappingProfile + m_Name: HandPointInteractionMappingProfile m_EditorClassIdentifier: interactionMapping: description: Point diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandPointProfileInteractionMappingProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandPointInteractionMappingProfile.asset.meta similarity index 100% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandPointProfileInteractionMappingProfile.asset.meta rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandPointInteractionMappingProfile.asset.meta diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandSpatialPointerInteractionMappingProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandSpatialPointerPoseInteractionMappingProfile.asset similarity index 88% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandSpatialPointerInteractionMappingProfile.asset rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandSpatialPointerPoseInteractionMappingProfile.asset index d510d6b1..af4d831e 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandSpatialPointerInteractionMappingProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandSpatialPointerPoseInteractionMappingProfile.asset @@ -10,10 +10,10 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: e3fb79524faca40478c0844c24e542f7, type: 3} - m_Name: HandSpatialPointerInteractionMappingProfile + m_Name: HandSpatialPointerPoseInteractionMappingProfile m_EditorClassIdentifier: interactionMapping: - description: Index Spatial Pointer + description: Spatial Pointer Pose stateChangeType: 0 axisType: 7 inputType: 3 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandSpatialPointerInteractionMappingProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandSpatialPointerPoseInteractionMappingProfile.asset.meta similarity index 100% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandSpatialPointerInteractionMappingProfile.asset.meta rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandSpatialPointerPoseInteractionMappingProfile.asset.meta diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandTrackedPoseProfileInteractionMappingProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandTrackedPoseInteractionMappingProfile.asset similarity index 92% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandTrackedPoseProfileInteractionMappingProfile.asset rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandTrackedPoseInteractionMappingProfile.asset index 5e57c62d..85b9e921 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandTrackedPoseProfileInteractionMappingProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandTrackedPoseInteractionMappingProfile.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: e3fb79524faca40478c0844c24e542f7, type: 3} - m_Name: HandTrackedPoseProfileInteractionMappingProfile + m_Name: HandTrackedPoseInteractionMappingProfile m_EditorClassIdentifier: interactionMapping: description: Tracked Pose diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandTrackedPoseProfileInteractionMappingProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandTrackedPoseInteractionMappingProfile.asset.meta similarity index 100% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandTrackedPoseProfileInteractionMappingProfile.asset.meta rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandTrackedPoseInteractionMappingProfile.asset.meta diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/Pointers/HandControllerFarPointerProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/Pointers/HandControllerSpatialPointerProfile.asset similarity index 93% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/Pointers/HandControllerFarPointerProfile.asset rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/Pointers/HandControllerSpatialPointerProfile.asset index b2086a80..8f8cdc31 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/Pointers/HandControllerFarPointerProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/Pointers/HandControllerSpatialPointerProfile.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: c156ea3e1a7a493dac236ed84c4a819a, type: 3} - m_Name: HandControllerFarPointerProfile + m_Name: HandControllerSpatialPointerProfile m_EditorClassIdentifier: pointerPrefab: {fileID: 1247086986094436, guid: 3c6b5e276e9a37446b574ff0ee1eee58, type: 3} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/Pointers/HandControllerFarPointerProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/Pointers/HandControllerSpatialPointerProfile.asset.meta similarity index 100% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/Pointers/HandControllerFarPointerProfile.asset.meta rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/Pointers/HandControllerSpatialPointerProfile.asset.meta diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/DefaultHandControllerVisualizer.cs b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/DefaultHandControllerVisualizer.cs index 65a0f82d..63a3fc7b 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/DefaultHandControllerVisualizer.cs +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/DefaultHandControllerVisualizer.cs @@ -61,7 +61,7 @@ public GameObject GameObject /// /// The actual game object that is parent to all controller visualization of this hand controller. /// - public GameObject HandVisualizationGameObject => ((IMixedRealityHandControllerDataProvider)Controller.ControllerDataProvider).HandPhysicsEnabled ? PhysicsCompanionGameObject : GameObject; + public GameObject HandVisualizationGameObject => HandControllerDataProvider.HandPhysicsEnabled ? PhysicsCompanionGameObject : GameObject; private IMixedRealityHandControllerDataProvider handControllerDataProvider; @@ -75,15 +75,15 @@ protected override void OnDestroy() { // In case physics are enabled we need to take destroy the // physics game object as well when destroying the hand visualizer. - if (GameObject != HandVisualizationGameObject) + if (PhysicsCompanionGameObject != null) { if (Application.isEditor) { - DestroyImmediate(HandVisualizationGameObject); + DestroyImmediate(PhysicsCompanionGameObject); } else { - Destroy(HandVisualizationGameObject); + Destroy(PhysicsCompanionGameObject); } } @@ -143,6 +143,7 @@ private void UpdatePhysicsConfiguration() // the physics companion is setup properly. if (PhysicsCompanionGameObject != null) { + PhysicsCompanionGameObject.SetActive(true); return; } @@ -153,16 +154,22 @@ private void UpdatePhysicsConfiguration() Rigidbody controllerRigidbody = GameObject.GetOrAddComponent(); controllerRigidbody.isKinematic = true; controllerRigidbody.useGravity = false; + controllerRigidbody.collisionDetectionMode = CollisionDetectionMode.ContinuousDynamic; // Make the physics proxy a fixed joint rigidbody to the controller // and give it an adamantium coated connection so it doesn't break. Rigidbody physicsRigidbody = PhysicsCompanionGameObject.GetOrAddComponent(); physicsRigidbody.mass = float.MaxValue; + physicsRigidbody.collisionDetectionMode = CollisionDetectionMode.ContinuousDynamic; FixedJoint fixedJoint = PhysicsCompanionGameObject.GetOrAddComponent(); fixedJoint.connectedBody = controllerRigidbody; fixedJoint.breakForce = float.MaxValue; fixedJoint.breakTorque = float.MaxValue; } + else if (PhysicsCompanionGameObject != null) + { + PhysicsCompanionGameObject.SetActive(false); + } } private void UpdateHandColliders() @@ -310,6 +317,7 @@ public Transform GetOrCreateJointTransform(TrackedHandJoint handJoint) { if (jointTransforms.TryGetValue(handJoint, out Transform existingJointTransform)) { + existingJointTransform.parent = HandVisualizationGameObject.transform; existingJointTransform.gameObject.SetActive(true); return existingJointTransform; } diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/HandControllerJointsVisualizer.cs b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/HandControllerJointsVisualizer.cs index f4d148c6..714e1c51 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/HandControllerJointsVisualizer.cs +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/HandControllerJointsVisualizer.cs @@ -68,8 +68,9 @@ public void UpdateVisualization(DefaultHandControllerVisualizer mainVisualizer) private void CreateJointVisualizerIfNotExists(TrackedHandJoint handJoint) { - if (jointVisualizations.TryGetValue(handJoint, out _)) + if (jointVisualizations.TryGetValue(handJoint, out GameObject jointObject)) { + jointObject.SetActive(true); return; } diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandRayPointer.cs b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandRayPointer.cs deleted file mode 100644 index c9e9d242..00000000 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandRayPointer.cs +++ /dev/null @@ -1,34 +0,0 @@ -// Copyright (c) XRTK. All rights reserved. -// Licensed under the MIT License. See LICENSE in the project root for license information. - -using UnityEngine; -using XRTK.Definitions.Controllers.Hands; -using XRTK.EventDatum.Input; -using XRTK.Interfaces.Providers.Controllers.Hands; - -namespace XRTK.SDK.UX.Pointers -{ - /// - /// Extends the simple line pointer for drawing lines from the input source origin to the current pointer position, - /// by adding visual state - /// - public class HandRayPointer : LinePointer - { - /// - public override void OnInputChanged(InputEventData eventData) - { - base.OnInputChanged(eventData); - - // We listen for hand data changes here, so we can adjust the pointer's - // state if needed. - if (Controller is IMixedRealityHandController handController) - { - enabled = handController.IsPointing; - } - else - { - Debug.LogError($"{typeof(HandRayPointer).Name} is only for use with {typeof(IMixedRealityHandController).Name} controllers!", this); - } - } - } -} \ No newline at end of file diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandSpatialPointer.cs b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandSpatialPointer.cs new file mode 100644 index 00000000..d6a9073d --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandSpatialPointer.cs @@ -0,0 +1,64 @@ +// Copyright (c) XRTK. All rights reserved. +// Licensed under the MIT License. See LICENSE in the project root for license information. + +using UnityEngine; +using XRTK.Definitions.Controllers.Hands; +using XRTK.EventDatum.Input; +using XRTK.Interfaces.InputSystem; +using XRTK.Interfaces.Providers.Controllers.Hands; + +namespace XRTK.SDK.UX.Pointers +{ + /// + /// Extends the simple line pointer for drawing lines from the input source origin to the current pointer position, + /// by adding visual state + /// + public class HandSpatialPointer : LinePointer + { + private IMixedRealityPointer nearPointer; + + /// + public override bool IsInteractionEnabled => base.IsInteractionEnabled && IsNearPointerIdle; + + /// + /// Gets the near pointer attached to the hand. + /// + private IMixedRealityPointer NearPointer => nearPointer ?? (nearPointer = InitializeNearPointerReference()); + + /// + /// Is the near pointer in an idle state where it's not + /// interacting with anything and not targeting anything? + /// + private bool IsNearPointerIdle => NearPointer != null && NearPointer.Result.CurrentPointerTarget == null; + + /// + public override void OnInputChanged(InputEventData eventData) + { + base.OnInputChanged(eventData); + + // This pointer type must only be used with hand controllers. + var handController = Controller as IMixedRealityHandController; + if (handController == null) + { + Debug.LogError($"{typeof(HandSpatialPointer).Name} is only for use with {typeof(IMixedRealityHandController).Name} controllers!", this); + return; + } + + //enabled = handController.IsPointing; + } + + private IMixedRealityPointer InitializeNearPointerReference() + { + for (int i = 0; i < Controller.InputSource.Pointers.Length; i++) + { + var pointer = Controller.InputSource.Pointers[i]; + if (!pointer.PointerId.Equals(PointerId)) + { + return pointer; + } + } + + return null; + } + } +} \ No newline at end of file diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandRayPointer.cs.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandSpatialPointer.cs.meta similarity index 86% rename from XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandRayPointer.cs.meta rename to XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandSpatialPointer.cs.meta index c69026f5..c7697049 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandRayPointer.cs.meta +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandSpatialPointer.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9804cfa462754d0469b3fcb7e1dbf234 +guid: 3d1a1d7915ba964419ef4bddb15415ac MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/SurfaceTouchPointer.cs b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/SurfaceTouchPointer.cs deleted file mode 100644 index 275adee7..00000000 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/SurfaceTouchPointer.cs +++ /dev/null @@ -1,16 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. See LICENSE in the project root for license information. - -using UnityEngine; -using XRTK.Definitions.Physics; - -namespace XRTK.SDK.UX.Pointers -{ - /// - /// A pointer for touching surfaces in 3D space. - /// - public class SurfaceTouchPointer : BaseControllerPointer - { - - } -} \ No newline at end of file diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/SurfaceTouchPointer.cs.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/SurfaceTouchPointer.cs.meta deleted file mode 100644 index 9781903b..00000000 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/SurfaceTouchPointer.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: cf31a69c011196e4284aa3715a1e20a4 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {fileID: 2800000, guid: 08c0fd91bdca45afa09ec64323cf3848, type: 3} - userData: - assetBundleName: - assetBundleVariant: From 177f75e7e23b3165d7e723e28ac298f414158d0c Mon Sep 17 00:00:00 2001 From: Dino Fejzagic Date: Tue, 19 May 2020 20:54:45 +0200 Subject: [PATCH 40/78] Implement runtime bounds mode selection --- .../Hands/DefaultHandControllerVisualizer.cs | 107 ++++++++++++------ 1 file changed, 74 insertions(+), 33 deletions(-) diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/DefaultHandControllerVisualizer.cs b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/DefaultHandControllerVisualizer.cs index 63a3fc7b..e70222b7 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/DefaultHandControllerVisualizer.cs +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/DefaultHandControllerVisualizer.cs @@ -20,6 +20,8 @@ namespace XRTK.SDK.UX.Controllers.Hands public class DefaultHandControllerVisualizer : ControllerPoseSynchronizer, IMixedRealityControllerVisualizer { private readonly Dictionary jointTransforms = new Dictionary(); + private BoxCollider handBoundsModeCollider; + private Dictionary fingerBoundsModeColliders = new Dictionary(); private const float fingerColliderRadius = .007f; private const int capsuleColliderZAxis = 2; HandControllerJointsVisualizer jointsVisualizer; @@ -154,7 +156,7 @@ private void UpdatePhysicsConfiguration() Rigidbody controllerRigidbody = GameObject.GetOrAddComponent(); controllerRigidbody.isKinematic = true; controllerRigidbody.useGravity = false; - controllerRigidbody.collisionDetectionMode = CollisionDetectionMode.ContinuousDynamic; + controllerRigidbody.collisionDetectionMode = CollisionDetectionMode.ContinuousSpeculative; // Make the physics proxy a fixed joint rigidbody to the controller // and give it an adamantium coated connection so it doesn't break. @@ -180,18 +182,21 @@ private void UpdateHandColliders() if (HandControllerDataProvider.BoundsMode == HandBoundsMode.Fingers) { + // Make sure to disable other colliders not needed for the fingers mode. + DisableHandBounds(); + if (handController.TryGetBounds(TrackedHandBounds.Thumb, out Bounds[] thumbBounds)) { // Thumb bounds are made up of two capsule collider bounds entries. Bounds knuckleToMiddle = thumbBounds[0]; Bounds middleToTip = thumbBounds[1]; - GameObject thumbKnuckleGameObject = GetOrCreateJointTransform(TrackedHandJoint.ThumbMetacarpalJoint).gameObject; - CapsuleCollider capsuleCollider = thumbKnuckleGameObject.GetOrAddComponent(); + var thumbKnuckleGameObject = GetOrCreateJointTransform(TrackedHandJoint.ThumbMetacarpalJoint).gameObject; + var capsuleCollider = GetOrCreateCapsuleCollider(TrackedHandJoint.ThumbMetacarpalJoint, thumbKnuckleGameObject); ConfigureCapsuleCollider(capsuleCollider, knuckleToMiddle, thumbKnuckleGameObject.transform); - GameObject thumbMiddleGameObject = GetOrCreateJointTransform(TrackedHandJoint.ThumbProximalJoint).gameObject; - capsuleCollider = thumbMiddleGameObject.GetOrAddComponent(); + var thumbMiddleGameObject = GetOrCreateJointTransform(TrackedHandJoint.ThumbProximalJoint).gameObject; + capsuleCollider = GetOrCreateCapsuleCollider(TrackedHandJoint.ThumbProximalJoint, thumbMiddleGameObject); ConfigureCapsuleCollider(capsuleCollider, middleToTip, thumbMiddleGameObject.transform); } @@ -201,12 +206,12 @@ private void UpdateHandColliders() Bounds knuckleToMiddle = indexFingerBounds[0]; Bounds middleToTip = indexFingerBounds[1]; - GameObject indexKnuckleGameObject = GetOrCreateJointTransform(TrackedHandJoint.IndexKnuckle).gameObject; - CapsuleCollider capsuleCollider = indexKnuckleGameObject.GetOrAddComponent(); + var indexKnuckleGameObject = GetOrCreateJointTransform(TrackedHandJoint.IndexKnuckle).gameObject; + var capsuleCollider = GetOrCreateCapsuleCollider(TrackedHandJoint.IndexKnuckle, indexKnuckleGameObject); ConfigureCapsuleCollider(capsuleCollider, knuckleToMiddle, indexKnuckleGameObject.transform); - GameObject indexMiddleGameObject = GetOrCreateJointTransform(TrackedHandJoint.IndexMiddleJoint).gameObject; - capsuleCollider = indexMiddleGameObject.GetOrAddComponent(); + var indexMiddleGameObject = GetOrCreateJointTransform(TrackedHandJoint.IndexMiddleJoint).gameObject; + capsuleCollider = GetOrCreateCapsuleCollider(TrackedHandJoint.IndexMiddleJoint, indexMiddleGameObject); ConfigureCapsuleCollider(capsuleCollider, middleToTip, indexMiddleGameObject.transform); } @@ -216,12 +221,12 @@ private void UpdateHandColliders() Bounds knuckleToMiddle = middleFingerBounds[0]; Bounds middleToTip = middleFingerBounds[1]; - GameObject middleKnuckleGameObject = GetOrCreateJointTransform(TrackedHandJoint.MiddleKnuckle).gameObject; - CapsuleCollider capsuleCollider = middleKnuckleGameObject.GetOrAddComponent(); + var middleKnuckleGameObject = GetOrCreateJointTransform(TrackedHandJoint.MiddleKnuckle).gameObject; + var capsuleCollider = GetOrCreateCapsuleCollider(TrackedHandJoint.MiddleKnuckle, middleKnuckleGameObject); ConfigureCapsuleCollider(capsuleCollider, knuckleToMiddle, middleKnuckleGameObject.transform); - GameObject middleMiddleGameObject = GetOrCreateJointTransform(TrackedHandJoint.MiddleMiddleJoint).gameObject; - capsuleCollider = middleMiddleGameObject.GetOrAddComponent(); + var middleMiddleGameObject = GetOrCreateJointTransform(TrackedHandJoint.MiddleMiddleJoint).gameObject; + capsuleCollider = GetOrCreateCapsuleCollider(TrackedHandJoint.MiddleMiddleJoint, middleMiddleGameObject); ConfigureCapsuleCollider(capsuleCollider, middleToTip, middleMiddleGameObject.transform); } @@ -231,12 +236,12 @@ private void UpdateHandColliders() Bounds knuckleToMiddle = ringFingerBounds[0]; Bounds middleToTip = ringFingerBounds[1]; - GameObject ringKnuckleGameObject = GetOrCreateJointTransform(TrackedHandJoint.RingKnuckle).gameObject; - CapsuleCollider capsuleCollider = ringKnuckleGameObject.GetOrAddComponent(); + var ringKnuckleGameObject = GetOrCreateJointTransform(TrackedHandJoint.RingKnuckle).gameObject; + var capsuleCollider = GetOrCreateCapsuleCollider(TrackedHandJoint.RingKnuckle, ringKnuckleGameObject); ConfigureCapsuleCollider(capsuleCollider, knuckleToMiddle, ringKnuckleGameObject.transform); - GameObject ringMiddleGameObject = GetOrCreateJointTransform(TrackedHandJoint.RingMiddleJoint).gameObject; - capsuleCollider = ringMiddleGameObject.GetOrAddComponent(); + var ringMiddleGameObject = GetOrCreateJointTransform(TrackedHandJoint.RingMiddleJoint).gameObject; + capsuleCollider = GetOrCreateCapsuleCollider(TrackedHandJoint.RingMiddleJoint, ringMiddleGameObject); ConfigureCapsuleCollider(capsuleCollider, middleToTip, ringMiddleGameObject.transform); } @@ -246,12 +251,12 @@ private void UpdateHandColliders() Bounds knuckleToMiddle = pinkyFingerBounds[0]; Bounds middleToTip = pinkyFingerBounds[1]; - GameObject pinkyKnuckleGameObject = GetOrCreateJointTransform(TrackedHandJoint.PinkyKnuckle).gameObject; - CapsuleCollider capsuleCollider = pinkyKnuckleGameObject.GetOrAddComponent(); + var pinkyKnuckleGameObject = GetOrCreateJointTransform(TrackedHandJoint.PinkyKnuckle).gameObject; + var capsuleCollider = GetOrCreateCapsuleCollider(TrackedHandJoint.PinkyKnuckle, pinkyKnuckleGameObject); ConfigureCapsuleCollider(capsuleCollider, knuckleToMiddle, pinkyKnuckleGameObject.transform); - GameObject pinkyMiddleGameObject = GetOrCreateJointTransform(TrackedHandJoint.PinkyMiddleJoint).gameObject; - capsuleCollider = pinkyMiddleGameObject.GetOrAddComponent(); + var pinkyMiddleGameObject = GetOrCreateJointTransform(TrackedHandJoint.PinkyMiddleJoint).gameObject; + capsuleCollider = GetOrCreateCapsuleCollider(TrackedHandJoint.PinkyMiddleJoint, pinkyMiddleGameObject); ConfigureCapsuleCollider(capsuleCollider, middleToTip, pinkyMiddleGameObject.transform); } @@ -260,37 +265,40 @@ private void UpdateHandColliders() // For the palm we create a composite collider using a capsule collider per // finger for the area metacarpal <-> knuckle. Bounds indexPalmBounds = palmBounds[0]; - GameObject indexMetacarpalGameObject = GetOrCreateJointTransform(TrackedHandJoint.IndexMetacarpal).gameObject; - CapsuleCollider capsuleCollider = indexMetacarpalGameObject.GetOrAddComponent(); + var indexMetacarpalGameObject = GetOrCreateJointTransform(TrackedHandJoint.IndexMetacarpal).gameObject; + var capsuleCollider = GetOrCreateCapsuleCollider(TrackedHandJoint.IndexMetacarpal, indexMetacarpalGameObject); ConfigureCapsuleCollider(capsuleCollider, indexPalmBounds, indexMetacarpalGameObject.transform); Bounds middlePalmBounds = palmBounds[1]; - GameObject middleMetacarpalGameObject = GetOrCreateJointTransform(TrackedHandJoint.MiddleMetacarpal).gameObject; - capsuleCollider = middleMetacarpalGameObject.GetOrAddComponent(); + var middleMetacarpalGameObject = GetOrCreateJointTransform(TrackedHandJoint.MiddleMetacarpal).gameObject; + capsuleCollider = GetOrCreateCapsuleCollider(TrackedHandJoint.MiddleMetacarpal, middleMetacarpalGameObject); ConfigureCapsuleCollider(capsuleCollider, middlePalmBounds, middleMetacarpalGameObject.transform); Bounds ringPalmBounds = palmBounds[2]; - GameObject ringMetacarpalGameObject = GetOrCreateJointTransform(TrackedHandJoint.RingMetacarpal).gameObject; - capsuleCollider = ringMetacarpalGameObject.GetOrAddComponent(); + var ringMetacarpalGameObject = GetOrCreateJointTransform(TrackedHandJoint.RingMetacarpal).gameObject; + capsuleCollider = GetOrCreateCapsuleCollider(TrackedHandJoint.RingMetacarpal, ringMetacarpalGameObject); ConfigureCapsuleCollider(capsuleCollider, ringPalmBounds, ringMetacarpalGameObject.transform); Bounds pinkyPalmBounds = palmBounds[3]; - GameObject pinkyMetacarpalGameObject = GetOrCreateJointTransform(TrackedHandJoint.PinkyMetacarpal).gameObject; - capsuleCollider = pinkyMetacarpalGameObject.GetOrAddComponent(); + var pinkyMetacarpalGameObject = GetOrCreateJointTransform(TrackedHandJoint.PinkyMetacarpal).gameObject; + capsuleCollider = GetOrCreateCapsuleCollider(TrackedHandJoint.PinkyMetacarpal, pinkyMetacarpalGameObject); ConfigureCapsuleCollider(capsuleCollider, pinkyPalmBounds, pinkyMetacarpalGameObject.transform); } } else if (HandControllerDataProvider.BoundsMode == HandBoundsMode.Hand) { + DisableFingerBounds(); + if (handController.TryGetBounds(TrackedHandBounds.Hand, out Bounds[] handBounds)) { // For full hand bounds we'll only get one bounds entry, which is a box // encapsulating the whole hand. Bounds fullHandBounds = handBounds[0]; - BoxCollider boxCollider = HandVisualizationGameObject.GetOrAddComponent(); - boxCollider.center = fullHandBounds.center; - boxCollider.size = fullHandBounds.size; - boxCollider.isTrigger = HandControllerDataProvider.UseTriggers; + handBoundsModeCollider = HandVisualizationGameObject.GetOrAddComponent(); + handBoundsModeCollider.enabled = true; + handBoundsModeCollider.center = fullHandBounds.center; + handBoundsModeCollider.size = fullHandBounds.size; + handBoundsModeCollider.isTrigger = HandControllerDataProvider.UseTriggers; } } } @@ -303,6 +311,39 @@ private void ConfigureCapsuleCollider(CapsuleCollider collider, Bounds bounds, T collider.height = bounds.size.magnitude; collider.center = jointTransform.InverseTransformPoint(bounds.center); collider.isTrigger = HandControllerDataProvider.UseTriggers; + collider.enabled = true; + } + + private CapsuleCollider GetOrCreateCapsuleCollider(TrackedHandJoint trackedHandJoint, GameObject forObject) + { + CapsuleCollider collider; + if (fingerBoundsModeColliders.ContainsKey(trackedHandJoint)) + { + collider = fingerBoundsModeColliders[trackedHandJoint]; + } + else + { + collider = forObject.GetOrAddComponent(); + fingerBoundsModeColliders.Add(trackedHandJoint, collider); + } + + return collider; + } + + private void DisableFingerBounds() + { + foreach (var item in fingerBoundsModeColliders) + { + item.Value.enabled = false; + } + } + + private void DisableHandBounds() + { + if (handBoundsModeCollider != null) + { + handBoundsModeCollider.enabled = false; + } } #endregion From d1612091aee19bcece87841529eeb39e0a306a96 Mon Sep 17 00:00:00 2001 From: Dino Fejzagic Date: Wed, 20 May 2020 12:44:04 +0200 Subject: [PATCH 41/78] Fix visuailzation script guid reference --- .../HandControllers/LeftHandVisualizationProfile.asset | 2 +- .../HandControllers/RightHandVisulaizationProfile.asset | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/LeftHandVisualizationProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/LeftHandVisualizationProfile.asset index a054046e..a57f6a18 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/LeftHandVisualizationProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/LeftHandVisualizationProfile.asset @@ -13,7 +13,7 @@ MonoBehaviour: m_Name: LeftHandVisualizationProfile m_EditorClassIdentifier: controllerVisualizationType: - reference: 0b653537-d237-4622-acc6-e351209a5882 + reference: 5d844e0b-f913-46b8-bc3b-fa6429e62c60 useDefaultModels: 0 model: {fileID: 7398244499265140811, guid: 61feeca21178ba54682d3c61ff5f89a1, type: 3} pointerPose: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RightHandVisulaizationProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RightHandVisulaizationProfile.asset index d1879d10..68f31a64 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RightHandVisulaizationProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RightHandVisulaizationProfile.asset @@ -13,7 +13,7 @@ MonoBehaviour: m_Name: RightHandVisulaizationProfile m_EditorClassIdentifier: controllerVisualizationType: - reference: 0b653537-d237-4622-acc6-e351209a5882 + reference: 5d844e0b-f913-46b8-bc3b-fa6429e62c60 useDefaultModels: 0 model: {fileID: 7709636661657395508, guid: 79eeb06cd1ed4224eb6387ce28855a3c, type: 3} pointerPose: From f261c16aac2df9e8ca0823faba833f435de81e8a Mon Sep 17 00:00:00 2001 From: Dino Fejzagic Date: Wed, 20 May 2020 18:58:27 +0200 Subject: [PATCH 42/78] Reduce hand mass --- .../Controllers/Hands/DefaultHandControllerVisualizer.cs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/DefaultHandControllerVisualizer.cs b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/DefaultHandControllerVisualizer.cs index e70222b7..2d90cc68 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/DefaultHandControllerVisualizer.cs +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/DefaultHandControllerVisualizer.cs @@ -4,6 +4,7 @@ using System; using System.Collections.Generic; using UnityEngine; +using UnityEngine.Animations; using XRTK.Definitions.Controllers.Hands; using XRTK.EventDatum.Input; using XRTK.Extensions; @@ -151,9 +152,15 @@ private void UpdatePhysicsConfiguration() PhysicsCompanionGameObject = new GameObject($"{GameObject.name}_Physics"); PhysicsCompanionGameObject.transform.parent = GameObject.transform.parent; + var parentConstraint = PhysicsCompanionGameObject.AddComponent(); + parentConstraint.AddSource(new ConstraintSource + { + sourceTransform = GameObject.transform + }); // Setup the kinematic rigidbody on the actual controller game object. Rigidbody controllerRigidbody = GameObject.GetOrAddComponent(); + controllerRigidbody.mass = 1f; // 1 Kg controllerRigidbody.isKinematic = true; controllerRigidbody.useGravity = false; controllerRigidbody.collisionDetectionMode = CollisionDetectionMode.ContinuousSpeculative; @@ -161,7 +168,7 @@ private void UpdatePhysicsConfiguration() // Make the physics proxy a fixed joint rigidbody to the controller // and give it an adamantium coated connection so it doesn't break. Rigidbody physicsRigidbody = PhysicsCompanionGameObject.GetOrAddComponent(); - physicsRigidbody.mass = float.MaxValue; + physicsRigidbody.mass = 1f; // 1 Kg physicsRigidbody.collisionDetectionMode = CollisionDetectionMode.ContinuousDynamic; FixedJoint fixedJoint = PhysicsCompanionGameObject.GetOrAddComponent(); fixedJoint.connectedBody = controllerRigidbody; From aa7876cd7f42e412d83e246ab61c0f4bb8008451 Mon Sep 17 00:00:00 2001 From: Dino Fejzagic Date: Wed, 20 May 2020 18:59:39 +0200 Subject: [PATCH 43/78] Set hand weight to average human hand weight --- .../Controllers/Hands/DefaultHandControllerVisualizer.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/DefaultHandControllerVisualizer.cs b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/DefaultHandControllerVisualizer.cs index 2d90cc68..e59c2a71 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/DefaultHandControllerVisualizer.cs +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/DefaultHandControllerVisualizer.cs @@ -160,7 +160,7 @@ private void UpdatePhysicsConfiguration() // Setup the kinematic rigidbody on the actual controller game object. Rigidbody controllerRigidbody = GameObject.GetOrAddComponent(); - controllerRigidbody.mass = 1f; // 1 Kg + controllerRigidbody.mass = .46f; // 0.46 Kg average human hand weight controllerRigidbody.isKinematic = true; controllerRigidbody.useGravity = false; controllerRigidbody.collisionDetectionMode = CollisionDetectionMode.ContinuousSpeculative; @@ -168,7 +168,7 @@ private void UpdatePhysicsConfiguration() // Make the physics proxy a fixed joint rigidbody to the controller // and give it an adamantium coated connection so it doesn't break. Rigidbody physicsRigidbody = PhysicsCompanionGameObject.GetOrAddComponent(); - physicsRigidbody.mass = 1f; // 1 Kg + physicsRigidbody.mass = .46f; // 0.46 Kg average human hand weight physicsRigidbody.collisionDetectionMode = CollisionDetectionMode.ContinuousDynamic; FixedJoint fixedJoint = PhysicsCompanionGameObject.GetOrAddComponent(); fixedJoint.connectedBody = controllerRigidbody; From 755044e4408a237f0a6ee659ddbdcd149f2eb8b5 Mon Sep 17 00:00:00 2001 From: Dino Fejzagic Date: Thu, 21 May 2020 14:36:20 +0200 Subject: [PATCH 44/78] Update assets --- .../UX/Pointers/HandNearPointerInspector.cs | 14 + .../Pointers/HandNearPointerInspector.cs.meta | 11 + ...ctor.cs => HandSpatialPointerInspector.cs} | 2 +- ...ta => HandSpatialPointerInspector.cs.meta} | 0 ...efaultRightHandControllerVisualizer.prefab | 2 +- .../Prefabs~/UX/Hands/HandRight_Mesh.prefab | 42 +- .../UX/Hands/HandRight_Mesh.prefab.meta | 2 +- .../Pointers/HandControllerNearPointer.prefab | 938 +++++++++++------- .../HandControllerNearPointer.prefab.meta | 2 +- .../HandControllerNearPointerProfile.asset | 4 +- .../UX/Scripts/Pointers/HandNearPointer.cs | 63 ++ .../Scripts/Pointers/HandNearPointer.cs.meta | 11 + .../UX/Scripts/Pointers/HandSpatialPointer.cs | 10 +- 13 files changed, 701 insertions(+), 400 deletions(-) create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Editor/UX/Pointers/HandNearPointerInspector.cs create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Editor/UX/Pointers/HandNearPointerInspector.cs.meta rename XRTK.SDK/Packages/com.xrtk.sdk/Editor/UX/Pointers/{HandRayPointerInspector.cs => HandSpatialPointerInspector.cs} (80%) rename XRTK.SDK/Packages/com.xrtk.sdk/Editor/UX/Pointers/{HandRayPointerInspector.cs.meta => HandSpatialPointerInspector.cs.meta} (100%) create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandNearPointer.cs create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandNearPointer.cs.meta diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Editor/UX/Pointers/HandNearPointerInspector.cs b/XRTK.SDK/Packages/com.xrtk.sdk/Editor/UX/Pointers/HandNearPointerInspector.cs new file mode 100644 index 00000000..d4487228 --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Editor/UX/Pointers/HandNearPointerInspector.cs @@ -0,0 +1,14 @@ +// Copyright (c) XRTK. All rights reserved. +// Licensed under the MIT License. See LICENSE in the project root for license information. + +using UnityEditor; +using XRTK.SDK.UX.Pointers; + +namespace XRTK.SDK.Editor.UX.Pointers +{ + [CustomEditor(typeof(HandNearPointer))] + public class HandNearPointerInspector : LinePointerInspector + { + + } +} \ No newline at end of file diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Editor/UX/Pointers/HandNearPointerInspector.cs.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Editor/UX/Pointers/HandNearPointerInspector.cs.meta new file mode 100644 index 00000000..73c25db2 --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Editor/UX/Pointers/HandNearPointerInspector.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d7622c3a5c044ff45b585cbff6a6337c +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {fileID: 2800000, guid: 8ac5213854cf4dbabd140decf8df1946, type: 3} + userData: + assetBundleName: + assetBundleVariant: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Editor/UX/Pointers/HandRayPointerInspector.cs b/XRTK.SDK/Packages/com.xrtk.sdk/Editor/UX/Pointers/HandSpatialPointerInspector.cs similarity index 80% rename from XRTK.SDK/Packages/com.xrtk.sdk/Editor/UX/Pointers/HandRayPointerInspector.cs rename to XRTK.SDK/Packages/com.xrtk.sdk/Editor/UX/Pointers/HandSpatialPointerInspector.cs index 499e0973..693b8dd3 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Editor/UX/Pointers/HandRayPointerInspector.cs +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Editor/UX/Pointers/HandSpatialPointerInspector.cs @@ -7,7 +7,7 @@ namespace XRTK.SDK.Editor.UX.Pointers { [CustomEditor(typeof(HandSpatialPointer))] - public class HandRayPointerInspector : LinePointerInspector + public class HandSpatialPointerInspector : LinePointerInspector { } diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Editor/UX/Pointers/HandRayPointerInspector.cs.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Editor/UX/Pointers/HandSpatialPointerInspector.cs.meta similarity index 100% rename from XRTK.SDK/Packages/com.xrtk.sdk/Editor/UX/Pointers/HandRayPointerInspector.cs.meta rename to XRTK.SDK/Packages/com.xrtk.sdk/Editor/UX/Pointers/HandSpatialPointerInspector.cs.meta diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/DefaultRightHandControllerVisualizer.prefab b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/DefaultRightHandControllerVisualizer.prefab index c2ce4346..12ca1e6d 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/DefaultRightHandControllerVisualizer.prefab +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/DefaultRightHandControllerVisualizer.prefab @@ -47,7 +47,7 @@ PrefabInstance: type: 3} propertyPath: meshModePrefab value: - objectReference: {fileID: -6863652107527007305, guid: e7441264aa8569b4aae36828878435af, + objectReference: {fileID: 3866922547383302811, guid: ea935581bf93125478b7586a9a3c3f76, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 61feeca21178ba54682d3c61ff5f89a1, type: 3} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/HandRight_Mesh.prefab b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/HandRight_Mesh.prefab index 7ab17da5..759601c9 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/HandRight_Mesh.prefab +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/HandRight_Mesh.prefab @@ -1,31 +1,59 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1001 &5178562738904195930 +--- !u!1001 &3867647138407053199 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 1887883006053652, guid: 81cacd47fbb47714d8b19cffb1edf4af, type: 3} + - target: {fileID: 1887883006053652, guid: 12df5e0d0c33a444a985de4e29533a24, type: 3} propertyPath: m_Name value: HandLeft_Mesh objectReference: {fileID: 0} - - target: {fileID: 4948917796815494, guid: 81cacd47fbb47714d8b19cffb1edf4af, type: 3} + - target: {fileID: 4948917796815494, guid: 12df5e0d0c33a444a985de4e29533a24, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4948917796815494, guid: 12df5e0d0c33a444a985de4e29533a24, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4948917796815494, guid: 12df5e0d0c33a444a985de4e29533a24, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4948917796815494, guid: 12df5e0d0c33a444a985de4e29533a24, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4948917796815494, guid: 12df5e0d0c33a444a985de4e29533a24, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4948917796815494, guid: 12df5e0d0c33a444a985de4e29533a24, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4948917796815494, guid: 12df5e0d0c33a444a985de4e29533a24, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4948917796815494, guid: 12df5e0d0c33a444a985de4e29533a24, type: 3} propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} - - target: {fileID: 4948917796815494, guid: 81cacd47fbb47714d8b19cffb1edf4af, type: 3} + - target: {fileID: 4948917796815494, guid: 12df5e0d0c33a444a985de4e29533a24, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4948917796815494, guid: 81cacd47fbb47714d8b19cffb1edf4af, type: 3} + - target: {fileID: 4948917796815494, guid: 12df5e0d0c33a444a985de4e29533a24, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4948917796815494, guid: 81cacd47fbb47714d8b19cffb1edf4af, type: 3} + - target: {fileID: 4948917796815494, guid: 12df5e0d0c33a444a985de4e29533a24, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 81cacd47fbb47714d8b19cffb1edf4af, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: 12df5e0d0c33a444a985de4e29533a24, type: 3} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/HandRight_Mesh.prefab.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/HandRight_Mesh.prefab.meta index 75ec5ac8..7ac7fcc5 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/HandRight_Mesh.prefab.meta +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/HandRight_Mesh.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e7441264aa8569b4aae36828878435af +guid: ea935581bf93125478b7586a9a3c3f76 PrefabImporter: externalObjects: {} userData: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/HandControllerNearPointer.prefab b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/HandControllerNearPointer.prefab index a6469f09..7bdbf7d8 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/HandControllerNearPointer.prefab +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/HandControllerNearPointer.prefab @@ -1,12 +1,564 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!54 &3826619884932593450 +--- !u!1 &7751017874127228719 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7753987110195811991} + - component: {fileID: 3795335034429809122} + - component: {fileID: 8768622563881961207} + - component: {fileID: 7751017874127228716} + - component: {fileID: 4707942166383463581} + - component: {fileID: 9125729371685859888} + - component: {fileID: -3895640563058625731} + - component: {fileID: -5168941210383110042} + m_Layer: 0 + m_Name: HandControllerNearPointer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7753987110195811991 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7751017874127228719} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3795335034429809122 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7751017874127228719} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c85a4527bbdd25647a62ec06e8d2daf3, type: 3} + m_Name: + m_EditorClassIdentifier: + lineStartClamp: 0.0001 + lineEndClamp: 0.9999 + customLineTransform: {fileID: 0} + loops: 0 + transformMode: 1 + rotationMode: 1 + flipUpVector: 0 + originOffset: {x: 0, y: 0, z: 0} + manualUpVectorBlend: 0 + manualUpVectors: + - {x: 0, y: 1, z: 0} + - {x: 0, y: 1, z: 0} + - {x: 0, y: 1, z: 0} + velocitySearchRange: 0.02 + distorters: + - {fileID: 8768622563881961207} + distortionMode: 0 + distortionStrength: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + uniformDistortionStrength: 1 + inertia: + inertia: 10 + dampen: 6 + seekTargetStrength: 1.5 + p1Target: {x: 0, y: 0, z: 0.33} + p2Target: {x: 0, y: 0, z: 0.66} + controlPoints: + Point1: {x: 0, y: 0, z: 0} + Point2: {x: 0, y: 0, z: 0.33} + Point3: {x: 0, y: 0, z: 0.66} + Point4: {x: 0, y: 0, z: 1} + useLocalTangentPoints: 0 +--- !u!114 &8768622563881961207 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7751017874127228719} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 61988acbae5840069797ec6d990d8f50, type: 3} + m_Name: + m_EditorClassIdentifier: + distortOrder: 0 + distortStrength: 1 + localCenterOfGravity: {x: 0, y: 0, z: 0} + axisStrength: {x: 1, y: 1, z: 1} + radius: 0.5 + gravityStrength: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!114 &7751017874127228716 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7751017874127228719} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e3b094d01f2addc47b44a1e30fa7a32a, type: 3} + m_Name: + m_EditorClassIdentifier: + handedness: 1 + destroyOnSourceLost: 1 + useSourcePoseData: 0 + poseAction: + profileGuid: 399335ccc89c4d12b79f3539ca7771db + id: 15 + description: Index Finger Pose + axisConstraint: 7 + cursorPrefab: {fileID: 0} + disableCursorOnStart: 0 + setCursorVisibilityOnSourceDetected: 0 + raycastOrigin: {fileID: 0} + activeHoldAction: + profileGuid: 00000000000000000000000000000000 + id: 0 + description: None + axisConstraint: 0 + pointerAction: + profileGuid: 399335ccc89c4d12b79f3539ca7771db + id: 1 + description: Select + axisConstraint: 2 + requiresHoldAction: 0 + enablePointerOnStart: 0 + nearInteractionCollider: {fileID: -5168941210383110042} + overrideGlobalPointerExtent: 0 + defaultPointerExtent: 0.5 + pointerOrientation: 0 + lineColorSelected: + serializedVersion: 2 + key0: {r: 0.8490566, g: 0.8490566, b: 0.8490566, a: 0} + key1: {r: 0.8490566, g: 0.8490566, b: 0.8490566, a: 0} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 65535 + atime3: 65535 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + lineColorValid: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 0} + key1: {r: 0.14122522, g: 1, b: 0, a: 1} + key2: {r: 0, g: 0, b: 0, a: 1} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 3277 + atime2: 49151 + atime3: 65535 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 4 + lineColorInvalid: + serializedVersion: 2 + key0: {r: 0.8490566, g: 0.8490566, b: 0.8490566, a: 0} + key1: {r: 0.8490566, g: 0.8490566, b: 0.8490566, a: 0} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 65535 + atime3: 65535 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + lineColorNoTarget: + serializedVersion: 2 + key0: {r: 0.8490566, g: 0.8490566, b: 0.8490566, a: 0} + key1: {r: 0.8490566, g: 0.8490566, b: 0.8490566, a: 0} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 65535 + atime3: 65535 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + lineColorLockFocus: + serializedVersion: 2 + key0: {r: 0.8490566, g: 0.8490566, b: 0.8490566, a: 0} + key1: {r: 0.8490566, g: 0.8490566, b: 0.8490566, a: 0} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 65535 + atime3: 65535 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + lineCastResolution: 2 + lineBase: {fileID: 3795335034429809122} + lineRenderers: + - {fileID: 9125729371685859888} +--- !u!120 &4707942166383463581 +LineRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7751017874127228719} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 0 + m_MotionVectors: 0 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 49bbec7a7ebd47c786bf06ad0977ec1c, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Positions: + - {x: 0, y: 0, z: 0.00009899999} + - {x: 0, y: 0, z: 0.06608878} + - {x: 0, y: 0, z: 0.13209635} + - {x: 0, y: 0, z: 0.19813946} + - {x: 0, y: 0, z: 0.26423594} + - {x: 0, y: 0, z: 0.3304035} + - {x: 0, y: 0, z: 0.3966599} + - {x: 0, y: 0, z: 0.46302295} + - {x: 0, y: 0, z: 0.52951044} + - {x: 0, y: 0, z: 0.59614} + - {x: 0, y: 0, z: 0.66292953} + - {x: 0, y: 0, z: 0.7298968} + - {x: 0, y: 0, z: 0.7970595} + - {x: 0, y: 0, z: 0.8644354} + - {x: 0, y: 0, z: 0.93204236} + - {x: 0, y: 0, z: 0.999898} + m_Parameters: + serializedVersion: 3 + widthMultiplier: 0.01 + widthCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.2 + inSlope: 0 + outSlope: 0 + tangentMode: 34 + weightedMode: 0 + inWeight: 0 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0.2 + inSlope: 0 + outSlope: 0 + tangentMode: 34 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + colorGradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 0} + key1: {r: 0.4716981, g: 0.4716981, b: 0.4716981, a: 1} + key2: {r: 0, g: 0, b: 0, a: 1} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 1} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 9638 + atime2: 53970 + atime3: 65535 + atime4: 65535 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 4 + numCornerVertices: 8 + numCapVertices: 8 + alignment: 0 + textureMode: 3 + shadowBias: 0 + generateLightingData: 0 + m_UseWorldSpace: 1 + m_Loop: 0 +--- !u!114 &9125729371685859888 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7751017874127228719} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 01f6e868e3234547a04741fe2c20bd0d, type: 3} + m_Name: + m_EditorClassIdentifier: + lineDataSource: {fileID: 3795335034429809122} + lineColor: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 0} + key1: {r: 0.4716981, g: 0.4716981, b: 0.4716981, a: 1} + key2: {r: 0, g: 0, b: 0, a: 1} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 1} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 9638 + atime2: 53970 + atime3: 65535 + atime4: 65535 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 4 + lineWidth: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.2 + inSlope: 0 + outSlope: 0 + tangentMode: 34 + weightedMode: 0 + inWeight: 0 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0.2 + inSlope: 0 + outSlope: 0 + tangentMode: 34 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + widthMultiplier: 0.01 + colorOffset: 0 + widthOffset: 0 + stepMode: 0 + lineStepCount: 16 + pointDistributionMode: 1 + customPointDistributionLength: 0.1 + customPointDistributionCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 1 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 1 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + lineMaterial: {fileID: 2100000, guid: 49bbec7a7ebd47c786bf06ad0977ec1c, type: 2} + roundedEdges: 1 + roundedCaps: 1 + lineRenderer: {fileID: 4707942166383463581} +--- !u!54 &-3895640563058625731 Rigidbody: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6198175003172875473} + m_GameObject: {fileID: 7751017874127228719} serializedVersion: 2 m_Mass: 1 m_Drag: 0 @@ -16,394 +568,16 @@ Rigidbody: m_Interpolate: 0 m_Constraints: 0 m_CollisionDetection: 2 ---- !u!135 &-3199221569884269083 +--- !u!135 &-5168941210383110042 SphereCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6198175003172875473} + m_GameObject: {fileID: 7751017874127228719} m_Material: {fileID: 0} m_IsTrigger: 1 m_Enabled: 1 serializedVersion: 2 m_Radius: 0.01 m_Center: {x: 0, y: 0, z: 0} ---- !u!1001 &6197016220715994037 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 1247086986094436, guid: 54d78dc3333741c5b7f30fe3506096ba, type: 3} - propertyPath: m_Name - value: NearPointer - objectReference: {fileID: 0} - - target: {fileID: 4215223911988956, guid: 54d78dc3333741c5b7f30fe3506096ba, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4215223911988956, guid: 54d78dc3333741c5b7f30fe3506096ba, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4215223911988956, guid: 54d78dc3333741c5b7f30fe3506096ba, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4215223911988956, guid: 54d78dc3333741c5b7f30fe3506096ba, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4215223911988956, guid: 54d78dc3333741c5b7f30fe3506096ba, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4215223911988956, guid: 54d78dc3333741c5b7f30fe3506096ba, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4215223911988956, guid: 54d78dc3333741c5b7f30fe3506096ba, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4215223911988956, guid: 54d78dc3333741c5b7f30fe3506096ba, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4215223911988956, guid: 54d78dc3333741c5b7f30fe3506096ba, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4215223911988956, guid: 54d78dc3333741c5b7f30fe3506096ba, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4215223911988956, guid: 54d78dc3333741c5b7f30fe3506096ba, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6863193991115524521, guid: 54d78dc3333741c5b7f30fe3506096ba, - type: 3} - propertyPath: controlPoints.Point2.z - value: 0.33 - objectReference: {fileID: 0} - - target: {fileID: 6863193991115524521, guid: 54d78dc3333741c5b7f30fe3506096ba, - type: 3} - propertyPath: controlPoints.Point3.z - value: 0.66 - objectReference: {fileID: 0} - - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, - type: 3} - propertyPath: lineColorLockFocus.key0.r - value: 0.8490566 - objectReference: {fileID: 0} - - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, - type: 3} - propertyPath: lineColorLockFocus.key0.g - value: 0.8490566 - objectReference: {fileID: 0} - - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, - type: 3} - propertyPath: lineColorLockFocus.key0.b - value: 0.8490566 - objectReference: {fileID: 0} - - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, - type: 3} - propertyPath: lineColorLockFocus.key1.r - value: 0.8490566 - objectReference: {fileID: 0} - - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, - type: 3} - propertyPath: lineColorLockFocus.key1.g - value: 0.8490566 - objectReference: {fileID: 0} - - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, - type: 3} - propertyPath: lineColorLockFocus.key1.b - value: 0.8490566 - objectReference: {fileID: 0} - - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, - type: 3} - propertyPath: lineColorLockFocus.key1.a - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, - type: 3} - propertyPath: lineColorLockFocus.key2.a - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, - type: 3} - propertyPath: lineColorLockFocus.atime1 - value: 65535 - objectReference: {fileID: 0} - - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, - type: 3} - propertyPath: lineColorLockFocus.atime2 - value: 65535 - objectReference: {fileID: 0} - - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, - type: 3} - propertyPath: lineColorLockFocus.m_NumAlphaKeys - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, - type: 3} - propertyPath: lineColorNoTarget.key0.r - value: 0.8490566 - objectReference: {fileID: 0} - - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, - type: 3} - propertyPath: lineColorNoTarget.key0.g - value: 0.8490566 - objectReference: {fileID: 0} - - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, - type: 3} - propertyPath: lineColorNoTarget.key0.b - value: 0.8490566 - objectReference: {fileID: 0} - - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, - type: 3} - propertyPath: lineColorNoTarget.key1.r - value: 0.8490566 - objectReference: {fileID: 0} - - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, - type: 3} - propertyPath: lineColorNoTarget.key1.g - value: 0.8490566 - objectReference: {fileID: 0} - - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, - type: 3} - propertyPath: lineColorNoTarget.key1.b - value: 0.8490566 - objectReference: {fileID: 0} - - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, - type: 3} - propertyPath: lineColorNoTarget.key1.a - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, - type: 3} - propertyPath: lineColorNoTarget.atime1 - value: 65535 - objectReference: {fileID: 0} - - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, - type: 3} - propertyPath: lineColorNoTarget.atime3 - value: 65535 - objectReference: {fileID: 0} - - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, - type: 3} - propertyPath: lineColorNoTarget.m_NumAlphaKeys - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, - type: 3} - propertyPath: lineColorInvalid.key0.r - value: 0.8490566 - objectReference: {fileID: 0} - - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, - type: 3} - propertyPath: lineColorInvalid.key0.g - value: 0.8490566 - objectReference: {fileID: 0} - - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, - type: 3} - propertyPath: lineColorInvalid.key0.b - value: 0.8490566 - objectReference: {fileID: 0} - - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, - type: 3} - propertyPath: lineColorInvalid.key1.r - value: 0.8490566 - objectReference: {fileID: 0} - - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, - type: 3} - propertyPath: lineColorInvalid.key1.g - value: 0.8490566 - objectReference: {fileID: 0} - - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, - type: 3} - propertyPath: lineColorInvalid.key1.b - value: 0.8490566 - objectReference: {fileID: 0} - - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, - type: 3} - propertyPath: lineColorInvalid.key1.a - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, - type: 3} - propertyPath: lineColorInvalid.key2.a - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, - type: 3} - propertyPath: lineColorInvalid.atime1 - value: 65535 - objectReference: {fileID: 0} - - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, - type: 3} - propertyPath: lineColorInvalid.atime2 - value: 65535 - objectReference: {fileID: 0} - - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, - type: 3} - propertyPath: lineColorInvalid.m_NumAlphaKeys - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, - type: 3} - propertyPath: lineColorSelected.key0.r - value: 0.8490566 - objectReference: {fileID: 0} - - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, - type: 3} - propertyPath: lineColorSelected.key0.g - value: 0.8490566 - objectReference: {fileID: 0} - - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, - type: 3} - propertyPath: lineColorSelected.key0.b - value: 0.8490566 - objectReference: {fileID: 0} - - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, - type: 3} - propertyPath: lineColorSelected.key1.a - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, - type: 3} - propertyPath: lineColorSelected.key2.a - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, - type: 3} - propertyPath: lineColorSelected.atime1 - value: 65535 - objectReference: {fileID: 0} - - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, - type: 3} - propertyPath: lineColorSelected.atime2 - value: 65535 - objectReference: {fileID: 0} - - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, - type: 3} - propertyPath: lineColorSelected.m_NumAlphaKeys - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, - type: 3} - propertyPath: nearInteractionCollider - value: - objectReference: {fileID: -3199221569884269083} - - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, - type: 3} - propertyPath: defaultPointerExtent - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, - type: 3} - propertyPath: cursorPrefab - value: - objectReference: {fileID: 0} - - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, - type: 3} - propertyPath: poseAction.id - value: 15 - objectReference: {fileID: 0} - - target: {fileID: 2507312044101632756, guid: 54d78dc3333741c5b7f30fe3506096ba, - type: 3} - propertyPath: poseAction.description - value: Index Finger Pose - objectReference: {fileID: 0} - - target: {fileID: 3080660041806603478, guid: 54d78dc3333741c5b7f30fe3506096ba, - type: 3} - propertyPath: m_Positions.Array.data[0].z - value: 0.00009899999 - objectReference: {fileID: 0} - - target: {fileID: 3080660041806603478, guid: 54d78dc3333741c5b7f30fe3506096ba, - type: 3} - propertyPath: m_Positions.Array.data[1].z - value: 0.06608878 - objectReference: {fileID: 0} - - target: {fileID: 3080660041806603478, guid: 54d78dc3333741c5b7f30fe3506096ba, - type: 3} - propertyPath: m_Positions.Array.data[2].z - value: 0.13209635 - objectReference: {fileID: 0} - - target: {fileID: 3080660041806603478, guid: 54d78dc3333741c5b7f30fe3506096ba, - type: 3} - propertyPath: m_Positions.Array.data[3].z - value: 0.19813946 - objectReference: {fileID: 0} - - target: {fileID: 3080660041806603478, guid: 54d78dc3333741c5b7f30fe3506096ba, - type: 3} - propertyPath: m_Positions.Array.data[4].z - value: 0.26423594 - objectReference: {fileID: 0} - - target: {fileID: 3080660041806603478, guid: 54d78dc3333741c5b7f30fe3506096ba, - type: 3} - propertyPath: m_Positions.Array.data[5].z - value: 0.3304035 - objectReference: {fileID: 0} - - target: {fileID: 3080660041806603478, guid: 54d78dc3333741c5b7f30fe3506096ba, - type: 3} - propertyPath: m_Positions.Array.data[6].z - value: 0.3966599 - objectReference: {fileID: 0} - - target: {fileID: 3080660041806603478, guid: 54d78dc3333741c5b7f30fe3506096ba, - type: 3} - propertyPath: m_Positions.Array.data[7].z - value: 0.46302295 - objectReference: {fileID: 0} - - target: {fileID: 3080660041806603478, guid: 54d78dc3333741c5b7f30fe3506096ba, - type: 3} - propertyPath: m_Positions.Array.data[8].z - value: 0.52951044 - objectReference: {fileID: 0} - - target: {fileID: 3080660041806603478, guid: 54d78dc3333741c5b7f30fe3506096ba, - type: 3} - propertyPath: m_Positions.Array.data[9].z - value: 0.59614 - objectReference: {fileID: 0} - - target: {fileID: 3080660041806603478, guid: 54d78dc3333741c5b7f30fe3506096ba, - type: 3} - propertyPath: m_Positions.Array.data[10].z - value: 0.66292953 - objectReference: {fileID: 0} - - target: {fileID: 3080660041806603478, guid: 54d78dc3333741c5b7f30fe3506096ba, - type: 3} - propertyPath: m_Positions.Array.data[11].z - value: 0.7298968 - objectReference: {fileID: 0} - - target: {fileID: 3080660041806603478, guid: 54d78dc3333741c5b7f30fe3506096ba, - type: 3} - propertyPath: m_Positions.Array.data[12].z - value: 0.7970595 - objectReference: {fileID: 0} - - target: {fileID: 3080660041806603478, guid: 54d78dc3333741c5b7f30fe3506096ba, - type: 3} - propertyPath: m_Positions.Array.data[13].z - value: 0.8644354 - objectReference: {fileID: 0} - - target: {fileID: 3080660041806603478, guid: 54d78dc3333741c5b7f30fe3506096ba, - type: 3} - propertyPath: m_Positions.Array.data[14].z - value: 0.93204236 - objectReference: {fileID: 0} - - target: {fileID: 3080660041806603478, guid: 54d78dc3333741c5b7f30fe3506096ba, - type: 3} - propertyPath: m_Positions.Array.data[15].z - value: 0.999898 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 54d78dc3333741c5b7f30fe3506096ba, type: 3} ---- !u!1 &6198175003172875473 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1247086986094436, guid: 54d78dc3333741c5b7f30fe3506096ba, - type: 3} - m_PrefabInstance: {fileID: 6197016220715994037} - m_PrefabAsset: {fileID: 0} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/HandControllerNearPointer.prefab.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/HandControllerNearPointer.prefab.meta index 085f2842..8ef8d839 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/HandControllerNearPointer.prefab.meta +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/HandControllerNearPointer.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1fd3fff0f4e00844ea0cc05dbcbac113 +guid: dffe173621ec68b4abb66b6cfbe5c7f2 PrefabImporter: externalObjects: {} userData: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/Pointers/HandControllerNearPointerProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/Pointers/HandControllerNearPointerProfile.asset index 6de3e8f1..0cd3eecb 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/Pointers/HandControllerNearPointerProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/Pointers/HandControllerNearPointerProfile.asset @@ -12,9 +12,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c156ea3e1a7a493dac236ed84c4a819a, type: 3} m_Name: HandControllerNearPointerProfile m_EditorClassIdentifier: - pointerPrefab: {fileID: 6198175003172875473, guid: 1fd3fff0f4e00844ea0cc05dbcbac113, + pointerPrefab: {fileID: 7751017874127228719, guid: dffe173621ec68b4abb66b6cfbe5c7f2, type: 3} - pointingExtent: 10 + pointingExtent: 0.5 pointingRaycastLayerMasks: - serializedVersion: 2 m_Bits: 4294967291 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandNearPointer.cs b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandNearPointer.cs new file mode 100644 index 00000000..b8d46515 --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandNearPointer.cs @@ -0,0 +1,63 @@ +// Copyright (c) XRTK. All rights reserved. +// Licensed under the MIT License. See LICENSE in the project root for license information. + +using UnityEngine; +using XRTK.Definitions.Controllers.Hands; +using XRTK.EventDatum.Input; +using XRTK.Interfaces.InputSystem; +using XRTK.Interfaces.Providers.Controllers.Hands; + +namespace XRTK.SDK.UX.Pointers +{ + /// + /// Hand controller near interaction pointer. + /// + public class HandNearPointer : LinePointer + { + private IMixedRealityPointer spatialPointer; + private bool handIsPinching; + + /// + public override bool IsInteractionEnabled => base.IsInteractionEnabled && !handIsPinching && false; + + ///// + ///// Gets the near pointer attached to the hand. + ///// + private IMixedRealityPointer SpatialPointer => spatialPointer ?? (spatialPointer = InitializeSpatialPointerReference()); + + ///// + ///// Is the near pointer in an idle state where it's not + ///// interacting with anything and not targeting anything? + ///// + //private bool IsNearPointerIdle => NearPointer != null && NearPointer.Result.CurrentPointerTarget == null; + + /// + public override void OnInputChanged(InputEventData eventData) + { + base.OnInputChanged(eventData); + + // This pointer type must only be used with hand controllers. + if (!(Controller is IMixedRealityHandController handController)) + { + Debug.LogError($"{typeof(HandNearPointer).Name} is only for use with {typeof(IMixedRealityHandController).Name} controllers!", this); + return; + } + + handIsPinching = handController.IsPinching; + } + + private IMixedRealityPointer InitializeSpatialPointerReference() + { + for (int i = 0; i < Controller.InputSource.Pointers.Length; i++) + { + var pointer = Controller.InputSource.Pointers[i]; + if (!pointer.PointerId.Equals(PointerId) && pointer is HandSpatialPointer) + { + return pointer; + } + } + + return null; + } + } +} \ No newline at end of file diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandNearPointer.cs.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandNearPointer.cs.meta new file mode 100644 index 00000000..2d325305 --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandNearPointer.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e3b094d01f2addc47b44a1e30fa7a32a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {fileID: 2800000, guid: 08c0fd91bdca45afa09ec64323cf3848, type: 3} + userData: + assetBundleName: + assetBundleVariant: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandSpatialPointer.cs b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandSpatialPointer.cs index d6a9073d..f5a43e23 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandSpatialPointer.cs +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandSpatialPointer.cs @@ -16,9 +16,10 @@ namespace XRTK.SDK.UX.Pointers public class HandSpatialPointer : LinePointer { private IMixedRealityPointer nearPointer; + private bool handIsPointing; /// - public override bool IsInteractionEnabled => base.IsInteractionEnabled && IsNearPointerIdle; + public override bool IsInteractionEnabled => base.IsInteractionEnabled && IsNearPointerIdle && handIsPointing; /// /// Gets the near pointer attached to the hand. @@ -37,14 +38,13 @@ public override void OnInputChanged(InputEventData eventData) base.OnInputChanged(eventData); // This pointer type must only be used with hand controllers. - var handController = Controller as IMixedRealityHandController; - if (handController == null) + if (!(Controller is IMixedRealityHandController handController)) { Debug.LogError($"{typeof(HandSpatialPointer).Name} is only for use with {typeof(IMixedRealityHandController).Name} controllers!", this); return; } - //enabled = handController.IsPointing; + handIsPointing = handController.IsPointing; } private IMixedRealityPointer InitializeNearPointerReference() @@ -52,7 +52,7 @@ private IMixedRealityPointer InitializeNearPointerReference() for (int i = 0; i < Controller.InputSource.Pointers.Length; i++) { var pointer = Controller.InputSource.Pointers[i]; - if (!pointer.PointerId.Equals(PointerId)) + if (!pointer.PointerId.Equals(PointerId) && pointer is HandNearPointer) { return pointer; } From c44dee93168dd82e88c84062e92605d29ff3c4ed Mon Sep 17 00:00:00 2001 From: Dino Fejzagic Date: Thu, 21 May 2020 14:44:14 +0200 Subject: [PATCH 45/78] Update IsNearPointerIdle computed property --- .../UX/Scripts/Pointers/HandNearPointer.cs | 38 +++++++++---------- .../UX/Scripts/Pointers/HandSpatialPointer.cs | 2 +- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandNearPointer.cs b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandNearPointer.cs index b8d46515..56c79899 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandNearPointer.cs +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandNearPointer.cs @@ -14,16 +14,16 @@ namespace XRTK.SDK.UX.Pointers /// public class HandNearPointer : LinePointer { - private IMixedRealityPointer spatialPointer; + //private IMixedRealityPointer spatialPointer; private bool handIsPinching; /// - public override bool IsInteractionEnabled => base.IsInteractionEnabled && !handIsPinching && false; + public override bool IsInteractionEnabled => base.IsInteractionEnabled && !handIsPinching; - ///// - ///// Gets the near pointer attached to the hand. - ///// - private IMixedRealityPointer SpatialPointer => spatialPointer ?? (spatialPointer = InitializeSpatialPointerReference()); + /////// + /////// Gets the near pointer attached to the hand. + /////// + //private IMixedRealityPointer SpatialPointer => spatialPointer ?? (spatialPointer = InitializeSpatialPointerReference()); ///// ///// Is the near pointer in an idle state where it's not @@ -46,18 +46,18 @@ public override void OnInputChanged(InputEventData eventData) handIsPinching = handController.IsPinching; } - private IMixedRealityPointer InitializeSpatialPointerReference() - { - for (int i = 0; i < Controller.InputSource.Pointers.Length; i++) - { - var pointer = Controller.InputSource.Pointers[i]; - if (!pointer.PointerId.Equals(PointerId) && pointer is HandSpatialPointer) - { - return pointer; - } - } - - return null; - } + //private IMixedRealityPointer InitializeSpatialPointerReference() + //{ + // for (int i = 0; i < Controller.InputSource.Pointers.Length; i++) + // { + // var pointer = Controller.InputSource.Pointers[i]; + // if (!pointer.PointerId.Equals(PointerId) && pointer is HandSpatialPointer) + // { + // return pointer; + // } + // } + + // return null; + //} } } \ No newline at end of file diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandSpatialPointer.cs b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandSpatialPointer.cs index f5a43e23..6ed238e4 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandSpatialPointer.cs +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandSpatialPointer.cs @@ -30,7 +30,7 @@ public class HandSpatialPointer : LinePointer /// Is the near pointer in an idle state where it's not /// interacting with anything and not targeting anything? /// - private bool IsNearPointerIdle => NearPointer != null && NearPointer.Result.CurrentPointerTarget == null; + private bool IsNearPointerIdle => NearPointer == null || NearPointer.Result.CurrentPointerTarget == null || !NearPointer.IsInteractionEnabled; /// public override void OnInputChanged(InputEventData eventData) From 80376b0def83d7321a8ae16143ec0d1f7c2cda34 Mon Sep 17 00:00:00 2001 From: Dino Fejzagic Date: Fri, 22 May 2020 12:32:56 +0200 Subject: [PATCH 46/78] Implement spatial pointer transform --- .../Pointers/HandSpatialPointerInspector.cs | 35 +++++++ .../HandControllerSpatialPointer.prefab | 86 ++++++++++++++- .../UX/Meshes/Cursors/HandSpatialPointer.fbx | Bin 0 -> 14348 bytes .../Cursors/HandSpatialPointer.fbx.meta | 99 ++++++++++++++++++ .../UX/Scripts/Pointers/HandSpatialPointer.cs | 51 +++++++-- 5 files changed, 263 insertions(+), 8 deletions(-) create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Meshes/Cursors/HandSpatialPointer.fbx create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Meshes/Cursors/HandSpatialPointer.fbx.meta diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Editor/UX/Pointers/HandSpatialPointerInspector.cs b/XRTK.SDK/Packages/com.xrtk.sdk/Editor/UX/Pointers/HandSpatialPointerInspector.cs index 693b8dd3..f8d0bf01 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Editor/UX/Pointers/HandSpatialPointerInspector.cs +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Editor/UX/Pointers/HandSpatialPointerInspector.cs @@ -2,6 +2,8 @@ // Licensed under the MIT License. See LICENSE in the project root for license information. using UnityEditor; +using UnityEngine; +using XRTK.Editor.Extensions; using XRTK.SDK.UX.Pointers; namespace XRTK.SDK.Editor.UX.Pointers @@ -9,6 +11,39 @@ namespace XRTK.SDK.Editor.UX.Pointers [CustomEditor(typeof(HandSpatialPointer))] public class HandSpatialPointerInspector : LinePointerInspector { + private SerializedProperty pointerPoseTransform; + private SerializedProperty offsetStart; + private SerializedProperty offsetEnd; + private static readonly GUIContent foldoutHeader = new GUIContent("Spatial Pointer Settings"); + protected override void OnEnable() + { + base.OnEnable(); + + pointerPoseTransform = serializedObject.FindProperty(nameof(pointerPoseTransform)); + offsetStart = serializedObject.FindProperty(nameof(offsetStart)); + offsetEnd = serializedObject.FindProperty(nameof(offsetEnd)); + } + + public override void OnInspectorGUI() + { + base.OnInspectorGUI(); + + serializedObject.Update(); + + pointerPoseTransform.isExpanded = EditorGUILayoutExtensions.FoldoutWithBoldLabel(pointerPoseTransform.isExpanded, foldoutHeader); + if (pointerPoseTransform.isExpanded) + { + EditorGUI.indentLevel++; + + EditorGUILayout.PropertyField(pointerPoseTransform); + EditorGUILayout.PropertyField(offsetStart); + EditorGUILayout.PropertyField(offsetEnd); + + EditorGUI.indentLevel--; + } + + serializedObject.ApplyModifiedProperties(); + } } } \ No newline at end of file diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/HandControllerSpatialPointer.prefab b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/HandControllerSpatialPointer.prefab index c2801792..f030551f 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/HandControllerSpatialPointer.prefab +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/HandControllerSpatialPointer.prefab @@ -31,7 +31,8 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] + m_Children: + - {fileID: 6392329022490078173} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -332,6 +333,9 @@ MonoBehaviour: lineBase: {fileID: 6863193991115524521} lineRenderers: - {fileID: 1526809385130449531} + pointerPoseTransform: {fileID: 6392329022490078173} + offsetStart: {x: 0, y: 0, z: 0.02} + offsetEnd: {x: 0, y: 0, z: 0.04} --- !u!120 &3080660041806603478 LineRenderer: m_ObjectHideFlags: 0 @@ -551,3 +555,83 @@ MonoBehaviour: roundedEdges: 1 roundedCaps: 1 lineRenderer: {fileID: 3080660041806603478} +--- !u!1001 &2147277688235704519 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 4215223911988956} + m_Modifications: + - target: {fileID: -927199367670048503, guid: 020718e6e118ec3489dbc21ec763a517, + type: 3} + propertyPath: m_Name + value: HandSpatialPointer + objectReference: {fileID: 0} + - target: {fileID: -927199367670048503, guid: 020718e6e118ec3489dbc21ec763a517, + type: 3} + propertyPath: m_Layer + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 020718e6e118ec3489dbc21ec763a517, + type: 3} + propertyPath: m_LocalPosition.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 020718e6e118ec3489dbc21ec763a517, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 020718e6e118ec3489dbc21ec763a517, + type: 3} + propertyPath: m_LocalPosition.z + value: 0.05 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 020718e6e118ec3489dbc21ec763a517, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 020718e6e118ec3489dbc21ec763a517, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 020718e6e118ec3489dbc21ec763a517, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 020718e6e118ec3489dbc21ec763a517, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 020718e6e118ec3489dbc21ec763a517, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 020718e6e118ec3489dbc21ec763a517, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 020718e6e118ec3489dbc21ec763a517, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 020718e6e118ec3489dbc21ec763a517, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 020718e6e118ec3489dbc21ec763a517, type: 3} +--- !u!4 &6392329022490078173 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -4216859302048453862, guid: 020718e6e118ec3489dbc21ec763a517, + type: 3} + m_PrefabInstance: {fileID: 2147277688235704519} + m_PrefabAsset: {fileID: 0} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Meshes/Cursors/HandSpatialPointer.fbx b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Meshes/Cursors/HandSpatialPointer.fbx new file mode 100644 index 0000000000000000000000000000000000000000..193c3fd4e32632ce17d7a78db01f917718c25bd4 GIT binary patch literal 14348 zcmc&*d0Z36+Ycgwg2o$9z>1>v06YrF5fOw^xio+WDu%E?G$fb=NH}ZJTI)e8){E2H zU$I5N8>(Ci2#5k!QIS&-K|oHqgS^iq8wg4w)j!_(u-V<2dA{>p^E|V&%LWS1g~Fn! znXTKRwvNW2uy|@}gjs~zIRt`}JYk?rhW2kUiVMbC&*fkYHjT;H4vjK!$iXpjpxFUq zp+<{(SptD8)?*y>5Vaxj(_(EC)-$Lqo+k(B?0BA-1vC-%A!xizGGSp9K`YGzBXcMo zo(0e%8e4t<7KW@AYZ$#1qp&PqffRhPS~)8wgX3<2xSj+MA{1Fu3eRFXRBDJ-j{cVE z#j;R>T9R1p7%LjXi-TFHLH%a&dNM|3GF&VsKs`sSUeSt1r_9ze_DJgegII%{9gRcB$cQ*htXiJz<-8lCas&-m#Tv#KdvV-B zF^J%SSiQmqjOW8-xv&K-HR3IsFmD=iML`PzI7I>qL@;4`cwh|SAP8`vtQYfmC0iEL z6Jv2`7+Xin1IQ7n9vm{ZWJNfcGO1n&#hyhcBeD%-4vWTcBO{fdIyeyo9W`BC z4bb7X*HaAC|2;*68Im7PG9 zqKZLPk`cdJ+M4jEt*4`qWtJYfMG zpw_W)vZSy%WQsTDBEiOs#te}QDQke_3yu6E4s9#sW~L-)De_6Naw(4ftq>jZgCxcU z*=2-g)&*}vW=1g=G>D@6pgKfm{Y*Op)=0`hU;)J)<-vLIs| z4n#AyE0nrby{9pk#uh|I8iZXCm0-c(U~ZT& zo?9RpGH|kGLb7p#WHdL1bkaVYbg7UOO%yX0BzftBLaHF>Ltn(JmXH!((wMEXllYtzv*bjRt%jBVn@<}f|XSfGMUkS;%MY~8g0B%xeGBH?AMXf4D} zfKidFAc_JXdYk=>K-Zi4>}JmX8{e#2=kes zu!+g!Sc4x}4(&7C-7_(f#%;n}F&4(4V(cMZUDO9}6~Sd`Fr#2G%pMEjLZsJ$fbIf) z)x;Wbg(F2X@M#3{4f3j{(p?L&`PCeW(%%AdZG6f;q5;Y@{a2zlK)CKnzK1+m5fW;~O%(o`@xgg0d9A}!dIOF*P>KNoQ}=mN>92?vOb zV!bVk=7FB_9pK@}nMS8^c!J2|%w*!vEYOD_m}_L5_-i3CvY81iK-p?!cZv(shb@Wj zC{DLjNC!d@Hepl@!r!MTq31}-X7Fv~MJPIndl8Zpg;IJ0aDY0X3bEkv9Zo0Jh0q){ zgpQ&z#Dy5Jo=2c~EJdrjjb7k?EC$;1fHe)vlPU1W(a`ciFh_vdK#v?{0~}xvG>JAb zITSQAZCqX180T{htqP_^z~2dhk*!3)wlr_%XXE;OjEk~7EDgVm-+Ua`LdY+&2#)(j z?2dylh3vCj2#cP+>{t{A8*Bn97KZBK+!p!~s6hLHZNzB5U|J_j2mbuo-GNIhHqnN1 zyhW0%TChMtdXh-FRTAayPf>1@MEQqwN(xsZx8#2}K5XEH{)93dLtlsiQ)Li? zLvwXyU~Kl5PcOP)X#G25v^=(DVFUU_tBB7?yW4P7u~=lwWOKe0HWXly@|VEzL9CY^h~9iGrHGd=h(aXT zm-|3>1E`-Lg1iA03AtD(B#Pq$s5FMe8678;OyYEYC6!F#T%HZHP!f|;!pa6c~XbcJUNIk@3XzGRUb!2OAH2pAxAgn$AQTl|;+&BvVQ8t^{dR5;?4v zMkSF$Q`lBS*4_vQgd#|%qNgnyRcyuZxr@(e9Nt<8k5*my!yJt&iUyyH-HT&e39(^e zKZuR{!APLR9BRPDNU({3d<0L`Xw3}HZwjv$H&GaF*oZQ0uyl+OCD&}}7$eH7iYgz= zLgD^5S!|?Zj7XMH=@=uDi8B+Q6}GF1CmH$%A@kx)P2Fgij@p~qQRkD>i27h{GSePmN8`x77|5=d#D zP#{U1j7Xey0D|%?o@$UdmQ3azV~%LMNw7x!a8J+|r@~V(ict2R!eyvby1#Ii;e>)R z8kp?P^cn8)Ne0@Q@b0?8?vMuv)|eYS*Lq{H!3^*FIj}7QFYdiOJ(;j8jNpdZ(^>tM zP)|4tJZOmavyD0M{@NLR*8pD~a3#NSL9Y;8ag_N&UeHdd84JUFg`3zP3=55fQy&vp z+L*#_*>HR!f;J#P84FJ-Xb;JfN>>w4R>RdHQZmw(F&^cI+i$Y~wh{KXaDd{`niXLW zWU7xUpu?w8BXCqRAu3wGAyiS0`tbfE%;7Rr8DOFewL*xAR%v3}b|2ghgQ%r0q+c(j zhi5M_dNq7`NrAm%!Mo8x=pju4T=XN@6hs&QwOm3O7BBL`J!JOk)xwQ@4X9TTZT(vQ zsj>=|d!TJJi^!g^{KW_|qE>;gpdH@lAeN{M*`5Dw#6u0LodvaA8IKbw8|G}Bn&qT0dfE@WsLE!}GxI#k4wh`mJpH(Z z`tu@%_cGrtU6^_2kIT0E7wvmUU*P;A`|MXPF^aWU#{F(zXson9=vub<+CH8E4Kdc%0N!OewOzmGti~ zy$_3~*wyroHS{<1KjinQxXm##jdb&SmHyrO)B3VvmOResj-K7ow^Uf&y7@C z)fZ^=ZfzSm#GHR`${SzS+3%>+x+{Z2!oA;mPw{=#AsZ2X+l8jQrh^y}o_j0AFEuLs zU2pdmw>0RjfXc() zH2!VcA5J^he5Sr{mXE=sLczhCQYn#ZuJMz~!u>`cECvxetfw{t>|+1XHTz`2;(UgEvi`43tl zM<6c=ho8x|Oghhv$v`fIaRuR%){J{m2()u$mW9gg8Ld4-uCuN&-qGi2Z@=xWo40Ol z?7R}OPerM_{5a1-@sPZ+)`U0BD(fH4h)uKWQV+RuZ0!pF(1Tm4&3W6?XUQAta~@R& z-=AFjXS#CngfjK6Zl9H>RZkl_YAUPbM#h~QU*J;kBya!bE0NYJwe@wc(x+_Qtf9Cw z=Vp2L(PG1n=^5kE@141NQAOn|lGOb)A|@v-tgoATd)d~fjef5Esy)8mwI}aP`zO38 zf1B=Cy=D2kb?5o1>Mwb5q#>XoW!H_(P6ZRnX6Y_0Ip-)B$p+UR=SZK7*#`R&NS(;9yA5j(f2*FV30 zzo8;J!R=rp;r_303*QFIwN8w6>zc4Ir?E{bi0snI`>|=)*@iv?joS@+NS>aP3vdnE!N=7Xld|-@eo#|zKC(KWJH>KU zt_#_6^#jhz`>XQk?E9+={1um8%W>YY^!k0)l8e{w?cQ^7wM#_%H_zNdAKZAhJM69Z zGuo-Lj%RzK`X=bs{*rM_x9)V6weFh}kMecv!`ps5I>YPs`cvDzv+SR4_sOtIEcMRb z(OKG=ZW3b9kx4Ev=)AKbA-UtOV^ebHZSyGqj;zfU{+$^%Y5b0Cr+&Wt&eK{lWG$iC zC>&0>ND_i5Q7^7v4+utSDa8uVB@vud2+fH z#nTgB3!twI0Z;I?Ci;#LW$AUiAv5GWPKHwAjDgpe9}=QPg(-~%Z_&(f&O?ALc_FuK zmqG~7h}9pUk}LDu7Q-Xc>}RC>cJ~L-cfvo%t`Suc_SgsYu%XnEJl!)!zGU*Q*!a4{d5Zo2_fWaJF5o8L>K5qol5U2a;PKJ9j}NiRfut5?a^$_y9TmY#yw zxys9BZOXen_v`xo%`{Jw(M+)OCxsX1x962NjII2qxveiJp=Y1Z8+k_0Z>mWxv840| zQNQdjQA}2yRaQi12JGi8H&Qb)Rb8dBcX|Tfzk;uj>2oNLf;7?qOR>fc=VJ3l9{ zuD1J6;HO$crT+K#1f8I3qrVk`fG6PpG!sO?XcrK2%Mxc`Tn9Mx5nD z2&tG~EzjWJ%jnu-{#L%yLAiY&_nmRusPfnCr1}e~zmlF9UL+P!cg{`DOjXHGD}2|| z(>(5JeZ|A@TUBI(Y(qmvSxFN&<=ZyCTzRu8_jJ`}eOIm5q2vdhw~L+rCdF07_1lx0 z9nzX*bpqoQo8x;XhqT9aJF4bTjjr*QHTUl7i{>9_RU|eWw7Tz1FG9(~u zlT^R=>0TR|``*3ZRDM;%1PB> zio}+j^Yx<=Uf!%DR-Gs9Ou6TgaP;4v0Ken8JJP6;PI}%dRl5q5lS#RLkNDP$NL6b( z=C&j?*^ycl}j6K}5)}SYv zHz|bo7cuiZap#T`q^z5B`I+<6Hk)f|+JuxRu627Fpx9oL68cCZUZqCGrs;4xvvXrz z%NT@iGW*hiIhGB44d2e1`%htAa z$<@_G4`UD4UoD;T=bfhV-dx@Ru72lZ`O3J0m$FrH2{-GyG%HHxp*K{6W%jDUEHXhn z)7U!*vdj^&Of)3R#NZ9%085xQc)e)O0-cu%_m3@D`pd3gvlP}( zayq2Amb{}&JMzu?@Ya}n-aeDH^Ye^Vm%R-4p6O6C|82n0D(0D>hCbKKm{$)schL`| znQiC!Bk`j3%$9Gfr zlCCu0N`3oU)AzoW5qoBa`TOH-KQYOh-?d!TEI6FnmHz6SdBu%;K8C)32R9w>{bk9^ zuV31=Ol`5f+;cNdH?`L*>t0a&7T*N@`+aXas{-u``Yt8Rh^bC(_p&f@?2aJC^^$*X zE0#YQV4GMxrFS~9vp(=xck22>@!dJ6Dta~da?eoD#~S2^v!C4vx9N2zJwB6Gd%IxH zlZ{dQ)ca1CYNB_pDNW=ZICI!2iIg4FZaCv`c;{ND-|+@R2UGu zx4nv2yV-Y6!NV&~Tie{N`}-AEYWT*_U#_JZD3i0NPLQLE14PQFH9!QTM$z^Zd&!fa6y0id)Ir_Y+u*i1s97~Hu0Z44|?0;zUpk|cT2Mv zbF#9z%8?til{dfK>3=AWJGH8k=Bc-Bmdde{V@}1it8-1BwM~C%_N;AZ*5OMvJAMkS z+)F=L$)c}Ln&UXW@o8mA(z3e`F6|APt4UQT%ivD;ol{bAyZYH~&osIIy-K$qRkHFO z%k%cuH^g@vd9T~hwtKr$O4H?8d(P!PDtzTG7;1YtFVAm{QFvL+Ke3u4IQ&|5DTfxQKzihu>@*}$2o3>m2vM}Q9_ z@R05p9#C8@bYCd8KQd%LqY5aH_CJ5O4u}ae0Un{iBP-hP8o`@IWc49s9YBa&VVo6w z{Yo43haF;VV+Cz?ls&?K;$q`XuvRC?qp!x`0l`G(BwmXi4dhL{;D4jw-)2zE$FJeb zq9KD1xtWi4c=4iW!elVehqdrsV-tWPlfe5>f{Y0njc8*tU=>T8f-oJ(Kkg>lb{gm} z>Ml4tiVZ1;WMf-HjYu6J0Sn$r4D;VaLqK|xW5*WeJa)b8-5Wfob77#U5&bXR|5xeS Uc4T*XdvRdH8>K3*kj0As2ge!|82|tP literal 0 HcmV?d00001 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Meshes/Cursors/HandSpatialPointer.fbx.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Meshes/Cursors/HandSpatialPointer.fbx.meta new file mode 100644 index 00000000..06c27814 --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Meshes/Cursors/HandSpatialPointer.fbx.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: 020718e6e118ec3489dbc21ec763a517 +ModelImporter: + serializedVersion: 25 + internalIDToNameTable: [] + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: No Name + second: {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + materials: + importMaterials: 1 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 0 + importLights: 0 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVPackMargin: 4 + useFileScale: 1 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 0 + copyAvatar: 0 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + animationType: 0 + humanoidOversampling: 1 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandSpatialPointer.cs b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandSpatialPointer.cs index 6ed238e4..c6d5fa16 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandSpatialPointer.cs +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandSpatialPointer.cs @@ -16,35 +16,57 @@ namespace XRTK.SDK.UX.Pointers public class HandSpatialPointer : LinePointer { private IMixedRealityPointer nearPointer; - private bool handIsPointing; + private IMixedRealityHandController handController; + + [SerializeField] + private Transform pointerPoseTransform = null; + + [SerializeField] + [Tooltip("Local offset for the pointer pose transform when not pinching.")] + private Vector3 offsetStart = Vector3.zero; + + [SerializeField] + [Tooltip("Local offset for the pointer pose transform when pinching.")] + private Vector3 offsetEnd = Vector3.zero; /// - public override bool IsInteractionEnabled => base.IsInteractionEnabled && IsNearPointerIdle && handIsPointing; + public override bool IsInteractionEnabled => + base.IsInteractionEnabled && + IsNearPointerIdle && + HandController != null && + HandController.IsPointing; /// /// Gets the near pointer attached to the hand. /// private IMixedRealityPointer NearPointer => nearPointer ?? (nearPointer = InitializeNearPointerReference()); + /// + /// Casted reference to the hand controller driving the pointer. + /// + private IMixedRealityHandController HandController => handController ?? (handController = InitializeHandControllerReference()); + /// /// Is the near pointer in an idle state where it's not /// interacting with anything and not targeting anything? /// private bool IsNearPointerIdle => NearPointer == null || NearPointer.Result.CurrentPointerTarget == null || !NearPointer.IsInteractionEnabled; - /// - public override void OnInputChanged(InputEventData eventData) + private void Update() { - base.OnInputChanged(eventData); + UpdatePointerTransform(); + } + private IMixedRealityHandController InitializeHandControllerReference() + { // This pointer type must only be used with hand controllers. if (!(Controller is IMixedRealityHandController handController)) { Debug.LogError($"{typeof(HandSpatialPointer).Name} is only for use with {typeof(IMixedRealityHandController).Name} controllers!", this); - return; + return null; } - handIsPointing = handController.IsPointing; + return handController; } private IMixedRealityPointer InitializeNearPointerReference() @@ -60,5 +82,20 @@ private IMixedRealityPointer InitializeNearPointerReference() return null; } + + private void UpdatePointerTransform() + { + if (IsInteractionEnabled) + { + pointerPoseTransform.gameObject.SetActive(true); + var pinchScale = Mathf.Clamp(1 - HandController.PinchStrength, .5f, 1f); + pointerPoseTransform.localScale = new Vector3(pinchScale, pinchScale, 1f); + pointerPoseTransform.localPosition = Vector3.Slerp(offsetStart, offsetEnd, HandController.PinchStrength); + } + else + { + pointerPoseTransform.gameObject.SetActive(false); + } + } } } \ No newline at end of file From 8d94e661b19c2e8e852c455932895aaa184b484c Mon Sep 17 00:00:00 2001 From: Dino Fejzagic Date: Fri, 22 May 2020 14:12:37 +0200 Subject: [PATCH 47/78] Update pointer mesh --- .../HandControllerSpatialPointer.prefab | 11 ++++++++--- .../UX/Meshes/Cursors/HandSpatialPointer.fbx | Bin 14348 -> 16668 bytes 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/HandControllerSpatialPointer.prefab b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/HandControllerSpatialPointer.prefab index f030551f..34b38285 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/HandControllerSpatialPointer.prefab +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/HandControllerSpatialPointer.prefab @@ -334,8 +334,8 @@ MonoBehaviour: lineRenderers: - {fileID: 1526809385130449531} pointerPoseTransform: {fileID: 6392329022490078173} - offsetStart: {x: 0, y: 0, z: 0.02} - offsetEnd: {x: 0, y: 0, z: 0.04} + offsetStart: {x: 0, y: 0, z: 0.03} + offsetEnd: {x: 0, y: 0, z: 0.05} --- !u!120 &3080660041806603478 LineRenderer: m_ObjectHideFlags: 0 @@ -585,7 +585,7 @@ PrefabInstance: - target: {fileID: -4216859302048453862, guid: 020718e6e118ec3489dbc21ec763a517, type: 3} propertyPath: m_LocalPosition.z - value: 0.05 + value: 0 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: 020718e6e118ec3489dbc21ec763a517, type: 3} @@ -627,6 +627,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: -1504981713932161579, guid: 020718e6e118ec3489dbc21ec763a517, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 5533073c4b0c4bec9fbb2b19f3f8e814, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 020718e6e118ec3489dbc21ec763a517, type: 3} --- !u!4 &6392329022490078173 stripped diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Meshes/Cursors/HandSpatialPointer.fbx b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Meshes/Cursors/HandSpatialPointer.fbx index 193c3fd4e32632ce17d7a78db01f917718c25bd4..0df60da50cb9e4de16fa7076328f03f8fb4c4dac 100644 GIT binary patch delta 6447 zcmYir30P9;)@{PFqSVQ9W75hNb4krqgf??plvbTmu~H!)E5a_kZ_Z?tjj?|2g+;_i+BlftmLdUmGeSHY+G7 zz!en~ElScZ zU!ZmG-_lgcX;fWM!6Ck0D6F^VKRjQ{p`nVnCueUvUC?}JeNkOmdFO*O&X3RYUusX< zJ6P?qsy_PLkyrzR#Gex_F*XHz^p&0J>qo}MUp`f?QFztwb#c%3-|h}1I-Ts9JW1&? zM1~hsNqum+r|eej{AIje9>9(^Z*)m}xuPL#s)TPvpf_8YXLs8ihaN~*97CMSu)&iE zzaJq!byQ2>g>_7>JiAB}igg7~z(GqVQ73fl5vcyw{;-2X8C2!Dd@t3MWUv}oV0PYfDY{>U{Ku^T5N>Hdz>g=}_116$B zV5;AG^bdXNOY#-i*PWg#TcQ!csP5)_y|os#(7x5wxLjVd(5a6YQ%70MjAllMJ~f>j zj9qpg?I4W!Lx7>VWAM;MRu6umoVzaKtq(^#LA?|c(bF;SLhaIp4cJC68#szkh>45^ z$yj+BPjvS@#=Z2$sdHQbwxFcAf01beYXI0a8UB;v=YAIKi|S&pPV3-4}1WC^>iR-?!5?>X*| zZrceWS+HEOBliuBeuQ@nk`lf2F}A0&Da1wCVnTx>izf+jkn4LKnLZ4aBxdLHBRXAK zKt|CMiOn-?I&b-21#Kpe5c27L4#~h@GC!s=3oqu&9HfKo$D~NrQk<6r`Sh!kR7ehM zYBn(%xjLOkv4rphd+~=D-S2b4CeI!yySlqPgVY})0c_IiEb{yWjJQbjhXvgiOJ(7~ zg~Bi5Q$Zf&@Q2v5m0Bw@|Fi=$CFbRKT+e3#*UuV+ci>SFJ^JH78(nH^Pj{?j-g2A)~YeNVvGDn%YOS<>GS z6|9au8nG0KHuAaueol>fW@9va4rI;DRJu+t9~-%!T_(Rqa>~lD4w!O0y!s60cHrZ2 zYBhlC`=7p4Gz=^L zvJ2fGq)=bI2^zosfoq_|{Ps6+JIhKjm9mADHRi^mwuek!ff2*}(P61D= z*#ZIwF^rBu*-cpuRKIE*yQeEADx=Il>&+o{9Z5z6>r~%h(PzuBN5ZYYMfJKG%s;d*<7HNX zbZfIZGEH9Vl!9rvhorLdwtkJn!0=+CLe+r6jQh-&^@~I6PoifxxCL?pogBZB-I}{A z>s;7Kc9HV!x~%5R#lS82g7A0ur^|}UUmTpO?rTo#sdi?IdhmBt&&dhUiAs5aEAv;q ztF_tCY=`}~YqNSYcl{FIo5CWRvIfVNjoYuAV?1GTA>V$r%MD+m7B*A?+@hZ!?k>ZY zH)7xFmnJg}RL=&52O*dZhuAi)eDzurEV+VI9qhrBy% zaZjBRTehCrbtE;iY0L2SBgXaitim1Oj-c6wI@MINTW@;Z^=&h<2aKANsgEkVifq)! z24|+zPn-Q9qRO0degZT~wZgY=un3wJb1b#ThNSNnEfu#7_G25(%|NB5qPJ8VB>wIS z)<;xg%>nx#Nhzw#7D|+DxU;9K5B?oU@$v}z!ND7i!upQLzoqh-!msj6sN$yfW&~J1 z8{i=JpDD4tmU>d3P~7<9WBXsvZ#dm~d@%m&O)tO;Yj!5U0rlKxr)8XWyiaRS=cm`c z&EH;|Z?@XJ`S#|`hg*j2h_V_jRTZUUK3i(f9ba#ld9`KFy`RUnI9Qt3t2aT1PG8>{ z_p|r<)5eBrqxs%H?#oB%`QH91YvZBr!0*GE1G{ox{*lyi`GV7?lFkbVW%R9Qu~^HF;|I9DIaz8UpFcWOl+~jO zKet+il^rv+E_Z;evd1xFH8{2Bn}?nEVY3n1aTb6ps7rCou1(Xv)b67l8}3!#-dDuT8yYF+g_)hO#0>1 z2A86Tm%EA*oxESCoqPLXPYP7fUE}=dTdV$~eSbaD_1-;4dYp&hYR z^O6VrJb&M$$xQT~r>|AJ$~_qA77NR5cg+?iL%x=CscwD1*FKAlpr(ERNSN#s33~lR z`b*=Lx8TH)ik^6lfUGN(!nQuozx3KRMs|22WqkZ#r4i!X^s1ZIS5FLFXLyk#8_Gxp zh(fOt9j%#Vr|H1SC)IAU32PVg*-2)HxQ9bpl{`aWKfNg;%uu$YC2E5flG;HI;Rbv@ z_5_FouxR|sD~y#bPz%^eccS@fZFCQw`lfnmA}C5Dh0xpvk|2c~;ubK>o1Tc@p$#Gt zCwW7-%gDLPh(YXf6oo8Q%bk^~AW2=FM?NiYq*lQCK!fuibK3kCb|(k~Wsj9Pm15s~ z)0 z_@9|Xe<%pP2Qtp$X>kVXm|fPZYOPscOo>iFftF;3+*nFKf(zk!D>ZZKf%p_KTcquY z2eA6_O$b3XuzYY_g{5o$ZS zH~Irx3%QSOO_v`BNcOHTQSdVhzncezh(ObJ=?qsYw)3qi;y&)?s`QVbe2@S~eUpiS zCZ_}nf+07FB>i^S0jZSmk@Puqu{%GZ%@j5{BdO&(G1pIG=ZH_f?iO~FV#;t3{Az86 zbjtP&5lj6N3M~wj;2}yh7@CfPl?4pdl#YTBt8exKtE+fZkBfGFVH=Ua zv|y;__H{#bRtFpG3RNOzg4wRs4e(^Xy)2O5>R;P?VR$pRf7@`);8sSXsa*tX2k}Xh zFqnlzw53kWzYmL8crM(6NYbMJp_Tp7ldm;705;l?J@H&D4JG8T~5B z0}jwHftD;F^)zvDeS_z<&;bu&yyUq@(>c<#Av@%?_Vn~e7bt~Ng zUN|2f!$4*Wy2V9hEx8S75qAp^thW^)C%<=>?bUc?`0y@HaSR3`^R&RBlPB(aI?Yh> zn~{t~!-kA-*w%h{_C_=&o1U8qTbw@5MZl%yJ$?Re8VFxK7JZMtefCR~=K*+bPB=^v zS+z)f&#Goz81jYjYe?`b?u#f6B1*#*IvMA95ZVqAl0VNv(*n}Kg`8pF%o$w^CeF*| z3!K&W$dQhc3=P|VS=|cbk^?1QF6)sz-f|yJ*{F~-GWe{p-ylJK=n4MvUmV(jF%hqx zH$*_$+S43j>xAmOQ$Y`MESk?kx6)Q3Qb(Um?1BgkF)oe_6HN$*m=#?ZwweSE8e4i| z%6lfsOu+Oh4TGRL{}r$&ywo!#N$Sy zk{7wl$#PfMjIJnat3E*Hj+XI4zH3ICK`PzROz5|pk9f-09asUw7b(MeK%x5;VBvGg z5~kR8L4+Ri4Si>-3D|41c!Q)2kwt&*ThULG4}gQT{kn{B;tc6(SPX*Qf(RKtAQ|6A zCPqe!5Z40b>3Z&UTMU>g9+>@8-&H-N#e@6_@64D(GL8%lgr5^pdsn8UG2qo1av)I^ zvpUhA@+BHE_ZwJPT{OFYw>Z zh-BBlI_O4a()@({vqM`_7MyhF(KvjBD6(P*A{l5Ur_FlI=*v!~wH3@AW^olCpELFpjNV9$`j@<}L zD#;t*Rt zCk6_tDrh;vxLiJK_QQBX^i+7|$^di($mt3S4TmgA+iVRmZYf#JIrZF$Qrx(73wdeI z0s;#q_EkvF8L@Owzd|@QI&hX-ik5iT8rm{TQ=5y(s+2nHILVf)aFkvyn>n$jzpwK~ ztSlOYbs9Ejxw;^2z$w6S&wt1*ES~cwm^&Bn`1}MkY$;UKD%N8bI=TytoI98mH}t-) zfGc7<8nJ+}5Q-VYx@d9nkoE-^jh~!5?r#n`Et6e6TxqpdzWjGU?EhEYY(95`fC_fF zjk<%vgj{hsy+-72y;caVTPuX{)|3RZ9ZH4P-z%R{Ys!F`6>!-0@8^#zDJUpiaq-?R zuXxsq9xM4gR53oe`GWGXjVG;tZ+);S>il8NLqDl3Hg3h}2K{(BE#S@i>bVyMJ}_iu z>iwuw7xUaKyeu{ns@&(yqxznQq>!eZ-sP{nK09@wP3kz+oKQEXOP|yAyjT%WdRN>v zMgBsDX8;mE&sAL!efsip8pmY$gOQ25VAQKsR>h+ofkK`}Y~o1^Ii1!jQeAAFD`x`} znt!P*VfJEA06&s8c7{3@Puhqq{_HpZ)=O5<#?A9nw*B7K@5yh_j%EKSgv&4(>bl`dZit%7}<2yexnCz@cl z%09Vfs!!nH`P}RDHvf5Jpiffsb=G+Cvy3}i^~$s?B0w+^J_#*)oU_7A7RStL!pi6Y zN87j!1*HWs-=XV^lPS7d6ui|o)sBbqE?Us!}9x|e6I{*P0B zkUJ4b?uZy~RH*O2U5Co=o@Lb$o8p4i1*!)xJoDajmU7(d;_p5i4nER$O8kO6S-d0a zuEC49PY$1zg=BLx`BY&hfh(o+NV9!5W@ctaG9P0%!EwyUIXbgHzvX)JC=y17+T0v% zeq!jdsXVy;ubrZ>k+`5cIOL=4EHd|e=OvNfT}OMHn*ol6x^MhGRP7K~8hBE*gMk3Y z0<`c_*Jueb<&Jod=SV9w&4B=wjj-NlfWK3WzI^`B-Nx_LPS<`}iG;LY%ZDcG;()|v zeuc5u{HUK^ynOy56Q1)hUC^0ir+gUM)3XPPSW`Fm z6n#5AO%Yp$#gydqjcjbh9?AL`>VqE>vB}}%NU3f%D$yd1RIbk=0tX`UtO#&m5T^XJ2ZGR4!|PPHV*1l=|A6HoWYr2FvQZ^xvyolN+avo#Ok-WvJl^tfnZ9AyNt zH?qib6<%#YiB<{5uw`iC^X`<7F;zNtm18S*Z;EVWZIO=~k)C5`wmE`JSdD2mizi#M zVuBWNoo}0#U;1vV^h`)gIF;}%*YK`o*vGVl?dZFm%}pj@$WL{*TLPzcW1wiSwpISd zO%7B#)ts4LH5vnC>4>VWIQDrnk>y(TMYm1D!x{q`s9`UsJpz49W@EO8#|DjgTx>>a zT<9=P!P@$~&DDL=f8|Zsyr2Y z$U?)s&80p~G!KZa(dyz3SG4*42IaI?u z!p$NL<(1j}1#@%$ykox1!#YJg-+@08{PlGTY`L4emG=N&yOvu2JB;OR^|hS2_7C%i z?>YE;>P6UpPrcr9Xt_Pb$x=({H+zbYi;=(BWok!O;4HWd? zl(-#c6ysf65vSx!{43H1C*182-~Y*VS!3yg2GT`R1~*vg1` z*CYh60dciANKMe}Ns5RJA(ALTc_5-jjX;zNxpJ@U#I{qLY65gtZT{gL5q>Ptu<=UY z&7L#W>Fu+`pZDr4L%ugNt*-p-x%>6K39X@f0*7iJ?F!=PPP|zA>*hdd`vscx_$9vj~MBV2* zPL~wDyQ66BFz^^xtidoaj9c`!Zix?@k1M`rymHB5v#N%(zr9YD{mr7v9?-&g0+UKA zThB@rkDYgv5K>)~4F;cLBOZNE+$~(|F0lM5(#t zzs9VdUxgW&H}e2tD7)pLTl4!&r-_d*W6cj{v3+Ltd*JLo)uJB;MA42(;*4AGBj1Ux zvqBz=9|~1QG3c|kWkWGfg~Juy2PX2kjKXfT&prpW|CE5IrwiFKEG%+vNm;j!omvN! z4{#?MQ%7;@N5>vMXdcCt^FHeNM=jUb%j=KxvtY(R4oII*=Jd{OT6rGIu8j$^I~!h2^eIMKh?&7JFw*i$jy)}K(qCVG>=Bb1_n0%GfHjOYzn$CrB~w^nx@>eO zhth({Vd^v@QICfOk*Fc!ubGqz+NqEOOzq37EVpV)Cuj0}V%{rO0QZvOl9E%>7nuph zdb0kzwBx$BpocB=KZ%W-U)~$zl$sBhoQGD7bMwJ2!2eAV|>Jc-`v-+s$}FIQg;Mz}pL{>t9#gFH7mhEN-b< zr`DC*?Xo)hzXOU)=*Y~CMW({ZO%(^c-_Ou5tRUpE(Gw3UH~-D*Xg+JZOVQVS$#y3l z;jn)wc`9zI?A&Xw0D*p=k*#UZV;^l!kVEADLDp1^gHsn$(bw;Efi66k(M|8}UgZ!Z z`n^Yk4ibbz*Pe0O^yJ0%DfuT}muP#Y_Yuj+XLtLE0NLRg)5(+WbDjw@v_Z!9{9~Q# z9UL4$bsGV6Yn4 z?YZ?i!Att4bu$t@fDk05{U|#3Xi9}fR!rHc7bJgRTCdhW{j$B7_q*X7!sEBKZl8c} zzl3iT43oBVP%w!SLj4-CF7TTQSy$z-{{|Sl7Jbl5$`?~8=#&mR7NLt@w*X1mgzU{=Fs@t}c z=_78opYF9a+X`8dA5*qQRXC^lM%SEv?;BI)TG$(1>nH7%mOG`Q7pn;Zw6yXBw{-E1 zkEm2y;gZEztnnIPNUQLCw$X?PivlL_*o*?eL(OOvvPgzr~5gnM2yynKKz;9D(4z6Ey z$|Pya3)6%3VLGjD7CB3xPmO{e=e=gXof&8SJun3s*A-gDi0T2GakhvtP$pUYaed|P zq0yJd4KV{nzU{>2rH|oFl2@aqO-#|uqgq=uRf!zt;;6EsYIA5k=$gDZcVb?17IZYjd3uY*92yG}F5?!X>JSQ&?J z;VKyeO1Sahn>Aam(q?_ zi8pO+b#1YS@HM*!binpKq^ zx_piJ`a%t)Ijv><&ng%?NlCJAjPr3~H1rEx%DLbq%THm|4vZbfaqg;eSN`0l!9vx{ z{QbEd{Z#Y{Caa7$#}H5cs;q0AoRIwiIy8zj7XG@dVFSFxCG^;3V=b_9{=HHlvQOO7 zT%b*bU134kp&wMpvF-;Y!ImGGDGv$|Wu<6LcW@Sa2Y#i~PV7Z5RQ^P>KJ=HxgS7Zj z8T+&}A`i{rKH**~RP8`l?@rCr?d?3hVhAwfhGf~igjxn+d6T`vqV;SM7lXKmn0>=t z)_}DlxcGKxbq35RKqGYk*gXmjQ#MpBopG6l4tl~D5~%ZsC7S(X3pn9Z-Y>XL%rlsP z=)b+RnrGb1Z<(K!i`Tvv4z#jLMhNIy3?{6vM?@|Ak3^~6FFs05AMtXyU@^udyp>jT z2mFQ09m!oejT3wF#acG;xw_&!`Nq_RT$vA|j);9pJ0Mn^160|{8*{oaF?#Nze|b-7 zHRwdldmGN}Fu&`#sHKDqa*`?_@okm;U-8u$@e2^DuwcnCUP74H;(Ko|D^4Q<9*mW@ zhHPfyC0B}@KO;jj*OG%SEYMO=!%)BT+R3Vxp5}p?$AGS2d@2D?#iHbtINV;~)Ho>$ zR;g7AjBY?&i;+39ivsr5C!sA-3y>mN{?mfh8RIyGWo~#*$()wWz+D-sAid|{R?Hhw zrWg2(l%6rO3CdP{2duOMr6RObg`AO$xgEUGU!oEUmmB{+9Pg0!LFEs%fyGG}?gMpX zRp(r93-UI5Qkctm7h5)!WywxWbb*Oh16gTlg)`y_%GCRz>LjI##hsGGguady*@=;q zk~4e;LrxK+_Mj$zrhSXMI)Z{Xi&vVBhMCWbCEtj1;;UmiZYZB4+M#b;5FWUzZK7$E zU*Vmo`_Q76uryV+Ay$r(Vgf&Q2PQn10L$l@Jq8|Zq z%?A-HjGe7gp)yTGuX5gsdhTar(32G$H!Xy*Y)JDBqpz)0>dvn8h8K-y=)z{}o(MI$ z!^M-ZktaC+vW6?%ly~wt`rUdzK9L<@7i~OpP5>{()zjOQZhLVf_KVwRi$or{*{1=r zTQ2bn(4r2~EQ=2;FCUF_ER|)?YF|~v30XKW6(=~0T32(D zJzP!kc4hT$zLyIMg-`7-bPRqUr@PQo#%x388IK#|MM>pk>8VN1SdRRbPe47!s zVOF%E=lJgFxRep{LtsjEp_=ot)oUsA2LG5ZEv7!$46dB`&_FH=8D#?d17}p>?Wi(7 z5*Al!0|N*R`OdI-dF+Rd{XI~u&-|uv+zW9DZ+Z+B+vJL+7*@F~-yl>cJcGIl;b9r&DEl&|u(*We1iRC&psivhP@g4$I zK6fi;l(!Id9P1+kGI6;I!q1X!=z}=-!fpe_7MN5Re_O_LzLh7dOB+z2!l@65Pjb-B zEK1jF7G4pEYk$a}s1R)HJe8&7H3j64XZzdt7Se7!Ou`o7YB>v-tw}7YV?gOm{*qvY zZs8xh(q#ANIJPA&CwyUqHsKY!P0;!xz*}Gc2}`)wus`EgE_Kt$V8~Uwvqr|ZAFKw_I146Jr!L8s;bUDA z|C*%yalfCKgW;h!2O~nQi?;c!n|VLjQ*_|X+x&1~JBp~&S4G_tyRB!SVzlehRlfF0 zxL!ruU_`S|e`C0CDo=)uK5{~G$ycvT^xWw3G|q5Yd1AM^k)K?ekHJ-D{(7hIsHpVFk0_hDK)9GA2GP-#+F5#@2U(5idh~kwaPe6x`2! z`I2=j2`($PN&|eN0QB^wRgv+5b>?^>?o9SBOAYmP^dH%4&D@FEta-xf^Ogw$@mE&N zQy92rvK8|Z##HmE6>|xL)cnT!GdO3(Y{%@<)VBt~!|*5IMOA$%H36HpD>;Z1dJ9|@wtKlJLlA#6D%w&V+kwZ)~oY6r)@Nd-H zPkmZj;~Etj8RBvNGU@Y9rhGMl$1)8l;o|wAkg#AU$b&;n8qNXOZ3CiTMc0WO76x9F zL&#wi(O0(&K^w%0pdO3IfA&mGKB-n}*#Zt%d;h;Q^_5y}{fDpq@sIfYYf2q$wVM<- O8>WNfapoPz Date: Sat, 23 May 2020 20:20:50 +0200 Subject: [PATCH 48/78] Use local position only for joint poses --- .../Controllers/Hands/DefaultHandControllerVisualizer.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/DefaultHandControllerVisualizer.cs b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/DefaultHandControllerVisualizer.cs index e59c2a71..1f614997 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/DefaultHandControllerVisualizer.cs +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/DefaultHandControllerVisualizer.cs @@ -130,7 +130,7 @@ private void UpdateHandJointTransforms(HandData handData) { var jointTransform = GetOrCreateJointTransform(handJoint); var jointPose = jointPoses[handJoint]; - jointTransform.localPosition = jointTransform.parent.InverseTransformPoint(jointPose.Position); + jointTransform.localPosition = jointPose.Position; jointTransform.rotation = jointPose.Rotation; } } From 9b3c0591585c829d88a60285e24e3fe3c11562be Mon Sep 17 00:00:00 2001 From: Dino Fejzagic Date: Tue, 26 May 2020 18:01:50 +0200 Subject: [PATCH 49/78] Add debug utility to record hand data --- .../Features/Input/HandDataRecorder.cs | 60 +++++++++++++++++++ .../Features/Input/HandDataRecorder.cs.meta | 11 ++++ 2 files changed, 71 insertions(+) create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/Input/HandDataRecorder.cs create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/Input/HandDataRecorder.cs.meta diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/Input/HandDataRecorder.cs b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/Input/HandDataRecorder.cs new file mode 100644 index 00000000..152632ff --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/Input/HandDataRecorder.cs @@ -0,0 +1,60 @@ +// Copyright (c) XRTK. All rights reserved. +// Licensed under the MIT License. See LICENSE in the project root for license information. + +using UnityEngine; +using XRTK.Definitions.Controllers.Hands; +using XRTK.Definitions.Utilities; +using XRTK.EventDatum.Input; +using XRTK.Interfaces.InputSystem.Handlers; + +namespace XRTK.SDK.Input +{ + /// + /// Utilitiy component to record a hand controller's data into a file. + /// + public class HandDataRecorder : InputSystemGlobalListener, IMixedRealityInputHandler + { + private RecordedHandJoints currentRecording; + + [SerializeField] + [Tooltip("The handedness of the hand to record data for.")] + private Handedness targetHandedness = Handedness.Right; + + [SerializeField] + [Tooltip("Keycode to trigger saving of the currently recorded data.")] + private KeyCode saveRecordingKey = KeyCode.Return; + + private void Update() + { + if (currentRecording != null && UnityEngine.Input.GetKeyDown(saveRecordingKey)) + { + Debug.Log(JsonUtility.ToJson(currentRecording)); + } + } + + public void OnInputChanged(InputEventData eventData) + { +#if UNITY_EDITOR + + if (targetHandedness != eventData.Handedness) + { + return; + } + + var handData = eventData.InputData; + var recordedHandJoints = new RecordedHandJoints(); + var jointPoses = new RecordedHandJoint[HandData.JointCount]; + + for (int i = 0; i < HandData.JointCount; i++) + { + var jointPose = handData.Joints[i]; + jointPoses[i] = new RecordedHandJoint((TrackedHandJoint)i, jointPose); + } + + recordedHandJoints.items = jointPoses; + currentRecording = recordedHandJoints; + +#endif + } + } +} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/Input/HandDataRecorder.cs.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/Input/HandDataRecorder.cs.meta new file mode 100644 index 00000000..5fb5d70e --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/Input/HandDataRecorder.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c7e5d8a16f6afc94bb2badc2f4daf3c8 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {fileID: 2800000, guid: 08c0fd91bdca45afa09ec64323cf3848, type: 3} + userData: + assetBundleName: + assetBundleVariant: From 8fda857a94ce212ff324493fa052a6eb8125b0a1 Mon Sep 17 00:00:00 2001 From: Dino Fejzagic Date: Tue, 26 May 2020 21:51:46 +0200 Subject: [PATCH 50/78] Goodbye NONE joint --- .../RecordedPoses/FlatHandPoseData.json | 16 ---------------- .../RecordedPoses/GrabHandPoseData.json | 16 ---------------- .../RecordedPoses/OpenHandPoseData.json | 16 ---------------- .../RecordedPoses/PinchHandPoseData.json | 16 ---------------- .../PinchSteadyWristHandPoseData.json | 16 ---------------- .../RecordedPoses/PokeHandPoseData.json | 16 ---------------- .../RecordedPoses/ThumbsUpHandPoseData.json | 16 ---------------- .../RecordedPoses/VictoryHandPoseData.json | 16 ---------------- .../Hands/DefaultHandControllerVisualizer.cs | 11 ++++------- .../Hands/HandControllerJointsVisualizer.cs | 5 +---- 10 files changed, 5 insertions(+), 139 deletions(-) diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/FlatHandPoseData.json b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/FlatHandPoseData.json index 16645ce7..44cc8e27 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/FlatHandPoseData.json +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/FlatHandPoseData.json @@ -1,21 +1,5 @@ { "items": [ - { - "joint": "None", - "pose": { - "position": { - "x": -0.0470723882317543, - "y": -0.18403607606887818, - "z": -0.5408412218093872 - }, - "rotation": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - } - } - }, { "joint": "Wrist", "pose": { diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/GrabHandPoseData.json b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/GrabHandPoseData.json index 9fff898b..747899d8 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/GrabHandPoseData.json +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/GrabHandPoseData.json @@ -1,21 +1,5 @@ { "items": [ - { - "joint": "None", - "pose": { - "position": { - "x": -0.08690944314002991, - "y": 0.013536587357521057, - "z": -0.3781388998031616 - }, - "rotation": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - } - } - }, { "joint": "Wrist", "pose": { diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/OpenHandPoseData.json b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/OpenHandPoseData.json index b63a2e64..a64f6cff 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/OpenHandPoseData.json +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/OpenHandPoseData.json @@ -1,21 +1,5 @@ { "items": [ - { - "joint": "None", - "pose": { - "position": { - "x": -0.0780251994729042, - "y": -0.05990780144929886, - "z": -0.3291178047657013 - }, - "rotation": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - } - } - }, { "joint": "Wrist", "pose": { diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PinchHandPoseData.json b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PinchHandPoseData.json index cd2adf5a..ff012a96 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PinchHandPoseData.json +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PinchHandPoseData.json @@ -1,21 +1,5 @@ { "items": [ - { - "joint": "None", - "pose": { - "position": { - "x": -0.055795830441638827, - "y": -0.050494263647124171, - "z": -0.31160801439546049 - }, - "rotation": { - "x": 0, - "y": 0, - "z": 0, - "w": 0 - } - } - }, { "joint": "Wrist", "pose": { diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PinchSteadyWristHandPoseData.json b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PinchSteadyWristHandPoseData.json index 627c670e..79aff5fe 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PinchSteadyWristHandPoseData.json +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PinchSteadyWristHandPoseData.json @@ -1,21 +1,5 @@ { "items": [ - { - "joint": "None", - "pose": { - "position": { - "x": -0.06115446984767914, - "y": -0.09662134945392609, - "z": -0.2845369577407837 - }, - "rotation": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - } - } - }, { "joint": "Wrist", "pose": { diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PokeHandPoseData.json b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PokeHandPoseData.json index 20ad07b8..32081ae2 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PokeHandPoseData.json +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PokeHandPoseData.json @@ -1,21 +1,5 @@ { "items": [ - { - "joint": "None", - "pose": { - "position": { - "x": -0.0002162586897611618, - "y": -0.07638707756996155, - "z": -0.5826087594032288 - }, - "rotation": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - } - } - }, { "joint": "Wrist", "pose": { diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/ThumbsUpHandPoseData.json b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/ThumbsUpHandPoseData.json index 4909c61a..47f48173 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/ThumbsUpHandPoseData.json +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/ThumbsUpHandPoseData.json @@ -1,21 +1,5 @@ { "items": [ - { - "joint": "None", - "pose": { - "position": { - "x": -0.01725071482360363, - "y": -0.08121182024478913, - "z": -0.47676876187324526 - }, - "rotation": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - } - } - }, { "joint": "Wrist", "pose": { diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/VictoryHandPoseData.json b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/VictoryHandPoseData.json index 52e498ec..986bba1c 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/VictoryHandPoseData.json +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/VictoryHandPoseData.json @@ -1,21 +1,5 @@ { "items": [ - { - "joint": "None", - "pose": { - "position": { - "x": 0.0021753902547061445, - "y": -0.13046418130397798, - "z": -0.45588064193725588 - }, - "rotation": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - } - } - }, { "joint": "Wrist", "pose": { diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/DefaultHandControllerVisualizer.cs b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/DefaultHandControllerVisualizer.cs index 1f614997..a40e5d4d 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/DefaultHandControllerVisualizer.cs +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/DefaultHandControllerVisualizer.cs @@ -126,13 +126,10 @@ private void UpdateHandJointTransforms(HandData handData) foreach (var handJoint in jointPoses.Keys) { - if (handJoint != TrackedHandJoint.None) - { - var jointTransform = GetOrCreateJointTransform(handJoint); - var jointPose = jointPoses[handJoint]; - jointTransform.localPosition = jointPose.Position; - jointTransform.rotation = jointPose.Rotation; - } + var jointTransform = GetOrCreateJointTransform(handJoint); + var jointPose = jointPoses[handJoint]; + jointTransform.localPosition = jointPose.Position; + jointTransform.rotation = jointPose.Rotation; } } diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/HandControllerJointsVisualizer.cs b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/HandControllerJointsVisualizer.cs index 714e1c51..bd1f5ac1 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/HandControllerJointsVisualizer.cs +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/HandControllerJointsVisualizer.cs @@ -59,10 +59,7 @@ public void UpdateVisualization(DefaultHandControllerVisualizer mainVisualizer) for (int i = 0; i < HandData.JointCount; i++) { var joint = (TrackedHandJoint)i; - if (joint != TrackedHandJoint.None) - { - CreateJointVisualizerIfNotExists(joint); - } + CreateJointVisualizerIfNotExists(joint); } } From 6224ab7dbc9fbf7987ce3bace81df79536b3c6ce Mon Sep 17 00:00:00 2001 From: Dino Fejzagic Date: Wed, 27 May 2020 10:39:23 +0200 Subject: [PATCH 51/78] Rename joints --- .../RecordedPoses/FlatHandPoseData.json | 34 +++++++------- .../RecordedPoses/GrabHandPoseData.json | 34 +++++++------- .../RecordedPoses/OpenHandPoseData.json | 34 +++++++------- .../RecordedPoses/PinchHandPoseData.json | 34 +++++++------- .../PinchSteadyWristHandPoseData.json | 34 +++++++------- .../RecordedPoses/PokeHandPoseData.json | 34 +++++++------- .../RecordedPoses/ThumbsUpHandPoseData.json | 34 +++++++------- .../RecordedPoses/VictoryHandPoseData.json | 34 +++++++------- .../Hands/DefaultHandControllerVisualizer.cs | 44 +++++++++---------- .../Hands/HandControllerJointsVisualizer.cs | 2 +- 10 files changed, 159 insertions(+), 159 deletions(-) diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/FlatHandPoseData.json b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/FlatHandPoseData.json index 44cc8e27..23ac08cb 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/FlatHandPoseData.json +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/FlatHandPoseData.json @@ -33,7 +33,7 @@ } }, { - "joint": "ThumbMetacarpalJoint", + "joint": "ThumbMetacarpal", "pose": { "position": { "x": 0.03695414960384369, @@ -49,7 +49,7 @@ } }, { - "joint": "ThumbProximalJoint", + "joint": "ThumbProximal", "pose": { "position": { "x": 0.00045104348100721836, @@ -65,7 +65,7 @@ } }, { - "joint": "ThumbDistalJoint", + "joint": "ThumbDistal", "pose": { "position": { "x": -0.016296127811074258, @@ -113,7 +113,7 @@ } }, { - "joint": "IndexKnuckle", + "joint": "IndexProximal", "pose": { "position": { "x": 0.023209279403090478, @@ -129,7 +129,7 @@ } }, { - "joint": "IndexMiddleJoint", + "joint": "IndexIntermediate", "pose": { "position": { "x": 0.009743190370500088, @@ -145,7 +145,7 @@ } }, { - "joint": "IndexDistalJoint", + "joint": "IndexDistal", "pose": { "position": { "x": 0.0026917937211692335, @@ -193,7 +193,7 @@ } }, { - "joint": "MiddleKnuckle", + "joint": "MiddleProximal", "pose": { "position": { "x": 0.045069482177495959, @@ -209,7 +209,7 @@ } }, { - "joint": "MiddleMiddleJoint", + "joint": "MiddleIntermediate", "pose": { "position": { "x": 0.035030756145715716, @@ -225,7 +225,7 @@ } }, { - "joint": "MiddleDistalJoint", + "joint": "MiddleDistal", "pose": { "position": { "x": 0.031546302139759067, @@ -273,7 +273,7 @@ } }, { - "joint": "RingKnuckle", + "joint": "RingProximal", "pose": { "position": { "x": 0.06544187664985657, @@ -289,7 +289,7 @@ } }, { - "joint": "RingMiddleJoint", + "joint": "RingIntermediate", "pose": { "position": { "x": 0.06159381568431854, @@ -305,7 +305,7 @@ } }, { - "joint": "RingDistalJoint", + "joint": "RingDistal", "pose": { "position": { "x": 0.06070023775100708, @@ -337,7 +337,7 @@ } }, { - "joint": "PinkyMetacarpal", + "joint": "LittleMetacarpal", "pose": { "position": { "x": 0.07710164040327072, @@ -353,7 +353,7 @@ } }, { - "joint": "PinkyKnuckle", + "joint": "LittleProximal", "pose": { "position": { "x": 0.08530370891094208, @@ -369,7 +369,7 @@ } }, { - "joint": "PinkyMiddleJoint", + "joint": "LittleIntermediate", "pose": { "position": { "x": 0.08779342472553253, @@ -385,7 +385,7 @@ } }, { - "joint": "PinkyDistalJoint", + "joint": "LittleDistal", "pose": { "position": { "x": 0.09219621121883393, @@ -401,7 +401,7 @@ } }, { - "joint": "PinkyTip", + "joint": "LittleTip", "pose": { "position": { "x": 0.09392204880714417, diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/GrabHandPoseData.json b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/GrabHandPoseData.json index 747899d8..a42ea2e8 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/GrabHandPoseData.json +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/GrabHandPoseData.json @@ -33,7 +33,7 @@ } }, { - "joint": "ThumbMetacarpalJoint", + "joint": "ThumbMetacarpal", "pose": { "position": { "x": 0.033823080360889438, @@ -49,7 +49,7 @@ } }, { - "joint": "ThumbProximalJoint", + "joint": "ThumbProximal", "pose": { "position": { "x": -0.0048112208023667339, @@ -65,7 +65,7 @@ } }, { - "joint": "ThumbDistalJoint", + "joint": "ThumbDistal", "pose": { "position": { "x": -0.02188277430832386, @@ -113,7 +113,7 @@ } }, { - "joint": "IndexKnuckle", + "joint": "IndexProximal", "pose": { "position": { "x": -0.0008817678317427635, @@ -129,7 +129,7 @@ } }, { - "joint": "IndexMiddleJoint", + "joint": "IndexIntermediate", "pose": { "position": { "x": -0.014839660376310349, @@ -145,7 +145,7 @@ } }, { - "joint": "IndexDistalJoint", + "joint": "IndexDistal", "pose": { "position": { "x": -0.008270945399999619, @@ -193,7 +193,7 @@ } }, { - "joint": "MiddleKnuckle", + "joint": "MiddleProximal", "pose": { "position": { "x": 0.020074930042028428, @@ -209,7 +209,7 @@ } }, { - "joint": "MiddleMiddleJoint", + "joint": "MiddleIntermediate", "pose": { "position": { "x": 0.005748542491346598, @@ -225,7 +225,7 @@ } }, { - "joint": "MiddleDistalJoint", + "joint": "MiddleDistal", "pose": { "position": { "x": 0.012452101334929467, @@ -273,7 +273,7 @@ } }, { - "joint": "RingKnuckle", + "joint": "RingProximal", "pose": { "position": { "x": 0.038666337728500369, @@ -289,7 +289,7 @@ } }, { - "joint": "RingMiddleJoint", + "joint": "RingIntermediate", "pose": { "position": { "x": 0.02693704515695572, @@ -305,7 +305,7 @@ } }, { - "joint": "RingDistalJoint", + "joint": "RingDistal", "pose": { "position": { "x": 0.029263043776154519, @@ -337,7 +337,7 @@ } }, { - "joint": "PinkyMetacarpal", + "joint": "LittleMetacarpal", "pose": { "position": { "x": 0.0675557404756546, @@ -353,7 +353,7 @@ } }, { - "joint": "PinkyKnuckle", + "joint": "LittleProximal", "pose": { "position": { "x": 0.05575947463512421, @@ -369,7 +369,7 @@ } }, { - "joint": "PinkyMiddleJoint", + "joint": "LittleIntermediate", "pose": { "position": { "x": 0.046450983732938769, @@ -385,7 +385,7 @@ } }, { - "joint": "PinkyDistalJoint", + "joint": "LittleDistal", "pose": { "position": { "x": 0.044868819415569308, @@ -401,7 +401,7 @@ } }, { - "joint": "PinkyTip", + "joint": "LittleTip", "pose": { "position": { "x": 0.04328276216983795, diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/OpenHandPoseData.json b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/OpenHandPoseData.json index a64f6cff..d33119e9 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/OpenHandPoseData.json +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/OpenHandPoseData.json @@ -33,7 +33,7 @@ } }, { - "joint": "ThumbMetacarpalJoint", + "joint": "ThumbMetacarpal", "pose": { "position": { "x": 0.05004027485847473, @@ -49,7 +49,7 @@ } }, { - "joint": "ThumbProximalJoint", + "joint": "ThumbProximal", "pose": { "position": { "x": 0.014790681190788746, @@ -65,7 +65,7 @@ } }, { - "joint": "ThumbDistalJoint", + "joint": "ThumbDistal", "pose": { "position": { "x": -0.0062080565840005878, @@ -113,7 +113,7 @@ } }, { - "joint": "IndexKnuckle", + "joint": "IndexProximal", "pose": { "position": { "x": 0.025922514498233796, @@ -129,7 +129,7 @@ } }, { - "joint": "IndexMiddleJoint", + "joint": "IndexIntermediate", "pose": { "position": { "x": 0.012116845697164536, @@ -145,7 +145,7 @@ } }, { - "joint": "IndexDistalJoint", + "joint": "IndexDistal", "pose": { "position": { "x": 0.0047910469584167, @@ -193,7 +193,7 @@ } }, { - "joint": "MiddleKnuckle", + "joint": "MiddleProximal", "pose": { "position": { "x": 0.04579643905162811, @@ -209,7 +209,7 @@ } }, { - "joint": "MiddleMiddleJoint", + "joint": "MiddleIntermediate", "pose": { "position": { "x": 0.03759719431400299, @@ -225,7 +225,7 @@ } }, { - "joint": "MiddleDistalJoint", + "joint": "MiddleDistal", "pose": { "position": { "x": 0.039636775851249698, @@ -273,7 +273,7 @@ } }, { - "joint": "RingKnuckle", + "joint": "RingProximal", "pose": { "position": { "x": 0.06377431005239487, @@ -289,7 +289,7 @@ } }, { - "joint": "RingMiddleJoint", + "joint": "RingIntermediate", "pose": { "position": { "x": 0.056988153606653216, @@ -305,7 +305,7 @@ } }, { - "joint": "RingDistalJoint", + "joint": "RingDistal", "pose": { "position": { "x": 0.05652663856744766, @@ -337,7 +337,7 @@ } }, { - "joint": "PinkyMetacarpal", + "joint": "LittleMetacarpal", "pose": { "position": { "x": 0.08423660695552826, @@ -353,7 +353,7 @@ } }, { - "joint": "PinkyKnuckle", + "joint": "LittleProximal", "pose": { "position": { "x": 0.0801829993724823, @@ -369,7 +369,7 @@ } }, { - "joint": "PinkyMiddleJoint", + "joint": "LittleIntermediate", "pose": { "position": { "x": 0.07411551475524903, @@ -385,7 +385,7 @@ } }, { - "joint": "PinkyDistalJoint", + "joint": "LittleDistal", "pose": { "position": { "x": 0.07075578719377518, @@ -401,7 +401,7 @@ } }, { - "joint": "PinkyTip", + "joint": "LittleTip", "pose": { "position": { "x": 0.0670883059501648, diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PinchHandPoseData.json b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PinchHandPoseData.json index ff012a96..5b051adc 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PinchHandPoseData.json +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PinchHandPoseData.json @@ -33,7 +33,7 @@ } }, { - "joint": "ThumbMetacarpalJoint", + "joint": "ThumbMetacarpal", "pose": { "position": { "x": 0.0704388425219804, @@ -49,7 +49,7 @@ } }, { - "joint": "ThumbProximalJoint", + "joint": "ThumbProximal", "pose": { "position": { "x": 0.030931103276088834, @@ -65,7 +65,7 @@ } }, { - "joint": "ThumbDistalJoint", + "joint": "ThumbDistal", "pose": { "position": { "x": 0.011377685004845262, @@ -113,7 +113,7 @@ } }, { - "joint": "IndexKnuckle", + "joint": "IndexProximal", "pose": { "position": { "x": 0.042313426034525037, @@ -129,7 +129,7 @@ } }, { - "joint": "IndexMiddleJoint", + "joint": "IndexIntermediate", "pose": { "position": { "x": 0.015641395235434175, @@ -145,7 +145,7 @@ } }, { - "joint": "IndexDistalJoint", + "joint": "IndexDistal", "pose": { "position": { "x": 0.0043656446505337954, @@ -193,7 +193,7 @@ } }, { - "joint": "MiddleKnuckle", + "joint": "MiddleProximal", "pose": { "position": { "x": 0.061702992068603635, @@ -209,7 +209,7 @@ } }, { - "joint": "MiddleMiddleJoint", + "joint": "MiddleIntermediate", "pose": { "position": { "x": 0.033647007541731, @@ -225,7 +225,7 @@ } }, { - "joint": "MiddleDistalJoint", + "joint": "MiddleDistal", "pose": { "position": { "x": 0.033218997763469815, @@ -273,7 +273,7 @@ } }, { - "joint": "RingKnuckle", + "joint": "RingProximal", "pose": { "position": { "x": 0.076233054744079709, @@ -289,7 +289,7 @@ } }, { - "joint": "RingMiddleJoint", + "joint": "RingIntermediate", "pose": { "position": { "x": 0.051643508719280362, @@ -305,7 +305,7 @@ } }, { - "joint": "RingDistalJoint", + "joint": "RingDistal", "pose": { "position": { "x": 0.0525671869982034, @@ -337,7 +337,7 @@ } }, { - "joint": "PinkyMetacarpal", + "joint": "LittleMetacarpal", "pose": { "position": { "x": 0.10081055318005383, @@ -353,7 +353,7 @@ } }, { - "joint": "PinkyKnuckle", + "joint": "LittleProximal", "pose": { "position": { "x": 0.088435876416042447, @@ -369,7 +369,7 @@ } }, { - "joint": "PinkyMiddleJoint", + "joint": "LittleIntermediate", "pose": { "position": { "x": 0.071086059557273984, @@ -385,7 +385,7 @@ } }, { - "joint": "PinkyDistalJoint", + "joint": "LittleDistal", "pose": { "position": { "x": 0.068500611232593656, @@ -401,7 +401,7 @@ } }, { - "joint": "PinkyTip", + "joint": "LittleTip", "pose": { "position": { "x": 0.070451776729896665, diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PinchSteadyWristHandPoseData.json b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PinchSteadyWristHandPoseData.json index 79aff5fe..7cd9233c 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PinchSteadyWristHandPoseData.json +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PinchSteadyWristHandPoseData.json @@ -33,7 +33,7 @@ } }, { - "joint": "ThumbMetacarpalJoint", + "joint": "ThumbMetacarpal", "pose": { "position": { "x": 0.0726172998547554, @@ -49,7 +49,7 @@ } }, { - "joint": "ThumbProximalJoint", + "joint": "ThumbProximal", "pose": { "position": { "x": 0.033425573259592059, @@ -65,7 +65,7 @@ } }, { - "joint": "ThumbDistalJoint", + "joint": "ThumbDistal", "pose": { "position": { "x": 0.014360085129737854, @@ -113,7 +113,7 @@ } }, { - "joint": "IndexKnuckle", + "joint": "IndexProximal", "pose": { "position": { "x": 0.03474228084087372, @@ -129,7 +129,7 @@ } }, { - "joint": "IndexMiddleJoint", + "joint": "IndexIntermediate", "pose": { "position": { "x": 0.011708781123161316, @@ -145,7 +145,7 @@ } }, { - "joint": "IndexDistalJoint", + "joint": "IndexDistal", "pose": { "position": { "x": 0.007551820017397404, @@ -193,7 +193,7 @@ } }, { - "joint": "MiddleKnuckle", + "joint": "MiddleProximal", "pose": { "position": { "x": 0.05473826080560684, @@ -209,7 +209,7 @@ } }, { - "joint": "MiddleMiddleJoint", + "joint": "MiddleIntermediate", "pose": { "position": { "x": 0.03288401663303375, @@ -225,7 +225,7 @@ } }, { - "joint": "MiddleDistalJoint", + "joint": "MiddleDistal", "pose": { "position": { "x": 0.03765859827399254, @@ -273,7 +273,7 @@ } }, { - "joint": "RingKnuckle", + "joint": "RingProximal", "pose": { "position": { "x": 0.07221101969480515, @@ -289,7 +289,7 @@ } }, { - "joint": "RingMiddleJoint", + "joint": "RingIntermediate", "pose": { "position": { "x": 0.05479241907596588, @@ -305,7 +305,7 @@ } }, { - "joint": "RingDistalJoint", + "joint": "RingDistal", "pose": { "position": { "x": 0.05848679319024086, @@ -337,7 +337,7 @@ } }, { - "joint": "PinkyMetacarpal", + "joint": "LittleMetacarpal", "pose": { "position": { "x": 0.10431554913520813, @@ -353,7 +353,7 @@ } }, { - "joint": "PinkyKnuckle", + "joint": "LittleProximal", "pose": { "position": { "x": 0.08813987672328949, @@ -369,7 +369,7 @@ } }, { - "joint": "PinkyMiddleJoint", + "joint": "LittleIntermediate", "pose": { "position": { "x": 0.07569940388202667, @@ -385,7 +385,7 @@ } }, { - "joint": "PinkyDistalJoint", + "joint": "LittleDistal", "pose": { "position": { "x": 0.0749262273311615, @@ -401,7 +401,7 @@ } }, { - "joint": "PinkyTip", + "joint": "LittleTip", "pose": { "position": { "x": 0.07520446181297302, diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PokeHandPoseData.json b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PokeHandPoseData.json index 32081ae2..346c9253 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PokeHandPoseData.json +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PokeHandPoseData.json @@ -33,7 +33,7 @@ } }, { - "joint": "ThumbMetacarpalJoint", + "joint": "ThumbMetacarpal", "pose": { "position": { "x": 0.020570117980241777, @@ -49,7 +49,7 @@ } }, { - "joint": "ThumbProximalJoint", + "joint": "ThumbProximal", "pose": { "position": { "x": -0.009850621223449707, @@ -65,7 +65,7 @@ } }, { - "joint": "ThumbDistalJoint", + "joint": "ThumbDistal", "pose": { "position": { "x": -0.02049688994884491, @@ -113,7 +113,7 @@ } }, { - "joint": "IndexKnuckle", + "joint": "IndexProximal", "pose": { "position": { "x": -0.0017803632654249669, @@ -129,7 +129,7 @@ } }, { - "joint": "IndexMiddleJoint", + "joint": "IndexIntermediate", "pose": { "position": { "x": -0.014122002758085728, @@ -145,7 +145,7 @@ } }, { - "joint": "IndexDistalJoint", + "joint": "IndexDistal", "pose": { "position": { "x": -0.020550768822431566, @@ -193,7 +193,7 @@ } }, { - "joint": "MiddleKnuckle", + "joint": "MiddleProximal", "pose": { "position": { "x": 0.018060242757201196, @@ -209,7 +209,7 @@ } }, { - "joint": "MiddleMiddleJoint", + "joint": "MiddleIntermediate", "pose": { "position": { "x": 0.005449346732348204, @@ -225,7 +225,7 @@ } }, { - "joint": "MiddleDistalJoint", + "joint": "MiddleDistal", "pose": { "position": { "x": 0.0013555703917518259, @@ -273,7 +273,7 @@ } }, { - "joint": "RingKnuckle", + "joint": "RingProximal", "pose": { "position": { "x": 0.03491469845175743, @@ -289,7 +289,7 @@ } }, { - "joint": "RingMiddleJoint", + "joint": "RingIntermediate", "pose": { "position": { "x": 0.023768775165081025, @@ -305,7 +305,7 @@ } }, { - "joint": "RingDistalJoint", + "joint": "RingDistal", "pose": { "position": { "x": 0.02067880891263485, @@ -337,7 +337,7 @@ } }, { - "joint": "PinkyMetacarpal", + "joint": "LittleMetacarpal", "pose": { "position": { "x": 0.05288681760430336, @@ -353,7 +353,7 @@ } }, { - "joint": "PinkyKnuckle", + "joint": "LittleProximal", "pose": { "position": { "x": 0.050300415605306628, @@ -369,7 +369,7 @@ } }, { - "joint": "PinkyMiddleJoint", + "joint": "LittleIntermediate", "pose": { "position": { "x": 0.04166591167449951, @@ -385,7 +385,7 @@ } }, { - "joint": "PinkyDistalJoint", + "joint": "LittleDistal", "pose": { "position": { "x": 0.03587989881634712, @@ -401,7 +401,7 @@ } }, { - "joint": "PinkyTip", + "joint": "LittleTip", "pose": { "position": { "x": 0.03135494887828827, diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/ThumbsUpHandPoseData.json b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/ThumbsUpHandPoseData.json index 47f48173..c233008d 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/ThumbsUpHandPoseData.json +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/ThumbsUpHandPoseData.json @@ -33,7 +33,7 @@ } }, { - "joint": "ThumbMetacarpalJoint", + "joint": "ThumbMetacarpal", "pose": { "position": { "x": 0.06692907959222794, @@ -49,7 +49,7 @@ } }, { - "joint": "ThumbProximalJoint", + "joint": "ThumbProximal", "pose": { "position": { "x": 0.048644911497831348, @@ -65,7 +65,7 @@ } }, { - "joint": "ThumbDistalJoint", + "joint": "ThumbDistal", "pose": { "position": { "x": 0.030924495309591295, @@ -113,7 +113,7 @@ } }, { - "joint": "IndexKnuckle", + "joint": "IndexProximal", "pose": { "position": { "x": 0.011573880910873413, @@ -129,7 +129,7 @@ } }, { - "joint": "IndexMiddleJoint", + "joint": "IndexIntermediate", "pose": { "position": { "x": -0.021892068907618524, @@ -145,7 +145,7 @@ } }, { - "joint": "IndexDistalJoint", + "joint": "IndexDistal", "pose": { "position": { "x": -0.017463261261582376, @@ -193,7 +193,7 @@ } }, { - "joint": "MiddleKnuckle", + "joint": "MiddleProximal", "pose": { "position": { "x": 0.01083554606884718, @@ -209,7 +209,7 @@ } }, { - "joint": "MiddleMiddleJoint", + "joint": "MiddleIntermediate", "pose": { "position": { "x": -0.025254713371396066, @@ -225,7 +225,7 @@ } }, { - "joint": "MiddleDistalJoint", + "joint": "MiddleDistal", "pose": { "position": { "x": -0.00917090568691492, @@ -273,7 +273,7 @@ } }, { - "joint": "RingKnuckle", + "joint": "RingProximal", "pose": { "position": { "x": 0.010207276791334153, @@ -289,7 +289,7 @@ } }, { - "joint": "RingMiddleJoint", + "joint": "RingIntermediate", "pose": { "position": { "x": -0.01994304731488228, @@ -305,7 +305,7 @@ } }, { - "joint": "RingDistalJoint", + "joint": "RingDistal", "pose": { "position": { "x": -0.0031065356452018024, @@ -337,7 +337,7 @@ } }, { - "joint": "PinkyMetacarpal", + "joint": "LittleMetacarpal", "pose": { "position": { "x": 0.06254640221595764, @@ -353,7 +353,7 @@ } }, { - "joint": "PinkyKnuckle", + "joint": "LittleProximal", "pose": { "position": { "x": 0.009921858087182045, @@ -369,7 +369,7 @@ } }, { - "joint": "PinkyMiddleJoint", + "joint": "LittleIntermediate", "pose": { "position": { "x": -0.007876850664615631, @@ -385,7 +385,7 @@ } }, { - "joint": "PinkyDistalJoint", + "joint": "LittleDistal", "pose": { "position": { "x": 0.0036155348643660547, @@ -401,7 +401,7 @@ } }, { - "joint": "PinkyTip", + "joint": "LittleTip", "pose": { "position": { "x": 0.016652610152959825, diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/VictoryHandPoseData.json b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/VictoryHandPoseData.json index 986bba1c..6fb9692c 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/VictoryHandPoseData.json +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/VictoryHandPoseData.json @@ -33,7 +33,7 @@ } }, { - "joint": "ThumbMetacarpalJoint", + "joint": "ThumbMetacarpal", "pose": { "position": { "x": 0.05787024274468422, @@ -49,7 +49,7 @@ } }, { - "joint": "ThumbProximalJoint", + "joint": "ThumbProximal", "pose": { "position": { "x": 0.030012525618076326, @@ -65,7 +65,7 @@ } }, { - "joint": "ThumbDistalJoint", + "joint": "ThumbDistal", "pose": { "position": { "x": 0.026396021246910096, @@ -113,7 +113,7 @@ } }, { - "joint": "IndexKnuckle", + "joint": "IndexProximal", "pose": { "position": { "x": 0.034438081085681918, @@ -129,7 +129,7 @@ } }, { - "joint": "IndexMiddleJoint", + "joint": "IndexIntermediate", "pose": { "position": { "x": 0.015563697554171086, @@ -145,7 +145,7 @@ } }, { - "joint": "IndexDistalJoint", + "joint": "IndexDistal", "pose": { "position": { "x": 0.005756473168730736, @@ -193,7 +193,7 @@ } }, { - "joint": "MiddleKnuckle", + "joint": "MiddleProximal", "pose": { "position": { "x": 0.054447855800390246, @@ -209,7 +209,7 @@ } }, { - "joint": "MiddleMiddleJoint", + "joint": "MiddleIntermediate", "pose": { "position": { "x": 0.04355549067258835, @@ -225,7 +225,7 @@ } }, { - "joint": "MiddleDistalJoint", + "joint": "MiddleDistal", "pose": { "position": { "x": 0.03923114016652107, @@ -273,7 +273,7 @@ } }, { - "joint": "RingKnuckle", + "joint": "RingProximal", "pose": { "position": { "x": 0.07067620009183884, @@ -289,7 +289,7 @@ } }, { - "joint": "RingMiddleJoint", + "joint": "RingIntermediate", "pose": { "position": { "x": 0.060088954865932468, @@ -305,7 +305,7 @@ } }, { - "joint": "RingDistalJoint", + "joint": "RingDistal", "pose": { "position": { "x": 0.0528024360537529, @@ -337,7 +337,7 @@ } }, { - "joint": "PinkyMetacarpal", + "joint": "LittleMetacarpal", "pose": { "position": { "x": 0.08909709751605988, @@ -353,7 +353,7 @@ } }, { - "joint": "PinkyKnuckle", + "joint": "LittleProximal", "pose": { "position": { "x": 0.0851951465010643, @@ -369,7 +369,7 @@ } }, { - "joint": "PinkyMiddleJoint", + "joint": "LittleIntermediate", "pose": { "position": { "x": 0.07433749735355377, @@ -385,7 +385,7 @@ } }, { - "joint": "PinkyDistalJoint", + "joint": "LittleDistal", "pose": { "position": { "x": 0.06645255535840988, @@ -401,7 +401,7 @@ } }, { - "joint": "PinkyTip", + "joint": "LittleTip", "pose": { "position": { "x": 0.05911727994680405, diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/DefaultHandControllerVisualizer.cs b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/DefaultHandControllerVisualizer.cs index a40e5d4d..8db7c8b0 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/DefaultHandControllerVisualizer.cs +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/DefaultHandControllerVisualizer.cs @@ -195,12 +195,12 @@ private void UpdateHandColliders() Bounds knuckleToMiddle = thumbBounds[0]; Bounds middleToTip = thumbBounds[1]; - var thumbKnuckleGameObject = GetOrCreateJointTransform(TrackedHandJoint.ThumbMetacarpalJoint).gameObject; - var capsuleCollider = GetOrCreateCapsuleCollider(TrackedHandJoint.ThumbMetacarpalJoint, thumbKnuckleGameObject); + var thumbKnuckleGameObject = GetOrCreateJointTransform(TrackedHandJoint.ThumbMetacarpal).gameObject; + var capsuleCollider = GetOrCreateCapsuleCollider(TrackedHandJoint.ThumbMetacarpal, thumbKnuckleGameObject); ConfigureCapsuleCollider(capsuleCollider, knuckleToMiddle, thumbKnuckleGameObject.transform); - var thumbMiddleGameObject = GetOrCreateJointTransform(TrackedHandJoint.ThumbProximalJoint).gameObject; - capsuleCollider = GetOrCreateCapsuleCollider(TrackedHandJoint.ThumbProximalJoint, thumbMiddleGameObject); + var thumbMiddleGameObject = GetOrCreateJointTransform(TrackedHandJoint.ThumbProximal).gameObject; + capsuleCollider = GetOrCreateCapsuleCollider(TrackedHandJoint.ThumbProximal, thumbMiddleGameObject); ConfigureCapsuleCollider(capsuleCollider, middleToTip, thumbMiddleGameObject.transform); } @@ -210,12 +210,12 @@ private void UpdateHandColliders() Bounds knuckleToMiddle = indexFingerBounds[0]; Bounds middleToTip = indexFingerBounds[1]; - var indexKnuckleGameObject = GetOrCreateJointTransform(TrackedHandJoint.IndexKnuckle).gameObject; - var capsuleCollider = GetOrCreateCapsuleCollider(TrackedHandJoint.IndexKnuckle, indexKnuckleGameObject); + var indexKnuckleGameObject = GetOrCreateJointTransform(TrackedHandJoint.IndexProximal).gameObject; + var capsuleCollider = GetOrCreateCapsuleCollider(TrackedHandJoint.IndexProximal, indexKnuckleGameObject); ConfigureCapsuleCollider(capsuleCollider, knuckleToMiddle, indexKnuckleGameObject.transform); - var indexMiddleGameObject = GetOrCreateJointTransform(TrackedHandJoint.IndexMiddleJoint).gameObject; - capsuleCollider = GetOrCreateCapsuleCollider(TrackedHandJoint.IndexMiddleJoint, indexMiddleGameObject); + var indexMiddleGameObject = GetOrCreateJointTransform(TrackedHandJoint.IndexIntermediate).gameObject; + capsuleCollider = GetOrCreateCapsuleCollider(TrackedHandJoint.IndexIntermediate, indexMiddleGameObject); ConfigureCapsuleCollider(capsuleCollider, middleToTip, indexMiddleGameObject.transform); } @@ -225,12 +225,12 @@ private void UpdateHandColliders() Bounds knuckleToMiddle = middleFingerBounds[0]; Bounds middleToTip = middleFingerBounds[1]; - var middleKnuckleGameObject = GetOrCreateJointTransform(TrackedHandJoint.MiddleKnuckle).gameObject; - var capsuleCollider = GetOrCreateCapsuleCollider(TrackedHandJoint.MiddleKnuckle, middleKnuckleGameObject); + var middleKnuckleGameObject = GetOrCreateJointTransform(TrackedHandJoint.MiddleProximal).gameObject; + var capsuleCollider = GetOrCreateCapsuleCollider(TrackedHandJoint.MiddleProximal, middleKnuckleGameObject); ConfigureCapsuleCollider(capsuleCollider, knuckleToMiddle, middleKnuckleGameObject.transform); - var middleMiddleGameObject = GetOrCreateJointTransform(TrackedHandJoint.MiddleMiddleJoint).gameObject; - capsuleCollider = GetOrCreateCapsuleCollider(TrackedHandJoint.MiddleMiddleJoint, middleMiddleGameObject); + var middleMiddleGameObject = GetOrCreateJointTransform(TrackedHandJoint.MiddleIntermediate).gameObject; + capsuleCollider = GetOrCreateCapsuleCollider(TrackedHandJoint.MiddleIntermediate, middleMiddleGameObject); ConfigureCapsuleCollider(capsuleCollider, middleToTip, middleMiddleGameObject.transform); } @@ -240,12 +240,12 @@ private void UpdateHandColliders() Bounds knuckleToMiddle = ringFingerBounds[0]; Bounds middleToTip = ringFingerBounds[1]; - var ringKnuckleGameObject = GetOrCreateJointTransform(TrackedHandJoint.RingKnuckle).gameObject; - var capsuleCollider = GetOrCreateCapsuleCollider(TrackedHandJoint.RingKnuckle, ringKnuckleGameObject); + var ringKnuckleGameObject = GetOrCreateJointTransform(TrackedHandJoint.RingProximal).gameObject; + var capsuleCollider = GetOrCreateCapsuleCollider(TrackedHandJoint.RingProximal, ringKnuckleGameObject); ConfigureCapsuleCollider(capsuleCollider, knuckleToMiddle, ringKnuckleGameObject.transform); - var ringMiddleGameObject = GetOrCreateJointTransform(TrackedHandJoint.RingMiddleJoint).gameObject; - capsuleCollider = GetOrCreateCapsuleCollider(TrackedHandJoint.RingMiddleJoint, ringMiddleGameObject); + var ringMiddleGameObject = GetOrCreateJointTransform(TrackedHandJoint.RingIntermediate).gameObject; + capsuleCollider = GetOrCreateCapsuleCollider(TrackedHandJoint.RingIntermediate, ringMiddleGameObject); ConfigureCapsuleCollider(capsuleCollider, middleToTip, ringMiddleGameObject.transform); } @@ -255,12 +255,12 @@ private void UpdateHandColliders() Bounds knuckleToMiddle = pinkyFingerBounds[0]; Bounds middleToTip = pinkyFingerBounds[1]; - var pinkyKnuckleGameObject = GetOrCreateJointTransform(TrackedHandJoint.PinkyKnuckle).gameObject; - var capsuleCollider = GetOrCreateCapsuleCollider(TrackedHandJoint.PinkyKnuckle, pinkyKnuckleGameObject); + var pinkyKnuckleGameObject = GetOrCreateJointTransform(TrackedHandJoint.LittleProximal).gameObject; + var capsuleCollider = GetOrCreateCapsuleCollider(TrackedHandJoint.LittleProximal, pinkyKnuckleGameObject); ConfigureCapsuleCollider(capsuleCollider, knuckleToMiddle, pinkyKnuckleGameObject.transform); - var pinkyMiddleGameObject = GetOrCreateJointTransform(TrackedHandJoint.PinkyMiddleJoint).gameObject; - capsuleCollider = GetOrCreateCapsuleCollider(TrackedHandJoint.PinkyMiddleJoint, pinkyMiddleGameObject); + var pinkyMiddleGameObject = GetOrCreateJointTransform(TrackedHandJoint.LittleIntermediate).gameObject; + capsuleCollider = GetOrCreateCapsuleCollider(TrackedHandJoint.LittleIntermediate, pinkyMiddleGameObject); ConfigureCapsuleCollider(capsuleCollider, middleToTip, pinkyMiddleGameObject.transform); } @@ -284,8 +284,8 @@ private void UpdateHandColliders() ConfigureCapsuleCollider(capsuleCollider, ringPalmBounds, ringMetacarpalGameObject.transform); Bounds pinkyPalmBounds = palmBounds[3]; - var pinkyMetacarpalGameObject = GetOrCreateJointTransform(TrackedHandJoint.PinkyMetacarpal).gameObject; - capsuleCollider = GetOrCreateCapsuleCollider(TrackedHandJoint.PinkyMetacarpal, pinkyMetacarpalGameObject); + var pinkyMetacarpalGameObject = GetOrCreateJointTransform(TrackedHandJoint.LittleMetacarpal).gameObject; + capsuleCollider = GetOrCreateCapsuleCollider(TrackedHandJoint.LittleMetacarpal, pinkyMetacarpalGameObject); ConfigureCapsuleCollider(capsuleCollider, pinkyPalmBounds, pinkyMetacarpalGameObject.transform); } } diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/HandControllerJointsVisualizer.cs b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/HandControllerJointsVisualizer.cs index bd1f5ac1..20731aaa 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/HandControllerJointsVisualizer.cs +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/HandControllerJointsVisualizer.cs @@ -83,7 +83,7 @@ private void CreateJointVisualizerIfNotExists(TrackedHandJoint handJoint) break; case TrackedHandJoint.IndexTip: case TrackedHandJoint.MiddleTip: - case TrackedHandJoint.PinkyTip: + case TrackedHandJoint.LittleTip: case TrackedHandJoint.RingTip: case TrackedHandJoint.ThumbTip: prefab = fingertipPrefab; From 737e04a545b0d94c6c5cd8e704948cf26d2af2ec Mon Sep 17 00:00:00 2001 From: Dino Fejzagic Date: Wed, 27 May 2020 15:52:31 +0200 Subject: [PATCH 52/78] Update default hand interactions --- ...> HandGripInteractionMappingProfile.asset} | 4 +-- ...dGripInteractionMappingProfile.asset.meta} | 2 +- ...andGripPoseInteractionMappingProfile.asset | 30 +++++++++++++++++++ ...ipPoseInteractionMappingProfile.asset.meta | 8 +++++ ...eftMixedRealityHandControllerProfile.asset | 3 +- ...xedRealityHandControllerProfile.asset.meta | 2 +- ...ghtMixedRealityHandControllerProfile.asset | 3 +- ...xedRealityHandControllerProfile.asset.meta | 2 +- .../MixedRealityInputActionsProfile.asset | 4 +++ 9 files changed, 51 insertions(+), 7 deletions(-) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/{HandGrabInteractionMappingProfile.asset => HandGripInteractionMappingProfile.asset} (91%) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/{HandGrabInteractionMappingProfile.asset.meta => HandGripInteractionMappingProfile.asset.meta} (79%) create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandGripPoseInteractionMappingProfile.asset create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandGripPoseInteractionMappingProfile.asset.meta diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandGrabInteractionMappingProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandGripInteractionMappingProfile.asset similarity index 91% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandGrabInteractionMappingProfile.asset rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandGripInteractionMappingProfile.asset index 445d2960..7bc42a8f 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandGrabInteractionMappingProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandGripInteractionMappingProfile.asset @@ -10,10 +10,10 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: e3fb79524faca40478c0844c24e542f7, type: 3} - m_Name: HandGrabInteractionMappingProfile + m_Name: HandGripInteractionMappingProfile m_EditorClassIdentifier: interactionMapping: - description: Grab + description: Grip stateChangeType: 0 axisType: 3 inputType: 13 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandGrabInteractionMappingProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandGripInteractionMappingProfile.asset.meta similarity index 79% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandGrabInteractionMappingProfile.asset.meta rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandGripInteractionMappingProfile.asset.meta index 5e6597d7..f39006d8 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandGrabInteractionMappingProfile.asset.meta +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandGripInteractionMappingProfile.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b37f910a179e80c48a2c9970709f72f3 +guid: 8e01cb476d731534093fe5edd227c54c NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandGripPoseInteractionMappingProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandGripPoseInteractionMappingProfile.asset new file mode 100644 index 00000000..4f8823d5 --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandGripPoseInteractionMappingProfile.asset @@ -0,0 +1,30 @@ +%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: e3fb79524faca40478c0844c24e542f7, type: 3} + m_Name: HandGripPoseInteractionMappingProfile + m_EditorClassIdentifier: + interactionMapping: + description: Grip Pose + stateChangeType: 0 + axisType: 7 + inputType: 14 + inputAction: + profileGuid: 00000000000000000000000000000000 + id: 0 + description: None + axisConstraint: 0 + keyCode: 0 + inputName: + axisCodeX: + axisCodeY: + inputProcessors: [] + pointerProfiles: [] diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandGripPoseInteractionMappingProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandGripPoseInteractionMappingProfile.asset.meta new file mode 100644 index 00000000..c2f1b30e --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandGripPoseInteractionMappingProfile.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b24f94bd93cab98498809436cb5b685f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/LeftMixedRealityHandControllerProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/LeftMixedRealityHandControllerProfile.asset index 008dd26b..7a9ad25b 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/LeftMixedRealityHandControllerProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/LeftMixedRealityHandControllerProfile.asset @@ -22,6 +22,7 @@ MonoBehaviour: - {fileID: 11400000, guid: b7f65e3d3581e3d46ba01ecb4fedd827, type: 2} - {fileID: 11400000, guid: 1fd0c5cd50876514bb0027af902ed920, type: 2} - {fileID: 11400000, guid: 118d8e619c1393b49bbf1d387651668c, type: 2} - - {fileID: 11400000, guid: b37f910a179e80c48a2c9970709f72f3, type: 2} + - {fileID: 11400000, guid: 8e01cb476d731534093fe5edd227c54c, type: 2} + - {fileID: 11400000, guid: b24f94bd93cab98498809436cb5b685f, type: 2} - {fileID: 11400000, guid: 80556dee026997f4ba146ffda4710f79, type: 2} - {fileID: 11400000, guid: 84ae5012fb31f1945b5be6a71bedfd88, type: 2} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/LeftMixedRealityHandControllerProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/LeftMixedRealityHandControllerProfile.asset.meta index e6a8949d..1934929a 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/LeftMixedRealityHandControllerProfile.asset.meta +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/LeftMixedRealityHandControllerProfile.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 777fb11f650654740825e1853e030405 +guid: dd499836e4b82f14da2f414aad1fed8b NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RightMixedRealityHandControllerProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RightMixedRealityHandControllerProfile.asset index 309eec11..83fa92e4 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RightMixedRealityHandControllerProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RightMixedRealityHandControllerProfile.asset @@ -22,6 +22,7 @@ MonoBehaviour: - {fileID: 11400000, guid: b7f65e3d3581e3d46ba01ecb4fedd827, type: 2} - {fileID: 11400000, guid: 1fd0c5cd50876514bb0027af902ed920, type: 2} - {fileID: 11400000, guid: 118d8e619c1393b49bbf1d387651668c, type: 2} - - {fileID: 11400000, guid: b37f910a179e80c48a2c9970709f72f3, type: 2} + - {fileID: 11400000, guid: 8e01cb476d731534093fe5edd227c54c, type: 2} + - {fileID: 11400000, guid: b24f94bd93cab98498809436cb5b685f, type: 2} - {fileID: 11400000, guid: 80556dee026997f4ba146ffda4710f79, type: 2} - {fileID: 11400000, guid: 84ae5012fb31f1945b5be6a71bedfd88, type: 2} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RightMixedRealityHandControllerProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RightMixedRealityHandControllerProfile.asset.meta index 1bf733be..7d7be74a 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RightMixedRealityHandControllerProfile.asset.meta +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RightMixedRealityHandControllerProfile.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 094680cae747ccb438c376af7ec85f32 +guid: 78bf44d2b6970a74ea2721883b0b22bc NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/MixedRealityInputActionsProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/MixedRealityInputActionsProfile.asset index 247124b4..17c79ff3 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/MixedRealityInputActionsProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/MixedRealityInputActionsProfile.asset @@ -73,3 +73,7 @@ MonoBehaviour: id: 15 description: Index Finger Pose axisConstraint: 7 + - profileGuid: 399335ccc89c4d12b79f3539ca7771db + id: 16 + description: Grip + axisConstraint: 2 From e635fd5a4ea22cf82711ec4a426831743f5727d9 Mon Sep 17 00:00:00 2001 From: Dino Fejzagic Date: Wed, 27 May 2020 16:06:23 +0200 Subject: [PATCH 53/78] Sync simulation profiles --- ...mmon.meta => CommonInteractionMappingProfiles.meta} | 0 .../HandGripInteractionMappingProfile.asset | 10 +++++----- .../HandGripInteractionMappingProfile.asset.meta | 0 .../HandGripPoseInteractionMappingProfile.asset | 8 ++++---- .../HandGripPoseInteractionMappingProfile.asset.meta | 0 .../HandIndexFingerPoseInteractionMappingProfile.asset | 0 ...IndexFingerPoseInteractionMappingProfile.asset.meta | 0 .../HandPointInteractionMappingProfile.asset | 0 .../HandPointInteractionMappingProfile.asset.meta | 0 .../HandSelectInteractionMappingProfile.asset | 0 .../HandSelectInteractionMappingProfile.asset.meta | 0 ...ndSpatialPointerPoseInteractionMappingProfile.asset | 0 ...tialPointerPoseInteractionMappingProfile.asset.meta | 0 .../HandTrackedPoseInteractionMappingProfile.asset | 0 ...HandTrackedPoseInteractionMappingProfile.asset.meta | 0 ...mmon.meta => CommonInteractionMappingProfiles.meta} | 0 .../MoveAway(Depth)Profile.asset | 0 .../MoveAway(Depth)Profile.asset.meta | 0 .../MoveCloser(Depth)Profile.asset | 0 .../MoveCloser(Depth)Profile.asset.meta | 0 .../PitchClockwiseProfile.asset | 0 .../PitchClockwiseProfile.asset.meta | 0 .../PitchCounterClockwiseProfile.asset | 0 .../PitchCounterClockwiseProfile.asset.meta | 0 .../RollClockwiseProfile.asset | 0 .../RollClockwiseProfile.asset.meta | 0 .../RollCounterClockwiseProfile.asset | 0 .../RollCounterClockwiseProfile.asset.meta | 0 .../YawClockwiseProfile.asset | 0 .../YawClockwiseProfile.asset.meta | 0 .../YawCounterClockwiseProfile.asset | 0 .../YawCounterClockwiseProfile.asset.meta | 0 ...eftSimulatedMixedRealityHandControllerProfile.asset | 3 ++- ...mulatedMixedRealityHandControllerProfile.asset.meta | 2 +- ...ghtSimulatedMixedRealityHandControllerProfile.asset | 3 ++- ...mulatedMixedRealityHandControllerProfile.asset.meta | 2 +- .../SimulatedHandControllerDataProviderProfile.asset | 6 +++--- 37 files changed, 18 insertions(+), 16 deletions(-) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/{Common.meta => CommonInteractionMappingProfiles.meta} (100%) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/{Common => CommonInteractionMappingProfiles}/HandGripInteractionMappingProfile.asset (83%) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/{Common => CommonInteractionMappingProfiles}/HandGripInteractionMappingProfile.asset.meta (100%) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/{Common => CommonInteractionMappingProfiles}/HandGripPoseInteractionMappingProfile.asset (84%) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/{Common => CommonInteractionMappingProfiles}/HandGripPoseInteractionMappingProfile.asset.meta (100%) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/{Common => CommonInteractionMappingProfiles}/HandIndexFingerPoseInteractionMappingProfile.asset (100%) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/{Common => CommonInteractionMappingProfiles}/HandIndexFingerPoseInteractionMappingProfile.asset.meta (100%) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/{Common => CommonInteractionMappingProfiles}/HandPointInteractionMappingProfile.asset (100%) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/{Common => CommonInteractionMappingProfiles}/HandPointInteractionMappingProfile.asset.meta (100%) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/{Common => CommonInteractionMappingProfiles}/HandSelectInteractionMappingProfile.asset (100%) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/{Common => CommonInteractionMappingProfiles}/HandSelectInteractionMappingProfile.asset.meta (100%) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/{Common => CommonInteractionMappingProfiles}/HandSpatialPointerPoseInteractionMappingProfile.asset (100%) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/{Common => CommonInteractionMappingProfiles}/HandSpatialPointerPoseInteractionMappingProfile.asset.meta (100%) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/{Common => CommonInteractionMappingProfiles}/HandTrackedPoseInteractionMappingProfile.asset (100%) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/{Common => CommonInteractionMappingProfiles}/HandTrackedPoseInteractionMappingProfile.asset.meta (100%) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/{Common.meta => CommonInteractionMappingProfiles.meta} (100%) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/{Common => CommonInteractionMappingProfiles}/MoveAway(Depth)Profile.asset (100%) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/{Common => CommonInteractionMappingProfiles}/MoveAway(Depth)Profile.asset.meta (100%) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/{Common => CommonInteractionMappingProfiles}/MoveCloser(Depth)Profile.asset (100%) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/{Common => CommonInteractionMappingProfiles}/MoveCloser(Depth)Profile.asset.meta (100%) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/{Common => CommonInteractionMappingProfiles}/PitchClockwiseProfile.asset (100%) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/{Common => CommonInteractionMappingProfiles}/PitchClockwiseProfile.asset.meta (100%) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/{Common => CommonInteractionMappingProfiles}/PitchCounterClockwiseProfile.asset (100%) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/{Common => CommonInteractionMappingProfiles}/PitchCounterClockwiseProfile.asset.meta (100%) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/{Common => CommonInteractionMappingProfiles}/RollClockwiseProfile.asset (100%) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/{Common => CommonInteractionMappingProfiles}/RollClockwiseProfile.asset.meta (100%) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/{Common => CommonInteractionMappingProfiles}/RollCounterClockwiseProfile.asset (100%) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/{Common => CommonInteractionMappingProfiles}/RollCounterClockwiseProfile.asset.meta (100%) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/{Common => CommonInteractionMappingProfiles}/YawClockwiseProfile.asset (100%) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/{Common => CommonInteractionMappingProfiles}/YawClockwiseProfile.asset.meta (100%) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/{Common => CommonInteractionMappingProfiles}/YawCounterClockwiseProfile.asset (100%) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/{Common => CommonInteractionMappingProfiles}/YawCounterClockwiseProfile.asset.meta (100%) diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles.meta similarity index 100% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common.meta rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles.meta diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandGripInteractionMappingProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/HandGripInteractionMappingProfile.asset similarity index 83% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandGripInteractionMappingProfile.asset rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/HandGripInteractionMappingProfile.asset index 7bc42a8f..a8355cc3 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandGripInteractionMappingProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/HandGripInteractionMappingProfile.asset @@ -15,13 +15,13 @@ MonoBehaviour: interactionMapping: description: Grip stateChangeType: 0 - axisType: 3 + axisType: 2 inputType: 13 inputAction: - profileGuid: 00000000000000000000000000000000 - id: 0 - description: None - axisConstraint: 0 + profileGuid: 399335ccc89c4d12b79f3539ca7771db + id: 16 + description: Grip + axisConstraint: 2 keyCode: 0 inputName: axisCodeX: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandGripInteractionMappingProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/HandGripInteractionMappingProfile.asset.meta similarity index 100% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandGripInteractionMappingProfile.asset.meta rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/HandGripInteractionMappingProfile.asset.meta diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandGripPoseInteractionMappingProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/HandGripPoseInteractionMappingProfile.asset similarity index 84% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandGripPoseInteractionMappingProfile.asset rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/HandGripPoseInteractionMappingProfile.asset index 4f8823d5..06730a13 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandGripPoseInteractionMappingProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/HandGripPoseInteractionMappingProfile.asset @@ -18,10 +18,10 @@ MonoBehaviour: axisType: 7 inputType: 14 inputAction: - profileGuid: 00000000000000000000000000000000 - id: 0 - description: None - axisConstraint: 0 + profileGuid: 399335ccc89c4d12b79f3539ca7771db + id: 3 + description: Grip Pose + axisConstraint: 7 keyCode: 0 inputName: axisCodeX: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandGripPoseInteractionMappingProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/HandGripPoseInteractionMappingProfile.asset.meta similarity index 100% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandGripPoseInteractionMappingProfile.asset.meta rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/HandGripPoseInteractionMappingProfile.asset.meta diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandIndexFingerPoseInteractionMappingProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/HandIndexFingerPoseInteractionMappingProfile.asset similarity index 100% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandIndexFingerPoseInteractionMappingProfile.asset rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/HandIndexFingerPoseInteractionMappingProfile.asset diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandIndexFingerPoseInteractionMappingProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/HandIndexFingerPoseInteractionMappingProfile.asset.meta similarity index 100% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandIndexFingerPoseInteractionMappingProfile.asset.meta rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/HandIndexFingerPoseInteractionMappingProfile.asset.meta diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandPointInteractionMappingProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/HandPointInteractionMappingProfile.asset similarity index 100% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandPointInteractionMappingProfile.asset rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/HandPointInteractionMappingProfile.asset diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandPointInteractionMappingProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/HandPointInteractionMappingProfile.asset.meta similarity index 100% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandPointInteractionMappingProfile.asset.meta rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/HandPointInteractionMappingProfile.asset.meta diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandSelectInteractionMappingProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/HandSelectInteractionMappingProfile.asset similarity index 100% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandSelectInteractionMappingProfile.asset rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/HandSelectInteractionMappingProfile.asset diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandSelectInteractionMappingProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/HandSelectInteractionMappingProfile.asset.meta similarity index 100% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandSelectInteractionMappingProfile.asset.meta rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/HandSelectInteractionMappingProfile.asset.meta diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandSpatialPointerPoseInteractionMappingProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/HandSpatialPointerPoseInteractionMappingProfile.asset similarity index 100% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandSpatialPointerPoseInteractionMappingProfile.asset rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/HandSpatialPointerPoseInteractionMappingProfile.asset diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandSpatialPointerPoseInteractionMappingProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/HandSpatialPointerPoseInteractionMappingProfile.asset.meta similarity index 100% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandSpatialPointerPoseInteractionMappingProfile.asset.meta rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/HandSpatialPointerPoseInteractionMappingProfile.asset.meta diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandTrackedPoseInteractionMappingProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/HandTrackedPoseInteractionMappingProfile.asset similarity index 100% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandTrackedPoseInteractionMappingProfile.asset rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/HandTrackedPoseInteractionMappingProfile.asset diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandTrackedPoseInteractionMappingProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/HandTrackedPoseInteractionMappingProfile.asset.meta similarity index 100% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Common/HandTrackedPoseInteractionMappingProfile.asset.meta rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/HandTrackedPoseInteractionMappingProfile.asset.meta diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Common.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/CommonInteractionMappingProfiles.meta similarity index 100% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Common.meta rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/CommonInteractionMappingProfiles.meta diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Common/MoveAway(Depth)Profile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/CommonInteractionMappingProfiles/MoveAway(Depth)Profile.asset similarity index 100% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Common/MoveAway(Depth)Profile.asset rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/CommonInteractionMappingProfiles/MoveAway(Depth)Profile.asset diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Common/MoveAway(Depth)Profile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/CommonInteractionMappingProfiles/MoveAway(Depth)Profile.asset.meta similarity index 100% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Common/MoveAway(Depth)Profile.asset.meta rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/CommonInteractionMappingProfiles/MoveAway(Depth)Profile.asset.meta diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Common/MoveCloser(Depth)Profile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/CommonInteractionMappingProfiles/MoveCloser(Depth)Profile.asset similarity index 100% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Common/MoveCloser(Depth)Profile.asset rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/CommonInteractionMappingProfiles/MoveCloser(Depth)Profile.asset diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Common/MoveCloser(Depth)Profile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/CommonInteractionMappingProfiles/MoveCloser(Depth)Profile.asset.meta similarity index 100% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Common/MoveCloser(Depth)Profile.asset.meta rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/CommonInteractionMappingProfiles/MoveCloser(Depth)Profile.asset.meta diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Common/PitchClockwiseProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/CommonInteractionMappingProfiles/PitchClockwiseProfile.asset similarity index 100% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Common/PitchClockwiseProfile.asset rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/CommonInteractionMappingProfiles/PitchClockwiseProfile.asset diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Common/PitchClockwiseProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/CommonInteractionMappingProfiles/PitchClockwiseProfile.asset.meta similarity index 100% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Common/PitchClockwiseProfile.asset.meta rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/CommonInteractionMappingProfiles/PitchClockwiseProfile.asset.meta diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Common/PitchCounterClockwiseProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/CommonInteractionMappingProfiles/PitchCounterClockwiseProfile.asset similarity index 100% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Common/PitchCounterClockwiseProfile.asset rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/CommonInteractionMappingProfiles/PitchCounterClockwiseProfile.asset diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Common/PitchCounterClockwiseProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/CommonInteractionMappingProfiles/PitchCounterClockwiseProfile.asset.meta similarity index 100% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Common/PitchCounterClockwiseProfile.asset.meta rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/CommonInteractionMappingProfiles/PitchCounterClockwiseProfile.asset.meta diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Common/RollClockwiseProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/CommonInteractionMappingProfiles/RollClockwiseProfile.asset similarity index 100% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Common/RollClockwiseProfile.asset rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/CommonInteractionMappingProfiles/RollClockwiseProfile.asset diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Common/RollClockwiseProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/CommonInteractionMappingProfiles/RollClockwiseProfile.asset.meta similarity index 100% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Common/RollClockwiseProfile.asset.meta rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/CommonInteractionMappingProfiles/RollClockwiseProfile.asset.meta diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Common/RollCounterClockwiseProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/CommonInteractionMappingProfiles/RollCounterClockwiseProfile.asset similarity index 100% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Common/RollCounterClockwiseProfile.asset rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/CommonInteractionMappingProfiles/RollCounterClockwiseProfile.asset diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Common/RollCounterClockwiseProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/CommonInteractionMappingProfiles/RollCounterClockwiseProfile.asset.meta similarity index 100% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Common/RollCounterClockwiseProfile.asset.meta rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/CommonInteractionMappingProfiles/RollCounterClockwiseProfile.asset.meta diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Common/YawClockwiseProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/CommonInteractionMappingProfiles/YawClockwiseProfile.asset similarity index 100% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Common/YawClockwiseProfile.asset rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/CommonInteractionMappingProfiles/YawClockwiseProfile.asset diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Common/YawClockwiseProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/CommonInteractionMappingProfiles/YawClockwiseProfile.asset.meta similarity index 100% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Common/YawClockwiseProfile.asset.meta rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/CommonInteractionMappingProfiles/YawClockwiseProfile.asset.meta diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Common/YawCounterClockwiseProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/CommonInteractionMappingProfiles/YawCounterClockwiseProfile.asset similarity index 100% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Common/YawCounterClockwiseProfile.asset rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/CommonInteractionMappingProfiles/YawCounterClockwiseProfile.asset diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Common/YawCounterClockwiseProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/CommonInteractionMappingProfiles/YawCounterClockwiseProfile.asset.meta similarity index 100% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/Common/YawCounterClockwiseProfile.asset.meta rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/CommonInteractionMappingProfiles/YawCounterClockwiseProfile.asset.meta diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/LeftSimulatedMixedRealityHandControllerProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/LeftSimulatedMixedRealityHandControllerProfile.asset index b0e08c32..46e0626c 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/LeftSimulatedMixedRealityHandControllerProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/LeftSimulatedMixedRealityHandControllerProfile.asset @@ -22,7 +22,8 @@ MonoBehaviour: - {fileID: 11400000, guid: b7f65e3d3581e3d46ba01ecb4fedd827, type: 2} - {fileID: 11400000, guid: 1fd0c5cd50876514bb0027af902ed920, type: 2} - {fileID: 11400000, guid: 118d8e619c1393b49bbf1d387651668c, type: 2} - - {fileID: 11400000, guid: b37f910a179e80c48a2c9970709f72f3, type: 2} + - {fileID: 11400000, guid: 8e01cb476d731534093fe5edd227c54c, type: 2} + - {fileID: 11400000, guid: b24f94bd93cab98498809436cb5b685f, type: 2} - {fileID: 11400000, guid: 80556dee026997f4ba146ffda4710f79, type: 2} - {fileID: 11400000, guid: 84ae5012fb31f1945b5be6a71bedfd88, type: 2} - {fileID: 11400000, guid: 65fe769960045eb4284e122669355d0f, type: 2} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/LeftSimulatedMixedRealityHandControllerProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/LeftSimulatedMixedRealityHandControllerProfile.asset.meta index 0ed7fca7..5eb83b27 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/LeftSimulatedMixedRealityHandControllerProfile.asset.meta +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/LeftSimulatedMixedRealityHandControllerProfile.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e7410f969234129419325b60dd7ef6b5 +guid: 4b5c2efa5f88d1548953da2172e3f5d5 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/RightSimulatedMixedRealityHandControllerProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/RightSimulatedMixedRealityHandControllerProfile.asset index be692fd3..aeb515ca 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/RightSimulatedMixedRealityHandControllerProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/RightSimulatedMixedRealityHandControllerProfile.asset @@ -22,7 +22,8 @@ MonoBehaviour: - {fileID: 11400000, guid: b7f65e3d3581e3d46ba01ecb4fedd827, type: 2} - {fileID: 11400000, guid: 1fd0c5cd50876514bb0027af902ed920, type: 2} - {fileID: 11400000, guid: 118d8e619c1393b49bbf1d387651668c, type: 2} - - {fileID: 11400000, guid: b37f910a179e80c48a2c9970709f72f3, type: 2} + - {fileID: 11400000, guid: 8e01cb476d731534093fe5edd227c54c, type: 2} + - {fileID: 11400000, guid: b24f94bd93cab98498809436cb5b685f, type: 2} - {fileID: 11400000, guid: 80556dee026997f4ba146ffda4710f79, type: 2} - {fileID: 11400000, guid: 84ae5012fb31f1945b5be6a71bedfd88, type: 2} - {fileID: 11400000, guid: 65fe769960045eb4284e122669355d0f, type: 2} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/RightSimulatedMixedRealityHandControllerProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/RightSimulatedMixedRealityHandControllerProfile.asset.meta index 57c0ce4a..2c02e159 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/RightSimulatedMixedRealityHandControllerProfile.asset.meta +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/RightSimulatedMixedRealityHandControllerProfile.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7c17bff23a6d6e44b9a2225f53257bba +guid: 2713516723d50ce49a834fbee5d64ff4 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/SimulatedHandControllerDataProviderProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/SimulatedHandControllerDataProviderProfile.asset index 90c662fa..04e1ebe5 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/SimulatedHandControllerDataProviderProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/SimulatedHandControllerDataProviderProfile.asset @@ -14,8 +14,8 @@ MonoBehaviour: m_EditorClassIdentifier: hasSetupDefaults: 1 controllerMappingProfiles: - - {fileID: 11400000, guid: e7410f969234129419325b60dd7ef6b5, type: 2} - - {fileID: 11400000, guid: 7c17bff23a6d6e44b9a2225f53257bba, type: 2} + - {fileID: 11400000, guid: 4b5c2efa5f88d1548953da2172e3f5d5, type: 2} + - {fileID: 11400000, guid: 2713516723d50ce49a834fbee5d64ff4, type: 2} simulatedUpdateFrequency: 0 controllerHideTimeout: 0.2 defaultDistance: 0.5 @@ -27,7 +27,7 @@ MonoBehaviour: rightControllerTrackedKey: 32 rotationSpeed: 100 handPoseAnimationSpeed: 8 - handMeshingEnabled: 0 + renderingMode: 1 handPhysicsEnabled: 0 useTriggers: 0 boundsMode: 0 From c29a261dda90f7127a2df3a5926a68e67878e46f Mon Sep 17 00:00:00 2001 From: Stephen Hodgson Date: Wed, 27 May 2020 14:50:16 -0400 Subject: [PATCH 54/78] reserialized json data to exclude reference types (#192) Fixed build errors from hand data recorder updated log for near pointer --- .../RecordedPoses/FlatHandPoseData.json | 784 +++++++++--------- .../RecordedPoses/GrabHandPoseData.json | 784 +++++++++--------- .../RecordedPoses/OpenHandPoseData.json | 784 +++++++++--------- .../RecordedPoses/PinchHandPoseData.json | 784 +++++++++--------- .../PinchSteadyWristHandPoseData.json | 784 +++++++++--------- .../RecordedPoses/PokeHandPoseData.json | 784 +++++++++--------- .../RecordedPoses/ThumbsUpHandPoseData.json | 784 +++++++++--------- .../RecordedPoses/VictoryHandPoseData.json | 784 +++++++++--------- .../Features/Input/HandDataRecorder.cs | 22 +- .../UX/Scripts/Pointers/HandNearPointer.cs | 2 +- 10 files changed, 3146 insertions(+), 3150 deletions(-) diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/FlatHandPoseData.json b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/FlatHandPoseData.json index 23ac08cb..98eca9ad 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/FlatHandPoseData.json +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/FlatHandPoseData.json @@ -1,420 +1,420 @@ { - "items": [ - { - "joint": "Wrist", - "pose": { - "position": { - "x": 0.06179157271981239, - "y": -0.15333214402198792, - "z": -0.0469515398144722 + "joints": [ + { + "joint": 0, + "pose": { + "position": { + "x": 0.06179157271981239, + "y": -0.15333214402198792, + "z": -0.0469515398144722 + }, + "rotation": { + "x": -0.5501163005828857, + "y": -0.11712269484996796, + "z": 0.001836930401623249, + "w": 0.8265576958656311 + } + } }, - "rotation": { - "x": -0.5501163005828857, - "y": -0.11712269484996796, - "z": 0.001836930401623249, - "w": 0.8265576958656311 - } - } - }, - { - "joint": "Palm", - "pose": { - "position": { - "x": 0.05801215022802353, - "y": -0.1058567613363266, - "z": -0.02556976117193699 + { + "joint": 1, + "pose": { + "position": { + "x": 0.05801215022802353, + "y": -0.1058567613363266, + "z": -0.02556976117193699 + }, + "rotation": { + "x": -0.5501163005828857, + "y": -0.11712269484996796, + "z": 0.001836930401623249, + "w": 0.8265576958656311 + } + } }, - "rotation": { - "x": -0.5501163005828857, - "y": -0.11712269484996796, - "z": 0.001836930401623249, - "w": 0.8265576958656311 - } - } - }, - { - "joint": "ThumbMetacarpal", - "pose": { - "position": { - "x": 0.03695414960384369, - "y": -0.1407443881034851, - "z": -0.03328647091984749 + { + "joint": 2, + "pose": { + "position": { + "x": 0.03695414960384369, + "y": -0.1407443881034851, + "z": -0.03328647091984749 + }, + "rotation": { + "x": -0.5855690240859985, + "y": -0.10429229587316513, + "z": 0.5890942811965942, + "w": 0.547493577003479 + } + } }, - "rotation": { - "x": -0.5855690240859985, - "y": -0.10429229587316513, - "z": 0.5890942811965942, - "w": 0.547493577003479 - } - } - }, - { - "joint": "ThumbProximal", - "pose": { - "position": { - "x": 0.00045104348100721836, - "y": -0.11720659583806992, - "z": -0.01997363194823265 + { + "joint": 3, + "pose": { + "position": { + "x": 0.00045104348100721836, + "y": -0.11720659583806992, + "z": -0.01997363194823265 + }, + "rotation": { + "x": -0.5386121273040772, + "y": 0.04485885053873062, + "z": 0.5422580242156982, + "w": 0.6437124609947205 + } + } }, - "rotation": { - "x": -0.5386121273040772, - "y": 0.04485885053873062, - "z": 0.5422580242156982, - "w": 0.6437124609947205 - } - } - }, - { - "joint": "ThumbDistal", - "pose": { - "position": { - "x": -0.016296127811074258, - "y": -0.09359179437160492, - "z": -0.006718119606375694 + { + "joint": 4, + "pose": { + "position": { + "x": -0.016296127811074258, + "y": -0.09359179437160492, + "z": -0.006718119606375694 + }, + "rotation": { + "x": -0.6040476560592651, + "y": -0.08891747146844864, + "z": 0.5752687454223633, + "w": 0.5448194742202759 + } + } }, - "rotation": { - "x": -0.6040476560592651, - "y": -0.08891747146844864, - "z": 0.5752687454223633, - "w": 0.5448194742202759 - } - } - }, - { - "joint": "ThumbTip", - "pose": { - "position": { - "x": -0.03216664865612984, - "y": -0.08244754374027252, - "z": -0.001603197306394577 + { + "joint": 5, + "pose": { + "position": { + "x": -0.03216664865612984, + "y": -0.08244754374027252, + "z": -0.001603197306394577 + }, + "rotation": { + "x": -0.6040476560592651, + "y": -0.08891747146844864, + "z": 0.5752687454223633, + "w": 0.5448194742202759 + } + } }, - "rotation": { - "x": -0.6040476560592651, - "y": -0.08891747146844864, - "z": 0.5752687454223633, - "w": 0.5448194742202759 - } - } - }, - { - "joint": "IndexMetacarpal", - "pose": { - "position": { - "x": 0.04794362187385559, - "y": -0.13700048625469209, - "z": -0.03438100963830948 + { + "joint": 6, + "pose": { + "position": { + "x": 0.04794362187385559, + "y": -0.13700048625469209, + "z": -0.03438100963830948 + }, + "rotation": { + "x": -0.534980297088623, + "y": -0.28449201583862307, + "z": -0.061086010187864307, + "w": 0.7931764721870422 + } + } }, - "rotation": { - "x": -0.534980297088623, - "y": -0.28449201583862307, - "z": -0.061086010187864307, - "w": 0.7931764721870422 - } - } - }, - { - "joint": "IndexProximal", - "pose": { - "position": { - "x": 0.023209279403090478, - "y": -0.08038382232189179, - "z": -0.017351558431982995 + { + "joint": 7, + "pose": { + "position": { + "x": 0.023209279403090478, + "y": -0.08038382232189179, + "z": -0.017351558431982995 + }, + "rotation": { + "x": -0.599485456943512, + "y": -0.1474478840827942, + "z": 0.04840812832117081, + "w": 0.7852058410644531 + } + } }, - "rotation": { - "x": -0.599485456943512, - "y": -0.1474478840827942, - "z": 0.04840812832117081, - "w": 0.7852058410644531 - } - } - }, - { - "joint": "IndexIntermediate", - "pose": { - "position": { - "x": 0.009743190370500088, - "y": -0.03727291524410248, - "z": -0.006295463070273399 - }, - "rotation": { - "x": -0.6344203948974609, - "y": -0.08629350364208222, - "z": 0.11939872056245804, - "w": 0.7588865756988525 - } - } - }, - { - "joint": "IndexDistal", - "pose": { - "position": { - "x": 0.0026917937211692335, - "y": -0.013759316876530648, - "z": -0.0017971978522837163 + { + "joint": 8, + "pose": { + "position": { + "x": 0.009743190370500088, + "y": -0.03727291524410248, + "z": -0.006295463070273399 + }, + "rotation": { + "x": -0.6344203948974609, + "y": -0.08629350364208222, + "z": 0.11939872056245804, + "w": 0.7588865756988525 + } + } }, - "rotation": { - "x": -0.6451734304428101, - "y": -0.12336783856153488, - "z": 0.00809548981487751, - "w": 0.7542511224746704 - } - } - }, - { - "joint": "IndexTip", - "pose": { - "position": { - "x": -0.0002534952946007252, - "y": 0.0007631087210029364, - "z": 0.0002575620310381055 + { + "joint": 9, + "pose": { + "position": { + "x": 0.0026917937211692335, + "y": -0.013759316876530648, + "z": -0.0017971978522837163 + }, + "rotation": { + "x": -0.6451734304428101, + "y": -0.12336783856153488, + "z": 0.00809548981487751, + "w": 0.7542511224746704 + } + } }, - "rotation": { - "x": -0.6451734304428101, - "y": -0.12336783856153488, - "z": 0.00809548981487751, - "w": 0.7542511224746704 - } - } - }, - { - "joint": "MiddleMetacarpal", - "pose": { - "position": { - "x": 0.056570135056972507, - "y": -0.13634957373142243, - "z": -0.03486650064587593 + { + "joint": 10, + "pose": { + "position": { + "x": -0.0002534952946007252, + "y": 0.0007631087210029364, + "z": 0.0002575620310381055 + }, + "rotation": { + "x": -0.6451734304428101, + "y": -0.12336783856153488, + "z": 0.00809548981487751, + "w": 0.7542511224746704 + } + } }, - "rotation": { - "x": -0.6017327308654785, - "y": -0.1049300879240036, - "z": 0.008752312511205674, - "w": 0.7917264699935913 - } - } - }, - { - "joint": "MiddleProximal", - "pose": { - "position": { - "x": 0.045069482177495959, - "y": -0.07444917410612107, - "z": -0.018345370888710023 + { + "joint": 11, + "pose": { + "position": { + "x": 0.056570135056972507, + "y": -0.13634957373142243, + "z": -0.03486650064587593 + }, + "rotation": { + "x": -0.6017327308654785, + "y": -0.1049300879240036, + "z": 0.008752312511205674, + "w": 0.7917264699935913 + } + } }, - "rotation": { - "x": -0.5885983109474182, - "y": -0.10035836696624756, - "z": 0.025189023464918138, - "w": 0.8017893433570862 - } - } - }, - { - "joint": "MiddleIntermediate", - "pose": { - "position": { - "x": 0.035030756145715716, - "y": -0.025001518428325654, - "z": -0.0032290546223521234 + { + "joint": 12, + "pose": { + "position": { + "x": 0.045069482177495959, + "y": -0.07444917410612107, + "z": -0.018345370888710023 + }, + "rotation": { + "x": -0.5885983109474182, + "y": -0.10035836696624756, + "z": 0.025189023464918138, + "w": 0.8017893433570862 + } + } }, - "rotation": { - "x": -0.6631931662559509, - "y": -0.09005288034677506, - "z": -0.0027521485462784769, - "w": 0.7431085109710693 - } - } - }, - { - "joint": "MiddleDistal", - "pose": { - "position": { - "x": 0.031546302139759067, - "y": 0.0013798222644254566, - "z": -0.0004363078624010086 + { + "joint": 13, + "pose": { + "position": { + "x": 0.035030756145715716, + "y": -0.025001518428325654, + "z": -0.0032290546223521234 + }, + "rotation": { + "x": -0.6631931662559509, + "y": -0.09005288034677506, + "z": -0.0027521485462784769, + "w": 0.7431085109710693 + } + } }, - "rotation": { - "x": -0.6468731164932251, - "y": -0.11953263729810715, - "z": -0.06937266886234284, - "w": 0.7504633665084839 - } - } - }, - { - "joint": "MiddleTip", - "pose": { - "position": { - "x": 0.030048875138163568, - "y": 0.017790958285331727, - "z": 0.0018172836862504483 + { + "joint": 14, + "pose": { + "position": { + "x": 0.031546302139759067, + "y": 0.0013798222644254566, + "z": -0.0004363078624010086 + }, + "rotation": { + "x": -0.6468731164932251, + "y": -0.11953263729810715, + "z": -0.06937266886234284, + "w": 0.7504633665084839 + } + } }, - "rotation": { - "x": -0.6468731164932251, - "y": -0.11953263729810715, - "z": -0.06937266886234284, - "w": 0.7504633665084839 - } - } - }, - { - "joint": "RingMetacarpal", - "pose": { - "position": { - "x": 0.06806596368551254, - "y": -0.13525664806365968, - "z": -0.034837257117033008 + { + "joint": 15, + "pose": { + "position": { + "x": 0.030048875138163568, + "y": 0.017790958285331727, + "z": 0.0018172836862504483 + }, + "rotation": { + "x": -0.6468731164932251, + "y": -0.11953263729810715, + "z": -0.06937266886234284, + "w": 0.7504633665084839 + } + } }, - "rotation": { - "x": -0.5803540945053101, - "y": 0.014031633734703064, - "z": 0.05480925738811493, - "w": 0.8123965859413147 - } - } - }, - { - "joint": "RingProximal", - "pose": { - "position": { - "x": 0.06544187664985657, - "y": -0.07453925907611847, - "z": -0.013881120830774308 + { + "joint": 16, + "pose": { + "position": { + "x": 0.06806596368551254, + "y": -0.13525664806365968, + "z": -0.034837257117033008 + }, + "rotation": { + "x": -0.5803540945053101, + "y": 0.014031633734703064, + "z": 0.05480925738811493, + "w": 0.8123965859413147 + } + } }, - "rotation": { - "x": -0.6466344594955444, - "y": -0.03600946068763733, - "z": 0.02467469871044159, - "w": 0.7615609765052795 - } - } - }, - { - "joint": "RingIntermediate", - "pose": { - "position": { - "x": 0.06159381568431854, - "y": -0.03093438223004341, - "z": -0.006733019836246967 + { + "joint": 17, + "pose": { + "position": { + "x": 0.06544187664985657, + "y": -0.07453925907611847, + "z": -0.013881120830774308 + }, + "rotation": { + "x": -0.6466344594955444, + "y": -0.03600946068763733, + "z": 0.02467469871044159, + "w": 0.7615609765052795 + } + } }, - "rotation": { - "x": -0.6550348401069641, - "y": -0.06099399924278259, - "z": -0.04121965169906616, - "w": 0.7520787715911865 - } - } - }, - { - "joint": "RingDistal", - "pose": { - "position": { - "x": 0.06070023775100708, - "y": -0.007464663125574589, - "z": -0.003544492181390524 + { + "joint": 18, + "pose": { + "position": { + "x": 0.06159381568431854, + "y": -0.03093438223004341, + "z": -0.006733019836246967 + }, + "rotation": { + "x": -0.6550348401069641, + "y": -0.06099399924278259, + "z": -0.04121965169906616, + "w": 0.7520787715911865 + } + } }, - "rotation": { - "x": -0.6712727546691895, - "y": -0.05777180939912796, - "z": -0.05727298930287361, - "w": 0.7370488047599793 - } - } - }, - { - "joint": "RingTip", - "pose": { - "position": { - "x": 0.060552775859832767, - "y": 0.010114867240190506, - "z": -0.0019072332652285696 + { + "joint": 19, + "pose": { + "position": { + "x": 0.06070023775100708, + "y": -0.007464663125574589, + "z": -0.003544492181390524 + }, + "rotation": { + "x": -0.6712727546691895, + "y": -0.05777180939912796, + "z": -0.05727298930287361, + "w": 0.7370488047599793 + } + } }, - "rotation": { - "x": -0.6712727546691895, - "y": -0.05777180939912796, - "z": -0.05727298930287361, - "w": 0.7370488047599793 - } - } - }, - { - "joint": "LittleMetacarpal", - "pose": { - "position": { - "x": 0.07710164040327072, - "y": -0.13650110363960267, - "z": -0.032643478363752368 + { + "joint": 20, + "pose": { + "position": { + "x": 0.060552775859832767, + "y": 0.010114867240190506, + "z": -0.0019072332652285696 + }, + "rotation": { + "x": -0.6712727546691895, + "y": -0.05777180939912796, + "z": -0.05727298930287361, + "w": 0.7370488047599793 + } + } }, - "rotation": { - "x": -0.5344982147216797, - "y": 0.1545339822769165, - "z": 0.10820292681455612, - "w": 0.8238464593887329 - } - } - }, - { - "joint": "LittleProximal", - "pose": { - "position": { - "x": 0.08530370891094208, - "y": -0.08254323154687882, - "z": -0.010162543505430222 + { + "joint": 21, + "pose": { + "position": { + "x": 0.07710164040327072, + "y": -0.13650110363960267, + "z": -0.032643478363752368 + }, + "rotation": { + "x": -0.5344982147216797, + "y": 0.1545339822769165, + "z": 0.10820292681455612, + "w": 0.8238464593887329 + } + } }, - "rotation": { - "x": -0.6702333688735962, - "y": 0.05704934149980545, - "z": 0.006686835549771786, - "w": 0.7399358749389648 - } - } - }, - { - "joint": "LittleIntermediate", - "pose": { - "position": { - "x": 0.08779342472553253, - "y": -0.049793362617492679, - "z": -0.0070251524448394779 + { + "joint": 22, + "pose": { + "position": { + "x": 0.08530370891094208, + "y": -0.08254323154687882, + "z": -0.010162543505430222 + }, + "rotation": { + "x": -0.6702333688735962, + "y": 0.05704934149980545, + "z": 0.006686835549771786, + "w": 0.7399358749389648 + } + } }, - "rotation": { - "x": -0.6393072605133057, - "y": 0.030266048386693, - "z": -0.15569603443145753, - "w": 0.7524937987327576 - } - } - }, - { - "joint": "LittleDistal", - "pose": { - "position": { - "x": 0.09219621121883393, - "y": -0.03264733776450157, - "z": -0.0037694787606596948 + { + "joint": 23, + "pose": { + "position": { + "x": 0.08779342472553253, + "y": -0.049793362617492679, + "z": -0.0070251524448394779 + }, + "rotation": { + "x": -0.6393072605133057, + "y": 0.030266048386693, + "z": -0.15569603443145753, + "w": 0.7524937987327576 + } + } }, - "rotation": { - "x": -0.6555882692337036, - "y": -0.0018634665757417679, - "z": -0.09289215505123139, - "w": 0.7497090101242065 - } - } - }, - { - "joint": "LittleTip", - "pose": { - "position": { - "x": 0.09392204880714417, - "y": -0.018381092697381974, - "z": -0.0017222119495272637 + { + "joint": 24, + "pose": { + "position": { + "x": 0.09219621121883393, + "y": -0.03264733776450157, + "z": -0.0037694787606596948 + }, + "rotation": { + "x": -0.6555882692337036, + "y": -0.0018634665757417679, + "z": -0.09289215505123139, + "w": 0.7497090101242065 + } + } }, - "rotation": { - "x": -0.6555882692337036, - "y": -0.0018634665757417679, - "z": -0.09289215505123139, - "w": 0.7497090101242065 + { + "joint": 25, + "pose": { + "position": { + "x": 0.09392204880714417, + "y": -0.018381092697381974, + "z": -0.0017222119495272637 + }, + "rotation": { + "x": -0.6555882692337036, + "y": -0.0018634665757417679, + "z": -0.09289215505123139, + "w": 0.7497090101242065 + } + } } - } - } - ] + ] } \ No newline at end of file diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/GrabHandPoseData.json b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/GrabHandPoseData.json index a42ea2e8..8aa4dda8 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/GrabHandPoseData.json +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/GrabHandPoseData.json @@ -1,420 +1,420 @@ { - "items": [ - { - "joint": "Wrist", - "pose": { - "position": { - "x": 0.059647563844919208, - "y": -0.018170714378356935, - "z": -0.07320141047239304 + "joints": [ + { + "joint": 0, + "pose": { + "position": { + "x": 0.059647563844919208, + "y": -0.018170714378356935, + "z": -0.07320141047239304 + }, + "rotation": { + "x": -0.44069746136665347, + "y": -0.3151600956916809, + "z": -0.029152734205126764, + "w": 0.8398429155349731 + } + } }, - "rotation": { - "x": -0.44069746136665347, - "y": -0.3151600956916809, - "z": -0.029152734205126764, - "w": 0.8398429155349731 - } - } - }, - { - "joint": "Palm", - "pose": { - "position": { - "x": 0.040150947868824008, - "y": 0.022433746606111528, - "z": -0.04928050562739372 + { + "joint": 1, + "pose": { + "position": { + "x": 0.040150947868824008, + "y": 0.022433746606111528, + "z": -0.04928050562739372 + }, + "rotation": { + "x": -0.44069746136665347, + "y": -0.3151600956916809, + "z": -0.029152734205126764, + "w": 0.8398429155349731 + } + } }, - "rotation": { - "x": -0.44069746136665347, - "y": -0.3151600956916809, - "z": -0.029152734205126764, - "w": 0.8398429155349731 - } - } - }, - { - "joint": "ThumbMetacarpal", - "pose": { - "position": { - "x": 0.033823080360889438, - "y": -0.014000600203871727, - "z": -0.06483504176139832 + { + "joint": 2, + "pose": { + "position": { + "x": 0.033823080360889438, + "y": -0.014000600203871727, + "z": -0.06483504176139832 + }, + "rotation": { + "x": 0.46251192688941958, + "y": 0.15892137587070466, + "z": -0.748396635055542, + "w": -0.44902268052101138 + } + } }, - "rotation": { - "x": 0.46251192688941958, - "y": 0.15892137587070466, - "z": -0.748396635055542, - "w": -0.44902268052101138 - } - } - }, - { - "joint": "ThumbProximal", - "pose": { - "position": { - "x": -0.0048112208023667339, - "y": -0.005827075336128473, - "z": -0.04063580185174942 + { + "joint": 3, + "pose": { + "position": { + "x": -0.0048112208023667339, + "y": -0.005827075336128473, + "z": -0.04063580185174942 + }, + "rotation": { + "x": 0.32614850997924807, + "y": -0.017511412501335145, + "z": -0.7735356688499451, + "w": -0.5439797639846802 + } + } }, - "rotation": { - "x": 0.32614850997924807, - "y": -0.017511412501335145, - "z": -0.7735356688499451, - "w": -0.5439797639846802 - } - } - }, - { - "joint": "ThumbDistal", - "pose": { - "position": { - "x": -0.02188277430832386, - "y": 0.0075818500481545929, - "z": -0.01290540024638176 + { + "joint": 4, + "pose": { + "position": { + "x": -0.02188277430832386, + "y": 0.0075818500481545929, + "z": -0.01290540024638176 + }, + "rotation": { + "x": 0.22856087982654572, + "y": -0.09300848096609116, + "z": -0.7769821286201477, + "w": -0.5795565247535706 + } + } }, - "rotation": { - "x": 0.22856087982654572, - "y": -0.09300848096609116, - "z": -0.7769821286201477, - "w": -0.5795565247535706 - } - } - }, - { - "joint": "ThumbTip", - "pose": { - "position": { - "x": -0.026505667716264726, - "y": 0.015197398141026497, - "z": 0.0034610535949468614 + { + "joint": 5, + "pose": { + "position": { + "x": -0.026505667716264726, + "y": 0.015197398141026497, + "z": 0.0034610535949468614 + }, + "rotation": { + "x": 0.22856087982654572, + "y": -0.09300848096609116, + "z": -0.7769821286201477, + "w": -0.5795565247535706 + } + } }, - "rotation": { - "x": 0.22856087982654572, - "y": -0.09300848096609116, - "z": -0.7769821286201477, - "w": -0.5795565247535706 - } - } - }, - { - "joint": "IndexMetacarpal", - "pose": { - "position": { - "x": 0.04238410294055939, - "y": -0.007463002577424049, - "z": -0.06319385766983032 + { + "joint": 6, + "pose": { + "position": { + "x": 0.04238410294055939, + "y": -0.007463002577424049, + "z": -0.06319385766983032 + }, + "rotation": { + "x": -0.420803427696228, + "y": -0.44982725381851199, + "z": -0.04907778277993202, + "w": 0.7862387895584106 + } + } }, - "rotation": { - "x": -0.420803427696228, - "y": -0.44982725381851199, - "z": -0.04907778277993202, - "w": 0.7862387895584106 - } - } - }, - { - "joint": "IndexProximal", - "pose": { - "position": { - "x": -0.0008817678317427635, - "y": 0.03838954120874405, - "z": -0.04752813279628754 + { + "joint": 7, + "pose": { + "position": { + "x": -0.0008817678317427635, + "y": 0.03838954120874405, + "z": -0.04752813279628754 + }, + "rotation": { + "x": 0.004830620251595974, + "y": 0.18448397517204286, + "z": -0.1560613363981247, + "w": -0.9703620672225952 + } + } }, - "rotation": { - "x": 0.004830620251595974, - "y": 0.18448397517204286, - "z": -0.1560613363981247, - "w": -0.9703620672225952 - } - } - }, - { - "joint": "IndexIntermediate", - "pose": { - "position": { - "x": -0.014839660376310349, - "y": 0.03651837632060051, - "z": -0.01135229505598545 - }, - "rotation": { - "x": -0.5098936557769775, - "y": 0.03039226494729519, - "z": -0.30394697189331057, - "w": -0.8042332530021668 - } - } - }, - { - "joint": "IndexDistal", - "pose": { - "position": { - "x": -0.008270945399999619, - "y": 0.015406630001962185, - "z": 0.0006891884841024876 + { + "joint": 8, + "pose": { + "position": { + "x": -0.014839660376310349, + "y": 0.03651837632060051, + "z": -0.01135229505598545 + }, + "rotation": { + "x": -0.5098936557769775, + "y": 0.03039226494729519, + "z": -0.30394697189331057, + "w": -0.8042332530021668 + } + } }, - "rotation": { - "x": -0.7222777009010315, - "y": -0.08202659338712692, - "z": -0.2391108274459839, - "w": -0.6440979242324829 - } - } - }, - { - "joint": "IndexTip", - "pose": { - "position": { - "x": -0.0009594520088285208, - "y": 0.000933439121581614, - "z": -0.00021468542399816215 + { + "joint": 9, + "pose": { + "position": { + "x": -0.008270945399999619, + "y": 0.015406630001962185, + "z": 0.0006891884841024876 + }, + "rotation": { + "x": -0.7222777009010315, + "y": -0.08202659338712692, + "z": -0.2391108274459839, + "w": -0.6440979242324829 + } + } }, - "rotation": { - "x": -0.7222777009010315, - "y": -0.08202659338712692, - "z": -0.2391108274459839, - "w": -0.6440979242324829 - } - } - }, - { - "joint": "MiddleMetacarpal", - "pose": { - "position": { - "x": 0.04958740621805191, - "y": -0.004707379266619682, - "z": -0.06129273772239685 + { + "joint": 10, + "pose": { + "position": { + "x": -0.0009594520088285208, + "y": 0.000933439121581614, + "z": -0.00021468542399816215 + }, + "rotation": { + "x": -0.7222777009010315, + "y": -0.08202659338712692, + "z": -0.2391108274459839, + "w": -0.6440979242324829 + } + } }, - "rotation": { - "x": -0.5128890872001648, - "y": -0.29369285702705386, - "z": 0.018453821539878846, - "w": 0.8064419627189636 - } - } - }, - { - "joint": "MiddleProximal", - "pose": { - "position": { - "x": 0.020074930042028428, - "y": 0.04420189931988716, - "z": -0.04323747381567955 + { + "joint": 11, + "pose": { + "position": { + "x": 0.04958740621805191, + "y": -0.004707379266619682, + "z": -0.06129273772239685 + }, + "rotation": { + "x": -0.5128890872001648, + "y": -0.29369285702705386, + "z": 0.018453821539878846, + "w": 0.8064419627189636 + } + } }, - "rotation": { - "x": -0.07308150827884674, - "y": 0.17278942465782166, - "z": -0.10241489112377167, - "w": -0.9769001603126526 - } - } - }, - { - "joint": "MiddleIntermediate", - "pose": { - "position": { - "x": 0.005748542491346598, - "y": 0.0362907275557518, - "z": -0.001959702931344509 + { + "joint": 12, + "pose": { + "position": { + "x": 0.020074930042028428, + "y": 0.04420189931988716, + "z": -0.04323747381567955 + }, + "rotation": { + "x": -0.07308150827884674, + "y": 0.17278942465782166, + "z": -0.10241489112377167, + "w": -0.9769001603126526 + } + } }, - "rotation": { - "x": -0.7482351660728455, - "y": 0.06403420120477677, - "z": -0.2061866670846939, - "w": -0.6274414658546448 - } - } - }, - { - "joint": "MiddleDistal", - "pose": { - "position": { - "x": 0.012452101334929467, - "y": 0.007901951670646668, - "z": -0.0057104239240288738 + { + "joint": 13, + "pose": { + "position": { + "x": 0.005748542491346598, + "y": 0.0362907275557518, + "z": -0.001959702931344509 + }, + "rotation": { + "x": -0.7482351660728455, + "y": 0.06403420120477677, + "z": -0.2061866670846939, + "w": -0.6274414658546448 + } + } }, - "rotation": { - "x": -0.9225407838821411, - "y": -0.07818678766489029, - "z": -0.1428528130054474, - "w": -0.3514384627342224 - } - } - }, - { - "joint": "MiddleTip", - "pose": { - "position": { - "x": 0.01802952028810978, - "y": -0.003061514813452959, - "z": -0.01820256933569908 + { + "joint": 14, + "pose": { + "position": { + "x": 0.012452101334929467, + "y": 0.007901951670646668, + "z": -0.0057104239240288738 + }, + "rotation": { + "x": -0.9225407838821411, + "y": -0.07818678766489029, + "z": -0.1428528130054474, + "w": -0.3514384627342224 + } + } }, - "rotation": { - "x": -0.9225407838821411, - "y": -0.07818678766489029, - "z": -0.1428528130054474, - "w": -0.3514384627342224 - } - } - }, - { - "joint": "RingMetacarpal", - "pose": { - "position": { - "x": 0.05912885442376137, - "y": -0.0009383354336023331, - "z": -0.05809984356164932 + { + "joint": 15, + "pose": { + "position": { + "x": 0.01802952028810978, + "y": -0.003061514813452959, + "z": -0.01820256933569908 + }, + "rotation": { + "x": -0.9225407838821411, + "y": -0.07818678766489029, + "z": -0.1428528130054474, + "w": -0.3514384627342224 + } + } }, - "rotation": { - "x": -0.49521127343177798, - "y": -0.17924758791923524, - "z": 0.07874160259962082, - "w": 0.846425473690033 - } - } - }, - { - "joint": "RingProximal", - "pose": { - "position": { - "x": 0.038666337728500369, - "y": 0.04252086579799652, - "z": -0.03421220928430557 + { + "joint": 16, + "pose": { + "position": { + "x": 0.05912885442376137, + "y": -0.0009383354336023331, + "z": -0.05809984356164932 + }, + "rotation": { + "x": -0.49521127343177798, + "y": -0.17924758791923524, + "z": 0.07874160259962082, + "w": 0.846425473690033 + } + } }, - "rotation": { - "x": -0.1513676941394806, - "y": 0.15960678458213807, - "z": -0.05129222199320793, - "w": -0.9741657376289368 - } - } - }, - { - "joint": "RingIntermediate", - "pose": { - "position": { - "x": 0.02693704515695572, - "y": 0.030163494870066644, - "z": 0.0016453623538836837 + { + "joint": 17, + "pose": { + "position": { + "x": 0.038666337728500369, + "y": 0.04252086579799652, + "z": -0.03421220928430557 + }, + "rotation": { + "x": -0.1513676941394806, + "y": 0.15960678458213807, + "z": -0.05129222199320793, + "w": -0.9741657376289368 + } + } }, - "rotation": { - "x": -0.8552912473678589, - "y": 0.0920121893286705, - "z": -0.11032526195049286, - "w": -0.4979609251022339 - } - } - }, - { - "joint": "RingDistal", - "pose": { - "position": { - "x": 0.029263043776154519, - "y": 0.009234108030796051, - "z": -0.009864533320069313 + { + "joint": 18, + "pose": { + "position": { + "x": 0.02693704515695572, + "y": 0.030163494870066644, + "z": 0.0016453623538836837 + }, + "rotation": { + "x": -0.8552912473678589, + "y": 0.0920121893286705, + "z": -0.11032526195049286, + "w": -0.4979609251022339 + } + } }, - "rotation": { - "x": -0.9685380458831787, - "y": -0.018125316128134729, - "z": -0.094183549284935, - "w": -0.23075833916664124 - } - } - }, - { - "joint": "RingTip", - "pose": { - "position": { - "x": 0.032915160059928897, - "y": 0.0007288604974746704, - "z": -0.02667597308754921 + { + "joint": 19, + "pose": { + "position": { + "x": 0.029263043776154519, + "y": 0.009234108030796051, + "z": -0.009864533320069313 + }, + "rotation": { + "x": -0.9685380458831787, + "y": -0.018125316128134729, + "z": -0.094183549284935, + "w": -0.23075833916664124 + } + } }, - "rotation": { - "x": -0.9685380458831787, - "y": -0.018125316128134729, - "z": -0.094183549284935, - "w": -0.23075833916664124 - } - } - }, - { - "joint": "LittleMetacarpal", - "pose": { - "position": { - "x": 0.0675557404756546, - "y": -0.0004099104553461075, - "z": -0.05376683175563812 + { + "joint": 20, + "pose": { + "position": { + "x": 0.032915160059928897, + "y": 0.0007288604974746704, + "z": -0.02667597308754921 + }, + "rotation": { + "x": -0.9685380458831787, + "y": -0.018125316128134729, + "z": -0.094183549284935, + "w": -0.23075833916664124 + } + } }, - "rotation": { - "x": -0.44121748208999636, - "y": -0.05341072380542755, - "z": 0.14569664001464845, - "w": 0.8838818073272705 - } - } - }, - { - "joint": "LittleProximal", - "pose": { - "position": { - "x": 0.05575947463512421, - "y": 0.04002845287322998, - "z": -0.02176406979560852 + { + "joint": 21, + "pose": { + "position": { + "x": 0.0675557404756546, + "y": -0.0004099104553461075, + "z": -0.05376683175563812 + }, + "rotation": { + "x": -0.44121748208999636, + "y": -0.05341072380542755, + "z": 0.14569664001464845, + "w": 0.8838818073272705 + } + } }, - "rotation": { - "x": -0.2122899889945984, - "y": 0.1802181601524353, - "z": 0.03122050315141678, - "w": -0.959945559501648 - } - } - }, - { - "joint": "LittleIntermediate", - "pose": { - "position": { - "x": 0.046450983732938769, - "y": 0.029760107398033143, - "z": 0.0001273825764656067 + { + "joint": 22, + "pose": { + "position": { + "x": 0.05575947463512421, + "y": 0.04002845287322998, + "z": -0.02176406979560852 + }, + "rotation": { + "x": -0.2122899889945984, + "y": 0.1802181601524353, + "z": 0.03122050315141678, + "w": -0.959945559501648 + } + } }, - "rotation": { - "x": -0.8192430138587952, - "y": 0.16303858160972596, - "z": -0.0602981373667717, - "w": -0.5465834140777588 - } - } - }, - { - "joint": "LittleDistal", - "pose": { - "position": { - "x": 0.044868819415569308, - "y": 0.011532457545399666, - "z": -0.007741663604974747 + { + "joint": 23, + "pose": { + "position": { + "x": 0.046450983732938769, + "y": 0.029760107398033143, + "z": 0.0001273825764656067 + }, + "rotation": { + "x": -0.8192430138587952, + "y": 0.16303858160972596, + "z": -0.0602981373667717, + "w": -0.5465834140777588 + } + } }, - "rotation": { - "x": -0.9710148572921753, - "y": 0.04234015569090843, - "z": 0.042903631925582889, - "w": -0.23259779810905457 - } - } - }, - { - "joint": "LittleTip", - "pose": { - "position": { - "x": 0.04328276216983795, - "y": 0.004625056870281696, - "z": -0.0214386023581028 + { + "joint": 24, + "pose": { + "position": { + "x": 0.044868819415569308, + "y": 0.011532457545399666, + "z": -0.007741663604974747 + }, + "rotation": { + "x": -0.9710148572921753, + "y": 0.04234015569090843, + "z": 0.042903631925582889, + "w": -0.23259779810905457 + } + } }, - "rotation": { - "x": -0.9710148572921753, - "y": 0.04234015569090843, - "z": 0.042903631925582889, - "w": -0.23259779810905457 + { + "joint": 25, + "pose": { + "position": { + "x": 0.04328276216983795, + "y": 0.004625056870281696, + "z": -0.0214386023581028 + }, + "rotation": { + "x": -0.9710148572921753, + "y": 0.04234015569090843, + "z": 0.042903631925582889, + "w": -0.23259779810905457 + } + } } - } - } - ] + ] } \ No newline at end of file diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/OpenHandPoseData.json b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/OpenHandPoseData.json index d33119e9..e8e62afe 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/OpenHandPoseData.json +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/OpenHandPoseData.json @@ -1,420 +1,420 @@ { - "items": [ - { - "joint": "Wrist", - "pose": { - "position": { - "x": 0.07397598028182984, - "y": -0.1239677220582962, - "z": -0.05636374652385712 + "joints": [ + { + "joint": 0, + "pose": { + "position": { + "x": 0.07397598028182984, + "y": -0.1239677220582962, + "z": -0.05636374652385712 + }, + "rotation": { + "x": -0.5306746959686279, + "y": -0.24036270380020142, + "z": -0.0010364949703216553, + "w": 0.8126773834228516 + } + } }, - "rotation": { - "x": -0.5306746959686279, - "y": -0.24036270380020142, - "z": -0.0010364949703216553, - "w": 0.8126773834228516 - } - } - }, - { - "joint": "Palm", - "pose": { - "position": { - "x": 0.06148417666554451, - "y": -0.08249785006046295, - "z": -0.04003134369850159 + { + "joint": 1, + "pose": { + "position": { + "x": 0.06148417666554451, + "y": -0.08249785006046295, + "z": -0.04003134369850159 + }, + "rotation": { + "x": -0.5306746959686279, + "y": -0.24036270380020142, + "z": -0.0010364949703216553, + "w": 0.8126773834228516 + } + } }, - "rotation": { - "x": -0.5306746959686279, - "y": -0.24036270380020142, - "z": -0.0010364949703216553, - "w": 0.8126773834228516 - } - } - }, - { - "joint": "ThumbMetacarpal", - "pose": { - "position": { - "x": 0.05004027485847473, - "y": -0.1168040931224823, - "z": -0.046657364815473559 + { + "joint": 2, + "pose": { + "position": { + "x": 0.05004027485847473, + "y": -0.1168040931224823, + "z": -0.046657364815473559 + }, + "rotation": { + "x": -0.5606539249420166, + "y": -0.098196841776371, + "z": 0.670694887638092, + "w": 0.4761941432952881 + } + } }, - "rotation": { - "x": -0.5606539249420166, - "y": -0.098196841776371, - "z": 0.670694887638092, - "w": 0.4761941432952881 - } - } - }, - { - "joint": "ThumbProximal", - "pose": { - "position": { - "x": 0.014790681190788746, - "y": -0.1000247374176979, - "z": -0.031946491450071338 + { + "joint": 3, + "pose": { + "position": { + "x": 0.014790681190788746, + "y": -0.1000247374176979, + "z": -0.031946491450071338 + }, + "rotation": { + "x": -0.5155644416809082, + "y": -0.0010041594505310059, + "z": 0.6619959473609924, + "w": 0.5445378422737122 + } + } }, - "rotation": { - "x": -0.5155644416809082, - "y": -0.0010041594505310059, - "z": 0.6619959473609924, - "w": 0.5445378422737122 - } - } - }, - { - "joint": "ThumbDistal", - "pose": { - "position": { - "x": -0.0062080565840005878, - "y": -0.0828109011054039, - "z": -0.01753186620771885 + { + "joint": 4, + "pose": { + "position": { + "x": -0.0062080565840005878, + "y": -0.0828109011054039, + "z": -0.01753186620771885 + }, + "rotation": { + "x": -0.5490170121192932, + "y": -0.08343470841646195, + "z": 0.6728134751319885, + "w": 0.48939600586891177 + } + } }, - "rotation": { - "x": -0.5490170121192932, - "y": -0.08343470841646195, - "z": 0.6728134751319885, - "w": 0.48939600586891177 - } - } - }, - { - "joint": "ThumbTip", - "pose": { - "position": { - "x": -0.02095535211265087, - "y": -0.07516473531723023, - "z": -0.010627731680870057 + { + "joint": 5, + "pose": { + "position": { + "x": -0.02095535211265087, + "y": -0.07516473531723023, + "z": -0.010627731680870057 + }, + "rotation": { + "x": -0.5490170121192932, + "y": -0.08343470841646195, + "z": 0.6728134751319885, + "w": 0.48939600586891177 + } + } }, - "rotation": { - "x": -0.5490170121192932, - "y": -0.08343470841646195, - "z": 0.6728134751319885, - "w": 0.48939600586891177 - } - } - }, - { - "joint": "IndexMetacarpal", - "pose": { - "position": { - "x": 0.058891069144010547, - "y": -0.11150021106004715, - "z": -0.047359079122543338 + { + "joint": 6, + "pose": { + "position": { + "x": 0.058891069144010547, + "y": -0.11150021106004715, + "z": -0.047359079122543338 + }, + "rotation": { + "x": -0.5242606997489929, + "y": -0.3638727068901062, + "z": 0.0003723353147506714, + "w": 0.7699006795883179 + } + } }, - "rotation": { - "x": -0.5242606997489929, - "y": -0.3638727068901062, - "z": 0.0003723353147506714, - "w": 0.7699006795883179 - } - } - }, - { - "joint": "IndexProximal", - "pose": { - "position": { - "x": 0.025922514498233796, - "y": -0.06404880434274674, - "z": -0.036451879888772967 + { + "joint": 7, + "pose": { + "position": { + "x": 0.025922514498233796, + "y": -0.06404880434274674, + "z": -0.036451879888772967 + }, + "rotation": { + "x": -0.5153175592422485, + "y": -0.13684964179992677, + "z": 0.0975230410695076, + "w": 0.840372622013092 + } + } }, - "rotation": { - "x": -0.5153175592422485, - "y": -0.13684964179992677, - "z": 0.0975230410695076, - "w": 0.840372622013092 - } - } - }, - { - "joint": "IndexIntermediate", - "pose": { - "position": { - "x": 0.012116845697164536, - "y": -0.028988275676965715, - "z": -0.0184309259057045 - }, - "rotation": { - "x": -0.5083625912666321, - "y": -0.08690404891967774, - "z": 0.1772240400314331, - "w": 0.8382880687713623 - } - } - }, - { - "joint": "IndexDistal", - "pose": { - "position": { - "x": 0.0047910469584167, - "y": -0.01052884478121996, - "z": -0.007911253720521927 + { + "joint": 8, + "pose": { + "position": { + "x": 0.012116845697164536, + "y": -0.028988275676965715, + "z": -0.0184309259057045 + }, + "rotation": { + "x": -0.5083625912666321, + "y": -0.08690404891967774, + "z": 0.1772240400314331, + "w": 0.8382880687713623 + } + } }, - "rotation": { - "x": -0.4986042380332947, - "y": -0.10437075048685074, - "z": 0.07316453754901886, - "w": 0.8577484488487244 - } - } - }, - { - "joint": "IndexTip", - "pose": { - "position": { - "x": 0.0011067038867622614, - "y": 0.0017288230592384935, - "z": -0.0008905145805329084 + { + "joint": 9, + "pose": { + "position": { + "x": 0.0047910469584167, + "y": -0.01052884478121996, + "z": -0.007911253720521927 + }, + "rotation": { + "x": -0.4986042380332947, + "y": -0.10437075048685074, + "z": 0.07316453754901886, + "w": 0.8577484488487244 + } + } }, - "rotation": { - "x": -0.4986042380332947, - "y": -0.10437075048685074, - "z": 0.07316453754901886, - "w": 0.8577484488487244 - } - } - }, - { - "joint": "MiddleMetacarpal", - "pose": { - "position": { - "x": 0.06627093255519867, - "y": -0.1093648374080658, - "z": -0.04731958359479904 + { + "joint": 10, + "pose": { + "position": { + "x": 0.0011067038867622614, + "y": 0.0017288230592384935, + "z": -0.0008905145805329084 + }, + "rotation": { + "x": -0.4986042380332947, + "y": -0.10437075048685074, + "z": 0.07316453754901886, + "w": 0.8577484488487244 + } + } }, - "rotation": { - "x": -0.5980523824691773, - "y": -0.19373856484889985, - "z": 0.061999037861824039, - "w": 0.7752125859260559 - } - } - }, - { - "joint": "MiddleProximal", - "pose": { - "position": { - "x": 0.04579643905162811, - "y": -0.05998942255973816, - "z": -0.035861626267433169 + { + "joint": 11, + "pose": { + "position": { + "x": 0.06627093255519867, + "y": -0.1093648374080658, + "z": -0.04731958359479904 + }, + "rotation": { + "x": -0.5980523824691773, + "y": -0.19373856484889985, + "z": 0.061999037861824039, + "w": 0.7752125859260559 + } + } }, - "rotation": { - "x": 0.07707051932811737, - "y": 0.09493987262248993, - "z": -0.06967925280332566, - "w": -0.9900561571121216 - } - } - }, - { - "joint": "MiddleIntermediate", - "pose": { - "position": { - "x": 0.03759719431400299, - "y": -0.054239436984062198, - "z": 0.004158938303589821 + { + "joint": 12, + "pose": { + "position": { + "x": 0.04579643905162811, + "y": -0.05998942255973816, + "z": -0.035861626267433169 + }, + "rotation": { + "x": 0.07707051932811737, + "y": 0.09493987262248993, + "z": -0.06967925280332566, + "w": -0.9900561571121216 + } + } }, - "rotation": { - "x": -0.5364435911178589, - "y": 0.035090312361717227, - "z": -0.1292860358953476, - "w": -0.8333183526992798 - } - } - }, - { - "joint": "MiddleDistal", - "pose": { - "position": { - "x": 0.039636775851249698, - "y": -0.07725092768669129, - "z": 0.014920881018042565 + { + "joint": 13, + "pose": { + "position": { + "x": 0.03759719431400299, + "y": -0.054239436984062198, + "z": 0.004158938303589821 + }, + "rotation": { + "x": -0.5364435911178589, + "y": 0.035090312361717227, + "z": -0.1292860358953476, + "w": -0.8333183526992798 + } + } }, - "rotation": { - "x": -0.7898687720298767, - "y": -0.05351902171969414, - "z": -0.050689004361629489, - "w": -0.6095116138458252 - } - } - }, - { - "joint": "MiddleTip", - "pose": { - "position": { - "x": 0.04198702797293663, - "y": -0.09284322708845139, - "z": 0.010831182822585106 + { + "joint": 14, + "pose": { + "position": { + "x": 0.039636775851249698, + "y": -0.07725092768669129, + "z": 0.014920881018042565 + }, + "rotation": { + "x": -0.7898687720298767, + "y": -0.05351902171969414, + "z": -0.050689004361629489, + "w": -0.6095116138458252 + } + } }, - "rotation": { - "x": -0.7898687720298767, - "y": -0.05351902171969414, - "z": -0.050689004361629489, - "w": -0.6095116138458252 - } - } - }, - { - "joint": "RingMetacarpal", - "pose": { - "position": { - "x": 0.07596171647310257, - "y": -0.10612225532531738, - "z": -0.04667811840772629 + { + "joint": 15, + "pose": { + "position": { + "x": 0.04198702797293663, + "y": -0.09284322708845139, + "z": 0.010831182822585106 + }, + "rotation": { + "x": -0.7898687720298767, + "y": -0.05351902171969414, + "z": -0.050689004361629489, + "w": -0.6095116138458252 + } + } }, - "rotation": { - "x": -0.5675100088119507, - "y": -0.08019199222326279, - "z": 0.10617346316576004, - "w": 0.8125444054603577 - } - } - }, - { - "joint": "RingProximal", - "pose": { - "position": { - "x": 0.06377431005239487, - "y": -0.06213853880763054, - "z": -0.030012063682079316 + { + "joint": 16, + "pose": { + "position": { + "x": 0.07596171647310257, + "y": -0.10612225532531738, + "z": -0.04667811840772629 + }, + "rotation": { + "x": -0.5675100088119507, + "y": -0.08019199222326279, + "z": 0.10617346316576004, + "w": 0.8125444054603577 + } + } }, - "rotation": { - "x": -0.03975258022546768, - "y": 0.09559198468923569, - "z": -0.024301081895828248, - "w": -0.9943375587463379 - } - } - }, - { - "joint": "RingIntermediate", - "pose": { - "position": { - "x": 0.056988153606653216, - "y": -0.06515654176473618, - "z": 0.005276134237647057 + { + "joint": 17, + "pose": { + "position": { + "x": 0.06377431005239487, + "y": -0.06213853880763054, + "z": -0.030012063682079316 + }, + "rotation": { + "x": -0.03975258022546768, + "y": 0.09559198468923569, + "z": -0.024301081895828248, + "w": -0.9943375587463379 + } + } }, - "rotation": { - "x": -0.7588484287261963, - "y": 0.0701710507273674, - "z": -0.045488141477108, - "w": -0.6459669470787048 - } - } - }, - { - "joint": "RingDistal", - "pose": { - "position": { - "x": 0.05652663856744766, - "y": -0.08611556887626648, - "z": 0.0018516592681407929 + { + "joint": 18, + "pose": { + "position": { + "x": 0.056988153606653216, + "y": -0.06515654176473618, + "z": 0.005276134237647057 + }, + "rotation": { + "x": -0.7588484287261963, + "y": 0.0701710507273674, + "z": -0.045488141477108, + "w": -0.6459669470787048 + } + } }, - "rotation": { - "x": -0.9129649996757507, - "y": -0.005179869011044502, - "z": -0.007560268044471741, - "w": -0.408629447221756 - } - } - }, - { - "joint": "RingTip", - "pose": { - "position": { - "x": 0.056841082870960239, - "y": -0.09943331778049469, - "z": -0.010053567588329316 + { + "joint": 19, + "pose": { + "position": { + "x": 0.05652663856744766, + "y": -0.08611556887626648, + "z": 0.0018516592681407929 + }, + "rotation": { + "x": -0.9129649996757507, + "y": -0.005179869011044502, + "z": -0.007560268044471741, + "w": -0.408629447221756 + } + } }, - "rotation": { - "x": -0.9129649996757507, - "y": -0.005179869011044502, - "z": -0.007560268044471741, - "w": -0.408629447221756 - } - } - }, - { - "joint": "LittleMetacarpal", - "pose": { - "position": { - "x": 0.08423660695552826, - "y": -0.10567539930343628, - "z": -0.044220417737960818 + { + "joint": 20, + "pose": { + "position": { + "x": 0.056841082870960239, + "y": -0.09943331778049469, + "z": -0.010053567588329316 + }, + "rotation": { + "x": -0.9129649996757507, + "y": -0.005179869011044502, + "z": -0.007560268044471741, + "w": -0.408629447221756 + } + } }, - "rotation": { - "x": -0.5077040791511536, - "y": 0.04072892665863037, - "z": 0.1517779380083084, - "w": 0.8470779657363892 - } - } - }, - { - "joint": "LittleProximal", - "pose": { - "position": { - "x": 0.0801829993724823, - "y": -0.06412312388420105, - "z": -0.021305494010448457 + { + "joint": 21, + "pose": { + "position": { + "x": 0.08423660695552826, + "y": -0.10567539930343628, + "z": -0.044220417737960818 + }, + "rotation": { + "x": -0.5077040791511536, + "y": 0.04072892665863037, + "z": 0.1517779380083084, + "w": 0.8470779657363892 + } + } }, - "rotation": { - "x": -0.08299122005701065, - "y": 0.1249239444732666, - "z": 0.04155319184064865, - "w": -0.9878235459327698 - } - } - }, - { - "joint": "LittleIntermediate", - "pose": { - "position": { - "x": 0.07411551475524903, - "y": -0.0677957683801651, - "z": 0.0015332028269767762 + { + "joint": 22, + "pose": { + "position": { + "x": 0.0801829993724823, + "y": -0.06412312388420105, + "z": -0.021305494010448457 + }, + "rotation": { + "x": -0.08299122005701065, + "y": 0.1249239444732666, + "z": 0.04155319184064865, + "w": -0.9878235459327698 + } + } }, - "rotation": { - "x": -0.715654730796814, - "y": 0.1371033787727356, - "z": 0.001321159303188324, - "w": -0.6849520206451416 - } - } - }, - { - "joint": "LittleDistal", - "pose": { - "position": { - "x": 0.07075578719377518, - "y": -0.08515383303165436, - "z": 0.00044181570410728455 + { + "joint": 23, + "pose": { + "position": { + "x": 0.07411551475524903, + "y": -0.0677957683801651, + "z": 0.0015332028269767762 + }, + "rotation": { + "x": -0.715654730796814, + "y": 0.1371033787727356, + "z": 0.001321159303188324, + "w": -0.6849520206451416 + } + } }, - "rotation": { - "x": -0.8999292254447937, - "y": 0.06855495274066925, - "z": 0.11455988883972168, - "w": -0.41592133045196535 - } - } - }, - { - "joint": "LittleTip", - "pose": { - "position": { - "x": 0.0670883059501648, - "y": -0.09537018835544586, - "z": -0.008319821208715439 + { + "joint": 24, + "pose": { + "position": { + "x": 0.07075578719377518, + "y": -0.08515383303165436, + "z": 0.00044181570410728455 + }, + "rotation": { + "x": -0.8999292254447937, + "y": 0.06855495274066925, + "z": 0.11455988883972168, + "w": -0.41592133045196535 + } + } }, - "rotation": { - "x": -0.8999292254447937, - "y": 0.06855495274066925, - "z": 0.11455988883972168, - "w": -0.41592133045196535 + { + "joint": 25, + "pose": { + "position": { + "x": 0.0670883059501648, + "y": -0.09537018835544586, + "z": -0.008319821208715439 + }, + "rotation": { + "x": -0.8999292254447937, + "y": 0.06855495274066925, + "z": 0.11455988883972168, + "w": -0.41592133045196535 + } + } } - } - } - ] + ] } \ No newline at end of file diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PinchHandPoseData.json b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PinchHandPoseData.json index 5b051adc..20ab6794 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PinchHandPoseData.json +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PinchHandPoseData.json @@ -1,420 +1,420 @@ { - "items": [ - { - "joint": "Wrist", - "pose": { - "position": { - "x": 0.094970445381477475, - "y": -0.071920572547242045, - "z": -0.043240679195150733 + "joints": [ + { + "joint": 0, + "pose": { + "position": { + "x": 0.09497044235467911, + "y": -0.07192057371139527, + "z": -0.04324067756533623 + }, + "rotation": { + "x": -0.5712693333625794, + "y": -0.40886738896369936, + "z": -0.1171460971236229, + "w": 0.7017942667007446 + } + } }, - "rotation": { - "x": -0.57126933336257935, - "y": -0.40886738896369934, - "z": -0.11714609712362289, - "w": 0.70179426670074463 - } - } - }, - { - "joint": "Palm", - "pose": { - "position": { - "x": 0.078446935163810849, - "y": -0.025236195651814342, - "z": -0.038608604809269309 + { + "joint": 1, + "pose": { + "position": { + "x": 0.07844693213701248, + "y": -0.02523619495332241, + "z": -0.038608603179454806 + }, + "rotation": { + "x": -0.5712693333625794, + "y": -0.40886738896369936, + "z": -0.1171460971236229, + "w": 0.7017942667007446 + } + } }, - "rotation": { - "x": -0.57126933336257935, - "y": -0.40886738896369934, - "z": -0.11714609712362289, - "w": 0.70179426670074463 - } - } - }, - { - "joint": "ThumbMetacarpal", - "pose": { - "position": { - "x": 0.0704388425219804, - "y": -0.063463031081482768, - "z": -0.0446559542324394 + { + "joint": 2, + "pose": { + "position": { + "x": 0.07043883949518204, + "y": -0.06346303224563599, + "z": -0.04465595260262489 + }, + "rotation": { + "x": 0.5995731949806213, + "y": 0.05699071288108826, + "z": -0.661469042301178, + "w": -0.44784826040267947 + } + } }, - "rotation": { - "x": 0.59957319498062134, - "y": 0.056990712881088257, - "z": -0.661469042301178, - "w": -0.44784826040267944 - } - } - }, - { - "joint": "ThumbProximal", - "pose": { - "position": { - "x": 0.030931103276088834, - "y": -0.041895947186276317, - "z": -0.03173214360140264 + { + "joint": 3, + "pose": { + "position": { + "x": 0.030931103974580766, + "y": -0.041895948350429538, + "z": -0.031732141971588138 + }, + "rotation": { + "x": 0.48144450783729555, + "y": -0.07798700034618378, + "z": -0.6672651767730713, + "w": -0.5636534690856934 + } + } }, - "rotation": { - "x": 0.48144450783729553, - "y": -0.077987000346183777, - "z": -0.66726517677307129, - "w": -0.56365346908569336 - } - } - }, - { - "joint": "ThumbDistal", - "pose": { - "position": { - "x": 0.011377685004845262, - "y": -0.0191096484195441, - "z": -0.013179950183257461 + { + "joint": 4, + "pose": { + "position": { + "x": 0.011377684772014618, + "y": -0.01910964772105217, + "z": -0.013179950416088105 + }, + "rotation": { + "x": 0.48974254727363589, + "y": -0.04340343177318573, + "z": -0.678149402141571, + "w": -0.5469872951507568 + } + } }, - "rotation": { - "x": 0.48974254727363586, - "y": -0.04340343177318573, - "z": -0.678149402141571, - "w": -0.54698729515075684 - } - } - }, - { - "joint": "ThumbTip", - "pose": { - "position": { - "x": -0.00054007698781788349, - "y": -0.0076306506525725126, - "z": -0.0031634948682039976 + { + "joint": 5, + "pose": { + "position": { + "x": -0.0005400769878178835, + "y": -0.007630650419741869, + "z": -0.0031634948682039978 + }, + "rotation": { + "x": 0.48974254727363589, + "y": -0.04340343177318573, + "z": -0.678149402141571, + "w": -0.5469872951507568 + } + } }, - "rotation": { - "x": 0.48974254727363586, - "y": -0.04340343177318573, - "z": -0.678149402141571, - "w": -0.54698729515075684 - } - } - }, - { - "joint": "IndexMetacarpal", - "pose": { - "position": { - "x": 0.079071666346862912, - "y": -0.057821920840069652, - "z": -0.042442125966772437 + { + "joint": 6, + "pose": { + "position": { + "x": 0.07907166332006455, + "y": -0.05782192200422287, + "z": -0.04244212433695793 + }, + "rotation": { + "x": -0.5483980774879456, + "y": -0.5408281683921814, + "z": -0.10956580191850662, + "w": 0.6282992959022522 + } + } }, - "rotation": { - "x": -0.54839807748794556, - "y": -0.5408281683921814, - "z": -0.10956580191850662, - "w": 0.6282992959022522 - } - } - }, - { - "joint": "IndexProximal", - "pose": { - "position": { - "x": 0.042313426034525037, - "y": -0.0047555731143802404, - "z": -0.054694456746801734 + { + "joint": 7, + "pose": { + "position": { + "x": 0.04231342673301697, + "y": -0.004755572881549597, + "z": -0.05469445511698723 + }, + "rotation": { + "x": 0.33803752064704897, + "y": 0.3461552560329437, + "z": -0.07535676658153534, + "w": -0.8719203472137451 + } + } }, - "rotation": { - "x": 0.33803752064704895, - "y": 0.34615525603294373, - "z": -0.075356766581535339, - "w": -0.87192034721374512 - } - } - }, - { - "joint": "IndexIntermediate", - "pose": { - "position": { - "x": 0.015641395235434175, - "y": 0.0171373023185879, - "z": -0.033025106182321906 - }, - "rotation": { - "x": 0.011520777828991413, - "y": 0.23532292246818543, - "z": -0.26723867654800415, - "w": -0.93442928791046143 - } - } - }, - { - "joint": "IndexDistal", - "pose": { - "position": { - "x": 0.0043656446505337954, - "y": 0.014503426151350141, - "z": -0.01055326103232801 + { + "joint": 8, + "pose": { + "position": { + "x": 0.01564139500260353, + "y": 0.017137302085757257, + "z": -0.0330251045525074 + }, + "rotation": { + "x": 0.011520777828991413, + "y": 0.23532292246818543, + "z": -0.26723867654800417, + "w": -0.9344292879104614 + } + } }, - "rotation": { - "x": -0.18848013877868652, - "y": 0.1752738356590271, - "z": -0.23216751217842102, - "w": -0.938201367855072 - } - } - }, - { - "joint": "IndexTip", - "pose": { - "position": { - "x": 0.00054007698781788349, - "y": 0.0076306506525725126, - "z": 0.0031634948682039976 + { + "joint": 9, + "pose": { + "position": { + "x": 0.004365644417703152, + "y": 0.014503425918519497, + "z": -0.010553261265158654 + }, + "rotation": { + "x": -0.18848013877868653, + "y": 0.1752738356590271, + "z": -0.23216751217842103, + "w": -0.938201367855072 + } + } }, - "rotation": { - "x": -0.18848013877868652, - "y": 0.1752738356590271, - "z": -0.23216751217842102, - "w": -0.938201367855072 - } - } - }, - { - "joint": "MiddleMetacarpal", - "pose": { - "position": { - "x": 0.085573996650055051, - "y": -0.055481004295870662, - "z": -0.039088224759325385 + { + "joint": 10, + "pose": { + "position": { + "x": 0.0005400769878178835, + "y": 0.007630650419741869, + "z": 0.0031634948682039978 + }, + "rotation": { + "x": -0.18848013877868653, + "y": 0.1752738356590271, + "z": -0.23216751217842103, + "w": -0.938201367855072 + } + } }, - "rotation": { - "x": -0.64046329259872437, - "y": -0.373137503862381, - "z": -0.082113638520240784, - "w": 0.66620767116546631 - } - } - }, - { - "joint": "MiddleProximal", - "pose": { - "position": { - "x": 0.061702992068603635, - "y": 0.00021764193661510944, - "z": -0.04510785429738462 + { + "joint": 11, + "pose": { + "position": { + "x": 0.08557399362325669, + "y": -0.05548100546002388, + "z": -0.03908822312951088 + }, + "rotation": { + "x": -0.6404632925987244, + "y": -0.373137503862381, + "z": -0.08211363852024079, + "w": 0.6662076711654663 + } + } }, - "rotation": { - "x": 0.1714177131652832, - "y": 0.3295632004737854, - "z": -0.056909773498773575, - "w": -0.92670679092407227 - } - } - }, - { - "joint": "MiddleIntermediate", - "pose": { - "position": { - "x": 0.033647007541731, - "y": 0.01268923026509583, - "z": -0.012882571434602141 + { + "joint": 12, + "pose": { + "position": { + "x": 0.061702992767095569, + "y": 0.00021764193661510944, + "z": -0.045107852667570117 + }, + "rotation": { + "x": 0.1714177131652832, + "y": 0.3295632004737854, + "z": -0.056909773498773578, + "w": -0.9267067909240723 + } + } }, - "rotation": { - "x": -0.52955335378646851, - "y": 0.20503298938274384, - "z": -0.28541553020477295, - "w": -0.77215194702148438 - } - } - }, - { - "joint": "MiddleDistal", - "pose": { - "position": { - "x": 0.033218997763469815, - "y": -0.014666470466181636, - "z": -0.00248397677205503 + { + "joint": 13, + "pose": { + "position": { + "x": 0.03364700824022293, + "y": 0.012689230032265187, + "z": -0.012882571667432785 + }, + "rotation": { + "x": -0.5295533537864685, + "y": 0.20503298938274384, + "z": -0.28541553020477297, + "w": -0.7721519470214844 + } + } }, - "rotation": { - "x": -0.80611693859100342, - "y": 0.037188127636909485, - "z": -0.25478187203407288, - "w": -0.5337793231010437 - } - } - }, - { - "joint": "MiddleTip", - "pose": { - "position": { - "x": 0.039724528091028333, - "y": -0.030166196404024959, - "z": -0.0077722163405269384 + { + "joint": 14, + "pose": { + "position": { + "x": 0.033218998461961749, + "y": -0.01466647069901228, + "z": -0.00248397677205503 + }, + "rotation": { + "x": -0.8061169385910034, + "y": 0.037188127636909488, + "z": -0.2547818720340729, + "w": -0.5337793231010437 + } + } }, - "rotation": { - "x": -0.80611693859100342, - "y": 0.037188127636909485, - "z": -0.25478187203407288, - "w": -0.5337793231010437 - } - } - }, - { - "joint": "RingMetacarpal", - "pose": { - "position": { - "x": 0.094046983169391751, - "y": -0.05198403331451118, - "z": -0.034078513970598578 + { + "joint": 15, + "pose": { + "position": { + "x": 0.039724528789520267, + "y": -0.030166195705533029, + "z": -0.007772216107696295 + }, + "rotation": { + "x": -0.8061169385910034, + "y": 0.037188127636909488, + "z": -0.2547818720340729, + "w": -0.5337793231010437 + } + } }, - "rotation": { - "x": -0.63099503517150879, - "y": -0.25767973065376282, - "z": -0.040025528520345688, - "w": 0.73064666986465454 - } - } - }, - { - "joint": "RingProximal", - "pose": { - "position": { - "x": 0.076233054744079709, - "y": -0.00047668232582509518, - "z": -0.030205076327547431 + { + "joint": 16, + "pose": { + "position": { + "x": 0.09404698014259339, + "y": -0.0519840344786644, + "z": -0.03407851234078407 + }, + "rotation": { + "x": -0.6309950351715088, + "y": -0.2576797306537628, + "z": -0.04002552852034569, + "w": 0.7306466698646545 + } + } }, - "rotation": { - "x": 0.061521425843238831, - "y": 0.32744783163070679, - "z": -0.026347285136580467, - "w": -0.94250476360321045 - } - } - }, - { - "joint": "RingIntermediate", - "pose": { - "position": { - "x": 0.051643508719280362, - "y": 0.003435472259297967, - "z": 0.00062574469484388828 + { + "joint": 17, + "pose": { + "position": { + "x": 0.07623305171728134, + "y": -0.0004766823258250952, + "z": -0.030205076560378076 + }, + "rotation": { + "x": 0.06152142584323883, + "y": 0.3274478316307068, + "z": -0.026347285136580468, + "w": -0.9425047636032105 + } + } }, - "rotation": { - "x": -0.7006344199180603, - "y": 0.22492779791355133, - "z": -0.23193849623203278, - "w": -0.63627457618713379 - } - } - }, - { - "joint": "RingDistal", - "pose": { - "position": { - "x": 0.0525671869982034, - "y": -0.0204183969181031, - "z": -0.0013549791183322668 + { + "joint": 18, + "pose": { + "position": { + "x": 0.05164350941777229, + "y": 0.003435472259297967, + "z": 0.0006257446948438883 + }, + "rotation": { + "x": -0.7006344199180603, + "y": 0.22492779791355134, + "z": -0.23193849623203278, + "w": -0.6362745761871338 + } + } }, - "rotation": { - "x": -0.88947725296020508, - "y": 0.068172931671142578, - "z": -0.23703967034816742, - "w": -0.38538727164268494 - } - } - }, - { - "joint": "RingTip", - "pose": { - "position": { - "x": 0.0596969083417207, - "y": -0.034293188480660319, - "z": -0.0127856710460037 + { + "joint": 19, + "pose": { + "position": { + "x": 0.05256718769669533, + "y": -0.020418396219611169, + "z": -0.0013549791183322669 + }, + "rotation": { + "x": -0.8894772529602051, + "y": 0.06817293167114258, + "z": -0.23703967034816743, + "w": -0.38538727164268496 + } + } }, - "rotation": { - "x": -0.88947725296020508, - "y": 0.068172931671142578, - "z": -0.23703967034816742, - "w": -0.38538727164268494 - } - } - }, - { - "joint": "LittleMetacarpal", - "pose": { - "position": { - "x": 0.10081055318005383, - "y": -0.050989105133339763, - "z": -0.027507969876751304 + { + "joint": 20, + "pose": { + "position": { + "x": 0.05969690904021263, + "y": -0.03429318964481354, + "z": -0.012785671278834343 + }, + "rotation": { + "x": -0.8894772529602051, + "y": 0.06817293167114258, + "z": -0.23703967034816743, + "w": -0.38538727164268496 + } + } }, - "rotation": { - "x": -0.58761417865753174, - "y": -0.13647006452083588, - "z": 0.010980717837810516, - "w": 0.79747408628463745 - } - } - }, - { - "joint": "LittleProximal", - "pose": { - "position": { - "x": 0.088435876416042447, - "y": -0.00084916572086513042, - "z": -0.01290042488835752 + { + "joint": 21, + "pose": { + "position": { + "x": 0.10081055015325546, + "y": -0.05098910629749298, + "z": -0.027507970109581949 + }, + "rotation": { + "x": -0.5876141786575317, + "y": -0.13647006452083589, + "z": 0.010980717837810517, + "w": 0.7974740862846375 + } + } }, - "rotation": { - "x": -0.015533886849880219, - "y": 0.36132562160491943, - "z": 0.044756371527910233, - "w": -0.9312441349029541 - } - } - }, - { - "joint": "LittleIntermediate", - "pose": { - "position": { - "x": 0.071086059557273984, - "y": -0.000761339208111167, - "z": 0.0060971176717430353 + { + "joint": 22, + "pose": { + "position": { + "x": 0.08843587338924408, + "y": -0.0008491657208651304, + "z": -0.012900425121188164 + }, + "rotation": { + "x": -0.015533886849880219, + "y": 0.36132562160491946, + "z": 0.04475637152791023, + "w": -0.9312441349029541 + } + } }, - "rotation": { - "x": -0.6863744854927063, - "y": 0.30161058902740479, - "z": -0.18428879976272583, - "w": -0.63567912578582764 - } - } - }, - { - "joint": "LittleDistal", - "pose": { - "position": { - "x": 0.068500611232593656, - "y": -0.02024311083368957, - "z": 0.0036448633763939142 + { + "joint": 23, + "pose": { + "position": { + "x": 0.07108605653047562, + "y": -0.000761339208111167, + "z": 0.006097117438912392 + }, + "rotation": { + "x": -0.6863744854927063, + "y": 0.3016105890274048, + "z": -0.18428879976272584, + "w": -0.6356791257858276 + } + } }, - "rotation": { - "x": -0.93071597814559937, - "y": 0.13045383989810944, - "z": -0.11257931590080261, - "w": -0.32351988554000854 - } - } - }, - { - "joint": "LittleTip", - "pose": { - "position": { - "x": 0.070451776729896665, - "y": -0.030086855171248317, - "z": -0.00828781514428556 + { + "joint": 24, + "pose": { + "position": { + "x": 0.06850060820579529, + "y": -0.02024311013519764, + "z": 0.0036448633763939144 + }, + "rotation": { + "x": -0.9307159781455994, + "y": 0.13045383989810944, + "z": -0.11257931590080261, + "w": -0.32351988554000857 + } + } }, - "rotation": { - "x": -0.93071597814559937, - "y": 0.13045383989810944, - "z": -0.11257931590080261, - "w": -0.32351988554000854 + { + "joint": 25, + "pose": { + "position": { + "x": 0.0704517737030983, + "y": -0.030086854472756387, + "z": -0.008287815377116204 + }, + "rotation": { + "x": -0.9307159781455994, + "y": 0.13045383989810944, + "z": -0.11257931590080261, + "w": -0.32351988554000857 + } + } } - } - } - ] + ] } \ No newline at end of file diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PinchSteadyWristHandPoseData.json b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PinchSteadyWristHandPoseData.json index 7cd9233c..a1f72a29 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PinchSteadyWristHandPoseData.json +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PinchSteadyWristHandPoseData.json @@ -1,420 +1,420 @@ { - "items": [ - { - "joint": "Wrist", - "pose": { - "position": { - "x": 0.09835253655910492, - "y": -0.13776640594005586, - "z": -0.039533719420433047 + "joints": [ + { + "joint": 0, + "pose": { + "position": { + "x": 0.09835253655910492, + "y": -0.13776640594005586, + "z": -0.039533719420433047 + }, + "rotation": { + "x": -0.5504903793334961, + "y": -0.3628506064414978, + "z": 0.009051494300365448, + "w": 0.7516400218009949 + } + } }, - "rotation": { - "x": -0.5504903793334961, - "y": -0.3628506064414978, - "z": 0.009051494300365448, - "w": 0.7516400218009949 - } - } - }, - { - "joint": "Palm", - "pose": { - "position": { - "x": 0.0762285590171814, - "y": -0.0935618057847023, - "z": -0.03025330975651741 + { + "joint": 1, + "pose": { + "position": { + "x": 0.0762285590171814, + "y": -0.0935618057847023, + "z": -0.03025330975651741 + }, + "rotation": { + "x": -0.5504903793334961, + "y": -0.3628506064414978, + "z": 0.009051494300365448, + "w": 0.7516400218009949 + } + } }, - "rotation": { - "x": -0.5504903793334961, - "y": -0.3628506064414978, - "z": 0.009051494300365448, - "w": 0.7516400218009949 - } - } - }, - { - "joint": "ThumbMetacarpal", - "pose": { - "position": { - "x": 0.0726172998547554, - "y": -0.13283079862594605, - "z": -0.03489827364683151 + { + "joint": 2, + "pose": { + "position": { + "x": 0.0726172998547554, + "y": -0.13283079862594605, + "z": -0.03489827364683151 + }, + "rotation": { + "x": 0.5268919467926025, + "y": 0.07137523591518402, + "z": -0.7376347184181213, + "w": -0.4172084629535675 + } + } }, - "rotation": { - "x": 0.5268919467926025, - "y": 0.07137523591518402, - "z": -0.7376347184181213, - "w": -0.4172084629535675 - } - } - }, - { - "joint": "ThumbProximal", - "pose": { - "position": { - "x": 0.033425573259592059, - "y": -0.11720558255910874, - "z": -0.01445704698562622 + { + "joint": 3, + "pose": { + "position": { + "x": 0.033425573259592059, + "y": -0.11720558255910874, + "z": -0.01445704698562622 + }, + "rotation": { + "x": 0.434413880109787, + "y": -0.0821000337600708, + "z": -0.7344200611114502, + "w": -0.5157689452171326 + } + } }, - "rotation": { - "x": 0.434413880109787, - "y": -0.0821000337600708, - "z": -0.7344200611114502, - "w": -0.5157689452171326 - } - } - }, - { - "joint": "ThumbDistal", - "pose": { - "position": { - "x": 0.014360085129737854, - "y": -0.09762166440486908, - "z": 0.006609674543142319 + { + "joint": 4, + "pose": { + "position": { + "x": 0.014360085129737854, + "y": -0.09762166440486908, + "z": 0.006609674543142319 + }, + "rotation": { + "x": 0.4773363769054413, + "y": 0.019135713577270509, + "z": -0.7483649849891663, + "w": -0.4610738456249237 + } + } }, - "rotation": { - "x": 0.4773363769054413, - "y": 0.019135713577270509, - "z": -0.7483649849891663, - "w": -0.4610738456249237 - } - } - }, - { - "joint": "ThumbTip", - "pose": { - "position": { - "x": -0.00011064158752560616, - "y": -0.08949866145849228, - "z": 0.017393887042999269 + { + "joint": 5, + "pose": { + "position": { + "x": -0.00011064158752560616, + "y": -0.08949866145849228, + "z": 0.017393887042999269 + }, + "rotation": { + "x": 0.4773363769054413, + "y": 0.019135713577270509, + "z": -0.7483649849891663, + "w": -0.4610738456249237 + } + } }, - "rotation": { - "x": 0.4773363769054413, - "y": 0.019135713577270509, - "z": -0.7483649849891663, - "w": -0.4610738456249237 - } - } - }, - { - "joint": "IndexMetacarpal", - "pose": { - "position": { - "x": 0.08073623478412628, - "y": -0.125896617770195, - "z": -0.034658633172512057 + { + "joint": 6, + "pose": { + "position": { + "x": 0.08073623478412628, + "y": -0.125896617770195, + "z": -0.034658633172512057 + }, + "rotation": { + "x": -0.5162340998649597, + "y": -0.5017301440238953, + "z": 0.006298713386058807, + "w": 0.6940672993659973 + } + } }, - "rotation": { - "x": -0.5162340998649597, - "y": -0.5017301440238953, - "z": 0.006298713386058807, - "w": 0.6940672993659973 - } - } - }, - { - "joint": "IndexProximal", - "pose": { - "position": { - "x": 0.03474228084087372, - "y": -0.0794244259595871, - "z": -0.03704426437616348 + { + "joint": 7, + "pose": { + "position": { + "x": 0.03474228084087372, + "y": -0.0794244259595871, + "z": -0.03704426437616348 + }, + "rotation": { + "x": 0.24844542145729066, + "y": 0.2553045451641083, + "z": -0.1957876831293106, + "w": -0.9136616587638855 + } + } }, - "rotation": { - "x": 0.24844542145729066, - "y": 0.2553045451641083, - "z": -0.1957876831293106, - "w": -0.9136616587638855 - } - } - }, - { - "joint": "IndexIntermediate", - "pose": { - "position": { - "x": 0.011708781123161316, - "y": -0.06496208906173706, - "z": -0.006560325622558594 - }, - "rotation": { - "x": -0.07294681668281555, - "y": 0.11601599305868149, - "z": -0.3479400873184204, - "w": -0.9274918437004089 - } - } - }, - { - "joint": "IndexDistal", - "pose": { - "position": { - "x": 0.007551820017397404, - "y": -0.07041776180267334, - "z": 0.017747312784194948 + { + "joint": 8, + "pose": { + "position": { + "x": 0.011708781123161316, + "y": -0.06496208906173706, + "z": -0.006560325622558594 + }, + "rotation": { + "x": -0.07294681668281555, + "y": 0.11601599305868149, + "z": -0.3479400873184204, + "w": -0.9274918437004089 + } + } }, - "rotation": { - "x": -0.23120707273483277, - "y": 0.04230353981256485, - "z": -0.283862441778183, - "w": -0.9298091530799866 - } - } - }, - { - "joint": "IndexTip", - "pose": { - "position": { - "x": 0.008366326801478863, - "y": -0.07753925025463104, - "z": 0.03171003982424736 + { + "joint": 9, + "pose": { + "position": { + "x": 0.007551820017397404, + "y": -0.07041776180267334, + "z": 0.017747312784194948 + }, + "rotation": { + "x": -0.23120707273483277, + "y": 0.04230353981256485, + "z": -0.283862441778183, + "w": -0.9298091530799866 + } + } }, - "rotation": { - "x": -0.23120707273483277, - "y": 0.04230353981256485, - "z": -0.283862441778183, - "w": -0.9298091530799866 - } - } - }, - { - "joint": "MiddleMetacarpal", - "pose": { - "position": { - "x": 0.08751480281352997, - "y": -0.12250128388404846, - "z": -0.03293202817440033 + { + "joint": 10, + "pose": { + "position": { + "x": 0.008366326801478863, + "y": -0.07753925025463104, + "z": 0.03171003982424736 + }, + "rotation": { + "x": -0.23120707273483277, + "y": 0.04230353981256485, + "z": -0.283862441778183, + "w": -0.9298091530799866 + } + } }, - "rotation": { - "x": -0.6167790293693543, - "y": -0.3379325270652771, - "z": 0.047245174646377566, - "w": 0.7093328237533569 - } - } - }, - { - "joint": "MiddleProximal", - "pose": { - "position": { - "x": 0.05473826080560684, - "y": -0.07110955566167832, - "z": -0.03227551281452179 + { + "joint": 11, + "pose": { + "position": { + "x": 0.08751480281352997, + "y": -0.12250128388404846, + "z": -0.03293202817440033 + }, + "rotation": { + "x": -0.6167790293693543, + "y": -0.3379325270652771, + "z": 0.047245174646377566, + "w": 0.7093328237533569 + } + } }, - "rotation": { - "x": 0.14497825503349305, - "y": 0.23276910185813905, - "z": -0.15017877519130708, - "w": -0.9498769640922546 - } - } - }, - { - "joint": "MiddleIntermediate", - "pose": { - "position": { - "x": 0.03288401663303375, - "y": -0.061863791197538379, - "z": 0.005947750061750412 + { + "joint": 12, + "pose": { + "position": { + "x": 0.05473826080560684, + "y": -0.07110955566167832, + "z": -0.03227551281452179 + }, + "rotation": { + "x": 0.14497825503349305, + "y": 0.23276910185813905, + "z": -0.15017877519130708, + "w": -0.9498769640922546 + } + } }, - "rotation": { - "x": -0.529046893119812, - "y": 0.08228799700737, - "z": -0.27945762872695925, - "w": -0.7971096038818359 - } - } - }, - { - "joint": "MiddleDistal", - "pose": { - "position": { - "x": 0.03765859827399254, - "y": -0.08771546185016632, - "z": 0.018359089270234109 + { + "joint": 13, + "pose": { + "position": { + "x": 0.03288401663303375, + "y": -0.061863791197538379, + "z": 0.005947750061750412 + }, + "rotation": { + "x": -0.529046893119812, + "y": 0.08228799700737, + "z": -0.27945762872695925, + "w": -0.7971096038818359 + } + } }, - "rotation": { - "x": -0.7883356809616089, - "y": -0.06667964905500412, - "z": -0.20251651108264924, - "w": -0.5779290795326233 - } - } - }, - { - "joint": "MiddleTip", - "pose": { - "position": { - "x": 0.044593729078769687, - "y": -0.10324498265981674, - "z": 0.013978719711303711 + { + "joint": 14, + "pose": { + "position": { + "x": 0.03765859827399254, + "y": -0.08771546185016632, + "z": 0.018359089270234109 + }, + "rotation": { + "x": -0.7883356809616089, + "y": -0.06667964905500412, + "z": -0.20251651108264924, + "w": -0.5779290795326233 + } + } }, - "rotation": { - "x": -0.7883356809616089, - "y": -0.06667964905500412, - "z": -0.20251651108264924, - "w": -0.5779290795326233 - } - } - }, - { - "joint": "RingMetacarpal", - "pose": { - "position": { - "x": 0.09642073512077332, - "y": -0.11764736473560333, - "z": -0.03004951775074005 + { + "joint": 15, + "pose": { + "position": { + "x": 0.044593729078769687, + "y": -0.10324498265981674, + "z": 0.013978719711303711 + }, + "rotation": { + "x": -0.7883356809616089, + "y": -0.06667964905500412, + "z": -0.20251651108264924, + "w": -0.5779290795326233 + } + } }, - "rotation": { - "x": -0.6103544235229492, - "y": -0.2158902883529663, - "z": 0.09254944324493408, - "w": 0.756500780582428 - } - } - }, - { - "joint": "RingProximal", - "pose": { - "position": { - "x": 0.07221101969480515, - "y": -0.06899281591176987, - "z": -0.021143771708011628 + { + "joint": 16, + "pose": { + "position": { + "x": 0.09642073512077332, + "y": -0.11764736473560333, + "z": -0.03004951775074005 + }, + "rotation": { + "x": -0.6103544235229492, + "y": -0.2158902883529663, + "z": 0.09254944324493408, + "w": 0.756500780582428 + } + } }, - "rotation": { - "x": 0.05531589314341545, - "y": 0.22126297652721406, - "z": -0.10504759848117829, - "w": -0.9679690599441528 - } - } - }, - { - "joint": "RingIntermediate", - "pose": { - "position": { - "x": 0.05479241907596588, - "y": -0.06659357994794846, - "z": 0.014326661825180054 + { + "joint": 17, + "pose": { + "position": { + "x": 0.07221101969480515, + "y": -0.06899281591176987, + "z": -0.021143771708011628 + }, + "rotation": { + "x": 0.05531589314341545, + "y": 0.22126297652721406, + "z": -0.10504759848117829, + "w": -0.9679690599441528 + } + } }, - "rotation": { - "x": -0.7176058888435364, - "y": 0.09858439117670059, - "z": -0.19834160804748536, - "w": -0.6603801846504211 - } - } - }, - { - "joint": "RingDistal", - "pose": { - "position": { - "x": 0.05848679319024086, - "y": -0.09022481739521027, - "z": 0.013152096420526505 + { + "joint": 18, + "pose": { + "position": { + "x": 0.05479241907596588, + "y": -0.06659357994794846, + "z": 0.014326661825180054 + }, + "rotation": { + "x": -0.7176058888435364, + "y": 0.09858439117670059, + "z": -0.19834160804748536, + "w": -0.6603801846504211 + } + } }, - "rotation": { - "x": -0.902705729007721, - "y": -0.04138700291514397, - "z": -0.16108426451683045, - "w": -0.39749816060066225 - } - } - }, - { - "joint": "RingTip", - "pose": { - "position": { - "x": 0.0647393986582756, - "y": -0.10384124517440796, - "z": 0.000916551798582077 + { + "joint": 19, + "pose": { + "position": { + "x": 0.05848679319024086, + "y": -0.09022481739521027, + "z": 0.013152096420526505 + }, + "rotation": { + "x": -0.902705729007721, + "y": -0.04138700291514397, + "z": -0.16108426451683045, + "w": -0.39749816060066225 + } + } }, - "rotation": { - "x": -0.902705729007721, - "y": -0.04138700291514397, - "z": -0.16108426451683045, - "w": -0.39749816060066225 - } - } - }, - { - "joint": "LittleMetacarpal", - "pose": { - "position": { - "x": 0.10431554913520813, - "y": -0.11550788581371308, - "z": -0.02525215595960617 + { + "joint": 20, + "pose": { + "position": { + "x": 0.0647393986582756, + "y": -0.10384124517440796, + "z": 0.000916551798582077 + }, + "rotation": { + "x": -0.902705729007721, + "y": -0.04138700291514397, + "z": -0.16108426451683045, + "w": -0.39749816060066225 + } + } }, - "rotation": { - "x": -0.5731514096260071, - "y": -0.08393544703722, - "z": 0.14239011704921723, - "w": 0.8026066422462463 - } - } - }, - { - "joint": "LittleProximal", - "pose": { - "position": { - "x": 0.08813987672328949, - "y": -0.06685832887887955, - "z": -0.0073963552713394169 + { + "joint": 21, + "pose": { + "position": { + "x": 0.10431554913520813, + "y": -0.11550788581371308, + "z": -0.02525215595960617 + }, + "rotation": { + "x": -0.5731514096260071, + "y": -0.08393544703722, + "z": 0.14239011704921723, + "w": 0.8026066422462463 + } + } }, - "rotation": { - "x": 0.004650826565921307, - "y": 0.2523718476295471, - "z": -0.022669829428195955, - "w": -0.967362105846405 - } - } - }, - { - "joint": "LittleIntermediate", - "pose": { - "position": { - "x": 0.07569940388202667, - "y": -0.066920705139637, - "z": 0.014825716614723206 + { + "joint": 22, + "pose": { + "position": { + "x": 0.08813987672328949, + "y": -0.06685832887887955, + "z": -0.0073963552713394169 + }, + "rotation": { + "x": 0.004650826565921307, + "y": 0.2523718476295471, + "z": -0.022669829428195955, + "w": -0.967362105846405 + } + } }, - "rotation": { - "x": -0.6876563429832459, - "y": 0.1765523999929428, - "z": -0.14831064641475678, - "w": -0.6885376572608948 - } - } - }, - { - "joint": "LittleDistal", - "pose": { - "position": { - "x": 0.0749262273311615, - "y": -0.08663906902074814, - "z": 0.014672402292490006 + { + "joint": 23, + "pose": { + "position": { + "x": 0.07569940388202667, + "y": -0.066920705139637, + "z": 0.014825716614723206 + }, + "rotation": { + "x": -0.6876563429832459, + "y": 0.1765523999929428, + "z": -0.14831064641475678, + "w": -0.6885376572608948 + } + } }, - "rotation": { - "x": -0.927348792552948, - "y": 0.0344926156103611, - "z": -0.02340996265411377, - "w": -0.37271565198898318 - } - } - }, - { - "joint": "LittleTip", - "pose": { - "position": { - "x": 0.07520446181297302, - "y": -0.09743660688400269, - "z": 0.0034288540482521059 + { + "joint": 24, + "pose": { + "position": { + "x": 0.0749262273311615, + "y": -0.08663906902074814, + "z": 0.014672402292490006 + }, + "rotation": { + "x": -0.927348792552948, + "y": 0.0344926156103611, + "z": -0.02340996265411377, + "w": -0.37271565198898318 + } + } }, - "rotation": { - "x": -0.927348792552948, - "y": 0.0344926156103611, - "z": -0.02340996265411377, - "w": -0.37271565198898318 + { + "joint": 25, + "pose": { + "position": { + "x": 0.07520446181297302, + "y": -0.09743660688400269, + "z": 0.0034288540482521059 + }, + "rotation": { + "x": -0.927348792552948, + "y": 0.0344926156103611, + "z": -0.02340996265411377, + "w": -0.37271565198898318 + } + } } - } - } - ] + ] } \ No newline at end of file diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PokeHandPoseData.json b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PokeHandPoseData.json index 346c9253..36c5ca0e 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PokeHandPoseData.json +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PokeHandPoseData.json @@ -1,420 +1,420 @@ { - "items": [ - { - "joint": "Wrist", - "pose": { - "position": { - "x": 0.042526353150606158, - "y": -0.05274807661771774, - "z": -0.002824799157679081 + "joints": [ + { + "joint": 0, + "pose": { + "position": { + "x": 0.042526353150606158, + "y": -0.05274807661771774, + "z": -0.002824799157679081 + }, + "rotation": { + "x": -0.3676998019218445, + "y": -0.23572500050067902, + "z": -0.11507342755794525, + "w": 0.8920522332191467 + } + } }, - "rotation": { - "x": -0.3676998019218445, - "y": -0.23572500050067902, - "z": -0.11507342755794525, - "w": 0.8920522332191467 - } - } - }, - { - "joint": "Palm", - "pose": { - "position": { - "x": 0.03201436251401901, - "y": -0.019188636913895608, - "z": 0.02868746407330036 + { + "joint": 1, + "pose": { + "position": { + "x": 0.03201436251401901, + "y": -0.019188636913895608, + "z": 0.02868746407330036 + }, + "rotation": { + "x": -0.3676998019218445, + "y": -0.23572500050067902, + "z": -0.11507342755794525, + "w": 0.8920522332191467 + } + } }, - "rotation": { - "x": -0.3676998019218445, - "y": -0.23572500050067902, - "z": -0.11507342755794525, - "w": 0.8920522332191467 - } - } - }, - { - "joint": "ThumbMetacarpal", - "pose": { - "position": { - "x": 0.020570117980241777, - "y": -0.04709470272064209, - "z": 0.006985310930758715 + { + "joint": 2, + "pose": { + "position": { + "x": 0.020570117980241777, + "y": -0.04709470272064209, + "z": 0.006985310930758715 + }, + "rotation": { + "x": 0.3615202307701111, + "y": 0.20331884920597077, + "z": -0.6839582324028015, + "w": -0.6008830666542053 + } + } }, - "rotation": { - "x": 0.3615202307701111, - "y": 0.20331884920597077, - "z": -0.6839582324028015, - "w": -0.6008830666542053 - } - } - }, - { - "joint": "ThumbProximal", - "pose": { - "position": { - "x": -0.009850621223449707, - "y": -0.04070408642292023, - "z": 0.034042149782180789 + { + "joint": 3, + "pose": { + "position": { + "x": -0.009850621223449707, + "y": -0.04070408642292023, + "z": 0.034042149782180789 + }, + "rotation": { + "x": 0.21800242364406587, + "y": 0.02305757999420166, + "z": -0.7068297266960144, + "w": -0.673233151435852 + } + } }, - "rotation": { - "x": 0.21800242364406587, - "y": 0.02305757999420166, - "z": -0.7068297266960144, - "w": -0.673233151435852 - } - } - }, - { - "joint": "ThumbDistal", - "pose": { - "position": { - "x": -0.02049688994884491, - "y": -0.03254491835832596, - "z": 0.06248035654425621 + { + "joint": 4, + "pose": { + "position": { + "x": -0.02049688994884491, + "y": -0.03254491835832596, + "z": 0.06248035654425621 + }, + "rotation": { + "x": 0.258157342672348, + "y": 0.0635419636964798, + "z": -0.7039065957069397, + "w": -0.6593562960624695 + } + } }, - "rotation": { - "x": 0.258157342672348, - "y": 0.0635419636964798, - "z": -0.7039065957069397, - "w": -0.6593562960624695 - } - } - }, - { - "joint": "ThumbTip", - "pose": { - "position": { - "x": -0.028410332277417184, - "y": -0.028122693300247194, - "z": 0.07770571112632752 + { + "joint": 5, + "pose": { + "position": { + "x": -0.028410332277417184, + "y": -0.028122693300247194, + "z": 0.07770571112632752 + }, + "rotation": { + "x": 0.258157342672348, + "y": 0.0635419636964798, + "z": -0.7039065957069397, + "w": -0.6593562960624695 + } + } }, - "rotation": { - "x": 0.258157342672348, - "y": 0.0635419636964798, - "z": -0.7039065957069397, - "w": -0.6593562960624695 - } - } - }, - { - "joint": "IndexMetacarpal", - "pose": { - "position": { - "x": 0.029027197510004045, - "y": -0.042809583246707919, - "z": 0.009094133973121643 + { + "joint": 6, + "pose": { + "position": { + "x": 0.029027197510004045, + "y": -0.042809583246707919, + "z": 0.009094133973121643 + }, + "rotation": { + "x": -0.3631853759288788, + "y": -0.3677399158477783, + "z": -0.1473514586687088, + "w": 0.8432979583740234 + } + } }, - "rotation": { - "x": -0.3631853759288788, - "y": -0.3677399158477783, - "z": -0.1473514586687088, - "w": 0.8432979583740234 - } - } - }, - { - "joint": "IndexProximal", - "pose": { - "position": { - "x": -0.0017803632654249669, - "y": 0.0004678480327129364, - "z": 0.03705211728811264 + { + "joint": 7, + "pose": { + "position": { + "x": -0.0017803632654249669, + "y": 0.0004678480327129364, + "z": 0.03705211728811264 + }, + "rotation": { + "x": -0.27657586336135867, + "y": -0.15855258703231812, + "z": 0.0009860674617812038, + "w": 0.947831392288208 + } + } }, - "rotation": { - "x": -0.27657586336135867, - "y": -0.15855258703231812, - "z": 0.0009860674617812038, - "w": 0.947831392288208 - } - } - }, - { - "joint": "IndexIntermediate", - "pose": { - "position": { - "x": -0.014122002758085728, - "y": 0.021943308413028718, - "z": 0.06970683485269547 - }, - "rotation": { - "x": -0.2553846836090088, - "y": -0.12617842853069306, - "z": 0.09538201987743378, - "w": 0.9538831114768982 - } - } - }, - { - "joint": "IndexDistal", - "pose": { - "position": { - "x": -0.020550768822431566, - "y": 0.0322258397936821, - "z": 0.08830686658620835 + { + "joint": 8, + "pose": { + "position": { + "x": -0.014122002758085728, + "y": 0.021943308413028718, + "z": 0.06970683485269547 + }, + "rotation": { + "x": -0.2553846836090088, + "y": -0.12617842853069306, + "z": 0.09538201987743378, + "w": 0.9538831114768982 + } + } }, - "rotation": { - "x": -0.30963119864463808, - "y": -0.11118883639574051, - "z": -0.031351685523986819, - "w": 0.9441277980804443 - } - } - }, - { - "joint": "IndexTip", - "pose": { - "position": { - "x": -0.02332291379570961, - "y": 0.04081675410270691, - "z": 0.09968645870685578 + { + "joint": 9, + "pose": { + "position": { + "x": -0.020550768822431566, + "y": 0.0322258397936821, + "z": 0.08830686658620835 + }, + "rotation": { + "x": -0.30963119864463808, + "y": -0.11118883639574051, + "z": -0.031351685523986819, + "w": 0.9441277980804443 + } + } }, - "rotation": { - "x": -0.30963119864463808, - "y": -0.11118883639574051, - "z": -0.031351685523986819, - "w": 0.9441277980804443 - } - } - }, - { - "joint": "MiddleMetacarpal", - "pose": { - "position": { - "x": 0.035866666585206988, - "y": -0.041708216071128848, - "z": 0.010740639641880989 + { + "joint": 10, + "pose": { + "position": { + "x": -0.02332291379570961, + "y": 0.04081675410270691, + "z": 0.09968645870685578 + }, + "rotation": { + "x": -0.30963119864463808, + "y": -0.11118883639574051, + "z": -0.031351685523986819, + "w": 0.9441277980804443 + } + } }, - "rotation": { - "x": -0.43399062752723696, - "y": -0.2068476676940918, - "z": -0.05406999588012695, - "w": 0.8751816153526306 - } - } - }, - { - "joint": "MiddleProximal", - "pose": { - "position": { - "x": 0.018060242757201196, - "y": 0.002479703165590763, - "z": 0.04112553596496582 + { + "joint": 11, + "pose": { + "position": { + "x": 0.035866666585206988, + "y": -0.041708216071128848, + "z": 0.010740639641880989 + }, + "rotation": { + "x": -0.43399062752723696, + "y": -0.2068476676940918, + "z": -0.05406999588012695, + "w": 0.8751816153526306 + } + } }, - "rotation": { - "x": 0.005038086324930191, - "y": 0.1527022123336792, - "z": 0.021530797705054284, - "w": -0.9880359768867493 - } - } - }, - { - "joint": "MiddleIntermediate", - "pose": { - "position": { - "x": 0.005449346732348204, - "y": 0.0031707696616649629, - "z": 0.08099328726530075 + { + "joint": 12, + "pose": { + "position": { + "x": 0.018060242757201196, + "y": 0.002479703165590763, + "z": 0.04112553596496582 + }, + "rotation": { + "x": 0.005038086324930191, + "y": 0.1527022123336792, + "z": 0.021530797705054284, + "w": -0.9880359768867493 + } + } }, - "rotation": { - "x": -0.49786925315856936, - "y": 0.13922974467277528, - "z": -0.07507844269275665, - "w": -0.8527824878692627 - } - } - }, - { - "joint": "MiddleDistal", - "pose": { - "position": { - "x": 0.0013555703917518259, - "y": -0.01869615726172924, - "z": 0.09269960224628449 + { + "joint": 13, + "pose": { + "position": { + "x": 0.005449346732348204, + "y": 0.0031707696616649629, + "z": 0.08099328726530075 + }, + "rotation": { + "x": -0.49786925315856936, + "y": 0.13922974467277528, + "z": -0.07507844269275665, + "w": -0.8527824878692627 + } + } }, - "rotation": { - "x": -0.7163864970207214, - "y": 0.07041004300117493, - "z": -0.030646607279777528, - "w": -0.6939578652381897 - } - } - }, - { - "joint": "MiddleTip", - "pose": { - "position": { - "x": 0.0004728742642328143, - "y": -0.03479576110839844, - "z": 0.09213778376579285 + { + "joint": 14, + "pose": { + "position": { + "x": 0.0013555703917518259, + "y": -0.01869615726172924, + "z": 0.09269960224628449 + }, + "rotation": { + "x": -0.7163864970207214, + "y": 0.07041004300117493, + "z": -0.030646607279777528, + "w": -0.6939578652381897 + } + } }, - "rotation": { - "x": -0.7163864970207214, - "y": 0.07041004300117493, - "z": -0.030646607279777528, - "w": -0.6939578652381897 - } - } - }, - { - "joint": "RingMetacarpal", - "pose": { - "position": { - "x": 0.044932689517736438, - "y": -0.04016602039337158, - "z": 0.013597620651125908 + { + "joint": 15, + "pose": { + "position": { + "x": 0.0004728742642328143, + "y": -0.03479576110839844, + "z": 0.09213778376579285 + }, + "rotation": { + "x": -0.7163864970207214, + "y": 0.07041004300117493, + "z": -0.030646607279777528, + "w": -0.6939578652381897 + } + } }, - "rotation": { - "x": -0.3939853310585022, - "y": -0.10114617645740509, - "z": 0.016117071732878686, - "w": 0.9133923053741455 - } - } - }, - { - "joint": "RingProximal", - "pose": { - "position": { - "x": 0.03491469845175743, - "y": -0.003818823955953121, - "z": 0.047541361302137378 + { + "joint": 16, + "pose": { + "position": { + "x": 0.044932689517736438, + "y": -0.04016602039337158, + "z": 0.013597620651125908 + }, + "rotation": { + "x": -0.3939853310585022, + "y": -0.10114617645740509, + "z": 0.016117071732878686, + "w": 0.9133923053741455 + } + } }, - "rotation": { - "x": -0.11738020181655884, - "y": 0.15373656153678895, - "z": 0.05639626830816269, - "w": -0.9795019030570984 - } - } - }, - { - "joint": "RingIntermediate", - "pose": { - "position": { - "x": 0.023768775165081025, - "y": -0.01135534793138504, - "z": 0.08033758401870728 + { + "joint": 17, + "pose": { + "position": { + "x": 0.03491469845175743, + "y": -0.003818823955953121, + "z": 0.047541361302137378 + }, + "rotation": { + "x": -0.11738020181655884, + "y": 0.15373656153678895, + "z": 0.05639626830816269, + "w": -0.9795019030570984 + } + } }, - "rotation": { - "x": -0.7923092842102051, - "y": 0.16401034593582154, - "z": -0.02978098951280117, - "w": -0.5869977474212647 - } - } - }, - { - "joint": "RingDistal", - "pose": { - "position": { - "x": 0.02067880891263485, - "y": -0.031320542097091678, - "z": 0.0737735852599144 + { + "joint": 18, + "pose": { + "position": { + "x": 0.023768775165081025, + "y": -0.01135534793138504, + "z": 0.08033758401870728 + }, + "rotation": { + "x": -0.7923092842102051, + "y": 0.16401034593582154, + "z": -0.02978098951280117, + "w": -0.5869977474212647 + } + } }, - "rotation": { - "x": -0.9346709847450256, - "y": 0.0874316394329071, - "z": -0.023773543536663057, - "w": -0.344605952501297 - } - } - }, - { - "joint": "RingTip", - "pose": { - "position": { - "x": 0.020386409014463426, - "y": -0.04289411008358002, - "z": 0.06018315628170967 + { + "joint": 19, + "pose": { + "position": { + "x": 0.02067880891263485, + "y": -0.031320542097091678, + "z": 0.0737735852599144 + }, + "rotation": { + "x": -0.9346709847450256, + "y": 0.0874316394329071, + "z": -0.023773543536663057, + "w": -0.344605952501297 + } + } }, - "rotation": { - "x": -0.9346709847450256, - "y": 0.0874316394329071, - "z": -0.023773543536663057, - "w": -0.344605952501297 - } - } - }, - { - "joint": "LittleMetacarpal", - "pose": { - "position": { - "x": 0.05288681760430336, - "y": -0.041848354041576388, - "z": 0.01654883660376072 + { + "joint": 20, + "pose": { + "position": { + "x": 0.020386409014463426, + "y": -0.04289411008358002, + "z": 0.06018315628170967 + }, + "rotation": { + "x": -0.9346709847450256, + "y": 0.0874316394329071, + "z": -0.023773543536663057, + "w": -0.344605952501297 + } + } }, - "rotation": { - "x": -0.33144858479499819, - "y": 0.002071807160973549, - "z": 0.085218146443367, - "w": 0.9396145343780518 - } - } - }, - { - "joint": "LittleProximal", - "pose": { - "position": { - "x": 0.050300415605306628, - "y": -0.011202438734471798, - "z": 0.054917603731155398 + { + "joint": 21, + "pose": { + "position": { + "x": 0.05288681760430336, + "y": -0.041848354041576388, + "z": 0.01654883660376072 + }, + "rotation": { + "x": -0.33144858479499819, + "y": 0.002071807160973549, + "z": 0.085218146443367, + "w": 0.9396145343780518 + } + } }, - "rotation": { - "x": -0.16419324278831483, - "y": 0.1696346402168274, - "z": 0.12252454459667206, - "w": -0.9639865159988403 - } - } - }, - { - "joint": "LittleIntermediate", - "pose": { - "position": { - "x": 0.04166591167449951, - "y": -0.017666997388005258, - "z": 0.07580538094043732 + { + "joint": 22, + "pose": { + "position": { + "x": 0.050300415605306628, + "y": -0.011202438734471798, + "z": 0.054917603731155398 + }, + "rotation": { + "x": -0.16419324278831483, + "y": 0.1696346402168274, + "z": 0.12252454459667206, + "w": -0.9639865159988403 + } + } }, - "rotation": { - "x": -0.7474591135978699, - "y": 0.20672142505645753, - "z": 0.04626481607556343, - "w": -0.6297129392623901 - } - } - }, - { - "joint": "LittleDistal", - "pose": { - "position": { - "x": 0.03587989881634712, - "y": -0.03386271744966507, - "z": 0.0722469910979271 + { + "joint": 23, + "pose": { + "position": { + "x": 0.04166591167449951, + "y": -0.017666997388005258, + "z": 0.07580538094043732 + }, + "rotation": { + "x": -0.7474591135978699, + "y": 0.20672142505645753, + "z": 0.04626481607556343, + "w": -0.6297129392623901 + } + } }, - "rotation": { - "x": -0.928327202796936, - "y": 0.13445810973644257, - "z": 0.1272566169500351, - "w": -0.3232197165489197 - } - } - }, - { - "joint": "LittleTip", - "pose": { - "position": { - "x": 0.03135494887828827, - "y": -0.04178089275956154, - "z": 0.06164591759443283 + { + "joint": 24, + "pose": { + "position": { + "x": 0.03587989881634712, + "y": -0.03386271744966507, + "z": 0.0722469910979271 + }, + "rotation": { + "x": -0.928327202796936, + "y": 0.13445810973644257, + "z": 0.1272566169500351, + "w": -0.3232197165489197 + } + } }, - "rotation": { - "x": -0.928327202796936, - "y": 0.13445810973644257, - "z": 0.1272566169500351, - "w": -0.3232197165489197 + { + "joint": 25, + "pose": { + "position": { + "x": 0.03135494887828827, + "y": -0.04178089275956154, + "z": 0.06164591759443283 + }, + "rotation": { + "x": -0.928327202796936, + "y": 0.13445810973644257, + "z": 0.1272566169500351, + "w": -0.3232197165489197 + } + } } - } - } - ] + ] } \ No newline at end of file diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/ThumbsUpHandPoseData.json b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/ThumbsUpHandPoseData.json index c233008d..7f20400e 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/ThumbsUpHandPoseData.json +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/ThumbsUpHandPoseData.json @@ -1,420 +1,420 @@ { - "items": [ - { - "joint": "Wrist", - "pose": { - "position": { - "x": 0.08615099638700485, - "y": -0.024168234318494798, - "z": 0.034818120300769809 + "joints": [ + { + "joint": 0, + "pose": { + "position": { + "x": 0.08615099638700485, + "y": -0.024168234318494798, + "z": 0.034818120300769809 + }, + "rotation": { + "x": -0.24332590401172639, + "y": 0.6052875518798828, + "z": 0.5141062140464783, + "w": -0.5566452741622925 + } + } }, - "rotation": { - "x": -0.24332590401172639, - "y": 0.6052875518798828, - "z": 0.5141062140464783, - "w": -0.5566452741622925 - } - } - }, - { - "joint": "Palm", - "pose": { - "position": { - "x": 0.03520287200808525, - "y": -0.010816145688295365, - "z": 0.04648737236857414 + { + "joint": 1, + "pose": { + "position": { + "x": 0.03520287200808525, + "y": -0.010816145688295365, + "z": 0.04648737236857414 + }, + "rotation": { + "x": -0.24332590401172639, + "y": 0.6052875518798828, + "z": 0.5141062140464783, + "w": -0.5566452741622925 + } + } }, - "rotation": { - "x": -0.24332590401172639, - "y": 0.6052875518798828, - "z": 0.5141062140464783, - "w": -0.5566452741622925 - } - } - }, - { - "joint": "ThumbMetacarpal", - "pose": { - "position": { - "x": 0.06692907959222794, - "y": -0.0030839829705655576, - "z": 0.020349422469735147 + { + "joint": 2, + "pose": { + "position": { + "x": 0.06692907959222794, + "y": -0.0030839829705655576, + "z": 0.020349422469735147 + }, + "rotation": { + "x": 0.39406728744506838, + "y": 0.7213952541351318, + "z": 0.33115363121032717, + "w": -0.46385547518730166 + } + } }, - "rotation": { - "x": 0.39406728744506838, - "y": 0.7213952541351318, - "z": 0.33115363121032717, - "w": -0.46385547518730166 - } - } - }, - { - "joint": "ThumbProximal", - "pose": { - "position": { - "x": 0.048644911497831348, - "y": 0.034663256257772449, - "z": 0.004639927297830582 + { + "joint": 3, + "pose": { + "position": { + "x": 0.048644911497831348, + "y": 0.034663256257772449, + "z": 0.004639927297830582 + }, + "rotation": { + "x": 0.34302714467048647, + "y": 0.719179630279541, + "z": 0.2980014383792877, + "w": -0.5261238217353821 + } + } }, - "rotation": { - "x": 0.34302714467048647, - "y": 0.719179630279541, - "z": 0.2980014383792877, - "w": -0.5261238217353821 - } - } - }, - { - "joint": "ThumbDistal", - "pose": { - "position": { - "x": 0.030924495309591295, - "y": 0.05998371168971062, - "z": -0.004000300541520119 + { + "joint": 4, + "pose": { + "position": { + "x": 0.030924495309591295, + "y": 0.05998371168971062, + "z": -0.004000300541520119 + }, + "rotation": { + "x": 0.4403221607208252, + "y": 0.6942930817604065, + "z": 0.3865111470222473, + "w": -0.4186002314090729 + } + } }, - "rotation": { - "x": 0.4403221607208252, - "y": 0.6942930817604065, - "z": 0.3865111470222473, - "w": -0.4186002314090729 - } - } - }, - { - "joint": "ThumbTip", - "pose": { - "position": { - "x": 0.02607334591448307, - "y": 0.07819978147745133, - "z": -0.011070644482970238 + { + "joint": 5, + "pose": { + "position": { + "x": 0.02607334591448307, + "y": 0.07819978147745133, + "z": -0.011070644482970238 + }, + "rotation": { + "x": 0.4403221607208252, + "y": 0.6942930817604065, + "z": 0.3865111470222473, + "w": -0.4186002314090729 + } + } }, - "rotation": { - "x": 0.4403221607208252, - "y": 0.6942930817604065, - "z": 0.3865111470222473, - "w": -0.4186002314090729 - } - } - }, - { - "joint": "IndexMetacarpal", - "pose": { - "position": { - "x": 0.06430374830961228, - "y": -0.01019766554236412, - "z": 0.02929815649986267 + { + "joint": 6, + "pose": { + "position": { + "x": 0.06430374830961228, + "y": -0.01019766554236412, + "z": 0.02929815649986267 + }, + "rotation": { + "x": -0.22792501747608186, + "y": 0.6316274404525757, + "z": 0.5866482257843018, + "w": -0.45270389318466189 + } + } }, - "rotation": { - "x": -0.22792501747608186, - "y": 0.6316274404525757, - "z": 0.5866482257843018, - "w": -0.45270389318466189 - } - } - }, - { - "joint": "IndexProximal", - "pose": { - "position": { - "x": 0.011573880910873413, - "y": 0.02339656837284565, - "z": 0.03546718880534172 + { + "joint": 7, + "pose": { + "position": { + "x": 0.011573880910873413, + "y": 0.02339656837284565, + "z": 0.03546718880534172 + }, + "rotation": { + "x": 0.3942926526069641, + "y": -0.7424762845039368, + "z": -0.21414896845817567, + "w": 0.49741214513778689 + } + } }, - "rotation": { - "x": 0.3942926526069641, - "y": -0.7424762845039368, - "z": -0.21414896845817567, - "w": 0.49741214513778689 - } - } - }, - { - "joint": "IndexIntermediate", - "pose": { - "position": { - "x": -0.021892068907618524, - "y": 0.020658958703279496, - "z": 0.020219745114445688 - }, - "rotation": { - "x": 0.5834210515022278, - "y": -0.7061115503311157, - "z": 0.3634859323501587, - "w": 0.17027443647384644 - } - } - }, - { - "joint": "IndexDistal", - "pose": { - "position": { - "x": -0.017463261261582376, - "y": 0.00348295527510345, - "z": 0.0038637774996459486 + { + "joint": 8, + "pose": { + "position": { + "x": -0.021892068907618524, + "y": 0.020658958703279496, + "z": 0.020219745114445688 + }, + "rotation": { + "x": 0.5834210515022278, + "y": -0.7061115503311157, + "z": 0.3634859323501587, + "w": 0.17027443647384644 + } + } }, - "rotation": { - "x": 0.6371655464172363, - "y": -0.4360961318016052, - "z": 0.6206539869308472, - "w": -0.13840782642364503 - } - } - }, - { - "joint": "IndexTip", - "pose": { - "position": { - "x": -0.001938387518748641, - "y": -0.0027357139624655248, - "z": 0.0005815188633278012 + { + "joint": 9, + "pose": { + "position": { + "x": -0.017463261261582376, + "y": 0.00348295527510345, + "z": 0.0038637774996459486 + }, + "rotation": { + "x": 0.6371655464172363, + "y": -0.4360961318016052, + "z": 0.6206539869308472, + "w": -0.13840782642364503 + } + } }, - "rotation": { - "x": 0.6371655464172363, - "y": -0.4360961318016052, - "z": 0.6206539869308472, - "w": -0.13840782642364503 - } - } - }, - { - "joint": "MiddleMetacarpal", - "pose": { - "position": { - "x": 0.06397924572229386, - "y": -0.016921602189540864, - "z": 0.03521520271897316 + { + "joint": 10, + "pose": { + "position": { + "x": -0.001938387518748641, + "y": -0.0027357139624655248, + "z": 0.0005815188633278012 + }, + "rotation": { + "x": 0.6371655464172363, + "y": -0.4360961318016052, + "z": 0.6206539869308472, + "w": -0.13840782642364503 + } + } }, - "rotation": { - "x": -0.16760338842868806, - "y": 0.5928976535797119, - "z": 0.5015624761581421, - "w": -0.6073026657104492 - } - } - }, - { - "joint": "MiddleProximal", - "pose": { - "position": { - "x": 0.01083554606884718, - "y": 0.006482137367129326, - "z": 0.049619730561971667 + { + "joint": 11, + "pose": { + "position": { + "x": 0.06397924572229386, + "y": -0.016921602189540864, + "z": 0.03521520271897316 + }, + "rotation": { + "x": -0.16760338842868806, + "y": 0.5928976535797119, + "z": 0.5015624761581421, + "w": -0.6073026657104492 + } + } }, - "rotation": { - "x": 0.5027921199798584, - "y": -0.7059369087219238, - "z": -0.16476257145404817, - "w": 0.4708792269229889 - } - } - }, - { - "joint": "MiddleIntermediate", - "pose": { - "position": { - "x": -0.025254713371396066, - "y": -0.003984889946877956, - "z": 0.02779259905219078 + { + "joint": 12, + "pose": { + "position": { + "x": 0.01083554606884718, + "y": 0.006482137367129326, + "z": 0.049619730561971667 + }, + "rotation": { + "x": 0.5027921199798584, + "y": -0.7059369087219238, + "z": -0.16476257145404817, + "w": 0.4708792269229889 + } + } }, - "rotation": { - "x": 0.6809582710266113, - "y": -0.6233372688293457, - "z": 0.3824990391731262, - "w": -0.039771441370248798 - } - } - }, - { - "joint": "MiddleDistal", - "pose": { - "position": { - "x": -0.00917090568691492, - "y": -0.015904264524579049, - "z": 0.007921875454485417 + { + "joint": 13, + "pose": { + "position": { + "x": -0.025254713371396066, + "y": -0.003984889946877956, + "z": 0.02779259905219078 + }, + "rotation": { + "x": 0.6809582710266113, + "y": -0.6233372688293457, + "z": 0.3824990391731262, + "w": -0.039771441370248798 + } + } }, - "rotation": { - "x": 0.6229440569877625, - "y": -0.2391648292541504, - "z": 0.642637312412262, - "w": -0.37781840562820437 - } - } - }, - { - "joint": "MiddleTip", - "pose": { - "position": { - "x": 0.008252275176346302, - "y": -0.013008372858166695, - "z": 0.009888304397463799 + { + "joint": 14, + "pose": { + "position": { + "x": -0.00917090568691492, + "y": -0.015904264524579049, + "z": 0.007921875454485417 + }, + "rotation": { + "x": 0.6229440569877625, + "y": -0.2391648292541504, + "z": 0.642637312412262, + "w": -0.37781840562820437 + } + } }, - "rotation": { - "x": 0.6229440569877625, - "y": -0.2391648292541504, - "z": 0.642637312412262, - "w": -0.37781840562820437 - } - } - }, - { - "joint": "RingMetacarpal", - "pose": { - "position": { - "x": 0.06303475052118302, - "y": -0.02612213045358658, - "z": 0.04269380867481232 + { + "joint": 15, + "pose": { + "position": { + "x": 0.008252275176346302, + "y": -0.013008372858166695, + "z": 0.009888304397463799 + }, + "rotation": { + "x": 0.6229440569877625, + "y": -0.2391648292541504, + "z": 0.642637312412262, + "w": -0.37781840562820437 + } + } }, - "rotation": { - "x": -0.18103565275669099, - "y": 0.5941647887229919, - "z": 0.39771339297294619, - "w": -0.6752913594245911 - } - } - }, - { - "joint": "RingProximal", - "pose": { - "position": { - "x": 0.010207276791334153, - "y": -0.013390008360147477, - "z": 0.055441394448280337 + { + "joint": 16, + "pose": { + "position": { + "x": 0.06303475052118302, + "y": -0.02612213045358658, + "z": 0.04269380867481232 + }, + "rotation": { + "x": -0.18103565275669099, + "y": 0.5941647887229919, + "z": 0.39771339297294619, + "w": -0.6752913594245911 + } + } }, - "rotation": { - "x": 0.5632884502410889, - "y": -0.6713510751724243, - "z": -0.15870888531208039, - "w": 0.45477786660194399 - } - } - }, - { - "joint": "RingIntermediate", - "pose": { - "position": { - "x": -0.01994304731488228, - "y": -0.024818312376737596, - "z": 0.03496982902288437 + { + "joint": 17, + "pose": { + "position": { + "x": 0.010207276791334153, + "y": -0.013390008360147477, + "z": 0.055441394448280337 + }, + "rotation": { + "x": 0.5632884502410889, + "y": -0.6713510751724243, + "z": -0.15870888531208039, + "w": 0.45477786660194399 + } + } }, - "rotation": { - "x": 0.7331446409225464, - "y": -0.5462665557861328, - "z": 0.3692132830619812, - "w": -0.16697438061237336 - } - } - }, - { - "joint": "RingDistal", - "pose": { - "position": { - "x": -0.0031065356452018024, - "y": -0.028507214039564134, - "z": 0.019337791949510576 + { + "joint": 18, + "pose": { + "position": { + "x": -0.01994304731488228, + "y": -0.024818312376737596, + "z": 0.03496982902288437 + }, + "rotation": { + "x": 0.7331446409225464, + "y": -0.5462665557861328, + "z": 0.3692132830619812, + "w": -0.16697438061237336 + } + } }, - "rotation": { - "x": 0.6351615786552429, - "y": -0.23133434355258943, - "z": 0.5935887098312378, - "w": -0.43731656670570376 - } - } - }, - { - "joint": "RingTip", - "pose": { - "position": { - "x": 0.015546157956123352, - "y": -0.023027585819363595, - "z": 0.021024812012910844 + { + "joint": 19, + "pose": { + "position": { + "x": -0.0031065356452018024, + "y": -0.028507214039564134, + "z": 0.019337791949510576 + }, + "rotation": { + "x": 0.6351615786552429, + "y": -0.23133434355258943, + "z": 0.5935887098312378, + "w": -0.43731656670570376 + } + } }, - "rotation": { - "x": 0.6351615786552429, - "y": -0.23133434355258943, - "z": 0.5935887098312378, - "w": -0.43731656670570376 - } - } - }, - { - "joint": "LittleMetacarpal", - "pose": { - "position": { - "x": 0.06254640221595764, - "y": -0.034929849207401279, - "z": 0.04593820124864578 + { + "joint": 20, + "pose": { + "position": { + "x": 0.015546157956123352, + "y": -0.023027585819363595, + "z": 0.021024812012910844 + }, + "rotation": { + "x": 0.6351615786552429, + "y": -0.23133434355258943, + "z": 0.5935887098312378, + "w": -0.43731656670570376 + } + } }, - "rotation": { - "x": -0.19249169528484345, - "y": 0.581859290599823, - "z": 0.2601516842842102, - "w": -0.7461285591125488 - } - } - }, - { - "joint": "LittleProximal", - "pose": { - "position": { - "x": 0.009921858087182045, - "y": -0.03408779203891754, - "z": 0.05945640057325363 + { + "joint": 21, + "pose": { + "position": { + "x": 0.06254640221595764, + "y": -0.034929849207401279, + "z": 0.04593820124864578 + }, + "rotation": { + "x": -0.19249169528484345, + "y": 0.581859290599823, + "z": 0.2601516842842102, + "w": -0.7461285591125488 + } + } }, - "rotation": { - "x": 0.6286200881004334, - "y": -0.6190594434738159, - "z": -0.18423764407634736, - "w": 0.43321672081947329 - } - } - }, - { - "joint": "LittleIntermediate", - "pose": { - "position": { - "x": -0.007876850664615631, - "y": -0.041423700749874118, - "z": 0.04655241593718529 + { + "joint": 22, + "pose": { + "position": { + "x": 0.009921858087182045, + "y": -0.03408779203891754, + "z": 0.05945640057325363 + }, + "rotation": { + "x": 0.6286200881004334, + "y": -0.6190594434738159, + "z": -0.18423764407634736, + "w": 0.43321672081947329 + } + } }, - "rotation": { - "x": 0.7744045257568359, - "y": -0.5470465421676636, - "z": 0.2698802649974823, - "w": -0.1682688444852829 - } - } - }, - { - "joint": "LittleDistal", - "pose": { - "position": { - "x": 0.0036155348643660547, - "y": -0.042087383568286899, - "z": 0.03132062032818794 + { + "joint": 23, + "pose": { + "position": { + "x": -0.007876850664615631, + "y": -0.041423700749874118, + "z": 0.04655241593718529 + }, + "rotation": { + "x": 0.7744045257568359, + "y": -0.5470465421676636, + "z": 0.2698802649974823, + "w": -0.1682688444852829 + } + } }, - "rotation": { - "x": 0.7368069291114807, - "y": -0.19751593470573426, - "z": 0.4435950815677643, - "w": -0.47120407223701479 - } - } - }, - { - "joint": "LittleTip", - "pose": { - "position": { - "x": 0.016652610152959825, - "y": -0.034032851457595828, - "z": 0.02879030816257 + { + "joint": 24, + "pose": { + "position": { + "x": 0.0036155348643660547, + "y": -0.042087383568286899, + "z": 0.03132062032818794 + }, + "rotation": { + "x": 0.7368069291114807, + "y": -0.19751593470573426, + "z": 0.4435950815677643, + "w": -0.47120407223701479 + } + } }, - "rotation": { - "x": 0.7368069291114807, - "y": -0.19751593470573426, - "z": 0.4435950815677643, - "w": -0.47120407223701479 + { + "joint": 25, + "pose": { + "position": { + "x": 0.016652610152959825, + "y": -0.034032851457595828, + "z": 0.02879030816257 + }, + "rotation": { + "x": 0.7368069291114807, + "y": -0.19751593470573426, + "z": 0.4435950815677643, + "w": -0.47120407223701479 + } + } } - } - } - ] + ] } \ No newline at end of file diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/VictoryHandPoseData.json b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/VictoryHandPoseData.json index 6fb9692c..d88bb5e8 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/VictoryHandPoseData.json +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/VictoryHandPoseData.json @@ -1,420 +1,420 @@ { - "items": [ - { - "joint": "Wrist", - "pose": { - "position": { - "x": 0.07915662229061127, - "y": -0.13887012004852296, - "z": -0.010340530425310135 + "joints": [ + { + "joint": 0, + "pose": { + "position": { + "x": 0.07915662229061127, + "y": -0.13887012004852296, + "z": -0.010340530425310135 + }, + "rotation": { + "x": -0.5914298295974731, + "y": -0.2676140367984772, + "z": -0.06283169984817505, + "w": 0.7577439546585083 + } + } }, - "rotation": { - "x": -0.5914298295974731, - "y": -0.2676140367984772, - "z": -0.06283169984817505, - "w": 0.7577439546585083 - } - } - }, - { - "joint": "Palm", - "pose": { - "position": { - "x": 0.06830108910799027, - "y": -0.09366560727357865, - "z": -0.0000256318598985672 + { + "joint": 1, + "pose": { + "position": { + "x": 0.06830108910799027, + "y": -0.09366560727357865, + "z": -0.0000256318598985672 + }, + "rotation": { + "x": -0.5914298295974731, + "y": -0.2676140367984772, + "z": -0.06283169984817505, + "w": 0.7577439546585083 + } + } }, - "rotation": { - "x": -0.5914298295974731, - "y": -0.2676140367984772, - "z": -0.06283169984817505, - "w": 0.7577439546585083 - } - } - }, - { - "joint": "ThumbMetacarpal", - "pose": { - "position": { - "x": 0.05787024274468422, - "y": -0.12883375585079194, - "z": -0.005382232367992401 + { + "joint": 2, + "pose": { + "position": { + "x": 0.05787024274468422, + "y": -0.12883375585079194, + "z": -0.005382232367992401 + }, + "rotation": { + "x": 0.4801919758319855, + "y": -0.04491055756807327, + "z": -0.7443504333496094, + "w": -0.4627794027328491 + } + } }, - "rotation": { - "x": 0.4801919758319855, - "y": -0.04491055756807327, - "z": -0.7443504333496094, - "w": -0.4627794027328491 - } - } - }, - { - "joint": "ThumbProximal", - "pose": { - "position": { - "x": 0.030012525618076326, - "y": -0.10770050436258316, - "z": 0.016813457012176515 + { + "joint": 3, + "pose": { + "position": { + "x": 0.030012525618076326, + "y": -0.10770050436258316, + "z": 0.016813457012176515 + }, + "rotation": { + "x": 0.312323659658432, + "y": -0.2742984890937805, + "z": -0.6935320496559143, + "w": -0.5894817113876343 + } + } }, - "rotation": { - "x": 0.312323659658432, - "y": -0.2742984890937805, - "z": -0.6935320496559143, - "w": -0.5894817113876343 - } - } - }, - { - "joint": "ThumbDistal", - "pose": { - "position": { - "x": 0.026396021246910096, - "y": -0.08305369317531586, - "z": 0.03835996612906456 + { + "joint": 4, + "pose": { + "position": { + "x": 0.026396021246910096, + "y": -0.08305369317531586, + "z": 0.03835996612906456 + }, + "rotation": { + "x": 0.26157766580581667, + "y": -0.3302468955516815, + "z": -0.6686716675758362, + "w": -0.6136223673820496 + } + } }, - "rotation": { - "x": 0.26157766580581667, - "y": -0.3302468955516815, - "z": -0.6686716675758362, - "w": -0.6136223673820496 - } - } - }, - { - "joint": "ThumbTip", - "pose": { - "position": { - "x": 0.027343440800905229, - "y": -0.07000578194856644, - "z": 0.04939644783735275 + { + "joint": 5, + "pose": { + "position": { + "x": 0.027343440800905229, + "y": -0.07000578194856644, + "z": 0.04939644783735275 + }, + "rotation": { + "x": 0.26157766580581667, + "y": -0.3302468955516815, + "z": -0.6686716675758362, + "w": -0.6136223673820496 + } + } }, - "rotation": { - "x": 0.26157766580581667, - "y": -0.3302468955516815, - "z": -0.6686716675758362, - "w": -0.6136223673820496 - } - } - }, - { - "joint": "IndexMetacarpal", - "pose": { - "position": { - "x": 0.06611358374357224, - "y": -0.12426556646823883, - "z": -0.0055283233523368839 + { + "joint": 6, + "pose": { + "position": { + "x": 0.06611358374357224, + "y": -0.12426556646823883, + "z": -0.0055283233523368839 + }, + "rotation": { + "x": -0.5613270998001099, + "y": -0.42208683490753176, + "z": -0.06766947358846665, + "w": 0.7086432576179504 + } + } }, - "rotation": { - "x": -0.5613270998001099, - "y": -0.42208683490753176, - "z": -0.06766947358846665, - "w": 0.7086432576179504 - } - } - }, - { - "joint": "IndexProximal", - "pose": { - "position": { - "x": 0.034438081085681918, - "y": -0.0725482851266861, - "z": -0.004708992317318916 + { + "joint": 7, + "pose": { + "position": { + "x": 0.034438081085681918, + "y": -0.0725482851266861, + "z": -0.004708992317318916 + }, + "rotation": { + "x": -0.6286489963531494, + "y": -0.2787279188632965, + "z": 0.040076885372400287, + "w": 0.7249277830123901 + } + } }, - "rotation": { - "x": -0.6286489963531494, - "y": -0.2787279188632965, - "z": 0.040076885372400287, - "w": 0.7249277830123901 - } - } - }, - { - "joint": "IndexIntermediate", - "pose": { - "position": { - "x": 0.015563697554171086, - "y": -0.03562714159488678, - "z": -0.0024565430358052255 - }, - "rotation": { - "x": -0.6645650863647461, - "y": -0.2075067013502121, - "z": 0.10458821058273316, - "w": 0.7102522253990173 - } - } - }, - { - "joint": "IndexDistal", - "pose": { - "position": { - "x": 0.005756473168730736, - "y": -0.015270628966391087, - "z": -0.0017626225017011166 + { + "joint": 8, + "pose": { + "position": { + "x": 0.015563697554171086, + "y": -0.03562714159488678, + "z": -0.0024565430358052255 + }, + "rotation": { + "x": -0.6645650863647461, + "y": -0.2075067013502121, + "z": 0.10458821058273316, + "w": 0.7102522253990173 + } + } }, - "rotation": { - "x": -0.6223592162132263, - "y": -0.24349386990070344, - "z": 0.01842544600367546, - "w": 0.7439839839935303 - } - } - }, - { - "joint": "IndexTip", - "pose": { - "position": { - "x": 0.00011674128472805023, - "y": -0.0018588211387395859, - "z": -0.00020025699632242322 + { + "joint": 9, + "pose": { + "position": { + "x": 0.005756473168730736, + "y": -0.015270628966391087, + "z": -0.0017626225017011166 + }, + "rotation": { + "x": -0.6223592162132263, + "y": -0.24349386990070344, + "z": 0.01842544600367546, + "w": 0.7439839839935303 + } + } }, - "rotation": { - "x": -0.6223592162132263, - "y": -0.24349386990070344, - "z": 0.01842544600367546, - "w": 0.7439839839935303 - } - } - }, - { - "joint": "MiddleMetacarpal", - "pose": { - "position": { - "x": 0.07268297672271729, - "y": -0.12254584580659867, - "z": -0.004201311618089676 + { + "joint": 10, + "pose": { + "position": { + "x": 0.00011674128472805023, + "y": -0.0018588211387395859, + "z": -0.00020025699632242322 + }, + "rotation": { + "x": -0.6223592162132263, + "y": -0.24349386990070344, + "z": 0.01842544600367546, + "w": 0.7439839839935303 + } + } }, - "rotation": { - "x": -0.6534333825111389, - "y": -0.22906279563903809, - "z": -0.018352244049310685, - "w": 0.7212615013122559 - } - } - }, - { - "joint": "MiddleProximal", - "pose": { - "position": { - "x": 0.054447855800390246, - "y": -0.06595612317323685, - "z": -0.0017550308257341385 + { + "joint": 11, + "pose": { + "position": { + "x": 0.07268297672271729, + "y": -0.12254584580659867, + "z": -0.004201311618089676 + }, + "rotation": { + "x": -0.6534333825111389, + "y": -0.22906279563903809, + "z": -0.018352244049310685, + "w": 0.7212615013122559 + } + } }, - "rotation": { - "x": -0.5899049043655396, - "y": -0.16088859736919404, - "z": -0.018363818526268007, - "w": 0.7910826206207275 - } - } - }, - { - "joint": "MiddleIntermediate", - "pose": { - "position": { - "x": 0.04355549067258835, - "y": -0.022029317915439607, - "z": 0.010043984279036522 + { + "joint": 12, + "pose": { + "position": { + "x": 0.054447855800390246, + "y": -0.06595612317323685, + "z": -0.0017550308257341385 + }, + "rotation": { + "x": -0.5899049043655396, + "y": -0.16088859736919404, + "z": -0.018363818526268007, + "w": 0.7910826206207275 + } + } }, - "rotation": { - "x": -0.6020974516868591, - "y": -0.14070262014865876, - "z": -0.036361001431941989, - "w": 0.7852000594139099 - } - } - }, - { - "joint": "MiddleDistal", - "pose": { - "position": { - "x": 0.03923114016652107, - "y": 0.0012873951345682145, - "z": 0.015791211277246476 + { + "joint": 13, + "pose": { + "position": { + "x": 0.04355549067258835, + "y": -0.022029317915439607, + "z": 0.010043984279036522 + }, + "rotation": { + "x": -0.6020974516868591, + "y": -0.14070262014865876, + "z": -0.036361001431941989, + "w": 0.7852000594139099 + } + } }, - "rotation": { - "x": -0.5366969108581543, - "y": -0.17153941094875337, - "z": -0.09987709671258927, - "w": 0.8206644058227539 - } - } - }, - { - "joint": "MiddleTip", - "pose": { - "position": { - "x": 0.03647539019584656, - "y": 0.015714645385742189, - "z": 0.021557386964559556 + { + "joint": 14, + "pose": { + "position": { + "x": 0.03923114016652107, + "y": 0.0012873951345682145, + "z": 0.015791211277246476 + }, + "rotation": { + "x": -0.5366969108581543, + "y": -0.17153941094875337, + "z": -0.09987709671258927, + "w": 0.8206644058227539 + } + } }, - "rotation": { - "x": -0.5366969108581543, - "y": -0.17153941094875337, - "z": -0.09987709671258927, - "w": 0.8206644058227539 - } - } - }, - { - "joint": "RingMetacarpal", - "pose": { - "position": { - "x": 0.08137646317481995, - "y": -0.11985518038272858, - "z": -0.00190657377243042 + { + "joint": 15, + "pose": { + "position": { + "x": 0.03647539019584656, + "y": 0.015714645385742189, + "z": 0.021557386964559556 + }, + "rotation": { + "x": -0.5366969108581543, + "y": -0.17153941094875337, + "z": -0.09987709671258927, + "w": 0.8206644058227539 + } + } }, - "rotation": { - "x": -0.6267969012260437, - "y": -0.10518965870141983, - "z": 0.02498382329940796, - "w": 0.7716453075408936 - } - } - }, - { - "joint": "RingProximal", - "pose": { - "position": { - "x": 0.07067620009183884, - "y": -0.06669728457927704, - "z": 0.008708799257874489 + { + "joint": 16, + "pose": { + "position": { + "x": 0.08137646317481995, + "y": -0.11985518038272858, + "z": -0.00190657377243042 + }, + "rotation": { + "x": -0.6267969012260437, + "y": -0.10518965870141983, + "z": 0.02498382329940796, + "w": 0.7716453075408936 + } + } }, - "rotation": { - "x": 0.40646883845329287, - "y": 0.1807955503463745, - "z": 0.030094729736447336, - "w": -0.8951042294502258 - } - } - }, - { - "joint": "RingIntermediate", - "pose": { - "position": { - "x": 0.060088954865932468, - "y": -0.04056686535477638, - "z": 0.03008754923939705 + { + "joint": 17, + "pose": { + "position": { + "x": 0.07067620009183884, + "y": -0.06669728457927704, + "z": 0.008708799257874489 + }, + "rotation": { + "x": 0.40646883845329287, + "y": 0.1807955503463745, + "z": 0.030094729736447336, + "w": -0.8951042294502258 + } + } }, - "rotation": { - "x": -0.2107616662979126, - "y": 0.18913404643535615, - "z": -0.04620787873864174, - "w": -0.9580028653144836 - } - } - }, - { - "joint": "RingDistal", - "pose": { - "position": { - "x": 0.0528024360537529, - "y": -0.0495174415409565, - "z": 0.047927625477313998 + { + "joint": 18, + "pose": { + "position": { + "x": 0.060088954865932468, + "y": -0.04056686535477638, + "z": 0.03008754923939705 + }, + "rotation": { + "x": -0.2107616662979126, + "y": 0.18913404643535615, + "z": -0.04620787873864174, + "w": -0.9580028653144836 + } + } }, - "rotation": { - "x": -0.449715256690979, - "y": 0.15903393924236298, - "z": -0.020673276856541635, - "w": -0.8789007067680359 - } - } - }, - { - "joint": "RingTip", - "pose": { - "position": { - "x": 0.048170287162065509, - "y": -0.06364263594150543, - "z": 0.05758979544043541 + { + "joint": 19, + "pose": { + "position": { + "x": 0.0528024360537529, + "y": -0.0495174415409565, + "z": 0.047927625477313998 + }, + "rotation": { + "x": -0.449715256690979, + "y": 0.15903393924236298, + "z": -0.020673276856541635, + "w": -0.8789007067680359 + } + } }, - "rotation": { - "x": -0.449715256690979, - "y": 0.15903393924236298, - "z": -0.020673276856541635, - "w": -0.8789007067680359 - } - } - }, - { - "joint": "LittleMetacarpal", - "pose": { - "position": { - "x": 0.08909709751605988, - "y": -0.11985252797603607, - "z": 0.001964922994375229 + { + "joint": 20, + "pose": { + "position": { + "x": 0.048170287162065509, + "y": -0.06364263594150543, + "z": 0.05758979544043541 + }, + "rotation": { + "x": -0.449715256690979, + "y": 0.15903393924236298, + "z": -0.020673276856541635, + "w": -0.8789007067680359 + } + } }, - "rotation": { - "x": -0.5780324339866638, - "y": -0.0013396204449236394, - "z": 0.06318691372871399, - "w": 0.8135625720024109 - } - } - }, - { - "joint": "LittleProximal", - "pose": { - "position": { - "x": 0.0851951465010643, - "y": -0.07107751816511154, - "z": 0.019172409549355508 + { + "joint": 21, + "pose": { + "position": { + "x": 0.08909709751605988, + "y": -0.11985252797603607, + "z": 0.001964922994375229 + }, + "rotation": { + "x": -0.5780324339866638, + "y": -0.0013396204449236394, + "z": 0.06318691372871399, + "w": 0.8135625720024109 + } + } }, - "rotation": { - "x": 0.31776368618011477, - "y": 0.2502634525299072, - "z": 0.05463750660419464, - "w": -0.9129235744476318 - } - } - }, - { - "joint": "LittleIntermediate", - "pose": { - "position": { - "x": 0.07433749735355377, - "y": -0.055455759167671207, - "z": 0.03647337108850479 + { + "joint": 22, + "pose": { + "position": { + "x": 0.0851951465010643, + "y": -0.07107751816511154, + "z": 0.019172409549355508 + }, + "rotation": { + "x": 0.31776368618011477, + "y": 0.2502634525299072, + "z": 0.05463750660419464, + "w": -0.9129235744476318 + } + } }, - "rotation": { - "x": -0.17528946697711945, - "y": 0.2344343513250351, - "z": 0.019245747476816179, - "w": -0.9560556411743164 - } - } - }, - { - "joint": "LittleDistal", - "pose": { - "position": { - "x": 0.06645255535840988, - "y": -0.06111001968383789, - "z": 0.050835996866226199 + { + "joint": 23, + "pose": { + "position": { + "x": 0.07433749735355377, + "y": -0.055455759167671207, + "z": 0.03647337108850479 + }, + "rotation": { + "x": -0.17528946697711945, + "y": 0.2344343513250351, + "z": 0.019245747476816179, + "w": -0.9560556411743164 + } + } }, - "rotation": { - "x": -0.4488738477230072, - "y": 0.26990553736686709, - "z": 0.08396486192941666, - "w": -0.8479632139205933 - } - } - }, - { - "joint": "LittleTip", - "pose": { - "position": { - "x": 0.05911727994680405, - "y": -0.07095448672771454, - "z": 0.05705229192972183 + { + "joint": 24, + "pose": { + "position": { + "x": 0.06645255535840988, + "y": -0.06111001968383789, + "z": 0.050835996866226199 + }, + "rotation": { + "x": -0.4488738477230072, + "y": 0.26990553736686709, + "z": 0.08396486192941666, + "w": -0.8479632139205933 + } + } }, - "rotation": { - "x": -0.4488738477230072, - "y": 0.26990553736686709, - "z": 0.08396486192941666, - "w": -0.8479632139205933 + { + "joint": 25, + "pose": { + "position": { + "x": 0.05911727994680405, + "y": -0.07095448672771454, + "z": 0.05705229192972183 + }, + "rotation": { + "x": -0.4488738477230072, + "y": 0.26990553736686709, + "z": 0.08396486192941666, + "w": -0.8479632139205933 + } + } } - } - } - ] + ] } \ No newline at end of file diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/Input/HandDataRecorder.cs b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/Input/HandDataRecorder.cs index 152632ff..9fa9e22d 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/Input/HandDataRecorder.cs +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/Input/HandDataRecorder.cs @@ -10,11 +10,13 @@ namespace XRTK.SDK.Input { /// - /// Utilitiy component to record a hand controller's data into a file. + /// Utility component to record a hand controller's data into a file. /// public class HandDataRecorder : InputSystemGlobalListener, IMixedRealityInputHandler { private RecordedHandJoints currentRecording; + RecordedHandJoints recordedHandJoints = new RecordedHandJoints(); + RecordedHandJoint[] jointPoses = new RecordedHandJoint[HandData.JointCount]; [SerializeField] [Tooltip("The handedness of the hand to record data for.")] @@ -26,35 +28,29 @@ public class HandDataRecorder : InputSystemGlobalListener, IMixedRealityInputHan private void Update() { - if (currentRecording != null && UnityEngine.Input.GetKeyDown(saveRecordingKey)) + // TODO Update this to use an action instead of raw keyboard input + if (currentRecording != null && UnityEngine.Input.GetKeyUp(saveRecordingKey)) { + // TODO dump to XRTK.Generated/Recorded Poses? Debug.Log(JsonUtility.ToJson(currentRecording)); } } + /// public void OnInputChanged(InputEventData eventData) { -#if UNITY_EDITOR - if (targetHandedness != eventData.Handedness) { return; } - var handData = eventData.InputData; - var recordedHandJoints = new RecordedHandJoints(); - var jointPoses = new RecordedHandJoint[HandData.JointCount]; - for (int i = 0; i < HandData.JointCount; i++) { - var jointPose = handData.Joints[i]; - jointPoses[i] = new RecordedHandJoint((TrackedHandJoint)i, jointPose); + jointPoses[i] = new RecordedHandJoint((TrackedHandJoint)i, eventData.InputData.Joints[i]); } - recordedHandJoints.items = jointPoses; + recordedHandJoints.Joints = jointPoses; currentRecording = recordedHandJoints; - -#endif } } } diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandNearPointer.cs b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandNearPointer.cs index 56c79899..492b3c5e 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandNearPointer.cs +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandNearPointer.cs @@ -39,7 +39,7 @@ public override void OnInputChanged(InputEventData eventData) // This pointer type must only be used with hand controllers. if (!(Controller is IMixedRealityHandController handController)) { - Debug.LogError($"{typeof(HandNearPointer).Name} is only for use with {typeof(IMixedRealityHandController).Name} controllers!", this); + Debug.LogError($"{nameof(HandNearPointer)} is only for use with {nameof(IMixedRealityHandController)} controllers!", this); return; } From fc3020ab8ef6cca64f6910e391d26d6f8217a7de Mon Sep 17 00:00:00 2001 From: Dino Fejzagic Date: Thu, 28 May 2020 12:07:31 +0200 Subject: [PATCH 55/78] Fix NRE in case tip prefab does not have a renderer --- .../Controllers/Hands/HandControllerJointsVisualizer.cs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/HandControllerJointsVisualizer.cs b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/HandControllerJointsVisualizer.cs index 20731aaa..dfed3616 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/HandControllerJointsVisualizer.cs +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/HandControllerJointsVisualizer.cs @@ -97,9 +97,12 @@ private void CreateJointVisualizerIfNotExists(TrackedHandJoint handJoint) if (handJoint == TrackedHandJoint.IndexTip) { var indexJointRenderer = jointVisualization.GetComponent(); - var indexMaterial = indexJointRenderer.material; - indexMaterial.color = indexFingertipColor; - indexJointRenderer.material = indexMaterial; + if (indexJointRenderer != null) + { + var indexMaterial = indexJointRenderer.material; + indexMaterial.color = indexFingertipColor; + indexJointRenderer.material = indexMaterial; + } } jointVisualizations.Add(handJoint, jointVisualization); From 33ff3b1e366fa6ef740193db33f2f126c87cfc89 Mon Sep 17 00:00:00 2001 From: Stephen Hodgson Date: Thu, 28 May 2020 11:47:32 -0400 Subject: [PATCH 56/78] updated spatial pointer from update loop to use input changed event (#193) removed commented out stuff from near pointer removed empty near pointer inspector updated pointer inspectors to fallback if no inspector is made for derived types --- .../ControllerPoseSynchronizerInspector.cs | 2 +- .../BaseControllerPointerInspector.cs | 2 +- .../UX/Pointers/HandNearPointerInspector.cs | 14 ---------- .../Pointers/HandNearPointerInspector.cs.meta | 11 -------- .../UX/Pointers/LinePointerInspector.cs | 2 +- .../UX/Scripts/Pointers/HandNearPointer.cs | 27 ------------------- .../UX/Scripts/Pointers/HandSpatialPointer.cs | 19 +++++++------ 7 files changed, 12 insertions(+), 65 deletions(-) delete mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Editor/UX/Pointers/HandNearPointerInspector.cs delete mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Editor/UX/Pointers/HandNearPointerInspector.cs.meta diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Editor/Input/Handlers/ControllerPoseSynchronizerInspector.cs b/XRTK.SDK/Packages/com.xrtk.sdk/Editor/Input/Handlers/ControllerPoseSynchronizerInspector.cs index 57282e5d..8031ee18 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Editor/Input/Handlers/ControllerPoseSynchronizerInspector.cs +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Editor/Input/Handlers/ControllerPoseSynchronizerInspector.cs @@ -9,7 +9,7 @@ namespace XRTK.SDK.Editor.Input.Handlers { - [CustomEditor(typeof(ControllerPoseSynchronizer))] + [CustomEditor(typeof(ControllerPoseSynchronizer), true, isFallback = true)] public class ControllerPoseSynchronizerInspector : UnityEditor.Editor { private static readonly GUIContent SynchronizationSettings = new GUIContent("Synchronization Settings"); diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Editor/UX/Pointers/BaseControllerPointerInspector.cs b/XRTK.SDK/Packages/com.xrtk.sdk/Editor/UX/Pointers/BaseControllerPointerInspector.cs index 0ac6fd64..05436dd8 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Editor/UX/Pointers/BaseControllerPointerInspector.cs +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Editor/UX/Pointers/BaseControllerPointerInspector.cs @@ -9,7 +9,7 @@ namespace XRTK.SDK.Editor.UX.Pointers { - [CustomEditor(typeof(BaseControllerPointer))] + [CustomEditor(typeof(BaseControllerPointer), true, isFallback = true)] public class BaseControllerPointerInspector : ControllerPoseSynchronizerInspector { private readonly GUIContent basePointerFoldoutHeader = new GUIContent("Base Pointer Settings"); diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Editor/UX/Pointers/HandNearPointerInspector.cs b/XRTK.SDK/Packages/com.xrtk.sdk/Editor/UX/Pointers/HandNearPointerInspector.cs deleted file mode 100644 index d4487228..00000000 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Editor/UX/Pointers/HandNearPointerInspector.cs +++ /dev/null @@ -1,14 +0,0 @@ -// Copyright (c) XRTK. All rights reserved. -// Licensed under the MIT License. See LICENSE in the project root for license information. - -using UnityEditor; -using XRTK.SDK.UX.Pointers; - -namespace XRTK.SDK.Editor.UX.Pointers -{ - [CustomEditor(typeof(HandNearPointer))] - public class HandNearPointerInspector : LinePointerInspector - { - - } -} \ No newline at end of file diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Editor/UX/Pointers/HandNearPointerInspector.cs.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Editor/UX/Pointers/HandNearPointerInspector.cs.meta deleted file mode 100644 index 73c25db2..00000000 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Editor/UX/Pointers/HandNearPointerInspector.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: d7622c3a5c044ff45b585cbff6a6337c -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {fileID: 2800000, guid: 8ac5213854cf4dbabd140decf8df1946, type: 3} - userData: - assetBundleName: - assetBundleVariant: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Editor/UX/Pointers/LinePointerInspector.cs b/XRTK.SDK/Packages/com.xrtk.sdk/Editor/UX/Pointers/LinePointerInspector.cs index bbc28259..e0cde793 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Editor/UX/Pointers/LinePointerInspector.cs +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Editor/UX/Pointers/LinePointerInspector.cs @@ -8,7 +8,7 @@ namespace XRTK.SDK.Editor.UX.Pointers { - [CustomEditor(typeof(LinePointer))] + [CustomEditor(typeof(LinePointer), true, isFallback = true)] public class LinePointerInspector : BaseControllerPointerInspector { private const int MAX_RECOMMENDED_LINECAST_RESOLUTION = 20; diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandNearPointer.cs b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandNearPointer.cs index 492b3c5e..ea08e7ff 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandNearPointer.cs +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandNearPointer.cs @@ -4,7 +4,6 @@ using UnityEngine; using XRTK.Definitions.Controllers.Hands; using XRTK.EventDatum.Input; -using XRTK.Interfaces.InputSystem; using XRTK.Interfaces.Providers.Controllers.Hands; namespace XRTK.SDK.UX.Pointers @@ -14,23 +13,11 @@ namespace XRTK.SDK.UX.Pointers /// public class HandNearPointer : LinePointer { - //private IMixedRealityPointer spatialPointer; private bool handIsPinching; /// public override bool IsInteractionEnabled => base.IsInteractionEnabled && !handIsPinching; - /////// - /////// Gets the near pointer attached to the hand. - /////// - //private IMixedRealityPointer SpatialPointer => spatialPointer ?? (spatialPointer = InitializeSpatialPointerReference()); - - ///// - ///// Is the near pointer in an idle state where it's not - ///// interacting with anything and not targeting anything? - ///// - //private bool IsNearPointerIdle => NearPointer != null && NearPointer.Result.CurrentPointerTarget == null; - /// public override void OnInputChanged(InputEventData eventData) { @@ -45,19 +32,5 @@ public override void OnInputChanged(InputEventData eventData) handIsPinching = handController.IsPinching; } - - //private IMixedRealityPointer InitializeSpatialPointerReference() - //{ - // for (int i = 0; i < Controller.InputSource.Pointers.Length; i++) - // { - // var pointer = Controller.InputSource.Pointers[i]; - // if (!pointer.PointerId.Equals(PointerId) && pointer is HandSpatialPointer) - // { - // return pointer; - // } - // } - - // return null; - //} } } \ No newline at end of file diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandSpatialPointer.cs b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandSpatialPointer.cs index c6d5fa16..7086d591 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandSpatialPointer.cs +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandSpatialPointer.cs @@ -52,21 +52,16 @@ public class HandSpatialPointer : LinePointer /// private bool IsNearPointerIdle => NearPointer == null || NearPointer.Result.CurrentPointerTarget == null || !NearPointer.IsInteractionEnabled; - private void Update() - { - UpdatePointerTransform(); - } - private IMixedRealityHandController InitializeHandControllerReference() { // This pointer type must only be used with hand controllers. - if (!(Controller is IMixedRealityHandController handController)) + if (!(Controller is IMixedRealityHandController controller)) { - Debug.LogError($"{typeof(HandSpatialPointer).Name} is only for use with {typeof(IMixedRealityHandController).Name} controllers!", this); + Debug.LogError($"{nameof(HandSpatialPointer)} is only for use with {nameof(IMixedRealityHandController)} controllers!", this); return null; } - return handController; + return controller; } private IMixedRealityPointer InitializeNearPointerReference() @@ -74,7 +69,8 @@ private IMixedRealityPointer InitializeNearPointerReference() for (int i = 0; i < Controller.InputSource.Pointers.Length; i++) { var pointer = Controller.InputSource.Pointers[i]; - if (!pointer.PointerId.Equals(PointerId) && pointer is HandNearPointer) + + if (pointer.PointerId != PointerId && pointer is HandNearPointer) { return pointer; } @@ -83,8 +79,11 @@ private IMixedRealityPointer InitializeNearPointerReference() return null; } - private void UpdatePointerTransform() + /// + public override void OnInputChanged(InputEventData eventData) { + base.OnInputChanged(eventData); + if (IsInteractionEnabled) { pointerPoseTransform.gameObject.SetActive(true); From db0033d2fc4f0d5cd57a0daf45d918ec64b3ec71 Mon Sep 17 00:00:00 2001 From: Stephen Hodgson Date: Fri, 29 May 2020 03:47:29 -0400 Subject: [PATCH 57/78] override interaction modes for hand near/spatial pointers --- .../Runtime/Features/UX/Scripts/Pointers/HandNearPointer.cs | 4 ++++ .../Features/UX/Scripts/Pointers/HandSpatialPointer.cs | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandNearPointer.cs b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandNearPointer.cs index ea08e7ff..db4f831b 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandNearPointer.cs +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandNearPointer.cs @@ -2,6 +2,7 @@ // Licensed under the MIT License. See LICENSE in the project root for license information. using UnityEngine; +using XRTK.Definitions; using XRTK.Definitions.Controllers.Hands; using XRTK.EventDatum.Input; using XRTK.Interfaces.Providers.Controllers.Hands; @@ -18,6 +19,9 @@ public class HandNearPointer : LinePointer /// public override bool IsInteractionEnabled => base.IsInteractionEnabled && !handIsPinching; + /// + public override InteractionMode InteractionMode => InteractionMode.Near; + /// public override void OnInputChanged(InputEventData eventData) { diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandSpatialPointer.cs b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandSpatialPointer.cs index 7086d591..26d5683a 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandSpatialPointer.cs +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandSpatialPointer.cs @@ -2,6 +2,7 @@ // Licensed under the MIT License. See LICENSE in the project root for license information. using UnityEngine; +using XRTK.Definitions; using XRTK.Definitions.Controllers.Hands; using XRTK.EventDatum.Input; using XRTK.Interfaces.InputSystem; @@ -79,6 +80,9 @@ private IMixedRealityPointer InitializeNearPointerReference() return null; } + /// + public override InteractionMode InteractionMode => InteractionMode.Far; + /// public override void OnInputChanged(InputEventData eventData) { From 380a21e6bbea605eba1f7fce5fd2c22fd8447cda Mon Sep 17 00:00:00 2001 From: Stephen Hodgson Date: Fri, 29 May 2020 03:50:15 -0400 Subject: [PATCH 58/78] updated prefab serialization --- .../Prefabs~/UX/Pointers/HandControllerNearPointer.prefab | 1 + .../Prefabs~/UX/Pointers/HandControllerSpatialPointer.prefab | 1 + 2 files changed, 2 insertions(+) diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/HandControllerNearPointer.prefab b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/HandControllerNearPointer.prefab index 7bdbf7d8..f37a7011 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/HandControllerNearPointer.prefab +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/HandControllerNearPointer.prefab @@ -180,6 +180,7 @@ MonoBehaviour: axisConstraint: 2 requiresHoldAction: 0 enablePointerOnStart: 0 + interactionMode: 2 nearInteractionCollider: {fileID: -5168941210383110042} overrideGlobalPointerExtent: 0 defaultPointerExtent: 0.5 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/HandControllerSpatialPointer.prefab b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/HandControllerSpatialPointer.prefab index 34b38285..1327b848 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/HandControllerSpatialPointer.prefab +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/HandControllerSpatialPointer.prefab @@ -180,6 +180,7 @@ MonoBehaviour: axisConstraint: 2 requiresHoldAction: 0 enablePointerOnStart: 0 + interactionMode: 1 nearInteractionCollider: {fileID: 0} overrideGlobalPointerExtent: 0 defaultPointerExtent: 10 From c3f4f144ddb636bfb049ca68f87bae6d2fbc68ff Mon Sep 17 00:00:00 2001 From: Dino Fejzagic Date: Fri, 29 May 2020 15:37:05 +0200 Subject: [PATCH 59/78] Bake default poses --- .../HandControllers/RecordedPoses/FlatHandPose.asset | 10 +++++++++- .../HandControllers/RecordedPoses/GrabHandPose.asset | 10 +++++++++- .../HandControllers/RecordedPoses/OpenHandPose.asset | 10 +++++++++- .../HandControllers/RecordedPoses/PinchHandPose.asset | 10 +++++++++- .../RecordedPoses/PinchSteadyWristHandPose.asset | 10 +++++++++- .../HandControllers/RecordedPoses/PokeHandPose.asset | 10 +++++++++- .../RecordedPoses/ThumbsUpHandPose.asset | 10 +++++++++- .../RecordedPoses/VictoryHandPose.asset | 10 +++++++++- 8 files changed, 72 insertions(+), 8 deletions(-) diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/FlatHandPose.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/FlatHandPose.asset index aaf4458d..12c64b39 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/FlatHandPose.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/FlatHandPose.asset @@ -15,6 +15,14 @@ MonoBehaviour: id: flat description: Flat hand with fingers spread out. isDefault: 0 - isSelectionPose: 0 keyCode: 49 data: {fileID: 4900000, guid: d01fab68eb29b1743b37beb044cfebe1, type: 3} + didBake: 1 + isGripping: 0 + fingerCurlStrengths: + - 0.19951756 + - 0.0063138288 + - 0.0028837689 + - 0.005681025 + - 0.00097340444 + gripStrength: 0.0039188415 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/GrabHandPose.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/GrabHandPose.asset index 85b1d006..205a9286 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/GrabHandPose.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/GrabHandPose.asset @@ -15,6 +15,14 @@ MonoBehaviour: id: grab description: Grab with whole hand, fist shape. isDefault: 0 - isSelectionPose: 0 keyCode: 50 data: {fileID: 4900000, guid: 99870b188ec58c949b89786e62a77394, type: 3} + didBake: 1 + isGripping: 1 + fingerCurlStrengths: + - 1 + - 1 + - 1 + - 1 + - 1 + gripStrength: 1 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/OpenHandPose.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/OpenHandPose.asset index 39444563..401a8a85 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/OpenHandPose.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/OpenHandPose.asset @@ -15,6 +15,14 @@ MonoBehaviour: id: open description: Relaxed hand pose. isDefault: 1 - isSelectionPose: 0 keyCode: 0 data: {fileID: 4900000, guid: f5a9db29d9d2bd741b793a18dac228d6, type: 3} + didBake: 1 + isGripping: 0 + fingerCurlStrengths: + - 0.66477686 + - 0.090871215 + - 0.8710865 + - 1 + - 1 + gripStrength: 0.8003202 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PinchHandPose.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PinchHandPose.asset index 8f88a198..3d6b9d4c 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PinchHandPose.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PinchHandPose.asset @@ -15,6 +15,14 @@ MonoBehaviour: id: pinch description: Index finger and Thumb touching, index tip does not move. isDefault: 0 - isSelectionPose: 0 keyCode: 323 data: {fileID: 4900000, guid: c39432faae5de8245a47d3fb3d0a6a3d, type: 3} + didBake: 1 + isGripping: 0 + fingerCurlStrengths: + - 1 + - 0.6731408 + - 0.9723644 + - 1 + - 1 + gripStrength: 0.96465635 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PinchSteadyWristHandPose.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PinchSteadyWristHandPose.asset index 4fbfb335..ed50dedc 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PinchSteadyWristHandPose.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PinchSteadyWristHandPose.asset @@ -15,6 +15,14 @@ MonoBehaviour: id: pinch-steady-wrist description: Index finger and Thumb touching, wrist does not move. isDefault: 0 - isSelectionPose: 0 keyCode: 51 data: {fileID: 4900000, guid: 8eaebf41206ee3546aed07b9a58f6a40, type: 3} + didBake: 1 + isGripping: 0 + fingerCurlStrengths: + - 1 + - 0.7133551 + - 0.9268092 + - 1 + - 1 + gripStrength: 0.9429617 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PokeHandPose.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PokeHandPose.asset index 5c5cf39e..85f672b8 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PokeHandPose.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PokeHandPose.asset @@ -15,6 +15,14 @@ MonoBehaviour: id: poke description: Index finger stretched out. isDefault: 0 - isSelectionPose: 0 keyCode: 324 data: {fileID: 4900000, guid: 5f148c90347c0dc47bbfd1ed7a2d4334, type: 3} + didBake: 1 + isGripping: 0 + fingerCurlStrengths: + - 1 + - 0.12710708 + - 0.6714742 + - 0.9232829 + - 0.9189967 + gripStrength: 0.6932526 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/ThumbsUpHandPose.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/ThumbsUpHandPose.asset index 6b6988a3..0d6e10cf 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/ThumbsUpHandPose.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/ThumbsUpHandPose.asset @@ -15,6 +15,14 @@ MonoBehaviour: id: thumbs-up description: OK sign. isDefault: 0 - isSelectionPose: 0 keyCode: 52 data: {fileID: 4900000, guid: f8236cb3fbe55ed499df0418bb28c0cd, type: 3} + didBake: 1 + isGripping: 1 + fingerCurlStrengths: + - 0.31353787 + - 1 + - 0.94159126 + - 0.95732826 + - 0.97244227 + gripStrength: 0.9714226 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/VictoryHandPose.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/VictoryHandPose.asset index e8866811..6a261ff5 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/VictoryHandPose.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/VictoryHandPose.asset @@ -15,6 +15,14 @@ MonoBehaviour: id: victory description: Victory sign. isDefault: 0 - isSelectionPose: 0 keyCode: 53 data: {fileID: 4900000, guid: f7b9fdc8704378f4a8e1f18c99edb3ac, type: 3} + didBake: 1 + isGripping: 0 + fingerCurlStrengths: + - 1 + - 0.046339203 + - 0 + - 0.5765423 + - 0.5370643 + gripStrength: 0.30365536 From 1796e071c02555785307561c2c8514a8b41dad33 Mon Sep 17 00:00:00 2001 From: Dino Fejzagic Date: Fri, 29 May 2020 18:33:01 +0200 Subject: [PATCH 60/78] Add tracked hand pose input action --- .../HandTrackedPoseInteractionMappingProfile.asset | 8 ++++---- .../Profiles~/Input/MixedRealityInputActionsProfile.asset | 4 ++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/HandTrackedPoseInteractionMappingProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/HandTrackedPoseInteractionMappingProfile.asset index 85b9e921..e9d567c9 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/HandTrackedPoseInteractionMappingProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/HandTrackedPoseInteractionMappingProfile.asset @@ -18,10 +18,10 @@ MonoBehaviour: axisType: 1 inputType: 28 inputAction: - profileGuid: 00000000000000000000000000000000 - id: 0 - description: None - axisConstraint: 0 + profileGuid: 399335ccc89c4d12b79f3539ca7771db + id: 17 + description: Tracked Hand Pose + axisConstraint: 1 keyCode: 0 inputName: axisCodeX: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/MixedRealityInputActionsProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/MixedRealityInputActionsProfile.asset index 17c79ff3..c995a9ed 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/MixedRealityInputActionsProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/MixedRealityInputActionsProfile.asset @@ -77,3 +77,7 @@ MonoBehaviour: id: 16 description: Grip axisConstraint: 2 + - profileGuid: 399335ccc89c4d12b79f3539ca7771db + id: 17 + description: Tracked Hand Pose + axisConstraint: 1 From 1abfddb4bd49aa35484a0ffe4847dae78564fcd9 Mon Sep 17 00:00:00 2001 From: Dino Fejzagic Date: Fri, 29 May 2020 19:53:44 +0200 Subject: [PATCH 61/78] Update baked data for hand poses --- .../HandControllers/RecordedPoses/FlatHandPose.asset | 10 +++++----- .../HandControllers/RecordedPoses/OpenHandPose.asset | 8 ++++---- .../HandControllers/RecordedPoses/PinchHandPose.asset | 6 +++--- .../RecordedPoses/PinchSteadyWristHandPose.asset | 10 +++++----- .../HandControllers/RecordedPoses/PokeHandPose.asset | 10 +++++----- .../RecordedPoses/ThumbsUpHandPose.asset | 10 +++++----- .../RecordedPoses/VictoryHandPose.asset | 8 ++++---- 7 files changed, 31 insertions(+), 31 deletions(-) diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/FlatHandPose.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/FlatHandPose.asset index 12c64b39..4f4d5c5d 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/FlatHandPose.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/FlatHandPose.asset @@ -20,9 +20,9 @@ MonoBehaviour: didBake: 1 isGripping: 0 fingerCurlStrengths: - - 0.19951756 - - 0.0063138288 - - 0.0028837689 - - 0.005681025 - - 0.00097340444 + - 0.1894797 + - 0.010929594 + - 0.0030815455 + - 0.007151756 + - 0.012282488 gripStrength: 0.0039188415 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/OpenHandPose.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/OpenHandPose.asset index 401a8a85..368391bb 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/OpenHandPose.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/OpenHandPose.asset @@ -20,9 +20,9 @@ MonoBehaviour: didBake: 1 isGripping: 0 fingerCurlStrengths: - - 0.66477686 - - 0.090871215 - - 0.8710865 - - 1 + - 0.6183342 + - 0.12485591 + - 0.88863266 - 1 + - 0.9942756 gripStrength: 0.8003202 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PinchHandPose.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PinchHandPose.asset index 3d6b9d4c..09a51ca4 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PinchHandPose.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PinchHandPose.asset @@ -21,8 +21,8 @@ MonoBehaviour: isGripping: 0 fingerCurlStrengths: - 1 - - 0.6731408 - - 0.9723644 - - 1 + - 0.65910643 + - 0.9230474 + - 0.98393315 - 1 gripStrength: 0.96465635 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PinchSteadyWristHandPose.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PinchSteadyWristHandPose.asset index ed50dedc..623513fd 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PinchSteadyWristHandPose.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PinchSteadyWristHandPose.asset @@ -20,9 +20,9 @@ MonoBehaviour: didBake: 1 isGripping: 0 fingerCurlStrengths: - - 1 - - 0.7133551 - - 0.9268092 - - 1 - - 1 + - 0.973506 + - 0.7414424 + - 0.89368385 + - 0.9511476 + - 0.9382899 gripStrength: 0.9429617 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PokeHandPose.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PokeHandPose.asset index 85f672b8..1eeaddd2 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PokeHandPose.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/PokeHandPose.asset @@ -20,9 +20,9 @@ MonoBehaviour: didBake: 1 isGripping: 0 fingerCurlStrengths: - - 1 - - 0.12710708 - - 0.6714742 - - 0.9232829 - - 0.9189967 + - 0.96689564 + - 0.17719902 + - 0.6713774 + - 0.83242744 + - 0.8090317 gripStrength: 0.6932526 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/ThumbsUpHandPose.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/ThumbsUpHandPose.asset index 0d6e10cf..1f5fb68c 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/ThumbsUpHandPose.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/ThumbsUpHandPose.asset @@ -20,9 +20,9 @@ MonoBehaviour: didBake: 1 isGripping: 1 fingerCurlStrengths: - - 0.31353787 - - 1 - - 0.94159126 - - 0.95732826 - - 0.97244227 + - 0.29784977 + - 0.85514337 + - 0.86561483 + - 0.83954275 + - 0.8154361 gripStrength: 0.9714226 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/VictoryHandPose.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/VictoryHandPose.asset index 6a261ff5..35ea60f1 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/VictoryHandPose.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RecordedPoses/VictoryHandPose.asset @@ -21,8 +21,8 @@ MonoBehaviour: isGripping: 0 fingerCurlStrengths: - 1 - - 0.046339203 - - 0 - - 0.5765423 - - 0.5370643 + - 0.06573929 + - 0.06283465 + - 0.39798924 + - 0.3726366 gripStrength: 0.30365536 From b461567b249ef665694a065e9e411d9f682e6982 Mon Sep 17 00:00:00 2001 From: Dino Fejzagic Date: Mon, 1 Jun 2020 08:58:10 +0200 Subject: [PATCH 62/78] Fix spatial pointer disabled while interacting --- .../Pointers/HandControllerNearPointer.prefab | 46 +++++++++---------- .../UX/Scripts/Pointers/HandSpatialPointer.cs | 5 +- 2 files changed, 26 insertions(+), 25 deletions(-) diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/HandControllerNearPointer.prefab b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/HandControllerNearPointer.prefab index f37a7011..ae5f9381 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/HandControllerNearPointer.prefab +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/HandControllerNearPointer.prefab @@ -187,9 +187,9 @@ MonoBehaviour: pointerOrientation: 0 lineColorSelected: serializedVersion: 2 - key0: {r: 0.8490566, g: 0.8490566, b: 0.8490566, a: 0} - key1: {r: 0.8490566, g: 0.8490566, b: 0.8490566, a: 0} - key2: {r: 0, g: 0, b: 0, a: 0} + key0: {r: 1, g: 1, b: 1, a: 0} + key1: {r: 0.8490566, g: 0.8490566, b: 0.8490566, a: 1} + key2: {r: 0, g: 0, b: 0, a: 1} key3: {r: 0, g: 0, b: 0, a: 0} key4: {r: 0, g: 0, b: 0, a: 0} key5: {r: 0, g: 0, b: 0, a: 0} @@ -204,8 +204,8 @@ MonoBehaviour: ctime6: 0 ctime7: 0 atime0: 0 - atime1: 65535 - atime2: 65535 + atime1: 3277 + atime2: 49151 atime3: 65535 atime4: 0 atime5: 0 @@ -213,7 +213,7 @@ MonoBehaviour: atime7: 0 m_Mode: 0 m_NumColorKeys: 2 - m_NumAlphaKeys: 2 + m_NumAlphaKeys: 4 lineColorValid: serializedVersion: 2 key0: {r: 1, g: 1, b: 1, a: 0} @@ -245,9 +245,9 @@ MonoBehaviour: m_NumAlphaKeys: 4 lineColorInvalid: serializedVersion: 2 - key0: {r: 0.8490566, g: 0.8490566, b: 0.8490566, a: 0} - key1: {r: 0.8490566, g: 0.8490566, b: 0.8490566, a: 0} - key2: {r: 0, g: 0, b: 0, a: 0} + key0: {r: 1, g: 1, b: 1, a: 0} + key1: {r: 1, g: 0, b: 0, a: 1} + key2: {r: 0, g: 0, b: 0, a: 1} key3: {r: 0, g: 0, b: 0, a: 0} key4: {r: 0, g: 0, b: 0, a: 0} key5: {r: 0, g: 0, b: 0, a: 0} @@ -262,8 +262,8 @@ MonoBehaviour: ctime6: 0 ctime7: 0 atime0: 0 - atime1: 65535 - atime2: 65535 + atime1: 3277 + atime2: 49151 atime3: 65535 atime4: 0 atime5: 0 @@ -271,11 +271,11 @@ MonoBehaviour: atime7: 0 m_Mode: 0 m_NumColorKeys: 2 - m_NumAlphaKeys: 2 + m_NumAlphaKeys: 4 lineColorNoTarget: serializedVersion: 2 - key0: {r: 0.8490566, g: 0.8490566, b: 0.8490566, a: 0} - key1: {r: 0.8490566, g: 0.8490566, b: 0.8490566, a: 0} + key0: {r: 0.754717, g: 0.754717, b: 0.754717, a: 0} + key1: {r: 0.754717, g: 0.754717, b: 0.754717, a: 1} key2: {r: 0, g: 0, b: 0, a: 0} key3: {r: 0, g: 0, b: 0, a: 0} key4: {r: 0, g: 0, b: 0, a: 0} @@ -291,21 +291,21 @@ MonoBehaviour: ctime6: 0 ctime7: 0 atime0: 0 - atime1: 65535 + atime1: 3277 atime2: 65535 - atime3: 65535 + atime3: 0 atime4: 0 atime5: 0 atime6: 0 atime7: 0 m_Mode: 0 m_NumColorKeys: 2 - m_NumAlphaKeys: 2 + m_NumAlphaKeys: 3 lineColorLockFocus: serializedVersion: 2 - key0: {r: 0.8490566, g: 0.8490566, b: 0.8490566, a: 0} - key1: {r: 0.8490566, g: 0.8490566, b: 0.8490566, a: 0} - key2: {r: 0, g: 0, b: 0, a: 0} + key0: {r: 0, g: 0.9806142, b: 1, a: 0} + key1: {r: 0, g: 0.9806142, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 1} key3: {r: 0, g: 0, b: 0, a: 0} key4: {r: 0, g: 0, b: 0, a: 0} key5: {r: 0, g: 0, b: 0, a: 0} @@ -320,8 +320,8 @@ MonoBehaviour: ctime6: 0 ctime7: 0 atime0: 0 - atime1: 65535 - atime2: 65535 + atime1: 3277 + atime2: 49151 atime3: 65535 atime4: 0 atime5: 0 @@ -329,7 +329,7 @@ MonoBehaviour: atime7: 0 m_Mode: 0 m_NumColorKeys: 2 - m_NumAlphaKeys: 2 + m_NumAlphaKeys: 4 lineCastResolution: 2 lineBase: {fileID: 3795335034429809122} lineRenderers: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandSpatialPointer.cs b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandSpatialPointer.cs index 26d5683a..0e6fe6dd 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandSpatialPointer.cs +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandSpatialPointer.cs @@ -33,9 +33,10 @@ public class HandSpatialPointer : LinePointer /// public override bool IsInteractionEnabled => base.IsInteractionEnabled && - IsNearPointerIdle && + (IsNearPointerIdle && HandController != null && - HandController.IsPointing; + HandController.IsPointing) || + (IsSelectPressed && Result.CurrentPointerTarget != null); /// /// Gets the near pointer attached to the hand. From 9ad2d2c377baf2c94984190eed3424ee6e471a51 Mon Sep 17 00:00:00 2001 From: Dino Fejzagic Date: Mon, 1 Jun 2020 09:27:51 +0200 Subject: [PATCH 63/78] Fix spatial pointer line renderer start offset --- .../HandControllerSpatialPointer.prefab | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/HandControllerSpatialPointer.prefab b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/HandControllerSpatialPointer.prefab index 1327b848..afb01e3f 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/HandControllerSpatialPointer.prefab +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/HandControllerSpatialPointer.prefab @@ -48,7 +48,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c85a4527bbdd25647a62ec06e8d2daf3, type: 3} m_Name: m_EditorClassIdentifier: - lineStartClamp: 0.0001 + lineStartClamp: 0.155 lineEndClamp: 0.9999 customLineTransform: {fileID: 0} loops: 0 @@ -375,21 +375,21 @@ LineRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_Positions: - - {x: 0, y: 0, z: 0.00009899999} - - {x: 0, y: 0, z: 0.06608878} - - {x: 0, y: 0, z: 0.13209635} - - {x: 0, y: 0, z: 0.19813946} - - {x: 0, y: 0, z: 0.26423594} - - {x: 0, y: 0, z: 0.3304035} - - {x: 0, y: 0, z: 0.3966599} - - {x: 0, y: 0, z: 0.46302295} - - {x: 0, y: 0, z: 0.52951044} - - {x: 0, y: 0, z: 0.59614} - - {x: 0, y: 0, z: 0.66292953} - - {x: 0, y: 0, z: 0.7298968} - - {x: 0, y: 0, z: 0.7970595} - - {x: 0, y: 0, z: 0.8644354} - - {x: 0, y: 0, z: 0.93204236} + - {x: 0, y: 0, z: 0.029799275} + - {x: 0, y: 0, z: 0.09381431} + - {x: 0, y: 0, z: 0.15785313} + - {x: 0, y: 0, z: 0.22193189} + - {x: 0, y: 0, z: 0.2860669} + - {x: 0, y: 0, z: 0.35027426} + - {x: 0, y: 0, z: 0.41457027} + - {x: 0, y: 0, z: 0.47897112} + - {x: 0, y: 0, z: 0.54349303} + - {x: 0, y: 0, z: 0.6081523} + - {x: 0, y: 0, z: 0.67296493} + - {x: 0, y: 0, z: 0.7379472} + - {x: 0, y: 0, z: 0.8031155} + - {x: 0, y: 0, z: 0.86848587} + - {x: 0, y: 0, z: 0.93407464} - {x: 0, y: 0, z: 0.999898} m_Parameters: serializedVersion: 3 From afe944f3411f5329ea9d4a707fea6a9f6f5d9f5d Mon Sep 17 00:00:00 2001 From: Dino Fejzagic Date: Tue, 9 Jun 2020 16:28:57 +0200 Subject: [PATCH 64/78] Fix rotation not set in local space --- .../Controllers/Hands/DefaultHandControllerVisualizer.cs | 2 +- .../Scripts/Controllers/Hands/HandControllerMeshVisualizer.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/DefaultHandControllerVisualizer.cs b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/DefaultHandControllerVisualizer.cs index cbdffdd5..278cd2dd 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/DefaultHandControllerVisualizer.cs +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/DefaultHandControllerVisualizer.cs @@ -121,7 +121,7 @@ private void UpdateHandJointTransforms(HandData handData) var jointTransform = GetOrCreateJointTransform(handJoint); var jointPose = jointPoses[handJoint]; jointTransform.localPosition = jointPose.Position; - jointTransform.rotation = jointPose.Rotation; + jointTransform.localRotation = jointPose.Rotation; } } diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/HandControllerMeshVisualizer.cs b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/HandControllerMeshVisualizer.cs index 1ff2284d..f2e84c7f 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/HandControllerMeshVisualizer.cs +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/HandControllerMeshVisualizer.cs @@ -61,7 +61,7 @@ public void UpdateVisualization(HandData handData) } //meshFilter.transform.position = handMeshData.Position; - meshFilter.transform.rotation = handMeshData.Rotation; + meshFilter.transform.rotation = handData.RootPose.Rotation; } } } From 81975630d07dcec9fc014e9e445ab9582852816d Mon Sep 17 00:00:00 2001 From: Dino Fejzagic Date: Wed, 10 Jun 2020 22:49:01 +0200 Subject: [PATCH 65/78] Adjust spatial pointer mesh renderer settings --- .../HandControllerSpatialPointer.prefab | 50 +++++++++++++------ 1 file changed, 35 insertions(+), 15 deletions(-) diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/HandControllerSpatialPointer.prefab b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/HandControllerSpatialPointer.prefab index afb01e3f..9476777c 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/HandControllerSpatialPointer.prefab +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/HandControllerSpatialPointer.prefab @@ -375,21 +375,21 @@ LineRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_Positions: - - {x: 0, y: 0, z: 0.029799275} - - {x: 0, y: 0, z: 0.09381431} - - {x: 0, y: 0, z: 0.15785313} - - {x: 0, y: 0, z: 0.22193189} - - {x: 0, y: 0, z: 0.2860669} - - {x: 0, y: 0, z: 0.35027426} - - {x: 0, y: 0, z: 0.41457027} - - {x: 0, y: 0, z: 0.47897112} - - {x: 0, y: 0, z: 0.54349303} - - {x: 0, y: 0, z: 0.6081523} - - {x: 0, y: 0, z: 0.67296493} - - {x: 0, y: 0, z: 0.7379472} - - {x: 0, y: 0, z: 0.8031155} - - {x: 0, y: 0, z: 0.86848587} - - {x: 0, y: 0, z: 0.93407464} + - {x: 0, y: 0, z: 0.15348725} + - {x: 0, y: 0, z: 0.2093078} + - {x: 0, y: 0, z: 0.26516858} + - {x: 0, y: 0, z: 0.32108033} + - {x: 0, y: 0, z: 0.37705365} + - {x: 0, y: 0, z: 0.43309948} + - {x: 0, y: 0, z: 0.48922837} + - {x: 0, y: 0, z: 0.54545105} + - {x: 0, y: 0, z: 0.60177845} + - {x: 0, y: 0, z: 0.65822107} + - {x: 0, y: 0, z: 0.7147896} + - {x: 0, y: 0, z: 0.7714949} + - {x: 0, y: 0, z: 0.8283477} + - {x: 0, y: 0, z: 0.8853587} + - {x: 0, y: 0, z: 0.9425385} - {x: 0, y: 0, z: 0.999898} m_Parameters: serializedVersion: 3 @@ -633,6 +633,26 @@ PrefabInstance: propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 2100000, guid: 5533073c4b0c4bec9fbb2b19f3f8e814, type: 2} + - target: {fileID: -1504981713932161579, guid: 020718e6e118ec3489dbc21ec763a517, + type: 3} + propertyPath: m_ReceiveShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -1504981713932161579, guid: 020718e6e118ec3489dbc21ec763a517, + type: 3} + propertyPath: m_CastShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -1504981713932161579, guid: 020718e6e118ec3489dbc21ec763a517, + type: 3} + propertyPath: m_LightProbeUsage + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -1504981713932161579, guid: 020718e6e118ec3489dbc21ec763a517, + type: 3} + propertyPath: m_ReflectionProbeUsage + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 020718e6e118ec3489dbc21ec763a517, type: 3} --- !u!4 &6392329022490078173 stripped From 3d3f26aee9f71fe3414facc6586075a920a63ef1 Mon Sep 17 00:00:00 2001 From: Dino Fejzagic Date: Thu, 11 Jun 2020 10:31:23 +0200 Subject: [PATCH 66/78] Only update hand visusalization if hand is tracked --- .../Hands/DefaultHandControllerVisualizer.cs | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/DefaultHandControllerVisualizer.cs b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/DefaultHandControllerVisualizer.cs index 278cd2dd..3accc8cf 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/DefaultHandControllerVisualizer.cs +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/DefaultHandControllerVisualizer.cs @@ -98,18 +98,21 @@ public override void OnInputChanged(InputEventData eventData) ? Definitions.Devices.TrackingState.Tracked : Definitions.Devices.TrackingState.NotTracked; - // It's important to update physics - // configuration before updating joints. - UpdatePhysicsConfiguration(); + if (TrackingState == Definitions.Devices.TrackingState.Tracked) + { + // It's important to update physics + // configuration before updating joints. + UpdatePhysicsConfiguration(); - var handData = eventData.InputData; - UpdateHandJointTransforms(handData); + var handData = eventData.InputData; + UpdateHandJointTransforms(handData); - // With joints updated, we can update colliders. - UpdateHandColliders(); + // With joints updated, we can update colliders. + UpdateHandColliders(); - // Update visualizers depending on the current mode. - UpdateRendering(handData); + // Update visualizers depending on the current mode. + UpdateRendering(handData); + } } private void UpdateHandJointTransforms(HandData handData) From 3279d68f01d1fb4b84663589137cd0d2c8dfd8ae Mon Sep 17 00:00:00 2001 From: Dino Fejzagic Date: Thu, 11 Jun 2020 10:39:13 +0200 Subject: [PATCH 67/78] Optimize foreach loop to for loop --- .../Controllers/Hands/DefaultHandControllerVisualizer.cs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/DefaultHandControllerVisualizer.cs b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/DefaultHandControllerVisualizer.cs index 3accc8cf..0985eae6 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/DefaultHandControllerVisualizer.cs +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/DefaultHandControllerVisualizer.cs @@ -117,12 +117,11 @@ public override void OnInputChanged(InputEventData eventData) private void UpdateHandJointTransforms(HandData handData) { - var jointPoses = handData.Joints.ToJointPoseDictionary(); - - foreach (var handJoint in jointPoses.Keys) + for (int i = 0; i < HandData.JointCount; i++) { + var handJoint = (TrackedHandJoint)i; var jointTransform = GetOrCreateJointTransform(handJoint); - var jointPose = jointPoses[handJoint]; + var jointPose = handData.Joints[i]; jointTransform.localPosition = jointPose.Position; jointTransform.localRotation = jointPose.Rotation; } From e7afe4c54ebf62a4bf0063b8f45f17724eb520a9 Mon Sep 17 00:00:00 2001 From: Dino Fejzagic Date: Thu, 11 Jun 2020 23:54:07 +0200 Subject: [PATCH 68/78] Get mesh data using TryGetHandMeshData --- .../Hands/DefaultHandControllerVisualizer.cs | 13 +++++++------ .../Hands/HandControllerMeshVisualizer.cs | 11 +++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/DefaultHandControllerVisualizer.cs b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/DefaultHandControllerVisualizer.cs index 0985eae6..2e65dfd5 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/DefaultHandControllerVisualizer.cs +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/DefaultHandControllerVisualizer.cs @@ -111,7 +111,7 @@ public override void OnInputChanged(InputEventData eventData) UpdateHandColliders(); // Update visualizers depending on the current mode. - UpdateRendering(handData); + UpdateRendering(); } } @@ -368,15 +368,16 @@ public Transform GetOrCreateJointTransform(TrackedHandJoint handJoint) return jointTransform; } - private void UpdateRendering(HandData handData) + private void UpdateRendering() { var renderingMode = HandControllerDataProvider.RenderingMode; if (renderingMode != HandRenderingMode.None) { - // Fallback to joints rendering if the platform did not provide - // any mesh data. + var handController = (IMixedRealityHandController)Controller; + + // Fallback to joints rendering if mesh data is not available. if (renderingMode == HandRenderingMode.Mesh && - handData.Mesh.Empty) + !handController.TryGetHandMeshData(out var handMeshData)) { renderingMode = HandRenderingMode.Joints; } @@ -409,7 +410,7 @@ private void UpdateRendering(HandData handData) } meshVisualizer.gameObject.SetActive(true); - meshVisualizer.UpdateVisualization(handData); + meshVisualizer.UpdateVisualization(handMeshData); } } else diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/HandControllerMeshVisualizer.cs b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/HandControllerMeshVisualizer.cs index f2e84c7f..e33888e5 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/HandControllerMeshVisualizer.cs +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/HandControllerMeshVisualizer.cs @@ -14,13 +14,12 @@ public class HandControllerMeshVisualizer : MonoBehaviour private MeshFilter meshFilter = null; /// - /// Updates the mesh visuailzation using latest hand data. + /// Updates the mesh visuailzation using latest hand mesh data. /// - /// New hand data. - public void UpdateVisualization(HandData handData) + /// New hand mesh data. + public void UpdateVisualization(HandMeshData handMeshData) { - var handMeshData = handData.Mesh; - if (handMeshData.Empty) + if (handMeshData.IsEmpty) { return; } @@ -61,7 +60,7 @@ public void UpdateVisualization(HandData handData) } //meshFilter.transform.position = handMeshData.Position; - meshFilter.transform.rotation = handData.RootPose.Rotation; + //meshFilter.transform.rotation = handData.RootPose.Rotation; } } } From 5166c53d74593e26f82833c2f41ba405d9474a6d Mon Sep 17 00:00:00 2001 From: Dino Fejzagic Date: Fri, 12 Jun 2020 20:59:25 +0200 Subject: [PATCH 69/78] Remove HandData input event --- .../Handlers/ControllerPoseSynchronizer.cs | 4 --- .../Hands/DefaultHandControllerVisualizer.cs | 34 ++++++++++--------- .../UX/Scripts/Pointers/HandNearPointer.cs | 4 +-- .../UX/Scripts/Pointers/HandSpatialPointer.cs | 4 +-- 4 files changed, 22 insertions(+), 24 deletions(-) diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/Input/Handlers/ControllerPoseSynchronizer.cs b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/Input/Handlers/ControllerPoseSynchronizer.cs index 93537c38..9c8d6089 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/Input/Handlers/ControllerPoseSynchronizer.cs +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/Input/Handlers/ControllerPoseSynchronizer.cs @@ -2,7 +2,6 @@ // Licensed under the MIT License. See LICENSE in the project root for license information. using UnityEngine; -using XRTK.Definitions.Controllers.Hands; using XRTK.Definitions.Devices; using XRTK.Definitions.InputSystem; using XRTK.Definitions.Utilities; @@ -183,9 +182,6 @@ public virtual void OnInputDown(InputEventData eventData) { } /// public virtual void OnInputChanged(InputEventData eventData) { } - /// - public virtual void OnInputChanged(InputEventData eventData) { } - /// public virtual void OnInputChanged(InputEventData eventData) { } diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/DefaultHandControllerVisualizer.cs b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/DefaultHandControllerVisualizer.cs index 2e65dfd5..72386250 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/DefaultHandControllerVisualizer.cs +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/DefaultHandControllerVisualizer.cs @@ -5,6 +5,7 @@ using UnityEngine; using UnityEngine.Animations; using XRTK.Definitions.Controllers.Hands; +using XRTK.Definitions.Utilities; using XRTK.EventDatum.Input; using XRTK.Extensions; using XRTK.Interfaces.InputSystem.Handlers; @@ -86,44 +87,45 @@ protected override void OnDestroy() } /// - public override void OnInputChanged(InputEventData eventData) + public override void OnInputChanged(InputEventData eventData) { + base.OnInputChanged(eventData); + if (eventData.Handedness != Controller.ControllerHandedness) { return; } + var handController = (IMixedRealityHandController)Controller; + // Update the visualizers tracking state. - TrackingState = eventData.InputData.IsTracked - ? Definitions.Devices.TrackingState.Tracked - : Definitions.Devices.TrackingState.NotTracked; + TrackingState = handController.TrackingState; if (TrackingState == Definitions.Devices.TrackingState.Tracked) { // It's important to update physics - // configuration before updating joints. + // configuration first. UpdatePhysicsConfiguration(); - var handData = eventData.InputData; - UpdateHandJointTransforms(handData); - - // With joints updated, we can update colliders. + UpdateHandJointTransforms(); UpdateHandColliders(); - - // Update visualizers depending on the current mode. UpdateRendering(); } } - private void UpdateHandJointTransforms(HandData handData) + private void UpdateHandJointTransforms() { + var handController = (IMixedRealityHandController)Controller; + for (int i = 0; i < HandData.JointCount; i++) { var handJoint = (TrackedHandJoint)i; - var jointTransform = GetOrCreateJointTransform(handJoint); - var jointPose = handData.Joints[i]; - jointTransform.localPosition = jointPose.Position; - jointTransform.localRotation = jointPose.Rotation; + if (handController.TryGetJointPose(handJoint, out var jointPose)) + { + var jointTransform = GetOrCreateJointTransform(handJoint); + jointTransform.localPosition = jointPose.Position; + jointTransform.localRotation = jointPose.Rotation; + } } } diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandNearPointer.cs b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandNearPointer.cs index db4f831b..56cfa01b 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandNearPointer.cs +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandNearPointer.cs @@ -3,7 +3,7 @@ using UnityEngine; using XRTK.Definitions; -using XRTK.Definitions.Controllers.Hands; +using XRTK.Definitions.Utilities; using XRTK.EventDatum.Input; using XRTK.Interfaces.Providers.Controllers.Hands; @@ -23,7 +23,7 @@ public class HandNearPointer : LinePointer public override InteractionMode InteractionMode => InteractionMode.Near; /// - public override void OnInputChanged(InputEventData eventData) + public override void OnInputChanged(InputEventData eventData) { base.OnInputChanged(eventData); diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandSpatialPointer.cs b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandSpatialPointer.cs index 0e6fe6dd..a381dd5c 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandSpatialPointer.cs +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandSpatialPointer.cs @@ -3,7 +3,7 @@ using UnityEngine; using XRTK.Definitions; -using XRTK.Definitions.Controllers.Hands; +using XRTK.Definitions.Utilities; using XRTK.EventDatum.Input; using XRTK.Interfaces.InputSystem; using XRTK.Interfaces.Providers.Controllers.Hands; @@ -85,7 +85,7 @@ private IMixedRealityPointer InitializeNearPointerReference() public override InteractionMode InteractionMode => InteractionMode.Far; /// - public override void OnInputChanged(InputEventData eventData) + public override void OnInputChanged(InputEventData eventData) { base.OnInputChanged(eventData); From 22c80fe5b8d09bbc0747259db9568de559ab1b4a Mon Sep 17 00:00:00 2001 From: Dino Fejzagic Date: Mon, 15 Jun 2020 17:06:27 +0200 Subject: [PATCH 70/78] Fix physics companion pose not updated --- .../Hands/DefaultHandControllerVisualizer.cs | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/DefaultHandControllerVisualizer.cs b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/DefaultHandControllerVisualizer.cs index 72386250..3839b67e 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/DefaultHandControllerVisualizer.cs +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/DefaultHandControllerVisualizer.cs @@ -140,16 +140,15 @@ private void UpdatePhysicsConfiguration() if (PhysicsCompanionGameObject != null) { PhysicsCompanionGameObject.SetActive(true); + PhysicsCompanionGameObject.transform.localPosition = GameObject.transform.localPosition; + PhysicsCompanionGameObject.transform.localRotation = GameObject.transform.localRotation; return; } PhysicsCompanionGameObject = new GameObject($"{GameObject.name}_Physics"); - PhysicsCompanionGameObject.transform.parent = GameObject.transform.parent; - var parentConstraint = PhysicsCompanionGameObject.AddComponent(); - parentConstraint.AddSource(new ConstraintSource - { - sourceTransform = GameObject.transform - }); + PhysicsCompanionGameObject.transform.SetParent(GameObject.transform.parent, false); + PhysicsCompanionGameObject.transform.localPosition = GameObject.transform.localPosition; + PhysicsCompanionGameObject.transform.localRotation = GameObject.transform.localRotation; // Setup the kinematic rigidbody on the actual controller game object. Rigidbody controllerRigidbody = GameObject.GetOrAddComponent(); @@ -363,7 +362,7 @@ public Transform GetOrCreateJointTransform(TrackedHandJoint handJoint) return existingJointTransform; } - Transform jointTransform = new GameObject($"{handJoint}ProxyTransform").transform; + Transform jointTransform = new GameObject($"{handJoint}").transform; jointTransform.parent = HandVisualizationGameObject.transform; jointTransforms.Add(handJoint, jointTransform.transform); From 866dff91fec28f7e357668225fcdf478b5990df1 Mon Sep 17 00:00:00 2001 From: Dino Fejzagic Date: Tue, 16 Jun 2020 01:14:10 +0200 Subject: [PATCH 71/78] Remove tracked pose raw input action --- ...TrackedPoseInteractionMappingProfile.asset | 30 ------------------- ...edPoseInteractionMappingProfile.asset.meta | 8 ----- .../MixedRealityInputActionsProfile.asset | 4 --- 3 files changed, 42 deletions(-) delete mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/HandTrackedPoseInteractionMappingProfile.asset delete mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/HandTrackedPoseInteractionMappingProfile.asset.meta diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/HandTrackedPoseInteractionMappingProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/HandTrackedPoseInteractionMappingProfile.asset deleted file mode 100644 index e9d567c9..00000000 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/HandTrackedPoseInteractionMappingProfile.asset +++ /dev/null @@ -1,30 +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: e3fb79524faca40478c0844c24e542f7, type: 3} - m_Name: HandTrackedPoseInteractionMappingProfile - m_EditorClassIdentifier: - interactionMapping: - description: Tracked Pose - stateChangeType: 0 - axisType: 1 - inputType: 28 - inputAction: - profileGuid: 399335ccc89c4d12b79f3539ca7771db - id: 17 - description: Tracked Hand Pose - axisConstraint: 1 - keyCode: 0 - inputName: - axisCodeX: - axisCodeY: - inputProcessors: [] - pointerProfiles: [] diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/HandTrackedPoseInteractionMappingProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/HandTrackedPoseInteractionMappingProfile.asset.meta deleted file mode 100644 index afc8744f..00000000 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/HandTrackedPoseInteractionMappingProfile.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 84ae5012fb31f1945b5be6a71bedfd88 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/MixedRealityInputActionsProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/MixedRealityInputActionsProfile.asset index c995a9ed..17c79ff3 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/MixedRealityInputActionsProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/MixedRealityInputActionsProfile.asset @@ -77,7 +77,3 @@ MonoBehaviour: id: 16 description: Grip axisConstraint: 2 - - profileGuid: 399335ccc89c4d12b79f3539ca7771db - id: 17 - description: Tracked Hand Pose - axisConstraint: 1 From e78f207292315d47512a04d10ab31c8583dc2442 Mon Sep 17 00:00:00 2001 From: Dino Fejzagic Date: Tue, 16 Jun 2020 01:19:44 +0200 Subject: [PATCH 72/78] Fix hand controller profiles default mappings --- .../HandControllers/LeftMixedRealityHandControllerProfile.asset | 1 - .../HandControllers/RightMixedRealityHandControllerProfile.asset | 1 - .../LeftSimulatedMixedRealityHandControllerProfile.asset | 1 - .../RightSimulatedMixedRealityHandControllerProfile.asset | 1 - 4 files changed, 4 deletions(-) diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/LeftMixedRealityHandControllerProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/LeftMixedRealityHandControllerProfile.asset index 7a9ad25b..228bcea7 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/LeftMixedRealityHandControllerProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/LeftMixedRealityHandControllerProfile.asset @@ -25,4 +25,3 @@ MonoBehaviour: - {fileID: 11400000, guid: 8e01cb476d731534093fe5edd227c54c, type: 2} - {fileID: 11400000, guid: b24f94bd93cab98498809436cb5b685f, type: 2} - {fileID: 11400000, guid: 80556dee026997f4ba146ffda4710f79, type: 2} - - {fileID: 11400000, guid: 84ae5012fb31f1945b5be6a71bedfd88, type: 2} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RightMixedRealityHandControllerProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RightMixedRealityHandControllerProfile.asset index 83fa92e4..5a0d1b8f 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RightMixedRealityHandControllerProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RightMixedRealityHandControllerProfile.asset @@ -25,4 +25,3 @@ MonoBehaviour: - {fileID: 11400000, guid: 8e01cb476d731534093fe5edd227c54c, type: 2} - {fileID: 11400000, guid: b24f94bd93cab98498809436cb5b685f, type: 2} - {fileID: 11400000, guid: 80556dee026997f4ba146ffda4710f79, type: 2} - - {fileID: 11400000, guid: 84ae5012fb31f1945b5be6a71bedfd88, type: 2} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/LeftSimulatedMixedRealityHandControllerProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/LeftSimulatedMixedRealityHandControllerProfile.asset index 46e0626c..352171fb 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/LeftSimulatedMixedRealityHandControllerProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/LeftSimulatedMixedRealityHandControllerProfile.asset @@ -25,7 +25,6 @@ MonoBehaviour: - {fileID: 11400000, guid: 8e01cb476d731534093fe5edd227c54c, type: 2} - {fileID: 11400000, guid: b24f94bd93cab98498809436cb5b685f, type: 2} - {fileID: 11400000, guid: 80556dee026997f4ba146ffda4710f79, type: 2} - - {fileID: 11400000, guid: 84ae5012fb31f1945b5be6a71bedfd88, type: 2} - {fileID: 11400000, guid: 65fe769960045eb4284e122669355d0f, type: 2} - {fileID: 11400000, guid: 7a31aa9670c8b0046ab22a9a8c86aabd, type: 2} - {fileID: 11400000, guid: 3265960ea5cd94f499bf02eb746a79af, type: 2} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/RightSimulatedMixedRealityHandControllerProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/RightSimulatedMixedRealityHandControllerProfile.asset index aeb515ca..717c611a 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/RightSimulatedMixedRealityHandControllerProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/RightSimulatedMixedRealityHandControllerProfile.asset @@ -25,7 +25,6 @@ MonoBehaviour: - {fileID: 11400000, guid: 8e01cb476d731534093fe5edd227c54c, type: 2} - {fileID: 11400000, guid: b24f94bd93cab98498809436cb5b685f, type: 2} - {fileID: 11400000, guid: 80556dee026997f4ba146ffda4710f79, type: 2} - - {fileID: 11400000, guid: 84ae5012fb31f1945b5be6a71bedfd88, type: 2} - {fileID: 11400000, guid: 65fe769960045eb4284e122669355d0f, type: 2} - {fileID: 11400000, guid: 7a31aa9670c8b0046ab22a9a8c86aabd, type: 2} - {fileID: 11400000, guid: 3265960ea5cd94f499bf02eb746a79af, type: 2} From 4c94422e4982fd7e5b43f186d685a801897bed87 Mon Sep 17 00:00:00 2001 From: Dino Fejzagic Date: Wed, 17 Jun 2020 20:23:53 +0200 Subject: [PATCH 73/78] Set graphics quality to highest for vr devices --- .../CameraSystem/MixedRealityCameraDataProviderProfile.asset | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/CameraSystem/MixedRealityCameraDataProviderProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/CameraSystem/MixedRealityCameraDataProviderProfile.asset index 19e3f005..8eeaef9d 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/CameraSystem/MixedRealityCameraDataProviderProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/CameraSystem/MixedRealityCameraDataProviderProfile.asset @@ -16,7 +16,7 @@ MonoBehaviour: nearClipPlaneOpaqueDisplay: 0.1 cameraClearFlagsOpaqueDisplay: 1 backgroundColorOpaqueDisplay: {r: 0, g: 0, b: 0, a: 1} - opaqueQualityLevel: 0 + opaqueQualityLevel: 5 nearClipPlaneTransparentDisplay: 0.2 cameraClearFlagsTransparentDisplay: 2 backgroundColorTransparentDisplay: {r: 0, g: 0, b: 0, a: 0} From a10fc6ee703614ccdac1f5483e0af7dd7b84d20a Mon Sep 17 00:00:00 2001 From: Dino Fejzagic Date: Fri, 19 Jun 2020 19:14:52 +0200 Subject: [PATCH 74/78] Fix interaction mappings for hand controllers --- ...ftHandGripInteractionMappingProfile.asset} | 2 +- ...dGripInteractionMappingProfile.asset.meta} | 0 ...ndGripPoseInteractionMappingProfile.asset} | 2 +- ...pPoseInteractionMappingProfile.asset.meta} | 0 ...FingerPoseInteractionMappingProfile.asset} | 2 +- ...rPoseInteractionMappingProfile.asset.meta} | 0 ...tHandPointInteractionMappingProfile.asset} | 2 +- ...dPointInteractionMappingProfile.asset.meta | 8 +++++ ...HandSelectInteractionMappingProfile.asset} | 2 +- ...SelectInteractionMappingProfile.asset.meta | 8 +++++ ...ointerPoseInteractionMappingProfile.asset} | 2 +- ...rPoseInteractionMappingProfile.asset.meta} | 0 ...ghtHandGripInteractionMappingProfile.asset | 30 ++++++++++++++++++ ...ndGripInteractionMappingProfile.asset.meta | 8 +++++ ...andGripPoseInteractionMappingProfile.asset | 30 ++++++++++++++++++ ...ipPoseInteractionMappingProfile.asset.meta | 8 +++++ ...xFingerPoseInteractionMappingProfile.asset | 31 +++++++++++++++++++ ...erPoseInteractionMappingProfile.asset.meta | 8 +++++ ...htHandPointInteractionMappingProfile.asset | 30 ++++++++++++++++++ ...PointInteractionMappingProfile.asset.meta} | 0 ...tHandSelectInteractionMappingProfile.asset | 30 ++++++++++++++++++ ...electInteractionMappingProfile.asset.meta} | 0 ...PointerPoseInteractionMappingProfile.asset | 31 +++++++++++++++++++ ...erPoseInteractionMappingProfile.asset.meta | 8 +++++ ...eftMixedRealityHandControllerProfile.asset | 4 +-- ...ghtMixedRealityHandControllerProfile.asset | 8 ++--- ...tedMixedRealityHandControllerProfile.asset | 4 +-- ...tedMixedRealityHandControllerProfile.asset | 8 ++--- 28 files changed, 248 insertions(+), 18 deletions(-) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/{HandGripInteractionMappingProfile.asset => LeftHandGripInteractionMappingProfile.asset} (93%) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/{HandGripInteractionMappingProfile.asset.meta => LeftHandGripInteractionMappingProfile.asset.meta} (100%) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/{HandGripPoseInteractionMappingProfile.asset => LeftHandGripPoseInteractionMappingProfile.asset} (93%) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/{HandGripPoseInteractionMappingProfile.asset.meta => LeftHandGripPoseInteractionMappingProfile.asset.meta} (100%) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/{HandIndexFingerPoseInteractionMappingProfile.asset => LeftHandIndexFingerPoseInteractionMappingProfile.asset} (93%) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/{HandIndexFingerPoseInteractionMappingProfile.asset.meta => LeftHandIndexFingerPoseInteractionMappingProfile.asset.meta} (100%) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/{HandPointInteractionMappingProfile.asset => LeftHandPointInteractionMappingProfile.asset} (93%) create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/LeftHandPointInteractionMappingProfile.asset.meta rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/{HandSelectInteractionMappingProfile.asset => LeftHandSelectInteractionMappingProfile.asset} (93%) create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/LeftHandSelectInteractionMappingProfile.asset.meta rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/{HandSpatialPointerPoseInteractionMappingProfile.asset => LeftHandSpatialPointerPoseInteractionMappingProfile.asset} (92%) rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/{HandSpatialPointerPoseInteractionMappingProfile.asset.meta => LeftHandSpatialPointerPoseInteractionMappingProfile.asset.meta} (100%) create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/RightHandGripInteractionMappingProfile.asset create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/RightHandGripInteractionMappingProfile.asset.meta create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/RightHandGripPoseInteractionMappingProfile.asset create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/RightHandGripPoseInteractionMappingProfile.asset.meta create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/RightHandIndexFingerPoseInteractionMappingProfile.asset create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/RightHandIndexFingerPoseInteractionMappingProfile.asset.meta create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/RightHandPointInteractionMappingProfile.asset rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/{HandPointInteractionMappingProfile.asset.meta => RightHandPointInteractionMappingProfile.asset.meta} (100%) create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/RightHandSelectInteractionMappingProfile.asset rename XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/{HandSelectInteractionMappingProfile.asset.meta => RightHandSelectInteractionMappingProfile.asset.meta} (100%) create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/RightHandSpatialPointerPoseInteractionMappingProfile.asset create mode 100644 XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/RightHandSpatialPointerPoseInteractionMappingProfile.asset.meta diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/HandGripInteractionMappingProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/LeftHandGripInteractionMappingProfile.asset similarity index 93% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/HandGripInteractionMappingProfile.asset rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/LeftHandGripInteractionMappingProfile.asset index a8355cc3..90afed87 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/HandGripInteractionMappingProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/LeftHandGripInteractionMappingProfile.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: e3fb79524faca40478c0844c24e542f7, type: 3} - m_Name: HandGripInteractionMappingProfile + m_Name: LeftHandGripInteractionMappingProfile m_EditorClassIdentifier: interactionMapping: description: Grip diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/HandGripInteractionMappingProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/LeftHandGripInteractionMappingProfile.asset.meta similarity index 100% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/HandGripInteractionMappingProfile.asset.meta rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/LeftHandGripInteractionMappingProfile.asset.meta diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/HandGripPoseInteractionMappingProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/LeftHandGripPoseInteractionMappingProfile.asset similarity index 93% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/HandGripPoseInteractionMappingProfile.asset rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/LeftHandGripPoseInteractionMappingProfile.asset index 06730a13..73d87443 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/HandGripPoseInteractionMappingProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/LeftHandGripPoseInteractionMappingProfile.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: e3fb79524faca40478c0844c24e542f7, type: 3} - m_Name: HandGripPoseInteractionMappingProfile + m_Name: LeftHandGripPoseInteractionMappingProfile m_EditorClassIdentifier: interactionMapping: description: Grip Pose diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/HandGripPoseInteractionMappingProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/LeftHandGripPoseInteractionMappingProfile.asset.meta similarity index 100% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/HandGripPoseInteractionMappingProfile.asset.meta rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/LeftHandGripPoseInteractionMappingProfile.asset.meta diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/HandIndexFingerPoseInteractionMappingProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/LeftHandIndexFingerPoseInteractionMappingProfile.asset similarity index 93% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/HandIndexFingerPoseInteractionMappingProfile.asset rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/LeftHandIndexFingerPoseInteractionMappingProfile.asset index c91474a8..a6f161b4 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/HandIndexFingerPoseInteractionMappingProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/LeftHandIndexFingerPoseInteractionMappingProfile.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: e3fb79524faca40478c0844c24e542f7, type: 3} - m_Name: HandIndexFingerPoseInteractionMappingProfile + m_Name: LeftHandIndexFingerPoseInteractionMappingProfile m_EditorClassIdentifier: interactionMapping: description: Index Finger Pose diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/HandIndexFingerPoseInteractionMappingProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/LeftHandIndexFingerPoseInteractionMappingProfile.asset.meta similarity index 100% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/HandIndexFingerPoseInteractionMappingProfile.asset.meta rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/LeftHandIndexFingerPoseInteractionMappingProfile.asset.meta diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/HandPointInteractionMappingProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/LeftHandPointInteractionMappingProfile.asset similarity index 93% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/HandPointInteractionMappingProfile.asset rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/LeftHandPointInteractionMappingProfile.asset index 18821173..5da71197 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/HandPointInteractionMappingProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/LeftHandPointInteractionMappingProfile.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: e3fb79524faca40478c0844c24e542f7, type: 3} - m_Name: HandPointInteractionMappingProfile + m_Name: LeftHandPointInteractionMappingProfile m_EditorClassIdentifier: interactionMapping: description: Point diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/LeftHandPointInteractionMappingProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/LeftHandPointInteractionMappingProfile.asset.meta new file mode 100644 index 00000000..0d37b8d8 --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/LeftHandPointInteractionMappingProfile.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 96140c34e5c8322468a744646a7b64fe +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/HandSelectInteractionMappingProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/LeftHandSelectInteractionMappingProfile.asset similarity index 93% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/HandSelectInteractionMappingProfile.asset rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/LeftHandSelectInteractionMappingProfile.asset index 38dce412..ae7878a3 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/HandSelectInteractionMappingProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/LeftHandSelectInteractionMappingProfile.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: e3fb79524faca40478c0844c24e542f7, type: 3} - m_Name: HandSelectInteractionMappingProfile + m_Name: LeftHandSelectInteractionMappingProfile m_EditorClassIdentifier: interactionMapping: description: Select diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/LeftHandSelectInteractionMappingProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/LeftHandSelectInteractionMappingProfile.asset.meta new file mode 100644 index 00000000..ff6b109c --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/LeftHandSelectInteractionMappingProfile.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ac477884d2650664bab2f52184673eee +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/HandSpatialPointerPoseInteractionMappingProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/LeftHandSpatialPointerPoseInteractionMappingProfile.asset similarity index 92% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/HandSpatialPointerPoseInteractionMappingProfile.asset rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/LeftHandSpatialPointerPoseInteractionMappingProfile.asset index af4d831e..a46141c2 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/HandSpatialPointerPoseInteractionMappingProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/LeftHandSpatialPointerPoseInteractionMappingProfile.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: e3fb79524faca40478c0844c24e542f7, type: 3} - m_Name: HandSpatialPointerPoseInteractionMappingProfile + m_Name: LeftHandSpatialPointerPoseInteractionMappingProfile m_EditorClassIdentifier: interactionMapping: description: Spatial Pointer Pose diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/HandSpatialPointerPoseInteractionMappingProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/LeftHandSpatialPointerPoseInteractionMappingProfile.asset.meta similarity index 100% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/HandSpatialPointerPoseInteractionMappingProfile.asset.meta rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/LeftHandSpatialPointerPoseInteractionMappingProfile.asset.meta diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/RightHandGripInteractionMappingProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/RightHandGripInteractionMappingProfile.asset new file mode 100644 index 00000000..cb400ef4 --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/RightHandGripInteractionMappingProfile.asset @@ -0,0 +1,30 @@ +%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: e3fb79524faca40478c0844c24e542f7, type: 3} + m_Name: RightHandGripInteractionMappingProfile + m_EditorClassIdentifier: + interactionMapping: + description: Grip + stateChangeType: 0 + axisType: 2 + inputType: 13 + inputAction: + profileGuid: 399335ccc89c4d12b79f3539ca7771db + id: 16 + description: Grip + axisConstraint: 2 + keyCode: 0 + inputName: + axisCodeX: + axisCodeY: + inputProcessors: [] + pointerProfiles: [] diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/RightHandGripInteractionMappingProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/RightHandGripInteractionMappingProfile.asset.meta new file mode 100644 index 00000000..911d00ca --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/RightHandGripInteractionMappingProfile.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ff17201622b23b64f8065fd2e8a79b5a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/RightHandGripPoseInteractionMappingProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/RightHandGripPoseInteractionMappingProfile.asset new file mode 100644 index 00000000..71208b33 --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/RightHandGripPoseInteractionMappingProfile.asset @@ -0,0 +1,30 @@ +%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: e3fb79524faca40478c0844c24e542f7, type: 3} + m_Name: RightHandGripPoseInteractionMappingProfile + m_EditorClassIdentifier: + interactionMapping: + description: Grip Pose + stateChangeType: 0 + axisType: 7 + inputType: 14 + inputAction: + profileGuid: 399335ccc89c4d12b79f3539ca7771db + id: 3 + description: Grip Pose + axisConstraint: 7 + keyCode: 0 + inputName: + axisCodeX: + axisCodeY: + inputProcessors: [] + pointerProfiles: [] diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/RightHandGripPoseInteractionMappingProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/RightHandGripPoseInteractionMappingProfile.asset.meta new file mode 100644 index 00000000..b72bc06c --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/RightHandGripPoseInteractionMappingProfile.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 31223e437c1f97a498a229666eb1d6e2 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/RightHandIndexFingerPoseInteractionMappingProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/RightHandIndexFingerPoseInteractionMappingProfile.asset new file mode 100644 index 00000000..0a01bce6 --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/RightHandIndexFingerPoseInteractionMappingProfile.asset @@ -0,0 +1,31 @@ +%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: e3fb79524faca40478c0844c24e542f7, type: 3} + m_Name: RightHandIndexFingerPoseInteractionMappingProfile + m_EditorClassIdentifier: + interactionMapping: + description: Index Finger Pose + stateChangeType: 0 + axisType: 7 + inputType: 33 + inputAction: + profileGuid: 399335ccc89c4d12b79f3539ca7771db + id: 15 + description: Index Finger Pose + axisConstraint: 7 + keyCode: 0 + inputName: + axisCodeX: + axisCodeY: + inputProcessors: [] + pointerProfiles: + - {fileID: 11400000, guid: 57fc2b172a8871344b147342d8444217, type: 2} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/RightHandIndexFingerPoseInteractionMappingProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/RightHandIndexFingerPoseInteractionMappingProfile.asset.meta new file mode 100644 index 00000000..30caa74a --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/RightHandIndexFingerPoseInteractionMappingProfile.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5e2b50bb0283a7a46aa1cb475066855f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/RightHandPointInteractionMappingProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/RightHandPointInteractionMappingProfile.asset new file mode 100644 index 00000000..e307bde8 --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/RightHandPointInteractionMappingProfile.asset @@ -0,0 +1,30 @@ +%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: e3fb79524faca40478c0844c24e542f7, type: 3} + m_Name: RightHandPointInteractionMappingProfile + m_EditorClassIdentifier: + interactionMapping: + description: Point + stateChangeType: 0 + axisType: 2 + inputType: 7 + inputAction: + profileGuid: 00000000000000000000000000000000 + id: 0 + description: None + axisConstraint: 0 + keyCode: 0 + inputName: + axisCodeX: + axisCodeY: + inputProcessors: [] + pointerProfiles: [] diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/HandPointInteractionMappingProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/RightHandPointInteractionMappingProfile.asset.meta similarity index 100% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/HandPointInteractionMappingProfile.asset.meta rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/RightHandPointInteractionMappingProfile.asset.meta diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/RightHandSelectInteractionMappingProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/RightHandSelectInteractionMappingProfile.asset new file mode 100644 index 00000000..bded999e --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/RightHandSelectInteractionMappingProfile.asset @@ -0,0 +1,30 @@ +%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: e3fb79524faca40478c0844c24e542f7, type: 3} + m_Name: RightHandSelectInteractionMappingProfile + m_EditorClassIdentifier: + interactionMapping: + description: Select + stateChangeType: 0 + axisType: 2 + inputType: 25 + inputAction: + profileGuid: 399335ccc89c4d12b79f3539ca7771db + id: 1 + description: Select + axisConstraint: 2 + keyCode: 0 + inputName: + axisCodeX: + axisCodeY: + inputProcessors: [] + pointerProfiles: [] diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/HandSelectInteractionMappingProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/RightHandSelectInteractionMappingProfile.asset.meta similarity index 100% rename from XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/HandSelectInteractionMappingProfile.asset.meta rename to XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/RightHandSelectInteractionMappingProfile.asset.meta diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/RightHandSpatialPointerPoseInteractionMappingProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/RightHandSpatialPointerPoseInteractionMappingProfile.asset new file mode 100644 index 00000000..89f0eb06 --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/RightHandSpatialPointerPoseInteractionMappingProfile.asset @@ -0,0 +1,31 @@ +%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: e3fb79524faca40478c0844c24e542f7, type: 3} + m_Name: RightHandSpatialPointerPoseInteractionMappingProfile + m_EditorClassIdentifier: + interactionMapping: + description: Spatial Pointer Pose + stateChangeType: 0 + axisType: 7 + inputType: 3 + inputAction: + profileGuid: 399335ccc89c4d12b79f3539ca7771db + id: 4 + description: Pointer Pose + axisConstraint: 7 + keyCode: 0 + inputName: + axisCodeX: + axisCodeY: + inputProcessors: [] + pointerProfiles: + - {fileID: 11400000, guid: aa72cf2eb48c6fe44a827f7d68ce3e44, type: 2} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/RightHandSpatialPointerPoseInteractionMappingProfile.asset.meta b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/RightHandSpatialPointerPoseInteractionMappingProfile.asset.meta new file mode 100644 index 00000000..27727289 --- /dev/null +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/CommonInteractionMappingProfiles/RightHandSpatialPointerPoseInteractionMappingProfile.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e47d35b7a8a79774c8f8386e9350cb41 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/LeftMixedRealityHandControllerProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/LeftMixedRealityHandControllerProfile.asset index 228bcea7..66a4f22d 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/LeftMixedRealityHandControllerProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/LeftMixedRealityHandControllerProfile.asset @@ -20,8 +20,8 @@ MonoBehaviour: useCustomInteractions: 0 interactionMappingProfiles: - {fileID: 11400000, guid: b7f65e3d3581e3d46ba01ecb4fedd827, type: 2} - - {fileID: 11400000, guid: 1fd0c5cd50876514bb0027af902ed920, type: 2} - - {fileID: 11400000, guid: 118d8e619c1393b49bbf1d387651668c, type: 2} + - {fileID: 11400000, guid: ac477884d2650664bab2f52184673eee, type: 2} + - {fileID: 11400000, guid: 96140c34e5c8322468a744646a7b64fe, type: 2} - {fileID: 11400000, guid: 8e01cb476d731534093fe5edd227c54c, type: 2} - {fileID: 11400000, guid: b24f94bd93cab98498809436cb5b685f, type: 2} - {fileID: 11400000, guid: 80556dee026997f4ba146ffda4710f79, type: 2} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RightMixedRealityHandControllerProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RightMixedRealityHandControllerProfile.asset index 5a0d1b8f..acf0291d 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RightMixedRealityHandControllerProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/RightMixedRealityHandControllerProfile.asset @@ -19,9 +19,9 @@ MonoBehaviour: type: 2} useCustomInteractions: 0 interactionMappingProfiles: - - {fileID: 11400000, guid: b7f65e3d3581e3d46ba01ecb4fedd827, type: 2} + - {fileID: 11400000, guid: e47d35b7a8a79774c8f8386e9350cb41, type: 2} - {fileID: 11400000, guid: 1fd0c5cd50876514bb0027af902ed920, type: 2} - {fileID: 11400000, guid: 118d8e619c1393b49bbf1d387651668c, type: 2} - - {fileID: 11400000, guid: 8e01cb476d731534093fe5edd227c54c, type: 2} - - {fileID: 11400000, guid: b24f94bd93cab98498809436cb5b685f, type: 2} - - {fileID: 11400000, guid: 80556dee026997f4ba146ffda4710f79, type: 2} + - {fileID: 11400000, guid: ff17201622b23b64f8065fd2e8a79b5a, type: 2} + - {fileID: 11400000, guid: 31223e437c1f97a498a229666eb1d6e2, type: 2} + - {fileID: 11400000, guid: 5e2b50bb0283a7a46aa1cb475066855f, type: 2} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/LeftSimulatedMixedRealityHandControllerProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/LeftSimulatedMixedRealityHandControllerProfile.asset index 352171fb..bb423d7c 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/LeftSimulatedMixedRealityHandControllerProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/LeftSimulatedMixedRealityHandControllerProfile.asset @@ -20,8 +20,8 @@ MonoBehaviour: useCustomInteractions: 0 interactionMappingProfiles: - {fileID: 11400000, guid: b7f65e3d3581e3d46ba01ecb4fedd827, type: 2} - - {fileID: 11400000, guid: 1fd0c5cd50876514bb0027af902ed920, type: 2} - - {fileID: 11400000, guid: 118d8e619c1393b49bbf1d387651668c, type: 2} + - {fileID: 11400000, guid: ac477884d2650664bab2f52184673eee, type: 2} + - {fileID: 11400000, guid: 96140c34e5c8322468a744646a7b64fe, type: 2} - {fileID: 11400000, guid: 8e01cb476d731534093fe5edd227c54c, type: 2} - {fileID: 11400000, guid: b24f94bd93cab98498809436cb5b685f, type: 2} - {fileID: 11400000, guid: 80556dee026997f4ba146ffda4710f79, type: 2} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/RightSimulatedMixedRealityHandControllerProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/RightSimulatedMixedRealityHandControllerProfile.asset index 717c611a..f8f2904d 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/RightSimulatedMixedRealityHandControllerProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Profiles~/Input/DataProviders/HandControllers/Simulated/RightSimulatedMixedRealityHandControllerProfile.asset @@ -19,12 +19,12 @@ MonoBehaviour: type: 2} useCustomInteractions: 0 interactionMappingProfiles: - - {fileID: 11400000, guid: b7f65e3d3581e3d46ba01ecb4fedd827, type: 2} + - {fileID: 11400000, guid: e47d35b7a8a79774c8f8386e9350cb41, type: 2} - {fileID: 11400000, guid: 1fd0c5cd50876514bb0027af902ed920, type: 2} - {fileID: 11400000, guid: 118d8e619c1393b49bbf1d387651668c, type: 2} - - {fileID: 11400000, guid: 8e01cb476d731534093fe5edd227c54c, type: 2} - - {fileID: 11400000, guid: b24f94bd93cab98498809436cb5b685f, type: 2} - - {fileID: 11400000, guid: 80556dee026997f4ba146ffda4710f79, type: 2} + - {fileID: 11400000, guid: ff17201622b23b64f8065fd2e8a79b5a, type: 2} + - {fileID: 11400000, guid: ff17201622b23b64f8065fd2e8a79b5a, type: 2} + - {fileID: 11400000, guid: 5e2b50bb0283a7a46aa1cb475066855f, type: 2} - {fileID: 11400000, guid: 65fe769960045eb4284e122669355d0f, type: 2} - {fileID: 11400000, guid: 7a31aa9670c8b0046ab22a9a8c86aabd, type: 2} - {fileID: 11400000, guid: 3265960ea5cd94f499bf02eb746a79af, type: 2} From fc9d4a74d42e0c5705fc29b96f317577de7f16b6 Mon Sep 17 00:00:00 2001 From: Dino Fejzagic Date: Sat, 20 Jun 2020 20:41:11 +0200 Subject: [PATCH 75/78] Fix near pointer target not updated --- .../Pointers/HandControllerNearPointer.prefab | 481 +----------------- .../Scripts/Pointers/BaseControllerPointer.cs | 33 +- .../UX/Scripts/Pointers/HandNearPointer.cs | 41 +- 3 files changed, 58 insertions(+), 497 deletions(-) diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/HandControllerNearPointer.prefab b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/HandControllerNearPointer.prefab index ae5f9381..b468f24f 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/HandControllerNearPointer.prefab +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Pointers/HandControllerNearPointer.prefab @@ -9,11 +9,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7753987110195811991} - - component: {fileID: 3795335034429809122} - - component: {fileID: 8768622563881961207} - component: {fileID: 7751017874127228716} - - component: {fileID: 4707942166383463581} - - component: {fileID: 9125729371685859888} - component: {fileID: -3895640563058625731} - component: {fileID: -5168941210383110042} m_Layer: 0 @@ -37,113 +33,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &3795335034429809122 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7751017874127228719} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c85a4527bbdd25647a62ec06e8d2daf3, type: 3} - m_Name: - m_EditorClassIdentifier: - lineStartClamp: 0.0001 - lineEndClamp: 0.9999 - customLineTransform: {fileID: 0} - loops: 0 - transformMode: 1 - rotationMode: 1 - flipUpVector: 0 - originOffset: {x: 0, y: 0, z: 0} - manualUpVectorBlend: 0 - manualUpVectors: - - {x: 0, y: 1, z: 0} - - {x: 0, y: 1, z: 0} - - {x: 0, y: 1, z: 0} - velocitySearchRange: 0.02 - distorters: - - {fileID: 8768622563881961207} - distortionMode: 0 - distortionStrength: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - uniformDistortionStrength: 1 - inertia: - inertia: 10 - dampen: 6 - seekTargetStrength: 1.5 - p1Target: {x: 0, y: 0, z: 0.33} - p2Target: {x: 0, y: 0, z: 0.66} - controlPoints: - Point1: {x: 0, y: 0, z: 0} - Point2: {x: 0, y: 0, z: 0.33} - Point3: {x: 0, y: 0, z: 0.66} - Point4: {x: 0, y: 0, z: 1} - useLocalTangentPoints: 0 ---- !u!114 &8768622563881961207 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7751017874127228719} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 61988acbae5840069797ec6d990d8f50, type: 3} - m_Name: - m_EditorClassIdentifier: - distortOrder: 0 - distortStrength: 1 - localCenterOfGravity: {x: 0, y: 0, z: 0} - axisStrength: {x: 1, y: 1, z: 1} - radius: 0.5 - gravityStrength: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 --- !u!114 &7751017874127228716 MonoBehaviour: m_ObjectHideFlags: 0 @@ -179,380 +68,12 @@ MonoBehaviour: description: Select axisConstraint: 2 requiresHoldAction: 0 - enablePointerOnStart: 0 + enablePointerOnStart: 1 interactionMode: 2 nearInteractionCollider: {fileID: -5168941210383110042} overrideGlobalPointerExtent: 0 defaultPointerExtent: 0.5 pointerOrientation: 0 - lineColorSelected: - serializedVersion: 2 - key0: {r: 1, g: 1, b: 1, a: 0} - key1: {r: 0.8490566, g: 0.8490566, b: 0.8490566, a: 1} - key2: {r: 0, g: 0, b: 0, a: 1} - key3: {r: 0, g: 0, b: 0, a: 0} - key4: {r: 0, g: 0, b: 0, a: 0} - key5: {r: 0, g: 0, b: 0, a: 0} - key6: {r: 0, g: 0, b: 0, a: 0} - key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 - ctime1: 65535 - ctime2: 0 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 3277 - atime2: 49151 - atime3: 65535 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_Mode: 0 - m_NumColorKeys: 2 - m_NumAlphaKeys: 4 - lineColorValid: - serializedVersion: 2 - key0: {r: 1, g: 1, b: 1, a: 0} - key1: {r: 0.14122522, g: 1, b: 0, a: 1} - key2: {r: 0, g: 0, b: 0, a: 1} - key3: {r: 0, g: 0, b: 0, a: 0} - key4: {r: 0, g: 0, b: 0, a: 0} - key5: {r: 0, g: 0, b: 0, a: 0} - key6: {r: 0, g: 0, b: 0, a: 0} - key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 - ctime1: 65535 - ctime2: 0 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 3277 - atime2: 49151 - atime3: 65535 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_Mode: 0 - m_NumColorKeys: 2 - m_NumAlphaKeys: 4 - lineColorInvalid: - serializedVersion: 2 - key0: {r: 1, g: 1, b: 1, a: 0} - key1: {r: 1, g: 0, b: 0, a: 1} - key2: {r: 0, g: 0, b: 0, a: 1} - key3: {r: 0, g: 0, b: 0, a: 0} - key4: {r: 0, g: 0, b: 0, a: 0} - key5: {r: 0, g: 0, b: 0, a: 0} - key6: {r: 0, g: 0, b: 0, a: 0} - key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 - ctime1: 65535 - ctime2: 0 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 3277 - atime2: 49151 - atime3: 65535 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_Mode: 0 - m_NumColorKeys: 2 - m_NumAlphaKeys: 4 - lineColorNoTarget: - serializedVersion: 2 - key0: {r: 0.754717, g: 0.754717, b: 0.754717, a: 0} - key1: {r: 0.754717, g: 0.754717, b: 0.754717, a: 1} - key2: {r: 0, g: 0, b: 0, a: 0} - key3: {r: 0, g: 0, b: 0, a: 0} - key4: {r: 0, g: 0, b: 0, a: 0} - key5: {r: 0, g: 0, b: 0, a: 0} - key6: {r: 0, g: 0, b: 0, a: 0} - key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 - ctime1: 65535 - ctime2: 0 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 3277 - atime2: 65535 - atime3: 0 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_Mode: 0 - m_NumColorKeys: 2 - m_NumAlphaKeys: 3 - lineColorLockFocus: - serializedVersion: 2 - key0: {r: 0, g: 0.9806142, b: 1, a: 0} - key1: {r: 0, g: 0.9806142, b: 1, a: 1} - key2: {r: 0, g: 0, b: 0, a: 1} - key3: {r: 0, g: 0, b: 0, a: 0} - key4: {r: 0, g: 0, b: 0, a: 0} - key5: {r: 0, g: 0, b: 0, a: 0} - key6: {r: 0, g: 0, b: 0, a: 0} - key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 - ctime1: 65535 - ctime2: 0 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 3277 - atime2: 49151 - atime3: 65535 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_Mode: 0 - m_NumColorKeys: 2 - m_NumAlphaKeys: 4 - lineCastResolution: 2 - lineBase: {fileID: 3795335034429809122} - lineRenderers: - - {fileID: 9125729371685859888} ---- !u!120 &4707942166383463581 -LineRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7751017874127228719} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 0 - m_MotionVectors: 0 - m_LightProbeUsage: 0 - m_ReflectionProbeUsage: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 49bbec7a7ebd47c786bf06ad0977ec1c, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Positions: - - {x: 0, y: 0, z: 0.00009899999} - - {x: 0, y: 0, z: 0.06608878} - - {x: 0, y: 0, z: 0.13209635} - - {x: 0, y: 0, z: 0.19813946} - - {x: 0, y: 0, z: 0.26423594} - - {x: 0, y: 0, z: 0.3304035} - - {x: 0, y: 0, z: 0.3966599} - - {x: 0, y: 0, z: 0.46302295} - - {x: 0, y: 0, z: 0.52951044} - - {x: 0, y: 0, z: 0.59614} - - {x: 0, y: 0, z: 0.66292953} - - {x: 0, y: 0, z: 0.7298968} - - {x: 0, y: 0, z: 0.7970595} - - {x: 0, y: 0, z: 0.8644354} - - {x: 0, y: 0, z: 0.93204236} - - {x: 0, y: 0, z: 0.999898} - m_Parameters: - serializedVersion: 3 - widthMultiplier: 0.01 - widthCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0.2 - inSlope: 0 - outSlope: 0 - tangentMode: 34 - weightedMode: 0 - inWeight: 0 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0.2 - inSlope: 0 - outSlope: 0 - tangentMode: 34 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - colorGradient: - serializedVersion: 2 - key0: {r: 1, g: 1, b: 1, a: 0} - key1: {r: 0.4716981, g: 0.4716981, b: 0.4716981, a: 1} - key2: {r: 0, g: 0, b: 0, a: 1} - key3: {r: 0, g: 0, b: 0, a: 0} - key4: {r: 0, g: 0, b: 0, a: 1} - key5: {r: 0, g: 0, b: 0, a: 0} - key6: {r: 0, g: 0, b: 0, a: 0} - key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 - ctime1: 65535 - ctime2: 0 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 9638 - atime2: 53970 - atime3: 65535 - atime4: 65535 - atime5: 0 - atime6: 0 - atime7: 0 - m_Mode: 0 - m_NumColorKeys: 2 - m_NumAlphaKeys: 4 - numCornerVertices: 8 - numCapVertices: 8 - alignment: 0 - textureMode: 3 - shadowBias: 0 - generateLightingData: 0 - m_UseWorldSpace: 1 - m_Loop: 0 ---- !u!114 &9125729371685859888 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7751017874127228719} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 01f6e868e3234547a04741fe2c20bd0d, type: 3} - m_Name: - m_EditorClassIdentifier: - lineDataSource: {fileID: 3795335034429809122} - lineColor: - serializedVersion: 2 - key0: {r: 1, g: 1, b: 1, a: 0} - key1: {r: 0.4716981, g: 0.4716981, b: 0.4716981, a: 1} - key2: {r: 0, g: 0, b: 0, a: 1} - key3: {r: 0, g: 0, b: 0, a: 0} - key4: {r: 0, g: 0, b: 0, a: 1} - key5: {r: 0, g: 0, b: 0, a: 0} - key6: {r: 0, g: 0, b: 0, a: 0} - key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 - ctime1: 65535 - ctime2: 0 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 9638 - atime2: 53970 - atime3: 65535 - atime4: 65535 - atime5: 0 - atime6: 0 - atime7: 0 - m_Mode: 0 - m_NumColorKeys: 2 - m_NumAlphaKeys: 4 - lineWidth: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0.2 - inSlope: 0 - outSlope: 0 - tangentMode: 34 - weightedMode: 0 - inWeight: 0 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0.2 - inSlope: 0 - outSlope: 0 - tangentMode: 34 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - widthMultiplier: 0.01 - colorOffset: 0 - widthOffset: 0 - stepMode: 0 - lineStepCount: 16 - pointDistributionMode: 1 - customPointDistributionLength: 0.1 - customPointDistributionCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 1 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 1 - inSlope: 1 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - lineMaterial: {fileID: 2100000, guid: 49bbec7a7ebd47c786bf06ad0977ec1c, type: 2} - roundedEdges: 1 - roundedCaps: 1 - lineRenderer: {fileID: 4707942166383463581} --- !u!54 &-3895640563058625731 Rigidbody: m_ObjectHideFlags: 0 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/BaseControllerPointer.cs b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/BaseControllerPointer.cs index 400c5ee2..2097b8e8 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/BaseControllerPointer.cs +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/BaseControllerPointer.cs @@ -89,7 +89,11 @@ public Transform RaycastOrigin private bool lateRegisterTeleport = true; - private GameObject capturedNearInteractionObject = null; + /// + /// Gets the currently captured near interaction object. Only applicable + /// if or . + /// + protected GameObject CapturedNearInteractionObject { get; private set; } = null; /// /// The forward direction of the targeting ray @@ -184,7 +188,14 @@ protected virtual void OnTriggerEnter(Collider other) nearInteractionCollider != null && other.IsValidCollision(PointerRaycastLayerMasksOverride ?? MixedRealityToolkit.InputSystem.FocusProvider.GlobalPointerRaycastLayerMasks)) { - capturedNearInteractionObject = other.gameObject; + CapturedNearInteractionObject = other.gameObject; + + // Force update the focus provider so the focused target + // gets updated before raising the event. If we don't update + // the focus provider here, the event will not be raised on the + // capture near interaction object. + MixedRealityToolkit.InputSystem.FocusProvider.Update(); + MixedRealityToolkit.InputSystem.RaiseOnInputDown(InputSourceParent, Handedness, pointerAction); } } @@ -193,8 +204,14 @@ protected virtual void OnTriggerStay(Collider other) { if (InteractionMode.HasFlags(InteractionMode.Near) && nearInteractionCollider != null && - capturedNearInteractionObject == other.gameObject) + CapturedNearInteractionObject == other.gameObject) { + // Force update the focus provider so the focused target + // gets updated before raising the event. If we don't update + // the focus provider here, the event will not be raised on the + // capture near interaction object. + MixedRealityToolkit.InputSystem.FocusProvider.Update(); + MixedRealityToolkit.InputSystem.RaiseOnInputPressed(InputSourceParent, Handedness, pointerAction); } } @@ -203,10 +220,16 @@ protected virtual void OnTriggerExit(Collider other) { if (InteractionMode.HasFlags(InteractionMode.Near) && nearInteractionCollider != null && - capturedNearInteractionObject == other.gameObject) + CapturedNearInteractionObject == other.gameObject) { - capturedNearInteractionObject = null; + // Force update the focus provider so the focused target + // gets updated before raising the event. If we don't update + // the focus provider here, the event will not be raised on the + // capture near interaction object. + MixedRealityToolkit.InputSystem.FocusProvider.Update(); + MixedRealityToolkit.InputSystem.RaiseOnInputUp(InputSourceParent, Handedness, pointerAction); + CapturedNearInteractionObject = null; } } diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandNearPointer.cs b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandNearPointer.cs index 56cfa01b..f981605e 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandNearPointer.cs +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Pointers/HandNearPointer.cs @@ -3,8 +3,8 @@ using UnityEngine; using XRTK.Definitions; -using XRTK.Definitions.Utilities; -using XRTK.EventDatum.Input; +using XRTK.Definitions.Physics; +using XRTK.Extensions; using XRTK.Interfaces.Providers.Controllers.Hands; namespace XRTK.SDK.UX.Pointers @@ -12,29 +12,46 @@ namespace XRTK.SDK.UX.Pointers /// /// Hand controller near interaction pointer. /// - public class HandNearPointer : LinePointer + public class HandNearPointer : BaseControllerPointer { - private bool handIsPinching; + private IMixedRealityHandController handController; /// - public override bool IsInteractionEnabled => base.IsInteractionEnabled && !handIsPinching; + public override bool IsInteractionEnabled => base.IsInteractionEnabled && !HandController.IsPinching; /// public override InteractionMode InteractionMode => InteractionMode.Near; - /// - public override void OnInputChanged(InputEventData eventData) - { - base.OnInputChanged(eventData); + /// + /// Casted reference to the hand controller driving the pointer. + /// + private IMixedRealityHandController HandController => handController ?? (handController = InitializeHandControllerReference()); + private IMixedRealityHandController InitializeHandControllerReference() + { // This pointer type must only be used with hand controllers. - if (!(Controller is IMixedRealityHandController handController)) + if (!(Controller is IMixedRealityHandController controller)) { Debug.LogError($"{nameof(HandNearPointer)} is only for use with {nameof(IMixedRealityHandController)} controllers!", this); - return; + return null; } - handIsPinching = handController.IsPinching; + return controller; + } + + /// + public override void OnPreRaycast() + { + if (Rays == null || Rays.Length > 1) + { + Rays = new RayStep[1]; + } + + var origin = TryGetPointerPosition(out var pointerPosition) ? pointerPosition : Vector3.zero; + var terminus = CapturedNearInteractionObject.IsNull() ? origin + Vector3.forward : origin + CapturedNearInteractionObject.transform.forward; + + Rays[0] = new RayStep(); + Rays[0].UpdateRayStep(ref origin, ref terminus); } } } \ No newline at end of file From d036595bd04b2cbc37aff2986a719cefd47a92e7 Mon Sep 17 00:00:00 2001 From: Dino Fejzagic Date: Wed, 15 Jul 2020 21:12:34 +0200 Subject: [PATCH 76/78] Temporarily change hand prefabs for better debugging --- ...DefaultLeftHandControllerVisualizer.prefab | 156 ++- ...efaultRightHandControllerVisualizer.prefab | 10 + .../Prefabs~/UX/Hands/HandJointGizmo.prefab | 1113 +---------------- 3 files changed, 179 insertions(+), 1100 deletions(-) diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/DefaultLeftHandControllerVisualizer.prefab b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/DefaultLeftHandControllerVisualizer.prefab index 3d861bc6..86d4963b 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/DefaultLeftHandControllerVisualizer.prefab +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/DefaultLeftHandControllerVisualizer.prefab @@ -27,7 +27,9 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] + m_Children: + - {fileID: 4191434239757458300} + - {fileID: 2089245550809874106} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -55,3 +57,155 @@ MonoBehaviour: type: 3} meshModePrefab: {fileID: 1887883006053652, guid: 12df5e0d0c33a444a985de4e29533a24, type: 3} +--- !u!1 &7615510903626891603 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2089245550809874106} + - component: {fileID: 5511067064646238094} + - component: {fileID: 1038253522407150282} + m_Layer: 0 + m_Name: Sphere + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2089245550809874106 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7615510903626891603} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.01779201, y: 0.01779201, z: 0.01779201} + m_Children: [] + m_Father: {fileID: 1355368130211572882} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &5511067064646238094 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7615510903626891603} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &1038253522407150282 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7615510903626891603} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!1001 &4191434239757458001 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1355368130211572882} + m_Modifications: + - target: {fileID: 1370450866519632, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + propertyPath: m_Name + value: HandJointGizmo + objectReference: {fileID: 0} + - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + propertyPath: m_LocalScale.x + value: 0.4 + objectReference: {fileID: 0} + - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + propertyPath: m_LocalScale.y + value: 0.4 + objectReference: {fileID: 0} + - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} + propertyPath: m_LocalScale.z + value: 0.4 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} +--- !u!4 &4191434239757458300 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, + type: 3} + m_PrefabInstance: {fileID: 4191434239757458001} + m_PrefabAsset: {fileID: 0} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/DefaultRightHandControllerVisualizer.prefab b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/DefaultRightHandControllerVisualizer.prefab index 12ca1e6d..cb4ed892 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/DefaultRightHandControllerVisualizer.prefab +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/DefaultRightHandControllerVisualizer.prefab @@ -49,5 +49,15 @@ PrefabInstance: value: objectReference: {fileID: 3866922547383302811, guid: ea935581bf93125478b7586a9a3c3f76, type: 3} + - target: {fileID: 4191434239757458300, guid: 61feeca21178ba54682d3c61ff5f89a1, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2089245550809874106, guid: 61feeca21178ba54682d3c61ff5f89a1, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 61feeca21178ba54682d3c61ff5f89a1, type: 3} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/HandJointGizmo.prefab b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/HandJointGizmo.prefab index 6b7bec77..83eedd37 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/HandJointGizmo.prefab +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/HandJointGizmo.prefab @@ -1,134 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &1001023312899986 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4186140948520772} - m_Layer: 0 - m_Name: polySurface6 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4186140948520772 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1001023312899986} - m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.00006252681, y: 0.00025995207, z: -0.000121954334} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 4131195074314422} - m_Father: {fileID: 4013377268125804} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1012291600991614 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4111614969388694} - m_Layer: 0 - m_Name: transform10 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4111614969388694 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1012291600991614} - m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.00006252681, y: 0.00025995207, z: -0.000121954334} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 4013377268125804} - m_RootOrder: 6 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1016227633610690 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4109460465459574} - m_Layer: 0 - m_Name: transform13 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4109460465459574 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1016227633610690} - m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 4680987130549786} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1058611435578706 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4013377268125804} - m_Layer: 0 - m_Name: pCone6 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4013377268125804 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1058611435578706} - m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.00006252681, y: -0.00025995207, z: 0.000121954334} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 4680987130549786} - - {fileID: 4703719883755212} - - {fileID: 4060342539979694} - - {fileID: 4854407580125384} - - {fileID: 4140881223239102} - - {fileID: 4186140948520772} - - {fileID: 4111614969388694} - m_Father: {fileID: 4607474556101662} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1069666104943182 +--- !u!1 &1370450866519632 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -136,45 +8,45 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4391910669484542} - - component: {fileID: 33867933401133456} - - component: {fileID: 23816222880568950} + - component: {fileID: 4607474556101662} + - component: {fileID: 4466896398402103566} + - component: {fileID: 5301240126761059008} m_Layer: 0 - m_Name: polySurface7 + m_Name: HandJointGizmo m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &4391910669484542 +--- !u!4 &4607474556101662 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1069666104943182} + m_GameObject: {fileID: 1370450866519632} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 0.2, y: 0.2, z: 0.2} m_Children: [] - m_Father: {fileID: 4607474556101662} - m_RootOrder: 11 + m_Father: {fileID: 0} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &33867933401133456 +--- !u!33 &4466896398402103566 MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1069666104943182} + m_GameObject: {fileID: 1370450866519632} m_Mesh: {fileID: 4300000, guid: a481711e38d94bbeaa22998e03d9e773, type: 3} ---- !u!23 &23816222880568950 +--- !u!23 &5301240126761059008 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1069666104943182} + m_GameObject: {fileID: 1370450866519632} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 @@ -207,960 +79,3 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 ---- !u!1 &1090134416363156 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4487561386526946} - m_Layer: 0 - m_Name: pCone2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4487561386526946 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1090134416363156} - m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.0000000011920929, y: 0.055, z: -0.0000000017881393} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 4280833947237478} - m_Father: {fileID: 4607474556101662} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1145850890159610 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4131195074314422} - m_Layer: 0 - m_Name: transform16 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4131195074314422 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1145850890159610} - m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 4186140948520772} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1195144308563246 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4831455789484130} - m_Layer: 0 - m_Name: pCone1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4831455789484130 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1195144308563246} - m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0, y: 0.099999994, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 4094156543883328} - m_Father: {fileID: 4607474556101662} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1212420467150214 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4660560217398952} - m_Layer: 0 - m_Name: pCylinder3 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4660560217398952 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1212420467150214} - m_LocalRotation: {x: 0, y: -0, z: -0.7071068, w: 0.7071068} - m_LocalPosition: {x: -0.049999997, y: 0, z: 0} - m_LocalScale: {x: 0.5, y: 5, z: 0.5} - m_Children: - - {fileID: 4268802020502070} - m_Father: {fileID: 4607474556101662} - m_RootOrder: 8 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1217906579295778 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4459465648329020} - m_Layer: 0 - m_Name: transform7 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4459465648329020 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1217906579295778} - m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.0000000011920929, y: -0.0000000017881393, z: -0.055} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 4020172611768032} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1277368866650346 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4451406195980762} - m_Layer: 0 - m_Name: transform4 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4451406195980762 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1277368866650346} - m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 4064998544505022} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1315706137308178 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4854407580125384} - m_Layer: 0 - m_Name: polySurface4 1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4854407580125384 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1315706137308178} - m_LocalRotation: {x: 0, y: 0, z: 1, w: -6.123234e-17} - m_LocalPosition: {x: -0.00006252681, y: 0.00025995207, z: -0.000121954334} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 4018014694696610} - m_Father: {fileID: 4013377268125804} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1329845897897754 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4094156543883328} - m_Layer: 0 - m_Name: transform2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4094156543883328 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1329845897897754} - m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 4831455789484130} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1352225487113192 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4869651590292830} - m_Layer: 0 - m_Name: pCylinder2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4869651590292830 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1352225487113192} - m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} - m_LocalPosition: {x: -0, y: 0, z: 0.049999997} - m_LocalScale: {x: 0.5, y: 5, z: 0.5} - m_Children: - - {fileID: 4157925468139474} - m_Father: {fileID: 4607474556101662} - m_RootOrder: 7 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1370450866519632 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4607474556101662} - m_Layer: 0 - m_Name: HandJointGizmo - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4607474556101662 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1370450866519632} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.2, y: 0.2, z: 0.2} - m_Children: - - {fileID: 4831455789484130} - - {fileID: 4487561386526946} - - {fileID: 4064998544505022} - - {fileID: 4020172611768032} - - {fileID: 4660288217157578} - - {fileID: 4013377268125804} - - {fileID: 4130678677717830} - - {fileID: 4869651590292830} - - {fileID: 4660560217398952} - - {fileID: 4829329165331362} - - {fileID: 4408134395720264} - - {fileID: 4391910669484542} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1381027257424706 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4140881223239102} - m_Layer: 0 - m_Name: polySurface5 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4140881223239102 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1381027257424706} - m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.00006252681, y: 0.00025995207, z: -0.000121954334} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 4087125247616986} - m_Father: {fileID: 4013377268125804} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1408595393393296 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4087125247616986} - m_Layer: 0 - m_Name: transform15 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4087125247616986 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1408595393393296} - m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 4140881223239102} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1422519149249586 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4076801075672242} - m_Layer: 0 - m_Name: transform5 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4076801075672242 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1422519149249586} - m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 4660288217157578} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1470031561532040 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4456423708130434} - m_Layer: 0 - m_Name: transform14 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4456423708130434 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1470031561532040} - m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 4703719883755212} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1509841376499254 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4130678677717830} - m_Layer: 0 - m_Name: pCylinder1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4130678677717830 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1509841376499254} - m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0, y: 0.049999997, z: 0} - m_LocalScale: {x: 0.5, y: 5, z: 0.5} - m_Children: - - {fileID: 4745674140739456} - m_Father: {fileID: 4607474556101662} - m_RootOrder: 6 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1543222956753698 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4020172611768032} - m_Layer: 0 - m_Name: pCone4 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4020172611768032 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1543222956753698} - m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.0000000011920929, y: 0.0000000017881393, z: 0.055} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 4459465648329020} - m_Father: {fileID: 4607474556101662} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1549795834324088 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4680987130549786} - m_Layer: 0 - m_Name: polySurface1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4680987130549786 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1549795834324088} - m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.00006252681, y: 0.00025995207, z: -0.000121954334} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 4109460465459574} - m_Father: {fileID: 4013377268125804} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1553694309947368 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4829329165331362} - m_Layer: 0 - m_Name: pCylinder4 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4829329165331362 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1553694309947368} - m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.055, y: 0.0000000011920929, z: -0.0000000017881393} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 4117671574520176} - m_Father: {fileID: 4607474556101662} - m_RootOrder: 9 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1611858554024070 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4745674140739456} - m_Layer: 0 - m_Name: transform1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4745674140739456 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1611858554024070} - m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 4130678677717830} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1647562739246770 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4408134395720264} - m_Layer: 0 - m_Name: polySurface4 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4408134395720264 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1647562739246770} - m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.055, y: -0.0000000011920929, z: -0.0000000017881393} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 4026616148607812} - m_Father: {fileID: 4607474556101662} - m_RootOrder: 10 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1718980416105284 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4117671574520176} - m_Layer: 0 - m_Name: transform8 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4117671574520176 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1718980416105284} - m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.055, y: -0.0000000011920929, z: 0.0000000017881393} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 4829329165331362} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1729695324654792 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4026616148607812} - m_Layer: 0 - m_Name: transform17 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4026616148607812 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1729695324654792} - m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.055, y: 0.0000000011920929, z: 0.0000000017881393} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 4408134395720264} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1758312226982130 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4268802020502070} - m_Layer: 0 - m_Name: transform6 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4268802020502070 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1758312226982130} - m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 4660560217398952} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1775306317959236 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4703719883755212} - m_Layer: 0 - m_Name: polySurface2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4703719883755212 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1775306317959236} - m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.00006252681, y: 0.00025995207, z: -0.000121954334} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 4456423708130434} - m_Father: {fileID: 4013377268125804} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1801773605472886 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4280833947237478} - m_Layer: 0 - m_Name: transform9 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4280833947237478 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1801773605472886} - m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.0000000011920929, y: -0.055, z: 0.0000000017881393} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 4487561386526946} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1847357150043972 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4018014694696610} - m_Layer: 0 - m_Name: transform12 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4018014694696610 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1847357150043972} - m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 4854407580125384} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1853286976527396 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4660288217157578} - m_Layer: 0 - m_Name: pCone5 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4660288217157578 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1853286976527396} - m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068} - m_LocalPosition: {x: -0.099999994, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 4076801075672242} - m_Father: {fileID: 4607474556101662} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1885014420847488 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4064998544505022} - m_Layer: 0 - m_Name: pCone3 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4064998544505022 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1885014420847488} - m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} - m_LocalPosition: {x: -0, y: 0, z: 0.099999994} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 4451406195980762} - m_Father: {fileID: 4607474556101662} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1955923376010374 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4157925468139474} - m_Layer: 0 - m_Name: transform3 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4157925468139474 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1955923376010374} - m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 4869651590292830} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1969020753344146 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4834548033309622} - m_Layer: 0 - m_Name: transform11 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4834548033309622 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1969020753344146} - m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 4060342539979694} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1997232187386186 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4060342539979694} - m_Layer: 0 - m_Name: polySurface3 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4060342539979694 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1997232187386186} - m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.099937476, y: 0.00025995207, z: -0.000121954334} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 4834548033309622} - m_Father: {fileID: 4013377268125804} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} From e1b4430658f5a6c3b071f67cf1812bf45a0d8472 Mon Sep 17 00:00:00 2001 From: Dino Fejzagic Date: Thu, 17 Sep 2020 21:49:16 +0200 Subject: [PATCH 77/78] Make colliders dict readonly --- .../Controllers/Hands/DefaultHandControllerVisualizer.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/DefaultHandControllerVisualizer.cs b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/DefaultHandControllerVisualizer.cs index 3839b67e..da95de8b 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/DefaultHandControllerVisualizer.cs +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Runtime/Features/UX/Scripts/Controllers/Hands/DefaultHandControllerVisualizer.cs @@ -21,8 +21,8 @@ namespace XRTK.SDK.UX.Controllers.Hands public class DefaultHandControllerVisualizer : ControllerPoseSynchronizer, IMixedRealityControllerVisualizer { private readonly Dictionary jointTransforms = new Dictionary(); + private readonly Dictionary fingerBoundsModeColliders = new Dictionary(); private BoxCollider handBoundsModeCollider; - private Dictionary fingerBoundsModeColliders = new Dictionary(); private const float fingerColliderRadius = .007f; private const int capsuleColliderZAxis = 2; HandControllerJointsVisualizer jointsVisualizer; From 1ab7f042be816d28cec653fcb5f352071d15668b Mon Sep 17 00:00:00 2001 From: Dino Fejzagic Date: Fri, 18 Sep 2020 19:19:43 +0200 Subject: [PATCH 78/78] Remove debug hand visualization --- ...DefaultLeftHandControllerVisualizer.prefab | 156 +----------------- .../Prefabs~/UX/Hands/HandLeft_Joints.prefab | 2 +- 2 files changed, 2 insertions(+), 156 deletions(-) diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/DefaultLeftHandControllerVisualizer.prefab b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/DefaultLeftHandControllerVisualizer.prefab index 86d4963b..3d861bc6 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/DefaultLeftHandControllerVisualizer.prefab +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/DefaultLeftHandControllerVisualizer.prefab @@ -27,9 +27,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 4191434239757458300} - - {fileID: 2089245550809874106} + m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -57,155 +55,3 @@ MonoBehaviour: type: 3} meshModePrefab: {fileID: 1887883006053652, guid: 12df5e0d0c33a444a985de4e29533a24, type: 3} ---- !u!1 &7615510903626891603 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2089245550809874106} - - component: {fileID: 5511067064646238094} - - component: {fileID: 1038253522407150282} - m_Layer: 0 - m_Name: Sphere - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2089245550809874106 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7615510903626891603} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.01779201, y: 0.01779201, z: 0.01779201} - m_Children: [] - m_Father: {fileID: 1355368130211572882} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &5511067064646238094 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7615510903626891603} - m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &1038253522407150282 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7615510903626891603} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 ---- !u!1001 &4191434239757458001 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1355368130211572882} - m_Modifications: - - target: {fileID: 1370450866519632, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} - propertyPath: m_Name - value: HandJointGizmo - objectReference: {fileID: 0} - - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} - propertyPath: m_LocalScale.x - value: 0.4 - objectReference: {fileID: 0} - - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} - propertyPath: m_LocalScale.y - value: 0.4 - objectReference: {fileID: 0} - - target: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} - propertyPath: m_LocalScale.z - value: 0.4 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 7644fc8494afb074f9d76648ac4da6f7, type: 3} ---- !u!4 &4191434239757458300 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4607474556101662, guid: 7644fc8494afb074f9d76648ac4da6f7, - type: 3} - m_PrefabInstance: {fileID: 4191434239757458001} - m_PrefabAsset: {fileID: 0} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/HandLeft_Joints.prefab b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/HandLeft_Joints.prefab index 1bb5321c..e0f51c7f 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/HandLeft_Joints.prefab +++ b/XRTK.SDK/Packages/com.xrtk.sdk/Prefabs~/UX/Hands/HandLeft_Joints.prefab @@ -43,7 +43,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 71894c53357d52a44b03004f02e70846, type: 3} m_Name: m_EditorClassIdentifier: - wristPrefab: {fileID: 1370450866519632, guid: 7644fc8494afb074f9d76648ac4da6f7, + wristPrefab: {fileID: 3141352679402889276, guid: ecbaba8bdbeef32459e87a1ce06bfd36, type: 3} jointPrefab: {fileID: 3141352679402889276, guid: ecbaba8bdbeef32459e87a1ce06bfd36, type: 3}