aboutsummaryrefslogtreecommitdiff
path: root/src/lua/modules/graphics
diff options
context:
space:
mode:
Diffstat (limited to 'src/lua/modules/graphics')
-rw-r--r--src/lua/modules/graphics/canvas.cpp6
-rw-r--r--src/lua/modules/graphics/graphics.cpp13
-rw-r--r--src/lua/modules/graphics/texture.cpp6
3 files changed, 13 insertions, 12 deletions
diff --git a/src/lua/modules/graphics/canvas.cpp b/src/lua/modules/graphics/canvas.cpp
index 79e7282..b64dc16 100644
--- a/src/lua/modules/graphics/canvas.cpp
+++ b/src/lua/modules/graphics/canvas.cpp
@@ -40,12 +40,12 @@ namespace JinEngine
return 2;
}
- static int l_setAnchor(lua_State* L)
+ static int l_setOrigin(lua_State* L)
{
CanvasRef ref = checkCanvas(L);
int x = luax_checknumber(L, 1);
int y = luax_checknumber(L, 2);
- ref->setAnchor(x, y);
+ ref->setOrigin(x, y);
return 0;
}
@@ -61,7 +61,7 @@ namespace JinEngine
{ "getWidth", l_getWidth },
{ "getHeight", l_getHeight },
{ "getSize", l_getSize },
- { "setAnchor", l_setAnchor },
+ { "setOrigin", l_setOrigin },
{ 0, 0 }
};
diff --git a/src/lua/modules/graphics/graphics.cpp b/src/lua/modules/graphics/graphics.cpp
index 573f319..4ff0dfc 100644
--- a/src/lua/modules/graphics/graphics.cpp
+++ b/src/lua/modules/graphics/graphics.cpp
@@ -10,6 +10,7 @@ namespace JinEngine
{
namespace Lua
{
+
using namespace std;
using namespace JinEngine;
using namespace JinEngine::Graphics;
@@ -125,12 +126,12 @@ namespace JinEngine
goto fail;
}
Buffer b = {};
- if (!fs->read(f, &b))
+ if (!fs->read(f, b))
{
error(L, "Failed to read image %s", f);
goto fail;
}
- bitmap = Bitmap::createBitmap(b.data, b.size);
+ bitmap = Bitmap::createBitmap(&b, b.size());
//const Color* col = bitmap->getPixels();
//ofstream o = ofstream("img.txt", ios_base::app);
//for (int i = 0; i < bitmap->getWidth() * bitmap->getHeight(); ++i)
@@ -195,8 +196,8 @@ namespace JinEngine
return 1;
}
Buffer b;
- fs->read(path, &b);
- Shader* jsl = Shader::createShader((char*)b.data);
+ fs->read(path, b);
+ Shader* jsl = Shader::createShader((char*)&b);
if (jsl == nullptr)
{
error(L, "Failed to compile shader");
@@ -618,8 +619,8 @@ namespace JinEngine
return 1;
}
Buffer b;
- fs->read(path, &b);
- fd = TTFData::createTTFData((unsigned char*)b.data, b.size);
+ fs->read(path, b);
+ fd = TTFData::createTTFData(&b, b.size());
}
proxy->bind(new Ref<TTFData>(fd, JIN_GRAPHICS_TTFDATA));
return 1;
diff --git a/src/lua/modules/graphics/texture.cpp b/src/lua/modules/graphics/texture.cpp
index 63ab5f2..15e258c 100644
--- a/src/lua/modules/graphics/texture.cpp
+++ b/src/lua/modules/graphics/texture.cpp
@@ -32,12 +32,12 @@ namespace JinEngine
return 1;
}
- static int l_setAnchor(lua_State* L)
+ static int l_setOrigin(lua_State* L)
{
TextureRef ref = checkTexture(L);
int x = luax_checknumber(L, 2);
int y = luax_checknumber(L, 3);
- ref->setAnchor(x, y);
+ ref->setOrigin(x, y);
return 0;
}
@@ -61,7 +61,7 @@ namespace JinEngine
{ "getWidth", l_getWidth },
{ "getHeight", l_getHeight },
{ "getSize", l_getSize },
- { "setAnchor", l_setAnchor },
+ { "setOrigin", l_setOrigin },
{ 0, 0 }
};