Changeset 6149

Timestamp:

Nov 25, 2009, 4:20:05 PM (15 years ago)

Author:

wirthmi

Message:

Introduced new feature: permanent speed

Location:

code/branches/presentation2

Files:

• data/defaultConfig/keybindings.ini (modified) (1 diff)
• src/orxonox/controllers/HumanController.cc (modified) (1 diff)
• src/orxonox/controllers/HumanController.h (modified) (2 diffs)
• src/orxonox/controllers/NewHumanController.cc (modified) (6 diffs)
• src/orxonox/controllers/NewHumanController.h (modified) (3 diffs)

code/branches/presentation2/data/defaultConfig/keybindings.ini

@@ -147 +147 @@
 
 [MouseButtons]
-MouseButton3=
-MouseButton4=
-MouseButton5=
-MouseButton6=
-MouseButton7=
-MouseLeft="fire 0"
-MouseMiddle=
-MouseRight="fire 1"
-MouseWheel1Down=
-MouseWheel1Up=
-MouseWheel2Down=
-MouseWheel2Up=
+Button3=
+Button4=
+Button5=
+Button6=
+Button7=
 Left="fire 0"
+Middle=
 Right="fire 1"
+Wheel1Down="NewHumanController decelerate"
+Wheel1Up="NewHumanController accelerate"
+Wheel2Down=
+Wheel2Up=
 
 [MouseAxes]

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

@@ -95 +95 @@
     }
 
-    void HumanController::moveFrontBack(const Vector2& value)
+    void HumanController::frontback(const Vector2& value)
     {
         if (HumanController::localController_s && HumanController::localController_s->controllableEntity_)

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

@@ -45 +45 @@
             virtual void tick(float dt);
 
-            static void moveFrontBack(const Vector2& value);
+            static void moveFrontBack(const Vector2& value){ HumanController::localController_s->frontback(value); }
             static void moveRightLeft(const Vector2& value);
             static void moveUpDown(const Vector2& value);
@@ -52 +52 @@
             static void rotatePitch(const Vector2& value){ HumanController::localController_s->pitch(value); }
             static void rotateRoll(const Vector2& value);
-            
+
+            virtual void frontback(const Vector2& value);
             virtual void yaw(const Vector2& value);
             virtual void pitch(const Vector2& value);

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

@@ -47 +47 @@
 {
     SetConsoleCommand(NewHumanController, changeMode,          false).keybindMode(KeybindMode::OnPress);
+    SetConsoleCommand(NewHumanController, accelerate,          false).keybindMode(KeybindMode::OnPress);
+    SetConsoleCommand(NewHumanController, decelerate,          false).keybindMode(KeybindMode::OnPress);
 
     CreateUnloadableFactory(NewHumanController);
@@ -60 +62 @@
         overlaySize_ = 0.08;
         controlMode_ = 0;
+        acceleration_ = 0;
+
+        //currentPitch_ = 1;
+        //currentYaw_ = 1;
 
         if (GameMode::showsGraphics())
@@ -98 +104 @@
                 this->crossHairOverlay_->hide();
             // TODO: update aimPosition of Pawn
+
+            if ( this->acceleration_ > 0 )
+                HumanController::moveFrontBack(Vector2(clamp(this->acceleration_ + this->currentAcceleration_, 0.0f, 1.0f), 0));
         }
 
@@ -230 +239 @@
     }
 
+    void NewHumanController::frontback(const Vector2& value)
+    {
+        this->currentAcceleration_ = value.x;
+
+        if (this->acceleration_ == 0)
+            HumanController::frontback(value);
+    }
+
     void NewHumanController::yaw(const Vector2& value)
     {
@@ -248 +265 @@
     }
 
-    void NewHumanController::changeMode() {
+    void NewHumanController::changeMode()
+    {
         if (NewHumanController::localController_s && NewHumanController::localController_s->controlMode_ == 0)
         {
@@ -264 +282 @@
         this->currentPitch_ = 0;
     }
+
+    void NewHumanController::accelerate()
+    {
+        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);
+        }
+    }
+
+    void NewHumanController::decelerate()
+    {
+        if ( NewHumanController::localController_s ) {
+            NewHumanController::localController_s->acceleration_ = clamp(NewHumanController::localController_s->acceleration_ - 0.05f, 0.0f, 1.0f);
+        }
+    }
 }

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

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 
+#include "util/Math.h"
+
 #include "core/ClassTreeMask.h"
 #include "HumanController.h"
@@ -45 +47 @@
             virtual void tick(float dt);
 
+            virtual void frontback(const Vector2& value);
             virtual void yaw(const Vector2& value);
             virtual void pitch(const Vector2& value);
+
+            static void accelerate();
+            static void decelerate();
 
             virtual void doFire(unsigned int firemode);
 
             static void changeMode();
-            
+
             virtual void changedControllableEntity();
 
         protected:
             void updateTarget();
-            
+
             unsigned int                controlMode_;
             static NewHumanController*  localController_s;
@@ -64 +70 @@
             OrxonoxOverlay*             crossHairOverlay_;
             float                       overlaySize_;
+            float                       currentAcceleration_;
+            float                       acceleration_;
             ClassTreeMask               targetMask_;
     };