added fading to the hint when near

Author: dooly123

Basis/Assets/AddressableAssetsData/AddressableAssetSettings.asset

@@ -15,7 +15,7 @@ MonoBehaviour:
   m_DefaultGroup: 37c75a6cf72db324eb01200602299fc8
   m_currentHash:
     serializedVersion: 2
-    Hash: 00000000000000000000000000000000
+    Hash: 5fb38613a650df59b01d34675473340b
   m_OptimizeCatalogSize: 0
   m_BuildRemoteCatalog: 0
   m_CatalogRequestsTimeout: 0

Basis/Assets/XR/Settings/OpenVRSettings.asset

@@ -18,7 +18,7 @@ MonoBehaviour:
   StereoRenderingMode: 1
   InitializationType: 1
   EditorAppKey: application.generated.unity.basisunity.exe
-  ActionManifestFileRelativeFilePath: StreamingAssets\SteamVR\actions.json
+  ActionManifestFileRelativeFilePath: C:/Users/doola/OneDrive/Documents/Github/Basis/Basis/Assets/StreamingAssets\SteamVR\actions.json
   MirrorView: 2
   PreInit: 0
   HasCopiedDefaults: 0

Basis/Packages/com.basis.framework/Avatar/BasisAvatarIKStageCalibration.cs

@@ -130,6 +130,9 @@ public class BasisCalibrationData
         /// same trackers map the same way whether the user wears a child avatar or a
         /// three-meter giant.
         /// </summary>
+        /// <summary>Raised at the end of <see cref="FullBodyCalibration"/>, after tracker roles have been (re)assigned.</summary>
+        public static System.Action OnFullBodyCalibrated;
+
         public static void FullBodyCalibration()
         {
             BasisHeightDriver.OnAvatarFBCalibration();//avatar height is good,player height is needed
@@ -160,6 +163,8 @@ public static void FullBodyCalibration()
             // newly stored avatar bone transforms. No-op when the ShowGizmos
             // master toggle is off; the toggle path rebuilds when it flips on.
             BasisLocalPlayer.Instance.LocalBoneDriver.RebuildCalibrationSpheres();
+
+            OnFullBodyCalibrated?.Invoke();
         }
 
         /// <summary>

Basis/Packages/com.basis.framework/Avatar/BasisTrackerPairing.cs

@@ -134,6 +134,19 @@ private static void UnlinkInternal(string id, bool raiseEvent, bool persist)
             }
         }
 
+        /// <summary>
+        /// Remove every pairing. Persists and fires <see cref="OnPairingsChanged"/>
+        /// once. No-op if there are none.
+        /// </summary>
+        public static void ClearAll()
+        {
+            EnsureLoaded();
+            if (_pairs.Count == 0) return;
+            _pairs.Clear();
+            Save();
+            OnPairingsChanged?.Invoke();
+        }
+
         /// <summary>
         /// Snapshot enumeration of pairings, with each pair reported once from the
         /// canonical side. Useful for diagnostics or UI summaries.

Basis/Packages/com.basis.framework/Avatar/BasisTrackerRoleOverride.cs

@@ -75,6 +75,18 @@ public static void ClearOverride(string id)
             OnOverridesChanged?.Invoke();
         }
 
+        /// <summary>
+        /// Remove every override. No-op if there are none.
+        /// </summary>
+        public static void ClearAll()
+        {
+            EnsureLoaded();
+            if (_overrides.Count == 0) return;
+            _overrides.Clear();
+            Save();
+            OnOverridesChanged?.Invoke();
+        }
+
         // ----------------------------------------------------------------
         // Persistence
         // ----------------------------------------------------------------

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

@@ -162,6 +162,10 @@
       "key": "trackerLinking.identifyDescription",
       "value": "Light up a glowing sphere on this tracker so you can spot which physical device it is. Press again to turn it off."
     },
