1
0
mirror of https://github.com/ppy/osu.git synced 2025-03-19 07:07:18 +08:00

Merge pull request #4099 from smoogipoo/diffcalc-fixes

Apply various fixes to bring diffcalc in-line with stable
This commit is contained in:
Dean Herbert 2019-01-23 17:17:37 +09:00 committed by GitHub
commit cbbcaf6821
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions

View File

@ -101,8 +101,8 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Preprocessing
float approxFollowCircleRadius = (float)(slider.Radius * 3);
var computeVertex = new Action<double>(t =>
{
double progress = ((int)t - (int)slider.StartTime) / (float)(int)slider.SpanDuration;
if (progress % 2 > 1)
double progress = (t - slider.StartTime) / slider.SpanDuration;
if (progress % 2 >= 1)
progress = 1 - progress % 1;
else
progress = progress % 1;

View File

@ -198,7 +198,7 @@ namespace osu.Game.Rulesets.Osu.Objects
if (tickDistance == 0) return;
var minDistanceFromEnd = Velocity * 0.01;
var minDistanceFromEnd = Velocity * 10;
var spanCount = this.SpanCount();