tidy up SiloBarWidget to be almost completely independent of ore

OpenRA.FileFormats/Primitives/float2.cs

@@ -101,4 +101,18 @@ namespace OpenRA
 		public float LengthSquared { get { return X * X + Y * Y; } }
 		public float Length { get { return (float)Math.Sqrt(LengthSquared); } }
 	}
+
+	public class EWMA
+	{
+		readonly float animRate;
+		float? value;
+
+		public EWMA(float animRate) { this.animRate = animRate; }
+
+		public float Update(float newValue)
+		{
+			value = float2.Lerp(value ?? newValue, newValue, animRate);
+			return value.Value;
+		}
+	}
 }

OpenRA.Mods.Cnc/Widgets/PowerBarWidget.cs

@@ -53,27 +53,26 @@ namespace OpenRA.Mods.Cnc.Widgets
 			float powerScaleBy = 100;
 			var maxPower = Math.Max(pm.PowerProvided, pm.PowerDrained);
 			while (maxPower >= powerScaleBy) powerScaleBy *= 2;
+			var animRate = .3f;
 
 			// Current power supply
 			var providedFrac = pm.PowerProvided / powerScaleBy;
-			lastProvidedFrac = providedFrac = float2.Lerp(lastProvidedFrac.GetValueOrDefault(providedFrac), providedFrac, .3f);
+			lastProvidedFrac = providedFrac = float2.Lerp(lastProvidedFrac.GetValueOrDefault(providedFrac), providedFrac, animRate);
 
 			var color = GetBarColor();
 
 			var b = RenderBounds;
-			var rect = new RectangleF(b.X,
+			var rect = new RectangleF(b.X, float2.Lerp(b.Bottom, b.Top, providedFrac),
-									  b.Y + (1-providedFrac)*b.Height,
+				(float)b.Width, providedFrac*b.Height);
-									  (float)b.Width,
-									  providedFrac*b.Height);
 			Game.Renderer.LineRenderer.FillRect(rect, color);
 
 			var indicator = ChromeProvider.GetImage("sidebar-bits", "left-indicator");
 
 			var drainedFrac = pm.PowerDrained / powerScaleBy;
-			lastDrainedFrac = drainedFrac = float2.Lerp(lastDrainedFrac.GetValueOrDefault(drainedFrac), drainedFrac, .3f);
+			lastDrainedFrac = drainedFrac = float2.Lerp(lastDrainedFrac.GetValueOrDefault(drainedFrac), drainedFrac, animRate);
 
 			float2 pos = new float2(b.X + b.Width - indicator.size.X,
-									b.Y + (1-drainedFrac)*b.Height - indicator.size.Y / 2);
+				float2.Lerp(b.Bottom, b.Top, drainedFrac));
 
 			Game.Renderer.RgbaSpriteRenderer.DrawSprite(indicator, pos);
 		}

OpenRA.Mods.Cnc/Widgets/SiloBarWidget.cs

@@ -24,8 +24,12 @@ namespace OpenRA.Mods.Cnc.Widgets
 		Lazy<TooltipContainerWidget> tooltipContainer;
 
 		public float LowStorageThreshold = 0.8f;
-		float? lastCapacityFrac;
+		EWMA providedLerp = new EWMA(0.3f);
-		float? lastStoredFrac;
+		EWMA usedLerp = new EWMA(0.3f);
+
+		public Func<float> GetProvided, GetUsed;
+		public string TooltipFormat = "Silo Usage: {0}/{1}";
+		public bool RightIndicator = false;
 
 		readonly PlayerResources pr;
 
@@ -35,12 +39,15 @@ namespace OpenRA.Mods.Cnc.Widgets
 			pr = world.LocalPlayer.PlayerActor.Trait<PlayerResources>();
 			tooltipContainer = Lazy.New(() =>
 				Ui.Root.Get<TooltipContainerWidget>(TooltipContainer));
+
+			GetProvided = () => pr.OreCapacity;
+			GetUsed = () => pr.Ore;
 		}
 
 		public override void MouseEntered()
 		{
 			if (TooltipContainer == null) return;
-			Func<string> getText = () => "Silo Usage: {0}/{1}".F(pr.Ore, pr.OreCapacity);
+			Func<string> getText = () => TooltipFormat.F(GetUsed(), GetProvided());
 			tooltipContainer.Value.SetTooltip(TooltipTemplate, new WidgetArgs() {{ "getText", getText }});
 		}
 
@@ -52,27 +59,28 @@ namespace OpenRA.Mods.Cnc.Widgets
 
 		public override void Draw()
 		{
-			float scaleBy = 100;
+			var scaleBy = 100.0f;
-			var max = Math.Max(pr.OreCapacity, pr.Ore);
+			var provided = GetProvided();
+			var used = GetUsed();
+			var max = Math.Max(provided, used);
 			while (max >= scaleBy) scaleBy *= 2;
 
-			// Current capacity
+			var providedFrac = providedLerp.Update(provided/scaleBy);
-			var capacityFrac = pr.OreCapacity / scaleBy;
+			var usedFrac = usedLerp.Update(used/scaleBy);
-			lastCapacityFrac = capacityFrac = float2.Lerp(lastCapacityFrac.GetValueOrDefault(capacityFrac), capacityFrac, .3f);
 
 			var color = GetBarColor();
 
 			var b = RenderBounds;
-			var rect = new RectangleF(b.X, float2.Lerp( b.Bottom, b.Top, capacityFrac ),
+			var rect = new RectangleF(b.X, float2.Lerp( b.Bottom, b.Top, providedFrac ),
-				(float)b.Width, capacityFrac*b.Height);
+				b.Width, providedFrac*b.Height);
 			Game.Renderer.LineRenderer.FillRect(rect, color);
 
-			var indicator = ChromeProvider.GetImage("sidebar-bits", "right-indicator");
+			var indicator = ChromeProvider.GetImage("sidebar-bits",
+				RightIndicator ? "right-indicator" : "left-indicator");
 
-			var storedFrac = pr.Ore / scaleBy;
+			var indicatorX = RightIndicator ? (b.Right - indicator.size.X) : b.Left;
-			lastStoredFrac = storedFrac = float2.Lerp(lastStoredFrac.GetValueOrDefault(storedFrac), storedFrac, .3f);
 
-			float2 pos = new float2(b.X, float2.Lerp( b.Bottom, b.Top, storedFrac ) - indicator.size.Y / 2);
+			var pos = new float2(indicatorX, float2.Lerp( b.Bottom, b.Top, usedFrac ) - indicator.size.Y / 2);
 
 			Game.Renderer.RgbaSpriteRenderer.DrawSprite(indicator, pos);
 		}