Merge pull request #3799 from davidkline-ms/obsoleteScrub

David Kline · web-flow · commit 49d88f2c198b · 2019-04-03T14:04:04.000-07:00
Obsolete scrub
diff --git a/Assets/MixedRealityToolkit.SDK/Features/Input/Handlers/ControllerPoseSynchronizer.cs b/Assets/MixedRealityToolkit.SDK/Features/Input/Handlers/ControllerPoseSynchronizer.cs
@@ -158,16 +158,9 @@ public virtual void OnInputUp(InputEventData eventData) { }
         /// <inheritdoc />
         public virtual void OnInputDown(InputEventData eventData) { }
 
-        /// <inheritdoc />
-        [Obsolete("Use ControllerPoseSynchronizer.OnInputChanged(InputEventData<float> eventData)")]
-        public virtual void OnInputPressed(InputEventData<float> eventData) { }
-
         /// <inheritdoc />
         public virtual void OnInputChanged(InputEventData<float> eventData) { }
 
-        [Obsolete("Use ControllerPoseSynchronizer.OnInputChanged(InputEventData<Vector2> eventData)")]
-        public virtual void OnPositionInputChanged(InputEventData<Vector2> eventData) { }
-
         /// <inheritdoc />
         public virtual void OnInputChanged(InputEventData<Vector2> eventData) { }
 
@@ -218,18 +211,5 @@ public virtual void OnInputChanged(InputEventData<MixedRealityPose> eventData)
         }
 
         #endregion  IMixedRealityInputHandler Implementation
-
-        #region IMixedRealitySpatialInputHandler Implementation
-
-        [Obsolete("Use ControllerPoseSynchronizer.OnInputChanged(InputEventData<Vector3> eventData)")]
-        public virtual void OnPositionChanged(InputEventData<Vector3> eventData) { }
-
-        [Obsolete("Use ControllerPoseSynchronizer.OnInputChanged(InputEventData<Quaternion> eventData)")]
-        public virtual void OnRotationChanged(InputEventData<Quaternion> eventData) { }
-
-        [Obsolete("Use ControllerPoseSynchronizer.OnInputChanged(InputEventData<MixedRealityPose> eventData)")]
-        public virtual void OnPoseInputChanged(InputEventData<MixedRealityPose> eventData) { }
-
-        #endregion IMixedRealitySpatialInputHandler Implementation 
     }
 }
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Receivers/InteractionReceiver.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Receivers/InteractionReceiver.cs
@@ -196,12 +196,6 @@ void IMixedRealityInputHandler.OnInputDown(InputEventData eventData)
             }
         }
 
-        [Obsolete("Use IMixedRealityInputHandler<float>.OnInputChanged instead.")]
-        void IMixedRealityInputHandler.OnInputPressed(InputEventData<float> eventData)
-        {
-            Debug.LogWarning("Obsolete. Use IMixedRealityInputHandler<float>.OnInputChanged instead.");
-        }
-
         /// <inheritdoc />
         void IMixedRealityInputHandler<float>.OnInputChanged(InputEventData<float> eventData)
         {
@@ -211,13 +205,6 @@ void IMixedRealityInputHandler<float>.OnInputChanged(InputEventData<float> event
             }
         }
 
