sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-29 17:37:23 +09:00
Code Issues Packages Projects Releases Wiki Activity

Add combo index display support

Browse Source
This commit is contained in:
Dean Herbert 2020-09-29 17:04:59 +09:00
parent f16fc29071
commit 8d8d45a0c0
1 changed files with 44 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
View File

@ -13,6 +13,8 @@ using osu.Framework.Graphics.Effects;
using osu.Framework.Graphics.Primitives; using osu.Framework.Graphics.Primitives;
using osu.Framework.Graphics.Shapes; using osu.Framework.Graphics.Shapes;
using osu.Framework.Input.Events; using osu.Framework.Input.Events;
using osu.Game.Graphics;
using osu.Game.Graphics.Sprites;
using osu.Game.Graphics.UserInterface; using osu.Game.Graphics.UserInterface;
using osu.Game.Rulesets.Edit; using osu.Game.Rulesets.Edit;
using osu.Game.Rulesets.Objects; using osu.Game.Rulesets.Objects;
@ -40,11 +42,17 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
private Bindable<Color4> comboColour; private Bindable<Color4> comboColour;
private readonly Container mainComponents;
private readonly OsuSpriteText comboIndexText;
private Bindable<int> comboIndex;
private const float thickness = 5; private const float thickness = 5;
private const float shadow_radius = 5; private const float shadow_radius = 5;
private const float circle_size = 16; private const float circle_size = 24;
public TimelineHitObjectBlueprint(HitObject hitObject) public TimelineHitObjectBlueprint(HitObject hitObject)
: base(hitObject) : base(hitObject)
@ -60,6 +68,23 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
RelativeSizeAxes = Axes.X; RelativeSizeAxes = Axes.X;
AutoSizeAxes = Axes.Y; AutoSizeAxes = Axes.Y;
AddRangeInternal(new Drawable[]
{
mainComponents = new Container
{
Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft,
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
},
comboIndexText = new OsuSpriteText
{
Anchor = Anchor.CentreLeft,
Origin = Anchor.Centre,
Font = OsuFont.Numeric.With(size: circle_size / 2, weight: FontWeight.Black),
},
});
circle = new Circle circle = new Circle
{ {
Size = new Vector2(circle_size), Size = new Vector2(circle_size),
@ -83,7 +108,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
DragBar dragBarUnderlay; DragBar dragBarUnderlay;
Container extensionBar; Container extensionBar;
AddRangeInternal(new Drawable[] mainComponents.AddRange(new Drawable[]
{ {
extensionBar = new Container extensionBar = new Container
{ {
@ -123,7 +148,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
} }
else else
{ {
AddInternal(circle); mainComponents.Add(circle);
} }
updateShadows(); updateShadows();
@ -143,12 +168,27 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
{ {
base.LoadComplete(); base.LoadComplete();
if (HitObject is IHasComboInformation comboInfo)
{
comboIndex = comboInfo.IndexInCurrentComboBindable.GetBoundCopy();
comboIndex.BindValueChanged(combo =>
{
comboIndexText.Text = (combo.NewValue + 1).ToString();
}, true);
}
if (drawableHitObject != null) if (drawableHitObject != null)
{ {
comboColour = drawableHitObject.AccentColour.GetBoundCopy(); comboColour = drawableHitObject.AccentColour.GetBoundCopy();
comboColour.BindValueChanged(colour => comboColour.BindValueChanged(colour =>
{ {
Colour = drawableHitObject.AccentColour.Value; mainComponents.Colour = drawableHitObject.AccentColour.Value;
var col = mainComponents.Colour.AverageColour.Linear;
float brightness = col.R + col.G + col.B;
// decide the combo index colour based on brightness?
comboIndexText.Colour = brightness > 0.5f ? Color4.Black : Color4.White;
}, true); }, true);
} }
} }