changed over bone control

breaking down bone driver

working on more swapping over

changed over more code

more work on jobification

moved server provider to its own package

improved the error reporting

Author: dooly123

Basis/Packages/com.basis.common/BasisLocks.cs

@@ -4,6 +4,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using System.Threading;
 
 namespace Basis.Scripts.Common
 {
@@ -25,6 +26,8 @@ private sealed class ContextState
         {
             public readonly object Sync = new object();
             public readonly HashSet<string> Owners = new HashSet<string>();
+            // Mirrors Owners.Count; written under Sync, read lock-free via Volatile.
+            public int LiveCount;
         }
 
         public static LockContext GetContext(string context)
@@ -81,7 +84,10 @@ public void Add(string key)
                 var state = GetState();
 
                 lock (state.Sync)
-                    state.Owners.Add(key);
+                {
+                    if (state.Owners.Add(key))
+                        Volatile.Write(ref state.LiveCount, state.Owners.Count);
+                }
             }
 
             public bool Remove(string key)
@@ -101,7 +107,10 @@ public bool Remove(string key)
                 lock (state.Sync)
                 {
                     BasisDebug.Log($"removing lock for {key}");
-                    return state.Owners.Remove(key);
+                    bool removed = state.Owners.Remove(key);
+                    if (removed)
+                        Volatile.Write(ref state.LiveCount, state.Owners.Count);
+                    return removed;
                 }
             }
 
@@ -115,6 +124,7 @@ public void Clear()
                 lock (state.Sync)
                 {
                     state.Owners.Clear();
+                    Volatile.Write(ref state.LiveCount, 0);
                 }
             }
 
@@ -163,10 +173,7 @@ public int Count
                         return 0;
                     }
 
-                    lock (state.Sync)
-                    {
-                        return state.Owners.Count;
-                    }
+                    return Volatile.Read(ref state.LiveCount);
                 }
             }
 

Basis/Packages/com.basis.framework/Avatar/TransformBinders/BoneControl/BasisLocalBoneControl.cs

@@ -17,6 +17,8 @@ public abstract class BasisMenuBase<TMenu> where TMenu : BasisMenuBase<TMenu>
 
         public static List<BasisMenuActionProvider<TMenu>> Providers = new();
 
+        private static readonly HashSet<Type> SuppressedProviderTypes = new();
+
         /// <summary>
         /// Parent component used containing Action Provider buttons.
         /// </summary>
@@ -32,6 +34,7 @@ public abstract class BasisMenuBase<TMenu> where TMenu : BasisMenuBase<TMenu>
         /// </summary>
         public static void AddProvider(BasisMenuActionProvider<TMenu> provider)
         {
+            if (provider == null || SuppressedProviderTypes.Contains(provider.GetType())) return;
             Providers.Add(provider);
             Providers.Sort();
             if (Instance) Instance.BindProvidersToButtons();
@@ -47,6 +50,41 @@ public static void RemoveProvider(BasisMenuActionProvider<TMenu> provider)
             if (Instance) Instance.BindProvidersToButtons();
         }
 
