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

- fix: engine update fix
Some checks failed
Build & Test Map Renderer / build (ubuntu-latest) (push) Has been cancelled
Details
Build & Test Debug / build (ubuntu-latest) (push) Has been cancelled
Details
Check Merge Conflicts / Label (push) Has been cancelled
Details
Test Packaging / Test Packaging (push) Has been cancelled
Details
RGA schema validator / YAML RGA schema validator (push) Has been cancelled
Details
Map file schema validator / YAML map schema validator (push) Has been cancelled
Details
YAML Linter / YAML Linter (push) Has been cancelled
Details
Build & Test Map Renderer / Build & Test Debug (push) Has been cancelled
Details
Build & Test Debug / Build & Test Debug (push) Has been cancelled
Details
Benchmarks / Run Benchmarks (push) Has been cancelled
Details
Update Contrib and Patreons in credits / get_credits (push) Has been cancelled
Details
Build & Publish Docfx / docfx (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Cinka
2026-02-01 14:47:44 +03:00
parent 0026c52592
commit f02cc9cb87
66 changed files with 122 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Client/Shuttles/UI/ShuttleDockControl.xaml.cs
View File

@@ -108,8 +108,8 @@ public sealed partial class ShuttleDockControl : BaseShuttleControl
var gridNent = EntManager.GetNetEntity(GridEntity);
var mapPos = _xformSystem.ToMapCoordinates(_coordinates.Value);
var ourGridMatrix = _xformSystem.GetWorldMatrix(gridXform.Owner);
var dockMatrix = Matrix3.CreateTransform(_coordinates.Value.Position, Angle.Zero);
Matrix3.Multiply(dockMatrix, ourGridMatrix, out var offsetMatrix);
var dockMatrix = Matrix3Helpers.CreateTransform(_coordinates.Value.Position, Angle.Zero);
ContentMathHelper.Multiply(dockMatrix, ourGridMatrix, out var offsetMatrix);
offsetMatrix = offsetMatrix.Invert();
@@ -137,7 +137,7 @@ public sealed partial class ShuttleDockControl : BaseShuttleControl
continue;
var gridMatrix = _xformSystem.GetWorldMatrix(grid.Owner);
Matrix3.Multiply(in gridMatrix, in offsetMatrix, out var matty);
ContentMathHelper.Multiply(gridMatrix, offsetMatrix, out var matty);
var color = _shuttles.GetIFFColor(grid.Owner, grid.Owner == GridEntity, component: iffComp);
DrawGrid(handle, matty, grid, color);
@@ -153,7 +153,7 @@ public sealed partial class ShuttleDockControl : BaseShuttleControl
var position = matty.Transform(dock.Coordinates.Position);
var otherDockRotation = Matrix3.CreateRotation(dock.Angle);
var otherDockRotation = Matrix3Helpers.CreateRotation(dock.Angle);
var scaledPos = ScalePosition(position with {Y = -position.Y});
if (!controlBounds.Contains(scaledPos.Floored()))
@@ -308,7 +308,7 @@ public sealed partial class ShuttleDockControl : BaseShuttleControl
// Draw the dock's collision
var invertedPosition = Vector2.Zero;
invertedPosition.Y = -invertedPosition.Y;
var rotation = Matrix3.CreateRotation(-_angle.Value + MathF.PI);
var rotation = Matrix3Helpers.CreateRotation(-_angle.Value + MathF.PI);
var ourDockConnection = new UIBox2(
ScalePosition(rotation.Transform(new Vector2(-0.2f, -0.7f))),
ScalePosition(rotation.Transform(new Vector2(0.2f, -0.5f))));

4
Content.Client/Shuttles/UI/ShuttleMapControl.xaml.cs
View File

@@ -114,7 +114,7 @@ public sealed partial class ShuttleMapControl : BaseShuttleControl
var beaconsOnly = EntManager.TryGetComponent(mapUid, out FTLDestinationComponent? destComp) &&
destComp.BeaconsOnly;
var mapTransform = Matrix3.CreateInverseTransform(Offset, Angle.Zero);
var mapTransform = Matrix3Helpers.CreateInverseTransform(Offset, Angle.Zero);
if (beaconsOnly && TryGetBeacon(_beacons, mapTransform, args.RelativePixelPosition, PixelRect, out var foundBeacon, out _))
{
@@ -250,7 +250,7 @@ public sealed partial class ShuttleMapControl : BaseShuttleControl
DrawParallax(handle);
var viewedMapUid = _mapManager.GetMapEntityId(ViewingMap);
var matty = Matrix3.CreateInverseTransform(Offset, Angle.Zero);
var matty = Matrix3Helpers.CreateInverseTransform(Offset, Angle.Zero);
var realTime = _timing.RealTime;
var viewBox = new Box2(Offset - WorldRangeVector, Offset + WorldRangeVector);
var viewportObjects = GetViewportMapObjects(matty, mapObjects);

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

@@ -137,9 +137,9 @@ public sealed partial class ShuttleNavControl : BaseShuttleControl
var mapPos = _transform.ToMapCoordinates(_coordinates.Value);
var offset = _coordinates.Value.Position;
var posMatrix = Matrix3.CreateTransform(offset, _rotation.Value);
var posMatrix = Matrix3Helpers.CreateTransform(offset, _rotation.Value);
var (_, ourEntRot, ourEntMatrix) = _transform.GetWorldPositionRotationMatrix(_coordinates.Value.EntityId);
Matrix3.Multiply(posMatrix, ourEntMatrix, out var ourWorldMatrix);
ContentMathHelper.Multiply(posMatrix, ourEntMatrix, out var ourWorldMatrix);
var ourWorldMatrixInvert = ourWorldMatrix.Invert();
// Draw our grid in detail
@@ -148,7 +148,7 @@ public sealed partial class ShuttleNavControl : BaseShuttleControl
fixturesQuery.HasComponent(ourGridId.Value))
{
var ourGridMatrix = _transform.GetWorldMatrix(ourGridId.Value);
Matrix3.Multiply(in ourGridMatrix, in ourWorldMatrixInvert, out var matrix);
ContentMathHelper.Multiply(ourGridMatrix, ourWorldMatrixInvert, out var matrix);
var color = _shuttles.GetIFFColor(ourGridId.Value, self: true);
DrawGrid(handle, matrix, (ourGridId.Value, ourGrid), color);
@@ -194,7 +194,7 @@ public sealed partial class ShuttleNavControl : BaseShuttleControl
continue;
var gridMatrix = _transform.GetWorldMatrix(gUid);
Matrix3.Multiply(in gridMatrix, in ourWorldMatrixInvert, out var matty);
ContentMathHelper.Multiply(gridMatrix, ourWorldMatrixInvert, out var matty);
var color = _shuttles.GetIFFColor(grid, self: false, iff);
// Others default: