Added gui window

Bound irrlicht's IGUIWindow to lua

8 files changed, 330 insertions, 2 deletions

diff --git a/src/client/lua_api/gui/iguibutton.cpp b/src/client/lua_api/gui/iguibutton.cpp
index 88aa48e..494e9f9 100644
--- a/src/client/lua_api/gui/iguibutton.cpp
+++ b/src/client/lua_api/gui/iguibutton.cpp
@@ -33,7 +33,7 @@ static LIGUIElement* checkiguibutton(lua_State* L){
 }
 
 //The callback even for all gui buttons
-static void iguibuttonevent(irr::SEvent e){
+static bool iguibuttonevent(irr::SEvent e){
   IGUIElement* caller = (IGUIElement*)e.GUIEvent.Caller;
   printf("Some gui something somewhere was pressed\n");
   if(iguielements.find(caller) != iguielements.end()){
@@ -65,6 +65,7 @@ static void iguibuttonevent(irr::SEvent e){
       }
     }
   }
+  return false;
 }
 
 static int newiguibutton(lua_State* L){
diff --git a/src/client/lua_api/gui/iguilabel.cpp b/src/client/lua_api/gui/iguilabel.cpp
index 3754ac6..7c00e84 100644
--- a/src/client/lua_api/gui/iguilabel.cpp
+++ b/src/client/lua_api/gui/iguilabel.cpp
@@ -30,8 +30,9 @@ static LIGUIElement* checkiguilabel(lua_State* L){
   return checkiguilabel(L,1);
 }
 
-static void iguilabelevent(irr::SEvent e){
+static bool iguilabelevent(irr::SEvent e){
 	printf("Oh no! an iguilabel generated an event!");
+    return false;
 }
 
 static int newiguilabel(lua_State* L){
diff --git a/src/client/lua_api/gui/iguiskin.cpp b/src/client/lua_api/gui/iguiskin.cpp
new file mode 100644
index 0000000..edc994b
--- /dev/null
+++ b/src/client/lua_api/gui/iguiskin.cpp
@@ -0,0 +1,64 @@
+extern "C" {
+  #include <lua.h>
+  #include <lauxlib.h>
+  #include <lualib.h>
+}
+#include <irrlicht.h>
+#include <string>
+#include <stdio.h>
+
+#include "iguiutil.hpp"
+
+using namespace irr;
+using namespace gui;
+
+extern IrrlichtDevice* device;
+
+#define register(l,n) lua_pushnumber(l,n);\
+lua_setglobal(l,#n);
+
+static int setskincolor(lua_State* L){
+	irr::gui::EGUI_DEFAULT_COLOR which = (irr::gui::EGUI_DEFAULT_COLOR)luaL_optint(L,1,0);
+	
+	video::SColor c = video::SColor(0,0,0,0);
+	lua_popscolor(L,2,&c);
+	printf("Setting color %d to (%d, %d, %d, %d)\n",which,c.getRed(),c.getBlue(),c.getGreen(),c.getAlpha());
+	IGUIEnvironment* env = device->getGUIEnvironment();
+	env->getSkin()->setColor(which,c);
+	
+	printf("Color is now %d\n",env->getSkin()->getColor(which).getAlpha());
+	
+	return 0;
+}
+
+int register_skin(lua_State* L){
+	register(L,EGDC_3D_DARK_SHADOW);
+	register(L,EGDC_3D_SHADOW);
+	register(L,EGDC_3D_FACE);
+	register(L,EGDC_3D_HIGH_LIGHT);
+	register(L,EGDC_ACTIVE_BORDER);
+	register(L,EGDC_ACTIVE_CAPTION);
+	register(L,EGDC_APP_WORKSPACE);
+	register(L,EGDC_BUTTON_TEXT);
+	register(L,EGDC_GRAY_TEXT);
+	register(L,EGDC_HIGH_LIGHT);
+	register(L,EGDC_HIGH_LIGHT_TEXT);
+	register(L,EGDC_INACTIVE_BORDER);
+	register(L,EGDC_INACTIVE_CAPTION);
+	register(L,EGDC_TOOLTIP);
+	register(L,EGDC_TOOLTIP_BACKGROUND);
+	register(L,EGDC_SCROLLBAR);
+	register(L,EGDC_WINDOW);
+	register(L,EGDC_WINDOW_SYMBOL);
+	register(L,EGDC_ICON);
+	register(L,EGDC_ICON_HIGH_LIGHT);
+	register(L,EGDC_GRAY_WINDOW_SYMBOL);
+	register(L,EGDC_EDITABLE);
+	register(L,EGDC_GRAY_EDITABLE);
+	register(L,EGDC_FOCUSED_EDITABLE);
+	
+	lua_pushcfunction(L,setskincolor);
+	lua_setglobal(L,"setskincolor");
+	
+	return 0;
+}
diff --git a/src/client/lua_api/gui/iguiskin.hpp b/src/client/lua_api/gui/iguiskin.hpp
new file mode 100644
index 0000000..fe445d5
--- /dev/null
+++ b/src/client/lua_api/gui/iguiskin.hpp
@@ -0,0 +1,8 @@
+extern "C" {
+  #include <lua.h>
+  #include <lauxlib.h>
+  #include <lualib.h>
+}
+#include <irrlicht.h>
+
+int register_skin(lua_State* L);
diff --git a/src/client/lua_api/gui/iguiutil.cpp b/src/client/lua_api/gui/iguiutil.cpp
new file mode 100644
index 0000000..0e8d179
--- /dev/null
+++ b/src/client/lua_api/gui/iguiutil.cpp
@@ -0,0 +1,61 @@
+#include <stdio.h>
+
+extern "C" {
+  #include <lua.h>
+  #include <lauxlib.h>
+  #include <lualib.h>
+}
+
+#include <btBulletDynamicsCommon.h>
+
+#include <irrlicht.h>
+#include "iguiutil.hpp"
+
+int lua_popvector2(lua_State* L,int pos, float* x,float* y){
+	float p[2];
+	
+	for(int i = 0; i < 2; i++){
+		lua_pushnumber(L,i+1);
+		lua_gettable(L,pos);
+		p[i] = (float) lua_tonumber(L,-1);
+		lua_pop(L,1);
+	}
+	
+	printf("Found vector (%f,%f)\n",p[0],p[1]);
+	*x = p[0];
+	*y = p[1];
+	return 0;
+}
+
+int lua_popvector2i(lua_State* L,int pos, int* x,int* y){
+	int p[2];
+	
+	for(int i = 0; i < 2; i++){
+		lua_pushnumber(L,i+1);
+		lua_gettable(L,pos);
+		p[i] = (int) lua_tonumber(L,-1);
+		lua_pop(L,1);
+	}
+	
+	printf("Found vector (%d,%d)\n",p[0],p[1]);
+	*x = p[0];
+	*y = p[1];
+	return 0;
+}
+
+int lua_popscolor(lua_State* L, int pos, irr::video::SColor* c){
+    int p[4];
+    
+    for(int i = 0; i < 4; i++){
+        lua_pushnumber(L,i+1);
+        lua_gettable(L,pos);
+        p[i] = (int) lua_tonumber(L,-1);
+        lua_pop(L,1);
+    }
+    c->setRed(p[0]);
+    c->setBlue(p[1]);
+    c->setGreen(p[2]);
+    c->setAlpha(p[3]);
+    
+    return 0;
+}
diff --git a/src/client/lua_api/gui/iguiutil.hpp b/src/client/lua_api/gui/iguiutil.hpp
new file mode 100644
index 0000000..f8b4b92
--- /dev/null
+++ b/src/client/lua_api/gui/iguiutil.hpp
@@ -0,0 +1,15 @@
+#ifndef __IGUIUTIL_H__
+#define __IGUIUTIL_H__
+extern "C" {
+  #include <lua.h>
+  #include <lauxlib.h>
+  #include <lualib.h>
+}
+#include <irrlicht.h>
+
+int lua_popvector2(lua_State* L,int pos, float* x, float* y);
+
+int lua_popvector2i(lua_State* L,int pos, int* x, int* y);
+
+int lua_popscolor(lua_State* L, int pos, irr::video::SColor* c);
+#endif
diff --git a/src/client/lua_api/gui/iguiwindow.cpp b/src/client/lua_api/gui/iguiwindow.cpp
new file mode 100644
index 0000000..34b6cfa
--- /dev/null
+++ b/src/client/lua_api/gui/iguiwindow.cpp
@@ -0,0 +1,167 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <vector>
+#include <memory>
+#include <map>
+#include <functional>
+extern "C" {
+  #include <lua.h>
+  #include <lauxlib.h>
+  #include <lualib.h>
+}
+#include <irrlicht.h>
+#include "../guiparts.hpp"
+#include "iguielement.hpp"
+#include "iguiwindow.hpp"
+#include "iguiutil.hpp"
+#include "../../callbackhandeler.hpp"
+
+using namespace irr;
+using namespace gui;
+
+//IrrlichtDevice* guidevice;
+
+static LIGUIElement* checkiguiwindow(lua_State* L, int index){
+  void* ud = luaL_checkudata(L,index,"gui.iguiwindow");
+  luaL_argcheck(L,ud != NULL, index, "'gui.iguiwindow' expected");
+  return (LIGUIElement*) ud;
+}
+
+static LIGUIElement* checkiguiwindow(lua_State* L){
+  return checkiguiwindow(L,1);
+}
+
+static bool iguiwindowevent(irr::SEvent e){
+    IGUIElement* caller = (IGUIElement*)e.GUIEvent.Caller;
+    int ref = iguielements[caller];
+    EGUI_EVENT_TYPE etype = e.GUIEvent.EventType;
+    printf("Detected window event\n");
+    if(etype == EGET_ELEMENT_CLOSED){
+        lua_rawgeti(tL,LUA_REGISTRYINDEX,ref);
+        printf("getting raw, the thing on the top of stack is a %s\n",luaL_typename(tL,-1));
+        LIGUIElement* tbut = checkiguiwindow(tL,-1);
+        int hashmapresponse;
+        char* hashkey = (char*)"onclose";
+        int terror = hashmap_get(tbut->funcmap,hashkey,(void**)&hashmapresponse);
+        if(terror == MAP_OK){ //Only call if we actually have that function.
+            printf("Looks like we have an onclose function, calling!\n");
+            lua_rawgeti(tL,LUA_REGISTRYINDEX,hashmapresponse); //push the function
+            lua_rawgeti(tL,LUA_REGISTRYINDEX,ref); //push the referance to iguielement
+            lua_call(tL,1,1);
+            //int b = lua_isnoneornil(tL,1);
+            int a = lua_toboolean(tL,-1);
+            printf("a:%d\n",a);
+            return a;
+        }
+    }
+	printf("Oh no! an iguiwindow generated an event!");
+    return false;
+}
+
+static int newiguiwindow(lua_State* L){
+  printf("Createing label!\n");
+  int nargs = lua_gettop(L);
+  //The position of the text
+
+	//Frame position
+	int x,y;
+	lua_popvector2i(L,1,&x,&y);
+	
+	printf("got xy\n");
+	
+	//Frame size
+	int w,h;
+	lua_popvector2i(L,2,&w,&h);
+	
+	printf("I want to make a frame at (%d,%d) size (%d,%d)\n",x,y,w,h);
+  
+  // int startx = luaL_optint(L,1,0);
+  // int starty = luaL_optint(L,2,0);
+  // int endx = luaL_optint(L,3,startx+100);
+  // int endy = luaL_optint(L,4,starty+100);
+
+  //Label
+	wchar_t* label;
+	const char* labelopt = luaL_optstring(L,3,"Label");
+	int bls = strlen(labelopt);
+	label = (wchar_t*)calloc(sizeof(wchar_t),(bls));
+	mbstowcs(label,labelopt,bls);
+	printf("Got the string option\n");
+  // 
+  //If the element has a parrent
+  int parent = luaL_optint(L,4,0);
+  // 
+  // 
+  // //Create the button
+	IGUIEnvironment* env = guidevice->getGUIEnvironment();
+	IGUIWindow* wi = env->addWindow(
+		core::rect<s32>(x,y,x+w,y+h),
+		false,
+		label,
+		guielements[parent],
+		-1
+	);
+  // /Create the label
+  // IGUIStaticText* llabel = (IGUIStaticText*) env->addStaticText(label,core::rect<s32>(startx,starty,endx,endy),false,false, guielements[parent], gui_elenum++, false);
+  // printf("Created the button\n");
+  // 
+  // /Register it's callback
+	registerguicallback(wi,EGET_ELEMENT_CLOSED,iguiwindowevent);
+  // 
+  //Create it's lua representation
+  LIGUIElement* lwindow = (LIGUIElement*)lua_newuserdata(L, sizeof(LIGUIElement));
+  int tref = luaL_ref(L,LUA_REGISTRYINDEX);
+  iguielements[wi] = tref;
+  lua_rawgeti(L,LUA_REGISTRYINDEX,tref);//Put it back on the stack since luaL_ref pops the object.
+  // 
+  //Set it's metatable
+  luaL_getmetatable(L, "gui.iguiwindow");
+  lua_setmetatable(L, -2);
+  // 
+  //Create the struct
+  lwindow->e = wi;
+  lwindow->funcmap = hashmap_new();
+  lwindow->type = "iguiwindow";
+  // 
+  // /Free up anything made in this function
+  free(label);
+  // 
+  // /Put it on top and return it
+  lua_rawgeti(L,LUA_REGISTRYINDEX,tref);
+  return 1;
+}
+
+static const luaL_reg iguiwindow_f[] = {
+  {"new",           newiguiwindow},
+  {"gethandeler",   guigethandeler},
+  {"sethandeler",   guisethandeler},
+  {0,0},
+};
+
+static const luaL_reg iguiwindow_m[] = {
+  {"move",          moveiguielement},
+  {"settext",       setiguitext},
+  {"remove",        removeiguielement},
+  {0, 0},
+};
+
+int iguiwindow_register(lua_State* L, IrrlichtDevice* d){
+
+  luaL_newmetatable(L, "gui.iguiwindow");
+
+  luaL_register(L,"iguiwindow",iguiwindow_f);
+
+  lua_pushstring(L,"__index");
+  lua_pushstring(L,"gethandeler");
+  lua_gettable(L,-3);
+  lua_settable(L,-4);
+
+  lua_pushstring(L,"__newindex");
+  lua_pushstring(L,"sethandeler");
+  lua_gettable(L,-3);
+  lua_settable(L,-4);
+
+  luaL_register(L, NULL, iguiwindow_m);
+
+  return 1;
+}
diff --git a/src/client/lua_api/gui/iguiwindow.hpp b/src/client/lua_api/gui/iguiwindow.hpp
new file mode 100644
index 0000000..afc5e7a
--- /dev/null
+++ b/src/client/lua_api/gui/iguiwindow.hpp
@@ -0,0 +1,11 @@
+
+#include <stdio.h>
+#include <stdlib.h>
+extern "C" {
+  #include <lua.h>
+  #include <lauxlib.h>
+  #include <lualib.h>
+}
+#include <irrlicht.h>
+
+int iguiwindow_register(lua_State* L, irr::IrrlichtDevice* d);