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

Fix mapgrid rendering (#13642)

Browse Source
This commit is contained in:
metalgearsloth
2023-01-27 12:13:49 +11:00
committed by GitHub
parent 39ff49c9d6
commit 6f43a5d983
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -200,7 +200,7 @@ public sealed class RadarControl : Control
foreach (var grid in _mapManager.FindGridsIntersecting(mapPosition.MapId, foreach (var grid in _mapManager.FindGridsIntersecting(mapPosition.MapId,
new Box2(mapPosition.Position - MaxRadarRange, mapPosition.Position + MaxRadarRange))) new Box2(mapPosition.Position - MaxRadarRange, mapPosition.Position + MaxRadarRange)))
{ {
if (grid.Owner == ourGridId) if (grid.Owner == ourGridId || !fixturesQuery.TryGetComponent(grid.Owner, out var gridFixtures))
continue; continue;
var gridBody = bodyQuery.GetComponent(grid.Owner); var gridBody = bodyQuery.GetComponent(grid.Owner);
@@ -226,7 +226,6 @@ public sealed class RadarControl : Control
name = Loc.GetString("shuttle-console-unknown"); name = Loc.GetString("shuttle-console-unknown");
var gridXform = xformQuery.GetComponent(grid.Owner); var gridXform = xformQuery.GetComponent(grid.Owner);
var gridFixtures = fixturesQuery.GetComponent(grid.Owner);
var gridMatrix = gridXform.WorldMatrix; 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 ?? IFFComponent.IFFColor; var color = iff?.Color ?? IFFComponent.IFFColor;
@@ -350,7 +349,7 @@ public sealed class RadarControl : Control
private void DrawGrid(DrawingHandleScreen handle, Matrix3 matrix, FixturesComponent component, Color color) private void DrawGrid(DrawingHandleScreen handle, Matrix3 matrix, FixturesComponent component, Color color)
{ {
foreach (var (_, fixture) in component.Fixtures) foreach (var fixture in component.Fixtures.Values)
{ {
// If the fixture has any points out of range we won't draw any of it. // If the fixture has any points out of range we won't draw any of it.
var invalid = false; var invalid = false;