Changeset 5657

Timestamp:

Aug 17, 2009, 9:12:54 PM (15 years ago)

Author:

rgrieder

Message:

Dividing the resource locations isn't necessary after all: The trick is not to initialise them without a renderer.

Files:

• code/branches/resource2/data/resources.oxr (modified) (1 diff)
• code/branches/resource2/data/resources_graphics.oxr (deleted)
• code/branches/resource2/src/core/GraphicsManager.cc (modified) (1 diff)
• code/branches/resource2/src/core/GraphicsManager.h (modified) (1 diff)
• data/branches/media_stripped/resources.oxr (modified) (1 diff)
• data/branches/media_stripped/resources_graphics.oxr (deleted)

code/branches/resource2/data/resources.oxr

@@ -3 +3 @@
     <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>

code/branches/resource2/src/core/GraphicsManager.cc

@@ -160 +160 @@
         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

code/branches/resource2/src/core/GraphicsManager.h

@@ -97 +97 @@
         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

data/branches/media_stripped/resources.oxr

@@ -1 +1 @@
 <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>