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

Don't make Beatmap in OsuGameBase public

Browse Source 
Signed-off-by: C0D3 M4513R <28912031+C0D3-M4513R@users.noreply.github.com>
This commit is contained in:
C0D3 M4513R
2022-11-01 21:19:01 +01:00
parent c231a20cbb
commit 975eed964e
2 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/OsuGameBase.cs
View File

@ -155,7 +155,7 @@ namespace osu.Game
protected Storage Storage { get; set; }
public Bindable<WorkingBeatmap> Beatmap { get; private set; } // cached via load() method
protected Bindable<WorkingBeatmap> Beatmap { get; private set; } // cached via load() method
[Cached]
[Cached(typeof(IBindable<RulesetInfo>))]

25
osu.Game/Skinning/Components/BeatmapInfoDrawable.cs
View File

@ -9,6 +9,7 @@ using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Game.Beatmaps;
using osu.Game.Configuration;
using osu.Game.Graphics;
using osu.Game.Graphics.Sprites;
@ -24,7 +25,7 @@ namespace osu.Game.Skinning.Components
public Bindable<BeatmapInfo> Type { get; } = new Bindable<BeatmapInfo>(BeatmapInfo.StarRating);
[Resolved]
private OsuGameBase mGameBase { get; set; }
private IBindable<WorkingBeatmap> beatmap { get; set; }
private readonly OsuSpriteText text;
@ -55,70 +56,70 @@ namespace osu.Game.Skinning.Components
switch (type.NewValue)
{
case BeatmapInfo.CircleSize:
mGameBase.Beatmap.BindValueChanged(bm =>
beatmap.BindValueChanged(bm =>
{
text.Current.Value = bm.NewValue.BeatmapInfo.Difficulty.CircleSize.ToString("F2");
}, true);
break;
case BeatmapInfo.HPDrain:
mGameBase.Beatmap.BindValueChanged(bm =>
beatmap.BindValueChanged(bm =>
{
text.Current.Value = bm.NewValue.BeatmapInfo.Difficulty.DrainRate.ToString("F2");
}, true);
break;
case BeatmapInfo.Accuracy:
mGameBase.Beatmap.BindValueChanged(bm =>
beatmap.BindValueChanged(bm =>
{
text.Current.Value = bm.NewValue.BeatmapInfo.Difficulty.OverallDifficulty.ToString("F2");
}, true);
break;
case BeatmapInfo.ApproachRate:
mGameBase.Beatmap.BindValueChanged(bm =>
beatmap.BindValueChanged(bm =>
{
text.Current.Value = bm.NewValue.BeatmapInfo.Difficulty.ApproachRate.ToString("F2");
}, true);
break;
case BeatmapInfo.StarRating:
mGameBase.Beatmap.BindValueChanged(bm =>
beatmap.BindValueChanged(bm =>
{
text.Current.Value = bm.NewValue.BeatmapInfo.StarRating.ToString("F2");
}, true);
break;
case BeatmapInfo.Song:
mGameBase.Beatmap.BindValueChanged(bm =>
beatmap.BindValueChanged(bm =>
{
text.Current.Value = bm.NewValue.BeatmapInfo.Metadata.Title;
}, true);
break;
case BeatmapInfo.Artist:
mGameBase.Beatmap.BindValueChanged(bm =>
beatmap.BindValueChanged(bm =>
{
text.Current.Value = bm.NewValue.BeatmapInfo.Metadata.Artist;
}, true);
break;
case BeatmapInfo.Difficulty:
mGameBase.Beatmap.BindValueChanged(bm =>
beatmap.BindValueChanged(bm =>
{
text.Current.Value = bm.NewValue.BeatmapInfo.DifficultyName;
}, true);
break;
case BeatmapInfo.Mapper:
mGameBase.Beatmap.BindValueChanged(bm =>
beatmap.BindValueChanged(bm =>
{
text.Current.Value = bm.NewValue.BeatmapInfo.Metadata.Author.Username;
}, true);
break;
case BeatmapInfo.Length:
mGameBase.Beatmap.BindValueChanged(bm =>
beatmap.BindValueChanged(bm =>
{
const long ms_to_s = 1000;
double length = bm.NewValue.BeatmapInfo.Length;
@ -153,7 +154,7 @@ namespace osu.Game.Skinning.Components
break;
case BeatmapInfo.BPM:
mGameBase.Beatmap.BindValueChanged(bm =>
beatmap.BindValueChanged(bm =>
{
text.Current.Value = bm.NewValue.BeatmapInfo.BPM.ToString("F2");
}, true);