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

Code cleanup: Purge obsoleted SharedPhysicsSystem methods (#26287)

Browse Source 
Updated calls to SharedPhysicsSystem methods
This commit is contained in:
Tayrtahn
2024-03-25 02:37:25 -04:00
committed by GitHub
parent b2c5ae9023
commit 964c6d54ca
16 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
View File

@@ -409,7 +409,7 @@ public sealed partial class AdminVerbSystem
var fixtures = Comp<FixturesComponent>(args.Target); var fixtures = Comp<FixturesComponent>(args.Target);
xform.Anchored = false; // Just in case. xform.Anchored = false; // Just in case.
_physics.SetBodyType(args.Target, BodyType.Dynamic, manager: fixtures, body: physics); _physics.SetBodyType(args.Target, BodyType.Dynamic, manager: fixtures, body: physics);
_physics.SetBodyStatus(physics, BodyStatus.InAir); _physics.SetBodyStatus(args.Target, physics, BodyStatus.InAir);
_physics.WakeBody(args.Target, manager: fixtures, body: physics); _physics.WakeBody(args.Target, manager: fixtures, body: physics);
foreach (var fixture in fixtures.Fixtures.Values) foreach (var fixture in fixtures.Fixtures.Values)
@@ -424,8 +424,8 @@ public sealed partial class AdminVerbSystem
_physics.SetLinearVelocity(args.Target, _random.NextVector2(1.5f, 1.5f), manager: fixtures, body: physics); _physics.SetLinearVelocity(args.Target, _random.NextVector2(1.5f, 1.5f), manager: fixtures, body: physics);
_physics.SetAngularVelocity(args.Target, MathF.PI * 12, manager: fixtures, body: physics); _physics.SetAngularVelocity(args.Target, MathF.PI * 12, manager: fixtures, body: physics);
_physics.SetLinearDamping(physics, 0f); _physics.SetLinearDamping(args.Target, physics, 0f);
_physics.SetAngularDamping(physics, 0f); _physics.SetAngularDamping(args.Target, physics, 0f);
}, },
Impact = LogImpact.Extreme, Impact = LogImpact.Extreme,
Message = Loc.GetString("admin-smite-pinball-description") Message = Loc.GetString("admin-smite-pinball-description")
@@ -444,7 +444,7 @@ public sealed partial class AdminVerbSystem
xform.Anchored = false; // Just in case. xform.Anchored = false; // Just in case.
_physics.SetBodyType(args.Target, BodyType.Dynamic, body: physics); _physics.SetBodyType(args.Target, BodyType.Dynamic, body: physics);
_physics.SetBodyStatus(physics, BodyStatus.InAir); _physics.SetBodyStatus(args.Target, physics, BodyStatus.InAir);
_physics.WakeBody(args.Target, manager: fixtures, body: physics); _physics.WakeBody(args.Target, manager: fixtures, body: physics);
foreach (var fixture in fixtures.Fixtures.Values) foreach (var fixture in fixtures.Fixtures.Values)
@@ -454,8 +454,8 @@ public sealed partial class AdminVerbSystem
_physics.SetLinearVelocity(args.Target, _random.NextVector2(8.0f, 8.0f), manager: fixtures, body: physics); _physics.SetLinearVelocity(args.Target, _random.NextVector2(8.0f, 8.0f), manager: fixtures, body: physics);
_physics.SetAngularVelocity(args.Target, MathF.PI * 12, manager: fixtures, body: physics); _physics.SetAngularVelocity(args.Target, MathF.PI * 12, manager: fixtures, body: physics);
_physics.SetLinearDamping(physics, 0f); _physics.SetLinearDamping(args.Target, physics, 0f);
_physics.SetAngularDamping(physics, 0f); _physics.SetAngularDamping(args.Target, physics, 0f);
}, },
Impact = LogImpact.Extreme, Impact = LogImpact.Extreme,
Message = Loc.GetString("admin-smite-yeet-description") Message = Loc.GetString("admin-smite-yeet-description")

4
Content.Server/Atmos/EntitySystems/AtmosphereSystem.HighPressureDelta.cs
View File

