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

Move already placed objects when adjusting offset/BPM

Browse Source
This commit is contained in:
Aurelian 2024-06-02 16:38:58 +02:00
parent 4162d0babe
commit e85869e0b4
1 changed files with 55 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
osu.Game/Screens/Edit/Timing/TapTimingControl.cs
View File

@ -1,6 +1,8 @@
// 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;
using System.Collections.Generic;
using System.Linq;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
@ -9,11 +11,13 @@ using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Input.Events;
using osu.Framework.Utils;
using osu.Game.Beatmaps.ControlPoints;
using osu.Game.Graphics;
using osu.Game.Graphics.UserInterface;
using osu.Game.Graphics.UserInterfaceV2;
using osu.Game.Overlays;
using osu.Game.Rulesets.Objects;
using osuTK;
namespace osu.Game.Screens.Edit.Timing
@ -33,6 +37,8 @@ namespace osu.Game.Screens.Edit.Timing
private MetronomeDisplay metronome = null!;
private LabelledSwitchButton adjustPlacedNotes = null!;
[BackgroundDependencyLoader]
private void load(OverlayColourProvider colourProvider, OsuColour colours)
{
@ -59,6 +65,7 @@ namespace osu.Game.Screens.Edit.Timing
{
new Dimension(GridSizeMode.Absolute, 200),
new Dimension(GridSizeMode.Absolute, 50),
new Dimension(GridSizeMode.Absolute, 50),
new Dimension(GridSizeMode.Absolute, TapButton.SIZE + padding),
},
Content = new[]
@ -116,6 +123,18 @@ namespace osu.Game.Screens.Edit.Timing
},
},
new Drawable[]
{
new Container
{
RelativeSizeAxes = Axes.Both,
Padding = new MarginPadding { Bottom = padding, Horizontal = padding },
Children = new Drawable[]
{
adjustPlacedNotes = new LabelledSwitchButton { Label = "Move already placed notes\nwhen changing the offset/BPM" },
}
},
},
new Drawable[]
{
new Container
{
@ -192,6 +211,17 @@ namespace osu.Game.Screens.Edit.Timing
editorClock.Seek(selectedGroup.Value.Time);
}
private List<HitObject> hitObjectsInTimingRange(EditorBeatmap beatmap, ControlPointGroup selectedGroup)
{
// If the first group, we grab all hitobjects prior to the next, if the last group, we grab all remaining hitobjects
double firstGroupTime = beatmap.ControlPointInfo.Groups.Any(x => x.ControlPoints.Any(y => y is TimingControlPoint) && x.Time < selectedGroup.Time) ? selectedGroup.Time : double.MinValue;
double nextGroupTime = beatmap.ControlPointInfo.Groups.FirstOrDefault(x => x.ControlPoints.Any(y => y is TimingControlPoint) && x.Time > selectedGroup.Time)?.Time ?? double.MaxValue;
var result = beatmap.HitObjects.Where(x => Precision.AlmostBigger(x.StartTime, firstGroupTime) && Precision.DefinitelyBigger(nextGroupTime, x.StartTime)).ToList();
Console.WriteLine(firstGroupTime + ", " + nextGroupTime + ", " + result.Count);
return result;
}
private void adjustOffset(double adjust)
{
if (selectedGroup.Value == null)
@ -199,6 +229,8 @@ namespace osu.Game.Screens.Edit.Timing
bool wasAtStart = editorClock.CurrentTimeAccurate == selectedGroup.Value.Time;
List<HitObject> hitObjectsInRange = hitObjectsInTimingRange(beatmap, selectedGroup.Value);
// VERY TEMPORARY
var currentGroupItems = selectedGroup.Value.ControlPoints.ToArray();
@ -212,6 +244,14 @@ namespace osu.Game.Screens.Edit.Timing
// the control point might not necessarily exist yet, if currentGroupItems was empty.
selectedGroup.Value = beatmap.ControlPointInfo.GroupAt(newOffset, true);
if (adjustPlacedNotes.Current.Value)
{
foreach (HitObject hitObject in hitObjectsInRange)
{
hitObject.StartTime += adjust;
}
}
if (!editorClock.IsRunning && wasAtStart)
editorClock.Seek(newOffset);
}
@ -223,7 +263,21 @@ namespace osu.Game.Screens.Edit.Timing
if (timing == null)
return;
timing.BeatLength = 60000 / (timing.BPM + adjust);
double newBeatLength = 60000 / (timing.BPM + adjust);
List<HitObject> hitObjectsInRange = hitObjectsInTimingRange(beatmap, selectedGroup.Value!);
if (adjustPlacedNotes.Current.Value)
{
foreach (HitObject hitObject in hitObjectsInRange)
{
double beat = (hitObject.StartTime - selectedGroup.Value!.Time) / timing.BeatLength;
hitObject.StartTime = beat * newBeatLength + selectedGroup.Value.Time;
}
}
timing.BeatLength = newBeatLength;
}
private partial class InlineButton : OsuButton