This repository has been archived by the owner on Aug 11, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 3
Add support for input and gestures for hand controllers #63
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Conflicts: # XRTK.Oculus/Packages/com.xrtk.oculus/Controllers/OculusControllerDataProvider.cs # XRTK.Oculus/Packages/com.xrtk.oculus/Extensions/ControllerExtensions.cs # XRTK.Oculus/Packages/com.xrtk.oculus/Inspectors/OculusGoControllerMappingProfileInspector.cs.meta # XRTK.Oculus/Packages/com.xrtk.oculus/Inspectors/OculusRemoteControllerMappingProfileInspector.cs.meta # XRTK.Oculus/Packages/com.xrtk.oculus/Inspectors/OculusTouchControllerMappingProfileInspector.cs.meta # XRTK.Oculus/Packages/com.xrtk.oculus/Profiles/OculusTouchControllerMappingProfile.cs
fixed GetCOntroller return types
…ping-refactor # Conflicts: # XRTK.Oculus/Packages/com.xrtk.oculus/Controllers/OculusControllerDataProvider.cs
* Update indent levels for oculus settings * Cache GUIContent
FejZa
commented
Jun 14, 2020
XRTK.Oculus/Packages/com.xrtk.oculus/Runtime/Profiles/OculusControllerDataProviderProfile.cs
Outdated
Show resolved
Hide resolved
FejZa
commented
Jun 14, 2020
...s/Packages/com.xrtk.oculus/Runtime/Providers/InputSystem/Controllers/BaseOculusController.cs
Outdated
Show resolved
Hide resolved
StephenHodgson
previously approved these changes
Jun 16, 2020
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good. Just need to get the release from Core that goes with this in and we can update the standalone project with the preview that goes with it.
} | ||
else if (bone.Id == OculusApi.BoneId.Hand_Pinky1) | ||
{ | ||
GetJointPose(handedness, handSkeleton.Bones[(int)OculusApi.BoneId.Hand_Pinky0]); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we need to return the data from these recursive calls?
SimonDarksideJ
previously approved these changes
Jun 17, 2020
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Approved subject to the Core being approved
22 tasks
SimonDarksideJ
approved these changes
Sep 21, 2020
XRTK-Build-Bot
pushed a commit
that referenced
this pull request
Dec 25, 2020
* updated oculus data provider profiles * updated oculus controller * updated references * updated profile constructor parameter reference to enable inspector * updated references * Added default controller definitions * updated hand provider inspector * fixed hand inspector * cleaned up references * cleaned up controller interaction mappings a bit * updated references fixed GetCOntroller return types * updated controller instance creation * added default constructor * updated TryRenderController method * removed asset menu * Remove obsolete SetupDefaultInteractions (#53) * updated references to camera system * Changed timing of initialization to prevent race condition * updated hands inspector * updated constructors for data providers * Change requests for controller provider inspectors (#55) * Update indent levels for oculus settings * Cache GUIContent * Update Oculus hand data converter * Remove redundant handedness field * Update due to rename * Cleanup usings * Removed head height settings in controllers * added initial platform definition for Oculus * removed * Added Oculus Camera Data Providers * updated icons * Updated platform check for Version and check headset connected for runtime. (#59) Tested on platform * Added platform overrides * Resolve conflicts * Fix namespace * Fix usings * Fix OculusControllerDataProviderProfile asset guid * Pass hand state to converter for Oculus * Use platform API for pointer pose * Fix default Oculus hand data provider profile * Fix manifest merge error * Fix duplicate plugin issue * Remove eye height in joint conversion * Translate poses to camera space properly * Update hand controller profile references * Introduce hand rendering mode * Implement runtime rendering mode switch * Update converter to define platform capabilities * Remove the need for base converter * Fix build errors due to removal of base converter * Rename joints * Point to new hand controller profiles * Remove handedness from hand data * Pass handedness to recognizer * Change HandData to be a struct * Remove HandMeshingEnabled static property * Remove unnecessary parameter * Remove hand state from data provider * Move pose estimation to new utillities static class * Fix joint pose conversion * Allow changing required tracking confidence in runtime * Fix hands starting position offset issue * Use TrackingState instead of bool for tracking state * Fix pointer pose * Undo namespace change * Fix positioning after teleport * fixed some typos * Cache joint poses array * Remove debug code * Fix typo in docs * Commit updated profile GUIDs Co-authored-by: Stephen Hodgson <hodgson.designs@gmail.com> Co-authored-by: Simon (Darkside) Jackson <darkside@zenithmoon.com>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Overview
Companion PR to XRTK/com.xrtk.core#552