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

Reuse BeatmapDifficultyManager cache for beatmap difficulty attributes.

Browse Source
This commit is contained in:
Lucas A
2020-09-29 18:32:02 +02:00
parent 35f7de2084
commit 2766cf73b4
12 changed files with 29 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
osu.Game/Beatmaps/BeatmapDifficultyManager.cs
View File

@ -15,6 +15,7 @@ using osu.Framework.Graphics.Containers;
using osu.Framework.Lists;
using osu.Framework.Threading;
using osu.Game.Rulesets;
using osu.Game.Rulesets.Difficulty;
using osu.Game.Rulesets.Mods;
namespace osu.Game.Beatmaps
@ -207,7 +208,7 @@ namespace osu.Game.Beatmaps
var calculator = ruleset.CreateDifficultyCalculator(beatmapManager.GetWorkingBeatmap(beatmapInfo));
var attributes = calculator.Calculate(key.Mods);
return difficultyCache[key] = new StarDifficulty(attributes.StarRating, attributes.MaxCombo);
return difficultyCache[key] = new StarDifficulty(attributes.StarRating, attributes.MaxCombo, attributes);
}
catch
{
@ -300,11 +301,13 @@ namespace osu.Game.Beatmaps
public readonly double Stars;
public readonly int MaxCombo;
public StarDifficulty(double stars, int maxCombo)
public readonly DifficultyAttributes Attributes;
public StarDifficulty(double stars, int maxCombo, DifficultyAttributes attributes = null)
{
Stars = stars;
MaxCombo = maxCombo;
Attributes = attributes;
// Todo: Add more members (BeatmapInfo.DifficultyRating? Attributes? Etc...)
}
}