added GlobalToggleAdditionalAvatarDataLock aswell as most of the way there on local avatar preview camera rendererr

Author: dooly123

Basis Server/BasisNetworkCore/BasisServerConfiguration.cs

@@ -78,9 +78,17 @@ public class Configuration
     /// </summary>
     public bool ThirdPersonDisabled = false;
     /// <summary>
-    /// Read config from file. If no file is found create a default config file at filePath
+    /// When true, the server strips AdditionalAvatarDatas (blendshapes, custom-behaviour
+    /// params) from every inbound avatar sync message before propagating to other peers.
+    /// Muscle/position/rotation still sync normally; only the additional-data payload is
+    /// dropped. Toggled live via the admin panel and persisted alongside the other
+    /// content lockouts. Default off.
+    /// </summary>
+    public bool AdditionalAvatarDataLock = false;
+    /// <summary>
+    /// Read config from file. If no file is found create a default config file at filePath.
+    /// Also loads per-transport config sidecars from <c>{configDir}/transports/{stackId}.xml</c>.
     /// </summary>
-    /// <param name="filePath">Path to config file</param>
     public static Configuration LoadFromXml(string filePath)
     {
         RuntimeHelpers.RunClassConstructor(typeof(BasisNetworkStackRegistry).TypeHandle);

Basis Server/BasisNetworkCore/Serializable/AdminRequest.cs

@@ -92,6 +92,12 @@ public enum AdminRequestMode : byte
             // Payload: [string url]
             // Removes every defaultlibrary/ XML whose URL matches and rebroadcasts.
             RemoveDefaultLibraryItem,
+
+            // admin: toggle the global strip of AdditionalAvatarDatas (blendshapes,
+            // custom-behaviour params) on inbound avatar sync messages. Muscle/position/
+            // rotation still propagate normally. State is appended as the 6th bool in
+            // GlobalGetLockState.
+            GlobalToggleAdditionalAvatarDataLock,
         }
     }
 }

Basis Server/BasisNetworkServer/BasisNetworkingReductionSystem/BasisServerReductionSystemEvents.cs

@@ -1061,6 +1061,12 @@ private static void ProcessMessage(QueuedMessage message)
                 return;
             }
 
+            if (BasisNetworkServer.Security.BasisGlobalLockManager.AdditionalAvatarDataLock)
+            {
+                poolMsg.AdditionalAvatarDatas = null;
+                poolMsg.AdditionalAvatarDataSize = 0;
+            }
+
             var incomingQuality = (BitQuality)poolMsg.DataQualityLevel;
             bool isHighQuality = incomingQuality == BitQuality.High;
 

Basis Server/BasisNetworkServer/Security/BasisGlobalLockManager.cs

@@ -17,12 +17,14 @@ public static class BasisGlobalLockManager
         private static int _worldsLocked;
         private static int _serversLocked;
         private static int _thirdPersonDisabled;
+        private static int _additionalAvatarDataLock;
 
         public static bool AvatarsLocked => Interlocked.CompareExchange(ref _avatarsLocked, 0, 0) == 1;
         public static bool PropsLocked => Interlocked.CompareExchange(ref _propsLocked, 0, 0) == 1;
         public static bool WorldsLocked => Interlocked.CompareExchange(ref _worldsLocked, 0, 0) == 1;
         public static bool ServersLocked => Interlocked.CompareExchange(ref _serversLocked, 0, 0) == 1;
         public static bool ThirdPersonDisabled => Interlocked.CompareExchange(ref _thirdPersonDisabled, 0, 0) == 1;
+        public static bool AdditionalAvatarDataLock => Interlocked.CompareExchange(ref _additionalAvatarDataLock, 0, 0) == 1;
 
         /// <summary>
         /// Seed the initial lock state from the server configuration.
@@ -35,6 +37,7 @@ public static void InitializeFromConfig(Configuration config)
             Interlocked.Exchange(ref _worldsLocked, config.WorldsLocked ? 1 : 0);
             Interlocked.Exchange(ref _serversLocked, config.ServersLocked ? 1 : 0);
             Interlocked.Exchange(ref _thirdPersonDisabled, config.ThirdPersonDisabled ? 1 : 0);
+            Interlocked.Exchange(ref _additionalAvatarDataLock, config.AdditionalAvatarDataLock ? 1 : 0);
         }
 
         /// <summary>
@@ -62,6 +65,12 @@ public static void InitializeFromConfig(Configuration config)
         /// </summary>
         public static bool ToggleThirdPerson() => Toggle(ref _thirdPersonDisabled);
 
