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

Jump to bottom

fix viewing nav slowing shuttle down #32381

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix viewing nav slowing shuttle down #32381

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 10 additions & 4 deletions Content.Server/Physics/Controllers/MoverController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,9 @@ private void HandleShuttleMovement(float frameTime)
var linearInput = Vector2.Zero;
var brakeInput = 0f;
var angularInput = 0f;
var linearCount = 0;
var brakeCount = 0;
var angularCount = 0;

foreach (var (pilotUid, pilot, _, consoleXform) in pilots)
{
Expand All @@ -322,24 +325,27 @@ private void HandleShuttleMovement(float frameTime)
if (brakes > 0f)
{
brakeInput += brakes;
brakeCount++;
}

if (strafe.Length() > 0f)
{
var offsetRotation = consoleXform.LocalRotation;
linearInput += offsetRotation.RotateVec(strafe);
linearCount++;
}

if (rotation != 0f)
{
angularInput += rotation;
angularCount++;
}
}

var count = pilots.Count;
linearInput /= count;
angularInput /= count;
brakeInput /= count;
// Don't slow down the shuttle if there's someone just looking at the console
linearInput /= Math.Max(1, linearCount);
angularInput /= Math.Max(1, angularCount);
brakeInput /= Math.Max(1, brakeCount);

// Handle shuttle movement
if (brakeInput > 0f)
Expand Down
Loading