Merge remote-tracking branch 'origin/havok' into particles

Conflicts: src/Components/Vehicle.h
2014-05-12 15:43:41 +02:00
parent e0b5b72454 2aa51c3e90
commit 457ee84903
34 changed files with 1243 additions and 447 deletions
@@ -10,7 +10,8 @@ namespace Components
 struct Vehicle : Component
 {
 	Vehicle()
-		: MaxTorque(500.0f), MinRPM(1000.0f), OptimalRPM(5500.0f), MaxRPM(7500.0f), MaxSteeringAngle(35), TopSpeed(50.0f) { }
+		: MaxTorque(1000.0f), MinRPM(1000.0f), OptimalRPM(3000.0f), MaxRPM(4000.0f), MaxSteeringAngle(35), TopSpeed(130.0f),
+	MaxSpeedFullSteeringAngle(40.0f){ }

 	float MaxTorque;
 	float MinRPM;
@@ -18,8 +19,10 @@ struct Vehicle : Component
 	float MaxRPM;
 	// Degrees
 	float MaxSteeringAngle;
+	//TopSpeed not working fully yet 
 	float TopSpeed;
-
+	float MaxSpeedFullSteeringAngle;
+	
 	Vehicle* Clone() const override { return new Vehicle(*this); }
 };