Merge branch 'develop' into feature/texture-quality-param

.github/latest.md

@@ -2,38 +2,19 @@
 ## Changelog
 
 ### Updated
-- refactor and extracted shared logic from network packages @harrisonhough in [#148](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/148)
-- replaced api urls in samples with models urls by @rk132 in [#152](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/152)
-- added com.unity.cloud.gltfast as a dependency and removed auto install of gltfast from git url by @harrisonhough in [#155](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/155)
-- updated to GLTFast 6.0.1 by @harrisonhough in by @harrisonhough in [#157](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/157)
-- replaced use of ienumerator coroutines with async/await by @rYuuk in [#172](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/172)
-- request class names updated to be more uniform by @MaxAndreassenRPM in [#173](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/173)
-- endpoint classes removed and refactored by @MaxAndreassenRPM in [#174](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/174)
-- added avatar creator POC sample using new elements by @ryuuk in [#182](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/182)
-- removed "I don't have an account" checkbox from setup guide by @rk132 in [#184](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/184)
-- restructure of avatar creator samples by @rYuuk in [#185](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/185)
-- class and folder restructure to match Unity package standards by @harrisonhough in [#190](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/190)
-- namespaces added to some scripts to meet asset store requirements by @harrisonhough in [#195](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/195)
-- Ready Player Me top toolbar menu is under `Tools/Ready Player Me` to comply with Asset Store requirements by @harrisonhough in [#195](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/195)
-- samples renamed for Asset Store version of package and paths updated accordingly by @harrisonhough in [#198](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/198)
-- quick start sample animations updated by @rYuuk in [#200](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/200)
-- draco compression package version updated by @harrisonhough in [#202](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/202)
+
+- **BREAKING: Renamed Avatar Create Samples** [#210](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/210) _This change
+  may require updates to existing references in your projects._
+- small fix for button icon resizing [#215](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/215)
 
 ### Added
-- add gender select element for Avatar Creator by @harrisonhough in [#159](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/159)
-- basic login element for Avatar Creator by @harrisonhough in [#160](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/160)
-- photo capture element for Avatar Creator by @ryuuk in [#162](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/162)
-- avatar template element for Avatar Creator by @harrisonhough in [#164](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/164)
-- selfie element for Avatar Creator by @ryuuk in [#166](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/166)
-- asset panel element for Avatar Creator by @harrisonhough in [#175](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/175)
-- account creation element for Avatar Creator by @ryuuk in [#178](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/178)
-- avatar preview element for Avatar Creator by @ryuuk in [#181](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/181)
 
-- fixed some issues related to paths like in the Graphics Setting Utility by @harrisonhough in [#195](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/195)
-- shader override property added to avatar config by @ryuuk in [#199](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/199)
+- Logout Element for Avatar Creator [#216](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/216)
+- New iFrame Events to WebFrameHandler [#212](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/212)
+- Added support for XR Avatar skeleton [#217](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/217)
+
+### Removed
 
-### Fixed
-- fix for handling pasted url text in subdomain field by @harrisonhough in [#183](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/183)
-- added permission and orientation fix to photo capture element by @ryuuk in [#192](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/192)
-- added Panel Switcher clear functionality to fix issues related to relaunching the creator by @ryuuk in [#194](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/194)
-- namespaces added to some scripts to meet asset store requirements by @harrisonhough in [#195](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/195)
+- Quickstart Parameter from UrlConfig [#221](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/221)
+- Selfie to Avatar Element* [#220](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/220)
+- Removed WebView auto installation [#208](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/208)

CHANGELOG.md

@@ -10,12 +10,14 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - **BREAKING: Renamed Avatar Create Samples** [#210](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/210) _This change
 may require updates to existing references in your projects._
 - small fix for button icon resizing [#215](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/215)
+- LoginWithCode can now merge avatars into RPM account [#219](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/219)
 
 ### Added
 
 - Logout Element for Avatar Creator [#216](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/216)
 - New iFrame Events to WebFrameHandler [#212](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/212)
 - Added support for XR Avatar skeleton [#217](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/217)
+- Added Avatar List element [#218](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/218)
 
 ### Removed
 

Editor/Core/Scripts/Analytics/IAnalyticsEditorLogger.cs

@@ -1,5 +1,3 @@
-using ReadyPlayerMe.Core.Editor;
-
 namespace ReadyPlayerMe.Core.Analytics
 {
     public interface IAnalyticsEditorLogger

Runtime/AvatarCreator/Scripts/Managers/AvatarManager.cs

@@ -32,7 +32,7 @@ public AvatarManager(AvatarConfig avatarConfig = null, CancellationToken token =
             this.gender = gender;
             if (avatarConfig != null)
             {
-                avatarConfigParameters = AvatarConfigProcessor.ProcessAvatarConfiguration(avatarConfig);
+                avatarConfigParameters = AvatarConfigProcessor.ProcessAvatarConfiguration(avatarConfig, false);
             }
 
             ctxSource = CancellationTokenSource.CreateLinkedTokenSource(token);
@@ -141,6 +141,7 @@ public async Task<GameObject> GetAvatar(string id, BodyType bodyType, bool isPre
         {
             avatarId = id;
             byte[] data;
+            Debug.Log($"GetAvatar: Avatar config parameters: {avatarConfigParameters}");
             try
             {
                 data = await avatarAPIRequests.GetAvatar(avatarId, isPreview, avatarConfigParameters);
@@ -194,7 +195,6 @@ public async Task<GameObject> UpdateAsset(AssetType assetType, BodyType bodyType
             }
 
             payload.Assets.Add(assetType, assetId);
-
             byte[] data;
             try
             {

Runtime/AvatarCreator/Scripts/UI/Elements/SelectionElement.cs

@@ -80,7 +80,7 @@ public void AddClearButton(SelectionButton button, AssetType assetType, bool set
             {
                 clearButton.transform.SetAsFirstSibling();
             }
-            var assetData = new PartnerAsset { Id = "0", AssetType = assetType };
+            var assetData = new PartnerAsset { Id = "", AssetType = assetType };
             clearButton.AddListener(() => OnAssetSelected?.Invoke(assetData));
             clearButton.AddListener(() => SetButtonSelected(clearButton.transform));
         }

Runtime/AvatarCreator/Scripts/WebRequests/AvatarAPIRequests.cs

@@ -209,9 +209,6 @@ public async Task<byte[]> UpdateAvatar(string avatarId, AvatarProperties avatarP
         {
             var url = $"{RPM_AVATAR_V2_BASE_URL}/{avatarId}?responseType=glb&{parameters}";
 
-            if (!string.IsNullOrEmpty(parameters))
-                url += parameters?.Substring(1);
-
             var response = await authorizedRequest.SendRequest<Response>(
                 new RequestData
                 {

Runtime/Core/Scripts/Data/ApplicationData.cs

@@ -6,7 +6,7 @@ namespace ReadyPlayerMe.Core
 {
     public static class ApplicationData
     {
-        public const string SDK_VERSION = "5.0.0";
+        public const string SDK_VERSION = "6.0.0";
         private const string TAG = "ApplicationData";
         private const string DEFAULT_RENDER_PIPELINE = "Built-In Render Pipeline";
         private static readonly AppData Data;

Runtime/Core/Scripts/Utils/AvatarConfigProcessor.cs

@@ -19,12 +19,13 @@ public static class AvatarConfigProcessor
         /// an avatar URL.
         /// </summary>
         /// <param name="avatarConfig">Stores the settings of the <see cref="AvatarConfig" /> to use when requesting the avatar.</param>
+        /// <param name="includeStartingCharacter">If true it will include a "?" as the first character</param>
         /// <returns>The <see cref="AvatarConfig" /> parameters combined as a <c>string</c>.</returns>
-        public static string ProcessAvatarConfiguration(AvatarConfig avatarConfig)
+        public static string ProcessAvatarConfiguration(AvatarConfig avatarConfig, bool includeStartingCharacter = true)
         {
             SDKLogger.Log(TAG, PROCESSING_AVATAR_CONFIGURATION);
 
-            var queryBuilder = new QueryBuilder();
+            var queryBuilder = new QueryBuilder(includeStartingCharacter);
             queryBuilder.AddKeyValue(AvatarAPIParameters.POSE, AvatarConfigMap.Pose[avatarConfig.Pose]);
             queryBuilder.AddKeyValue(AvatarAPIParameters.LOD, ((int) avatarConfig.Lod).ToString());
             queryBuilder.AddKeyValue(AvatarAPIParameters.TEXTURE_ATLAS, AvatarConfigMap.TextureAtlas[avatarConfig.TextureAtlas]);

Runtime/Core/Scripts/Utils/QueryBuilder.cs

@@ -9,13 +9,15 @@ public class QueryBuilder
         private readonly StringBuilder query = new StringBuilder();
         public string Query => query.ToString();
 
-        public QueryBuilder()
+        public QueryBuilder(bool includeStartingCharacter = true)
         {
+            if (!includeStartingCharacter) return;
             query.Append(STARTING_CHARACTER);
         }
 
-        public QueryBuilder(string keyName, string value)
+        public QueryBuilder(string keyName, string value, bool includeStartingCharacter = true)
         {
+            if (!includeStartingCharacter) return;
             query.Append(STARTING_CHARACTER);
             AddKeyValue(keyName, value);
         }

Samples~/AvatarCreatorSamples/AvatarCreatorExperimental/Animation/AnimationController.controller

@@ -51,7 +51,7 @@ AnimatorState:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: Pointing Forward
+  m_Name: IdleAnimation
   m_Speed: 1
   m_CycleOffset: 0
   m_Transitions: []
@@ -64,7 +64,7 @@ AnimatorState:
   m_MirrorParameterActive: 0
   m_CycleOffsetParameterActive: 0
   m_TimeParameterActive: 0
-  m_Motion: {fileID: 7400000, guid: 81bfdad495dec1848ae5e0145d9bfaca, type: 2}
+  m_Motion: {fileID: 7400000, guid: a7d37dbbb852bdb49a43e11d5a9e8056, type: 2}
   m_Tag: 
   m_SpeedParameter: 
   m_MirrorParameter: