diff options
author | chai <chaifix@163.com> | 2018-10-25 10:38:31 +0800 |
---|---|---|
committer | chai <chaifix@163.com> | 2018-10-25 10:38:31 +0800 |
commit | 9aaffab5721e0b2e850d6ffe9cf6c1e1367fc8ca (patch) | |
tree | abae6d9751fc412c0fb55da8d1547021e0ef5fde /src/lua | |
parent | 7322a090355af1989d7a1de0de431b6c89844fe2 (diff) |
*修改目录结构,将lua binding独立出来一个工程
Diffstat (limited to 'src/lua')
-rw-r--r-- | src/lua/main.cpp | 44 | ||||
-rw-r--r-- | src/lua/modules/graphics/je_lua_graphics.cpp | 3 | ||||
-rw-r--r-- | src/lua/modules/graphics/je_lua_page.cpp | 4 | ||||
-rw-r--r-- | src/lua/modules/graphics/je_lua_shader.cpp | 4 |
4 files changed, 5 insertions, 50 deletions
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) |