Context Navigation

← Previous Change
Next Change →

levels

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

Files:

: 23 edited

empty_level.oxw (modified) (1 diff)
gametype_asteroids.oxw (modified) (1 diff)
gametype_underattack.oxw (modified) (1 diff)
old/CuboidSpaceStation.oxw (modified) (2 diffs)
old/physicstest2.oxw (modified) (1 diff)
old/planettest.oxw (modified) (1 diff)
old/presentation_physics.oxw (modified) (1 diff)
old/princessaeryn.oxw (modified) (1 diff)
old/questsystem.oxw (modified) (1 diff)
old/sample4.oxw (modified) (1 diff)
pickuptest.oxw (modified) (1 diff)
presentation.oxw (modified) (1 diff)
presentation09.oxw (modified) (1 diff)
presentation09b.oxw (modified) (1 diff)
presentation_dm.oxw (modified) (1 diff)
presentation_pong.oxw (modified) (2 diffs)
teambasematchlevel.oxw (modified) (1 diff)
teamdeathmatch.oxw (modified) (1 diff)
templates/spaceship_H2.oxt (modified) (1 diff)
templates/spaceship_assff.oxt (modified) (1 diff)
templates/spaceship_pirate.oxt (modified) (1 diff)
tutorial.oxw (modified) (1 diff)
waypoints.oxw (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

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

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

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

-                      r5556
+                      r5654
 <?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/gametype_underattack.oxw

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

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

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

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

-                      r5528
+                      r5654
 <?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

-                      r5528
+                      r5654
 <?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

-                      r5528
+                      r5654
 <?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

-                      r5528
+                      r5654
 <?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

-                      r5528
+                      r5654
 <?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

-                      r5528
+                      r5654
 <?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/pickuptest.oxw

-                      r5529
+                      r5654
 <?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/presentation.oxw

-                      r5537
+                      r5654
 <?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/presentation09.oxw

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

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

-                      r5575
+                      r5654
 <?lua
   include("overlay/hudtemplates3.oxo")
   include("overlay/stats.oxo")
   include("levels/templates/spaceship_assff.oxt")
   include("levels/templates/spaceship_H2.oxt")
   include("levels/templates/spaceship_pirate.oxt")
+  include("hudtemplates3.oxo")
+  include("stats.oxo")
+  include("templates/spaceship_assff.oxt")
+  include("templates/spaceship_H2.oxt")
+  include("templates/spaceship_pirate.oxt")
 ?>

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

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

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

-                      r5528
+                      r5654
 <?lua
   include("overlay/hudtemplates3.oxo")
   include("overlay/stats.oxo")
   include("overlay/ponghud.oxo")
+  include("hudtemplates3.oxo")
+  include("stats.oxo")
+  include("ponghud.oxo")
 ?>
 …
   <?lua
     dofile("../../media/levels/includes/CuboidSpaceStation.lua")
+    dofile("includes/CuboidSpaceStation.lua")
   ?>

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

-                      r5572
+                      r5654
 <?lua
   include("overlay/hudtemplates3.oxo")
   include("overlay/stats.oxo")
   include("overlay/teambasematchhud.oxo")
   include("levels/templates/spaceship_assff.oxt")
   include("levels/templates/spaceship_pirate.oxt")
+  include("hudtemplates3.oxo")
+  include("stats.oxo")
+  include("teambasematchhud.oxo")
+  include("templates/spaceship_assff.oxt")
+  include("templates/spaceship_pirate.oxt")
 ?>

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

-                      r5534
+                      r5654
 <?lua
   include("overlay/hudtemplates3.oxo")
   include("overlay/stats.oxo")
   include("levels/templates/spaceship_assff.oxt")
   include("levels/templates/spaceship_H2.oxt")
   include("levels/templates/spaceship_pirate.oxt")
+  include("hudtemplates3.oxo")
+  include("stats.oxo")
+  include("templates/spaceship_assff.oxt")
+  include("templates/spaceship_H2.oxt")
+  include("templates/spaceship_pirate.oxt")
 ?>

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

r5573	r5654
23	23
24	24	<?lua
25		include("~~levels/~~includes/weaponsettings_H2.oxi")
	25	include("includes/weaponsettings_H2.oxi")
26	26	?>
27	27

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

r5550	r5654
35	35	</collisionShapes>
36	36	<?lua
37		include("~~levels/~~includes/weaponsettings3.oxi")
	37	include("includes/weaponsettings3.oxi")
38	38	?>
39	39	</SpaceShip>

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

r5528	r5654
38	38
39	39	<?lua
40		include("~~levels/~~includes/weaponsettings_pirate.oxi")
	40	include("includes/weaponsettings_pirate.oxi")
41	41	?>
42	42	</SpaceShip>

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

-                      r5528
+                      r5654
 <?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/waypoints.oxw

-                      r5560
+                      r5654
 <?lua
   include("overlay/hudtemplates3.oxo")
   include("overlay/stats.oxo")
   include("levels/templates/spaceship_assff.oxt")
   include("levels/templates/spaceship_H2.oxt")
   include("levels/templates/spaceship_pirate.oxt")
+  include("hudtemplates3.oxo")
+  include("stats.oxo")
+  include("templates/spaceship_assff.oxt")
+  include("templates/spaceship_H2.oxt")
+  include("templates/spaceship_pirate.oxt")
 ?>

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

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

Legend:

Download in other formats: