Switch to centimeters for height and arm span

nicoco007 · Oct 1, 2024 · 0872296 · 0872296
1 parent 9ade974
commit 0872296
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 20 deletions.
diff --git a/Source/CustomAvatar/UI/GeneralSettingsHost.cs b/Source/CustomAvatar/UI/GeneralSettingsHost.cs
@@ -240,11 +240,6 @@ private string ResizeModeFormatter(object value)
             };
         }
 
-        private string MillimeterFormatter(object value)
-        {
-            return $"{(float)value * 100:0.#} cm";
-        }
-
         private string FloorHeightAdjustFormatter(object value)
         {
             if (value is not FloorHeightAdjustMode floorHeightAdjustMode)
@@ -261,28 +256,20 @@ private string FloorHeightAdjustFormatter(object value)
             };
         }
 
-        private string HeightFormatter(float value)
+        private string CentimeterFormatter(float value)
         {
-            return $"{value + BeatSaberUtilities.kHeadPosToPlayerHeightOffset:0.00} m";
+            return $"{value * 100:0.#} cm";
         }
 
+        private string HeightFormatter(float value) => CentimeterFormatter(value + BeatSaberUtilities.kHeadPosToPlayerHeightOffset);
+
+        private string ArmSpanFormatter(float value) => _armSpanMeasurer.isMeasuring ? $"Measuring... {CentimeterFormatter(value)}" : CentimeterFormatter(value);
+
         private void OnMeasureHeightButtonClicked()
         {
             this.height = _trackingRig.eyeHeight;
         }
 
-        private string ArmSpanFormatter(float value)
-        {
-            if (_armSpanMeasurer.isMeasuring)
-            {
-                return $"Measuring... {value:0.00} m";
-            }
-            else
-            {
-                return $"{value:0.00} m";
-            }
-        }
-
         private void OnMeasureArmSpanButtonClicked()
         {
             if (_armSpanMeasurer.isMeasuring)

diff --git a/Source/CustomAvatar/UI/Views/Settings.bsml b/Source/CustomAvatar/UI/Views/Settings.bsml
@@ -38,7 +38,7 @@
 
         <toggle-setting value="moveFloorWithRoomAdjust" bind-value="true" apply-on-change="true" text="Move Floor with Room Adjust" hover-hint="Move the floor/environment along with the game's built-in vertical room adjust." />
         <toggle-setting value="enableLocomotion" bind-value="true" apply-on-change="true" text="Enable locomotion" hover-hint="Allow feet and waist to be moved automatically to follow your head/body when not using dedicated trackers. Only affects full body avatars." />
-        <list-setting value="cameraNearClipPlane" bind-value="true" apply-on-change="true" text="Camera Near Clip Plane" hover-hint="Distance from your eyes at which objets start being visible." options="nearClipPlaneValues" formatter="MillimeterFormatter" />
+        <list-setting value="cameraNearClipPlane" bind-value="true" apply-on-change="true" text="Camera Near Clip Plane" hover-hint="Distance from your eyes at which objets start being visible." options="nearClipPlaneValues" formatter="CentimeterFormatter" />
       </macro.as-host>
 
       <horizontal pref-width="90" pad-top="2">