Changeset 1268 for code/branches/merge/src/orxonox

Timestamp:

May 13, 2008, 10:13:17 PM (16 years ago)

Author:

rgrieder

Message:

• removed some debug output

Location:

code/branches/merge/src/orxonox

Files:

• GraphicsEngine.cc (modified) (4 diffs)
• Orxonox.cc (modified) (7 diffs)

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

@@ -99 +99 @@
   void GraphicsEngine::destroy()
   {
-    COUT(4) << "Destroying objects..." << std::endl;
+    CCOUT(4) << "Destroying objects..." << std::endl;
     Ogre::WindowEventUtilities::removeWindowEventListener(this->renderWindow_, this);
     if (this->root_)
@@ -113 +113 @@
       delete Ogre::LogManager::getSingletonPtr();
     }
-    COUT(4) << "Destroying objects done" << std::endl;
+    CCOUT(4) << "Destroying objects done" << std::endl;
   }
 
@@ -139 +139 @@
     // create a logManager
     Ogre::LogManager *logger;
-    if (Ogre::LogManager::getSingletonPtr() == 0)
-      logger = new Ogre::LogManager();
-    else
-      logger = Ogre::LogManager::getSingletonPtr();
+    //if (Ogre::LogManager::getSingletonPtr() == 0)
+    // note: If there's already a logManager, Ogre will complain by a failed assertation.
+    // but that shouldn't happen, since this is the first time to create a logManager..
+    logger = new Ogre::LogManager();
+    //else
+    //  logger = Ogre::LogManager::getSingletonPtr();
     CCOUT(4) << "Ogre LogManager created/assigned" << std::endl;
 
@@ -151 +153 @@
     else
       myLog = logger->createLog(this->ogreLogfile_, true, false, false);
-    COUT(4) << "*** GraphicsEngine: Ogre Log created" << std::endl;
+    CCOUT(4) << "Ogre Log created" << std::endl;
 
     myLog->setLogDetail(Ogre::LL_BOREME);

code/branches/merge/src/orxonox/Orxonox.cc

@@ -201 +201 @@
   void Orxonox::abortRequest()
   {
-    COUT(3) << "*** Orxonox: Abort requested." << std::endl;
+    COUT(3) << "Orxonox: Abort requested." << std::endl;
     bAbort_ = true;
   }
@@ -246 +246 @@
       return false;
 
-    COUT(3) << "*** Orxonox: Mode is " << mode << "." << std::endl;
     if (mode == "client")
       mode_ = CLIENT;
@@ -252 +251 @@
       mode_ = SERVER;
     else
+    {
+      mode = "standalone";
       mode_ = STANDALONE;
+    }
+    COUT(3) << "Orxonox: Mode is " << mode << "." << std::endl;
 
     //if (mode_ == DEDICATED)
@@ -343 +346 @@
 
     // Load the HUD
-    COUT(3) << "*** Orxonox: Loading HUD..." << std::endl;
+    COUT(3) << "Orxonox: Loading HUD..." << std::endl;
     Ogre::Overlay* hudOverlay = Ogre::OverlayManager::getSingleton().getByName("Orxonox/HUD1.2");
     orxonoxHUD_ = new HUD();
@@ -350 +353 @@
     hudOverlay->show();
 
-    COUT(3) << "*** Orxonox: Loading Console..." << std::endl;
+    COUT(3) << "Orxonox: Loading Console..." << std::endl;
     InputBuffer* ib = dynamic_cast<InputBuffer*>(InputManager::getKeyHandler("buffer"));
     /*
@@ -445 +448 @@
     if (Ogre::Root::getSingletonPtr() == 0)
     {
-      COUT(2) << "*** Orxonox Error: Could not start rendering. No Ogre root object found" << std::endl;
+      COUT(2) << "Orxonox Error: Could not start rendering. No Ogre root object found" << std::endl;
       return false;
     }
@@ -466 +469 @@
     timer_->reset();
 
-    COUT(3) << "*** Orxonox: Starting the main loop." << std::endl;
+    COUT(3) << "Orxonox: Starting the main loop." << std::endl;
           while (!bAbort_)
           {