Fix AI vision occlusion (#31341)

Forgot to do this, but how tf do doors work then.
space-syndicate · Aug 23, 2024 · 42078b4 · 42078b4
1 parent 616601b
commit 42078b4
Showing 1 changed file with 22 additions and 18 deletions.
diff --git a/Content.Shared/Silicons/StationAi/StationAiVisionSystem.cs b/Content.Shared/Silicons/StationAi/StationAiVisionSystem.cs
@@ -95,12 +95,7 @@ public bool IsAccessible(Entity<MapGridComponent> grid, Vector2i tile, float exp
             // Get all other relevant tiles.
             while (tileEnumerator.MoveNext(out var tileRef))
             {
-                var tileBounds = _lookup.GetLocalBounds(tileRef.GridIndices, grid.Comp.TileSize).Enlarged(-0.05f);
-
-                _occluders.Clear();
-                _lookup.GetLocalEntitiesIntersecting(grid.Owner, tileBounds, _occluders, LookupFlags.Static);
-
-                if (_occluders.Count > 0)
+                if (IsOccluded(grid, tileRef.GridIndices))
                 {
                     _opaque.Add(tileRef.GridIndices);
                 }
@@ -125,6 +120,25 @@ public bool IsAccessible(Entity<MapGridComponent> grid, Vector2i tile, float exp
         return TargetFound;
     }
 
+    private bool IsOccluded(Entity<MapGridComponent> grid, Vector2i tile)
+    {
+        var tileBounds = _lookup.GetLocalBounds(tile, grid.Comp.TileSize).Enlarged(-0.05f);
+        _occluders.Clear();
+        _lookup.GetLocalEntitiesIntersecting(grid.Owner, tileBounds, _occluders, LookupFlags.Static);
+        var anyOccluders = false;
+
+        foreach (var occluder in _occluders)
+        {
+            if (!occluder.Comp.Enabled)
+                continue;
+
+            anyOccluders = true;
+            break;
+        }
+
+        return anyOccluders;
+    }
+
     /// <summary>
     /// Gets a byond-equivalent for tiles in the specified worldAABB.
     /// </summary>
@@ -160,12 +174,7 @@ public void GetView(Entity<MapGridComponent> grid, Box2Rotated worldBounds, Hash
 
         while (tileEnumerator.MoveNext(out var tileRef))
         {
-            var tileBounds = _lookup.GetLocalBounds(tileRef.GridIndices, grid.Comp.TileSize).Enlarged(-0.05f);
-
-            _occluders.Clear();
-            _lookup.GetLocalEntitiesIntersecting(grid.Owner, tileBounds, _occluders, LookupFlags.Static);
-
-            if (_occluders.Count > 0)
+            if (IsOccluded(grid, tileRef.GridIndices))
             {
                 _opaque.Add(tileRef.GridIndices);
             }
@@ -181,12 +190,7 @@ public void GetView(Entity<MapGridComponent> grid, Box2Rotated worldBounds, Hash
             if (_viewportTiles.Contains(tileRef.GridIndices))
                 continue;
 
-            var tileBounds = _lookup.GetLocalBounds(tileRef.GridIndices, grid.Comp.TileSize).Enlarged(-0.05f);
-
-            _occluders.Clear();
-            _lookup.GetLocalEntitiesIntersecting(grid.Owner, tileBounds, _occluders, LookupFlags.Static);
-
-            if (_occluders.Count > 0)
+            if (IsOccluded(grid, tileRef.GridIndices))
             {
                 _opaque.Add(tileRef.GridIndices);
             }