Changeset 8541 for code

Timestamp:

May 23, 2011, 3:50:13 PM (14 years ago)

Author:

dboehi

Message:

Changed boost to start on key press and stop on key release

Location:

code/branches/gameimmersion

Files:

• data/defaultConfig/keybindings.ini (modified) (2 diffs)
• data/levels/templates/spaceshipImmTest.oxt (modified) (1 diff)
• src/orxonox/controllers/HumanController.cc (modified) (4 diffs)
• src/orxonox/controllers/HumanController.h (modified) (1 diff)
• src/orxonox/worldentities/pawns/SpaceShip.cc (modified) (4 diffs)

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

@@ -21 +21 @@
 KeyDown="scale -1 moveFrontBack"
 KeyE="scale -1 rotateRoll"
-KeyEnd=boost
+KeyEnd=
 KeyEquals=
 KeyEscape="keyESC"
@@ -120 +120 @@
 KeySlash=
 KeySleep=
-KeySpace=boost
+KeySpace=startBoost | stopBoost
 KeyStop=
 KeySystemRequest=

code/branches/gameimmersion/data/levels/templates/spaceshipImmTest.oxt

@@ -20 +20 @@
    linearDamping     = 0.7
    angularDamping    = 0.9999999
+   
+   shakeFrequency    = 15
   >
     <attached>

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

@@ -52 +52 @@
     SetConsoleCommand("HumanController", __CC_fire_name,           &HumanController::fire          ).addShortcut().keybindMode(KeybindMode::OnHold);
     SetConsoleCommand("HumanController", "reload",                 &HumanController::reload        ).addShortcut();
-    SetConsoleCommand("HumanController", __CC_boost_name,          &HumanController::toggleBoost   ).addShortcut().keybindMode(KeybindMode::OnPress);
+    //SetConsoleCommand("HumanController", __CC_boost_name,          &HumanController::toggleBoost   ).addShortcut().keybindMode(KeybindMode::OnPress);
+    SetConsoleCommand("HumanController", "startBoost",             &HumanController::startBoost    ).addShortcut().keybindMode(KeybindMode::OnPress);
+    SetConsoleCommand("HumanController", "stopBoost",              &HumanController::stopBoost     ).addShortcut().keybindMode(KeybindMode::OnRelease);
     SetConsoleCommand("HumanController", "greet",                  &HumanController::greet         ).addShortcut();
     SetConsoleCommand("HumanController", "switchCamera",           &HumanController::switchCamera  ).addShortcut();
