Move height changed signal/action into BasisLocalHeight

aaronfranke · aaronfranke · commit 289872b83173 · 2025-11-27T16:44:17.000-08:00
diff --git a/Basis/Packages/com.basis.framework/Camera/BasisHandHeldCameraInteractable.cs b/Basis/Packages/com.basis.framework/Camera/BasisHandHeldCameraInteractable.cs
@@ -161,7 +161,7 @@ public enum CameraPinSpace
         OnInteractStartEvent += OnInteractDesktopTweak;
         BasisDeviceManagement.OnBootModeChanged += OnBootModeChanged;
 
-        BasisLocalPlayer.OnPlayersHeightChangedNextFrame += OnHeightChanged;
+        BasisLocalHeight.OnChangedNextFrame += OnHeightChanged;
 
         // scale camera to avatar size
         transform.localScale = new Vector3(cameraDefaultScale, cameraDefaultScale, cameraDefaultScale) *
@@ -623,7 +623,7 @@ public override void OnDestroy()
     {
         BasisDeviceManagement.OnBootModeChanged -= OnBootModeChanged;
         OnInteractStartEvent -= OnInteractDesktopTweak;
-        BasisLocalPlayer.OnPlayersHeightChangedNextFrame -= OnHeightChanged;
+        BasisLocalHeight.OnChangedNextFrame -= OnHeightChanged;
 
         BasisLocalPlayer.AfterFinalMove.RemoveAction(202, UpdateCamera);
 
diff --git a/Basis/Packages/com.basis.framework/Device Management/Common/BasisVisualTracker.cs b/Basis/Packages/com.basis.framework/Device Management/Common/BasisVisualTracker.cs
@@ -54,7 +54,7 @@ public void Initialization(BasisInput basisInput)
                 if (HasEvents == false)
                 {
                     BasisLocalPlayer.OnLocalAvatarChanged += UpdateVisualSizeAndOffset;
-                    BasisLocalPlayer.OnPlayersHeightChangedNextFrame += UpdateVisualSizeAndOffset;
+                    BasisLocalHeight.OnChangedNextFrame += UpdateVisualSizeAndOffset;
                     HasEvents = true;
                 }
 
@@ -70,7 +70,7 @@ public void OnDestroy()
             if (HasEvents)
             {
                 BasisLocalPlayer.OnLocalAvatarChanged -= UpdateVisualSizeAndOffset;
-                BasisLocalPlayer.OnPlayersHeightChangedNextFrame -= UpdateVisualSizeAndOffset;
+                BasisLocalHeight.OnChangedNextFrame -= UpdateVisualSizeAndOffset;
                 HasEvents = false;
             }
         }
diff --git a/Basis/Packages/com.basis.framework/Drivers/Common/BasisHeightDriver.cs b/Basis/Packages/com.basis.framework/Drivers/Common/BasisHeightDriver.cs
@@ -28,7 +28,7 @@ public static class BasisHeightDriver
     /// <remarks>
     /// Establishes authoritative avatar metrics (eye height, arm span) first, then captures live player metrics.
     /// Ensures nonzero defaults, computes scale ratios safely, picks the active ratio set for <paramref name="selectedHeightMode"/>,
-    /// and invokes <see cref="BasisLocalPlayer.OnPlayersHeightChangedNextFrame"/> via <see cref="BasisLocalPlayer.ExecuteNextFrame(System.Action)"/>.
+    /// and invokes <see cref="BasisLocalHeight.OnChangedNextFrame"/> via <see cref="BasisLocalPlayer.ExecuteNextFrame(System.Action)"/>.
     /// </remarks>
     public static void ChangeEyeHeightMode(BasisLocalPlayer localPlayer, BasisSelectedHeightMode selectedHeightMode)
     {
@@ -100,7 +100,7 @@ public static void ChangeEyeHeightMode(BasisLocalPlayer localPlayer, BasisSelect
         // notify next frame
         localPlayer.ExecuteNextFrame(() =>
         {
-            BasisLocalPlayer.OnPlayersHeightChangedNextFrame?.Invoke();
+            BasisLocalHeight.OnChangedNextFrame?.Invoke();
         });
     }
 
@@ -254,7 +254,7 @@ public static void SetCustomPlayerHeight(float customHeight)
 
         player.ExecuteNextFrame(() =>
         {
-            BasisLocalPlayer.OnPlayersHeightChangedNextFrame?.Invoke();
+            BasisLocalHeight.OnChangedNextFrame?.Invoke();
         });
     }
 }
