diff options
| author | aap <aap@papnet.eu> | 2020-12-27 20:34:12 +0100 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2020-12-27 20:34:12 +0100 |
| commit | ab80ff71323a057caf66b3d2595f9d5f8786cf3b (patch) | |
| tree | 347c1a6666c3ed51159b6110f773bee8340c5a00 | |
| parent | tiny rendering fix (diff) | |
| download | re3-ab80ff71323a057caf66b3d2595f9d5f8786cf3b.tar re3-ab80ff71323a057caf66b3d2595f9d5f8786cf3b.tar.gz re3-ab80ff71323a057caf66b3d2595f9d5f8786cf3b.tar.bz2 re3-ab80ff71323a057caf66b3d2595f9d5f8786cf3b.tar.lz re3-ab80ff71323a057caf66b3d2595f9d5f8786cf3b.tar.xz re3-ab80ff71323a057caf66b3d2595f9d5f8786cf3b.tar.zst re3-ab80ff71323a057caf66b3d2595f9d5f8786cf3b.zip | |
| -rw-r--r-- | src/vehicles/HandlingMgr.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/vehicles/HandlingMgr.cpp b/src/vehicles/HandlingMgr.cpp index 7b74b590..3ac6f057 100644 --- a/src/vehicles/HandlingMgr.cpp +++ b/src/vehicles/HandlingMgr.cpp @@ -2,6 +2,7 @@ #include "main.h" #include "FileMgr.h" +#include "Physical.h" #include "HandlingMgr.h" cHandlingDataMgr mod_HandlingManager; @@ -189,17 +190,17 @@ cHandlingDataMgr::FindExactWord(const char *word, const char *words, int wordLen void cHandlingDataMgr::ConvertDataToGameUnits(tHandlingData *handling) { - // TODO: figure out what exactly is being converted here + // acceleration is in ms^-2, but we need mf^-2 where f is one frame time (50fps) float velocity, a, b, specificVolume; - handling->Transmission.fEngineAcceleration /= 2500.0f; - handling->Transmission.fMaxVelocity /= 180.0f; - handling->fBrakeDeceleration /= 2500.0f; + handling->Transmission.fEngineAcceleration *= 1.0f/(50.0f*50.0f); + handling->Transmission.fMaxVelocity *= 1000.0f/(60.0f*60.0f * 50.0f); + handling->fBrakeDeceleration *= 1.0f/(50.0f*50.0f); handling->fTurnMass = (sq(handling->Dimension.x) + sq(handling->Dimension.y)) * handling->fMass / 12.0f; if(handling->fTurnMass < 10.0f) handling->fTurnMass *= 5.0f; handling->fInvMass = 1.0f/handling->fMass; - handling->fBuoyancy = 100.0f/handling->nPercentSubmerged * 0.008f*handling->fMass; + handling->fBuoyancy = 100.0f/handling->nPercentSubmerged * GRAVITY*handling->fMass; // What the hell is going on here? specificVolume = handling->Dimension.x*handling->Dimension.z*0.5f / handling->fMass; // ? |