h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-15 07:22:55 +08:00
Code Issues Releases Wiki Activity

revert the fix

Browse Source
This commit is contained in:
OliBomby 2022-09-13 01:09:42 +02:00
parent 8400de4b2e
commit 718f8c4ee2
1 changed files with 14 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
osu.Game/Screens/Edit/EditorBeatmap.cs
View File

@ -16,7 +16,6 @@ using osu.Game.Beatmaps.Legacy;
using osu.Game.Beatmaps.Timing; using osu.Game.Beatmaps.Timing;
using osu.Game.Rulesets.Edit; using osu.Game.Rulesets.Edit;
using osu.Game.Rulesets.Objects; using osu.Game.Rulesets.Objects;
using osu.Game.Rulesets.Objects.Types;
using osu.Game.Skinning; using osu.Game.Skinning;
namespace osu.Game.Screens.Edit namespace osu.Game.Screens.Edit
@ -80,7 +79,7 @@ namespace osu.Game.Screens.Edit
private readonly IBeatmapProcessor beatmapProcessor; private readonly IBeatmapProcessor beatmapProcessor;
private readonly Dictionary<HitObject, List<IUnbindable>> hitObjectBindables = new Dictionary<HitObject, List<IUnbindable>>(); private readonly Dictionary<HitObject, Bindable<double>> startTimeBindables = new Dictionary<HitObject, Bindable<double>>();
public EditorBeatmap(IBeatmap playableBeatmap, ISkin beatmapSkin = null, BeatmapInfo beatmapInfo = null) public EditorBeatmap(IBeatmap playableBeatmap, ISkin beatmapSkin = null, BeatmapInfo beatmapInfo = null)
{ {
@ -98,7 +97,7 @@ namespace osu.Game.Screens.Edit
beatmapProcessor = playableBeatmap.BeatmapInfo.Ruleset.CreateInstance().CreateBeatmapProcessor(PlayableBeatmap); beatmapProcessor = playableBeatmap.BeatmapInfo.Ruleset.CreateInstance().CreateBeatmapProcessor(PlayableBeatmap);
foreach (var obj in HitObjects) foreach (var obj in HitObjects)
trackBindables(obj); trackStartTime(obj);
} }
/// <summary> /// <summary>
@ -223,7 +222,7 @@ namespace osu.Game.Screens.Edit
/// <param name="hitObject">The <see cref="HitObject"/> to insert.</param> /// <param name="hitObject">The <see cref="HitObject"/> to insert.</param>
public void Insert(int index, HitObject hitObject) public void Insert(int index, HitObject hitObject)
{ {
trackBindables(hitObject); trackStartTime(hitObject);
mutableHitObjects.Insert(index, hitObject); mutableHitObjects.Insert(index, hitObject);
@ -300,9 +299,9 @@ namespace osu.Game.Screens.Edit
mutableHitObjects.RemoveAt(index); mutableHitObjects.RemoveAt(index);
var bindables = hitObjectBindables[hitObject]; var bindable = startTimeBindables[hitObject];
bindables.ForEach(b => b.UnbindAll()); bindable.UnbindAll();
hitObjectBindables.Remove(hitObject); startTimeBindables.Remove(hitObject);
BeginChange(); BeginChange();
batchPendingDeletes.Add(hitObject); batchPendingDeletes.Add(hitObject);
@ -326,25 +325,25 @@ namespace osu.Game.Screens.Edit
beatmapProcessor?.PreProcess(); beatmapProcessor?.PreProcess();
foreach (var h in batchPendingUpdates) processHitObject(h);
foreach (var h in batchPendingDeletes) processHitObject(h); foreach (var h in batchPendingDeletes) processHitObject(h);
foreach (var h in batchPendingInserts) processHitObject(h); foreach (var h in batchPendingInserts) processHitObject(h);
foreach (var h in batchPendingUpdates) processHitObject(h);
beatmapProcessor?.PostProcess(); beatmapProcessor?.PostProcess();
// callbacks may modify the lists so let's be safe about it // callbacks may modify the lists so let's be safe about it
var updates = batchPendingUpdates.ToArray();
batchPendingUpdates.Clear();
var deletes = batchPendingDeletes.ToArray(); var deletes = batchPendingDeletes.ToArray();
batchPendingDeletes.Clear(); batchPendingDeletes.Clear();
var inserts = batchPendingInserts.ToArray(); var inserts = batchPendingInserts.ToArray();
batchPendingInserts.Clear(); batchPendingInserts.Clear();
foreach (var h in updates) HitObjectUpdated?.Invoke(h); var updates = batchPendingUpdates.ToArray();
batchPendingUpdates.Clear();
foreach (var h in deletes) HitObjectRemoved?.Invoke(h); foreach (var h in deletes) HitObjectRemoved?.Invoke(h);
foreach (var h in inserts) HitObjectAdded?.Invoke(h); foreach (var h in inserts) HitObjectAdded?.Invoke(h);
foreach (var h in updates) HitObjectUpdated?.Invoke(h);
updateInProgress.Value = false; updateInProgress.Value = false;
} }
@ -356,12 +355,10 @@ namespace osu.Game.Screens.Edit
private void processHitObject(HitObject hitObject) => hitObject.ApplyDefaults(ControlPointInfo, PlayableBeatmap.Difficulty); private void processHitObject(HitObject hitObject) => hitObject.ApplyDefaults(ControlPointInfo, PlayableBeatmap.Difficulty);
private void trackBindables(HitObject hitObject) private void trackStartTime(HitObject hitObject)
{ {
var bindables = new List<IUnbindable>(3); startTimeBindables[hitObject] = hitObject.StartTimeBindable.GetBoundCopy();
startTimeBindables[hitObject].ValueChanged += _ =>
var startTimeBindable = hitObject.StartTimeBindable.GetBoundCopy();
startTimeBindable.ValueChanged += _ =>
{ {
// For now we'll remove and re-add the hitobject. This is not optimal and can be improved if required. // For now we'll remove and re-add the hitobject. This is not optimal and can be improved if required.
mutableHitObjects.Remove(hitObject); mutableHitObjects.Remove(hitObject);
@ -371,20 +368,6 @@ namespace osu.Game.Screens.Edit
Update(hitObject); Update(hitObject);
}; };
bindables.Add(startTimeBindable);
if (hitObject is IHasComboInformation hasCombo)
{
var comboIndexBindable = hasCombo.ComboIndexBindable.GetBoundCopy();
comboIndexBindable.ValueChanged += _ => Update(hitObject);
bindables.Add(comboIndexBindable);
var indexInCurrentComboBindable = hasCombo.IndexInCurrentComboBindable.GetBoundCopy();
indexInCurrentComboBindable.ValueChanged += _ => Update(hitObject);
bindables.Add(indexInCurrentComboBindable);
}
hitObjectBindables[hitObject] = bindables;
} }
private int findInsertionIndex(IReadOnlyList<HitObject> list, double startTime) private int findInsertionIndex(IReadOnlyList<HitObject> list, double startTime)