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

Nest TickContainer in BeatSnapVisualiser

Browse Source
This commit is contained in:
smoogipoo 2018-03-19 20:20:29 +09:00
parent b25c564ecb
commit 879dbc75b5
3 changed files with 82 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
osu.Game/Screens/Edit/Screens/Compose/BeatSnap/BeatSnapVisualiser.cs
View File

@ -1,6 +1,7 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System;
using osu.Framework.Allocation;
using osu.Framework.Configuration;
using osu.Framework.Graphics;
@ -183,5 +184,86 @@ namespace osu.Game.Screens.Edit.Screens.Compose.BeatSnap
FlashColour = colours.Gray9;
}
}
private class TickContainer : CompositeDrawable
{
public readonly BindableInt Divisor = new BindableInt();
public new MarginPadding Padding
{
set => base.Padding = value;
}
private EquilateralTriangle marker;
private readonly int[] availableDivisors;
private readonly float tickSpacing;
public TickContainer(params int[] divisors)
{
availableDivisors = divisors;
tickSpacing = 1f / (availableDivisors.Length + 1);
}
[BackgroundDependencyLoader]
private void load(OsuColour colours)
{
InternalChild = marker = new EquilateralTriangle
{
Anchor = Anchor.BottomLeft,
Origin = Anchor.BottomCentre,
RelativePositionAxes = Axes.X,
Height = 7,
EdgeSmoothness = new Vector2(1),
Colour = colours.Gray4,
};
for (int i = 0; i < availableDivisors.Length; i++)
{
AddInternal(new Tick(availableDivisors[i])
{
Anchor = Anchor.TopLeft,
Origin = Anchor.TopCentre,
RelativePositionAxes = Axes.X,
X = getTickPosition(i)
});
}
}
protected override void LoadComplete()
{
base.LoadComplete();
Divisor.ValueChanged += v => updatePosition();
updatePosition();
}
private void updatePosition() => marker.MoveToX(getTickPosition(Array.IndexOf(availableDivisors, Divisor.Value)), 100, Easing.OutQuint);
private float getTickPosition(int index) => (index + 1) * tickSpacing;
private class Tick : Box
{
private readonly int divisor;
public Tick(int divisor)
{
this.divisor = divisor;
Size = new Vector2(2, 10);
}
[BackgroundDependencyLoader]
private void load(OsuColour colours)
{
if (divisor >= 16)
Colour = colours.Red;
else if (divisor >= 8)
Colour = colours.Yellow;
else
Colour = colours.Gray4;
}
}
}
}
}

92
osu.Game/Screens/Edit/Screens/Compose/BeatSnap/TickContainer.cs
View File

@ -1,92 +0,0 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System;
using osu.Framework.Allocation;
using osu.Framework.Configuration;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Game.Graphics;
using OpenTK;
namespace osu.Game.Screens.Edit.Screens.Compose.BeatSnap
{
public class TickContainer : CompositeDrawable
{
public readonly BindableInt Divisor = new BindableInt();
public new MarginPadding Padding { set => base.Padding = value; }
private EquilateralTriangle marker;
private readonly int[] availableDivisors;
private readonly float tickSpacing;
public TickContainer(params int[] divisors)
{
availableDivisors = divisors;
tickSpacing = 1f / (availableDivisors.Length + 1);
}
[BackgroundDependencyLoader]
private void load(OsuColour colours)
{
InternalChild = marker = new EquilateralTriangle
{
Anchor = Anchor.BottomLeft,
Origin = Anchor.BottomCentre,
RelativePositionAxes = Axes.X,
Height = 7,
EdgeSmoothness = new Vector2(1),
Colour = colours.Gray4,
};
for (int i = 0; i < availableDivisors.Length; i++)
{
AddInternal(new Tick(availableDivisors[i])
{
Anchor = Anchor.TopLeft,
Origin = Anchor.TopCentre,
RelativePositionAxes = Axes.X,
X = getTickPosition(i)
});
}
}
protected override void LoadComplete()
{
base.LoadComplete();
Divisor.ValueChanged += v => updatePosition();
updatePosition();
}
private void updatePosition() => marker.MoveToX(getTickPosition(Array.IndexOf(availableDivisors, Divisor.Value)), 100, Easing.OutQuint);
private float getTickPosition(int index) => (index + 1) * tickSpacing;
private class Tick : Box
{
private readonly int divisor;
public Tick(int divisor)
{
this.divisor = divisor;
Size = new Vector2(2, 10);
}
[BackgroundDependencyLoader]
private void load(OsuColour colours)
{
if (divisor >= 16)
Colour = colours.Red;
else if (divisor >= 8)
Colour = colours.Yellow;
else
Colour = colours.Gray4;
}
}
}
}

1
osu.Game/osu.Game.csproj
View File

@ -381,7 +381,6 @@
<Compile Include="Rulesets\Scoring\Legacy\LegacyScoreParser.cs" />
<Compile Include="Rulesets\UI\JudgementContainer.cs" />
<Compile Include="Screens\Edit\Screens\Compose\BeatSnap\BeatSnapVisualiser.cs" />
<Compile Include="Screens\Edit\Screens\Compose\BeatSnap\TickContainer.cs" />
<Compile Include="Screens\Edit\Screens\Compose\Layers\BorderLayer.cs" />
<Compile Include="Screens\Edit\Screens\Compose\Layers\HitObjectMaskLayer.cs" />
<Compile Include="Screens\Edit\Screens\Compose\Layers\SelectionBox.cs" />