Merge branch 'MRTK-Version-Next' into vNext-WMRController_Position

# Conflicts:
#	Assets/MixedRealityToolkit/_Core/Devices/MixedReality/WindowsMixedRealityController.cs

Author: StephenHodgson

Assets/MixedRealityToolkit/_Core/Devices/MixedReality/WindowsMixedRealityController.cs

@@ -112,22 +112,35 @@ public void UpdateController(InteractionSourceState interactionSourceState)
         private void UpdateControllerData(InteractionSourceState interactionSourceState)
         {
             var lastState = TrackingState;
+            var sourceKind = interactionSourceState.source.kind;
 
-            IsPositionAvailable = interactionSourceState.sourcePose.TryGetPosition(out currentControllerPosition);
-
-            if (IsPositionAvailable)
+            if ((sourceKind == InteractionSourceKind.Hand) ||
+               ((sourceKind == InteractionSourceKind.Controller) && interactionSourceState.source.supportsPointing))
             {
-                TrackingState = TrackingState.Tracked;
-                IsPositionApproximate = interactionSourceState.sourcePose.positionAccuracy == InteractionSourcePositionAccuracy.Approximate;
+                // The source is either a hand or a controller that supports pointing.
+                // We can now check for position and rotation.
+                IsPositionAvailable = interactionSourceState.sourcePose.TryGetPosition(out currentControllerPosition);
+
+                if (IsPositionAvailable)
+                {
+                    IsPositionApproximate = (interactionSourceState.sourcePose.positionAccuracy == InteractionSourcePositionAccuracy.Approximate);
+                }
+                else
+                {
+                    IsPositionApproximate = false;
+                }
+
+                IsRotationAvailable = interactionSourceState.sourcePose.TryGetRotation(out currentControllerRotation);
+
+                // Devices are considered tracked if we receive position OR rotation data from the sensors.
+                TrackingState = (IsPositionAvailable || IsRotationAvailable) ? TrackingState.Tracked : TrackingState.NotTracked;
             }
             else
             {
-                TrackingState = TrackingState.NotTracked;
-                IsPositionApproximate = true;
+                // The input source does not support tracking.
+                TrackingState = TrackingState.NotApplicable;
             }
 
-            IsRotationAvailable = interactionSourceState.sourcePose.TryGetRotation(out currentControllerRotation);
-
             lastControllerPose = currentControllerPose;
             currentControllerPose.Position = currentControllerPosition;
             currentControllerPose.Rotation = currentControllerRotation;