From bb9f6d43a4e574506e3049bd56c890c242d35e8b Mon Sep 17 00:00:00 2001 From: Alexander Date: Wed, 9 Jan 2019 16:09:39 -0500 Subject: Moved the define constant definition into common/shared header --- src/client/lua_api/gui/iguielement.cpp | 4 ++-- src/client/lua_api/video/iimage.cpp | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) (limited to 'src/client') diff --git a/src/client/lua_api/gui/iguielement.cpp b/src/client/lua_api/gui/iguielement.cpp index 4ef5026..f1a83b8 100644 --- a/src/client/lua_api/gui/iguielement.cpp +++ b/src/client/lua_api/gui/iguielement.cpp @@ -17,7 +17,7 @@ extern "C" { #include } - +#include #include #include #include "../guiparts.hpp" @@ -177,7 +177,7 @@ int getiguitext(lua_State* L){ lua_pop(L,2);// const wchar_t *t = el->getText(); size_t cstrlen = wcslen(t); - __mingw_printf("In gui get text, cstrlen is %zu\n",cstrlen); + printf("In gui get text, cstrlen is %zu\n",cstrlen); char output[cstrlen + 1];//+1 for \0 wcstombs(output,t,cstrlen); output[cstrlen] = '\0'; diff --git a/src/client/lua_api/video/iimage.cpp b/src/client/lua_api/video/iimage.cpp index 6fbf6c5..4c7795d 100644 --- a/src/client/lua_api/video/iimage.cpp +++ b/src/client/lua_api/video/iimage.cpp @@ -135,9 +135,24 @@ int getiimagepixel(lua_State* L){ return 1; } +/*** +Returns the dimensions of the image +@function iimage:getDimensions() +@treturn vec2i dimensions The dimensions of the image +*/ +//getdimensions({self}) +int getiimagedimensions(lua_State *L){ + lua_getfield(L,-1,"image"); + IImage *img = (IImage*)lua_touserdata(L,-1); + core::dimension2d dims = img->getDimension(); + pushvector2i(L,dims.Height, dims.Width); + return 1; +} + static const luaL_reg iimage_m[] = { {"setpixel", setiimagepixel}, {"getpixel", getiimagepixel}, + {"getdimensions", getiimagedimensions}, {0,0}, }; -- cgit v1.2.3-70-g09d2