[Orxonox-commit 1455] r6173 - code/branches/presentation2/src/orxonox/controllers

[wirthmi at orxonox.net]

Author: wirthmi
Date: 2009-11-27 13:11:53 +0100 (Fri, 27 Nov 2009)
New Revision: 6173

Modified:
   code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc
   code/branches/presentation2/src/orxonox/controllers/NewHumanController.h
Log:
Working permanent acceleration.


Modified: code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc
===================================================================
--- code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc	2009-11-27 11:42:38 UTC (rev 6172)
+++ code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc	2009-11-27 12:11:53 UTC (rev 6173)
@@ -106,7 +106,19 @@
             // TODO: update aimPosition of Pawn
 
             if ( this->acceleration_ > 0 )
-                HumanController::moveFrontBack(Vector2(clamp(this->acceleration_ + this->currentAcceleration_, 0.0f, 1.0f), 0));
+            {
+/*
+if (this->controllableEntity_ && this->controllableEntity_->getEngine()) {
+    std::cout << this->controllableEntity_->getEngine()->getAccelerationFront() << endl;
+}
+*/
+                if ( this->accelerating_ )
+                    HumanController::moveFrontBack(Vector2(1, 0));
+                else
+                    HumanController::moveFrontBack(Vector2(this->acceleration_, 0)); 
+                this->accelerating_ = false;
+                //HumanController::moveFrontBack(Vector2(clamp(this->acceleration_ + this->currentAcceleration_, 0.0f, 1.0f), 0));
+            }
         }
 
         HumanController::tick(dt);
@@ -238,9 +250,9 @@
 
     void NewHumanController::frontback(const Vector2& value)
     {
-        this->currentAcceleration_ = value.x;
+        this->accelerating_ = true;
 
-        if (this->acceleration_ == 0)
+        //if (this->acceleration_ == 0)
             HumanController::frontback(value);
     }
 
@@ -284,8 +296,7 @@
     {
         if ( NewHumanController::localController_s )
         {
-            NewHumanController::localController_s->acceleration_ += 0.08;
-            NewHumanController::localController_s->acceleration_ = clamp(NewHumanController::localController_s->acceleration_ + 0.08f, 0.0f, 1.0f);
+            NewHumanController::localController_s->acceleration_ = clamp(NewHumanController::localController_s->acceleration_ + 0.2f, 0.00f, 1.0f);
         }
     }
 
@@ -293,7 +304,7 @@
     {
         if ( NewHumanController::localController_s )
         {
-            NewHumanController::localController_s->acceleration_ = clamp(NewHumanController::localController_s->acceleration_ - 0.05f, 0.0f, 1.0f);
+            NewHumanController::localController_s->acceleration_ = clamp(NewHumanController::localController_s->acceleration_ - 0.1f, 0.0f, 1.0f);
         }
     }
 }

Modified: code/branches/presentation2/src/orxonox/controllers/NewHumanController.h
===================================================================
--- code/branches/presentation2/src/orxonox/controllers/NewHumanController.h	2009-11-27 11:42:38 UTC (rev 6172)
+++ code/branches/presentation2/src/orxonox/controllers/NewHumanController.h	2009-11-27 12:11:53 UTC (rev 6173)
@@ -69,7 +69,7 @@
             float                       currentPitch_;
             OrxonoxOverlay*             crossHairOverlay_;
             float                       overlaySize_;
-            float                       currentAcceleration_;
+            bool                        accelerating_;
             float                       acceleration_;
             ClassTreeMask               targetMask_;
     };