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

Revert "Improves sprite click detection (#3480)" (#3536)

Browse Source 
This reverts commit abdee3d4ee.
This commit is contained in:
metalgearsloth
2021-03-07 03:49:23 +11:00
committed by GitHub
parent 8710e538f9
commit d70fec01cb
1 changed files with 1 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Content.Client/GameObjects/Components/ClickableComponent.cs
View File

@@ -89,17 +89,7 @@ namespace Content.Client.GameObjects.Components
var layerPos = modAngle.RotateVec(localPos); var layerPos = modAngle.RotateVec(localPos);
var localOffset = layerPos * EyeManager.PixelsPerMeter; var localOffset = layerPos * EyeManager.PixelsPerMeter * (1, -1);
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()
};
if (layer.Texture != null) if (layer.Texture != null)
{ {
if (_clickMapManager.IsOccluding(layer.Texture, if (_clickMapManager.IsOccluding(layer.Texture,
@@ -118,10 +108,6 @@ namespace Content.Client.GameObjects.Components
} }
var (mX, mY) = localOffset + rsi.Size / 2; 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, if (_clickMapManager.IsOccluding(rsi, layer.RsiState, dir,
layer.AnimationFrame, ((int) mX, (int) mY))) layer.AnimationFrame, ((int) mX, (int) mY)))