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

Fix StepTrigger error (#8480)

Browse Source 
* Fix StepTrigger error

* Changed it

* Update Content.Shared/StepTrigger/StepTriggerSystem.cs

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

* Update Content.Shared/StepTrigger/StepTriggerSystem.cs

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

* Update StepTriggerSystem.cs

* Update StepTriggerSystem.cs

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
This commit is contained in:
wrexbe
2022-05-27 22:39:26 -07:00
committed by GitHub
parent a63b64a46a
commit 4c40f3bdf8
1 changed files with 39 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
Content.Shared/StepTrigger/StepTriggerSystem.cs
View File

@@ -18,62 +18,60 @@ public sealed class StepTriggerSystem : EntitySystem
public override void Update(float frameTime) public override void Update(float frameTime)
{ {
foreach (var (_, trigger) in EntityQuery<StepTriggerActiveComponent, StepTriggerComponent>()) foreach (var (_, trigger, transform) in EntityQuery<StepTriggerActiveComponent, StepTriggerComponent, TransformComponent>())
{ {
if (!Update(trigger)) if (!Update(trigger, transform))
continue; continue;
RemComp<StepTriggerActiveComponent>(trigger.Owner); RemComp<StepTriggerActiveComponent>(trigger.Owner);
} }
} }
private bool Update(StepTriggerComponent component) private bool Update(StepTriggerComponent component, TransformComponent transform)
{ {
if (component.Deleted || !component.Active || component.Colliding.Count == 0) if (!component.Active ||
component.Colliding.Count == 0)
return true; return true;
foreach (var otherUid in component.Colliding.ToArray()) foreach (var otherUid in component.Colliding.ToArray())
{ {
if (!otherUid.IsValid()) var shouldRemoveFromColliding = UpdateColliding(component, transform, otherUid);
{ if (!shouldRemoveFromColliding) continue;
component.Colliding.Remove(otherUid);
component.CurrentlySteppedOn.Remove(otherUid);
component.Dirty();
continue;
}
// TODO: This shouldn't be calculating based on world AABBs. component.Colliding.Remove(otherUid);
var ourAabb = _entityLookup.GetWorldAABB(component.Owner); component.CurrentlySteppedOn.Remove(otherUid);
var otherAabb = _entityLookup.GetWorldAABB(otherUid); Dirty(component);
if (!TryComp(otherUid, out PhysicsComponent? otherPhysics) || !ourAabb.Intersects(otherAabb))
{
component.Colliding.Remove(otherUid);
component.CurrentlySteppedOn.Remove(otherUid);
component.Dirty();
continue;
}
if (component.CurrentlySteppedOn.Contains(otherUid))
continue;
if (!CanTrigger(component.Owner, otherUid, component))
continue;
if (otherPhysics.LinearVelocity.Length < component.RequiredTriggerSpeed)
continue;
var percentage = otherAabb.IntersectPercentage(ourAabb);
if (percentage < component.IntersectRatio)
continue;
var ev = new StepTriggeredEvent { Source = component.Owner, Tripper = otherUid };
RaiseLocalEvent(component.Owner, ref ev);
component.CurrentlySteppedOn.Add(otherUid);
component.Dirty();
} }
return false;
}
private bool UpdateColliding(StepTriggerComponent component, TransformComponent ownerTransform, EntityUid otherUid)
{
if (!TryComp(otherUid, out PhysicsComponent? otherPhysics))
return true;
if (component.CurrentlySteppedOn.Contains(otherUid) ||
!CanTrigger(component.Owner, otherUid, component) ||
otherPhysics.LinearVelocity.Length < component.RequiredTriggerSpeed)
return false;
// TODO: This shouldn't be calculating based on world AABBs.
var ourAabb = _entityLookup.GetWorldAABB(component.Owner, ownerTransform);
var otherAabb = _entityLookup.GetWorldAABB(otherUid);
if (!ourAabb.Intersects(otherAabb))
return true;
var percentage = otherAabb.IntersectPercentage(ourAabb);
if (percentage < component.IntersectRatio)
return false;
var ev = new StepTriggeredEvent { Source = component.Owner, Tripper = otherUid };
RaiseLocalEvent(component.Owner, ref ev);
component.CurrentlySteppedOn.Add(otherUid);
Dirty(component);
return false; return false;
} }