diff --git a/Basis/Packages/com.basis.framework/Drivers/Local/BasisLocalCameraDriver.cs b/Basis/Packages/com.basis.framework/Drivers/Local/BasisLocalCameraDriver.cs
@@ -195,7 +195,7 @@ public void OnEnable()
                 RenderPipelineManager.endCameraRendering += EndCameraRendering;
 
                 BasisDeviceManagement.OnBootModeChanged += OnModeSwitch;
-                BasisLocalPlayer.OnPlayersHeightChangedNextFrame += OnHeightChanged;
+                BasisLocalHeight.OnChangedNextFrame += OnHeightChanged;
 
                 InstanceExists?.Invoke();
                 HasEvents = true;
@@ -224,7 +224,7 @@ public void OnDestroy()
             RenderPipelineManager.beginCameraRendering -= BeginCameraRendering;
             RenderPipelineManager.endCameraRendering -= EndCameraRendering;
             BasisDeviceManagement.OnBootModeChanged -= OnModeSwitch;
-            BasisLocalPlayer.OnPlayersHeightChangedNextFrame -= OnHeightChanged;
+            BasisLocalHeight.OnChangedNextFrame -= OnHeightChanged;
             BasisLocalMicrophoneDriver.OnPausedAction -= microphoneIconDriver.OnPausedEvent;
             HasEvents = false;
             HasInstance = false;
@@ -330,7 +330,7 @@ public void BeginCameraRendering(ScriptableRenderContext context, Camera Camera)
                             Vector3 localPos = this.transform.InverseTransformPoint(worldPoint);
                             ParentOfUI.localPosition = localPos * LocalPlayer.CurrentHeight.SelectedAvatarToAvatarDefaultScale;
                         }
