Changeset 8579 for code/branches/presentation/src/orxonox/graphics

Timestamp:

May 25, 2011, 9:28:29 PM (14 years ago)

Author:

dafrick

Message:

Reverse merge to revert last, failed, merge. Apparently you can't partially commit a merge.

Location:

code/branches/presentation/src/orxonox/graphics

Files:

• Camera.cc (modified) (1 diff)
• Camera.h (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;