Changeset 1653 for code/branches/gui/src/orxonox/objects/CameraHandler.cc

Timestamp:

Aug 5, 2008, 9:50:26 PM (16 years ago)

Author:

rgrieder

Message:

• getInstance is probably more suitable than getSingleton (as x3n has already done so in most of his classes) I changed it in Orxonox and GraphicsEngine. Maybe more to come.
• Removed derivation from BaseObject in InputState (templates work well too, don't need a factory at all)

File:

• code/branches/gui/src/orxonox/objects/CameraHandler.cc (modified) (1 diff)

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

@@ -44 +44 @@
   CameraHandler::CameraHandler()
   {
-    this->cam_ = GraphicsEngine::getSingleton().getLevelSceneManager()->createCamera("Cam");
-    GraphicsEngine::getSingleton().getViewport()->setCamera(this->cam_);
-    //GraphicsEngine::getSingleton().getRenderWindow()->addViewport(this->cam_, 2, 0.4, 0.4, 0.2, 0.2);
+    this->cam_ = GraphicsEngine::getInstance().getLevelSceneManager()->createCamera("Cam");
+    GraphicsEngine::getInstance().getViewport()->setCamera(this->cam_);
+    //GraphicsEngine::getInstance().getRenderWindow()->addViewport(this->cam_, 2, 0.4, 0.4, 0.2, 0.2);
     /*this->activeCamera_ = *ObjectList<Camera>::begin();
     this->activeCamera_->cam_ = this->cam_;*/