Change OverrideFocusedObjectTest scene to use global listener mechanism

In a recent change, the OverrideFocusedObject concept was removed from FocusManager since it
was redundant with global listeners and modal handlers. This change fixes up the
OverrideFocusedObjectTest scene to use the global listener mechanism.

It also adds a box collider to the text so it can be clicked when not overriding focus and makes the
text easier to understand by counting clicks and saying whether or not focus is currently overridden.

Author: Robert El-Soudani

Assets/HoloToolkit/Input/Tests/Scenes/OverrideFocusedObjectTest.unity

@@ -13,7 +13,7 @@ OcclusionCullingSettings:
 --- !u!104 &2
 RenderSettings:
   m_ObjectHideFlags: 0
-  serializedVersion: 7
+  serializedVersion: 8
   m_Fog: 0
   m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
   m_FogMode: 3
@@ -25,6 +25,7 @@ RenderSettings:
   m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
   m_AmbientIntensity: 1
   m_AmbientMode: 0
+  m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
   m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0}
   m_HaloStrength: 0.5
   m_FlareStrength: 1
@@ -37,11 +38,11 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.44657874, g: 0.4964127, b: 0.5748172, a: 1}
+  m_IndirectSpecularColor: {r: 0.44657886, g: 0.4964128, b: 0.57481706, a: 1}
 --- !u!157 &3
 LightmapSettings:
   m_ObjectHideFlags: 0
-  serializedVersion: 7
+  serializedVersion: 9
   m_GIWorkflowMode: 0
   m_GISettings:
     serializedVersion: 2
@@ -53,7 +54,7 @@ LightmapSettings:
     m_EnableBakedLightmaps: 1
     m_EnableRealtimeLightmaps: 1
   m_LightmapEditorSettings:
-    serializedVersion: 4
+    serializedVersion: 8
     m_Resolution: 2
     m_BakeResolution: 40
     m_TextureWidth: 1024
@@ -66,13 +67,27 @@ LightmapSettings:
     m_LightmapParameters: {fileID: 0}
     m_LightmapsBakeMode: 1
     m_TextureCompression: 1
-    m_DirectLightInLightProbes: 1
     m_FinalGather: 0
     m_FinalGatherFiltering: 1
     m_FinalGatherRayCount: 256
     m_ReflectionCompression: 2
+    m_MixedBakeMode: 1
+    m_BakeBackend: 0
+    m_PVRSampling: 1
+    m_PVRDirectSampleCount: 32
+    m_PVRSampleCount: 500
+    m_PVRBounces: 2
+    m_PVRFiltering: 0
+    m_PVRFilteringMode: 1
+    m_PVRCulling: 1
+    m_PVRFilteringGaussRadiusDirect: 1
+    m_PVRFilteringGaussRadiusIndirect: 5
+    m_PVRFilteringGaussRadiusAO: 2
+    m_PVRFilteringAtrousColorSigma: 1
+    m_PVRFilteringAtrousNormalSigma: 1
+    m_PVRFilteringAtrousPositionSigma: 1
   m_LightingDataAsset: {fileID: 0}
-  m_RuntimeCPUUsage: 25
+  m_ShadowMaskMode: 2
 --- !u!196 &4
 NavMeshSettings:
   serializedVersion: 2
@@ -89,6 +104,8 @@ NavMeshSettings:
     minRegionArea: 2
     manualCellSize: 0
     cellSize: 0.16666667
+    manualTileSize: 0
+    tileSize: 256
     accuratePlacement: 0
   m_NavMeshData: {fileID: 0}
 --- !u!1 &10687557
@@ -114,7 +131,7 @@ Light:
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 10687557}
   m_Enabled: 1
-  serializedVersion: 7
+  serializedVersion: 8
   m_Type: 1
   m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
   m_Intensity: 1
@@ -139,6 +156,8 @@ Light:
   m_Lightmapping: 4
   m_AreaSize: {x: 1, y: 1}
   m_BounceIntensity: 1
+  m_ColorTemperature: 6570
+  m_UseColorTemperature: 0
   m_ShadowRadius: 0
   m_ShadowAngle: 0
 --- !u!4 &10687559
@@ -147,7 +166,7 @@ Transform:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 10687557}
-  m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261}
+  m_LocalRotation: {x: 0.4082179, y: -0.23456971, z: 0.10938164, w: 0.8754262}
   m_LocalPosition: {x: 0, y: 3, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
@@ -217,6 +236,7 @@ GameObject:
   - component: {fileID: 221526973}
   - component: {fileID: 221526972}
   - component: {fileID: 221526975}
+  - component: {fileID: 221526976}
   m_Layer: 0
   m_Name: TestMessages
   m_TagString: Untagged
@@ -231,7 +251,7 @@ TextMesh:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 221526971}
-  m_Text: Hello World
+  m_Text: The click handler was called 0 times. Currently, focus is not overridden.
   m_OffsetZ: 0
   m_CharacterSize: 1
   m_LineSpacing: 1
@@ -275,6 +295,7 @@ MeshRenderer:
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
+  m_SortingLayer: 0
   m_SortingOrder: 0
 --- !u!4 &221526974
 Transform:
@@ -300,6 +321,18 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: cac20ddb16c1fe54cac9ae87c0d6680c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!65 &221526976
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 221526971}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 41.5, y: 1.4523438, z: 0}
+  m_Center: {x: 20.75, y: -0.7261719, z: -0}
 --- !u!1 &774281391
 GameObject:
   m_ObjectHideFlags: 0

Assets/HoloToolkit/Input/Tests/Scripts/TestOverrideFocusedObject.cs

@@ -7,25 +7,65 @@ public class TestOverrideFocusedObject : MonoBehaviour, IInputClickHandler
         InputManager inputManager;
         TextMesh textMesh;
 
+        int clickCount;
+        bool isOverridingFocus;
+
         void Start()
         {
             inputManager = InputManager.Instance;
 
             if (inputManager != null)
             {
-                inputManager.OverrideFocusedObject = gameObject;
+                OverrideFocus();
             }
 
             textMesh = GameObject.FindObjectOfType<TextMesh>();
+
+            if (textMesh != null)
+            {
+                UpdateText();
+            }
         }
 
         public void OnInputClicked(InputClickedEventData eventData)
         {
             if (textMesh != null && inputManager != null)
             {
-                textMesh.text = "Air tap worked and OverrideFocusedObject is null.";
-                inputManager.OverrideFocusedObject = null;
+                clickCount++;
+
+                if (isOverridingFocus)
+                {
+                    UndoOverrideFocus();
+                }
+                else
+                {
+                    OverrideFocus();
+                }
+
+                UpdateText();
+
+                eventData.Use();
             }
         }
+
+        private void OverrideFocus()
+        {
+            inputManager.AddGlobalListener(gameObject);
+            isOverridingFocus = true;
+        }
+
+        private void UndoOverrideFocus()
+        {
+            inputManager.RemoveGlobalListener(gameObject);
+            isOverridingFocus = false;
+        }
+
+        private void UpdateText()
+        {
+            textMesh.text = string.Format("The click handler was called {0} times. Currently, focus is {1}.",
+                clickCount,
+                isOverridingFocus ? "overridden" : "not overridden"
+                );
+        }
     }
 }