fix: added avatar config to InCreatorLoader

readyplayerme · Jun 3, 2024 · b2f256d · b2f256d
1 parent 64eb501
commit b2f256d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/Runtime/AvatarCreator/Scripts/InCreatorAvatarLoader.cs b/Runtime/AvatarCreator/Scripts/InCreatorAvatarLoader.cs
@@ -9,6 +9,17 @@ namespace ReadyPlayerMe.AvatarCreator
     /// </summary>
     public class InCreatorAvatarLoader
     {
+        private readonly AvatarConfig avatarConfig;
+
+        public InCreatorAvatarLoader(AvatarConfig avatarConfig = null)
+        {
+            if (avatarConfig != null)
+            {
+                avatarConfig = AvatarLoaderSettings.LoadSettings().AvatarConfig;
+            }
+            this.avatarConfig = avatarConfig;
+        }
+
         public async Task<GameObject> Load(string avatarId, BodyType bodyType, OutfitGender gender, byte[] data)
         {
             var avatarMetadata = new AvatarMetadata();
@@ -20,7 +31,7 @@ public async Task<GameObject> Load(string avatarId, BodyType bodyType, OutfitGen
             context.AvatarUri.Guid = avatarId;
             context.AvatarCachingEnabled = false;
             context.Metadata = avatarMetadata;
-
+            context.AvatarConfig = avatarConfig;
             var executor = new OperationExecutor<AvatarContext>(new IOperation<AvatarContext>[]
             {
                 new GltFastAvatarImporter(),

diff --git a/Runtime/AvatarCreator/Scripts/Managers/AvatarManager.cs b/Runtime/AvatarCreator/Scripts/Managers/AvatarManager.cs
@@ -50,7 +50,7 @@ public AvatarManager(AvatarConfig avatarConfig = null, CancellationToken token =
             }
 
             ctxSource = CancellationTokenSource.CreateLinkedTokenSource(token);
-            inCreatorAvatarLoader = new InCreatorAvatarLoader();
+            inCreatorAvatarLoader = new InCreatorAvatarLoader(avatarConfig);
             avatarAPIRequests = new AvatarAPIRequests(ctxSource.Token);
         }