Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes gravity wells #29617

Merged
merged 7 commits into from
Jul 1, 2024
Merged

Fixes gravity wells #29617

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
51178e8
Fixes gravity wells
Jun 30, 2024
1016d41
thank you slarticodefast
Jul 1, 2024
14aa67e
Minor nitpicks addressed
Jul 1, 2024
c5053ca
NITPICKS UNDONE
Jul 1, 2024
c782eee
REDO THE NITPICK, WE LOVE MATRIX MULTIPLCATION
Jul 1, 2024
1a120f3
Revert "REDO THE NITPICK, WE LOVE MATRIX MULTIPLCATION"
Jul 1, 2024
04f0346
NITPICK REDO
Jul 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions Content.Server/Singularity/EntitySystems/GravityWellSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ public void GravPulse(EntityUid uid, float maxRange, float minRange, float baseR
/// <param name="minRange">The minimum distance at which entities can be affected by the gravity pulse.</param>
/// <param name="baseMatrixDeltaV">The base velocity added to any entities within affected by the gravity pulse scaled by the displacement of those entities from the epicenter.</param>
public void GravPulse(EntityCoordinates entityPos, float maxRange, float minRange, in Matrix3x2 baseMatrixDeltaV)
=> GravPulse(entityPos.ToMap(EntityManager, _transform), maxRange, minRange, in baseMatrixDeltaV);
=> GravPulse(_transform.ToMapCoordinates(entityPos), maxRange, minRange, in baseMatrixDeltaV);

/// <summary>
/// Greates a gravitational pulse, shoving around all entities within some distance of an epicenter.
Expand All @@ -167,7 +167,7 @@ public void GravPulse(EntityCoordinates entityPos, float maxRange, float minRang
/// <param name="baseRadialDeltaV">The base radial velocity that will be added to entities within range towards the center of the gravitational pulse.</param>
/// <param name="baseTangentialDeltaV">The base tangential velocity that will be added to entities within countrclockwise around the center of the gravitational pulse.</param>
public void GravPulse(EntityCoordinates entityPos, float maxRange, float minRange, float baseRadialDeltaV = 0.0f, float baseTangentialDeltaV = 0.0f)
=> GravPulse(entityPos.ToMap(EntityManager, _transform), maxRange, minRange, baseRadialDeltaV, baseTangentialDeltaV);
=> GravPulse(_transform.ToMapCoordinates(entityPos), maxRange, minRange, baseRadialDeltaV, baseTangentialDeltaV);

/// <summary>
/// Causes a gravitational pulse, shoving around all entities within some distance of an epicenter.
Expand Down Expand Up @@ -206,7 +206,7 @@ public void GravPulse(MapCoordinates mapPos, float maxRange, float minRange, in
continue;

var scaling = (1f / distance2) * physics.Mass; // TODO: Variable falloff gradiants.
_physics.ApplyLinearImpulse(entity, Vector2.Transform(displacement, baseMatrixDeltaV) * scaling, body: physics);
_physics.ApplyLinearImpulse(entity, Vector2.TransformNormal(displacement, baseMatrixDeltaV) * scaling, body: physics);
}
}

Expand All @@ -219,10 +219,7 @@ public void GravPulse(MapCoordinates mapPos, float maxRange, float minRange, in
/// <param name="baseRadialDeltaV">The base amount of velocity that will be added to entities in range towards the epicenter of the pulse.</param>
/// <param name="baseTangentialDeltaV">The base amount of velocity that will be added to entities in range counterclockwise relative to the epicenter of the pulse.</param>
public void GravPulse(MapCoordinates mapPos, float maxRange, float minRange = 0.0f, float baseRadialDeltaV = 0.0f, float baseTangentialDeltaV = 0.0f)
=> GravPulse(mapPos, maxRange, minRange, new Matrix3x2(
baseRadialDeltaV, -baseTangentialDeltaV, 0.0f,
+baseTangentialDeltaV, baseRadialDeltaV, 0.0f
));
=> GravPulse(mapPos, maxRange, minRange, new Matrix3x2(baseRadialDeltaV, -baseTangentialDeltaV, baseTangentialDeltaV, baseRadialDeltaV, 0.0f, 0.0f));

#endregion GravPulse

Expand Down
Loading