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

Merge pull request #1085 from smoogipooo/spriteicon-invalidation-fix

Browse Source 
Fix SpriteIcon invalidation causing game breakness.
This commit is contained in:
Dean Herbert
2017-08-07 15:04:05 +09:00
committed by GitHub
parent 25bc281f00 2ce30474ca
commit d5c6693990
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
osu.Game/Graphics/SpriteIcon.cs
View File

@ -9,6 +9,7 @@ using osu.Framework.Graphics;
using osu.Framework.IO.Stores; using osu.Framework.IO.Stores;
using OpenTK; using OpenTK;
using OpenTK.Graphics; using OpenTK.Graphics;
using osu.Framework.Caching;
namespace osu.Game.Graphics namespace osu.Game.Graphics
{ {
@ -17,6 +18,7 @@ namespace osu.Game.Graphics
private readonly Sprite spriteShadow; private readonly Sprite spriteShadow;
private readonly Sprite spriteMain; private readonly Sprite spriteMain;
private Cached layout = new Cached();
private readonly Container shadowVisibility; private readonly Container shadowVisibility;
public SpriteIcon() public SpriteIcon()
@ -71,16 +73,23 @@ namespace osu.Game.Graphics
public override bool Invalidate(Invalidation invalidation = Invalidation.All, Drawable source = null, bool shallPropagate = true) public override bool Invalidate(Invalidation invalidation = Invalidation.All, Drawable source = null, bool shallPropagate = true)
{ {
if ((invalidation & Invalidation.Colour) > 0) if ((invalidation & Invalidation.Colour) > 0 && Shadow)
layout.Invalidate();
return base.Invalidate(invalidation, source, shallPropagate);
}
protected override void Update()
{
if (!layout.IsValid)
{ {
//adjust shadow alpha based on highest component intensity to avoid muddy display of darker text. //adjust shadow alpha based on highest component intensity to avoid muddy display of darker text.
//squared result for quadratic fall-off seems to give the best result. //squared result for quadratic fall-off seems to give the best result.
var avgColour = (Color4)DrawInfo.Colour.AverageColour; var avgColour = (Color4)DrawInfo.Colour.AverageColour;
spriteShadow.Alpha = (float)Math.Pow(Math.Max(Math.Max(avgColour.R, avgColour.G), avgColour.B), 2); spriteShadow.Alpha = (float)Math.Pow(Math.Max(Math.Max(avgColour.R, avgColour.G), avgColour.B), 2);
}
return base.Invalidate(invalidation, source, shallPropagate); layout.Validate();
}
} }
public bool Shadow public bool Shadow