Skip to content

fixed dampening decouple from twp port #66

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

Merged
Endalion merged 1 commit into from
Aug 14, 2026
Merged

fixed dampening decouple from twp port #66

Show file tree
Hide file tree
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
3 changes: 1 addition & 2 deletions src/main/java/edn/stratodonut/trackwork/tracks/forces/OleoWheelController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ public final class OleoWheelController implements ShipPhysicsListener {

private volatile Vector3dc suspensionAdjust = new Vector3d(0, 1, 0);
private volatile float suspensionStiffness = 1.0f;
private volatile float suspensionDampening = 1.2f;

public OleoWheelController() {}

Expand Down Expand Up @@ -156,7 +155,7 @@ private ComputeResult computeForce(OleoWheelData data, PhysShip ship, PhysLevel
tForce.add(springForce);

// Less damper downward
double damperMagnitude = m * -suspensionDelta * coefficientOfPower * this.suspensionDampening;
double damperMagnitude = m * 1.2 * -suspensionDelta * coefficientOfPower * this.suspensionStiffness;
if (damperMagnitude > 0) {
damperMagnitude *= 0.5;
}
Expand Down
3 changes: 0 additions & 3 deletions src/main/java/edn/stratodonut/trackwork/tracks/forces/PhysicsTrackController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,6 @@ public final class PhysicsTrackController implements ShipPhysicsListener {

private volatile Vector3dc suspensionAdjust = new Vector3d(0, 1, 0);
private volatile float suspensionStiffness = 1.0f;
@JsonIgnore
@Deprecated(forRemoval = true)
private volatile float suspensionDampening = 1.2f;

public PhysicsTrackController () {}

Expand Down
3 changes: 1 addition & 2 deletions src/main/java/edn/stratodonut/trackwork/tracks/forces/SimpleWheelController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ public final class SimpleWheelController implements ShipPhysicsListener {

private volatile Vector3dc suspensionAdjust = new Vector3d(0, 1, 0);
private volatile float suspensionStiffness = 1.0f;
private volatile float suspensionDampening = 1.2f;

public SimpleWheelController() {}

Expand Down Expand Up @@ -186,7 +185,7 @@ private ComputeResult computeForce(SimpleWheelData data, PhysShipImpl ship, doub
tForce.add(springForce);

// Damper force (dampening) - apply in world coordinates but calculated relative to local up
Vector3dc damperForce = trackNormal.mul(m * -suspensionDelta * coefficientOfPower * this.suspensionDampening, new Vector3d());
Vector3dc damperForce = trackNormal.mul(m * 1.2 * -suspensionDelta * coefficientOfPower * this.suspensionStiffness, new Vector3d());
tForce.add(damperForce);
// Really half-assed antislip when the spring is stronger than friction (what?)
if (data.wheelRPM == 0) {
Expand Down