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

Fix the mass scanner ui (#7012)

Browse Source
This commit is contained in:
Radrark
2022-03-07 04:04:26 -03:00
committed by GitHub
parent 01624e8e8d
commit 718ba1158b
2 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
Content.Client/Radar/RadarConsoleWindow.xaml.cs
View File

@@ -34,15 +34,16 @@ public sealed partial class RadarConsoleWindow : DefaultWindow, IComputerWindow<
public sealed class RadarControl : Control public sealed class RadarControl : Control
{ {
private float _radarArea = 256f; private const int MinimapRadius = 256;
private const int MinimapMargin = 4;
private float RadarCircleRadius => MathF.Max(0, _radarArea - 8) / 2; private const float GridLinesDistance = 32f;
private float _radarRange = 256f;
private RadarConsoleBoundInterfaceState _lastState = new(256f, Array.Empty<RadarObjectData>()); private RadarConsoleBoundInterfaceState _lastState = new(256f, Array.Empty<RadarObjectData>());
private float SizeFull => (int) (_radarArea * UIScale); private int SizeFull => (int) ((MinimapRadius + MinimapMargin) * 2 * UIScale);
private int ScaledMinimapRadius => (int) (MinimapRadius * UIScale);
public int RadiusCircle => (int) (RadarCircleRadius * UIScale); private float MinimapScale => _radarRange != 0 ? ScaledMinimapRadius / _radarRange : 0f;
public RadarControl() public RadarControl()
{ {
@@ -51,10 +52,9 @@ public sealed class RadarControl : Control
public void UpdateState(RadarConsoleBoundInterfaceState ls) public void UpdateState(RadarConsoleBoundInterfaceState ls)
{ {
if (!_radarArea.Equals(ls.Range * 2)) if (!_radarRange.Equals(ls.Range))
{ {
_radarArea = ls.Range * 2; _radarRange = ls.Range;
MinSize = (SizeFull, SizeFull);
} }
_lastState = ls; _lastState = ls;
@@ -66,20 +66,20 @@ public sealed class RadarControl : Control
var fakeAA = new Color(0.08f, 0.08f, 0.08f); var fakeAA = new Color(0.08f, 0.08f, 0.08f);
var gridLines = new Color(0.08f, 0.08f, 0.08f); var gridLines = new Color(0.08f, 0.08f, 0.08f);
var gridLinesRadial = 8; var gridLinesRadial = 8;
var gridLinesEquatorial = 8; var gridLinesEquatorial = (int) Math.Floor(_radarRange / GridLinesDistance);
handle.DrawCircle((point, point), RadiusCircle + 1, fakeAA); handle.DrawCircle((point, point), ScaledMinimapRadius + 1, fakeAA);
handle.DrawCircle((point, point), RadiusCircle, Color.Black); handle.DrawCircle((point, point), ScaledMinimapRadius, Color.Black);
for (var i = 0; i < gridLinesEquatorial; i++) for (var i = 1; i < gridLinesEquatorial + 1; i++)
{ {
handle.DrawCircle((point, point), (RadiusCircle / gridLinesEquatorial) * i, gridLines, false); handle.DrawCircle((point, point), GridLinesDistance * MinimapScale * i, gridLines, false);
} }
for (var i = 0; i < gridLinesRadial; i++) for (var i = 0; i < gridLinesRadial; i++)
{ {
Angle angle = (Math.PI / gridLinesRadial) * i; Angle angle = (Math.PI / gridLinesRadial) * i;
var aExtent = angle.ToVec() * RadiusCircle; var aExtent = angle.ToVec() * ScaledMinimapRadius;
handle.DrawLine((point, point) - aExtent, (point, point) + aExtent, gridLines); handle.DrawLine((point, point) - aExtent, (point, point) + aExtent, gridLines);
} }
@@ -88,7 +88,10 @@ public sealed class RadarControl : Control
foreach (var obj in _lastState.Objects) foreach (var obj in _lastState.Objects)
{ {
if (obj.Position.Length > RadiusCircle - 24) var minimapPos = obj.Position * MinimapScale;
var radius = obj.Radius * MinimapScale;
if (minimapPos.Length + radius > ScaledMinimapRadius)
continue; continue;
switch (obj.Shape) switch (obj.Shape)
@@ -96,7 +99,7 @@ public sealed class RadarControl : Control
case RadarObjectShape.CircleFilled: case RadarObjectShape.CircleFilled:
case RadarObjectShape.Circle: case RadarObjectShape.Circle:
{ {
handle.DrawCircle(obj.Position + point, obj.Radius, obj.Color, obj.Shape == RadarObjectShape.CircleFilled); handle.DrawCircle(minimapPos + point, radius, obj.Color, obj.Shape == RadarObjectShape.CircleFilled);
break; break;
} }
default: default:

2
Content.Server/Radar/RadarConsoleSystem.cs
View File

@@ -32,7 +32,7 @@ public sealed class RadarConsoleSystem : EntitySystem
{ {
var s = component.Owner.GetUIOrNull(RadarConsoleUiKey.Key); var s = component.Owner.GetUIOrNull(RadarConsoleUiKey.Key);
if (s is null) if (s is null || s.SubscribedSessions.Count == 0)
continue; continue;
var (radarPos, _, radarInvMatrix) = xform.GetWorldPositionRotationInvMatrix(); var (radarPos, _, radarInvMatrix) = xform.GetWorldPositionRotationInvMatrix();