Changeset 1244 for code/branches/ogre/src/orxonox/GraphicsEngine.cc

Timestamp:

May 7, 2008, 9:20:42 AM (17 years ago)

Author:

rgrieder

Message:

• added some comments and COUTs

File:

• code/branches/ogre/src/orxonox/GraphicsEngine.cc (modified) (10 diffs)

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

@@ -70 +70 @@
     this->renderWindow_ = 0;
     this->setConfigValues();
-    COUT(4) << "*** GraphicsEngine: Constructed" << std::endl;
+    CCOUT(4) << "Constructed" << std::endl;
   }
 
@@ -87 +87 @@
   void GraphicsEngine::destroy()
   {
-    COUT(4) << "*** GraphicsEngine: Destroying objects..." << std::endl;
+    COUT(4) << "Destroying objects..." << std::endl;
     Ogre::WindowEventUtilities::removeWindowEventListener(this->renderWindow_, this);
     if (this->root_)
@@ -101 +101 @@
       delete Ogre::LogManager::getSingletonPtr();
     }
-    COUT(4) << "*** GraphicsEngine: Destroying objects done" << std::endl;
+    COUT(4) << "Destroying objects done" << std::endl;
   }
 
@@ -118 +118 @@
   bool GraphicsEngine::setup(std::string& dataPath)
   {
+    CCOUT(3) << "Setting up..." << std::endl;
     // temporary overwrite of dataPath, change ini file for permanent change
     if (dataPath != "")
@@ -139 +140 @@
     else
       logger = Ogre::LogManager::getSingletonPtr();
-    COUT(4) << "*** GraphicsEngine: Ogre LogManager created/assigned" << std::endl;
+    CCOUT(4) << "Ogre LogManager created/assigned" << std::endl;
 
     // create our own log that we can listen to
@@ -153 +154 @@
 
     // Root will detect that we've already created a Log
-    COUT(4) << "*** GraphicsEngine: Creating Ogre Root..." << std::endl;
+    CCOUT(4) << "Creating Ogre Root..." << std::endl;
     root_ = new Ogre::Root(plugin_filename);
-    COUT(4) << "*** GraphicsEngine: Creating Ogre Root done" << std::endl;
+    CCOUT(4) << "Creating Ogre Root done" << std::endl;
 
     // specify where Ogre has to look for resources. This call doesn't parse anything yet!
     declareRessourceLocations();
 
+    CCOUT(3) << "Set up done." << std::endl;
     return true;
   }
@@ -165 +167 @@
   void GraphicsEngine::declareRessourceLocations()
   {
+    CCOUT(4) << "Declaring Resources" << std::endl;
     //TODO: Specify layout of data file and maybe use xml-loader
     //TODO: Work with ressource groups (should be generated by a special loader)
@@ -194 +197 @@
   bool GraphicsEngine::loadRenderer()
   {
+    CCOUT(4) << "Configuring Renderer" << std::endl;
     if (!root_->restoreConfig() && !root_->showConfigDialog())
       return false;
 
+    CCOUT(4) << "Creating render window" << std::endl;
     this->renderWindow_ = root_->initialise(true, "OrxonoxV2");
     if (!root_->isInitialised())
-      return false;
+    {
+      CCOUT(2) << "Error: Creating Ogre root object failed" << std::endl;
+      return false;
+    }
     Ogre::WindowEventUtilities::addWindowEventListener(this->renderWindow_, this);
     Ogre::TextureManager::getSingleton().setDefaultNumMipmaps(5);
@@ -205 +213 @@
   }
 
-  void GraphicsEngine::initialiseResources()
-  {
+  bool GraphicsEngine::initialiseResources()
+  {
+    CCOUT(4) << "Initialising resources" << std::endl;
     //TODO: Do NOT load all the groups, why are we doing that? And do we really do that? initialise != load...
-    Ogre::ResourceGroupManager::getSingleton().initialiseAllResourceGroups();
+    try
+    {
+      Ogre::ResourceGroupManager::getSingleton().initialiseAllResourceGroups();
+    }
+    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;
   }
 
@@ -216 +235 @@
   bool GraphicsEngine::createNewScene()
   {
+    CCOUT(4) << "Creating new SceneManager" << std::endl;
     if (scene_)
-      return false;
+    {
+      CCOUT(2) << "SceneManager already exists! Skipping." << std::endl;
+      return false;
+    }
     scene_ = root_->createSceneManager(Ogre::ST_GENERIC, "Default SceneManager");
-    COUT(3) << "Info: Created SceneManager: " << scene_ << std::endl;
+    CCOUT(3) << "Created SceneManager: " << scene_ << std::endl;
     return true;
   }