mirror of
https://github.com/ppy/osu.git
synced 2025-02-13 15:03:13 +08:00
Implement swell application
Also removes a weird sizing application that seems to have no effect (introduced in 27e63eb; compare removals for other taiko DHO types in9d00e5b
and58bf288
).
This commit is contained in:
parent
8b6bc09b8f
commit
e3b6eaa390
@ -3,6 +3,7 @@
|
||||
|
||||
using System;
|
||||
using System.Linq;
|
||||
using JetBrains.Annotations;
|
||||
using osu.Framework.Allocation;
|
||||
using osu.Framework.Extensions.Color4Extensions;
|
||||
using osu.Framework.Graphics;
|
||||
@ -35,7 +36,12 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
|
||||
private readonly CircularContainer targetRing;
|
||||
private readonly CircularContainer expandingRing;
|
||||
|
||||
public DrawableSwell(Swell swell)
|
||||
public DrawableSwell()
|
||||
: this(null)
|
||||
{
|
||||
}
|
||||
|
||||
public DrawableSwell([CanBeNull] Swell swell)
|
||||
: base(swell)
|
||||
{
|
||||
FillMode = FillMode.Fit;
|
||||
@ -123,12 +129,13 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
|
||||
Origin = Anchor.Centre,
|
||||
});
|
||||
|
||||
protected override void LoadComplete()
|
||||
protected override void OnFree()
|
||||
{
|
||||
base.LoadComplete();
|
||||
base.OnFree();
|
||||
|
||||
// We need to set this here because RelativeSizeAxes won't/can't set our size by default with a different RelativeChildSize
|
||||
Width *= Parent.RelativeChildSize.X;
|
||||
UnproxyContent();
|
||||
|
||||
lastWasCentre = null;
|
||||
}
|
||||
|
||||
protected override void AddNestedHitObject(DrawableHitObject hitObject)
|
||||
|
Loading…
Reference in New Issue
Block a user