juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improve GetInStation filter (#33405)

Browse Source 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
This commit is contained in:
Milon
2025-02-09 10:45:11 +01:00
committed by GitHub
parent b4b4db73d1
commit 9963416c1d
1 changed files with 53 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
Content.Server/Station/Systems/StationSystem.cs
View File

@@ -37,11 +37,20 @@ public sealed class StationSystem : EntitySystem
private ISawmill _sawmill = default!;
private EntityQuery<MapGridComponent> _gridQuery;
private EntityQuery<TransformComponent> _xformQuery;
private ValueList<MapId> _mapIds = new();
private ValueList<(Box2Rotated Bounds, MapId MapId)> _gridBounds = new();
/// <inheritdoc/>
public override void Initialize()
{
_sawmill = _logManager.GetSawmill("station");
_gridQuery = GetEntityQuery<MapGridComponent>();
_xformQuery = GetEntityQuery<TransformComponent>();
SubscribeLocalEvent<GameRunLevelChangedEvent>(OnRoundEnd);
SubscribeLocalEvent<PostGameMapLoad>(OnPostGameMapLoad);
SubscribeLocalEvent<StationDataComponent, ComponentStartup>(OnStationAdd);
@@ -211,45 +220,72 @@ public sealed class StationSystem : EntitySystem
/// </summary>
public Filter GetInStation(StationDataComponent dataComponent, float range = 32f)
{
// Could also use circles if you wanted.
var bounds = new ValueList<Box2>(dataComponent.Grids.Count);
var filter = Filter.Empty();
var mapIds = new ValueList<MapId>();
var xformQuery = GetEntityQuery<TransformComponent>();
_mapIds.Clear();
// First collect all valid map IDs where station grids exist
foreach (var gridUid in dataComponent.Grids)
{
if (!TryComp(gridUid, out MapGridComponent? grid) ||
!xformQuery.TryGetComponent(gridUid, out var xform))
if (!_xformQuery.TryGetComponent(gridUid, out var xform))
continue;
var mapId = xform.MapID;
var position = _transform.GetWorldPosition(xform, xformQuery);
var bound = grid.LocalAABB.Enlarged(range).Translated(position);
if (!_mapIds.Contains(mapId))
_mapIds.Add(mapId);
}
bounds.Add(bound);
if (!mapIds.Contains(mapId))
// Cache the rotated bounds for each grid
_gridBounds.Clear();
foreach (var gridUid in dataComponent.Grids)
{
if (!_gridQuery.TryComp(gridUid, out var grid) ||
!_xformQuery.TryGetComponent(gridUid, out var gridXform))
{
mapIds.Add(xform.MapID);
continue;
}
var (worldPos, worldRot) = _transform.GetWorldPositionRotation(gridXform);
var localBounds = grid.LocalAABB.Enlarged(range);
// Create a rotated box using the grid's transform
var rotatedBounds = new Box2Rotated(
localBounds,
worldRot,
worldPos);
_gridBounds.Add((rotatedBounds, gridXform.MapID));
}
foreach (var session in Filter.GetAllPlayers(_player))
{
var entity = session.AttachedEntity;
if (entity == null || !xformQuery.TryGetComponent(entity, out var xform))
if (entity == null || !_xformQuery.TryGetComponent(entity, out var xform))
continue;
var mapId = xform.MapID;
if (!mapIds.Contains(mapId))
if (!_mapIds.Contains(mapId))
continue;
var position = _transform.GetWorldPosition(xform, xformQuery);
foreach (var bound in bounds)
// Check if the player is directly on any station grid
var gridUid = xform.GridUid;
if (gridUid != null && dataComponent.Grids.Contains(gridUid.Value))
{
if (!bound.Contains(position))
filter.AddPlayer(session);
continue;
}
// If not directly on a grid, check against cached rotated bounds
var position = _transform.GetWorldPosition(xform);
foreach (var (bounds, boundsMapId) in _gridBounds)
{
// Skip bounds on different maps
if (boundsMapId != mapId)
continue;
if (!bounds.Contains(position))
continue;
filter.AddPlayer(session);