h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-28 02:02:53 +08:00
Code Issues Releases Wiki Activity

Fix slider cursor positions not being taken into account

Browse Source
This commit is contained in:
smoogipoo 2017-11-17 20:28:41 +09:00
parent c7ffe6fe58
commit c221cfd30c
2 changed files with 41 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,6 +45,12 @@ namespace osu.Game.Rulesets.Osu.Objects
set { Curve.Distance = value; }
}
/// <summary>
/// The position of the cursor at the point of completion of this <see cref="OsuHitObject"/>.
/// This is set and used by difficulty calculation.
/// </summary>
internal Vector2? CursorPosition;
public List<SampleInfoList> RepeatSamples { get; set; } = new List<SampleInfoList>();
public int RepeatCount { get; set; } = 1;

36
osu.Game.Rulesets.Osu/OsuDifficulty/Preprocessing/OsuDifficultyHitObject.cs
View File

@ -2,6 +2,8 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System;
using System.Linq;
using OpenTK;
using osu.Game.Rulesets.Osu.Objects;
namespace osu.Game.Rulesets.Osu.OsuDifficulty.Preprocessing
@ -61,7 +63,39 @@ namespace osu.Game.Rulesets.Osu.OsuDifficulty.Preprocessing
scalingFactor *= 1 + smallCircleBonus;
}
Distance = (t[0].StackedPosition - t[1].StackedPosition).Length * scalingFactor;
Vector2 lastCursorPosition = t[1].StackedPosition;
var lastSlider = t[1] as Slider;
if (lastSlider != null)
{
if (lastSlider.CursorPosition == null)
{
float approxFollowCircleRadius = (float)(lastSlider.Radius * scalingFactor * 3);
var computeVertex = new Action<double>(t =>
{
var diff = lastSlider.PositionAt(t) - lastCursorPosition;
float dist = diff.Length;
if (dist > approxFollowCircleRadius)
{
// The cursor would be outside the follow circle, we need to move it
diff.Normalize(); // Obtain direction of diff
dist -= approxFollowCircleRadius;
lastCursorPosition += diff * dist;
}
});
var scoringTimes = lastSlider.Ticks.Select(t => t.StartTime).Concat(lastSlider.RepeatPoints.Select(r => r.StartTime)).OrderBy(t => t);
foreach (var time in scoringTimes)
computeVertex(time);
computeVertex(lastSlider.EndTime);
lastSlider.CursorPosition = lastCursorPosition;
}
}
Distance = (BaseObject.StackedPosition - lastCursorPosition).Length * scalingFactor;
}
private void setTimingValues()