fixed a mistake with pipeline asset

dooly123 · dooly123 · commit 275bd1d55008 · 2026-02-16T19:54:51.000+10:00
diff --git a/Basis/Assets/AddressableAssetsData/link.xml b/Basis/Assets/AddressableAssetsData/link.xml
diff --git a/Basis/Assets/AddressableAssetsData/link.xml.meta b/Basis/Assets/AddressableAssetsData/link.xml.meta
diff --git a/Basis/Assets/Basis/Settings/Quality Settiings/Modified - Android.asset b/Basis/Assets/Basis/Settings/Quality Settiings/Modified - Android.asset
@@ -10,7 +10,7 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3}
-  m_Name: Modified - Quest
+  m_Name: Modified - Android
   m_EditorClassIdentifier: 
   k_AssetVersion: 13
   k_AssetPreviousVersion: 13
diff --git a/Basis/Assets/Basis/Settings/Quality Settiings/Modified - Android.asset.meta b/Basis/Assets/Basis/Settings/Quality Settiings/Modified - Android.asset.meta
diff --git a/Basis/Packages/com.basis.framework/BasisUI/BasisMenuMover.cs b/Basis/Packages/com.basis.framework/BasisUI/BasisMenuMover.cs
@@ -111,12 +111,16 @@ private void OnBootModeChanged(string obj)
         {
             SetRootMode(GetFindCurrentMode());
         }
-
         public void OnAvatarHeightChange()
         {
             SetRootMode(GetFindCurrentMode());
         }
 
+        public void OnAvatarHeightChange(BasisHeightDriver.HeightModeChange HeightModeChange)
+        {
+            SetRootMode(GetFindCurrentMode());
+        }
+
         public PanelGroupRootMode GetFindCurrentMode()
         {
             if (BasisDeviceManagement.IsUserInDesktop())
diff --git a/Basis/Packages/com.basis.framework/BasisUI/Menus/BasisMainMenu.cs b/Basis/Packages/com.basis.framework/BasisUI/Menus/BasisMainMenu.cs
@@ -11,7 +11,11 @@ public static string ActiveMenuTitle
         {
             get
             {
-                if (!Instance || !Instance.ActiveMenu) return string.Empty;
+                if (!Instance || !Instance.ActiveMenu)
+                {
+                    return string.Empty;
+                }
+
                 return Instance.ActiveMenu.Data.Title;
             }
         }
@@ -23,13 +27,9 @@ public static string ActiveMenuTitle
 
         public BasisMainMenu()
         {
-            HotbarMenu = BasisMenuPanel.CreateNew(
-                BasisMenuPanel.PanelData.Toolbar(MenuTitle),
-                MenuObjectInstance.PanelRoot);
+            HotbarMenu = BasisMenuPanel.CreateNew(BasisMenuPanel.PanelData.Toolbar(MenuTitle), MenuObjectInstance.PanelRoot);
 
-            HorizontalLayout = PanelElementDescriptor.CreateNew(
-                PanelElementDescriptor.ElementStyles.ScrollViewHorizontal, 
-                HotbarMenu.Descriptor.ContentParent);
+            HorizontalLayout = PanelElementDescriptor.CreateNew(PanelElementDescriptor.ElementStyles.ScrollViewHorizontal, HotbarMenu.Descriptor.ContentParent);
 
             BindProvidersToButtons();
         }
@@ -38,20 +38,34 @@ public static void Open()
         {
             BasisUIManagement.CloseAllMenus();
 
-            if (Instance) Instance.Release();
+            if (Instance)
+            {
+                Instance.Release();
+            }
+
             Instance = new BasisMainMenu();
             BasisCursorManagement.UnlockCursor(nameof(BasisMainMenu));
         }
 
         public static void Toggle()
         {
-            if (Instance) Close();
-            else Open();
+            if (Instance)
+            {
+                Close();
+            }
+            else
+            {
+                Open();
+            }
         }
 
         public static void Close()
         {
-            if (!Instance) return;
+            if (!Instance)
+            {
+                return;
+            }
+
             Instance.Release();
             Instance = null;
             BasisCursorManagement.LockCursor(nameof(BasisMainMenu));
@@ -66,15 +80,16 @@ public static BasisMenuPanel CreateActiveMenu(BasisMenuPanel.PanelData data, str
             if (Instance.ActiveMenu)
             {
                 if (Instance.ActiveMenu.Data.Title == data.Title)
+                {
                     return Instance.ActiveMenu;
+                }
                 else
+                {
                     Instance.ActiveMenu.ReleaseInstance();
+                }
             }
 
-            Instance.ActiveMenu = BasisMenuPanel.CreateNew(
-                data,
-                Instance.MenuObjectInstance.PanelRoot,
-                style);
+            Instance.ActiveMenu = BasisMenuPanel.CreateNew( data, Instance.MenuObjectInstance.PanelRoot, style);
             return Instance.ActiveMenu;
         }
     }
diff --git a/Basis/Packages/com.basis.framework/Camera/BasisHandHeldCameraInteractable.cs b/Basis/Packages/com.basis.framework/Camera/BasisHandHeldCameraInteractable.cs
@@ -192,7 +192,7 @@ private void OnInteractDesktopTweak(BasisInput _input)
     }
 
     /// <summary>Rescales the camera when the local player’s avatar height changes.</summary>