@@ -52,7 +52,7 @@ namespace Content.Server.Atmos.EntitySystems
if (HasComp<MobStateComponent>(uid) && if (HasComp<MobStateComponent>(uid) &&
TryComp<PhysicsComponent>(uid, out var body)) TryComp<PhysicsComponent>(uid, out var body))
{ {
_physics.SetBodyStatus(body, BodyStatus.OnGround); _physics.SetBodyStatus(uid, body, BodyStatus.OnGround);
} }
if (TryComp<FixturesComponent>(uid, out var fixtures)) if (TryComp<FixturesComponent>(uid, out var fixtures))
@@ -75,7 +75,7 @@ namespace Content.Server.Atmos.EntitySystems
if (!TryComp<FixturesComponent>(uid, out var fixtures)) if (!TryComp<FixturesComponent>(uid, out var fixtures))
return; return;
_physics.SetBodyStatus(body, BodyStatus.InAir); _physics.SetBodyStatus(uid, body, BodyStatus.InAir);
foreach (var (id, fixture) in fixtures.Fixtures) foreach (var (id, fixture) in fixtures.Fixtures)
{ {

4
Content.Server/Chemistry/EntitySystems/VaporSystem.cs
View File

@@ -64,8 +64,8 @@ namespace Content.Server.Chemistry.EntitySystems
// Set Move // Set Move
if (EntityManager.TryGetComponent(vapor, out PhysicsComponent? physics)) if (EntityManager.TryGetComponent(vapor, out PhysicsComponent? physics))
{ {
_physics.SetLinearDamping(physics, 0f); _physics.SetLinearDamping(vapor, physics, 0f);
_physics.SetAngularDamping(physics, 0f); _physics.SetAngularDamping(vapor, physics, 0f);
_throwing.TryThrow(vapor, dir, speed, user: user); _throwing.TryThrow(vapor, dir, speed, user: user);

6
Content.Server/ImmovableRod/ImmovableRodSystem.cs
View File

@@ -53,9 +53,9 @@ public sealed class ImmovableRodSystem : EntitySystem
{ {
if (EntityManager.TryGetComponent(uid, out PhysicsComponent? phys)) if (EntityManager.TryGetComponent(uid, out PhysicsComponent? phys))
{ {
_physics.SetLinearDamping(phys, 0f); _physics.SetLinearDamping(uid, phys, 0f);
_physics.SetFriction(phys, 0f); _physics.SetFriction(uid, phys, 0f);
_physics.SetBodyStatus(phys, BodyStatus.InAir); _physics.SetBodyStatus(uid, phys, BodyStatus.InAir);
if (!component.RandomizeVelocity) if (!component.RandomizeVelocity)
return; return;

2
Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorSystem.Emitter.cs
View File

@@ -28,7 +28,7 @@ public sealed partial class ParticleAcceleratorSystem
if (TryComp<PhysicsComponent>(emitted, out var particlePhys)) if (TryComp<PhysicsComponent>(emitted, out var particlePhys))
{ {
var angle = _transformSystem.GetWorldRotation(uid, xformQuery); var angle = _transformSystem.GetWorldRotation(uid, xformQuery);
_physicsSystem.SetBodyStatus(particlePhys, BodyStatus.InAir); _physicsSystem.SetBodyStatus(emitted, particlePhys, BodyStatus.InAir);
var velocity = angle.ToWorldVec() * 20f; var velocity = angle.ToWorldVec() * 20f;
if (TryComp<PhysicsComponent>(uid, out var phys)) if (TryComp<PhysicsComponent>(uid, out var phys))

2
Content.Server/Physics/Controllers/ChasingWalkSystem.cs
View File

@@ -97,6 +97,6 @@ public sealed class ChasingWalkSystem : VirtualController
var speed = delta.Length() > 0 ? delta.Normalized() * component.Speed : Vector2.Zero; var speed = delta.Length() > 0 ? delta.Normalized() * component.Speed : Vector2.Zero;
_physics.SetLinearVelocity(uid, speed); _physics.SetLinearVelocity(uid, speed);
_physics.SetBodyStatus(physics, BodyStatus.InAir); //If this is not done, from the explosion up close, the tesla will "Fall" to the ground, and almost stop moving. _physics.SetBodyStatus(uid, physics, BodyStatus.InAir); //If this is not done, from the explosion up close, the tesla will "Fall" to the ground, and almost stop moving.
} }
} }

8
Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
View File

@@ -371,8 +371,8 @@ public sealed partial class ShuttleSystem
Enable(uid, component: body); Enable(uid, component: body);
_physics.SetLinearVelocity(uid, new Vector2(0f, 20f), body: body); _physics.SetLinearVelocity(uid, new Vector2(0f, 20f), body: body);
_physics.SetAngularVelocity(uid, 0f, body: body); _physics.SetAngularVelocity(uid, 0f, body: body);
_physics.SetLinearDamping(body, 0f); _physics.SetLinearDamping(uid, body, 0f);
_physics.SetAngularDamping(body, 0f); _physics.SetAngularDamping(uid, body, 0f);
_dockSystem.SetDockBolts(uid, true); _dockSystem.SetDockBolts(uid, true);
_console.RefreshShuttleConsoles(uid); _console.RefreshShuttleConsoles(uid);
@@ -426,8 +426,8 @@ public sealed partial class ShuttleSystem
_physics.SetLinearVelocity(uid, Vector2.Zero, body: body); _physics.SetLinearVelocity(uid, Vector2.Zero, body: body);
_physics.SetAngularVelocity(uid, 0f, body: body); _physics.SetAngularVelocity(uid, 0f, body: body);
_physics.SetLinearDamping(body, entity.Comp2.LinearDamping); _physics.SetLinearDamping(uid, body, entity.Comp2.LinearDamping);
_physics.SetAngularDamping(body, entity.Comp2.AngularDamping); _physics.SetAngularDamping(uid, body, entity.Comp2.AngularDamping);
var target = entity.Comp1.TargetCoordinates; var target = entity.Comp1.TargetCoordinates;

8
Content.Server/Shuttles/Systems/ShuttleSystem.cs
View File

@@ -129,10 +129,10 @@ public sealed partial class ShuttleSystem : SharedShuttleSystem
return; return;
_physics.SetBodyType(uid, BodyType.Dynamic, manager: manager, body: component); _physics.SetBodyType(uid, BodyType.Dynamic, manager: manager, body: component);
_physics.SetBodyStatus(component, BodyStatus.InAir); _physics.SetBodyStatus(uid, component, BodyStatus.InAir);
_physics.SetFixedRotation(uid, false, manager: manager, body: component); _physics.SetFixedRotation(uid, false, manager: manager, body: component);
_physics.SetLinearDamping(component, shuttle.LinearDamping); _physics.SetLinearDamping(uid, component, shuttle.LinearDamping);
_physics.SetAngularDamping(component, shuttle.AngularDamping); _physics.SetAngularDamping(uid, component, shuttle.AngularDamping);
} }
public void Disable(EntityUid uid, FixturesComponent? manager = null, PhysicsComponent? component = null) public void Disable(EntityUid uid, FixturesComponent? manager = null, PhysicsComponent? component = null)
@@ -141,7 +141,7 @@ public sealed partial class ShuttleSystem : SharedShuttleSystem
return; return;
_physics.SetBodyType(uid, BodyType.Static, manager: manager, body: component); _physics.SetBodyType(uid, BodyType.Static, manager: manager, body: component);
_physics.SetBodyStatus(component, BodyStatus.OnGround); _physics.SetBodyStatus(uid, component, BodyStatus.OnGround);
_physics.SetFixedRotation(uid, true, manager: manager, body: component); _physics.SetFixedRotation(uid, true, manager: manager, body: component);
} }

6
Content.Server/StationEvents/Events/MeteorSwarmRule.cs
View File

@@ -68,9 +68,9 @@ namespace Content.Server.StationEvents.Events
var spawnPosition = new MapCoordinates(center + offset, mapId); var spawnPosition = new MapCoordinates(center + offset, mapId);
var meteor = Spawn("MeteorLarge", spawnPosition); var meteor = Spawn("MeteorLarge", spawnPosition);
var physics = EntityManager.GetComponent<PhysicsComponent>(meteor); var physics = EntityManager.GetComponent<PhysicsComponent>(meteor);
_physics.SetBodyStatus(physics, BodyStatus.InAir); _physics.SetBodyStatus(meteor, physics, BodyStatus.InAir);
_physics.SetLinearDamping(physics, 0f); _physics.SetLinearDamping(meteor, physics, 0f);
_physics.SetAngularDamping(physics, 0f); _physics.SetAngularDamping(meteor, physics, 0f);
_physics.ApplyLinearImpulse(meteor, -offset.Normalized() * component.MeteorVelocity * physics.Mass, body: physics); _physics.ApplyLinearImpulse(meteor, -offset.Normalized() * component.MeteorVelocity * physics.Mass, body: physics);
_physics.ApplyAngularImpulse( _physics.ApplyAngularImpulse(
meteor, meteor,

2
Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs
View File

@@ -358,7 +358,7 @@ public abstract partial class SharedBuckleSystem
if (TryComp<PhysicsComponent>(buckleUid, out var physics)) if (TryComp<PhysicsComponent>(buckleUid, out var physics))
{ {
_physics.ResetDynamics(physics); _physics.ResetDynamics(buckleUid, physics);
} }
if (!buckleComp.PullStrap && TryComp<PullableComponent>(strapUid, out var toPullable)) if (!buckleComp.PullStrap && TryComp<PullableComponent>(strapUid, out var toPullable))

4
Content.Shared/Movement/Systems/SharedJetpackSystem.cs
View File

@@ -92,7 +92,7 @@ public abstract class SharedJetpackSystem : EntitySystem
_mover.SetRelay(user, jetpackUid); _mover.SetRelay(user, jetpackUid);
if (TryComp<PhysicsComponent>(user, out var physics)) if (TryComp<PhysicsComponent>(user, out var physics))
_physics.SetBodyStatus(physics, BodyStatus.InAir); _physics.SetBodyStatus(user, physics, BodyStatus.InAir);
userComp.Jetpack = jetpackUid; userComp.Jetpack = jetpackUid;
} }
@@ -103,7 +103,7 @@ public abstract class SharedJetpackSystem : EntitySystem
return; return;
if (TryComp<PhysicsComponent>(uid, out var physics)) if (TryComp<PhysicsComponent>(uid, out var physics))
_physics.SetBodyStatus(physics, BodyStatus.OnGround); _physics.SetBodyStatus(uid, physics, BodyStatus.OnGround);
RemComp<RelayInputMoverComponent>(uid); RemComp<RelayInputMoverComponent>(uid);
} }

