Work

1 files changed, 16 insertions, 13 deletions

diff --git a/src/main.lua b/src/main.lua
index 8c8461a..55b7ef5 100644
--- a/src/main.lua
+++ b/src/main.lua
@@ -1,15 +1,18 @@
+require("preload")
+local win = require("window")
+--local stars = require("shaders.stars")
+--win.scene:append(stars)
+--world_shader = require("shaders.world")
+--print("World shader:",world_shader)
+--win.scene:append(world_shader.node)
+local ui = require("ui")
+win.scene:append(ui.node)
+--require("world_test")
+--require("net_test")
+require("ui_test")
 
-print("Hello, world!")
-
-am.eval_js("console.log('Hello, js!')")
-
-local win = am.window{
-    title = "ggj25",
-    width = 1280,
-    height = 720,
-    clear_color = vec4(0.8, 0.8, 0.3, 1)
-}
-print("about to pcall")
-am.eval_js(require("js_bridge"))
+require("log").observe(function(chunk)
+	print(table.concat({"[",chunk.level:upper(),"]",os.date()," > ",chunk.message}))
+end)
+--am.eval_js(require("js_bridge"))
 --local a,b = pcall(am.eval_js, require("js_bridge"))
-print("done with pcall", a,b)