+        /// <summary>
+        /// Prevent a provider type from appearing on this menu, regardless of when its
+        /// registrar runs. Order-independent: removes the provider if already present and
+        /// blocks any later registration, rebinding the menu if it is open.
+        /// </summary>
+        public static void SuppressProvider<T>() where T : BasisMenuActionProvider<TMenu>
+            => SuppressProvider(typeof(T));
+
+        public static void SuppressProvider(Type providerType)
+        {
+            if (providerType == null)
+            {
+                BasisDebug.LogError("SuppressProvider was called with a null providerType; nothing suppressed.");
+                return;
+            }
+
+            SuppressedProviderTypes.Add(providerType);
+
+            if (Providers.RemoveAll(p => providerType.IsInstanceOfType(p)) > 0)
+            {
+                Providers.Sort();
+                if (Instance) Instance.BindProvidersToButtons();
+                BasisDebug.Log($"SuppressProvider removed and blocked provider '{providerType.Name}'.");
+            }
+            else
+            {
+                BasisDebug.LogWarning($"SuppressProvider could not find a registered provider of type '{providerType.Name}' to remove; it is now blocked from registering later.");
+            }
+        }
+
+        public static void AllowProvider(Type providerType)
+        {
+            if (providerType != null) SuppressedProviderTypes.Remove(providerType);
+        }
+
 
         public void BindProvidersToButtons()
         {

Basis/Packages/com.basis.framework/BasisUI/Menus/BasisMenuBase.cs

@@ -1,3 +1,4 @@
+using Basis.BasisUI;
 using System;
 using System.Collections.Generic;
 
@@ -25,10 +26,13 @@ internal static void RegisterGroup(Action<double> processor)
 
         public static void Simulate(double realtimeSinceStartupAsDouble)
         {
-            List<Action<double>> processors = _tweenProcessors;
-            foreach (Action<double> tween in processors)
+            if (BasisMainMenu.Instance != null)
             {
-                tween(realtimeSinceStartupAsDouble);
+                List<Action<double>> processors = _tweenProcessors;
+                foreach (Action<double> tween in processors)
+                {
+                    tween(realtimeSinceStartupAsDouble);
+                }
             }
         }
     }

Basis/Packages/com.basis.framework/BasisUI/Tweening/BasisTweenManager.cs

@@ -11,7 +11,21 @@ namespace Basis.BTween
         public static implicit operator bool(BaseTween<T> tween) => tween != null;
 
 
-        public bool Active;
+        private bool _active;
+        public bool Active
+        {
+            get => _active;
+            set
+            {
+                if (_active == value) return;
+                _active = value;
+                if (value) ActiveCount++;
+                else ActiveCount--;
+            }
+        }
+        // Live count of active tweens of this type; lets ProcessGroup skip the pool when idle.
+        private static int ActiveCount;
+
         public Easing Ease = Easing.OutSine;
         public float StartTime;
         public float EndTime;
