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

Remove 700 usages of Component.Owner (#21100)

Browse Source
This commit is contained in:
DrSmugleaf
2023-10-19 12:34:31 -07:00
committed by GitHub
parent 5825ffb95c
commit f560f88eb5
261 changed files with 2291 additions and 2036 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Content.Client/NodeContainer/NodeVisualizationOverlay.cs
View File

@@ -6,6 +6,7 @@ using Robust.Client.Input;
using Robust.Client.ResourceManagement;
using Robust.Shared.Enums;
using Robust.Shared.Map;
using Robust.Shared.Map.Components;
using Robust.Shared.Timing;
using Robust.Shared.Utility;
using static Content.Shared.NodeContainer.NodeVis;
@@ -22,6 +23,7 @@ namespace Content.Client.NodeContainer
private readonly Dictionary<(int, int), NodeRenderData> _nodeIndex = new();
private readonly Dictionary<EntityUid, Dictionary<Vector2i, List<(GroupData, NodeDatum)>>> _gridIndex = new ();
private List<Entity<MapGridComponent>> _grids = new();
private readonly Font _font;
@@ -112,21 +114,24 @@ namespace Content.Client.NodeContainer
var worldAABB = overlayDrawArgs.WorldAABB;
var xformQuery = _entityManager.GetEntityQuery<TransformComponent>();
foreach (var grid in _mapManager.FindGridsIntersecting(map, worldAABB))
_grids.Clear();
_mapManager.FindGridsIntersecting(map, worldAABB, ref _grids);
foreach (var grid in _grids)
{
foreach (var entity in _lookup.GetEntitiesIntersecting(grid.Owner, worldAABB))
foreach (var entity in _lookup.GetEntitiesIntersecting(grid, worldAABB))
{
if (!_system.Entities.TryGetValue(entity, out var nodeData))
continue;
var gridDict = _gridIndex.GetOrNew(grid.Owner);
var gridDict = _gridIndex.GetOrNew(grid);
var coords = xformQuery.GetComponent(entity).Coordinates;
// TODO: This probably shouldn't be capable of returning NaN...
if (float.IsNaN(coords.Position.X) || float.IsNaN(coords.Position.Y))
continue;
var tile = gridDict.GetOrNew(grid.TileIndicesFor(coords));
var tile = gridDict.GetOrNew(grid.Comp.TileIndicesFor(coords));
foreach (var (group, nodeDatum) in nodeData)
{
@@ -141,7 +146,7 @@ namespace Content.Client.NodeContainer
foreach (var (gridId, gridDict) in _gridIndex)
{
var grid = _mapManager.GetGrid(gridId);
var (_, _, worldMatrix, invMatrix) = _entityManager.GetComponent<TransformComponent>(grid.Owner).GetWorldPositionRotationMatrixWithInv();
var (_, _, worldMatrix, invMatrix) = _entityManager.GetComponent<TransformComponent>(gridId).GetWorldPositionRotationMatrixWithInv();
var lCursorBox = invMatrix.TransformBox(cursorBox);
foreach (var (pos, list) in gridDict)