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

Support trimmed production icon rectangles.

Browse Source
This commit is contained in:
Paul Chote
2014-07-16 18:17:57 +12:00
parent 6d96d46081
commit c1e83d9415
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenRA.Mods.RA/Widgets/ProductionPaletteWidget.cs
View File

@@ -38,6 +38,8 @@ namespace OpenRA.Mods.RA.Widgets
public readonly Color ReadyTextAltColor = Color.Red; public readonly Color ReadyTextAltColor = Color.Red;
public readonly int Columns = 3; public readonly int Columns = 3;
public readonly int2 IconSize = new int2(64, 48); public readonly int2 IconSize = new int2(64, 48);
public readonly int2 IconMargin = int2.Zero;
public readonly int2 IconSpriteOffset = int2.Zero;
public readonly string TabClick = null; public readonly string TabClick = null;
public readonly string DisabledTabClick = null; public readonly string DisabledTabClick = null;
@@ -201,7 +203,7 @@ namespace OpenRA.Mods.RA.Widgets
{ {
var x = IconCount % Columns; var x = IconCount % Columns;
var y = IconCount / Columns; var y = IconCount / Columns;
var rect = new Rectangle(rb.X + x * IconSize.X + 1, rb.Y + y * IconSize.Y + 1, IconSize.X, IconSize.Y); var rect = new Rectangle(rb.X + x * (IconSize.X + IconMargin.X), rb.Y + y * (IconSize.Y + IconMargin.Y), IconSize.X, IconSize.Y);
var icon = new Animation(World, RenderSimple.GetImage(item)); var icon = new Animation(World, RenderSimple.GetImage(item));
icon.Play(item.Traits.Get<TooltipInfo>().Icon); icon.Play(item.Traits.Get<TooltipInfo>().Icon);
@@ -225,7 +227,7 @@ namespace OpenRA.Mods.RA.Widgets
public override void Draw() public override void Draw()
{ {
var iconOffset = 0.5f * IconSize.ToFloat2(); var iconOffset = 0.5f * IconSize.ToFloat2() + IconSpriteOffset;
overlayFont = Game.Renderer.Fonts["TinyBold"]; overlayFont = Game.Renderer.Fonts["TinyBold"];
timeOffset = iconOffset - overlayFont.Measure(WidgetUtils.FormatTime(0)) / 2; timeOffset = iconOffset - overlayFont.Measure(WidgetUtils.FormatTime(0)) / 2;
@@ -251,6 +253,7 @@ namespace OpenRA.Mods.RA.Widgets
() => (first.TotalTime - first.RemainingTime) () => (first.TotalTime - first.RemainingTime)
* (clock.CurrentSequence.Length - 1) / first.TotalTime); * (clock.CurrentSequence.Length - 1) / first.TotalTime);
clock.Tick(); clock.Tick();
WidgetUtils.DrawSHPCentered(clock.Image, icon.Pos + iconOffset, worldRenderer); WidgetUtils.DrawSHPCentered(clock.Image, icon.Pos + iconOffset, worldRenderer);
} }
else if (!buildableItems.Any(a => a.Name == icon.Name)) else if (!buildableItems.Any(a => a.Name == icon.Name))

4
mods/cnc/chrome/ingame.yaml
View File

@@ -397,8 +397,8 @@ Container@PLAYER_WIDGETS:
Height: 50 Height: 50
Background: panel-black Background: panel-black
ProductionPalette@PRODUCTION_PALETTE: ProductionPalette@PRODUCTION_PALETTE:
X: WINDOW_RIGHT - 204 X: WINDOW_RIGHT - 203
Y: 287 Y: 288
TooltipContainer: TOOLTIP_CONTAINER TooltipContainer: TOOLTIP_CONTAINER
ReadyText: Ready ReadyText: Ready
HoldText: On Hold HoldText: On Hold