1 files changed, 46 insertions, 90 deletions

diff --git a/src/lua/embed/boot.lua.h b/src/lua/embed/boot.lua.h
index 99e657b..ca08e87 100644
--- a/src/lua/embed/boot.lua.h
+++ b/src/lua/embed/boot.lua.h
@@ -12,8 +12,8 @@ jin.config  = {}
 if jin.filesystem.exist("config.lua") then 
     jin.config = require "config"    
 end
-jin.config.width      = jin.config.width      or 576 
-jin.config.height     = jin.config.height     or 448 
+jin.config.width      = jin.config.width      or 580 
+jin.config.height     = jin.config.height     or 450 
 jin.config.vsync      = jin.config.vsync      or true
 jin.config.title      = jin.config.title      or ("jin v" .. jin.version)
 jin.config.resizable  = jin.config.resizable  or false 
@@ -26,7 +26,7 @@ jin.config.fps	      = jin.config.fps		  or 60
 
 jin.graphics.init(jin.config)
 jin.audio.init()
--- TODO: ����ϵͳģ��
+-- TODO: Disable some internal lua modules.
 
 -------------------------------------------------------------------------
 -- Default game loop
@@ -66,110 +66,66 @@ function jin.core.run()
 end
 
 -------------------------------------------------------------------------
--- No game handler
+-- Boot game
 -------------------------------------------------------------------------
 
-jin.core.setHandler = function(handler)
-	if handler == nil then 
-		return 
-	end 
-	jin.core.onLoad = handler.onLoad
-	jin.core.onEvent = handler.onEvent
-	jin.core.onUpdate = handler.onUpdate
-	jin.core.onDraw = handler.onDraw
-end 
-
--- TODO: Ĭ��ͼ����base64
-jin.nogame = {
-    cs = 64, 
-    sw = jin.graphics.getWidth(), 
-    sh = jin.graphics.getHeight(), 
-    cw = 0,
-    ch = 0,
-    ww = 6,
-    ww2 = 6*2, 
-    speed = 4, 
-    t = 0,
-    onLoad = function()
-        local nogame = jin.nogame
-        nogame.cw = nogame.sw / nogame.cs 
-        nogame.ch = nogame.sh / nogame.cs 
-        nogame.t = nogame.ww - 1
-    end, 
-    onEvent = function(e)
-        if e.type == 'Quit' then 
-            jin.core.stop()
-        end
-    end,
-    onUpdate = function(dt)
-        print(dt)
-        local nogame = jin.nogame
-        nogame.t = nogame.t + dt * nogame.speed 
-        if nogame.t > nogame.ww2 then 
-            nogame.t = nogame.t - nogame.ww2 
-        end 
-    end, 
-    circle = function(x, y, r)
-        local nogame = jin.nogame
-        if r % nogame.ww2 > nogame.ww then 
-            return 
-        end 
-        r = math.sin((r/nogame.ww)*math.pi)*nogame.cs/2
-        local fact = (x + y) / nogame.ch * nogame.cw
-        jin.graphics.setColor(
-			155 + 100 * math.sin(fact), 
-			155 + 100 * math.cos(fact), 
-			155 + 100 * math.sin(fact * fact), 
-			255
-		)
-        jin.graphics.circle("fill", x*nogame.cs + nogame.cs/2, y*nogame.cs + nogame.cs/2, r)
-    end,
-    onDraw = function() 
-        local nogame = jin.nogame
-        for y = 0, nogame.ch - 1 do 
-            for x = 0, nogame.cw - 1 do 
-                nogame.circle(x, y, nogame.t+x+y)
-            end 
+local function plainLoop() 
+    while jin.core.running() do 
+        for _, e in pairs(jin.event.poll()) do 
+            if e.type == "Quit" then 
+                jin.core.stop()
+            end
         end
+        jin.time.sleep(0.001)
     end
-}
-
--------------------------------------------------------------------------
--- Boot jin
--------------------------------------------------------------------------
+end
 
+-- Display error message.
 local function onError(msg) 
+    local err = "Error:\n" .. msg .. "\n" .. debug.traceback()
     jin.graphics.reset()
     jin.graphics.setClearColor(100, 100, 100, 255)
     jin.graphics.clear()
-    jin.graphics.print("Error:\n" .. msg .. "\n" .. debug.traceback(), 5, 5) 
+    jin.graphics.print(err, 5, 5) 
     jin.graphics.present()
-    while jin.core.running() do 
-        for _, e in pairs(jin.event.poll()) do 
-            if e.type == "Quit" then 
-                jin.core.stop()
-            end
-        end
-        jin.time.sleep(0.001)
-    end     
-    jin.core.quit()
+    plainLoop()
+end
+
+-- No game screen.
+local function noGame()
+    jin.graphics.reset()
+    jin.graphics.reset()
+    jin.graphics.setClearColor(100, 100, 100, 255)
+    jin.graphics.clear()
+    jin.graphics.print("No Game", 5, 5) 
+    jin.graphics.present()
+    plainLoop()
 end
 
 local function boot() 
     if jin.filesystem.exist("main.lua") then 
-        -- Require main game script
-        xpcall(function() require"main" end, onError)
-        xpcall(function() jin.core.run() end, onError)
+        call(function() 
+            require"main" 
+            jin.core.run()
+        end)
     else
-        -- No game 
-		jin.core.setHandler(jin.nogame)
-        jin.core.run()
+        noGame()
     end
-    jin.graphics.destroy()
-    jin.audio.destroy()
-    jin.core.quit()
-end 
+end
 
 xpcall(boot, onError)
 
+-------------------------------------------------------------------------
+-- Destroy sub-systems
+-------------------------------------------------------------------------
+
+jin.graphics.destroy()
+jin.audio.destroy()
+
+-------------------------------------------------------------------------
+-- Quit game
+-------------------------------------------------------------------------
+
+jin.core.quit()
+
 )";
\ No newline at end of file