Merge branch 'hotfix/v3.2.1' into main

Author: HarrisonHough

.github/latest.md

@@ -1,16 +1,6 @@
-We're excited to introduce the 3.0 release of our Unity package, which merges the Avatar Loader plugin into Core for improved maintenance and package installation. Please note that this update includes breaking changes. We recommend backing up your project and consulting our documentation if you encounter any installation issues. Thank you for your continued support, and we're here to assist throughout the update process.
 
 ## Changelog
 
-### Added
-- **Breaking:** all scripts and assets from Avatar Loader [#87](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/87)
-- module installer now automatically removes Avatar Loader after update [#89](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/89)
-- new Integration guide editor window [91](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/91)
+### Fixed
+- issue of missing mesh references when prefabs were created by avatar loader window
 
-### Removed
-- **Breaking:** all references to ReadyPlayerMe.AvatarLoader namespace [#87](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/87)
-
-### Updated
-- moved GltFast dependent code behind scripting define symbol [#87](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/87) 
-- avatar config processor now uses new mesh LOD parameter [#90](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/90)
-- setup guide window improvements [#91](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/91)

CHANGELOG.md

@@ -3,6 +3,11 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [3.2.1] - 2023.08.28
+
+### Fixed
+- issue of missing mesh references when prefabs were created by avatar loader window
+
 ## [3.2.0] - 2023.08.24
 
 ### Added

Editor/UI/EditorWindows/AvatarLoaderEditor/AvatarLoaderEditor.cs

@@ -113,19 +113,17 @@ private void Failed(object sender, FailureEventArgs args)
 
         private void Completed(object sender, CompletionEventArgs args)
         {
-            GameObject avatar = args.Avatar;
-
-            if (useEyeAnimations) avatar.AddComponent<EyeAnimationHandler>();
-            if (useVoiceToAnim) avatar.AddComponent<VoiceHandler>();
             if (avatarLoaderSettings == null)
             {
                 avatarLoaderSettings = AvatarLoaderSettings.LoadSettings();
             }
-
             var paramHash = AvatarCache.GetAvatarConfigurationHash(avatarLoaderSettings.AvatarConfig);
-            EditorUtilities.CreatePrefab(avatar, $"{DirectoryUtility.GetRelativeProjectPath(avatar.name, paramHash)}/{avatar.name}.prefab");
-
-            Selection.activeObject = args.Avatar;
+            var path = $"{DirectoryUtility.GetRelativeProjectPath(args.Avatar.name, paramHash)}/{args.Avatar.name}";
+            GameObject avatar = EditorUtilities.CreateAvatarPrefab(args.Metadata, path);
+            if (useEyeAnimations) avatar.AddComponent<EyeAnimationHandler>();
+            if (useVoiceToAnim) avatar.AddComponent<VoiceHandler>();
+            DestroyImmediate(args.Avatar, true);
+            Selection.activeObject = avatar;
             AnalyticsEditorLogger.EventLogger.LogAvatarLoaded(EditorApplication.timeSinceStartup - startTime);
         }
     }

Editor/Utils/EditorUtilities.cs

@@ -2,6 +2,7 @@
 using System.Text.RegularExpressions;
 using UnityEditor;
 using UnityEngine;
+using Object = UnityEngine.Object;
 
 namespace ReadyPlayerMe.Core.Editor
 {
@@ -39,5 +40,21 @@ public static bool IsUrlShortcodeValid(string urlString)
             return !string.IsNullOrEmpty(urlString) &&
                    (Regex.Match(urlString, SHORT_CODE_REGEX).Length > 0 || Uri.IsWellFormedUriString(urlString, UriKind.Absolute) && urlString.EndsWith(".glb"));
         }
+        
+        public static GameObject CreateAvatarPrefab(AvatarMetadata avatarMetadata, string path)
+        {
+            var modelFilePath = $"{path}.glb";
+            AssetDatabase.Refresh();
+            Object avatarSource = AssetDatabase.LoadAssetAtPath(modelFilePath, typeof(GameObject));
+            var newAvatar = (GameObject) PrefabUtility.InstantiatePrefab(avatarSource);
+            var avatarProcessor = new AvatarProcessor();
+            PrefabUtility.UnpackPrefabInstance(newAvatar, PrefabUnpackMode.Completely, InteractionMode.AutomatedAction);
+            avatarProcessor.ProcessAvatar(newAvatar, avatarMetadata);
+            var avatarData = newAvatar.AddComponent<AvatarData>();
+            avatarData.AvatarMetadata = avatarMetadata;
+            avatarData.AvatarId = newAvatar.name;
+            CreatePrefab(newAvatar, $"{path}.prefab");
+            return newAvatar;
+        }
     }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "com.readyplayerme.core",
-  "version": "3.2.0",
+  "version": "3.2.1",
   "displayName": "Ready Player Me Core",
   "description": "This Module contains all the core functionality required for using Ready Player Me avatars in Unity, including features such as: \n - Module management and automatic package setup logic\n - Avatar loading from .glb files\n - Avatar and 2D render requests\n - Optional Analytics\n - Custom editor windows\n - Sample scenes and assets",
   "unity": "2020.3",