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

Cleanup warnings: Use TransformSystem for anchoring (#39778)

Browse Source 
* Cleanup

* Bonus

* I hope this helps

* Revert
This commit is contained in:
B_Kirill
2025-09-23 12:52:51 +10:00
committed by GitHub
parent d79fb62d8d
commit c1a21693fa
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Client/Administration/UI/AdminCamera/AdminCameraWindow.xaml
View File

@@ -1,6 +1,5 @@
<DefaultWindow xmlns="https://spacestation14.io" <DefaultWindow xmlns="https://spacestation14.io"
Title="{Loc admin-camera-window-title-placeholder}" Title="{Loc admin-camera-window-title-placeholder}"
SetSize="425 550" SetSize="425 550"
MinSize="200 225" MinSize="200 225">
Name="Window">
</DefaultWindow> </DefaultWindow>

3
Content.Server/StationEvents/Events/ImmovableRodRule.cs
View File

@@ -35,7 +35,8 @@ public sealed class ImmovableRodRule : StationEventSystem<ImmovableRodRuleCompon
var speed = RobustRandom.NextFloat(rod.MinSpeed, rod.MaxSpeed); var speed = RobustRandom.NextFloat(rod.MinSpeed, rod.MaxSpeed);
var angle = RobustRandom.NextAngle(); var angle = RobustRandom.NextAngle();
var direction = angle.ToVec(); var direction = angle.ToVec();
var spawnCoords = targetCoords.ToMap(EntityManager, _transform).Offset(-direction * speed * despawn.Lifetime / 2); var mapCoords = _transform.ToMapCoordinates(targetCoords);
var spawnCoords = mapCoords.Offset(-direction * speed * despawn.Lifetime / 2);
var ent = Spawn(protoName, spawnCoords); var ent = Spawn(protoName, spawnCoords);
_gun.ShootProjectile(ent, direction, Vector2.Zero, uid, speed: speed); _gun.ShootProjectile(ent, direction, Vector2.Zero, uid, speed: speed);
} }

8
Content.Shared/Coordinates/Helpers/SnapgridHelper.cs
View File

@@ -9,12 +9,12 @@ namespace Content.Shared.Coordinates.Helpers
public static EntityCoordinates SnapToGrid(this EntityCoordinates coordinates, IEntityManager? entMan = null, IMapManager? mapManager = null) public static EntityCoordinates SnapToGrid(this EntityCoordinates coordinates, IEntityManager? entMan = null, IMapManager? mapManager = null)
{ {
IoCManager.Resolve(ref entMan, ref mapManager); IoCManager.Resolve(ref entMan, ref mapManager);
var xformSys = entMan.System<SharedTransformSystem>();
var gridId = coordinates.GetGridUid(entMan); var gridId = xformSys.GetGrid(coordinates.EntityId);
if (gridId == null) if (gridId == null)
{ {
var xformSys = entMan.System<SharedTransformSystem>();
var mapPos = xformSys.ToMapCoordinates(coordinates); var mapPos = xformSys.ToMapCoordinates(coordinates);
var mapX = (int)Math.Floor(mapPos.X) + 0.5f; var mapX = (int)Math.Floor(mapPos.X) + 0.5f;
var mapY = (int)Math.Floor(mapPos.Y) + 0.5f; var mapY = (int)Math.Floor(mapPos.Y) + 0.5f;
@@ -24,11 +24,11 @@ namespace Content.Shared.Coordinates.Helpers
var grid = entMan.GetComponent<MapGridComponent>(gridId.Value); var grid = entMan.GetComponent<MapGridComponent>(gridId.Value);
var tileSize = grid.TileSize; var tileSize = grid.TileSize;
var localPos = coordinates.WithEntityId(gridId.Value).Position; var localPos = xformSys.WithEntityId(coordinates, gridId.Value).Position;
var x = (int)Math.Floor(localPos.X / tileSize) + tileSize / 2f; var x = (int)Math.Floor(localPos.X / tileSize) + tileSize / 2f;
var y = (int)Math.Floor(localPos.Y / tileSize) + tileSize / 2f; var y = (int)Math.Floor(localPos.Y / tileSize) + tileSize / 2f;
var gridPos = new EntityCoordinates(gridId.Value, new Vector2(x, y)); var gridPos = new EntityCoordinates(gridId.Value, new Vector2(x, y));
return gridPos.WithEntityId(coordinates.EntityId); return xformSys.WithEntityId(gridPos, coordinates.EntityId);
} }
public static EntityCoordinates SnapToGrid(this EntityCoordinates coordinates, MapGridComponent grid) public static EntityCoordinates SnapToGrid(this EntityCoordinates coordinates, MapGridComponent grid)