epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

slow down power bar lerp slightly; extract constant

Browse Source
This commit is contained in:
Chris Forbes
2011-08-21 20:49:34 +12:00
parent 8b33c6c8b0
commit 2c5c069480
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.RA/Widgets/PowerBinWidget.cs
View File

@@ -46,6 +46,8 @@ namespace OpenRA.Mods.RA.Widgets
return Color.LimeGreen; return Color.LimeGreen;
} }
const float PowerBarLerpFactor = .2f;
public override void Draw() public override void Draw()
{ {
if( world.LocalPlayer == null ) return; if( world.LocalPlayer == null ) return;
@@ -69,7 +71,7 @@ namespace OpenRA.Mods.RA.Widgets
// Current power supply // Current power supply
var powerLevelTemp = barStart.X + (barEnd.X - barStart.X) * (power.PowerProvided / powerScaleBy); var powerLevelTemp = barStart.X + (barEnd.X - barStart.X) * (power.PowerProvided / powerScaleBy);
lastPowerProvidedPos = float2.Lerp(lastPowerProvidedPos.GetValueOrDefault(powerLevelTemp), powerLevelTemp, .3f); lastPowerProvidedPos = float2.Lerp(lastPowerProvidedPos.GetValueOrDefault(powerLevelTemp), powerLevelTemp, PowerBarLerpFactor);
var powerLevel = new float2(lastPowerProvidedPos.Value, barStart.Y); var powerLevel = new float2(lastPowerProvidedPos.Value, barStart.Y);
var color = GetPowerColor(power); var color = GetPowerColor(power);
@@ -92,7 +94,7 @@ namespace OpenRA.Mods.RA.Widgets
// Power usage indicator // Power usage indicator
var indicator = ChromeProvider.GetImage( powerCollection, "power-indicator"); var indicator = ChromeProvider.GetImage( powerCollection, "power-indicator");
var powerDrainedTemp = barStart.X + (barEnd.X - barStart.X) * (power.PowerDrained / powerScaleBy); var powerDrainedTemp = barStart.X + (barEnd.X - barStart.X) * (power.PowerDrained / powerScaleBy);
lastPowerDrainedPos = float2.Lerp(lastPowerDrainedPos.GetValueOrDefault(powerDrainedTemp), powerDrainedTemp, .3f); lastPowerDrainedPos = float2.Lerp(lastPowerDrainedPos.GetValueOrDefault(powerDrainedTemp), powerDrainedTemp, PowerBarLerpFactor);
var powerDrainLevel = new float2(lastPowerDrainedPos.Value - indicator.size.X / 2, barStart.Y - 1); var powerDrainLevel = new float2(lastPowerDrainedPos.Value - indicator.size.X / 2, barStart.Y - 1);
Game.Renderer.RgbaSpriteRenderer.DrawSprite(indicator, powerDrainLevel); Game.Renderer.RgbaSpriteRenderer.DrawSprite(indicator, powerDrainLevel);