decentraland · AnsisMalins · Jun 13, 2025 · Jun 13, 2025 · Jun 20, 2025 · Jun 20, 2025
@@ -14,8 +14,8 @@
 using Vector3 = UnityEngine.Vector3;
 using DCL.Audio.Jobs;
 using DCL.Landscape;
-using DCL.Landscape.Systems;
 using Random = UnityEngine.Random;
+using TerrainData = UnityEngine.TerrainData;
 
 namespace DCL.Audio.Systems
 {
@@ -25,7 +25,6 @@ namespace DCL.Audio.Systems
     /// </summary>
     [LogCategory(ReportCategory.AUDIO)]
     [UpdateInGroup(typeof(PresentationSystemGroup))]
-    [UpdateAfter(typeof(LandscapeTerrainCullingSystem))]
     public partial class LandscapeAudioCullingSystem : BaseUnityLoopSystem
     {
         private readonly TerrainGenerator terrainGenerator;

@@ -8,9 +8,9 @@
 using ECS.SceneLifeCycle.SceneDefinition;
 using ECS.StreamableLoading.Common;
 using System.Threading;
-using Unity.Collections;
 using Unity.Mathematics;
 using UnityEngine;
+using UnityEngine.Pool;
 using Utility;
 using Utility.Types;
 
@@ -22,15 +22,13 @@ public class Landscape : ILandscape
         private readonly TerrainGenerator genesisTerrain;
         private readonly WorldTerrainGenerator worldsTerrain;
         private readonly bool landscapeEnabled;
-        private readonly bool isLocalSceneDevelopment;
 
         public Landscape(IGlobalRealmController realmController, TerrainGenerator genesisTerrain, WorldTerrainGenerator worldsTerrain, bool landscapeEnabled, bool isLocalSceneDevelopment)
         {
             this.realmController = realmController;
             this.genesisTerrain = genesisTerrain;
             this.worldsTerrain = worldsTerrain;
             this.landscapeEnabled = landscapeEnabled;
-            this.isLocalSceneDevelopment = isLocalSceneDevelopment;
         }
 
         public async UniTask<EnumResult<LandscapeError>> LoadTerrainAsync(AsyncLoadProcessReport landscapeLoadReport, CancellationToken ct)
@@ -44,13 +42,12 @@ public async UniTask<EnumResult<LandscapeError>> LoadTerrainAsync(AsyncLoadProce
             if (realmController.RealmData.IsGenesis())
             {
                 //TODO (Juani): The globalWorld terrain would be hidden. We need to implement the re-usage when going back
-                worldsTerrain.SwitchVisibility(false);
+                worldsTerrain.Hide();
 
                 if (!genesisTerrain.IsTerrainGenerated)
-                    await genesisTerrain.GenerateGenesisTerrainAndShowAsync(processReport: landscapeLoadReport,
-                        cancellationToken: ct);
+                    genesisTerrain.GenerateAndShow(landscapeLoadReport);
                 else
-                    await genesisTerrain.ShowAsync(landscapeLoadReport);
+                    genesisTerrain.Show(landscapeLoadReport);
             }
             else
             {
@@ -83,16 +80,13 @@ private async UniTask GenerateStaticScenesTerrainAsync(AsyncLoadProcessReport la
             var staticScenesEntityDefinitions = await realmController.WaitForStaticScenesEntityDefinitionsAsync(ct);
             if (!staticScenesEntityDefinitions.HasValue) return;
 
-            int parcelsAmount = staticScenesEntityDefinitions.Value.Value.Count;
-
-            using (var parcels = new NativeParallelHashSet<int2>(parcelsAmount, AllocatorManager.Persistent))
+            using (ListPool<int2>.Get(out var parcels))
             {
                 foreach (var staticScene in staticScenesEntityDefinitions.Value.Value)
-                {
-                    foreach (Vector2Int parcel in staticScene.metadata.scene.DecodedParcels) { parcels.Add(parcel.ToInt2()); }
-                }
+                    foreach (Vector2Int parcel in staticScene.metadata.scene.DecodedParcels)
+                        parcels.Add(parcel.ToInt2());
 
-                await worldsTerrain.GenerateTerrainAsync(parcels, (uint)realmController.RealmData.GetHashCode(), landscapeLoadReport, cancellationToken: ct);
+                worldsTerrain.GenerateTerrain(parcels.ToArray(), landscapeLoadReport);
             }
         }
 
@@ -103,20 +97,13 @@ private async UniTask GenerateFixedScenesTerrainAsync(AsyncLoadProcessReport lan
 
             AssetPromise<SceneEntityDefinition, GetSceneDefinition>[]? promises = await realmController.WaitForFixedScenePromisesAsync(ct);
 
-            var parcelsAmount = 0;
-
-            foreach (AssetPromise<SceneEntityDefinition, GetSceneDefinition> promise in promises)
-                parcelsAmount += promise.Result!.Value.Asset!.metadata.scene.DecodedParcels.Count;
-
-            using (var parcels = new NativeParallelHashSet<int2>(parcelsAmount, AllocatorManager.Persistent))
+            using (ListPool<int2>.Get(out var parcels))
             {
                 foreach (AssetPromise<SceneEntityDefinition, GetSceneDefinition> promise in promises)
-                {
                     foreach (Vector2Int parcel in promise.Result!.Value.Asset!.metadata.scene.DecodedParcels)
                         parcels.Add(parcel.ToInt2());
-                }
 
-                await worldsTerrain.GenerateTerrainAsync(parcels, (uint)realmController.RealmData.GetHashCode(), landscapeLoadReport, cancellationToken: ct);
+                worldsTerrain.GenerateTerrain(parcels.ToArray(), landscapeLoadReport);
             }
         }
 

@@ -3,7 +3,6 @@
 using DCL.Multiplayer.Connections.DecentralandUrls;
 using DCL.PluginSystem.Global;
 using DCL.RealmNavigation;
-using ECS.SceneLifeCycle;
 using ECS.SceneLifeCycle.Realm;
 using Global.Dynamic.Landscapes;
 

@@ -33,8 +33,7 @@ Material:
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
-  disabledShaderPasses:
-  - MOTIONVECTORS
+  disabledShaderPasses: []
   m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3

@@ -33,8 +33,7 @@ Material:
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
-  disabledShaderPasses:
-  - MOTIONVECTORS
+  disabledShaderPasses: []
   m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3

@@ -14,15 +14,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: 7a5b23ea474707949ac1958443314f0f, type: 3}
       propertyPath: m_LocalPosition.x
-      value: 717.4116
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: 7a5b23ea474707949ac1958443314f0f, type: 3}
       propertyPath: m_LocalPosition.y
-      value: 0.58625525
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: 7a5b23ea474707949ac1958443314f0f, type: 3}
       propertyPath: m_LocalPosition.z
-      value: -1573.6902
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: 7a5b23ea474707949ac1958443314f0f, type: 3}
       propertyPath: m_LocalRotation.w

