Add slider ticks.

This commit is contained in:
Damnae
2017-02-12 20:38:05 +01:00
parent 3caa6ee5d2
commit 3e7208c8a4
6 changed files with 260 additions and 6 deletions

View File

@ -3,6 +3,9 @@
using osu.Game.Beatmaps;
using OpenTK;
using System.Collections.Generic;
using System;
using osu.Game.Beatmaps.Samples;
namespace osu.Game.Modes.Osu.Objects
{
@ -25,17 +28,66 @@ namespace osu.Game.Modes.Osu.Objects
}
public double Velocity;
public double TickDistance;
public override void SetDefaultsFromBeatmap(Beatmap beatmap)
{
base.SetDefaultsFromBeatmap(beatmap);
Velocity = 100 / beatmap.BeatLengthAt(StartTime, true) * beatmap.BeatmapInfo.BaseDifficulty.SliderMultiplier;
var baseDifficulty = beatmap.BeatmapInfo.BaseDifficulty;
var startBeatLength = beatmap.BeatLengthAt(StartTime);
var multipliedStartBeatLength = beatmap.BeatLengthAt(StartTime, true);
Velocity = 100 / multipliedStartBeatLength * baseDifficulty.SliderMultiplier;
TickDistance = (100 * baseDifficulty.SliderMultiplier) / baseDifficulty.SliderTickRate / (multipliedStartBeatLength / startBeatLength);
}
public int RepeatCount;
public SliderCurve Curve;
public IEnumerable<SliderTick> Ticks
{
get
{
var length = Curve.Length;
var tickDistance = Math.Min(TickDistance, length);
var repeatDuration = length / Velocity;
var minDistanceFromEnd = Velocity * 0.01;
for (var repeat = 0; repeat < RepeatCount; repeat++)
{
var repeatStartTime = StartTime + repeat * repeatDuration;
var reversed = repeat % 2 == 1;
for (var d = tickDistance; d <= length; d += tickDistance)
{
if (d > length - minDistanceFromEnd)
break;
var distanceProgress = d / length;
var timeProgress = reversed ? 1 - distanceProgress : distanceProgress;
yield return new SliderTick
{
RepeatIndex = repeat,
StartTime = repeatStartTime + timeProgress * repeatDuration,
Position = Curve.PositionAt(distanceProgress) - StackedPosition,
StackHeight = StackHeight,
Scale = Scale,
Colour = Colour,
Sample = new HitSampleInfo
{
Type = SampleType.None,
Set = SampleSet.Soft,
},
};
}
}
}
}
}
public enum CurveTypes