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

optimisation

Browse Source
This commit is contained in:
Givikap120 2024-03-26 02:55:06 +02:00
parent 6ec5bb5dca
commit c4af2bbf69
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game.Rulesets.Osu/Difficulty/Evaluators/ReadingEvaluator.cs
View File

@ -192,7 +192,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Evaluators
if (current.BaseObject is Spinner || current.Index == 0) if (current.BaseObject is Spinner || current.Index == 0)
return 0; return 0;
double difficulty = Math.Pow(4 * Math.Log(Math.Max(1, EvaluateDensityOf(current))), 2.5); double difficulty = Math.Pow(4 * Math.Log(Math.Max(1, ((OsuDifficultyHitObject)current).Density)), 2.5);
double overlapBonus = EvaluateOverlapDifficultyOf(current) * difficulty; double overlapBonus = EvaluateOverlapDifficultyOf(current) * difficulty;
difficulty += overlapBonus; difficulty += overlapBonus;
@ -202,7 +202,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Evaluators
public static double EvaluateAimingDensityFactorOf(DifficultyHitObject current) public static double EvaluateAimingDensityFactorOf(DifficultyHitObject current)
{ {
double difficulty = EvaluateDensityOf(current); double difficulty = ((OsuDifficultyHitObject)current).Density;
double overlapBonus = EvaluateOverlapDifficultyOf(current) * difficulty; double overlapBonus = EvaluateOverlapDifficultyOf(current) * difficulty;
difficulty += overlapBonus * 0.1; // Overlaps should affect aiming part much less difficulty += overlapBonus * 0.1; // Overlaps should affect aiming part much less
@ -330,10 +330,8 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Evaluators
{ {
var currObj = (OsuDifficultyHitObject)current; var currObj = (OsuDifficultyHitObject)current;
double density = ReadingEvaluator.EvaluateDensityOf(current, false);
// Consider that density matters only starting from 3rd note on the screen // Consider that density matters only starting from 3rd note on the screen
double densityFactor = Math.Max(0, density - 1) / 4; double densityFactor = Math.Max(0, currObj.Density - 1) / 4;
// This is kinda wrong cuz it returns value bigger than preempt // This is kinda wrong cuz it returns value bigger than preempt
// double timeSpentInvisible = getDurationSpentInvisible(currObj) / 1000 / currObj.ClockRate; // double timeSpentInvisible = getDurationSpentInvisible(currObj) / 1000 / currObj.ClockRate;

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

@ -90,6 +90,11 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Preprocessing
/// </summary> /// </summary>
public double RhythmDifficulty { get; private set; } public double RhythmDifficulty { get; private set; }
/// <summary>
/// Density of the object for given preempt. Saved for optimization, density calculation is expensive.
/// </summary>
public double Density { get; private set; }
/// <summary> /// <summary>
/// Objects that was visible after the note was hit together with cumulative overlapping difficulty. Saved for optimization to avoid O(x^4) time complexity. /// Objects that was visible after the note was hit together with cumulative overlapping difficulty. Saved for optimization to avoid O(x^4) time complexity.
/// </summary> /// </summary>
@ -140,8 +145,13 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Preprocessing
setDistances(clockRate); setDistances(clockRate);
RhythmDifficulty = RhythmEvaluator.EvaluateDifficultyOf(this); RhythmDifficulty = RhythmEvaluator.EvaluateDifficultyOf(this);
Density = ReadingEvaluator.EvaluateDensityOf(this);
OverlapObjects = getOverlapObjects();
}
OverlapObjects = new List<OverlapObject>(); private List<OverlapObject> getOverlapObjects()
{
List<OverlapObject> overlapObjects = new List<OverlapObject>();
double totalOverlapnessDifficulty = 0; double totalOverlapnessDifficulty = 0;
double currentTime = DeltaTime; double currentTime = DeltaTime;
@ -204,9 +214,11 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Preprocessing
} }
totalOverlapnessDifficulty += currentOverlapness; totalOverlapnessDifficulty += currentOverlapness;
OverlapObjects.Add(new OverlapObject(loopObj, totalOverlapnessDifficulty)); overlapObjects.Add(new OverlapObject(loopObj, totalOverlapnessDifficulty));
prevObject = loopObj; prevObject = loopObj;
} }
return overlapObjects;
} }
private static double getSimilarity(double timeA, double timeB) private static double getSimilarity(double timeA, double timeB)