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

Fix broken first tick rendering in BuildPaletteWidget.

Browse Source
This commit is contained in:
Paul Chote
2011-01-20 00:51:13 +13:00
parent 1fb42f47b6
commit 2fca9b0b19
2 changed files with 98 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.RA/Player/ClassicProductionQueue.cs
View File

@@ -25,7 +25,7 @@ namespace OpenRA.Mods.RA
public ClassicProductionQueue( Actor self, ClassicProductionQueueInfo info ) public ClassicProductionQueue( Actor self, ClassicProductionQueueInfo info )
: base(self, self, info as ProductionQueueInfo) {} : base(self, self, info as ProductionQueueInfo) {}
[Sync] bool QueueActive = true; [Sync] bool QueueActive = false;
public override void Tick( Actor self ) public override void Tick( Actor self )
{ {
QueueActive = self.World.Queries.OwnedBy[self.Owner].WithTrait<Production>() QueueActive = self.World.Queries.OwnedBy[self.Owner].WithTrait<Production>()

168
OpenRA.Mods.RA/Widgets/BuildPaletteWidget.cs
View File

@@ -26,16 +26,17 @@ namespace OpenRA.Mods.RA.Widgets
public int Columns = 3; public int Columns = 3;
public int Rows = 5; public int Rows = 5;
ProductionQueue CurrentQueue = null; ProductionQueue CurrentQueue;
List<ProductionQueue> VisibleQueues = new List<ProductionQueue>(); List<ProductionQueue> VisibleQueues;
bool paletteOpen = false; bool paletteOpen = false;
Dictionary<string, Sprite> iconSprites; Dictionary<string, Sprite> iconSprites;
static float2 paletteOpenOrigin = new float2(Game.viewport.Width - 215, 280); float2 paletteOpenOrigin = new float2(Game.viewport.Width - 215, 280);
static float2 paletteClosedOrigin = new float2(Game.viewport.Width - 16, 280); float2 paletteClosedOrigin = new float2(Game.viewport.Width - 16, 280);
static float2 paletteOrigin = paletteClosedOrigin; float2 paletteOrigin;
const int paletteAnimationLength = 7;
int paletteAnimationLength = 7;
int paletteAnimationFrame = 0; int paletteAnimationFrame = 0;
bool paletteAnimating = false; bool paletteAnimating = false;
@@ -55,25 +56,21 @@ namespace OpenRA.Mods.RA.Widgets
{ {
this.world = world; this.world = world;
this.worldRenderer = worldRenderer; this.worldRenderer = worldRenderer;
}
public override void Initialize()
{
base.Initialize();
cantBuild = new Animation("clock"); cantBuild = new Animation("clock");
cantBuild.PlayFetchIndex("idle", () => 0); cantBuild.PlayFetchIndex("idle", () => 0);
ready = new Animation("pips"); ready = new Animation("pips");
ready.PlayRepeating("ready"); ready.PlayRepeating("ready");
clock = new Animation("clock"); clock = new Animation("clock");
paletteOrigin = paletteClosedOrigin;
VisibleQueues = new List<ProductionQueue>();
CurrentQueue = null;
iconSprites = Rules.Info.Values iconSprites = Rules.Info.Values
.Where(u => u.Traits.Contains<BuildableInfo>() && u.Name[0] != '^') .Where(u => u.Traits.Contains<BuildableInfo>() && u.Name[0] != '^')
.ToDictionary( .ToDictionary(
u => u.Name, u => u.Name,
u => SpriteSheetBuilder.LoadAllSprites(u.Traits.Get<TooltipInfo>().Icon ?? (u.Name + "icon"))[0]); u => SpriteSheetBuilder.LoadAllSprites(u.Traits.Get<TooltipInfo>().Icon ?? (u.Name + "icon"))[0]);
IsVisible = () => { return CurrentQueue != null || (CurrentQueue == null && !paletteOpen); };
} }
public override Rectangle EventBounds public override Rectangle EventBounds
@@ -142,6 +139,7 @@ namespace OpenRA.Mods.RA.Widgets
{ {
if (!paletteOpen) if (!paletteOpen)
paletteAnimating = true; paletteAnimating = true;
paletteOpen = true; paletteOpen = true;
CurrentQueue = queue; CurrentQueue = queue;
} }
@@ -178,111 +176,111 @@ namespace OpenRA.Mods.RA.Widgets
return true; return true;
} }
int paletteHeight = 0;
int numActualRows = 0;
public override void DrawInner() public override void DrawInner()
{ {
if (!IsVisible()) return; if (!IsVisible()) return;
// todo: fix // todo: fix
paletteHeight = DrawPalette(CurrentQueue); int paletteHeight = DrawPalette(CurrentQueue);
DrawBuildTabs(world, paletteHeight); DrawBuildTabs(world, paletteHeight);
} }
int numActualRows = 5;
int DrawPalette(ProductionQueue queue) int DrawPalette(ProductionQueue queue)
{ {
buttons.Clear(); buttons.Clear();
if (queue == null) return 0;
string paletteCollection = "palette-" + world.LocalPlayer.Country.Race; string paletteCollection = "palette-" + world.LocalPlayer.Country.Race;
float2 origin = new float2(paletteOrigin.X + 9, paletteOrigin.Y + 9); float2 origin = new float2(paletteOrigin.X + 9, paletteOrigin.Y + 9);
// Collect info
var x = 0; var x = 0;
var y = 0; var y = 0;
var buildableItems = queue.BuildableItems().OrderBy(a => a.Traits.Get<BuildableInfo>().BuildPaletteOrder);
var allBuildables = queue.AllItems().OrderBy(a => a.Traits.Get<BuildableInfo>().BuildPaletteOrder);
var overlayBits = new List<Pair<Sprite, float2>>(); if (queue != null)
numActualRows = Math.Max((allBuildables.Count() + Columns - 1) / Columns, Rows);
// Palette Background
WidgetUtils.DrawRGBA(ChromeProvider.GetImage(paletteCollection, "top"), new float2(origin.X - 9, origin.Y - 9));
for (var w = 0; w < numActualRows; w++)
WidgetUtils.DrawRGBA(
ChromeProvider.GetImage(paletteCollection, "bg-" + (w % 4).ToString()),
new float2(origin.X - 9, origin.Y + 48 * w));
WidgetUtils.DrawRGBA(ChromeProvider.GetImage(paletteCollection, "bottom"),
new float2(origin.X - 9, origin.Y - 1 + 48 * numActualRows));
// Icons
string tooltipItem = null;
var isBuildingSomething = queue.CurrentItem() != null;
foreach (var item in allBuildables)
{ {
var rect = new RectangleF(origin.X + x * 64, origin.Y + 48 * y, 64, 48); var buildableItems = queue.BuildableItems().OrderBy(a => a.Traits.Get<BuildableInfo>().BuildPaletteOrder);
var drawPos = new float2(rect.Location); var allBuildables = queue.AllItems().OrderBy(a => a.Traits.Get<BuildableInfo>().BuildPaletteOrder);
WidgetUtils.DrawSHP(iconSprites[item.Name], drawPos, worldRenderer);
var firstOfThis = queue.AllQueued().FirstOrDefault(a => a.Item == item.Name); var overlayBits = new List<Pair<Sprite, float2>>();
numActualRows = Math.Max((allBuildables.Count() + Columns - 1) / Columns, Rows);
if (rect.Contains(Viewport.LastMousePos)) // Palette Background
tooltipItem = item.Name; WidgetUtils.DrawRGBA(ChromeProvider.GetImage(paletteCollection, "top"), new float2(origin.X - 9, origin.Y - 9));
for (var w = 0; w < numActualRows; w++)
WidgetUtils.DrawRGBA(
ChromeProvider.GetImage(paletteCollection, "bg-" + (w % 4).ToString()),
new float2(origin.X - 9, origin.Y + 48 * w));
WidgetUtils.DrawRGBA(ChromeProvider.GetImage(paletteCollection, "bottom"),
new float2(origin.X - 9, origin.Y - 1 + 48 * numActualRows));
var overlayPos = drawPos + new float2((64 - ready.Image.size.X) / 2, 2);
if (firstOfThis != null) // Icons
string tooltipItem = null;
var isBuildingSomething = queue.CurrentItem() != null;
foreach (var item in allBuildables)
{ {
clock.PlayFetchIndex("idle", var rect = new RectangleF(origin.X + x * 64, origin.Y + 48 * y, 64, 48);
() => (firstOfThis.TotalTime - firstOfThis.RemainingTime) var drawPos = new float2(rect.Location);
* (clock.CurrentSequence.Length - 1) / firstOfThis.TotalTime); WidgetUtils.DrawSHP(iconSprites[item.Name], drawPos, worldRenderer);
clock.Tick();
WidgetUtils.DrawSHP(clock.Image, drawPos, worldRenderer);
if (firstOfThis.Done) var firstOfThis = queue.AllQueued().FirstOrDefault(a => a.Item == item.Name);
{
ready.Play("ready");
overlayBits.Add(Pair.New(ready.Image, overlayPos));
}
else if (firstOfThis.Paused)
{
ready.Play("hold");
overlayBits.Add(Pair.New(ready.Image, overlayPos));
}
var repeats = queue.AllQueued().Count(a => a.Item == item.Name); if (rect.Contains(Viewport.LastMousePos))
if (repeats > 1 || queue.CurrentItem() != firstOfThis) tooltipItem = item.Name;
var overlayPos = drawPos + new float2((64 - ready.Image.size.X) / 2, 2);
if (firstOfThis != null)
{ {
var offset = -22; clock.PlayFetchIndex("idle",
var digits = repeats.ToString(); () => (firstOfThis.TotalTime - firstOfThis.RemainingTime)
foreach (var d in digits) * (clock.CurrentSequence.Length - 1) / firstOfThis.TotalTime);
clock.Tick();
WidgetUtils.DrawSHP(clock.Image, drawPos, worldRenderer);
if (firstOfThis.Done)
{ {
ready.PlayFetchIndex("groups", () => d - '0'); ready.Play("ready");
ready.Tick(); overlayBits.Add(Pair.New(ready.Image, overlayPos));
overlayBits.Add(Pair.New(ready.Image, overlayPos + new float2(offset, 0))); }
offset += 6; else if (firstOfThis.Paused)
{
ready.Play("hold");
overlayBits.Add(Pair.New(ready.Image, overlayPos));
}
var repeats = queue.AllQueued().Count(a => a.Item == item.Name);
if (repeats > 1 || queue.CurrentItem() != firstOfThis)
{
var offset = -22;
var digits = repeats.ToString();
foreach (var d in digits)
{
ready.PlayFetchIndex("groups", () => d - '0');
ready.Tick();
overlayBits.Add(Pair.New(ready.Image, overlayPos + new float2(offset, 0)));
offset += 6;
}
} }
} }
else
if (!buildableItems.Any(a => a.Name == item.Name) || isBuildingSomething)
overlayBits.Add(Pair.New(cantBuild.Image, drawPos));
var closureName = buildableItems.Any(a => a.Name == item.Name) ? item.Name : null;
buttons.Add(Pair.New(new Rectangle((int)rect.X, (int)rect.Y, (int)rect.Width, (int)rect.Height), HandleClick(closureName, world)));
if (++x == Columns) { x = 0; y++; }
} }
else if (x != 0) y++;
if (!buildableItems.Any(a => a.Name == item.Name) || isBuildingSomething)
overlayBits.Add(Pair.New(cantBuild.Image, drawPos));
var closureName = buildableItems.Any(a => a.Name == item.Name) ? item.Name : null; foreach (var ob in overlayBits)
buttons.Add(Pair.New(new Rectangle((int)rect.X, (int)rect.Y, (int)rect.Width, (int)rect.Height), HandleClick(closureName, world))); WidgetUtils.DrawSHP(ob.First, ob.Second, worldRenderer);
if (++x == Columns) { x = 0; y++; } // Tooltip
if (tooltipItem != null && !paletteAnimating && paletteOpen)
DrawProductionTooltip(world, tooltipItem,
new float2(Game.viewport.Width, origin.Y + numActualRows * 48 + 9).ToInt2());
} }
if (x != 0) y++;
foreach (var ob in overlayBits)
WidgetUtils.DrawSHP(ob.First, ob.Second, worldRenderer);
// Tooltip
if (tooltipItem != null && !paletteAnimating && paletteOpen)
DrawProductionTooltip(world, tooltipItem,
new float2(Game.viewport.Width, origin.Y + numActualRows * 48 + 9).ToInt2());
// Palette Dock // Palette Dock
WidgetUtils.DrawRGBA(ChromeProvider.GetImage(paletteCollection, "dock-top"), WidgetUtils.DrawRGBA(ChromeProvider.GetImage(paletteCollection, "dock-top"),