Changeset 2023 for code/branches/objecthierarchy/src/orxonox/objects/CameraHandler.cc

Timestamp:

Oct 27, 2008, 10:56:51 PM (16 years ago)

Author:

rgrieder

Message:

• Added support for dedicated server. Could not network test it yet, client still segfaults me.
• Also kicked GraphicsEngine::levelSceneManager_, there are only the statistic methods left.
• GSDedicated also derives from GSLevel, but GSLevel is not anymore a real GameState.
• CameraHandler and LevelManager get created in GSLevel now.

File:

• code/branches/objecthierarchy/src/orxonox/objects/CameraHandler.cc (modified) (3 diffs)

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

@@ -29 +29 @@
 #include "CameraHandler.h"
 
-#include <OgreSceneManager.h>
-#include <OgreRenderWindow.h>
+#include <OgreViewport.h>
 
-#include "core/ObjectList.h"
 #include "core/Core.h"
 #include "Camera.h"
-#include "GraphicsEngine.h"
 
-#include <OgreCamera.h>
 
 namespace orxonox
 {
-    CameraHandler::CameraHandler()
+    CameraHandler* CameraHandler::singletonRef_s = 0;
+
+    CameraHandler::CameraHandler(Ogre::Viewport* viewport)
+        : viewport_(viewport)
     {
-//        GraphicsEngine::getInstance().getViewport()->setCamera(this->cam_);
+        assert(singletonRef_s == 0);
+        singletonRef_s = this;
     }
 
-    CameraHandler& CameraHandler::getInstance()
+    CameraHandler::~CameraHandler()
     {
-        static CameraHandler instance;
-        return instance;
+        assert(singletonRef_s != 0);
+        singletonRef_s = 0;
     }
 
@@ -71 +71 @@
         // add to list
         this->cameraList_.push_front(camera);
-        camera->setFocus(GraphicsEngine::getInstance().getViewport());
+        camera->setFocus(this->viewport_);
     }
 
@@ -87 +87 @@
             // set new focus if necessary
             if (cameraList_.size() > 0)
-                cameraList_.front()->setFocus(GraphicsEngine::getInstance().getViewport());
+                cameraList_.front()->setFocus(this->viewport_);
         }
         else