Merge pull request #433 from aalmada/InputManagerRefactoring

Changed InputManager.HandleEvent() to public and removed all events from IInputSource.

Author: NeerajW

Assets/HoloToolkit-Examples/ColorPicker/GazeableColorPicker.cs

@@ -49,7 +49,7 @@ public void OnFocusExit()
             gazing = false;
         }
 
-        public void OnInputClicked(InputEventData eventData)
+        public void OnInputClicked(InputClickedEventData eventData)
         {
             UpdatePickedColor(OnPickedColor);
         }

Assets/HoloToolkit-Examples/GazeRuler/Scripts/MeasureManager.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
 using UnityEngine;
@@ -104,11 +104,11 @@ public void OnHoldCanceled(HoldEventData eventData)
             // Nothing to do
         }
 
-        public void OnInputClicked(InputEventData eventData)
-        {
-            OnSelect();
-        }
+    public void OnInputClicked(InputClickedEventData eventData)
+    {
+        OnSelect();
     }
+}
 
     public class Point
     {
@@ -127,4 +127,4 @@ public enum GeometryMode
         Cube,
         Polygon
     }
-}
+}

Assets/HoloToolkit-Examples/SharingWithUNET/Scripts/PlayerController.cs

@@ -139,7 +139,7 @@ void CmdFire()
             Destroy(nextBullet, 8.0f);
         }
 
-        public void OnInputClicked(InputEventData eventData)
+        public void OnInputClicked(InputClickedEventData eventData)
         {
             if (isLocalPlayer)
             {

Assets/HoloToolkit-Examples/SpatialUnderstanding/SpatialUnderstanding-FeatureOverview/Scripts/AppState.cs

@@ -260,13 +260,12 @@ public void OnSourceLost(SourceStateEventData eventData)
             }
         }
 
-        public void OnInputClicked(InputEventData eventData)
+    public void OnInputClicked(InputClickedEventData eventData)
+    {
+        if ((SpatialUnderstanding.Instance.ScanState == SpatialUnderstanding.ScanStates.Scanning) &&
+            !SpatialUnderstanding.Instance.ScanStatsReportStillWorking)
         {
-            if ((SpatialUnderstanding.Instance.ScanState == SpatialUnderstanding.ScanStates.Scanning) &&
-                !SpatialUnderstanding.Instance.ScanStatsReportStillWorking)
-            {
-                SpatialUnderstanding.Instance.RequestFinishScan();
-            }
+            SpatialUnderstanding.Instance.RequestFinishScan();
         }
     }
-}
+}

Assets/HoloToolkit/Input/Scripts/Cursor/Cursor.cs

@@ -368,7 +368,7 @@ public virtual void OnInputDown(InputEventData eventData)
         /// Function for receiving OnInputClicked events from InputManager
         /// </summary>
         /// <param name="eventData"></param>
-        public virtual void OnInputClicked(InputEventData eventData)
+        public virtual void OnInputClicked(InputClickedEventData eventData)
         {
             // Open input socket for other cool stuff...
         }

Assets/HoloToolkit/Input/Scripts/InputEvents/IInputClickHandler.cs

@@ -10,6 +10,6 @@ namespace HoloToolkit.Unity.InputModule
     /// </summary>
     public interface IInputClickHandler : IEventSystemHandler
     {
-        void OnInputClicked(InputEventData eventData);
+        void OnInputClicked(InputClickedEventData eventData);
     }
 }

Assets/HoloToolkit/Input/Scripts/InputEvents/InputClickedEventData.cs

@@ -0,0 +1,29 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
+using UnityEngine;
+using UnityEngine.EventSystems;
+
+namespace HoloToolkit.Unity.InputModule
+{
+    /// <summary>
+    /// Describes an input event that involves a tap.
+    /// </summary>
+    public class InputClickedEventData : InputEventData
+    {
+        /// <summary>
+        /// Number of taps that triggered the event.
+        /// </summary>
+        public int TapCount { get; private set; }
+
+        public InputClickedEventData(EventSystem eventSystem) : base(eventSystem)
+        {
+        }
+
+        public void Initialize(IInputSource inputSource, uint sourceId, int tapCount)
+        {
+            BaseInitialize(inputSource, sourceId);
+            TapCount = tapCount;
+        }
+    }
+}