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

Conversation

FejZa
Copy link
Contributor

@FejZa FejZa commented Apr 24, 2020

Overview

Companion PR to XRTK/com.xrtk.core#552

StephenHodgson and others added 30 commits April 6, 2020 13:44
# 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
StephenHodgson
StephenHodgson previously approved these changes Jun 16, 2020
Copy link
Contributor

@StephenHodgson StephenHodgson left a 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]);
Copy link
Contributor

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
SimonDarksideJ previously approved these changes Jun 17, 2020
Copy link
Contributor

@SimonDarksideJ SimonDarksideJ left a 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

@FejZa FejZa removed the Blocked label Sep 21, 2020
@FejZa FejZa merged commit 31768e5 into development Sep 22, 2020
@FejZa FejZa deleted the feature/hand-input branch September 22, 2020 12:17
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants