Merge pull request #510 from NeerajW/master

InputManager: Add OverrideFocusedObject functionality

Author: Stephen Hodgson

Assets/HoloToolkit/Input/README.md

@@ -295,6 +295,10 @@ Gazing on an object and saying "Select Object" will persistently select that obj
 after which the user can also adjust object size with "Make Smaller" and "Make Bigger" voice commands and finally clear
 currently selected object by saying "Clear Selection".
 
+#### OverrideFocusedObjectTest.unity
+Test scene shows you in a simple way, how to route input to an object not being gazed/focused at.
+Useful for scenarios like placing head locked content or clicking around to create objects.
+
 #### SpeechInputSource.unity
 
 Shows how to use the SpeechInputSource.cs script to add keywords to your scene.

Assets/HoloToolkit/Input/Scripts/InputManager.cs

@@ -14,6 +14,13 @@ namespace HoloToolkit.Unity.InputModule
     /// </summary>
     public class InputManager : Singleton<InputManager>
     {
+        /// <summary>
+        /// To tap on a hologram even when not focused on,
+        /// set OverrideFocusedObject to desired game object.
+        /// If it's null, then focused object will be used.
+        /// </summary>
+        public GameObject OverrideFocusedObject { get; set; }
+
         public event Action InputEnabled;
         public event Action InputDisabled;
 
@@ -208,6 +215,9 @@ public void HandleEvent<T>(BaseEventData eventData, ExecuteEvents.EventFunction<
                 return;
             }
 
+            // Use focused object when OverrideFocusedObject is null.
+            GameObject focusedObject = (OverrideFocusedObject == null) ? GazeManager.Instance.HitObject : OverrideFocusedObject;
+
             // Send the event to global listeners
             for (int i = 0; i < globalListeners.Count; i++)
             {
@@ -222,7 +232,6 @@ public void HandleEvent<T>(BaseEventData eventData, ExecuteEvents.EventFunction<
 
                 // If there is a focused object in the hierarchy of the modal handler, start the event
                 // bubble there
-                GameObject focusedObject = GazeManager.Instance.HitObject;
                 if (focusedObject != null && focusedObject.transform.IsChildOf(modalInput.transform))
                 {
 
@@ -242,9 +251,9 @@ public void HandleEvent<T>(BaseEventData eventData, ExecuteEvents.EventFunction<
             }
 
             // If event was not handled by modal, pass it on to the current focused object
-            if (GazeManager.Instance.HitObject != null)
+            if (focusedObject != null)
             {
-                bool eventHandled = ExecuteEvents.ExecuteHierarchy(GazeManager.Instance.HitObject, eventData, eventHandler);
+                bool eventHandled = ExecuteEvents.ExecuteHierarchy(focusedObject, eventData, eventHandler);
                 if (eventHandled)
                 {
                     return;