RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move objects at a constant speed whenever possible

This commit is contained in:
Andrei Zavatski 2023-12-06 07:09:46 +03:00
parent 594ea4da5f
commit 160edcd270
1 changed files with 42 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
osu.Game.Rulesets.Osu/Mods/OsuModDepth.cs
View File

@ -27,8 +27,8 @@ public class OsuModDepth : ModWithVisibilityAdjustment, IUpdatableByPlayfield, I
public override double ScoreMultiplier => 1; public override double ScoreMultiplier => 1;
public override Type[] IncompatibleMods => base.IncompatibleMods.Concat(new[] { typeof(OsuModMagnetised), typeof(OsuModRepel), typeof(OsuModFreezeFrame), typeof(ModWithVisibilityAdjustment) }).ToArray(); public override Type[] IncompatibleMods => base.IncompatibleMods.Concat(new[] { typeof(OsuModMagnetised), typeof(OsuModRepel), typeof(OsuModFreezeFrame), typeof(ModWithVisibilityAdjustment) }).ToArray();
private static readonly Vector3 camera_position = new Vector3(OsuPlayfield.BASE_SIZE.X * 0.5f, OsuPlayfield.BASE_SIZE.Y * 0.5f, -100); private static readonly Vector3 camera_position = new Vector3(OsuPlayfield.BASE_SIZE.X * 0.5f, OsuPlayfield.BASE_SIZE.Y * 0.5f, -200);
private readonly float minDepth = depthForScale(1.5f); private readonly float sliderMinDepth = depthForScale(1.5f); // Depth at which slider's scale will be 1.5f
[SettingSource("Maximum depth", "How far away objects appear.", 0)] [SettingSource("Maximum depth", "How far away objects appear.", 0)]
public BindableFloat MaxDepth { get; } = new BindableFloat(100) public BindableFloat MaxDepth { get; } = new BindableFloat(100)
@ -80,30 +80,60 @@ public void Update(Playfield playfield)
switch (drawable) switch (drawable)
{ {
case DrawableHitCircle circle: case DrawableHitCircle circle:
processObject(time, circle, 0); processHitObject(time, circle);
break; break;
case DrawableSlider slider: case DrawableSlider slider:
processObject(time, slider, slider.HitObject.Duration); processSlider(time, slider);
break; break;
} }
} }
} }
private void processObject(double time, DrawableOsuHitObject drawable, double duration) private void processHitObject(double time, DrawableOsuHitObject drawable)
{ {
var hitObject = drawable.HitObject; var hitObject = drawable.HitObject;
// Circles are always moving at the constant speed. They'll fade out before reaching the camera even at extreme conditions (AR 11, max depth).
double speed = MaxDepth.Value / hitObject.TimePreempt;
double appearTime = hitObject.StartTime - hitObject.TimePreempt;
float z = MaxDepth.Value - (float)((Math.Max(time, appearTime) - appearTime) * speed);
float scale = scaleForDepth(z);
drawable.Position = toPlayfieldPosition(scale, hitObject.Position);
drawable.Scale = new Vector2(scale);
}
private void processSlider(double time, DrawableSlider drawableSlider)
{
var hitObject = drawableSlider.HitObject;
double baseSpeed = MaxDepth.Value / hitObject.TimePreempt; double baseSpeed = MaxDepth.Value / hitObject.TimePreempt;
double offsetAfterStartTime = duration + hitObject.MaximumJudgementOffset + 500; double appearTime = hitObject.StartTime - hitObject.TimePreempt;
double slowSpeed = Math.Min(-minDepth / offsetAfterStartTime, baseSpeed);
// Allow slider to move at a constant speed if its scale at the end time will be lower than 1.5f
float zEnd = MaxDepth.Value - (float)((Math.Max(hitObject.StartTime + hitObject.Duration, appearTime) - appearTime) * baseSpeed);
if (zEnd > sliderMinDepth)
{
processHitObject(time, drawableSlider);
return;
}
double offsetAfterStartTime = hitObject.Duration + 500;
double slowSpeed = Math.Min(-sliderMinDepth / offsetAfterStartTime, baseSpeed);
double decelerationTime = hitObject.TimePreempt * 0.2; double decelerationTime = hitObject.TimePreempt * 0.2;
float decelerationDistance = (float)(decelerationTime * (baseSpeed + slowSpeed) * 0.5); float decelerationDistance = (float)(decelerationTime * (baseSpeed + slowSpeed) * 0.5);
float z; float z;
if (time < hitObject.StartTime) if (time < hitObject.StartTime - decelerationTime)
{
float fullDistance = decelerationDistance + (float)(baseSpeed * (hitObject.TimePreempt - decelerationTime));
z = fullDistance - (float)((Math.Max(time, appearTime) - appearTime) * baseSpeed);
}
else if (time < hitObject.StartTime)
{ {
double timeOffset = time - (hitObject.StartTime - decelerationTime); double timeOffset = time - (hitObject.StartTime - decelerationTime);
double deceleration = (slowSpeed - baseSpeed) / decelerationTime; double deceleration = (slowSpeed - baseSpeed) / decelerationTime;
@ -116,13 +146,13 @@ private void processObject(double time, DrawableOsuHitObject drawable, double du
} }
float scale = scaleForDepth(z); float scale = scaleForDepth(z);
drawable.Position = toPlayfieldPosition(scale, hitObject.Position); drawableSlider.Position = toPlayfieldPosition(scale, hitObject.Position);
drawable.Scale = new Vector2(scale); drawableSlider.Scale = new Vector2(scale);
} }
private static float scaleForDepth(float depth) => 100 / (depth - camera_position.Z); private static float scaleForDepth(float depth) => -camera_position.Z / Math.Max(1f, depth - camera_position.Z);
private static float depthForScale(float scale) => 100 / scale + camera_position.Z; private static float depthForScale(float scale) => -camera_position.Z / scale + camera_position.Z;
private static Vector2 toPlayfieldPosition(float scale, Vector2 positionAtZeroDepth) private static Vector2 toPlayfieldPosition(float scale, Vector2 positionAtZeroDepth)
{ {