Changeset 5654 for code/branches/resource2/data/levels/templates

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/levels/templates

Files:

• spaceship_H2.oxt (modified) (1 diff)
• spaceship_assff.oxt (modified) (1 diff)
• spaceship_pirate.oxt (modified) (1 diff)

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

@@ -23 +23 @@
 
 <?lua
-  include("levels/includes/weaponsettings_H2.oxi")
+  include("includes/weaponsettings_H2.oxi")
 ?>
 

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

@@ -35 +35 @@
     </collisionShapes>
 <?lua
-  include("levels/includes/weaponsettings3.oxi")
+  include("includes/weaponsettings3.oxi")
 ?>
   </SpaceShip>

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

@@ -38 +38 @@
 
 <?lua
-  include("levels/includes/weaponsettings_pirate.oxi")
+  include("includes/weaponsettings_pirate.oxi")
 ?>
   </SpaceShip>