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

Dev/package layout shuffle #163

Merged
merged 114 commits into from
Apr 27, 2020
Merged

Conversation

StephenHodgson
Copy link
Contributor

@StephenHodgson StephenHodgson commented Apr 26, 2020

StephenHodgson and others added 30 commits September 26, 2019 14:46
Updated profiles
# Conflicts:
#	XRTK.SDK/Packages/com.xrtk.sdk/package.json
# Conflicts:
#	XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/DefaultMixedRealityInputActionRulesProfile.asset
#	XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/DefaultMixedRealityInputActionsProfile.asset
…-mapping-refactor

# Conflicts:
#	XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/DefaultMixedRealityControllerDataProvidersProfile.asset
# Conflicts:
#	XRTK.SDK/Packages/com.xrtk.sdk/Features/Input/GazeProvider.cs
# Conflicts:
#	XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/DataProviders/HoloLensController/HoloLensControllerProfile.asset
#	XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/DataProviders/WindowsMixedRealityController/LeftWMRControllerProfile.asset
#	XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/DataProviders/WindowsMixedRealityController/RightWMRControllerProfile.asset
#	XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/DefaultMixedRealityInputSystemProfile.asset
@StephenHodgson StephenHodgson merged commit c833689 into development Apr 27, 2020
@StephenHodgson StephenHodgson deleted the dev/package-layout-shuffle branch April 27, 2020 06:38
XRTK-Build-Bot pushed a commit that referenced this pull request Dec 25, 2020
* Input Action Refactor

Updated profiles

* added guid references to actions

* updated the input handler inspectors

* updated all the default controller mappings

* updated serialization

* bumped package version

* removed some profiles and updated the gaze provider

* removed unused profile and folder

* revert package changes

* updated profile references

* removed old profiles

* updated profile references

* removed empty folder

* updated default controller profiles

* removed a bunch of created profiles

* Rolled back registered processors

Added default mouse mappings

* Added default touch and unity joystick controllers

* removed empty array

* updated all the controller profiles and their mappings

* updated controller visualizations

* removed some meta files

* updated changes from broken out PRs

* updated speech input data provider's registration

* updated input system profile serialization

* updated spatial awareness system profile serialization

* updated handler references

* fixed some issues with the touch controller

* Added license header to controller visualizer

* Added a spatial pointer pose interaction mapping to both left/right articulated hand controllers

* updated diagnostics profile serialization

* Added base camera data provider and updated references to camera system

* updated camera settings

* renamed default camera system profile

* updated name property

* removed extra hololens interaction mappings

* removed empty reference

* updated service configurations

* updated serailization

* updated serailization

* moved Lumin camera data provider profile to it's package

* updated default camera data provider profile

* updated camera data provider configurations

* fixed lumin camera data provider reference

* updated reference to wmr profile

* Fixed the hand controller visualizations

Position should be in local space

* updated camera system settings

* fixed data provider serialization

* removed unused asset file

* Updated windows controller type name to get the controller textures to show up correctly based on the type name

* updated camera system profile serialization

* updated simulated controller type name to make texture lookup work

* Added Oculus Camera Data Provider

* cleaned up wmr interactions

* Fixed platform references for input data providers

* fixed gaze provider

* specified oculus platform for controllers

* fixed profile runtime platform definitions

* updated references from moving the wmr package into the correct layout

* updated some references to profiles

* fixed open vr controller data provider reference

* updated lumin references

* updated the editor namespaces

Co-authored-by: Stephen Hodgson <StephenHodgson@users.noreply.github.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.

2 participants