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

Add HD support

Browse Source
This commit is contained in:
apollo-dw 2022-08-10 20:04:38 +01:00
parent e6193e8b98
commit 152a195514
1 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
osu.Game.Rulesets.Osu/Difficulty/Evaluators/CognitionEvaluator.cs
View File

@ -7,6 +7,7 @@ using FFmpeg.AutoGen;
using osu.Framework.Extensions.ObjectExtensions; using osu.Framework.Extensions.ObjectExtensions;
using osu.Game.Rulesets.Difficulty.Preprocessing; using osu.Game.Rulesets.Difficulty.Preprocessing;
using osu.Game.Rulesets.Osu.Difficulty.Preprocessing; using osu.Game.Rulesets.Osu.Difficulty.Preprocessing;
using osu.Game.Rulesets.Osu.Mods;
using osu.Game.Rulesets.Osu.Objects; using osu.Game.Rulesets.Osu.Objects;
namespace osu.Game.Rulesets.Osu.Difficulty.Evaluators namespace osu.Game.Rulesets.Osu.Difficulty.Evaluators
@ -15,14 +16,21 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Evaluators
{ {
private const double cognition_window_size = 2000; private const double cognition_window_size = 2000;
private const double note_density_difficulty_multiplier = 1.0;
public static double EvaluateDifficultyOf(DifficultyHitObject current, bool hidden) public static double EvaluateDifficultyOf(DifficultyHitObject current, bool hidden)
{ {
if (current.BaseObject is Spinner || current.Index == 0) if (current.BaseObject is Spinner || current.Index == 0)
return 0; return 0;
var currObj = (OsuDifficultyHitObject)current; var currObj = (OsuDifficultyHitObject)current;
var prevObj = (OsuDifficultyHitObject)current.Previous(0);
double currVelocity = currObj.LazyJumpDistance / currObj.StrainTime; double currVelocity = currObj.LazyJumpDistance / currObj.StrainTime;
// Maybe I should just pass in clockrate...
var clockRateEstimate = current.BaseObject.StartTime / currObj.StartTime;
List<OsuDifficultyHitObject> pastVisibleObjects = retrievePastVisibleObjects(currObj); List<OsuDifficultyHitObject> pastVisibleObjects = retrievePastVisibleObjects(currObj);
List<OsuDifficultyHitObject> currentVisibleObjects = retrieveCurrentVisibleObjects(currObj); List<OsuDifficultyHitObject> currentVisibleObjects = retrieveCurrentVisibleObjects(currObj);
@ -30,6 +38,8 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Evaluators
// consider it as how many objects the current object has been visible for. // consider it as how many objects the current object has been visible for.
double noteDensityDifficulty = 1.0; double noteDensityDifficulty = 1.0;
double pastObjectDifficultyInfluence = 1.0;
foreach (var loopObj in pastVisibleObjects) foreach (var loopObj in pastVisibleObjects)
{ {
var prevLoopObj = (OsuDifficultyHitObject)loopObj.Previous(0); var prevLoopObj = (OsuDifficultyHitObject)loopObj.Previous(0);
@ -43,13 +53,24 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Evaluators
//if (loopObj.Angle.IsNotNull() && prevLoopObj.Angle.IsNotNull()) //if (loopObj.Angle.IsNotNull() && prevLoopObj.Angle.IsNotNull())
// loopDifficulty *= 1 - Math.Pow(Math.Sin(0.5 * loopObj.Angle.Value), 5); // loopDifficulty *= 1 - Math.Pow(Math.Sin(0.5 * loopObj.Angle.Value), 5);
noteDensityDifficulty += loopDifficulty; pastObjectDifficultyInfluence += loopDifficulty;
} }
noteDensityDifficulty = Math.Pow(3 * Math.Log(Math.Max(1, noteDensityDifficulty - 1)), 2.3); noteDensityDifficulty = Math.Pow(3 * Math.Log(Math.Max(1, pastObjectDifficultyInfluence - 1)), 2.3) * note_density_difficulty_multiplier;
double hiddenDifficulty = 0; double hiddenDifficulty = 0;
if (hidden)
{
var timeSpentInvisible = getDurationSpentInvisible(currObj) / clockRateEstimate;
var isRhythmChange = (currObj.StrainTime - prevObj.StrainTime < 5);
var timeDifficultyFactor = 1200 / pastObjectDifficultyInfluence;
hiddenDifficulty += 12 * timeSpentInvisible / timeDifficultyFactor;
hiddenDifficulty += 7 * currVelocity;
}
double preemptDifficulty = 0.0; double preemptDifficulty = 0.0;
if (currObj.preempt < 400) if (currObj.preempt < 400)
preemptDifficulty += Math.Pow(400 - currObj.preempt, 1.5) / 14; preemptDifficulty += Math.Pow(400 - currObj.preempt, 1.5) / 14;
@ -100,6 +121,16 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Evaluators
return objects; return objects;
} }
private static double getDurationSpentInvisible(OsuDifficultyHitObject current)
{
var baseObject = (OsuHitObject)current.BaseObject;
double fadeOutStartTime = baseObject.StartTime - baseObject.TimePreempt + baseObject.TimeFadeIn;
double fadeOutDuration = baseObject.TimePreempt * OsuModHidden.FADE_OUT_DURATION_MULTIPLIER;
return (fadeOutStartTime + fadeOutDuration) - (baseObject.StartTime - baseObject.TimePreempt);
}
private static double logistic(double x) => 1 / (1 + Math.Pow(Math.E, -x)); private static double logistic(double x) => 1 / (1 + Math.Pow(Math.E, -x));
} }
} }