@@ -28,6 +42,7 @@ static BaseTween()
 
         private static void ProcessGroup(double currentTime)
         {
+            if (ActiveCount <= 0) return;
             List<T> list = Tweens;
             int count = list.Count;
             for (int i = 0; i < count; i++)

Basis/Packages/com.basis.framework/BasisUI/Tweening/TweenTypes/BaseTween.cs

@@ -160,7 +160,7 @@ public static string StaticCurrentMode
         /// <summary>
         /// Registered device SDK managers capable of booting into given modes (Desktop/XR/etc.).
         /// </summary>
-        [SerializeField] public List<BasisBaseTypeManagement> BaseTypes = new();
+        [SerializeField] public BasisBaseTypeManagement[] BaseTypes;
 
         /// <summary>
         /// Helpers that constrain transforms to input devices.
@@ -264,14 +264,11 @@ private async void OnDestroy()
         public void Simulate()
         {
             OnDeviceManagementLoop?.Invoke();
-            int Count = BaseTypes.Count;
+            int Count = BaseTypes.Length;
             for (int Index = 0; Index < Count; Index++)
             {
-                BasisBaseTypeManagement Sim = BaseTypes[Index];
-                if (Sim != null)
-                {
-                    Sim.Simulate();
-                }
+               BaseTypes[Index].Simulate();
+                //if a null happens here thats a failure of how you added / removed something
             }
         }
 
@@ -450,7 +447,8 @@ public async Task StartDevices(string mode)
         /// </summary>
         public void StopAllDevices()
         {
-            for (int i = 0; i < BaseTypes.Count; i++)
+           var length = BaseTypes.Length;
+            for (int i = 0; i < length; i++)
             {
                 BaseTypes[i]?.AttemptStopSDK();
             }
@@ -477,7 +475,8 @@ public void ShutDownXR()
         /// </summary>
         public void StartAllStartIfPermanentlyExists()
         {
-            for (int i = 0; i < BaseTypes.Count; i++)
+            var length = BaseTypes.Length;
+            for (int i = 0; i < length; i++)
             {
                 BaseTypes[i]?.StartIfPermanentlyExists();
             }
@@ -507,9 +506,13 @@ public static void UnassignFBTrackers()
         public bool TryFindBasisBaseTypeManagement(string name, out List<BasisBaseTypeManagement> match, bool OnlyFinding = false)
         {
             match = new List<BasisBaseTypeManagement>();
-            if (string.IsNullOrEmpty(name) || BaseTypes == null) return false;
+            if (string.IsNullOrEmpty(name) || BaseTypes == null)
+            {
+                return false;
+            }
 
-            for (int i = 0; i < BaseTypes.Count; i++)
+            var length = BaseTypes.Length;
+            for (int i = 0; i < length; i++)
             {
                 var type = BaseTypes[i];
                 if (type != null && type.AttemptIsDeviceBootable(name, OnlyFinding))
@@ -588,7 +591,7 @@ private IEnumerator RestoreInversetOffsets(BasisInput input, BasisStoredPrevious
                 }
                 if (prev.hasRoleAssigned)
                 {
-                    input.Control.InverseOffsetFromBone = prev.InverseOffsetFromBone;
+                    input.Control.SetInverseOffset(prev.InverseOffsetFromBone);
                 }
                 if (input.HasControl)
                 {
@@ -888,8 +891,9 @@ public async Task SoftSwitchToDesktop()
 
             BasisDebug.Log($"Soft-switching from {AutoSwapPreviousVRMode} to Desktop (keeping runtime alive)", BasisDebug.LogTag.Device);
 
+            var length = BaseTypes.Length;
             // Soft-stop VR input devices — runtime stays alive
-            for (int i = 0; i < BaseTypes.Count; i++)
+            for (int i = 0; i < length; i++)
             {
                 var bt = BaseTypes[i];
                 if (bt != null && bt.IsDeviceBooted && bt.IsDeviceBootable(AutoSwapPreviousVRMode))
@@ -925,8 +929,9 @@ public async Task SoftSwitchToVR()
 
             BasisDebug.Log($"Soft-switching from Desktop back to {vrMode}", BasisDebug.LogTag.Device);
 
+            var length = BaseTypes.Length;
             // Stop desktop devices normally
-            for (int i = 0; i < BaseTypes.Count; i++)
+            for (int i = 0; i < length; i++)
             {
                 var bt = BaseTypes[i];
                 if (bt != null && bt.IsDeviceBooted && bt.IsDeviceBootable(BasisConstants.Desktop))
@@ -941,7 +946,7 @@ public async Task SoftSwitchToVR()
             BasisCursorManagement.OnReset();
 
             // Soft-start VR input devices — runtime is already alive
-            for (int i = 0; i < BaseTypes.Count; i++)
+            for (int i = 0; i < length; i++)
             {
                 var bt = BaseTypes[i];
                 if (bt != null && bt.IsDeviceBooted && bt.IsDeviceBootable(vrMode))

Basis/Packages/com.basis.framework/Device Management/BasisDeviceManagement.cs

@@ -311,8 +311,9 @@ public void CalculateOffset()
             BasisInverseOffsetData.InitialControlRotation = Control.OutgoingWorldData.rotation;
 
             Vector3 Offset = Control.OutgoingWorldData.position - BasisInverseOffsetData.TrackerPosition;
-            Control.InverseOffsetFromBone.position = BasisInverseOffsetData.InitialInverseTrackRotation * (Offset);
-            Control.InverseOffsetFromBone.rotation = BasisInverseOffsetData.InitialInverseTrackRotation * BasisInverseOffsetData.InitialControlRotation;
+            Control.SetInverseOffset(
+                BasisInverseOffsetData.InitialInverseTrackRotation * (Offset),
+                BasisInverseOffsetData.InitialInverseTrackRotation * BasisInverseOffsetData.InitialControlRotation);
             Control.UseInverseOffset = true;
         }
 
@@ -323,8 +324,7 @@ public void UnAssignRoleAndTracker()
         {
             if (Control != null)
             {
-                Control.IncomingData.position = Vector3.zero;
-                Control.IncomingData.rotation = Quaternion.identity;
+                Control.SetIncoming(Vector3.zero, Quaternion.identity);
                 SetRealTrackers(BasisHasTracked.HasNoTracker, BasisHasRigLayer.HasNoRigLayer, UniqueDeviceIdentifier);
             }
             if (DeviceMatchSettings == null || DeviceMatchSettings.HasTrackedRole == false)
@@ -392,8 +392,7 @@ public void UnAssignTracker()
                 if (HasControl)
                 {
                     BasisDebug.Log($"UnAssigning Tracker {Control.name}", BasisDebug.LogTag.Input);
-                    Control.InverseOffsetFromBone.position = Vector3.zero;
-                    Control.InverseOffsetFromBone.rotation = Quaternion.identity;
+                    Control.SetInverseOffset(Vector3.zero, Quaternion.identity);
                     Control.UseInverseOffset = false;
                 }
                 UnAssignRoleAndTracker();
@@ -736,11 +735,7 @@ public void ControlOnlyAsDevice()
         {
             if (hasRoleAssigned && Control.HasTracked != BasisHasTracked.HasNoTracker)
             {
-                // Apply position offset using math.mul for quaternion-vector multiplication
-                Control.IncomingData.position = ScaledDeviceCoord.position;
-
-                // Apply rotation offset using math.mul for quaternion multiplication
-                Control.IncomingData.rotation = ScaledDeviceCoord.rotation;
+                Control.SetIncoming(ScaledDeviceCoord.position, ScaledDeviceCoord.rotation);
             }
 
         }

Basis/Packages/com.basis.framework/Device Management/Devices/Base/BasisInput.cs

@@ -83,8 +83,7 @@ public void ControlOnlyAsHand(Vector3 Position,Quaternion Rotation)
     {
         if (hasRoleAssigned && Control.HasTracked != BasisHasTracked.HasNoTracker)
         {
-            Control.IncomingData.position = Position;
-            Control.IncomingData.rotation = Rotation;
+            Control.SetIncoming(Position, Rotation);
         }
     }
     public Vector3 ChangeHandYHeight(Vector3 position)

Basis/Packages/com.basis.framework/Device Management/Devices/Base/BasisInputController.cs

@@ -99,8 +99,7 @@ public override void LateDoPollData()
 
             if (hasRoleAssigned && Control.HasTracked != BasisHasTracked.HasNoTracker)
             {
-                Control.IncomingData.position = ScaledDeviceCoord.position;
-                Control.IncomingData.rotation = ScaledDeviceCoord.rotation;
+                Control.SetIncoming(ScaledDeviceCoord.position, ScaledDeviceCoord.rotation);
                 this.transform.name = Control.name;
                 this.FollowMovement.name = $"{Control.name} Moveable transform";
             }

Basis/Packages/com.basis.framework/Device Management/Devices/Simulation/BasisInputXRSimulate.cs

@@ -136,8 +136,7 @@ public static void ApplyAvatarScale(float ScaleFactor)
         {
             BasisLocalBoneControl c = boneDriver.Controls[Index];
 
-            c.TposeLocalScaled.position = c.TposeLocal.position * ScaleFactor;
-            c.TposeLocalScaled.rotation = c.TposeLocal.rotation;
+            c.SetTposeScaled(c.TposeLocal.position * ScaleFactor, c.TposeLocal.rotation);
             c.ScaledOffset = c.Offset * ScaleFactor;
         }
     }