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

Optimise pinpointer activation significantly (#7169)

Browse Source
This commit is contained in:
metalgearsloth
2022-03-20 05:27:26 +11:00
committed by GitHub
parent 8e46b8040e
commit 0318b6f9e5
8 changed files with 54 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
Content.Server/Pinpointer/ServerPinpointerSystem.cs
View File

@@ -1,17 +1,13 @@
using Content.Shared.Interaction;
using Content.Shared.Pinpointer;
using Content.Shared.Whitelist;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Maths;
using System.Collections.Generic;
using System.Linq;
using Robust.Shared.Utility;
namespace Content.Server.Pinpointer
{
public sealed class ServerPinpointerSystem : SharedPinpointerSystem
{
[Dependency] private readonly EntityLookupSystem _entityLookup = default!;
[Dependency] private readonly SharedTransformSystem _transform = default!;
public override void Initialize()
{
@@ -24,9 +20,16 @@ namespace Content.Server.Pinpointer
TogglePinpointer(uid, component);
// try to find target from whitelist
if (component.IsActive && component.Whitelist != null)
if (component.IsActive && component.Component != null)
{
var target = FindTargetFromWhitelist(uid, component.Whitelist);
if (!EntityManager.ComponentFactory.TryGetRegistration(component.Component, out var reg))
{
Logger.Error($"Unable to find component registration for {component.Component} for pinpointer!");
DebugTools.Assert(false);
return;
}
var target = FindTargetFromComponent(uid, reg.Type);
SetTarget(uid, target, component);
}
}
@@ -47,24 +50,28 @@ namespace Content.Server.Pinpointer
/// Try to find the closest entity from whitelist on a current map
/// Will return null if can't find anything
/// </summary>
private EntityUid? FindTargetFromWhitelist(EntityUid uid, EntityWhitelist whitelist,
TransformComponent? transform = null)
private EntityUid? FindTargetFromComponent(EntityUid uid, Type whitelist, TransformComponent? transform = null)
{
if (!Resolve(uid, ref transform))
var xformQuery = GetEntityQuery<TransformComponent>();
if (transform == null)
xformQuery.TryGetComponent(uid, out transform);
if (transform == null)
return null;
var mapId = transform.MapID;
var ents = _entityLookup.GetEntitiesInMap(mapId);
// sort all entities in distance increasing order
var mapId = transform.MapID;
var l = new SortedList<float, EntityUid>();
foreach (var e in ents)
var worldPos = _transform.GetWorldPosition(transform, xformQuery);
foreach (var comp in EntityManager.GetAllComponents(whitelist))
{
if (whitelist.IsValid(e))
{
var dist = (EntityManager.GetComponent<TransformComponent>(e).WorldPosition - transform.WorldPosition).LengthSquared;
l.TryAdd(dist, e);
}
if (!xformQuery.TryGetComponent(comp.Owner, out var compXform) ||
compXform.MapID != mapId) continue;
var dist = (_transform.GetWorldPosition(compXform, xformQuery) - worldPos).LengthSquared;
l.TryAdd(dist, comp.Owner);
}
// return uid with a smallest distacne
@@ -124,10 +131,12 @@ namespace Content.Server.Pinpointer
/// <returns>Null if failed to caluclate distance between two entities</returns>
private Vector2? CalculateDirection(EntityUid pinUid, EntityUid trgUid)
{
var xformQuery = GetEntityQuery<TransformComponent>();
// check if entities have transform component
if (!EntityManager.TryGetComponent(pinUid, out TransformComponent? pin))
if (!xformQuery.TryGetComponent(pinUid, out var pin))
return null;
if (!EntityManager.TryGetComponent(trgUid, out TransformComponent? trg))
if (!xformQuery.TryGetComponent(trgUid, out var trg))
return null;
// check if they are on same map
@@ -135,7 +144,7 @@ namespace Content.Server.Pinpointer
return null;
// get world direction vector
var dir = (trg.WorldPosition - pin.WorldPosition);
var dir = (_transform.GetWorldPosition(trg, xformQuery) - _transform.GetWorldPosition(pin, xformQuery));
return dir;
}