Skip to content
This repository has been archived by the owner on Aug 11, 2024. It is now read-only.

Add support for input and gestures for hand controllers #164

Merged
merged 116 commits into from
Sep 22, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
116 commits
Select commit Hold shift + click to select a range
dbf8dd0
Move SDK asm definition to correct plact
FejZa Apr 27, 2020
a680dee
Fix recorded poses assets
FejZa Apr 27, 2020
79ed510
Merge branch 'development' of https://github.com/XRTK/SDK into featur…
FejZa Apr 27, 2020
fbed045
Merge branch 'development' of https://github.com/XRTK/SDK into featur…
FejZa Apr 28, 2020
d786a97
Fix simulation profiles
FejZa Apr 28, 2020
ffb9529
Assign default tracked poses
FejZa Apr 28, 2020
dd96378
Copy over SDK changes
FejZa Apr 28, 2020
104dd77
Merge branch 'development' of https://github.com/XRTK/SDK into featur…
FejZa May 1, 2020
563db7b
fixed visualization references
StephenHodgson May 1, 2020
e557c02
Merge branch 'development' of https://github.com/XRTK/SDK into featur…
FejZa May 2, 2020
0bdf165
Undo GUID change
FejZa May 2, 2020
66168a2
Restore recorded hand pose JSON assets lost by merge
FejZa May 2, 2020
0bbde1e
Fix NRE for spatial pointer mapping
FejZa May 2, 2020
2865f23
Re-init simulated hand defaults
FejZa May 2, 2020
8bf5604
Remove open steady pose
FejZa May 2, 2020
0414f9d
Update hand pointer profile
FejZa May 2, 2020
4640605
Update defaults for runtime hands
FejZa May 2, 2020
171b8e2
Moved WMR hand data provider profile to WMR module
FejZa May 2, 2020
02ca15f
Reduce profile redundancy a bit
FejZa May 2, 2020
43ccbd8
Fix visualized joint rotations
FejZa May 3, 2020
7c07e02
Moved simulated hand data provider profile
FejZa May 3, 2020
d50e55a
Moved WMR profile to WMR module
FejZa May 3, 2020
81e2f33
Update profiles
FejZa May 3, 2020
b80ba4f
Updated profiles
FejZa May 3, 2020
8fd1d73
changes for near pointer interactions using collision
StephenHodgson May 3, 2020
8fdfe79
Merge branch 'development' into feature/pointer-near-interactions
StephenHodgson May 4, 2020
dd27aaf
removed unused reference
StephenHodgson May 4, 2020
7c4fcb3
Merge branch 'development' of https://github.com/XRTK/SDK into featur…
FejZa May 5, 2020
d540295
Merge branch 'feature/pointer-near-interactions' of https://github.co…
FejZa May 5, 2020
f56cbc1
Update BaseControllerPointerInspector.cs (#175)
FejZa May 5, 2020
63db7fa
Merge branch 'feature/pointer-near-interactions' of https://github.co…
FejZa May 6, 2020
c9c5179
Merge branch 'development' into feature/pointer-near-interactions
StephenHodgson May 7, 2020
07d2f62
Merge branch 'development' into feature/pointer-near-interactions
StephenHodgson May 9, 2020
cd41e35
Update index finger pose mapping for hands
FejZa May 9, 2020
8ae6545
Use triggers instead of physics colliders
FejZa May 9, 2020
968b54e
Merge branch 'feature/pointer-near-interactions' of https://github.co…
FejZa May 9, 2020
d5594bd
Update BaseControllerPointer.cs
FejZa May 9, 2020
c46f3ee
Merge pull request #179 from XRTK/feature/pnr-change-requests
StephenHodgson May 9, 2020
10c72d6
Create hand near poniter prefab (temp?)
FejZa May 9, 2020
2ee021c
Merge branch 'feature/pointer-near-interactions' of https://github.co…
FejZa May 9, 2020
250c11a
Merge branch 'development' of https://github.com/XRTK/SDK into featur…
FejZa May 9, 2020
cfcbe7b
Merge branch 'development' into feature/pointer-near-interactions
StephenHodgson May 9, 2020
c629fd9
Merge branch 'feature/pointer-near-interactions' of https://github.co…
FejZa May 9, 2020
1c89216
Merge branch 'feature/hand-input-temp' into feature/hand-input
FejZa May 9, 2020
9665884
only raise pointer events if we have a valid pointer target
StephenHodgson May 9, 2020
c47d68f
Merge branch 'feature/pointer-near-interactions' of https://github.co…
FejZa May 9, 2020
28c552c
revert
StephenHodgson May 9, 2020
9d6b938
Merge branch 'feature/pointer-near-interactions' of https://github.co…
FejZa May 9, 2020
da98884
Delete surface touch prefab
FejZa May 9, 2020
36f4f69
Create near pointer prefab variant
FejZa May 9, 2020
6b1bffb
Introduce hand rendering mode
FejZa May 10, 2020
c3666c5
Implement visuailzation runtime switch and update prefabs
FejZa May 10, 2020
3458be2
Fix none rendering mode
FejZa May 10, 2020
a68c751
Fix existing joints not enabled on enable
FejZa May 10, 2020
1fb7352
Update prefabs
FejZa May 10, 2020
9122d1c
Remove redundant check
FejZa May 10, 2020
0f06a90
Merge branch 'development' into feature/pointer-near-interactions
StephenHodgson May 12, 2020
636a5de
Merge branch 'feature/pointer-near-interactions' into feature/hand-input
StephenHodgson May 12, 2020
b27da8c
Merge branch 'development' into feature/pointer-near-interactions
StephenHodgson May 13, 2020
9dde38c
Merge branch 'feature/pointer-near-interactions' of https://github.co…
FejZa May 13, 2020
3a977cd
Merge branch 'development' into feature/pointer-near-interactions
StephenHodgson May 13, 2020
8973811
Merge branch 'feature/pointer-near-interactions' into feature/hand-input
StephenHodgson May 13, 2020
19a2c19
Merge branch 'development' into feature/hand-input
StephenHodgson May 14, 2020
ce77dfb
Create custom pointer prefab for hands
FejZa May 18, 2020
0df9b68
Merge branch 'feature/hand-input' of https://github.com/XRTK/SDK into…
FejZa May 18, 2020
7dfb8f2
Merge branch 'development' of https://github.com/XRTK/SDK into featur…
FejZa May 18, 2020
21288d2
Merge branch 'development' of https://github.com/XRTK/SDK into featur…
FejZa May 18, 2020
154136e
Implement runtime physics toggle
FejZa May 19, 2020
177f75e
Implement runtime bounds mode selection
FejZa May 19, 2020
d161209
Fix visuailzation script guid reference
FejZa May 20, 2020
f261c16
Reduce hand mass
FejZa May 20, 2020
aa7876c
Set hand weight to average human hand weight
FejZa May 20, 2020
755044e
Update assets
FejZa May 21, 2020
c44dee9
Update IsNearPointerIdle computed property
FejZa May 21, 2020
80376b0
Implement spatial pointer transform
FejZa May 22, 2020
b4e9e91
Merge branch 'development' of https://github.com/XRTK/SDK into featur…
FejZa May 22, 2020
8d94e66
Update pointer mesh
FejZa May 22, 2020
5982388
Use local position only for joint poses
FejZa May 23, 2020
25c30b5
Merge branch 'development' of https://github.com/XRTK/SDK into featur…
FejZa May 25, 2020
9b3c059
Add debug utility to record hand data
FejZa May 26, 2020
8fda857
Goodbye NONE joint
FejZa May 26, 2020
6224ab7
Rename joints
FejZa May 27, 2020
737e04a
Update default hand interactions
FejZa May 27, 2020
e635fd5
Sync simulation profiles
FejZa May 27, 2020
c29a261
reserialized json data to exclude reference types (#192)
StephenHodgson May 27, 2020
2abc3df
Merge branch 'development' into feature/hand-input
StephenHodgson May 27, 2020
fc3020a
Fix NRE in case tip prefab does not have a renderer
FejZa May 28, 2020
33ff3b1
updated spatial pointer from update loop to use input changed event (…
StephenHodgson May 28, 2020
19d9f30
Merge branch 'development' into feature/hand-input
StephenHodgson May 29, 2020
db0033d
override interaction modes for hand near/spatial pointers
StephenHodgson May 29, 2020
380a21e
updated prefab serialization
StephenHodgson May 29, 2020
895fd17
Merge branch 'development' into feature/hand-input
StephenHodgson May 29, 2020
c3f4f14
Bake default poses
FejZa May 29, 2020
1796e07
Add tracked hand pose input action
FejZa May 29, 2020
1abfddb
Update baked data for hand poses
FejZa May 29, 2020
b461567
Fix spatial pointer disabled while interacting
FejZa Jun 1, 2020
9ad2d2c
Fix spatial pointer line renderer start offset
FejZa Jun 1, 2020
6a11136
Merge branch 'development' of https://github.com/XRTK/SDK into featur…
FejZa Jun 2, 2020
afe944f
Fix rotation not set in local space
FejZa Jun 9, 2020
8197563
Adjust spatial pointer mesh renderer settings
FejZa Jun 10, 2020
32b4228
Merge branch 'development' of https://github.com/XRTK/SDK into featur…
FejZa Jun 10, 2020
3d3f26a
Only update hand visusalization if hand is tracked
FejZa Jun 11, 2020
3279d68
Optimize foreach loop to for loop
FejZa Jun 11, 2020
e7afe4c
Get mesh data using TryGetHandMeshData
FejZa Jun 11, 2020
bbe0961
Merge branch 'development' into feature/hand-input
StephenHodgson Jun 12, 2020
5166c53
Remove HandData input event
FejZa Jun 12, 2020
445888b
Merge branch 'feature/hand-input' of https://github.com/XRTK/SDK into…
FejZa Jun 12, 2020
22c80fe
Fix physics companion pose not updated
FejZa Jun 15, 2020
866dff9
Remove tracked pose raw input action
FejZa Jun 15, 2020
e78f207
Fix hand controller profiles default mappings
FejZa Jun 15, 2020
4c94422
Set graphics quality to highest for vr devices
FejZa Jun 17, 2020
a10fc6e
Fix interaction mappings for hand controllers
FejZa Jun 19, 2020
fc9d4a7
Fix near pointer target not updated
FejZa Jun 20, 2020
d036595
Temporarily change hand prefabs for better debugging
FejZa Jul 15, 2020
e1b4430
Make colliders dict readonly
FejZa Sep 17, 2020
1ab7f04
Remove debug hand visualization
FejZa Sep 18, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,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");
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
// Copyright (c) XRTK. All rights reserved.
// 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
{
[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();
}
}
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
%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: []
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: 12df5e0d0c33a444a985de4e29533a24,
type: 3}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
%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: 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}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading