Renamed SourceClickedEventData to InputClickedEventData. Changed argument type in IInputClickHandler.OnInputClicked() from InputEventData to InputClickedEventData.

aalmada · aalmada · commit 991d5a94790a · 2017-01-14T15:06:13.000Z
diff --git a/Assets/HoloToolkit-Examples/ColorPicker/GazeableColorPicker.cs b/Assets/HoloToolkit-Examples/ColorPicker/GazeableColorPicker.cs
@@ -46,7 +46,7 @@ public void OnFocusExit()
             gazing = false;
         }
 
-        public void OnInputClicked(InputEventData eventData)
+        public void OnInputClicked(InputClickedEventData eventData)
         {
             UpdatePickedColor(OnPickedColor);
         }
diff --git a/Assets/HoloToolkit-Examples/GazeRuler/Scripts/MeasureManager.cs b/Assets/HoloToolkit-Examples/GazeRuler/Scripts/MeasureManager.cs
@@ -99,7 +99,7 @@ public void OnHoldCanceled(HoldEventData eventData)
         // Nothing to do
     }
 
-    public void OnInputClicked(InputEventData eventData)
+    public void OnInputClicked(InputClickedEventData eventData)
     {
         OnSelect();
     }
diff --git a/Assets/HoloToolkit-Examples/SharingWithUNET/Scripts/PlayerController.cs b/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)
             {
diff --git a/Assets/HoloToolkit-Examples/SpatialUnderstanding/SpatialUnderstanding-FeatureOverview/Scripts/AppState.cs b/Assets/HoloToolkit-Examples/SpatialUnderstanding/SpatialUnderstanding-FeatureOverview/Scripts/AppState.cs
@@ -258,7 +258,7 @@ 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)
diff --git a/Assets/HoloToolkit/Input/Scripts/Cursor/Cursor.cs b/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...
         }
diff --git a/Assets/HoloToolkit/Input/Scripts/InputEvents/IInputClickHandler.cs b/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);
     }
 }
