h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 06:57:39 +08:00
Code Issues Releases Wiki Activity

Add a BPM property in BeatmapInfo

Browse Source
This commit is contained in:
iiSaLMaN 2019-07-08 10:43:35 +03:00
parent 2d0c924bdf
commit 129899f419
6 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
View File

@ -267,15 +267,18 @@ namespace osu.Game.Tests.Visual.SongSelect
for (int i = 0; i < 6; i++)
{
int beatmapId = setId * 10 + i;
int length = RNG.Next(30000, 200000);
double bpm = RNG.NextSingle(80, 200);
beatmaps.Add(new BeatmapInfo
{
Ruleset = getRuleset(),
OnlineBeatmapID = beatmapId,
Path = "normal.osu",
Version = $"{beatmapId} (length {TimeSpan.FromMilliseconds(length):m\\:ss})",
Version = $"{beatmapId} (length {TimeSpan.FromMilliseconds(length):m\\:ss}, bpm {bpm:0.#})",
Length = length,
BPM = bpm,
BaseDifficulty = new BeatmapDifficulty
{
OverallDifficulty = 3.5f,
@ -283,7 +286,6 @@ namespace osu.Game.Tests.Visual.SongSelect
});
}
double bpm = RNG.NextSingle(80, 200);
return new BeatmapSetInfo
{
OnlineBeatmapSetID = setId,
@ -292,15 +294,11 @@ namespace osu.Game.Tests.Visual.SongSelect
{
// Create random metadata, then we can check if sorting works based on these
Artist = "Some Artist " + RNG.Next(0, 9),
Title = $"Some Song (set id {setId}, bpm {bpm:0.#})",
Title = $"Some Song (set id {setId}, max bpm {beatmaps.Max(b => b.BPM):0.#})",
AuthorString = "Some Guy " + RNG.Next(0, 9),
},
Beatmaps = beatmaps,
DateAdded = DateTimeOffset.UtcNow,
OnlineInfo = new BeatmapSetOnlineInfo
{
BPM = bpm,
}
};
}
}

2
osu.Game.Tournament/Components/SongBar.cs
View File

@ -158,7 +158,7 @@ namespace osu.Game.Tournament.Components
return;
}
var bpm = beatmap.BeatmapSet.BPM;
var bpm = beatmap.BeatmapSet.OnlineInfo.BPM;
var length = beatmap.Length;
string hardRockExtra = "";
string srExtra = "";

5
osu.Game/Beatmaps/BeatmapInfo.cs
View File

@ -56,6 +56,11 @@ namespace osu.Game.Beatmaps
/// </summary>
public double Length { get; set; }
/// <summary>
/// The most common BPM of this beatmap.
/// </summary>
public double BPM { get; set; }
public string Path { get; set; }
[JsonProperty("file_sha2")]

7
osu.Game/Beatmaps/BeatmapManager.cs
View File

@ -271,11 +271,7 @@ namespace osu.Game.Beatmaps
OnlineBeatmapSetID = beatmap.BeatmapInfo.BeatmapSet?.OnlineBeatmapSetID,
Beatmaps = new List<BeatmapInfo>(),
Metadata = beatmap.Metadata,
DateAdded = DateTimeOffset.UtcNow,
OnlineInfo = new BeatmapSetOnlineInfo
{
BPM = beatmap.ControlPointInfo.BPMMode,
}
DateAdded = DateTimeOffset.UtcNow
};
}
@ -307,6 +303,7 @@ namespace osu.Game.Beatmaps
// TODO: this should be done in a better place once we actually need to dynamically update it.
beatmap.BeatmapInfo.StarDifficulty = ruleset?.CreateInstance().CreateDifficultyCalculator(new DummyConversionBeatmap(beatmap)).Calculate().StarRating ?? 0;
beatmap.BeatmapInfo.Length = beatmap.CalculateLength();
beatmap.BeatmapInfo.BPM = beatmap.ControlPointInfo.BPMMode;
beatmapInfos.Add(beatmap.BeatmapInfo);
}

5
osu.Game/Beatmaps/BeatmapSetInfo.cs
View File

@ -45,6 +45,11 @@ namespace osu.Game.Beatmaps
/// </summary>
public double MaxLength => Beatmaps?.Max(b => b.Length) ?? 0;
/// <summary>
/// The maximum BPM of all beatmaps in this set.
/// </summary>
public double MaxBPM => Beatmaps?.Max(b => b.BPM) ?? 0;
[NotMapped]
public bool DeletePending { get; set; }

2
osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
View File

@ -49,7 +49,7 @@ namespace osu.Game.Screens.Select.Carousel
return otherSet.BeatmapSet.DateAdded.CompareTo(BeatmapSet.DateAdded);
case SortMode.BPM:
return BeatmapSet.OnlineInfo.BPM.CompareTo(otherSet.BeatmapSet.OnlineInfo.BPM);
return BeatmapSet.MaxBPM.CompareTo(otherSet.BeatmapSet.MaxBPM);
case SortMode.Length:
return BeatmapSet.MaxLength.CompareTo(otherSet.BeatmapSet.MaxLength);