updated font asset for UX scene, fixed light estimation

Unity-Technologies · Mar 8, 2020 · a62edf5 · a62edf5
1 parent 42cb3c0
commit a62edf5
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 89 deletions.
diff --git a/Assets/Common/Fonts/Roboto-Medium SDF.asset b/Assets/Common/Fonts/Roboto-Medium SDF.asset
diff --git a/Assets/Common/Scripts/LightEstimation.cs b/Assets/Common/Scripts/LightEstimation.cs
@@ -120,19 +120,7 @@ void FrameChanged(ARCameraFrameEventArgs args)
         if (args.lightEstimation.mainLightColor.HasValue)
         {
             mainLightColor = args.lightEstimation.mainLightColor;
-
-#if PLATFORM_ANDROID
-            // ARCore needs to apply energy conservation term (1 / PI) and be placed in gamma
-            m_Light.color = mainLightColor.Value / Mathf.PI;
-            m_Light.color = m_Light.color.gamma;
-
-            // ARCore returns color in HDR format (can be represented as FP16 and have values above 1.0)
-            var camera = m_CameraManager.GetComponentInParent<Camera>();
-            if (camera == null || !camera.allowHDR)
-            {
-                Debug.LogWarning($"HDR Rendering is not allowed.  Color values returned could be above the maximum representable value.");
-            }
-#endif
+            m_Light.color = mainLightColor.Value;
         }
 
         if (args.lightEstimation.mainLightIntensityLumens.HasValue)

diff --git a/Assets/UX/Prefabs/ScreenspaceUI.prefab b/Assets/UX/Prefabs/ScreenspaceUI.prefab
@@ -538,8 +538,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_StartWithInstructionalUI: 1
-  m_InstructionalUI: 4
-  m_InstructionalGoal: 5
+  m_InstructionalUI: 0
+  m_InstructionalGoal: 0
   m_ShowSecondaryInstructionalUI: 1
   m_SecondaryInstructionUI: 2
   m_SecondaryGoal: 6

diff --git a/Assets/UX/Scenes/UXManagerScene.unity b/Assets/UX/Scenes/UXManagerScene.unity
@@ -611,68 +611,6 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 0}
     m_Modifications:
-    - target: {fileID: 5977163236686653921, guid: 29251f2f7c5044cce8e7eb862b4d93ef,
-        type: 3}
-      propertyPath: m_fontAsset
-      value: 
-      objectReference: {fileID: 11400000, guid: 801223ab657744a85b0e2b5ac5c1a041,
-        type: 2}
-    - target: {fileID: 5977163236686653921, guid: 29251f2f7c5044cce8e7eb862b4d93ef,
-        type: 3}
-      propertyPath: m_sharedMaterial
-      value: 
-      objectReference: {fileID: -7188733246301788310, guid: 801223ab657744a85b0e2b5ac5c1a041,
-        type: 2}
-    - target: {fileID: 5977163236686653921, guid: 29251f2f7c5044cce8e7eb862b4d93ef,
-        type: 3}
-      propertyPath: m_fontSize
-      value: 50
-      objectReference: {fileID: 0}
-    - target: {fileID: 5977163236686653921, guid: 29251f2f7c5044cce8e7eb862b4d93ef,
-        type: 3}
-      propertyPath: m_fontSizeBase
-      value: 50
-      objectReference: {fileID: 0}
-    - target: {fileID: 5977163236686653921, guid: 29251f2f7c5044cce8e7eb862b4d93ef,
-        type: 3}
-      propertyPath: m_firstOverflowCharacterIndex
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5977163236686653921, guid: 29251f2f7c5044cce8e7eb862b4d93ef,
-        type: 3}
-      propertyPath: m_characterSpacing
-      value: 3
-      objectReference: {fileID: 0}
-    - target: {fileID: 5977163236686653921, guid: 29251f2f7c5044cce8e7eb862b4d93ef,
-        type: 3}
-      propertyPath: m_margin.x
-      value: -200
-      objectReference: {fileID: 0}
-    - target: {fileID: 5977163236686653921, guid: 29251f2f7c5044cce8e7eb862b4d93ef,
-        type: 3}
-      propertyPath: m_textInfo.lineCount
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 5977163236686653921, guid: 29251f2f7c5044cce8e7eb862b4d93ef,
-        type: 3}
-      propertyPath: m_margin.z
-      value: -200
-      objectReference: {fileID: 0}
-    - target: {fileID: 5977163236686653923, guid: 29251f2f7c5044cce8e7eb862b4d93ef,
-        type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -870
-      objectReference: {fileID: 0}
-    - target: {fileID: 5977163237016520487, guid: 29251f2f7c5044cce8e7eb862b4d93ef,
-        type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5977163237016520487, guid: 29251f2f7c5044cce8e7eb862b4d93ef,
-        type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 0
-      objectReference: {fileID: 0}
     - target: {fileID: 5977163238016480453, guid: 29251f2f7c5044cce8e7eb862b4d93ef,
         type: 3}
       propertyPath: m_Name
@@ -693,16 +631,6 @@ PrefabInstance:
       propertyPath: m_PlaneManager
       value: 
       objectReference: {fileID: 1335839537}
-    - target: {fileID: 5977163238016480458, guid: 29251f2f7c5044cce8e7eb862b4d93ef,
-        type: 3}
-      propertyPath: m_InstructionalGoal
-      value: 5
-      objectReference: {fileID: 0}
-    - target: {fileID: 5977163238016480458, guid: 29251f2f7c5044cce8e7eb862b4d93ef,
-        type: 3}
-      propertyPath: m_InstructionalUI
-      value: 4
-      objectReference: {fileID: 0}
     - target: {fileID: 5977163238016480459, guid: 29251f2f7c5044cce8e7eb862b4d93ef,
         type: 3}
       propertyPath: m_LocalPosition.x