simplify tracking state vs accuracy

Author: David Kline (ANALOG)

Assets/MixedRealityToolkit/_Core/Definitions/Devices/Headset.cs

@@ -31,11 +31,6 @@ public struct Headset
         /// </summary>
         public Vector3 Position { get; set; }
 
-        /// <summary>
-        /// Indicates the accuracy of the position data being reported.
-        /// </summary>
-        public TrackingAccuracy PositionAccuracy { get; set; }
-
         /// <summary>
         /// Indicates whether or not the headset is currently providing rotation data.
         /// </summary>
@@ -46,11 +41,6 @@ public struct Headset
         /// </summary>
         public Quaternion Rotation { get; set; }
 
-        /// <summary>
-        /// Indicates the accuracy of the rotation data being reported.
-        /// </summary>
-        public TrackingAccuracy RotationAccuracy { get; set; }
-
         /// <summary>
         /// Outputs the current state of the headset, whether it is tracked or not. As defined by the SDK / Unity.
         /// </summary>

Assets/MixedRealityToolkit/_Core/Definitions/Devices/TrackingAccuracy.cs

@@ -17,10 +17,6 @@ public enum TrackingState
         /// </summary>
         NotApplicable = 0,
         /// <summary>
-        /// Reserved, for systems that provide alternate tracking.
-        /// </summary>
-        Other,
-        /// <summary>
         /// The device is not tracked.
         /// </summary>
         NotTracked,

Assets/MixedRealityToolkit/_Core/Definitions/Devices/TrackingAccuracy.cs.meta

@@ -31,9 +31,8 @@ protected BaseController(TrackingState trackingState, Handedness controllerHande
             Interactions = interactions;
 
             IsPositionAvailable = false;
-            PositionAccuracy = TrackingAccuracy.None;
+            IsPositionApproximate = false;
             IsRotationAvailable = false;
-            RotationAccuracy = TrackingAccuracy.None;
         }
 
         /// <summary>
@@ -67,14 +66,11 @@ protected IMixedRealityInputSystem InputSystem
         public bool IsPositionAvailable { get; protected set; }
 
         /// <inheritdoc />
-        public TrackingAccuracy PositionAccuracy { get; protected set; }
+        public bool IsPositionApproximate { get; protected set; }
 
         /// <inheritdoc />
         public bool IsRotationAvailable { get; protected set; }
 
-        /// <inheritdoc />
-        public TrackingAccuracy RotationAccuracy { get; protected set; }
-
         /// <inheritdoc />
         public MixedRealityInteractionMapping[] Interactions { get; private set; }
 

Assets/MixedRealityToolkit/_Core/Definitions/Devices/TrackingState.cs

@@ -114,20 +114,16 @@ private void UpdateControllerData(InteractionSourceState interactionSourceState)
             IsPositionAvailable = interactionSourceState.sourcePose.TryGetPosition(out currentControllerPosition);
             if (IsPositionAvailable)
             {
-                PositionAccuracy = (interactionSourceState.sourcePose.positionAccuracy == InteractionSourcePositionAccuracy.High) ?
-                    TrackingAccuracy.High : TrackingAccuracy.Approximate;
+                TrackingState = TrackingState.Tracked;
+                IsPositionApproximate = (interactionSourceState.sourcePose.positionAccuracy == InteractionSourcePositionAccuracy.Approximate);
             }
             else
             {
-                PositionAccuracy = TrackingAccuracy.None;
+                TrackingState = TrackingState.NotTracked;
+                IsPositionApproximate = true;
             }
 
             IsRotationAvailable = interactionSourceState.sourcePose.TryGetRotation(out currentControllerRotation);
-            // Windows Mixed Reality does not have a concept of rotation accuracy, therefore we return high accuracy
-            RotationAccuracy = IsRotationAvailable ? TrackingAccuracy.High : TrackingAccuracy.None;
-
-            // Windows Mixed Reality controllers are tracked if we are receiving position or rotation data
-            TrackingState = (IsPositionAvailable || IsRotationAvailable) ? TrackingState.Tracked : TrackingState.NotTracked;
 
             if (lastState != TrackingState)
             {

Assets/MixedRealityToolkit/_Core/Devices/BaseController.cs

@@ -39,7 +39,7 @@ public interface IMixedRealityController
         /// <summary>
         /// Indicates the accuracy of the position data being reported.
         /// </summary>
-        TrackingAccuracy PositionAccuracy { get; }
+        bool IsPositionApproximate { get; }
 
         /// <summary>
         /// Indicates that this controller is currently providing rotation data.
@@ -50,11 +50,6 @@ public interface IMixedRealityController
         /// </remarks>
         bool IsRotationAvailable { get; }
 
-        /// <summary>
-        /// Indicates the accuracy of the rotation data being reported.
-        /// </summary>
-        TrackingAccuracy RotationAccuracy { get; }
-
         /// <summary>
         /// Mapping definition for this controller, linking the Physical inputs to logical Input System Actions
         /// </summary>