sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-04 15:16:38 +09:00
Code Issues Packages Projects Releases Wiki Activity

Expose AccentColour/GlowColour from hud elements, and set from HudOverlay.

Browse Source
This commit is contained in:
smoogipooo
2017-04-13 10:04:12 +09:00
parent 2987a57588
commit 3054697f98
6 changed files with 54 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game/Graphics/UserInterface/PercentageCounter.cs
View File

@ -31,12 +31,6 @@ namespace osu.Game.Graphics.UserInterface
Current.Value = DisplayedCount = 1.0f;
}
[BackgroundDependencyLoader]
private void load(OsuColour colours)
{
DisplayedCountSpriteText.Colour = colours.BlueLighter;
}
protected override string FormatCount(double count)
{
return $@"{count:P2}";

9
osu.Game/Graphics/UserInterface/RollingCounter.cs
View File

@ -10,10 +10,11 @@ using osu.Game.Graphics.Sprites;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using OpenTK.Graphics;
namespace osu.Game.Graphics.UserInterface
{
public abstract class RollingCounter<T> : Container
public abstract class RollingCounter<T> : Container, IHasAccentColour
{
/// <summary>
/// The current value.
@ -80,6 +81,12 @@ namespace osu.Game.Graphics.UserInterface
}
}
public Color4 AccentColour
{
get { return DisplayedCountSpriteText.Colour; }
set { DisplayedCountSpriteText.Colour = value; }
}
/// <summary>
/// Skeleton of a numeric counter which value rolls over time.
/// </summary>

6
osu.Game/Graphics/UserInterface/ScoreCounter.cs
View File

@ -35,12 +35,6 @@ namespace osu.Game.Graphics.UserInterface
LeadingZeroes = leading;
}
[BackgroundDependencyLoader]
private void load(OsuColour colours)
{
DisplayedCountSpriteText.Colour = colours.BlueLighter;
}
protected override double GetProportionalDuration(double currentValue, double newValue)
{
return currentValue > newValue ? currentValue - newValue : newValue - currentValue;

7
osu.Game/Graphics/UserInterface/SimpleComboCounter.cs
View File

@ -2,6 +2,7 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System;
using OpenTK.Graphics;
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Transforms;
@ -38,12 +39,6 @@ namespace osu.Game.Graphics.UserInterface
Current.Value = Current + amount;
}
[BackgroundDependencyLoader]
private void load(OsuColour colours)
{
DisplayedCountSpriteText.Colour = colours.BlueLighter;
}
protected class TransformCount : Transform<int>
{
public override int CurrentValue