h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-12 15:22:55 +08:00
Code Issues Releases Wiki Activity

Fix span piece being incorrect in some drag scenarios

Browse Source
This commit is contained in:
Dean Herbert 2020-06-02 21:02:09 +09:00
parent 665530f1c3
commit 61f906d9c4
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
osu.Game.Rulesets.Taiko/Edit/Blueprints/TaikoSpanPlacementBlueprint.cs
View File

@ -48,6 +48,7 @@ namespace osu.Game.Rulesets.Taiko.Edit.Blueprints
} }
private double originalStartTime; private double originalStartTime;
private Vector2 originalPosition;
protected override bool OnMouseDown(MouseDownEvent e) protected override bool OnMouseDown(MouseDownEvent e)
{ {
@ -73,22 +74,25 @@ namespace osu.Game.Rulesets.Taiko.Edit.Blueprints
if (PlacementActive) if (PlacementActive)
{ {
if (result.Time is double endTime) if (result.Time is double dragTime)
{ {
if (endTime < originalStartTime) if (dragTime < originalStartTime)
{ {
HitObject.StartTime = endTime; HitObject.StartTime = dragTime;
spanPlacementObject.Duration = Math.Abs(endTime - originalStartTime); spanPlacementObject.Duration = Math.Abs(dragTime - originalStartTime);
headPiece.Position = ToLocalSpace(result.ScreenSpacePosition); headPiece.Position = ToLocalSpace(result.ScreenSpacePosition);
lengthPiece.X = headPiece.X; tailPiece.Position = originalPosition;
lengthPiece.Width = tailPiece.X - headPiece.X;
} }
else else
{ {
spanPlacementObject.Duration = Math.Abs(endTime - originalStartTime); HitObject.StartTime = originalStartTime;
spanPlacementObject.Duration = Math.Abs(dragTime - originalStartTime);
tailPiece.Position = ToLocalSpace(result.ScreenSpacePosition); tailPiece.Position = ToLocalSpace(result.ScreenSpacePosition);
lengthPiece.Width = tailPiece.X - headPiece.X; headPiece.Position = originalPosition;
} }
lengthPiece.X = headPiece.X;
lengthPiece.Width = tailPiece.X - headPiece.X;
} }
} }
else else
@ -96,7 +100,10 @@ namespace osu.Game.Rulesets.Taiko.Edit.Blueprints
lengthPiece.Position = headPiece.Position = tailPiece.Position = ToLocalSpace(result.ScreenSpacePosition); lengthPiece.Position = headPiece.Position = tailPiece.Position = ToLocalSpace(result.ScreenSpacePosition);
if (result.Time is double startTime) if (result.Time is double startTime)
{
originalStartTime = HitObject.StartTime = startTime; originalStartTime = HitObject.StartTime = startTime;
originalPosition = ToLocalSpace(result.ScreenSpacePosition);
}
} }
} }
} }