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

add addition bank

Browse Source
This commit is contained in:
OliBomby 2023-05-08 16:12:03 +02:00
parent 7260dcac60
commit dd0fceaec6
2 changed files with 53 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs
View File

@ -122,7 +122,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
if (h.Samples.Any(s => s.Name == sampleName)) if (h.Samples.Any(s => s.Name == sampleName))
return; return;
h.Samples.Add(h.GetSampleInfo(sampleName)); var relevantSample = h.Samples.FirstOrDefault(s => s.Name != HitSampleInfo.HIT_NORMAL);
h.Samples.Add(relevantSample?.With(sampleName) ?? h.GetSampleInfo(sampleName));
EditorBeatmap.Update(h); EditorBeatmap.Update(h);
}); });
} }

53
osu.Game/Screens/Edit/Compose/Components/Timeline/SamplePointPiece.cs
View File

@ -69,7 +69,12 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
public static string? GetBankValue(IEnumerable<HitSampleInfo> samples) public static string? GetBankValue(IEnumerable<HitSampleInfo> samples)
{ {
return samples.FirstOrDefault()?.Bank; return samples.FirstOrDefault(o => o.Name == HitSampleInfo.HIT_NORMAL)?.Bank;
}
public static string? GetAdditionBankValue(IEnumerable<HitSampleInfo> samples)
{
return samples.FirstOrDefault(o => o.Name != HitSampleInfo.HIT_NORMAL)?.Bank ?? GetBankValue(samples);
} }
public static int GetVolumeValue(ICollection<HitSampleInfo> samples) public static int GetVolumeValue(ICollection<HitSampleInfo> samples)
@ -86,6 +91,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
private readonly HitObject hitObject; private readonly HitObject hitObject;
private LabelledTextBox bank = null!; private LabelledTextBox bank = null!;
private LabelledTextBox additionBank = null!;
private IndeterminateSliderWithTextBoxInput<int> volume = null!; private IndeterminateSliderWithTextBoxInput<int> volume = null!;
private FillFlowContainer togglesCollection = null!; private FillFlowContainer togglesCollection = null!;
@ -126,6 +132,10 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
{ {
Label = "Bank Name", Label = "Bank Name",
}, },
additionBank = new LabelledTextBox
{
Label = "Addition Bank",
},
volume = new IndeterminateSliderWithTextBoxInput<int>("Volume", new BindableInt(100) volume = new IndeterminateSliderWithTextBoxInput<int>("Volume", new BindableInt(100)
{ {
MinValue = 0, MinValue = 0,
@ -136,6 +146,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
}; };
bank.TabbableContentContainer = flow; bank.TabbableContentContainer = flow;
additionBank.TabbableContentContainer = flow;
volume.TabbableContentContainer = flow; volume.TabbableContentContainer = flow;
// if the piece belongs to a currently selected object, assume that the user wants to change all selected objects. // if the piece belongs to a currently selected object, assume that the user wants to change all selected objects.
@ -148,6 +159,10 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
if (!string.IsNullOrEmpty(commonBank)) if (!string.IsNullOrEmpty(commonBank))
bank.Current.Value = commonBank; bank.Current.Value = commonBank;
string? commonAdditionBank = getCommonAdditionBank(relevantSamples);
if (!string.IsNullOrEmpty(commonAdditionBank))
additionBank.Current.Value = commonAdditionBank;
int? commonVolume = getCommonVolume(relevantSamples); int? commonVolume = getCommonVolume(relevantSamples);
if (commonVolume != null) if (commonVolume != null)
volume.Current.Value = commonVolume.Value; volume.Current.Value = commonVolume.Value;
@ -162,6 +177,14 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
// this ensures that committing empty text causes a revert to the previous value. // this ensures that committing empty text causes a revert to the previous value.
bank.OnCommit += (_, _) => bank.Current.Value = getCommonBank(relevantSamples); bank.OnCommit += (_, _) => bank.Current.Value = getCommonBank(relevantSamples);
updateAdditionBankPlaceholderText(relevantObjects);
additionBank.Current.BindValueChanged(val =>
{
updateAdditionBankFor(relevantObjects, val.NewValue);
updateAdditionBankPlaceholderText(relevantObjects);
});
additionBank.OnCommit += (_, _) => additionBank.Current.Value = getCommonAdditionBank(relevantSamples);
volume.Current.BindValueChanged(val => updateVolumeFor(relevantObjects, val.NewValue)); volume.Current.BindValueChanged(val => updateVolumeFor(relevantObjects, val.NewValue));
createStateBindables(relevantObjects); createStateBindables(relevantObjects);
@ -176,6 +199,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
} }
private static string? getCommonBank(IList<HitSampleInfo>[] relevantSamples) => relevantSamples.Select(GetBankValue).Distinct().Count() == 1 ? GetBankValue(relevantSamples.First()) : null; private static string? getCommonBank(IList<HitSampleInfo>[] relevantSamples) => relevantSamples.Select(GetBankValue).Distinct().Count() == 1 ? GetBankValue(relevantSamples.First()) : null;
private static string? getCommonAdditionBank(IList<HitSampleInfo>[] relevantSamples) => relevantSamples.Select(GetAdditionBankValue).Distinct().Count() == 1 ? GetAdditionBankValue(relevantSamples.First()) : null;
private static int? getCommonVolume(IList<HitSampleInfo>[] relevantSamples) => relevantSamples.Select(GetVolumeValue).Distinct().Count() == 1 ? GetVolumeValue(relevantSamples.First()) : null; private static int? getCommonVolume(IList<HitSampleInfo>[] relevantSamples) => relevantSamples.Select(GetVolumeValue).Distinct().Count() == 1 ? GetVolumeValue(relevantSamples.First()) : null;
private void updateFor(IEnumerable<HitObject> objects, Action<HitObject, IList<HitSampleInfo>> updateAction) private void updateFor(IEnumerable<HitObject> objects, Action<HitObject, IList<HitSampleInfo>> updateAction)
@ -201,6 +225,24 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
{ {
for (int i = 0; i < samples.Count; i++) for (int i = 0; i < samples.Count; i++)
{ {
if (samples[i].Name != HitSampleInfo.HIT_NORMAL) continue;
samples[i] = samples[i].With(newBank: newBank);
}
});
}
private void updateAdditionBankFor(IEnumerable<HitObject> objects, string? newBank)
{
if (string.IsNullOrEmpty(newBank))
return;
updateFor(objects, (_, samples) =>
{
for (int i = 0; i < samples.Count; i++)
{
if (samples[i].Name == HitSampleInfo.HIT_NORMAL) continue;
samples[i] = samples[i].With(newBank: newBank); samples[i] = samples[i].With(newBank: newBank);
} }
}); });
@ -212,6 +254,12 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
bank.PlaceholderText = string.IsNullOrEmpty(commonBank) ? "(multiple)" : string.Empty; bank.PlaceholderText = string.IsNullOrEmpty(commonBank) ? "(multiple)" : string.Empty;
} }
private void updateAdditionBankPlaceholderText(IEnumerable<HitObject> objects)
{
string? commonAdditionBank = getCommonAdditionBank(objects.Select(GetSamples).ToArray());
additionBank.PlaceholderText = string.IsNullOrEmpty(commonAdditionBank) ? "(multiple)" : string.Empty;
}
private void updateVolumeFor(IEnumerable<HitObject> objects, int? newVolume) private void updateVolumeFor(IEnumerable<HitObject> objects, int? newVolume)
{ {
if (newVolume == null) if (newVolume == null)
@ -282,7 +330,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
if (samples.Any(s => s.Name == sampleName)) if (samples.Any(s => s.Name == sampleName))
return; return;
samples.Add(h.GetSampleInfo(sampleName)); var relevantSample = samples.FirstOrDefault(s => s.Name != HitSampleInfo.HIT_NORMAL) ?? samples.FirstOrDefault();
samples.Add(relevantSample?.With(sampleName) ?? h.GetSampleInfo(sampleName));
}); });
} }