Changeset 5661 for code/branches/resource2/data/lua

Timestamp:

Aug 19, 2009, 12:19:11 AM (15 years ago)

Author:

rgrieder

Message:

Cleaned out the lua script files for the GUI.
Also replaced "require" function to support resources.
Fixed a problem with the return value of doFile, includeFile and require being discarded because the tolua binding is for a C++ function returning void.

File:

• code/branches/resource2/data/lua/LuaStateInit.lua (modified) (3 diffs)

code/branches/resource2/data/lua/LuaStateInit.lua

@@ -1 +1 @@
 -- Note: luaState is a pointer to the LuaState instance that created this lua state
 
--- Redirect debug to print
+-- Save original print function in debug
 debug = print
 
@@ -23 +23 @@
   resourceGroup = resourceGroup or "NoResourceGroupProvided"
   luaState:doFile(filename, resourceGroup, bSearchOtherPaths)
+  -- Required because the C++ function cannot return whatever might be on the stack
+  return LuaStateReturnValue
 end
+original_dofile = dofile
 dofile = doFile
 
@@ -33 +36 @@
   resourceGroup = resourceGroup or "NoResourceGroupProvided"
   luaState:includeFile(filename, resourceGroup, bSearchOtherPaths)
+  -- Required because the C++ function cannot return whatever might be on the stack
+  return LuaStateReturnValue
 end
+
+-- Replace require function with almost similar behaviour
+-- The difference is that you need to provide a resource group
+-- Default value there is the current one (if present) or else "General"
+-- But the loaded modules are then stored with only with the name (where name has no .lua extension)
+-- CAUTION: That also means that you need to take care of conflicting filenames among groups
+-- Furthermore the moduleName parameters is appended with the .lua extension when looking for the file
+old_require = require
+require = function(moduleName, resourceGroup)
+  local bSearchOtherPaths = (resourceGroup == nil) or false
+  resourceGroup = resourceGroup or "NoResourceGroupProvided"
+  if not luaState:fileExists(moduleName .. ".lua", resourceGroup, bSearchOtherPaths) then
+    return nil
+  end
+  if not _LOADED then
+    _LOADED = {}
+  end
+  if not _LOADED[moduleName] then
+    -- save old value
+    _REQUIREDNAME_OLD = _REQUIREDNAME
+    _REQUIREDNAME = moduleName
+    luaState:doFile(moduleName .. ".lua", resourceGroup, bSearchOtherPaths)
+    _LOADED[moduleName] = LuaStateReturnValue or true
+    -- restore old value
+    _REQUIREDNAME = _REQUIREDNAME_OLD
+  end
+  return _LOADED[moduleName]
+end