From d70fec01cbc56dacb18e30ff635e41fb80984ab5 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Sun, 7 Mar 2021 03:49:23 +1100 Subject: [PATCH] Revert "Improves sprite click detection (#3480)" (#3536) This reverts commit abdee3d4eeb2c1bb76ceb129db27e6f780d9712d. --- .../GameObjects/Components/ClickableComponent.cs | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/Content.Client/GameObjects/Components/ClickableComponent.cs b/Content.Client/GameObjects/Components/ClickableComponent.cs index c6ac93b7c5..c9a695df18 100644 --- a/Content.Client/GameObjects/Components/ClickableComponent.cs +++ b/Content.Client/GameObjects/Components/ClickableComponent.cs @@ -89,17 +89,7 @@ namespace Content.Client.GameObjects.Components var layerPos = modAngle.RotateVec(localPos); - var localOffset = layerPos * EyeManager.PixelsPerMeter; - - localOffset *= layer.DirOffset switch - { - SpriteComponent.DirectionOffset.None => (1, -1), - SpriteComponent.DirectionOffset.Clockwise => (-1, -1), - SpriteComponent.DirectionOffset.CounterClockwise => (1, 1), - SpriteComponent.DirectionOffset.Flip => (-1, 1), - _ => throw new ArgumentOutOfRangeException() - }; - + var localOffset = layerPos * EyeManager.PixelsPerMeter * (1, -1); if (layer.Texture != null) { if (_clickMapManager.IsOccluding(layer.Texture, @@ -118,10 +108,6 @@ namespace Content.Client.GameObjects.Components } var (mX, mY) = localOffset + rsi.Size / 2; - (mX, mY) = layer.DirOffset == SpriteComponent.DirectionOffset.Clockwise || - layer.DirOffset == SpriteComponent.DirectionOffset.CounterClockwise - ? (mY, mX) - : (mX, mY); if (_clickMapManager.IsOccluding(rsi, layer.RsiState, dir, layer.AnimationFrame, ((int) mX, (int) mY)))