Merge pull request #839 from killerantz/fix/interactiveMeshCursor

The light now goes away when the cursor's visibility is set to false.

Author: StephenHodgson

Assets/HoloToolkit-Tests/Input/Scenes/InteractiveMeshCursor.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
@@ -41,7 +42,7 @@ RenderSettings:
 --- !u!157 &3
 LightmapSettings:
   m_ObjectHideFlags: 0
-  serializedVersion: 7
+  serializedVersion: 11
   m_GIWorkflowMode: 1
   m_GISettings:
     serializedVersion: 2
@@ -53,7 +54,7 @@ LightmapSettings:
     m_EnableBakedLightmaps: 1
     m_EnableRealtimeLightmaps: 1
   m_LightmapEditorSettings:
-    serializedVersion: 4
+    serializedVersion: 9
     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_UseShadowmask: 0
 --- !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!1001 &46329470
@@ -156,7 +173,7 @@ Light:
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 785754854}
   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
@@ -181,6 +198,22 @@ Light:
   m_Lightmapping: 4
   m_AreaSize: {x: 1, y: 1}
   m_BounceIntensity: 1
+  m_FalloffTable:
+    m_Table[0]: 0
+    m_Table[1]: 0
+    m_Table[2]: 0
+    m_Table[3]: 0
+    m_Table[4]: 0
+    m_Table[5]: 0
+    m_Table[6]: 0
+    m_Table[7]: 0
+    m_Table[8]: 0
+    m_Table[9]: 0
+    m_Table[10]: 0
+    m_Table[11]: 0
+    m_Table[12]: 0
+  m_ColorTemperature: 6570
+  m_UseColorTemperature: 0
   m_ShadowRadius: 0
   m_ShadowAngle: 0
 --- !u!4 &785754856
@@ -244,6 +277,7 @@ MeshRenderer:
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
+  m_SortingLayer: 0
   m_SortingOrder: 0
 --- !u!65 &1060606162
 BoxCollider:
@@ -316,27 +350,6 @@ Prefab:
       propertyPath: m_RootOrder
       value: 3
       objectReference: {fileID: 0}
-    - target: {fileID: 4000013367923696, guid: dc138879450c80f438141cbe47938daf, type: 2}
-      propertyPath: m_LocalScale.x
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4000013367923696, guid: dc138879450c80f438141cbe47938daf, type: 2}
-      propertyPath: m_LocalScale.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4000013367923696, guid: dc138879450c80f438141cbe47938daf, type: 2}
-      propertyPath: m_LocalScale.z
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 114698458312288788, guid: dc138879450c80f438141cbe47938daf,
-        type: 2}
-      propertyPath: DistanceScaleFactor
-      value: 0.3
-      objectReference: {fileID: 0}
-    - target: {fileID: 1000012327360030, guid: dc138879450c80f438141cbe47938daf, type: 2}
-      propertyPath: m_IsActive
-      value: 1
-      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: dc138879450c80f438141cbe47938daf, type: 2}
   m_IsPrefabParent: 0

Assets/HoloToolkit/Input/Prefabs/Cursor/InteractiveMeshCursor.prefab

@@ -163,6 +163,7 @@ MeshRenderer:
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
+  m_SortingLayer: 0
   m_SortingOrder: 0
 --- !u!23 &23000014103550452
 MeshRenderer:
@@ -195,6 +196,7 @@ MeshRenderer:
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
+  m_SortingLayer: 0
   m_SortingOrder: 0
 --- !u!33 &33000012338699338
 MeshFilter:
@@ -217,7 +219,7 @@ Light:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1000012327360030}
   m_Enabled: 1
-  serializedVersion: 7
+  serializedVersion: 8
   m_Type: 2
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_Intensity: 0.4
@@ -242,6 +244,22 @@ Light:
   m_Lightmapping: 4
   m_AreaSize: {x: 1, y: 1}
   m_BounceIntensity: 1
+  m_FalloffTable:
+    m_Table[0]: 0
+    m_Table[1]: 0
+    m_Table[2]: 0
+    m_Table[3]: 0
+    m_Table[4]: 0
+    m_Table[5]: 0
+    m_Table[6]: 0
+    m_Table[7]: 0
+    m_Table[8]: 0
+    m_Table[9]: 0
+    m_Table[10]: 0
+    m_Table[11]: 0
+    m_Table[12]: 0
+  m_ColorTemperature: 6570
+  m_UseColorTemperature: 0
   m_ShadowRadius: 0
   m_ShadowAngle: 0
 --- !u!114 &114698458312288788
@@ -266,6 +284,7 @@ MonoBehaviour:
   PrimaryCursorVisual: {fileID: 0}
   Ring: {fileID: 1000013883439490}
   Dot: {fileID: 1000010809468922}
+  Light: {fileID: 1000012327360030}
   DistanceScaleFactor: 0.3
   DefaultScale: 0.5
   DownScale: 0.4

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

@@ -16,6 +16,9 @@ public class InteractiveMeshCursor : Cursor
         [Tooltip("Inner cursor element")]
         public GameObject Dot;
 
+        [Tooltip("Point light")]
+        public GameObject Light;
+
         [Tooltip("The scale factor to soften the distance scaling, we want the cursor to scale in the distance, but not disapprear.")]
         public float DistanceScaleFactor = 0.3f;
 
@@ -110,8 +113,7 @@ public override void OnCursorStateChange(CursorStateEnum state)
             // added observation of CursorModifier
             if (TargetedCursorModifier != null && mHasHover)
             {
-                Ring.SetActive(!TargetedCursorModifier.GetCursorVisibility());
-                Dot.SetActive(!TargetedCursorModifier.GetCursorVisibility());
+                ElementVisibility(!TargetedCursorModifier.GetCursorVisibility());
             }
         }
 
@@ -150,18 +152,33 @@ public override void SetVisiblity(bool visible)
             base.SetVisiblity(visible);
 
             mIsVisible = visible;
+            ElementVisibility(visible);
 
             if (visible)
             {
                 OnCursorStateChange(CursorState);
             }
-            else
+        }
+
+        /// <summary>
+        /// controls the visibility of cursor elements in one place
+        /// </summary>
+        /// <param name="visible"></param>
+        private void ElementVisibility(bool visible)
+        {
+            if (Ring != null)
             {
-                if (Ring != null && Dot != null)
-                {
-                    Ring.SetActive(visible);
-                    Dot.SetActive(visible);
-                }
+                Ring.SetActive(visible);
+            }
+
+            if (Dot != null)
+            {
+                Dot.SetActive(visible);
+            }
+
+            if (Light != null)
+            {
+                Light.SetActive(visible);
             }
         }
     }