mirror of
https://github.com/ppy/osu.git
synced 2024-12-18 05:52:56 +08:00
4c59ec1d94
Closes https://github.com/ppy/osu/issues/28741.
Regressed in a7b066f3ee
.
The intent of the original change there was to ensure that addition
banks being set will put the ternary state toggles in indeterminate
state (to at least provide a visual indication that the selection does
not use a single bank). This would previously not be the case due to
the use of `.All()` in the original condition (a single object/node
was considered to have a bank enabled if and only if *all* samples
within it used it). However the attempt to fix that via switching
to `Any()` was not correct.
The logic used in the offending commit operates on extracted `Samples`
and `NodeSamples` from the selection, and would consider the ternary
toggle:
- fully off if none of the samples/node samples contained a sample with
the given bank,
- indeterminate if the some of the samples/node samples contained a
sample with the given bank,
- fully on if at least one sample from every samples/node samples
contained a sample with the given bank.
This is a *two-tiered* process, as in first a *binary* on/off state is
extracted from each object's samples/node samples, and *then* a ternary
state is extracted from all objects/nodes. This is insufficient to
express the *desired* behaviour, which is that the toggle should be:
- fully off if *none of the individual samples in the selection* use
the given bank,
- indeterminate if *at least one individual sample in the selection*
uses the given bank,
- fully on if *all individual samples in the selection* use the given
bank.
The second wording is flattened, and no longer tries to consider "nodes"
or "objects", it just looks at all of the samples in the selection
without concern as to whether they're from separate objects/nodes
or not.
To explain why this discrepancy caused the bug, consider a single object
with a `soft` normal bank and `drum` addition bank. Selecting the object
would cause a ternary button state update; as per the incorrect logic,
there were two samples on the object and each had its own separate
banks, so two ternary toggles would have their state set to `True`
(rather than the correct `Indeterminate`), thus triggering a bindable
feedback loop that would cause one of these banks to win and actually
overwrite the other.
Note that the addition indeterminate state computation *still* needs
to do the two-tiered process, because there it actually makes sense (for
a selection to have an addition fully on rather than indeterminate,
*every* object/node *must* contain that addition).
374 lines
14 KiB
C#
374 lines
14 KiB
C#
// 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 Humanizer;
|
|
using osu.Framework.Allocation;
|
|
using osu.Framework.Bindables;
|
|
using osu.Framework.Graphics.UserInterface;
|
|
using osu.Game.Audio;
|
|
using osu.Game.Beatmaps.ControlPoints;
|
|
using osu.Game.Graphics.UserInterface;
|
|
using osu.Game.Rulesets.Edit;
|
|
using osu.Game.Rulesets.Objects;
|
|
using osu.Game.Rulesets.Objects.Types;
|
|
|
|
namespace osu.Game.Screens.Edit.Compose.Components
|
|
{
|
|
public partial class EditorSelectionHandler : SelectionHandler<HitObject>
|
|
{
|
|
/// <summary>
|
|
/// A special bank name that is only used in the editor UI.
|
|
/// When selected and in placement mode, the bank of the last hit object will always be used.
|
|
/// </summary>
|
|
public const string HIT_BANK_AUTO = "auto";
|
|
|
|
[Resolved]
|
|
protected EditorBeatmap EditorBeatmap { get; private set; } = null!;
|
|
|
|
[BackgroundDependencyLoader]
|
|
private void load()
|
|
{
|
|
createStateBindables();
|
|
|
|
// bring in updates from selection changes
|
|
EditorBeatmap.HitObjectUpdated += _ => Scheduler.AddOnce(UpdateTernaryStates);
|
|
|
|
SelectedItems.CollectionChanged += (_, _) => Scheduler.AddOnce(UpdateTernaryStates);
|
|
}
|
|
|
|
protected override void DeleteItems(IEnumerable<HitObject> items) => EditorBeatmap.RemoveRange(items);
|
|
|
|
#region Selection State
|
|
|
|
/// <summary>
|
|
/// The state of "new combo" for all selected hitobjects.
|
|
/// </summary>
|
|
public readonly Bindable<TernaryState> SelectionNewComboState = new Bindable<TernaryState>();
|
|
|
|
/// <summary>
|
|
/// The state of each sample type for all selected hitobjects. Keys match with <see cref="HitSampleInfo"/> constant specifications.
|
|
/// </summary>
|
|
public readonly Dictionary<string, Bindable<TernaryState>> SelectionSampleStates = new Dictionary<string, Bindable<TernaryState>>();
|
|
|
|
/// <summary>
|
|
/// The state of each sample bank type for all selected hitobjects.
|
|
/// </summary>
|
|
public readonly Dictionary<string, Bindable<TernaryState>> SelectionBankStates = new Dictionary<string, Bindable<TernaryState>>();
|
|
|
|
/// <summary>
|
|
/// Set up ternary state bindables and bind them to selection/hitobject changes (in both directions)
|
|
/// </summary>
|
|
private void createStateBindables()
|
|
{
|
|
foreach (string bankName in HitSampleInfo.AllBanks.Prepend(HIT_BANK_AUTO))
|
|
{
|
|
var bindable = new Bindable<TernaryState>
|
|
{
|
|
Description = bankName.Titleize()
|
|
};
|
|
|
|
bindable.ValueChanged += state =>
|
|
{
|
|
switch (state.NewValue)
|
|
{
|
|
case TernaryState.False:
|
|
if (SelectedItems.Count == 0)
|
|
{
|
|
// Ensure that if this is the last selected bank, it should remain selected.
|
|
if (SelectionBankStates.Values.All(b => b.Value == TernaryState.False))
|
|
bindable.Value = TernaryState.True;
|
|
}
|
|
else
|
|
{
|
|
// Auto should never apply when there is a selection made.
|
|
// This is also required to stop a bindable feedback loop when a HitObject has zero samples (and LINQ `All` below becomes true).
|
|
if (bankName == HIT_BANK_AUTO)
|
|
break;
|
|
|
|
// Never remove a sample bank.
|
|
// These are basically radio buttons, not toggles.
|
|
if (SelectedItems.All(h => h.Samples.All(s => s.Bank == bankName)))
|
|
bindable.Value = TernaryState.True;
|
|
}
|
|
|
|
break;
|
|
|
|
case TernaryState.True:
|
|
if (SelectedItems.Count == 0)
|
|
{
|
|
// Ensure the user can't stack multiple bank selections when there's no hitobject selection.
|
|
// Note that in normal scenarios this is sorted out by the feedback from applying the bank to the selected objects.
|
|
foreach (var other in SelectionBankStates.Values)
|
|
{
|
|
if (other != bindable)
|
|
other.Value = TernaryState.False;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
// Auto should just not apply if there's a selection already made.
|
|
// Maybe we could make it a disabled button in the future, but right now the editor buttons don't support disabled state.
|
|
if (bankName == HIT_BANK_AUTO)
|
|
{
|
|
bindable.Value = TernaryState.False;
|
|
break;
|
|
}
|
|
|
|
SetSampleBank(bankName);
|
|
}
|
|
|
|
break;
|
|
}
|
|
};
|
|
|
|
SelectionBankStates[bankName] = bindable;
|
|
}
|
|
|
|
// start with normal selected.
|
|
SelectionBankStates[SampleControlPoint.DEFAULT_BANK].Value = TernaryState.True;
|
|
|
|
foreach (string sampleName in HitSampleInfo.AllAdditions)
|
|
{
|
|
var bindable = new Bindable<TernaryState>
|
|
{
|
|
Description = sampleName.Replace("hit", string.Empty).Titleize()
|
|
};
|
|
|
|
bindable.ValueChanged += state =>
|
|
{
|
|
switch (state.NewValue)
|
|
{
|
|
case TernaryState.False:
|
|
RemoveHitSample(sampleName);
|
|
break;
|
|
|
|
case TernaryState.True:
|
|
AddHitSample(sampleName);
|
|
break;
|
|
}
|
|
};
|
|
|
|
SelectionSampleStates[sampleName] = bindable;
|
|
}
|
|
|
|
// new combo
|
|
SelectionNewComboState.ValueChanged += state =>
|
|
{
|
|
switch (state.NewValue)
|
|
{
|
|
case TernaryState.False:
|
|
SetNewCombo(false);
|
|
break;
|
|
|
|
case TernaryState.True:
|
|
SetNewCombo(true);
|
|
break;
|
|
}
|
|
};
|
|
}
|
|
|
|
/// <summary>
|
|
/// Called when context menu ternary states may need to be recalculated (selection changed or hitobject updated).
|
|
/// </summary>
|
|
protected virtual void UpdateTernaryStates()
|
|
{
|
|
SelectionNewComboState.Value = GetStateFromSelection(SelectedItems.OfType<IHasComboInformation>(), h => h.NewCombo);
|
|
|
|
var samplesInSelection = SelectedItems.SelectMany(enumerateAllSamples).ToArray();
|
|
|
|
foreach ((string sampleName, var bindable) in SelectionSampleStates)
|
|
{
|
|
bindable.Value = GetStateFromSelection(samplesInSelection, h => h.Any(s => s.Name == sampleName));
|
|
}
|
|
|
|
foreach ((string bankName, var bindable) in SelectionBankStates)
|
|
{
|
|
bindable.Value = GetStateFromSelection(samplesInSelection.SelectMany(s => s), h => h.Bank == bankName);
|
|
}
|
|
|
|
IEnumerable<IList<HitSampleInfo>> enumerateAllSamples(HitObject hitObject)
|
|
{
|
|
yield return hitObject.Samples;
|
|
|
|
if (hitObject is IHasRepeats withRepeats)
|
|
{
|
|
foreach (var node in withRepeats.NodeSamples)
|
|
yield return node;
|
|
}
|
|
}
|
|
}
|
|
|
|
#endregion
|
|
|
|
#region Ternary state changes
|
|
|
|
/// <summary>
|
|
/// Sets the sample bank for all selected <see cref="HitObject"/>s.
|
|
/// </summary>
|
|
/// <param name="bankName">The name of the sample bank.</param>
|
|
public void SetSampleBank(string bankName)
|
|
{
|
|
bool hasRelevantBank(HitObject hitObject)
|
|
{
|
|
bool result = hitObject.Samples.All(s => s.Bank == bankName);
|
|
|
|
if (hitObject is IHasRepeats hasRepeats)
|
|
{
|
|
foreach (var node in hasRepeats.NodeSamples)
|
|
result &= node.All(s => s.Bank == bankName);
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
if (SelectedItems.All(hasRelevantBank))
|
|
return;
|
|
|
|
EditorBeatmap.PerformOnSelection(h =>
|
|
{
|
|
if (h.Samples.All(s => s.Bank == bankName))
|
|
return;
|
|
|
|
h.Samples = h.Samples.Select(s => s.With(newBank: bankName)).ToList();
|
|
|
|
if (h is IHasRepeats hasRepeats)
|
|
{
|
|
for (int i = 0; i < hasRepeats.NodeSamples.Count; ++i)
|
|
hasRepeats.NodeSamples[i] = hasRepeats.NodeSamples[i].Select(s => s.With(newBank: bankName)).ToList();
|
|
}
|
|
|
|
EditorBeatmap.Update(h);
|
|
});
|
|
}
|
|
|
|
private bool hasRelevantSample(HitObject hitObject, string sampleName)
|
|
{
|
|
bool result = hitObject.Samples.Any(s => s.Name == sampleName);
|
|
|
|
if (hitObject is IHasRepeats hasRepeats)
|
|
{
|
|
foreach (var node in hasRepeats.NodeSamples)
|
|
result &= node.Any(s => s.Name == sampleName);
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Adds a hit sample to all selected <see cref="HitObject"/>s.
|
|
/// </summary>
|
|
/// <param name="sampleName">The name of the hit sample.</param>
|
|
public void AddHitSample(string sampleName)
|
|
{
|
|
if (SelectedItems.All(h => hasRelevantSample(h, sampleName)))
|
|
return;
|
|
|
|
EditorBeatmap.PerformOnSelection(h =>
|
|
{
|
|
// Make sure there isn't already an existing sample
|
|
if (h.Samples.Any(s => s.Name == sampleName))
|
|
return;
|
|
|
|
h.Samples.Add(h.CreateHitSampleInfo(sampleName));
|
|
|
|
if (h is IHasRepeats hasRepeats)
|
|
{
|
|
foreach (var node in hasRepeats.NodeSamples)
|
|
{
|
|
if (node.Any(s => s.Name == sampleName))
|
|
continue;
|
|
|
|
var hitSample = h.CreateHitSampleInfo(sampleName);
|
|
|
|
string? existingAdditionBank = node.FirstOrDefault(s => s.Name != HitSampleInfo.HIT_NORMAL)?.Bank;
|
|
if (existingAdditionBank != null)
|
|
hitSample = hitSample.With(newBank: existingAdditionBank);
|
|
|
|
node.Add(hitSample);
|
|
}
|
|
}
|
|
|
|
EditorBeatmap.Update(h);
|
|
});
|
|
}
|
|
|
|
/// <summary>
|
|
/// Removes a hit sample from all selected <see cref="HitObject"/>s.
|
|
/// </summary>
|
|
/// <param name="sampleName">The name of the hit sample.</param>
|
|
public void RemoveHitSample(string sampleName)
|
|
{
|
|
if (SelectedItems.All(h => !hasRelevantSample(h, sampleName)))
|
|
return;
|
|
|
|
EditorBeatmap.PerformOnSelection(h =>
|
|
{
|
|
h.SamplesBindable.RemoveAll(s => s.Name == sampleName);
|
|
|
|
if (h is IHasRepeats hasRepeats)
|
|
{
|
|
for (int i = 0; i < hasRepeats.NodeSamples.Count; ++i)
|
|
hasRepeats.NodeSamples[i] = hasRepeats.NodeSamples[i].Where(s => s.Name != sampleName).ToList();
|
|
}
|
|
|
|
EditorBeatmap.Update(h);
|
|
});
|
|
}
|
|
|
|
/// <summary>
|
|
/// Set the new combo state of all selected <see cref="HitObject"/>s.
|
|
/// </summary>
|
|
/// <param name="state">Whether to set or unset.</param>
|
|
/// <exception cref="InvalidOperationException">Throws if any selected object doesn't implement <see cref="IHasComboInformation"/></exception>
|
|
public void SetNewCombo(bool state)
|
|
{
|
|
if (SelectedItems.OfType<IHasComboInformation>().All(h => h.NewCombo == state))
|
|
return;
|
|
|
|
EditorBeatmap.PerformOnSelection(h =>
|
|
{
|
|
var comboInfo = h as IHasComboInformation;
|
|
|
|
if (comboInfo == null || comboInfo.NewCombo == state) return;
|
|
|
|
comboInfo.NewCombo = state;
|
|
EditorBeatmap.Update(h);
|
|
});
|
|
}
|
|
|
|
#endregion
|
|
|
|
#region Context Menu
|
|
|
|
/// <summary>
|
|
/// Provide context menu items relevant to current selection. Calling base is not required.
|
|
/// </summary>
|
|
/// <param name="selection">The current selection.</param>
|
|
/// <returns>The relevant menu items.</returns>
|
|
protected override IEnumerable<MenuItem> GetContextMenuItemsForSelection(IEnumerable<SelectionBlueprint<HitObject>> selection)
|
|
{
|
|
if (SelectedBlueprints.All(b => b.Item is IHasComboInformation))
|
|
{
|
|
yield return new TernaryStateToggleMenuItem("New combo") { State = { BindTarget = SelectionNewComboState } };
|
|
}
|
|
|
|
yield return new OsuMenuItem("Sample")
|
|
{
|
|
Items = SelectionSampleStates.Select(kvp =>
|
|
new TernaryStateToggleMenuItem(kvp.Value.Description) { State = { BindTarget = kvp.Value } }).ToArray()
|
|
};
|
|
|
|
yield return new OsuMenuItem("Bank")
|
|
{
|
|
Items = SelectionBankStates.Select(kvp =>
|
|
new TernaryStateToggleMenuItem(kvp.Value.Description) { State = { BindTarget = kvp.Value } }).ToArray()
|
|
};
|
|
}
|
|
|
|
#endregion
|
|
}
|
|
}
|