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 #63

Merged
merged 110 commits into from
Sep 22, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
110 commits
Select commit Hold shift + click to select a range
60583ab
updated oculus data provider profiles
StephenHodgson Apr 6, 2020
39ed09a
Merge branch 'development' into feature/controller-mapping-refactor
StephenHodgson Apr 7, 2020
cf389aa
updated oculus controller
StephenHodgson Apr 7, 2020
a5a5a4d
updated references
StephenHodgson Apr 7, 2020
6fe13ab
updated profile constructor parameter reference to enable inspector
StephenHodgson Apr 7, 2020
097aa93
Merge branch 'development' into feature/controller-mapping-refactor
StephenHodgson Apr 7, 2020
d3a621e
updated references
StephenHodgson Apr 7, 2020
01de05a
Added default controller definitions
StephenHodgson Apr 7, 2020
fc1eb0d
updated hand provider inspector
StephenHodgson Apr 8, 2020
b7b0deb
fixed hand inspector
StephenHodgson Apr 9, 2020
3dca425
cleaned up references
StephenHodgson Apr 9, 2020
f426ee2
cleaned up controller interaction mappings a bit
StephenHodgson Apr 9, 2020
b5cfb2a
updated references
StephenHodgson Apr 9, 2020
257490c
updated controller instance creation
StephenHodgson Apr 9, 2020
2581c28
added default constructor
StephenHodgson Apr 9, 2020
1326d40
updated TryRenderController method
StephenHodgson Apr 10, 2020
cfc3d9c
removed asset menu
StephenHodgson Apr 11, 2020
3921db6
Remove obsolete SetupDefaultInteractions (#53)
FejZa Apr 11, 2020
5101798
updated references to camera system
StephenHodgson Apr 11, 2020
b8472ee
Changed timing of initialization to prevent race condition
StephenHodgson Apr 11, 2020
6c70c60
updated hands inspector
StephenHodgson Apr 12, 2020
80277b7
Merge branch 'dev/camera-system-refactor' into feature/controller-map…
StephenHodgson Apr 12, 2020
2badc3f
updated constructors for data providers
StephenHodgson Apr 14, 2020
0a9477d
Merge branch 'dev/data-providers' into dev/camera-system-refactor
StephenHodgson Apr 14, 2020
932546c
Merge branch 'dev/camera-system-refactor' into feature/controller-map…
StephenHodgson Apr 14, 2020
6723ff7
Change requests for controller provider inspectors (#55)
FejZa Apr 15, 2020
d452578
Update Oculus hand data converter
FejZa Apr 15, 2020
7275f21
Remove redundant handedness field
FejZa Apr 16, 2020
816c395
Update due to rename
FejZa Apr 16, 2020
ff10a5f
Cleanup usings
FejZa Apr 16, 2020
6d029ef
Removed head height settings in controllers
StephenHodgson Apr 19, 2020
9986939
added initial platform definition for Oculus
StephenHodgson Apr 19, 2020
31c3b68
removed
StephenHodgson Apr 19, 2020
45a9e3a
Merge branch 'dev/platform-definition' into dev/camera-system-refactor
StephenHodgson Apr 19, 2020
4c8873d
Added Oculus Camera Data Providers
StephenHodgson Apr 19, 2020
fcc8dd8
Merge branch 'dev/camera-system-refactor' into feature/controller-map…
StephenHodgson Apr 19, 2020
e8d862b
Merge branch 'development' into dev/platform-definition
StephenHodgson Apr 19, 2020
0485f95
Merge branch 'development' into dev/camera-system-refactor
StephenHodgson Apr 19, 2020
4e1fff8
Merge branch 'dev/camera-system-refactor' into feature/controller-map…
StephenHodgson Apr 19, 2020
247f1a0
updated icons
StephenHodgson Apr 20, 2020
65c5855
Updated platform check for Version and check headset connected for ru…
SimonDarksideJ Apr 20, 2020
7031775
Merge branch 'dev/platform-definition' into dev/camera-system-refactor
StephenHodgson Apr 20, 2020
b11afbf
Added platform overrides
StephenHodgson Apr 20, 2020
309fc66
Merge branch 'dev/platform-definition' into dev/camera-system-refactor
StephenHodgson Apr 20, 2020
ebef186
Merge branch 'feature/controller-mapping-refactor' of https://github.…
FejZa Apr 20, 2020
6f1617b
Merge branch 'dev/camera-system-refactor' into feature/controller-map…
StephenHodgson Apr 20, 2020
6fa6eca
Merge branch 'development' into dev/camera-system-refactor
StephenHodgson Apr 20, 2020
ee0f747
Merge branch 'dev/camera-system-refactor' into feature/controller-map…
StephenHodgson Apr 20, 2020
5d00ee7
Merge branch 'feature/controller-mapping-refactor' of https://github.…
FejZa Apr 21, 2020
208a1a2
Merge branch 'development' into dev/camera-system-refactor
StephenHodgson Apr 23, 2020
e5f5d6d
Merge branch 'development' into dev/camera-system-refactor
StephenHodgson Apr 23, 2020
879075f
Merge branch 'dev/camera-system-refactor' into feature/controller-map…
StephenHodgson Apr 23, 2020
af1c541
Merge branch 'development' into feature/controller-mapping-refactor
StephenHodgson Apr 23, 2020
390a254
Merge branch 'feature/controller-mapping-refactor' into feature/hand-…
FejZa Apr 24, 2020
89592c2
Merge branch 'development' of https://github.com/XRTK/Oculus into fea…
FejZa Apr 27, 2020
63c75de
Resolve conflicts
FejZa Apr 27, 2020
0079be1
Fix namespace
FejZa Apr 27, 2020
f130273
Fix usings
FejZa Apr 27, 2020
739b83d
Merge branch 'development' of https://github.com/XRTK/Oculus into fea…
FejZa Apr 28, 2020
1127daa
Fix OculusControllerDataProviderProfile asset guid
FejZa Apr 28, 2020
959cfb6
Merge branch 'development' of https://github.com/XRTK/Oculus into fea…
FejZa Apr 30, 2020
a651e61
Merge branch 'development' of https://github.com/XRTK/Oculus into fea…
FejZa May 1, 2020
d70bff6
Merge branch 'development' of https://github.com/XRTK/Oculus into fea…
FejZa May 2, 2020
29d3541
Pass hand state to converter for Oculus
FejZa May 2, 2020
c3440c2
Use platform API for pointer pose
FejZa May 2, 2020
4401675
Fix default Oculus hand data provider profile
FejZa May 2, 2020
0ad1921
Fix manifest merge error
FejZa May 2, 2020
4aec0a9
Fix duplicate plugin issue
FejZa May 2, 2020
94177da
Remove eye height in joint conversion
FejZa May 2, 2020
5297b10
Translate poses to camera space properly
FejZa May 3, 2020
1a775bc
Update hand controller profile references
FejZa May 3, 2020
3c6d312
Merge branch 'development' of https://github.com/XRTK/Oculus into fea…
FejZa May 5, 2020
42611a3
Merge branch 'development' into feature/hand-input
StephenHodgson May 8, 2020
e4e5b31
Merge branch 'development' of https://github.com/XRTK/Oculus into fea…
FejZa May 9, 2020
91c9cda
Merge branch 'feature/hand-input' of https://github.com/XRTK/Oculus i…
FejZa May 9, 2020
57a03e9
Introduce hand rendering mode
FejZa May 10, 2020
d03ef50
Implement runtime rendering mode switch
FejZa May 10, 2020
d62e2ac
Merge branch 'development' into feature/hand-input
StephenHodgson May 13, 2020
382e971
Merge branch 'development' into feature/hand-input
StephenHodgson May 13, 2020
62216f3
Merge branch 'development' of https://github.com/XRTK/Oculus into fea…
FejZa May 18, 2020
b418613
Update converter to define platform capabilities
FejZa May 22, 2020
baffb2b
Remove the need for base converter
FejZa May 26, 2020
a6c396e
Fix build errors due to removal of base converter
FejZa May 26, 2020
d54faf7
Rename joints
FejZa May 27, 2020
0b656f5
Point to new hand controller profiles
FejZa May 27, 2020
247877a
Remove handedness from hand data
FejZa May 29, 2020
9b5f6f8
Pass handedness to recognizer
FejZa May 29, 2020
54d42ad
Change HandData to be a struct
FejZa Jun 6, 2020
24cf36d
Remove HandMeshingEnabled static property
FejZa Jun 9, 2020
044c8d9
Remove unnecessary parameter
FejZa Jun 9, 2020
317717b
Merge branch 'development' of https://github.com/XRTK/Oculus into fea…
FejZa Jun 10, 2020
b0296b4
Remove hand state from data provider
FejZa Jun 11, 2020
70eef44
Move pose estimation to new utillities static class
FejZa Jun 11, 2020
a5a366f
Fix joint pose conversion
FejZa Jun 11, 2020
57635aa
Allow changing required tracking confidence in runtime
FejZa Jun 11, 2020
733c340
Merge branch 'development' into feature/hand-input
StephenHodgson Jun 12, 2020
9b5d6b5
Fix hands starting position offset issue
FejZa Jun 14, 2020
0639235
Use TrackingState instead of bool for tracking state
FejZa Jun 14, 2020
c2a8cf3
Fix pointer pose
FejZa Jun 14, 2020
3006e53
Undo namespace change
FejZa Jun 14, 2020
ee89d8c
Fix positioning after teleport
FejZa Jun 15, 2020
63bad77
fixed some typos
StephenHodgson Jun 16, 2020
3ee3cd2
Merge branch 'development' into feature/hand-input
StephenHodgson Jun 17, 2020
8ea4d30
Merge branch 'development' into feature/hand-input
StephenHodgson Jun 17, 2020
cc928b5
Merge branch 'feature/hand-input' of https://github.com/XRTK/Oculus i…
StephenHodgson Jun 17, 2020
44b4956
Cache joint poses array
FejZa Jun 21, 2020
faf0513
Remove debug code
FejZa Aug 1, 2020
c6d2f1f
Merge branch 'development' of https://github.com/XRTK/Oculus into fea…
FejZa Sep 17, 2020
cd63413
Fix typo in docs
FejZa Sep 17, 2020
47f2e3d
Commit updated profile GUIDs
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 @@ -14,10 +14,11 @@ MonoBehaviour:
m_EditorClassIdentifier:
hasSetupDefaults: 1
controllerMappingProfiles:
- {fileID: 11400000, guid: b43ff1b6f37e65946b1abc7e50af105f, type: 2}
- {fileID: 11400000, guid: 6c775257f26873e459a492f28125e129, type: 2}
handMeshingEnabled: 0
- {fileID: 11400000, guid: dd499836e4b82f14da2f414aad1fed8b, type: 2}
- {fileID: 11400000, guid: 78bf44d2b6970a74ea2721883b0b22bc, type: 2}
renderingMode: 1
handPhysicsEnabled: 0
useTriggers: 0
boundsMode: 0
trackedPoses: []
minConfidenceRequired: 0

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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 @@ -25,6 +25,8 @@ MonoBehaviour:
runtimePlatforms:
- reference: c838c4f5-a87e-48c7-8742-09a4d85fc3bc
- reference: db1acc26-ec8d-4bc6-afca-c51351b2da2e
- reference: c838c4f5-a87e-48c7-8742-09a4d85fc3bc
- reference: db1acc26-ec8d-4bc6-afca-c51351b2da2e
profile: {fileID: 0}
- instancedType:
reference: 0de5da40-feb8-4891-b9b2-942eafd041b9
Expand All @@ -34,6 +36,8 @@ MonoBehaviour:
runtimePlatforms:
- reference: c838c4f5-a87e-48c7-8742-09a4d85fc3bc
- reference: db1acc26-ec8d-4bc6-afca-c51351b2da2e
- reference: c838c4f5-a87e-48c7-8742-09a4d85fc3bc
- reference: db1acc26-ec8d-4bc6-afca-c51351b2da2e
profile: {fileID: 11400000, guid: b849f3a28dc36b84a92d2ec4d8239cd6, type: 2}
- instancedType:
reference: ea666456-baef-4412-a829-a4c7132e98c3
Expand All @@ -43,4 +47,6 @@ MonoBehaviour:
runtimePlatforms:
- reference: c838c4f5-a87e-48c7-8742-09a4d85fc3bc
- reference: db1acc26-ec8d-4bc6-afca-c51351b2da2e
- reference: c838c4f5-a87e-48c7-8742-09a4d85fc3bc
- reference: db1acc26-ec8d-4bc6-afca-c51351b2da2e
profile: {fileID: 11400000, guid: d9b3b9f611dffee4883c089dc35e0ce7, type: 2}
2 changes: 1 addition & 1 deletion XRTK.Oculus/Packages/com.xrtk.oculus/Runtime/Plugins.meta

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

2 changes: 1 addition & 1 deletion XRTK.Oculus/Packages/com.xrtk.oculus/Runtime/Profiles.meta

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

Loading