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

Improve ProductionBar performance.

Browse Source 
Also adds an explicit second bar for construction yards.
This commit is contained in:
Paul Chote
2014-04-18 23:55:58 +12:00
parent abe06b24b4
commit 59da851d71
4 changed files with 54 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
OpenRA.Mods.RA/ProductionBar.cs
View File

@@ -8,6 +8,7 @@
*/
#endregion
using System;
using System.Drawing;
using System.Linq;
using OpenRA.FileFormats;
@@ -18,13 +19,49 @@ namespace OpenRA.Mods.RA
[Desc("Visualizes the remaining build time of actor produced here.")]
class ProductionBarInfo : ITraitInfo
{
public object Create(ActorInitializer init) { return new ProductionBar( init.self ); }
[Desc("Production queue type, for actors with multiple queues.")]
public readonly string ProductionType = null;
public object Create(ActorInitializer init) { return new ProductionBar(init.self, this); }
}
class ProductionBar : ISelectionBar
class ProductionBar : ISelectionBar, ITick
{
Actor self;
public ProductionBar(Actor self) { this.self = self; }
readonly ProductionBarInfo info;
readonly Actor self;
ProductionQueue queue;
float value;
public ProductionBar(Actor self, ProductionBarInfo info)
{
this.self = self;
this.info = info;
}
public void Tick(Actor self)
{
if (queue == null)
{
var type = info.ProductionType ?? self.Trait<Production>().Info.Produces.First();
// Per-actor queue
queue = self.TraitsImplementing<ProductionQueue>()
.FirstOrDefault(q => type == null || type == q.Info.Type);
if (queue == null)
{
// No queues available - check for classic production queues
queue = self.Owner.PlayerActor.TraitsImplementing<ProductionQueue>()
.FirstOrDefault(q => type == null || type == q.Info.Type);
}
if (queue == null)
throw new InvalidOperationException("No queues available for production type '{0}'".F(type));
}
var current = queue.CurrentItem();
value = current != null ? 1 - (float)current.RemainingCost / current.TotalCost : 0;
}
public float GetValue()
{
@@ -32,18 +69,7 @@ namespace OpenRA.Mods.RA
if (!self.Owner.IsAlliedWith(self.World.RenderPlayer))
return 0;
var queue = self.TraitsImplementing<ProductionQueue>().FirstOrDefault(q => q.CurrentItem() != null);
if (queue == null)
{
var produces = self.Trait<Production>().Info.Produces;
queue = self.Owner.PlayerActor.TraitsImplementing<ProductionQueue>()
.FirstOrDefault(q => produces.Contains(q.Info.Type));
}
if (queue == null || queue.CurrentItem() == null)
return 0f;
return 1 - (float)queue.CurrentItem().RemainingCost / queue.CurrentItem().TotalCost;
return value;
}
public Color GetColor() { return Color.SkyBlue; }