tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup PathfindingSystem (#36083)

Browse Source 
* EntityCoordinates.GetMapUid -> SharedTransformSystem.GetMap

* EntityCoordinates.GetGridUid -> SharedTransformSystem.GetGrid

* EntityCoordinates.ToMapPos -> SharedTransformSystem.ToMapCoordinates().Position

* Formatting why not
This commit is contained in:
Tayrtahn
2025-03-25 16:51:11 -04:00
committed by GitHub
parent 1732579c22
commit 8dfa2e8f95
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Content.Server/NPC/Pathfinding/PathfindingSystem.cs
View File

@@ -188,8 +188,8 @@ namespace Content.Server.NPC.Pathfinding
/// </summary> /// </summary>
public bool TryCreatePortal(EntityCoordinates coordsA, EntityCoordinates coordsB, out int handle) public bool TryCreatePortal(EntityCoordinates coordsA, EntityCoordinates coordsB, out int handle)
{ {
var mapUidA = coordsA.GetMapUid(EntityManager); var mapUidA = _transform.GetMap(coordsA);
var mapUidB = coordsB.GetMapUid(EntityManager); var mapUidB = _transform.GetMap(coordsB);
handle = -1; handle = -1;
if (mapUidA != mapUidB || mapUidA == null) if (mapUidA != mapUidB || mapUidA == null)
@@ -197,8 +197,8 @@ namespace Content.Server.NPC.Pathfinding
return false; return false;
} }
var gridUidA = coordsA.GetGridUid(EntityManager); var gridUidA = _transform.GetGrid(coordsA);
var gridUidB = coordsB.GetGridUid(EntityManager); var gridUidB = _transform.GetGrid(coordsB);
if (!TryComp<GridPathfindingComponent>(gridUidA, out var gridA) || if (!TryComp<GridPathfindingComponent>(gridUidA, out var gridA) ||
!TryComp<GridPathfindingComponent>(gridUidB, out var gridB)) !TryComp<GridPathfindingComponent>(gridUidB, out var gridB))
@@ -236,8 +236,8 @@ namespace Content.Server.NPC.Pathfinding
_portals.Remove(handle); _portals.Remove(handle);
var gridUidA = portal.CoordinatesA.GetGridUid(EntityManager); var gridUidA = _transform.GetGrid(portal.CoordinatesA);
var gridUidB = portal.CoordinatesB.GetGridUid(EntityManager); var gridUidB = _transform.GetGrid(portal.CoordinatesB);
if (!TryComp<GridPathfindingComponent>(gridUidA, out var gridA) || if (!TryComp<GridPathfindingComponent>(gridUidA, out var gridA) ||
!TryComp<GridPathfindingComponent>(gridUidB, out var gridB)) !TryComp<GridPathfindingComponent>(gridUidB, out var gridB))
@@ -397,7 +397,7 @@ namespace Content.Server.NPC.Pathfinding
/// </summary> /// </summary>
public PathPoly? GetPoly(EntityCoordinates coordinates) public PathPoly? GetPoly(EntityCoordinates coordinates)
{ {
var gridUid = coordinates.GetGridUid(EntityManager); var gridUid = _transform.GetGrid(coordinates);
if (!TryComp<GridPathfindingComponent>(gridUid, out var comp) || if (!TryComp<GridPathfindingComponent>(gridUid, out var comp) ||
!TryComp(gridUid, out TransformComponent? xform)) !TryComp(gridUid, out TransformComponent? xform))
@@ -405,7 +405,7 @@ namespace Content.Server.NPC.Pathfinding
return null; return null;
} }
var localPos = Vector2.Transform(coordinates.ToMapPos(EntityManager, _transform), _transform.GetInvWorldMatrix(xform)); var localPos = Vector2.Transform(_transform.ToMapCoordinates(coordinates).Position, _transform.GetInvWorldMatrix(xform));
var origin = GetOrigin(localPos); var origin = GetOrigin(localPos);
if (!TryGetChunk(origin, comp, out var chunk)) if (!TryGetChunk(origin, comp, out var chunk))