*修改代码结构

8 files changed, 61 insertions, 17 deletions

diff --git a/src/lua/embed/embed.h b/src/lua/embed/embed.h
index 1efbc95..054672c 100644
--- a/src/lua/embed/embed.h
+++ b/src/lua/embed/embed.h
@@ -18,10 +18,10 @@ namespace JinEngine
         };
 
         // Embed scripts.
-    #include "graphics.lua.h" 
-    #include "keyboard.lua.h" 
-    #include "mouse.lua.h"    
-    #include "boot.lua.h"     
+    #include "scripts/graphics.lua.h" 
+    #include "scripts/keyboard.lua.h" 
+    #include "scripts/mouse.lua.h"    
+    #include "scripts/boot.lua.h"     
 
         // In order.
         const jin_Embed scripts[] = {
diff --git a/src/lua/embed/scripts/ai.lua.h b/src/lua/embed/scripts/ai.lua.h
new file mode 100644
index 0000000..a69da84
--- /dev/null
+++ b/src/lua/embed/scripts/ai.lua.h
@@ -0,0 +1,26 @@
+/* graphics.lua */
+static const char* ai_lua = R"(
+jin.ai = jin.ai or {} 
+
+local ja = jin.ai
+
+ja.StateMachineType = {
+    STEPWISE = 1, 
+    ITERATIVE = 2,
+}
+
+
+
+)";
+
+
+//local sp = jin.graphics.newSprite()
+//local sm = jin.ai.newStateMachine(jin.StateMachineMode.STEPWISE, sp)
+//sm:addState("run")
+//sm:addEnterCallback("run", function(spr)
+//  spr:setRun()
+//end)
+//
+//function jin.core.onUpdate(dt)
+//  sm:update()
+//end
diff --git a/src/lua/embed/boot.lua.h b/src/lua/embed/scripts/boot.lua.h
index 0884188..cffeca6 100644
--- a/src/lua/embed/boot.lua.h
+++ b/src/lua/embed/scripts/boot.lua.h
@@ -63,12 +63,13 @@ end
 
 -- Display error message.
 local function onError(msg) 
+    jin.audio.destroy()
     jin.graphics.showWindow()
     local err = "Error:\n" .. msg .. "\n" .. debug.traceback()
     jin.graphics.reset()
     jin.graphics.setClearColor(100, 100, 100, 255)
     jin.graphics.clear()
-    jin.graphics.print(err, 5, 5) 
+    jin.graphics.print(err, 5, 5)
     jin.graphics.present()
     while jin.core.running() do 
         for _, e in pairs(jin.event.poll()) do 
diff --git a/src/lua/embed/graphics.lua.h b/src/lua/embed/scripts/graphics.lua.h
index b2a19b5..751d029 100644
--- a/src/lua/embed/graphics.lua.h
+++ b/src/lua/embed/scripts/graphics.lua.h
@@ -2,6 +2,13 @@
 static const char* graphics_lua = R"(
 jin.graphics = jin.graphics or {} 
 
+local jg = jin.graphics
+
+jg.RenderMode = {
+    FILL = 1, 
+    LINE = 2,
+}
+
 local default_shader = nil
 local default_shader_source = [[
 #VERTEX_SHADER
@@ -23,31 +30,32 @@ Color frag(Color col, Texture tex, Vertex v)
 #END_FRAGMENT_SHADER
 ]]
 
-local _init = jin.graphics.init
+local _init = jg.init
 local initialized = false
 
-jin.graphics.init = function(setting) 
+jg.init = function(setting) 
     if initialized then 
         return initialized
     end
     initialized = _init(setting)
     if initialized then 
-        default_shader = jin.graphics.newShader(default_shader_source)
-        jin.graphics.useShader(default_shader)
+        default_shader = jg.newShader(default_shader_source)
+        jg.useShader(default_shader)
     end
     return initialized 
 end
 
-jin.graphics.unuseShader = function()
-    jin.graphics.useShader(default_shader)
+jg.unuseShader = function()
+    jg.useShader(default_shader)
 end
 
 -- Reset all attributes to default value.
-jin.graphics.reset = function()
-    jin.graphics.setColor(255, 255, 255, 255)
-    jin.graphics.setClearColor(0, 0, 0, 255)
-    jin.graphics.clear()
-    jin.graphics.unsetFont()
+jg.reset = function()
+    jg.setColor(255, 255, 255, 255)
+    jg.setClearColor(0, 0, 0, 255)
+    jg.clear()
+    jg.unsetFont()
+    jg.unuseShader()
 end
 
-)";
+)";
\ No newline at end of file
diff --git a/src/lua/embed/keyboard.lua.h b/src/lua/embed/scripts/keyboard.lua.h
index ee8428f..e989928 100644
--- a/src/lua/embed/keyboard.lua.h
+++ b/src/lua/embed/scripts/keyboard.lua.h
@@ -2,6 +2,8 @@
 static const char* keyboard_lua = R"(
 jin.keyboard = jin.keyboard or {} 
 
+local jk = jin.keyboard
+
 local keys = {} 
 
 function jin.keyboard.isPressed(k) 
diff --git a/src/lua/embed/mouse.lua.h b/src/lua/embed/scripts/mouse.lua.h
index 3c222f3..ca070a3 100644
--- a/src/lua/embed/mouse.lua.h
+++ b/src/lua/embed/scripts/mouse.lua.h
@@ -1,6 +1,8 @@
 static const char* mouse_lua = R"(
 jin.mouse = jin.mouse or {} 
 
+local jm = jin.mouse
+
 local button = {} 
 
 function jin.mouse.isDown(btn) 
diff --git a/src/lua/embed/net.lua.h b/src/lua/embed/scripts/net.lua.h
index 4d89dc7..a986ce6 100644
--- a/src/lua/embed/net.lua.h
+++ b/src/lua/embed/scripts/net.lua.h
@@ -1,4 +1,7 @@
 /* net.lua */
 static const char* net_lua = R"(
 jin.net = jin.net or {} 
+
+local jn = jin.net
+
 )";
\ No newline at end of file
diff --git a/src/lua/embed/path.lua.h b/src/lua/embed/scripts/path.lua.h
index 648adf8..f7e1ec3 100644
--- a/src/lua/embed/path.lua.h
+++ b/src/lua/embed/scripts/path.lua.h
@@ -2,6 +2,8 @@
 static const char* path_lua = R"(
 jin.path = jin.path or {} 
 
+local jp = jin.path
+
 -- game root directory 
 jin._root = nil