Skip to content

Commit 6831c31

Browse files
authored
Merge pull request #7153 from keveleigh/xr-sdk-ggvhand
Add HoloLens 1 hand definition to XR SDK support
2 parents 9984eb9 + 0a35a4b commit 6831c31

14 files changed

+252
-6
lines changed

Assets/MixedRealityToolkit.Examples/Demos/Input/Scenes/InputActions/InputActions.MixedRealityControllerMappingProfile.asset

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -709,6 +709,99 @@ MonoBehaviour:
709709
axisCodeY:
710710
invertXAxis: 0
711711
invertYAxis: 0
712+
- controllerType:
713+
reference: Microsoft.MixedReality.Toolkit.XRSDK.WindowsMixedReality.WindowsMixedRealityXRSDKGGVHand,
714+
Microsoft.MixedReality.Toolkit.Providers.XRSDK.WindowsMixedReality
715+
handedness: 0
716+
interactions:
717+
- id: 0
718+
description: Select
719+
axisType: 2
720+
inputType: 25
721+
inputAction:
722+
id: 1
723+
description: Select
724+
axisConstraint: 2
725+
keyCode: 0
726+
axisCodeX:
727+
axisCodeY:
728+
invertXAxis: 0
729+
invertYAxis: 0
730+
- id: 1
731+
description: Grip Pose
732+
axisType: 7
733+
inputType: 14
734+
inputAction:
735+
id: 3
736+
description: Grip Pose
737+
axisConstraint: 7
738+
keyCode: 0
739+
axisCodeX:
740+
axisCodeY:
741+
invertXAxis: 0
742+
invertYAxis: 0
743+
- controllerType:
744+
reference: Microsoft.MixedReality.Toolkit.XRSDK.WindowsMixedReality.WindowsMixedRealityXRSDKGGVHand,
745+
Microsoft.MixedReality.Toolkit.Providers.XRSDK.WindowsMixedReality
746+
handedness: 1
747+
interactions:
748+
- id: 0
749+
description: Select
750+
axisType: 2
751+
inputType: 25
752+
inputAction:
753+
id: 1
754+
description: Select
755+
axisConstraint: 2
756+
keyCode: 0
757+
axisCodeX:
758+
axisCodeY:
759+
invertXAxis: 0
760+
invertYAxis: 0
761+
- id: 1
762+
description: Grip Pose
763+
axisType: 7
764+
inputType: 14
765+
inputAction:
766+
id: 3
767+
description: Grip Pose
768+
axisConstraint: 7
769+
keyCode: 0
770+
axisCodeX:
771+
axisCodeY:
772+
invertXAxis: 0
773+
invertYAxis: 0
774+
- controllerType:
775+
reference: Microsoft.MixedReality.Toolkit.XRSDK.WindowsMixedReality.WindowsMixedRealityXRSDKGGVHand,
776+
Microsoft.MixedReality.Toolkit.Providers.XRSDK.WindowsMixedReality
777+
handedness: 2
778+
interactions:
779+
- id: 0
780+
description: Select
781+
axisType: 2
782+
inputType: 25
783+
inputAction:
784+
id: 1
785+
description: Select
786+
axisConstraint: 2
787+
keyCode: 0
788+
axisCodeX:
789+
axisCodeY:
790+
invertXAxis: 0
791+
invertYAxis: 0
792+
- id: 1
793+
description: Grip Pose
794+
axisType: 7
795+
inputType: 14
796+
inputAction:
797+
id: 3
798+
description: Grip Pose
799+
axisConstraint: 7
800+
keyCode: 0
801+
axisCodeX:
802+
axisCodeY:
803+
invertXAxis: 0
804+
invertYAxis: 0
712805
- controllerType:
713806
reference: Microsoft.MixedReality.Toolkit.XRSDK.WindowsMixedReality.WindowsMixedRealityXRSDKMotionController,
714807
Microsoft.MixedReality.Toolkit.Providers.XRSDK.WindowsMixedReality

