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

Slight DoAfterSystem improvement (#8806)

Browse Source
This commit is contained in:
Leon Friedrich
2022-06-13 19:07:49 +12:00
committed by GitHub
parent eea508a002
commit db2353a24e
1 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
Content.Client/DoAfter/DoAfterSystem.cs
View File

@@ -1,4 +1,4 @@
using System.Linq; using System.Linq;
using Content.Client.DoAfter.UI; using Content.Client.DoAfter.UI;
using Content.Shared.DoAfter; using Content.Shared.DoAfter;
using Content.Shared.Examine; using Content.Shared.Examine;
@@ -30,6 +30,7 @@ namespace Content.Client.DoAfter
[Dependency] private readonly IGameTiming _gameTiming = default!; [Dependency] private readonly IGameTiming _gameTiming = default!;
[Dependency] private readonly IPlayerManager _player = default!; [Dependency] private readonly IPlayerManager _player = default!;
[Dependency] private readonly ExamineSystemShared _examineSystem = default!; [Dependency] private readonly ExamineSystemShared _examineSystem = default!;
[Dependency] private readonly SharedTransformSystem _xformSystem = default!;
/// <summary> /// <summary>
/// We'll use an excess time so stuff like finishing effects can show. /// We'll use an excess time so stuff like finishing effects can show.
@@ -186,6 +187,8 @@ namespace Content.Client.DoAfter
component.Gui?.CancelDoAfter(id); component.Gui?.CancelDoAfter(id);
} }
// TODO move this to an overlay
// TODO separate DoAfter & ActiveDoAfter components for the entity query.
public override void Update(float frameTime) public override void Update(float frameTime)
{ {
base.Update(frameTime); base.Update(frameTime);
@@ -203,30 +206,38 @@ namespace Content.Client.DoAfter
var occluded = _examineSystem.IsOccluded(attached.Value); var occluded = _examineSystem.IsOccluded(attached.Value);
var viewbox = _eyeManager.GetWorldViewport().Enlarged(2.0f); var viewbox = _eyeManager.GetWorldViewport().Enlarged(2.0f);
var entXform = Transform(attached.Value); var xforms = GetEntityQuery<TransformComponent>();
var playerPos = entXform.MapPosition; var entXform = xforms.GetComponent(attached.Value);
var playerPos = _xformSystem.GetWorldPosition(entXform, xforms);
foreach (var (comp, xform) in EntityManager.EntityQuery<DoAfterComponent, TransformComponent>(true)) foreach (var (comp, xform) in EntityManager.EntityQuery<DoAfterComponent, TransformComponent>(true))
{ {
var doAfters = comp.DoAfters; var doAfters = comp.DoAfters;
var compPos = xform.MapPosition;
if (doAfters.Count == 0 || if (doAfters.Count == 0 || xform.MapID != entXform.MapID)
compPos.MapId != entXform.MapID ||
!viewbox.Contains(compPos.Position))
{ {
Disable(comp); Disable(comp);
continue; continue;
} }
var range = (compPos.Position - playerPos.Position).Length + 0.01f; var compPos = _xformSystem.GetWorldPosition(xform, xforms);
if (!viewbox.Contains(compPos))
{
Disable(comp);
continue;
}
var range = (compPos - playerPos).Length + 0.01f;
if (occluded && if (occluded &&
comp.Owner != attached && comp.Owner != attached &&
// Static ExamineSystemShared.InRangeUnOccluded has to die.
!ExamineSystemShared.InRangeUnOccluded( !ExamineSystemShared.InRangeUnOccluded(
playerPos, new(playerPos, entXform.MapID),
compPos, range, new(compPos, entXform.MapID), range,
(comp.Owner, attached), predicate)) (comp.Owner, attached), predicate,
entMan: EntityManager))
{ {
Disable(comp); Disable(comp);
continue; continue;