fix: gate avatar sim/inspector foldout when framework is in project

Author: mriise

Basis/Packages/com.basis.sdk/BasisSDK.asmdef

@@ -16,6 +16,12 @@
     "precompiledReferences": [],
     "autoReferenced": true,
     "defineConstraints": [],
-    "versionDefines": [],
+    "versionDefines": [
+        {
+            "name": "com.basis.framework",
+            "expression": "",
+            "define": "BASIS_FRAMEWORK_EXISTS"
+        }
+    ],
     "noEngineReferences": false
 }

Basis/Packages/com.basis.sdk/Scripts/Editor/BasisAvatarEditorPreviewBootstrap.cs

@@ -1,3 +1,4 @@
+#if !BASIS_FRAMEWORK_EXISTS
 using UnityEditor;
 
 namespace Basis.Scripts.BasisSdk.Players.Editor
@@ -11,3 +12,4 @@ private static void Register()
         }
     }
 }
+#endif

Basis/Packages/com.basis.sdk/Scripts/Editor/BasisEditorPreviewLocalPlayer.cs

@@ -1,3 +1,4 @@
+#if !BASIS_FRAMEWORK_EXISTS
 using Basis.Scripts.Animator_Driver;
 using System.Threading.Tasks;
 using UnityEditor;
@@ -121,3 +122,4 @@ public static void DisposeActive()
 
     }
 }
+#endif

Basis/Packages/com.basis.sdk/Scripts/Editor/BasisEditorPreviewParametersFoldout.cs

@@ -1,3 +1,4 @@
+#if !BASIS_FRAMEWORK_EXISTS
 using UnityEditor;
 using UnityEngine;
 using UnityEngine.UIElements;
@@ -130,3 +131,4 @@ private static void DrawMicSection()
         }
     }
 }
+#endif

Basis/Packages/com.basis.sdk/Scripts/Editor/SDKInspector/BasisAvatarSDKInspector.cs

@@ -15,6 +15,11 @@
 public partial class BasisAvatarSDKInspector : Editor
 {
     private const string PendingTestInEditorAvatarIdSessionKey = "BasisAvatarSDKInspector.PendingTestInEditorAvatarId";
+    // Unity's GlobalObjectId table isn't always populated on the first delayCall after
+    // EnteredPlayMode (the play-mode scene reload races us). Retry a bounded number of
+    // ticks so a transient null resolve doesn't drop the pending avatar.
+    private const int MaxResolveAttempts = 30;
+    private static int _resolveAttempts;
 
     public delegate void BeforeTestInEditorHandler(GameObject clone);
     public static BeforeTestInEditorHandler OnBeforeTestInEditor;
@@ -50,6 +55,7 @@ private static void OnPlayModeStateChanged(PlayModeStateChange state)
             return;
         }
 
+        _resolveAttempts = 0;
         EditorApplication.delayCall -= TryExecutePendingTestInEditor;
         EditorApplication.delayCall += TryExecutePendingTestInEditor;
     }
@@ -59,23 +65,34 @@ private static void TryExecutePendingTestInEditor()
         string pendingAvatarId = GetPendingTestInEditorAvatarId();
         if (string.IsNullOrEmpty(pendingAvatarId))
         {
+            _resolveAttempts = 0;
             return;
         }
 
         if (!GlobalObjectId.TryParse(pendingAvatarId, out GlobalObjectId avatarId))
         {
             ClearPendingTestInEditorAvatarId();
+            _resolveAttempts = 0;
             return;
         }
 
         BasisAvatar avatar = GlobalObjectId.GlobalObjectIdentifierToObjectSlow(avatarId) as BasisAvatar;
-        ClearPendingTestInEditorAvatarId();
         if (avatar == null)
         {
-            BasisDebug.LogError("Unable to resolve the pending avatar for Test In Editor.", BasisDebug.LogTag.Editor);
+            if (++_resolveAttempts < MaxResolveAttempts)
+            {
+                EditorApplication.delayCall += TryExecutePendingTestInEditor;
+                return;
+            }
+
+            ClearPendingTestInEditorAvatarId();
+            _resolveAttempts = 0;
+            BasisDebug.LogError($"Unable to resolve the pending avatar for Test In Editor after {MaxResolveAttempts} attempts.", BasisDebug.LogTag.Editor);
             return;
         }
 
+        ClearPendingTestInEditorAvatarId();
+        _resolveAttempts = 0;
         RequestAvatarLoad(avatar);
     }
 

Basis/Packages/com.basis.sdk/Scripts/Sim/BasisAvatarSimMic.cs

@@ -1,3 +1,4 @@
+#if !BASIS_FRAMEWORK_EXISTS
 using Basis.Scripts.Drivers;
 using UnityEngine;
 
@@ -56,3 +57,4 @@ private void OnAudioFilterRead(float[] data, int channels)
         private void OnDisable() => StopCapture();
     }
 }
+#endif

Basis/Packages/com.basis.sdk/Scripts/Sim/BasisAvatarSimPlayer.cs

@@ -1,3 +1,4 @@
+#if !BASIS_FRAMEWORK_EXISTS
 using Basis.Scripts.BasisSdk;
 using Basis.Scripts.BasisSdk.Helpers;
 using Basis.Scripts.Drivers;
@@ -60,3 +61,4 @@ private void OnDestroy()
         }
     }
 }
+#endif