-                        else 
+                        else
                         {
                             Vector3 worldPoint = Camera.ViewportToWorldPoint(DesktopMicrophoneViewportPosition);
                             // assume this transform is the camera parent
diff --git a/Basis/Packages/com.basis.framework/Drivers/Local/BasisLocalSeatDriver.cs b/Basis/Packages/com.basis.framework/Drivers/Local/BasisLocalSeatDriver.cs
@@ -120,7 +120,7 @@ public void Sit(BasisSeat seat)
             GrabLatestTposeLocalScaleData();
             if (hasEvent == false)
             {
-                BasisLocalPlayer.OnPlayersHeightChangedNextFrame += GrabLatestTposeLocalScaleData;
+                BasisLocalHeight.OnChangedNextFrame += GrabLatestTposeLocalScaleData;
                 hasEvent = true;
             }
             OnSimulate();
@@ -156,7 +156,7 @@ public void Stand()
             GrabLatestTposeLocalScaleData();
             if (hasEvent)
             {
-                BasisLocalPlayer.OnPlayersHeightChangedNextFrame -= GrabLatestTposeLocalScaleData;
+                BasisLocalHeight.OnChangedNextFrame -= GrabLatestTposeLocalScaleData;
                 hasEvent = false;
             }
             _seat = null;
@@ -299,7 +299,6 @@ Quaternion rightLowerLegRot
             Vector3 playerPelvisLocalPos = 0.5f * (BasisLocalBoneDriver.LeftUpperLegControl.TposeLocalScaled.position + BasisLocalBoneDriver.RightUpperLegControl.TposeLocalScaled.position);
             Vector3 playerPos = pelvisWorldPos - playerRot * playerPelvisLocalPos;
 
-           
             LocalPlayer.transform.SetPositionAndRotation(playerPos, playerRot);
            //dont need todo this LocalPlayer.AvatarTransform.SetPositionAndRotation(playerPos, playerRot);
             LocalPlayer.LocalAnimatorDriver.HandleTeleport();
diff --git a/Basis/Packages/com.basis.framework/Players/Local/BasisLocalHeight.cs b/Basis/Packages/com.basis.framework/Players/Local/BasisLocalHeight.cs
@@ -26,6 +26,11 @@ public class BasisLocalHeight
         /// </summary>
         public string AvatarName;
 
+        /// <summary>
+        /// Fired on the frame after a player height change is requested.
+        /// </summary>
+        public static System.Action OnChangedNextFrame;
+
         /// <summary>
         /// Fallback height (meters) used when no measurement is available.
         /// not the total height but the eye height
diff --git a/Basis/Packages/com.basis.framework/Players/Local/BasisLocalPlayer.cs b/Basis/Packages/com.basis.framework/Players/Local/BasisLocalPlayer.cs
@@ -77,11 +77,6 @@ public class BasisLocalPlayer : BasisPlayer
         /// </summary>
         public static Action OnSpawnedEvent;
 
-        /// <summary>
-        /// Fired on the frame after a player height change is requested.
-        /// </summary>
-        public static Action OnPlayersHeightChangedNextFrame;
-
         /// <summary>
         /// Ordered delegate queue invoked after all movement and simulation have completed for the frame.
         /// </summary>
diff --git a/Basis/Packages/com.basis.framework/UI Panels/BasisSetUserName.cs b/Basis/Packages/com.basis.framework/UI Panels/BasisSetUserName.cs
@@ -82,7 +82,7 @@ public void Start()
             }
 
             ApplySize();
-            BasisLocalPlayer.OnPlayersHeightChangedNextFrame += ApplySize;
+            BasisLocalHeight.OnChangedNextFrame += ApplySize;
             if (BasisNetworkManagement.Instance != null)
             {
                 LoadCurrentSettings();
@@ -110,7 +110,7 @@ public void OnDestroy()
                 AdvancedSettings.onClick.RemoveListener(ToggleAdvancedSettings);
                 UseLocalhost.onClick.RemoveListener(UseLocalHost);
             }
-            BasisLocalPlayer.OnPlayersHeightChangedNextFrame -= ApplySize;
+            BasisLocalHeight.OnChangedNextFrame -= ApplySize;
         }
 
         /// <summary>
diff --git a/Basis/Packages/com.basis.framework/UI Panels/BasisUIMovementDriver.cs b/Basis/Packages/com.basis.framework/UI Panels/BasisUIMovementDriver.cs
@@ -46,7 +46,7 @@ public void DeInitalize()
                 BasisLocalPlayer.AfterFinalMove.RemoveAction(120, UpdateUIFollow);
             }
 
-            BasisLocalPlayer.OnPlayersHeightChangedNextFrame -= SetUILocation;
+            BasisLocalHeight.OnChangedNextFrame -= SetUILocation;
 
             if (hasLocalCreationEvent)
             {
@@ -60,7 +60,7 @@ public void LocalPlayerGenerated()
             {
                 BasisLocalPlayer.AfterFinalMove.AddAction(120, UpdateUIFollow);
             }
-            BasisLocalPlayer.OnPlayersHeightChangedNextFrame += SetUILocation;
+            BasisLocalHeight.OnChangedNextFrame += SetUILocation;
             SetUILocation();
         }
         public void UpdateUIFollow()
diff --git a/Basis/Packages/com.basis.framework/UI Panels/BasisUIServers.cs b/Basis/Packages/com.basis.framework/UI Panels/BasisUIServers.cs
@@ -53,7 +53,7 @@ public void Start()
             }
             UseLocalhost.onClick.AddListener(UseLocalHost);
             ApplySize();
