From 1cbcb498297dc4de232a514b01790ef561edc041 Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Sat, 8 Sep 2018 15:51:02 +0800
Subject: *update

---
 src/lua/modules/_embed/boot.lua.h     | 171 ++++++++++++++++++++++++++++++++++
 src/lua/modules/_embed/embed.h        |  46 +++++++++
 src/lua/modules/_embed/graphics.lua.h |   4 +
 src/lua/modules/_embed/keyboard.lua.h |  15 +++
 src/lua/modules/_embed/mouse.lua.h    |  14 +++
 src/lua/modules/_embed/net.lua.h      |   4 +
 src/lua/modules/_embed/path.lua.h     |  14 +++
 src/lua/modules/embed/boot.lua.h      | 171 ----------------------------------
 src/lua/modules/embed/embed.h         |  46 ---------
 src/lua/modules/embed/graphics.lua.h  |   4 -
 src/lua/modules/embed/keyboard.lua.h  |  15 ---
 src/lua/modules/embed/mouse.lua.h     |  14 ---
 src/lua/modules/embed/net.lua.h       |   4 -
 src/lua/modules/embed/path.lua.h      |  14 ---
 src/lua/modules/graphics/graphics.cpp |   2 +-
 src/lua/modules/jin.cpp               |   2 +-
 src/lua/modules/keyboard/keyboard.cpp |   2 +-
 17 files changed, 271 insertions(+), 271 deletions(-)
 create mode 100644 src/lua/modules/_embed/boot.lua.h
 create mode 100644 src/lua/modules/_embed/embed.h
 create mode 100644 src/lua/modules/_embed/graphics.lua.h
 create mode 100644 src/lua/modules/_embed/keyboard.lua.h
 create mode 100644 src/lua/modules/_embed/mouse.lua.h
 create mode 100644 src/lua/modules/_embed/net.lua.h
 create mode 100644 src/lua/modules/_embed/path.lua.h
 delete mode 100644 src/lua/modules/embed/boot.lua.h
 delete mode 100644 src/lua/modules/embed/embed.h
 delete mode 100644 src/lua/modules/embed/graphics.lua.h
 delete mode 100644 src/lua/modules/embed/keyboard.lua.h
 delete mode 100644 src/lua/modules/embed/mouse.lua.h
 delete mode 100644 src/lua/modules/embed/net.lua.h
 delete mode 100644 src/lua/modules/embed/path.lua.h

(limited to 'src')

