sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 16:29:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

Better beatmap conversion model.

Browse Source
This commit is contained in:
smoogipooo
2017-03-12 00:34:21 +09:00
parent 75ed7406e4
commit 592e05a2c8
26 changed files with 196 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
osu.Game/Modes/UI/HitRenderer.cs
View File

@ -32,19 +32,9 @@ namespace osu.Game.Modes.UI
/// </summary>
protected abstract int JudgementCount { get; }
/// <summary>
/// The beatmap this HitRenderer is initialized with.
/// </summary>
protected readonly Beatmap Beatmap;
private int maxJudgements;
private int countJudgements;
protected HitRenderer(Beatmap beatmap)
{
Beatmap = beatmap;
}
protected override void LoadComplete()
{
base.LoadComplete();
@ -69,9 +59,6 @@ namespace osu.Game.Modes.UI
public override Func<Vector2, Vector2> MapPlayfieldToScreenSpace => Playfield.ScaledContent.ToScreenSpace;
public IEnumerable<DrawableHitObject> DrawableObjects => Playfield.HitObjects.Children;
protected abstract HitObjectConverter<TObject> Converter { get; }
protected virtual List<TObject> Convert(Beatmap beatmap) => Converter.Convert(beatmap);
protected override Container<Drawable> Content => content;
private int judgementCount;
@ -79,11 +66,14 @@ namespace osu.Game.Modes.UI
protected Playfield<TObject> Playfield;
protected Beatmap<TObject> Beatmap;
private Container content;
protected HitRenderer(Beatmap beatmap)
: base(beatmap)
{
Beatmap = beatmap.ConvertTo<TObject>();
RelativeSizeAxes = Axes.Both;
InputManager.Add(content = new Container
@ -107,7 +97,7 @@ namespace osu.Game.Modes.UI
private void loadObjects()
{
foreach (TObject h in Convert(Beatmap))
foreach (TObject h in Beatmap.HitObjects)
{
DrawableHitObject<TObject> drawableObject = GetVisualRepresentation(h);