fix: remove entities dependency (#1903)

* fix: remove entities dependency * include manifest changes
decentraland · Aug 27, 2024 · dc13600 · dc13600
1 parent 2513be8
commit dc13600
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/Explorer/Assets/DCL/Landscape/Jobs/UpdateBoundariesCullingJob.cs b/Explorer/Assets/DCL/Landscape/Jobs/UpdateBoundariesCullingJob.cs
@@ -2,12 +2,13 @@
 using Unity.Collections;
 using Unity.Jobs;
 using Unity.Mathematics;
+using UnityEngine;
 
 namespace DCL.Landscape.Jobs
 {
     public struct VisibleBounds
     {
-        public AABB Bounds;
+        public Bounds Bounds;
         public bool IsVisible;
         public bool IsAtDistance;
         public bool IsDirty;
@@ -41,7 +42,7 @@ public void Execute(int i)
 
             if (isVisible)
             {
-                float sqrDist = terrain.Bounds.DistanceSq(cameraPosition);
+                float sqrDist = terrain.Bounds.SqrDistance(cameraPosition);
                 isAtDistance = sqrDist < detailDistanceSqr;
             }
 
@@ -54,15 +55,15 @@ public void Execute(int i)
 
         // got this one from https://forum.unity.com/threads/managed-version-of-geometryutility-testplanesaabb.473575/
         // thanks kind internet fellow :)
-        private bool TestPlanesAABB(AABB bounds)
+        private bool TestPlanesAABB(Bounds bounds)
         {
             for (var i = 0; i < cameraPlanes.Length; i++)
             {
                 float4 plane = cameraPlanes[i];
                 float3 planeNormal = plane.xyz;
                 float planeDistance = plane.w;
                 float3 normalSign = math.sign(planeNormal);
-                float3 testPoint = bounds.Center + (bounds.Extents * normalSign);
+                float3 testPoint = new float3(bounds.center) + (bounds.extents * normalSign);
 
                 float dot = math.dot(testPoint, planeNormal);
 

diff --git a/Explorer/Assets/DCL/Landscape/Systems/LandscapeMiscCullingSystem.cs b/Explorer/Assets/DCL/Landscape/Systems/LandscapeMiscCullingSystem.cs
@@ -125,10 +125,10 @@ private void InitializeMiscVisibility()
 
                     var cliffsBoundary = new VisibleBounds
                     {
-                        Bounds = new AABB
+                        Bounds = new Bounds()
                         {
-                            Center = bounds.center,
-                            Extents = bounds.extents + Vector3.one,
+                            center = bounds.center,
+                            extents = bounds.extents + Vector3.one,
                         },
                     };
 
@@ -157,10 +157,10 @@ private void InitializeWaterVisibility()
 
                 waterBoundaries[i] = new VisibleBounds
                 {
-                    Bounds = new AABB
+                    Bounds = new Bounds()
                     {
-                        Center = bounds.center,
-                        Extents = bounds.extents + Vector3.one,
+                        center = bounds.center,
+                        extents = bounds.extents + Vector3.one,
                     },
                 };
             }

diff --git a/Explorer/Assets/DCL/Landscape/Systems/LandscapeTerrainCullingSystem.cs b/Explorer/Assets/DCL/Landscape/Systems/LandscapeTerrainCullingSystem.cs
@@ -92,10 +92,10 @@ private void InitializeTerrainVisibility()
 
                 terrainVisibilities[i] = new VisibleBounds
                 {
-                    Bounds = new AABB
+                    Bounds = new Bounds
                     {
-                        Center = bounds.center,
-                        Extents = bounds.extents,
+                        center = bounds.center,
+                        extents = bounds.extents,
                     },
                 };
             }

diff --git a/Explorer/Packages/manifest.json b/Explorer/Packages/manifest.json
@@ -18,7 +18,6 @@
     "com.unity.code-analysis": "0.1.2-preview",
     "com.unity.collab-proxy": "2.4.4",
     "com.unity.collections": "2.1.4",
-    "com.unity.entities": "1.0.16",
     "com.unity.feature.development": "1.0.1",
     "com.unity.ide.rider": "3.0.31",
     "com.unity.inputsystem": "1.7.0",