Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
little renamings & librw update
- Loading branch information
Showing
with
13 additions
and
13 deletions.
-
+12
−12
src/vehicles/Vehicle.cpp
-
+1
−1
vendor/librw
There are no files selected for viewing
|
|
@@ -290,18 +290,18 @@ CVehicle::FlyingControl(eFlightModel flightModel) |
|
|
case FLIGHT_MODEL_SEAPLANE: |
|
|
{ |
|
|
// thrust |
|
|
float fThrust = flightModel == FLIGHT_MODEL_RCPLANE ? fRCAeroThrust : fSeaThrust; |
|
|
float fThrustFallOff = flightModel == FLIGHT_MODEL_RCPLANE ? fRCPropFallOff : fSeaPropFallOff; |
|
|
|
|
|
float fForwSpeed = DotProduct(GetMoveSpeed(), GetForward()); |
|
|
CVector vecTail = GetColModel()->boundingBox.min.y * GetForward(); |
|
|
float fThrust = (CPad::GetPad(0)->GetAccelerate() - CPad::GetPad(0)->GetBrake()) / 255.0f; |
|
|
float fPedalState = (CPad::GetPad(0)->GetAccelerate() - CPad::GetPad(0)->GetBrake()) / 255.0f; |
|
|
if (fForwSpeed > 0.1f || (flightModel == FLIGHT_MODEL_RCPLANE && fForwSpeed > 0.02f)) |
|
|
fThrust += 1.0f; |
|
|
else if (fForwSpeed > 0.0f && fThrust < 0.0f) |
|
|
fThrust = 0.0f; |
|
|
float fThrustAccel; |
|
|
if (flightModel == FLIGHT_MODEL_RCPLANE) |
|
|
fThrustAccel = (fThrust - fRCPropFallOff * fForwSpeed) * fRCAeroThrust; |
|
|
else |
|
|
fThrustAccel = (fThrust - fSeaPropFallOff * fForwSpeed) * fSeaThrust; |
|
|
fPedalState += 1.0f; |
|
|
else if (fForwSpeed > 0.0f && fPedalState < 0.0f) |
|
|
fPedalState = 0.0f; |
|
|
float fThrustAccel = (fPedalState - fThrustFallOff * fForwSpeed) * fThrust; |
|
|
|
|
|
ApplyMoveForce(fThrustAccel * GetForward() * m_fMass * CTimer::GetTimeStep()); |
|
|
|
|
|
// left/right |
|
|
@@ -353,12 +353,12 @@ CVehicle::FlyingControl(eFlightModel flightModel) |
|
|
fPitchAccel = fSeaTailMult * fTail * Abs(fTail) + fSeaPitchMult * fSteerUD * fForwSpeed; |
|
|
ApplyTurnForce(fPitchAccel * m_fTurnMass * GetUp() * CTimer::GetTimeStep(), vecTail); |
|
|
|
|
|
float fLift = -DotProduct(GetMoveSpeed(), GetUp()) / Max(0.01f, GetMoveSpeed().Magnitude()); |
|
|
float fLift = DotProduct(GetMoveSpeed(), GetUp()) / Max(0.01f, GetMoveSpeed().Magnitude()); //accel*angle |
|
|
float fLiftAccel; |
|
|
if (flightModel == FLIGHT_MODEL_RCPLANE) |
|
|
fLiftAccel = (fRCAttackLiftMult * fLift + fRCFormLiftMult) * fForwSpeed * fForwSpeed; |
|
|
fLiftAccel = (fRCFormLiftMult - fRCAttackLiftMult * fLift) * SQR(fForwSpeed); |
|
|
else |
|
|
fLiftAccel = (fSeaAttackLiftMult * fLift + fSeaFormLiftMult) * fForwSpeed * fForwSpeed; |
|
|
fLiftAccel = (fSeaFormLiftMult - fSeaAttackLiftMult * fLift) * SQR(fForwSpeed); |
|
|
float fLiftImpulse = fLiftAccel * m_fMass * CTimer::GetTimeStep(); |
|
|
if (GRAVITY * CTimer::GetTimeStep() * m_fMass < fLiftImpulse) { |
|
|
if (flightModel == FLIGHT_MODEL_RCPLANE && GetPosition().z > 50.0f) |
|
|
|
