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

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/old

Files:

• CuboidSpaceStation.oxw (modified) (2 diffs)
• physicstest2.oxw (modified) (1 diff)
• planettest.oxw (modified) (1 diff)
• presentation_physics.oxw (modified) (1 diff)
• princessaeryn.oxw (modified) (1 diff)
• questsystem.oxw (modified) (1 diff)
• sample4.oxw (modified) (1 diff)

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

@@ -1 +1 @@
 <?lua
-        include("overlay/hudtemplates3.oxo")
+        include("hudtemplates3.oxo")
 ?>
 
 <?lua
-        include("levels/templates/spaceship_assff.oxt")
+        include("templates/spaceship_assff.oxt")
 ?>
 
@@ -20 +20 @@
 <!-------------------------------------------------------------------------------------------------------------------------------------------------------------------------->
 <?lua
-        dofile("../../media/levels/includes/CuboidSpaceStation.lua")
+        dofile("includes/CuboidSpaceStation.lua")
 ?>
 

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

@@ -1 +1 @@
 <?lua
-  include("levels/old/spaceshiptemplates_physics.oxw")
+  include("spaceshiptemplates_physics.oxw")
 ?>
 <?lua
-  include("overlay/hudtemplates3.oxo")
+  include("hudtemplates3.oxo")
 ?>
 

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

@@ -1 +1 @@
 <?lua
-  include("overlay/hudtemplates3.oxo")
+  include("hudtemplates3.oxo")
 ?>
 
 <?lua
-  include("levels/templates/spaceship_assff.oxt")
+  include("templates/spaceship_assff.oxt")
 ?>
 

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

@@ -1 +1 @@
 <?lua
-  include("overlay/hudtemplates3.oxo")
-  include("overlay/stats.oxo")
-  include("levels/templates/spaceship_assff.oxt")
+  include("hudtemplates3.oxo")
+  include("stats.oxo")
+  include("templates/spaceship_assff.oxt")
   math.randomseed(344)
 ?>

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

@@ -1 +1 @@
 <?lua
-  include("overlay/hudtemplates3.oxo")
-  include("overlay/stats.oxo")
-  include("levels/templates/spaceship_assff.oxt")
+  include("hudtemplates3.oxo")
+  include("stats.oxo")
+  include("templates/spaceship_assff.oxt")
 ?>
 
 <?lua
-        dofile("../../media/levels/includes/CuboidSpaceStation.lua")
+        dofile("includes/CuboidSpaceStation.lua")
 ?>
 

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

@@ -1 +1 @@
 <?lua
-  include("overlay/hudtemplates3.oxo")
-  include("overlay/stats.oxo")
-  include("levels/templates/spaceship_assff.oxt")
+  include("hudtemplates3.oxo")
+  include("stats.oxo")
+  include("templates/spaceship_assff.oxt")
 ?>
 

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

@@ -1 +1 @@
 <?lua
-  include("overlay/hudtemplates3.oxo")
+  include("hudtemplates3.oxo")
 ?>
 
 <?lua
-  include("levels/templates/spaceship_assff.oxt")
+  include("templates/spaceship_assff.oxt")
 ?>