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 4280804f41c325d4047ea9849596cf8df20d57af..cdd49f5aaec4ff58f855af221e48547e42ef66cc 100644 (file)
Binary files a/VDrift.suo and b/VDrift.suo differ

diff --git a/src/OutputHaptic.cpp b/src/OutputHaptic.cpp
index 958c7e0c0f688e92bfc6c9ffd41cff72c6ff4f68..10321ec4018bba53efe3988e9ff9f7f95f5c800f 100644 (file)
Binary files a/src/OutputHaptic.cpp and b/src/OutputHaptic.cpp differ

diff --git a/src/OutputHaptic.h b/src/OutputHaptic.h
index 0da92e308f0230b12138ff2c9662ffbeca4d049d..0369b7bbc2fdb0e67598584f6d42925cfff8209e 100644 (file)
--- 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\r
 #define MINWAIT 20
 #define MAXWAIT 500
 #define MAXSPEED 60.0\r

-#define COMPORT "COM4"
+#define COMPORT "COM6"

 
 class OutputHaptic
 {
        private:
                TactonPlayer *_tactonPlayer;
 
 class OutputHaptic
 {
        private:
                TactonPlayer *_tactonPlayer;

-               Tacton *_tactons[5];
+               Tacton *_tactons[6];

                unsigned long _lasttimestamp;
 
                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();
        public:
 
                OutputHaptic();

+               ~OutputHaptic();

 
 

-               void Update(float speed_value, float steer_value);
+               void Update(float speed_value, float steer_value, float brake_value);

 };
 
 #endif
 };
 
 #endif

diff --git a/src/car.cpp b/src/car.cpp
index ba7bcac5063e5eb0dc9c1eec594cfcaab99425b4..5fdb62f558598d648812ecd73256e6b5293c2c3c 100644 (file)
--- a/src/car.cpp
+++ b/src/car.cpp
@@ -946,7 +946,7 @@ void CAR::UpdateHaptics(float dt)
 {
        if (_outputhaptic == NULL)
                _outputhaptic = new OutputHaptic;
 {
        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 6a59cfe1215167d5e2641be2ad83102aaacf7942..8e0faacf61fb72479587c57a8548b5b44ef0561c 100644 (file)
--- 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;\r
        float n = sqrt(a * a + b * b);\r
        _laststeerleft = b / n;\r
        float b = pos[NUI_SKELETON_POSITION_HAND_RIGHT].y - pos[NUI_SKELETON_POSITION_HAND_LEFT].y;\r
        float n = sqrt(a * a + b * b);\r
        _laststeerleft = b / n;\r

-       stringstream strs;\r
+/*     stringstream strs;\r

        strs << "Left " << _laststeerleft << endl;\r
        strs << "Left " << _laststeerleft << endl;\r

-       OutputDebugString(strs.str().c_str());\r
+       OutputDebugString(strs.str().c_str());*/\r

        //SDL_Log("Left %f\n", _laststeerleft);\r
        return _laststeerleft;\r
 }\r
        //SDL_Log("Left %f\n", _laststeerleft);\r
        return _laststeerleft;\r
 }\r


@@ -166,9 +166,9 @@ float KinectInput::processSteerRight()
        float n = sqrt(a * a + b * b);\r
        _laststeerright = b / n;\r
        //SDL_Log("Right %f\n", _laststeerright);\r
        float n = sqrt(a * a + b * b);\r
        _laststeerright = b / n;\r
        //SDL_Log("Right %f\n", _laststeerright);\r

-       stringstream strs;\r
+/*     stringstream strs;\r

        strs << "Right " << _laststeerright << endl;\r
        strs << "Right " << _laststeerright << endl;\r

-       OutputDebugString(strs.str().c_str());\r
+       OutputDebugString(strs.str().c_str());*/\r

        return _laststeerright;\r
 }\r
 \r
        return _laststeerright;\r
 }\r
 \r