[Orxonox-commit 2834] r7537 - in code/branches/data_cleanup: data data/gui src/libraries/core src/libraries/tools

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2010-10-13 20:36:22 +0200 (Wed, 13 Oct 2010)
New Revision: 7537

Added:
   code/branches/data_cleanup/data/gui/looknfeels/
Modified:
   code/branches/data_cleanup/data/DefaultResources.oxr
   code/branches/data_cleanup/src/libraries/core/GUIManager.cc
   code/branches/data_cleanup/src/libraries/tools/ResourceLocation.cc
Log:
Moved content of resource group "GUI" to "General" and added looknfeels from data repository.

Modified: code/branches/data_cleanup/data/DefaultResources.oxr
===================================================================
--- code/branches/data_cleanup/data/DefaultResources.oxr	2010-10-13 18:35:37 UTC (rev 7536)
+++ code/branches/data_cleanup/data/DefaultResources.oxr	2010-10-13 18:36:22 UTC (rev 7537)
@@ -1,14 +1,13 @@
 <ResourceCollection resourceGroup = "General" >
-    <ResourceLocation path = "levels" />
+    <ResourceLocation path = "levels" recursive=true/>
     <ResourceLocation path = "lua" />
     <ResourceLocation path = "overlays" />
     <ResourceLocation path = "particle" />
     <ResourceLocation path = "tcl" />
-</ResourceCollection>
 
-<ResourceCollection resourceGroup = "GUI" >
     <ResourceLocation path = "gui/configs" />
     <ResourceLocation path = "gui/layouts" />
+    <ResourceLocation path = "gui/looknfeels" />
     <ResourceLocation path = "gui/schemes" />
     <ResourceLocation path = "gui/scripts" />
 </ResourceCollection>

Modified: code/branches/data_cleanup/src/libraries/core/GUIManager.cc
===================================================================
--- code/branches/data_cleanup/src/libraries/core/GUIManager.cc	2010-10-13 18:35:37 UTC (rev 7536)
+++ code/branches/data_cleanup/src/libraries/core/GUIManager.cc	2010-10-13 18:36:22 UTC (rev 7537)
@@ -122,7 +122,7 @@
         // Note: No SceneManager specified yet
         guiRenderer_.reset(new OgreCEGUIRenderer(GraphicsManager::getInstance().getRenderWindow(), Ogre::RENDER_QUEUE_OVERLAY, false, 3000));
         resourceProvider_ = guiRenderer_->createResourceProvider();
-        resourceProvider_->setDefaultResourceGroup("GUI");
+        resourceProvider_->setDefaultResourceGroup("General");
 
         // Setup scripting
         luaState_.reset(new LuaState());

Modified: code/branches/data_cleanup/src/libraries/tools/ResourceLocation.cc
===================================================================
--- code/branches/data_cleanup/src/libraries/tools/ResourceLocation.cc	2010-10-13 18:35:37 UTC (rev 7536)
+++ code/branches/data_cleanup/src/libraries/tools/ResourceLocation.cc	2010-10-13 18:36:22 UTC (rev 7537)
@@ -48,7 +48,7 @@
 
         // Default values
         archiveType_ = "FileSystem";
-        bRecursive_  = true;
+        bRecursive_  = false;
     }
 
     ResourceLocation::~ResourceLocation()