Merge pull request #9398 from keveleigh/fix-reading-mode

Only update renderViewPortScale if an XR device is present

Author: David Kline

Assets/MRTK/Examples/Demos/ReadingMode/Scripts/ReadingModeSceneBehavior.cs

@@ -4,7 +4,14 @@
 using Microsoft.MixedReality.Toolkit.CameraSystem;
 using Microsoft.MixedReality.Toolkit.UI;
 using UnityEngine;
+
+#if UNITY_2019_3_OR_NEWER
+using Microsoft.MixedReality.Toolkit.Utilities;
+#endif // UNITY_2019_3_OR_NEWER
+
+#if !UNITY_2020_1_OR_NEWER
 using UnityEngine.XR;
+#endif // !UNITY_2020_1_OR_NEWER
 
 namespace Microsoft.MixedReality.Toolkit.Examples.Demos.ReadingMode
 {
@@ -16,12 +23,32 @@ public class ReadingModeSceneBehavior : MonoBehaviour
         [SerializeField]
         private PinchSlider renderViewportScaleSlider = null;
 
+        private float previousSliderValue = -1;
+        private const float MinScale = 0.001f;
+
         private void Update()
         {
-            if (renderViewportScaleSlider != null)
+            if (renderViewportScaleSlider == null || renderViewportScaleSlider.SliderValue == previousSliderValue)
+            {
+                return;
+            }
+
+            previousSliderValue = renderViewportScaleSlider.SliderValue;
+
+#if UNITY_2019_3_OR_NEWER
+            if (XRSubsystemHelpers.DisplaySubsystem != null)
+            {
+                XRSubsystemHelpers.DisplaySubsystem.scaleOfAllViewports = Mathf.Max(renderViewportScaleSlider.SliderValue, MinScale);
+                return;
+            }
+#endif // UNITY_2019_3_OR_NEWER
+
+#if !UNITY_2020_1_OR_NEWER
+            if (XRDevice.isPresent)
             {
-                XRSettings.renderViewportScale = renderViewportScaleSlider.SliderValue;
+                XRSettings.renderViewportScale = Mathf.Max(renderViewportScaleSlider.SliderValue, MinScale);
             }
+#endif // !UNITY_2020_1_OR_NEWER
         }
 
         public void EnableReadingMode()