Merge pull request #241 from killerantz/PressedReleasedEvents

Added Pressed and Released events to the Gesture Manager

Author: NeerajW

Assets/HoloToolkit/Input/Scripts/GestureManager.cs

@@ -86,6 +86,8 @@ public Vector3 ManipulationHandPosition
         // we want for manipulation
         private GestureRecognizer manipulationRecognizer;
 
+        private bool hasRecognitionStarted = false;
+
         private bool HandPressed { get { return pressedHands.Count > 0; } }
         private HashSet<uint> pressedHands = new HashSet<uint>();
 
@@ -107,6 +109,11 @@ void Start()
 
             gestureRecognizer.TappedEvent += GestureRecognizer_TappedEvent;
 
+            // We need to send pressed and released events to UI so they can provide visual feedback
+            // of the current state of the UI based on user input.
+            gestureRecognizer.RecognitionStartedEvent += GestureRecognizer_RecognitionStartedEvent;
+            gestureRecognizer.RecognitionEndedEvent += GestureRecogniser_RecognitionEndedEvent;
+
             manipulationRecognizer.ManipulationStartedEvent += ManipulationRecognizer_ManipulationStartedEvent;
             manipulationRecognizer.ManipulationUpdatedEvent += ManipulationRecognizer_ManipulationUpdatedEvent;
             manipulationRecognizer.ManipulationCompletedEvent += ManipulationRecognizer_ManipulationCompletedEvent;
@@ -116,7 +123,7 @@ void Start()
             gestureRecognizer.StartCapturingGestures();
             manipulationRecognizer.StartCapturingGestures();
         }
-        
+
         private void InteractionManager_SourcePressed(InteractionSourceState state)
         {
             if (!HandPressed)
@@ -150,6 +157,16 @@ private void GestureRecognizer_TappedEvent(InteractionSourceKind source, int tap
             OnTap();
         }
 
+        private void GestureRecognizer_RecognitionStartedEvent(InteractionSourceKind source, Ray headRay)
+        {
+            OnRecognitionStarted();
+        }
+
+        private void GestureRecogniser_RecognitionEndedEvent(InteractionSourceKind source, Ray headRay)
+        {
+            OnRecognitionEndeded();
+        }
+
         private void OnTap()
         {
             if (FocusedObject != null)
@@ -158,6 +175,25 @@ private void OnTap()
             }
         }
 
+        private void OnRecognitionStarted()
+        {
+            if (FocusedObject != null)
+            {
+                hasRecognitionStarted = true;
+                FocusedObject.SendMessage("OnPressed", SendMessageOptions.DontRequireReceiver);
+            }
+        }
+
+        private void OnRecognitionEndeded()
+        {
+            if (FocusedObject != null && hasRecognitionStarted)
+            {
+                FocusedObject.SendMessage("OnReleased", SendMessageOptions.DontRequireReceiver);
+            }
+
+            hasRecognitionStarted = false;
+        }
+
         private void ManipulationRecognizer_ManipulationStartedEvent(InteractionSourceKind source, Vector3 cumulativeDelta, Ray headRay)
         {
             // Don't start another manipulation gesture if one is already underway
@@ -202,6 +238,8 @@ private void OnManipulation(bool inProgress, Vector3 offset)
 
         void LateUpdate()
         {
+            // set the next focus object to see if focus has changed, but don't replace the current focused object
+            // until all the inputs are handled, like Unity Editor input for OnTap().
             GameObject newFocusedObject;
 
             if (GazeManager.Instance.Hit &&
@@ -218,27 +256,36 @@ void LateUpdate()
                 newFocusedObject = OverrideFocusedObject;
             }
 
-            if (FocusedObject != newFocusedObject)
-            {
-                // If the currently focused object doesn't match the old focused object, cancel the current gesture.
-                // Start looking for new gestures.  This is to prevent applying gestures from one hologram to another.
-                gestureRecognizer.CancelGestures();
-                FocusedObject = newFocusedObject;
-                gestureRecognizer.StartCapturingGestures();
-            }
+            bool focusedChanged = FocusedObject != newFocusedObject;
 
 #if UNITY_EDITOR
             if (Input.GetMouseButtonDown(1) || Input.GetKeyDown(EditorSelectKey))
             {
                 OnTap();
+                OnRecognitionStarted();
+            }
+
+            if (Input.GetMouseButtonUp(1) || Input.GetKeyUp(EditorSelectKey) || focusedChanged)
+            {
+                OnRecognitionEndeded();
             }
 #endif
+            if (focusedChanged)
+            {
+                // If the currently focused object doesn't match the new focused object, cancel the current gesture.
+                // Start looking for new gestures.  This is to prevent applying gestures from one hologram to another.
+                gestureRecognizer.CancelGestures();
+                FocusedObject = newFocusedObject;
+                gestureRecognizer.StartCapturingGestures();
+            }
         }
 
         void OnDestroy()
         {
             gestureRecognizer.StopCapturingGestures();
             gestureRecognizer.TappedEvent -= GestureRecognizer_TappedEvent;
+            gestureRecognizer.RecognitionStartedEvent -= GestureRecognizer_RecognitionStartedEvent;
+            gestureRecognizer.RecognitionEndedEvent -= GestureRecogniser_RecognitionEndedEvent;
 
             manipulationRecognizer.StopCapturingGestures();
             manipulationRecognizer.ManipulationStartedEvent -= ManipulationRecognizer_ManipulationStartedEvent;