Merge pull request #2792 from keveleigh/SourceNaming

SimonDarksideJ · web-flow · commit f42d8638db10 · 2018-09-16T10:48:27.000+01:00
Update WMR source naming to include Voice
diff --git a/Assets/MixedRealityToolkit/_Core/Devices/MixedReality/WindowsMixedRealityDeviceManager.cs b/Assets/MixedRealityToolkit/_Core/Devices/MixedReality/WindowsMixedRealityDeviceManager.cs
@@ -382,7 +382,7 @@ private WindowsMixedRealityController GetController(InteractionSource interactio
             }
 
             var pointers = interactionSource.supportsPointing ? RequestPointers(typeof(WindowsMixedRealityController), controllingHand) : null;
-            string nameModifier = controllingHand == Handedness.None ? "Hand" : controllingHand.ToString();
+            string nameModifier = controllingHand == Handedness.None ? interactionSource.kind.ToString() : controllingHand.ToString();
             var inputSource = InputSystem?.RequestNewGenericInputSource($"Mixed Reality Controller {nameModifier}", pointers);
             var detectedController = new WindowsMixedRealityController(TrackingState.NotTracked, controllingHand, inputSource);
 

Original file line number	Diff line number	Diff line change
`@@ -382,7 +382,7 @@ private WindowsMixedRealityController GetController(InteractionSource interactio`
`382`	`382`	`}`
`383`	`383`
`384`	`384`	`var pointers = interactionSource.supportsPointing ? RequestPointers(typeof(WindowsMixedRealityController), controllingHand) : null;`
`385`		`- string nameModifier = controllingHand == Handedness.None ? "Hand" : controllingHand.ToString();`
	`385`	`+ string nameModifier = controllingHand == Handedness.None ? interactionSource.kind.ToString() : controllingHand.ToString();`
`386`	`386`	`var inputSource = InputSystem?.RequestNewGenericInputSource($"Mixed Reality Controller {nameModifier}", pointers);`
`387`	`387`	`var detectedController = new WindowsMixedRealityController(TrackingState.NotTracked, controllingHand, inputSource);`
`388`	`388`