diff --git a/src/lua/modules/_embed/boot.lua.h b/src/lua/modules/_embed/boot.lua.h
new file mode 100644
index 0000000..8ff89ee
--- /dev/null
+++ b/src/lua/modules/_embed/boot.lua.h
@@ -0,0 +1,171 @@
+/* boot.lua */
+static const char* boot_lua = R"(
+jin._argv[2] = jin._argv[2] or '.'
+jin.filesystem.init()
+jin.filesystem.mount(jin._argv[2])
+
+-------------------------------------------------------------------------
+-- Config game
+-------------------------------------------------------------------------
+
+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.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 
+jin.config.fullscreen = jin.config.fullscreen or false
+jin.config.fps	      = jin.config.fps		  or 60
+
+-------------------------------------------------------------------------
+-- Initialize sub systems
+-------------------------------------------------------------------------
+
+jin.graphics.init(jin.config)
+jin.audio.init()
+-- TODO: 禁用系统模块
+
+-------------------------------------------------------------------------
+-- Default game loop
+-------------------------------------------------------------------------
+
+local function call(func, ...)
+    if func then 
+        return func(...)
+    end
+end
+
+function jin.core.run()
+    call(jin.core.onLoad)
+    local dt = 0
+    local previous = jin.time.second()
+	local current = previous
+    while jin.core.running() do
+        for _, e in pairs(jin.event.poll()) do 
+            if e.type == "keydown" then 
+                jin.keyboard.set(e.key, true) 
+            elseif e.type == "keyup" then 
+                jin.keyboard.set(e.key, false)
+            end
+            call(jin.core.onEvent, e)
+        end
+		previous = current
+        current = jin.time.second() 
+        dt = current - previous
+	    call(jin.core.onUpdate, dt)
+        jin.graphics.clear()		
+		call(jin.core.onDraw)
+        jin.graphics.present()
+        -- sleep 1 ms
+        jin.time.sleep(0.001)
+    end
+end
+
+-------------------------------------------------------------------------
+-- No game handler
+-------------------------------------------------------------------------
+
+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 
+
+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 
+        end
+    end
+}
+
+-------------------------------------------------------------------------
+-- Boot jin
+-------------------------------------------------------------------------
+
+local function onError(msg) 
+    local tab = '    '
+    print("Error:\n" .. msg)
+    function jin.core.onEvent(e) 
+        if e.type == 'quit' then 
+            jin.core.stop()
+        end
+    end
+    local ww, wh = jin.graphics.getSize() 
+    function jin.core.onDraw() 
+        jin.graphics.write("Error: ", 10, 10, 30, 3, 30)
+        jin.graphics.write(msg, 10, 50) 
+    end
+end
+
+local function boot() 
+    if jin.filesystem.exist("main.lua") then 
+        -- require main game script
+        xpcall(function() require"main" end, onError)
+        jin.core.run()
+    else
+        -- no game 
+		jin.core.setHandler(jin.nogame)
+        jin.core.run()
+    end
+    jin.graphics.destroy()
+    jin.audio.destroy()
+    jin.core.quit()
+end 
+
+xpcall(boot, onError)
+
+)";
diff --git a/src/lua/modules/_embed/embed.h b/src/lua/modules/_embed/embed.h
new file mode 100644
index 0000000..8d0ba85
--- /dev/null
+++ b/src/lua/modules/_embed/embed.h
@@ -0,0 +1,46 @@
+#ifndef __JIN_LUA_EMBED_H
+#define __JIN_LUA_EMBED_H
+#include <cstring>
+
+namespace jin
+{
+namespace embed
+{
+    
+#define embed(L, script, name)\
+    if(luax_loadbuffer(L, script, strlen(script), name) == 0)\
+        lua_call(L, 0, 0);
+
+    /**
+    * embed structure. 
+    */
+    struct jin_Embed
+    {
+        const char* file, *source;
+    };
+
+    static void boot(lua_State* L)
+    {
+        // embed scripts 
+        #include "graphics.lua.h" 
+        #include "keyboard.lua.h" 
+        #include "mouse.lua.h"    
+        #include "boot.lua.h"     
+
+        // in order
+        const jin_Embed scripts[] = {
+            { "graphics.lua", graphics_lua },
+            { "keyboard.lua", keyboard_lua },
+            { "mouse.lua",    mouse_lua    },
+            { "boot.lua",     boot_lua     },
+            { 0,              0            }
+        };
+
+        for (int i = 0; scripts[i].file; ++i)
+            embed(L, scripts[i].source, scripts[i].file);
+    }
+
+} // embed
+} // jin 
+
+#endif
\ No newline at end of file
diff --git a/src/lua/modules/_embed/graphics.lua.h b/src/lua/modules/_embed/graphics.lua.h
new file mode 100644
index 0000000..1414efc
--- /dev/null
+++ b/src/lua/modules/_embed/graphics.lua.h
@@ -0,0 +1,4 @@
+/* graphics.lua */
+static const char* graphics_lua = R"(
+jin.graphics = jin.graphics or {} 
+)";
diff --git a/src/lua/modules/_embed/keyboard.lua.h b/src/lua/modules/_embed/keyboard.lua.h
new file mode 100644
index 0000000..77bf3a9
--- /dev/null
+++ b/src/lua/modules/_embed/keyboard.lua.h
@@ -0,0 +1,15 @@
+
+static const char* keyboard_lua = R"(
+jin.keyboard = jin.keyboard or {} 
+
+local keys = {} 
+
+function jin.keyboard.isDown(k) 
+    return keys[k]
+end  
+
+function jin.keyboard.set(k, status) 
+    keys[k] = status 
+end 
+
+)";
diff --git a/src/lua/modules/_embed/mouse.lua.h b/src/lua/modules/_embed/mouse.lua.h
new file mode 100644
index 0000000..3c222f3
--- /dev/null
+++ b/src/lua/modules/_embed/mouse.lua.h
@@ -0,0 +1,14 @@
+static const char* mouse_lua = R"(
+jin.mouse = jin.mouse or {} 
+
+local button = {} 
+
+function jin.mouse.isDown(btn) 
+    return button[btn]
+end 
+
+function jin.mouse.set(btn, status) 
+    button[btn] = status
+end 
+
+)";
\ No newline at end of file
diff --git a/src/lua/modules/_embed/net.lua.h b/src/lua/modules/_embed/net.lua.h
new file mode 100644
index 0000000..4d89dc7
--- /dev/null
+++ b/src/lua/modules/_embed/net.lua.h
@@ -0,0 +1,4 @@
+/* net.lua */
+static const char* net_lua = R"(
+jin.net = jin.net or {} 
+)";
\ No newline at end of file
diff --git a/src/lua/modules/_embed/path.lua.h b/src/lua/modules/_embed/path.lua.h
new file mode 100644
index 0000000..648adf8
--- /dev/null
+++ b/src/lua/modules/_embed/path.lua.h
@@ -0,0 +1,14 @@
+/* path.lua */
+static const char* path_lua = R"(
+jin.path = jin.path or {} 
+
+-- game root directory 
+jin._root = nil 
+
+-- return full path of a given path 
+function jin.path.full(path)
+    local root = jin._dir .. '/' .. jin._argv[2]
+    return root .. '/' .. path 
+end
+
+)";
\ No newline at end of file
diff --git a/src/lua/modules/embed/boot.lua.h b/src/lua/modules/embed/boot.lua.h
deleted file mode 100644
index 8ff89ee..0000000
--- a/src/lua/modules/embed/boot.lua.h
+++ /dev/null
@@ -1,171 +0,0 @@
-/* boot.lua */
-static const char* boot_lua = R"(
-jin._argv[2] = jin._argv[2] or '.'
-jin.filesystem.init()
-jin.filesystem.mount(jin._argv[2])
-
--------------------------------------------------------------------------
--- Config game
--------------------------------------------------------------------------
-
-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.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 
-jin.config.fullscreen = jin.config.fullscreen or false
-jin.config.fps	      = jin.config.fps		  or 60
-
--------------------------------------------------------------------------
--- Initialize sub systems
--------------------------------------------------------------------------
-
-jin.graphics.init(jin.config)
-jin.audio.init()
--- TODO: 禁用系统模块
-
--------------------------------------------------------------------------
--- Default game loop
--------------------------------------------------------------------------
-
-local function call(func, ...)
-    if func then 
-        return func(...)
-    end
-end
-
-function jin.core.run()
-    call(jin.core.onLoad)
-    local dt = 0
-    local previous = jin.time.second()
-	local current = previous
-    while jin.core.running() do
-        for _, e in pairs(jin.event.poll()) do 
-            if e.type == "keydown" then 
-                jin.keyboard.set(e.key, true) 
-            elseif e.type == "keyup" then 
-                jin.keyboard.set(e.key, false)
-            end
-            call(jin.core.onEvent, e)
-        end
-		previous = current
-        current = jin.time.second() 
-        dt = current - previous
-	    call(jin.core.onUpdate, dt)
-        jin.graphics.clear()		
-		call(jin.core.onDraw)
-        jin.graphics.present()
-        -- sleep 1 ms
-        jin.time.sleep(0.001)
-    end
-end
-
--------------------------------------------------------------------------
--- No game handler
--------------------------------------------------------------------------
-
-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 
-
-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 
-        end
-    end
-}
-
--------------------------------------------------------------------------
--- Boot jin
--------------------------------------------------------------------------
-
-local function onError(msg) 
-    local tab = '    '
-    print("Error:\n" .. msg)
-    function jin.core.onEvent(e) 
-        if e.type == 'quit' then 
-            jin.core.stop()
-        end
-    end
-    local ww, wh = jin.graphics.getSize() 
-    function jin.core.onDraw() 
-        jin.graphics.write("Error: ", 10, 10, 30, 3, 30)
-        jin.graphics.write(msg, 10, 50) 
-    end
-end
-
-local function boot() 
-    if jin.filesystem.exist("main.lua") then 
-        -- require main game script
-        xpcall(function() require"main" end, onError)
-        jin.core.run()
-    else
-        -- no game 
-		jin.core.setHandler(jin.nogame)
-        jin.core.run()
-    end
-    jin.graphics.destroy()
-    jin.audio.destroy()
-    jin.core.quit()
-end 
-
-xpcall(boot, onError)
-
-)";
diff --git a/src/lua/modules/embed/embed.h b/src/lua/modules/embed/embed.h
deleted file mode 100644
index 8d0ba85..0000000
--- a/src/lua/modules/embed/embed.h
+++ /dev/null
@@ -1,46 +0,0 @@
-#ifndef __JIN_LUA_EMBED_H
-#define __JIN_LUA_EMBED_H
-#include <cstring>
-
-namespace jin
-{
-namespace embed
-{
-    
-#define embed(L, script, name)\
-    if(luax_loadbuffer(L, script, strlen(script), name) == 0)\
-        lua_call(L, 0, 0);
-
-    /**
-    * embed structure. 
-    */
-    struct jin_Embed
-    {
-        const char* file, *source;
-    };
-
-    static void boot(lua_State* L)
-    {
-        // embed scripts 
-        #include "graphics.lua.h" 
-        #include "keyboard.lua.h" 
-        #include "mouse.lua.h"    
-        #include "boot.lua.h"     
-
-        // in order
-        const jin_Embed scripts[] = {
-            { "graphics.lua", graphics_lua },
-            { "keyboard.lua", keyboard_lua },
-            { "mouse.lua",    mouse_lua    },
-            { "boot.lua",     boot_lua     },
-            { 0,              0            }
-        };
-
-        for (int i = 0; scripts[i].file; ++i)
-            embed(L, scripts[i].source, scripts[i].file);
-    }
-
-} // embed
-} // jin 
-
-#endif
\ No newline at end of file
diff --git a/src/lua/modules/embed/graphics.lua.h b/src/lua/modules/embed/graphics.lua.h
deleted file mode 100644
index 1414efc..0000000
--- a/src/lua/modules/embed/graphics.lua.h
+++ /dev/null
@@ -1,4 +0,0 @@
-/* graphics.lua */
-static const char* graphics_lua = R"(
-jin.graphics = jin.graphics or {} 
-)";
diff --git a/src/lua/modules/embed/keyboard.lua.h b/src/lua/modules/embed/keyboard.lua.h
deleted file mode 100644
index 77bf3a9..0000000
--- a/src/lua/modules/embed/keyboard.lua.h
+++ /dev/null
@@ -1,15 +0,0 @@
-
-static const char* keyboard_lua = R"(
-jin.keyboard = jin.keyboard or {} 
-
-local keys = {} 
-
-function jin.keyboard.isDown(k) 
-    return keys[k]
-end  
-
-function jin.keyboard.set(k, status) 
-    keys[k] = status 
-end 
-
-)";
diff --git a/src/lua/modules/embed/mouse.lua.h b/src/lua/modules/embed/mouse.lua.h
deleted file mode 100644
index 3c222f3..0000000
--- a/src/lua/modules/embed/mouse.lua.h
+++ /dev/null
@@ -1,14 +0,0 @@
-static const char* mouse_lua = R"(
-jin.mouse = jin.mouse or {} 
-
-local button = {} 
-
-function jin.mouse.isDown(btn) 
-    return button[btn]
-end 
-
-function jin.mouse.set(btn, status) 
-    button[btn] = status
-end 
-
-)";
\ No newline at end of file
diff --git a/src/lua/modules/embed/net.lua.h b/src/lua/modules/embed/net.lua.h
deleted file mode 100644
index 4d89dc7..0000000
--- a/src/lua/modules/embed/net.lua.h
+++ /dev/null
@@ -1,4 +0,0 @@
-/* net.lua */
-static const char* net_lua = R"(
-jin.net = jin.net or {} 
-)";
\ No newline at end of file
diff --git a/src/lua/modules/embed/path.lua.h b/src/lua/modules/embed/path.lua.h
deleted file mode 100644
index 648adf8..0000000
--- a/src/lua/modules/embed/path.lua.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/* path.lua */
-static const char* path_lua = R"(
-jin.path = jin.path or {} 
-
--- game root directory 
-jin._root = nil 
-
--- return full path of a given path 
-function jin.path.full(path)
-    local root = jin._dir .. '/' .. jin._argv[2]
-    return root .. '/' .. path 
-end
-
-)";
\ No newline at end of file
diff --git a/src/lua/modules/graphics/graphics.cpp b/src/lua/modules/graphics/graphics.cpp
index 4d597ae..a8c54c2 100644
--- a/src/lua/modules/graphics/graphics.cpp
+++ b/src/lua/modules/graphics/graphics.cpp
@@ -2,7 +2,7 @@
 #include "lua/modules/types.h"
 #include "libjin/jin.h"
 #include "lua/common/common.h"
-#include "lua/modules/embed/graphics.lua.h"
+#include "lua/modules/_embed/graphics.lua.h"
 
 namespace jin
 {
diff --git a/src/lua/modules/jin.cpp b/src/lua/modules/jin.cpp
index a25ec6c..a287218 100644
--- a/src/lua/modules/jin.cpp
+++ b/src/lua/modules/jin.cpp
@@ -1,6 +1,6 @@
 #include "jin.h"
 #include "lua/modules/luax.h"
-#include "embed/embed.h"
+#include "_embed/embed.h"
 
 namespace jin
 {
diff --git a/src/lua/modules/keyboard/keyboard.cpp b/src/lua/modules/keyboard/keyboard.cpp
index 1866211..ffbc6b9 100644
--- a/src/lua/modules/keyboard/keyboard.cpp
+++ b/src/lua/modules/keyboard/keyboard.cpp
@@ -1,5 +1,5 @@
 #include "lua/modules/luax.h"
-#include "lua/modules/embed/keyboard.lua.h"
+#include "lua/modules/_embed/keyboard.lua.h"
 
 namespace jin
 {
-- 
cgit v1.1-26-g67d0