Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5657


Ignore:
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:
2 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • code/branches/resource2/data/resources.oxr

    r5656 r5657  
    33    <ResourceLocation path = "lua" />
    44    <ResourceLocation path = "overlays" />
     5    <ResourceLocation path = "particle" />
    56    <ResourceLocation path = "tcl" />
    67</ResourceCollection>
     8
     9<ResourceCollection resourceGroup = "GUI" >
     10    <ResourceLocation path = "gui/configs" />
     11    <ResourceLocation path = "gui/layouts" />
     12    <ResourceLocation path = "gui/schemes" />
     13    <ResourceLocation path = "gui/scripts" />
     14</ResourceCollection>
  • code/branches/resource2/src/core/GraphicsManager.cc

    r5654 r5657  
    160160        this->loadRenderer();
    161161
    162         // RESOURCE MANAGEMENT
    163 
    164         // Load graphical resources
    165         resourcesGraphics_.reset(new XMLFile("resources_graphics.oxr", "dataRoot"));
    166         Loader::open(resourcesGraphics_.get());
    167 
    168         // Consider external data folder for dev runs
    169         if (Core::isDevelopmentRun())
    170         {
    171             extResourcesGraphics_.reset(new XMLFile("resources_graphics.oxr", "externalDataRoot"));
    172             Loader::open(extResourcesGraphics_.get());
    173         }
    174 
    175         // Initialise all resources
     162        // Initialise all resources (do this AFTER the renderer has been loaded!)
    176163        // Note: You can only do this once! Ogre will check whether a resource group has
    177164        // already been initialised. If you need to load resources later, you will have to
  • code/branches/resource2/src/core/GraphicsManager.h

    r5654 r5657  
    9797        shared_ptr<XMLFile> resources_;                //!< XML with resource locations
    9898        shared_ptr<XMLFile> extResources_;             //!< XML with resource locations in the external path (only for dev runs)
    99         shared_ptr<XMLFile> resourcesGraphics_;        //!< XML with resource locations (with renderer)
    100         shared_ptr<XMLFile> extResourcesGraphics_;     //!< XML with resource locations in the external path (only for dev runs) (with renderer)
    10199
    102100        // config values
  • data/branches/media_stripped/resources.oxr

    r5654 r5657  
    11<ResourceCollection resourceGroup = "General" >
     2    <ResourceLocation path = "audio" />
     3    <ResourceLocation path = "fonts" />
     4    <ResourceLocation path = "materials/programs" />
     5    <ResourceLocation path = "materials/scripts" />
     6    <ResourceLocation path = "materials/textures" />
     7    <ResourceLocation path = "models" />
     8    <ResourceLocation path = "gui/fonts" />
     9    <ResourceLocation path = "packs/cubemap.zip" archiveType = "Zip" />
     10    <ResourceLocation path = "packs/skybox.zip"  archiveType = "Zip" />
    211</ResourceCollection>
    312
    413<ResourceCollection resourceGroup = "GUI" >
     14    <ResourceLocation path = "gui/fonts" />
     15    <ResourceLocation path = "gui/imagesets" />
     16    <ResourceLocation path = "gui/looknfeel" />
    517</ResourceCollection>
Note: See TracChangeset for help on using the changeset viewer.