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

Remove some client IEnumerables (#16501)

Browse Source
This commit is contained in:
metalgearsloth
2023-05-16 22:55:22 +10:00
committed by GitHub
parent e91fc652a3
commit 64bb57cdef
6 changed files with 30 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Content.Shared/Physics/Controllers/SharedConveyorController.cs
View File

@@ -13,9 +13,9 @@ namespace Content.Shared.Physics.Controllers;
public abstract class SharedConveyorController : VirtualController
{
[Dependency] protected readonly IMapManager _mapManager = default!;
[Dependency] protected readonly EntityLookupSystem _lookup = default!;
[Dependency] protected readonly SharedPhysicsSystem _physics = default!;
[Dependency] protected readonly IMapManager MapManager = default!;
[Dependency] protected readonly EntityLookupSystem Lookup = default!;
[Dependency] protected readonly SharedPhysicsSystem Physics = default!;
[Dependency] private readonly SharedGravitySystem _gravity = default!;
protected const string ConveyorFixture = "conveyor";
@@ -74,10 +74,10 @@ public abstract class SharedConveyorController : VirtualController
// Don't use it directly in EntityQuery because we may be able to save getcomponents.
var xformQuery = GetEntityQuery<TransformComponent>();
var bodyQuery = GetEntityQuery<PhysicsComponent>();
var query = EntityQueryEnumerator<ActiveConveyorComponent, ConveyorComponent>();
foreach (var (_, comp) in EntityQuery<ActiveConveyorComponent, ConveyorComponent>())
while (query.MoveNext(out var uid, out var _, out var comp))
{
var uid = comp.Owner;
Convey(uid, comp, xformQuery, bodyQuery, conveyed, frameTime, prediction);
}
}
@@ -115,8 +115,8 @@ public abstract class SharedConveyorController : VirtualController
transform.LocalPosition = localPos;
// Force it awake for collisionwake reasons.
_physics.SetAwake(entity, body, true);
_physics.SetSleepTime(body, 0f);
Physics.SetAwake(entity, body, true);
Physics.SetSleepTime(body, 0f);
}
Dirty(comp);
}
@@ -161,9 +161,9 @@ public abstract class SharedConveyorController : VirtualController
EntityQuery<PhysicsComponent> bodyQuery)
{
// Check if the thing's centre overlaps the grid tile.
var grid = _mapManager.GetGrid(xform.GridUid!.Value);
var grid = MapManager.GetGrid(xform.GridUid!.Value);
var tile = grid.GetTileRef(xform.Coordinates);
var conveyorBounds = _lookup.GetLocalBounds(tile, grid.TileSize);
var conveyorBounds = Lookup.GetLocalBounds(tile, grid.TileSize);
foreach (var entity in comp.Intersecting)
{