Changeset 2019 for code/branches/objecthierarchy/src/orxonox/objects/CameraHandler.h

Timestamp:

Oct 27, 2008, 4:08:51 AM (17 years ago)

Author:

landauf

Message:

many changes, most important: BaseObject takes now a pointer to it's creator which is needed to build a level hierarchy (with different scenes)

File:

• code/branches/objecthierarchy/src/orxonox/objects/CameraHandler.h (modified) (2 diffs)

code/branches/objecthierarchy/src/orxonox/objects/CameraHandler.h

@@ -36 +36 @@
 #define _Camera_Handler_H__
 
+#include "OrxonoxPrereqs.h"
+
 #include <list>
-
 #include <OgreCamera.h>
-
-#include "OrxonoxPrereqs.h"
 
 #include "core/BaseObject.h"
@@ -46 +45 @@
 namespace orxonox
 {
-  class _OrxonoxExport CameraHandler
-  {
+    class _OrxonoxExport CameraHandler
+    {
+        public:
+            static CameraHandler& getInstance();
 
-    public:
-      inline static CameraHandler* getInstance() { if (!CameraHandler::singletonRef) CameraHandler::singletonRef = new CameraHandler(); return CameraHandler::singletonRef; }
-      inline ~CameraHandler() { CameraHandler::singletonRef = NULL; }
-      inline Camera* getActiveCamera() { return this->focusList_.back(); }
-      /*void registerCamera(Camera* newCam);
-      void changeActiveCamera(Camera* setCam);*/
-      void requestFocus(Camera* requestCam);
-      void releaseFocus(Camera* cam);
+            Camera* getActiveCamera() const;
 
-    private:
-      CameraHandler();
-      //bool isInVector(Camera* cam);
+            void requestFocus(Camera* camera);
+            void releaseFocus(Camera* camera);
 
-    private:
-      static CameraHandler* singletonRef;
-      Ogre::Camera* cam_;
-      std::list<Camera*> focusList_;
-      //std::vector<Camera*> cams_;
+        private:
+            CameraHandler();
+            ~CameraHandler() {}
 
-  };
+            std::list<Camera*> cameraList_;
+    };
 }