mirror of
https://github.com/ppy/osu.git
synced 2025-01-15 15:12:57 +08:00
Encapsulate zoom logic into a separate class
This commit is contained in:
smoogipoo
parent
0141cbebba
commit
9a9ed1d630
@ -3,40 +3,24 @@
|
|||||||
|
|
||||||
using osu.Framework.Configuration;
|
using osu.Framework.Configuration;
|
||||||
using osu.Framework.Graphics;
|
using osu.Framework.Graphics;
|
||||||
using osu.Framework.Graphics.Containers;
|
|
||||||
using osu.Framework.Graphics.Transforms;
|
|
||||||
using osu.Framework.Input;
|
|
||||||
using osu.Framework.MathUtils;
|
|
||||||
using osu.Game.Beatmaps;
|
using osu.Game.Beatmaps;
|
||||||
using osu.Game.Graphics;
|
using osu.Game.Graphics;
|
||||||
using OpenTK;
|
|
||||||
|
|
||||||
namespace osu.Game.Screens.Edit.Screens.Compose.Timeline
|
namespace osu.Game.Screens.Edit.Screens.Compose.Timeline
|
||||||
{
|
{
|
||||||
public class ScrollingTimelineContainer : ScrollContainer
|
public class ScrollingTimelineContainer : ZoomableScrollContainer
|
||||||
{
|
{
|
||||||
public readonly Bindable<bool> WaveformVisible = new Bindable<bool>();
|
public readonly Bindable<bool> WaveformVisible = new Bindable<bool>();
|
||||||
public readonly Bindable<WorkingBeatmap> Beatmap = new Bindable<WorkingBeatmap>();
|
public readonly Bindable<WorkingBeatmap> Beatmap = new Bindable<WorkingBeatmap>();
|
||||||
|
|
||||||
private readonly Container zoomedContent;
|
|
||||||
|
|
||||||
private float currentZoom = 10;
|
|
||||||
|
|
||||||
public ScrollingTimelineContainer()
|
public ScrollingTimelineContainer()
|
||||||
: base(Direction.Horizontal)
|
|
||||||
{
|
{
|
||||||
Masking = true;
|
|
||||||
|
|
||||||
BeatmapWaveformGraph waveform;
|
BeatmapWaveformGraph waveform;
|
||||||
Child = zoomedContent = new Container
|
Child = waveform = new BeatmapWaveformGraph
|
||||||
{
|
{
|
||||||
RelativeSizeAxes = Axes.Y,
|
RelativeSizeAxes = Axes.Both,
|
||||||
Child = waveform = new BeatmapWaveformGraph
|
Colour = OsuColour.FromHex("222"),
|
||||||
{
|
Depth = float.MaxValue
|
||||||
RelativeSizeAxes = Axes.Both,
|
|
||||||
Colour = OsuColour.FromHex("222"),
|
|
||||||
Depth = float.MaxValue
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
waveform.Beatmap.BindTo(Beatmap);
|
waveform.Beatmap.BindTo(Beatmap);
|
||||||
@ -44,97 +28,12 @@ namespace osu.Game.Screens.Edit.Screens.Compose.Timeline
|
|||||||
WaveformVisible.ValueChanged += visible => waveform.FadeTo(visible ? 1 : 0, 200, Easing.OutQuint);
|
WaveformVisible.ValueChanged += visible => waveform.FadeTo(visible ? 1 : 0, 200, Easing.OutQuint);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets the content zoom of this <see cref="ScrollingTimelineContainer"/>.
|
|
||||||
/// </summary>
|
|
||||||
public int Zoom
|
|
||||||
{
|
|
||||||
get => zoomTarget;
|
|
||||||
set => setZoomTarget(value, ToSpaceOfOtherDrawable(new Vector2(DrawWidth / 2, 0), zoomedContent).X);
|
|
||||||
}
|
|
||||||
|
|
||||||
protected override void Update()
|
protected override void Update()
|
||||||
{
|
{
|
||||||
base.Update();
|
base.Update();
|
||||||
|
|
||||||
zoomedContent.Margin = new MarginPadding { Horizontal = DrawWidth / 2 };
|
// We want time = 0 to be at the centre of the container when scrolled to the start
|
||||||
zoomedContent.Width = DrawWidth * currentZoom;
|
Content.Margin = new MarginPadding { Horizontal = DrawWidth / 2 };
|
||||||
}
|
|
||||||
|
|
||||||
protected override bool OnWheel(InputState state)
|
|
||||||
{
|
|
||||||
if (!state.Keyboard.ControlPressed)
|
|
||||||
return base.OnWheel(state);
|
|
||||||
|
|
||||||
setZoomTarget(zoomTarget + state.Mouse.WheelDelta, zoomedContent.ToLocalSpace(state.Mouse.NativeState.Position).X);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
private int zoomTarget = 10;
|
|
||||||
private void setZoomTarget(int newZoom, float focusPoint)
|
|
||||||
{
|
|
||||||
zoomTarget = MathHelper.Clamp(newZoom, 1, 60);
|
|
||||||
transformZoomTo(zoomTarget, focusPoint, 200, Easing.OutQuint);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void transformZoomTo(int newZoom, float focusPoint, double duration = 0, Easing easing = Easing.None)
|
|
||||||
=> this.TransformTo(this.PopulateTransform(new TransformZoom(focusPoint, zoomedContent.DrawWidth), newZoom, duration, easing));
|
|
||||||
|
|
||||||
private class TransformZoom : Transform<float, ScrollingTimelineContainer>
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// The focus point in the waveform, in absolute coordinates local to the waveform.
|
|
||||||
/// </summary>
|
|
||||||
private readonly float focusPoint;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// The size of the waveform.
|
|
||||||
/// </summary>
|
|
||||||
private readonly float waveformSize;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// The scroll offset at the start time of the transform/
|
|
||||||
/// </summary>
|
|
||||||
private float startScrollOffset;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Transforms <see cref="ScrollingTimelineContainer.zoom"/> to a new value.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="focusPoint">The focus point in the waveform, in absolute coordinates local to the waveform.</param>
|
|
||||||
/// <param name="waveformSize">The size of the waveform.</param>
|
|
||||||
public TransformZoom(float focusPoint, float waveformSize)
|
|
||||||
{
|
|
||||||
this.focusPoint = focusPoint;
|
|
||||||
this.waveformSize = waveformSize;
|
|
||||||
}
|
|
||||||
|
|
||||||
public override string TargetMember => nameof(currentZoom);
|
|
||||||
|
|
||||||
private float valueAt(double time)
|
|
||||||
{
|
|
||||||
if (time < StartTime) return StartValue;
|
|
||||||
if (time >= EndTime) return EndValue;
|
|
||||||
|
|
||||||
return Interpolation.ValueAt(time, StartValue, EndValue, StartTime, EndTime, Easing);
|
|
||||||
}
|
|
||||||
|
|
||||||
protected override void Apply(ScrollingTimelineContainer d, double time)
|
|
||||||
{
|
|
||||||
float newZoom = valueAt(time);
|
|
||||||
|
|
||||||
float focusOffset = focusPoint - startScrollOffset;
|
|
||||||
float expectedWidth = d.DrawWidth * newZoom;
|
|
||||||
float targetOffset = expectedWidth * (focusPoint / waveformSize) - focusOffset;
|
|
||||||
|
|
||||||
d.currentZoom = newZoom;
|
|
||||||
d.ScrollTo(targetOffset, false);
|
|
||||||
}
|
|
||||||
|
|
||||||
protected override void ReadIntoStartValue(ScrollingTimelineContainer d)
|
|
||||||
{
|
|
||||||
startScrollOffset = d.Current;
|
|
||||||
StartValue = d.currentZoom;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -0,0 +1,118 @@
|
|||||||
|
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
|
||||||
|
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
|
||||||
|
|
||||||
|
using osu.Framework.Graphics;
|
||||||
|
using osu.Framework.Graphics.Containers;
|
||||||
|
using osu.Framework.Graphics.Transforms;
|
||||||
|
using osu.Framework.Input;
|
||||||
|
using osu.Framework.MathUtils;
|
||||||
|
using OpenTK;
|
||||||
|
|
||||||
|
namespace osu.Game.Screens.Edit.Screens.Compose.Timeline
|
||||||
|
{
|
||||||
|
public class ZoomableScrollContainer : ScrollContainer
|
||||||
|
{
|
||||||
|
private readonly Container zoomedContent;
|
||||||
|
protected override Container<Drawable> Content => zoomedContent;
|
||||||
|
|
||||||
|
private float currentZoom = 10;
|
||||||
|
|
||||||
|
public ZoomableScrollContainer()
|
||||||
|
: base(Direction.Horizontal)
|
||||||
|
{
|
||||||
|
base.Content.Add(zoomedContent = new Container { RelativeSizeAxes = Axes.Y });
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets or sets the content zoom of this <see cref="ScrollingTimelineContainer"/>.
|
||||||
|
/// </summary>
|
||||||
|
public int Zoom
|
||||||
|
{
|
||||||
|
get => zoomTarget;
|
||||||
|
set => setZoomTarget(value, ToSpaceOfOtherDrawable(new Vector2(DrawWidth / 2, 0), zoomedContent).X);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override void Update()
|
||||||
|
{
|
||||||
|
base.Update();
|
||||||
|
|
||||||
|
zoomedContent.Width = DrawWidth * currentZoom;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override bool OnWheel(InputState state)
|
||||||
|
{
|
||||||
|
if (!state.Keyboard.ControlPressed)
|
||||||
|
return base.OnWheel(state);
|
||||||
|
|
||||||
|
setZoomTarget(zoomTarget + state.Mouse.WheelDelta, zoomedContent.ToLocalSpace(state.Mouse.NativeState.Position).X);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
private int zoomTarget = 10;
|
||||||
|
private void setZoomTarget(int newZoom, float focusPoint)
|
||||||
|
{
|
||||||
|
zoomTarget = MathHelper.Clamp(newZoom, 1, 60);
|
||||||
|
transformZoomTo(zoomTarget, focusPoint, 200, Easing.OutQuint);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void transformZoomTo(int newZoom, float focusPoint, double duration = 0, Easing easing = Easing.None)
|
||||||
|
=> this.TransformTo(this.PopulateTransform(new TransformZoom(focusPoint, zoomedContent.DrawWidth), newZoom, duration, easing));
|
||||||
|
|
||||||
|
private class TransformZoom : Transform<float, ZoomableScrollContainer>
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// The focus point in the waveform, in absolute coordinates local to the waveform.
|
||||||
|
/// </summary>
|
||||||
|
private readonly float focusPoint;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// The size of the waveform.
|
||||||
|
/// </summary>
|
||||||
|
private readonly float waveformSize;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// The scroll offset at the start time of the transform/
|
||||||
|
/// </summary>
|
||||||
|
private float startScrollOffset;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Transforms <see cref="ScrollingTimelineContainer.zoom"/> to a new value.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="focusPoint">The focus point in the waveform, in absolute coordinates local to the waveform.</param>
|
||||||
|
/// <param name="waveformSize">The size of the waveform.</param>
|
||||||
|
public TransformZoom(float focusPoint, float waveformSize)
|
||||||
|
{
|
||||||
|
this.focusPoint = focusPoint;
|
||||||
|
this.waveformSize = waveformSize;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override string TargetMember => nameof(currentZoom);
|
||||||
|
|
||||||
|
private float valueAt(double time)
|
||||||
|
{
|
||||||
|
if (time < StartTime) return StartValue;
|
||||||
|
if (time >= EndTime) return EndValue;
|
||||||
|
|
||||||
|
return Interpolation.ValueAt(time, StartValue, EndValue, StartTime, EndTime, Easing);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override void Apply(ZoomableScrollContainer d, double time)
|
||||||
|
{
|
||||||
|
float newZoom = valueAt(time);
|
||||||
|
|
||||||
|
float focusOffset = focusPoint - startScrollOffset;
|
||||||
|
float expectedWidth = d.DrawWidth * newZoom;
|
||||||
|
float targetOffset = expectedWidth * (focusPoint / waveformSize) - focusOffset;
|
||||||
|
|
||||||
|
d.currentZoom = newZoom;
|
||||||
|
d.ScrollTo(targetOffset, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override void ReadIntoStartValue(ZoomableScrollContainer d)
|
||||||
|
{
|
||||||
|
startScrollOffset = d.Current;
|
||||||
|
StartValue = d.currentZoom;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue
Block a user