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

Merge pull request #10148 from pchote/widelines

Browse Source 
Rewrite line renderer: Part 1 (improved lasers plus other cleanups)
This commit is contained in:
Matthias Mailänder
2015-12-13 20:55:54 +01:00
parent 0bde5bc294 92d0261005
commit 02c5c1bbfb
26 changed files with 332 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenRA.Mods.Common/Widgets/ResourceBarWidget.cs
View File

@@ -96,9 +96,11 @@ namespace OpenRA.Mods.Common.Widgets
}
}
else
Game.Renderer.LineRenderer.FillRect(new Rectangle(
b.X, (int)float2.Lerp(b.Bottom, b.Top, providedFrac),
b.Width, (int)(providedFrac * b.Height)), color);
{
var tl = new float2(b.X, (int)float2.Lerp(b.Bottom, b.Top, providedFrac));
var br = tl + new float2(b.Width, (int)(providedFrac * b.Height));
Game.Renderer.RgbaColorRenderer.FillRect(tl, br, color);
}
var x = (b.Left + b.Right - indicator.Size.X) / 2;
var y = float2.Lerp(b.Bottom, b.Top, usedFrac) - indicator.Size.Y / 2;
@@ -126,7 +128,11 @@ namespace OpenRA.Mods.Common.Widgets
}
}
else
Game.Renderer.LineRenderer.FillRect(new Rectangle(b.X, b.Y, (int)(providedFrac * b.Width), b.Height), color);
{
var tl = new float2(b.X, b.Y);
var br = tl + new float2((int)(providedFrac * b.Width), b.Height);
Game.Renderer.RgbaColorRenderer.FillRect(tl, br, color);
}
var x = float2.Lerp(b.Left, b.Right, usedFrac) - indicator.Size.X / 2;
var y = (b.Bottom + b.Top - indicator.Size.Y) / 2;