-        /// <inheritdoc />
-        [Obsolete("Use IMixedRealityInputHandler<Vector2>.OnInputChanged instead.")]
-        void IMixedRealityInputHandler.OnPositionInputChanged(InputEventData<Vector2> eventData)
-        {
-            Debug.LogWarning("Obsolete. Use IMixedRealityInputHandler<Vector2>.OnInputChanged instead.");
-        }
-
         /// <inheritdoc />
         void IMixedRealityInputHandler<Vector2>.OnInputChanged(InputEventData<Vector2> eventData)
         {
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Tooltips/ToolTipSpawner.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Tooltips/ToolTipSpawner.cs
@@ -12,7 +12,10 @@ namespace Microsoft.MixedReality.Toolkit.UI
     /// Add to any Object to spawn ToolTips on tap or on focus, according to preference
     /// Applies its follow settings to the spawned ToolTip's ToolTipConnector component
     /// </summary>
-    public class ToolTipSpawner : BaseFocusHandler, IMixedRealityInputHandler
+    public class ToolTipSpawner :
+        BaseFocusHandler,
+        IMixedRealityInputHandler,
+        IMixedRealityInputHandler<float>
     {
         private enum SettingsMode
         {
@@ -117,17 +120,14 @@ public override void OnFocusExit(FocusEventData eventData)
         }
 
         /// <inheritdoc />
-        void IMixedRealityInputHandler.OnInputPressed(InputEventData<float> eventData)
+        void IMixedRealityInputHandler<float>.OnInputChanged(InputEventData<float> eventData)
         {
-            if (eventData.InputData > .95f)
+            if (eventData.InputData > .95f) 
             {
                 HandleTap();
             }
         }
 
-        /// <inheritdoc />
-        void IMixedRealityInputHandler.OnPositionInputChanged(InputEventData<Vector2> eventData) { }
-
         /// <inheritdoc />
         void IMixedRealityInputHandler.OnInputDown(InputEventData eventData)
         {
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Utilities/GazeHandHelper.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Utilities/GazeHandHelper.cs
@@ -136,26 +136,6 @@ public Vector3 GetHandsCentroid()
             return Vector3.zero;
         }
 
-        /// <summary>
-        /// This function gets an array of all active hand positions
-        /// </summary>
-        /// <returns>array of Vector3</returns>
-        [Obsolete]
-        public Vector3[] GetHandPositions()
-        {
-            List<Vector3> positions = new List<Vector3>();
-
-            foreach (uint key in positionAvailableMap.Keys)
-            {
-                if (positionAvailableMap[key] == true)
-                {
-                    positions.Add(handPositionMap[key]);
-                }
-            }
-
-            return positions.ToArray();
-        }
-
         /// <summary>
         /// This function gets an array of all active hand positions
         /// </summary>
diff --git a/Assets/MixedRealityToolkit.Services/InputSystem/GazeProvider.cs b/Assets/MixedRealityToolkit.Services/InputSystem/GazeProvider.cs
@@ -13,7 +13,11 @@ namespace Microsoft.MixedReality.Toolkit.Input
     /// This class provides Gaze as an Input Source so users can interact with objects using their head.
     /// </summary>
     [DisallowMultipleComponent]
-    public class GazeProvider : InputSystemGlobalListener, IMixedRealityGazeProvider, IMixedRealityEyeGazeProvider, IMixedRealityInputHandler
+    public class GazeProvider :
+        InputSystemGlobalListener,
+        IMixedRealityGazeProvider,
+        IMixedRealityEyeGazeProvider,
+        IMixedRealityInputHandler
     {
         private const float VelocityThreshold = 0.1f;
 
@@ -434,12 +438,6 @@ public void OnInputDown(InputEventData eventData)
             }
         }
 
-        [Obsolete]
-        public void OnInputPressed(InputEventData<float> eventData) { }
-
-        [Obsolete]
-        public void OnPositionInputChanged(InputEventData<Vector2> eventData) { }
-
         #endregion IMixedRealityInputHandler Implementation
 
         #region Utilities
diff --git a/Assets/MixedRealityToolkit.Services/InputSystem/MixedRealityInputSystem.cs b/Assets/MixedRealityToolkit.Services/InputSystem/MixedRealityInputSystem.cs
@@ -865,12 +865,6 @@ public void RaiseFocusExit(IMixedRealityPointer pointer, GameObject unfocusedObj
                 handler.OnPointerDown(casted);
             };
 
-        /// <inheritdoc />
-        public void RaisePointerDown(IMixedRealityPointer pointer, Handedness handedness, MixedRealityInputAction inputAction)
-        {
-            RaisePointerDown(pointer, inputAction, handedness);
-        }
-
         /// <inheritdoc />
         public void RaisePointerDown(IMixedRealityPointer pointer, MixedRealityInputAction inputAction, Handedness handedness = Handedness.None, IMixedRealityInputSource inputSource = null)
         {
@@ -895,15 +889,6 @@ public void RaisePointerDown(IMixedRealityPointer pointer, MixedRealityInputActi
                     handler.OnPointerClicked(casted);
                 };
 
-        /// <inheritdoc />
-        public void RaisePointerClicked(IMixedRealityPointer pointer, Handedness handedness, MixedRealityInputAction inputAction, int count)
-        {
-            // Create input event
-            pointerEventData.Initialize(pointer, handedness, inputAction, count);
-
-            HandleClick();
-        }
-
         /// <inheritdoc />
         public void RaisePointerClicked(IMixedRealityPointer pointer, MixedRealityInputAction inputAction, int count, Handedness handedness = Handedness.None, IMixedRealityInputSource inputSource = null)
         {
@@ -932,12 +917,6 @@ private void HandleClick()
                 handler.OnPointerUp(casted);
             };
 
-        /// <inheritdoc />
-        public void RaisePointerUp(IMixedRealityPointer pointer, Handedness handedness, MixedRealityInputAction inputAction)
-        {
-            RaisePointerUp(pointer, inputAction, handedness);
-        }
-
         /// <inheritdoc />
         public void RaisePointerUp(IMixedRealityPointer pointer, MixedRealityInputAction inputAction, Handedness handedness = Handedness.None, IMixedRealityInputSource inputSource = null)
         {
diff --git a/Assets/MixedRealityToolkit/Definitions/MixedRealityToolkitConfigurationProfile.cs b/Assets/MixedRealityToolkit/Definitions/MixedRealityToolkitConfigurationProfile.cs
@@ -22,16 +22,6 @@ namespace Microsoft.MixedReality.Toolkit
     [CreateAssetMenu(menuName = "Mixed Reality Toolkit/Mixed Reality Toolkit Configuration Profile", fileName = "MixedRealityToolkitConfigurationProfile", order = (int)CreateProfileMenuItemIndices.Configuration)]
     public class MixedRealityToolkitConfigurationProfile : BaseMixedRealityProfile
     {
-        #region Service Registry properties
-
-        /// <summary>
-        /// Dictionary list of active Systems used by the Mixed Reality Toolkit at runtime
-        /// </summary>
-        [Obsolete("Use MixedRealityToolkit.ActiveSystems instead")]
-        public Dictionary<Type, IMixedRealityService> ActiveServices { get; } = new Dictionary<Type, IMixedRealityService>();
-
-        #endregion Service Registry properties
-
         #region Mixed Reality Toolkit configurable properties
 
         [SerializeField]
diff --git a/Assets/MixedRealityToolkit/Inspectors/Profiles/BaseMixedRealityProfileInspector.cs b/Assets/MixedRealityToolkit/Inspectors/Profiles/BaseMixedRealityProfileInspector.cs
@@ -34,12 +34,6 @@ protected virtual void OnEnable()
             profile = target as BaseMixedRealityProfile;
         }
 
-        [Obsolete("Use MixedRealityInspectorUtility.CheckMixedRealityConfigured instead")]
-        public static bool CheckMixedRealityConfigured(bool flag = true)
-        {
-            return false;
-        }
-
         /// <summary>
         /// Renders a <see cref="Microsoft.MixedReality.Toolkit.BaseMixedRealityProfile"/>.
         /// </summary>
diff --git a/Assets/MixedRealityToolkit/Inspectors/Profiles/BaseMixedRealityToolkitConfigurationProfileInspector.cs b/Assets/MixedRealityToolkit/Inspectors/Profiles/BaseMixedRealityToolkitConfigurationProfileInspector.cs
@@ -9,9 +9,6 @@
 
 namespace Microsoft.MixedReality.Toolkit.Editor
 {
-    [Obsolete("Use BaseMixedRealityToolkitConfigurationProfileInspector instead")]
-    public abstract class MixedRealityBaseConfigurationProfileInspector { }
-
     /// <summary>
     /// Base class for all Mixed Reality Toolkit specific <see cref="Microsoft.MixedReality.Toolkit.BaseMixedRealityProfile"/> inspectors to inherit from.
     /// </summary>
diff --git a/Assets/MixedRealityToolkit/Interfaces/InputSystem/Handlers/IMixedRealityInputHandler.cs b/Assets/MixedRealityToolkit/Interfaces/InputSystem/Handlers/IMixedRealityInputHandler.cs
@@ -23,26 +23,6 @@ public interface IMixedRealityInputHandler : IEventSystemHandler
         /// </summary>
         /// <param name="eventData"></param>
         void OnInputDown(InputEventData eventData);
-
-        /// <summary>
-        /// Input Pressed updates from Interactions, Keys, buttons, triggers, or any other simple input.
-        /// </summary>
-        /// <param name="eventData"></param>
-        /// <remarks>
-        /// The <see cref="Microsoft.MixedReality.Toolkit.Input.InputEventData{T}.InputData"/> is the pressed amount, if available.
-        /// </remarks>
-        [Obsolete("Use IMixedRealityInputHandler<float>.OnInputChanged(InputEventData<float> eventData)")]
-        void OnInputPressed(InputEventData<float> eventData);
-
-        /// <summary>
-        /// Input Position updates from Thumbsticks, Touchpads, or any other dual axis input with a position.
-        /// </summary>
-        /// <remarks>
-        /// The <see cref="Microsoft.MixedReality.Toolkit.Input.InputEventData{T}.InputData"/> is the current input position.
-        /// </remarks>
-        /// <param name="eventData"></param>
-        [Obsolete("Use IMixedRealityInputHandler<Vector2>.OnInputChanged(InputEventData<Vector2> eventData)")]
-        void OnPositionInputChanged(InputEventData<Vector2> eventData);
     }
 
     /// <summary>
diff --git a/Assets/MixedRealityToolkit/Interfaces/InputSystem/Handlers/IMixedRealitySpatialInputHandler.cs b/Assets/MixedRealityToolkit/Interfaces/InputSystem/Handlers/IMixedRealitySpatialInputHandler.cs
diff --git a/Assets/MixedRealityToolkit/Interfaces/InputSystem/Handlers/IMixedRealitySpatialInputHandler.cs.meta b/Assets/MixedRealityToolkit/Interfaces/InputSystem/Handlers/IMixedRealitySpatialInputHandler.cs.meta
diff --git a/Assets/MixedRealityToolkit/Interfaces/InputSystem/IMixedRealityInputSystem.cs b/Assets/MixedRealityToolkit/Interfaces/InputSystem/IMixedRealityInputSystem.cs
@@ -226,15 +226,6 @@ public interface IMixedRealityInputSystem : IMixedRealityEventSystem
         /// <param name="inputSource"></param>
         void RaisePointerDown(IMixedRealityPointer pointer, MixedRealityInputAction inputAction, Handedness handedness = Handedness.None, IMixedRealityInputSource inputSource = null);
 
-        /// <summary>
-        /// Raise the pointer down event.
-        /// </summary>
-        /// <param name="pointer">The pointer where the event originates.</param>
-        /// <param name="handedness">The handedness of the event.</param>
-        /// <param name="inputAction"></param>
-        [Obsolete("Use RaisePointerDown(IMixedRealityPointer pointer, MixedRealityInputAction inputAction, Handedness handedness = Handedness.None, IMixedRealityInputSource inputSource = null)")]
-        void RaisePointerDown(IMixedRealityPointer pointer, Handedness handedness, MixedRealityInputAction inputAction);
-
         #endregion Pointer Down
 
         #region Pointer Click
@@ -249,16 +240,6 @@ public interface IMixedRealityInputSystem : IMixedRealityEventSystem
         /// <param name="inputSource"></param>
         void RaisePointerClicked(IMixedRealityPointer pointer, MixedRealityInputAction inputAction, int count, Handedness handedness = Handedness.None, IMixedRealityInputSource inputSource = null);
 
-        /// <summary>
-        /// Raise the pointer clicked event.
-        /// </summary>
-        /// <param name="pointer"></param>
-        /// <param name="handedness"></param>
-        /// <param name="inputAction"></param>
-        /// <param name="count"></param>
-        [Obsolete("Use RaisePointerClicked(IMixedRealityPointer pointer, MixedRealityInputAction inputAction, int count, Handedness handedness = Handedness.None, IMixedRealityInputSource inputSource = null)")]
-        void RaisePointerClicked(IMixedRealityPointer pointer, Handedness handedness, MixedRealityInputAction inputAction, int count);
-
         #endregion Pointer Click
 
         #region Pointer Up
@@ -272,15 +253,6 @@ public interface IMixedRealityInputSystem : IMixedRealityEventSystem
         /// <param name="inputSource"></param>
         void RaisePointerUp(IMixedRealityPointer pointer, MixedRealityInputAction inputAction, Handedness handedness = Handedness.None, IMixedRealityInputSource inputSource = null);
 
-        /// <summary>
-        /// Raise the pointer up event.
-        /// </summary>
-        /// <param name="pointer"></param>
-        /// <param name="handedness"></param>
-        /// <param name="inputAction"></param>
-        [Obsolete("Use RaisePointerUp(IMixedRealityPointer pointer, MixedRealityInputAction inputAction, Handedness handedness = Handedness.None, IMixedRealityInputSource inputSource = null)")]
-        void RaisePointerUp(IMixedRealityPointer pointer, Handedness handedness, MixedRealityInputAction inputAction);
-
         #endregion Pointer Up
 
         #endregion Pointers

Original file line number	Diff line number	Diff line change
`@@ -196,12 +196,6 @@ void IMixedRealityInputHandler.OnInputDown(InputEventData eventData)`
`196`	`196`	`}`
`197`	`197`	`}`
`198`	`198`
`199`		`- [Obsolete("Use IMixedRealityInputHandler<float>.OnInputChanged instead.")]`
`200`		`- void IMixedRealityInputHandler.OnInputPressed(InputEventData<float> eventData)`
`201`		`- {`
`202`		`- Debug.LogWarning("Obsolete. Use IMixedRealityInputHandler<float>.OnInputChanged instead.");`
`203`		`- }`
`204`		`-`
`205`	`199`	`/// <inheritdoc />`
`206`	`200`	`void IMixedRealityInputHandler<float>.OnInputChanged(InputEventData<float> eventData)`
`207`	`201`	`{`
`@@ -211,13 +205,6 @@ void IMixedRealityInputHandler<float>.OnInputChanged(InputEventData<float> event`
`211`	`205`	`}`
`212`	`206`	`}`
`213`	`207`
`214`		`- /// <inheritdoc />`
`215`		`- [Obsolete("Use IMixedRealityInputHandler<Vector2>.OnInputChanged instead.")]`
`216`		`- void IMixedRealityInputHandler.OnPositionInputChanged(InputEventData<Vector2> eventData)`
`217`		`- {`
`218`		`- Debug.LogWarning("Obsolete. Use IMixedRealityInputHandler<Vector2>.OnInputChanged instead.");`
`219`		`- }`
`220`		`-`
`221`	`208`	`/// <inheritdoc />`
`222`	`209`	`void IMixedRealityInputHandler<Vector2>.OnInputChanged(InputEventData<Vector2> eventData)`
`223`	`210`	`{`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,10 @@ namespace Microsoft.MixedReality.Toolkit.UI`
`12`	`12`	`/// Add to any Object to spawn ToolTips on tap or on focus, according to preference`
`13`	`13`	`/// Applies its follow settings to the spawned ToolTip's ToolTipConnector component`
`14`	`14`	`/// </summary>`
`15`		`- public class ToolTipSpawner : BaseFocusHandler, IMixedRealityInputHandler`
	`15`	`+ public class ToolTipSpawner :`
	`16`	`+ BaseFocusHandler,`
	`17`	`+ IMixedRealityInputHandler,`
	`18`	`+ IMixedRealityInputHandler<float>`
`16`	`19`	`{`
`17`	`20`	`private enum SettingsMode`
`18`	`21`	`{`
`@@ -117,17 +120,14 @@ public override void OnFocusExit(FocusEventData eventData)`
`117`	`120`	`}`
`118`	`121`
`119`	`122`	`/// <inheritdoc />`
`120`		`- void IMixedRealityInputHandler.OnInputPressed(InputEventData<float> eventData)`
	`123`	`+ void IMixedRealityInputHandler<float>.OnInputChanged(InputEventData<float> eventData)`
`121`	`124`	`{`
`122`		`- if (eventData.InputData > .95f)`
	`125`	`+ if (eventData.InputData > .95f)`
`123`	`126`	`{`
`124`	`127`	`HandleTap();`
`125`	`128`	`}`
`126`	`129`	`}`
`127`	`130`
`128`		`- /// <inheritdoc />`
`129`		`- void IMixedRealityInputHandler.OnPositionInputChanged(InputEventData<Vector2> eventData) { }`
`130`		`-`
`131`	`131`	`/// <inheritdoc />`
`132`	`132`	`void IMixedRealityInputHandler.OnInputDown(InputEventData eventData)`
`133`	`133`	`{`
Original file line number	Diff line number	Diff line change
`@@ -9,9 +9,6 @@`
`9`	`9`
`10`	`10`	`namespace Microsoft.MixedReality.Toolkit.Editor`
`11`	`11`	`{`
`12`		`- [Obsolete("Use BaseMixedRealityToolkitConfigurationProfileInspector instead")]`
`13`		`- public abstract class MixedRealityBaseConfigurationProfileInspector { }`
`14`		`-`
`15`	`12`	`/// <summary>`
`16`	`13`	`/// Base class for all Mixed Reality Toolkit specific <see cref="Microsoft.MixedReality.Toolkit.BaseMixedRealityProfile"/> inspectors to inherit from.`
`17`	`14`	`/// </summary>`