cached more things into a single instance

Author: dooly123

Basis/Packages/com.basis.bundlemanagement/BasisBundleLoadAsset.cs

@@ -19,7 +19,7 @@ public static async Task<GameObject> LoadFromWrapper(BasisTrackedBundleWrapper B
                         {
                             string ReplacedName = Generated.AssetToLoadName.Replace(".bundle", ".prefab");
 
-                            AssetBundleRequest Request = BasisLoadableBundle.AssetBundle.LoadAssetAsync<GameObject>(ReplacedName);//assets/temporarystorage/19a260b00e5f474f8472fa9dea4ca2a920250227.prefab
+                            AssetBundleRequest Request = BasisLoadableBundle.AssetBundle.LoadAssetAsync<GameObject>(ReplacedName);
                             await Request;
                             GameObject loadedObject = Request.asset as GameObject;
                             if (loadedObject == null)

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

@@ -3,6 +3,7 @@
 using Basis.Scripts.BasisSdk.Players;
 using Basis.Scripts.Common;
 using Basis.Scripts.Device_Management;
+using Basis.Scripts.Player;
 using Basis.Scripts.TransformBinders.BoneControl;
 using GatorDragonGames.JigglePhysics;
 using System;
@@ -11,7 +12,6 @@
 using UnityEngine;
 using UnityEngine.AddressableAssets;
 using UnityEngine.Animations.Rigging;
-using UnityEngine.Rendering;
 
 namespace Basis.Scripts.Drivers
 {
@@ -22,8 +22,6 @@ namespace Basis.Scripts.Drivers
     [Serializable]
     public class BasisLocalAvatarDriver : BasisAvatarDriver
     {
-        /// <summary>Addressable path to the T-Pose animator controller asset.</summary>
-        public const string TPose = "Assets/Animator/Animated TPose.controller";
 
         /// <summary>Addressables key for the default locomotion animator controller.</summary>
         public const string Locomotion = "Locomotion";
@@ -351,9 +349,7 @@ public void PutAvatarIntoTPose()
             {
                 SavedruntimeAnimatorController = BasisLocalPlayer.Instance.BasisAvatar.Animator.runtimeAnimatorController;
             }
-            UnityEngine.ResourceManagement.AsyncOperations.AsyncOperationHandle<RuntimeAnimatorController> op = Addressables.LoadAssetAsync<RuntimeAnimatorController>(TPose);
-            RuntimeAnimatorController RAC = op.WaitForCompletion();
-            BasisLocalPlayer.Instance.BasisAvatar.Animator.runtimeAnimatorController = RAC;
+            BasisLocalPlayer.Instance.BasisAvatar.Animator.runtimeAnimatorController = BasisPlayerFactory.TposeController;
             ForceUpdateAnimator(BasisLocalPlayer.Instance.BasisAvatar.Animator);
             TposeStateChange?.Invoke();
 

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

@@ -1,6 +1,7 @@
 using Basis.Scripts.BasisSdk.Players;
 using Basis.Scripts.Common;
 using Basis.Scripts.Drivers;
+using Basis.Scripts.Player;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -268,10 +269,7 @@ public void PutAvatarIntoTPose(Animator Anim)
         {
             BasisLocalAvatarDriver.SavedruntimeAnimatorController = Anim.runtimeAnimatorController;
         }
-        UnityEngine.ResourceManagement.AsyncOperations.AsyncOperationHandle<RuntimeAnimatorController> op =
-            Addressables.LoadAssetAsync<RuntimeAnimatorController>(BasisLocalAvatarDriver.TPose);
-        RuntimeAnimatorController RAC = op.WaitForCompletion();
-        Anim.runtimeAnimatorController = RAC;
+        Anim.runtimeAnimatorController = BasisPlayerFactory.TposeController;
         float desiredTime = Time.deltaTime;
         Anim.Update(desiredTime);
     }

Basis/Packages/com.basis.framework/Players/Common/BasisPlayerFactory.cs

@@ -47,6 +47,15 @@ public static class BasisPlayerFactory
         /// </summary>
         public static UnityEngine.ResourceManagement.AsyncOperations.AsyncOperationHandle<GameObject> RemoteHandle;
 
+        /// <summary>
+        /// Tpose Handle
+        /// </summary>
+        public static UnityEngine.ResourceManagement.AsyncOperations.AsyncOperationHandle<RuntimeAnimatorController> TposeHandle;
+
+        public static RuntimeAnimatorController TposeController;
+
+        /// <summary>Addressable path to the T-Pose animator controller asset.</summary>
+        public const string TPose = "Assets/Animator/Animated TPose.controller";
         /// <summary>
         /// Loads the local and remote player prefabs from Addressables and caches them for instantiation.
         /// </summary>
@@ -61,6 +70,9 @@ public static void Initalize()
 
             RemoteHandle = Addressables.LoadAssetAsync<GameObject>(RemotePlayerId);
             RemotePlayerReadyToSpawn = RemoteHandle.WaitForCompletion();
+
+            TposeHandle = Addressables.LoadAssetAsync<RuntimeAnimatorController>(TPose);
+            TposeController = TposeHandle.WaitForCompletion();
         }
 
         /// <summary>
@@ -74,6 +86,7 @@ public static void DeInitalize()
         {
             Addressables.Release(LocalHandle);
             Addressables.Release(RemoteHandle);
+            Addressables.Release(TposeController);
         }
 
         /// <summary>