diff options
Diffstat (limited to 'src/lua/graphics')
-rw-r--r-- | src/lua/graphics/luaopen_Canvas.cpp | 2 | ||||
-rw-r--r-- | src/lua/graphics/luaopen_Font.cpp | 4 | ||||
-rw-r--r-- | src/lua/graphics/luaopen_Image.cpp | 4 | ||||
-rw-r--r-- | src/lua/graphics/luaopen_JSL.cpp | 2 | ||||
-rw-r--r-- | src/lua/graphics/luaopen_graphics.cpp | 14 |
5 files changed, 13 insertions, 13 deletions
diff --git a/src/lua/graphics/luaopen_Canvas.cpp b/src/lua/graphics/luaopen_Canvas.cpp index 5dede84..1b76edd 100644 --- a/src/lua/graphics/luaopen_Canvas.cpp +++ b/src/lua/graphics/luaopen_Canvas.cpp @@ -7,7 +7,7 @@ namespace jin namespace lua { - using namespace jin::render; + using namespace jin::graphics; static inline Canvas* checkCanvas(lua_State* L) { diff --git a/src/lua/graphics/luaopen_Font.cpp b/src/lua/graphics/luaopen_Font.cpp index 387b220..c0d4708 100644 --- a/src/lua/graphics/luaopen_Font.cpp +++ b/src/lua/graphics/luaopen_Font.cpp @@ -2,13 +2,13 @@ #include "lua/luaopen_types.h" #include "libjin/jin.h" -using namespace jin::render; - namespace jin { namespace lua { + using namespace jin::graphics; + static int l_gc(lua_State* L) { return 0; diff --git a/src/lua/graphics/luaopen_Image.cpp b/src/lua/graphics/luaopen_Image.cpp index d651e20..5fc9aea 100644 --- a/src/lua/graphics/luaopen_Image.cpp +++ b/src/lua/graphics/luaopen_Image.cpp @@ -2,13 +2,13 @@ #include "libjin/jin.h" #include "lua/luaopen_types.h" -using namespace jin::render; - namespace jin { namespace lua { + using namespace jin::graphics; + static inline Texture* checkTexture(lua_State* L) { Proxy* proxy = (Proxy*)luax_checktype(L, 1, TYPE_IMAGE); diff --git a/src/lua/graphics/luaopen_JSL.cpp b/src/lua/graphics/luaopen_JSL.cpp index 5289a43..9b9071c 100644 --- a/src/lua/graphics/luaopen_JSL.cpp +++ b/src/lua/graphics/luaopen_JSL.cpp @@ -7,7 +7,7 @@ namespace jin namespace lua { - using namespace render; + using namespace jin::graphics; static inline JSLProgram* checkJSLProgram(lua_State* L) { diff --git a/src/lua/graphics/luaopen_graphics.cpp b/src/lua/graphics/luaopen_graphics.cpp index 5cd0c8d..42586a5 100644 --- a/src/lua/graphics/luaopen_graphics.cpp +++ b/src/lua/graphics/luaopen_graphics.cpp @@ -7,7 +7,7 @@ namespace jin { namespace lua { - using namespace jin::render; + using namespace jin::graphics; using namespace jin::filesystem; /** @@ -262,7 +262,7 @@ namespace lua { int x = luax_checknumber(L, 1); int y = luax_checknumber(L, 2); - render::point(x, y); + point(x, y); return 0; } @@ -273,7 +273,7 @@ namespace lua int y1 = luax_checknumber(L, 2); int x2 = luax_checknumber(L, 3); int y2 = luax_checknumber(L, 4); - render::line(x1, y1, x2, y2); + line(x1, y1, x2, y2); return 0; } @@ -288,7 +288,7 @@ namespace lua int y = luax_checknumber(L, 3); int w = luax_checknumber(L, 4); int h = luax_checknumber(L, 5); - render::rect(mode, x, y, w, h); + rect(mode, x, y, w, h); } else { @@ -308,7 +308,7 @@ namespace lua int x = luax_checknumber(L, 2); int y = luax_checknumber(L, 3); float r = luax_checknumber(L, 4); - render::circle(mode, x, y, r); + circle(mode, x, y, r); } else { @@ -334,7 +334,7 @@ namespace lua int x3 = luax_checknumber(L, 5); int y3 = luax_checknumber(L, 6); - render::triangle(mode, x, y, x2, y2, x3, y3); + triangle(mode, x, y, x2, y2, x3, y3); } else { @@ -373,7 +373,7 @@ namespace lua float* p = new float[2 * n]; for (int i = 1; i <= 2 * n; ++i) p[i - 1] = luax_rawgetnumber(L, 3, i); - render::polygon(mode, p, n); + polygon(mode, p, n); delete[] p; } else |