sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-02 00:40:09 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into repeat-points

Browse Source
This commit is contained in:
ColdVolcano
2018-02-03 23:56:40 -06:00
parent b8f6dcffaf 3db75cd2fc
commit bf26fc94d8
50 changed files with 1412 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
osu.Game.Rulesets.Osu/Objects/Drawables/DrawableRepeatPoint.cs
View File

@ -18,7 +18,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
private readonly DrawableSlider drawableSlider;
/// <summary>
/// Whether currently in the last ControlPoint of the slider body's curve.
/// Whether this repeat point is at the end of the slider's curve.
/// </summary>
private bool isRepeatAtEnd => repeatPoint.RepeatIndex % 2 == 0;
@ -83,8 +83,22 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
var curve = drawableSlider.Body.CurrentCurve;
if (curve.Count < 3 || curve.All(p => p == Position))
return;
var referencePoint = curve[isRepeatAtEnd ? curve.IndexOf(Position, curve.Count - 2) - 1 : curve[0] == curve[1] ? 2 : 1];
Rotation = MathHelper.RadiansToDegrees((float)Math.Atan2(referencePoint.Y - Position.Y, referencePoint.X - Position.X));
int referenceIndex;
//We are looking for the next point in the curve different than our position
//Since there can be more than one point equal to our position, we iterate until one is found
if (isRepeatAtEnd)
{
referenceIndex = curve.Count - 1;
while (curve[referenceIndex] == Position)
referenceIndex--;
}
else
{
referenceIndex = 0;
while (curve[referenceIndex] == Position)
referenceIndex++;
}
Rotation = MathHelper.RadiansToDegrees((float)Math.Atan2(curve[referenceIndex].Y - Position.Y, curve[referenceIndex].X - Position.X));
}
}
}