aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/libjin-lua/embed/ai.lua.h12
-rw-r--r--src/libjin-lua/embed/app.lua.h (renamed from src/libjin-lua/embed/boot.lua.h)2
-rw-r--r--src/libjin-lua/embed/embed.h10
-rw-r--r--src/libjin-lua/embed/path.lua.h18
-rw-r--r--src/libjin-lua/embed/scripts/ai/ai.lua (renamed from src/libjin-lua/embed/scripts/ai.lua)1
-rw-r--r--src/libjin-lua/embed/scripts/ai/state_machine.lua7
-rw-r--r--src/libjin-lua/embed/scripts/app.lua (renamed from src/libjin-lua/embed/scripts/boot.lua)0
-rw-r--r--src/libjin-lua/embed/scripts/graphics/graphics.lua (renamed from src/libjin-lua/embed/scripts/graphics.lua)0
-rw-r--r--src/libjin-lua/embed/scripts/keyboard/keyboard.lua (renamed from src/libjin-lua/embed/scripts/keyboard.lua)0
-rw-r--r--src/libjin-lua/embed/scripts/mouse/mouse.lua (renamed from src/libjin-lua/embed/scripts/mouse.lua)0
-rw-r--r--src/libjin-lua/embed/scripts/net/net.lua (renamed from src/libjin-lua/embed/scripts/net.lua)0
-rw-r--r--src/libjin-lua/embed/scripts/path/path.lua (renamed from src/libjin-lua/embed/scripts/path.lua)4
-rw-r--r--src/libjin-lua/embed/state_machine.lua.h8
-rw-r--r--src/libjin/ai/je_ai.h2
14 files changed, 38 insertions, 26 deletions
diff --git a/src/libjin-lua/embed/ai.lua.h b/src/libjin-lua/embed/ai.lua.h
index 112706e..1af475c 100644
--- a/src/libjin-lua/embed/ai.lua.h
+++ b/src/libjin-lua/embed/ai.lua.h
@@ -1,9 +1,9 @@
static unsigned char ai_lua[] = {
-13,10,106,105,110,46,97,105,32,61,32,106,105,110,46,97,105,32,111,114,
-32,123,125,32,13,10,13,10,108,111,99,97,108,32,106,97,32,61,32,106,
-105,110,46,97,105,13,10,13,10,106,97,46,83,116,97,116,101,77,97,99,
-104,105,110,101,84,121,112,101,32,61,32,123,13,10,32,32,32,32,83,84,
-69,80,87,73,83,69,32,61,32,49,44,32,13,10,32,32,32,32,73,84,
-69,82,65,84,73,86,69,32,61,32,50,44,13,10,125,13,10
+106,105,110,46,97,105,32,61,32,106,105,110,46,97,105,32,111,114,32,123,
+125,32,13,10,13,10,108,111,99,97,108,32,106,97,32,61,32,106,105,110,
+46,97,105,13,10,13,10,106,97,46,83,116,97,116,101,77,97,99,104,105,
+110,101,84,121,112,101,32,61,32,123,13,10,32,32,32,32,83,84,69,80,
+87,73,83,69,32,61,32,49,44,32,13,10,32,32,32,32,73,84,69,82,
+65,84,73,86,69,32,61,32,50,44,13,10,125,13,10
};
diff --git a/src/libjin-lua/embed/boot.lua.h b/src/libjin-lua/embed/app.lua.h
index 51f1044..1a9afd1 100644
--- a/src/libjin-lua/embed/boot.lua.h
+++ b/src/libjin-lua/embed/app.lua.h
@@ -1,4 +1,4 @@
-static unsigned char boot_lua[] = {
+static unsigned char app_lua[] = {
13,10,108,111,99,97,108,32,99,119,100,32,61,32,106,105,110,46,97,114,
103,115,91,39,99,119,100,39,93,32,111,114,32,39,46,39,13,10,106,105,
110,46,102,105,108,101,115,121,115,116,101,109,46,105,110,105,116,40,41,13,
diff --git a/src/libjin-lua/embed/embed.h b/src/libjin-lua/embed/embed.h
index c1d1ef5..0609abc 100644
--- a/src/libjin-lua/embed/embed.h
+++ b/src/libjin-lua/embed/embed.h
@@ -1,5 +1,5 @@
-#ifndef __JIN_LUA_EMBED_H
-#define __JIN_LUA_EMBED_H
+#ifndef __JIN_LUA_EMBED_H__
+#define __JIN_LUA_EMBED_H__
#include <cstring>
namespace JinEngine
@@ -18,7 +18,7 @@ namespace JinEngine
#include "graphics.lua.h"
#include "keyboard.lua.h"
#include "mouse.lua.h"
- #include "boot.lua.h"
+ #include "app.lua.h"
// In order.
static const jin_Embed modules[] = {
@@ -28,7 +28,7 @@ namespace JinEngine
{ 0, 0 }
};
- static const jin_Embed bootscript = { "boot.lua", boot_lua };
+ static const jin_Embed bootscript = { "app.lua", app_lua };
static void run(lua_State* L)
{
@@ -49,4 +49,4 @@ namespace JinEngine
} // namespace Embed
} // namespace JinEngine
-#endif \ No newline at end of file
+#endif // __JIN_LUA_EMBED_H__ \ No newline at end of file
diff --git a/src/libjin-lua/embed/path.lua.h b/src/libjin-lua/embed/path.lua.h
index 859b35b..59e7d74 100644
--- a/src/libjin-lua/embed/path.lua.h
+++ b/src/libjin-lua/embed/path.lua.h
@@ -1,16 +1,16 @@
static unsigned char path_lua[] = {
13,10,106,105,110,46,112,97,116,104,32,61,32,106,105,110,46,112,97,116,
104,32,111,114,32,123,125,32,13,10,13,10,108,111,99,97,108,32,106,112,
-32,61,32,106,105,110,46,112,97,116,104,13,10,13,10,45,45,32,103,97,
+32,61,32,106,105,110,46,112,97,116,104,13,10,13,10,45,45,32,71,97,
109,101,32,114,111,111,116,32,100,105,114,101,99,116,111,114,121,32,13,10,
106,105,110,46,95,114,111,111,116,32,61,32,110,105,108,32,13,10,13,10,
-45,45,32,114,101,116,117,114,110,32,102,117,108,108,32,112,97,116,104,32,
-111,102,32,97,32,103,105,118,101,110,32,112,97,116,104,32,13,10,102,117,
-110,99,116,105,111,110,32,106,105,110,46,112,97,116,104,46,102,117,108,108,
-40,112,97,116,104,41,13,10,32,32,32,32,108,111,99,97,108,32,114,111,
-111,116,32,61,32,106,105,110,46,95,100,105,114,32,46,46,32,39,47,39,
-32,46,46,32,106,105,110,46,95,97,114,103,118,91,50,93,13,10,32,32,
-32,32,114,101,116,117,114,110,32,114,111,111,116,32,46,46,32,39,47,39,
-32,46,46,32,112,97,116,104,32,13,10,101,110,100,13,10
+45,45,32,71,101,116,32,102,117,108,108,32,112,97,116,104,32,111,102,32,
+97,32,103,105,118,101,110,32,112,97,116,104,32,13,10,102,117,110,99,116,
+105,111,110,32,106,105,110,46,112,97,116,104,46,102,117,108,108,40,112,97,
+116,104,41,13,10,32,32,32,32,108,111,99,97,108,32,114,111,111,116,32,
+61,32,106,105,110,46,95,100,105,114,32,46,46,32,39,47,39,32,46,46,
+32,106,105,110,46,95,97,114,103,118,91,50,93,13,10,32,32,32,32,114,
+101,116,117,114,110,32,114,111,111,116,32,46,46,32,39,47,39,32,46,46,
+32,112,97,116,104,32,13,10,101,110,100,13,10
};
diff --git a/src/libjin-lua/embed/scripts/ai.lua b/src/libjin-lua/embed/scripts/ai/ai.lua
index c9f6ff1..fb8ffa7 100644
--- a/src/libjin-lua/embed/scripts/ai.lua
+++ b/src/libjin-lua/embed/scripts/ai/ai.lua
@@ -1,4 +1,3 @@
-
jin.ai = jin.ai or {}
local ja = jin.ai
diff --git a/src/libjin-lua/embed/scripts/ai/state_machine.lua b/src/libjin-lua/embed/scripts/ai/state_machine.lua
new file mode 100644
index 0000000..b4ec768
--- /dev/null
+++ b/src/libjin-lua/embed/scripts/ai/state_machine.lua
@@ -0,0 +1,7 @@
+jin.ai = jin.ai or {}
+
+local statemachine = {}
+
+jin.ai.newStateMachine = function()
+
+end
diff --git a/src/libjin-lua/embed/scripts/boot.lua b/src/libjin-lua/embed/scripts/app.lua
index cfcf264..cfcf264 100644
--- a/src/libjin-lua/embed/scripts/boot.lua
+++ b/src/libjin-lua/embed/scripts/app.lua
diff --git a/src/libjin-lua/embed/scripts/graphics.lua b/src/libjin-lua/embed/scripts/graphics/graphics.lua
index 41c481c..41c481c 100644
--- a/src/libjin-lua/embed/scripts/graphics.lua
+++ b/src/libjin-lua/embed/scripts/graphics/graphics.lua
diff --git a/src/libjin-lua/embed/scripts/keyboard.lua b/src/libjin-lua/embed/scripts/keyboard/keyboard.lua
index 452e0f7..452e0f7 100644
--- a/src/libjin-lua/embed/scripts/keyboard.lua
+++ b/src/libjin-lua/embed/scripts/keyboard/keyboard.lua
diff --git a/src/libjin-lua/embed/scripts/mouse.lua b/src/libjin-lua/embed/scripts/mouse/mouse.lua
index 876bf1d..876bf1d 100644
--- a/src/libjin-lua/embed/scripts/mouse.lua
+++ b/src/libjin-lua/embed/scripts/mouse/mouse.lua
diff --git a/src/libjin-lua/embed/scripts/net.lua b/src/libjin-lua/embed/scripts/net/net.lua
index 946b55f..946b55f 100644
--- a/src/libjin-lua/embed/scripts/net.lua
+++ b/src/libjin-lua/embed/scripts/net/net.lua
diff --git a/src/libjin-lua/embed/scripts/path.lua b/src/libjin-lua/embed/scripts/path/path.lua
index ede7f62..015f602 100644
--- a/src/libjin-lua/embed/scripts/path.lua
+++ b/src/libjin-lua/embed/scripts/path/path.lua
@@ -3,10 +3,10 @@ jin.path = jin.path or {}
local jp = jin.path
--- game root directory
+-- Game root directory
jin._root = nil
--- return full path of a given path
+-- Get full path of a given path
function jin.path.full(path)
local root = jin._dir .. '/' .. jin._argv[2]
return root .. '/' .. path
diff --git a/src/libjin-lua/embed/state_machine.lua.h b/src/libjin-lua/embed/state_machine.lua.h
new file mode 100644
index 0000000..01dd1aa
--- /dev/null
+++ b/src/libjin-lua/embed/state_machine.lua.h
@@ -0,0 +1,8 @@
+static unsigned char state_machine_lua[] = {
+106,105,110,46,97,105,32,61,32,106,105,110,46,97,105,32,111,114,32,123,
+125,32,13,10,13,10,108,111,99,97,108,32,115,116,97,116,101,109,97,99,
+104,105,110,101,32,61,32,123,125,13,10,13,10,106,105,110,46,97,105,46,
+110,101,119,83,116,97,116,101,77,97,99,104,105,110,101,32,61,32,102,117,
+110,99,116,105,111,110,40,41,32,13,10,13,10,101,110,100,13,10
+};
+
diff --git a/src/libjin/ai/je_ai.h b/src/libjin/ai/je_ai.h
index 57debce..aeaa183 100644
--- a/src/libjin/ai/je_ai.h
+++ b/src/libjin/ai/je_ai.h
@@ -5,6 +5,4 @@
#include "je_state_machine.h"
#include "je_behavior_tree.h"
-//
-
#endif \ No newline at end of file