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

Use async difficulty calculation

This commit is contained in:
smoogipoo 2020-08-28 21:45:27 +09:00
parent 1e5e5cae0c
commit 39f8b5eb85
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
osu.Game/Scoring/ScoreManager.cs
View File

@ -108,6 +108,8 @@ public TotalScoreBindable(ScoreInfo score, Func<BeatmapDifficultyManager> diffic
ScoringMode.BindValueChanged(onScoringModeChanged, true);
}
private IBindable<StarDifficulty> difficultyBindable;
private void onScoringModeChanged(ValueChangedEvent<ScoringMode> mode)
{
int? beatmapMaxCombo = score.Beatmap.MaxCombo;
@ -121,19 +123,25 @@ private void onScoringModeChanged(ValueChangedEvent<ScoringMode> mode)
return;
}
// We can compute the max combo locally.
beatmapMaxCombo = difficulties().GetDifficulty(score.Beatmap, score.Ruleset, score.Mods).MaxCombo;
// We can compute the max combo locally after the async beatmap difficulty computation.
difficultyBindable = difficulties().GetBindableDifficulty(score.Beatmap, score.Ruleset, score.Mods);
difficultyBindable.BindValueChanged(d => updateScore(d.NewValue.MaxCombo), true);
}
else
updateScore(beatmapMaxCombo.Value);
}
private void updateScore(int beatmapMaxCombo)
{
var ruleset = score.Ruleset.CreateInstance();
var scoreProcessor = ruleset.CreateScoreProcessor();
scoreProcessor.Mods.Value = score.Mods;
double maxBaseScore = 300 * beatmapMaxCombo.Value;
double maxHighestCombo = beatmapMaxCombo.Value;
double maxBaseScore = 300 * beatmapMaxCombo;
double maxHighestCombo = beatmapMaxCombo;
Value = Math.Round(scoreProcessor.GetScore(mode.NewValue, maxBaseScore, maxHighestCombo, score.Accuracy, score.MaxCombo / maxHighestCombo, 0)).ToString("N0");
Value = Math.Round(scoreProcessor.GetScore(ScoringMode.Value, maxBaseScore, maxHighestCombo, score.Accuracy, score.MaxCombo / maxHighestCombo, 0)).ToString("N0");
}
}
}