6
Content.Shared/Throwing/ThrowingSystem.cs
View File

@@ -174,7 +174,7 @@ public sealed class ThrowingSystem : EntitySystem
} }
else else
{ {
_physics.SetBodyStatus(physics, BodyStatus.InAir); _physics.SetBodyStatus(uid, physics, BodyStatus.InAir);
} }
if (user == null) if (user == null)
@@ -191,10 +191,10 @@ public sealed class ThrowingSystem : EntitySystem
{ {
var msg = new ThrowPushbackAttemptEvent(); var msg = new ThrowPushbackAttemptEvent();
RaiseLocalEvent(uid, msg); RaiseLocalEvent(uid, msg);
const float MassLimit = 5f; const float massLimit = 5f;
if (!msg.Cancelled) if (!msg.Cancelled)
_physics.ApplyLinearImpulse(user.Value, -impulseVector / physics.Mass * pushbackRatio * MathF.Min(MassLimit, physics.Mass), body: userPhysics); _physics.ApplyLinearImpulse(user.Value, -impulseVector / physics.Mass * pushbackRatio * MathF.Min(massLimit, physics.Mass), body: userPhysics);
} }
} }
} }

2
Content.Shared/Throwing/ThrownItemSystem.cs
View File

@@ -92,7 +92,7 @@ namespace Content.Shared.Throwing
{ {
if (TryComp<PhysicsComponent>(uid, out var physics)) if (TryComp<PhysicsComponent>(uid, out var physics))
{ {
_physics.SetBodyStatus(physics, BodyStatus.OnGround); _physics.SetBodyStatus(uid, physics, BodyStatus.OnGround);
if (physics.Awake) if (physics.Awake)
_broadphase.RegenerateContacts(uid, physics); _broadphase.RegenerateContacts(uid, physics);

4
Content.Shared/Weapons/Melee/MeleeThrowOnHitSystem.cs
View File

@@ -74,7 +74,7 @@ public sealed class MeleeThrowOnHitSystem : EntitySystem
comp.PreviousStatus = body.BodyStatus; comp.PreviousStatus = body.BodyStatus;
comp.ThrownEndTime = _timing.CurTime + TimeSpan.FromSeconds(comp.Lifetime); comp.ThrownEndTime = _timing.CurTime + TimeSpan.FromSeconds(comp.Lifetime);
comp.MinLifetimeTime = _timing.CurTime + TimeSpan.FromSeconds(comp.MinLifetime); comp.MinLifetimeTime = _timing.CurTime + TimeSpan.FromSeconds(comp.MinLifetime);
_physics.SetBodyStatus(body, BodyStatus.InAir); _physics.SetBodyStatus(ent, body, BodyStatus.InAir);
_physics.SetLinearVelocity(ent, Vector2.Zero, body: body); _physics.SetLinearVelocity(ent, Vector2.Zero, body: body);
_physics.ApplyLinearImpulse(ent, comp.Velocity * body.Mass, body: body); _physics.ApplyLinearImpulse(ent, comp.Velocity * body.Mass, body: body);
Dirty(ent, ent.Comp); Dirty(ent, ent.Comp);
@@ -83,7 +83,7 @@ public sealed class MeleeThrowOnHitSystem : EntitySystem
private void OnThrownShutdown(Entity<MeleeThrownComponent> ent, ref ComponentShutdown args) private void OnThrownShutdown(Entity<MeleeThrownComponent> ent, ref ComponentShutdown args)
{ {
if (TryComp<PhysicsComponent>(ent, out var body)) if (TryComp<PhysicsComponent>(ent, out var body))
_physics.SetBodyStatus(body,ent.Comp.PreviousStatus); _physics.SetBodyStatus(ent, body, ent.Comp.PreviousStatus);
var ev = new MeleeThrowOnHitEndEvent(); var ev = new MeleeThrowOnHitEndEvent();
RaiseLocalEvent(ent, ref ev); RaiseLocalEvent(ent, ref ev);
} }

10
Content.Shared/Weapons/Misc/SharedTetherGunSystem.cs
View File

@@ -207,12 +207,12 @@ public abstract partial class SharedTetherGunSystem : EntitySystem
TransformSystem.Unanchor(target, targetXform); TransformSystem.Unanchor(target, targetXform);
component.Tethered = target; component.Tethered = target;
var tethered = EnsureComp<TetheredComponent>(target); var tethered = EnsureComp<TetheredComponent>(target);
_physics.SetBodyStatus(targetPhysics, BodyStatus.InAir, false); _physics.SetBodyStatus(target, targetPhysics, BodyStatus.InAir, false);
_physics.SetSleepingAllowed(target, targetPhysics, false); _physics.SetSleepingAllowed(target, targetPhysics, false);
tethered.Tetherer = gunUid; tethered.Tetherer = gunUid;
tethered.OriginalAngularDamping = targetPhysics.AngularDamping; tethered.OriginalAngularDamping = targetPhysics.AngularDamping;
_physics.SetAngularDamping(targetPhysics, 0f); _physics.SetAngularDamping(target, targetPhysics, 0f);
_physics.SetLinearDamping(targetPhysics, 0f); _physics.SetLinearDamping(target, targetPhysics, 0f);
_physics.SetAngularVelocity(target, SpinVelocity, body: targetPhysics); _physics.SetAngularVelocity(target, SpinVelocity, body: targetPhysics);
_physics.WakeBody(target, body: targetPhysics); _physics.WakeBody(target, body: targetPhysics);
var thrown = EnsureComp<ThrownItemComponent>(component.Tethered.Value); var thrown = EnsureComp<ThrownItemComponent>(component.Tethered.Value);
@@ -264,9 +264,9 @@ public abstract partial class SharedTetherGunSystem : EntitySystem
_thrown.StopThrow(component.Tethered.Value, thrown); _thrown.StopThrow(component.Tethered.Value, thrown);
} }
_physics.SetBodyStatus(targetPhysics, BodyStatus.OnGround); _physics.SetBodyStatus(component.Tethered.Value, targetPhysics, BodyStatus.OnGround);
_physics.SetSleepingAllowed(component.Tethered.Value, targetPhysics, true); _physics.SetSleepingAllowed(component.Tethered.Value, targetPhysics, true);
_physics.SetAngularDamping(targetPhysics, Comp<TetheredComponent>(component.Tethered.Value).OriginalAngularDamping); _physics.SetAngularDamping(component.Tethered.Value, targetPhysics, Comp<TetheredComponent>(component.Tethered.Value).OriginalAngularDamping);
} }
if (!transfer) if (!transfer)

2
Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
View File

@@ -386,7 +386,7 @@ public abstract partial class SharedGunSystem : EntitySystem
public void ShootProjectile(EntityUid uid, Vector2 direction, Vector2 gunVelocity, EntityUid gunUid, EntityUid? user = null, float speed = 20f) public void ShootProjectile(EntityUid uid, Vector2 direction, Vector2 gunVelocity, EntityUid gunUid, EntityUid? user = null, float speed = 20f)
{ {
var physics = EnsureComp<PhysicsComponent>(uid); var physics = EnsureComp<PhysicsComponent>(uid);
Physics.SetBodyStatus(physics, BodyStatus.InAir); Physics.SetBodyStatus(uid, physics, BodyStatus.InAir);
var targetMapVelocity = gunVelocity + direction.Normalized() * speed; var targetMapVelocity = gunVelocity + direction.Normalized() * speed;
var currentMapVelocity = Physics.GetMapLinearVelocity(uid, physics); var currentMapVelocity = Physics.GetMapLinearVelocity(uid, physics);