Merge pull request #6125 from decentraland/release/release-20240311

Release 20240311

Author: anicalbano

browser-interface/packages/shared/chat/sagas.ts

@@ -216,7 +216,7 @@ function initChatCommands() {
 
     if (isValidPosition) {
       const { x, y } = coordinates
-      TeleportController.goTo(x, y).then(
+      TeleportController.goTo(x, y, false).then(
         ({ message }) => notifyStatusThroughChat(message),
         () => {
           // Do nothing. This is handled inside controller

browser-interface/packages/shared/scene-loader/sagas.ts

@@ -135,15 +135,13 @@ function* teleportHandler(action: TeleportToAction) {
   try {
     // look for the target scene
     const pointer = encodeParcelPosition(worldToGrid(action.payload.position))
-    const command: SetDesiredScenesCommand = yield apply(sceneLoader, sceneLoader.fetchScenesByLocation, [[pointer]])
-
+    const command: SetDesiredScenesCommand = yield call(sceneLoader.fetchScenesByLocation, [pointer])
     // is a target scene, then it will be used to settle the position
     if (command && command.scenes && command.scenes.length) {
       // pick always the first scene to unsettle the position once loaded
       const settlerScene = command.scenes[0].id
 
       const scene: SceneWorker | undefined = yield call(getSceneWorkerBySceneID, settlerScene)
-
       const spawnPoint =
         pickWorldSpawnpoint(
           scene?.metadata || command.scenes[0].entity.metadata,

browser-interface/packages/shared/scene-loader/world-loader-impl/index.ts

@@ -31,8 +31,32 @@ export async function createWorldLoader(options: { urns: string[] }): Promise<IS
   const emptyParcelController = new EmptyParcelController({ rootUrl: getResourcesURL('.') })
 
   return {
-    async fetchScenesByLocation(_parcels) {
-      return { scenes }
+    async fetchScenesByLocation(parcels) {
+      // If the world has only one scene, return always that scene.
+      if (scenes.length === 1) {
+        return { scenes }
+      }
+
+      // Worlds with more than one scene deployed.
+      const newScenes = new Set<LoadableScene>()
+      // First add the scenes based on the location (parcels)
+      // If there is no scene, add an empty scene.
+      for (const parcel of parcels) {
+        const scene = mappingScene.get(parcel)
+        if (scene) {
+          newScenes.add(scene)
+        } else {
+          const scene = await emptyParcelController.createFakeEntity(parcel)
+
+          mappingScene.set(parcel, scene)
+          newScenes.add(scene)
+        }
+      }
+      // Add the rest of the scenes.
+      for (const [_, scene] of mappingScene) {
+        newScenes.add(scene)
+      }
+      return { scenes: [...newScenes] }
     },
     async reportPosition(positionReport) {
       const newScenes: Set<LoadableScene> = new Set()

browser-interface/packages/shared/world/TeleportController.ts

@@ -94,6 +94,7 @@ export class TeleportController {
     teleportMessage?: string
   ): Promise<{ message: string; success: boolean }> {
     const tpMessage: string = teleportMessage ? teleportMessage : `Teleporting to ${x}, ${y}...`
+
     if (isInsideWorldLimits(x, y)) {
       try {
         if (goToMostPopulatedRealm) await changeToMostPopulatedRealm()

unity-renderer/Assets/Scripts/MainScripts/DCL/Components/Avatar/AvatarAnimationEventHandler.cs

@@ -1,40 +1,43 @@
 using System.Collections;
-using System.Collections.Generic;
 using UnityEngine;
 using DCL;
 
 public class AvatarAnimationEventHandler : MonoBehaviour
 {
-    const string FOOTSTEP_NAME = "footstep", HEART_NAME = "heart";
-    const string ANIM_NAME_KISS = "kiss", ANIM_NAME_MONEY = "money", ANIM_NAME_CLAP = "clap", ANIM_NAME_SNOWFLAKE = "snowfall", ANIM_NAME_HOHOHO = "hohoho";
-    const float MIN_EVENT_WAIT_TIME = 0.1f;
-    const float HOHOHO_OFFSET = 1.5f;
+    private const string FOOTSTEP_NAME = "footstep", HEART_NAME = "heart";
+    private const string ANIM_NAME_KISS = "kiss", ANIM_NAME_MONEY = "money", ANIM_NAME_CLAP = "clap", ANIM_NAME_SNOWFLAKE = "snowfall", ANIM_NAME_HOHOHO = "hohoho";
+    private const float MIN_EVENT_WAIT_TIME = 0.1f;
+    private const float HOHOHO_OFFSET = 1.5f;
 
-    AudioEvent footstepLight;
-    AudioEvent footstepSlide;
-    AudioEvent footstepWalk;
-    AudioEvent footstepRun;
-    AudioEvent clothesRustleShort;
-    AudioEvent clap;
-    AudioEvent throwMoney;
-    AudioEvent blowKiss;
+    private AudioEvent footstepLight;
+    private AudioEvent footstepSlide;
+    private AudioEvent footstepWalk;
+    private AudioEvent footstepRun;
+    private AudioEvent clothesRustleShort;
+    private AudioEvent clap;
+    private AudioEvent throwMoney;
+    private AudioEvent blowKiss;
 
-    Animation anim;
+    private Animation anim;
 
-    float lastEventTime;
+    private float lastEventTime;
 
-    StickersController stickersController;
+    private StickersController stickersController;
 
-    Transform footL;
-    Transform footR;
-    Transform handL;
-    Transform handR;
+    private int renderingLayer;
 
-    public void Init(AudioContainer audioContainer)
+    private Transform footL;
+    private Transform footR;
+    private Transform handL;
+    private Transform handR;
+
+    public void Init(AudioContainer audioContainer, int renderingLayer)
     {
         if (audioContainer == null)
             return;
 
+        this.renderingLayer = renderingLayer;
+
         footstepLight = audioContainer.GetEvent("FootstepLight");
         footstepSlide = audioContainer.GetEvent("FootstepSlide");
         footstepWalk = audioContainer.GetEvent("FootstepWalk");
@@ -65,13 +68,13 @@ public void Init(AudioContainer audioContainer)
     public void AnimEvent_FootstepRunLeft()
     {
         PlayAudioEvent(footstepRun);
-        PlaySticker(FOOTSTEP_NAME, footL.position, Vector3.up);
+        PlaySticker(FOOTSTEP_NAME, footL.position, Vector3.up, renderingLayer: renderingLayer);
     }
 
     public void AnimEvent_FootstepRunRight()
     {
         PlayAudioEvent(footstepRun);
-        PlaySticker(FOOTSTEP_NAME, footR.position, Vector3.up);
+        PlaySticker(FOOTSTEP_NAME, footR.position, Vector3.up, renderingLayer: renderingLayer);
     }
 
     public void AnimEvent_ClothesRustleShort() { PlayAudioEvent(clothesRustleShort); }
@@ -85,7 +88,7 @@ public void AnimEvent_Clap()
             return;
 
         PlayAudioEvent(clap);
-        PlaySticker(ANIM_NAME_CLAP, handR.position, Vector3.up, true);
+        PlaySticker(ANIM_NAME_CLAP, handR.position, Vector3.up, true, renderingLayer: renderingLayer);
         UpdateEventTime();
     }
 
@@ -98,7 +101,7 @@ public void AnimEvent_ThrowMoney()
             return;
 
         PlayAudioEvent(throwMoney);
-        PlaySticker(ANIM_NAME_MONEY, handL.position, handL.rotation.eulerAngles, true);
+        PlaySticker(ANIM_NAME_MONEY, handL.position, handL.rotation.eulerAngles, true, renderingLayer: renderingLayer);
         UpdateEventTime();
     }
 
@@ -115,10 +118,10 @@ public void AnimEvent_BlowKiss()
         UpdateEventTime();
     }
 
-    IEnumerator EmitHeartParticle()
+    private IEnumerator EmitHeartParticle()
     {
         yield return new WaitForSeconds(0.8f);
-        PlaySticker(HEART_NAME, handR.position, transform.rotation.eulerAngles, true);
+        PlaySticker(HEART_NAME, handR.position, transform.rotation.eulerAngles, true, renderingLayer: renderingLayer);
     }
 
     public void AnimEvent_Snowflakes()
@@ -129,27 +132,27 @@ public void AnimEvent_Snowflakes()
         if (!AnimationWeightIsOverThreshold(0.2f, ANIM_NAME_SNOWFLAKE))
             return;
 
-        PlaySticker("snowflakes", transform.position, Vector3.zero, true);
+        PlaySticker("snowflakes", transform.position, Vector3.zero, true, renderingLayer: renderingLayer);
     }
 
     public void AnimEvent_Hohoho()
     {
         if (LastEventWasTooRecent())
             return;
-        
+
         if (!AnimationWeightIsOverThreshold(0.2f, ANIM_NAME_HOHOHO))
             return;
 
-        PlaySticker(ANIM_NAME_HOHOHO, transform.position + Vector3.up * HOHOHO_OFFSET, Vector3.zero, true);
+        PlaySticker(ANIM_NAME_HOHOHO, transform.position + Vector3.up * HOHOHO_OFFSET, Vector3.zero, true, renderingLayer: renderingLayer);
     }
 
-    void PlayAudioEvent(AudioEvent audioEvent)
+    private void PlayAudioEvent(AudioEvent audioEvent)
     {
         if (audioEvent != null)
             audioEvent.Play(true);
     }
 
-    bool AnimationWeightIsOverThreshold(float threshold, string animationName)
+    private bool AnimationWeightIsOverThreshold(float threshold, string animationName)
     {
         if (anim != null)
         {
@@ -170,25 +173,23 @@ bool AnimationWeightIsOverThreshold(float threshold, string animationName)
         return false;
     }
 
-    void UpdateEventTime()
+    private void UpdateEventTime()
     {
         lastEventTime = Time.realtimeSinceStartup;
     }
 
-    bool LastEventWasTooRecent()
-    {
-        return lastEventTime + MIN_EVENT_WAIT_TIME >= Time.realtimeSinceStartup;
-    }
+    private bool LastEventWasTooRecent() =>
+        lastEventTime + MIN_EVENT_WAIT_TIME >= Time.realtimeSinceStartup;
 
     /// <summary>
     /// Plays a sticker.
     /// </summary>
     /// <param name="id">ID string of sticker</param>
     /// <param name="position">Position in world space</param>
     /// <param name="rotation">Euler angles</param>
-    void PlaySticker(string id, Vector3 position, Vector3 direction, bool followTransform = false)
+    private void PlaySticker(string id, Vector3 position, Vector3 direction, bool followTransform = false, int renderingLayer = 0)
     {
         if (stickersController != null)
-            stickersController.PlaySticker(id, position, direction, followTransform);
+            stickersController.PlaySticker(id, position, direction, followTransform, renderingLayer);
     }
-}
+}

unity-renderer/Assets/Scripts/MainScripts/DCL/Components/Avatar/AvatarAnimatorLegacy.cs

@@ -83,6 +83,7 @@ public class BlackBoard
 
     [SerializeField] internal AvatarLocomotion femaleLocomotions;
     [SerializeField] internal AvatarLocomotion maleLocomotions;
+    [SerializeField] internal string renderingLayer = "Default";
     private AvatarLocomotion currentLocomotions;
 
     public new Animation animation;
@@ -550,7 +551,7 @@ private void InitializeAvatarAudioAndParticleHandlers(Animation createdAnimation
 
         if (audioContainer != null)
         {
-            animationEventHandler.Init(audioContainer);
+            animationEventHandler.Init(audioContainer, LayerMask.NameToLayer(renderingLayer));
 
             //NOTE(Mordi): If this is a remote avatar, pass the animation component so we can keep track of whether it is culled (off-screen) or not
             AvatarAudioHandlerRemote audioHandlerRemote = audioContainer.GetComponent<AvatarAudioHandlerRemote>();

unity-renderer/Assets/Scripts/MainScripts/DCL/Components/Avatar/AvatarShape.prefab

@@ -91,7 +91,6 @@ MonoBehaviour:
   baseAvatarContainer: {fileID: 4288110136316019743}
   baseAvatarReferencesPrefab: {fileID: 4766333532709993497, guid: 7bf2abf753051c34c9e0a568a90fc0f0,
     type: 3}
-  boneAnchors: []
   everythingIsLoaded: 0
 --- !u!114 &122622683908687435
 MonoBehaviour:
@@ -165,6 +164,7 @@ MonoBehaviour:
     run: {fileID: 7400000, guid: 916369dcf45c5944e9f2409e0be10181, type: 2}
     jump: {fileID: 7400000, guid: b51f09eb09017384a8ff4b3b88b00c00, type: 2}
     fall: {fileID: 7400000, guid: cd48d8cde6039fa4fac548ddab2ff277, type: 2}
+  renderingLayer: Default
   animation: {fileID: 0}
   blackboard:
     walkSpeedFactor: 0.3