From 0fdf965e6a8f65349ebcc9f4fa63417c5463497f Mon Sep 17 00:00:00 2001
From: pouillot <pouillot@30fe4595-0a0c-4342-8851-515496e4dcbd>
Date: Wed, 5 May 2010 22:30:22 +0000
Subject: [PATCH] re #115 (keyboard steering) : applied Jepz patch for smoother
 steering, plase test and report

git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@2430 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 8e61f8f726cb22e8bee1618e8ca7639a70b3bcf4
Former-commit-id: 1fd1ddbcaaed216f8738b5310d0feb0c759f5d58
---
 src/drivers/human/human.cpp | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/src/drivers/human/human.cpp b/src/drivers/human/human.cpp
index 59a812d5..6aea57ff 100644
--- a/src/drivers/human/human.cpp
+++ b/src/drivers/human/human.cpp
@@ -23,6 +23,10 @@
     @version	$Id$
 */
 
+// Comment out the following line to get back to the old "binary control command
+// steering smoother code".
+#define JEPZ_BINCTRL_STEERING
+
 #include <map>
 #include <string>
 
@@ -540,7 +544,9 @@ common_drive(const int index, tCarElt* car, tSituation *s)
 	tdble throttle;
 	tdble leftSteer;
 	tdble rightSteer;
+#ifdef JEPZ_BINCTRL_STEERING
 	tdble sensFrac, speedFrac;
+#endif
 	int scrw, scrh, dummy;
 	
 	const int idx = index - 1;
@@ -658,6 +664,19 @@ common_drive(const int index, tCarElt* car, tSituation *s)
 			} else {
 				ax0 = joyInfo->levelup[cmd[CMD_LEFTSTEER].val];
 			}
+#ifdef JEPZ_BINCTRL_STEERING
+			if (ax0 == 0) {
+				leftSteer = HCtx[idx]->prevLeftSteer - s->deltaTime * 5.0;
+			} else {
+				ax0 = 2 * ax0 - 1;
+				sensFrac = (cmd[CMD_LEFTSTEER].sens != 0.0) ? 10.0 / cmd[CMD_LEFTSTEER].sens : 1.0;
+				speedFrac = fabs(car->_speed_x * cmd[CMD_LEFTSTEER].spdSens * 100.0);
+				if (speedFrac < 1.0) speedFrac = 1.0;
+				leftSteer = HCtx[idx]->prevLeftSteer + s->deltaTime * ax0 * sensFrac / speedFrac;
+			}
+			if (leftSteer > 1.0) leftSteer = 1.0;
+			if (leftSteer < 0.0) leftSteer = 0.0;
+#else
 			if (ax0 == 0) {
 				leftSteer = 0;
 			} else {
@@ -666,6 +685,7 @@ common_drive(const int index, tCarElt* car, tSituation *s)
 				if (leftSteer > 1.0) leftSteer = 1.0;
 				if (leftSteer < 0.0) leftSteer = 0.0;
 			}
+#endif			
 			HCtx[idx]->prevLeftSteer = leftSteer;
 			break;
 		default:
@@ -703,6 +723,19 @@ common_drive(const int index, tCarElt* car, tSituation *s)
 			} else {
 				ax0 = joyInfo->levelup[cmd[CMD_RIGHTSTEER].val];
 			}
+#ifdef JEPZ_BINCTRL_STEERING
+			if (ax0 == 0) {
+				rightSteer = HCtx[idx]->prevRightSteer + s->deltaTime * 5.0;
+			} else {
+				ax0 = 2 * ax0 - 1;
+				sensFrac = (cmd[CMD_RIGHTSTEER].sens != 0.0) ? 10.0 / cmd[CMD_RIGHTSTEER].sens : 1.0;
+				speedFrac = fabs(car->_speed_x * cmd[CMD_RIGHTSTEER].spdSens * 100.0);
+				if (speedFrac < 1.0) speedFrac = 1.0;
+				rightSteer = HCtx[idx]->prevRightSteer - s->deltaTime * ax0 * sensFrac / speedFrac;
+			}
+			if (rightSteer > 0.0) rightSteer = 0.0;
+			if (rightSteer < -1.0) rightSteer = -1.0;
+#else
 			if (ax0 == 0) {
 				rightSteer = 0;
 			} else {
@@ -711,6 +744,7 @@ common_drive(const int index, tCarElt* car, tSituation *s)
 				if (rightSteer > 0.0) rightSteer = 0.0;
 				if (rightSteer < -1.0) rightSteer = -1.0;
 			}
+#endif
 			HCtx[idx]->prevRightSteer = rightSteer;
 			break;
 		default: