Merge pull request #1088 from StephenHodgson/MRTK-Dev-InputSync

StephenHodgson · web-flow · commit 8e8ab1e41a24 · 2017-10-05T11:30:56.000-07:00
Input Feature area sync
diff --git a/Assets/HoloToolkit-Tests/Input/Scripts/HapticsTest.cs b/Assets/HoloToolkit-Tests/Input/Scripts/HapticsTest.cs
@@ -11,7 +11,7 @@ public class HapticsTest : MonoBehaviour, IInputHandler
     {
         void IInputHandler.OnInputDown(InputEventData eventData)
         {
-            InteractionSourceInputSource inputSource = eventData.InputSource as InteractionSourceInputSource;
+            InteractionInputSource inputSource = eventData.InputSource as InteractionInputSource;
             if (inputSource != null)
             {
                 switch (eventData.PressType)
@@ -28,7 +28,7 @@ void IInputHandler.OnInputDown(InputEventData eventData)
 
         void IInputHandler.OnInputUp(InputEventData eventData)
         {
-            InteractionSourceInputSource inputSource = eventData.InputSource as InteractionSourceInputSource;
+            InteractionInputSource inputSource = eventData.InputSource as InteractionInputSource;
             if (inputSource != null)
             {
                 if (eventData.PressType == InteractionSourcePressInfo.Grasp)
diff --git a/Assets/HoloToolkit/Input/Scripts/InputSources/InteractionInputSource.cs b/Assets/HoloToolkit/Input/Scripts/InputSources/InteractionInputSource.cs
@@ -15,7 +15,7 @@ namespace HoloToolkit.Unity.InputModule
     /// and positional information for the various inputs that Windows gestures supports.
     /// This is mostly a wrapper on top of GestureRecognizer and InteractionManager.
     /// </summary>
-    public class InteractionSourceInputSource : BaseInputSource
+    public class InteractionInputSource : BaseInputSource
     {
         // This enumeration gives the manager two different ways to handle the recognizer. Both will
         // set up the recognizer. The first causes the recognizer to start
diff --git a/Assets/HoloToolkit/Input/Scripts/InputSources/InteractionInputSource.cs.meta b/Assets/HoloToolkit/Input/Scripts/InputSources/InteractionInputSource.cs.meta

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ public class HapticsTest : MonoBehaviour, IInputHandler`
`11`	`11`	`{`
`12`	`12`	`void IInputHandler.OnInputDown(InputEventData eventData)`
`13`	`13`	`{`
`14`		`- InteractionSourceInputSource inputSource = eventData.InputSource as InteractionSourceInputSource;`
	`14`	`+ InteractionInputSource inputSource = eventData.InputSource as InteractionInputSource;`
`15`	`15`	`if (inputSource != null)`
`16`	`16`	`{`
`17`	`17`	`switch (eventData.PressType)`
`@@ -28,7 +28,7 @@ void IInputHandler.OnInputDown(InputEventData eventData)`
`28`	`28`
`29`	`29`	`void IInputHandler.OnInputUp(InputEventData eventData)`
`30`	`30`	`{`
`31`		`- InteractionSourceInputSource inputSource = eventData.InputSource as InteractionSourceInputSource;`
	`31`	`+ InteractionInputSource inputSource = eventData.InputSource as InteractionInputSource;`
`32`	`32`	`if (inputSource != null)`
`33`	`33`	`{`
`34`	`34`	`if (eventData.PressType == InteractionSourcePressInfo.Grasp)`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ namespace HoloToolkit.Unity.InputModule`
`15`	`15`	`/// and positional information for the various inputs that Windows gestures supports.`
`16`	`16`	`/// This is mostly a wrapper on top of GestureRecognizer and InteractionManager.`
`17`	`17`	`/// </summary>`
`18`		`- public class InteractionSourceInputSource : BaseInputSource`
	`18`	`+ public class InteractionInputSource : BaseInputSource`
`19`	`19`	`{`
`20`	`20`	`// This enumeration gives the manager two different ways to handle the recognizer. Both will`
`21`	`21`	`// set up the recognizer. The first causes the recognizer to start`