Merge branch 'master' of ssh://cogarr.net:43/home/git/brokengine

1 files changed, 31 insertions, 6 deletions

diff --git a/src/client/lua_api/video/itexture.cpp b/src/client/lua_api/video/itexture.cpp
index a7f4652..42de1bd 100644
--- a/src/client/lua_api/video/itexture.cpp
+++ b/src/client/lua_api/video/itexture.cpp
@@ -14,20 +14,42 @@ using namespace video;
 
 extern IrrlichtDevice* device;
 extern IVideoDriver* driver;
-//newtexture(string name,IImage* image)
+//newtexture(string name,{image}) -> {texture}
 int newitexture(lua_State* L){
+	//printf("About to create new texture\n");
+	lua_getfield(L,-1,"image");//"name",{image},image*
 	IImage* im = (IImage*) lua_touserdata(L,-1);
-	lua_pop(L,1);
+	lua_pop(L,2);//"name"
 	const char* name = lua_tostring(L,-1);
-	lua_pop(L,1);
+	lua_pop(L,1);//
 
+	//printf("About to create texture\n");
 	ITexture* tex = driver->addTexture(name,im);
 	if(!tex){
 		lua_pushstring(L,"Failed to create texture!");
 		lua_error(L);
 	}
 
+	lua_newtable(L);
+	lua_pushlightuserdata(L,tex);
+	lua_setfield(L,-2,"texture");
+
+	return 1;
+}
+
+//newtexturefromfile(string file_name) -> {texture}
+int newitexturefromfile(lua_State* L){
+	const char* strpath = lua_tostring(L,-1);
+	lua_pop(L,1);
+	ITexture* tex = driver->getTexture(strpath);
+	if(!tex){
+		lua_pushstring(L,"Failed to create texture!");
+		lua_error(L);
+	}
+
+	lua_newtable(L);
 	lua_pushlightuserdata(L,tex);
+	lua_setfield(L,-2,"texture");
 
 	return 1;
 }
@@ -35,7 +57,10 @@ int newitexture(lua_State* L){
 
 
 void itexture_register(lua_State* L){
-	lua_getglobal(L,"video");
-	lua_pushcfunction(L,newitexture);
-	lua_setfield(L,-2,"newtexture");
+	lua_getglobal(L,"video");//{}
+	lua_pushcfunction(L,newitexture);//{},newitexture
+	lua_setfield(L,-2,"newtexture");//{}
+	lua_pushcfunction(L,newitexturefromfile);
+	lua_setfield(L,-2,"newtexturefromfile");
+	lua_pop(L,1);
 }