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

Add additional information to diagram

Browse Source
This commit is contained in:
Dan Balasescu 2021-11-24 13:22:52 +09:00
parent b5747f351d
commit 274444ed67
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs
View File

@ -103,7 +103,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Preprocessing
if (lastObject is Slider lastSlider) if (lastObject is Slider lastSlider)
{ {
double lastTravelTime = Math.Max(lastSlider.LazyTravelTime / clockRate, min_delta_time); double lastTravelTime = Math.Max(lastSlider.LazyTravelTime / clockRate, min_delta_time);
MovementTime = Math.Max(MovementTime - lastTravelTime, min_delta_time); MovementTime = Math.Max(StrainTime - lastTravelTime, min_delta_time);
// //
// We'll try to better approximate the real movements a player will take in patterns following on from sliders. Consider the following slider-to-object patterns: // We'll try to better approximate the real movements a player will take in patterns following on from sliders. Consider the following slider-to-object patterns:
@ -117,14 +117,17 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Preprocessing
// //
// Where "<==>" represents a slider, and "o" represents where the cursor needs to be for either hitobject (for a slider, this is the lazy cursor position). // Where "<==>" represents a slider, and "o" represents where the cursor needs to be for either hitobject (for a slider, this is the lazy cursor position).
// //
// Case (1) is an anti-flow pattern, where players will cut the slider short in order to move to the next object. The jump pattern is (o--o). // The pattern (o--o) has distance JumpDistance.
// Case (2) is a flow pattern, where players will follow the slider through to its visual extent. The jump pattern is (>--o). // The pattern (>--o) is a new distance we'll call "tailJumpDistance".
//
// Case (1) is an anti-flow pattern, where players will cut the slider short in order to move to the next object. The most natural jump pattern is (o--o).
// Case (2) is a flow pattern, where players will follow the slider through to its visual extent. The most natural jump pattern is (>--o).
// //
// A lenience is applied by assuming that the player jumps the minimum of these two distances in all cases. // A lenience is applied by assuming that the player jumps the minimum of these two distances in all cases.
// //
float tailJumpDistance = Vector2.Subtract(lastSlider.TailCircle.StackedPosition, BaseObject.StackedPosition).Length * scalingFactor; float tailJumpDistance = Vector2.Subtract(lastSlider.TailCircle.StackedPosition, BaseObject.StackedPosition).Length * scalingFactor;
MovementDistance = Math.Max(0, Math.Min(MovementDistance - (maximum_slider_radius - assumed_slider_radius), tailJumpDistance - maximum_slider_radius)); MovementDistance = Math.Max(0, Math.Min(JumpDistance - (maximum_slider_radius - assumed_slider_radius), tailJumpDistance - maximum_slider_radius));
} }
if (lastLastObject != null && !(lastLastObject is Spinner)) if (lastLastObject != null && !(lastLastObject is Spinner))