h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-16 02:23:10 +08:00
Code Issues Releases Wiki Activity

Update accent colour on combo index change

Browse Source
This commit is contained in:
smoogipoo 2019-09-26 17:04:38 +09:00
parent 3155a90501
commit 706e884cc0
2 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
View File

@ -76,6 +76,8 @@ namespace osu.Game.Rulesets.Objects.Drawables
/// </summary> /// </summary>
public JudgementResult Result { get; private set; } public JudgementResult Result { get; private set; }
private Bindable<int> comboIndexBindable;
public override bool RemoveWhenNotAlive => false; public override bool RemoveWhenNotAlive => false;
public override bool RemoveCompletedTransforms => false; public override bool RemoveCompletedTransforms => false;
protected override bool RequiresChildrenUpdate => true; protected override bool RequiresChildrenUpdate => true;
@ -122,6 +124,13 @@ namespace osu.Game.Rulesets.Objects.Drawables
protected override void LoadComplete() protected override void LoadComplete()
{ {
base.LoadComplete(); base.LoadComplete();
if (HitObject is IHasComboInformation combo)
{
comboIndexBindable = combo.ComboIndexBindable.GetBoundCopy();
comboIndexBindable.BindValueChanged(_ => updateAccentColour());
}
updateState(ArmedState.Idle, true); updateState(ArmedState.Idle, true);
} }
@ -244,12 +253,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
{ {
base.SkinChanged(skin, allowFallback); base.SkinChanged(skin, allowFallback);
if (HitObject is IHasComboInformation combo) updateAccentColour();
{
var comboColours = skin.GetConfig<GlobalSkinConfiguration, List<Color4>>(GlobalSkinConfiguration.ComboColours)?.Value;
AccentColour.Value = comboColours?.Count > 0 ? comboColours[combo.ComboIndex % comboColours.Count] : Color4.White;
}
ApplySkin(skin, allowFallback); ApplySkin(skin, allowFallback);
@ -257,6 +261,15 @@ namespace osu.Game.Rulesets.Objects.Drawables
updateState(State.Value, true); updateState(State.Value, true);
} }
private void updateAccentColour()
{
if (HitObject is IHasComboInformation combo)
{
var comboColours = CurrentSkin.GetConfig<GlobalSkinConfiguration, List<Color4>>(GlobalSkinConfiguration.ComboColours)?.Value;
AccentColour.Value = comboColours?.Count > 0 ? comboColours[combo.ComboIndex % comboColours.Count] : Color4.White;
}
}
/// <summary> /// <summary>
/// Called when a change is made to the skin. /// Called when a change is made to the skin.
/// </summary> /// </summary>

20
osu.Game/Skinning/SkinReloadableDrawable.cs
View File

@ -12,13 +12,17 @@ namespace osu.Game.Skinning
/// </summary> /// </summary>
public abstract class SkinReloadableDrawable : CompositeDrawable public abstract class SkinReloadableDrawable : CompositeDrawable
{ {
/// <summary>
/// The current skin source.
/// </summary>
protected ISkinSource CurrentSkin { get; private set; }
private readonly Func<ISkinSource, bool> allowFallback; private readonly Func<ISkinSource, bool> allowFallback;
private ISkinSource skin;
/// <summary> /// <summary>
/// Whether fallback to default skin should be allowed if the custom skin is missing this resource. /// Whether fallback to default skin should be allowed if the custom skin is missing this resource.
/// </summary> /// </summary>
private bool allowDefaultFallback => allowFallback == null || allowFallback.Invoke(skin); private bool allowDefaultFallback => allowFallback == null || allowFallback.Invoke(CurrentSkin);
/// <summary> /// <summary>
/// Create a new <see cref="SkinReloadableDrawable"/> /// Create a new <see cref="SkinReloadableDrawable"/>
@ -32,19 +36,19 @@ namespace osu.Game.Skinning
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(ISkinSource source) private void load(ISkinSource source)
{ {
skin = source; CurrentSkin = source;
skin.SourceChanged += onChange; CurrentSkin.SourceChanged += onChange;
} }
private void onChange() => private void onChange() =>
// schedule required to avoid calls after disposed. // schedule required to avoid calls after disposed.
// note that this has the side-effect of components only performing a skin change when they are alive. // note that this has the side-effect of components only performing a skin change when they are alive.
Scheduler.AddOnce(() => SkinChanged(skin, allowDefaultFallback)); Scheduler.AddOnce(() => SkinChanged(CurrentSkin, allowDefaultFallback));
protected override void LoadAsyncComplete() protected override void LoadAsyncComplete()
{ {
base.LoadAsyncComplete(); base.LoadAsyncComplete();
SkinChanged(skin, allowDefaultFallback); SkinChanged(CurrentSkin, allowDefaultFallback);
} }
/// <summary> /// <summary>
@ -60,8 +64,8 @@ namespace osu.Game.Skinning
{ {
base.Dispose(isDisposing); base.Dispose(isDisposing);
if (skin != null) if (CurrentSkin != null)
skin.SourceChanged -= onChange; CurrentSkin.SourceChanged -= onChange;
} }
} }
} }