aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDavid Walter Seikel2014-04-17 11:58:53 +1000
committerDavid Walter Seikel2014-04-17 11:58:53 +1000
commitb2b7232d1ad246c7534296d88f0b8f71c0a33d07 (patch)
tree053f2f8e6168d27c084f284372317fd54247be30
parentFigure out which is the main skin and run it. (diff)
downloadSledjHamr-b2b7232d1ad246c7534296d88f0b8f71c0a33d07.zip
SledjHamr-b2b7232d1ad246c7534296d88f0b8f71c0a33d07.tar.gz
SledjHamr-b2b7232d1ad246c7534296d88f0b8f71c0a33d07.tar.bz2
SledjHamr-b2b7232d1ad246c7534296d88f0b8f71c0a33d07.tar.xz
Actually get skin running to work.
-rw-r--r--ClientHamr/GuiLua/skang.lua16
-rw-r--r--ClientHamr/GuiLua/test.skang8
2 files changed, 14 insertions, 10 deletions
diff --git a/ClientHamr/GuiLua/skang.lua b/ClientHamr/GuiLua/skang.lua
index b33d003..3e9314f 100644
--- a/ClientHamr/GuiLua/skang.lua
+++ b/ClientHamr/GuiLua/skang.lua
@@ -352,17 +352,21 @@ moduleEnd = function (module)
352 end 352 end
353 353
354 pullArguments(module) 354 pullArguments(module)
355 if module.isLua then setfenv(2, module.savedEnvironment) end
356 355
357 -- Run the main skin, which is the first skin that is defined. In theory, the skin from the main module. 356 -- Run the main skin, which is the first skin that is defined. In theory, the skin from the main module.
358 if mainSkin == module then 357 if mainSkin == module then
359print("~~~~~~~~~~~~~~~~~RUNNING SKIN FOR " .. module._NAME .. '\n' .. module.DEFAULT_SKANG) 358 print("~~~~~~~~~~~~~~~~~RUNNING SKIN FOR " .. module._NAME)
360 local main = loadstring(module.DEFAULT_SKANG) 359print(module.DEFAULT_SKANG .. '\n~~~~~~~~~~~~~~~~~')
361 if (main) then 360 local skin, err = loadstring(module.DEFAULT_SKANG)
362 setfenv(main, getfenv(2)) 361 if skin then
363 main() 362 setfenv(skin, getfenv(2))
363 skin()
364 else
365 print("ERROR - " .. err)
364 end 366 end
365 end 367 end
368
369 if module.isLua then setfenv(2, module.savedEnvironment) end
366end 370end
367 371
368 372
diff --git a/ClientHamr/GuiLua/test.skang b/ClientHamr/GuiLua/test.skang
index 20430e1..015b3b9 100644
--- a/ClientHamr/GuiLua/test.skang
+++ b/ClientHamr/GuiLua/test.skang
@@ -6,12 +6,12 @@
6local widget = require 'widget' 6local widget = require 'widget'
7-- local other = require 'otherPackageName' 7-- local other = require 'otherPackageName'
8 8
9skang.clear 9skang.clear()
10skang.window(200, 200, "G'day planet.") 10skang.window(200, 200, "G'day planet.")
11 11
12quitter = widget.button('Quit', 0.5, 0.5, 0.5, 0.5) 12--quitter = widget.button('Quit', 0.5, 0.5, 0.5, 0.5)
13quitter:action('quit') -- 'quit' is looked up in ThingSpace.commands, and translated into the Lua 'skang.quit()'. 13--quitter:action('quit') -- 'quit' is looked up in ThingSpace.commands, and translated into the Lua 'skang.quit()'.
14 14
15--other.foo = 'stuff' 15--other.foo = 'stuff'
16this.bar = 'things' 16this.bar = 'things'
17this.func(1, 'two') 17this.ffunc(1, 'two')