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

Ensure TargetLineRenderable width and marker size don't get lost.

Browse Source 
By making the constructor take non-optional parameters, this highlights some calls sites which were forgetting to set these values. These are now fixed.

Set the path debug to have a marker size of 2 for better visibility.
This commit is contained in:
RoosterDragon
2021-09-25 12:57:27 +01:00
committed by Paul Chote
parent 9d4d4bb924
commit 3a7aeb5324
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Game/Graphics/TargetLineRenderable.cs
View File

@@ -22,7 +22,7 @@ namespace OpenRA.Graphics
readonly int width; readonly int width;
readonly int markerSize; readonly int markerSize;
public TargetLineRenderable(IEnumerable<WPos> waypoints, Color color, int width = 1, int markerSize = 1) public TargetLineRenderable(IEnumerable<WPos> waypoints, Color color, int width, int markerSize)
{ {
this.waypoints = waypoints; this.waypoints = waypoints;
this.color = color; this.color = color;
@@ -34,13 +34,13 @@ namespace OpenRA.Graphics
public int ZOffset => 0; public int ZOffset => 0;
public bool IsDecoration => true; public bool IsDecoration => true;
public IRenderable WithZOffset(int newOffset) { return new TargetLineRenderable(waypoints, color); } public IRenderable WithZOffset(int newOffset) { return this; }
public IRenderable OffsetBy(in WVec vec) public IRenderable OffsetBy(in WVec vec)
{ {
// Lambdas can't use 'in' variables, so capture a copy for later // Lambdas can't use 'in' variables, so capture a copy for later
var offset = vec; var offset = vec;
return new TargetLineRenderable(waypoints.Select(w => w + offset), color); return new TargetLineRenderable(waypoints.Select(w => w + offset), color, width, markerSize);
} }
public IRenderable AsDecoration() { return this; } public IRenderable AsDecoration() { return this; }

2
OpenRA.Mods.Common/Effects/RallyPointIndicator.cs
View File

@@ -123,7 +123,7 @@ namespace OpenRA.Mods.Common.Effects
{ {
var targetLine = new[] { prev, pos }; var targetLine = new[] { prev, pos };
prev = pos; prev = pos;
yield return new TargetLineRenderable(targetLine, building.Owner.Color, rp.Info.LineWidth); yield return new TargetLineRenderable(targetLine, building.Owner.Color, rp.Info.LineWidth, 1);
} }
} }
} }

2
OpenRA.Mods.Common/Traits/Render/SelectionDecorationsBase.cs
View File

@@ -94,7 +94,7 @@ namespace OpenRA.Mods.Common.Traits.Render
yield return r; yield return r;
if (selected && self.World.LocalPlayer != null && self.World.LocalPlayer.PlayerActor.Trait<DeveloperMode>().PathDebug) if (selected && self.World.LocalPlayer != null && self.World.LocalPlayer.PlayerActor.Trait<DeveloperMode>().PathDebug)
yield return new TargetLineRenderable(ActivityTargetPath(self), Color.Green); yield return new TargetLineRenderable(ActivityTargetPath(self), Color.Green, 1, 2);
// Hide decorations for spectators that zoom out further than the normal minimum level // Hide decorations for spectators that zoom out further than the normal minimum level
// This avoids graphical glitches with pip rows and icons overlapping the selection box // This avoids graphical glitches with pip rows and icons overlapping the selection box