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

tidy up spurious typenames in PowerBinWidget

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

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

@@ -64,12 +64,13 @@ namespace OpenRA.Mods.RA.Widgets
float powerScaleBy = 100; float powerScaleBy = 100;
var maxPower = Math.Max(power.PowerProvided, power.PowerDrained); var maxPower = Math.Max(power.PowerProvided, power.PowerDrained);
while (maxPower >= powerScaleBy) powerScaleBy *= 2; while (maxPower >= powerScaleBy) powerScaleBy *= 2;
// 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, .3f);
float2 powerLevel = new float2(lastPowerProvidedPos.Value, barStart.Y); var powerLevel = new float2(lastPowerProvidedPos.Value, barStart.Y);
var color = GetPowerColor(power); var color = GetPowerColor(power);
@@ -77,8 +78,8 @@ namespace OpenRA.Mods.RA.Widgets
for (int i = 0; i < powerSize.Height; i++) for (int i = 0; i < powerSize.Height; i++)
{ {
color = (i - 1 < powerSize.Height / 2) ? color : colorDark; color = (i - 1 < powerSize.Height / 2) ? color : colorDark;
float2 leftOffset = new float2(0, i); var leftOffset = new float2(0, i);
float2 rightOffset = new float2(0, i); var rightOffset = new float2(0, i);
// Indent corners // Indent corners
if ((i == 0 || i == powerSize.Height - 1) && powerLevel.X - barStart.X > 1) if ((i == 0 || i == powerSize.Height - 1) && powerLevel.X - barStart.X > 1)
{ {
@@ -92,7 +93,7 @@ namespace OpenRA.Mods.RA.Widgets
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, .3f);
float2 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);
} }