From e3abca29493251f208b37f25efc88b1d6017a501 Mon Sep 17 00:00:00 2001 From: Harrison Date: Wed, 20 Nov 2024 09:24:22 +0200 Subject: [PATCH 1/3] chore: make blendshapes default to none if empty --- Runtime/Core/Scripts/Utils/AvatarConfigProcessor.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Runtime/Core/Scripts/Utils/AvatarConfigProcessor.cs b/Runtime/Core/Scripts/Utils/AvatarConfigProcessor.cs index 572c48f1..33ba3f60 100644 --- a/Runtime/Core/Scripts/Utils/AvatarConfigProcessor.cs +++ b/Runtime/Core/Scripts/Utils/AvatarConfigProcessor.cs @@ -34,6 +34,11 @@ public static string ProcessAvatarConfiguration(AvatarConfig avatarConfig) { queryBuilder.AddKeyValue(AvatarAPIParameters.MORPH_TARGETS, CombineMorphTargetNames(avatarConfig.MorphTargets)); } + else + { + // If no morph targets are set, we set the value to "none" to prevent unwanted blendshapes. + queryBuilder.AddKeyValue(AvatarAPIParameters.MORPH_TARGETS, "none"); + } queryBuilder.AddKeyValue(AvatarAPIParameters.USE_HANDS, GetBoolStringValue(avatarConfig.UseHands)); queryBuilder.AddKeyValue(AvatarAPIParameters.USE_DRACO, GetBoolStringValue(avatarConfig.UseDracoCompression)); queryBuilder.AddKeyValue(AvatarAPIParameters.USE_MESHOPT, GetBoolStringValue(avatarConfig.UseMeshOptCompression)); From 168363e1a8709adcb726c861e90aed01346daf4a Mon Sep 17 00:00:00 2001 From: Harrison Hough Date: Fri, 6 Dec 2024 07:54:51 +0200 Subject: [PATCH 2/3] feat: add texture format to prevent webp usage --- Runtime/Core/Scripts/Utils/AvatarAPIParameters.cs | 1 + Runtime/Core/Scripts/Utils/AvatarConfigProcessor.cs | 1 + 2 files changed, 2 insertions(+) diff --git a/Runtime/Core/Scripts/Utils/AvatarAPIParameters.cs b/Runtime/Core/Scripts/Utils/AvatarAPIParameters.cs index dc7ed394..d21809d0 100644 --- a/Runtime/Core/Scripts/Utils/AvatarAPIParameters.cs +++ b/Runtime/Core/Scripts/Utils/AvatarAPIParameters.cs @@ -7,6 +7,7 @@ public static class AvatarAPIParameters public const string TEXTURE_ATLAS = "textureAtlas"; public const string TEXTURE_SIZE_LIMIT = "textureSizeLimit"; public const string TEXTURE_CHANNELS = "textureChannels"; + public const string TEXTURE_FORMAT = "textureFormat"; public const string MORPH_TARGETS = "morphTargets"; public const string USE_HANDS = "useHands"; public const string USE_DRACO = "useDracoMeshCompression"; diff --git a/Runtime/Core/Scripts/Utils/AvatarConfigProcessor.cs b/Runtime/Core/Scripts/Utils/AvatarConfigProcessor.cs index 33ba3f60..74956f17 100644 --- a/Runtime/Core/Scripts/Utils/AvatarConfigProcessor.cs +++ b/Runtime/Core/Scripts/Utils/AvatarConfigProcessor.cs @@ -42,6 +42,7 @@ public static string ProcessAvatarConfiguration(AvatarConfig avatarConfig) queryBuilder.AddKeyValue(AvatarAPIParameters.USE_HANDS, GetBoolStringValue(avatarConfig.UseHands)); queryBuilder.AddKeyValue(AvatarAPIParameters.USE_DRACO, GetBoolStringValue(avatarConfig.UseDracoCompression)); queryBuilder.AddKeyValue(AvatarAPIParameters.USE_MESHOPT, GetBoolStringValue(avatarConfig.UseMeshOptCompression)); + queryBuilder.AddKeyValue(AvatarAPIParameters.TEXTURE_FORMAT, "jpeg"); return queryBuilder.Query; } From 422661a121a5c70f35bd5b6ada4e1132c6f5059c Mon Sep 17 00:00:00 2001 From: Harrison Date: Mon, 16 Dec 2024 10:19:05 +0200 Subject: [PATCH 3/3] chore: small cleanup --- Editor/Core/Scripts/UI/EditorWindows/SetupGuide/SetupGuide.cs | 1 - Runtime/Core/Scripts/Utils/WebRequestDispatcher.cs | 1 - 2 files changed, 2 deletions(-) diff --git a/Editor/Core/Scripts/UI/EditorWindows/SetupGuide/SetupGuide.cs b/Editor/Core/Scripts/UI/EditorWindows/SetupGuide/SetupGuide.cs index 55ead9b0..75fa87bd 100644 --- a/Editor/Core/Scripts/UI/EditorWindows/SetupGuide/SetupGuide.cs +++ b/Editor/Core/Scripts/UI/EditorWindows/SetupGuide/SetupGuide.cs @@ -1,5 +1,4 @@ using ReadyPlayerMe.Core.Analytics; -using ReadyPlayerMe.Core.Data; using UnityEditor; using UnityEditor.UIElements; using UnityEngine; diff --git a/Runtime/Core/Scripts/Utils/WebRequestDispatcher.cs b/Runtime/Core/Scripts/Utils/WebRequestDispatcher.cs index 066386ca..0dfd701d 100644 --- a/Runtime/Core/Scripts/Utils/WebRequestDispatcher.cs +++ b/Runtime/Core/Scripts/Utils/WebRequestDispatcher.cs @@ -44,7 +44,6 @@ public async Task SendRequest( request.SetRequestHeader(header.Key, header.Value); } } - downloadHandler ??= new DownloadHandlerBuffer(); request.downloadHandler = downloadHandler;