juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Purges uses of TransformComponent.WorldRotation (#34946)

Browse Source
This commit is contained in:
TemporalOroboros
2025-02-10 19:16:20 -08:00
committed by GitHub
parent 976172b85e
commit 08e5362f43
9 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Server/Explosion/EntitySystems/ExplosionGridTileFlood.cs
View File

@@ -69,14 +69,17 @@ public sealed class ExplosionGridTileFlood : ExplosionTileFlood
return;
_needToTransform = true;
var transform = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(Grid.Owner);
var entityManager = IoCManager.Resolve<IEntityManager>();
var transformSystem = entityManager.System<SharedTransformSystem>();
var transform = entityManager.GetComponent<TransformComponent>(Grid.Owner);
var size = (float) Grid.TileSize;
_matrix.M31 = size / 2;
_matrix.M32 = size / 2;
Matrix3x2.Invert(spaceMatrix, out var invSpace);
_matrix *= transform.WorldMatrix * invSpace;
var relativeAngle = transform.WorldRotation - spaceAngle;
var relativeAngle = transformSystem.GetWorldRotation(transform) - spaceAngle;
_offset = relativeAngle.RotateVec(new Vector2(size / 4, size / 4));
}

2
Content.Server/Explosion/EntitySystems/ExplosionSystem.GridMap.cs
View File

@@ -71,7 +71,7 @@ public sealed partial class ExplosionSystem
{
var targetGrid = Comp<MapGridComponent>(referenceGrid.Value);
var xform = Transform(referenceGrid.Value);
targetAngle = xform.WorldRotation;
targetAngle = _transformSystem.GetWorldRotation(xform);
targetMatrix = xform.InvWorldMatrix;
tileSize = targetGrid.TileSize;
}

2
Content.Server/Explosion/EntitySystems/ExplosionSystem.TileFill.cs
View File

@@ -90,7 +90,7 @@ public sealed partial class ExplosionSystem
{
var xform = Transform(Comp<MapGridComponent>(referenceGrid.Value).Owner);
spaceMatrix = xform.WorldMatrix;
spaceAngle = xform.WorldRotation;
spaceAngle = _transformSystem.GetWorldRotation(xform);
}
// is the explosion starting on a grid?