Changeset 8587 for code/branches/presentation

Timestamp:

May 25, 2011, 11:44:04 PM (14 years ago)

Author:

dafrick

Message:

The Camera doesn't need to be a MovableEntity, which also averts problems when moving through a portal, that admits all MovableEntities.

Location:

code/branches/presentation/src/orxonox

Files:

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

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

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

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

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

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

@@ -81 +81 @@
         this->cameraOriginalPosition_ = Vector3::UNIT_SCALE;
         this->cameraOriginalOrientation_ = Quaternion::IDENTITY;
-        
 
         this->shakeFrequency_ = 15;