Merge branch 'master' into mania-hitexplosion-skinning

osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs

@@ -46,6 +46,9 @@ private void load(ISkinSource skin, IScrollingInfo scrollingInfo)
                                       new LegacyManiaSkinConfigurationLookup(Stage?.Columns.Count ?? 4, LegacyManiaSkinConfigurationLookups.LightPosition))?.Value
                                   ?? 0;
 
+            Color4 lineColour = GetManiaSkinConfig<Color4>(skin, LegacyManiaSkinConfigurationLookups.ColumnLineColour)?.Value
+                                ?? Color4.White;
+
             InternalChildren = new Drawable[]
             {
                 new Box
@@ -57,6 +60,7 @@ private void load(ISkinSource skin, IScrollingInfo scrollingInfo)
                 {
                     RelativeSizeAxes = Axes.Y,
                     Width = leftLineWidth,
+                    Colour = lineColour,
                     Alpha = hasLeftLine ? 1 : 0
                 },
                 new Box
@@ -65,6 +69,7 @@ private void load(ISkinSource skin, IScrollingInfo scrollingInfo)
                     Origin = Anchor.TopRight,
                     RelativeSizeAxes = Axes.Y,
                     Width = rightLineWidth,
+                    Colour = lineColour,
                     Alpha = hasRightLine ? 1 : 0
                 },
                 lightContainer = new Container

osu.Game.Tests/Resources/mania-skin-colours.ini

@@ -0,0 +1,3 @@
+[Mania]
+Keys: 4
+ColourBarline: 50,50,50,50

osu.Game.Tests/Skins/LegacyManiaSkinDecoderTest.cs

@@ -5,6 +5,7 @@
 using osu.Game.IO;
 using osu.Game.Skinning;
 using osu.Game.Tests.Resources;
+using osuTK.Graphics;
 
 namespace osu.Game.Tests.Skins
 {
@@ -83,5 +84,20 @@ public void TestParseWithUnnecessaryExtraData()
                 Assert.That(configs[0].HitPosition, Is.EqualTo(16));
             }
         }
+
+        [Test]
+        public void TestParseColours()
+        {
+            var decoder = new LegacyManiaSkinDecoder();
+
+            using (var resStream = TestResources.OpenResource("mania-skin-colours.ini"))
+            using (var stream = new LineBufferedReader(resStream))
+            {
+                var configs = decoder.Decode(stream);
+
+                Assert.That(configs.Count, Is.EqualTo(1));
+                Assert.That(configs[0].CustomColours, Contains.Key("ColourBarline").And.ContainValue(new Color4(50, 50, 50, 50)));
+            }
+        }
     }
 }

osu.Game/Beatmaps/Formats/LegacyDecoder.cs

@@ -73,7 +73,7 @@ protected virtual void ParseLine(T output, Section section, string line)
             switch (section)
             {
                 case Section.Colours:
-                    handleColours(output, line);
+                    HandleColours(output, line);
                     return;
             }
         }
@@ -87,7 +87,7 @@ protected string StripComments(string line)
             return line;
         }
 
-        private void handleColours(T output, string line)
+        protected void HandleColours<TModel>(TModel output, string line)
         {
             var pair = SplitKeyVal(line);
 

osu.Game/Skinning/LegacyManiaSkinConfiguration.cs

@@ -2,10 +2,13 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections.Generic;
+using osu.Game.Beatmaps.Formats;
+using osuTK.Graphics;
 
 namespace osu.Game.Skinning
 {
-    public class LegacyManiaSkinConfiguration
+    public class LegacyManiaSkinConfiguration : IHasCustomColours
     {
         /// <summary>
         /// Conversion factor from converting legacy positioning values (based in x480 dimensions) to x768.
@@ -19,6 +22,8 @@ public class LegacyManiaSkinConfiguration
 
         public readonly int Keys;
 
+        public Dictionary<string, Color4> CustomColours { get; set; } = new Dictionary<string, Color4>();
+
         public readonly float[] ColumnLineWidth;
         public readonly float[] ColumnSpacing;
         public readonly float[] ColumnWidth;

osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs

@@ -36,5 +36,6 @@ public enum LegacyManiaSkinConfigurationLookups
         HoldNoteBodyImage,
         ExplosionImage,
         ExplosionScale
+        ColumnLineColour
     }
 }

osu.Game/Skinning/LegacyManiaSkinDecoder.cs

@@ -71,6 +71,12 @@ private void flushPendingLines()
             {
                 var pair = SplitKeyVal(line);
 
+                if (pair.Key.StartsWith("Colour"))
+                {
+                    HandleColours(currentConfig, line);
+                    continue;
+                }
+
                 switch (pair.Key)
                 {
                     case "ColumnLineWidth":

osu.Game/Skinning/LegacySkin.cs

@@ -14,6 +14,7 @@
 using osu.Framework.Graphics.Textures;
 using osu.Framework.IO.Stores;
 using osu.Game.Audio;
+using osu.Game.Beatmaps.Formats;
 using osu.Game.IO;
 using osu.Game.Rulesets.Scoring;
 using osuTK.Graphics;
@@ -112,7 +113,7 @@ public override IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup)
                             break;
 
                         default:
-                            return SkinUtils.As<TValue>(getCustomColour(colour.ToString()));
+                            return SkinUtils.As<TValue>(getCustomColour(Configuration, colour.ToString()));
                     }
 
                     break;
@@ -130,7 +131,7 @@ public override IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup)
                     break;
 
                 case SkinCustomColourLookup customColour:
-                    return SkinUtils.As<TValue>(getCustomColour(customColour.Lookup.ToString()));
+                    return SkinUtils.As<TValue>(getCustomColour(Configuration, customColour.Lookup.ToString()));
 
                 case LegacyManiaSkinConfigurationLookup maniaLookup:
                     if (!AllowManiaSkin)
@@ -203,12 +204,16 @@ private IBindable<TValue> lookupForMania<TValue>(LegacyManiaSkinConfigurationLoo
                         return SkinUtils.As<TValue>(new Bindable<float>(existing.ExplosionWidth[maniaLookup.TargetColumn.Value] / LegacyManiaSkinConfiguration.DEFAULT_COLUMN_SIZE));
 
                     return SkinUtils.As<TValue>(new Bindable<float>(existing.ColumnWidth[maniaLookup.TargetColumn.Value] / LegacyManiaSkinConfiguration.DEFAULT_COLUMN_SIZE));
+
+                case LegacyManiaSkinConfigurationLookups.ColumnLineColour:
+                    return SkinUtils.As<TValue>(getCustomColour(existing, "ColourColumnLine"));
             }
 
             return null;
         }
 
-        private IBindable<Color4> getCustomColour(string lookup) => Configuration.CustomColours.TryGetValue(lookup, out var col) ? new Bindable<Color4>(col) : null;
+        private IBindable<Color4> getCustomColour(IHasCustomColours source, string lookup)
+            => source.CustomColours.TryGetValue(lookup, out var col) ? new Bindable<Color4>(col) : null;
 
         public override Drawable GetDrawableComponent(ISkinComponent component)
         {