Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

remove entity queries (#642)

Browse Source
This commit is contained in:
ThereDrD
2024-08-20 05:37:32 +03:00
committed by GitHub
parent 14fb328ea5
commit 34bf28d302
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Content.Server/Singularity/EntitySystems/GravityWellSystem.cs
View File

@@ -190,19 +190,20 @@ public sealed class GravityWellSystem : SharedGravityWellSystem
var epicenter = mapPos.Position; var epicenter = mapPos.Position;
var minRange2 = MathF.Max(minRange * minRange, MinGravPulseRange); // Cache square value for speed. Also apply a sane minimum value to the minimum value so that div/0s don't happen. var minRange2 = MathF.Max(minRange * minRange, MinGravPulseRange); // Cache square value for speed. Also apply a sane minimum value to the minimum value so that div/0s don't happen.
var bodyQuery = GetEntityQuery<PhysicsComponent>();
var xformQuery = GetEntityQuery<TransformComponent>();
foreach(var entity in _lookup.GetEntitiesInRange(mapPos.MapId, epicenter, maxRange, flags: LookupFlags.Dynamic | LookupFlags.Static | LookupFlags.Sundries)) foreach(var entity in _lookup.GetEntitiesInRange(mapPos.MapId, epicenter, maxRange, flags: LookupFlags.Dynamic | LookupFlags.Static | LookupFlags.Sundries))
{ {
if (!entity.Valid)
continue;
if (ignore?.Contains(entity) is true) if (ignore?.Contains(entity) is true)
continue; continue;
if (!bodyQuery.TryGetComponent(entity, out var physics)) // WD edit // WD added start
if (!TryComp<PhysicsComponent>(entity, out var physics)) // WD edit
continue; continue;
// WD added start if (!TryComp(entity, out TransformComponent? xform))
var xform = Transform(entity); continue;
if (HasComp<ContainmentFieldGeneratorComponent>(entity)) if (HasComp<ContainmentFieldGeneratorComponent>(entity))
continue; continue;
@@ -220,7 +221,7 @@ public sealed class GravityWellSystem : SharedGravityWellSystem
if (xform.Anchored) // WD added if (xform.Anchored) // WD added
_transform.Unanchor(entity, xform); _transform.Unanchor(entity, xform);
var displacement = epicenter - _transform.GetWorldPosition(entity, xformQuery); var displacement = epicenter - _transform.GetWorldPosition(entity);
var distance2 = displacement.LengthSquared(); var distance2 = displacement.LengthSquared();
if (distance2 < minRange2) if (distance2 < minRange2)