Assets/MixedRealityToolkit.Providers/WindowsMixedReality/XR2018/Controllers.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/MixedRealityToolkit.Providers/WindowsMixedReality/XR2018/BaseWindowsMixedRealitySource.cs renamed to Assets/MixedRealityToolkit.Providers/WindowsMixedReality/XR2018/Controllers/BaseWindowsMixedRealitySource.cs

File renamed without changes.

Assets/MixedRealityToolkit.Providers/WindowsMixedReality/XR2018/BaseWindowsMixedRealitySource.cs.meta renamed to Assets/MixedRealityToolkit.Providers/WindowsMixedReality/XR2018/Controllers/BaseWindowsMixedRealitySource.cs.meta

File renamed without changes.

Assets/MixedRealityToolkit.Providers/WindowsMixedReality/XR2018/WindowsMixedRealityArticulatedHand.cs renamed to Assets/MixedRealityToolkit.Providers/WindowsMixedReality/XR2018/Controllers/WindowsMixedRealityArticulatedHand.cs

File renamed without changes.

Assets/MixedRealityToolkit.Providers/WindowsMixedReality/XR2018/WindowsMixedRealityArticulatedHand.cs.meta renamed to Assets/MixedRealityToolkit.Providers/WindowsMixedReality/XR2018/Controllers/WindowsMixedRealityArticulatedHand.cs.meta

File renamed without changes.

Assets/MixedRealityToolkit.Providers/WindowsMixedReality/XR2018/WindowsMixedRealityController.cs renamed to Assets/MixedRealityToolkit.Providers/WindowsMixedReality/XR2018/Controllers/WindowsMixedRealityController.cs

File renamed without changes.

Assets/MixedRealityToolkit.Providers/WindowsMixedReality/XR2018/WindowsMixedRealityController.cs.meta renamed to Assets/MixedRealityToolkit.Providers/WindowsMixedReality/XR2018/Controllers/WindowsMixedRealityController.cs.meta

File renamed without changes.

Assets/MixedRealityToolkit.Providers/WindowsMixedReality/XR2018/WindowsMixedRealityGGVHand.cs renamed to Assets/MixedRealityToolkit.Providers/WindowsMixedReality/XR2018/Controllers/WindowsMixedRealityGGVHand.cs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,18 @@
77
namespace Microsoft.MixedReality.Toolkit.WindowsMixedReality.Input
88
{
99
/// <summary>
10-
/// A Windows Mixed Reality Controller Instance.
10+
/// A Windows Mixed Reality GGV hand instance.
1111
/// </summary>
1212
[MixedRealityController(
1313
SupportedControllerType.GGVHand,
1414
new[] { Handedness.Left, Handedness.Right, Handedness.None })]
1515
public class WindowsMixedRealityGGVHand : BaseWindowsMixedRealitySource
1616
{
1717
public WindowsMixedRealityGGVHand(TrackingState trackingState, Handedness controllerHandedness, IMixedRealityInputSource inputSource = null, MixedRealityInteractionMapping[] interactions = null)
18-
: base(trackingState, controllerHandedness, inputSource, interactions)
19-
{
20-
}
18+
: base(trackingState, controllerHandedness, inputSource, interactions) { }
2119

2220
/// <summary>
23-
/// The GGV hand default interactions
21+
/// The GGV hand default interactions.
2422
/// </summary>
2523
/// <remarks>A single interaction mapping works for both left and right controllers.</remarks>
2624
public override MixedRealityInteractionMapping[] DefaultInteractions { get; } = new[]

Assets/MixedRealityToolkit.Providers/WindowsMixedReality/XR2018/WindowsMixedRealityGGVHand.cs.meta renamed to Assets/MixedRealityToolkit.Providers/WindowsMixedReality/XR2018/Controllers/WindowsMixedRealityGGVHand.cs.meta

File renamed without changes.

0 commit comments

Comments
 (0)