Changeset 6412 for code/branches/pickup2/src/orxonox/graphics/Camera.h

Timestamp:

Dec 25, 2009, 1:18:03 PM (15 years ago)

Author:

dafrick

Message:

Merged presentation2 branch into pickup2 branch.

Location:

code/branches/pickup2

Files:

• . (modified) (1 prop)
• src/orxonox/graphics/Camera.h (modified) (3 diffs)

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

@@ -34 +34 @@
 #include "util/OgreForwardRefs.h"
 #include "tools/interfaces/Tickable.h"
+#include "tools/interfaces/TimeFactorListener.h"
 #include "worldentities/StaticEntity.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport Camera : public StaticEntity, public Tickable
+    class _OrxonoxExport Camera : public StaticEntity, public Tickable, public TimeFactorListener
     {
         friend class CameraManager;
@@ -51 +52 @@
             void requestFocus();
             void releaseFocus();
+
+            inline Ogre::Camera* getOgreCamera()
+               { return this->camera_; }
 
             inline bool hasFocus()
@@ -69 +73 @@
             bool             bHasFocus_;
             bool             bDrag_;
+            bool             lastDtLagged_;
     };
 }