Merge pull request #222 from killerantz/FocusObjectFix

Focus object fix

Author: jwittner

Assets/HoloToolkit/Input/Scripts/GestureManager.cs

@@ -48,7 +48,7 @@ public partial class GestureManager : Singleton<GestureManager>
         /// If its null, then the gazed at object will be selected.
         /// </summary>
         public GameObject OverrideFocusedObject { get; set; }
-        
+
         /// <summary>
         /// Gets the currently focused object, or null if none.
         /// </summary>
@@ -116,9 +116,7 @@ void Start()
             gestureRecognizer.StartCapturingGestures();
             manipulationRecognizer.StartCapturingGestures();
         }
-
-
-
+        
         private void InteractionManager_SourcePressed(InteractionSourceState state)
         {
             if (!HandPressed)
@@ -156,7 +154,7 @@ private void OnTap()
         {
             if (FocusedObject != null)
             {
-                FocusedObject.SendMessage("OnSelect");
+                FocusedObject.SendMessage("OnSelect", SendMessageOptions.DontRequireReceiver);
             }
         }
 
@@ -204,27 +202,28 @@ private void OnManipulation(bool inProgress, Vector3 offset)
 
         void LateUpdate()
         {
-            GameObject oldFocusedObject = FocusedObject;
+            GameObject newFocusedObject;
 
             if (GazeManager.Instance.Hit &&
                 OverrideFocusedObject == null &&
                 GazeManager.Instance.HitInfo.collider != null)
             {
                 // If gaze hits a hologram, set the focused object to that game object.
                 // Also if the caller has not decided to override the focused object.
-                FocusedObject = GazeManager.Instance.HitInfo.collider.gameObject;
+                newFocusedObject = GazeManager.Instance.HitInfo.collider.gameObject;
             }
             else
             {
                 // If our gaze doesn't hit a hologram, set the focused object to null or override focused object.
-                FocusedObject = OverrideFocusedObject;
+                newFocusedObject = OverrideFocusedObject;
             }
 
-            if (FocusedObject != oldFocusedObject)
+            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();
             }