From c7a32bb83d5f5fe58edd9193dd5e6ce74bda092f Mon Sep 17 00:00:00 2001 From: aap Date: Tue, 9 Jun 2020 15:50:00 +0200 Subject: some camera code --- src/vehicles/Automobile.cpp | 4 ++-- src/vehicles/Bike.cpp | 14 +++++++------- src/vehicles/Bike.h | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) (limited to 'src/vehicles') diff --git a/src/vehicles/Automobile.cpp b/src/vehicles/Automobile.cpp index fcf85685..97a6ce33 100644 --- a/src/vehicles/Automobile.cpp +++ b/src/vehicles/Automobile.cpp @@ -273,14 +273,14 @@ CAutomobile::ProcessControl(void) if(CReplay::IsPlayingBack()) return; - UpdatePassengerList(); - // Heli wind if(IsRealHeli()) if((GetStatus() == STATUS_PLAYER || GetStatus() == STATUS_PHYSICS) && m_aWheelSpeed[1] > 0.075f || GetStatus() == STATUS_SIMPLE) CWindModifiers::RegisterOne(GetPosition(), 1); + UpdatePassengerList(); + // Improve grip of vehicles in certain cases bool strongGrip1 = false; bool strongGrip2 = false; diff --git a/src/vehicles/Bike.cpp b/src/vehicles/Bike.cpp index 0dee85ce..01b489b2 100644 --- a/src/vehicles/Bike.cpp +++ b/src/vehicles/Bike.cpp @@ -125,7 +125,7 @@ CBike::CBike(int32 id, uint8 CreatedBy) bIsStanding = false; bExtraSpeed = false; bIsOnFire = false; - m_bike_flag80 = false; + bWheelieCam = false; m_fTireTemperature = 1.0f; m_fBrakeDestabilization = 0.0f; @@ -314,7 +314,7 @@ CBike::ProcessControl(void) ReduceHornCounter(); bVehicleColProcessed = false; bAudioChangingGear = false; - m_bike_flag80 = false; + bWheelieCam = false; // that's all we do for simple vehicles return; @@ -324,7 +324,7 @@ CBike::ProcessControl(void) PlayHornIfNecessary(); bBalancedByRider = true; - m_bike_flag80 = false; + bWheelieCam = false; if(bIsBeingCarJacked){ m_fGasPedal = 0.0f; @@ -350,7 +350,7 @@ CBike::ProcessControl(void) bBalancedByRider = (pDriver || pPassengers[0] || bIsBeingCarJacked) && !bIsStanding; m_fPedLeanAmountLR = 0.0f; m_fPedLeanAmountUD = 0.0f; - m_bike_flag80 = false; + bWheelieCam = false; if(bIsBeingCarJacked){ m_fGasPedal = 0.0f; @@ -371,7 +371,7 @@ CBike::ProcessControl(void) m_nCarHornTimer = 0; bBalancedByRider = false; - m_bike_flag80 = false; + bWheelieCam = false; m_fPedLeanAmountLR = 0.0f; m_fPedLeanAmountUD = 0.0f; break; @@ -393,7 +393,7 @@ CBike::ProcessControl(void) m_nCarHornTimer = 0; bBalancedByRider = true; - m_bike_flag80 = false; + bWheelieCam = false; break; } @@ -1344,7 +1344,7 @@ CBike::PreRender(void) // 1.0 if directly behind car, -1.0 if in front float behindness = DotProduct(lookVector, GetForward()); // 0.0 if behind car, PI if in front - float angle = Abs(PI/2.0f - Acos(Abs(behindness))); + float angle = Abs(Acos(Abs(behindness))); // Headlight diff --git a/src/vehicles/Bike.h b/src/vehicles/Bike.h index a13e4c56..669e236e 100644 --- a/src/vehicles/Bike.h +++ b/src/vehicles/Bike.h @@ -73,7 +73,7 @@ public: uint8 bIsStanding : 1; uint8 bExtraSpeed : 1; // leaning forward uint8 bIsOnFire : 1; - uint8 m_bike_flag80 : 1; + uint8 bWheelieCam : 1; int16 m_doingBurnout; float m_fTireTemperature; float m_fBrakeDestabilization; -- cgit v1.2.3