Merge pull request #426 from LocalJoost/ObjectCursorChange

It makes no sense to hide the cursor when there is no cursor listed

Author: NeerajW

Assets/HoloToolkit/Input/Scripts/Cursor/ObjectCursor.cs

@@ -37,6 +37,12 @@ protected override void OnEnable()
             {
                 ParentTransform = transform;
             }
+
+            for (int i = 0; i < ParentTransform.childCount; i++)
+            {
+                ParentTransform.GetChild(i).gameObject.SetActive(false);
+            }
+
             base.OnEnable();
         }
 
@@ -48,23 +54,42 @@ protected override void OnEnable()
         public override void OnCursorStateChange(CursorStateEnum state)
         {
             base.OnCursorStateChange(state);
-
             if (state != CursorStateEnum.Contextual)
             {
-                // Hide all children first
-                for(int i = 0; i < ParentTransform.childCount; i++)
+
+                // First, try to find a cursor for the current state
+                var newActive = new ObjectCursorDatum();
+                for(int cursorIndex = 0; cursorIndex < CursorStateData.Length; cursorIndex++)
                 {
-                    ParentTransform.GetChild(i).gameObject.SetActive(false);
+                    ObjectCursorDatum cursor = CursorStateData[cursorIndex];
+                    if (cursor.CursorState == state)
+                    {
+                        newActive = cursor;
+                        break;
+                    }
+                }
+
+                // If no cursor for current state is found, let the last active cursor be
+                // (any cursor is better than an invisible cursor)
+                if (newActive.Name == null)
+                {
+                    return;
                 }
 
-                // Set active any that match the current state
-                for (int i = 0; i < CursorStateData.Length; i++)
+                // If we come here, there is a cursor for the new state, 
+                // so de-activate a possible earlier active cursor
+                for(int cursorIndex = 0; cursorIndex < CursorStateData.Length; cursorIndex++)
                 {
-                    if (CursorStateData[i].CursorState == state)
+                    ObjectCursorDatum cursor = CursorStateData[cursorIndex];
+                    if (cursor.CursorObject.activeSelf)
                     {
-                        CursorStateData[i].CursorObject.SetActive(true);
+                        cursor.CursorObject.SetActive(false);
+                        break;
                     }
                 }
+
+                // ... and set the cursor for the new state active.
+                newActive.CursorObject.SetActive(true);
             }
         }
     }