tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make AlertControl use AnimatedTextureRect for animated alert icons.

Browse Source
This commit is contained in:
Pieter-Jan Briers
2021-01-24 23:02:29 +01:00
parent 9f7f55d264
commit 080846d396
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Content.Client/UserInterface/Controls/AlertControl.cs
View File

@@ -3,7 +3,6 @@ using System;
using Content.Shared.Alert; using Content.Shared.Alert;
using Robust.Client.UserInterface; using Robust.Client.UserInterface;
using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.Controls;
using Robust.Client.Utility;
using Robust.Shared.Interfaces.Timing; using Robust.Shared.Interfaces.Timing;
using Robust.Shared.IoC; using Robust.Shared.IoC;
using Robust.Shared.Maths; using Robust.Shared.Maths;
@@ -34,11 +33,12 @@ namespace Content.Client.UserInterface.Controls
} }
} }
} }
private (TimeSpan Start, TimeSpan End)? _cooldown; private (TimeSpan Start, TimeSpan End)? _cooldown;
private short? _severity; private short? _severity;
private readonly IGameTiming _gameTiming; private readonly IGameTiming _gameTiming;
private readonly TextureRect _icon; private readonly AnimatedTextureRect _icon;
private readonly CooldownGraphic _cooldownGraphic; private readonly CooldownGraphic _cooldownGraphic;
/// <summary> /// <summary>
@@ -53,17 +53,17 @@ namespace Content.Client.UserInterface.Controls
TooltipSupplier = SupplyTooltip; TooltipSupplier = SupplyTooltip;
Alert = alert; Alert = alert;
_severity = severity; _severity = severity;
var texture = alert.GetIcon(_severity).Frame0(); var specifier = alert.GetIcon(_severity);
_icon = new TextureRect _icon = new AnimatedTextureRect
{ {
TextureScale = (2, 2), DisplayRect = {TextureScale = (2, 2)}
Texture = texture
}; };
_icon.SetFromSpriteSpecifier(specifier);
Children.Add(_icon); Children.Add(_icon);
_cooldownGraphic = new CooldownGraphic(); _cooldownGraphic = new CooldownGraphic();
Children.Add(_cooldownGraphic); Children.Add(_cooldownGraphic);
} }
private Control SupplyTooltip(Control? sender) private Control SupplyTooltip(Control? sender)
@@ -79,7 +79,7 @@ namespace Content.Client.UserInterface.Controls
if (_severity != severity) if (_severity != severity)
{ {
_severity = severity; _severity = severity;
_icon.Texture = Alert.GetIcon(_severity).Frame0(); _icon.SetFromSpriteSpecifier(Alert.GetIcon(_severity));
} }
} }
@@ -99,7 +99,7 @@ namespace Content.Client.UserInterface.Controls
var progress = (curTime - Cooldown.Value.Start).TotalSeconds / length; var progress = (curTime - Cooldown.Value.Start).TotalSeconds / length;
var ratio = (progress <= 1 ? (1 - progress) : (curTime - Cooldown.Value.End).TotalSeconds * -5); var ratio = (progress <= 1 ? (1 - progress) : (curTime - Cooldown.Value.End).TotalSeconds * -5);
_cooldownGraphic.Progress = MathHelper.Clamp((float)ratio, -1, 1); _cooldownGraphic.Progress = MathHelper.Clamp((float) ratio, -1, 1);
_cooldownGraphic.Visible = ratio > -1f; _cooldownGraphic.Visible = ratio > -1f;
} }
} }