h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 14:55:37 +08:00
Code Issues Releases Wiki Activity

Reduce complexity of instantiating circle pieces in hits.

Browse Source
This commit is contained in:
smoogipooo 2017-04-03 14:39:56 +09:00
parent ef992b03bf
commit 6e612bbefc
5 changed files with 35 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
osu.Game.Modes.Taiko/Objects/Drawable/DrawableCentreHit.cs
View File

@ -12,24 +12,20 @@ namespace osu.Game.Modes.Taiko.Objects.Drawable
{
protected override Key[] HitKeys { get; } = { Key.F, Key.J };
private readonly CirclePiece circlePiece;
public DrawableCentreHit(Hit hit)
: base(hit)
{
Add(circlePiece = new CirclePiece
{
Children = new[]
{
new CentreHitSymbolPiece()
}
});
}
[BackgroundDependencyLoader]
private void load(OsuColour colours)
{
circlePiece.AccentColour = colours.PinkDarker;
Circle.AccentColour = colours.PinkDarker;
}
protected override CirclePiece CreateCirclePiece() => new CirclePiece
{
Children = new[] { new CentreHitSymbolPiece() }
};
}
}

13
osu.Game.Modes.Taiko/Objects/Drawable/DrawableHit.cs
View File

@ -6,6 +6,7 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Game.Modes.Objects.Drawables;
using osu.Game.Modes.Taiko.Judgements;
using osu.Game.Modes.Taiko.Objects.Drawable.Pieces;
using System;
using System.Linq;
@ -20,15 +21,17 @@ namespace osu.Game.Modes.Taiko.Objects.Drawable
protected override Container<Framework.Graphics.Drawable> Content => bodyContainer;
protected readonly CirclePiece Circle;
private readonly Hit hit;
private readonly Container bodyContainer;
/// <summary>
/// Whether the last key pressed is a valid hit key.
/// </summary>
private bool validKeyPressed;
private readonly Container bodyContainer;
protected DrawableHit(Hit hit)
: base(hit)
{
@ -38,6 +41,10 @@ namespace osu.Game.Modes.Taiko.Objects.Drawable
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Children = new[]
{
Circle = CreateCirclePiece()
}
});
}
@ -100,5 +107,7 @@ namespace osu.Game.Modes.Taiko.Objects.Drawable
Expire();
}
protected abstract CirclePiece CreateCirclePiece();
}
}

16
osu.Game.Modes.Taiko/Objects/Drawable/DrawableRimHit.cs
View File

@ -12,24 +12,20 @@ namespace osu.Game.Modes.Taiko.Objects.Drawable
{
protected override Key[] HitKeys { get; } = { Key.D, Key.K };
private readonly CirclePiece circlePiece;
public DrawableRimHit(Hit hit)
: base(hit)
{
Add(circlePiece = new CirclePiece
{
Children = new[]
{
new RimHitSymbolPiece()
}
});
}
[BackgroundDependencyLoader]
private void load(OsuColour colours)
{
circlePiece.AccentColour = colours.BlueDarker;
Circle.AccentColour = colours.BlueDarker;
}
protected override CirclePiece CreateCirclePiece() => new CirclePiece
{
Children = new[] { new RimHitSymbolPiece() }
};
}
}

16
osu.Game.Modes.Taiko/Objects/Drawable/DrawableStrongCentreHit.cs
View File

@ -12,24 +12,20 @@ namespace osu.Game.Modes.Taiko.Objects.Drawable
{
protected override Key[] HitKeys { get; } = { Key.F, Key.J };
private readonly CirclePiece circlePiece;
public DrawableStrongCentreHit(Hit hit)
: base(hit)
{
Add(circlePiece = new StrongCirclePiece
{
Children = new []
{
new CentreHitSymbolPiece()
}
});
}
[BackgroundDependencyLoader]
private void load(OsuColour colours)
{
circlePiece.AccentColour = colours.PinkDarker;
Circle.AccentColour = colours.PinkDarker;
}
protected override CirclePiece CreateCirclePiece() => new StrongCirclePiece
{
Children = new[] { new CentreHitSymbolPiece() }
};
}
}

16
osu.Game.Modes.Taiko/Objects/Drawable/DrawableStrongRimHit.cs
View File

@ -12,24 +12,20 @@ namespace osu.Game.Modes.Taiko.Objects.Drawable
{
protected override Key[] HitKeys { get; } = { Key.D, Key.K };
private readonly CirclePiece circlePiece;
public DrawableStrongRimHit(Hit hit)
: base(hit)
{
Add(circlePiece = new StrongCirclePiece
{
Children = new[]
{
new RimHitSymbolPiece()
}
});
}
[BackgroundDependencyLoader]
private void load(OsuColour colours)
{
circlePiece.AccentColour = colours.BlueDarker;
Circle.AccentColour = colours.BlueDarker;
}
protected override CirclePiece CreateCirclePiece() => new StrongCirclePiece
{
Children = new[] { new RimHitSymbolPiece() }
};
}
}