[Orxonox-commit 2928] r7628 - in code/branches/releasetodo/src: libraries/core orxonox

[dafrick at orxonox.net]

Author: dafrick
Date: 2010-11-10 10:28:30 +0100 (Wed, 10 Nov 2010)
New Revision: 7628

Modified:
   code/branches/releasetodo/src/libraries/core/GUIManager.cc
   code/branches/releasetodo/src/libraries/core/Loader.cc
   code/branches/releasetodo/src/libraries/core/Loader.h
   code/branches/releasetodo/src/orxonox/LevelManager.cc
Log:

Adjusting include paths of CEGUIListbox and CEGUILisbtoxItem.
Added verbose parameter to the load and reload methods of the Loader, to be able to supress (i.e. shift the output level) the output, when convenient.
Suppressing the output, when loading all levels to extract the LevelInfo.


Modified: code/branches/releasetodo/src/libraries/core/GUIManager.cc
===================================================================
--- code/branches/releasetodo/src/libraries/core/GUIManager.cc	2010-11-09 20:53:34 UTC (rev 7627)
+++ code/branches/releasetodo/src/libraries/core/GUIManager.cc	2010-11-10 09:28:30 UTC (rev 7628)
@@ -42,8 +42,8 @@
 #include <CEGUISystem.h>
 #include <CEGUIWindow.h>
 #include <CEGUIWindowManager.h>
-#include <CEGUI/elements/CEGUIListbox.h>
-#include <CEGUI/elements/CEGUIListboxItem.h>
+#include <elements/CEGUIListbox.h>
+#include <elements/CEGUIListboxItem.h>
 #include <ogreceguirenderer/OgreCEGUIRenderer.h>
 
 #include "SpecialConfig.h" // Configures the macro below

Modified: code/branches/releasetodo/src/libraries/core/Loader.cc
===================================================================
--- code/branches/releasetodo/src/libraries/core/Loader.cc	2010-11-09 20:53:34 UTC (rev 7627)
+++ code/branches/releasetodo/src/libraries/core/Loader.cc	2010-11-10 09:28:30 UTC (rev 7628)
@@ -87,11 +87,11 @@
         }
     }
 
-    bool Loader::load(const ClassTreeMask& mask)
+    bool Loader::load(const ClassTreeMask& mask, bool verbose)
     {
         bool success = true;
         for (std::vector<std::pair<const XMLFile*, ClassTreeMask> >::iterator it = Loader::files_s.begin(); it != Loader::files_s.end(); ++it)
-            if (!Loader::load(it->first, it->second * mask))
+            if (!Loader::load(it->first, it->second * mask, verbose))
                 success = false;
 
         return success;
@@ -108,13 +108,13 @@
         }
     }
 
-    bool Loader::reload(const ClassTreeMask& mask)
+    bool Loader::reload(const ClassTreeMask& mask, bool verbose)
     {
         Loader::unload(mask);
-        return Loader::load(mask);
+        return Loader::load(mask, verbose);
     }
 
-    bool Loader::load(const XMLFile* file, const ClassTreeMask& mask)
+    bool Loader::load(const XMLFile* file, const ClassTreeMask& mask, bool verbose)
     {
         if (!file)
             return false;
@@ -143,8 +143,16 @@
 
         try
         {
-            COUT(0) << "Start loading " << file->getFilename() << "..." << std::endl;
-            COUT(3) << "Mask: " << Loader::currentMask_s << std::endl;
+            if(verbose)
+            {
+                COUT(0) << "Start loading " << file->getFilename() << "..." << std::endl;
+                COUT(3) << "Mask: " << Loader::currentMask_s << std::endl;
+            }
+            else
+            {
+                COUT(4) << "Start loading " << file->getFilename() << "..." << std::endl;
+                COUT(4) << "Mask: " << Loader::currentMask_s << std::endl;
+            }
 
             ticpp::Document xmlfile(file->getFilename());
             xmlfile.Parse(xmlInput, true);
@@ -164,7 +172,10 @@
             rootNamespace->setRoot(true);
             rootNamespace->XMLPort(rootElement, XMLPort::LoadObject);
 
-            COUT(0) << "Finished loading " << file->getFilename() << '.' << std::endl;
+            if(verbose)
+                COUT(0) << "Finished loading " << file->getFilename() << '.' << std::endl;
+            else
+                COUT(4) << "Finished loading " << file->getFilename() << '.' << std::endl;
 
             COUT(4) << "Namespace-tree:" << std::endl << rootNamespace->toString("  ") << std::endl;
 
@@ -209,10 +220,10 @@
         }
     }
 
-    bool Loader::reload(const XMLFile* file, const ClassTreeMask& mask)
+    bool Loader::reload(const XMLFile* file, const ClassTreeMask& mask, bool verbose)
     {
         Loader::unload(file, mask);
-        return Loader::load(file, mask);
+        return Loader::load(file, mask, verbose);
     }
 
     std::string Loader::replaceLuaTags(const std::string& text)

Modified: code/branches/releasetodo/src/libraries/core/Loader.h
===================================================================
--- code/branches/releasetodo/src/libraries/core/Loader.h	2010-11-09 20:53:34 UTC (rev 7627)
+++ code/branches/releasetodo/src/libraries/core/Loader.h	2010-11-10 09:28:30 UTC (rev 7628)
@@ -56,13 +56,13 @@
             static void add(const XMLFile* file, const ClassTreeMask& mask = ClassTreeMask());
             static void remove(const XMLFile* file);
 
-            static bool load(const ClassTreeMask& mask = ClassTreeMask());
+            static bool load(const ClassTreeMask& mask = ClassTreeMask(), bool verbose = true);
             static void unload(const ClassTreeMask& mask = ClassTreeMask());
-            static bool reload(const ClassTreeMask& mask = ClassTreeMask());
+            static bool reload(const ClassTreeMask& mask = ClassTreeMask(), bool verbose = true);
 
-            static bool load(const XMLFile* file, const ClassTreeMask& mask = ClassTreeMask());
+            static bool load(const XMLFile* file, const ClassTreeMask& mask = ClassTreeMask(), bool verbose = true);
             static void unload(const XMLFile* file, const ClassTreeMask& mask = ClassTreeMask());
-            static bool reload(const XMLFile* file, const ClassTreeMask& mask = ClassTreeMask());
+            static bool reload(const XMLFile* file, const ClassTreeMask& mask = ClassTreeMask(), bool verbose = true);
 
             static std::string replaceLuaTags(const std::string& text);
 

Modified: code/branches/releasetodo/src/orxonox/LevelManager.cc
===================================================================
--- code/branches/releasetodo/src/orxonox/LevelManager.cc	2010-11-09 20:53:34 UTC (rev 7627)
+++ code/branches/releasetodo/src/orxonox/LevelManager.cc	2010-11-10 09:28:30 UTC (rev 7628)
@@ -164,7 +164,7 @@
                 ClassTreeMask mask = ClassTreeMask();
                 mask.exclude(ClassIdentifier<BaseObject>::getIdentifier());
                 mask.include(ClassIdentifier<LevelInfo>::getIdentifier());
-                Loader::load(&file, mask);
+                Loader::load(&file, mask, false);
                 for(ObjectList<LevelInfo>::iterator item = ObjectList<LevelInfo>::begin(); item != ObjectList<LevelInfo>::end(); ++item)
                 {
                     LevelInfoItem* info = item->copy();