Initial commit

Author: Railboy

Assets/HoloToolkit/Input/Scripts/Focus/FocusManager.cs

@@ -507,25 +507,33 @@ private void UpdatePointer(PointerData pointer)
             {
                 // Don't clear the previous focused object since we still want to trigger FocusExit events
                 pointer.ResetFocusedObjects(false);
-                return;
             }
+            else
+            {
+                // If the pointer is locked
+                // Keep the focus objects the same
+                // This will ensure that we execute events on those objects
+                // even if the pointer isn't pointing at them
+                if (!pointer.PointingSource.FocusLocked)
+                {
+                    // Otherwise, continue
+                    var prioritizedLayerMasks = (pointer.PointingSource.PrioritizedLayerMasksOverride ?? pointingRaycastLayerMasks);
 
-            // Otherwise, continue
-            var prioritizedLayerMasks = (pointer.PointingSource.PrioritizedLayerMasksOverride ?? pointingRaycastLayerMasks);
+                    // Perform raycast to determine focused object
+                    RaycastPhysics(pointer, prioritizedLayerMasks);
 
-            // Perform raycast to determine focused object
-            RaycastPhysics(pointer, prioritizedLayerMasks);
+                    // If we have a unity event system, perform graphics raycasts as well to support Unity UI interactions
+                    if (EventSystem.current != null)
+                    {
+                        // NOTE: We need to do this AFTER RaycastPhysics so we use the current hit point to perform the correct 2D UI Raycast.
+                        RaycastUnityUI(pointer, prioritizedLayerMasks);
+                    }
 
-            // If we have a unity event system, perform graphics raycasts as well to support Unity UI interactions
-            if (EventSystem.current != null)
-            {
-                // NOTE: We need to do this AFTER RaycastPhysics so we use the current hit point to perform the correct 2D UI Raycast.
-                RaycastUnityUI(pointer, prioritizedLayerMasks);
+                    // Set the pointer's result last
+                    pointer.PointingSource.Result = pointer;
+                }
             }
 
-            // Set the pointer's result last
-            pointer.PointingSource.Result = pointer;
-
             // Call the pointer's OnPostRaycast function
             // This will give it a chance to respond to raycast results
             // eg by updating its appearance
@@ -601,6 +609,9 @@ private void RaycastUnityUI(PointerData pointer, LayerMask[] prioritizedLayerMas
             RayStep rayStep = default(RayStep);
             int rayStepIndex = 0;
 
+            Debug.Assert(pointer.PointingSource.Rays != null);
+            Debug.Assert(pointer.PointingSource.Rays.Length > 0);
+
             // Cast rays for every step until we score a hit
             for (int i = 0; i < pointer.PointingSource.Rays.Length; i++)
             {
@@ -613,7 +624,7 @@ private void RaycastUnityUI(PointerData pointer, LayerMask[] prioritizedLayerMas
             }
 
             // Check if we need to overwrite the physics raycast info
-            if ((pointer.End.Object == null || overridePhysicsRaycast) && uiRaycastResult.module.eventCamera == UIRaycastCamera)
+            if ((pointer.End.Object == null || overridePhysicsRaycast) && (uiRaycastResult.module != null && uiRaycastResult.module.eventCamera == UIRaycastCamera))
             {
                 newUiRaycastPosition.x = uiRaycastResult.screenPosition.x;
                 newUiRaycastPosition.y = uiRaycastResult.screenPosition.y;

Assets/HoloToolkit/Input/Scripts/Focus/IPointingSource.cs

@@ -33,5 +33,7 @@ public interface IPointingSource
         void OnPostRaycast();
 
         bool OwnsInput(BaseEventData eventData);
+
+        bool FocusLocked { get; set; }
     }
 }

Assets/HoloToolkit/Input/Scripts/Focus/InputSourcePointer.cs

@@ -46,6 +46,8 @@ public bool InteractionEnabled
             }
         }
 
+        public bool FocusLocked { get; set; }
+
         private RayStep[] rays = new RayStep[1] { new RayStep(Vector3.zero, Vector3.forward) };
 
         [Obsolete("Will be removed in a later version. Use OnPreRaycast / OnPostRaycast instead.")]

Assets/HoloToolkit/Input/Scripts/Gaze/GazeManager.cs

@@ -139,6 +139,8 @@ public bool InteractionEnabled
             }
         }
 
+        public bool FocusLocked { get; set; }
+
         private float lastHitDistance = 2.0f;
 
         protected override void Awake()

Assets/HoloToolkit/UX/Scripts/Receivers/InteractionReceiver.cs

@@ -13,7 +13,7 @@ namespace HoloToolkit.Unity.Receivers
     /// An interaction receiver is simply a component that attached to a list of interactable objects and does something
     /// based on events from those interactable objects.  This is the base abstract class to extend from.
     /// </summary>
-    public abstract class InteractionReceiver : MonoBehaviour, IInputHandler, IHoldHandler, IInputClickHandler
+    public abstract class InteractionReceiver : MonoBehaviour, IInputHandler, IHoldHandler, IInputClickHandler, IManipulationHandler
     {
         #region Public Members
         /// <summary>
@@ -31,11 +31,25 @@ public abstract class InteractionReceiver : MonoBehaviour, IInputHandler, IHoldH
         /// <summary>
         /// Flag for locking focus while selected
         /// </summary>
-        [Tooltip("If true, this object will remain the prime focus while select is held")]
-        public bool _LockFocus;
+        public bool LockFocus
+        {
+            get
+            {
+                return lockFocus;
+            }
+            set
+            {
+                lockFocus = value;
+                CheckLockFocus(_selectingFocuser);
+            }
+        }
         #endregion
 
         #region Private and Protected Members
+        [Tooltip("If true, this object will remain the prime focus while select is held")]
+        [SerializeField]
+        private bool lockFocus = false;
+
         /// <summary>
         /// Protected focuser for the current selecting focuser
         /// </summary>
@@ -148,27 +162,39 @@ protected bool Isinteractable(GameObject interactable)
 
         private void CheckLockFocus(IPointingSource focuser)
         {
-            if (_LockFocus)
+            // If our previous selecting focuser isn't the same
+            if (_selectingFocuser != null && _selectingFocuser != focuser)
+            {
+                // If our focus is currently locked, unlock it before moving on
+                if (LockFocus)
+                {
+                    _selectingFocuser.FocusLocked = false;
+                }
+            }
+
+            // Set to the new focuser
+            _selectingFocuser = focuser;
+            if (_selectingFocuser != null)
             {
-                //LockFocus(focuser);
+                _selectingFocuser.FocusLocked = LockFocus;
             }
         }
 
-        private void LockFocus(IPointingSource focuser)
+        private void LockFocuser(IPointingSource focuser)
         {
             if (focuser != null)
             {
-                ReleaseFocus();
+                ReleaseFocuser();
                 _selectingFocuser = focuser;
-                // _selectingFocuser.LockFocus();
+                _selectingFocuser.FocusLocked = true;
             }
         }
 
-        private void ReleaseFocus()
+        private void ReleaseFocuser()
         {
             if (_selectingFocuser != null)
             {
-                // _selectingFocuser.ReleaseFocus();
+                _selectingFocuser.FocusLocked = false;
                 _selectingFocuser = null;
             }
         }
@@ -193,6 +219,8 @@ private void OnPointerSpecificFocusChanged(IPointingSource pointer, GameObject o
             {
                 FocusExit(oldFocusedObject, eventData);
             }
+
+            CheckLockFocus(pointer);
         }
 
         #region Global Listener Callbacks