-    private void OnHeightChanged()
+    private void OnHeightChanged(BasisHeightDriver.HeightModeChange HeightModeChange)
     {
         transform.localScale = new Vector3(cameraDefaultScale, cameraDefaultScale, cameraDefaultScale) *  BasisHeightDriver.ScaledToMatchValue;
     }
diff --git a/Basis/Packages/com.basis.framework/Device Management/Common/BasisVisualTracker.cs b/Basis/Packages/com.basis.framework/Device Management/Common/BasisVisualTracker.cs
@@ -2,6 +2,7 @@
 using Basis.Scripts.Device_Management.Devices;
 using System;
 using UnityEngine;
+using static BasisHeightDriver;
 
 namespace Basis.Scripts.Device_Management
 {
@@ -49,12 +50,12 @@ public void Initialization(BasisInput basisInput)
             {
                 BasisInput = basisInput;
 
-                UpdateVisualSizeAndOffset();
+                OnPlayersHeightChangedNextFrame();
 
                 if (HasEvents == false)
                 {
-                    BasisLocalPlayer.OnLocalAvatarChanged += UpdateVisualSizeAndOffset;
-                    BasisLocalPlayer.OnPlayersHeightChangedNextFrame += UpdateVisualSizeAndOffset;
+                    BasisLocalPlayer.OnLocalAvatarChanged += OnPlayersHeightChangedNextFrame;
+                    BasisLocalPlayer.OnPlayersHeightChangedNextFrame += OnPlayersHeightChangedNextFrame;
                     HasEvents = true;
                 }
 
@@ -69,17 +70,19 @@ public void OnDestroy()
         {
             if (HasEvents)
             {
-                BasisLocalPlayer.OnLocalAvatarChanged -= UpdateVisualSizeAndOffset;
-                BasisLocalPlayer.OnPlayersHeightChangedNextFrame -= UpdateVisualSizeAndOffset;
+                BasisLocalPlayer.OnLocalAvatarChanged -= OnPlayersHeightChangedNextFrame;
+                BasisLocalPlayer.OnPlayersHeightChangedNextFrame -= OnPlayersHeightChangedNextFrame;
                 HasEvents = false;
             }
         }
-
+        public void OnPlayersHeightChangedNextFrame()
+        {
+        }
         /// <summary>
         /// Applies avatar-relative scale and local offset/rotation to the visual.
         /// Called on initialization and whenever the local avatar/height changes.
         /// </summary>
-        public void UpdateVisualSizeAndOffset()
+        public void OnPlayersHeightChangedNextFrame(HeightModeChange Mode)
         {
             this.transform.localScale = ScaleOfModel * BasisHeightDriver.AvatarToDefaultRatioScaled;
             this.transform.SetLocalPositionAndRotation(Vector3.zero, ModelRotationOffset);
diff --git a/Basis/Packages/com.basis.framework/Drivers/Common/BasisHeightDriver.cs b/Basis/Packages/com.basis.framework/Drivers/Common/BasisHeightDriver.cs
@@ -89,10 +89,14 @@ public static void ApplyScale(bool ScaleAvatar, float SelectedScale)
         // Notify next frame so listeners read consistent updated values.
         BasisLocalPlayer.Instance.ExecuteNextFrame(() =>
         {
-            BasisLocalPlayer.OnPlayersHeightChangedNextFrame?.Invoke();
+            BasisLocalPlayer.OnPlayersHeightChangedNextFrame?.Invoke(HeightModeChange.ScaleOnly);
         });
     }
-
+    public enum HeightModeChange
+    {
+        ScaleOnly,
+        ScaleAndMode
+    }
     /// <summary>
     /// Applies a scale factor to the local avatar and updates any cached bone offsets
     /// that must remain consistent with the avatar's scale.
@@ -195,7 +199,7 @@ public static void CaptureAvatarHeightDuringTpose()
         // Notify next frame so listeners read consistent updated values.
         BasisLocalPlayer.Instance.ExecuteNextFrame(() =>
         {
-            BasisLocalPlayer.OnPlayersHeightChangedNextFrame?.Invoke();
+            BasisLocalPlayer.OnPlayersHeightChangedNextFrame?.Invoke(HeightModeChange.ScaleAndMode);
         });
     }
 
diff --git a/Basis/Packages/com.basis.framework/Drivers/Local/BasisLocalCameraDriver.cs b/Basis/Packages/com.basis.framework/Drivers/Local/BasisLocalCameraDriver.cs
@@ -256,7 +256,7 @@ private void OnModeSwitch(string mode)
             {
                 Camera.fieldOfView = DefaultCameraFov;
             }
-            UpdateCameraScale();
+            UpdateCameraScale(BasisHeightDriver.HeightModeChange.ScaleAndMode);
         }
 
         /// <summary>
