a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-12-24 00:50:01 +00:00
Code Issues Projects Releases Wiki Activity

transmission done

Browse source
This commit is contained in:
aap 2020-08-20 10:23:43 +02:00
parent 9fd91e6250
commit 30dadcfb22
1 changed files with 36 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
src/vehicles/Transmission.cpp
View file

@ -4,6 +4,8 @@
#include "HandlingMgr.h" #include "HandlingMgr.h"
#include "Transmission.h" #include "Transmission.h"
//--MIAMI: done
void void
cTransmission::InitGearRatios(void) cTransmission::InitGearRatios(void)
{ {
@ -80,59 +82,51 @@ cTransmission::CalculateDriveAcceleration(const float &gasPedal, uint8 &gear, fl
if(fVelocity > pGearRatio->fShiftUpVelocity){ if(fVelocity > pGearRatio->fShiftUpVelocity){
if(gear != 0 || gasPedal > 0.0f){ if(gear != 0 || gasPedal > 0.0f){
gear++; gear++;
time = 0.0f;
return CalculateDriveAcceleration(gasPedal, gear, time, fVelocity, false); return CalculateDriveAcceleration(gasPedal, gear, time, fVelocity, false);
} }
}else if(fVelocity < pGearRatio->fShiftDownVelocity && gear != 0){ }else if(fVelocity < pGearRatio->fShiftDownVelocity && gear != 0){
if(gear != 1 || gasPedal < 0.0f){ if(gear != 1 || gasPedal < 0.0f){
gear--; gear--;
time = 0.0f;
return CalculateDriveAcceleration(gasPedal, gear, time, fVelocity, false); return CalculateDriveAcceleration(gasPedal, gear, time, fVelocity, false);
} }
} }
if(time > 0.0f){ float speedMul, accelMul;
// changing gears currently, can't accelerate
fAcceleration = 0.0f; if(gear < 1){
time -= CTimer::GetTimeStepInSeconds(); // going reverse
accelMul = (Flags & HANDLING_2G_BOOST) ? 2.0f : 1.0f;
speedMul = -1.0f;
}else if(nNumberOfGears == 1){
accelMul = 1.0f;
speedMul = 1.0f;
}else{ }else{
float speedMul, accelMul; // BUG or not? this is 1.0 normally but 0.0 in the highest gear
float f = 1.0f - (gear-1)/(nNumberOfGears-1);
if(gear < 1){ speedMul = 3.0f*sq(f) + 1.0f;
// going reverse // This is pretty ugly, could be written more clearly
accelMul = (Flags & HANDLING_2G_BOOST) ? 2.0f : 1.0f; if(Flags & HANDLING_2G_BOOST){
speedMul = -1.0f; if(gear == 1)
}else if(nNumberOfGears == 1){ accelMul = (Flags & HANDLING_1G_BOOST) ? 2.0f : 1.6f;
accelMul = 1.0f; else if(gear == 2)
speedMul = 1.0f; accelMul = 1.3f;
}else{ else
// BUG or not? this is 1.0 normally but 0.0 in the highest gear
float f = 1.0f - (gear-1)/(nNumberOfGears-1);
speedMul = 3.0f*sq(f) + 1.0f;
// This is pretty ugly, could be written more clearly
if(Flags & HANDLING_2G_BOOST){
if(gear == 1)
accelMul = (Flags & HANDLING_1G_BOOST) ? 3.0f : 2.0f;
else if(gear == 2)
accelMul = 1.3f;
else
accelMul = 1.0f;
}else if(Flags & HANDLING_1G_BOOST && gear == 1){
accelMul = 3.0f;
}else
accelMul = 1.0f; accelMul = 1.0f;
} }else if(Flags & HANDLING_1G_BOOST && gear == 1){
accelMul = 2.0f;
if(cheat) }else
fCheat = 1.2f; accelMul = 1.0f;
else
fCheat = 1.0f;
float targetVelocity = Gears[gear].fMaxVelocity*speedMul*fCheat;
float accel = fEngineAcceleration*accelMul * (targetVelocity - fVelocity)/Abs(targetVelocity);
if(Abs(fVelocity) < Abs(Gears[gear].fMaxVelocity*fCheat))
fAcceleration = gasPedal * accel * CTimer::GetTimeStep();
else
fAcceleration = 0.0f;
} }
if(cheat)
fCheat = 1.2f;
else
fCheat = 1.0f;
float targetVelocity = Gears[gear].fMaxVelocity*speedMul*fCheat;
float accel = fEngineAcceleration*accelMul * (targetVelocity - fVelocity)/Abs(targetVelocity);
if(Abs(fVelocity) < Abs(Gears[gear].fMaxVelocity*fCheat))
fAcceleration = gasPedal * accel * CTimer::GetTimeStep();
else
fAcceleration = 0.0f;
return fAcceleration; return fAcceleration;
} }