Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Reduce node resolves (#6435)

Browse Source
This commit is contained in:
Leon Friedrich
2022-02-07 01:10:33 +13:00
committed by GitHub
parent b82926e324
commit 1e10314900
12 changed files with 195 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
Content.Server/NodeContainer/Nodes/NodeHelpers.cs
View File

@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using Robust.Shared.GameObjects;
@@ -12,11 +12,11 @@ namespace Content.Server.NodeContainer.Nodes
/// </summary>
public static class NodeHelpers
{
public static IEnumerable<Node> GetNodesInTile(IEntityManager entMan, IMapGrid grid, Vector2i coords)
public static IEnumerable<Node> GetNodesInTile(EntityQuery<NodeContainerComponent> nodeQuery, IMapGrid grid, Vector2i coords)
{
foreach (var entityUid in grid.GetAnchoredEntities(coords))
{
if (!entMan.TryGetComponent(entityUid, out NodeContainerComponent? container))
if (!nodeQuery.TryGetComponent(entityUid, out var container))
continue;
foreach (var node in container.Nodes.Values)
@@ -27,14 +27,14 @@ namespace Content.Server.NodeContainer.Nodes
}
public static IEnumerable<(Direction dir, Node node)> GetCardinalNeighborNodes(
IEntityManager entMan,
EntityQuery<NodeContainerComponent> nodeQuery,
IMapGrid grid,
Vector2i coords,
bool includeSameTile = true)
{
foreach (var (dir, entityUid) in GetCardinalNeighborCells(grid, coords, includeSameTile))
{
if (!entMan.TryGetComponent(entityUid, out NodeContainerComponent? container))
if (!nodeQuery.TryGetComponent(entityUid, out var container))
continue;
foreach (var node in container.Nodes.Values)
@@ -68,22 +68,5 @@ namespace Content.Server.NodeContainer.Nodes
foreach (var uid in grid.GetAnchoredEntities(coords + (-1, 0)))
yield return (Direction.West, uid);
}
public static Vector2i TileOffsetForDir(Direction dir)
{
return dir switch
{
Direction.Invalid => (0, 0),
Direction.South => (0, -1),
Direction.SouthEast => (1, -1),
Direction.East => (1, 0),
Direction.NorthEast => (1, 1),
Direction.North => (0, 1),
Direction.NorthWest => (-1, 1),
Direction.West => (-1, 0),
Direction.SouthWest => (-1, -1),
_ => throw new ArgumentOutOfRangeException(nameof(dir), dir, null)
};
}
}
}