Changeset 1652 for code/branches/gui/src/orxonox

Timestamp:

Jul 28, 2008, 8:45:31 PM (16 years ago)

Author:

rgrieder

Message:

• clean up in OrxonoxPlatform.h
• that's it

Location:

code/branches/gui/src/orxonox

Files:

• GraphicsEngine.cc (modified) (2 diffs)
• GraphicsEngine.h (modified) (2 diffs)

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

@@ -267 +267 @@
     }
 
-    bool GraphicsEngine::loadRenderer()
+    void GraphicsEngine::loadRenderer()
     {
         CCOUT(4) << "Configuring Renderer" << std::endl;
@@ -286 +286 @@
         if (!root_->restoreConfig())
             if (!root_->showConfigDialog())
-                return false;
+                ThrowException(InitialisationFailed, "Could not show Ogre configuration dialogue.");
 
         CCOUT(4) << "Creating render window" << std::endl;
-        try
-        {
-            this->renderWindow_ = root_->initialise(true, "OrxonoxV2");
-        }
-        catch (std::exception& ex)
-        {
-            COUT(2) << "Error: There was an exception when initialising Ogre Root." << std::endl;
-                        COUT(1) << ex.what() << std::endl;
-            return false;
-        }
-
-        if (!root_->isInitialised())
-        {
-            CCOUT(2) << "Error: Initialising Ogre root object failed." << std::endl;
-            return false;
-        }
+
+        this->renderWindow_ = root_->initialise(true, "OrxonoxV2");
+
         Ogre::WindowEventUtilities::addWindowEventListener(this->renderWindow_, this);
+
         //Ogre::TextureManager::getSingleton().setDefaultNumMipmaps(5);
 
-        // create a full screen viewport
+        // create a full screen default viewport
         this->viewport_ = this->renderWindow_->addViewport(0, 0);
-
-        return true;
     }
 

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

@@ -47 +47 @@
 #include "core/OrxonoxClass.h"
 
-
 namespace orxonox
 {
@@ -62 +61 @@
         void setup();
         void declareRessourceLocations();
-        bool loadRenderer();
+        void loadRenderer();
         bool initialiseResources();
         bool createNewScene();