Ensure we don't set 0 to renderViewportScale

keveleigh · keveleigh · commit 3547dd178e05 · 2021-03-01T11:20:13.000-08:00
diff --git a/Assets/MRTK/Examples/Demos/ReadingMode/Scripts/ReadingModeSceneBehavior.cs b/Assets/MRTK/Examples/Demos/ReadingMode/Scripts/ReadingModeSceneBehavior.cs
@@ -24,6 +24,7 @@ public class ReadingModeSceneBehavior : MonoBehaviour
         private PinchSlider renderViewportScaleSlider = null;
 
         private float previousSliderValue = -1;
+        private const float MinScale = 0.001f;
 
         private void Update()
         {
@@ -37,15 +38,15 @@ private void Update()
 #if UNITY_2019_3_OR_NEWER
             if (XRSubsystemHelpers.DisplaySubsystem != null)
             {
-                XRSubsystemHelpers.DisplaySubsystem.scaleOfAllViewports = renderViewportScaleSlider.SliderValue;
+                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
         }

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ public class ReadingModeSceneBehavior : MonoBehaviour`
`24`	`24`	`private PinchSlider renderViewportScaleSlider = null;`
`25`	`25`
`26`	`26`	`private float previousSliderValue = -1;`
	`27`	`+ private const float MinScale = 0.001f;`
`27`	`28`
`28`	`29`	`private void Update()`
`29`	`30`	`{`
`@@ -37,15 +38,15 @@ private void Update()`
`37`	`38`	`#if UNITY_2019_3_OR_NEWER`
`38`	`39`	`if (XRSubsystemHelpers.DisplaySubsystem != null)`
`39`	`40`	`{`
`40`		`- XRSubsystemHelpers.DisplaySubsystem.scaleOfAllViewports = renderViewportScaleSlider.SliderValue;`
	`41`	`+ XRSubsystemHelpers.DisplaySubsystem.scaleOfAllViewports = Mathf.Max(renderViewportScaleSlider.SliderValue, MinScale);`
`41`	`42`	`return;`
`42`	`43`	`}`
`43`	`44`	`#endif // UNITY_2019_3_OR_NEWER`
`44`	`45`
`45`	`46`	`#if !UNITY_2020_1_OR_NEWER`
`46`	`47`	`if (XRDevice.isPresent)`
`47`	`48`	`{`
`48`		`- XRSettings.renderViewportScale = renderViewportScaleSlider.SliderValue;`
	`49`	`+ XRSettings.renderViewportScale = Mathf.Max(renderViewportScaleSlider.SliderValue, MinScale);`
`49`	`50`	`}`
`50`	`51`	`#endif // !UNITY_2020_1_OR_NEWER`
`51`	`52`	`}`