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

Show disabled HitShapes in gray

Browse Source 
Instead of disabling their debug overlay entirely.
This commit is contained in:
reaperrr
2021-05-30 20:54:33 +02:00
committed by Paul Chote
parent 7356f2506b
commit 6d55161043
7 changed files with 38 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
OpenRA.Mods.Common/HitShapes/Rectangle.cs
View File

@@ -14,6 +14,7 @@ using System.Collections.Generic;
using System.Linq;
using OpenRA.Graphics;
using OpenRA.Mods.Common.Graphics;
using OpenRA.Mods.Common.Traits;
using OpenRA.Primitives;
namespace OpenRA.Mods.Common.HitShapes
@@ -125,7 +126,7 @@ namespace OpenRA.Mods.Common.HitShapes
return DistanceFromEdge((pos - new WPos(origin.X, origin.Y, pos.Z)).Rotate(-orientation));
}
IEnumerable<IRenderable> IHitShape.RenderDebugOverlay(WorldRenderer wr, WPos origin, WRot orientation)
IEnumerable<IRenderable> IHitShape.RenderDebugOverlay(HitShape hs, WorldRenderer wr, WPos origin, WRot orientation)
{
orientation += WRot.FromYaw(LocalYaw);
@@ -134,11 +135,13 @@ namespace OpenRA.Mods.Common.HitShapes
var side1 = combatOverlayVertsSide1.Select(v => origin + v.Rotate(orientation)).ToArray();
var side2 = combatOverlayVertsSide2.Select(v => origin + v.Rotate(orientation)).ToArray();
yield return new PolygonAnnotationRenderable(vertsTop, origin, 1, Color.Yellow);
yield return new PolygonAnnotationRenderable(vertsBottom, origin, 1, Color.Yellow);
yield return new PolygonAnnotationRenderable(side1, origin, 1, Color.Yellow);
yield return new PolygonAnnotationRenderable(side2, origin, 1, Color.Yellow);
yield return new CircleAnnotationRenderable(origin, OuterRadius, 1, Color.LimeGreen);
var shapeColor = hs.IsTraitDisabled ? Color.LightGray : Color.Yellow;
yield return new PolygonAnnotationRenderable(vertsTop, origin, 1, shapeColor);
yield return new PolygonAnnotationRenderable(vertsBottom, origin, 1, shapeColor);
yield return new PolygonAnnotationRenderable(side1, origin, 1, shapeColor);
yield return new PolygonAnnotationRenderable(side2, origin, 1, shapeColor);
yield return new CircleAnnotationRenderable(origin, OuterRadius, 1, hs.IsTraitDisabled ? Color.Gray : Color.LimeGreen);
}
}
}