Merge branch 'master' into fallback-to-skin-combo-colours

osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs

@@ -34,7 +34,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
         // Todo: Rulesets should be overriding the resources instead, but we need to figure out where/when to apply overrides first
         protected virtual string SampleNamespace => null;
 
-        protected SkinnableSound Samples;
+        protected SkinnableSound Samples { get; private set; }
 
         protected virtual IEnumerable<HitSampleInfo> GetSamples() => HitObject.Samples;
 
@@ -78,6 +78,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// </summary>
         public JudgementResult Result { get; private set; }
 
+        private BindableList<HitSampleInfo> samplesBindable;
         private Bindable<double> startTimeBindable;
         private Bindable<int> comboIndexBindable;
 
@@ -108,20 +109,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
                     throw new InvalidOperationException($"{GetType().ReadableName()} must provide a {nameof(JudgementResult)} through {nameof(CreateResult)}.");
             }
 
-            var samples = GetSamples().ToArray();
-
-            if (samples.Length > 0)
-            {
-                if (HitObject.SampleControlPoint == null)
-                    throw new ArgumentNullException(nameof(HitObject.SampleControlPoint), $"{nameof(HitObject)}s must always have an attached {nameof(HitObject.SampleControlPoint)}."
-                                                                                          + $" This is an indication that {nameof(HitObject.ApplyDefaults)} has not been invoked on {this}.");
-
-                samples = samples.Select(s => HitObject.SampleControlPoint.ApplyTo(s)).ToArray();
-                foreach (var s in samples)
-                    s.Namespace = SampleNamespace;
-
-                AddInternal(Samples = new SkinnableSound(samples));
-            }
+            loadSamples();
         }
 
         protected override void LoadComplete()
@@ -139,10 +127,40 @@ namespace osu.Game.Rulesets.Objects.Drawables
                 comboIndexBindable.BindValueChanged(_ => updateAccentColour(), true);
             }
 
+            samplesBindable = HitObject.SamplesBindable.GetBoundCopy();
+            samplesBindable.ItemsAdded += _ => loadSamples();
+            samplesBindable.ItemsRemoved += _ => loadSamples();
+
             updateState(ArmedState.Idle, true);
             onDefaultsApplied();
         }
 
+        private void loadSamples()
+        {
+            if (Samples != null)
+            {
+                RemoveInternal(Samples);
+                Samples = null;
+            }
+
+            var samples = GetSamples().ToArray();
+
+            if (samples.Length <= 0)
+                return;
+
+            if (HitObject.SampleControlPoint == null)
+            {
+                throw new ArgumentNullException(nameof(HitObject.SampleControlPoint), $"{nameof(HitObject)}s must always have an attached {nameof(HitObject.SampleControlPoint)}."
+                                                                                      + $" This is an indication that {nameof(HitObject.ApplyDefaults)} has not been invoked on {this}.");
+            }
+
+            samples = samples.Select(s => HitObject.SampleControlPoint.ApplyTo(s)).ToArray();
+            foreach (var s in samples)
+                s.Namespace = SampleNamespace;
+
+            AddInternal(Samples = new SkinnableSound(samples));
+        }
+
         private void onDefaultsApplied() => apply(HitObject);
 
         private void apply(HitObject hitObject)

osu.Game/Rulesets/Objects/HitObject.cs

@@ -45,7 +45,7 @@ namespace osu.Game.Rulesets.Objects
             set => StartTimeBindable.Value = value;
         }
 
-        private List<HitSampleInfo> samples;
+        public readonly BindableList<HitSampleInfo> SamplesBindable = new BindableList<HitSampleInfo>();
 
         /// <summary>
         /// The samples to be played when this hit object is hit.
@@ -54,10 +54,14 @@ namespace osu.Game.Rulesets.Objects
         /// and can be treated as the default samples for the hit object.
         /// </para>
         /// </summary>
-        public List<HitSampleInfo> Samples
+        public IList<HitSampleInfo> Samples
         {
-            get => samples ?? (samples = new List<HitSampleInfo>());
-            set => samples = value;
+            get => SamplesBindable;
+            set
+            {
+                SamplesBindable.Clear();
+                SamplesBindable.AddRange(value);
+            }
         }
 
         [JsonIgnore]

osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHitObjectParser.cs

