Changeset 1653 for code/branches/gui/src/orxonox/GraphicsEngine.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/GraphicsEngine.cc (modified) (12 diffs)

code/branches/gui/src/orxonox/GraphicsEngine.cc

@@ -64 +64 @@
 namespace orxonox
 {
+    SetConsoleCommand(GraphicsEngine, printScreen, true).setKeybindMode(KeybindMode::OnPress);
+
     GraphicsEngine* GraphicsEngine::singletonRef_s = 0;
 
@@ -72 +74 @@
         The only instance of GraphicsEngine.
     */
-    /*static*/ GraphicsEngine& GraphicsEngine::getSingleton()
+    /*static*/ GraphicsEngine& GraphicsEngine::getInstance()
     {
         assert(singletonRef_s);
@@ -128 +130 @@
         if (this->root_)
             delete this->root_;
-        this->root_ = 0;
-        this->levelSceneManager_ = 0;
-        this->renderWindow_ = 0;
 
 #if ORXONOX_PLATFORM == ORXONOX_PLATFORM_WIN32
@@ -154 +153 @@
         CCOUT(3) << "Setting up..." << std::endl;
 
-        // TODO: LogManager doesn't work on linux platform. The why is yet unknown.
+        // TODO: LogManager doesn't work on oli platform. The why is yet unknown.
 #if ORXONOX_PLATFORM == ORXONOX_PLATFORM_WIN32
         // create a new logManager
@@ -193 +192 @@
         root_ = new Ogre::Root(ogrePluginsFile_, ogreConfigFile_, ogreLogFile_);
 
-        if (!root_->getInstalledPlugins().size())
-        {
-            ThrowException(PluginsNotFound, "No Ogre plugins declared. Cannot load Ogre.");
-        }
-
-#if 0 // Ogre 1.4.3 doesn't support setDebugOutputEnabled(.)
-//#if ORXONOX_PLATFORM != ORXONOX_PLATFORM_WIN32
+        // We don't need plugins for the dedicated..
+        //if (!root_->getInstalledPlugins().size() > 0)
+        //{
+        //    ThrowException(PluginsNotFound, "No Ogre plugins declared. Cannot load Ogre.");
+        //}
+
+#if 0 // Ogre 1.4.3 doesn't yet support setDebugOutputEnabled(.)
+#if ORXONOX_PLATFORM != ORXONOX_PLATFORM_WIN32
         // tame the ogre ouput so we don't get all the mess in the console
         Ogre::Log* defaultLog = Ogre::LogManager::getSingleton().getDefaultLog();
@@ -206 +206 @@
         defaultLog->addListener(this);
 #endif
+#endif
 
         CCOUT(4) << "Creating Ogre Root done" << std::endl;
@@ -233 +234 @@
             cf.load(Settings::getDataPath() + resourceFile_);
         }
-        catch (Ogre::Exception& ex)
-        {
-            COUT(1) << ex.getFullDescription() << std::endl;
+        catch (...)
+        {
+            //COUT(1) << ex.getFullDescription() << std::endl;
             COUT(0) << "Have you forgotten to set the data path in orxnox.ini?" << std::endl;
             throw;
@@ -300 +301 @@
     }
 
-    bool GraphicsEngine::initialiseResources()
+    void GraphicsEngine::initialiseResources()
     {
         CCOUT(4) << "Initialising resources" << std::endl;
@@ -313 +314 @@
             }*/
         }
-        catch (Ogre::Exception& e)
-        {
-            CCOUT(2) << "Error: There was an Error when initialising the resources." << std::endl;
-            CCOUT(2) << "ErrorMessage: " << e.getFullDescription() << std::endl;
-            return false;
-        }
-        return true;
+        catch (...)
+        {
+            CCOUT(2) << "Error: There was a serious error when initialising the resources." << std::endl;
+            throw;
+        }
     }
 
@@ -326 +325 @@
         Creates the SceneManager
     */
-    bool GraphicsEngine::createNewScene()
+    void GraphicsEngine::createNewScene()
     {
         CCOUT(4) << "Creating new SceneManager..." << std::endl;
@@ -332 +331 @@
         {
             CCOUT(2) << "SceneManager already exists! Skipping." << std::endl;
-            return false;
         }
         this->levelSceneManager_ = this->root_->createSceneManager(Ogre::ST_GENERIC, "LevelSceneManager");
-        CCOUT(3) << "Created SceneManager: " << levelSceneManager_ << std::endl;
-        return true;
+        CCOUT(3) << "Created SceneManager: " << levelSceneManager_->getName() << std::endl;
     }
 
@@ -487 +484 @@
     }
 
+
+    /*static*/ void GraphicsEngine::printScreen()
+    {
+        if (getInstance().renderWindow_)
+        {
+            getInstance().renderWindow_->writeContentsToTimestampedFile("shot_", ".jpg");
+        }
+    }
 }