Skip to content

Commit

Permalink
Add mania touch overlay
Browse files Browse the repository at this point in the history
Adjust default anchor/origin
  • Loading branch information
smoogipoo authored and peppy committed May 14, 2024
1 parent 4f6777a commit ef40197
Show file tree
Hide file tree
Showing 2 changed files with 161 additions and 3 deletions.
20 changes: 17 additions & 3 deletions osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
using osu.Framework.Graphics.Containers;
using System;
using System.Collections.Generic;
using System.Linq;
using osu.Framework.Allocation;
using osu.Framework.Graphics.Primitives;
using osu.Game.Rulesets.Mania.Beatmaps;
Expand Down Expand Up @@ -60,10 +61,23 @@ public ManiaPlayfield(List<StageDefinition> stageDefinitions)
throw new ArgumentException("Can't have zero or fewer stages.");

GridContainer playfieldGrid;
AddInternal(playfieldGrid = new GridContainer

RelativeSizeAxes = Axes.Y;
AutoSizeAxes = Axes.X;

AddRangeInternal(new Drawable[]
{
RelativeSizeAxes = Axes.Both,
Content = new[] { new Drawable[stageDefinitions.Count] }
playfieldGrid = new GridContainer
{
RelativeSizeAxes = Axes.Y,
AutoSizeAxes = Axes.X,
Content = new[] { new Drawable[stageDefinitions.Count] },
ColumnDimensions = Enumerable.Range(0, stageDefinitions.Count).Select(_ => new Dimension(GridSizeMode.AutoSize)).ToArray()
},
new ManiaTouchInputOverlay
{
RelativeSizeAxes = Axes.Both,
}
});

var normalColumnAction = ManiaAction.Key1;
Expand Down
144 changes: 144 additions & 0 deletions osu.Game.Rulesets.Mania/UI/ManiaTouchInputOverlay.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,144 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.

using System.Collections.Generic;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Input.Events;
using osu.Game.Configuration;
using osu.Game.Skinning;
using osuTK;

namespace osu.Game.Rulesets.Mania.UI
{
public partial class ManiaTouchInputOverlay : CompositeDrawable, ISerialisableDrawable
{
[SettingSource("Spacing", "The spacing between input receptors.")]
public BindableFloat Spacing { get; } = new BindableFloat(10)
{
Precision = 1,
MinValue = 0,
MaxValue = 100,
};

[Resolved]
private ManiaPlayfield playfield { get; set; } = null!;

public ManiaTouchInputOverlay()
{
Anchor = Anchor.BottomCentre;
Origin = Anchor.BottomCentre;
RelativeSizeAxes = Axes.Both;
Height = 0.5f;
}

[BackgroundDependencyLoader]
private void load()
{
List<Drawable> receptorGridContent = new List<Drawable>();
List<Dimension> receptorGridDimensions = new List<Dimension>();

bool first = true;

foreach (var stage in playfield.Stages)
{
foreach (var column in stage.Columns)
{
if (!first)
{
receptorGridContent.Add(new Gutter { Spacing = { BindTarget = Spacing } });
receptorGridDimensions.Add(new Dimension(GridSizeMode.AutoSize));
}

receptorGridContent.Add(new InputReceptor());
receptorGridDimensions.Add(new Dimension());

first = false;
}
}

InternalChild = new GridContainer
{
RelativeSizeAxes = Axes.Both,
Content = new[] { receptorGridContent.ToArray() },
ColumnDimensions = receptorGridDimensions.ToArray()
};
}

public bool UsesFixedAnchor { get; set; }

public partial class InputReceptor : CompositeDrawable
{
private readonly Box highlightOverlay;

public InputReceptor()
{
RelativeSizeAxes = Axes.Both;

InternalChildren = new Drawable[]
{
new Container
{
RelativeSizeAxes = Axes.Both,
Masking = true,
CornerRadius = 10,
Children = new Drawable[]
{
new Box
{
RelativeSizeAxes = Axes.Both,
Alpha = 0.15f,
},
highlightOverlay = new Box
{
RelativeSizeAxes = Axes.Both,
Alpha = 0,
Blending = BlendingParameters.Additive,
}
}
}
};
}

protected override bool OnTouchDown(TouchDownEvent e)
{
updateHighlight(true);
return true;
}

protected override void OnTouchUp(TouchUpEvent e)
{
updateHighlight(false);
}

protected override bool OnMouseDown(MouseDownEvent e)
{
updateHighlight(true);
return true;
}

protected override void OnMouseUp(MouseUpEvent e)
{
updateHighlight(false);
}

private void updateHighlight(bool enabled)
{
highlightOverlay.FadeTo(enabled ? 0.1f : 0, enabled ? 80 : 400, Easing.OutQuint);
}
}

private partial class Gutter : Drawable
{
public readonly IBindable<float> Spacing = new Bindable<float>();

public Gutter()
{
Spacing.BindValueChanged(s => Size = new Vector2(s.NewValue));
}
}
}
}

0 comments on commit ef40197

Please sign in to comment.