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

Fix wallmount interaction (#38111)

Browse Source
This commit is contained in:
slarticodefast
2025-06-21 15:11:17 +02:00
committed by GitHub
parent 0d346840da
commit 686016098a
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Content.Shared/Interaction/SharedInteractionSystem.cs
View File

@@ -747,7 +747,7 @@ namespace Content.Shared.Interaction
var inRange = true; var inRange = true;
MapCoordinates originPos = default; MapCoordinates originPos = default;
var targetPos = _transform.ToMapCoordinates(otherCoordinates); var targetPos = _transform.ToMapCoordinates(otherCoordinates);
Angle targetRot = default; Angle targetRot = _transform.GetWorldRotation(otherCoordinates.EntityId) + otherAngle;
// So essentially: // So essentially:
// 1. If fixtures available check nearest point. We take in coordinates / angles because we might want to use a lag compensated position // 1. If fixtures available check nearest point. We take in coordinates / angles because we might want to use a lag compensated position
@@ -766,8 +766,7 @@ namespace Content.Shared.Interaction
{ {
var (worldPosA, worldRotA) = _transform.GetWorldPositionRotation(origin.Comp); var (worldPosA, worldRotA) = _transform.GetWorldPositionRotation(origin.Comp);
var xfA = new Transform(worldPosA, worldRotA); var xfA = new Transform(worldPosA, worldRotA);
var parentRotB = _transform.GetWorldRotation(otherCoordinates.EntityId); var xfB = new Transform(targetPos.Position, targetRot);
var xfB = new Transform(targetPos.Position, parentRotB + otherAngle);
// Different map or the likes. // Different map or the likes.
if (!_broadphase.TryGetNearest( if (!_broadphase.TryGetNearest(
@@ -809,8 +808,6 @@ namespace Content.Shared.Interaction
else else
{ {
originPos = _transform.GetMapCoordinates(origin, origin); originPos = _transform.GetMapCoordinates(origin, origin);
var otherParent = (other.Comp ?? Transform(other)).ParentUid;
targetRot = otherParent.IsValid() ? Transform(otherParent).LocalRotation + otherAngle : otherAngle;
} }
// Do a raycast to check if relevant // Do a raycast to check if relevant
@@ -851,7 +848,7 @@ namespace Content.Shared.Interaction
/// if the target entity is a wallmount we ignore all other entities on the tile. /// if the target entity is a wallmount we ignore all other entities on the tile.
/// </example> /// </example>
private Ignored GetPredicate( private Ignored GetPredicate(
MapCoordinates origin, MapCoordinates originCoords,
EntityUid target, EntityUid target,
MapCoordinates targetCoords, MapCoordinates targetCoords,
Angle targetRotation, Angle targetRotation,
@@ -871,7 +868,7 @@ namespace Content.Shared.Interaction
if (target == otherEnt || if (target == otherEnt ||
!_physicsQuery.TryComp(otherEnt, out var otherBody) || !_physicsQuery.TryComp(otherEnt, out var otherBody) ||
!otherBody.CanCollide || !otherBody.CanCollide ||
((int) collisionMask & otherBody.CollisionLayer) == 0x0) ((int)collisionMask & otherBody.CollisionLayer) == 0x0)
{ {
continue; continue;
} }
@@ -888,7 +885,7 @@ namespace Content.Shared.Interaction
ignoreAnchored = true; ignoreAnchored = true;
else else
{ {
var angle = Angle.FromWorldVec(origin.Position - targetCoords.Position); var angle = Angle.FromWorldVec(originCoords.Position - targetCoords.Position);
var angleDelta = (wallMount.Direction + targetRotation - angle).Reduced().FlipPositive(); var angleDelta = (wallMount.Direction + targetRotation - angle).Reduced().FlipPositive();
ignoreAnchored = angleDelta < wallMount.Arc / 2 || Math.Tau - angleDelta < wallMount.Arc / 2; ignoreAnchored = angleDelta < wallMount.Arc / 2 || Math.Tau - angleDelta < wallMount.Arc / 2;
} }