From: Thomas Pietrzak <thomas.pietrzak@gmail.com>
Date: Wed, 23 Jan 2013 10:55:46 +0000 (+0000)
Subject: Added Tactile fluids, fixed tactile buttons
X-Git-Url: https://git.thomaspietrzak.com/?a=commitdiff_plain;p=kinectdrift.git

Added Tactile fluids, fixed tactile buttons

git-svn-id: svn+ssh://thomaspietrzak.com/var/svn/rep@100 47cf9a05-e0a8-4ed5-9e9b-101a649bc004
---

diff --git a/VDrift.suo b/VDrift.suo
index 4280804..cdd49f5 100644
Binary files a/VDrift.suo and b/VDrift.suo differ
diff --git a/src/OutputHaptic.cpp b/src/OutputHaptic.cpp
index 958c7e0..10321ec 100644
Binary files a/src/OutputHaptic.cpp and b/src/OutputHaptic.cpp differ
diff --git a/src/OutputHaptic.h b/src/OutputHaptic.h
index 0da92e3..0369b7b 100644
--- a/src/OutputHaptic.h
+++ b/src/OutputHaptic.h
@@ -13,21 +13,22 @@ using namespace std;
 #define MINWAIT 20
 #define MAXWAIT 500
 #define MAXSPEED 60.0
-#define COMPORT "COM4"
+#define COMPORT "COM6"
 
 class OutputHaptic
 {
 	private:
 		TactonPlayer *_tactonPlayer;
-		Tacton *_tactons[5];
+		Tacton *_tactons[6];
 		unsigned long _lasttimestamp;
 
-		enum TACTON_CONFIG{TACTON_STRAIGHT, TACTON_FAR_RIGHT, TACTON_RIGHT, TACTON_FAR_LEFT, TACTON_LEFT };
+		enum TACTON_CONFIG{TACTON_STRAIGHT, TACTON_FAR_RIGHT, TACTON_RIGHT, TACTON_FAR_LEFT, TACTON_LEFT, TACTON_BRAKE, NB_TACTONS };
 	public:
 
 		OutputHaptic();
+		~OutputHaptic();
 
-		void Update(float speed_value, float steer_value);
+		void Update(float speed_value, float steer_value, float brake_value);
 };
 
 #endif
diff --git a/src/car.cpp b/src/car.cpp
index ba7bcac..5fdb62f 100644
--- a/src/car.cpp
+++ b/src/car.cpp
@@ -946,7 +946,7 @@ void CAR::UpdateHaptics(float dt)
 {
 	if (_outputhaptic == NULL)
 		_outputhaptic = new OutputHaptic;
-	_outputhaptic->Update(dynamics.GetSpeed(), GetLastSteer());
+	_outputhaptic->Update(dynamics.GetSpeed(), GetLastSteer(), dynamics.GetBrake(FRONT_LEFT).GetBrakeFactor());
 }
 
 
diff --git a/src/kinectinput.cpp b/src/kinectinput.cpp
index 6a59cfe..8e0faac 100644
--- a/src/kinectinput.cpp
+++ b/src/kinectinput.cpp
@@ -131,9 +131,9 @@ float KinectInput::processSteerLeft()
 	float b = pos[NUI_SKELETON_POSITION_HAND_RIGHT].y - pos[NUI_SKELETON_POSITION_HAND_LEFT].y;
 	float n = sqrt(a * a + b * b);
 	_laststeerleft = b / n;
-	stringstream strs;
+/*	stringstream strs;
 	strs << "Left " << _laststeerleft << endl;
-	OutputDebugString(strs.str().c_str());
+	OutputDebugString(strs.str().c_str());*/
 	//SDL_Log("Left %f\n", _laststeerleft);
 	return _laststeerleft;
 }
@@ -166,9 +166,9 @@ float KinectInput::processSteerRight()
 	float n = sqrt(a * a + b * b);
 	_laststeerright = b / n;
 	//SDL_Log("Right %f\n", _laststeerright);
-	stringstream strs;
+/*	stringstream strs;
 	strs << "Right " << _laststeerright << endl;
-	OutputDebugString(strs.str().c_str());
+	OutputDebugString(strs.str().c_str());*/
 	return _laststeerright;
 }