Rework WidgetUtil sprite rendering helpers.

This commit is contained in:
Paul Chote
2021-07-22 21:43:14 +01:00
committed by reaperrr
parent 2e6f444285
commit 8e94e1d5ec
21 changed files with 54 additions and 53 deletions

View File

@@ -181,7 +181,7 @@ namespace OpenRA.Mods.Common.Widgets
var y = RenderBounds.Y + (RenderBounds.Height - h) / 2;
mapRect = new Rectangle(x, y, w, h);
Game.Renderer.RgbaSpriteRenderer.DrawSprite(minimap, new float2(mapRect.Location), new float2(mapRect.Size));
WidgetUtils.DrawSprite(minimap, mapRect.Location, mapRect.Size);
TooltipSpawnIndex = -1;
if (ShowSpawnPoints)
@@ -207,14 +207,14 @@ namespace OpenRA.Mods.Common.Widgets
if (disabled)
{
Game.Renderer.RgbaSpriteRenderer.DrawSprite(spawnDisabled, pos - offset);
WidgetUtils.DrawSprite(spawnDisabled, pos - offset);
continue;
}
if (occupied)
WidgetUtils.FillEllipseWithColor(new Rectangle(pos.X - offset.X + 1, pos.Y - offset.Y + 1, (int)sprite.Size.X - 2, (int)sprite.Size.Y - 2), occupant.Color);
Game.Renderer.RgbaSpriteRenderer.DrawSprite(sprite, pos - offset);
WidgetUtils.DrawSprite(sprite, pos - offset);
var number = Convert.ToChar('A' + spawnPoints.IndexOf(p)).ToString();
var textOffset = spawnFont.Measure(number) / 2 + spawnLabelOffset;