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

Dim rows which are not part of the active control point (and offset centre)

Browse Source
This commit is contained in:
Dean Herbert 2022-05-23 21:00:21 +09:00
parent 7040dec013
commit c1720c128d
1 changed files with 46 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
osu.Game/Screens/Edit/Timing/WaveformComparisonDisplay.cs
View File

@ -33,6 +33,9 @@ namespace osu.Game.Screens.Edit.Timing
[Resolved] [Resolved]
private IBindable<WorkingBeatmap> beatmap { get; set; } = null!; private IBindable<WorkingBeatmap> beatmap { get; set; } = null!;
[Resolved]
private EditorBeatmap editorBeatmap { get; set; } = null!;
[Resolved] [Resolved]
private Bindable<ControlPointGroup?> selectedGroup { get; set; } = null!; private Bindable<ControlPointGroup?> selectedGroup { get; set; } = null!;
@ -46,7 +49,10 @@ namespace osu.Game.Screens.Edit.Timing
private int lastDisplayedBeatIndex; private int lastDisplayedBeatIndex;
private double offsetZeroTime => selectedGroup.Value?.Time ?? 0; private double selectedGroupStartTime;
private double selectedGroupEndTime;
private readonly BindableList<ControlPointGroup> controlPointGroups = new BindableList<ControlPointGroup>();
public WaveformComparisonDisplay() public WaveformComparisonDisplay()
{ {
@ -88,20 +94,45 @@ namespace osu.Game.Screens.Edit.Timing
AddInternal(beatIndexText = new OsuSpriteText AddInternal(beatIndexText = new OsuSpriteText
{ {
Margin = new MarginPadding(5), Anchor = Anchor.CentreLeft,
Margin = new MarginPadding(4),
}); });
selectedGroup.BindValueChanged(selectedGroupChanged, true); selectedGroup.BindValueChanged(_ => updateTimingGroup(), true);
((IBindableList<ControlPointGroup>)controlPointGroups).BindTo(editorBeatmap.ControlPointInfo.Groups);
controlPointGroups.BindCollectionChanged((_, __) => updateTimingGroup());
beatLength.BindValueChanged(_ => showFrom(lastDisplayedBeatIndex), true); beatLength.BindValueChanged(_ => showFrom(lastDisplayedBeatIndex), true);
} }
private void selectedGroupChanged(ValueChangedEvent<ControlPointGroup?> group) private void updateTimingGroup()
{ {
timingPoint = selectedGroup.Value?.ControlPoints.OfType<TimingControlPoint>().FirstOrDefault()
?? new TimingControlPoint();
beatLength.UnbindBindings(); beatLength.UnbindBindings();
selectedGroupStartTime = 0;
selectedGroupEndTime = beatmap.Value.Track.Length;
var tcp = selectedGroup.Value?.ControlPoints.OfType<TimingControlPoint>().FirstOrDefault();
if (tcp == null)
{
timingPoint = new TimingControlPoint();
return;
}
timingPoint = tcp;
beatLength.BindTo(timingPoint.BeatLengthBindable); beatLength.BindTo(timingPoint.BeatLengthBindable);
selectedGroupStartTime = selectedGroup.Value?.Time ?? 0;
var nextGroup = editorBeatmap.ControlPointInfo.TimingPoints
.SkipWhile(g => g != tcp)
.Skip(1)
.FirstOrDefault();
if (nextGroup != null)
selectedGroupEndTime = nextGroup.Time;
} }
protected override bool OnHover(HoverEvent e) => true; protected override bool OnHover(HoverEvent e) => true;
@ -122,7 +153,7 @@ namespace osu.Game.Screens.Edit.Timing
if (!IsHovered) if (!IsHovered)
{ {
int beatOffset = (int)Math.Max(0, ((editorClock.CurrentTime - offsetZeroTime) / timingPoint.BeatLength)); int beatOffset = (int)Math.Floor((editorClock.CurrentTimeAccurate - selectedGroupStartTime) / timingPoint.BeatLength);
showFrom(beatOffset); showFrom(beatOffset);
} }
@ -137,11 +168,17 @@ namespace osu.Game.Screens.Edit.Timing
beatIndexText.Text = beatIndex.ToString(); beatIndexText.Text = beatIndex.ToString();
// Start displaying from before the current beat
beatIndex -= total_waveforms / 2;
foreach (var waveform in InternalChildren.OfType<WaveformGraph>()) foreach (var waveform in InternalChildren.OfType<WaveformGraph>())
{ {
// offset to the required beat index. // offset to the required beat index.
float offset = (float)(offsetZeroTime + (beatIndex * timingPoint.BeatLength - (visible_width / 2))) / trackLength * scale; double time = selectedGroupStartTime + beatIndex * timingPoint.BeatLength;
float offset = (float)(time - visible_width / 2) / trackLength * scale;
waveform.Alpha = time < selectedGroupStartTime || time > selectedGroupEndTime ? 0.2f : 1;
waveform.X = -offset; waveform.X = -offset;
waveform.Scale = new Vector2(scale, 1); waveform.Scale = new Vector2(scale, 1);