@@ -20,8 +20,7 @@ Material:
   m_DoubleSidedGI: 1
   m_CustomRenderQueue: -1
   stringTagMap: {}
-  disabledShaderPasses:
-  - MOTIONVECTORS
+  disabledShaderPasses: []
   m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3

@@ -20,8 +20,7 @@ Material:
   m_DoubleSidedGI: 1
   m_CustomRenderQueue: -1
   stringTagMap: {}
-  disabledShaderPasses:
-  - MOTIONVECTORS
+  disabledShaderPasses: []
   m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3

@@ -33,8 +33,7 @@ Material:
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
-  disabledShaderPasses:
-  - MOTIONVECTORS
+  disabledShaderPasses: []
   m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3

@@ -33,8 +33,7 @@ Material:
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
-  disabledShaderPasses:
-  - MOTIONVECTORS
+  disabledShaderPasses: []
   m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3

@@ -0,0 +1,89 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &301782615085243669
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3087263769094213892}
+  - component: {fileID: 8742584773998374722}
+  m_Layer: 17
+  m_Name: CollisionObject0
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &3087263769094213892
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 301782615085243669}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: 0.000000030888096, z: 0.7071068, w: 0.7071068}
+  m_LocalPosition: {x: 0.006637088, y: 0.53919345, z: -0.0029117465}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 132018308065938286}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!136 &8742584773998374722
+CapsuleCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 301782615085243669}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 0
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Radius: 0.054864246
+  m_Height: 1.1490948
+  m_Direction: 0
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!1 &9037524513379548263
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 132018308065938286}
+  m_Layer: 0
+  m_Name: Bush02 Collider
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &132018308065938286
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9037524513379548263}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 3087263769094213892}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -14,15 +14,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: 7ee2877b90d2bc048b88aacb57ee6dcc, type: 3}
       propertyPath: m_LocalPosition.x
-      value: 716.7916
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: 7ee2877b90d2bc048b88aacb57ee6dcc, type: 3}
       propertyPath: m_LocalPosition.y
-      value: 0.08944039
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: 7ee2877b90d2bc048b88aacb57ee6dcc, type: 3}
       propertyPath: m_LocalPosition.z
-      value: -1574.5286
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: 7ee2877b90d2bc048b88aacb57ee6dcc, type: 3}
       propertyPath: m_LocalRotation.w

@@ -33,8 +33,7 @@ Material:
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
-  disabledShaderPasses:
-  - MOTIONVECTORS
+  disabledShaderPasses: []
   m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3

@@ -33,8 +33,7 @@ Material:
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
-  disabledShaderPasses:
-  - MOTIONVECTORS
+  disabledShaderPasses: []
   m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3