h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-03-13 04:17:20 +08:00
Code Issues Releases Wiki Activity

add strict path calculation

Browse Source
This commit is contained in:
Givikap120 2024-10-11 21:45:11 +03:00
parent c549d7003f
commit 5d48b9c6af
1 changed files with 59 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,6 +5,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using osu.Game.Rulesets.Difficulty.Preprocessing; using osu.Game.Rulesets.Difficulty.Preprocessing;
using osu.Game.Rulesets.Mods;
using osu.Game.Rulesets.Objects; using osu.Game.Rulesets.Objects;
using osu.Game.Rulesets.Osu.Mods; using osu.Game.Rulesets.Osu.Mods;
using osu.Game.Rulesets.Osu.Objects; using osu.Game.Rulesets.Osu.Objects;
@ -87,7 +88,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Preprocessing
private readonly OsuHitObject? lastLastObject; private readonly OsuHitObject? lastLastObject;
private readonly OsuHitObject lastObject; private readonly OsuHitObject lastObject;
public OsuDifficultyHitObject(HitObject hitObject, HitObject lastObject, HitObject? lastLastObject, double clockRate, List<DifficultyHitObject> objects, int index) public OsuDifficultyHitObject(HitObject hitObject, HitObject lastObject, HitObject? lastLastObject, double clockRate, List<DifficultyHitObject> objects, int index, Mod[] mods)
: base(hitObject, lastObject, clockRate, objects, index) : base(hitObject, lastObject, clockRate, objects, index)
{ {
this.lastLastObject = lastLastObject as OsuHitObject; this.lastLastObject = lastLastObject as OsuHitObject;
@ -334,6 +335,63 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Preprocessing
} }
} }
private static Vector2 positionWithRepeats(double relativeTime, Slider slider)
{
double progress = relativeTime / slider.SpanDuration;
if (slider.RepeatCount % 2 == 1)
progress = 1 - progress; // revert if odd number of repeats
return slider.Position + slider.Path.PositionAt(progress);
}
private void calculateStrictSliderPath(Slider slider)
{
double updateDistance = slider.Radius;
float followCircleRadius = (float)(slider.Radius * 2.4);
// WARNING, this is lazer-correct implementation because stable doesn't have Strict Tracking mod
// This means that path of this function can be lower than normal path
double trackingEndTime = Math.Max(
slider.StartTime + slider.Duration + SliderEventGenerator.TAIL_LENIENCY,
slider.NestedHitObjects.LastOrDefault(n => n is not SliderTailCircle)?.StartTime ?? double.MinValue
);
OsuHitObject head;
if (slider.RepeatCount == 0)
head = (OsuHitObject)slider.NestedHitObjects[0];
else
head = (OsuHitObject)slider.NestedHitObjects.Where(o => o is SliderRepeat).Last();
var tail = (OsuHitObject)slider.NestedHitObjects[^1];
double totalTrackingTime = trackingEndTime - head.StartTime;
double numberOfUpdates = Math.Ceiling(slider.Path.Distance / updateDistance);
double deltaT = totalTrackingTime / numberOfUpdates;
double totalPath = 0;
Vector2 currentCursorPosition = head.StackedPosition;
double lastTimeWithMovement = 0;
for (double relativeTime = 0; relativeTime <= totalTrackingTime; relativeTime += deltaT)
{
// calculating position of the normal path
Vector2 ballPosition = positionWithRepeats(relativeTime, slider);
float distanceToCursor = Vector2.Distance(ballPosition, currentCursorPosition);
if (distanceToCursor <= followCircleRadius)
continue;
lastTimeWithMovement = relativeTime;
float neededMovement = distanceToCursor - followCircleRadius;
totalPath += neededMovement;
currentCursorPosition = Vector2.Lerp(currentCursorPosition, ballPosition, neededMovement / distanceToCursor);
}
}
private Vector2 getEndCursorPosition(OsuHitObject hitObject) private Vector2 getEndCursorPosition(OsuHitObject hitObject)
{ {
Vector2 pos = hitObject.StackedPosition; Vector2 pos = hitObject.StackedPosition;