RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Handle changes via SamplePoints list for simplicity

This commit is contained in:
Dean Herbert 2020-11-02 14:39:01 +09:00
parent bfa6ae1b66
commit 3adf451e82
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
osu.Game.Rulesets.Taiko/Audio/DrumSampleContainer.cs
View File

@ -2,6 +2,7 @@
// See the LICENCE file in the repository root for full licence text.
using System.Collections.Generic;
using System.Linq;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
@ -21,7 +22,7 @@ public class DrumSampleContainer : LifetimeManagementContainer
private readonly ControlPointInfo controlPoints;
private readonly Dictionary<double, DrumSample> mappings = new Dictionary<double, DrumSample>();
private IBindableList<ControlPointGroup> groups;
private IBindableList<SampleControlPoint> samplePoints;
public DrumSampleContainer(ControlPointInfo controlPoints)
{
@ -31,8 +32,8 @@ public DrumSampleContainer(ControlPointInfo controlPoints)
[BackgroundDependencyLoader]
private void load()
{
groups = controlPoints.Groups.GetBoundCopy();
groups.BindCollectionChanged((_, __) => recreateMappings(), true);
samplePoints = controlPoints.SamplePoints.GetBoundCopy();
samplePoints.BindCollectionChanged((_, __) => recreateMappings(), true);
}
private void recreateMappings()
@ -40,14 +41,16 @@ private void recreateMappings()
mappings.Clear();
ClearInternal();
IReadOnlyList<SampleControlPoint> samplePoints = controlPoints.SamplePoints.Count == 0 ? new[] { controlPoints.SamplePointAt(double.MinValue) } : controlPoints.SamplePoints;
SampleControlPoint[] points = samplePoints.Count == 0
? new[] { controlPoints.SamplePointAt(double.MinValue) }
: samplePoints.ToArray();
for (int i = 0; i < samplePoints.Count; i++)
for (int i = 0; i < points.Length; i++)
{
var samplePoint = samplePoints[i];
var samplePoint = points[i];
var lifetimeStart = i > 0 ? samplePoint.Time : double.MinValue;
var lifetimeEnd = i + 1 < samplePoints.Count ? samplePoints[i + 1].Time : double.MaxValue;
var lifetimeEnd = i + 1 < points.Length ? points[i + 1].Time : double.MaxValue;
AddInternal(mappings[samplePoint.Time] = new DrumSample(samplePoint)
{

4
osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
View File

@ -41,9 +41,9 @@ public class ControlPointInfo
/// All sound points.
/// </summary>
[JsonProperty]
public IReadOnlyList<SampleControlPoint> SamplePoints => samplePoints;
public IBindableList<SampleControlPoint> SamplePoints => samplePoints;
private readonly SortedList<SampleControlPoint> samplePoints = new SortedList<SampleControlPoint>(Comparer<SampleControlPoint>.Default);
private readonly BindableList<SampleControlPoint> samplePoints = new BindableList<SampleControlPoint>();
/// <summary>
/// All effect points.