Changeset 8427

Timestamp:

May 9, 2011, 3:19:22 PM (14 years ago)

Author:

dboehi

Message:

Shake effect now depends on the velocity of the space ship

File:

• code/branches/gameimmersion/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) (6 diffs)

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

@@ -142 +142 @@
         if (this->hasLocalController())
         {
+                
 /*
             this->localLinearAcceleration_.setX(this->localLinearAcceleration_.x() * getMass() * this->auxilaryThrust_);
@@ -165 +166 @@
             }
 
+           // COUT(0) << "Velocity: " << this->getVelocity().length() << " - " << this->getVelocity().squaredLength() << std::endl;
 
 
@@ -172 +174 @@
                 if(this->boostPower_ <= 0.0f)
                 {
-                    this->bBoost_ = false;
+                    this->boost(false);
                     this->bBoostCooldown_ = true;
                     this->timer_.setTimer(this->boostCooldownDuration_, false, createExecutor(createFunctor(&SpaceShip::boostCooledDown, this)));
                     
                 }
-                else
+                if (this->getVelocity().squaredLength() > 20)
                 {
                         this->shakeDt_ += dt;
                         
                         Camera* c = this->getCamera();
+                        
+                        this->shakeFrequency_ = this->getVelocity().squaredLength() / 10000;
+                        
+                        COUT(0) << "ShakeFrequency: " << this->shakeFrequency_ << std::endl;
 
                         //Shaking Camera effect
                         if (c != 0)
                         {
-
-                                if (c->getAngularVelocity() == Vector3(0,0,0))
-                                {
-                                        c->setAngularVelocity(Vector3(2,0,0));
+                                c->setAngularVelocity(Vector3(shakeFrequency_,0 , 0));
+
+                                //if (c->getAngularVelocity() == Vector3(0,0,0))
+                                //{
+                                //      c->setAngularVelocity(Vector3(2,0,0));
 
                                         //set the delta to half the period time,
                                         //so the camera shakes up and down.
-                                        this->shakeDt_ = 1/(2 * this->shakeFrequency_);
-                                }
+                                //      this->shakeDt_ = 1/(2 * this->shakeFrequency_);
+                                //}
 
 
@@ -209 +216 @@
     }
 
+
     void SpaceShip::boostCooledDown(void)
     {
@@ -264 +272 @@
     */
     void SpaceShip::boost(bool bBoost)
-    {
-        Camera* c = this->getCamera();
-        
+    {   
         if(bBoost && !this->bBoostCooldown_)
             this->bBoost_ = true;
         if(!bBoost)
         {
+            this->resetCamera();
             this->bBoost_ = false;
-            this->resetCamera();
         }
     }
@@ -321 +327 @@
     void SpaceShip::resetCamera()
     {
+            //COUT(0) << "Resetting camera\n";
             Camera *c = this->getCamera();
-            
-            assert(c != 0);
           
             if (c == 0)