Merge pull request #3414 from Microsoft/beta2-stabilization

David Kline · web-flow · commit 60d299ede362 · 2019-02-06T11:31:00.000-08:00
Beta2 stabilization -&gt; mrtk_development
diff --git a/Assets/MixedRealityToolkit.SDK/Features/Input/Handlers/DragAndDropHandler.cs b/Assets/MixedRealityToolkit.SDK/Features/Input/Handlers/DragAndDropHandler.cs
@@ -19,7 +19,6 @@ namespace Microsoft.MixedReality.Toolkit.SDK.Input.Handlers
     /// and then repositioning the object based on that.
     /// </summary>
     public class DragAndDropHandler : BaseFocusHandler,
-        IMixedRealityInputHandler,
         IMixedRealityInputHandler<MixedRealityPose>,
         IMixedRealityPointerHandler,
         IMixedRealitySourceStateHandler
@@ -275,7 +274,7 @@ private void StopDragging()
             }
         }
 
-        #region IMixedRealitySourcePoseHandler Implementation
+        #region IMixedRealityInputHandler<MixedRealityPose> Implementation
 
         void IMixedRealityInputHandler<MixedRealityPose>.OnInputChanged(InputEventData<MixedRealityPose> eventData)
         {
@@ -390,15 +389,7 @@ void IMixedRealityInputHandler<MixedRealityPose>.OnInputChanged(InputEventData<M
             }
         }
 
-        void IMixedRealityInputHandler.OnInputUp(InputEventData eventData) { }
-
-        void IMixedRealityInputHandler.OnInputDown(InputEventData eventData) { }
-
-        void IMixedRealityInputHandler.OnInputPressed(InputEventData<float> eventData) { }
-
-        void IMixedRealityInputHandler.OnPositionInputChanged(InputEventData<Vector2> eventData) { }
-
-        #endregion IMixedRealitySourcePoseHandler Implementation
+        #endregion IMixedRealityInputHandler<MixedRealityPose> Implementation
 
         #region Private Helpers
 

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,6 @@ namespace Microsoft.MixedReality.Toolkit.SDK.Input.Handlers`
`19`	`19`	`/// and then repositioning the object based on that.`
`20`	`20`	`/// </summary>`
`21`	`21`	`public class DragAndDropHandler : BaseFocusHandler,`
`22`		`- IMixedRealityInputHandler,`
`23`	`22`	`IMixedRealityInputHandler<MixedRealityPose>,`
`24`	`23`	`IMixedRealityPointerHandler,`
`25`	`24`	`IMixedRealitySourceStateHandler`
`@@ -275,7 +274,7 @@ private void StopDragging()`
`275`	`274`	`}`
`276`	`275`	`}`
`277`	`276`
`278`		`- #region IMixedRealitySourcePoseHandler Implementation`
	`277`	`+ #region IMixedRealityInputHandler<MixedRealityPose> Implementation`
`279`	`278`
`280`	`279`	`void IMixedRealityInputHandler<MixedRealityPose>.OnInputChanged(InputEventData<MixedRealityPose> eventData)`
`281`	`280`	`{`
`@@ -390,15 +389,7 @@ void IMixedRealityInputHandler<MixedRealityPose>.OnInputChanged(InputEventData<M`
`390`	`389`	`}`
`391`	`390`	`}`
`392`	`391`
`393`		`- void IMixedRealityInputHandler.OnInputUp(InputEventData eventData) { }`
`394`		`-`
`395`		`- void IMixedRealityInputHandler.OnInputDown(InputEventData eventData) { }`
`396`		`-`
`397`		`- void IMixedRealityInputHandler.OnInputPressed(InputEventData<float> eventData) { }`
`398`		`-`
`399`		`- void IMixedRealityInputHandler.OnPositionInputChanged(InputEventData<Vector2> eventData) { }`
`400`		`-`
`401`		`- #endregion IMixedRealitySourcePoseHandler Implementation`
	`392`	`+ #endregion IMixedRealityInputHandler<MixedRealityPose> Implementation`
`402`	`393`
`403`	`394`	`#region Private Helpers`
`404`	`395`