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

Fix combo colour fallbacks when skin is not providing any

Browse Source
This commit is contained in:
Dean Herbert 2019-02-05 17:50:32 +09:00
parent e33277bd76
commit 2f8f4fac64
7 changed files with 110 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
View File

@ -58,7 +58,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
base.SkinChanged(skin, allowFallback);
if (HitObject is IHasComboInformation combo)
AccentColour = skin.GetValue<SkinConfiguration, Color4>(s => s.ComboColours.Count > 0 ? s.ComboColours[combo.ComboIndex % s.ComboColours.Count] : Color4.White);
AccentColour = skin.GetValue<SkinConfiguration, Color4?>(s => s.ComboColours.Count > 0 ? s.ComboColours[combo.ComboIndex % s.ComboColours.Count] : (Color4?)null) ?? Color4.White;
}
protected virtual void UpdatePreemptState() => this.FadeIn(HitObject.TimeFadeIn);

20
osu.Game.Tests/Resources/skin-empty.ini Normal file
View File

@ -0,0 +1,20 @@
[General]
Name: test skin
Author:
Version:
AnimationFramerate:
AllowSliderBallTint:
ComboBurstRandom:
CursorCentre:
CursorExpand:
CursorRotate:
CursorTrailRotate:
CustomComboBurstSounds:
HitCircleOverlayAboveNumber:
LayeredHitSounds:
SliderBallFlip:
SliderBallFrames:
SliderStyle:
SpinnerFadePlayfield:
SpinnerFrequencyModulate:
SpinnerNoBlink:

26
osu.Game.Tests/Resources/skin.ini Normal file
View File

@ -0,0 +1,26 @@
[General]
Name: test skin
Author:
Version:
AnimationFramerate:
AllowSliderBallTint:
ComboBurstRandom:
CursorCentre:
CursorExpand:
CursorRotate:
CursorTrailRotate:
CustomComboBurstSounds:
HitCircleOverlayAboveNumber:
LayeredHitSounds:
SliderBallFlip:
SliderBallFrames:
SliderStyle:
SpinnerFadePlayfield:
SpinnerFrequencyModulate:
SpinnerNoBlink:
[Colours]
Combo1 : 142,199,255
Combo2 : 255,128,128
Combo3 : 128,255,255
Combo7 : 100,100,100,100

44
osu.Game.Tests/Skins/LegacySkinDecoderTest.cs Normal file
View File

@ -0,0 +1,44 @@
// 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.Collections.Generic;
using System.IO;
using NUnit.Framework;
using osu.Game.Skinning;
using osu.Game.Tests.Resources;
using osuTK.Graphics;
namespace osu.Game.Tests.Skins
{
[TestFixture]
public class SkinFallbackTest
{
[TestCase(true)]
[TestCase(false)]
public void TestDecodeSkinColours(bool hasColours)
{
var decoder = new LegacySkinDecoder();
using (var resStream = TestResources.OpenResource(hasColours ? "skin.ini" : "skin-empty.ini"))
using (var stream = new StreamReader(resStream))
{
var comboColors = decoder.Decode(stream).ComboColours;
List<Color4> expectedColors;
if (hasColours)
expectedColors = new List<Color4>
{
new Color4(142, 199, 255, 255),
new Color4(255, 128, 128, 255),
new Color4(128, 255, 255, 255),
new Color4(100, 100, 100, 100),
};
else
expectedColors = new DefaultSkin().Configuration.ComboColours;
Assert.AreEqual(expectedColors.Count, comboColors.Count);
for (int i = 0; i < expectedColors.Count; i++)
Assert.AreEqual(expectedColors[i], comboColors[i]);
}
}
}
}

12
osu.Game/Skinning/DefaultSkin.cs
View File

@ -4,7 +4,6 @@
using osu.Framework.Audio.Sample;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Textures;
using osuTK.Graphics;
namespace osu.Game.Skinning
{
@ -13,16 +12,7 @@ namespace osu.Game.Skinning
public DefaultSkin()
: base(SkinInfo.Default)
{
Configuration = new SkinConfiguration
{
ComboColours =
{
new Color4(17, 136, 170, 255),
new Color4(102, 136, 0, 255),
new Color4(204, 102, 0, 255),
new Color4(121, 9, 13, 255)
}
};
Configuration = new SkinConfiguration();
}
public override Drawable GetDrawableComponent(string componentName) => null;

19
osu.Game/Skinning/LocalSkinOverrideContainer.cs
View File

@ -12,6 +12,9 @@ using osu.Game.Configuration;
namespace osu.Game.Skinning
{
/// <summary>
/// A container which overrides existing skin options with beatmap-local values.
/// </summary>
public class LocalSkinOverrideContainer : Container, ISkinSource
{
public event Action SourceChanged;
@ -19,6 +22,14 @@ namespace osu.Game.Skinning
private readonly Bindable<bool> beatmapSkins = new Bindable<bool>();
private readonly Bindable<bool> beatmapHitsounds = new Bindable<bool>();
private readonly ISkinSource source;
private ISkinSource fallbackSource;
public LocalSkinOverrideContainer(ISkinSource source)
{
this.source = source;
}
public Drawable GetDrawableComponent(string componentName)
{
Drawable sourceDrawable;
@ -53,14 +64,6 @@ namespace osu.Game.Skinning
return fallbackSource == null ? default : fallbackSource.GetValue(query);
}
private readonly ISkinSource source;
private ISkinSource fallbackSource;
public LocalSkinOverrideContainer(ISkinSource source)
{
this.source = source;
}
private void onSourceChanged() => SourceChanged?.Invoke();
protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)

8
osu.Game/Skinning/SkinConfiguration.cs
View File

@ -11,7 +11,13 @@ namespace osu.Game.Skinning
{
public readonly SkinInfo SkinInfo = new SkinInfo();
public List<Color4> ComboColours { get; set; } = new List<Color4>();
public List<Color4> ComboColours { get; set; } = new List<Color4>
{
new Color4(17, 136, 170, 255),
new Color4(102, 136, 0, 255),
new Color4(204, 102, 0, 255),
new Color4(121, 9, 13, 255)
};
public Dictionary<string, Color4> CustomColours { get; set; } = new Dictionary<string, Color4>();