From 5811649c8c2a7793863ae471105263d7d7879085 Mon Sep 17 00:00:00 2001 From: Dan Mackey <47985434+danmackey@users.noreply.github.com> Date: Thu, 13 Feb 2025 21:59:59 -0500 Subject: [PATCH] Removed incorrect damping calculation --- source/main/physics/Actor.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/source/main/physics/Actor.cpp b/source/main/physics/Actor.cpp index 7d4e8616fd..ac139e8653 100644 --- a/source/main/physics/Actor.cpp +++ b/source/main/physics/Actor.cpp @@ -2620,7 +2620,6 @@ void Actor::CalcShocks3(int i, Real difftoBeamL, Real &k, Real& d, Real v) k = ar_beams[i].shock->springout; d = ar_beams[i].shock->dampout * ar_beams[i].shock->dslowout * std::min(v, ar_beams[i].shock->splitout) + ar_beams[i].shock->dampout * ar_beams[i].shock->dfastout * std::max(0.0f, v - ar_beams[i].shock->splitout); - d /= v; } else if (v < 0) // Compression { @@ -2628,7 +2627,6 @@ void Actor::CalcShocks3(int i, Real difftoBeamL, Real &k, Real& d, Real v) k = ar_beams[i].shock->springin; d = ar_beams[i].shock->dampin * ar_beams[i].shock->dslowin * std::min(v, ar_beams[i].shock->splitin ) + ar_beams[i].shock->dampin * ar_beams[i].shock->dfastin * std::max(0.0f, v - ar_beams[i].shock->splitin ); - d /= v; } }