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

Simplify iteration code

Browse Source
This commit is contained in:
Dean Herbert
2018-02-06 17:46:45 +09:00
parent 2e3ee79975
commit 60fb78e49d
1 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,6 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System; using System;
using System.Linq;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Game.Rulesets.Objects.Drawables; using osu.Game.Rulesets.Objects.Drawables;
using OpenTK; using OpenTK;
@ -80,25 +79,24 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
public void UpdateSnakingPosition(Vector2 start, Vector2 end) public void UpdateSnakingPosition(Vector2 start, Vector2 end)
{ {
Position = isRepeatAtEnd ? end : start; Position = isRepeatAtEnd ? end : start;
var curve = drawableSlider.Body.CurrentCurve; var curve = drawableSlider.Body.CurrentCurve;
if (curve.Count < 3 || curve.All(p => p == Position))
if (curve.Count < 2)
return; return;
int referenceIndex;
//We are looking for the next point in the curve different than our position int searchStart = isRepeatAtEnd ? curve.Count - 1 : 0;
//Since there can be more than one point equal to our position, we iterate until one is found int direction = isRepeatAtEnd ? -1 : 1;
if (isRepeatAtEnd)
// find the next vector2 in the curve which is not equal to our current position to infer a rotation.
for (int i = searchStart; i >= 0 && i < curve.Count; i += direction)
{ {
referenceIndex = curve.Count - 1; if (curve[i] == Position)
while (curve[referenceIndex] == Position) continue;
referenceIndex--;
Rotation = MathHelper.RadiansToDegrees((float)Math.Atan2(curve[i].Y - Position.Y, curve[i].X - Position.X));
break;
} }
else
{
referenceIndex = 0;
while (curve[referenceIndex] == Position)
referenceIndex++;
}
Rotation = MathHelper.RadiansToDegrees((float)Math.Atan2(curve[referenceIndex].Y - Position.Y, curve[referenceIndex].X - Position.X));
} }
} }
} }