Changeset 8490 for code/branches

Timestamp:

May 16, 2011, 3:52:31 PM (14 years ago)

Author:

dboehi

Message:

Updated version of the camera shake effect, now based on sin.

Location:

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

Files:

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

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

@@ -38 +38 @@
 #include "graphics/Camera.h"
 #include "CameraManager.h"
+#include "util/Math.h"
 
 namespace orxonox
@@ -82 +83 @@
         this->cameraOriginalOrientation = c->getOrientation();
 
-        this->shakeFrequency_ = 50;
-        this->shakeAmplitude_ = 40;
+        this->shakeFrequency_ = 15;
+        this->shakeAmplitude_ = 5;
         this->shakeDt_ = 0;
     }
@@ -117 +118 @@
         registerVariable(this->boostRate_, VariableDirection::ToClient);
         registerVariable(this->boostCooldownDuration_, VariableDirection::ToClient);
+        registerVariable(this->shakeFrequency_, VariableDirection::ToClient);
     }
 
@@ -179 +181 @@
                     
                 }
-                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)
-                        {
-                                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_);
-                                //}
-
-
-                                //toggle the rotation
-                                if (1/(this->shakeFrequency_) <= shakeDt_)
-                                {
-                                        c->setAngularVelocity(-c->getAngularVelocity());
-                                        shakeDt_ = 0;
-                                }
-                        }
-                }
+                
+                shakeCamera(dt);                
             }
         }
+    }
+    
+    void SpaceShip::shakeCamera(float dt)
+    {
+            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);
+                    }
+            }
     }
 
@@ -274 +271 @@
     {   
         if(bBoost && !this->bBoostCooldown_)
+        {
+//          COUT(0) << "Boost startet!\n";
             this->bBoost_ = true;
+        }
         if(!bBoost)
         {
+//          COUT(0) << "Boost stoppt\n";
             this->resetCamera();
             this->bBoost_ = false;
@@ -327 +328 @@
     void SpaceShip::resetCamera()
     {
-            //COUT(0) << "Resetting camera\n";
+            
+//          COUT(0) << "Resetting camera\n";
             Camera *c = this->getCamera();
           
@@ -337 +339 @@
             
             shakeDt_ = 0;
-            
-            c->setAngularVelocity(Vector3(0,0,0));
+//          
             c->setPosition(this->cameraOriginalPosition);
             c->setOrientation(this->cameraOriginalOrientation);

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

@@ -109 +109 @@
             
             void resetCamera();
+            void shakeCamera(float dt);
 
             std::string enginetemplate_;