Changeset 8574 for code/branches/gameimmersion

Timestamp:

May 25, 2011, 6:23:51 PM (13 years ago)

Author:

dafrick

Message:

Reverting boost changes.

Location:

code/branches/gameimmersion

Files:

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

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

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

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", "startBoost",             &HumanController::startBoost    ).addShortcut().keybindMode(KeybindMode::OnPress);
-    SetConsoleCommand("HumanController", "stopBoost",              &HumanController::stopBoost     ).addShortcut().keybindMode(KeybindMode::OnRelease);
+    SetConsoleCommand("HumanController", __CC_boost_name,          &HumanController::toggleBoost   ).addShortcut().keybindMode(KeybindMode::OnPress);
     SetConsoleCommand("HumanController", "greet",                  &HumanController::greet         ).addShortcut();
     SetConsoleCommand("HumanController", "switchCamera",           &HumanController::switchCamera  ).addShortcut();
@@ -173 +171 @@
     /*static*/ void HumanController::toggleBoost()
     {
-        COUT(0) << "Toggling boost!";
+        COUT(3) << "Toggling boost!" << endl; // TODO: Remove!
         if (HumanController::localController_s && HumanController::localController_s->controllableEntity_)
             HumanController::localController_s->toggleBoosting();
@@ -185 +183 @@
     void HumanController::toggleBoosting(void)
     {
-            /*
         this->boosting_ = !this->boosting_;
         
@@ -194 +191 @@
             ModifyConsoleCommand(__CC_boost_name).keybindMode(KeybindMode::OnPress);
 
-        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);
-    }       
+        this->controllableEntity_->boost(this->boosting_);
+    }
 
     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);
+            static void toggleBoost(); // Static method, toggles boosting.
             /**
             @brief Check whether the HumanController is in boosting mode.

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

@@ -78 +78 @@
         this->setConfigValues();
         this->registerVariables();
-        
-        Camera* c = CameraManager::getInstance().getActiveCamera();
-        this->cameraOriginalPosition = c->getPosition();
-        this->cameraOriginalOrientation = c->getOrientation();
-
-        this->shakeFrequency_ = 15;
-        this->shakeAmplitude_ = 5;
-        this->shakeDt_ = 0;
+        
+        Camera* c = CameraManager::getInstance().getActiveCamera();
+        this->cameraOriginalPosition = c->getPosition();
+        this->cameraOriginalOrientation = c->getOrientation();
+
+        this->shakeFrequency_ = 15;
+        this->shakeAmplitude_ = 5;
+        this->shakeDt_ = 0;
     }
 
@@ -106 +106 @@
         XMLPortParamVariable(SpaceShip, "boostRate", boostRate_, xmlelement, mode);
         XMLPortParamVariable(SpaceShip, "boostCooldownDuration", boostCooldownDuration_, xmlelement, mode);
-        XMLPortParamVariable(SpaceShip, "shakeFrequency", shakeFrequency_, xmlelement, mode);
+        XMLPortParamVariable(SpaceShip, "shakeFrequency", shakeFrequency_, xmlelement, mode);
     }
 
@@ -118 +118 @@
         registerVariable(this->boostRate_, VariableDirection::ToClient);
         registerVariable(this->boostCooldownDuration_, VariableDirection::ToClient);
-        registerVariable(this->shakeFrequency_, VariableDirection::ToClient);
+        registerVariable(this->shakeFrequency_, VariableDirection::ToClient);
     }
 
@@ -144 +144 @@
         if (this->hasLocalController())
         {
-                
+
 /*
             this->localLinearAcceleration_.setX(this->localLinearAcceleration_.x() * getMass() * this->auxilaryThrust_);
@@ -176 +176 @@
                     this->bBoostCooldown_ = true;
                     this->timer_.setTimer(this->boostCooldownDuration_, false, createExecutor(createFunctor(&SpaceShip::boostCooledDown, this)));
-                    
+
                 }
-                
-                shakeCamera(dt);                
+
+                shakeCamera(dt);    
             }
         }
@@ -234 +234 @@
     */
     void SpaceShip::boost(bool bBoost)
-    {   
+    {
         if(bBoost && !this->bBoostCooldown_)
-        {
-            //COUT(0) << "Boost startet!\n";
+        {
+            //COUT(0) << "Boost startet!\n";
             this->bBoost_ = true;
-        }
+        }
         if(!bBoost)
-        {
-            //COUT(0) << "Boost stoppt\n";
-            this->resetCamera();
+        {
+            //COUT(0) << "Boost stoppt\n";
+            this->resetCamera();
             this->bBoost_ = false;
-        }
+        }
     }
     
     void SpaceShip::boostCooledDown(void)
     {
-            this->bBoostCooldown_ = false;
+        this->bBoostCooldown_ = false;
     }
     
     void SpaceShip::shakeCamera(float dt)
     {
-            //make sure the ship is only shaking if it's moving
-            if (this->getVelocity().squaredLength() > 80)
-            {
-                    this->shakeDt_ += dt;
-                    
-                    int frequency = this->shakeFrequency_ * (this->getVelocity().squaredLength());
-                    
-                    if (this->shakeDt_ >= 1 /(frequency))
-                    {
-                            this->shakeDt_ -= 1/(frequency);
-                    }
-                    
-                    Degree angle = Degree(sin(this->shakeDt_ * 2* math::pi * frequency) * this->shakeAmplitude_);
-                        
-//                  COUT(0) << "Angle: " << angle << std::endl;
-                    Camera* c = this->getCamera();
-
-                        //Shaking Camera effect
-                    if (c != 0)
-                    {
-                            c->setOrientation(Vector3::UNIT_X, angle);
-                    }
-            }
+        //make sure the ship is only shaking if it's moving
+        if (this->getVelocity().squaredLength() > 80)
+        {
+            this->shakeDt_ += dt;
+    
+            int frequency = this->shakeFrequency_ * (this->getVelocity().squaredLength());
+    
+            if (this->shakeDt_ >= 1 /(frequency))
+            {
+                this->shakeDt_ -= 1/(frequency);
+            }
+    
+            Degree angle = Degree(sin(this->shakeDt_ * 2* math::pi * frequency) * this->shakeAmplitude_);
+    
+            //COUT(0) << "Angle: " << angle << std::endl;
+            Camera* c = this->getCamera();
+
+            //Shaking Camera effect
+            if (c != 0)
+            {
+                c->setOrientation(Vector3::UNIT_X, angle);
+            }
+        }
     }
     
     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);
+    
+        //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);
     }