reoganization

4 files changed, 19 insertions, 12 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);//
 
diff --git a/src/client/lua_api/load_video.cpp b/src/client/lua_api/load_video.cpp
index 607759c..e0c7557 100644
--- a/src/client/lua_api/load_video.cpp
+++ b/src/client/lua_api/load_video.cpp
@@ -20,7 +20,7 @@ extern IVideoDriver* driver;
 
 //video.drawtexture
 //{texture},{x,y}
-//{texture},{x,y},{sourcerect},,{color},use_alpha
+//{texture},{x,y},{sourcerect},{color},use_alpha
 int draw2dimage(lua_State* L){
 	int nargs = lua_gettop(L);
 	//printf("Drawing a 2d image\n");
@@ -66,6 +66,19 @@ int draw2dimage(lua_State* L){
 	return 0;
 }
 
+//{sx,sy},{ex,ey},{color}
+int draw2dline(lua_State* L){
+	long sx,sy,ex,ey;
+	long r,g,b,a;
+	popvector4i(L,&r,&g,&b,&a);
+	popvector2i(L,&ex,&ey);
+	popvector2i(L,&sx,&sy);
+
+	driver->draw2DLine(position2d<s32>(sx,sy),position2d<s32>(ex,ey),SColor(r,g,b,a));
+
+	return 0;
+}
+
 void load_videofuncs(lua_State* L){
 	//printf("Loading video libraries...\n");
 	lua_newtable(L);//{}
@@ -74,6 +87,8 @@ void load_videofuncs(lua_State* L){
 	lua_getglobal(L,"video");//{}
 	lua_pushcfunction(L,draw2dimage);//{},draw2dimage()
 	lua_setfield(L,-2,"drawtexture");//{}
+	lua_pushcfunction(L,draw2dline);//{},draw2dline()
+	lua_setfield(L,-2,"drawline");//{}
 	lua_pop(L,1);//
 
 	smaterial_register(L);