+        /// <summary>
+        /// Toggle the network-side strip of AdditionalAvatarDatas on inbound avatar
+        /// sync messages. Returns the new state (true = additional data stripped).
+        /// </summary>
+        public static bool ToggleAdditionalAvatarDataLock() => Toggle(ref _additionalAvatarDataLock);
+
         private static bool Toggle(ref int field)
         {
             int prev, next;
@@ -88,6 +97,8 @@ public static void SendLockStateToPeer(NetPeer peer)
             writer.Put(ServersLocked);
             // Appended after ServersLocked so older clients reading 4 bools still parse cleanly.
             writer.Put(ThirdPersonDisabled);
+            // Appended after ThirdPersonDisabled — older clients parsing 5 bools still work.
+            writer.Put(AdditionalAvatarDataLock);
             NetworkServer.TrySend(peer, writer, BasisNetworkCommons.AdminChannel, DeliveryMethod.ReliableOrdered);
             NetworkServer.ReturnWriter(writer);
         }
@@ -105,6 +116,8 @@ public static void BroadcastLockState()
             writer.Put(ServersLocked);
             // Appended after ServersLocked so older clients reading 4 bools still parse cleanly.
             writer.Put(ThirdPersonDisabled);
+            // Appended after ThirdPersonDisabled — older clients parsing 5 bools still work.
+            writer.Put(AdditionalAvatarDataLock);
             NetworkServer.BroadcastMessageToClients(
                 writer,
                 BasisNetworkCommons.AdminChannel,

Basis Server/BasisNetworkServer/Security/BasisPlayerModeration.cs

@@ -344,6 +344,11 @@ public static void OnAdminMessage(NetPeer peer, NetPacketReader reader)
                         HandleGlobalToggle(peer, "Third-person camera", BasisGlobalLockManager.ToggleThirdPerson()));
                     break;
 
+                case AdminRequestMode.GlobalToggleAdditionalAvatarDataLock:
+                    Require(peer, PermNodes.ModerationGlobalLock, () =>
+                        HandleGlobalToggle(peer, "Additional avatar data lock", BasisGlobalLockManager.ToggleAdditionalAvatarDataLock()));
+                    break;
+
                 case AdminRequestMode.SetGlobalHeadlessAudio:
                     Require(peer, PermNodes.ModerationHeadlessAudio, () =>
                         HandleHeadlessAudioSet(peer, reader));

Basis/Packages/com.basis.framework/BasisUI/Localization/Languages/en.json

@@ -393,6 +393,8 @@
     { "key": "settings.general.hud.title", "value": "HUD" },
     { "key": "settings.general.desktopReticle", "value": "Desktop Reticle" },
     { "key": "settings.general.desktopReticle.description", "value": "Show a small aim reticle at screen center while in desktop mode." },
+    { "key": "settings.general.avatarPreview", "value": "Avatar Preview" },
+    { "key": "settings.general.avatarPreview.description", "value": "Show a small preview of your avatar near the microphone icon." },
     { "key": "settings.general.camera.title", "value": "Camera" },
     { "key": "settings.general.thirdPerson", "value": "Third-Person Camera" },
     { "key": "settings.general.thirdPerson.description", "value": "Allow the desktop camera to switch to a third-person view." },

Basis/Packages/com.basis.framework/BasisUI/Menus/Main Menu Providers/SettingsProvider.cs

@@ -352,6 +352,11 @@ public static PanelTabPage GeneralTab(PanelTabGroup tabGroup)
             toggleDesktopReticle.Descriptor.SetTitle(BasisLocalization.Get("settings.general.desktopReticle"));
             toggleDesktopReticle.Descriptor.SetDescription(BasisLocalization.Get("settings.general.desktopReticle.description"));
 