@@ -281,13 +281,16 @@ public void SetDesiredClipPlanes(float clipFar, float clipNear)
         {
             DesiredClipFar = clipFar;
             DesiredClipNear = clipNear;
-            UpdateCameraScale();
+            UpdateCameraScale(BasisHeightDriver.HeightModeChange.ScaleAndMode);
+        }
+        private void UpdateCameraScale()
+        {
+            UpdateCameraScale(BasisHeightDriver.HeightModeChange.ScaleAndMode);
         }
-
         /// <summary>
         /// Applies scale from the player's height so the camera’s local scale matches avatar scale.
         /// </summary>
-        public void UpdateCameraScale()
+        public void UpdateCameraScale(BasisHeightDriver.HeightModeChange HeightModeChange)
         {
             this.transform.localScale = Vector3.one * BasisHeightDriver.DeviceScale;
             // Ensure that the near clip plane is never far enough away that the avatar body clips through it.
diff --git a/Basis/Packages/com.basis.framework/Drivers/Local/BasisLocalRigDriver.cs b/Basis/Packages/com.basis.framework/Drivers/Local/BasisLocalRigDriver.cs
@@ -9,6 +9,7 @@
 using UnityEngine.Animations.Rigging;
 using UnityEngine.Playables;
 using static Basis.Scripts.Avatar.BasisAvatarIKStageCalibration;
+using static BasisHeightDriver;
 
 namespace Basis.Scripts.Drivers
 {
@@ -640,7 +641,7 @@ public void UpdateEuroSettings()
             fRotLeftShoulder.minCutoff = MinCutoff; fRotLeftShoulder.beta = Beta; fRotLeftShoulder.dCutoff = DerivativeCutoff;
             fRotRightShoulder.minCutoff = MinCutoff; fRotRightShoulder.beta = Beta; fRotRightShoulder.dCutoff = DerivativeCutoff;
         }
-        private void OnPlayersHeightChangedNextFrame()
+        private void OnPlayersHeightChangedNextFrame(HeightModeChange HeightModeChange)
         {
             var Data = BasisFullIKConstraint.data;
             SetHandCollisionScale(ref Data, BasisHeightDriver.AvatarToDefaultRatioScaled);
@@ -680,7 +681,7 @@ public void Spine(GameObject mainRig)
             BasisAnimationRiggingHelper.CreateBasisFullBodyRIG(localPlayer,  mainRig, basisTransformMapping, out BasisFullIKConstraint);
 
             BasisLocalPlayer.OnPlayersHeightChangedNextFrame += OnPlayersHeightChangedNextFrame;
-            OnPlayersHeightChangedNextFrame();
+            OnPlayersHeightChangedNextFrame( HeightModeChange.ScaleAndMode);
 
             var data = BasisFullIKConstraint.data;
 
diff --git a/Basis/Packages/com.basis.framework/Drivers/Local/BasisLocalSeatDriver.cs b/Basis/Packages/com.basis.framework/Drivers/Local/BasisLocalSeatDriver.cs
@@ -57,7 +57,7 @@ public class BasisLocalSeatDriver
 
         private bool hasEvent = false;
 
-        private void GrabLatestTposeLocalScaleData()
+        private void GrabLatestTposeLocalScaleData(BasisHeightDriver.HeightModeChange HeightModeChange)
         {
             leftLowerLegOffset =
                 BasisLocalBoneDriver.LeftFootControl.TposeLocalScaled.position -
@@ -149,7 +149,7 @@ public void Sit(BasisSeat seat)
             SetAllOverrideUsages(true);
             LocalPlayer.OnVirtualData += OnSimulate;
 
-            GrabLatestTposeLocalScaleData();
+            GrabLatestTposeLocalScaleData( BasisHeightDriver.HeightModeChange.ScaleAndMode);
 
             if (!hasEvent)
             {
@@ -691,7 +691,7 @@ public void DrawGizmosSelected()
             if (LocalPlayer == null) return;
             if (_seat == null) return;
 
-            GrabLatestTposeLocalScaleData();
+            GrabLatestTposeLocalScaleData( BasisHeightDriver.HeightModeChange.ScaleAndMode);
 
             const float kMinDot = 0.05f;
             const float kMaxBackShift = 0.25f;
diff --git a/Basis/Packages/com.basis.framework/Players/Local/BasisLocalPlayer.cs b/Basis/Packages/com.basis.framework/Players/Local/BasisLocalPlayer.cs
@@ -11,6 +11,7 @@
 using System.Threading.Tasks;
 using UnityEngine;
 using UnityEngine.SceneManagement;
+using static BasisHeightDriver;
 
 namespace Basis.Scripts.BasisSdk.Players
 {
@@ -73,7 +74,7 @@ public class BasisLocalPlayer : BasisPlayer
         /// <summary>
         /// Fired on the frame after a player height change is requested.
         /// </summary>
-        public static Action OnPlayersHeightChangedNextFrame;
+        public static Action<HeightModeChange> OnPlayersHeightChangedNextFrame;
 
         /// <summary>
         /// Fires Just Before the Apply of the remote player, good for chair movement
diff --git a/Basis/Packages/com.basis.framework/Settings/SMModuleShadowQualityURP.cs b/Basis/Packages/com.basis.framework/Settings/SMModuleShadowQualityURP.cs
@@ -13,9 +13,12 @@ public override void ValidSettingsChange(string matchedSettingName, string optio
         if (matchedSettingName != K_SHADOW_QUALITY)
             return;
 
-        UniversalRenderPipelineAsset Asset =
-            (UniversalRenderPipelineAsset)QualitySettings.renderPipeline;
-
+        UniversalRenderPipelineAsset Asset = (UniversalRenderPipelineAsset)QualitySettings.renderPipeline;
+        if(Asset == null)
+        {
+            BasisDebug.LogError("Missing Asset Pipeline!");
+            return;
+        }
         // Cascade setup (unchanged behavior)
         Asset.shadowCascadeCount = 4;                         // Four cascades for shadow quality
         Asset.cascade2Split = 0.12f;                          // 12% for 2-cascade setting
diff --git a/Basis/Packages/com.basis.framework/UI Panels/BasisSetUserName.cs b/Basis/Packages/com.basis.framework/UI Panels/BasisSetUserName.cs
@@ -1,12 +1,13 @@
-using UnityEngine;
-using UnityEngine.UI;
-using TMPro;
 using Basis.Scripts.BasisSdk.Players;
 using Basis.Scripts.Common;
+using Basis.Scripts.Device_Management;
+using Basis.Scripts.Drivers;
 using Basis.Scripts.Networking;
 using System.Threading.Tasks;
-using Basis.Scripts.Drivers;
-using Basis.Scripts.Device_Management;
+using TMPro;
+using UnityEngine;
+using UnityEngine.UI;
+using static BasisHeightDriver;
 
 namespace Basis.Scripts.UI.UI_Panels
 {
@@ -92,7 +93,10 @@ public void Start()
             BasisLocalPlayer.OnLocalAvatarChanged += ApplySizeAndPosition;
             BasisLocalCameraDriver.InstanceExists += ApplySizeAndPosition;
         }
-
+        public void ApplySizeAndPosition(HeightModeChange Mode)
+        {
+            ApplySizeAndPosition();
+        }
         /// <summary>
         /// Rescales the UI panel based on the local player's avatar height.
         /// </summary>
diff --git a/Basis/Packages/com.basis.framework/UI Panels/BasisUIMovementDriver.cs b/Basis/Packages/com.basis.framework/UI Panels/BasisUIMovementDriver.cs
@@ -2,6 +2,7 @@
 using Basis.Scripts.Device_Management;
 using Basis.Scripts.Drivers;
 using UnityEngine;
+using static BasisHeightDriver;
 namespace Basis.Scripts.UI.UI_Panels
 {
     public class BasisUIMovementDriver : MonoBehaviour
@@ -80,8 +81,11 @@ public void UpdateUIFollow()
                 SetUILocation();
             }
         }
-
         public void SetUILocation()
+        {
+            SetUILocation(HeightModeChange.ScaleAndMode);
+        }
+        public void SetUILocation(HeightModeChange Mode)
         {
             BasisLocalCameraDriver.GetPositionAndRotation(out Position, out Rotation);
 
diff --git a/Basis/Packages/com.basis.framework/UI/BasisMenuMovementDriver.cs b/Basis/Packages/com.basis.framework/UI/BasisMenuMovementDriver.cs
@@ -4,6 +4,7 @@
 using Basis.Scripts.TransformBinders.BoneControl;
 using System.Collections;
 using UnityEngine;
+using static BasisHeightDriver;
 namespace Basis.Scripts.UI.UI_Panels
 {
     public class BasisMenuMovementDriver : MonoBehaviour
@@ -68,6 +69,10 @@ private void UpdateDelayedSetUI()
         {
             StartCoroutine(DelaySetUI());
         }
+        private void UpdateDelayedSetUI(HeightModeChange Mode)
+        {
+            StartCoroutine(DelaySetUI());
+        }
         private void UpdateDelayedSetUI(bool state)
         {
             if (state)
diff --git a/Basis/Packages/com.basis.framework/UI/BasisUIRaycast.cs b/Basis/Packages/com.basis.framework/UI/BasisUIRaycast.cs
diff --git a/Basis/Packages/com.basis.sdk/Fonts/Inter.asset b/Basis/Packages/com.basis.sdk/Fonts/Inter.asset
diff --git a/Basis/Packages/com.basis.sdk/Fonts/Inter_24pt-Bold SDF.asset b/Basis/Packages/com.basis.sdk/Fonts/Inter_24pt-Bold SDF.asset
diff --git a/Basis/ProjectSettings/QualitySettings.asset b/Basis/ProjectSettings/QualitySettings.asset

Original file line number	Diff line number	Diff line change
`@@ -111,12 +111,16 @@ private void OnBootModeChanged(string obj)`
`111`	`111`	`{`
`112`	`112`	`SetRootMode(GetFindCurrentMode());`
`113`	`113`	`}`
`114`		`-`
`115`	`114`	`public void OnAvatarHeightChange()`
`116`	`115`	`{`
`117`	`116`	`SetRootMode(GetFindCurrentMode());`
`118`	`117`	`}`
`119`	`118`
	`119`	`+ public void OnAvatarHeightChange(BasisHeightDriver.HeightModeChange HeightModeChange)`
	`120`	`+ {`
	`121`	`+ SetRootMode(GetFindCurrentMode());`
	`122`	`+ }`
	`123`	`+`
`120`	`124`	`public PanelGroupRootMode GetFindCurrentMode()`
`121`	`125`	`{`
`122`	`126`	`if (BasisDeviceManagement.IsUserInDesktop())`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,11 @@ public static string ActiveMenuTitle`
`11`	`11`	`{`
`12`	`12`	`get`
`13`	`13`	`{`
`14`		`- if (!Instance \|\| !Instance.ActiveMenu) return string.Empty;`
	`14`	`+ if (!Instance \|\| !Instance.ActiveMenu)`
	`15`	`+ {`
	`16`	`+ return string.Empty;`
	`17`	`+ }`
	`18`	`+`
`15`	`19`	`return Instance.ActiveMenu.Data.Title;`
`16`	`20`	`}`
`17`	`21`	`}`
`@@ -23,13 +27,9 @@ public static string ActiveMenuTitle`
`23`	`27`
`24`	`28`	`public BasisMainMenu()`
`25`	`29`	`{`
`26`		`- HotbarMenu = BasisMenuPanel.CreateNew(`
`27`		`- BasisMenuPanel.PanelData.Toolbar(MenuTitle),`
`28`		`- MenuObjectInstance.PanelRoot);`
	`30`	`+ HotbarMenu = BasisMenuPanel.CreateNew(BasisMenuPanel.PanelData.Toolbar(MenuTitle), MenuObjectInstance.PanelRoot);`
`29`	`31`
`30`		`- HorizontalLayout = PanelElementDescriptor.CreateNew(`
`31`		`- PanelElementDescriptor.ElementStyles.ScrollViewHorizontal,`
`32`		`- HotbarMenu.Descriptor.ContentParent);`
	`32`	`+ HorizontalLayout = PanelElementDescriptor.CreateNew(PanelElementDescriptor.ElementStyles.ScrollViewHorizontal, HotbarMenu.Descriptor.ContentParent);`
`33`	`33`
`34`	`34`	`BindProvidersToButtons();`
`35`	`35`	`}`
`@@ -38,20 +38,34 @@ public static void Open()`
`38`	`38`	`{`
`39`	`39`	`BasisUIManagement.CloseAllMenus();`
`40`	`40`
`41`		`- if (Instance) Instance.Release();`
	`41`	`+ if (Instance)`
	`42`	`+ {`
	`43`	`+ Instance.Release();`
	`44`	`+ }`
	`45`	`+`
`42`	`46`	`Instance = new BasisMainMenu();`
`43`	`47`	`BasisCursorManagement.UnlockCursor(nameof(BasisMainMenu));`
`44`	`48`	`}`
`45`	`49`
`46`	`50`	`public static void Toggle()`
`47`	`51`	`{`
`48`		`- if (Instance) Close();`
`49`		`- else Open();`
	`52`	`+ if (Instance)`
	`53`	`+ {`
	`54`	`+ Close();`
	`55`	`+ }`
	`56`	`+ else`
	`57`	`+ {`
	`58`	`+ Open();`
	`59`	`+ }`
`50`	`60`	`}`
`51`	`61`
`52`	`62`	`public static void Close()`
`53`	`63`	`{`
`54`		`- if (!Instance) return;`
	`64`	`+ if (!Instance)`
	`65`	`+ {`
	`66`	`+ return;`
	`67`	`+ }`
	`68`	`+`
`55`	`69`	`Instance.Release();`
`56`	`70`	`Instance = null;`
`57`	`71`	`BasisCursorManagement.LockCursor(nameof(BasisMainMenu));`
`@@ -66,15 +80,16 @@ public static BasisMenuPanel CreateActiveMenu(BasisMenuPanel.PanelData data, str`
`66`	`80`	`if (Instance.ActiveMenu)`
`67`	`81`	`{`
`68`	`82`	`if (Instance.ActiveMenu.Data.Title == data.Title)`
	`83`	`+ {`
`69`	`84`	`return Instance.ActiveMenu;`
	`85`	`+ }`
`70`	`86`	`else`
	`87`	`+ {`
`71`	`88`	`Instance.ActiveMenu.ReleaseInstance();`
	`89`	`+ }`
`72`	`90`	`}`
`73`	`91`
`74`		`- Instance.ActiveMenu = BasisMenuPanel.CreateNew(`
`75`		`- data,`
`76`		`- Instance.MenuObjectInstance.PanelRoot,`
`77`		`- style);`
	`92`	`+ Instance.ActiveMenu = BasisMenuPanel.CreateNew( data, Instance.MenuObjectInstance.PanelRoot, style);`
`78`	`93`	`return Instance.ActiveMenu;`
`79`	`94`	`}`
`80`	`95`	`}`
Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,7 @@ private void OnInteractDesktopTweak(BasisInput _input)`
`192`	`192`	`}`
`193`	`193`
`194`	`194`	`/// <summary>Rescales the camera when the local player’s avatar height changes.</summary>`
`195`		`- private void OnHeightChanged()`
	`195`	`+ private void OnHeightChanged(BasisHeightDriver.HeightModeChange HeightModeChange)`
`196`	`196`	`{`
`197`	`197`	`transform.localScale = new Vector3(cameraDefaultScale, cameraDefaultScale, cameraDefaultScale) * BasisHeightDriver.ScaledToMatchValue;`
`198`	`198`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`using Basis.Scripts.Device_Management.Devices;`
`3`	`3`	`using System;`
`4`	`4`	`using UnityEngine;`
	`5`	`+using static BasisHeightDriver;`
`5`	`6`
`6`	`7`	`namespace Basis.Scripts.Device_Management`
`7`	`8`	`{`
`@@ -49,12 +50,12 @@ public void Initialization(BasisInput basisInput)`
`49`	`50`	`{`
`50`	`51`	`BasisInput = basisInput;`
`51`	`52`
`52`		`- UpdateVisualSizeAndOffset();`
	`53`	`+ OnPlayersHeightChangedNextFrame();`
`53`	`54`
`54`	`55`	`if (HasEvents == false)`
`55`	`56`	`{`
`56`		`- BasisLocalPlayer.OnLocalAvatarChanged += UpdateVisualSizeAndOffset;`
`57`		`- BasisLocalPlayer.OnPlayersHeightChangedNextFrame += UpdateVisualSizeAndOffset;`
	`57`	`+ BasisLocalPlayer.OnLocalAvatarChanged += OnPlayersHeightChangedNextFrame;`
	`58`	`+ BasisLocalPlayer.OnPlayersHeightChangedNextFrame += OnPlayersHeightChangedNextFrame;`
`58`	`59`	`HasEvents = true;`
`59`	`60`	`}`
`60`	`61`
`@@ -69,17 +70,19 @@ public void OnDestroy()`
`69`	`70`	`{`
`70`	`71`	`if (HasEvents)`
`71`	`72`	`{`
`72`		`- BasisLocalPlayer.OnLocalAvatarChanged -= UpdateVisualSizeAndOffset;`
`73`		`- BasisLocalPlayer.OnPlayersHeightChangedNextFrame -= UpdateVisualSizeAndOffset;`
	`73`	`+ BasisLocalPlayer.OnLocalAvatarChanged -= OnPlayersHeightChangedNextFrame;`
	`74`	`+ BasisLocalPlayer.OnPlayersHeightChangedNextFrame -= OnPlayersHeightChangedNextFrame;`
`74`	`75`	`HasEvents = false;`
`75`	`76`	`}`
`76`	`77`	`}`
`77`		`-`
	`78`	`+ public void OnPlayersHeightChangedNextFrame()`
	`79`	`+ {`
	`80`	`+ }`
`78`	`81`	`/// <summary>`
`79`	`82`	`/// Applies avatar-relative scale and local offset/rotation to the visual.`
`80`	`83`	`/// Called on initialization and whenever the local avatar/height changes.`
`81`	`84`	`/// </summary>`
`82`		`- public void UpdateVisualSizeAndOffset()`
	`85`	`+ public void OnPlayersHeightChangedNextFrame(HeightModeChange Mode)`
`83`	`86`	`{`
`84`	`87`	`this.transform.localScale = ScaleOfModel * BasisHeightDriver.AvatarToDefaultRatioScaled;`
`85`	`88`	`this.transform.SetLocalPositionAndRotation(Vector3.zero, ModelRotationOffset);`
Original file line number	Diff line number	Diff line change
`@@ -89,10 +89,14 @@ public static void ApplyScale(bool ScaleAvatar, float SelectedScale)`
`89`	`89`	`// Notify next frame so listeners read consistent updated values.`
`90`	`90`	`BasisLocalPlayer.Instance.ExecuteNextFrame(() =>`
`91`	`91`	`{`
`92`		`- BasisLocalPlayer.OnPlayersHeightChangedNextFrame?.Invoke();`
	`92`	`+ BasisLocalPlayer.OnPlayersHeightChangedNextFrame?.Invoke(HeightModeChange.ScaleOnly);`
`93`	`93`	`});`
`94`	`94`	`}`
`95`		`-`
	`95`	`+ public enum HeightModeChange`
	`96`	`+ {`
	`97`	`+ ScaleOnly,`
	`98`	`+ ScaleAndMode`
	`99`	`+ }`
`96`	`100`	`/// <summary>`
`97`	`101`	`/// Applies a scale factor to the local avatar and updates any cached bone offsets`
`98`	`102`	`/// that must remain consistent with the avatar's scale.`
`@@ -195,7 +199,7 @@ public static void CaptureAvatarHeightDuringTpose()`
`195`	`199`	`// Notify next frame so listeners read consistent updated values.`
`196`	`200`	`BasisLocalPlayer.Instance.ExecuteNextFrame(() =>`
`197`	`201`	`{`
`198`		`- BasisLocalPlayer.OnPlayersHeightChangedNextFrame?.Invoke();`
	`202`	`+ BasisLocalPlayer.OnPlayersHeightChangedNextFrame?.Invoke(HeightModeChange.ScaleAndMode);`
`199`	`203`	`});`
`200`	`204`	`}`
`201`	`205`
Original file line number	Diff line number	Diff line change
`@@ -256,7 +256,7 @@ private void OnModeSwitch(string mode)`
`256`	`256`	`{`
`257`	`257`	`Camera.fieldOfView = DefaultCameraFov;`
`258`	`258`	`}`
`259`		`- UpdateCameraScale();`
	`259`	`+ UpdateCameraScale(BasisHeightDriver.HeightModeChange.ScaleAndMode);`
`260`	`260`	`}`
`261`	`261`
`262`	`262`	`/// <summary>`
`@@ -281,13 +281,16 @@ public void SetDesiredClipPlanes(float clipFar, float clipNear)`
`281`	`281`	`{`
`282`	`282`	`DesiredClipFar = clipFar;`
`283`	`283`	`DesiredClipNear = clipNear;`
`284`		`- UpdateCameraScale();`
	`284`	`+ UpdateCameraScale(BasisHeightDriver.HeightModeChange.ScaleAndMode);`
	`285`	`+ }`
	`286`	`+ private void UpdateCameraScale()`
	`287`	`+ {`
	`288`	`+ UpdateCameraScale(BasisHeightDriver.HeightModeChange.ScaleAndMode);`
`285`	`289`	`}`
`286`		`-`
`287`	`290`	`/// <summary>`
`288`	`291`	`/// Applies scale from the player's height so the camera’s local scale matches avatar scale.`
`289`	`292`	`/// </summary>`
`290`		`- public void UpdateCameraScale()`
	`293`	`+ public void UpdateCameraScale(BasisHeightDriver.HeightModeChange HeightModeChange)`
`291`	`294`	`{`
`292`	`295`	`this.transform.localScale = Vector3.one * BasisHeightDriver.DeviceScale;`
`293`	`296`	`// Ensure that the near clip plane is never far enough away that the avatar body clips through it.`