Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5654 for data/branches


Ignore:
Timestamp:
Aug 17, 2009, 4:37:10 PM (15 years ago)
Author:
rgrieder
Message:
  • Implemented file management via resource manager and loading of resource locations via XML. Changes made:
    • SoundManager loads via memory stream rather than via file
    • Loader uses LuaState::includeFile() to load an XML file and passes the lua tag remover function to its LuaState.
    • ConfigFileManager still loads with hard paths because the files are required before Ogre gets created
  • Renamed LuaBind to LuaState, deSingletonised it and added new features:
    • doFile(), doString(), includeFile(), includeString() where include will preparse the string with a function provided with LuaState::setIncludeParser
    • Moved lua tags replace function to Loader (since it's actually an XML related task)
    • Using data_path/lua/LuaInitScript.lua to provide the following functions
      • logMessage(level, message)
      • doFile, dofile, include (all working with relative paths but within the same resource group)
  • Modified Script class to work with LuaState and fixed its XML Loader
  • Adjusted all level and include files (both "include" and "dofile" lua commands)
Location:
data/branches/media_stripped
Files:
1 deleted
1 edited
1 copied

Legend:

Unmodified
Added
Removed

  • data/branches/media_stripped/resources.oxr

    r5644 r5654  
    1 <ResourceGroup name = "General" >
    2     <ResourceLocation path = overlay />
    3     <ResourceLocation path = particle />
    4     <ResourceLocation path = defaultConfig />
    5     <ResourceLocation path = levels />
    6     <ResourceLocation path = tcl />
    7     <ResourceLocation
    8       path = test.zip
    9       archive = Zip
    10       recursive = true
    11     />
    12 </ResourceGroup>
     1<ResourceCollection resourceGroup = "General" >
     2</ResourceCollection>
    133
    14 <ResourceGroup name = "GUI" >
    15     <ResourceLocation path = gui/configs />
    16     <ResourceLocation path = gui/layouts />
    17     <ResourceLocation path = gui/schemas />
    18     <ResourceLocation path = gui/scripts />
    19 </ResourceGroup>
     4<ResourceCollection resourceGroup = "GUI" >
     5</ResourceCollection>

  • data/branches/media_stripped/resources_graphics.oxr

    r5645 r5654  
    1 <ResourceGroup name = "General" >
    2     <ResourceLocation path = overlay />
    3     <ResourceLocation path = particle />
    4     <ResourceLocation path = defaultConfig />
    5     <ResourceLocation path = levels />
    6     <ResourceLocation path = tcl />
    7     <ResourceLocation
    8       path = test.zip
    9       archive = Zip
    10       recursive = true
    11     />
    12 </ResourceGroup>
     1<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" />
     11</ResourceCollection>
    1312
    14 <ResourceGroup name = "GUI" >
    15     <ResourceLocation path = gui/configs />
    16     <ResourceLocation path = gui/layouts />
    17     <ResourceLocation path = gui/schemas />
    18     <ResourceLocation path = gui/scripts />
    19 </ResourceGroup>
     13<ResourceCollection resourceGroup = "GUI" >
     14    <ResourceLocation path = "gui/fonts" />
     15    <ResourceLocation path = "gui/imagesets" />
     16    <ResourceLocation path = "gui/looknfeel" />
     17</ResourceCollection>
Note: See TracChangeset for help on using the changeset viewer.