Changeset 8254 for code

Timestamp:

Apr 18, 2011, 4:04:40 PM (14 years ago)

Author:

dboehi

Message:

Added possibibility to change the frequency of the shaking camera in the
space ship configuration file.

Location:

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

Files:

• SpaceShip.cc (modified) (7 diffs)
• SpaceShip.h (modified) (3 diffs)

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

@@ -83 +83 @@
         this->cameraOriginalOrientation = c->getOrientation();
 
-        this->shakeFrequency_ = 100;
+        this->shakeFrequency_ = 20;
         this->shakeAmplitude_ = 40;
-        this->shakeDeltaTime_ = 0;
+        this->shakeDt_ = 0;
     }
 
@@ -106 +106 @@
         XMLPortParamVariable(SpaceShip, "boostRate", boostRate_, xmlelement, mode);
         XMLPortParamVariable(SpaceShip, "boostCooldownDuration", boostCooldownDuration_, xmlelement, mode);
+        XMLPortParamVariable(SpaceShip, "shakeFrequency", shakeFrequency_, xmlelement, mode);
     }
 
@@ -161 +162 @@
             }
 
-        Camera* c = CameraManager::getInstance().getActiveCamera();
+
+        Camera* c = this->getCamera();
             if(this->bBoost_)
             {
@@ -174 +176 @@
                 else
                 {
-                        this->shakeDeltaTime_ += dt;
+                        this->shakeDt_ += dt;
 
                         //Shaking Camera effect
@@ -183 +185 @@
                                 {
                                         c->setAngularVelocity(Vector3(2,0,0));
-                                        this->shakeDeltaTime_ = 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_) <= shakeDeltaTime_)
+                                if (1/(this->shakeFrequency_) <= shakeDt_)
                                 {
                                         c->setAngularVelocity(-c->getAngularVelocity());
-                                        shakeDeltaTime_ = 0;
+                                        shakeDt_ = 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;
-                                */
                         }
                 }
@@ -208 +205 @@
                     //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);
+                    this->resetCamera();
             }
         }
@@ -325 +320 @@
         return list;
     }
+    
+    void SpaceShip::resetCamera()
+    {
+            Camera *c = this->getCamera();
+            
+            assert(c != 0);
+            
+            c->setAngularVelocity(Vector3(0,0,0));
+            c->setPosition(this->cameraOriginalPosition);
+            c->setOrientation(this->cameraOriginalOrientation);
+    }
 }

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

@@ -106 +106 @@
             float shakeFrequency_;
             float shakeAmplitude_;
-            float shakeDeltaTime_;
 
         private:
@@ -115 +114 @@
             
             void boostCooledDown(void);
+            
+            void resetCamera();
 
             std::string enginetemplate_;
@@ -121 +122 @@
             Vector3 cameraOriginalPosition;
             Quaternion cameraOriginalOrientation;
+            
+            float shakeDt_;
     };
 }