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

Fix up DT not affecting hitobject densities

Browse Source
This commit is contained in:
smoogipoo 2017-11-17 17:28:22 +09:00
parent bf44b3d0ef
commit 5d753427f6
5 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game.Rulesets.Osu/OsuDifficulty/OsuDifficultyCalculator.cs
View File

@ -35,7 +35,7 @@ namespace osu.Game.Rulesets.Osu.OsuDifficulty
public override double Calculate(Dictionary<string, string> categoryDifficulty = null) public override double Calculate(Dictionary<string, string> categoryDifficulty = null)
{ {
OsuDifficultyBeatmap beatmap = new OsuDifficultyBeatmap(Beatmap.HitObjects); OsuDifficultyBeatmap beatmap = new OsuDifficultyBeatmap(Beatmap.HitObjects, TimeRate);
Skill[] skills = Skill[] skills =
{ {
new Aim(), new Aim(),
@ -57,7 +57,7 @@ namespace osu.Game.Rulesets.Osu.OsuDifficulty
} }
foreach (Skill s in skills) foreach (Skill s in skills)
s.Process(h, TimeRate); s.Process(h);
} }
double aimRating = Math.Sqrt(skills[0].DifficultyValue()) * difficulty_multiplier; double aimRating = Math.Sqrt(skills[0].DifficultyValue()) * difficulty_multiplier;

8
osu.Game.Rulesets.Osu/OsuDifficulty/Preprocessing/OsuDifficultyBeatmap.cs
View File

@ -20,12 +20,12 @@ namespace osu.Game.Rulesets.Osu.OsuDifficulty.Preprocessing
/// Creates an enumerator, which preprocesses a list of <see cref="OsuHitObject"/>s recieved as input, wrapping them as /// Creates an enumerator, which preprocesses a list of <see cref="OsuHitObject"/>s recieved as input, wrapping them as
/// <see cref="OsuDifficultyHitObject"/> which contains extra data required for difficulty calculation. /// <see cref="OsuDifficultyHitObject"/> which contains extra data required for difficulty calculation.
/// </summary> /// </summary>
public OsuDifficultyBeatmap(List<OsuHitObject> objects) public OsuDifficultyBeatmap(List<OsuHitObject> objects, double timeRate)
{ {
// Sort OsuHitObjects by StartTime - they are not correctly ordered in some cases. // Sort OsuHitObjects by StartTime - they are not correctly ordered in some cases.
// This should probably happen before the objects reach the difficulty calculator. // This should probably happen before the objects reach the difficulty calculator.
objects.Sort((a, b) => a.StartTime.CompareTo(b.StartTime)); objects.Sort((a, b) => a.StartTime.CompareTo(b.StartTime));
difficultyObjects = createDifficultyObjectEnumerator(objects); difficultyObjects = createDifficultyObjectEnumerator(objects, timeRate);
} }
/// <summary> /// <summary>
@ -67,7 +67,7 @@ namespace osu.Game.Rulesets.Osu.OsuDifficulty.Preprocessing
IEnumerator IEnumerable.GetEnumerator() => GetEnumerator(); IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
private IEnumerator<OsuDifficultyHitObject> createDifficultyObjectEnumerator(List<OsuHitObject> objects) private IEnumerator<OsuDifficultyHitObject> createDifficultyObjectEnumerator(List<OsuHitObject> objects, double timeRate)
{ {
// We will process OsuHitObjects in groups of three to form a triangle, so we can calculate an angle for each object. // We will process OsuHitObjects in groups of three to form a triangle, so we can calculate an angle for each object.
OsuHitObject[] triangle = new OsuHitObject[3]; OsuHitObject[] triangle = new OsuHitObject[3];
@ -87,7 +87,7 @@ namespace osu.Game.Rulesets.Osu.OsuDifficulty.Preprocessing
triangle[1] = triangle[0]; triangle[1] = triangle[0];
triangle[0] = objects[i]; triangle[0] = objects[i];
yield return new OsuDifficultyHitObject(triangle); yield return new OsuDifficultyHitObject(triangle, timeRate);
} }
} }
} }

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

@ -33,13 +33,17 @@ namespace osu.Game.Rulesets.Osu.OsuDifficulty.Preprocessing
private const int normalized_radius = 52; private const int normalized_radius = 52;
private readonly double timeRate;
private readonly OsuHitObject[] t; private readonly OsuHitObject[] t;
/// <summary> /// <summary>
/// Initializes the object calculating extra data required for difficulty calculation. /// Initializes the object calculating extra data required for difficulty calculation.
/// </summary> /// </summary>
public OsuDifficultyHitObject(OsuHitObject[] triangle) public OsuDifficultyHitObject(OsuHitObject[] triangle, double timeRate)
{ {
this.timeRate = timeRate;
t = triangle; t = triangle;
BaseObject = t[0]; BaseObject = t[0];
setDistances(); setDistances();
@ -63,7 +67,7 @@ namespace osu.Game.Rulesets.Osu.OsuDifficulty.Preprocessing
private void setTimingValues() private void setTimingValues()
{ {
// Every timing inverval is hard capped at the equivalent of 375 BPM streaming speed as a safety measure. // Every timing inverval is hard capped at the equivalent of 375 BPM streaming speed as a safety measure.
DeltaTime = Math.Max(40, t[0].StartTime - t[1].StartTime); DeltaTime = Math.Max(40, t[0].StartTime - t[1].StartTime) / timeRate;
TimeUntilHit = 450; // BaseObject.PreEmpt; TimeUntilHit = 450; // BaseObject.PreEmpt;
} }
} }

4
osu.Game.Rulesets.Osu/OsuDifficulty/Skills/Skill.cs
View File

@ -38,9 +38,9 @@ namespace osu.Game.Rulesets.Osu.OsuDifficulty.Skills
/// <summary> /// <summary>
/// Process an <see cref="OsuDifficultyHitObject"/> and update current strain values accordingly. /// Process an <see cref="OsuDifficultyHitObject"/> and update current strain values accordingly.
/// </summary> /// </summary>
public void Process(OsuDifficultyHitObject current, double timeRate) public void Process(OsuDifficultyHitObject current)
{ {
currentStrain *= strainDecay(current.DeltaTime / timeRate); currentStrain *= strainDecay(current.DeltaTime);
if (!(current.BaseObject is Spinner)) if (!(current.BaseObject is Spinner))
currentStrain += StrainValueOf(current) * SkillMultiplier; currentStrain += StrainValueOf(current) * SkillMultiplier;

3
osu.Game/Tests/Visual/TestCasePerformancePoints.cs
View File

@ -183,7 +183,8 @@ namespace osu.Game.Tests.Visual
this.osuGame = osuGame; this.osuGame = osuGame;
this.beatmaps = beatmaps; this.beatmaps = beatmaps;
text.Text = $"{beatmap.Metadata.Artist} - {beatmap.Metadata.Title} ({beatmap.Metadata.AuthorString}) [{beatmap.Version}]"; var working = beatmaps.GetWorkingBeatmap(beatmap);
text.Text = $"{working.Metadata.Artist} - {working.Metadata.Title} ({working.Metadata.AuthorString}) [{working.BeatmapInfo.Version}]";
osuGame.Beatmap.ValueChanged += beatmapChanged; osuGame.Beatmap.ValueChanged += beatmapChanged;
} }