Merge pull request #2076 from PJBowron/useActivatedPointingController

SimpleSinglePointerSelector: connect pointer upon OnSourceDetected

Author: David Kline

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

@@ -21,8 +21,15 @@ public class SimpleSinglePointerSelector : MonoBehaviour, ISourceStateHandler, I
         [Tooltip("The cursor, if any, which should follow the selected pointer.")]
         public Cursor Cursor;
 
-        [Tooltip("True to search for a cursor if one isn't explicitly set.")]
-        public bool SearchForCursorIfUnset = true;
+        [Tooltip("If true, search for a cursor if one isn't explicitly set.")]
+        [SerializeField]
+        private bool searchForCursorIfUnset = true;
+        public bool SearchForCursorIfUnset { get { return searchForCursorIfUnset; } set { searchForCursorIfUnset = value; } }
+
+        [Tooltip("If true, always select the best pointer available (OS behaviour does not autoselect).")]
+        [SerializeField]
+        private bool autoselectBestAvailable = false;
+        public bool AutoselectBestAvailable { get { return autoselectBestAvailable; } set { autoselectBestAvailable = value; } }
 
         #endregion
 
@@ -72,7 +79,11 @@ private void OnDisable()
 
         void ISourceStateHandler.OnSourceDetected(SourceStateEventData eventData)
         {
-            // Nothing to do on source detected.
+            // If a pointing controller just became available, set it as primary.
+            if (autoselectBestAvailable && SupportsPointingRay(eventData))
+            {
+                ConnectBestAvailablePointer();
+            }
         }
 
         void ISourceStateHandler.OnSourceLost(SourceStateEventData eventData)
@@ -117,7 +128,7 @@ private void RemoveInputManagerListenerIfNeeded()
 
         private void FindCursorIfNeeded()
         {
-            if ((Cursor == null) && SearchForCursorIfUnset)
+            if ((Cursor == null) && searchForCursorIfUnset)
             {
                 Debug.LogWarningFormat(
                     this,