Merge pull request #2705 from decentraland/dev

release: 11-4-2024

.github/ISSUE_TEMPLATE/bug_report.md

@@ -8,7 +8,7 @@ assignees: ''
 
 ---
 
-### **Explorer Alpha build versions:**
+### **Build version:**
 
 
 ### **Issue Description:**
@@ -20,14 +20,18 @@ assignees: ''
   2.
   3.
 
-### **Expected behaviour:**
+### **Expected behavior:**
 
 
 ### **Current behaviour:**
 
 
+### **Repro Index:**
+<!-- Starting on 0/10 attempts -->
+
 #### **Evidence:**
 
+
 #### **Additional Notes:**
 <!-- If the test is made on Mac, specify if the chip is M1 or Intel -->
 

Explorer/Assets/DCL/AvatarRendering/Emotes/Helpers/ApplicationParamsEmoteProvider.cs

@@ -0,0 +1,45 @@
+using CommunicationData.URLHelpers;
+using Cysharp.Threading.Tasks;
+using DCL.AvatarRendering.Loading.Components;
+using DCL.Web3;
+using Global.AppArgs;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+
+namespace DCL.AvatarRendering.Emotes
+{
+    public class ApplicationParamsEmoteProvider : IEmoteProvider
+    {
+        private readonly IAppArgs appArgs;
+        private readonly IEmoteProvider source;
+
+        public ApplicationParamsEmoteProvider(IAppArgs appArgs,
+            IEmoteProvider source)
+        {
+            this.appArgs = appArgs;
+            this.source = source;
+        }
+
+        public async UniTask<int> GetOwnedEmotesAsync(Web3Address userId, CancellationToken ct,
+            IEmoteProvider.OwnedEmotesRequestOptions requestOptions,
+            List<IEmote> output)
+        {
+            if (!appArgs.TryGetValue("self-preview-emotes", out string? emotesCsv))
+                return await source.GetOwnedEmotesAsync(userId, ct, requestOptions, output);
+
+            URN[] pointers = emotesCsv!.Split(',', StringSplitOptions.RemoveEmptyEntries)
+                                       .Select(s => new URN(s))
+                                       .ToArray();
+
+            await UniTask.WhenAll(GetEmotesAsync(pointers, BodyShape.MALE, ct, output),
+                GetEmotesAsync(pointers, BodyShape.FEMALE, ct, output));
+
+            return output.Count;
+        }
+
+        public UniTask GetEmotesAsync(IReadOnlyCollection<URN> emoteIds, BodyShape bodyShape, CancellationToken ct, List<IEmote> output) =>
+            source.GetEmotesAsync(emoteIds, bodyShape, ct, output);
+    }
+}

Explorer/Assets/DCL/AvatarRendering/Wearables/ApplicationParametersWearablesProvider.cs

