[Orxonox-commit 3913] r8587 - in code/branches/presentation/src/orxonox: graphics worldentities/pawns

[dafrick at orxonox.net]

Author: dafrick
Date: 2011-05-25 23:44:04 +0200 (Wed, 25 May 2011)
New Revision: 8587

Modified:
   code/branches/presentation/src/orxonox/graphics/Camera.cc
   code/branches/presentation/src/orxonox/graphics/Camera.h
   code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.cc
Log:
The Camera doesn't need to be a MovableEntity, which also averts problems when moving through a portal, that admits all MovableEntities.


Modified: code/branches/presentation/src/orxonox/graphics/Camera.cc
===================================================================
--- code/branches/presentation/src/orxonox/graphics/Camera.cc	2011-05-25 21:07:46 UTC (rev 8586)
+++ code/branches/presentation/src/orxonox/graphics/Camera.cc	2011-05-25 21:44:04 UTC (rev 8587)
@@ -47,7 +47,7 @@
 {
     CreateFactory(Camera);
 
-    Camera::Camera(BaseObject* creator) : MovableEntity(creator)
+    Camera::Camera(BaseObject* creator) : StaticEntity(creator)
     {
         RegisterObject(Camera);
 

Modified: code/branches/presentation/src/orxonox/graphics/Camera.h
===================================================================
--- code/branches/presentation/src/orxonox/graphics/Camera.h	2011-05-25 21:07:46 UTC (rev 8586)
+++ code/branches/presentation/src/orxonox/graphics/Camera.h	2011-05-25 21:44:04 UTC (rev 8587)
@@ -35,12 +35,12 @@
 #include "core/WindowEventListener.h"
 #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;
 

Modified: code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.cc
===================================================================
--- code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.cc	2011-05-25 21:07:46 UTC (rev 8586)
+++ code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.cc	2011-05-25 21:44:04 UTC (rev 8587)
@@ -80,7 +80,6 @@
         
         this->cameraOriginalPosition_ = Vector3::UNIT_SCALE;
         this->cameraOriginalOrientation_ = Quaternion::IDENTITY;
-        
 
         this->shakeFrequency_ = 15;
         this->shakeAmplitude_ = 5;