diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/jin/main.cpp (renamed from src/lua/main.cpp) | 18 | ||||
-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, 14 insertions, 15 deletions
diff --git a/src/lua/main.cpp b/src/jin/main.cpp index 95862ec..2d65064 100644 --- a/src/lua/main.cpp +++ b/src/jin/main.cpp @@ -3,8 +3,8 @@ #include <direct.h> #endif -#include "luax.h" -#include "jin.h" +#include "lua/luax.h" +#include "lua/jin.h" #include "libjin/jin.h" #include <Windows.h> @@ -15,17 +15,17 @@ int main(int argc, char* argv[]) { lua_State* L = luax_newstate(); - /* open lua standard module */ + // Open lua standard module. luax_openlibs(L); - /* open jin module */ + // Open jin module. luaopen_jin(L); - /* add args to field */ - luax_newtable(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 */ + // Push current working directory. + // Absolute directory. Buffer cwd = Buffer(1024); #ifdef _WIN32 _getcwd((char*)&cwd, cwd.size()); @@ -35,7 +35,7 @@ int main(int argc, char* argv[]) luax_setfieldstring(L, "cwd", (char*)&cwd); luax_clear(L); - /* boot jin and run it */ + // Boot jin and run it. boot(L); luax_close(L); 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) |