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

Fix clickmaps for SnapCardinals (#10908)

Browse Source 
* Fix clickmaps for SnapCardinals

* Poke tests
This commit is contained in:
Leon Friedrich
2022-08-29 13:55:32 +12:00
committed by GitHub
parent de7bd0063a
commit 0ebc733b3a
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Client/Clickable/ClickableComponent.cs
View File

@@ -26,7 +26,7 @@ namespace Content.Client.Clickable
/// <returns>True if the click worked, false otherwise.</returns> /// <returns>True if the click worked, false otherwise.</returns>
public bool CheckClick(Vector2 worldPos, out int drawDepth, out uint renderOrder) public bool CheckClick(Vector2 worldPos, out int drawDepth, out uint renderOrder)
{ {
if (!_entMan.TryGetComponent(Owner, out ISpriteComponent? sprite) || !sprite.Visible) if (!_entMan.TryGetComponent(Owner, out SpriteComponent? sprite) || !sprite.Visible)
{ {
drawDepth = default; drawDepth = default;
renderOrder = default; renderOrder = default;
@@ -54,8 +54,10 @@ namespace Content.Client.Clickable
// This should have been the rotation of the sprite relative to the screen, but this is not the case with no-rot or directional sprites. // This should have been the rotation of the sprite relative to the screen, but this is not the case with no-rot or directional sprites.
var relativeRotation = worldRot + _eyeManager.CurrentEye.Rotation; var relativeRotation = worldRot + _eyeManager.CurrentEye.Rotation;
Angle cardinalSnapping = sprite.SnapCardinals ? relativeRotation.GetCardinalDir().ToAngle() : Angle.Zero;
// First we get `localPos`, the clicked location in the sprite-coordinate frame. // First we get `localPos`, the clicked location in the sprite-coordinate frame.
var entityXform = Matrix3.CreateInverseTransform(transform.WorldPosition, sprite.NoRotation ? -_eyeManager.CurrentEye.Rotation : worldRot); var entityXform = Matrix3.CreateInverseTransform(transform.WorldPosition, sprite.NoRotation ? -_eyeManager.CurrentEye.Rotation : worldRot - cardinalSnapping);
var localPos = invSpriteMatrix.Transform(entityXform.Transform(worldPos)); var localPos = invSpriteMatrix.Transform(entityXform.Transform(worldPos));
// Check explicitly defined click-able bounds // Check explicitly defined click-able bounds