diff --git a/Assets/HoloToolkit/Input/Scripts/InputEvents/InputClickedEventData.cs b/Assets/HoloToolkit/Input/Scripts/InputEvents/InputClickedEventData.cs
@@ -7,16 +7,16 @@
 namespace HoloToolkit.Unity.InputModule
 {
     /// <summary>
-    /// Describes an input event that involves content manipulation.
+    /// Describes an input event that involves a tap.
     /// </summary>
-    public class SourceClickedEventData : InputEventData
+    public class InputClickedEventData : InputEventData
     {
         /// <summary>
         /// Number of taps that triggered the event.
         /// </summary>
         public int TapCount { get; private set; }
 
-        public SourceClickedEventData(EventSystem eventSystem) : base(eventSystem)
+        public InputClickedEventData(EventSystem eventSystem) : base(eventSystem)
         {
         }
 
diff --git a/Assets/HoloToolkit/Input/Scripts/InputEvents/InputClickedEventData.cs.meta b/Assets/HoloToolkit/Input/Scripts/InputEvents/InputClickedEventData.cs.meta
diff --git a/Assets/HoloToolkit/Input/Scripts/InputManager.cs b/Assets/HoloToolkit/Input/Scripts/InputManager.cs
@@ -29,7 +29,7 @@ public class InputManager : Singleton<InputManager>
         private int disabledRefCount;
 
         private InputEventData inputEventData;
-        private SourceClickedEventData sourceClickedEventData;
+        private InputClickedEventData sourceClickedEventData;
         private SourceStateEventData sourceStateEventData;
         private ManipulationEventData manipulationEventData;
         private HoldEventData holdEventData;
@@ -178,7 +178,7 @@ private void Start()
         private void InitializeEventDatas()
         {
             inputEventData = new InputEventData(EventSystem.current);
-            sourceClickedEventData = new SourceClickedEventData(EventSystem.current);
+            sourceClickedEventData = new InputClickedEventData(EventSystem.current);
             sourceStateEventData = new SourceStateEventData(EventSystem.current);
             manipulationEventData = new ManipulationEventData(EventSystem.current);
             navigationEventData = new NavigationEventData(EventSystem.current);
@@ -324,11 +324,11 @@ private void GazeManager_FocusedChanged(GameObject previousObject, GameObject ne
         private static readonly ExecuteEvents.EventFunction<IInputClickHandler> OnInputClickedEventHandler =
             delegate (IInputClickHandler handler, BaseEventData eventData)
             {
-                SourceClickedEventData casted = ExecuteEvents.ValidateEventData<SourceClickedEventData>(eventData);
+                InputClickedEventData casted = ExecuteEvents.ValidateEventData<InputClickedEventData>(eventData);
                 handler.OnInputClicked(casted);
             };
 
-        public void RaiseSourceClicked(IInputSource source, uint sourceId, int tapCount)
+        public void RaiseInputClicked(IInputSource source, uint sourceId, int tapCount)
         {
             // Create input event
             sourceClickedEventData.Initialize(source, sourceId, tapCount);
diff --git a/Assets/HoloToolkit/Input/Scripts/InputSources/EditorHandsInput.cs b/Assets/HoloToolkit/Input/Scripts/InputSources/EditorHandsInput.cs
@@ -317,7 +317,7 @@ private void SendHandStateEvents(EditorHandData editorHandData, float time)
                     if (time - editorHandData.FingerDownStartTime < MaxClickDuration)
                     {
                         // We currently only support single taps in editor
-                        inputManager.RaiseSourceClicked(this, editorHandData.HandId, 1);
+                        inputManager.RaiseInputClicked(this, editorHandData.HandId, 1);
 					}
                 }
             }
diff --git a/Assets/HoloToolkit/Input/Scripts/InputSources/GesturesInput.cs b/Assets/HoloToolkit/Input/Scripts/InputSources/GesturesInput.cs
@@ -151,7 +151,7 @@ public void StopGestureRecognizer()
 
         protected void OnTappedEvent(InteractionSourceKind source, int tapCount, Ray headRay)
         {
-            inputManager.RaiseSourceClicked(this, 0, tapCount);
+            inputManager.RaiseInputClicked(this, 0, tapCount);
         }
 
         protected void OnHoldStartedEvent(InteractionSourceKind source, Ray headray)
diff --git a/Assets/HoloToolkit/Input/Scripts/UI/TriggerButton.cs b/Assets/HoloToolkit/Input/Scripts/UI/TriggerButton.cs
@@ -30,7 +30,7 @@ public void Press()
             }
         }
 
-        public void OnInputClicked(InputEventData eventData)
+        public void OnInputClicked(InputClickedEventData eventData)
         {
             if (IsEnabled)
             {
diff --git a/Assets/HoloToolkit/Input/Tests/Scripts/InputHandleCallbackFX.cs b/Assets/HoloToolkit/Input/Tests/Scripts/InputHandleCallbackFX.cs
@@ -15,7 +15,7 @@ private void Start()
             InputManager.Instance.PushFallbackInputHandler(gameObject);
         }
 
-        public void OnInputClicked(InputEventData eventData)
+        public void OnInputClicked(InputClickedEventData eventData)
         {
             particles.transform.position = GazeManager.Instance.HitPosition;
             particles.Emit(60);
diff --git a/Assets/HoloToolkit/Input/Tests/Scripts/InputTest.cs b/Assets/HoloToolkit/Input/Tests/Scripts/InputTest.cs
@@ -31,9 +31,9 @@ public void OnInputDown(InputEventData eventData)
             Debug.LogFormat("OnInputDown\r\nSource: {0}  SourceId: {1}", eventData.InputSource, eventData.SourceId);
         }
 
-        public void OnInputClicked(InputEventData eventData)
+        public void OnInputClicked(InputClickedEventData eventData)
         {
-            Debug.LogFormat("OnInputClicked\r\nSource: {0}  SourceId: {1}", eventData.InputSource, eventData.SourceId);
+            Debug.LogFormat("OnInputClicked\r\nSource: {0}  SourceId: {1} TapCount: {2}", eventData.InputSource, eventData.SourceId, eventData.TapCount);
         }
 
         public void OnFocusEnter()
diff --git a/Assets/HoloToolkit/Input/Tests/Scripts/PopupMenu.cs b/Assets/HoloToolkit/Input/Tests/Scripts/PopupMenu.cs
@@ -135,7 +135,7 @@ private void OnCancelPressed(TestButton source)
             Dismiss();
         }
 
-        public void OnInputClicked(InputEventData eventData)
+        public void OnInputClicked(InputClickedEventData eventData)
         {
             if (closeOnNonTargetedTap)
             {
diff --git a/Assets/HoloToolkit/Input/Tests/Scripts/TapResponder.cs b/Assets/HoloToolkit/Input/Tests/Scripts/TapResponder.cs
@@ -11,7 +11,7 @@ namespace HoloToolkit.Unity.InputModule.Tests
     /// </summary>
     public class TapResponder : MonoBehaviour, IInputClickHandler
     {
-        public void OnInputClicked(InputEventData eventData)
+        public void OnInputClicked(InputClickedEventData eventData)
         {
             // Increase the scale of the object just as a response.
             gameObject.transform.localScale += 0.05f * gameObject.transform.localScale;
diff --git a/Assets/HoloToolkit/Input/Tests/Scripts/TestButton.cs b/Assets/HoloToolkit/Input/Tests/Scripts/TestButton.cs
@@ -197,7 +197,7 @@ private void UpdateButtonAnimation()
             }
         }
 
-        public void OnInputClicked(InputEventData eventData)
+        public void OnInputClicked(InputClickedEventData eventData)
         {
             if (!EnableActivation)
             {
diff --git a/Assets/HoloToolkit/SpatialMapping/Scripts/TapToPlace.cs b/Assets/HoloToolkit/SpatialMapping/Scripts/TapToPlace.cs
@@ -123,7 +123,7 @@ protected virtual void Update()
             }
         }
 
-        public virtual void OnInputClicked(InputEventData eventData)
+        public virtual void OnInputClicked(InputClickedEventData eventData)
         {
             // On each tap gesture, toggle whether the user is in placing mode.
             IsBeingPlaced = !IsBeingPlaced;
diff --git a/Assets/HoloToolkit/Utilities/Tests/Scripts/GestureResponder.cs b/Assets/HoloToolkit/Utilities/Tests/Scripts/GestureResponder.cs
@@ -8,7 +8,7 @@ private void Start()
         InputManager.Instance.PushFallbackInputHandler(gameObject);
     }
 
-    public void OnInputClicked(InputEventData eventData)
+    public void OnInputClicked(InputClickedEventData eventData)
     {
         PlaneTargetGroupPicker.Instance.PickNewTarget();
     }
diff --git a/Assets/HoloToolkit/Utilities/Tests/Scripts/TextToSpeechOnTap.cs b/Assets/HoloToolkit/Utilities/Tests/Scripts/TextToSpeechOnTap.cs
@@ -8,7 +8,7 @@ public class TextToSpeechOnTap : MonoBehaviour, IInputClickHandler
     {
         public TextToSpeechManager TextToSpeech;
 
-        public void OnInputClicked(InputEventData eventData)
+        public void OnInputClicked(InputClickedEventData eventData)
         {
             // If we have a text to speech manager on the target object, say something.
             // This voice will appear to emanate from the object.

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public void OnFocusExit()`
`46`	`46`	`gazing = false;`
`47`	`47`	`}`
`48`	`48`
`49`		`- public void OnInputClicked(InputEventData eventData)`
	`49`	`+ public void OnInputClicked(InputClickedEventData eventData)`
`50`	`50`	`{`
`51`	`51`	`UpdatePickedColor(OnPickedColor);`
`52`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ public void OnHoldCanceled(HoldEventData eventData)`
`99`	`99`	`// Nothing to do`
`100`	`100`	`}`
`101`	`101`
`102`		`- public void OnInputClicked(InputEventData eventData)`
	`102`	`+ public void OnInputClicked(InputClickedEventData eventData)`
`103`	`103`	`{`
`104`	`104`	`OnSelect();`
`105`	`105`	`}`
Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ void CmdFire()`
`139`	`139`	`Destroy(nextBullet, 8.0f);`
`140`	`140`	`}`
`141`	`141`
`142`		`- public void OnInputClicked(InputEventData eventData)`
	`142`	`+ public void OnInputClicked(InputClickedEventData eventData)`
`143`	`143`	`{`
`144`	`144`	`if (isLocalPlayer)`
`145`	`145`	`{`
Original file line number	Diff line number	Diff line change
`@@ -258,7 +258,7 @@ public void OnSourceLost(SourceStateEventData eventData)`
`258`	`258`	`}`
`259`	`259`	`}`
`260`	`260`
`261`		`- public void OnInputClicked(InputEventData eventData)`
	`261`	`+ public void OnInputClicked(InputClickedEventData eventData)`
`262`	`262`	`{`
`263`	`263`	`if ((SpatialUnderstanding.Instance.ScanState == SpatialUnderstanding.ScanStates.Scanning) &&`
`264`	`264`	`!SpatialUnderstanding.Instance.ScanStatsReportStillWorking)`
Original file line number	Diff line number	Diff line change
`@@ -368,7 +368,7 @@ public virtual void OnInputDown(InputEventData eventData)`
`368`	`368`	`/// Function for receiving OnInputClicked events from InputManager`
`369`	`369`	`/// </summary>`
`370`	`370`	`/// <param name="eventData"></param>`
`371`		`- public virtual void OnInputClicked(InputEventData eventData)`
	`371`	`+ public virtual void OnInputClicked(InputClickedEventData eventData)`
`372`	`372`	`{`
`373`	`373`	`// Open input socket for other cool stuff...`
`374`	`374`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,6 @@ namespace HoloToolkit.Unity.InputModule`
`10`	`10`	`/// </summary>`
`11`	`11`	`public interface IInputClickHandler : IEventSystemHandler`
`12`	`12`	`{`
`13`		`- void OnInputClicked(InputEventData eventData);`
	`13`	`+ void OnInputClicked(InputClickedEventData eventData);`
`14`	`14`	`}`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,16 +7,16 @@`
`7`	`7`	`namespace HoloToolkit.Unity.InputModule`
`8`	`8`	`{`
`9`	`9`	`/// <summary>`
`10`		`- /// Describes an input event that involves content manipulation.`
	`10`	`+ /// Describes an input event that involves a tap.`
`11`	`11`	`/// </summary>`
`12`		`- public class SourceClickedEventData : InputEventData`
	`12`	`+ public class InputClickedEventData : InputEventData`
`13`	`13`	`{`
`14`	`14`	`/// <summary>`
`15`	`15`	`/// Number of taps that triggered the event.`
`16`	`16`	`/// </summary>`
`17`	`17`	`public int TapCount { get; private set; }`
`18`	`18`
`19`		`- public SourceClickedEventData(EventSystem eventSystem) : base(eventSystem)`
	`19`	`+ public InputClickedEventData(EventSystem eventSystem) : base(eventSystem)`
`20`	`20`	`{`
`21`	`21`	`}`
`22`	`22`
Original file line number	Diff line number	Diff line change
`@@ -317,7 +317,7 @@ private void SendHandStateEvents(EditorHandData editorHandData, float time)`
`317`	`317`	`if (time - editorHandData.FingerDownStartTime < MaxClickDuration)`
`318`	`318`	`{`
`319`	`319`	`// We currently only support single taps in editor`
`320`		`- inputManager.RaiseSourceClicked(this, editorHandData.HandId, 1);`
	`320`	`+ inputManager.RaiseInputClicked(this, editorHandData.HandId, 1);`
`321`	`321`	`}`
`322`	`322`	`}`
`323`	`323`	`}`