Changeset 5924 for code/branches/core5/src/orxonox/CameraManager.h

Timestamp:

Oct 9, 2009, 6:04:16 PM (16 years ago)

Author:

scheusso

Message:

reverted r5911 partially and removed fallbackcamera
level scene now gets deleted after all when changing from level to mainmenu

File:

• code/branches/core5/src/orxonox/CameraManager.h (modified) (3 diffs)

code/branches/core5/src/orxonox/CameraManager.h

@@ -41 +41 @@
 #include <list>
 #include "util/OgreForwardRefs.h"
-#include "core/BaseObject.h"
+#include "util/Singleton.h"
+#include "core/OrxonoxClass.h"
+#include "core/SmartPtr.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport CameraManager : public BaseObject
+    class _OrxonoxExport CameraManager : public Singleton<CameraManager>, public OrxonoxClass
     {
+            friend class Singleton<CameraManager>;
         public:
-            CameraManager(BaseObject* creator);
+            CameraManager();
             ~CameraManager();
 
@@ -58 +61 @@
             void useCamera(Ogre::Camera* camera);
 
+            static CameraManager* getInstancePtr() { return singletonPtr_s; }
+
         private:
             CameraManager(const CameraManager&); // don't use
@@ -63 +68 @@
             std::list<Camera*>    cameraList_;
             Ogre::Viewport*       viewport_;
-            Ogre::Camera*         fallbackCamera_;
+
+            static CameraManager* singletonPtr_s;
     };
 }