Changeset 6173 for code/branches/presentation2/src/orxonox

Timestamp:

Nov 27, 2009, 1:11:53 PM (15 years ago)

Author:

wirthmi

Message:

Working permanent acceleration.

Location:

code/branches/presentation2/src/orxonox/controllers

Files:

• NewHumanController.cc (modified) (4 diffs)
• NewHumanController.h (modified) (1 diff)

code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc

@@ -107 +107 @@
 
             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));
+            }
         }
 
@@ -239 +251 @@
     void NewHumanController::frontback(const Vector2& value)
     {
-        this->currentAcceleration_ = value.x;
-
-        if (this->acceleration_ == 0)
+        this->accelerating_ = true;
+
+        //if (this->acceleration_ == 0)
             HumanController::frontback(value);
     }
@@ -285 +297 @@
         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);
         }
     }
@@ -294 +305 @@
         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);
         }
     }

code/branches/presentation2/src/orxonox/controllers/NewHumanController.h

@@ -70 +70 @@
             OrxonoxOverlay*             crossHairOverlay_;
             float                       overlaySize_;
-            float                       currentAcceleration_;
+            bool                        accelerating_;
             float                       acceleration_;
             ClassTreeMask               targetMask_;