@@ -38,7 +38,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Catch
         }
 
         protected override HitObject CreateSlider(Vector2 position, bool newCombo, int comboOffset, Vector2[] controlPoints, double? length, PathType pathType, int repeatCount,
-                                                  List<List<HitSampleInfo>> nodeSamples)
+                                                  List<IList<HitSampleInfo>> nodeSamples)
         {
             newCombo |= forceNewCombo;
             comboOffset += extraComboOffset;

osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs

@@ -74,9 +74,12 @@ namespace osu.Game.Rulesets.Objects.Legacy
                 string[] pointSplit = split[5].Split('|');
 
                 int pointCount = 1;
+
                 foreach (var t in pointSplit)
+                {
                     if (t.Length > 1)
                         pointCount++;
+                }
 
                 var points = new Vector2[pointCount];
 
@@ -181,7 +184,7 @@ namespace osu.Game.Rulesets.Objects.Legacy
                 }
 
                 // Generate the final per-node samples
-                var nodeSamples = new List<List<HitSampleInfo>>(nodes);
+                var nodeSamples = new List<IList<HitSampleInfo>>(nodes);
                 for (int i = 0; i < nodes; i++)
                     nodeSamples.Add(convertSoundType(nodeSoundTypes[i], nodeBankInfos[i]));
 
@@ -279,7 +282,7 @@ namespace osu.Game.Rulesets.Objects.Legacy
         /// <param name="nodeSamples">The samples to be played when the slider nodes are hit. This includes the head and tail of the slider.</param>
         /// <returns>The hit object.</returns>
         protected abstract HitObject CreateSlider(Vector2 position, bool newCombo, int comboOffset, Vector2[] controlPoints, double? length, PathType pathType, int repeatCount,
-                                                  List<List<HitSampleInfo>> nodeSamples);
+                                                  List<IList<HitSampleInfo>> nodeSamples);
 
         /// <summary>
         /// Creates a legacy Spinner-type hit object.

osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs

@@ -23,7 +23,7 @@ namespace osu.Game.Rulesets.Objects.Legacy
 
         public double Distance => Path.Distance;
 
-        public List<List<HitSampleInfo>> NodeSamples { get; set; }
+        public List<IList<HitSampleInfo>> NodeSamples { get; set; }
         public int RepeatCount { get; set; }
 
         public double EndTime => StartTime + this.SpanCount() * Distance / Velocity;

osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHitObjectParser.cs

@@ -27,7 +27,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Mania
         }
 
         protected override HitObject CreateSlider(Vector2 position, bool newCombo, int comboOffset, Vector2[] controlPoints, double? length, PathType pathType, int repeatCount,
-                                                  List<List<HitSampleInfo>> nodeSamples)
+                                                  List<IList<HitSampleInfo>> nodeSamples)
         {
             return new ConvertSlider
             {

osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHitObjectParser.cs

@@ -38,7 +38,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Osu
         }
 
         protected override HitObject CreateSlider(Vector2 position, bool newCombo, int comboOffset, Vector2[] controlPoints, double? length, PathType pathType, int repeatCount,
-                                                  List<List<HitSampleInfo>> nodeSamples)
+                                                  List<IList<HitSampleInfo>> nodeSamples)
         {
             newCombo |= forceNewCombo;
             comboOffset += extraComboOffset;

osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHitObjectParser.cs

@@ -24,7 +24,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Taiko
         }
 
         protected override HitObject CreateSlider(Vector2 position, bool newCombo, int comboOffset, Vector2[] controlPoints, double? length, PathType pathType, int repeatCount,
-                                                  List<List<HitSampleInfo>> nodeSamples)
+                                                  List<IList<HitSampleInfo>> nodeSamples)
         {
             return new ConvertSlider
             {

osu.Game/Rulesets/Objects/SliderPath.cs

@@ -185,8 +185,10 @@ namespace osu.Game.Rulesets.Objects
                     ReadOnlySpan<Vector2> cpSpan = ControlPoints.Slice(start, end - start);
 
                     foreach (Vector2 t in calculateSubpath(cpSpan))
+                    {
                         if (calculatedPath.Count == 0 || calculatedPath.Last() != t)
                             calculatedPath.Add(t);
+                    }
 
                     start = end;
                 }

osu.Game/Rulesets/Objects/Types/IHasRepeats.cs

@@ -25,7 +25,7 @@ namespace osu.Game.Rulesets.Objects.Types
         /// n-1: The last repeat.<br />
         /// n: The last node.
         /// </summary>
-        List<List<HitSampleInfo>> NodeSamples { get; }
+        List<IList<HitSampleInfo>> NodeSamples { get; }
     }
 
     public static class HasRepeatsExtensions