sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 16:29:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

Choose colours based on relative performance goals

Browse Source
This commit is contained in:
Dean Herbert
2022-07-20 20:28:58 +09:00
parent 0c3d43026d
commit 03e644e548
1 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
osu.Game/Graphics/UserInterface/FPSCounter.cs
View File

@ -4,11 +4,13 @@
using System; using System;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Colour;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Cursor; using osu.Framework.Graphics.Cursor;
using osu.Framework.Localisation; using osu.Framework.Localisation;
using osu.Framework.Platform; using osu.Framework.Platform;
using osu.Framework.Threading; using osu.Framework.Threading;
using osu.Framework.Utils;
using osu.Game.Graphics.Sprites; using osu.Game.Graphics.Sprites;
using osuTK; using osuTK;
@ -21,13 +23,16 @@ namespace osu.Game.Graphics.UserInterface
private Container mainContent = null!; private Container mainContent = null!;
[Resolved]
private OsuColour colours { get; set; } = null!;
public FPSCounter() public FPSCounter()
{ {
AutoSizeAxes = Axes.Both; AutoSizeAxes = Axes.Both;
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuColour colours) private void load()
{ {
InternalChildren = new Drawable[] InternalChildren = new Drawable[]
{ {
@ -41,7 +46,6 @@ namespace osu.Game.Graphics.UserInterface
{ {
Anchor = Anchor.TopRight, Anchor = Anchor.TopRight,
Origin = Anchor.TopRight, Origin = Anchor.TopRight,
Colour = colours.Orange2,
}, },
fpsCounter = new FramesPerSecondCounter fpsCounter = new FramesPerSecondCounter
{ {
@ -49,7 +53,6 @@ namespace osu.Game.Graphics.UserInterface
Origin = Anchor.TopRight, Origin = Anchor.TopRight,
Y = 11, Y = 11,
Scale = new Vector2(0.8f), Scale = new Vector2(0.8f),
Colour = colours.Lime3,
} }
} }
}, },
@ -97,8 +100,27 @@ namespace osu.Game.Graphics.UserInterface
if (hasSignificantChanges) if (hasSignificantChanges)
displayTemporarily(); displayTemporarily();
// If the frame time spikes up, make sure it shows immediately on the counter.
if (msCounter.Current.Value < 20 && newFrameTime > 20)
msCounter.SetCountWithoutRolling(newFrameTime);
else
msCounter.Current.Value = newFrameTime; msCounter.Current.Value = newFrameTime;
fpsCounter.Current.Value = newFps; fpsCounter.Current.Value = newFps;
fpsCounter.Colour = getColour(fpsCounter.DisplayedCount / gameHost.DrawThread.Clock.MaximumUpdateHz);
double equivalentHz = 1000 / msCounter.DisplayedCount;
msCounter.Colour = getColour(equivalentHz / gameHost.UpdateThread.Clock.MaximumUpdateHz);
}
private ColourInfo getColour(double performanceRatio)
{
if (performanceRatio < 0.5f)
return Interpolation.ValueAt(performanceRatio, colours.Red, colours.Orange2, 0, 0.5, Easing.Out);
return Interpolation.ValueAt(performanceRatio, colours.Orange2, colours.Lime3, 0.5, 1, Easing.Out);
} }
public ITooltip GetCustomTooltip() => new FPSCounterTooltip(); public ITooltip GetCustomTooltip() => new FPSCounterTooltip();