tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add doors to the station map (#23639)

Browse Source 
* Add doors to the navmap

* tweaksies

* gah

* draw primitive

* draw primitive? at least take me out to dinner first!

* Update Content.Client/Pinpointer/UI/NavMapControl.cs

* casualties

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
This commit is contained in:
Nemanja
2024-01-11 08:14:20 -05:00
committed by GitHub
parent 801f141c6a
commit 1886941da6
12 changed files with 140 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
Content.Client/Pinpointer/UI/NavMapControl.cs
View File

@@ -25,7 +25,7 @@ namespace Content.Client.Pinpointer.UI;
public partial class NavMapControl : MapGridControl
{
[Dependency] private readonly IEntityManager _entManager = default!;
private readonly SharedTransformSystem _transformSystem = default!;
private readonly SharedTransformSystem _transformSystem;
public EntityUid? Owner;
public EntityUid? MapUid;
@@ -37,7 +37,7 @@ public partial class NavMapControl : MapGridControl
// Tracked data
public Dictionary<EntityCoordinates, (bool Visible, Color Color)> TrackedCoordinates = new();
public Dictionary<NetEntity, NavMapBlip> TrackedEntities = new();
public Dictionary<Vector2i, List<NavMapLine>> TileGrid = default!;
public Dictionary<Vector2i, List<NavMapLine>>? TileGrid = default!;
// Default colors
public Color WallColor = new(102, 217, 102);
@@ -207,7 +207,6 @@ public partial class NavMapControl : MapGridControl
// Find closest tracked entity in range
var closestEntity = NetEntity.Invalid;
var closestCoords = new EntityCoordinates();
var closestDistance = float.PositiveInfinity;
foreach ((var currentEntity, var blip) in TrackedEntities)
@@ -221,7 +220,6 @@ public partial class NavMapControl : MapGridControl
continue;
closestEntity = currentEntity;
closestCoords = blip.Coordinates;
closestDistance = currentDistance;
}
@@ -234,8 +232,7 @@ public partial class NavMapControl : MapGridControl
else if (args.Function == EngineKeyFunctions.UIRightClick)
{
// Clear current selection with right click
if (TrackedEntitySelectedAction != null)
TrackedEntitySelectedAction.Invoke(null);
TrackedEntitySelectedAction?.Invoke(null);
}
}
@@ -260,7 +257,7 @@ public partial class NavMapControl : MapGridControl
{
base.Draw(handle);
// Get the components necessary for drawing the navmap
// Get the components necessary for drawing the navmap
_entManager.TryGetComponent(MapUid, out _navMap);
_entManager.TryGetComponent(MapUid, out _grid);
_entManager.TryGetComponent(MapUid, out _xform);
@@ -318,7 +315,7 @@ public partial class NavMapControl : MapGridControl
var area = new Box2(-WorldRange, -WorldRange, WorldRange + 1f, WorldRange + 1f).Translated(offset);
// Drawing lines can be rather expensive due to the number of neighbors that need to be checked in order
// Drawing lines can be rather expensive due to the number of neighbors that need to be checked in order
// to figure out where they should be drawn. However, we don't *need* to do check these every frame.
// Instead, lets periodically update where to draw each line and then store these points in a list.
// Then we can just run through the list each frame and draw the lines without any extra computation.
@@ -360,6 +357,41 @@ public partial class NavMapControl : MapGridControl
}
}
var airlockBuffer = Vector2.One * (MinimapScale / 2.25f) * 0.75f;
var airlockLines = new ValueList<Vector2>();
var foobarVec = new Vector2(1, -1);
foreach (var airlock in _navMap.Airlocks)
{
var position = airlock.Position - offset;
position = Scale(position with { Y = -position.Y });
airlockLines.Add(position + airlockBuffer);
airlockLines.Add(position - airlockBuffer * foobarVec);
airlockLines.Add(position + airlockBuffer);
airlockLines.Add(position + airlockBuffer * foobarVec);
airlockLines.Add(position - airlockBuffer);
airlockLines.Add(position + airlockBuffer * foobarVec);
airlockLines.Add(position - airlockBuffer);
airlockLines.Add(position - airlockBuffer * foobarVec);
airlockLines.Add(position + airlockBuffer * -Vector2.UnitY);
airlockLines.Add(position - airlockBuffer * -Vector2.UnitY);
}
if (airlockLines.Count > 0)
{
if (!_sRGBLookUp.TryGetValue(WallColor, out var sRGB))
{
sRGB = Color.ToSrgb(WallColor);
_sRGBLookUp[WallColor] = sRGB;
}
handle.DrawPrimitives(DrawPrimitiveTopology.LineList, airlockLines.Span, sRGB);
}
if (PostWallDrawingAction != null)
PostWallDrawingAction.Invoke(handle);