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

move rotation logic to its own method

Browse Source
This commit is contained in:
mcendu 2020-02-05 14:23:59 +08:00
parent d773eb2c22
commit 9f79713fb3
1 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs
View File

@ -96,32 +96,12 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
var thisAngle = -MathUtils.RadiansToDegrees(MathF.Atan2(mousePosition.X - DrawSize.X / 2, mousePosition.Y - DrawSize.Y / 2)); var thisAngle = -MathUtils.RadiansToDegrees(MathF.Atan2(mousePosition.X - DrawSize.X / 2, mousePosition.Y - DrawSize.Y / 2));
bool validAndTracking = tracking && spinner.StartTime <= Time.Current && spinner.EndTime > Time.Current;
var delta = thisAngle - lastAngle; var delta = thisAngle - lastAngle;
bool validAndTracking = tracking && spinner.StartTime <= Time.Current && spinner.EndTime > Time.Current;
if (validAndTracking) if (validAndTracking)
{ Rotate(delta);
if (!rotationTransferred)
{
currentRotation = Rotation * 2;
rotationTransferred = true;
}
if (delta > 180)
{
lastAngle += 360;
delta -= 360;
}
else if (-delta > 180)
{
lastAngle -= 360;
delta += 360;
}
currentRotation += delta;
RotationAbsolute += Math.Abs(delta) * Math.Sign(Clock.ElapsedFrameTime);
}
lastAngle = thisAngle; lastAngle = thisAngle;
@ -136,5 +116,28 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
this.RotateTo(currentRotation / 2, validAndTracking ? 500 : 1500, Easing.OutExpo); this.RotateTo(currentRotation / 2, validAndTracking ? 500 : 1500, Easing.OutExpo);
} }
public void Rotate(float angle)
{
if (!rotationTransferred)
{
currentRotation = Rotation * 2;
rotationTransferred = true;
}
if (angle > 180)
{
lastAngle += 360;
angle -= 360;
}
else if (-angle > 180)
{
lastAngle -= 360;
angle += 360;
}
currentRotation += angle;
RotationAbsolute += Math.Abs(angle) * Math.Sign(Clock.ElapsedFrameTime);
}
} }
} }