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

Make DrawableHitObjects have generic JudgementInfos.

Browse Source
This commit is contained in:
smoogipooo
2017-03-15 18:55:38 +09:00
parent 1c87d998a6
commit 36e8618370
20 changed files with 132 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,13 +52,6 @@ namespace osu.Game.Modes.UI
{
public Beatmap<TObject> Beatmap;
protected override Container<Drawable> Content => content;
protected override bool AllObjectsJudged => Playfield.HitObjects.Children.All(h => h.Judgement.Result.HasValue);
protected Playfield<TObject> Playfield;
private Container content;
protected HitRenderer(WorkingBeatmap beatmap)
{
Beatmap = CreateBeatmapConverter().Convert(beatmap.Beatmap);
@ -66,7 +59,34 @@ namespace osu.Game.Modes.UI
applyMods(beatmap.Mods.Value);
RelativeSizeAxes = Axes.Both;
}
private void applyMods(IEnumerable<Mod> mods)
{
if (mods == null)
return;
foreach (var mod in mods.OfType<IApplicableMod<TObject>>())
mod.Apply(this);
}
protected abstract IBeatmapConverter<TObject> CreateBeatmapConverter();
}
public abstract class HitRenderer<TObject, TJudgement> : HitRenderer<TObject>
where TObject : HitObject
where TJudgement : JudgementInfo
{
protected override Container<Drawable> Content => content;
protected override bool AllObjectsJudged => Playfield.HitObjects.Children.All(h => h.Judgement.Result.HasValue);
protected Playfield<TObject, TJudgement> Playfield;
private Container content;
protected HitRenderer(WorkingBeatmap beatmap)
: base(beatmap)
{
KeyConversionInputManager.Add(Playfield = CreatePlayfield());
InputManager.Add(content = new Container
@ -91,7 +111,7 @@ namespace osu.Game.Modes.UI
{
foreach (TObject h in Beatmap.HitObjects)
{
DrawableHitObject<TObject> drawableObject = GetVisualRepresentation(h);
var drawableObject = GetVisualRepresentation(h);
if (drawableObject == null)
continue;
@ -104,19 +124,13 @@ namespace osu.Game.Modes.UI
Playfield.PostProcess();
}
private void applyMods(IEnumerable<Mod> mods)
private void onJudgement(DrawableHitObject<TObject, TJudgement> j)
{
if (mods == null)
return;
foreach (var mod in mods.OfType<IApplicableMod<TObject>>())
mod.Apply(this);
TriggerOnJudgement(j.Judgement);
Playfield.OnJudgement(j);
}
private void onJudgement(DrawableHitObject<TObject> o, JudgementInfo j) => TriggerOnJudgement(j);
protected abstract DrawableHitObject<TObject> GetVisualRepresentation(TObject h);
protected abstract Playfield<TObject> CreatePlayfield();
protected abstract IBeatmapConverter<TObject> CreateBeatmapConverter();
protected abstract DrawableHitObject<TObject, TJudgement> GetVisualRepresentation(TObject h);
protected abstract Playfield<TObject, TJudgement> CreatePlayfield();
}
}

14
osu.Game/Modes/UI/Playfield.cs
View File

@ -6,15 +6,17 @@ using osu.Framework.Graphics.Containers;
using osu.Game.Modes.Objects;
using osu.Game.Modes.Objects.Drawables;
using OpenTK;
using osu.Game.Modes.Judgements;
namespace osu.Game.Modes.UI
{
public abstract class Playfield<T> : Container
where T : HitObject
public abstract class Playfield<TObject, TJudgement> : Container
where TObject : HitObject
where TJudgement : JudgementInfo
{
public HitObjectContainer<DrawableHitObject<T>> HitObjects;
public HitObjectContainer<DrawableHitObject<TObject, TJudgement>> HitObjects;
public virtual void Add(DrawableHitObject<T> h) => HitObjects.Add(h);
public virtual void Add(DrawableHitObject<TObject, TJudgement> h) => HitObjects.Add(h);
internal Container<Drawable> ScaledContent;
@ -43,7 +45,7 @@ namespace osu.Game.Modes.UI
}
});
Add(HitObjects = new HitObjectContainer<DrawableHitObject<T>>
Add(HitObjects = new HitObjectContainer<DrawableHitObject<TObject, TJudgement>>
{
RelativeSizeAxes = Axes.Both,
});
@ -70,5 +72,7 @@ namespace osu.Game.Modes.UI
{
public override bool Contains(Vector2 screenSpacePos) => true;
}
public virtual void OnJudgement(DrawableHitObject<TObject, TJudgement> judgedObject) { }
}
}