sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 08:20:00 +09:00
Code Issues Packages Projects Releases Wiki Activity

Rewrite catch diffcalc for readability + attempt to fix

Browse Source
This commit is contained in:
smoogipoo
2019-02-16 11:11:31 +09:00
parent e02ae927b3
commit f6b13ca79d
2 changed files with 36 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
osu.Game.Rulesets.Catch/Difficulty/Preprocessing/CatchDifficultyHitObject.cs
View File

@ -6,63 +6,34 @@ using osu.Game.Rulesets.Catch.Objects;
using osu.Game.Rulesets.Catch.UI;
using osu.Game.Rulesets.Difficulty.Preprocessing;
using osu.Game.Rulesets.Objects;
using osuTK;
namespace osu.Game.Rulesets.Catch.Difficulty.Preprocessing
{
public class CatchDifficultyHitObject : DifficultyHitObject
{
private const float normalized_hitobject_radius = 41.0f;
private const float absolute_player_positioning_error = 16f;
public new CatchHitObject BaseObject => (CatchHitObject)base.BaseObject;
public float MovementDistance { get; private set; }
public new CatchHitObject LastObject => (CatchHitObject)base.LastObject;
public readonly float NormalizedPosition;
/// <summary>
/// Milliseconds elapsed since the start time of the previous <see cref="CatchDifficultyHitObject"/>, with a minimum of 25ms.
/// </summary>
public readonly double StrainTime;
private readonly float scalingFactor;
private readonly CatchHitObject lastObject;
public CatchDifficultyHitObject(HitObject hitObject, HitObject lastObject, double timeRate, float halfCatcherWidth)
: base(hitObject, lastObject, timeRate)
{
this.lastObject = (CatchHitObject)lastObject;
// We will scale everything by this factor, so we can assume a uniform CircleSize among beatmaps.
scalingFactor = normalized_hitobject_radius / halfCatcherWidth;
var scalingFactor = normalized_hitobject_radius / halfCatcherWidth;
setDistances();
NormalizedPosition = BaseObject.X * CatchPlayfield.BASE_WIDTH * scalingFactor;
// Every strain interval is hard capped at the equivalent of 600 BPM streaming speed as a safety measure
StrainTime = Math.Max(25, DeltaTime);
}
private void setDistances()
{
float lastPosition = getNormalizedPosition(lastObject);
float currentPosition = getNormalizedPosition(BaseObject);
// After a hyperdash the player is assumed to be in the correct position
if (lastObject.LazyMovementDistance != null && !lastObject.HyperDash)
lastPosition += lastObject.LazyMovementDistance.Value;
BaseObject.LazyMovementDistance =
MathHelper.Clamp(
lastPosition,
currentPosition - (normalized_hitobject_radius - absolute_player_positioning_error),
currentPosition + (normalized_hitobject_radius - absolute_player_positioning_error)) // Obtain new lazy position, but be stricter by allowing for an error of a certain degree of the player.
- currentPosition; // Subtract HitObject position to obtain offset
MovementDistance = Math.Abs(currentPosition - lastPosition + BaseObject.LazyMovementDistance.Value);
if (currentPosition < lastPosition)
MovementDistance *= -1;
}
private float getNormalizedPosition(CatchHitObject hitObject) => hitObject.X * CatchPlayfield.BASE_WIDTH * scalingFactor;
}
}