-            BasisLocalPlayer.OnPlayersHeightChangedNextFrame += ApplySize;
+            BasisLocalHeight.OnChangedNextFrame += ApplySize;
             if (BasisNetworkManagement.Instance != null)
             {
                 LoadCurrentSettings();
@@ -68,7 +68,7 @@ public void ApplySize()
         }
         public void OnDestroy()
         {
-            BasisLocalPlayer.OnPlayersHeightChangedNextFrame -= ApplySize;
+            BasisLocalHeight.OnChangedNextFrame -= ApplySize;
             UseLocalhost.onClick.RemoveListener(UseLocalHost);
         }
         public void UseHostMode(bool IsDown)
diff --git a/Basis/Packages/com.basis.framework/UI/BasisMenuMovementDriver.cs b/Basis/Packages/com.basis.framework/UI/BasisMenuMovementDriver.cs
@@ -49,7 +49,7 @@ private void OnDisable()
             }
 
             BasisLocalPlayer.OnLocalAvatarChanged -= UpdateDelayedSetUI;
-            BasisLocalPlayer.OnPlayersHeightChangedNextFrame -= UpdateDelayedSetUI;
+            BasisLocalHeight.OnChangedNextFrame -= UpdateDelayedSetUI;
 
             BasisLocalPlayer.AfterFinalMove.RemoveAction(101, UpdateUI);
         }
