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

Fix docks clipping on shuttle nav (#36348)

Browse Source 
* Fix docks clipping on shuttle nav

UI scale casualty.

* review
This commit is contained in:
metalgearsloth
2025-04-13 16:29:05 +10:00
committed by GitHub
parent f7ad043239
commit 83aaa73f0e
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Client/Shuttles/UI/BaseShuttleControl.xaml.cs
View File

@@ -119,8 +119,6 @@ public partial class BaseShuttleControl : MapGridControl
protected void DrawGrid(DrawingHandleScreen handle, Matrix3x2 gridToView, Entity<MapGridComponent> grid, Color color, float alpha = 0.01f) protected void DrawGrid(DrawingHandleScreen handle, Matrix3x2 gridToView, Entity<MapGridComponent> grid, Color color, float alpha = 0.01f)
{ {
var rator = Maps.GetAllTilesEnumerator(grid.Owner, grid.Comp); var rator = Maps.GetAllTilesEnumerator(grid.Owner, grid.Comp);
var minimapScale = MinimapScale;
var midpoint = new Vector2(MidPoint, MidPoint);
var tileSize = grid.Comp.TileSize; var tileSize = grid.Comp.TileSize;
// Check if we even have data // Check if we even have data
@@ -263,9 +261,7 @@ public partial class BaseShuttleControl : MapGridControl
var edgeCount = totalData - gridData.EdgeIndex; var edgeCount = totalData - gridData.EdgeIndex;
Extensions.EnsureLength(ref _allVertices, totalData); Extensions.EnsureLength(ref _allVertices, totalData);
_drawJob.MidPoint = midpoint;
_drawJob.Matrix = gridToView; _drawJob.Matrix = gridToView;
_drawJob.MinimapScale = minimapScale;
_drawJob.Vertices = gridData.Vertices; _drawJob.Vertices = gridData.Vertices;
_drawJob.ScaledVertices = _allVertices; _drawJob.ScaledVertices = _allVertices;
@@ -288,8 +284,6 @@ public partial class BaseShuttleControl : MapGridControl
{ {
public int BatchSize => 64; public int BatchSize => 64;
public float MinimapScale;
public Vector2 MidPoint;
public Matrix3x2 Matrix; public Matrix3x2 Matrix;
public List<Vector2> Vertices; public List<Vector2> Vertices;

7
Content.Client/Shuttles/UI/ShuttleNavControl.xaml.cs
View File

@@ -303,7 +303,12 @@ public sealed partial class ShuttleNavControl : BaseShuttleControl
const float sqrt2 = 1.41421356f; const float sqrt2 = 1.41421356f;
const float dockRadius = DockScale * sqrt2; const float dockRadius = DockScale * sqrt2;
// Worst-case bounds used to cull a dock: // Worst-case bounds used to cull a dock:
Box2 viewBounds = new Box2(-dockRadius, -dockRadius, Size.X + dockRadius, Size.Y + dockRadius); Box2 viewBounds = new Box2(
-dockRadius * UIScale,
-dockRadius * UIScale,
(Size.X + dockRadius) * UIScale,
(Size.Y + dockRadius) * UIScale);
if (_docks.TryGetValue(nent, out var docks)) if (_docks.TryGetValue(nent, out var docks))
{ {
foreach (var state in docks) foreach (var state in docks)