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

Pulling rotation adjustment, newton's third law, entitycoordinates for moveto (#5141)

Browse Source 
* Pulling: Piano door stuck prevention (pulling angle-snap) and getting rid of a condition causing oddities with pull-to-location

* Pulling: Implement Newton's Third Law in regards to puller/pullee physics

Weightless condition was determined not to be necessary

* Fix pull-to-position on actively rotating/moving grids + fixes for rebase
This commit is contained in:
20kdc
2021-11-07 02:16:49 +00:00
committed by GitHub
parent 900f3e798d
commit 206f054cdf
5 changed files with 32 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Content.Server/Physics/Controllers/PullController.cs
View File

@@ -65,15 +65,17 @@ namespace Content.Server.Physics.Controllers
continue;
}
if (pullable.Puller == null)
var puller = pullable.Puller;
if (puller == null)
{
continue;
}
// Now that's over with...
var pullerPosition = pullable.Puller!.Transform.MapPosition;
if (pullable.MovingTo.Value.MapId != pullerPosition.MapId)
var pullerPosition = puller.Transform.MapPosition;
var movingTo = pullable.MovingTo.Value.ToMap(pullable.Owner.EntityManager);
if (movingTo.MapId != pullerPosition.MapId)
{
_pullableSystem.StopMoveTo(pullable);
continue;
@@ -81,13 +83,13 @@ namespace Content.Server.Physics.Controllers
if (!pullable.Owner.TryGetComponent<PhysicsComponent>(out var physics) ||
physics.BodyType == BodyType.Static ||
pullable.MovingTo.Value.MapId != pullable.Owner.Transform.MapID)
movingTo.MapId != pullable.Owner.Transform.MapID)
{
_pullableSystem.StopMoveTo(pullable);
continue;
}
var movingPosition = pullable.MovingTo.Value.Position;
var movingPosition = movingTo.Position;
var ownerPosition = pullable.Owner.Transform.MapPosition.Position;
var diff = movingPosition - ownerPosition;
@@ -113,7 +115,14 @@ namespace Content.Server.Physics.Controllers
accel -= physics.LinearVelocity * SettleShutdownMultiplier * scaling;
}
physics.WakeBody();
physics.ApplyLinearImpulse(accel * physics.Mass * frameTime);
var impulse = accel * physics.Mass * frameTime;
physics.ApplyLinearImpulse(impulse);
if (puller.TryGetComponent<PhysicsComponent>(out var pullerPhysics))
{
pullerPhysics.WakeBody();
pullerPhysics.ApplyLinearImpulse(-impulse);
}
}
}
}