+    {
+      "key": "trackerLinking.identifyCalibratedRole",
+      "value": "({0})"
+    },
     {
       "key": "trackerLinking.trackers.title",
       "value": "Connected Trackers"

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

@@ -4,6 +4,7 @@
 using Basis.Scripts.Device_Management;
 using Basis.Scripts.Device_Management.Devices;
 using Basis.Scripts.Device_Management.Devices.Pairing;
+using Basis.Scripts.Drivers;
 using Basis.Scripts.TransformBinders.BoneControl;
 using System;
 using System.Collections.Generic;
@@ -158,6 +159,8 @@ public static PanelTabPage TrackerSettingsTab(PanelTabGroup tabGroup)
             BasisTrackerPairing.OnPairingsChanged += handleChange;
             BasisTrackerRoleOverride.OnOverridesChanged += handleChange;
             BasisTrackerIdentifyGizmos.OnIdentifyChanged += handleChange;
+            BasisLocalAvatarDriver.CalibrationComplete += handleChange;
+            BasisAvatarIKStageCalibration.OnFullBodyCalibrated += handleChange;
 
             tabPage.OnInstanceReleased += () =>
             {
@@ -169,6 +172,8 @@ public static PanelTabPage TrackerSettingsTab(PanelTabGroup tabGroup)
                 BasisTrackerPairing.OnPairingsChanged -= handleChange;
                 BasisTrackerRoleOverride.OnOverridesChanged -= handleChange;
                 BasisTrackerIdentifyGizmos.OnIdentifyChanged -= handleChange;
+                BasisLocalAvatarDriver.CalibrationComplete -= handleChange;
+                BasisAvatarIKStageCalibration.OnFullBodyCalibrated -= handleChange;
                 state.TrackersContainer = null;
                 state.TrackersGroup = null;
                 state.TabDescriptor = null;
@@ -438,16 +443,24 @@ private static void ApplyIdentifyVisual(PanelButton button, BasisInput input)
             PanelElementDescriptor descriptor = button.Descriptor;
             if (descriptor == null || !descriptor.HasTitle) return;
 
+            string label;
             if (BasisTrackerIdentifyGizmos.TryGetColor(input, out Color color))
             {
                 string hex = ColorUtility.ToHtmlStringRGB(color);
-                descriptor.SetTitle($"<b><color=#{hex}>{BasisLocalization.Get("trackerLinking.identifyShowing")}</color></b>");
+                label = $"<b><color=#{hex}>{BasisLocalization.Get("trackerLinking.identifyShowing")}</color></b>";
             }
             else
             {
                 string accentHex = ColorUtility.ToHtmlStringRGB(ResolveAccentColor());
-                descriptor.SetTitle($"<b><color=#{accentHex}>{BasisLocalization.Get("trackerLinking.identifyLabel")}</color></b>");
+                label = $"<b><color=#{accentHex}>{BasisLocalization.Get("trackerLinking.identifyLabel")}</color></b>";
             }
+
+            if (input != null && input.TryGetRole(out BasisBoneTrackedRole role))
+            {
+                label += $" <size=85%>{BasisLocalization.Get("trackerLinking.identifyCalibratedRole", role.ToString())}</size>";
+            }
+
+            descriptor.SetTitle(label);
         }
 
         private static Color ResolveAccentColor()
@@ -629,6 +642,8 @@ private static void ResetTrackerSettingsDefaults()
             BasisSettingsDefaults.PairingDistanceEmaAlpha.ResetToDefault();
             BasisSettingsDefaults.PairingWeightSmoothing.ResetToDefault();
             BasisSettingsDefaults.PairingRotationHalfLife.ResetToDefault();
+            BasisTrackerRoleOverride.ClearAll();
+            BasisTrackerPairing.ClearAll();
             BasisTrackerIdentifyGizmos.ClearAll();
         }
 

Basis/Packages/com.basis.framework/IK/BasisFullBodyIK.cs

@@ -2206,10 +2206,17 @@ public void SolveTwoBoneIKArms(AnimationStream stream, ReadWriteTransformHandle
                     Vector3 abProj = ab - acNorm * Vector3.Dot(ab, acNorm);
                     Vector3 ahProj = ah - acNorm * Vector3.Dot(ah, acNorm);
 
-                    // you can also soften this threshold if hinting fights with max reach
-                    if (abProj.sqrMagnitude > (totalLen * totalLen * 0.001f) && ahProj.sqrMagnitude > 0f)
+                    // Near full extension the elbow sits on the shoulder->hand axis, so ahProj collapses
+                    // and FromToRotation spins on tracker noise. Fade the hint out as SolveTwoBone does.
+                    float reachRatio = (totalLen > k_Epsilon) ? (atCorrectedLen / totalLen) : 0f;
+                    float hintFade = (reachRatio > 0.9f) ? 1f - Mathf.Clamp01((reachRatio - 0.9f) / 0.1f) : 1f;
+                    if (hintFade > 0f && abProj.sqrMagnitude > (totalLen * totalLen * 0.001f) && ahProj.sqrMagnitude > (totalLen * totalLen * 0.001f))
                     {
                         Quaternion hintR = QuaternionExt.FromToRotation(abProj, ahProj);
+                        if (hintFade < 1f)
+                        {
+                            hintR = Quaternion.Slerp(Quaternion.identity, hintR, hintFade);
+                        }
                         hintR = QuaternionExt.NormalizeSafe(hintR);
                         root.SetRotation(stream, hintR * root.GetRotation(stream));
                     }

Basis/ProjectSettings/QualitySettings.asset

@@ -22,7 +22,7 @@ QualitySettings:
     globalTextureMipmapLimit: 0
     textureMipmapLimitSettings: []
     anisotropicTextures: 1
-    antiAliasing: 4
+    antiAliasing: 2
     softParticles: 1
     softVegetation: 1
     realtimeReflectionProbes: 1