+            PanelToggle toggleAvatarPreview = PanelToggle.CreateNewEntry(hudGroup);
+            toggleAvatarPreview.AssignBinding(BasisSettingsDefaults.AvatarPreview);
+            toggleAvatarPreview.Descriptor.SetTitle(BasisLocalization.Get("settings.general.avatarPreview"));
+            toggleAvatarPreview.Descriptor.SetDescription(BasisLocalization.Get("settings.general.avatarPreview.description"));
+
             // Third-person camera is desktop-only; hide the entire group in VR/XR.
             if (BasisDeviceManagement.IsUserInDesktop())
             {

Basis/Packages/com.basis.framework/BasisUI/Menus/Main Menu Providers/SettingsProviderParts/SettingsProviderAdminTab.cs

@@ -86,6 +86,12 @@ public static PanelTabPage AdminTab(PanelTabGroup tabGroup)
             thirdPersonLock.SetValueWithoutNotify(BasisNetworkModeration.GlobalThirdPersonDisabled);
             thirdPersonLock.OnValueChanged += _ => BasisNetworkModeration.GlobalToggleThirdPerson();
 
+            PanelToggle additionalAvatarDataLock = PanelToggle.CreateNewEntry(lockGroup.ContentParent);
+            additionalAvatarDataLock.Descriptor.SetTitle("Strip Additional Avatar Data");
+            additionalAvatarDataLock.Descriptor.SetDescription("Strips additional avatar data (blendshapes, custom-behaviour params) from every player's network broadcast. Muscle, position, and rotation still sync normally.");
+            additionalAvatarDataLock.SetValueWithoutNotify(BasisNetworkModeration.GlobalAdditionalAvatarDataLock);
+            additionalAvatarDataLock.OnValueChanged += _ => BasisNetworkModeration.GlobalToggleAdditionalAvatarDataLock();
+
             PanelSlider opusPacketLossSlider = PanelSlider.CreateNew(PanelSlider.SliderStyles.Entry, lockGroup.ContentParent);
             opusPacketLossSlider.SetSliderSettings(PanelSlider.SliderSettings.Percentage("Opus FEC loss %"));
             opusPacketLossSlider.Descriptor.SetDescription("Sets OPUS_SET_PACKET_LOSS_PERC on every client's voice encoder. Higher = more bitrate spent on redundant FEC data, better recovery under packet loss.");
@@ -97,6 +103,7 @@ public static PanelTabPage AdminTab(PanelTabGroup tabGroup)
             controller.WorldLockToggle = worldLock;
             controller.ServerShareLockToggle = serverShareLock;
             controller.ThirdPersonLockToggle = thirdPersonLock;
+            controller.AdditionalAvatarDataLockToggle = additionalAvatarDataLock;
             controller.HeadlessAudioToggle = headlessAudioToggle;
             controller.HeadlessDisallowToggle = disallowHeadlessToggle;
             controller.OpusPacketLossSlider = opusPacketLossSlider;
@@ -352,6 +359,7 @@ private sealed class AdminTabController : MonoBehaviour
             public PanelToggle WorldLockToggle;
             public PanelToggle ServerShareLockToggle;
             public PanelToggle ThirdPersonLockToggle;
+            public PanelToggle AdditionalAvatarDataLockToggle;
             public PanelToggle HeadlessAudioToggle;
             public PanelToggle HeadlessDisallowToggle;
             public PanelSlider OpusPacketLossSlider;
@@ -362,6 +370,8 @@ private void OnEnable()
                 BasisNetworkModeration.OnGlobalLockStateChanged += OnGlobalLockStateChanged;
                 BasisNetworkModeration.OnGlobalThirdPersonDisabledChanged -= OnGlobalThirdPersonDisabledChanged;
                 BasisNetworkModeration.OnGlobalThirdPersonDisabledChanged += OnGlobalThirdPersonDisabledChanged;
+                BasisNetworkModeration.OnGlobalAdditionalAvatarDataLockChanged -= OnGlobalAdditionalAvatarDataLockChanged;
+                BasisNetworkModeration.OnGlobalAdditionalAvatarDataLockChanged += OnGlobalAdditionalAvatarDataLockChanged;
                 BasisNetworkModeration.OnGlobalHeadlessAudioStateChanged -= OnGlobalHeadlessAudioStateChanged;
                 BasisNetworkModeration.OnGlobalHeadlessAudioStateChanged += OnGlobalHeadlessAudioStateChanged;
                 BasisNetworkModeration.OnGlobalHeadlessDisallowStateChanged -= OnGlobalHeadlessDisallowStateChanged;
@@ -374,6 +384,7 @@ private void OnDisable()
             {
                 BasisNetworkModeration.OnGlobalLockStateChanged -= OnGlobalLockStateChanged;
                 BasisNetworkModeration.OnGlobalThirdPersonDisabledChanged -= OnGlobalThirdPersonDisabledChanged;
+                BasisNetworkModeration.OnGlobalAdditionalAvatarDataLockChanged -= OnGlobalAdditionalAvatarDataLockChanged;
                 BasisNetworkModeration.OnGlobalHeadlessAudioStateChanged -= OnGlobalHeadlessAudioStateChanged;
                 BasisNetworkModeration.OnGlobalHeadlessDisallowStateChanged -= OnGlobalHeadlessDisallowStateChanged;
                 BasisNetworkModeration.OnGlobalOpusPacketLossChanged -= OnGlobalOpusPacketLossChanged;
@@ -383,6 +394,7 @@ private void OnDestroy()
             {
                 BasisNetworkModeration.OnGlobalLockStateChanged -= OnGlobalLockStateChanged;
                 BasisNetworkModeration.OnGlobalThirdPersonDisabledChanged -= OnGlobalThirdPersonDisabledChanged;
+                BasisNetworkModeration.OnGlobalAdditionalAvatarDataLockChanged -= OnGlobalAdditionalAvatarDataLockChanged;
                 BasisNetworkModeration.OnGlobalHeadlessAudioStateChanged -= OnGlobalHeadlessAudioStateChanged;
                 BasisNetworkModeration.OnGlobalHeadlessDisallowStateChanged -= OnGlobalHeadlessDisallowStateChanged;
                 BasisNetworkModeration.OnGlobalOpusPacketLossChanged -= OnGlobalOpusPacketLossChanged;
@@ -401,6 +413,11 @@ private void OnGlobalThirdPersonDisabledChanged(bool disabled)
                 if (ThirdPersonLockToggle != null) ThirdPersonLockToggle.SetValueWithoutNotify(disabled);
             }
 
+            private void OnGlobalAdditionalAvatarDataLockChanged(bool locked)
+            {
+                if (AdditionalAvatarDataLockToggle != null) AdditionalAvatarDataLockToggle.SetValueWithoutNotify(locked);
+            }
+
             private void OnGlobalHeadlessAudioStateChanged(bool headlessAudioOff)
             {
                 if (HeadlessAudioToggle != null) HeadlessAudioToggle.SetValueWithoutNotify(headlessAudioOff);

Basis/Packages/com.basis.framework/Drivers/Local/BasisLocalAvatarPreviewDriver.cs

@@ -1,5 +1,6 @@
 using Basis.BasisUI;
 using Basis.Scripts.BasisSdk.Players;
+using Basis.Scripts.Device_Management;
 using Basis.Scripts.TransformBinders;
 using UnityEngine;
 using UnityEngine.Rendering.Universal;
@@ -8,7 +9,7 @@ namespace Basis.Scripts.Drivers
 {
     /// <summary>
     /// Creates a secondary camera that renders only the local avatar layer (layer 6)
-    /// and displays the result on a HUD sprite near the microphone icon.
+    /// and displays the result on a HUD sprite spanning the bottom-right half of the screen.
     /// Off by default; toggled via the AvatarPreview setting.
     /// All objects are created at runtime and cleaned up on disable/destroy.
     /// </summary>
@@ -21,27 +22,15 @@ public class BasisLocalAvatarPreviewDriver
 
         [Header("Preview Camera")]
         /// <summary>Distance in front of the player's face the camera is placed.</summary>
-        public static float CameraDistance = 3f;
-        /// <summary>Where on the body the camera looks at, as a fraction of player height (0 = feet, 1 = head).</summary>
-        public static float BodyFocusHeight = 1f;
+        public static float CameraDistance = 1.6f;
         public float CameraFieldOfView = 40f;
 
-        [Header("HUD Display")]
-        /// <summary>
-        /// Normalized offset from the mic icon in frustum-relative units (fraction of half-frustum).
-        /// X moves right, Y moves up. Stays at the same relative screen position on resize.
-        /// </summary>
-        public static Vector2 DisplayNormalizedOffset = new Vector2(0.15f, 0.03f);
-        /// <summary>
-        /// Local scale of the display sprite within ParentOfUI.
-        /// </summary>
-        public static float DisplayScale = 50f;
-
         [System.NonSerialized] public Camera PreviewCamera;
         [System.NonSerialized] public RenderTexture PreviewRT;
 
         private BasisLocalCameraDriver cachedDriver;
         private GameObject cameraGO;
+        private GameObject parentOfUIGO;
         private GameObject displayGO;
         private SpriteRenderer displaySpriteRenderer;
         private MaterialPropertyBlock propertyBlock;
@@ -56,8 +45,6 @@ public class BasisLocalAvatarPreviewDriver
         /// </summary>
         public void Initialize(BasisLocalCameraDriver cameraDriver)
         {
-            // TODO: re-enable when avatar preview is finished
-            return;
             cachedDriver = cameraDriver;
 
             // Apply the persisted setting
@@ -121,11 +108,13 @@ private void CreateObjects()
                 urpData.allowXRRendering = false;
             }
 
-            // --- Display Sprite (child of ParentOfUI, next to the mic icon) ---
+            parentOfUIGO = new GameObject("AvatarPreviewParentOfUI");
+            parentOfUIGO.layer = LayerMask.NameToLayer("UI");
+            parentOfUIGO.transform.SetParent(cachedDriver.transform, false);
+
             displayGO = new GameObject("AvatarPreviewDisplay");
             displayGO.layer = LayerMask.NameToLayer("UI");
-            displayGO.transform.SetParent(cachedDriver.ParentOfUI, false);
-            displayGO.transform.localScale = new Vector3(DisplayScale, DisplayScale, 1f);
+            displayGO.transform.SetParent(parentOfUIGO.transform, false);
             displayGO.transform.localRotation = Quaternion.identity;
 
             displaySpriteRenderer = displayGO.AddComponent<SpriteRenderer>();
@@ -153,6 +142,7 @@ private void DestroyObjects()
 
             if (cameraGO != null) { Object.Destroy(cameraGO); cameraGO = null; }
             if (displayGO != null) { Object.Destroy(displayGO); displayGO = null; }
+            if (parentOfUIGO != null) { Object.Destroy(parentOfUIGO); parentOfUIGO = null; }
 
             if (PreviewRT != null)
             {
@@ -185,33 +175,39 @@ public void Simulate()
 
             Transform head = BasisLocalAvatarDriver.Mapping.head;
 
-            // Flatten head forward to horizontal (ignore pitch)
-            Vector3 flatForward = head.forward;
-            flatForward.y = 0f;
-            flatForward.Normalize();
-
-            // Place camera in front of the avatar at body center height
             Vector3 feetPos = BasisLocalPlayer.Instance.transform.position;
-            float bodyCenter = BasisHeightDriver.SelectedScaledPlayerHeight * BodyFocusHeight;
-            Vector3 bodyTarget = feetPos + Vector3.up * bodyCenter;
+            float playerHeight = BasisHeightDriver.SelectedScaledPlayerHeight;
+            Vector3 bodyCenter = feetPos + Vector3.up * (playerHeight * 0.75f);
 
-            Vector3 cameraPos = bodyTarget + flatForward * CameraDistance;
+            Vector3 cameraPos = bodyCenter + head.forward * CameraDistance;
 
             PreviewCamera.transform.SetPositionAndRotation(
                 cameraPos,
-                Quaternion.LookRotation(bodyTarget - cameraPos));
+                Quaternion.LookRotation(bodyCenter - cameraPos));
 
-            // Reposition display relative to frustum so it stays in the same screen-relative spot
-            if (displayGO != null && cachedDriver != null && cachedDriver.Camera != null)
+            if (displayGO != null && parentOfUIGO != null && cachedDriver != null && cachedDriver.Camera != null)
             {
                 Camera cam = cachedDriver.Camera;
                 cam.CalculateFrustumCorners(new Rect(0, 0, 1, 1), 1f, Camera.MonoOrStereoscopicEye.Left, frustumCorners);
                 float halfW = (frustumCorners[2] - frustumCorners[1]).magnitude * 0.5f;
                 float halfH = (frustumCorners[1] - frustumCorners[0]).magnitude * 0.5f;
-                displayGO.transform.localPosition = new Vector3(
-                    DisplayNormalizedOffset.x * halfW,
-                    DisplayNormalizedOffset.y * halfH,
-                    0f);
+
+                Vector3 viewportPos = BasisDeviceManagement.IsMobileHardware()
+                    ? cachedDriver.MobileMicrophoneViewportPosition
+                    : cachedDriver.DesktopMicrophoneViewportPosition;
+                viewportPos.x = 1f - viewportPos.x;
+                Vector3 parentWorld = cam.ViewportToWorldPoint(viewportPos);
+                parentOfUIGO.transform.localPosition = cachedDriver.transform.InverseTransformPoint(parentWorld);
+
+                float aspect = (float)TextureWidth / (float)TextureHeight;
+                float displayHeight = halfH;
+                float displayWidth = displayHeight * aspect;
+                displayGO.transform.localScale = new Vector3(displayWidth, displayHeight, 1f);
+
+                Vector3 displayCameraLocal = new Vector3(halfW - displayWidth * 0.5f, -halfH * 0.5f, 1f);
+                Vector3 displayWorld = cam.transform.TransformPoint(displayCameraLocal);
+                Vector3 displayLocal = cachedDriver.transform.InverseTransformPoint(displayWorld);
+                displayGO.transform.localPosition = displayLocal - parentOfUIGO.transform.localPosition;
             }
         }