Changeset 5661 for code/branches/resource2/data

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.

Location:

code/branches/resource2/data

Files:

• gui/layouts/MainMenu.layout (moved) (moved from code/branches/resource2/data/gui/layouts/MainMenu_2.layout) (6 diffs)
• gui/scripts/BasicGUI.lua (moved) (moved from code/branches/resource2/data/gui/scripts/gui.lua) (2 diffs)
• gui/scripts/IConsole.lua (deleted)
• gui/scripts/InitialiseGUI.lua (moved) (moved from code/branches/resource2/data/gui/scripts/loadGUI_3.lua) (1 diff)
• gui/scripts/InstancedInit.lua (deleted)
• gui/scripts/MainMenu.lua (moved) (moved from code/branches/resource2/data/gui/scripts/mainmenu_4.lua) (2 diffs)
• gui/scripts/PickupInventory.lua (modified) (2 diffs)
• gui/scripts/demo8.lua (deleted)
• gui/scripts/inGameTest.lua (deleted)
• gui/scripts/loadGUI.lua (deleted)
• gui/scripts/loadGUI_2.lua (deleted)
• gui/scripts/mainmenu.lua (deleted)
• gui/scripts/mainmenu_2.lua (deleted)
• gui/scripts/mainmenu_3.lua (deleted)
• lua/LuaStateInit.lua (modified) (3 diffs)

code/branches/resource2/data/gui/layouts/MainMenu.layout

@@ -12 +12 @@
             <Property Name="Text" Value="Standalone"/>
             <Property Name="Disabled" Value="true"/>
-            <Event Name="Clicked" Function="mainmenu_2.button_standalone_clicked"/>
+            <Event Name="Clicked" Function="MainMenu.button_standalone_clicked"/>
         </Window>
         
@@ -20 +20 @@
             <Property Name="UnifiedSize" Value="{{0.35,0},{0.33,0}}" />
             <Property Name="Tooltip" Value="Available Levels." />
-            <Event Name="ItemSelectionChanged" Function="mainmenu_2.listbox_level_selectionchanged" />
+            <Event Name="ItemSelectionChanged" Function="MainMenu.listbox_level_selectionchanged" />
         </Window>
         
@@ -27 +27 @@
             <Property Name="UnifiedSize" Value="{{0.15,0},{0.05,0}}"/>
             <Property Name="Text" Value="Dedicated"/>
-            <Event Name="Clicked" Function="mainmenu_2.button_dedicated_clicked"/>
+            <Event Name="Clicked" Function="MainMenu.button_dedicated_clicked"/>
         </Window>
         
@@ -34 +34 @@
             <Property Name="UnifiedSize" Value="{{0.15,0},{0.05,0}}"/>
             <Property Name="Text" Value="Server"/>
-            <Event Name="Clicked" Function="mainmenu_2.button_server_clicked"/>
+            <Event Name="Clicked" Function="MainMenu.button_server_clicked"/>
         </Window>
         
@@ -41 +41 @@
             <Property Name="UnifiedSize" Value="{{0.15,0},{0.05,0}}"/>
             <Property Name="Text" Value="Client"/>
-            <Event Name="Clicked" Function="mainmenu_2.button_client_clicked"/>
+            <Event Name="Clicked" Function="MainMenu.button_client_clicked"/>
         </Window>
         
@@ -48 +48 @@
             <Property Name="UnifiedSize" Value="{{0.15,0},{0.05,0}}"/>
             <Property Name="Text" Value="Quit"/>
-            <Event Name="Clicked" Function="mainmenu_2.button_quit_clicked"/>
+            <Event Name="Clicked" Function="MainMenu.button_quit_clicked"/>
         </Window>
     </Window>

code/branches/resource2/data/gui/scripts/BasicGUI.lua

@@ -3 +3 @@
 local P = {}
 if _REQUIREDNAME == nil then
-    gui = P
+    BasicGUI = P
 else
     _G[_REQUIREDNAME] = P
@@ -40 +40 @@
 end
 
-return gui or _G[_REQUIREDNAME]
+return P

code/branches/resource2/data/gui/scripts/InitialiseGUI.lua

@@ -14 +14 @@
 
 loadedGUIs = {}
-
--- datapath is set before executing the script and points to media-folder
-package.path = package.path .. ";" .. datapath .. "gui/scripts/?.lua"
 
 -- loads the GUI with the specified filename

code/branches/resource2/data/gui/scripts/MainMenu.lua

@@ -1 @@
--- mainmenu_2.lua
-gui = require("gui")
-local P = gui:new() --inherit everything from the gui package
+-- MainMenu.lua
 
-mainmenu_2 = P
+BasicGUI = require("BasicGUI")
+local P = BasicGUI:new() --inherit everything from the gui package
+if _REQUIREDNAME == nil then
+    MainMenu = P
+else
+    _G[_REQUIREDNAME] = P
+end
 
-P.filename = "mainmenu_2"
-P.layoutString = "MainMenu_2.layout"
+P.filename = "MainMenu"
+P.layoutString = "MainMenu.layout"
 
 function P:init()
@@ -85 +89 @@
 end
 
-return mainmenu_2
+return P
 

code/branches/resource2/data/gui/scripts/PickupInventory.lua

@@ -1 @@
-gui = require("gui")
-local P = gui:new() --inherit everything from the gui package
+-- PickupInventory.lua
 
-PickupInventory = P
+BasicGUI = require("BasicGUI")
+local P = BasicGUI:new() --inherit everything from the gui package
+if _REQUIREDNAME == nil then
+    PickupInventory = P
+else
+    _G[_REQUIREDNAME] = P
+end
 
 P.filename = "PickupInventory"
@@ -61 +66 @@
 end
 
-return PickupInventory
+return P

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