Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix radar text & misc warnings (#17902)

Browse Source
This commit is contained in:
Leon Friedrich
2023-07-09 07:47:53 +12:00
committed by GitHub
parent 9051470354
commit bf90cec696
1 changed files with 23 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
Content.Client/Shuttles/UI/RadarControl.cs
View File

@@ -26,7 +26,7 @@ public sealed class RadarControl : MapGridControl
{ {
[Dependency] private readonly IEntityManager _entManager = default!; [Dependency] private readonly IEntityManager _entManager = default!;
[Dependency] private readonly IMapManager _mapManager = default!; [Dependency] private readonly IMapManager _mapManager = default!;
private SharedTransformSystem _transform = default!; private SharedTransformSystem _transform;
private const float GridLinesDistance = 32f; private const float GridLinesDistance = 32f;
@@ -166,26 +166,23 @@ public sealed class RadarControl : MapGridControl
var fixturesQuery = _entManager.GetEntityQuery<FixturesComponent>(); var fixturesQuery = _entManager.GetEntityQuery<FixturesComponent>();
var bodyQuery = _entManager.GetEntityQuery<PhysicsComponent>(); var bodyQuery = _entManager.GetEntityQuery<PhysicsComponent>();
var mapPosition = _coordinates.Value.ToMap(_entManager); if (!xformQuery.TryGetComponent(_coordinates.Value.EntityId, out var xform)
|| xform.MapID == MapId.Nullspace)
if (mapPosition.MapId == MapId.Nullspace || !xformQuery.TryGetComponent(_coordinates.Value.EntityId, out var xform))
{ {
Clear(); Clear();
return; return;
} }
var (pos, rot) = _transform.GetWorldPositionRotation(xform);
var offset = _coordinates.Value.Position; var offset = _coordinates.Value.Position;
var offsetMatrix = Matrix3.CreateInverseTransform( var offsetMatrix = Matrix3.CreateInverseTransform(pos, rot + _rotation.Value);
mapPosition.Position,
xform.WorldRotation + _rotation.Value);
// Draw our grid in detail // Draw our grid in detail
var ourGridId = _coordinates.Value.GetGridUid(_entManager); var ourGridId = xform.GridUid;
if (_entManager.TryGetComponent<MapGridComponent>(ourGridId, out var ourGrid) && if (_entManager.TryGetComponent<MapGridComponent>(ourGridId, out var ourGrid) &&
fixturesQuery.TryGetComponent(ourGridId, out var ourFixturesComp)) fixturesQuery.HasComponent(ourGridId.Value))
{ {
var ourGridMatrix = xformQuery.GetComponent(ourGridId.Value).WorldMatrix; var ourGridMatrix = _transform.GetWorldMatrix(ourGridId.Value);
Matrix3.Multiply(in ourGridMatrix, in offsetMatrix, out var matrix); Matrix3.Multiply(in ourGridMatrix, in offsetMatrix, out var matrix);
DrawGrid(handle, matrix, ourGrid, Color.MediumSpringGreen, true); DrawGrid(handle, matrix, ourGrid, Color.MediumSpringGreen, true);
@@ -202,20 +199,21 @@ public sealed class RadarControl : MapGridControl
var shown = new HashSet<EntityUid>(); var shown = new HashSet<EntityUid>();
// Draw other grids... differently // Draw other grids... differently
foreach (var grid in _mapManager.FindGridsIntersecting(mapPosition.MapId, foreach (var grid in _mapManager.FindGridsIntersecting(xform.MapID,
new Box2(mapPosition.Position - MaxRadarRangeVector, mapPosition.Position + MaxRadarRangeVector))) new Box2(pos - MaxRadarRangeVector, pos + MaxRadarRangeVector)))
{ {
if (grid.Owner == ourGridId || !fixturesQuery.TryGetComponent(grid.Owner, out var fixturesComp)) var gUid = grid.Owner;
if (gUid == ourGridId || !fixturesQuery.HasComponent(gUid))
continue; continue;
var gridBody = bodyQuery.GetComponent(grid.Owner); var gridBody = bodyQuery.GetComponent(gUid);
if (gridBody.Mass < 10f) if (gridBody.Mass < 10f)
{ {
ClearLabel(grid.Owner); ClearLabel(gUid);
continue; continue;
} }
_entManager.TryGetComponent<IFFComponent>(grid.Owner, out var iff); _entManager.TryGetComponent<IFFComponent>(gUid, out var iff);
// Hide it entirely. // Hide it entirely.
if (iff != null && if (iff != null &&
@@ -224,14 +222,13 @@ public sealed class RadarControl : MapGridControl
continue; continue;
} }
shown.Add(grid.Owner); shown.Add(gUid);
var name = metaQuery.GetComponent(grid.Owner).EntityName; var name = metaQuery.GetComponent(gUid).EntityName;
if (name == string.Empty) if (name == string.Empty)
name = Loc.GetString("shuttle-console-unknown"); name = Loc.GetString("shuttle-console-unknown");
var gridXform = xformQuery.GetComponent(grid.Owner); var gridMatrix = _transform.GetWorldMatrix(gUid);
var gridMatrix = gridXform.WorldMatrix;
Matrix3.Multiply(in gridMatrix, in offsetMatrix, out var matty); Matrix3.Multiply(in gridMatrix, in offsetMatrix, out var matty);
var color = iff?.Color ?? Color.Gold; var color = iff?.Color ?? Color.Gold;
@@ -246,14 +243,14 @@ public sealed class RadarControl : MapGridControl
var gridBounds = grid.LocalAABB; var gridBounds = grid.LocalAABB;
Label label; Label label;
if (!_iffControls.TryGetValue(grid.Owner, out var control)) if (!_iffControls.TryGetValue(gUid, out var control))
{ {
label = new Label() label = new Label()
{ {
HorizontalAlignment = HAlignment.Left, HorizontalAlignment = HAlignment.Left,
}; };
_iffControls[grid.Owner] = label; _iffControls[gUid] = label;
AddChild(label); AddChild(label);
} }
else else
@@ -264,7 +261,7 @@ public sealed class RadarControl : MapGridControl
label.FontColorOverride = color; label.FontColorOverride = color;
var gridCentre = matty.Transform(gridBody.LocalCenter); var gridCentre = matty.Transform(gridBody.LocalCenter);
gridCentre.Y = -gridCentre.Y; gridCentre.Y = -gridCentre.Y;
var distance = gridCentre.Length; var distance = gridCentre.Length();
// y-offset the control to always render below the grid (vertically) // y-offset the control to always render below the grid (vertically)
var yOffset = Math.Max(gridBounds.Height, gridBounds.Width) * MinimapScale / 1.8f / UIScale; var yOffset = Math.Max(gridBounds.Height, gridBounds.Width) * MinimapScale / 1.8f / UIScale;
@@ -283,13 +280,13 @@ public sealed class RadarControl : MapGridControl
} }
else else
{ {
ClearLabel(grid.Owner); ClearLabel(gUid);
} }
// Detailed view // Detailed view
DrawGrid(handle, matty, grid, color, true); DrawGrid(handle, matty, grid, color, true);
DrawDocks(handle, grid.Owner, matty); DrawDocks(handle, gUid, matty);
} }
foreach (var (ent, _) in _iffControls) foreach (var (ent, _) in _iffControls)