1
0
mirror of https://github.com/ppy/osu.git synced 2025-02-06 13:32:55 +08:00

Cleanups + CircularContainer fixes.

This commit is contained in:
smoogipooo 2017-03-23 09:18:50 +09:00
parent edd9a22177
commit 5e0d9c3820
3 changed files with 5 additions and 26 deletions

View File

@ -27,15 +27,13 @@ namespace osu.Game.Modes.Taiko.Objects.Drawable.Pieces
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Size = new Vector2(45f), Size = new Vector2(45f),
Masking = true,
Children = new[] Children = new[]
{ {
new Box new Box
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Alpha = 1 Alpha = 1
} }
} }

View File

@ -62,29 +62,23 @@ namespace osu.Game.Modes.Taiko.Objects.Drawable.Pieces
innerLayer = new Container innerLayer = new Container
{ {
Name = "Inner Layer", Name = "Inner Layer",
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
RelativeSizeAxes = Axes.Y, RelativeSizeAxes = Axes.Y,
Children = new Framework.Graphics.Drawable[] Children = new Framework.Graphics.Drawable[]
{ {
backingGlowContainer = new CircularContainer backingGlowContainer = new CircularContainer
{ {
Name = "Backing Glow", Name = "Backing Glow",
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Masking = true,
Children = new[] Children = new[]
{ {
new Box new Box
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Alpha = 0, Alpha = 0,
AlwaysPresent = true AlwaysPresent = true
} }
@ -93,26 +87,22 @@ namespace osu.Game.Modes.Taiko.Objects.Drawable.Pieces
innerCircleContainer = new CircularContainer innerCircleContainer = new CircularContainer
{ {
Name = "Inner Circle", Name = "Inner Circle",
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Masking = true,
Children = new Framework.Graphics.Drawable[] Children = new Framework.Graphics.Drawable[]
{ {
innerBackground = new Box innerBackground = new Box
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
}, },
triangles = new Triangles triangles = new Triangles
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
} }
} }
@ -120,24 +110,19 @@ namespace osu.Game.Modes.Taiko.Objects.Drawable.Pieces
new CircularContainer new CircularContainer
{ {
Name = "Ring", Name = "Ring",
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
BorderThickness = 8, BorderThickness = 8,
BorderColour = Color4.White, BorderColour = Color4.White,
Masking = true,
Children = new[] Children = new[]
{ {
new Box new Box
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Alpha = 0, Alpha = 0,
AlwaysPresent = true AlwaysPresent = true
} }
@ -146,7 +131,6 @@ namespace osu.Game.Modes.Taiko.Objects.Drawable.Pieces
iconContainer = new Container iconContainer = new Container
{ {
Name = "Icon Container", Name = "Icon Container",
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
} }

View File

@ -28,18 +28,15 @@ namespace osu.Game.Modes.Taiko.Objects.Drawable.Pieces
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Size = new Vector2(61f), Size = new Vector2(61f),
BorderThickness = 8, BorderThickness = 8,
BorderColour = Color4.White, BorderColour = Color4.White,
Masking = true,
Children = new[] Children = new[]
{ {
new Box new Box
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Alpha = 0, Alpha = 0,
AlwaysPresent = true AlwaysPresent = true
} }