diff options
| author | Alexander Pickering <alex@cogarr.net> | 2018-08-19 16:41:02 -0400 |
|---|---|---|
| committer | Alexander Pickering <alex@cogarr.net> | 2018-08-19 16:43:42 -0400 |
| commit | bc66e5c26672a93b4960532dacde9dadd0ab3bf3 (patch) | |
| tree | 3b974085fb800c70ddaaed8491f7a9b594f217bc /src/client/lua_api/gui | |
| parent | a0caff7b820c4d1cade6ae567ca3c2e9af87bcda (diff) | |
| download | brokengine-bc66e5c26672a93b4960532dacde9dadd0ab3bf3.tar.gz brokengine-bc66e5c26672a93b4960532dacde9dadd0ab3bf3.tar.bz2 brokengine-bc66e5c26672a93b4960532dacde9dadd0ab3bf3.zip | |
reoganization
Diffstat (limited to 'src/client/lua_api/gui')
| -rw-r--r-- | src/client/lua_api/gui/iguielement.cpp | 1 | ||||
| -rw-r--r-- | src/client/lua_api/gui/iguiimage.cpp | 6 | ||||
| -rw-r--r-- | src/client/lua_api/gui/iguiwindow.cpp | 7 |
3 files changed, 3 insertions, 11 deletions
diff --git a/src/client/lua_api/gui/iguielement.cpp b/src/client/lua_api/gui/iguielement.cpp index 44fb67c..e63d986 100644 --- a/src/client/lua_api/gui/iguielement.cpp +++ b/src/client/lua_api/gui/iguielement.cpp @@ -46,7 +46,6 @@ Find the rectangle that an element occupies */ //getabsrect({element})-> {{sx,sy},{ex,ey}} int getiguiclippingrect(lua_State* L){ - printf("Getting iguiclipping elemnt\n"); lua_getfield(L,-1,"guielement"); IGUIElement *el = (IGUIElement*)lua_touserdata(L,-1);//{element},ud_element lua_pop(L,2); diff --git a/src/client/lua_api/gui/iguiimage.cpp b/src/client/lua_api/gui/iguiimage.cpp index 4e78e52..5ad8ba3 100644 --- a/src/client/lua_api/gui/iguiimage.cpp +++ b/src/client/lua_api/gui/iguiimage.cpp @@ -13,7 +13,7 @@ extern "C" { #include "../guiparts.hpp" #include "iguielement.hpp" #include "iguiwindow.hpp" -#include "iguiutil.hpp" +//#include "iguiutil.hpp" #include "../../callbackhandeler.hpp" #include <shared/lua_api/common.hpp> @@ -62,11 +62,7 @@ int setcolor(lua_State* L){ } static const luaL_reg iguiimage_m[] = { - {"move", moveiguielement}, - {"getabsrect", getiguiclippingrect}, {"setcolor", setcolor}, - //{"settext", setiguitext}, - {"remove", removeiguielement}, {0, 0}, }; diff --git a/src/client/lua_api/gui/iguiwindow.cpp b/src/client/lua_api/gui/iguiwindow.cpp index 3fbd5e4..1c9c5ea 100644 --- a/src/client/lua_api/gui/iguiwindow.cpp +++ b/src/client/lua_api/gui/iguiwindow.cpp @@ -13,7 +13,7 @@ extern "C" { #include "../guiparts.hpp" #include "iguielement.hpp" #include "iguiwindow.hpp" -#include "iguiutil.hpp" +//#include "iguiutil.hpp" #include "../../callbackhandeler.hpp" #include <shared/lua_api/common.hpp> @@ -66,10 +66,6 @@ static int newiguiwindow(lua_State* L){ } static const luaL_reg iguiwindow_m[] = { - {"move", moveiguielement}, - {"settext", setiguitext}, - {"remove", removeiguielement}, - {"getid", guigetid}, // bool :: iguiwindow:close() -- Called when window is closed, returning // -- Anything but false or nil prevents close {0, 0}, @@ -79,6 +75,7 @@ int iguiwindow_register(lua_State* L, IrrlichtDevice* d){ luaL_newmetatable(L,"gui.window");//m{gui.window} lua_newtable(L); luaL_register(L,NULL,iguiwindow_m); + luaL_register(L,NULL,iguielement_m); lua_setfield(L,-2,"__index"); lua_pop(L,1);// |
