[Orxonox-commit 4190] r8861 - in code/trunk/src: libraries/core orxonox/sound

[landauf at orxonox.net]

Author: landauf
Date: 2011-08-23 14:30:23 +0200 (Tue, 23 Aug 2011)
New Revision: 8861

Modified:
   code/trunk/src/libraries/core/GUIManager.cc
   code/trunk/src/libraries/core/Game.cc
   code/trunk/src/libraries/core/GraphicsManager.cc
   code/trunk/src/orxonox/sound/AmbientSound.cc
Log:
added some additional output for loading steps that might take some time on slow systems

Modified: code/trunk/src/libraries/core/GUIManager.cc
===================================================================
--- code/trunk/src/libraries/core/GUIManager.cc	2011-08-22 23:08:52 UTC (rev 8860)
+++ code/trunk/src/libraries/core/GUIManager.cc	2011-08-23 12:30:23 UTC (rev 8861)
@@ -320,6 +320,7 @@
         guiSystem_->injectMousePosition((float)mousePosition.first, (float)mousePosition.second);
 
         // Initialise the Lua framework and load the schemes
+        orxout(user_info) << "Loading user interface..." << endl;
         this->luaState_->doFile("InitialiseGUI.lua");
 
         // Create the root nodes

Modified: code/trunk/src/libraries/core/Game.cc
===================================================================
--- code/trunk/src/libraries/core/Game.cc	2011-08-22 23:08:52 UTC (rev 8860)
+++ code/trunk/src/libraries/core/Game.cc	2011-08-23 12:30:23 UTC (rev 8861)
@@ -177,8 +177,7 @@
         this->updateGameStateStack();
 
         orxout(user_status) << "Game loaded" << endl;
-        orxout(internal_status) << "--------------------------------------------------" << endl;
-        orxout(internal_status) << "starting main loop..." << endl;
+        orxout(internal_status) << "-------------------- starting main loop --------------------" << endl;
 
         // START GAME
         // first delta time should be about 0 seconds
@@ -233,8 +232,7 @@
                 this->updateFPSLimiter();
         }
 
-        orxout(internal_status) << "finished main loop" << endl;
-        orxout(internal_status) << "--------------------------------------------------" << endl;
+        orxout(internal_status) << "-------------------- finished main loop --------------------" << endl;
 
         // UNLOAD all remaining states
         while (this->loadedStates_.size() > 1)

Modified: code/trunk/src/libraries/core/GraphicsManager.cc
===================================================================
--- code/trunk/src/libraries/core/GraphicsManager.cc	2011-08-22 23:08:52 UTC (rev 8860)
+++ code/trunk/src/libraries/core/GraphicsManager.cc	2011-08-23 12:30:23 UTC (rev 8861)
@@ -182,14 +182,17 @@
         orxout(internal_info) << "GraphicsManager upgrade to graphics" << endl;
 
         // load all the required plugins for Ogre
+        orxout(user_info) << "Loading Ogre plugins..." << endl;
         this->loadOgrePlugins();
 
+        orxout(user_info) << "Creating render window..." << endl;
         this->loadRenderer();
 
         // Initialise all resources (do this AFTER the renderer has been loaded!)
         // Note: You can only do this once! Ogre will check whether a resource group has
         // already been initialised. If you need to load resources later, you will have to
         // choose another resource group.
+        orxout(user_info) << "Initializing all resource groups..." << endl;
         Ogre::ResourceGroupManager::getSingleton().initialiseAllResourceGroups();
 
         orxout(internal_info) << "GraphicsManager finished upgrade to graphics" << endl;

Modified: code/trunk/src/orxonox/sound/AmbientSound.cc
===================================================================
--- code/trunk/src/orxonox/sound/AmbientSound.cc	2011-08-22 23:08:52 UTC (rev 8860)
+++ code/trunk/src/orxonox/sound/AmbientSound.cc	2011-08-23 12:30:23 UTC (rev 8861)
@@ -91,9 +91,14 @@
             const std::string& path = "ambient/" + mood + '/' + this->ambientSource_;
             shared_ptr<ResourceInfo> fileInfo = Resource::getInfo(path);
             if (fileInfo != NULL)
+            {
+                orxout(user_info) << "Loading ambient sound " << path << "..." << endl; // TODO: make this output internal if we implement sound streaming
                 this->setSource(path);
+            }
             else
+            {
                 orxout(internal_warning, context::sound) << this->ambientSource_ << ": Not a valid name! Ambient sound will not change." << endl;
+            }
         }
     }