From 9aaffab5721e0b2e850d6ffe9cf6c1e1367fc8ca Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Thu, 25 Oct 2018 10:38:31 +0800
Subject: =?UTF-8?q?*=E4=BF=AE=E6=94=B9=E7=9B=AE=E5=BD=95=E7=BB=93=E6=9E=84?=
 =?UTF-8?q?=EF=BC=8C=E5=B0=86lua=20binding=E7=8B=AC=E7=AB=8B=E5=87=BA?=
 =?UTF-8?q?=E6=9D=A5=E4=B8=80=E4=B8=AA=E5=B7=A5=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jin/main.cpp                             | 44 ++++++++++++++++++++++++++++
 src/lua/main.cpp                             | 44 ----------------------------
 src/lua/modules/graphics/je_lua_graphics.cpp |  3 +-
 src/lua/modules/graphics/je_lua_page.cpp     |  4 +--
 src/lua/modules/graphics/je_lua_shader.cpp   |  4 +--
 5 files changed, 49 insertions(+), 50 deletions(-)
 create mode 100644 src/jin/main.cpp
 delete mode 100644 src/lua/main.cpp

(limited to 'src')

diff --git a/src/jin/main.cpp b/src/jin/main.cpp
new file mode 100644
index 0000000..2d65064
--- /dev/null
+++ b/src/jin/main.cpp
@@ -0,0 +1,44 @@
+#ifdef _WIN32
+    #include <SDL2/SDL_Main.h>
+    #include <direct.h>
+#endif
+
+#include "lua/luax.h"
+#include "lua/jin.h"
+#include "libjin/jin.h"
+#include <Windows.h>
+
+using namespace JinEngine::Lua;
+using namespace JinEngine::Filesystem;
+
+int main(int argc, char* argv[])
+{
+    lua_State* L = luax_newstate();
+
+    // Open lua standard module.
+    luax_openlibs(L);
+    // Open jin module.
+    luaopen_jin(L);
+    // Add args to field.
+    luax_newtable(L);
+    for (int i = 0; i < argc; ++i)
+        luax_setrawstring(L, -2, i + 1, argv[i]);
+    luax_setfield(L, -2, "args");
+    // Push current working directory.
+    // Absolute directory.
+    Buffer cwd = Buffer(1024);
+#ifdef _WIN32
+    _getcwd((char*)&cwd, cwd.size());
+#elif defined __unix__
+#elif defined __APPLE__
+#endif
+    luax_setfieldstring(L, "cwd", (char*)&cwd);
+    luax_clear(L);
+
+    // Boot jin and run it.
+    boot(L);
+
+    luax_close(L);
+
+    return 0;
+}
\ No newline at end of file
diff --git a/src/lua/main.cpp b/src/lua/main.cpp
deleted file mode 100644
index 95862ec..0000000
--- a/src/lua/main.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-#ifdef _WIN32
-    #include <SDL2/SDL_Main.h>
-    #include <direct.h>
-#endif
-
-#include "luax.h"
-#include "jin.h"
-#include "libjin/jin.h"
-#include <Windows.h>
-
-using namespace JinEngine::Lua;
-using namespace JinEngine::Filesystem;
-
-int main(int argc, char* argv[])
-{
-    lua_State* L = luax_newstate();
-
-    /* open lua standard module */
-    luax_openlibs(L);
-    /* open jin module */
-    luaopen_jin(L);
-    /* add args to field */
-    luax_newtable(L); 
-    for (int i = 0; i < argc; ++i)
-        luax_setrawstring(L, -2, i + 1, argv[i]);
-    luax_setfield(L, -2, "args");
-    /* push current working directory */
-    /* absolute directory */
-    Buffer cwd = Buffer(1024);
-#ifdef _WIN32
-    _getcwd((char*)&cwd, cwd.size());
-#elif defined __unix__
-#elif defined __APPLE__
-#endif
-    luax_setfieldstring(L, "cwd", (char*)&cwd);
-    luax_clear(L);
-
-    /* boot jin and run it */
-    boot(L);
-
-    luax_close(L);
-
-    return 0;
-}
\ No newline at end of file
diff --git a/src/lua/modules/graphics/je_lua_graphics.cpp b/src/lua/modules/graphics/je_lua_graphics.cpp
index df68957..83ef40b 100644
--- a/src/lua/modules/graphics/je_lua_graphics.cpp
+++ b/src/lua/modules/graphics/je_lua_graphics.cpp
@@ -9,8 +9,7 @@
 using namespace std;
 using namespace JinEngine;
 using namespace JinEngine::Graphics;
-using JinEngine::Filesystem::AssetDatabase;
-using JinEngine::Filesystem::Buffer;
+using namespace JinEngine::Filesystem;
 
 namespace JinEngine
 {
diff --git a/src/lua/modules/graphics/je_lua_page.cpp b/src/lua/modules/graphics/je_lua_page.cpp
index 2505ec5..7f3d1c8 100644
--- a/src/lua/modules/graphics/je_lua_page.cpp
+++ b/src/lua/modules/graphics/je_lua_page.cpp
@@ -5,13 +5,13 @@
 
 #include <iostream>
 
+using namespace JinEngine::Graphics;
+
 namespace JinEngine
 {
     namespace Lua
     {
 
-        using namespace JinEngine::Graphics;
-
         typedef Ref<Font>& FontRef;
 
         Page* getPage(lua_State* L)
diff --git a/src/lua/modules/graphics/je_lua_shader.cpp b/src/lua/modules/graphics/je_lua_shader.cpp
index 6aa45e2..d61f477 100644
--- a/src/lua/modules/graphics/je_lua_shader.cpp
+++ b/src/lua/modules/graphics/je_lua_shader.cpp
@@ -3,13 +3,13 @@
 #include "lua/common/je_lua_common.h"
 #include "libjin/jin.h"
 
+using namespace JinEngine::Graphics;
+
 namespace JinEngine
 {
     namespace Lua
     {
     
-	    using namespace JinEngine::Graphics;
-
 	    typedef Ref<Shader>& ShaderRef;
 
         static inline ShaderRef checkShader(lua_State* L)
-- 
cgit v1.1-26-g67d0