diff options
Diffstat (limited to 'src/lua/modules/graphics')
| -rw-r--r-- | src/lua/modules/graphics/graphics.cpp | 50 |
1 files changed, 27 insertions, 23 deletions
diff --git a/src/lua/modules/graphics/graphics.cpp b/src/lua/modules/graphics/graphics.cpp index fadc59d..62bfb26 100644 --- a/src/lua/modules/graphics/graphics.cpp +++ b/src/lua/modules/graphics/graphics.cpp @@ -13,8 +13,6 @@ namespace lua using jin::filesystem::Filesystem; using jin::filesystem::Buffer; - typedef Texture Texture; - static struct { color curRenderColor; @@ -27,12 +25,12 @@ namespace lua { Window* wnd = Window::get(); Window::Setting setting; - setting.width = luax_getfield_integer(L, 1, "width"); - setting.height = luax_getfield_integer(L, 1, "height"); - setting.title = luax_getfield_string(L, 1, "title"); - setting.vsync = luax_getfield_bool(L, 1, "vsync"); + setting.width = luax_getfield_integer(L, 1, "width"); + setting.height = luax_getfield_integer(L, 1, "height"); + setting.title = luax_getfield_string(L, 1, "title"); + setting.vsync = luax_getfield_bool(L, 1, "vsync"); setting.fullscreen = luax_getfield_bool(L, 1, "fullscreen"); - setting.resizable= luax_getfield_bool(L, 1, "resizable"); + setting.resizable = luax_getfield_bool(L, 1, "resizable"); if (!wnd->init(&setting)) { luax_pushboolean(L, false); @@ -270,12 +268,12 @@ namespace lua return 0; } - static RENDER_MODE strtomode(const char* str) + static RenderMode strtomode(const char* str) { std::string s = std::string(str); - if (s == "fill") return RENDER_MODE::FILL; - else if (s == "line") return RENDER_MODE::LINE; - else return RENDER_MODE::NONE; + if (s == "fill") return RenderMode::FILL; + else if (s == "line") return RenderMode::LINE; + else return RenderMode::NONE; } static int l_point(lua_State* L) @@ -301,8 +299,8 @@ namespace lua static int l_rect(lua_State* L) { const char* modestr = luax_checkstring(L, 1); - RENDER_MODE mode = strtomode(modestr); - if (mode != RENDER_MODE::NONE) + RenderMode mode = strtomode(modestr); + if (mode != RenderMode::NONE) { int x = luax_checknumber(L, 2); int y = luax_checknumber(L, 3); @@ -322,8 +320,8 @@ namespace lua static int l_circle(lua_State* L) { const char* modestr = luax_checkstring(L, 1); - RENDER_MODE mode = strtomode(modestr); - if (mode != RENDER_MODE::NONE) + RenderMode mode = strtomode(modestr); + if (mode != RenderMode::NONE) { int x = luax_checknumber(L, 2); int y = luax_checknumber(L, 3); @@ -342,8 +340,8 @@ namespace lua static int l_triangle(lua_State* L) { const char* modestr = luax_checkstring(L, 1); - RENDER_MODE mode = strtomode(modestr); - if (mode != RENDER_MODE::NONE) + RenderMode mode = strtomode(modestr); + if (mode != RenderMode::NONE) { int x = luax_checknumber(L, 2); int y = luax_checknumber(L, 3); @@ -369,8 +367,8 @@ namespace lua { const char* modestr = luax_checkstring(L, 1); int n = luax_checknumber(L, 2); - RENDER_MODE mode = strtomode(modestr); - if (mode != RENDER_MODE::NONE) + RenderMode mode = strtomode(modestr); + if (mode != RenderMode::NONE) { if (!luax_istable(L, 3)) { @@ -429,7 +427,6 @@ namespace lua if (context.defaultFont == 0) { #include "lua/resources/font.ttf.h" - // load default font context.defaultFont = new Font(); context.defaultFont->loadMemory(font_ttf); } @@ -473,35 +470,42 @@ namespace lua } static const luaL_Reg f[] = { + /* window */ { "init", l_init }, { "setTitle", l_setTitle }, { "getSize", l_getSize }, { "getWidth", l_getWidth }, { "getHeight", l_getHeight }, + { "destroy", l_destroy }, + /* creators */ { "newTexture", l_newTexture }, { "newShader", l_newShader }, { "newCanvas", l_newCanvas }, { "newFont", l_newFont }, - { "box", l_box }, - { "write", l_write }, + /* render */ { "setClearColor", l_setClearColor }, { "clear", l_clear }, { "draw", l_draw }, { "setColor", l_setColor }, { "palette", l_palette }, { "present", l_present }, + /* font */ + { "box", l_box }, + { "write", l_write }, { "setFont", l_setFont }, + /* canvas */ { "bindCanvas", l_bindCanvas }, { "unbindCanvas", l_unbindCanvas }, + /* shader */ { "useShader", l_useShader }, { "unuseShader", l_unuseShader }, + /* shapes */ { "point", l_point }, { "line", l_line }, { "rect", l_rect }, { "circle", l_circle }, { "triangle", l_triangle }, { "polygon", l_polygon }, - { "destroy", l_destroy }, { 0, 0 } }; |