mirror of
https://github.com/GTAmodding/re3.git
synced 2025-07-15 09:44:09 +00:00
rename clamp macro to Clamp to fix compilation with g++11 (and clamp2 for consistency sake)
This commit is contained in:
parent
f8297df9c5
commit
d17d437de3
41 changed files with 189 additions and 189 deletions
|
@ -533,7 +533,7 @@ CBike::ProcessControl(void)
|
|||
m_fWheelAngle += DEGTORAD(1.0f)*CTimer::GetTimeStep();
|
||||
if(bIsStanding){
|
||||
float f = Pow(0.97f, CTimer::GetTimeStep());
|
||||
m_fLeanLRAngle2 = m_fLeanLRAngle2*f - (Asin(clamp(GetRight().z,-1.0f,1.0f))+DEGTORAD(15.0f))*(1.0f-f);
|
||||
m_fLeanLRAngle2 = m_fLeanLRAngle2*f - (Asin(Clamp(GetRight().z,-1.0f,1.0f))+DEGTORAD(15.0f))*(1.0f-f);
|
||||
m_fLeanLRAngle = m_fLeanLRAngle2;
|
||||
}
|
||||
}else{
|
||||
|
@ -1028,9 +1028,9 @@ CBike::ProcessControl(void)
|
|||
lean = DotProduct(m_vecMoveSpeed-initialMoveSpeed, m_vecAvgSurfaceRight);
|
||||
lean /= GRAVITY*Max(CTimer::GetTimeStep(), 0.01f);
|
||||
if(m_wheelStatus[BIKEWHEEL_FRONT] == WHEEL_STATUS_BURST)
|
||||
lean = clamp(lean, -0.4f*pBikeHandling->fMaxLean, 0.4f*pBikeHandling->fMaxLean);
|
||||
lean = Clamp(lean, -0.4f*pBikeHandling->fMaxLean, 0.4f*pBikeHandling->fMaxLean);
|
||||
else
|
||||
lean = clamp(lean, -pBikeHandling->fMaxLean, pBikeHandling->fMaxLean);
|
||||
lean = Clamp(lean, -pBikeHandling->fMaxLean, pBikeHandling->fMaxLean);
|
||||
float f = Pow(pBikeHandling->fDesLean, CTimer::GetTimeStep());
|
||||
m_fLeanLRAngle2 = (Asin(lean) - idleAngle)*(1.0f-f) + m_fLeanLRAngle2*f;
|
||||
}else{
|
||||
|
@ -1053,11 +1053,11 @@ CBike::ProcessControl(void)
|
|||
if(m_aSuspensionSpringRatio[BIKESUSP_R1] < 1.0f || m_aSuspensionSpringRatio[BIKESUSP_R2] < 1.0f){
|
||||
// BUG: this clamp makes no sense and the arguments seem swapped too
|
||||
ApplyTurnForce(contactPoints[BIKESUSP_R1],
|
||||
m_fTurnMass*Sin(m_fBrakeDestabilization)*clamp(fwdSpeed, 0.5f, 0.2f)*0.013f*GetRight()*CTimer::GetTimeStep());
|
||||
m_fTurnMass*Sin(m_fBrakeDestabilization)*Clamp(fwdSpeed, 0.5f, 0.2f)*0.013f*GetRight()*CTimer::GetTimeStep());
|
||||
}else{
|
||||
// BUG: this clamp makes no sense and the arguments seem swapped too
|
||||
ApplyTurnForce(contactPoints[BIKESUSP_R1],
|
||||
m_fTurnMass*Sin(m_fBrakeDestabilization)*clamp(fwdSpeed, 0.5f, 0.2f)*0.003f*GetRight()*CTimer::GetTimeStep());
|
||||
m_fTurnMass*Sin(m_fBrakeDestabilization)*Clamp(fwdSpeed, 0.5f, 0.2f)*0.003f*GetRight()*CTimer::GetTimeStep());
|
||||
}
|
||||
}else
|
||||
m_fBrakeDestabilization = 0.0f;
|
||||
|
@ -1220,7 +1220,7 @@ CBike::ProcessControl(void)
|
|||
// Balance bike
|
||||
if(bBalancedByRider || bIsBeingPickedUp || bIsStanding){
|
||||
float onSideness = DotProduct(GetRight(), m_vecAvgSurfaceNormal);
|
||||
onSideness = clamp(onSideness, -1.0f, 1.0f);
|
||||
onSideness = Clamp(onSideness, -1.0f, 1.0f);
|
||||
CVector worldCOM = Multiply3x3(GetMatrix(), m_vecCentreOfMass);
|
||||
// Keep bike upright
|
||||
if(bBalancedByRider){
|
||||
|
@ -1840,7 +1840,7 @@ CBike::ProcessControlInputs(uint8 pad)
|
|||
0.2f*CTimer::GetTimeStep();
|
||||
nLastControlInput = 0;
|
||||
}
|
||||
m_fSteerInput = clamp(m_fSteerInput, -1.0f, 1.0f);
|
||||
m_fSteerInput = Clamp(m_fSteerInput, -1.0f, 1.0f);
|
||||
|
||||
// Lean forward/backward
|
||||
float updown;
|
||||
|
@ -1850,7 +1850,7 @@ CBike::ProcessControlInputs(uint8 pad)
|
|||
#endif
|
||||
updown = -CPad::GetPad(pad)->GetSteeringUpDown()/128.0f + CPad::GetPad(pad)->GetCarGunUpDown()/128.0f;
|
||||
m_fLeanInput += (updown - m_fLeanInput)*0.2f*CTimer::GetTimeStep();
|
||||
m_fLeanInput = clamp(m_fLeanInput, -1.0f, 1.0f);
|
||||
m_fLeanInput = Clamp(m_fLeanInput, -1.0f, 1.0f);
|
||||
|
||||
// Accelerate/Brake
|
||||
float acceleration = (CPad::GetPad(pad)->GetAccelerate() - CPad::GetPad(pad)->GetBrake())/255.0f;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue