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

Transform cleanups (#25963)

Browse Source 
* Transform cleanups

* Fix build

* ascension
This commit is contained in:
metalgearsloth
2024-03-29 17:26:30 +11:00
committed by GitHub
parent d830922603
commit cdfee5aa0c
5 changed files with 40 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Content.IntegrationTests/Tests/Buckle/BuckleTest.cs
View File

@@ -181,9 +181,8 @@ namespace Content.IntegrationTests.Tests.Buckle
#pragma warning restore NUnit2045 #pragma warning restore NUnit2045
// Move away from the chair // Move away from the chair
var xformQuery = entityManager.GetEntityQuery<TransformComponent>(); var oldWorldPosition = xformSystem.GetWorldPosition(chair);
var oldWorldPosition = xformSystem.GetWorldPosition(chair, xformQuery); xformSystem.SetWorldPosition(human, oldWorldPosition + new Vector2(1000, 1000));
xformSystem.SetWorldPosition(human, oldWorldPosition + new Vector2(1000, 1000), xformQuery);
// Out of range // Out of range
#pragma warning disable NUnit2045 // Interdependent asserts. #pragma warning disable NUnit2045 // Interdependent asserts.
@@ -193,8 +192,8 @@ namespace Content.IntegrationTests.Tests.Buckle
#pragma warning restore NUnit2045 #pragma warning restore NUnit2045
// Move near the chair // Move near the chair
oldWorldPosition = xformSystem.GetWorldPosition(chair, xformQuery); oldWorldPosition = xformSystem.GetWorldPosition(chair);
xformSystem.SetWorldPosition(human, oldWorldPosition + new Vector2(0.5f, 0), xformQuery); xformSystem.SetWorldPosition(human, oldWorldPosition + new Vector2(0.5f, 0));
// In range // In range
#pragma warning disable NUnit2045 // Interdependent asserts. #pragma warning disable NUnit2045 // Interdependent asserts.
@@ -220,8 +219,8 @@ namespace Content.IntegrationTests.Tests.Buckle
Assert.That(buckleSystem.TryBuckle(human, human, chair, buckleComp: buckle)); Assert.That(buckleSystem.TryBuckle(human, human, chair, buckleComp: buckle));
// Move away from the chair // Move away from the chair
oldWorldPosition = xformSystem.GetWorldPosition(chair, xformQuery); oldWorldPosition = xformSystem.GetWorldPosition(chair);
xformSystem.SetWorldPosition(human, oldWorldPosition + new Vector2(1, 0), xformQuery); xformSystem.SetWorldPosition(human, oldWorldPosition + new Vector2(1, 0));
}); });
await server.WaitRunTicks(1); await server.WaitRunTicks(1);
@@ -371,9 +370,8 @@ namespace Content.IntegrationTests.Tests.Buckle
}); });
// Move the buckled entity away // Move the buckled entity away
var xformQuery = entityManager.GetEntityQuery<TransformComponent>(); var oldWorldPosition = xformSystem.GetWorldPosition(chair);
var oldWorldPosition = xformSystem.GetWorldPosition(chair, xformQuery); xformSystem.SetWorldPosition(human, oldWorldPosition + new Vector2(100, 0));
xformSystem.SetWorldPosition(human, oldWorldPosition + new Vector2(100, 0), xformQuery);
}); });
await PoolManager.WaitUntil(server, () => !buckle.Buckled, 10); await PoolManager.WaitUntil(server, () => !buckle.Buckled, 10);
@@ -383,9 +381,8 @@ namespace Content.IntegrationTests.Tests.Buckle
await server.WaitAssertion(() => await server.WaitAssertion(() =>
{ {
// Move the now unbuckled entity back onto the chair // Move the now unbuckled entity back onto the chair
var xformQuery = entityManager.GetEntityQuery<TransformComponent>(); var oldWorldPosition = xformSystem.GetWorldPosition(chair);
var oldWorldPosition = xformSystem.GetWorldPosition(chair, xformQuery); xformSystem.SetWorldPosition(human, oldWorldPosition);
xformSystem.SetWorldPosition(human, oldWorldPosition, xformQuery);
// Buckle // Buckle
Assert.That(buckleSystem.TryBuckle(human, human, chair, buckleComp: buckle)); Assert.That(buckleSystem.TryBuckle(human, human, chair, buckleComp: buckle));

5
Content.IntegrationTests/Tests/GameObjects/Components/ActionBlocking/HandCuffTest.cs
View File

@@ -58,7 +58,6 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.ActionBlocking
var cuffableSys = entityManager.System<CuffableSystem>(); var cuffableSys = entityManager.System<CuffableSystem>();
var xformSys = entityManager.System<SharedTransformSystem>(); var xformSys = entityManager.System<SharedTransformSystem>();
var xformQuery = entityManager.GetEntityQuery<TransformComponent>();
// Spawn the entities // Spawn the entities
human = entityManager.SpawnEntity("HumanHandcuffDummy", coordinates); human = entityManager.SpawnEntity("HumanHandcuffDummy", coordinates);
@@ -66,8 +65,8 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.ActionBlocking
cuffs = entityManager.SpawnEntity("HandcuffsDummy", coordinates); cuffs = entityManager.SpawnEntity("HandcuffsDummy", coordinates);
secondCuffs = entityManager.SpawnEntity("HandcuffsDummy", coordinates); secondCuffs = entityManager.SpawnEntity("HandcuffsDummy", coordinates);
var coords = xformSys.GetWorldPosition(otherHuman, xformQuery); var coords = xformSys.GetWorldPosition(otherHuman);
xformSys.SetWorldPosition(human, coords, xformQuery); xformSys.SetWorldPosition(human, coords);
// Test for components existing // Test for components existing
Assert.Multiple(() => Assert.Multiple(() =>

12
Content.Server/Anomaly/Effects/BluespaceAnomalySystem.cs
View File

@@ -8,6 +8,7 @@ using Content.Shared.Mobs.Components;
using Content.Shared.Teleportation.Components; using Content.Shared.Teleportation.Components;
using Robust.Shared.Audio; using Robust.Shared.Audio;
using Robust.Shared.Audio.Systems; using Robust.Shared.Audio.Systems;
using Robust.Shared.Collections;
using Robust.Shared.Random; using Robust.Shared.Random;
namespace Content.Server.Anomaly.Effects; namespace Content.Server.Anomaly.Effects;
@@ -35,20 +36,19 @@ public sealed class BluespaceAnomalySystem : EntitySystem
var range = component.MaxShuffleRadius * args.Severity; var range = component.MaxShuffleRadius * args.Severity;
var mobs = new HashSet<Entity<MobStateComponent>>(); var mobs = new HashSet<Entity<MobStateComponent>>();
_lookup.GetEntitiesInRange(xform.Coordinates, range, mobs); _lookup.GetEntitiesInRange(xform.Coordinates, range, mobs);
var allEnts = new List<EntityUid>(mobs.Select(m => m.Owner)) { uid }; var allEnts = new ValueList<EntityUid>(mobs.Select(m => m.Owner)) { uid };
var coords = new List<Vector2>(); var coords = new ValueList<Vector2>();
foreach (var ent in allEnts) foreach (var ent in allEnts)
{ {
if (xformQuery.TryGetComponent(ent, out var xf)) if (xformQuery.TryGetComponent(ent, out var allXform))
coords.Add(xf.MapPosition.Position); coords.Add(_xform.GetWorldPosition(allXform));
} }
_random.Shuffle(coords); _random.Shuffle(coords);
for (var i = 0; i < allEnts.Count; i++) for (var i = 0; i < allEnts.Count; i++)
{ {
_adminLogger.Add(LogType.Teleport, $"{ToPrettyString(allEnts[i])} has been shuffled to {coords[i]} by the {ToPrettyString(uid)} at {xform.Coordinates}"); _adminLogger.Add(LogType.Teleport, $"{ToPrettyString(allEnts[i])} has been shuffled to {coords[i]} by the {ToPrettyString(uid)} at {xform.Coordinates}");
_xform.SetWorldPosition(allEnts[i], coords[i], xformQuery); _xform.SetWorldPosition(allEnts[i], coords[i]);
} }
} }

3
Content.Shared/Disposal/SharedDisposalUnitSystem.cs
View File

@@ -127,9 +127,6 @@ public abstract class SharedDisposalUnitSystem : EntitySystem
return damageState != null && (!component.MobsCanEnter || _mobState.IsDead(entity, damageState)); return damageState != null && (!component.MobsCanEnter || _mobState.IsDead(entity, damageState));
} }
/// <summary>
/// TODO: Proper prediction
/// </summary>
public abstract void DoInsertDisposalUnit(EntityUid uid, EntityUid toInsert, EntityUid user, SharedDisposalUnitComponent? disposal = null); public abstract void DoInsertDisposalUnit(EntityUid uid, EntityUid toInsert, EntityUid user, SharedDisposalUnitComponent? disposal = null);
[Serializable, NetSerializable] [Serializable, NetSerializable]

53
Content.Shared/Storage/EntitySystems/DumpableSystem.cs
View File

@@ -19,17 +19,16 @@ public sealed class DumpableSystem : EntitySystem
[Dependency] private readonly IPrototypeManager _prototypeManager = default!; [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly IRobustRandom _random = default!; [Dependency] private readonly IRobustRandom _random = default!;
[Dependency] private readonly SharedAudioSystem _audio = default!; [Dependency] private readonly SharedAudioSystem _audio = default!;
[Dependency] private readonly SharedContainerSystem _container = default!;
[Dependency] private readonly SharedDisposalUnitSystem _disposalUnitSystem = default!; [Dependency] private readonly SharedDisposalUnitSystem _disposalUnitSystem = default!;
[Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!; [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
[Dependency] private readonly SharedTransformSystem _transformSystem = default!; [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
private EntityQuery<TransformComponent> _xformQuery; private EntityQuery<ItemComponent> _itemQuery;
public override void Initialize() public override void Initialize()
{ {
base.Initialize(); base.Initialize();
_xformQuery = GetEntityQuery<TransformComponent>(); _itemQuery = GetEntityQuery<ItemComponent>();
SubscribeLocalEvent<DumpableComponent, AfterInteractEvent>(OnAfterInteract, after: new[]{ typeof(SharedEntityStorageSystem) }); SubscribeLocalEvent<DumpableComponent, AfterInteractEvent>(OnAfterInteract, after: new[]{ typeof(SharedEntityStorageSystem) });
SubscribeLocalEvent<DumpableComponent, GetVerbsEvent<AlternativeVerb>>(AddDumpVerb); SubscribeLocalEvent<DumpableComponent, GetVerbsEvent<AlternativeVerb>>(AddDumpVerb);
SubscribeLocalEvent<DumpableComponent, GetVerbsEvent<UtilityVerb>>(AddUtilityVerbs); SubscribeLocalEvent<DumpableComponent, GetVerbsEvent<UtilityVerb>>(AddUtilityVerbs);
@@ -111,7 +110,7 @@ public sealed class DumpableSystem : EntitySystem
} }
} }
private void StartDoAfter(EntityUid storageUid, EntityUid? targetUid, EntityUid userUid, DumpableComponent dumpable) private void StartDoAfter(EntityUid storageUid, EntityUid targetUid, EntityUid userUid, DumpableComponent dumpable)
{ {
if (!TryComp<StorageComponent>(storageUid, out var storage)) if (!TryComp<StorageComponent>(storageUid, out var storage))
return; return;
@@ -120,7 +119,7 @@ public sealed class DumpableSystem : EntitySystem
foreach (var entity in storage.Container.ContainedEntities) foreach (var entity in storage.Container.ContainedEntities)
{ {
if (!TryComp<ItemComponent>(entity, out var itemComp) || if (!_itemQuery.TryGetComponent(entity, out var itemComp) ||
!_prototypeManager.TryIndex(itemComp.Size, out var itemSize)) !_prototypeManager.TryIndex(itemComp.Size, out var itemSize))
{ {
continue; continue;
@@ -138,33 +137,16 @@ public sealed class DumpableSystem : EntitySystem
}); });
} }
private void OnDoAfter(EntityUid uid, DumpableComponent component, DoAfterEvent args) private void OnDoAfter(EntityUid uid, DumpableComponent component, DumpableDoAfterEvent args)
{ {
if (args.Handled || args.Cancelled || !TryComp<StorageComponent>(uid, out var storage)) if (args.Handled || args.Cancelled || !TryComp<StorageComponent>(uid, out var storage) || storage.Container.ContainedEntities.Count == 0)
return; return;
Queue<EntityUid> dumpQueue = new(); var dumpQueue = new Queue<EntityUid>(storage.Container.ContainedEntities);
foreach (var entity in storage.Container.ContainedEntities)
{
dumpQueue.Enqueue(entity);
}
if (dumpQueue.Count == 0)
return;
foreach (var entity in dumpQueue)
{
var transform = Transform(entity);
_container.AttachParentToContainerOrGrid((entity, transform));
_transformSystem.SetLocalPositionRotation(entity, transform.LocalPosition + _random.NextVector2Box() / 2, _random.NextAngle(), transform);
}
if (args.Args.Target == null)
return;
var dumped = false; var dumped = false;
if (_disposalUnitSystem.HasDisposals(args.Args.Target.Value)) if (_disposalUnitSystem.HasDisposals(args.Args.Target))
{ {
dumped = true; dumped = true;
@@ -173,22 +155,31 @@ public sealed class DumpableSystem : EntitySystem
_disposalUnitSystem.DoInsertDisposalUnit(args.Args.Target.Value, entity, args.Args.User); _disposalUnitSystem.DoInsertDisposalUnit(args.Args.Target.Value, entity, args.Args.User);
} }
} }
else if (HasComp<PlaceableSurfaceComponent>(args.Args.Target.Value)) else if (HasComp<PlaceableSurfaceComponent>(args.Args.Target))
{ {
dumped = true; dumped = true;
var targetPos = _xformQuery.GetComponent(args.Args.Target.Value).LocalPosition; var targetPos = _transformSystem.GetWorldPosition(args.Args.Target.Value);
foreach (var entity in dumpQueue) foreach (var entity in dumpQueue)
{ {
_transformSystem.SetLocalPosition(entity, targetPos + _random.NextVector2Box() / 4); _transformSystem.SetWorldPosition(entity, targetPos + _random.NextVector2Box() / 4);
}
}
else
{
var targetPos = _transformSystem.GetWorldPosition(uid);
foreach (var entity in dumpQueue)
{
var transform = Transform(entity);
_transformSystem.SetWorldPositionRotation(entity, targetPos + _random.NextVector2Box() / 4, _random.NextAngle(), transform);
} }
} }
if (dumped) if (dumped)
{ {
// TODO: Predicted when above predicted _audio.PlayPredicted(component.DumpSound, uid, args.User);
_audio.PlayPvs(component.DumpSound, uid);
} }
} }
} }