diff --git a/OpenRA.Game/Graphics/SelectionBarsRenderable.cs b/OpenRA.Game/Graphics/SelectionBarsRenderable.cs index 2b6e63fd62..cd34202801 100644 --- a/OpenRA.Game/Graphics/SelectionBarsRenderable.cs +++ b/OpenRA.Game/Graphics/SelectionBarsRenderable.cs @@ -48,21 +48,22 @@ namespace OpenRA.Graphics public IRenderable OffsetBy(WVec vec) { return new SelectionBarsRenderable(pos + vec, actor); } public IRenderable AsDecoration() { return this; } - void DrawExtraBars(WorldRenderer wr, float2 start, float2 end) + void DrawExtraBars(WorldRenderer wr, float3 start, float3 end) { foreach (var extraBar in actor.TraitsImplementing()) { var value = extraBar.GetValue(); if (value != 0 || extraBar.DisplayWhenEmpty) { - start.Y += (int)(4 / wr.Viewport.Zoom); - end.Y += (int)(4 / wr.Viewport.Zoom); + var offset = new float3(0, (int)(4 / wr.Viewport.Zoom), 0); + start += offset; + end += offset; DrawSelectionBar(wr, start, end, extraBar.GetValue(), extraBar.GetColor()); } } } - void DrawSelectionBar(WorldRenderer wr, float2 start, float2 end, float value, Color barColor) + void DrawSelectionBar(WorldRenderer wr, float3 start, float3 end, float value, Color barColor) { var iz = 1 / wr.Viewport.Zoom; var c = Color.FromArgb(128, 30, 30, 30); @@ -73,7 +74,7 @@ namespace OpenRA.Graphics var barColor2 = Color.FromArgb(255, barColor.R / 2, barColor.G / 2, barColor.B / 2); - var z = float2.Lerp(start, end, value); + var z = float3.Lerp(start, end, value); var wcr = Game.Renderer.WorldRgbaColorRenderer; wcr.DrawLine(start + p, end + p, iz, c); wcr.DrawLine(start + q, end + q, iz, c2); @@ -93,7 +94,7 @@ namespace OpenRA.Graphics health.DamageState == DamageState.Heavy ? Color.Yellow : Color.LimeGreen; } - void DrawHealthBar(WorldRenderer wr, IHealth health, float2 start, float2 end) + void DrawHealthBar(WorldRenderer wr, IHealth health, float3 start, float3 end) { if (health == null || health.IsDead) return; @@ -112,7 +113,7 @@ namespace OpenRA.Graphics healthColor.G / 2, healthColor.B / 2); - var z = float2.Lerp(start, end, (float)health.HP / health.MaxHP); + var z = float3.Lerp(start, end, (float)health.HP / health.MaxHP); var wcr = Game.Renderer.WorldRgbaColorRenderer; wcr.DrawLine(start + p, end + p, iz, c); @@ -131,7 +132,7 @@ namespace OpenRA.Graphics deltaColor.R / 2, deltaColor.G / 2, deltaColor.B / 2); - var zz = float2.Lerp(start, end, (float)health.DisplayHP / health.MaxHP); + var zz = float3.Lerp(start, end, (float)health.DisplayHP / health.MaxHP); wcr.DrawLine(z + p, zz + p, iz, deltaColor2); wcr.DrawLine(z + q, zz + q, iz, deltaColor); @@ -147,12 +148,12 @@ namespace OpenRA.Graphics var health = actor.TraitOrDefault(); - var screenPos = wr.ScreenPxPosition(pos); + var screenPos = wr.Screen3DPxPosition(pos); var bounds = actor.VisualBounds; - bounds.Offset(screenPos.X, screenPos.Y); + bounds.Offset((int)screenPos.X, (int)screenPos.Y); - var start = new float2(bounds.Left + 1, bounds.Top); - var end = new float2(bounds.Right - 1, bounds.Top); + var start = new float3(bounds.Left + 1, bounds.Top, screenPos.Z); + var end = new float3(bounds.Right - 1, bounds.Top, screenPos.Z); if (DisplayHealth) DrawHealthBar(wr, health, start, end); diff --git a/OpenRA.Game/Graphics/TargetLineRenderable.cs b/OpenRA.Game/Graphics/TargetLineRenderable.cs index 3cb6f3eaca..6d449b3c42 100644 --- a/OpenRA.Game/Graphics/TargetLineRenderable.cs +++ b/OpenRA.Game/Graphics/TargetLineRenderable.cs @@ -43,9 +43,9 @@ namespace OpenRA.Graphics return; var iz = 1 / wr.Viewport.Zoom; - var first = wr.ScreenPxPosition(waypoints.First()); + var first = wr.Screen3DPosition(waypoints.First()); var a = first; - foreach (var b in waypoints.Skip(1).Select(pos => wr.ScreenPxPosition(pos))) + foreach (var b in waypoints.Skip(1).Select(pos => wr.Screen3DPosition(pos))) { Game.Renderer.WorldRgbaColorRenderer.DrawLine(a, b, iz, color); DrawTargetMarker(wr, color, b); diff --git a/OpenRA.Game/Primitives/float3.cs b/OpenRA.Game/Primitives/float3.cs index 3012076471..a2b5047d1e 100644 --- a/OpenRA.Game/Primitives/float3.cs +++ b/OpenRA.Game/Primitives/float3.cs @@ -37,6 +37,14 @@ namespace OpenRA public static float3 operator /(float3 a, float3 b) { return new float3(a.X / b.X, a.Y / b.Y, a.Z / b.Z); } public static float3 operator /(float3 a, float b) { return new float3(a.X / b, a.Y / b, a.Z / b); } + public static float3 Lerp(float3 a, float3 b, float t) + { + return new float3( + float2.Lerp(a.X, b.X, t), + float2.Lerp(a.Y, b.Y, t), + float2.Lerp(a.Z, b.Z, t)); + } + public static bool operator ==(float3 me, float3 other) { return me.X == other.X && me.Y == other.Y && me.Z == other.Z; } public static bool operator !=(float3 me, float3 other) { return !(me == other); } public override int GetHashCode() { return X.GetHashCode() ^ Y.GetHashCode() ^ Z.GetHashCode(); } diff --git a/OpenRA.Mods.Common/Graphics/DetectionCircleRenderable.cs b/OpenRA.Mods.Common/Graphics/DetectionCircleRenderable.cs index 464e1c8f6d..bbd8c0679d 100644 --- a/OpenRA.Mods.Common/Graphics/DetectionCircleRenderable.cs +++ b/OpenRA.Mods.Common/Graphics/DetectionCircleRenderable.cs @@ -67,13 +67,13 @@ namespace OpenRA.Mods.Common.Graphics public void Render(WorldRenderer wr) { var wcr = Game.Renderer.WorldRgbaColorRenderer; - var center = wr.ScreenPosition(centerPosition); + var center = wr.Screen3DPosition(centerPosition); for (var i = 0; i < trailCount; i++) { var angle = trailAngle - new WAngle(i * (trailSeparation.Angle <= 512 ? 1 : -1)); var length = radius.Length * new WVec(angle.Cos(), angle.Sin(), 0) / 1024; - var end = wr.ScreenPosition(centerPosition + length); + var end = wr.Screen3DPosition(centerPosition + length); var alpha = color.A - i * color.A / trailCount; wcr.DrawLine(center, end, 3, Color.FromArgb(alpha, contrastColor)); diff --git a/OpenRA.Mods.Common/Graphics/RangeCircleRenderable.cs b/OpenRA.Mods.Common/Graphics/RangeCircleRenderable.cs index 1df4fa3e5d..e45a018191 100644 --- a/OpenRA.Mods.Common/Graphics/RangeCircleRenderable.cs +++ b/OpenRA.Mods.Common/Graphics/RangeCircleRenderable.cs @@ -58,8 +58,8 @@ namespace OpenRA.Mods.Common.Graphics var offset = new WVec(radius.Length, 0, 0); for (var i = 0; i < RangeCircleSegments; i++) { - var a = wr.ScreenPosition(centerPosition + offset.Rotate(RangeCircleStartRotations[i])); - var b = wr.ScreenPosition(centerPosition + offset.Rotate(RangeCircleEndRotations[i])); + var a = wr.Screen3DPosition(centerPosition + offset.Rotate(RangeCircleStartRotations[i])); + var b = wr.Screen3DPosition(centerPosition + offset.Rotate(RangeCircleEndRotations[i])); if (contrastWidth > 0) wcr.DrawLine(a, b, contrastWidth / wr.Viewport.Zoom, contrastColor); diff --git a/OpenRA.Mods.Common/Graphics/SelectionBoxRenderable.cs b/OpenRA.Mods.Common/Graphics/SelectionBoxRenderable.cs index 736e902fec..1cb44f6ed4 100644 --- a/OpenRA.Mods.Common/Graphics/SelectionBoxRenderable.cs +++ b/OpenRA.Mods.Common/Graphics/SelectionBoxRenderable.cs @@ -45,11 +45,11 @@ namespace OpenRA.Mods.Common.Graphics public void Render(WorldRenderer wr) { var iz = 1 / wr.Viewport.Zoom; - var screenPos = wr.ScreenPxPosition(pos); + var screenPos = wr.Screen3DPxPosition(pos); var tl = screenPos + new float2(visualBounds.Left, visualBounds.Top); var br = screenPos + new float2(visualBounds.Right, visualBounds.Bottom); - var tr = new float2(br.X, tl.Y); - var bl = new float2(tl.X, br.Y); + var tr = new float3(br.X, tl.Y, screenPos.Z); + var bl = new float3(tl.X, br.Y, screenPos.Z); var u = new float2(4 * iz, 0); var v = new float2(0, 4 * iz);