Replace GridEntityId with Owner (#12743)

This commit is contained in:
metalgearsloth
2022-12-12 14:59:02 +11:00
committed by GitHub
parent 4cbf78646a
commit 3b3963083b
75 changed files with 190 additions and 190 deletions

View File

@@ -113,12 +113,12 @@ namespace Content.Client.NodeContainer
foreach (var grid in _mapManager.FindGridsIntersecting(map, worldAABB))
{
foreach (var entity in _lookup.GetEntitiesIntersecting(grid.GridEntityId, worldAABB))
foreach (var entity in _lookup.GetEntitiesIntersecting(grid.Owner, worldAABB))
{
if (!_system.Entities.TryGetValue(entity, out var nodeData))
continue;
var gridDict = _gridIndex.GetOrNew(grid.GridEntityId);
var gridDict = _gridIndex.GetOrNew(grid.Owner);
var coords = xformQuery.GetComponent(entity).Coordinates;
// TODO: This probably shouldn't be capable of returning NaN...
@@ -140,7 +140,7 @@ namespace Content.Client.NodeContainer
foreach (var (gridId, gridDict) in _gridIndex)
{
var grid = _mapManager.GetGrid(gridId);
var (_, _, worldMatrix, invMatrix) = _entityManager.GetComponent<TransformComponent>(grid.GridEntityId).GetWorldPositionRotationMatrixWithInv();
var (_, _, worldMatrix, invMatrix) = _entityManager.GetComponent<TransformComponent>(grid.Owner).GetWorldPositionRotationMatrixWithInv();
var lCursorBox = invMatrix.TransformBox(cursorBox);
foreach (var (pos, list) in gridDict)