@@ -59,7 +59,7 @@ private void OnDisable()
         private void OnLocalPlayerGenerated()
         {
             BasisLocalPlayer.OnLocalAvatarChanged += UpdateDelayedSetUI;
-            BasisLocalPlayer.OnPlayersHeightChangedNextFrame += UpdateDelayedSetUI;
+            BasisLocalHeight.OnChangedNextFrame += UpdateDelayedSetUI;
             if (LocalPlayer.LocalBoneDriver.FindBone(out hand, BasisBoneTrackedRole.LeftHand))
             {
             }
diff --git a/Basis/Packages/com.basis.framework/UI/BasisUIRaycast.cs b/Basis/Packages/com.basis.framework/UI/BasisUIRaycast.cs
@@ -70,7 +70,7 @@ public void Initialize(BasisInput basisInput, BasisPointRaycaster pointRaycaster
 
             HasLineRenderer = false;
             HasRedicalRenderer = false;
-            BasisLocalPlayer.OnPlayersHeightChangedNextFrame += OnPlayersHeightChanged;
+            BasisLocalHeight.OnChangedNextFrame += OnPlayersHeightChanged;
             // Create the ray with the adjusted starting position and direction
             if (basisInput.DeviceMatchSettings.HasRayCastVisual)
             {
@@ -119,7 +119,7 @@ public void OnDeInitialize()
         {
             if (HasOnPlayersHeightChanged)
             {
-                BasisLocalPlayer.OnPlayersHeightChangedNextFrame -= OnPlayersHeightChanged;
+                BasisLocalHeight.OnChangedNextFrame -= OnPlayersHeightChanged;
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public void Initialization(BasisInput basisInput)`
`54`	`54`	`if (HasEvents == false)`
`55`	`55`	`{`
`56`	`56`	`BasisLocalPlayer.OnLocalAvatarChanged += UpdateVisualSizeAndOffset;`
`57`		`- BasisLocalPlayer.OnPlayersHeightChangedNextFrame += UpdateVisualSizeAndOffset;`
	`57`	`+ BasisLocalHeight.OnChangedNextFrame += UpdateVisualSizeAndOffset;`
`58`	`58`	`HasEvents = true;`
`59`	`59`	`}`
`60`	`60`
`@@ -70,7 +70,7 @@ public void OnDestroy()`
`70`	`70`	`if (HasEvents)`
`71`	`71`	`{`
`72`	`72`	`BasisLocalPlayer.OnLocalAvatarChanged -= UpdateVisualSizeAndOffset;`
`73`		`- BasisLocalPlayer.OnPlayersHeightChangedNextFrame -= UpdateVisualSizeAndOffset;`
	`73`	`+ BasisLocalHeight.OnChangedNextFrame -= UpdateVisualSizeAndOffset;`
`74`	`74`	`HasEvents = false;`
`75`	`75`	`}`
`76`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public static class BasisHeightDriver`
`28`	`28`	`/// <remarks>`
`29`	`29`	`/// Establishes authoritative avatar metrics (eye height, arm span) first, then captures live player metrics.`
`30`	`30`	`/// Ensures nonzero defaults, computes scale ratios safely, picks the active ratio set for <paramref name="selectedHeightMode"/>,`
`31`		`- /// and invokes <see cref="BasisLocalPlayer.OnPlayersHeightChangedNextFrame"/> via <see cref="BasisLocalPlayer.ExecuteNextFrame(System.Action)"/>.`
	`31`	`+ /// and invokes <see cref="BasisLocalHeight.OnChangedNextFrame"/> via <see cref="BasisLocalPlayer.ExecuteNextFrame(System.Action)"/>.`
`32`	`32`	`/// </remarks>`
`33`	`33`	`public static void ChangeEyeHeightMode(BasisLocalPlayer localPlayer, BasisSelectedHeightMode selectedHeightMode)`
`34`	`34`	`{`
`@@ -100,7 +100,7 @@ public static void ChangeEyeHeightMode(BasisLocalPlayer localPlayer, BasisSelect`
`100`	`100`	`// notify next frame`
`101`	`101`	`localPlayer.ExecuteNextFrame(() =>`
`102`	`102`	`{`
`103`		`- BasisLocalPlayer.OnPlayersHeightChangedNextFrame?.Invoke();`
	`103`	`+ BasisLocalHeight.OnChangedNextFrame?.Invoke();`
`104`	`104`	`});`
`105`	`105`	`}`
`106`	`106`
`@@ -254,7 +254,7 @@ public static void SetCustomPlayerHeight(float customHeight)`
`254`	`254`
`255`	`255`	`player.ExecuteNextFrame(() =>`
`256`	`256`	`{`
`257`		`- BasisLocalPlayer.OnPlayersHeightChangedNextFrame?.Invoke();`
	`257`	`+ BasisLocalHeight.OnChangedNextFrame?.Invoke();`
`258`	`258`	`});`
`259`	`259`	`}`
`260`	`260`	`}`
Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ public void Sit(BasisSeat seat)`
`120`	`120`	`GrabLatestTposeLocalScaleData();`
`121`	`121`	`if (hasEvent == false)`
`122`	`122`	`{`
`123`		`- BasisLocalPlayer.OnPlayersHeightChangedNextFrame += GrabLatestTposeLocalScaleData;`
	`123`	`+ BasisLocalHeight.OnChangedNextFrame += GrabLatestTposeLocalScaleData;`
`124`	`124`	`hasEvent = true;`
`125`	`125`	`}`
`126`	`126`	`OnSimulate();`
`@@ -156,7 +156,7 @@ public void Stand()`
`156`	`156`	`GrabLatestTposeLocalScaleData();`
`157`	`157`	`if (hasEvent)`
`158`	`158`	`{`
`159`		`- BasisLocalPlayer.OnPlayersHeightChangedNextFrame -= GrabLatestTposeLocalScaleData;`
	`159`	`+ BasisLocalHeight.OnChangedNextFrame -= GrabLatestTposeLocalScaleData;`
`160`	`160`	`hasEvent = false;`
`161`	`161`	`}`
`162`	`162`	`_seat = null;`
`@@ -299,7 +299,6 @@ Quaternion rightLowerLegRot`
`299`	`299`	`Vector3 playerPelvisLocalPos = 0.5f * (BasisLocalBoneDriver.LeftUpperLegControl.TposeLocalScaled.position + BasisLocalBoneDriver.RightUpperLegControl.TposeLocalScaled.position);`
`300`	`300`	`Vector3 playerPos = pelvisWorldPos - playerRot * playerPelvisLocalPos;`
`301`	`301`
`302`		`-`
`303`	`302`	`LocalPlayer.transform.SetPositionAndRotation(playerPos, playerRot);`
`304`	`303`	`//dont need todo this LocalPlayer.AvatarTransform.SetPositionAndRotation(playerPos, playerRot);`
`305`	`304`	`LocalPlayer.LocalAnimatorDriver.HandleTeleport();`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ public void Start()`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`ApplySize();`
`85`		`- BasisLocalPlayer.OnPlayersHeightChangedNextFrame += ApplySize;`
	`85`	`+ BasisLocalHeight.OnChangedNextFrame += ApplySize;`
`86`	`86`	`if (BasisNetworkManagement.Instance != null)`
`87`	`87`	`{`
`88`	`88`	`LoadCurrentSettings();`
`@@ -110,7 +110,7 @@ public void OnDestroy()`
`110`	`110`	`AdvancedSettings.onClick.RemoveListener(ToggleAdvancedSettings);`
`111`	`111`	`UseLocalhost.onClick.RemoveListener(UseLocalHost);`
`112`	`112`	`}`
`113`		`- BasisLocalPlayer.OnPlayersHeightChangedNextFrame -= ApplySize;`
	`113`	`+ BasisLocalHeight.OnChangedNextFrame -= ApplySize;`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public void DeInitalize()`
`46`	`46`	`BasisLocalPlayer.AfterFinalMove.RemoveAction(120, UpdateUIFollow);`
`47`	`47`	`}`
`48`	`48`
`49`		`- BasisLocalPlayer.OnPlayersHeightChangedNextFrame -= SetUILocation;`
	`49`	`+ BasisLocalHeight.OnChangedNextFrame -= SetUILocation;`
`50`	`50`
`51`	`51`	`if (hasLocalCreationEvent)`
`52`	`52`	`{`
`@@ -60,7 +60,7 @@ public void LocalPlayerGenerated()`
`60`	`60`	`{`
`61`	`61`	`BasisLocalPlayer.AfterFinalMove.AddAction(120, UpdateUIFollow);`
`62`	`62`	`}`
`63`		`- BasisLocalPlayer.OnPlayersHeightChangedNextFrame += SetUILocation;`
	`63`	`+ BasisLocalHeight.OnChangedNextFrame += SetUILocation;`
`64`	`64`	`SetUILocation();`
`65`	`65`	`}`
`66`	`66`	`public void UpdateUIFollow()`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public void Start()`
`53`	`53`	`}`
`54`	`54`	`UseLocalhost.onClick.AddListener(UseLocalHost);`
`55`	`55`	`ApplySize();`
`56`		`- BasisLocalPlayer.OnPlayersHeightChangedNextFrame += ApplySize;`
	`56`	`+ BasisLocalHeight.OnChangedNextFrame += ApplySize;`
`57`	`57`	`if (BasisNetworkManagement.Instance != null)`
`58`	`58`	`{`
`59`	`59`	`LoadCurrentSettings();`
`@@ -68,7 +68,7 @@ public void ApplySize()`
`68`	`68`	`}`
`69`	`69`	`public void OnDestroy()`
`70`	`70`	`{`
`71`		`- BasisLocalPlayer.OnPlayersHeightChangedNextFrame -= ApplySize;`
	`71`	`+ BasisLocalHeight.OnChangedNextFrame -= ApplySize;`
`72`	`72`	`UseLocalhost.onClick.RemoveListener(UseLocalHost);`
`73`	`73`	`}`
`74`	`74`	`public void UseHostMode(bool IsDown)`