Moved OverrideSizeRatio logic to the SetSizeRatio method so we do not duplicate code, but keep the same protection against a DivideByZero error.

Author: killerantz

Assets/HoloToolkit/Utilities/Scripts/FixedAngularSize.cs

@@ -12,36 +12,63 @@ namespace HoloToolkit.Unity
     /// </summary>
     public class FixedAngularSize : MonoBehaviour
     {
+        [Tooltip("Off sets the scale ratio so that text does not scale down too much. (Set to zero for linear scaling)")]
+        public float OverrideSizeRatio = 0;
+
         // The ratio between the transform's local scale and its starting
         // distance from the camera.
         private Vector3 defaultSizeRatios;
+        private float startingDistance;
+        private Vector3 startingScale;
 
-        void Start()
+        private void Start()
         {
             // Calculate the XYZ ratios for the transform's localScale over its
             // initial distance from the camera.
-            float startingDistance = Vector3.Distance(Camera.main.transform.position, transform.position);
-            if (startingDistance > 0.0f)
+            startingDistance = Vector3.Distance(Camera.main.transform.position, transform.position);
+            startingScale = transform.localScale;
+
+            SetSizeRatio(OverrideSizeRatio);
+        }
+
+        /// <summary>
+        /// Manually update the OverrideSizeRatio during runtime or through UnityEvents in the editor
+        /// </summary>
+        /// <param name="ratio"> 0 - 1 : Use 0 for linear scaling</param>
+        public void SetSizeRatio(float ratio)
+        {
+            if (ratio == 0)
             {
-                defaultSizeRatios = transform.localScale / startingDistance;
+                if (startingDistance > 0.0f)
+                {
+                    // set to a linear scale ratio
+                    OverrideSizeRatio = 1 / startingDistance;
+                }
+                else
+                {
+                    // If the transform and the camera are both in the same
+                    // position (that is, the distance between them is zero),
+                    // disable this Behaviour so we don't get a DivideByZero
+                    // error later on.
+                    enabled = false;
+#if UNITY_EDITOR
+                    Debug.LogWarning("The object and the camera are in the same position at Start(). The attached FixedAngularSize Behaviour is now disabled.");
+#endif // UNITY_EDITOR
+                }
             }
             else
             {
-                // If the transform and the camera are both in the same
-                // position (that is, the distance between them is zero),
-                // disable this Behaviour so we don't get a DivideByZero
-                // error later on.
-                enabled = false;
-#if UNITY_EDITOR
-                Debug.LogWarning("The object and the camera are in the same position at Start(). The attached FixedAngularSize Behaviour is now disabled.");
-#endif // UNITY_EDITOR
+                OverrideSizeRatio = ratio;
             }
         }
 
-        void Update()
+        private void Update()
         {
             float distanceToHologram = Vector3.Distance(Camera.main.transform.position, transform.position);
-            transform.localScale = defaultSizeRatios * distanceToHologram;
+            // create an offset ratio based on the starting position. This value creates a new angle that pivots
+            // on the starting position that is more or less drastic than the normal scale ratio.
+            float curvedRatio = 1 - startingDistance * OverrideSizeRatio;
+            transform.localScale = startingScale * (distanceToHologram * OverrideSizeRatio + curvedRatio);
         }
     }
 }