Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

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:
code/branches/resource2/data
Files:
2 added
1 deleted
24 edited
1 copied

Legend:

Unmodified
Added
Removed

  • code/branches/resource2/data/levels/empty_level.oxw

    r5528 r5654  
    11<?lua
    2   include("overlay/stats.oxo")
    3   include("overlay/hudtemplates3.oxo")
     2  include("stats.oxo")
     3  include("hudtemplates3.oxo")
    44?>
    55
    66<?lua
    7   include("levels/templates/spaceship_assff.oxt")
    8   include("levels/templates/spaceship_pirate.oxt")
     7  include("templates/spaceship_assff.oxt")
     8  include("templates/spaceship_pirate.oxt")
    99?>
    1010

  • code/branches/resource2/data/levels/gametype_asteroids.oxw

    r5556 r5654  
    11<?lua
    2   include("overlay/hudtemplates3.oxo")
    3   include("overlay/stats.oxo")
    4   include("levels/templates/spaceship_assff.oxt")
     2  include("hudtemplates3.oxo")
     3  include("stats.oxo")
     4  include("templates/spaceship_assff.oxt")
    55?>
    66

  • code/branches/resource2/data/levels/gametype_underattack.oxw

    r5572 r5654  
    11<?lua
    2   include("overlay/hudtemplates3.oxo")
    3   include("overlay/stats.oxo")
    4   include("overlay/underattackhud.oxo")
    5   include("levels/templates/spaceship_assff.oxt")
     2  include("hudtemplates3.oxo")
     3  include("stats.oxo")
     4  include("underattackhud.oxo")
     5  include("templates/spaceship_assff.oxt")
    66?>
    77

  • code/branches/resource2/data/levels/old/CuboidSpaceStation.oxw

    r5528 r5654  
    11<?lua
    2         include("overlay/hudtemplates3.oxo")
     2        include("hudtemplates3.oxo")
    33?>
    44
    55<?lua
    6         include("levels/templates/spaceship_assff.oxt")
     6        include("templates/spaceship_assff.oxt")
    77?>
    88
    … …  
    2020<!-------------------------------------------------------------------------------------------------------------------------------------------------------------------------->
    2121<?lua
    22         dofile("../../media/levels/includes/CuboidSpaceStation.lua")
     22        dofile("includes/CuboidSpaceStation.lua")
    2323?>
    2424

  • code/branches/resource2/data/levels/old/physicstest2.oxw

    r5528 r5654  
    11<?lua
    2   include("levels/old/spaceshiptemplates_physics.oxw")
     2  include("spaceshiptemplates_physics.oxw")
    33?>
    44<?lua
    5   include("overlay/hudtemplates3.oxo")
     5  include("hudtemplates3.oxo")
    66?>
    77

  • code/branches/resource2/data/levels/old/planettest.oxw

    r5528 r5654  
    11<?lua
    2   include("overlay/hudtemplates3.oxo")
     2  include("hudtemplates3.oxo")
    33?>
    44
    55<?lua
    6   include("levels/templates/spaceship_assff.oxt")
     6  include("templates/spaceship_assff.oxt")
    77?>
    88

  • code/branches/resource2/data/levels/old/presentation_physics.oxw

    r5528 r5654  
    11<?lua
    2   include("overlay/hudtemplates3.oxo")
    3   include("overlay/stats.oxo")
    4   include("levels/templates/spaceship_assff.oxt")
     2  include("hudtemplates3.oxo")
     3  include("stats.oxo")
     4  include("templates/spaceship_assff.oxt")
    55  math.randomseed(344)
    66?>

  • code/branches/resource2/data/levels/old/princessaeryn.oxw

    r5528 r5654  
    11<?lua
    2   include("overlay/hudtemplates3.oxo")
    3   include("overlay/stats.oxo")
    4   include("levels/templates/spaceship_assff.oxt")
     2  include("hudtemplates3.oxo")
     3  include("stats.oxo")
     4  include("templates/spaceship_assff.oxt")
    55?>
    66
    77<?lua
    8         dofile("../../media/levels/includes/CuboidSpaceStation.lua")
     8        dofile("includes/CuboidSpaceStation.lua")
    99?>
    1010

  • code/branches/resource2/data/levels/old/questsystem.oxw

    r5528 r5654  
    11<?lua
    2   include("overlay/hudtemplates3.oxo")
    3   include("overlay/stats.oxo")
    4   include("levels/templates/spaceship_assff.oxt")
     2  include("hudtemplates3.oxo")
     3  include("stats.oxo")
     4  include("templates/spaceship_assff.oxt")
    55?>
    66

  • code/branches/resource2/data/levels/old/sample4.oxw

    r5528 r5654  
    11<?lua
    2   include("overlay/hudtemplates3.oxo")
     2  include("hudtemplates3.oxo")
    33?>
    44
    55<?lua
    6   include("levels/templates/spaceship_assff.oxt")
     6  include("templates/spaceship_assff.oxt")
    77?>
    88

  • code/branches/resource2/data/levels/pickuptest.oxw

    r5529 r5654  
    11<?lua
    2   include("overlay/hudtemplates3.oxo")
    3   include("overlay/stats.oxo")
    4   include("levels/templates/spaceship_assff.oxt")
     2  include("hudtemplates3.oxo")
     3  include("stats.oxo")
     4  include("templates/spaceship_assff.oxt")
    55?>
    66

  • code/branches/resource2/data/levels/presentation.oxw

    r5537 r5654  
    11<?lua
    2   include("overlay/hudtemplates3.oxo")
    3   include("overlay/stats.oxo")
    4   include("levels/templates/spaceship_assff.oxt")
     2  include("hudtemplates3.oxo")
     3  include("stats.oxo")
     4  include("templates/spaceship_assff.oxt")
    55?>
    66

  • code/branches/resource2/data/levels/presentation09.oxw

    r5565 r5654  
    11<?lua
    2   include("overlay/hudtemplates3.oxo")
    3   include("overlay/stats.oxo")
    4   include("levels/templates/spaceship_assff.oxt")
    5   include("levels/templates/spaceship_H2.oxt")
     2  include("hudtemplates3.oxo")
     3  include("stats.oxo")
     4  include("templates/spaceship_assff.oxt")
     5  include("templates/spaceship_H2.oxt")
    66?>
    77

  • code/branches/resource2/data/levels/presentation09b.oxw

    r5575 r5654  
    11<?lua
    2   include("overlay/hudtemplates3.oxo")
    3   include("overlay/stats.oxo")
    4   include("levels/templates/spaceship_assff.oxt")
    5   include("levels/templates/spaceship_H2.oxt")
    6   include("levels/templates/spaceship_pirate.oxt")
     2  include("hudtemplates3.oxo")
     3  include("stats.oxo")
     4  include("templates/spaceship_assff.oxt")
     5  include("templates/spaceship_H2.oxt")
     6  include("templates/spaceship_pirate.oxt")
    77?>
    88

  • code/branches/resource2/data/levels/presentation_dm.oxw

    r5550 r5654  
    11<?lua
    2   include("overlay/hudtemplates3.oxo")
    3   include("overlay/stats.oxo")
    4   include("levels/templates/spaceship_assff.oxt")
    5   include("levels/templates/spaceship_H2.oxt")
     2  include("hudtemplates3.oxo")
     3  include("stats.oxo")
     4  include("templates/spaceship_assff.oxt")
     5  include("templates/spaceship_H2.oxt")
    66?>
    77

  • code/branches/resource2/data/levels/presentation_pong.oxw

    r5528 r5654  
    11<?lua
    2   include("overlay/hudtemplates3.oxo")
    3   include("overlay/stats.oxo")
    4   include("overlay/ponghud.oxo")
     2  include("hudtemplates3.oxo")
     3  include("stats.oxo")
     4  include("ponghud.oxo")
    55?>
    66
    … …  
    9191
    9292  <?lua
    93     dofile("../../media/levels/includes/CuboidSpaceStation.lua")
     93    dofile("includes/CuboidSpaceStation.lua")
    9494  ?>
    9595

  • code/branches/resource2/data/levels/teambasematchlevel.oxw

    r5572 r5654  
    11<?lua
    2   include("overlay/hudtemplates3.oxo")
    3   include("overlay/stats.oxo")
    4   include("overlay/teambasematchhud.oxo")
    5   include("levels/templates/spaceship_assff.oxt")
    6   include("levels/templates/spaceship_pirate.oxt")
     2  include("hudtemplates3.oxo")
     3  include("stats.oxo")
     4  include("teambasematchhud.oxo")
     5  include("templates/spaceship_assff.oxt")
     6  include("templates/spaceship_pirate.oxt")
    77?>
    88

  • code/branches/resource2/data/levels/teamdeathmatch.oxw

    r5534 r5654  
    11<?lua
    2   include("overlay/hudtemplates3.oxo")
    3   include("overlay/stats.oxo")
    4   include("levels/templates/spaceship_assff.oxt")
    5   include("levels/templates/spaceship_H2.oxt")
    6   include("levels/templates/spaceship_pirate.oxt")
     2  include("hudtemplates3.oxo")
     3  include("stats.oxo")
     4  include("templates/spaceship_assff.oxt")
     5  include("templates/spaceship_H2.oxt")
     6  include("templates/spaceship_pirate.oxt")
    77?>
    88

  • code/branches/resource2/data/levels/templates/spaceship_H2.oxt

    r5573 r5654  
    2323
    2424<?lua
    25   include("levels/includes/weaponsettings_H2.oxi")
     25  include("includes/weaponsettings_H2.oxi")
    2626?>
    2727

  • code/branches/resource2/data/levels/templates/spaceship_assff.oxt

    r5550 r5654  
    3535    </collisionShapes>
    3636<?lua
    37   include("levels/includes/weaponsettings3.oxi")
     37  include("includes/weaponsettings3.oxi")
    3838?>
    3939  </SpaceShip>

  • code/branches/resource2/data/levels/templates/spaceship_pirate.oxt

    r5528 r5654  
    3838
    3939<?lua
    40   include("levels/includes/weaponsettings_pirate.oxi")
     40  include("includes/weaponsettings_pirate.oxi")
    4141?>
    4242  </SpaceShip>

  • code/branches/resource2/data/levels/tutorial.oxw

    r5528 r5654  
    11<?lua
    2   include("overlay/hudtemplates3.oxo")
    3   include("overlay/stats.oxo")
    4   include("levels/templates/spaceship_assff.oxt")
     2  include("hudtemplates3.oxo")
     3  include("stats.oxo")
     4  include("templates/spaceship_assff.oxt")
    55?>
    66

  • code/branches/resource2/data/levels/waypoints.oxw

    r5560 r5654  
    11<?lua
    2   include("overlay/hudtemplates3.oxo")
    3   include("overlay/stats.oxo")
    4   include("levels/templates/spaceship_assff.oxt")
    5   include("levels/templates/spaceship_H2.oxt")
    6   include("levels/templates/spaceship_pirate.oxt")
     2  include("hudtemplates3.oxo")
     3  include("stats.oxo")
     4  include("templates/spaceship_assff.oxt")
     5  include("templates/spaceship_H2.oxt")
     6  include("templates/spaceship_pirate.oxt")
    77?>
    88

  • code/branches/resource2/data/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>
    13 
    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>
     1<ResourceCollection resourceGroup = "General" >
     2    <ResourceLocation path = "levels" />
     3    <ResourceLocation path = "lua" />
     4    <ResourceLocation path = "overlay" />
     5    <ResourceLocation path = "tcl" />
     6</ResourceCollection>

  • code/branches/resource2/data/resources_graphics.oxr

    r5646 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 = "particle" />
     3</ResourceCollection>
    134
    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>
     5<ResourceCollection resourceGroup = "GUI" >
     6    <ResourceLocation path = "gui/configs" />
     7    <ResourceLocation path = "gui/layouts" />
     8    <ResourceLocation path = "gui/schemes" />
     9    <ResourceLocation path = "gui/scripts" />
     10</ResourceCollection>
Note: See TracChangeset for help on using the changeset viewer.