@@ -18,17 +18,17 @@ namespace DCL.AvatarRendering.Wearables
 {
     public class ApplicationParametersWearablesProvider : IWearablesProvider
     {
-        private readonly IAppArgs applicationParametersParser;
+        private readonly IAppArgs appArgs;
         private readonly IWearablesProvider source;
         private readonly World world;
         private readonly string[] allWearableCategories = WearablesConstants.CATEGORIES_PRIORITY.ToArray();
         private readonly List<IWearable> resultWearablesBuffer = new ();
 
-        public ApplicationParametersWearablesProvider(IAppArgs applicationParametersParser,
+        public ApplicationParametersWearablesProvider(IAppArgs appArgs,
             IWearablesProvider source,
             World world)
         {
-            this.applicationParametersParser = applicationParametersParser;
+            this.appArgs = appArgs;
             this.source = source;
             this.world = world;
         }
@@ -41,14 +41,18 @@ public ApplicationParametersWearablesProvider(IAppArgs applicationParametersPars
             string? name = null,
             List<IWearable>? results = null)
         {
-            if (!applicationParametersParser.TryGetValue("self-preview-wearables", out string? wearablesCsv))
+            if (!appArgs.TryGetValue("self-preview-wearables", out string? wearablesCsv))
                 return await source.GetAsync(pageSize, pageNumber, ct, sortingField, orderBy, category, collectionType, name, results);
 
             URN[] pointers = wearablesCsv!.Split(',', StringSplitOptions.RemoveEmptyEntries)
-                                          .Select(s => new URN(s)).ToArray();
+                                          .Select(s => new URN(s))
+                                          .ToArray();
 
-            IReadOnlyCollection<IWearable>? maleWearables = await RequestPointersAsync(pointers, BodyShape.MALE, ct);
-            IReadOnlyCollection<IWearable>? femaleWearables = await RequestPointersAsync(pointers, BodyShape.FEMALE, ct);
+            (IReadOnlyCollection<IWearable>? maleWearables, IReadOnlyCollection<IWearable>? femaleWearables) =
+                await UniTask.WhenAll(RequestPointersAsync(pointers, BodyShape.MALE, ct),
+                    RequestPointersAsync(pointers, BodyShape.FEMALE, ct));
+
+            results ??= new List<IWearable>();
 
             lock (resultWearablesBuffer)
             {
@@ -61,7 +65,8 @@ public ApplicationParametersWearablesProvider(IAppArgs applicationParametersPars
                     resultWearablesBuffer.AddRange(femaleWearables);
 
                 int pageIndex = pageNumber - 1;
-                return (resultWearablesBuffer.Skip(pageIndex * pageSize).Take(pageSize).ToArray(), resultWearablesBuffer.Count);
+                results.AddRange(resultWearablesBuffer.Skip(pageIndex * pageSize).Take(pageSize));
+                return (results, resultWearablesBuffer.Count);
             }
         }
 
@@ -70,6 +75,7 @@ public ApplicationParametersWearablesProvider(IAppArgs applicationParametersPars
             CancellationToken ct)
         {
             var promise = WearablePromise.Create(world,
+
                 // We pass all categories as force renderer to force the download of all of them
                 // Otherwise they will be skipped if any wearable is hiding the category
                 WearableComponentsUtils.CreateGetWearablesByPointersIntention(bodyShape, pointers, allWearableCategories),

Explorer/Assets/DCL/Backpack/CharacterPreview/BackpackCharacterPreviewController.cs

@@ -131,6 +131,7 @@ private void OnColorChange(Color newColor, string category)
                     previewAvatarModel.SkinColor = newColor;
                     break;
             }
+
             OnModelUpdated();
         }
 
@@ -180,14 +181,18 @@ async UniTaskVoid EnsureEmoteAndPlayItAsync(CancellationToken ct)
             {
                 URN urn = emote.GetUrn().Shorten();
 
-                // In case you want to preview an emote, it might happen that the asset bundles are not loaded
-                // By adding the emote we force to fetch them if missing
+                // Ensure assets are loaded for the emote
                 if (!previewAvatarModel.Emotes?.Contains(urn) ?? true)
                 {
                     previewAvatarModel.Emotes!.Add(urn);
-                    await ShowLoadingSpinnerAndUpdateAvatarAsync(ct);
-                    // Remove the emote so it stays original
-                    previewAvatarModel.Emotes!.Remove(urn);
+
+                    try { await ShowLoadingSpinnerAndUpdateAvatarAsync(ct); }
+                    catch (OperationCanceledException) { }
+                    finally
+                    {
+                        // Remove the emote so it stays original
+                        previewAvatarModel.Emotes!.Remove(urn);
+                    }
                 }
 
                 PlayEmote(urn);

Explorer/Assets/DCL/Browser/DecentralandUrls/DecentralandUrl.cs

@@ -40,5 +40,8 @@ public enum DecentralandUrl
         AssetBundlesCDN,
 
         Badges,
+
+        CameraReelUsers,
+        CameraReelImages
     }
 }

Explorer/Assets/DCL/Browser/DecentralandUrls/DecentralandUrlsSource.cs

@@ -51,12 +51,13 @@ private static string RawUrl(DecentralandUrl decentralandUrl) =>
                 DecentralandUrl.FeatureFlags => $"https://feature-flags.decentraland.{ENV}",
                 DecentralandUrl.Help => $"https://decentraland.{ENV}/help/",
                 DecentralandUrl.Market => $"https://market.decentraland.{ENV}",
-                // All ABs are in org
                 DecentralandUrl.AssetBundlesCDN => $"https://ab-cdn.decentraland.{ENV}",
-                DecentralandUrl.ArchipelagoStatus => $"https://archipelago-stats.decentraland.{ENV}/status",
+                DecentralandUrl.ArchipelagoStatus => $"https://archipelago-ea-stats.decentraland.{ENV}/status",
                 DecentralandUrl.GatekeeperStatus => $"https://comms-gatekeeper.decentraland.{ENV}/status",
                 DecentralandUrl.Genesis => $"https://realm-provider-ea.decentraland.{ENV}/main",
                 DecentralandUrl.Badges => $"https://badges.decentraland.{ENV}",
+                DecentralandUrl.CameraReelUsers =>  $"https://camera-reel-service.decentraland.{ENV}/api/users",
+                DecentralandUrl.CameraReelImages => $"https://camera-reel-service.decentraland.{ENV}/api/images",
                 _ => throw new ArgumentOutOfRangeException(nameof(decentralandUrl), decentralandUrl, null!)
             };
     }

Explorer/Assets/DCL/Character/CharacterPreview/CharacterPreviewController.cs

@@ -71,6 +71,8 @@ public void Dispose()
 
         public UniTask UpdateAvatarAsync(CharacterPreviewAvatarModel avatarModel, CancellationToken ct)
         {
+            ct.ThrowIfCancellationRequested();
+
             ref AvatarShapeComponent avatarShape = ref globalWorld.Get<AvatarShapeComponent>(characterPreviewEntity);
 
             avatarShape.SkinColor = avatarModel.SkinColor;
@@ -87,25 +89,50 @@ public UniTask UpdateAvatarAsync(CharacterPreviewAvatarModel avatarModel, Cancel
                 PartitionComponent.TOP_PRIORITY
             );
 
-            globalWorld.Create(EmotePromise.Create(globalWorld,
+            Entity emotePromiseEntity = globalWorld.Create(EmotePromise.Create(globalWorld,
                 EmoteComponentsUtils.CreateGetEmotesByPointersIntention(avatarShape.BodyShape,
                     avatarModel.Emotes ?? (IReadOnlyCollection<URN>)Array.Empty<URN>()),
                 PartitionComponent.TOP_PRIORITY));
 
+            EntityReference emotePromiseRef = globalWorld.Reference(emotePromiseEntity);
+
             avatarShape.IsDirty = true;
 
-            return WaitForAvatarInstantiatedAsync(ct);
+            return WaitForAvatarInstantiatedAsync(emotePromiseRef, ct);
         }
 
-        private async UniTask WaitForAvatarInstantiatedAsync(CancellationToken ct)
+        private async UniTask WaitForAvatarInstantiatedAsync(EntityReference emotePromiseEntity, CancellationToken ct)
         {
-            while (!ct.IsCancellationRequested && globalWorld.Get<AvatarShapeComponent>(characterPreviewEntity).IsDirty)
+            World world = globalWorld;
+            Entity avatarEntity = characterPreviewEntity;
+
+            while (!IsAvatarLoaded() || !IsEmoteLoaded())
                 await UniTask.Yield(ct);
+
+            ct.ThrowIfCancellationRequested();
+
+            return;
+
+            bool IsAvatarLoaded()
+            {
+                return !world.Get<AvatarShapeComponent>(avatarEntity).IsDirty;
+            }
+
+            bool IsEmoteLoaded()
+            {
+                return !emotePromiseEntity.IsAlive(world)
+                       || world.Get<EmotePromise>(emotePromiseEntity).IsConsumed;
+            }
         }
 
         public void PlayEmote(string emoteId)
         {
-            globalWorld.Add(characterPreviewEntity, new CharacterEmoteIntent { EmoteId = emoteId, TriggerSource = TriggerSource.PREVIEW});
+            var intent = new CharacterEmoteIntent { EmoteId = emoteId, TriggerSource = TriggerSource.PREVIEW };
+
+            if (globalWorld.Has<CharacterEmoteIntent>(characterPreviewEntity))
+                globalWorld.Set(characterPreviewEntity, intent);
+            else
+                globalWorld.Add(characterPreviewEntity, intent);
         }
 
         public void StopEmotes()

Explorer/Assets/DCL/Character/CharacterPreview/CharacterPreviewControllerBase.cs

@@ -220,7 +220,18 @@ private void OnAnyCharacterPreviewHide(CharacterPreviewControllerBase characterP
         protected void OnModelUpdated()
         {
             updateModelCancellationToken = updateModelCancellationToken.SafeRestart();
-            ShowLoadingSpinnerAndUpdateAvatarAsync(updateModelCancellationToken.Token).Forget();
+
+            UpdateModelAsync(updateModelCancellationToken.Token).Forget();
+            return;
+
+            async UniTaskVoid UpdateModelAsync(CancellationToken ct)
+            {
+                try
+                {
+                    await ShowLoadingSpinnerAndUpdateAvatarAsync(ct);
+                }
+                catch (OperationCanceledException) { }
+            }
         }
 
         protected async UniTask ShowLoadingSpinnerAndUpdateAvatarAsync(CancellationToken ct)
@@ -232,7 +243,6 @@ protected async UniTask ShowLoadingSpinnerAndUpdateAvatarAsync(CancellationToken
             DisableSpinner(spinner);
         }
 
-
         private void DisableSpinner(GameObject spinner)
         {
             spinner.SetActive(false);
@@ -250,11 +260,8 @@ private GameObject EnableSpinner()
             return spinner;
         }
 
-        private async UniTask UpdateAvatarAsync(CharacterPreviewAvatarModel model, CancellationToken ct)
-        {
-            try { await (previewController?.UpdateAvatarAsync(model, ct) ?? UniTask.CompletedTask); }
-            catch (OperationCanceledException) { }
-        }
+        private async UniTask UpdateAvatarAsync(CharacterPreviewAvatarModel model, CancellationToken ct) =>
+            await (previewController?.UpdateAvatarAsync(model, ct) ?? UniTask.CompletedTask);
 
         protected void StopEmotes() =>
             previewController?.StopEmotes();

Explorer/Assets/DCL/InWorldCamera/CameraReelStorageService/AssemblyInfo.cs

@@ -0,0 +1,5 @@
+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("DCL.EditMode.Tests")]
+[assembly: InternalsVisibleTo("DCL.PlayMode.Tests")]
+[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")] // for NSubstitute