Add a debug visualization for screen map rectangles.
This commit is contained in:
@@ -212,6 +212,13 @@ namespace OpenRA.Graphics
|
|||||||
r.RenderDebugGeometry(this);
|
r.RenderDebugGeometry(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (debugVis.Value != null && debugVis.Value.ScreenMap)
|
||||||
|
foreach (var r in World.ScreenMap.ItemBounds(World.RenderPlayer))
|
||||||
|
Game.Renderer.WorldRgbaColorRenderer.DrawRect(
|
||||||
|
new float3(r.Left, r.Top, r.Bottom),
|
||||||
|
new float3(r.Right, r.Bottom, r.Bottom),
|
||||||
|
1 / Viewport.Zoom, Color.MediumSpringGreen);
|
||||||
|
|
||||||
Game.Renderer.Flush();
|
Game.Renderer.Flush();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -133,5 +133,7 @@ namespace OpenRA.Primitives
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public IEnumerable<Rectangle> ItemBounds { get { return itemBounds.Values; } }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ namespace OpenRA.Traits
|
|||||||
{
|
{
|
||||||
public bool CombatGeometry;
|
public bool CombatGeometry;
|
||||||
public bool RenderGeometry;
|
public bool RenderGeometry;
|
||||||
|
public bool ScreenMap;
|
||||||
public bool DepthBuffer;
|
public bool DepthBuffer;
|
||||||
public bool ActorTags;
|
public bool ActorTags;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -187,5 +187,13 @@ namespace OpenRA.Traits
|
|||||||
return NoFrozenActors;
|
return NoFrozenActors;
|
||||||
return partitionedFrozenActors[p].InBox(r).Where(frozenActorIsValid);
|
return partitionedFrozenActors[p].InBox(r).Where(frozenActorIsValid);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public IEnumerable<Rectangle> ItemBounds(Player viewer)
|
||||||
|
{
|
||||||
|
var bounds = partitionedActors.ItemBounds
|
||||||
|
.Concat(partitionedEffects.ItemBounds);
|
||||||
|
|
||||||
|
return viewer != null ? bounds.Concat(partitionedFrozenActors[viewer].ItemBounds) : bounds;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -11,6 +11,7 @@
|
|||||||
|
|
||||||
using System;
|
using System;
|
||||||
using OpenRA.Graphics;
|
using OpenRA.Graphics;
|
||||||
|
using OpenRA.Mods.Common.Traits;
|
||||||
using OpenRA.Traits;
|
using OpenRA.Traits;
|
||||||
|
|
||||||
namespace OpenRA.Mods.Common.Commands
|
namespace OpenRA.Mods.Common.Commands
|
||||||
@@ -21,12 +22,16 @@ namespace OpenRA.Mods.Common.Commands
|
|||||||
public class DebugVisualizationCommands : IChatCommand, IWorldLoaded
|
public class DebugVisualizationCommands : IChatCommand, IWorldLoaded
|
||||||
{
|
{
|
||||||
DebugVisualizations debugVis;
|
DebugVisualizations debugVis;
|
||||||
|
DeveloperMode devMode;
|
||||||
|
|
||||||
public void WorldLoaded(World w, WorldRenderer wr)
|
public void WorldLoaded(World w, WorldRenderer wr)
|
||||||
{
|
{
|
||||||
var world = w;
|
var world = w;
|
||||||
debugVis = world.WorldActor.TraitOrDefault<DebugVisualizations>();
|
debugVis = world.WorldActor.TraitOrDefault<DebugVisualizations>();
|
||||||
|
|
||||||
|
if (world.LocalPlayer != null)
|
||||||
|
devMode = world.LocalPlayer.PlayerActor.Trait<DeveloperMode>();
|
||||||
|
|
||||||
if (debugVis == null)
|
if (debugVis == null)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
@@ -41,6 +46,7 @@ namespace OpenRA.Mods.Common.Commands
|
|||||||
|
|
||||||
register("showcombatgeometry", "toggles combat geometry overlay.");
|
register("showcombatgeometry", "toggles combat geometry overlay.");
|
||||||
register("showrendergeometry", "toggles render geometry overlay.");
|
register("showrendergeometry", "toggles render geometry overlay.");
|
||||||
|
register("showscreenmap", "toggles screen map overlay.");
|
||||||
register("showdepthbuffer", "toggles depth buffer overlay.");
|
register("showdepthbuffer", "toggles depth buffer overlay.");
|
||||||
register("showactortags", "toggles actor tags overlay.");
|
register("showactortags", "toggles actor tags overlay.");
|
||||||
}
|
}
|
||||||
@@ -57,6 +63,11 @@ namespace OpenRA.Mods.Common.Commands
|
|||||||
debugVis.RenderGeometry ^= true;
|
debugVis.RenderGeometry ^= true;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case "showscreenmap":
|
||||||
|
if (devMode == null || devMode.Enabled)
|
||||||
|
debugVis.ScreenMap ^= true;
|
||||||
|
break;
|
||||||
|
|
||||||
case "showdepthbuffer":
|
case "showdepthbuffer":
|
||||||
debugVis.DepthBuffer ^= true;
|
debugVis.DepthBuffer ^= true;
|
||||||
break;
|
break;
|
||||||
|
|||||||
@@ -77,6 +77,14 @@ namespace OpenRA.Mods.Common.Widgets.Logic
|
|||||||
showGeometryCheckbox.OnClick = () => debugVis.RenderGeometry ^= true;
|
showGeometryCheckbox.OnClick = () => debugVis.RenderGeometry ^= true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var showScreenMapCheckbox = widget.GetOrNull<CheckboxWidget>("SHOW_SCREENMAP");
|
||||||
|
if (showScreenMapCheckbox != null)
|
||||||
|
{
|
||||||
|
showScreenMapCheckbox.Disabled = debugVis == null;
|
||||||
|
showScreenMapCheckbox.IsChecked = () => debugVis != null && debugVis.ScreenMap;
|
||||||
|
showScreenMapCheckbox.OnClick = () => debugVis.ScreenMap ^= true;
|
||||||
|
}
|
||||||
|
|
||||||
var terrainGeometryTrait = world.WorldActor.Trait<TerrainGeometryOverlay>();
|
var terrainGeometryTrait = world.WorldActor.Trait<TerrainGeometryOverlay>();
|
||||||
var showTerrainGeometryCheckbox = widget.GetOrNull<CheckboxWidget>("SHOW_TERRAIN_OVERLAY");
|
var showTerrainGeometryCheckbox = widget.GetOrNull<CheckboxWidget>("SHOW_TERRAIN_OVERLAY");
|
||||||
if (showTerrainGeometryCheckbox != null && terrainGeometryTrait != null)
|
if (showTerrainGeometryCheckbox != null && terrainGeometryTrait != null)
|
||||||
|
|||||||
@@ -122,4 +122,11 @@ Container@DEBUG_PANEL:
|
|||||||
Height: 20
|
Height: 20
|
||||||
Width: 200
|
Width: 200
|
||||||
Font: Regular
|
Font: Regular
|
||||||
Text: Show Terrain Geometry
|
Text: Show Terrain Geometry
|
||||||
|
Checkbox@SHOW_SCREENMAP:
|
||||||
|
X: 290
|
||||||
|
Y: 365
|
||||||
|
Height: 20
|
||||||
|
Width: 200
|
||||||
|
Font: Regular
|
||||||
|
Text: Show Screen Map
|
||||||
|
|||||||
@@ -128,3 +128,10 @@ Container@DEBUG_PANEL:
|
|||||||
Width: 200
|
Width: 200
|
||||||
Font: Regular
|
Font: Regular
|
||||||
Text: Show Terrain Geometry
|
Text: Show Terrain Geometry
|
||||||
|
Checkbox@SHOW_SCREENMAP:
|
||||||
|
X: 290
|
||||||
|
Y: 365
|
||||||
|
Height: 20
|
||||||
|
Width: 200
|
||||||
|
Font: Regular
|
||||||
|
Text: Show Screen Map
|
||||||
|
|||||||
@@ -135,3 +135,10 @@ Container@DEBUG_PANEL:
|
|||||||
Width: 200
|
Width: 200
|
||||||
Font: Regular
|
Font: Regular
|
||||||
Text: Show Terrain Geometry
|
Text: Show Terrain Geometry
|
||||||
|
Checkbox@SHOW_SCREENMAP:
|
||||||
|
X: 290
|
||||||
|
Y: 365
|
||||||
|
Height: 20
|
||||||
|
Width: 200
|
||||||
|
Font: Regular
|
||||||
|
Text: Show Screen Map
|
||||||
|
|||||||
Reference in New Issue
Block a user