@@ -171 +173 @@
     /*static*/ void HumanController::toggleBoost()
     {
+        COUT(0) << "Toggling boost!";
         if (HumanController::localController_s && HumanController::localController_s->controllableEntity_)
             HumanController::localController_s->toggleBoosting();
@@ -182 +185 @@
     void HumanController::toggleBoosting(void)
     {
+            /*
         this->boosting_ = !this->boosting_;
         
@@ -190 +194 @@
             ModifyConsoleCommand(__CC_boost_name).keybindMode(KeybindMode::OnPress);
 
-        this->controllableEntity_->boost(this->boosting_);
-    }
+        this->controllableEntity_->boost(this->boosting_);*/
+    }
+    
+    void HumanController::startBoost()
+    {
+            COUT(0) << "Starting boost" << std::endl;
+            if (HumanController::localController_s && HumanController::localController_s->controllableEntity_)
+                    HumanController::localController_s->setBoost(true);
+    }
+    
+    void HumanController::stopBoost()
+    {
+            COUT(0) << "Stopping boost" << std::endl;
+            if (HumanController::localController_s && HumanController::localController_s->controllableEntity_)
+                    HumanController::localController_s->setBoost(false);
+    }
+    
+    void HumanController::setBoost(bool bBoost)
+    {
+            this->controllableEntity_->boost(bBoost);
+    }       
 
     void HumanController::greet()

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

@@ -64 +64 @@
             static void reload();
 
+            static void startBoost();
+            static void stopBoost();
             static void toggleBoost(); // Static method,toggles boosting.
+            void setBoost(bool);
             /**
             @brief Check whether the HumanController is in boosting mode.

code/branches/gameimmersion/src/orxonox/worldentities/pawns/SpaceShip.cc

@@ -168 +168 @@
             }
 
-           // COUT(0) << "Velocity: " << this->getVelocity().length() << " - " << this->getVelocity().squaredLength() << std::endl;
-
-
             if(this->bBoost_)
             {
@@ -186 +183 @@
         }
     }
+
+    void SpaceShip::moveFrontBack(const Vector2& value)
+    {
+        this->localLinearAcceleration_.setZ(this->localLinearAcceleration_.z() - value.x);
+        this->steering_.z = -value.x;
+    }
+
+    void SpaceShip::moveRightLeft(const Vector2& value)
+    {
+        this->localLinearAcceleration_.setX(this->localLinearAcceleration_.x() + value.x);
+        this->steering_.x = value.x;
+    }
+
+    void SpaceShip::moveUpDown(const Vector2& value)
+    {
+        this->localLinearAcceleration_.setY(this->localLinearAcceleration_.y() + value.x);
+        this->steering_.y = value.x;
+    }
+
+    void SpaceShip::rotateYaw(const Vector2& value)
+    {
+        this->localAngularAcceleration_.setY(this->localAngularAcceleration_.y() + value.x);
+
+        Pawn::rotateYaw(value);
+    }
+
+    void SpaceShip::rotatePitch(const Vector2& value)
+    {
+        this->localAngularAcceleration_.setX(this->localAngularAcceleration_.x() + value.x);
+
+        Pawn::rotatePitch(value);
+    }
+
+    void SpaceShip::rotateRoll(const Vector2& value)
+    {
+        this->localAngularAcceleration_.setZ(this->localAngularAcceleration_.z() + value.x);
+
+        Pawn::rotateRoll(value);
+    }
+
+    void SpaceShip::fire()
+    {
+    }
+
+    /**
+    @brief
+        Starts or stops boosting.
+    @param bBoost
+        Whether to start or stop boosting.
+    */
+    void SpaceShip::boost(bool bBoost)
+    {   
+        if(bBoost && !this->bBoostCooldown_)
+        {
+            //COUT(0) << "Boost startet!\n";
+            this->bBoost_ = true;
+        }
+        if(!bBoost)
+        {
+            //COUT(0) << "Boost stoppt\n";
+            this->resetCamera();
+            this->bBoost_ = false;
+        }
+    }
+    
+    void SpaceShip::boostCooledDown(void)
+    {
+            this->bBoostCooldown_ = false;
+    }
     
     void SpaceShip::shakeCamera(float dt)
     {
+            //make sure the ship is only shaking if it's moving
             if (this->getVelocity().squaredLength() > 80)
             {
@@ -208 +275 @@
                     if (c != 0)
                     {
-                        c->setOrientation(Vector3::UNIT_X, angle);
+                            c->setOrientation(Vector3::UNIT_X, angle);
                     }
             }
     }
-
-
-    void SpaceShip::boostCooledDown(void)
-    {
-        this->bBoostCooldown_ = false;
-    }
-
-    void SpaceShip::moveFrontBack(const Vector2& value)
-    {
-        this->localLinearAcceleration_.setZ(this->localLinearAcceleration_.z() - value.x);
-        this->steering_.z = -value.x;
-    }
-
-    void SpaceShip::moveRightLeft(const Vector2& value)
-    {
-        this->localLinearAcceleration_.setX(this->localLinearAcceleration_.x() + value.x);
-        this->steering_.x = value.x;
-    }
-
-    void SpaceShip::moveUpDown(const Vector2& value)
-    {
-        this->localLinearAcceleration_.setY(this->localLinearAcceleration_.y() + value.x);
-        this->steering_.y = value.x;
-    }
-
-    void SpaceShip::rotateYaw(const Vector2& value)
-    {
-        this->localAngularAcceleration_.setY(this->localAngularAcceleration_.y() + value.x);
-
-        Pawn::rotateYaw(value);
-    }
-
-    void SpaceShip::rotatePitch(const Vector2& value)
-    {
-        this->localAngularAcceleration_.setX(this->localAngularAcceleration_.x() + value.x);
-
-        Pawn::rotatePitch(value);
-    }
-
-    void SpaceShip::rotateRoll(const Vector2& value)
-    {
-        this->localAngularAcceleration_.setZ(this->localAngularAcceleration_.z() + value.x);
-
-        Pawn::rotateRoll(value);
-    }
-
-    void SpaceShip::fire()
-    {
-    }
-
-    /**
-    @brief
-        Starts or stops boosting.
-    @param bBoost
-        Whether to start or stop boosting.
-    */
-    void SpaceShip::boost(bool bBoost)
-    {   
-        if(bBoost && !this->bBoostCooldown_)
-        {
-//          COUT(0) << "Boost startet!\n";
-            this->bBoost_ = true;
-        }
-        if(!bBoost)
-        {
-//          COUT(0) << "Boost stoppt\n";
-            this->resetCamera();
-            this->bBoost_ = false;
-        }
+    
+    void SpaceShip::resetCamera()
+    {
+            
+//          COUT(0) << "Resetting camera\n";
+            Camera *c = this->getCamera();
+          
+            if (c == 0)
+            {
+                    COUT(2) << "Failed to reset camera!";
+                    return;
+            }
+            
+            shakeDt_ = 0;
+            //      
+            c->setPosition(this->cameraOriginalPosition);
+            c->setOrientation(this->cameraOriginalOrientation);
     }
 
@@ -326 +341 @@
     }
     
-    void SpaceShip::resetCamera()
-    {
-            
-//          COUT(0) << "Resetting camera\n";
-            Camera *c = this->getCamera();
-          
-            if (c == 0)
-            {
-                    COUT(2) << "Failed to reset camera!";
-                    return;
-            }
-            
-            shakeDt_ = 0;
-//          
-            c->setPosition(this->cameraOriginalPosition);
-            c->setOrientation(this->cameraOriginalOrientation);
-    }
+
 }