Changeset 8138 for code/branches

Timestamp:

Mar 28, 2011, 3:13:04 PM (14 years ago)

Author:

dboehi

Message:

First version of the camera shake effect for the afterburner

Location:

code/branches/gameimmersion/src/orxonox

Files:

• graphics/Camera.cc (modified) (1 diff)
• graphics/Camera.h (modified) (1 diff)
• worldentities/pawns/SpaceShip.cc (modified) (4 diffs)
• worldentities/pawns/SpaceShip.h (modified) (1 diff)

code/branches/gameimmersion/src/orxonox/graphics/Camera.cc

@@ -48 +48 @@
     CreateFactory(Camera);
 
-    Camera::Camera(BaseObject* creator) : StaticEntity(creator)
+    //Camera::Camera(BaseObject* creator) : StaticEntity(creator)
+    Camera::Camera(BaseObject* creator) : MovableEntity(creator)
     {
         RegisterObject(Camera);

code/branches/gameimmersion/src/orxonox/graphics/Camera.h

@@ -36 +36 @@
 #include "tools/interfaces/Tickable.h"
 #include "tools/interfaces/TimeFactorListener.h"
-#include "worldentities/StaticEntity.h"
+//#include "worldentities/StaticEntity.h"
+#include "worldentities/MovableEntity.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport Camera : public StaticEntity, public Tickable, public TimeFactorListener, public WindowEventListener
+    //class _OrxonoxExport Camera : public StaticEntity, public Tickable, public TimeFactorListener, public WindowEventListener
+    class _OrxonoxExport Camera : public MovableEntity, public TimeFactorListener, public WindowEventListener
     {
         friend class CameraManager;

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

@@ -36 +36 @@
 #include "core/XMLPort.h"
 #include "items/Engine.h"
+#include "graphics/Camera.h"
+#include "CameraManager.h"
 
 namespace orxonox
@@ -76 +78 @@
         this->setConfigValues();
         this->registerVariables();
+        
+        Camera* c = CameraManager::getInstance().getActiveCamera();
+        this->cameraOriginalPosition = c->getPosition();
+        this->cameraOriginalOrientation = c->getOrientation();
     }
 
@@ -152 +158 @@
             if(this->bBoost_)
             {
+                Camera* c = CameraManager::getInstance().getActiveCamera();
                 this->boostPower_ -=this->boostRate_*dt;
                 if(this->boostPower_ <= 0.0f)
@@ -158 +165 @@
                     this->bBoostCooldown_ = true;
                     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";
+                        if (c != 0)
+                        {
+                                c->setVelocity(0.1, 2.0, 0.3);
+                        }
+                }
             }
         }

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

@@ -114 +114 @@
             Engine* engine_;
             Timer timer_;
+            Vector3 cameraOriginalPosition;
+            Quaternion cameraOriginalOrientation;
     };
 }