Sophie

Sophie

distrib > Mageia > 9 > armv7hl > media > core-release-src > by-pkgid > c66f6322b95219b7ead4e4902713df94 > files > 1

vdrift-20141020-18.mga9.src.rpm

diff -urNp vdrift/src/ai/ai_car_experimental.cpp.orig vdrift/src/ai/ai_car_experimental.cpp
--- vdrift/src/ai/ai_car_experimental.cpp.orig	2022-12-08 07:08:51.059701945 +0100
+++ vdrift/src/ai/ai_car_experimental.cpp	2022-12-08 07:14:56.851202505 +0100
@@ -829,7 +829,7 @@ float AiCarExperimental::SteerAwayFromOt
 {
 	const float spacingdistance = 3.5; //how far left and right we target for our spacing in meters (center of mass to center of mass)
 	const float horizontal_meters_per_second = 5.0; //how fast we want to steer away in horizontal meters per second
-	const float speed = std::max(1.0f, car->GetVelocity().length());
+	const float speed = std::max(btScalar(1.0f), car->GetVelocity().length());
 	const float authority = std::min(10.0, (180.0 / 3.141593) * atan(horizontal_meters_per_second / speed)); //steering bias authority limit magnitude in degrees
 	const float gain = 4.0; //amplify steering command by this factor
 	const float mineta = 1.0; //fastest reaction time in seconds
diff -urNp vdrift/src/ai/ai_car_standard.cpp.orig vdrift/src/ai/ai_car_standard.cpp
--- vdrift/src/ai/ai_car_standard.cpp.orig	2022-12-08 07:17:01.521716412 +0100
+++ vdrift/src/ai/ai_car_standard.cpp	2022-12-08 07:17:03.971726511 +0100
@@ -704,7 +704,7 @@ float AiCarStandard::SteerAwayFromOthers
 {
 	const float spacingdistance = 3.5; //how far left and right we target for our spacing in meters (center of mass to center of mass)
 	const float horizontal_meters_per_second = 5.0; //how fast we want to steer away in horizontal meters per second
-	const float speed = std::max(1.0f, car->GetVelocity().length());
+	const float speed = std::max(btScalar(1.0f), car->GetVelocity().length());
 	const float authority = std::min(10.0, (180.0 / 3.141593) * atan(horizontal_meters_per_second / speed)); //steering bias authority limit magnitude in degrees
 	const float gain = 4.0; //amplify steering command by this factor
 	const float mineta = 1.0; //fastest reaction time in seconds
diff -urNp vdrift/src/physics/cardynamics.cpp.orig vdrift/src/physics/cardynamics.cpp
--- vdrift/src/physics/cardynamics.cpp.orig	2022-12-08 07:20:14.922513565 +0100
+++ vdrift/src/physics/cardynamics.cpp	2022-12-08 07:23:04.163211075 +0100
@@ -1716,7 +1716,7 @@ btScalar CarDynamics::AutoClutch(btScala
 		btScalar ramp = 0.8f * (rpm_engine - rpm_stall) / (rpm_min - rpm_stall);
 		btScalar torque_limit = engine.GetTorque() * ramp;
 		clutch_new = torque_limit / clutch.GetMaxTorque();
-		btClamp(clutch_new, 0.0f, 1.0f);
+		btClamp(clutch_new, btScalar(0.0f), btScalar(1.0f));
 	}
 
 	// shifting