[Orxonox-commit 934] r5657 - code/branches/resource2/data code/branches/resource2/src/core data/branches/media_stripped

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2009-08-17 21:12:54 +0200 (Mon, 17 Aug 2009)
New Revision: 5657

Removed:
   code/branches/resource2/data/resources_graphics.oxr
   data/branches/media_stripped/resources_graphics.oxr
Modified:
   code/branches/resource2/data/resources.oxr
   code/branches/resource2/src/core/GraphicsManager.cc
   code/branches/resource2/src/core/GraphicsManager.h
   data/branches/media_stripped/resources.oxr
Log:
Dividing the resource locations isn't necessary after all: The trick is not to initialise them without a renderer.

Modified: code/branches/resource2/data/resources.oxr
===================================================================
--- code/branches/resource2/data/resources.oxr	2009-08-17 18:50:41 UTC (rev 5656)
+++ code/branches/resource2/data/resources.oxr	2009-08-17 19:12:54 UTC (rev 5657)
@@ -2,5 +2,13 @@
     <ResourceLocation path = "levels" />
     <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/schemes" />
+    <ResourceLocation path = "gui/scripts" />
+</ResourceCollection>

Deleted: code/branches/resource2/data/resources_graphics.oxr
===================================================================
--- code/branches/resource2/data/resources_graphics.oxr	2009-08-17 18:50:41 UTC (rev 5656)
+++ code/branches/resource2/data/resources_graphics.oxr	2009-08-17 19:12:54 UTC (rev 5657)
@@ -1,10 +0,0 @@
-<ResourceCollection resourceGroup = "General" >
-    <ResourceLocation path = "particle" />
-</ResourceCollection>
-
-<ResourceCollection resourceGroup = "GUI" >
-    <ResourceLocation path = "gui/configs" />
-    <ResourceLocation path = "gui/layouts" />
-    <ResourceLocation path = "gui/schemes" />
-    <ResourceLocation path = "gui/scripts" />
-</ResourceCollection>

Modified: code/branches/resource2/src/core/GraphicsManager.cc
===================================================================
--- code/branches/resource2/src/core/GraphicsManager.cc	2009-08-17 18:50:41 UTC (rev 5656)
+++ code/branches/resource2/src/core/GraphicsManager.cc	2009-08-17 19:12:54 UTC (rev 5657)
@@ -159,20 +159,7 @@
 
         this->loadRenderer();
 
-        // RESOURCE MANAGEMENT
-
-        // Load graphical resources
-        resourcesGraphics_.reset(new XMLFile("resources_graphics.oxr", "dataRoot"));
-        Loader::open(resourcesGraphics_.get());
-
-        // Consider external data folder for dev runs
-        if (Core::isDevelopmentRun())
-        {
-            extResourcesGraphics_.reset(new XMLFile("resources_graphics.oxr", "externalDataRoot"));
-            Loader::open(extResourcesGraphics_.get());
-        }
-
-        // Initialise all resources
+        // 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.

Modified: code/branches/resource2/src/core/GraphicsManager.h
===================================================================
--- code/branches/resource2/src/core/GraphicsManager.h	2009-08-17 18:50:41 UTC (rev 5656)
+++ code/branches/resource2/src/core/GraphicsManager.h	2009-08-17 19:12:54 UTC (rev 5657)
@@ -96,8 +96,6 @@
         // XML files for the resources
         shared_ptr<XMLFile> resources_;                //!< XML with resource locations
         shared_ptr<XMLFile> extResources_;             //!< XML with resource locations in the external path (only for dev runs)
-        shared_ptr<XMLFile> resourcesGraphics_;        //!< XML with resource locations (with renderer)
-        shared_ptr<XMLFile> extResourcesGraphics_;     //!< XML with resource locations in the external path (only for dev runs) (with renderer)
 
         // config values
         std::string         ogreConfigFile_;           //!< ogre config file name

Modified: data/branches/media_stripped/resources.oxr
===================================================================
--- data/branches/media_stripped/resources.oxr	2009-08-17 18:50:41 UTC (rev 5656)
+++ data/branches/media_stripped/resources.oxr	2009-08-17 19:12:54 UTC (rev 5657)
@@ -1,5 +1,17 @@
 <ResourceCollection resourceGroup = "General" >
+    <ResourceLocation path = "audio" />
+    <ResourceLocation path = "fonts" />
+    <ResourceLocation path = "materials/programs" />
+    <ResourceLocation path = "materials/scripts" />
+    <ResourceLocation path = "materials/textures" />
+    <ResourceLocation path = "models" />
+    <ResourceLocation path = "gui/fonts" />
+    <ResourceLocation path = "packs/cubemap.zip" archiveType = "Zip" />
+    <ResourceLocation path = "packs/skybox.zip"  archiveType = "Zip" />
 </ResourceCollection>
 
 <ResourceCollection resourceGroup = "GUI" >
+    <ResourceLocation path = "gui/fonts" />
+    <ResourceLocation path = "gui/imagesets" />
+    <ResourceLocation path = "gui/looknfeel" />
 </ResourceCollection>

Deleted: data/branches/media_stripped/resources_graphics.oxr
===================================================================
--- data/branches/media_stripped/resources_graphics.oxr	2009-08-17 18:50:41 UTC (rev 5656)
+++ data/branches/media_stripped/resources_graphics.oxr	2009-08-17 19:12:54 UTC (rev 5657)
@@ -1,17 +0,0 @@
-<ResourceCollection resourceGroup = "General" >
-    <ResourceLocation path = "audio" />
-    <ResourceLocation path = "fonts" />
-    <ResourceLocation path = "materials/programs" />
-    <ResourceLocation path = "materials/scripts" />
-    <ResourceLocation path = "materials/textures" />
-    <ResourceLocation path = "models" />
-    <ResourceLocation path = "gui/fonts" />
-    <ResourceLocation path = "packs/cubemap.zip" archiveType = "Zip" />
-    <ResourceLocation path = "packs/skybox.zip"  archiveType = "Zip" />
-</ResourceCollection>
-
-<ResourceCollection resourceGroup = "GUI" >
-    <ResourceLocation path = "gui/fonts" />
-    <ResourceLocation path = "gui/imagesets" />
-    <ResourceLocation path = "gui/looknfeel" />
-</ResourceCollection>