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

address review

Browse Source
This commit is contained in:
Shawdooow
2017-09-27 11:28:44 -04:00
parent 4e8944de04
commit cfb1804aa1
6 changed files with 27 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
osu.Game.Rulesets.Osu/Objects/Slider.cs
View File

@ -61,7 +61,6 @@ namespace osu.Game.Rulesets.Osu.Objects
public double Velocity;
public double TickDistance;
public double BouncerDistance;
public override void ApplyDefaults(ControlPointInfo controlPointInfo, BeatmapDifficulty difficulty)
{
@ -74,7 +73,6 @@ namespace osu.Game.Rulesets.Osu.Objects
Velocity = scoringDistance / timingPoint.BeatLength;
TickDistance = scoringDistance / difficulty.SliderTickRate;
BouncerDistance = Distance;
}
public Vector2 PositionAt(double progress) => Curve.PositionAt(ProgressAt(progress));
@ -133,23 +131,23 @@ namespace osu.Game.Rulesets.Osu.Objects
}
}
}
public IEnumerable<SliderBouncer> Bouncers
public IEnumerable<RepeatPoint> RepeatPoints
{
get
{
var length = Curve.Distance;
var bouncerDistance = Math.Min(BouncerDistance, length);
var repeatPointDistance = Math.Min(Distance, length);
var repeatDuration = length / Velocity;
for (var repeat = 0; repeat < RepeatCount; repeat++)
{
if (repeat > 0)
for (var d = bouncerDistance; d <= length; d += bouncerDistance)
for (var d = repeatPointDistance; d <= length; d += repeatPointDistance)
{
var repeatStartTime = StartTime + repeat * repeatDuration;
var distanceProgress = d / length;
yield return new SliderBouncer
yield return new RepeatPoint
{
RepeatIndex = repeat,
StartTime = repeatStartTime,