Changeset 8191 for code/branches/gameimmersion

Timestamp:

Apr 4, 2011, 4:19:57 PM (14 years ago)

Author:

dboehi

Message:

Update version of the boost effect,
the camera is rotating up and down if the
boost is active.

Location:

code/branches/gameimmersion/src/orxonox/worldentities/pawns

Files:

• SpaceShip.cc (modified) (3 diffs)
• SpaceShip.h (modified) (1 diff)

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

@@ -82 +82 @@
         this->cameraOriginalPosition = c->getPosition();
         this->cameraOriginalOrientation = c->getOrientation();
+
+        this->shakeFrequency_ = 100;
+        this->shakeAmplitude_ = 40;
+        this->shakeDeltaTime_ = 0;
     }
 
@@ -156 +160 @@
                 this->boostPower_ += this->boostPowerRate_*dt;
             }
+
+        Camera* c = CameraManager::getInstance().getActiveCamera();
             if(this->bBoost_)
             {
-                Camera* c = CameraManager::getInstance().getActiveCamera();
                 this->boostPower_ -=this->boostRate_*dt;
                 if(this->boostPower_ <= 0.0f)
@@ -166 +171 @@
                     this->timer_.setTimer(this->boostCooldownDuration_, false, createExecutor(createFunctor(&SpaceShip::boostCooledDown, this)));
                     
-                    c->setVelocity(0,0,0);
-                    c->setPosition(this->cameraOriginalPosition);
-                    c->setOrientation(this->cameraOriginalOrientation);
                 }
                 else
                 {
-                        //Kamera schuettelt
-                        COUT(1) << "Afterburner effect\n";
+                        this->shakeDeltaTime_ += dt;
+
+                        //Shaking Camera effect
                         if (c != 0)
                         {
-                                c->setVelocity(0.1, 2.0, 0.3);
+
+                                if (c->getAngularVelocity() == Vector3(0,0,0))
+                                {
+                                        c->setAngularVelocity(Vector3(2,0,0));
+                                        this->shakeDeltaTime_ = 0;
+                                }
+
+
+                                //toggle the rotation
+                                if (1/(this->shakeFrequency_) <= shakeDeltaTime_)
+                                {
+                                        c->setAngularVelocity(-c->getAngularVelocity());
+                                        shakeDeltaTime_ = 0;
+                                }
+
+                                
+                                /*
+                                COUT(1) << "Time since change: " << shakeDeltaTime_ << std::endl;
+                                COUT(1) << "Rotation Rate: " << c->getRotationRate() << std::endl;
+                                COUT(1) << "Angular Velocity: " << c->getAngularVelocity().length();
+                                COUT(1) << std::endl;
+                                */
                         }
                 }
             }
+            else
+            {
+                    //reset the camera, if the boost is not active
+                    //TODO: don't call this every tick
+                    c->setAngularVelocity(Vector3(0,0,0));
+                    c->setPosition(this->cameraOriginalPosition);
+                    c->setOrientation(this->cameraOriginalOrientation);
+            }
         }
     }

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

@@ -103 +103 @@
             btVector3 localAngularAcceleration_;
 
+
+            float shakeFrequency_;
+            float shakeAmplitude_;
+            float shakeDeltaTime_;
+
         private:
             void registerVariables();