aboutsummaryrefslogtreecommitdiff
path: root/src/lua/graphics
diff options
context:
space:
mode:
Diffstat (limited to 'src/lua/graphics')
-rw-r--r--src/lua/graphics/luaopen_Canvas.cpp6
-rw-r--r--src/lua/graphics/luaopen_Font.cpp4
-rw-r--r--src/lua/graphics/luaopen_Image.cpp6
-rw-r--r--src/lua/graphics/luaopen_JSL.cpp10
-rw-r--r--src/lua/graphics/luaopen_graphics.cpp24
5 files changed, 25 insertions, 25 deletions
diff --git a/src/lua/graphics/luaopen_Canvas.cpp b/src/lua/graphics/luaopen_Canvas.cpp
index 1b76edd..808a977 100644
--- a/src/lua/graphics/luaopen_Canvas.cpp
+++ b/src/lua/graphics/luaopen_Canvas.cpp
@@ -11,7 +11,7 @@ namespace lua
static inline Canvas* checkCanvas(lua_State* L)
{
- Proxy* proxy = (Proxy*)luax_checktype(L, 1, TYPE_CANVAS);
+ Proxy* proxy = (Proxy*)luax_checktype(L, 1, JIN_GRAPHICS_CANVAS);
if (proxy != nullptr)
return (Canvas*)proxy->object;
return nullptr;
@@ -50,7 +50,7 @@ namespace lua
static int l_gc(lua_State* L)
{
- Proxy* proxy = (Proxy*)luax_checktype(L, 1, TYPE_CANVAS);
+ Proxy* proxy = (Proxy*)luax_checktype(L, 1, JIN_GRAPHICS_CANVAS);
Canvas* canvas = (Canvas*)proxy->object;
delete canvas;
return 0;
@@ -67,7 +67,7 @@ namespace lua
int luaopen_Canvas(lua_State* L)
{
- luax_newtype(L, TYPE_CANVAS, f);
+ luax_newtype(L, JIN_GRAPHICS_CANVAS, f);
return 0;
}
diff --git a/src/lua/graphics/luaopen_Font.cpp b/src/lua/graphics/luaopen_Font.cpp
index c0d4708..3de2981 100644
--- a/src/lua/graphics/luaopen_Font.cpp
+++ b/src/lua/graphics/luaopen_Font.cpp
@@ -16,7 +16,7 @@ namespace lua
static int l_box(lua_State* L)
{
- Font* font = (Font*)luax_checktype(L, 1, TYPE_FONT);
+ Font* font = (Font*)luax_checktype(L, 1, JIN_GRAPHICS_FONT);
const char* text = luax_checkstring(L, 2);
int fheight = luax_checknumber(L, 3);
int spacing = luax_checknumber(L, 4);
@@ -36,7 +36,7 @@ namespace lua
int luaopen_Font(lua_State* L)
{
- luax_newtype(L, TYPE_FONT, f);
+ luax_newtype(L, JIN_GRAPHICS_FONT, f);
return 0;
}
diff --git a/src/lua/graphics/luaopen_Image.cpp b/src/lua/graphics/luaopen_Image.cpp
index 546e6b1..0f97b2c 100644
--- a/src/lua/graphics/luaopen_Image.cpp
+++ b/src/lua/graphics/luaopen_Image.cpp
@@ -11,7 +11,7 @@ namespace lua
static inline Texture* checkTexture(lua_State* L)
{
- Proxy* proxy = (Proxy*)luax_checktype(L, 1, TYPE_IMAGE);
+ Proxy* proxy = (Proxy*)luax_checktype(L, 1, JIN_GRAPHICS_IMAGE);
if (proxy != nullptr)
return (Texture*)proxy->object;
return nullptr;
@@ -63,7 +63,7 @@ namespace lua
static int l_gc(lua_State* L)
{
- Proxy* proxy = (Proxy*)luax_checktype(L, 1, TYPE_IMAGE);
+ Proxy* proxy = (Proxy*)luax_checktype(L, 1, JIN_GRAPHICS_IMAGE);
Texture* img = (Texture*)proxy->object;
delete img;
return 0;
@@ -81,7 +81,7 @@ namespace lua
int luaopen_Image(lua_State* L)
{
- luax_newtype(L, TYPE_IMAGE, f);
+ luax_newtype(L, JIN_GRAPHICS_IMAGE, f);
return 0;
}
diff --git a/src/lua/graphics/luaopen_JSL.cpp b/src/lua/graphics/luaopen_JSL.cpp
index 7c59937..8d25178 100644
--- a/src/lua/graphics/luaopen_JSL.cpp
+++ b/src/lua/graphics/luaopen_JSL.cpp
@@ -11,7 +11,7 @@ namespace lua
static inline JSLProgram* checkJSLProgram(lua_State* L)
{
- Proxy* proxy = (Proxy*)luax_checktype(L, 1, TYPE_JSL);
+ Proxy* proxy = (Proxy*)luax_checktype(L, 1, JIN_GRAPHICS_SHADER);
if(proxy != nullptr)
return (JSLProgram*)proxy->object;
return nullptr;
@@ -66,14 +66,14 @@ namespace lua
}
case IMAGE:
{
- Proxy* proxy = (Proxy*)luax_checktype(L, 4, TYPE_IMAGE);
+ Proxy* proxy = (Proxy*)luax_checktype(L, 4, JIN_GRAPHICS_IMAGE);
Texture* tex = (Texture*)proxy->object;
jsl->sendTexture(variable, tex);
break;
}
case CANVAS:
{
- Proxy* proxy = (Proxy*)luax_checktype(L, 4, TYPE_IMAGE);
+ Proxy* proxy = (Proxy*)luax_checktype(L, 4, JIN_GRAPHICS_CANVAS);
Canvas* canvas = (Canvas*)proxy->object;
jsl->sendCanvas(variable, canvas);
break;
@@ -121,7 +121,7 @@ namespace lua
static int l_gc(lua_State* L)
{
- Proxy* proxy = (Proxy*)luax_checktype(L, 1, TYPE_JSL);
+ Proxy* proxy = (Proxy*)luax_checktype(L, 1, JIN_GRAPHICS_SHADER);
JSLProgram* jsl = (JSLProgram*)proxy->object;
delete jsl;
return 0;
@@ -138,7 +138,7 @@ namespace lua
*/
int luaopen_JSL(lua_State* L)
{
- luax_newtype(L, TYPE_JSL, f);
+ luax_newtype(L, JIN_GRAPHICS_SHADER, f);
return 0;
}
diff --git a/src/lua/graphics/luaopen_graphics.cpp b/src/lua/graphics/luaopen_graphics.cpp
index 2aa68e8..da91c51 100644
--- a/src/lua/graphics/luaopen_graphics.cpp
+++ b/src/lua/graphics/luaopen_graphics.cpp
@@ -77,9 +77,9 @@ namespace lua
Buffer b;
fs->read(f, &b);
- Proxy* proxy = (Proxy*)luax_newinstance(L, TYPE_IMAGE, sizeof(Proxy));
+ Proxy* proxy = (Proxy*)luax_newinstance(L, JIN_GRAPHICS_IMAGE, sizeof(Proxy));
Texture* img = Texture::createTexture(b.data, b.size);
- proxy->bind(img);
+ proxy->bind(img, JIN_GRAPHICS_IMAGE);
return 1;
}
@@ -89,10 +89,10 @@ namespace lua
*/
static int l_newShader(lua_State* L)
{
- Proxy* proxy = (Proxy*)luax_newinstance(L, TYPE_JSL, sizeof(Proxy));
+ Proxy* proxy = (Proxy*)luax_newinstance(L, JIN_GRAPHICS_SHADER, sizeof(Proxy));
const char* program = luax_checkstring(L, 1);
JSLProgram* jsl = JSLProgram::createJSLProgram(program);
- proxy->bind(jsl);
+ proxy->bind(jsl, JIN_GRAPHICS_SHADER);
return 1;
}
@@ -104,9 +104,9 @@ namespace lua
{
int w = luax_checknumber(L, 1);
int h = luax_checknumber(L, 2);
- Proxy* proxy = (Proxy*)luax_newinstance(L, TYPE_CANVAS, sizeof(Proxy));
+ Proxy* proxy = (Proxy*)luax_newinstance(L, JIN_GRAPHICS_CANVAS, sizeof(Proxy));
Canvas* cvs = Canvas::createCanvas(w, h);
- proxy->bind(cvs);
+ proxy->bind(cvs, JIN_GRAPHICS_CANVAS);
return 1;
}
@@ -145,13 +145,13 @@ namespace lua
float sx = luax_optnumber(L, 4, 1);
float sy = luax_optnumber(L, 5, 1);
float r = luax_optnumber(L, 6, 0);
- if (luax_istype(L, 1, TYPE_IMAGE))
+ if (luax_istype(L, 1, JIN_GRAPHICS_IMAGE))
{
Proxy* proxy = (Proxy*)luax_toudata(L, 1);
Texture* tex = (Texture*)proxy->object;
tex->draw(x, y, sx, sy, r);
}
- else if (luax_istype(L, 1, TYPE_CANVAS))
+ else if (luax_istype(L, 1, JIN_GRAPHICS_CANVAS))
{
Proxy* proxy = (Proxy*)luax_toudata(L, 1);
Canvas* p = (Canvas*)proxy->object;
@@ -204,7 +204,7 @@ namespace lua
Canvas::unbind();
return 0;
}
- Proxy* proxy = (Proxy*)luax_checktype(L, 1, TYPE_CANVAS);
+ Proxy* proxy = (Proxy*)luax_checktype(L, 1, JIN_GRAPHICS_CANVAS);
Canvas* c = (Canvas*)proxy->object;
c->bind();
return 0;
@@ -223,7 +223,7 @@ namespace lua
JSLProgram::unuse();
return 0;
}
- if (luax_istype(L, 1, TYPE_JSL))
+ if (luax_istype(L, 1, JIN_GRAPHICS_SHADER))
{
Proxy* proxy = (Proxy*)luax_toudata(L, 1);
JSLProgram* jsl = (JSLProgram*)proxy->object;
@@ -389,7 +389,7 @@ namespace lua
static int l_newFont(lua_State* L)
{
- Font* font = (Font*)luax_newinstance(L, TYPE_FONT, sizeof(Font));
+ Font* font = (Font*)luax_newinstance(L, JIN_GRAPHICS_FONT, sizeof(Font));
const char* path = luax_checkstring(L, 1);
Filesystem* fs = Filesystem::get();
Buffer b = {};
@@ -422,7 +422,7 @@ namespace lua
context.curFont = context.defaultFont;
return 0;
}
- Font* font = (Font*)luax_checktype(L, 1, TYPE_FONT);
+ Font* font = (Font*)luax_checktype(L, 1, JIN_GRAPHICS_FONT);
context.curFont = font;
return 0;
}
generated by cgit v1.1-26-g67d0 at 2025-05-28 21:26:23 +0000