diff --git a/luaExample/bin/data/scripts/boringTests.lua b/luaExample/bin/data/scripts/boringTests.lua index 24abc60..b4314c8 100644 --- a/luaExample/bin/data/scripts/boringTests.lua +++ b/luaExample/bin/data/scripts/boringTests.lua @@ -86,14 +86,13 @@ function setup() img = of.Image() -- GL type defines added by the swig interface (don't exist in OF) - local d = of.TEXTURE_CLAMP_TO_EDGE - d = of.TEXTURE_CLAMP_TO_BORDER - d = of.TEXTURE_MIRROR_REPEAT - d = of.TEXTURE_REPEAT - - d = of.TEXTURE_LUMINENCE - d = of.TEXTURE_RGB - d = of.TEXTURE_RGBA + print("of.CLAMP_TO_EDGE: "..string.format("0x%X", of.CLAMP_TO_EDGE)) + print("of.CLAMP_TO_BORDER: "..string.format("0x%X", of.CLAMP_TO_BORDER)) + print("of.REPEAT: "..string.format("0x%X", of.REPEAT)) + print("of.MIRRORED_REPEAT: "..string.format("0x%X", of.MIRRORED_REPEAT)) + print("of.TEXTURE_LUMINANCE: "..string.format("0x%X", of.TEXTURE_LUMINANCE)) + print("of.TEXTURE_RGB: "..string.format("0x%X", of.TEXTURE_RGB)) + print("of.TEXTURE_RGBA: "..string.format("0x%X", of.TEXTURE_RGBA)) -- function loaded from separate script via require requireTest() @@ -105,6 +104,9 @@ function setup() -- uint_64t print("elapsed millis: "..of.getElapsedTimeMillis()) + -- util stuff + of.restoreWorkingDirectoryToDefault() + end function update() diff --git a/luaExample/src/ofApp.cpp b/luaExample/src/ofApp.cpp index 131263e..4a85440 100644 --- a/luaExample/src/ofApp.cpp +++ b/luaExample/src/ofApp.cpp @@ -157,7 +157,7 @@ void ofApp::prevScript() { lua.doScript("variableTest.lua"); // prints global table if no table is pushed - //lua.printTable(); + lua.printTable(); // print the variables in the script manually ofLog() << "variableTest variables:"; diff --git a/src/bindings/desktop/ofxLuaBindings.cpp b/src/bindings/desktop/ofxLuaBindings.cpp index 773c218..2d97a2f 100644 --- a/src/bindings/desktop/ofxLuaBindings.cpp +++ b/src/bindings/desktop/ofxLuaBindings.cpp @@ -1,6 +1,6 @@ /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). - * Version 3.0.8 + * Version 3.0.10 * * This file is not intended to be easily readable and contains a number of * coding conventions designed to improve portability and efficiency. Do not make @@ -107,9 +107,11 @@ template T SwigValueInit() { #endif /* exporting methods */ -#if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) -# ifndef GCC_HASCLASSVISIBILITY -# define GCC_HASCLASSVISIBILITY +#if defined(__GNUC__) +# if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) +# ifndef GCC_HASCLASSVISIBILITY +# define GCC_HASCLASSVISIBILITY +# endif # endif #endif @@ -659,16 +661,16 @@ SWIG_UnpackData(const char *c, void *ptr, size_t sz) { char d = *(c++); unsigned char uu; if ((d >= '0') && (d <= '9')) - uu = ((d - '0') << 4); + uu = (unsigned char)((d - '0') << 4); else if ((d >= 'a') && (d <= 'f')) - uu = ((d - ('a'-10)) << 4); + uu = (unsigned char)((d - ('a'-10)) << 4); else return (char *) 0; d = *(c++); if ((d >= '0') && (d <= '9')) - uu |= (d - '0'); + uu |= (unsigned char)(d - '0'); else if ((d >= 'a') && (d <= 'f')) - uu |= (d - ('a'-10)); + uu |= (unsigned char)(d - ('a'-10)); else return (char *) 0; *u = uu; @@ -1543,6 +1545,44 @@ SWIGINTERN int SWIG_Lua_iterate_bases(lua_State *L, swig_type_info * SWIGUNUSED return result; } +/* The class.get method helper, performs the lookup of class attributes. + * It returns an error code. Number of function return values is passed inside 'ret'. + * first_arg is not used in this function because function always has 2 arguments. + */ +SWIGINTERN int SWIG_Lua_class_do_get_item(lua_State *L, swig_type_info *type, int SWIGUNUSED first_arg, int *ret) +{ +/* there should be 2 params passed in + (1) userdata (not the meta table) + (2) string name of the attribute +*/ + int bases_search_result; + int substack_start = lua_gettop(L)-2; + assert(first_arg == substack_start+1); + lua_checkstack(L,5); + assert(lua_isuserdata(L,-2)); /* just in case */ + lua_getmetatable(L,-2); /* get the meta table */ + assert(lua_istable(L,-1)); /* just in case */ + /* NEW: looks for the __getitem() fn + this is a user provided get fn */ + SWIG_Lua_get_table(L,"__getitem"); /* find the __getitem fn */ + if (lua_iscfunction(L,-1)) /* if its there */ + { /* found it so call the fn & return its value */ + lua_pushvalue(L,substack_start+1); /* the userdata */ + lua_pushvalue(L,substack_start+2); /* the parameter */ + lua_call(L,2,1); /* 2 value in (userdata),1 out (result) */ + lua_remove(L,-2); /* stack tidy, remove metatable */ + if(ret) *ret = 1; + return SWIG_OK; + } + lua_pop(L,1); + /* Remove the metatable */ + lua_pop(L,1); + /* Search in base classes */ + bases_search_result = SWIG_Lua_iterate_bases(L,type,substack_start+1,SWIG_Lua_class_do_get_item,ret); + return bases_search_result; /* sorry not known */ +} + + /* The class.get method helper, performs the lookup of class attributes. * It returns an error code. Number of function return values is passed inside 'ret'. * first_arg is not used in this function because function always has 2 arguments. @@ -1590,19 +1630,6 @@ SWIGINTERN int SWIG_Lua_class_do_get(lua_State *L, swig_type_info *type, int SW return SWIG_OK; } lua_pop(L,1); /* remove whatever was there */ - /* NEW: looks for the __getitem() fn - this is a user provided get fn */ - SWIG_Lua_get_table(L,"__getitem"); /* find the __getitem fn */ - if (lua_iscfunction(L,-1)) /* if its there */ - { /* found it so call the fn & return its value */ - lua_pushvalue(L,substack_start+1); /* the userdata */ - lua_pushvalue(L,substack_start+2); /* the parameter */ - lua_call(L,2,1); /* 2 value in (userdata),1 out (result) */ - lua_remove(L,-2); /* stack tidy, remove metatable */ - if(ret) *ret = 1; - return SWIG_OK; - } - lua_pop(L,1); /* Remove the metatable */ lua_pop(L,1); /* Search in base classes */ @@ -1629,6 +1656,10 @@ SWIGINTERN int SWIG_Lua_class_get(lua_State *L) if(result == SWIG_OK) return ret; + result = SWIG_Lua_class_do_get_item(L,type,1,&ret); + if(result == SWIG_OK) + return ret; + return 0; } @@ -3839,11 +3870,6 @@ static int _wrap_new_Fbo__SWIG_0(lua_State* L) { int SWIG_arg = 0; ofFbo *result result = (ofFbo *)new ofFbo(); SWIG_NewPointerObj(L,result,SWIGTYPE_p_ofFbo,1); SWIG_arg++; return SWIG_arg; if(0) SWIG_fail; fail: lua_error(L); return SWIG_arg; } static int _wrap_new_Fbo__SWIG_1(lua_State* L) { int SWIG_arg = 0; ofFbo *arg1 = 0 ; ofFbo *result = 0 ; - SWIG_check_num_args("ofFbo::ofFbo",1,1) if(!lua_isuserdata(L,1)) SWIG_fail_arg("ofFbo::ofFbo",1,"ofFbo const &"); - if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_ofFbo,0))){ SWIG_fail_ptr("new_Fbo",1,SWIGTYPE_p_ofFbo); } - result = (ofFbo *)new ofFbo((ofFbo const &)*arg1); SWIG_NewPointerObj(L,result,SWIGTYPE_p_ofFbo,1); SWIG_arg++; - return SWIG_arg; if(0) SWIG_fail; fail: lua_error(L); return SWIG_arg; } -static int _wrap_new_Fbo__SWIG_2(lua_State* L) { int SWIG_arg = 0; ofFbo *arg1 = 0 ; ofFbo *result = 0 ; SWIG_check_num_args("ofFbo::ofFbo",1,1) if(!lua_isuserdata(L,1)) SWIG_fail_arg("ofFbo::ofFbo",1,"ofFbo &&"); if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_ofFbo,0))){ SWIG_fail_ptr("new_Fbo",1,SWIGTYPE_p_ofFbo); } result = (ofFbo *)new ofFbo((ofFbo &&)*arg1); SWIG_NewPointerObj(L,result,SWIGTYPE_p_ofFbo,1); SWIG_arg++; return SWIG_arg; @@ -3851,11 +3877,9 @@ static int _wrap_new_Fbo__SWIG_2(lua_State* L) { int SWIG_arg = 0; ofFbo *arg1 = static int _wrap_new_Fbo(lua_State* L) { int argc; int argv[2]={ 1,2} ; argc = lua_gettop(L); if (argc == 0) { return _wrap_new_Fbo__SWIG_0(L);} if (argc == 1) { int _v; { void *ptr; if (lua_isuserdata(L,argv[0])==0 || SWIG_ConvertPtr(L,argv[0], (void **) &ptr, SWIGTYPE_p_ofFbo, 0)) { _v = 0; } else { - _v = 1; } } if (_v) { return _wrap_new_Fbo__SWIG_1(L);} } if (argc == 1) { int _v; { void *ptr; - if (lua_isuserdata(L,argv[0])==0 || SWIG_ConvertPtr(L,argv[0], (void **) &ptr, SWIGTYPE_p_ofFbo, 0)) { _v = 0; } else { - _v = 1; } } if (_v) { return _wrap_new_Fbo__SWIG_2(L);} } + _v = 1; } } if (_v) { return _wrap_new_Fbo__SWIG_1(L);} } SWIG_Lua_pusherrstring(L,"Wrong arguments for overloaded function 'new_Fbo'\n" " Possible C/C++ prototypes are:\n" - " ofFbo::ofFbo()\n" " ofFbo::ofFbo(ofFbo const &)\n" " ofFbo::ofFbo(ofFbo &&)\n"); lua_error(L);return 0; } + " ofFbo::ofFbo()\n" " ofFbo::ofFbo(ofFbo &&)\n"); lua_error(L);return 0; } static int _wrap_Fbo_allocate__SWIG_0(lua_State* L) { int SWIG_arg = 0; ofFbo *arg1 = (ofFbo *) 0 ; int arg2 ; int arg3 ; int arg4 ; int arg5 ; SWIG_check_num_args("ofFbo::allocate",5,5) if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("ofFbo::allocate",1,"ofFbo *"); @@ -4788,13 +4812,6 @@ static int _wrap_new_Texture__SWIG_0(lua_State* L) { int SWIG_arg = 0; ofTexture SWIG_NewPointerObj(L,result,SWIGTYPE_p_ofTexture,1); SWIG_arg++; return SWIG_arg; if(0) SWIG_fail; fail: lua_error(L); return SWIG_arg; } static int _wrap_new_Texture__SWIG_1(lua_State* L) { int SWIG_arg = 0; ofTexture *arg1 = 0 ; ofTexture *result = 0 ; - SWIG_check_num_args("ofTexture::ofTexture",1,1) - if(!lua_isuserdata(L,1)) SWIG_fail_arg("ofTexture::ofTexture",1,"ofTexture const &"); - if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_ofTexture,0))){ - SWIG_fail_ptr("new_Texture",1,SWIGTYPE_p_ofTexture); } result = (ofTexture *)new ofTexture((ofTexture const &)*arg1); - SWIG_NewPointerObj(L,result,SWIGTYPE_p_ofTexture,1); SWIG_arg++; return SWIG_arg; if(0) SWIG_fail; fail: lua_error(L); - return SWIG_arg; } -static int _wrap_new_Texture__SWIG_2(lua_State* L) { int SWIG_arg = 0; ofTexture *arg1 = 0 ; ofTexture *result = 0 ; SWIG_check_num_args("ofTexture::ofTexture",1,1) if(!lua_isuserdata(L,1)) SWIG_fail_arg("ofTexture::ofTexture",1,"ofTexture &&"); if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_ofTexture,0))){ @@ -4804,12 +4821,9 @@ static int _wrap_new_Texture__SWIG_2(lua_State* L) { int SWIG_arg = 0; ofTexture static int _wrap_new_Texture(lua_State* L) { int argc; int argv[2]={ 1,2} ; argc = lua_gettop(L); if (argc == 0) { return _wrap_new_Texture__SWIG_0(L);} if (argc == 1) { int _v; { void *ptr; if (lua_isuserdata(L,argv[0])==0 || SWIG_ConvertPtr(L,argv[0], (void **) &ptr, SWIGTYPE_p_ofTexture, 0)) { _v = 0; } - else { _v = 1; } } if (_v) { return _wrap_new_Texture__SWIG_1(L);} } if (argc == 1) { int _v; { void *ptr; - if (lua_isuserdata(L,argv[0])==0 || SWIG_ConvertPtr(L,argv[0], (void **) &ptr, SWIGTYPE_p_ofTexture, 0)) { _v = 0; } - else { _v = 1; } } if (_v) { return _wrap_new_Texture__SWIG_2(L);} } + else { _v = 1; } } if (_v) { return _wrap_new_Texture__SWIG_1(L);} } SWIG_Lua_pusherrstring(L,"Wrong arguments for overloaded function 'new_Texture'\n" " Possible C/C++ prototypes are:\n" - " ofTexture::ofTexture()\n" " ofTexture::ofTexture(ofTexture const &)\n" " ofTexture::ofTexture(ofTexture &&)\n"); - lua_error(L);return 0; } + " ofTexture::ofTexture()\n" " ofTexture::ofTexture(ofTexture &&)\n"); lua_error(L);return 0; } static int _wrap_Texture_allocate__SWIG_0(lua_State* L) { int SWIG_arg = 0; ofTexture *arg1 = (ofTexture *) 0 ; ofTextureData *arg2 = 0 ; SWIG_check_num_args("ofTexture::allocate",2,2) if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("ofTexture::allocate",1,"ofTexture *"); @@ -5896,14 +5910,6 @@ static int _wrap_new_Image__SWIG_3(lua_State* L) { int SWIG_arg = 0; std::string SWIG_NewPointerObj(L,result,SWIGTYPE_p_ofImage_T_unsigned_char_t,1); SWIG_arg++; return SWIG_arg; if(0) SWIG_fail; fail: lua_error(L); return SWIG_arg; } static int _wrap_new_Image__SWIG_4(lua_State* L) { int SWIG_arg = 0; ofImage_< unsigned char > *arg1 = 0 ; - ofImage_< unsigned char > *result = 0 ; SWIG_check_num_args("ofImage_< unsigned char >::ofImage_",1,1) - if(!lua_isuserdata(L,1)) SWIG_fail_arg("ofImage_< unsigned char >::ofImage_",1,"ofImage_< unsigned char > const &"); - if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_ofImage_T_unsigned_char_t,0))){ - SWIG_fail_ptr("new_Image",1,SWIGTYPE_p_ofImage_T_unsigned_char_t); } - result = (ofImage_< unsigned char > *)new ofImage_< unsigned char >((ofImage_< unsigned char > const &)*arg1); - SWIG_NewPointerObj(L,result,SWIGTYPE_p_ofImage_T_unsigned_char_t,1); SWIG_arg++; return SWIG_arg; if(0) SWIG_fail; fail: - lua_error(L); return SWIG_arg; } -static int _wrap_new_Image__SWIG_5(lua_State* L) { int SWIG_arg = 0; ofImage_< unsigned char > *arg1 = 0 ; ofImage_< unsigned char > *result = 0 ; SWIG_check_num_args("ofImage_< unsigned char >::ofImage_",1,1) if(!lua_isuserdata(L,1)) SWIG_fail_arg("ofImage_< unsigned char >::ofImage_",1,"ofImage_< unsigned char > &&"); if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_ofImage_T_unsigned_char_t,0))){ @@ -5918,14 +5924,11 @@ static int _wrap_new_Image(lua_State* L) { int argc; int argv[2]={ 1,2} ; argc = if (lua_isuserdata(L,argv[0])==0 || SWIG_ConvertPtr(L,argv[0], (void **) &ptr, SWIGTYPE_p_ofFile, 0)) { _v = 0; } else { _v = 1; } } if (_v) { return _wrap_new_Image__SWIG_2(L);} } if (argc == 1) { int _v; { void *ptr; if (lua_isuserdata(L,argv[0])==0 || SWIG_ConvertPtr(L,argv[0], (void **) &ptr, SWIGTYPE_p_ofImage_T_unsigned_char_t, 0)) { - _v = 0; } else { _v = 1; } } if (_v) { return _wrap_new_Image__SWIG_4(L);} } if (argc == 1) { int _v; { void *ptr; - if (lua_isuserdata(L,argv[0])==0 || SWIG_ConvertPtr(L,argv[0], (void **) &ptr, SWIGTYPE_p_ofImage_T_unsigned_char_t, 0)) { - _v = 0; } else { _v = 1; } } if (_v) { return _wrap_new_Image__SWIG_5(L);} } if (argc == 1) { int _v; { + _v = 0; } else { _v = 1; } } if (_v) { return _wrap_new_Image__SWIG_4(L);} } if (argc == 1) { int _v; { _v = lua_isstring(L,argv[0]); } if (_v) { return _wrap_new_Image__SWIG_3(L);} } SWIG_Lua_pusherrstring(L,"Wrong arguments for overloaded function 'new_Image'\n" " Possible C/C++ prototypes are:\n" " ofImage_< unsigned char >::ofImage_()\n" " ofImage_< unsigned char >::ofImage_(ofPixels_< unsigned char > const &)\n" " ofImage_< unsigned char >::ofImage_(ofFile const &)\n" " ofImage_< unsigned char >::ofImage_(std::string const &)\n" - " ofImage_< unsigned char >::ofImage_(ofImage_< unsigned char > const &)\n" " ofImage_< unsigned char >::ofImage_(ofImage_< unsigned char > &&)\n"); lua_error(L);return 0; } static int _wrap_Image_allocate(lua_State* L) { int SWIG_arg = 0; ofImage_< unsigned char > *arg1 = (ofImage_< unsigned char > *) 0 ; int arg2 ; int arg3 ; ofImageType arg4 ; @@ -6804,14 +6807,6 @@ static int _wrap_new_FloatImage__SWIG_3(lua_State* L) { int SWIG_arg = 0; std::s SWIG_NewPointerObj(L,result,SWIGTYPE_p_ofImage_T_float_t,1); SWIG_arg++; return SWIG_arg; if(0) SWIG_fail; fail: lua_error(L); return SWIG_arg; } static int _wrap_new_FloatImage__SWIG_4(lua_State* L) { int SWIG_arg = 0; ofImage_< float > *arg1 = 0 ; - ofImage_< float > *result = 0 ; SWIG_check_num_args("ofImage_< float >::ofImage_",1,1) - if(!lua_isuserdata(L,1)) SWIG_fail_arg("ofImage_< float >::ofImage_",1,"ofImage_< float > const &"); - if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_ofImage_T_float_t,0))){ - SWIG_fail_ptr("new_FloatImage",1,SWIGTYPE_p_ofImage_T_float_t); } - result = (ofImage_< float > *)new ofImage_< float >((ofImage_< float > const &)*arg1); - SWIG_NewPointerObj(L,result,SWIGTYPE_p_ofImage_T_float_t,1); SWIG_arg++; return SWIG_arg; if(0) SWIG_fail; fail: - lua_error(L); return SWIG_arg; } -static int _wrap_new_FloatImage__SWIG_5(lua_State* L) { int SWIG_arg = 0; ofImage_< float > *arg1 = 0 ; ofImage_< float > *result = 0 ; SWIG_check_num_args("ofImage_< float >::ofImage_",1,1) if(!lua_isuserdata(L,1)) SWIG_fail_arg("ofImage_< float >::ofImage_",1,"ofImage_< float > &&"); if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_ofImage_T_float_t,0))){ @@ -6828,15 +6823,11 @@ static int _wrap_new_FloatImage(lua_State* L) { int argc; int argv[2]={ 1,2} ; a void *ptr; if (lua_isuserdata(L,argv[0])==0 || SWIG_ConvertPtr(L,argv[0], (void **) &ptr, SWIGTYPE_p_ofImage_T_float_t, 0)) { _v = 0; } else { _v = 1; } } if (_v) { return _wrap_new_FloatImage__SWIG_4(L);} } if (argc == 1) { int _v; { - void *ptr; - if (lua_isuserdata(L,argv[0])==0 || SWIG_ConvertPtr(L,argv[0], (void **) &ptr, SWIGTYPE_p_ofImage_T_float_t, 0)) { - _v = 0; } else { _v = 1; } } if (_v) { return _wrap_new_FloatImage__SWIG_5(L);} } if (argc == 1) { int _v; { _v = lua_isstring(L,argv[0]); } if (_v) { return _wrap_new_FloatImage__SWIG_3(L);} } SWIG_Lua_pusherrstring(L,"Wrong arguments for overloaded function 'new_FloatImage'\n" " Possible C/C++ prototypes are:\n" " ofImage_< float >::ofImage_()\n" " ofImage_< float >::ofImage_(ofPixels_< float > const &)\n" " ofImage_< float >::ofImage_(ofFile const &)\n" " ofImage_< float >::ofImage_(std::string const &)\n" - " ofImage_< float >::ofImage_(ofImage_< float > const &)\n" " ofImage_< float >::ofImage_(ofImage_< float > &&)\n"); - lua_error(L);return 0; } + " ofImage_< float >::ofImage_(ofImage_< float > &&)\n"); lua_error(L);return 0; } static int _wrap_FloatImage_allocate(lua_State* L) { int SWIG_arg = 0; ofImage_< float > *arg1 = (ofImage_< float > *) 0 ; int arg2 ; int arg3 ; ofImageType arg4 ; SWIG_check_num_args("ofImage_< float >::allocate",4,4) if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("ofImage_< float >::allocate",1,"ofImage_< float > *"); @@ -7678,14 +7669,6 @@ static int _wrap_new_ShortImage__SWIG_3(lua_State* L) { int SWIG_arg = 0; std::s SWIG_NewPointerObj(L,result,SWIGTYPE_p_ofImage_T_unsigned_short_t,1); SWIG_arg++; return SWIG_arg; if(0) SWIG_fail; fail: lua_error(L); return SWIG_arg; } static int _wrap_new_ShortImage__SWIG_4(lua_State* L) { int SWIG_arg = 0; ofImage_< unsigned short > *arg1 = 0 ; - ofImage_< unsigned short > *result = 0 ; SWIG_check_num_args("ofImage_< unsigned short >::ofImage_",1,1) - if(!lua_isuserdata(L,1)) SWIG_fail_arg("ofImage_< unsigned short >::ofImage_",1,"ofImage_< unsigned short > const &"); - if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_ofImage_T_unsigned_short_t,0))){ - SWIG_fail_ptr("new_ShortImage",1,SWIGTYPE_p_ofImage_T_unsigned_short_t); } - result = (ofImage_< unsigned short > *)new ofImage_< unsigned short >((ofImage_< unsigned short > const &)*arg1); - SWIG_NewPointerObj(L,result,SWIGTYPE_p_ofImage_T_unsigned_short_t,1); SWIG_arg++; return SWIG_arg; if(0) SWIG_fail; fail: - lua_error(L); return SWIG_arg; } -static int _wrap_new_ShortImage__SWIG_5(lua_State* L) { int SWIG_arg = 0; ofImage_< unsigned short > *arg1 = 0 ; ofImage_< unsigned short > *result = 0 ; SWIG_check_num_args("ofImage_< unsigned short >::ofImage_",1,1) if(!lua_isuserdata(L,1)) SWIG_fail_arg("ofImage_< unsigned short >::ofImage_",1,"ofImage_< unsigned short > &&"); if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_ofImage_T_unsigned_short_t,0))){ @@ -7702,15 +7685,11 @@ static int _wrap_new_ShortImage(lua_State* L) { int argc; int argv[2]={ 1,2} ; a void *ptr; if (lua_isuserdata(L,argv[0])==0 || SWIG_ConvertPtr(L,argv[0], (void **) &ptr, SWIGTYPE_p_ofImage_T_unsigned_short_t, 0)) { _v = 0; } else { _v = 1; } } if (_v) { return _wrap_new_ShortImage__SWIG_4(L);} } if (argc == 1) { int _v; { - void *ptr; - if (lua_isuserdata(L,argv[0])==0 || SWIG_ConvertPtr(L,argv[0], (void **) &ptr, SWIGTYPE_p_ofImage_T_unsigned_short_t, 0)) { - _v = 0; } else { _v = 1; } } if (_v) { return _wrap_new_ShortImage__SWIG_5(L);} } if (argc == 1) { int _v; { _v = lua_isstring(L,argv[0]); } if (_v) { return _wrap_new_ShortImage__SWIG_3(L);} } SWIG_Lua_pusherrstring(L,"Wrong arguments for overloaded function 'new_ShortImage'\n" " Possible C/C++ prototypes are:\n" " ofImage_< unsigned short >::ofImage_()\n" " ofImage_< unsigned short >::ofImage_(ofPixels_< unsigned short > const &)\n" " ofImage_< unsigned short >::ofImage_(ofFile const &)\n" " ofImage_< unsigned short >::ofImage_(std::string const &)\n" - " ofImage_< unsigned short >::ofImage_(ofImage_< unsigned short > const &)\n" " ofImage_< unsigned short >::ofImage_(ofImage_< unsigned short > &&)\n"); lua_error(L);return 0; } static int _wrap_ShortImage_allocate(lua_State* L) { int SWIG_arg = 0; ofImage_< unsigned short > *arg1 = (ofImage_< unsigned short > *) 0 ; int arg2 ; int arg3 ; ofImageType arg4 ; @@ -8580,11 +8559,6 @@ static int _wrap_new_Node__SWIG_0(lua_State* L) { int SWIG_arg = 0; ofNode *resu SWIG_NewPointerObj(L,result,SWIGTYPE_p_ofNode,1); SWIG_arg++; return SWIG_arg; if(0) SWIG_fail; fail: lua_error(L); return SWIG_arg; } static int _wrap_new_Node__SWIG_1(lua_State* L) { int SWIG_arg = 0; ofNode *arg1 = 0 ; ofNode *result = 0 ; - SWIG_check_num_args("ofNode::ofNode",1,1) if(!lua_isuserdata(L,1)) SWIG_fail_arg("ofNode::ofNode",1,"ofNode const &"); - if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_ofNode,0))){ SWIG_fail_ptr("new_Node",1,SWIGTYPE_p_ofNode); } - result = (ofNode *)new ofNode((ofNode const &)*arg1); SWIG_NewPointerObj(L,result,SWIGTYPE_p_ofNode,1); SWIG_arg++; - return SWIG_arg; if(0) SWIG_fail; fail: lua_error(L); return SWIG_arg; } -static int _wrap_new_Node__SWIG_2(lua_State* L) { int SWIG_arg = 0; ofNode *arg1 = 0 ; ofNode *result = 0 ; SWIG_check_num_args("ofNode::ofNode",1,1) if(!lua_isuserdata(L,1)) SWIG_fail_arg("ofNode::ofNode",1,"ofNode &&"); if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_ofNode,0))){ SWIG_fail_ptr("new_Node",1,SWIGTYPE_p_ofNode); } result = (ofNode *)new ofNode((ofNode &&)*arg1); SWIG_NewPointerObj(L,result,SWIGTYPE_p_ofNode,1); SWIG_arg++; @@ -8592,11 +8566,9 @@ static int _wrap_new_Node__SWIG_2(lua_State* L) { int SWIG_arg = 0; ofNode *arg1 static int _wrap_new_Node(lua_State* L) { int argc; int argv[2]={ 1,2} ; argc = lua_gettop(L); if (argc == 0) { return _wrap_new_Node__SWIG_0(L);} if (argc == 1) { int _v; { void *ptr; if (lua_isuserdata(L,argv[0])==0 || SWIG_ConvertPtr(L,argv[0], (void **) &ptr, SWIGTYPE_p_ofNode, 0)) { _v = 0; } else { - _v = 1; } } if (_v) { return _wrap_new_Node__SWIG_1(L);} } if (argc == 1) { int _v; { void *ptr; - if (lua_isuserdata(L,argv[0])==0 || SWIG_ConvertPtr(L,argv[0], (void **) &ptr, SWIGTYPE_p_ofNode, 0)) { _v = 0; } else { - _v = 1; } } if (_v) { return _wrap_new_Node__SWIG_2(L);} } + _v = 1; } } if (_v) { return _wrap_new_Node__SWIG_1(L);} } SWIG_Lua_pusherrstring(L,"Wrong arguments for overloaded function 'new_Node'\n" " Possible C/C++ prototypes are:\n" - " ofNode::ofNode()\n" " ofNode::ofNode(ofNode const &)\n" " ofNode::ofNode(ofNode &&)\n"); lua_error(L);return 0; } + " ofNode::ofNode()\n" " ofNode::ofNode(ofNode &&)\n"); lua_error(L);return 0; } static int _wrap_Node_setParent__SWIG_0(lua_State* L) { int SWIG_arg = 0; ofNode *arg1 = (ofNode *) 0 ; ofNode *arg2 = 0 ; bool arg3 ; SWIG_check_num_args("ofNode::setParent",3,3) if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("ofNode::setParent",1,"ofNode *"); @@ -15777,12 +15749,6 @@ static int _wrap_new_Shader__SWIG_0(lua_State* L) { int SWIG_arg = 0; ofShader * SWIG_NewPointerObj(L,result,SWIGTYPE_p_ofShader,1); SWIG_arg++; return SWIG_arg; if(0) SWIG_fail; fail: lua_error(L); return SWIG_arg; } static int _wrap_new_Shader__SWIG_1(lua_State* L) { int SWIG_arg = 0; ofShader *arg1 = 0 ; ofShader *result = 0 ; - SWIG_check_num_args("ofShader::ofShader",1,1) - if(!lua_isuserdata(L,1)) SWIG_fail_arg("ofShader::ofShader",1,"ofShader const &"); - if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_ofShader,0))){ SWIG_fail_ptr("new_Shader",1,SWIGTYPE_p_ofShader); } - result = (ofShader *)new ofShader((ofShader const &)*arg1); SWIG_NewPointerObj(L,result,SWIGTYPE_p_ofShader,1); SWIG_arg++; - return SWIG_arg; if(0) SWIG_fail; fail: lua_error(L); return SWIG_arg; } -static int _wrap_new_Shader__SWIG_2(lua_State* L) { int SWIG_arg = 0; ofShader *arg1 = 0 ; ofShader *result = 0 ; SWIG_check_num_args("ofShader::ofShader",1,1) if(!lua_isuserdata(L,1)) SWIG_fail_arg("ofShader::ofShader",1,"ofShader &&"); if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_ofShader,0))){ SWIG_fail_ptr("new_Shader",1,SWIGTYPE_p_ofShader); } result = (ofShader *)new ofShader((ofShader &&)*arg1); SWIG_NewPointerObj(L,result,SWIGTYPE_p_ofShader,1); SWIG_arg++; @@ -15790,12 +15756,9 @@ static int _wrap_new_Shader__SWIG_2(lua_State* L) { int SWIG_arg = 0; ofShader * static int _wrap_new_Shader(lua_State* L) { int argc; int argv[2]={ 1,2} ; argc = lua_gettop(L); if (argc == 0) { return _wrap_new_Shader__SWIG_0(L);} if (argc == 1) { int _v; { void *ptr; if (lua_isuserdata(L,argv[0])==0 || SWIG_ConvertPtr(L,argv[0], (void **) &ptr, SWIGTYPE_p_ofShader, 0)) { _v = 0; } - else { _v = 1; } } if (_v) { return _wrap_new_Shader__SWIG_1(L);} } if (argc == 1) { int _v; { void *ptr; - if (lua_isuserdata(L,argv[0])==0 || SWIG_ConvertPtr(L,argv[0], (void **) &ptr, SWIGTYPE_p_ofShader, 0)) { _v = 0; } - else { _v = 1; } } if (_v) { return _wrap_new_Shader__SWIG_2(L);} } + else { _v = 1; } } if (_v) { return _wrap_new_Shader__SWIG_1(L);} } SWIG_Lua_pusherrstring(L,"Wrong arguments for overloaded function 'new_Shader'\n" " Possible C/C++ prototypes are:\n" - " ofShader::ofShader()\n" " ofShader::ofShader(ofShader const &)\n" " ofShader::ofShader(ofShader &&)\n"); - lua_error(L);return 0; } + " ofShader::ofShader()\n" " ofShader::ofShader(ofShader &&)\n"); lua_error(L);return 0; } static int _wrap_Shader_load__SWIG_0(lua_State* L) { int SWIG_arg = 0; ofShader *arg1 = (ofShader *) 0 ; std::string arg2 ; bool result; SWIG_check_num_args("ofShader::load",2,2) if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("ofShader::load",1,"ofShader *"); @@ -18442,14 +18405,6 @@ static int _wrap_new_Pixels__SWIG_0(lua_State* L) { int SWIG_arg = 0; ofPixels_< SWIG_NewPointerObj(L,result,SWIGTYPE_p_ofPixels_T_unsigned_char_t,1); SWIG_arg++; return SWIG_arg; if(0) SWIG_fail; fail: lua_error(L); return SWIG_arg; } static int _wrap_new_Pixels__SWIG_1(lua_State* L) { int SWIG_arg = 0; ofPixels_< unsigned char > *arg1 = 0 ; - ofPixels_< unsigned char > *result = 0 ; SWIG_check_num_args("ofPixels_< unsigned char >::ofPixels_",1,1) - if(!lua_isuserdata(L,1)) SWIG_fail_arg("ofPixels_< unsigned char >::ofPixels_",1,"ofPixels_< unsigned char > const &"); - if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_ofPixels_T_unsigned_char_t,0))){ - SWIG_fail_ptr("new_Pixels",1,SWIGTYPE_p_ofPixels_T_unsigned_char_t); } - result = (ofPixels_< unsigned char > *)new ofPixels_< unsigned char >((ofPixels_< unsigned char > const &)*arg1); - SWIG_NewPointerObj(L,result,SWIGTYPE_p_ofPixels_T_unsigned_char_t,1); SWIG_arg++; return SWIG_arg; if(0) SWIG_fail; fail: - lua_error(L); return SWIG_arg; } -static int _wrap_new_Pixels__SWIG_2(lua_State* L) { int SWIG_arg = 0; ofPixels_< unsigned char > *arg1 = 0 ; ofPixels_< unsigned char > *result = 0 ; SWIG_check_num_args("ofPixels_< unsigned char >::ofPixels_",1,1) if(!lua_isuserdata(L,1)) SWIG_fail_arg("ofPixels_< unsigned char >::ofPixels_",1,"ofPixels_< unsigned char > &&"); if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_ofPixels_T_unsigned_char_t,0))){ @@ -18460,13 +18415,10 @@ static int _wrap_new_Pixels__SWIG_2(lua_State* L) { int SWIG_arg = 0; ofPixels_< static int _wrap_new_Pixels(lua_State* L) { int argc; int argv[2]={ 1,2} ; argc = lua_gettop(L); if (argc == 0) { return _wrap_new_Pixels__SWIG_0(L);} if (argc == 1) { int _v; { void *ptr; if (lua_isuserdata(L,argv[0])==0 || SWIG_ConvertPtr(L,argv[0], (void **) &ptr, SWIGTYPE_p_ofPixels_T_unsigned_char_t, 0)) { - _v = 0; } else { _v = 1; } } if (_v) { return _wrap_new_Pixels__SWIG_1(L);} } if (argc == 1) { int _v; { void *ptr; - if (lua_isuserdata(L,argv[0])==0 || SWIG_ConvertPtr(L,argv[0], (void **) &ptr, SWIGTYPE_p_ofPixels_T_unsigned_char_t, 0)) { - _v = 0; } else { _v = 1; } } if (_v) { return _wrap_new_Pixels__SWIG_2(L);} } + _v = 0; } else { _v = 1; } } if (_v) { return _wrap_new_Pixels__SWIG_1(L);} } SWIG_Lua_pusherrstring(L,"Wrong arguments for overloaded function 'new_Pixels'\n" " Possible C/C++ prototypes are:\n" - " ofPixels_< unsigned char >::ofPixels_()\n" - " ofPixels_< unsigned char >::ofPixels_(ofPixels_< unsigned char > const &)\n" - " ofPixels_< unsigned char >::ofPixels_(ofPixels_< unsigned char > &&)\n"); lua_error(L);return 0; } + " ofPixels_< unsigned char >::ofPixels_()\n" " ofPixels_< unsigned char >::ofPixels_(ofPixels_< unsigned char > &&)\n"); + lua_error(L);return 0; } static int _wrap_Pixels_allocate(lua_State* L) { int SWIG_arg = 0; ofPixels_< unsigned char > *arg1 = (ofPixels_< unsigned char > *) 0 ; int arg2 ; int arg3 ; int arg4 ; SWIG_check_num_args("ofPixels_< unsigned char >::allocate",4,4) @@ -19210,14 +19162,6 @@ static int _wrap_new_FloatPixels__SWIG_0(lua_State* L) { int SWIG_arg = 0; ofPix SWIG_NewPointerObj(L,result,SWIGTYPE_p_ofPixels_T_float_t,1); SWIG_arg++; return SWIG_arg; if(0) SWIG_fail; fail: lua_error(L); return SWIG_arg; } static int _wrap_new_FloatPixels__SWIG_1(lua_State* L) { int SWIG_arg = 0; ofPixels_< float > *arg1 = 0 ; - ofPixels_< float > *result = 0 ; SWIG_check_num_args("ofPixels_< float >::ofPixels_",1,1) - if(!lua_isuserdata(L,1)) SWIG_fail_arg("ofPixels_< float >::ofPixels_",1,"ofPixels_< float > const &"); - if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_ofPixels_T_float_t,0))){ - SWIG_fail_ptr("new_FloatPixels",1,SWIGTYPE_p_ofPixels_T_float_t); } - result = (ofPixels_< float > *)new ofPixels_< float >((ofPixels_< float > const &)*arg1); - SWIG_NewPointerObj(L,result,SWIGTYPE_p_ofPixels_T_float_t,1); SWIG_arg++; return SWIG_arg; if(0) SWIG_fail; fail: - lua_error(L); return SWIG_arg; } -static int _wrap_new_FloatPixels__SWIG_2(lua_State* L) { int SWIG_arg = 0; ofPixels_< float > *arg1 = 0 ; ofPixels_< float > *result = 0 ; SWIG_check_num_args("ofPixels_< float >::ofPixels_",1,1) if(!lua_isuserdata(L,1)) SWIG_fail_arg("ofPixels_< float >::ofPixels_",1,"ofPixels_< float > &&"); if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_ofPixels_T_float_t,0))){ @@ -19228,13 +19172,9 @@ static int _wrap_new_FloatPixels__SWIG_2(lua_State* L) { int SWIG_arg = 0; ofPix static int _wrap_new_FloatPixels(lua_State* L) { int argc; int argv[2]={ 1,2} ; argc = lua_gettop(L); if (argc == 0) { return _wrap_new_FloatPixels__SWIG_0(L);} if (argc == 1) { int _v; { void *ptr; if (lua_isuserdata(L,argv[0])==0 || SWIG_ConvertPtr(L,argv[0], (void **) &ptr, SWIGTYPE_p_ofPixels_T_float_t, 0)) { - _v = 0; } else { _v = 1; } } if (_v) { return _wrap_new_FloatPixels__SWIG_1(L);} } if (argc == 1) { int _v; { - void *ptr; - if (lua_isuserdata(L,argv[0])==0 || SWIG_ConvertPtr(L,argv[0], (void **) &ptr, SWIGTYPE_p_ofPixels_T_float_t, 0)) { - _v = 0; } else { _v = 1; } } if (_v) { return _wrap_new_FloatPixels__SWIG_2(L);} } + _v = 0; } else { _v = 1; } } if (_v) { return _wrap_new_FloatPixels__SWIG_1(L);} } SWIG_Lua_pusherrstring(L,"Wrong arguments for overloaded function 'new_FloatPixels'\n" " Possible C/C++ prototypes are:\n" - " ofPixels_< float >::ofPixels_()\n" " ofPixels_< float >::ofPixels_(ofPixels_< float > const &)\n" - " ofPixels_< float >::ofPixels_(ofPixels_< float > &&)\n"); lua_error(L);return 0; } + " ofPixels_< float >::ofPixels_()\n" " ofPixels_< float >::ofPixels_(ofPixels_< float > &&)\n"); lua_error(L);return 0; } static int _wrap_FloatPixels_allocate(lua_State* L) { int SWIG_arg = 0; ofPixels_< float > *arg1 = (ofPixels_< float > *) 0 ; int arg2 ; int arg3 ; int arg4 ; SWIG_check_num_args("ofPixels_< float >::allocate",4,4) if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("ofPixels_< float >::allocate",1,"ofPixels_< float > *"); @@ -19950,14 +19890,6 @@ static int _wrap_new_ShortPixels__SWIG_0(lua_State* L) { int SWIG_arg = 0; ofPix SWIG_NewPointerObj(L,result,SWIGTYPE_p_ofPixels_T_unsigned_short_t,1); SWIG_arg++; return SWIG_arg; if(0) SWIG_fail; fail: lua_error(L); return SWIG_arg; } static int _wrap_new_ShortPixels__SWIG_1(lua_State* L) { int SWIG_arg = 0; ofPixels_< unsigned short > *arg1 = 0 ; - ofPixels_< unsigned short > *result = 0 ; SWIG_check_num_args("ofPixels_< unsigned short >::ofPixels_",1,1) - if(!lua_isuserdata(L,1)) SWIG_fail_arg("ofPixels_< unsigned short >::ofPixels_",1,"ofPixels_< unsigned short > const &"); - if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_ofPixels_T_unsigned_short_t,0))){ - SWIG_fail_ptr("new_ShortPixels",1,SWIGTYPE_p_ofPixels_T_unsigned_short_t); } - result = (ofPixels_< unsigned short > *)new ofPixels_< unsigned short >((ofPixels_< unsigned short > const &)*arg1); - SWIG_NewPointerObj(L,result,SWIGTYPE_p_ofPixels_T_unsigned_short_t,1); SWIG_arg++; return SWIG_arg; if(0) SWIG_fail; fail: - lua_error(L); return SWIG_arg; } -static int _wrap_new_ShortPixels__SWIG_2(lua_State* L) { int SWIG_arg = 0; ofPixels_< unsigned short > *arg1 = 0 ; ofPixels_< unsigned short > *result = 0 ; SWIG_check_num_args("ofPixels_< unsigned short >::ofPixels_",1,1) if(!lua_isuserdata(L,1)) SWIG_fail_arg("ofPixels_< unsigned short >::ofPixels_",1,"ofPixels_< unsigned short > &&"); if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_ofPixels_T_unsigned_short_t,0))){ @@ -19968,13 +19900,9 @@ static int _wrap_new_ShortPixels__SWIG_2(lua_State* L) { int SWIG_arg = 0; ofPix static int _wrap_new_ShortPixels(lua_State* L) { int argc; int argv[2]={ 1,2} ; argc = lua_gettop(L); if (argc == 0) { return _wrap_new_ShortPixels__SWIG_0(L);} if (argc == 1) { int _v; { void *ptr; if (lua_isuserdata(L,argv[0])==0 || SWIG_ConvertPtr(L,argv[0], (void **) &ptr, SWIGTYPE_p_ofPixels_T_unsigned_short_t, 0)) { - _v = 0; } else { _v = 1; } } if (_v) { return _wrap_new_ShortPixels__SWIG_1(L);} } if (argc == 1) { int _v; { - void *ptr; - if (lua_isuserdata(L,argv[0])==0 || SWIG_ConvertPtr(L,argv[0], (void **) &ptr, SWIGTYPE_p_ofPixels_T_unsigned_short_t, 0)) { - _v = 0; } else { _v = 1; } } if (_v) { return _wrap_new_ShortPixels__SWIG_2(L);} } + _v = 0; } else { _v = 1; } } if (_v) { return _wrap_new_ShortPixels__SWIG_1(L);} } SWIG_Lua_pusherrstring(L,"Wrong arguments for overloaded function 'new_ShortPixels'\n" " Possible C/C++ prototypes are:\n" " ofPixels_< unsigned short >::ofPixels_()\n" - " ofPixels_< unsigned short >::ofPixels_(ofPixels_< unsigned short > const &)\n" " ofPixels_< unsigned short >::ofPixels_(ofPixels_< unsigned short > &&)\n"); lua_error(L);return 0; } static int _wrap_ShortPixels_allocate(lua_State* L) { int SWIG_arg = 0; ofPixels_< unsigned short > *arg1 = (ofPixels_< unsigned short > *) 0 ; int arg2 ; int arg3 ; int arg4 ; @@ -25731,14 +25659,6 @@ static int _wrap_new_TrueTypeFont__SWIG_0(lua_State* L) { int SWIG_arg = 0; ofTr SWIG_NewPointerObj(L,result,SWIGTYPE_p_ofTrueTypeFont,1); SWIG_arg++; return SWIG_arg; if(0) SWIG_fail; fail: lua_error(L); return SWIG_arg; } static int _wrap_new_TrueTypeFont__SWIG_1(lua_State* L) { int SWIG_arg = 0; ofTrueTypeFont *arg1 = 0 ; - ofTrueTypeFont *result = 0 ; SWIG_check_num_args("ofTrueTypeFont::ofTrueTypeFont",1,1) - if(!lua_isuserdata(L,1)) SWIG_fail_arg("ofTrueTypeFont::ofTrueTypeFont",1,"ofTrueTypeFont const &"); - if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_ofTrueTypeFont,0))){ - SWIG_fail_ptr("new_TrueTypeFont",1,SWIGTYPE_p_ofTrueTypeFont); } - result = (ofTrueTypeFont *)new ofTrueTypeFont((ofTrueTypeFont const &)*arg1); - SWIG_NewPointerObj(L,result,SWIGTYPE_p_ofTrueTypeFont,1); SWIG_arg++; return SWIG_arg; if(0) SWIG_fail; fail: lua_error(L); - return SWIG_arg; } -static int _wrap_new_TrueTypeFont__SWIG_2(lua_State* L) { int SWIG_arg = 0; ofTrueTypeFont *arg1 = 0 ; ofTrueTypeFont *result = 0 ; SWIG_check_num_args("ofTrueTypeFont::ofTrueTypeFont",1,1) if(!lua_isuserdata(L,1)) SWIG_fail_arg("ofTrueTypeFont::ofTrueTypeFont",1,"ofTrueTypeFont &&"); if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_ofTrueTypeFont,0))){ @@ -25749,12 +25669,9 @@ static int _wrap_new_TrueTypeFont__SWIG_2(lua_State* L) { int SWIG_arg = 0; ofTr static int _wrap_new_TrueTypeFont(lua_State* L) { int argc; int argv[2]={ 1,2} ; argc = lua_gettop(L); if (argc == 0) { return _wrap_new_TrueTypeFont__SWIG_0(L);} if (argc == 1) { int _v; { void *ptr; if (lua_isuserdata(L,argv[0])==0 || SWIG_ConvertPtr(L,argv[0], (void **) &ptr, SWIGTYPE_p_ofTrueTypeFont, 0)) { _v = 0; } - else { _v = 1; } } if (_v) { return _wrap_new_TrueTypeFont__SWIG_1(L);} } if (argc == 1) { int _v; { void *ptr; - if (lua_isuserdata(L,argv[0])==0 || SWIG_ConvertPtr(L,argv[0], (void **) &ptr, SWIGTYPE_p_ofTrueTypeFont, 0)) { _v = 0; } - else { _v = 1; } } if (_v) { return _wrap_new_TrueTypeFont__SWIG_2(L);} } + else { _v = 1; } } if (_v) { return _wrap_new_TrueTypeFont__SWIG_1(L);} } SWIG_Lua_pusherrstring(L,"Wrong arguments for overloaded function 'new_TrueTypeFont'\n" " Possible C/C++ prototypes are:\n" - " ofTrueTypeFont::ofTrueTypeFont()\n" " ofTrueTypeFont::ofTrueTypeFont(ofTrueTypeFont const &)\n" - " ofTrueTypeFont::ofTrueTypeFont(ofTrueTypeFont &&)\n"); lua_error(L);return 0; } + " ofTrueTypeFont::ofTrueTypeFont()\n" " ofTrueTypeFont::ofTrueTypeFont(ofTrueTypeFont &&)\n"); lua_error(L);return 0; } static int _wrap_TrueTypeFont_load__SWIG_0(lua_State* L) { int SWIG_arg = 0; ofTrueTypeFont *arg1 = (ofTrueTypeFont *) 0 ; std::string *arg2 = 0 ; int arg3 ; bool arg4 ; bool arg5 ; bool arg6 ; float arg7 ; int arg8 ; std::string temp2 ; bool result; SWIG_check_num_args("ofTrueTypeFont::load",8,8) @@ -43105,7 +43022,7 @@ static swig_lua_attribute swig_SwigModule_attributes[] = { static swig_lua_const_info swig_SwigModule_constants[]= { {SWIG_LUA_CONSTTAB_INT("VERSION_MAJOR", 0)}, {SWIG_LUA_CONSTTAB_INT("VERSION_MINOR", 9)}, - {SWIG_LUA_CONSTTAB_INT("VERSION_PATCH", 2)}, + {SWIG_LUA_CONSTTAB_INT("VERSION_PATCH", 3)}, {SWIG_LUA_CONSTTAB_STRING("VERSION_PRE_RELEASE", "stable")}, {SWIG_LUA_CONSTTAB_INT("LOOP_NONE", OF_LOOP_NONE)}, {SWIG_LUA_CONSTTAB_INT("LOOP_PALINDROME", OF_LOOP_PALINDROME)}, @@ -43320,6 +43237,13 @@ static swig_lua_const_info swig_SwigModule_constants[]= { {SWIG_LUA_CONSTTAB_INT("IMAGE_FORMAT_PFM", OF_IMAGE_FORMAT_PFM)}, {SWIG_LUA_CONSTTAB_INT("IMAGE_FORMAT_PICT", OF_IMAGE_FORMAT_PICT)}, {SWIG_LUA_CONSTTAB_INT("IMAGE_FORMAT_RAW", OF_IMAGE_FORMAT_RAW)}, + {SWIG_LUA_CONSTTAB_INT("TEXTURE_LUMINANCE", 6409)}, + {SWIG_LUA_CONSTTAB_INT("TEXTURE_RGB", 6407)}, + {SWIG_LUA_CONSTTAB_INT("TEXTURE_RGBA", 6408)}, + {SWIG_LUA_CONSTTAB_INT("CLAMP_TO_EDGE", 33071)}, + {SWIG_LUA_CONSTTAB_INT("CLAMP_TO_BORDER", 33069)}, + {SWIG_LUA_CONSTTAB_INT("REPEAT", 10497)}, + {SWIG_LUA_CONSTTAB_INT("MIRRORED_REPEAT", 33648)}, {SWIG_LUA_CONSTTAB_INT("BoxPrimitive_SIDE_FRONT", ofBoxPrimitive::SIDE_FRONT)}, {SWIG_LUA_CONSTTAB_INT("BoxPrimitive_SIDE_RIGHT", ofBoxPrimitive::SIDE_RIGHT)}, {SWIG_LUA_CONSTTAB_INT("BoxPrimitive_SIDE_LEFT", ofBoxPrimitive::SIDE_LEFT)}, diff --git a/src/bindings/ios/ofxLuaBindings.cpp b/src/bindings/ios/ofxLuaBindings.cpp index e2dab44..9a22b32 100644 --- a/src/bindings/ios/ofxLuaBindings.cpp +++ b/src/bindings/ios/ofxLuaBindings.cpp @@ -1,6 +1,6 @@ /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). - * Version 3.0.8 + * Version 3.0.10 * * This file is not intended to be easily readable and contains a number of * coding conventions designed to improve portability and efficiency. Do not make @@ -107,9 +107,11 @@ template T SwigValueInit() { #endif /* exporting methods */ -#if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) -# ifndef GCC_HASCLASSVISIBILITY -# define GCC_HASCLASSVISIBILITY +#if defined(__GNUC__) +# if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) +# ifndef GCC_HASCLASSVISIBILITY +# define GCC_HASCLASSVISIBILITY +# endif # endif #endif @@ -659,16 +661,16 @@ SWIG_UnpackData(const char *c, void *ptr, size_t sz) { char d = *(c++); unsigned char uu; if ((d >= '0') && (d <= '9')) - uu = ((d - '0') << 4); + uu = (unsigned char)((d - '0') << 4); else if ((d >= 'a') && (d <= 'f')) - uu = ((d - ('a'-10)) << 4); + uu = (unsigned char)((d - ('a'-10)) << 4); else return (char *) 0; d = *(c++); if ((d >= '0') && (d <= '9')) - uu |= (d - '0'); + uu |= (unsigned char)(d - '0'); else if ((d >= 'a') && (d <= 'f')) - uu |= (d - ('a'-10)); + uu |= (unsigned char)(d - ('a'-10)); else return (char *) 0; *u = uu; @@ -1543,6 +1545,44 @@ SWIGINTERN int SWIG_Lua_iterate_bases(lua_State *L, swig_type_info * SWIGUNUSED return result; } +/* The class.get method helper, performs the lookup of class attributes. + * It returns an error code. Number of function return values is passed inside 'ret'. + * first_arg is not used in this function because function always has 2 arguments. + */ +SWIGINTERN int SWIG_Lua_class_do_get_item(lua_State *L, swig_type_info *type, int SWIGUNUSED first_arg, int *ret) +{ +/* there should be 2 params passed in + (1) userdata (not the meta table) + (2) string name of the attribute +*/ + int bases_search_result; + int substack_start = lua_gettop(L)-2; + assert(first_arg == substack_start+1); + lua_checkstack(L,5); + assert(lua_isuserdata(L,-2)); /* just in case */ + lua_getmetatable(L,-2); /* get the meta table */ + assert(lua_istable(L,-1)); /* just in case */ + /* NEW: looks for the __getitem() fn + this is a user provided get fn */ + SWIG_Lua_get_table(L,"__getitem"); /* find the __getitem fn */ + if (lua_iscfunction(L,-1)) /* if its there */ + { /* found it so call the fn & return its value */ + lua_pushvalue(L,substack_start+1); /* the userdata */ + lua_pushvalue(L,substack_start+2); /* the parameter */ + lua_call(L,2,1); /* 2 value in (userdata),1 out (result) */ + lua_remove(L,-2); /* stack tidy, remove metatable */ + if(ret) *ret = 1; + return SWIG_OK; + } + lua_pop(L,1); + /* Remove the metatable */ + lua_pop(L,1); + /* Search in base classes */ + bases_search_result = SWIG_Lua_iterate_bases(L,type,substack_start+1,SWIG_Lua_class_do_get_item,ret); + return bases_search_result; /* sorry not known */ +} + + /* The class.get method helper, performs the lookup of class attributes. * It returns an error code. Number of function return values is passed inside 'ret'. * first_arg is not used in this function because function always has 2 arguments. @@ -1590,19 +1630,6 @@ SWIGINTERN int SWIG_Lua_class_do_get(lua_State *L, swig_type_info *type, int SW return SWIG_OK; } lua_pop(L,1); /* remove whatever was there */ - /* NEW: looks for the __getitem() fn - this is a user provided get fn */ - SWIG_Lua_get_table(L,"__getitem"); /* find the __getitem fn */ - if (lua_iscfunction(L,-1)) /* if its there */ - { /* found it so call the fn & return its value */ - lua_pushvalue(L,substack_start+1); /* the userdata */ - lua_pushvalue(L,substack_start+2); /* the parameter */ - lua_call(L,2,1); /* 2 value in (userdata),1 out (result) */ - lua_remove(L,-2); /* stack tidy, remove metatable */ - if(ret) *ret = 1; - return SWIG_OK; - } - lua_pop(L,1); /* Remove the metatable */ lua_pop(L,1); /* Search in base classes */ @@ -1629,6 +1656,10 @@ SWIGINTERN int SWIG_Lua_class_get(lua_State *L) if(result == SWIG_OK) return ret; + result = SWIG_Lua_class_do_get_item(L,type,1,&ret); + if(result == SWIG_OK) + return ret; + return 0; } @@ -3828,11 +3859,6 @@ static int _wrap_new_Fbo__SWIG_0(lua_State* L) { int SWIG_arg = 0; ofFbo *result result = (ofFbo *)new ofFbo(); SWIG_NewPointerObj(L,result,SWIGTYPE_p_ofFbo,1); SWIG_arg++; return SWIG_arg; if(0) SWIG_fail; fail: lua_error(L); return SWIG_arg; } static int _wrap_new_Fbo__SWIG_1(lua_State* L) { int SWIG_arg = 0; ofFbo *arg1 = 0 ; ofFbo *result = 0 ; - SWIG_check_num_args("ofFbo::ofFbo",1,1) if(!lua_isuserdata(L,1)) SWIG_fail_arg("ofFbo::ofFbo",1,"ofFbo const &"); - if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_ofFbo,0))){ SWIG_fail_ptr("new_Fbo",1,SWIGTYPE_p_ofFbo); } - result = (ofFbo *)new ofFbo((ofFbo const &)*arg1); SWIG_NewPointerObj(L,result,SWIGTYPE_p_ofFbo,1); SWIG_arg++; - return SWIG_arg; if(0) SWIG_fail; fail: lua_error(L); return SWIG_arg; } -static int _wrap_new_Fbo__SWIG_2(lua_State* L) { int SWIG_arg = 0; ofFbo *arg1 = 0 ; ofFbo *result = 0 ; SWIG_check_num_args("ofFbo::ofFbo",1,1) if(!lua_isuserdata(L,1)) SWIG_fail_arg("ofFbo::ofFbo",1,"ofFbo &&"); if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_ofFbo,0))){ SWIG_fail_ptr("new_Fbo",1,SWIGTYPE_p_ofFbo); } result = (ofFbo *)new ofFbo((ofFbo &&)*arg1); SWIG_NewPointerObj(L,result,SWIGTYPE_p_ofFbo,1); SWIG_arg++; return SWIG_arg; @@ -3840,11 +3866,9 @@ static int _wrap_new_Fbo__SWIG_2(lua_State* L) { int SWIG_arg = 0; ofFbo *arg1 = static int _wrap_new_Fbo(lua_State* L) { int argc; int argv[2]={ 1,2} ; argc = lua_gettop(L); if (argc == 0) { return _wrap_new_Fbo__SWIG_0(L);} if (argc == 1) { int _v; { void *ptr; if (lua_isuserdata(L,argv[0])==0 || SWIG_ConvertPtr(L,argv[0], (void **) &ptr, SWIGTYPE_p_ofFbo, 0)) { _v = 0; } else { - _v = 1; } } if (_v) { return _wrap_new_Fbo__SWIG_1(L);} } if (argc == 1) { int _v; { void *ptr; - if (lua_isuserdata(L,argv[0])==0 || SWIG_ConvertPtr(L,argv[0], (void **) &ptr, SWIGTYPE_p_ofFbo, 0)) { _v = 0; } else { - _v = 1; } } if (_v) { return _wrap_new_Fbo__SWIG_2(L);} } + _v = 1; } } if (_v) { return _wrap_new_Fbo__SWIG_1(L);} } SWIG_Lua_pusherrstring(L,"Wrong arguments for overloaded function 'new_Fbo'\n" " Possible C/C++ prototypes are:\n" - " ofFbo::ofFbo()\n" " ofFbo::ofFbo(ofFbo const &)\n" " ofFbo::ofFbo(ofFbo &&)\n"); lua_error(L);return 0; } + " ofFbo::ofFbo()\n" " ofFbo::ofFbo(ofFbo &&)\n"); lua_error(L);return 0; } static int _wrap_Fbo_allocate__SWIG_0(lua_State* L) { int SWIG_arg = 0; ofFbo *arg1 = (ofFbo *) 0 ; int arg2 ; int arg3 ; int arg4 ; int arg5 ; SWIG_check_num_args("ofFbo::allocate",5,5) if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("ofFbo::allocate",1,"ofFbo *"); @@ -4777,13 +4801,6 @@ static int _wrap_new_Texture__SWIG_0(lua_State* L) { int SWIG_arg = 0; ofTexture SWIG_NewPointerObj(L,result,SWIGTYPE_p_ofTexture,1); SWIG_arg++; return SWIG_arg; if(0) SWIG_fail; fail: lua_error(L); return SWIG_arg; } static int _wrap_new_Texture__SWIG_1(lua_State* L) { int SWIG_arg = 0; ofTexture *arg1 = 0 ; ofTexture *result = 0 ; - SWIG_check_num_args("ofTexture::ofTexture",1,1) - if(!lua_isuserdata(L,1)) SWIG_fail_arg("ofTexture::ofTexture",1,"ofTexture const &"); - if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_ofTexture,0))){ - SWIG_fail_ptr("new_Texture",1,SWIGTYPE_p_ofTexture); } result = (ofTexture *)new ofTexture((ofTexture const &)*arg1); - SWIG_NewPointerObj(L,result,SWIGTYPE_p_ofTexture,1); SWIG_arg++; return SWIG_arg; if(0) SWIG_fail; fail: lua_error(L); - return SWIG_arg; } -static int _wrap_new_Texture__SWIG_2(lua_State* L) { int SWIG_arg = 0; ofTexture *arg1 = 0 ; ofTexture *result = 0 ; SWIG_check_num_args("ofTexture::ofTexture",1,1) if(!lua_isuserdata(L,1)) SWIG_fail_arg("ofTexture::ofTexture",1,"ofTexture &&"); if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_ofTexture,0))){ @@ -4793,12 +4810,9 @@ static int _wrap_new_Texture__SWIG_2(lua_State* L) { int SWIG_arg = 0; ofTexture static int _wrap_new_Texture(lua_State* L) { int argc; int argv[2]={ 1,2} ; argc = lua_gettop(L); if (argc == 0) { return _wrap_new_Texture__SWIG_0(L);} if (argc == 1) { int _v; { void *ptr; if (lua_isuserdata(L,argv[0])==0 || SWIG_ConvertPtr(L,argv[0], (void **) &ptr, SWIGTYPE_p_ofTexture, 0)) { _v = 0; } - else { _v = 1; } } if (_v) { return _wrap_new_Texture__SWIG_1(L);} } if (argc == 1) { int _v; { void *ptr; - if (lua_isuserdata(L,argv[0])==0 || SWIG_ConvertPtr(L,argv[0], (void **) &ptr, SWIGTYPE_p_ofTexture, 0)) { _v = 0; } - else { _v = 1; } } if (_v) { return _wrap_new_Texture__SWIG_2(L);} } + else { _v = 1; } } if (_v) { return _wrap_new_Texture__SWIG_1(L);} } SWIG_Lua_pusherrstring(L,"Wrong arguments for overloaded function 'new_Texture'\n" " Possible C/C++ prototypes are:\n" - " ofTexture::ofTexture()\n" " ofTexture::ofTexture(ofTexture const &)\n" " ofTexture::ofTexture(ofTexture &&)\n"); - lua_error(L);return 0; } + " ofTexture::ofTexture()\n" " ofTexture::ofTexture(ofTexture &&)\n"); lua_error(L);return 0; } static int _wrap_Texture_allocate__SWIG_0(lua_State* L) { int SWIG_arg = 0; ofTexture *arg1 = (ofTexture *) 0 ; ofTextureData *arg2 = 0 ; SWIG_check_num_args("ofTexture::allocate",2,2) if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("ofTexture::allocate",1,"ofTexture *"); @@ -5846,14 +5860,6 @@ static int _wrap_new_Image__SWIG_3(lua_State* L) { int SWIG_arg = 0; std::string SWIG_NewPointerObj(L,result,SWIGTYPE_p_ofImage_T_unsigned_char_t,1); SWIG_arg++; return SWIG_arg; if(0) SWIG_fail; fail: lua_error(L); return SWIG_arg; } static int _wrap_new_Image__SWIG_4(lua_State* L) { int SWIG_arg = 0; ofImage_< unsigned char > *arg1 = 0 ; - ofImage_< unsigned char > *result = 0 ; SWIG_check_num_args("ofImage_< unsigned char >::ofImage_",1,1) - if(!lua_isuserdata(L,1)) SWIG_fail_arg("ofImage_< unsigned char >::ofImage_",1,"ofImage_< unsigned char > const &"); - if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_ofImage_T_unsigned_char_t,0))){ - SWIG_fail_ptr("new_Image",1,SWIGTYPE_p_ofImage_T_unsigned_char_t); } - result = (ofImage_< unsigned char > *)new ofImage_< unsigned char >((ofImage_< unsigned char > const &)*arg1); - SWIG_NewPointerObj(L,result,SWIGTYPE_p_ofImage_T_unsigned_char_t,1); SWIG_arg++; return SWIG_arg; if(0) SWIG_fail; fail: - lua_error(L); return SWIG_arg; } -static int _wrap_new_Image__SWIG_5(lua_State* L) { int SWIG_arg = 0; ofImage_< unsigned char > *arg1 = 0 ; ofImage_< unsigned char > *result = 0 ; SWIG_check_num_args("ofImage_< unsigned char >::ofImage_",1,1) if(!lua_isuserdata(L,1)) SWIG_fail_arg("ofImage_< unsigned char >::ofImage_",1,"ofImage_< unsigned char > &&"); if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_ofImage_T_unsigned_char_t,0))){ @@ -5868,14 +5874,11 @@ static int _wrap_new_Image(lua_State* L) { int argc; int argv[2]={ 1,2} ; argc = if (lua_isuserdata(L,argv[0])==0 || SWIG_ConvertPtr(L,argv[0], (void **) &ptr, SWIGTYPE_p_ofFile, 0)) { _v = 0; } else { _v = 1; } } if (_v) { return _wrap_new_Image__SWIG_2(L);} } if (argc == 1) { int _v; { void *ptr; if (lua_isuserdata(L,argv[0])==0 || SWIG_ConvertPtr(L,argv[0], (void **) &ptr, SWIGTYPE_p_ofImage_T_unsigned_char_t, 0)) { - _v = 0; } else { _v = 1; } } if (_v) { return _wrap_new_Image__SWIG_4(L);} } if (argc == 1) { int _v; { void *ptr; - if (lua_isuserdata(L,argv[0])==0 || SWIG_ConvertPtr(L,argv[0], (void **) &ptr, SWIGTYPE_p_ofImage_T_unsigned_char_t, 0)) { - _v = 0; } else { _v = 1; } } if (_v) { return _wrap_new_Image__SWIG_5(L);} } if (argc == 1) { int _v; { + _v = 0; } else { _v = 1; } } if (_v) { return _wrap_new_Image__SWIG_4(L);} } if (argc == 1) { int _v; { _v = lua_isstring(L,argv[0]); } if (_v) { return _wrap_new_Image__SWIG_3(L);} } SWIG_Lua_pusherrstring(L,"Wrong arguments for overloaded function 'new_Image'\n" " Possible C/C++ prototypes are:\n" " ofImage_< unsigned char >::ofImage_()\n" " ofImage_< unsigned char >::ofImage_(ofPixels_< unsigned char > const &)\n" " ofImage_< unsigned char >::ofImage_(ofFile const &)\n" " ofImage_< unsigned char >::ofImage_(std::string const &)\n" - " ofImage_< unsigned char >::ofImage_(ofImage_< unsigned char > const &)\n" " ofImage_< unsigned char >::ofImage_(ofImage_< unsigned char > &&)\n"); lua_error(L);return 0; } static int _wrap_Image_allocate(lua_State* L) { int SWIG_arg = 0; ofImage_< unsigned char > *arg1 = (ofImage_< unsigned char > *) 0 ; int arg2 ; int arg3 ; ofImageType arg4 ; @@ -6754,14 +6757,6 @@ static int _wrap_new_FloatImage__SWIG_3(lua_State* L) { int SWIG_arg = 0; std::s SWIG_NewPointerObj(L,result,SWIGTYPE_p_ofImage_T_float_t,1); SWIG_arg++; return SWIG_arg; if(0) SWIG_fail; fail: lua_error(L); return SWIG_arg; } static int _wrap_new_FloatImage__SWIG_4(lua_State* L) { int SWIG_arg = 0; ofImage_< float > *arg1 = 0 ; - ofImage_< float > *result = 0 ; SWIG_check_num_args("ofImage_< float >::ofImage_",1,1) - if(!lua_isuserdata(L,1)) SWIG_fail_arg("ofImage_< float >::ofImage_",1,"ofImage_< float > const &"); - if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_ofImage_T_float_t,0))){ - SWIG_fail_ptr("new_FloatImage",1,SWIGTYPE_p_ofImage_T_float_t); } - result = (ofImage_< float > *)new ofImage_< float >((ofImage_< float > const &)*arg1); - SWIG_NewPointerObj(L,result,SWIGTYPE_p_ofImage_T_float_t,1); SWIG_arg++; return SWIG_arg; if(0) SWIG_fail; fail: - lua_error(L); return SWIG_arg; } -static int _wrap_new_FloatImage__SWIG_5(lua_State* L) { int SWIG_arg = 0; ofImage_< float > *arg1 = 0 ; ofImage_< float > *result = 0 ; SWIG_check_num_args("ofImage_< float >::ofImage_",1,1) if(!lua_isuserdata(L,1)) SWIG_fail_arg("ofImage_< float >::ofImage_",1,"ofImage_< float > &&"); if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_ofImage_T_float_t,0))){ @@ -6778,15 +6773,11 @@ static int _wrap_new_FloatImage(lua_State* L) { int argc; int argv[2]={ 1,2} ; a void *ptr; if (lua_isuserdata(L,argv[0])==0 || SWIG_ConvertPtr(L,argv[0], (void **) &ptr, SWIGTYPE_p_ofImage_T_float_t, 0)) { _v = 0; } else { _v = 1; } } if (_v) { return _wrap_new_FloatImage__SWIG_4(L);} } if (argc == 1) { int _v; { - void *ptr; - if (lua_isuserdata(L,argv[0])==0 || SWIG_ConvertPtr(L,argv[0], (void **) &ptr, SWIGTYPE_p_ofImage_T_float_t, 0)) { - _v = 0; } else { _v = 1; } } if (_v) { return _wrap_new_FloatImage__SWIG_5(L);} } if (argc == 1) { int _v; { _v = lua_isstring(L,argv[0]); } if (_v) { return _wrap_new_FloatImage__SWIG_3(L);} } SWIG_Lua_pusherrstring(L,"Wrong arguments for overloaded function 'new_FloatImage'\n" " Possible C/C++ prototypes are:\n" " ofImage_< float >::ofImage_()\n" " ofImage_< float >::ofImage_(ofPixels_< float > const &)\n" " ofImage_< float >::ofImage_(ofFile const &)\n" " ofImage_< float >::ofImage_(std::string const &)\n" - " ofImage_< float >::ofImage_(ofImage_< float > const &)\n" " ofImage_< float >::ofImage_(ofImage_< float > &&)\n"); - lua_error(L);return 0; } + " ofImage_< float >::ofImage_(ofImage_< float > &&)\n"); lua_error(L);return 0; } static int _wrap_FloatImage_allocate(lua_State* L) { int SWIG_arg = 0; ofImage_< float > *arg1 = (ofImage_< float > *) 0 ; int arg2 ; int arg3 ; ofImageType arg4 ; SWIG_check_num_args("ofImage_< float >::allocate",4,4) if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("ofImage_< float >::allocate",1,"ofImage_< float > *"); @@ -7628,14 +7619,6 @@ static int _wrap_new_ShortImage__SWIG_3(lua_State* L) { int SWIG_arg = 0; std::s SWIG_NewPointerObj(L,result,SWIGTYPE_p_ofImage_T_unsigned_short_t,1); SWIG_arg++; return SWIG_arg; if(0) SWIG_fail; fail: lua_error(L); return SWIG_arg; } static int _wrap_new_ShortImage__SWIG_4(lua_State* L) { int SWIG_arg = 0; ofImage_< unsigned short > *arg1 = 0 ; - ofImage_< unsigned short > *result = 0 ; SWIG_check_num_args("ofImage_< unsigned short >::ofImage_",1,1) - if(!lua_isuserdata(L,1)) SWIG_fail_arg("ofImage_< unsigned short >::ofImage_",1,"ofImage_< unsigned short > const &"); - if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_ofImage_T_unsigned_short_t,0))){ - SWIG_fail_ptr("new_ShortImage",1,SWIGTYPE_p_ofImage_T_unsigned_short_t); } - result = (ofImage_< unsigned short > *)new ofImage_< unsigned short >((ofImage_< unsigned short > const &)*arg1); - SWIG_NewPointerObj(L,result,SWIGTYPE_p_ofImage_T_unsigned_short_t,1); SWIG_arg++; return SWIG_arg; if(0) SWIG_fail; fail: - lua_error(L); return SWIG_arg; } -static int _wrap_new_ShortImage__SWIG_5(lua_State* L) { int SWIG_arg = 0; ofImage_< unsigned short > *arg1 = 0 ; ofImage_< unsigned short > *result = 0 ; SWIG_check_num_args("ofImage_< unsigned short >::ofImage_",1,1) if(!lua_isuserdata(L,1)) SWIG_fail_arg("ofImage_< unsigned short >::ofImage_",1,"ofImage_< unsigned short > &&"); if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_ofImage_T_unsigned_short_t,0))){ @@ -7652,15 +7635,11 @@ static int _wrap_new_ShortImage(lua_State* L) { int argc; int argv[2]={ 1,2} ; a void *ptr; if (lua_isuserdata(L,argv[0])==0 || SWIG_ConvertPtr(L,argv[0], (void **) &ptr, SWIGTYPE_p_ofImage_T_unsigned_short_t, 0)) { _v = 0; } else { _v = 1; } } if (_v) { return _wrap_new_ShortImage__SWIG_4(L);} } if (argc == 1) { int _v; { - void *ptr; - if (lua_isuserdata(L,argv[0])==0 || SWIG_ConvertPtr(L,argv[0], (void **) &ptr, SWIGTYPE_p_ofImage_T_unsigned_short_t, 0)) { - _v = 0; } else { _v = 1; } } if (_v) { return _wrap_new_ShortImage__SWIG_5(L);} } if (argc == 1) { int _v; { _v = lua_isstring(L,argv[0]); } if (_v) { return _wrap_new_ShortImage__SWIG_3(L);} } SWIG_Lua_pusherrstring(L,"Wrong arguments for overloaded function 'new_ShortImage'\n" " Possible C/C++ prototypes are:\n" " ofImage_< unsigned short >::ofImage_()\n" " ofImage_< unsigned short >::ofImage_(ofPixels_< unsigned short > const &)\n" " ofImage_< unsigned short >::ofImage_(ofFile const &)\n" " ofImage_< unsigned short >::ofImage_(std::string const &)\n" - " ofImage_< unsigned short >::ofImage_(ofImage_< unsigned short > const &)\n" " ofImage_< unsigned short >::ofImage_(ofImage_< unsigned short > &&)\n"); lua_error(L);return 0; } static int _wrap_ShortImage_allocate(lua_State* L) { int SWIG_arg = 0; ofImage_< unsigned short > *arg1 = (ofImage_< unsigned short > *) 0 ; int arg2 ; int arg3 ; ofImageType arg4 ; @@ -8530,11 +8509,6 @@ static int _wrap_new_Node__SWIG_0(lua_State* L) { int SWIG_arg = 0; ofNode *resu SWIG_NewPointerObj(L,result,SWIGTYPE_p_ofNode,1); SWIG_arg++; return SWIG_arg; if(0) SWIG_fail; fail: lua_error(L); return SWIG_arg; } static int _wrap_new_Node__SWIG_1(lua_State* L) { int SWIG_arg = 0; ofNode *arg1 = 0 ; ofNode *result = 0 ; - SWIG_check_num_args("ofNode::ofNode",1,1) if(!lua_isuserdata(L,1)) SWIG_fail_arg("ofNode::ofNode",1,"ofNode const &"); - if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_ofNode,0))){ SWIG_fail_ptr("new_Node",1,SWIGTYPE_p_ofNode); } - result = (ofNode *)new ofNode((ofNode const &)*arg1); SWIG_NewPointerObj(L,result,SWIGTYPE_p_ofNode,1); SWIG_arg++; - return SWIG_arg; if(0) SWIG_fail; fail: lua_error(L); return SWIG_arg; } -static int _wrap_new_Node__SWIG_2(lua_State* L) { int SWIG_arg = 0; ofNode *arg1 = 0 ; ofNode *result = 0 ; SWIG_check_num_args("ofNode::ofNode",1,1) if(!lua_isuserdata(L,1)) SWIG_fail_arg("ofNode::ofNode",1,"ofNode &&"); if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_ofNode,0))){ SWIG_fail_ptr("new_Node",1,SWIGTYPE_p_ofNode); } result = (ofNode *)new ofNode((ofNode &&)*arg1); SWIG_NewPointerObj(L,result,SWIGTYPE_p_ofNode,1); SWIG_arg++; @@ -8542,11 +8516,9 @@ static int _wrap_new_Node__SWIG_2(lua_State* L) { int SWIG_arg = 0; ofNode *arg1 static int _wrap_new_Node(lua_State* L) { int argc; int argv[2]={ 1,2} ; argc = lua_gettop(L); if (argc == 0) { return _wrap_new_Node__SWIG_0(L);} if (argc == 1) { int _v; { void *ptr; if (lua_isuserdata(L,argv[0])==0 || SWIG_ConvertPtr(L,argv[0], (void **) &ptr, SWIGTYPE_p_ofNode, 0)) { _v = 0; } else { - _v = 1; } } if (_v) { return _wrap_new_Node__SWIG_1(L);} } if (argc == 1) { int _v; { void *ptr; - if (lua_isuserdata(L,argv[0])==0 || SWIG_ConvertPtr(L,argv[0], (void **) &ptr, SWIGTYPE_p_ofNode, 0)) { _v = 0; } else { - _v = 1; } } if (_v) { return _wrap_new_Node__SWIG_2(L);} } + _v = 1; } } if (_v) { return _wrap_new_Node__SWIG_1(L);} } SWIG_Lua_pusherrstring(L,"Wrong arguments for overloaded function 'new_Node'\n" " Possible C/C++ prototypes are:\n" - " ofNode::ofNode()\n" " ofNode::ofNode(ofNode const &)\n" " ofNode::ofNode(ofNode &&)\n"); lua_error(L);return 0; } + " ofNode::ofNode()\n" " ofNode::ofNode(ofNode &&)\n"); lua_error(L);return 0; } static int _wrap_Node_setParent__SWIG_0(lua_State* L) { int SWIG_arg = 0; ofNode *arg1 = (ofNode *) 0 ; ofNode *arg2 = 0 ; bool arg3 ; SWIG_check_num_args("ofNode::setParent",3,3) if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("ofNode::setParent",1,"ofNode *"); @@ -14736,12 +14708,6 @@ static int _wrap_new_Shader__SWIG_0(lua_State* L) { int SWIG_arg = 0; ofShader * SWIG_NewPointerObj(L,result,SWIGTYPE_p_ofShader,1); SWIG_arg++; return SWIG_arg; if(0) SWIG_fail; fail: lua_error(L); return SWIG_arg; } static int _wrap_new_Shader__SWIG_1(lua_State* L) { int SWIG_arg = 0; ofShader *arg1 = 0 ; ofShader *result = 0 ; - SWIG_check_num_args("ofShader::ofShader",1,1) - if(!lua_isuserdata(L,1)) SWIG_fail_arg("ofShader::ofShader",1,"ofShader const &"); - if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_ofShader,0))){ SWIG_fail_ptr("new_Shader",1,SWIGTYPE_p_ofShader); } - result = (ofShader *)new ofShader((ofShader const &)*arg1); SWIG_NewPointerObj(L,result,SWIGTYPE_p_ofShader,1); SWIG_arg++; - return SWIG_arg; if(0) SWIG_fail; fail: lua_error(L); return SWIG_arg; } -static int _wrap_new_Shader__SWIG_2(lua_State* L) { int SWIG_arg = 0; ofShader *arg1 = 0 ; ofShader *result = 0 ; SWIG_check_num_args("ofShader::ofShader",1,1) if(!lua_isuserdata(L,1)) SWIG_fail_arg("ofShader::ofShader",1,"ofShader &&"); if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_ofShader,0))){ SWIG_fail_ptr("new_Shader",1,SWIGTYPE_p_ofShader); } result = (ofShader *)new ofShader((ofShader &&)*arg1); SWIG_NewPointerObj(L,result,SWIGTYPE_p_ofShader,1); SWIG_arg++; @@ -14749,12 +14715,9 @@ static int _wrap_new_Shader__SWIG_2(lua_State* L) { int SWIG_arg = 0; ofShader * static int _wrap_new_Shader(lua_State* L) { int argc; int argv[2]={ 1,2} ; argc = lua_gettop(L); if (argc == 0) { return _wrap_new_Shader__SWIG_0(L);} if (argc == 1) { int _v; { void *ptr; if (lua_isuserdata(L,argv[0])==0 || SWIG_ConvertPtr(L,argv[0], (void **) &ptr, SWIGTYPE_p_ofShader, 0)) { _v = 0; } - else { _v = 1; } } if (_v) { return _wrap_new_Shader__SWIG_1(L);} } if (argc == 1) { int _v; { void *ptr; - if (lua_isuserdata(L,argv[0])==0 || SWIG_ConvertPtr(L,argv[0], (void **) &ptr, SWIGTYPE_p_ofShader, 0)) { _v = 0; } - else { _v = 1; } } if (_v) { return _wrap_new_Shader__SWIG_2(L);} } + else { _v = 1; } } if (_v) { return _wrap_new_Shader__SWIG_1(L);} } SWIG_Lua_pusherrstring(L,"Wrong arguments for overloaded function 'new_Shader'\n" " Possible C/C++ prototypes are:\n" - " ofShader::ofShader()\n" " ofShader::ofShader(ofShader const &)\n" " ofShader::ofShader(ofShader &&)\n"); - lua_error(L);return 0; } + " ofShader::ofShader()\n" " ofShader::ofShader(ofShader &&)\n"); lua_error(L);return 0; } static int _wrap_Shader_load__SWIG_0(lua_State* L) { int SWIG_arg = 0; ofShader *arg1 = (ofShader *) 0 ; std::string arg2 ; bool result; SWIG_check_num_args("ofShader::load",2,2) if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("ofShader::load",1,"ofShader *"); @@ -17294,14 +17257,6 @@ static int _wrap_new_Pixels__SWIG_0(lua_State* L) { int SWIG_arg = 0; ofPixels_< SWIG_NewPointerObj(L,result,SWIGTYPE_p_ofPixels_T_unsigned_char_t,1); SWIG_arg++; return SWIG_arg; if(0) SWIG_fail; fail: lua_error(L); return SWIG_arg; } static int _wrap_new_Pixels__SWIG_1(lua_State* L) { int SWIG_arg = 0; ofPixels_< unsigned char > *arg1 = 0 ; - ofPixels_< unsigned char > *result = 0 ; SWIG_check_num_args("ofPixels_< unsigned char >::ofPixels_",1,1) - if(!lua_isuserdata(L,1)) SWIG_fail_arg("ofPixels_< unsigned char >::ofPixels_",1,"ofPixels_< unsigned char > const &"); - if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_ofPixels_T_unsigned_char_t,0))){ - SWIG_fail_ptr("new_Pixels",1,SWIGTYPE_p_ofPixels_T_unsigned_char_t); } - result = (ofPixels_< unsigned char > *)new ofPixels_< unsigned char >((ofPixels_< unsigned char > const &)*arg1); - SWIG_NewPointerObj(L,result,SWIGTYPE_p_ofPixels_T_unsigned_char_t,1); SWIG_arg++; return SWIG_arg; if(0) SWIG_fail; fail: - lua_error(L); return SWIG_arg; } -static int _wrap_new_Pixels__SWIG_2(lua_State* L) { int SWIG_arg = 0; ofPixels_< unsigned char > *arg1 = 0 ; ofPixels_< unsigned char > *result = 0 ; SWIG_check_num_args("ofPixels_< unsigned char >::ofPixels_",1,1) if(!lua_isuserdata(L,1)) SWIG_fail_arg("ofPixels_< unsigned char >::ofPixels_",1,"ofPixels_< unsigned char > &&"); if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_ofPixels_T_unsigned_char_t,0))){ @@ -17312,13 +17267,10 @@ static int _wrap_new_Pixels__SWIG_2(lua_State* L) { int SWIG_arg = 0; ofPixels_< static int _wrap_new_Pixels(lua_State* L) { int argc; int argv[2]={ 1,2} ; argc = lua_gettop(L); if (argc == 0) { return _wrap_new_Pixels__SWIG_0(L);} if (argc == 1) { int _v; { void *ptr; if (lua_isuserdata(L,argv[0])==0 || SWIG_ConvertPtr(L,argv[0], (void **) &ptr, SWIGTYPE_p_ofPixels_T_unsigned_char_t, 0)) { - _v = 0; } else { _v = 1; } } if (_v) { return _wrap_new_Pixels__SWIG_1(L);} } if (argc == 1) { int _v; { void *ptr; - if (lua_isuserdata(L,argv[0])==0 || SWIG_ConvertPtr(L,argv[0], (void **) &ptr, SWIGTYPE_p_ofPixels_T_unsigned_char_t, 0)) { - _v = 0; } else { _v = 1; } } if (_v) { return _wrap_new_Pixels__SWIG_2(L);} } + _v = 0; } else { _v = 1; } } if (_v) { return _wrap_new_Pixels__SWIG_1(L);} } SWIG_Lua_pusherrstring(L,"Wrong arguments for overloaded function 'new_Pixels'\n" " Possible C/C++ prototypes are:\n" - " ofPixels_< unsigned char >::ofPixels_()\n" - " ofPixels_< unsigned char >::ofPixels_(ofPixels_< unsigned char > const &)\n" - " ofPixels_< unsigned char >::ofPixels_(ofPixels_< unsigned char > &&)\n"); lua_error(L);return 0; } + " ofPixels_< unsigned char >::ofPixels_()\n" " ofPixels_< unsigned char >::ofPixels_(ofPixels_< unsigned char > &&)\n"); + lua_error(L);return 0; } static int _wrap_Pixels_allocate(lua_State* L) { int SWIG_arg = 0; ofPixels_< unsigned char > *arg1 = (ofPixels_< unsigned char > *) 0 ; int arg2 ; int arg3 ; int arg4 ; SWIG_check_num_args("ofPixels_< unsigned char >::allocate",4,4) @@ -18062,14 +18014,6 @@ static int _wrap_new_FloatPixels__SWIG_0(lua_State* L) { int SWIG_arg = 0; ofPix SWIG_NewPointerObj(L,result,SWIGTYPE_p_ofPixels_T_float_t,1); SWIG_arg++; return SWIG_arg; if(0) SWIG_fail; fail: lua_error(L); return SWIG_arg; } static int _wrap_new_FloatPixels__SWIG_1(lua_State* L) { int SWIG_arg = 0; ofPixels_< float > *arg1 = 0 ; - ofPixels_< float > *result = 0 ; SWIG_check_num_args("ofPixels_< float >::ofPixels_",1,1) - if(!lua_isuserdata(L,1)) SWIG_fail_arg("ofPixels_< float >::ofPixels_",1,"ofPixels_< float > const &"); - if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_ofPixels_T_float_t,0))){ - SWIG_fail_ptr("new_FloatPixels",1,SWIGTYPE_p_ofPixels_T_float_t); } - result = (ofPixels_< float > *)new ofPixels_< float >((ofPixels_< float > const &)*arg1); - SWIG_NewPointerObj(L,result,SWIGTYPE_p_ofPixels_T_float_t,1); SWIG_arg++; return SWIG_arg; if(0) SWIG_fail; fail: - lua_error(L); return SWIG_arg; } -static int _wrap_new_FloatPixels__SWIG_2(lua_State* L) { int SWIG_arg = 0; ofPixels_< float > *arg1 = 0 ; ofPixels_< float > *result = 0 ; SWIG_check_num_args("ofPixels_< float >::ofPixels_",1,1) if(!lua_isuserdata(L,1)) SWIG_fail_arg("ofPixels_< float >::ofPixels_",1,"ofPixels_< float > &&"); if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_ofPixels_T_float_t,0))){ @@ -18080,13 +18024,9 @@ static int _wrap_new_FloatPixels__SWIG_2(lua_State* L) { int SWIG_arg = 0; ofPix static int _wrap_new_FloatPixels(lua_State* L) { int argc; int argv[2]={ 1,2} ; argc = lua_gettop(L); if (argc == 0) { return _wrap_new_FloatPixels__SWIG_0(L);} if (argc == 1) { int _v; { void *ptr; if (lua_isuserdata(L,argv[0])==0 || SWIG_ConvertPtr(L,argv[0], (void **) &ptr, SWIGTYPE_p_ofPixels_T_float_t, 0)) { - _v = 0; } else { _v = 1; } } if (_v) { return _wrap_new_FloatPixels__SWIG_1(L);} } if (argc == 1) { int _v; { - void *ptr; - if (lua_isuserdata(L,argv[0])==0 || SWIG_ConvertPtr(L,argv[0], (void **) &ptr, SWIGTYPE_p_ofPixels_T_float_t, 0)) { - _v = 0; } else { _v = 1; } } if (_v) { return _wrap_new_FloatPixels__SWIG_2(L);} } + _v = 0; } else { _v = 1; } } if (_v) { return _wrap_new_FloatPixels__SWIG_1(L);} } SWIG_Lua_pusherrstring(L,"Wrong arguments for overloaded function 'new_FloatPixels'\n" " Possible C/C++ prototypes are:\n" - " ofPixels_< float >::ofPixels_()\n" " ofPixels_< float >::ofPixels_(ofPixels_< float > const &)\n" - " ofPixels_< float >::ofPixels_(ofPixels_< float > &&)\n"); lua_error(L);return 0; } + " ofPixels_< float >::ofPixels_()\n" " ofPixels_< float >::ofPixels_(ofPixels_< float > &&)\n"); lua_error(L);return 0; } static int _wrap_FloatPixels_allocate(lua_State* L) { int SWIG_arg = 0; ofPixels_< float > *arg1 = (ofPixels_< float > *) 0 ; int arg2 ; int arg3 ; int arg4 ; SWIG_check_num_args("ofPixels_< float >::allocate",4,4) if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("ofPixels_< float >::allocate",1,"ofPixels_< float > *"); @@ -18802,14 +18742,6 @@ static int _wrap_new_ShortPixels__SWIG_0(lua_State* L) { int SWIG_arg = 0; ofPix SWIG_NewPointerObj(L,result,SWIGTYPE_p_ofPixels_T_unsigned_short_t,1); SWIG_arg++; return SWIG_arg; if(0) SWIG_fail; fail: lua_error(L); return SWIG_arg; } static int _wrap_new_ShortPixels__SWIG_1(lua_State* L) { int SWIG_arg = 0; ofPixels_< unsigned short > *arg1 = 0 ; - ofPixels_< unsigned short > *result = 0 ; SWIG_check_num_args("ofPixels_< unsigned short >::ofPixels_",1,1) - if(!lua_isuserdata(L,1)) SWIG_fail_arg("ofPixels_< unsigned short >::ofPixels_",1,"ofPixels_< unsigned short > const &"); - if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_ofPixels_T_unsigned_short_t,0))){ - SWIG_fail_ptr("new_ShortPixels",1,SWIGTYPE_p_ofPixels_T_unsigned_short_t); } - result = (ofPixels_< unsigned short > *)new ofPixels_< unsigned short >((ofPixels_< unsigned short > const &)*arg1); - SWIG_NewPointerObj(L,result,SWIGTYPE_p_ofPixels_T_unsigned_short_t,1); SWIG_arg++; return SWIG_arg; if(0) SWIG_fail; fail: - lua_error(L); return SWIG_arg; } -static int _wrap_new_ShortPixels__SWIG_2(lua_State* L) { int SWIG_arg = 0; ofPixels_< unsigned short > *arg1 = 0 ; ofPixels_< unsigned short > *result = 0 ; SWIG_check_num_args("ofPixels_< unsigned short >::ofPixels_",1,1) if(!lua_isuserdata(L,1)) SWIG_fail_arg("ofPixels_< unsigned short >::ofPixels_",1,"ofPixels_< unsigned short > &&"); if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_ofPixels_T_unsigned_short_t,0))){ @@ -18820,13 +18752,9 @@ static int _wrap_new_ShortPixels__SWIG_2(lua_State* L) { int SWIG_arg = 0; ofPix static int _wrap_new_ShortPixels(lua_State* L) { int argc; int argv[2]={ 1,2} ; argc = lua_gettop(L); if (argc == 0) { return _wrap_new_ShortPixels__SWIG_0(L);} if (argc == 1) { int _v; { void *ptr; if (lua_isuserdata(L,argv[0])==0 || SWIG_ConvertPtr(L,argv[0], (void **) &ptr, SWIGTYPE_p_ofPixels_T_unsigned_short_t, 0)) { - _v = 0; } else { _v = 1; } } if (_v) { return _wrap_new_ShortPixels__SWIG_1(L);} } if (argc == 1) { int _v; { - void *ptr; - if (lua_isuserdata(L,argv[0])==0 || SWIG_ConvertPtr(L,argv[0], (void **) &ptr, SWIGTYPE_p_ofPixels_T_unsigned_short_t, 0)) { - _v = 0; } else { _v = 1; } } if (_v) { return _wrap_new_ShortPixels__SWIG_2(L);} } + _v = 0; } else { _v = 1; } } if (_v) { return _wrap_new_ShortPixels__SWIG_1(L);} } SWIG_Lua_pusherrstring(L,"Wrong arguments for overloaded function 'new_ShortPixels'\n" " Possible C/C++ prototypes are:\n" " ofPixels_< unsigned short >::ofPixels_()\n" - " ofPixels_< unsigned short >::ofPixels_(ofPixels_< unsigned short > const &)\n" " ofPixels_< unsigned short >::ofPixels_(ofPixels_< unsigned short > &&)\n"); lua_error(L);return 0; } static int _wrap_ShortPixels_allocate(lua_State* L) { int SWIG_arg = 0; ofPixels_< unsigned short > *arg1 = (ofPixels_< unsigned short > *) 0 ; int arg2 ; int arg3 ; int arg4 ; @@ -24497,14 +24425,6 @@ static int _wrap_new_TrueTypeFont__SWIG_0(lua_State* L) { int SWIG_arg = 0; ofTr SWIG_NewPointerObj(L,result,SWIGTYPE_p_ofTrueTypeFont,1); SWIG_arg++; return SWIG_arg; if(0) SWIG_fail; fail: lua_error(L); return SWIG_arg; } static int _wrap_new_TrueTypeFont__SWIG_1(lua_State* L) { int SWIG_arg = 0; ofTrueTypeFont *arg1 = 0 ; - ofTrueTypeFont *result = 0 ; SWIG_check_num_args("ofTrueTypeFont::ofTrueTypeFont",1,1) - if(!lua_isuserdata(L,1)) SWIG_fail_arg("ofTrueTypeFont::ofTrueTypeFont",1,"ofTrueTypeFont const &"); - if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_ofTrueTypeFont,0))){ - SWIG_fail_ptr("new_TrueTypeFont",1,SWIGTYPE_p_ofTrueTypeFont); } - result = (ofTrueTypeFont *)new ofTrueTypeFont((ofTrueTypeFont const &)*arg1); - SWIG_NewPointerObj(L,result,SWIGTYPE_p_ofTrueTypeFont,1); SWIG_arg++; return SWIG_arg; if(0) SWIG_fail; fail: lua_error(L); - return SWIG_arg; } -static int _wrap_new_TrueTypeFont__SWIG_2(lua_State* L) { int SWIG_arg = 0; ofTrueTypeFont *arg1 = 0 ; ofTrueTypeFont *result = 0 ; SWIG_check_num_args("ofTrueTypeFont::ofTrueTypeFont",1,1) if(!lua_isuserdata(L,1)) SWIG_fail_arg("ofTrueTypeFont::ofTrueTypeFont",1,"ofTrueTypeFont &&"); if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_ofTrueTypeFont,0))){ @@ -24515,12 +24435,9 @@ static int _wrap_new_TrueTypeFont__SWIG_2(lua_State* L) { int SWIG_arg = 0; ofTr static int _wrap_new_TrueTypeFont(lua_State* L) { int argc; int argv[2]={ 1,2} ; argc = lua_gettop(L); if (argc == 0) { return _wrap_new_TrueTypeFont__SWIG_0(L);} if (argc == 1) { int _v; { void *ptr; if (lua_isuserdata(L,argv[0])==0 || SWIG_ConvertPtr(L,argv[0], (void **) &ptr, SWIGTYPE_p_ofTrueTypeFont, 0)) { _v = 0; } - else { _v = 1; } } if (_v) { return _wrap_new_TrueTypeFont__SWIG_1(L);} } if (argc == 1) { int _v; { void *ptr; - if (lua_isuserdata(L,argv[0])==0 || SWIG_ConvertPtr(L,argv[0], (void **) &ptr, SWIGTYPE_p_ofTrueTypeFont, 0)) { _v = 0; } - else { _v = 1; } } if (_v) { return _wrap_new_TrueTypeFont__SWIG_2(L);} } + else { _v = 1; } } if (_v) { return _wrap_new_TrueTypeFont__SWIG_1(L);} } SWIG_Lua_pusherrstring(L,"Wrong arguments for overloaded function 'new_TrueTypeFont'\n" " Possible C/C++ prototypes are:\n" - " ofTrueTypeFont::ofTrueTypeFont()\n" " ofTrueTypeFont::ofTrueTypeFont(ofTrueTypeFont const &)\n" - " ofTrueTypeFont::ofTrueTypeFont(ofTrueTypeFont &&)\n"); lua_error(L);return 0; } + " ofTrueTypeFont::ofTrueTypeFont()\n" " ofTrueTypeFont::ofTrueTypeFont(ofTrueTypeFont &&)\n"); lua_error(L);return 0; } static int _wrap_TrueTypeFont_load__SWIG_0(lua_State* L) { int SWIG_arg = 0; ofTrueTypeFont *arg1 = (ofTrueTypeFont *) 0 ; std::string *arg2 = 0 ; int arg3 ; bool arg4 ; bool arg5 ; bool arg6 ; float arg7 ; int arg8 ; std::string temp2 ; bool result; SWIG_check_num_args("ofTrueTypeFont::load",8,8) @@ -41871,7 +41788,7 @@ static swig_lua_attribute swig_SwigModule_attributes[] = { static swig_lua_const_info swig_SwigModule_constants[]= { {SWIG_LUA_CONSTTAB_INT("VERSION_MAJOR", 0)}, {SWIG_LUA_CONSTTAB_INT("VERSION_MINOR", 9)}, - {SWIG_LUA_CONSTTAB_INT("VERSION_PATCH", 2)}, + {SWIG_LUA_CONSTTAB_INT("VERSION_PATCH", 3)}, {SWIG_LUA_CONSTTAB_STRING("VERSION_PRE_RELEASE", "stable")}, {SWIG_LUA_CONSTTAB_INT("LOOP_NONE", OF_LOOP_NONE)}, {SWIG_LUA_CONSTTAB_INT("LOOP_PALINDROME", OF_LOOP_PALINDROME)}, @@ -42086,6 +42003,12 @@ static swig_lua_const_info swig_SwigModule_constants[]= { {SWIG_LUA_CONSTTAB_INT("IMAGE_FORMAT_PFM", OF_IMAGE_FORMAT_PFM)}, {SWIG_LUA_CONSTTAB_INT("IMAGE_FORMAT_PICT", OF_IMAGE_FORMAT_PICT)}, {SWIG_LUA_CONSTTAB_INT("IMAGE_FORMAT_RAW", OF_IMAGE_FORMAT_RAW)}, + {SWIG_LUA_CONSTTAB_INT("TEXTURE_LUMINANCE", 6409)}, + {SWIG_LUA_CONSTTAB_INT("TEXTURE_RGB", 6407)}, + {SWIG_LUA_CONSTTAB_INT("TEXTURE_RGBA", 6408)}, + {SWIG_LUA_CONSTTAB_INT("CLAMP_TO_EDGE", 33071)}, + {SWIG_LUA_CONSTTAB_INT("REPEAT", 10497)}, + {SWIG_LUA_CONSTTAB_INT("MIRRORED_REPEAT", 33648)}, {SWIG_LUA_CONSTTAB_INT("BoxPrimitive_SIDE_FRONT", ofBoxPrimitive::SIDE_FRONT)}, {SWIG_LUA_CONSTTAB_INT("BoxPrimitive_SIDE_RIGHT", ofBoxPrimitive::SIDE_RIGHT)}, {SWIG_LUA_CONSTTAB_INT("BoxPrimitive_SIDE_LEFT", ofBoxPrimitive::SIDE_LEFT)}, diff --git a/src/bindings/linuxarm/ofxLuaBindings.cpp b/src/bindings/linuxarm/ofxLuaBindings.cpp index 291195d..858915a 100644 --- a/src/bindings/linuxarm/ofxLuaBindings.cpp +++ b/src/bindings/linuxarm/ofxLuaBindings.cpp @@ -1,6 +1,6 @@ /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). - * Version 3.0.8 + * Version 3.0.10 * * This file is not intended to be easily readable and contains a number of * coding conventions designed to improve portability and efficiency. Do not make @@ -107,9 +107,11 @@ template T SwigValueInit() { #endif /* exporting methods */ -#if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) -# ifndef GCC_HASCLASSVISIBILITY -# define GCC_HASCLASSVISIBILITY +#if defined(__GNUC__) +# if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) +# ifndef GCC_HASCLASSVISIBILITY +# define GCC_HASCLASSVISIBILITY +# endif # endif #endif @@ -659,16 +661,16 @@ SWIG_UnpackData(const char *c, void *ptr, size_t sz) { char d = *(c++); unsigned char uu; if ((d >= '0') && (d <= '9')) - uu = ((d - '0') << 4); + uu = (unsigned char)((d - '0') << 4); else if ((d >= 'a') && (d <= 'f')) - uu = ((d - ('a'-10)) << 4); + uu = (unsigned char)((d - ('a'-10)) << 4); else return (char *) 0; d = *(c++); if ((d >= '0') && (d <= '9')) - uu |= (d - '0'); + uu |= (unsigned char)(d - '0'); else if ((d >= 'a') && (d <= 'f')) - uu |= (d - ('a'-10)); + uu |= (unsigned char)(d - ('a'-10)); else return (char *) 0; *u = uu; @@ -1543,6 +1545,44 @@ SWIGINTERN int SWIG_Lua_iterate_bases(lua_State *L, swig_type_info * SWIGUNUSED return result; } +/* The class.get method helper, performs the lookup of class attributes. + * It returns an error code. Number of function return values is passed inside 'ret'. + * first_arg is not used in this function because function always has 2 arguments. + */ +SWIGINTERN int SWIG_Lua_class_do_get_item(lua_State *L, swig_type_info *type, int SWIGUNUSED first_arg, int *ret) +{ +/* there should be 2 params passed in + (1) userdata (not the meta table) + (2) string name of the attribute +*/ + int bases_search_result; + int substack_start = lua_gettop(L)-2; + assert(first_arg == substack_start+1); + lua_checkstack(L,5); + assert(lua_isuserdata(L,-2)); /* just in case */ + lua_getmetatable(L,-2); /* get the meta table */ + assert(lua_istable(L,-1)); /* just in case */ + /* NEW: looks for the __getitem() fn + this is a user provided get fn */ + SWIG_Lua_get_table(L,"__getitem"); /* find the __getitem fn */ + if (lua_iscfunction(L,-1)) /* if its there */ + { /* found it so call the fn & return its value */ + lua_pushvalue(L,substack_start+1); /* the userdata */ + lua_pushvalue(L,substack_start+2); /* the parameter */ + lua_call(L,2,1); /* 2 value in (userdata),1 out (result) */ + lua_remove(L,-2); /* stack tidy, remove metatable */ + if(ret) *ret = 1; + return SWIG_OK; + } + lua_pop(L,1); + /* Remove the metatable */ + lua_pop(L,1); + /* Search in base classes */ + bases_search_result = SWIG_Lua_iterate_bases(L,type,substack_start+1,SWIG_Lua_class_do_get_item,ret); + return bases_search_result; /* sorry not known */ +} + + /* The class.get method helper, performs the lookup of class attributes. * It returns an error code. Number of function return values is passed inside 'ret'. * first_arg is not used in this function because function always has 2 arguments. @@ -1590,19 +1630,6 @@ SWIGINTERN int SWIG_Lua_class_do_get(lua_State *L, swig_type_info *type, int SW return SWIG_OK; } lua_pop(L,1); /* remove whatever was there */ - /* NEW: looks for the __getitem() fn - this is a user provided get fn */ - SWIG_Lua_get_table(L,"__getitem"); /* find the __getitem fn */ - if (lua_iscfunction(L,-1)) /* if its there */ - { /* found it so call the fn & return its value */ - lua_pushvalue(L,substack_start+1); /* the userdata */ - lua_pushvalue(L,substack_start+2); /* the parameter */ - lua_call(L,2,1); /* 2 value in (userdata),1 out (result) */ - lua_remove(L,-2); /* stack tidy, remove metatable */ - if(ret) *ret = 1; - return SWIG_OK; - } - lua_pop(L,1); /* Remove the metatable */ lua_pop(L,1); /* Search in base classes */ @@ -1629,6 +1656,10 @@ SWIGINTERN int SWIG_Lua_class_get(lua_State *L) if(result == SWIG_OK) return ret; + result = SWIG_Lua_class_do_get_item(L,type,1,&ret); + if(result == SWIG_OK) + return ret; + return 0; } @@ -3838,11 +3869,6 @@ static int _wrap_new_Fbo__SWIG_0(lua_State* L) { int SWIG_arg = 0; ofFbo *result result = (ofFbo *)new ofFbo(); SWIG_NewPointerObj(L,result,SWIGTYPE_p_ofFbo,1); SWIG_arg++; return SWIG_arg; if(0) SWIG_fail; fail: lua_error(L); return SWIG_arg; } static int _wrap_new_Fbo__SWIG_1(lua_State* L) { int SWIG_arg = 0; ofFbo *arg1 = 0 ; ofFbo *result = 0 ; - SWIG_check_num_args("ofFbo::ofFbo",1,1) if(!lua_isuserdata(L,1)) SWIG_fail_arg("ofFbo::ofFbo",1,"ofFbo const &"); - if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_ofFbo,0))){ SWIG_fail_ptr("new_Fbo",1,SWIGTYPE_p_ofFbo); } - result = (ofFbo *)new ofFbo((ofFbo const &)*arg1); SWIG_NewPointerObj(L,result,SWIGTYPE_p_ofFbo,1); SWIG_arg++; - return SWIG_arg; if(0) SWIG_fail; fail: lua_error(L); return SWIG_arg; } -static int _wrap_new_Fbo__SWIG_2(lua_State* L) { int SWIG_arg = 0; ofFbo *arg1 = 0 ; ofFbo *result = 0 ; SWIG_check_num_args("ofFbo::ofFbo",1,1) if(!lua_isuserdata(L,1)) SWIG_fail_arg("ofFbo::ofFbo",1,"ofFbo &&"); if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_ofFbo,0))){ SWIG_fail_ptr("new_Fbo",1,SWIGTYPE_p_ofFbo); } result = (ofFbo *)new ofFbo((ofFbo &&)*arg1); SWIG_NewPointerObj(L,result,SWIGTYPE_p_ofFbo,1); SWIG_arg++; return SWIG_arg; @@ -3850,11 +3876,9 @@ static int _wrap_new_Fbo__SWIG_2(lua_State* L) { int SWIG_arg = 0; ofFbo *arg1 = static int _wrap_new_Fbo(lua_State* L) { int argc; int argv[2]={ 1,2} ; argc = lua_gettop(L); if (argc == 0) { return _wrap_new_Fbo__SWIG_0(L);} if (argc == 1) { int _v; { void *ptr; if (lua_isuserdata(L,argv[0])==0 || SWIG_ConvertPtr(L,argv[0], (void **) &ptr, SWIGTYPE_p_ofFbo, 0)) { _v = 0; } else { - _v = 1; } } if (_v) { return _wrap_new_Fbo__SWIG_1(L);} } if (argc == 1) { int _v; { void *ptr; - if (lua_isuserdata(L,argv[0])==0 || SWIG_ConvertPtr(L,argv[0], (void **) &ptr, SWIGTYPE_p_ofFbo, 0)) { _v = 0; } else { - _v = 1; } } if (_v) { return _wrap_new_Fbo__SWIG_2(L);} } + _v = 1; } } if (_v) { return _wrap_new_Fbo__SWIG_1(L);} } SWIG_Lua_pusherrstring(L,"Wrong arguments for overloaded function 'new_Fbo'\n" " Possible C/C++ prototypes are:\n" - " ofFbo::ofFbo()\n" " ofFbo::ofFbo(ofFbo const &)\n" " ofFbo::ofFbo(ofFbo &&)\n"); lua_error(L);return 0; } + " ofFbo::ofFbo()\n" " ofFbo::ofFbo(ofFbo &&)\n"); lua_error(L);return 0; } static int _wrap_Fbo_allocate__SWIG_0(lua_State* L) { int SWIG_arg = 0; ofFbo *arg1 = (ofFbo *) 0 ; int arg2 ; int arg3 ; int arg4 ; int arg5 ; SWIG_check_num_args("ofFbo::allocate",5,5) if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("ofFbo::allocate",1,"ofFbo *"); @@ -4787,13 +4811,6 @@ static int _wrap_new_Texture__SWIG_0(lua_State* L) { int SWIG_arg = 0; ofTexture SWIG_NewPointerObj(L,result,SWIGTYPE_p_ofTexture,1); SWIG_arg++; return SWIG_arg; if(0) SWIG_fail; fail: lua_error(L); return SWIG_arg; } static int _wrap_new_Texture__SWIG_1(lua_State* L) { int SWIG_arg = 0; ofTexture *arg1 = 0 ; ofTexture *result = 0 ; - SWIG_check_num_args("ofTexture::ofTexture",1,1) - if(!lua_isuserdata(L,1)) SWIG_fail_arg("ofTexture::ofTexture",1,"ofTexture const &"); - if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_ofTexture,0))){ - SWIG_fail_ptr("new_Texture",1,SWIGTYPE_p_ofTexture); } result = (ofTexture *)new ofTexture((ofTexture const &)*arg1); - SWIG_NewPointerObj(L,result,SWIGTYPE_p_ofTexture,1); SWIG_arg++; return SWIG_arg; if(0) SWIG_fail; fail: lua_error(L); - return SWIG_arg; } -static int _wrap_new_Texture__SWIG_2(lua_State* L) { int SWIG_arg = 0; ofTexture *arg1 = 0 ; ofTexture *result = 0 ; SWIG_check_num_args("ofTexture::ofTexture",1,1) if(!lua_isuserdata(L,1)) SWIG_fail_arg("ofTexture::ofTexture",1,"ofTexture &&"); if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_ofTexture,0))){ @@ -4803,12 +4820,9 @@ static int _wrap_new_Texture__SWIG_2(lua_State* L) { int SWIG_arg = 0; ofTexture static int _wrap_new_Texture(lua_State* L) { int argc; int argv[2]={ 1,2} ; argc = lua_gettop(L); if (argc == 0) { return _wrap_new_Texture__SWIG_0(L);} if (argc == 1) { int _v; { void *ptr; if (lua_isuserdata(L,argv[0])==0 || SWIG_ConvertPtr(L,argv[0], (void **) &ptr, SWIGTYPE_p_ofTexture, 0)) { _v = 0; } - else { _v = 1; } } if (_v) { return _wrap_new_Texture__SWIG_1(L);} } if (argc == 1) { int _v; { void *ptr; - if (lua_isuserdata(L,argv[0])==0 || SWIG_ConvertPtr(L,argv[0], (void **) &ptr, SWIGTYPE_p_ofTexture, 0)) { _v = 0; } - else { _v = 1; } } if (_v) { return _wrap_new_Texture__SWIG_2(L);} } + else { _v = 1; } } if (_v) { return _wrap_new_Texture__SWIG_1(L);} } SWIG_Lua_pusherrstring(L,"Wrong arguments for overloaded function 'new_Texture'\n" " Possible C/C++ prototypes are:\n" - " ofTexture::ofTexture()\n" " ofTexture::ofTexture(ofTexture const &)\n" " ofTexture::ofTexture(ofTexture &&)\n"); - lua_error(L);return 0; } + " ofTexture::ofTexture()\n" " ofTexture::ofTexture(ofTexture &&)\n"); lua_error(L);return 0; } static int _wrap_Texture_allocate__SWIG_0(lua_State* L) { int SWIG_arg = 0; ofTexture *arg1 = (ofTexture *) 0 ; ofTextureData *arg2 = 0 ; SWIG_check_num_args("ofTexture::allocate",2,2) if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("ofTexture::allocate",1,"ofTexture *"); @@ -5856,14 +5870,6 @@ static int _wrap_new_Image__SWIG_3(lua_State* L) { int SWIG_arg = 0; std::string SWIG_NewPointerObj(L,result,SWIGTYPE_p_ofImage_T_unsigned_char_t,1); SWIG_arg++; return SWIG_arg; if(0) SWIG_fail; fail: lua_error(L); return SWIG_arg; } static int _wrap_new_Image__SWIG_4(lua_State* L) { int SWIG_arg = 0; ofImage_< unsigned char > *arg1 = 0 ; - ofImage_< unsigned char > *result = 0 ; SWIG_check_num_args("ofImage_< unsigned char >::ofImage_",1,1) - if(!lua_isuserdata(L,1)) SWIG_fail_arg("ofImage_< unsigned char >::ofImage_",1,"ofImage_< unsigned char > const &"); - if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_ofImage_T_unsigned_char_t,0))){ - SWIG_fail_ptr("new_Image",1,SWIGTYPE_p_ofImage_T_unsigned_char_t); } - result = (ofImage_< unsigned char > *)new ofImage_< unsigned char >((ofImage_< unsigned char > const &)*arg1); - SWIG_NewPointerObj(L,result,SWIGTYPE_p_ofImage_T_unsigned_char_t,1); SWIG_arg++; return SWIG_arg; if(0) SWIG_fail; fail: - lua_error(L); return SWIG_arg; } -static int _wrap_new_Image__SWIG_5(lua_State* L) { int SWIG_arg = 0; ofImage_< unsigned char > *arg1 = 0 ; ofImage_< unsigned char > *result = 0 ; SWIG_check_num_args("ofImage_< unsigned char >::ofImage_",1,1) if(!lua_isuserdata(L,1)) SWIG_fail_arg("ofImage_< unsigned char >::ofImage_",1,"ofImage_< unsigned char > &&"); if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_ofImage_T_unsigned_char_t,0))){ @@ -5878,14 +5884,11 @@ static int _wrap_new_Image(lua_State* L) { int argc; int argv[2]={ 1,2} ; argc = if (lua_isuserdata(L,argv[0])==0 || SWIG_ConvertPtr(L,argv[0], (void **) &ptr, SWIGTYPE_p_ofFile, 0)) { _v = 0; } else { _v = 1; } } if (_v) { return _wrap_new_Image__SWIG_2(L);} } if (argc == 1) { int _v; { void *ptr; if (lua_isuserdata(L,argv[0])==0 || SWIG_ConvertPtr(L,argv[0], (void **) &ptr, SWIGTYPE_p_ofImage_T_unsigned_char_t, 0)) { - _v = 0; } else { _v = 1; } } if (_v) { return _wrap_new_Image__SWIG_4(L);} } if (argc == 1) { int _v; { void *ptr; - if (lua_isuserdata(L,argv[0])==0 || SWIG_ConvertPtr(L,argv[0], (void **) &ptr, SWIGTYPE_p_ofImage_T_unsigned_char_t, 0)) { - _v = 0; } else { _v = 1; } } if (_v) { return _wrap_new_Image__SWIG_5(L);} } if (argc == 1) { int _v; { + _v = 0; } else { _v = 1; } } if (_v) { return _wrap_new_Image__SWIG_4(L);} } if (argc == 1) { int _v; { _v = lua_isstring(L,argv[0]); } if (_v) { return _wrap_new_Image__SWIG_3(L);} } SWIG_Lua_pusherrstring(L,"Wrong arguments for overloaded function 'new_Image'\n" " Possible C/C++ prototypes are:\n" " ofImage_< unsigned char >::ofImage_()\n" " ofImage_< unsigned char >::ofImage_(ofPixels_< unsigned char > const &)\n" " ofImage_< unsigned char >::ofImage_(ofFile const &)\n" " ofImage_< unsigned char >::ofImage_(std::string const &)\n" - " ofImage_< unsigned char >::ofImage_(ofImage_< unsigned char > const &)\n" " ofImage_< unsigned char >::ofImage_(ofImage_< unsigned char > &&)\n"); lua_error(L);return 0; } static int _wrap_Image_allocate(lua_State* L) { int SWIG_arg = 0; ofImage_< unsigned char > *arg1 = (ofImage_< unsigned char > *) 0 ; int arg2 ; int arg3 ; ofImageType arg4 ; @@ -6764,14 +6767,6 @@ static int _wrap_new_FloatImage__SWIG_3(lua_State* L) { int SWIG_arg = 0; std::s SWIG_NewPointerObj(L,result,SWIGTYPE_p_ofImage_T_float_t,1); SWIG_arg++; return SWIG_arg; if(0) SWIG_fail; fail: lua_error(L); return SWIG_arg; } static int _wrap_new_FloatImage__SWIG_4(lua_State* L) { int SWIG_arg = 0; ofImage_< float > *arg1 = 0 ; - ofImage_< float > *result = 0 ; SWIG_check_num_args("ofImage_< float >::ofImage_",1,1) - if(!lua_isuserdata(L,1)) SWIG_fail_arg("ofImage_< float >::ofImage_",1,"ofImage_< float > const &"); - if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_ofImage_T_float_t,0))){ - SWIG_fail_ptr("new_FloatImage",1,SWIGTYPE_p_ofImage_T_float_t); } - result = (ofImage_< float > *)new ofImage_< float >((ofImage_< float > const &)*arg1); - SWIG_NewPointerObj(L,result,SWIGTYPE_p_ofImage_T_float_t,1); SWIG_arg++; return SWIG_arg; if(0) SWIG_fail; fail: - lua_error(L); return SWIG_arg; } -static int _wrap_new_FloatImage__SWIG_5(lua_State* L) { int SWIG_arg = 0; ofImage_< float > *arg1 = 0 ; ofImage_< float > *result = 0 ; SWIG_check_num_args("ofImage_< float >::ofImage_",1,1) if(!lua_isuserdata(L,1)) SWIG_fail_arg("ofImage_< float >::ofImage_",1,"ofImage_< float > &&"); if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_ofImage_T_float_t,0))){ @@ -6788,15 +6783,11 @@ static int _wrap_new_FloatImage(lua_State* L) { int argc; int argv[2]={ 1,2} ; a void *ptr; if (lua_isuserdata(L,argv[0])==0 || SWIG_ConvertPtr(L,argv[0], (void **) &ptr, SWIGTYPE_p_ofImage_T_float_t, 0)) { _v = 0; } else { _v = 1; } } if (_v) { return _wrap_new_FloatImage__SWIG_4(L);} } if (argc == 1) { int _v; { - void *ptr; - if (lua_isuserdata(L,argv[0])==0 || SWIG_ConvertPtr(L,argv[0], (void **) &ptr, SWIGTYPE_p_ofImage_T_float_t, 0)) { - _v = 0; } else { _v = 1; } } if (_v) { return _wrap_new_FloatImage__SWIG_5(L);} } if (argc == 1) { int _v; { _v = lua_isstring(L,argv[0]); } if (_v) { return _wrap_new_FloatImage__SWIG_3(L);} } SWIG_Lua_pusherrstring(L,"Wrong arguments for overloaded function 'new_FloatImage'\n" " Possible C/C++ prototypes are:\n" " ofImage_< float >::ofImage_()\n" " ofImage_< float >::ofImage_(ofPixels_< float > const &)\n" " ofImage_< float >::ofImage_(ofFile const &)\n" " ofImage_< float >::ofImage_(std::string const &)\n" - " ofImage_< float >::ofImage_(ofImage_< float > const &)\n" " ofImage_< float >::ofImage_(ofImage_< float > &&)\n"); - lua_error(L);return 0; } + " ofImage_< float >::ofImage_(ofImage_< float > &&)\n"); lua_error(L);return 0; } static int _wrap_FloatImage_allocate(lua_State* L) { int SWIG_arg = 0; ofImage_< float > *arg1 = (ofImage_< float > *) 0 ; int arg2 ; int arg3 ; ofImageType arg4 ; SWIG_check_num_args("ofImage_< float >::allocate",4,4) if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("ofImage_< float >::allocate",1,"ofImage_< float > *"); @@ -7638,14 +7629,6 @@ static int _wrap_new_ShortImage__SWIG_3(lua_State* L) { int SWIG_arg = 0; std::s SWIG_NewPointerObj(L,result,SWIGTYPE_p_ofImage_T_unsigned_short_t,1); SWIG_arg++; return SWIG_arg; if(0) SWIG_fail; fail: lua_error(L); return SWIG_arg; } static int _wrap_new_ShortImage__SWIG_4(lua_State* L) { int SWIG_arg = 0; ofImage_< unsigned short > *arg1 = 0 ; - ofImage_< unsigned short > *result = 0 ; SWIG_check_num_args("ofImage_< unsigned short >::ofImage_",1,1) - if(!lua_isuserdata(L,1)) SWIG_fail_arg("ofImage_< unsigned short >::ofImage_",1,"ofImage_< unsigned short > const &"); - if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_ofImage_T_unsigned_short_t,0))){ - SWIG_fail_ptr("new_ShortImage",1,SWIGTYPE_p_ofImage_T_unsigned_short_t); } - result = (ofImage_< unsigned short > *)new ofImage_< unsigned short >((ofImage_< unsigned short > const &)*arg1); - SWIG_NewPointerObj(L,result,SWIGTYPE_p_ofImage_T_unsigned_short_t,1); SWIG_arg++; return SWIG_arg; if(0) SWIG_fail; fail: - lua_error(L); return SWIG_arg; } -static int _wrap_new_ShortImage__SWIG_5(lua_State* L) { int SWIG_arg = 0; ofImage_< unsigned short > *arg1 = 0 ; ofImage_< unsigned short > *result = 0 ; SWIG_check_num_args("ofImage_< unsigned short >::ofImage_",1,1) if(!lua_isuserdata(L,1)) SWIG_fail_arg("ofImage_< unsigned short >::ofImage_",1,"ofImage_< unsigned short > &&"); if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_ofImage_T_unsigned_short_t,0))){ @@ -7662,15 +7645,11 @@ static int _wrap_new_ShortImage(lua_State* L) { int argc; int argv[2]={ 1,2} ; a void *ptr; if (lua_isuserdata(L,argv[0])==0 || SWIG_ConvertPtr(L,argv[0], (void **) &ptr, SWIGTYPE_p_ofImage_T_unsigned_short_t, 0)) { _v = 0; } else { _v = 1; } } if (_v) { return _wrap_new_ShortImage__SWIG_4(L);} } if (argc == 1) { int _v; { - void *ptr; - if (lua_isuserdata(L,argv[0])==0 || SWIG_ConvertPtr(L,argv[0], (void **) &ptr, SWIGTYPE_p_ofImage_T_unsigned_short_t, 0)) { - _v = 0; } else { _v = 1; } } if (_v) { return _wrap_new_ShortImage__SWIG_5(L);} } if (argc == 1) { int _v; { _v = lua_isstring(L,argv[0]); } if (_v) { return _wrap_new_ShortImage__SWIG_3(L);} } SWIG_Lua_pusherrstring(L,"Wrong arguments for overloaded function 'new_ShortImage'\n" " Possible C/C++ prototypes are:\n" " ofImage_< unsigned short >::ofImage_()\n" " ofImage_< unsigned short >::ofImage_(ofPixels_< unsigned short > const &)\n" " ofImage_< unsigned short >::ofImage_(ofFile const &)\n" " ofImage_< unsigned short >::ofImage_(std::string const &)\n" - " ofImage_< unsigned short >::ofImage_(ofImage_< unsigned short > const &)\n" " ofImage_< unsigned short >::ofImage_(ofImage_< unsigned short > &&)\n"); lua_error(L);return 0; } static int _wrap_ShortImage_allocate(lua_State* L) { int SWIG_arg = 0; ofImage_< unsigned short > *arg1 = (ofImage_< unsigned short > *) 0 ; int arg2 ; int arg3 ; ofImageType arg4 ; @@ -8540,11 +8519,6 @@ static int _wrap_new_Node__SWIG_0(lua_State* L) { int SWIG_arg = 0; ofNode *resu SWIG_NewPointerObj(L,result,SWIGTYPE_p_ofNode,1); SWIG_arg++; return SWIG_arg; if(0) SWIG_fail; fail: lua_error(L); return SWIG_arg; } static int _wrap_new_Node__SWIG_1(lua_State* L) { int SWIG_arg = 0; ofNode *arg1 = 0 ; ofNode *result = 0 ; - SWIG_check_num_args("ofNode::ofNode",1,1) if(!lua_isuserdata(L,1)) SWIG_fail_arg("ofNode::ofNode",1,"ofNode const &"); - if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_ofNode,0))){ SWIG_fail_ptr("new_Node",1,SWIGTYPE_p_ofNode); } - result = (ofNode *)new ofNode((ofNode const &)*arg1); SWIG_NewPointerObj(L,result,SWIGTYPE_p_ofNode,1); SWIG_arg++; - return SWIG_arg; if(0) SWIG_fail; fail: lua_error(L); return SWIG_arg; } -static int _wrap_new_Node__SWIG_2(lua_State* L) { int SWIG_arg = 0; ofNode *arg1 = 0 ; ofNode *result = 0 ; SWIG_check_num_args("ofNode::ofNode",1,1) if(!lua_isuserdata(L,1)) SWIG_fail_arg("ofNode::ofNode",1,"ofNode &&"); if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_ofNode,0))){ SWIG_fail_ptr("new_Node",1,SWIGTYPE_p_ofNode); } result = (ofNode *)new ofNode((ofNode &&)*arg1); SWIG_NewPointerObj(L,result,SWIGTYPE_p_ofNode,1); SWIG_arg++; @@ -8552,11 +8526,9 @@ static int _wrap_new_Node__SWIG_2(lua_State* L) { int SWIG_arg = 0; ofNode *arg1 static int _wrap_new_Node(lua_State* L) { int argc; int argv[2]={ 1,2} ; argc = lua_gettop(L); if (argc == 0) { return _wrap_new_Node__SWIG_0(L);} if (argc == 1) { int _v; { void *ptr; if (lua_isuserdata(L,argv[0])==0 || SWIG_ConvertPtr(L,argv[0], (void **) &ptr, SWIGTYPE_p_ofNode, 0)) { _v = 0; } else { - _v = 1; } } if (_v) { return _wrap_new_Node__SWIG_1(L);} } if (argc == 1) { int _v; { void *ptr; - if (lua_isuserdata(L,argv[0])==0 || SWIG_ConvertPtr(L,argv[0], (void **) &ptr, SWIGTYPE_p_ofNode, 0)) { _v = 0; } else { - _v = 1; } } if (_v) { return _wrap_new_Node__SWIG_2(L);} } + _v = 1; } } if (_v) { return _wrap_new_Node__SWIG_1(L);} } SWIG_Lua_pusherrstring(L,"Wrong arguments for overloaded function 'new_Node'\n" " Possible C/C++ prototypes are:\n" - " ofNode::ofNode()\n" " ofNode::ofNode(ofNode const &)\n" " ofNode::ofNode(ofNode &&)\n"); lua_error(L);return 0; } + " ofNode::ofNode()\n" " ofNode::ofNode(ofNode &&)\n"); lua_error(L);return 0; } static int _wrap_Node_setParent__SWIG_0(lua_State* L) { int SWIG_arg = 0; ofNode *arg1 = (ofNode *) 0 ; ofNode *arg2 = 0 ; bool arg3 ; SWIG_check_num_args("ofNode::setParent",3,3) if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("ofNode::setParent",1,"ofNode *"); @@ -15627,12 +15599,6 @@ static int _wrap_new_Shader__SWIG_0(lua_State* L) { int SWIG_arg = 0; ofShader * SWIG_NewPointerObj(L,result,SWIGTYPE_p_ofShader,1); SWIG_arg++; return SWIG_arg; if(0) SWIG_fail; fail: lua_error(L); return SWIG_arg; } static int _wrap_new_Shader__SWIG_1(lua_State* L) { int SWIG_arg = 0; ofShader *arg1 = 0 ; ofShader *result = 0 ; - SWIG_check_num_args("ofShader::ofShader",1,1) - if(!lua_isuserdata(L,1)) SWIG_fail_arg("ofShader::ofShader",1,"ofShader const &"); - if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_ofShader,0))){ SWIG_fail_ptr("new_Shader",1,SWIGTYPE_p_ofShader); } - result = (ofShader *)new ofShader((ofShader const &)*arg1); SWIG_NewPointerObj(L,result,SWIGTYPE_p_ofShader,1); SWIG_arg++; - return SWIG_arg; if(0) SWIG_fail; fail: lua_error(L); return SWIG_arg; } -static int _wrap_new_Shader__SWIG_2(lua_State* L) { int SWIG_arg = 0; ofShader *arg1 = 0 ; ofShader *result = 0 ; SWIG_check_num_args("ofShader::ofShader",1,1) if(!lua_isuserdata(L,1)) SWIG_fail_arg("ofShader::ofShader",1,"ofShader &&"); if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_ofShader,0))){ SWIG_fail_ptr("new_Shader",1,SWIGTYPE_p_ofShader); } result = (ofShader *)new ofShader((ofShader &&)*arg1); SWIG_NewPointerObj(L,result,SWIGTYPE_p_ofShader,1); SWIG_arg++; @@ -15640,12 +15606,9 @@ static int _wrap_new_Shader__SWIG_2(lua_State* L) { int SWIG_arg = 0; ofShader * static int _wrap_new_Shader(lua_State* L) { int argc; int argv[2]={ 1,2} ; argc = lua_gettop(L); if (argc == 0) { return _wrap_new_Shader__SWIG_0(L);} if (argc == 1) { int _v; { void *ptr; if (lua_isuserdata(L,argv[0])==0 || SWIG_ConvertPtr(L,argv[0], (void **) &ptr, SWIGTYPE_p_ofShader, 0)) { _v = 0; } - else { _v = 1; } } if (_v) { return _wrap_new_Shader__SWIG_1(L);} } if (argc == 1) { int _v; { void *ptr; - if (lua_isuserdata(L,argv[0])==0 || SWIG_ConvertPtr(L,argv[0], (void **) &ptr, SWIGTYPE_p_ofShader, 0)) { _v = 0; } - else { _v = 1; } } if (_v) { return _wrap_new_Shader__SWIG_2(L);} } + else { _v = 1; } } if (_v) { return _wrap_new_Shader__SWIG_1(L);} } SWIG_Lua_pusherrstring(L,"Wrong arguments for overloaded function 'new_Shader'\n" " Possible C/C++ prototypes are:\n" - " ofShader::ofShader()\n" " ofShader::ofShader(ofShader const &)\n" " ofShader::ofShader(ofShader &&)\n"); - lua_error(L);return 0; } + " ofShader::ofShader()\n" " ofShader::ofShader(ofShader &&)\n"); lua_error(L);return 0; } static int _wrap_Shader_load__SWIG_0(lua_State* L) { int SWIG_arg = 0; ofShader *arg1 = (ofShader *) 0 ; std::string arg2 ; bool result; SWIG_check_num_args("ofShader::load",2,2) if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("ofShader::load",1,"ofShader *"); @@ -18185,14 +18148,6 @@ static int _wrap_new_Pixels__SWIG_0(lua_State* L) { int SWIG_arg = 0; ofPixels_< SWIG_NewPointerObj(L,result,SWIGTYPE_p_ofPixels_T_unsigned_char_t,1); SWIG_arg++; return SWIG_arg; if(0) SWIG_fail; fail: lua_error(L); return SWIG_arg; } static int _wrap_new_Pixels__SWIG_1(lua_State* L) { int SWIG_arg = 0; ofPixels_< unsigned char > *arg1 = 0 ; - ofPixels_< unsigned char > *result = 0 ; SWIG_check_num_args("ofPixels_< unsigned char >::ofPixels_",1,1) - if(!lua_isuserdata(L,1)) SWIG_fail_arg("ofPixels_< unsigned char >::ofPixels_",1,"ofPixels_< unsigned char > const &"); - if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_ofPixels_T_unsigned_char_t,0))){ - SWIG_fail_ptr("new_Pixels",1,SWIGTYPE_p_ofPixels_T_unsigned_char_t); } - result = (ofPixels_< unsigned char > *)new ofPixels_< unsigned char >((ofPixels_< unsigned char > const &)*arg1); - SWIG_NewPointerObj(L,result,SWIGTYPE_p_ofPixels_T_unsigned_char_t,1); SWIG_arg++; return SWIG_arg; if(0) SWIG_fail; fail: - lua_error(L); return SWIG_arg; } -static int _wrap_new_Pixels__SWIG_2(lua_State* L) { int SWIG_arg = 0; ofPixels_< unsigned char > *arg1 = 0 ; ofPixels_< unsigned char > *result = 0 ; SWIG_check_num_args("ofPixels_< unsigned char >::ofPixels_",1,1) if(!lua_isuserdata(L,1)) SWIG_fail_arg("ofPixels_< unsigned char >::ofPixels_",1,"ofPixels_< unsigned char > &&"); if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_ofPixels_T_unsigned_char_t,0))){ @@ -18203,13 +18158,10 @@ static int _wrap_new_Pixels__SWIG_2(lua_State* L) { int SWIG_arg = 0; ofPixels_< static int _wrap_new_Pixels(lua_State* L) { int argc; int argv[2]={ 1,2} ; argc = lua_gettop(L); if (argc == 0) { return _wrap_new_Pixels__SWIG_0(L);} if (argc == 1) { int _v; { void *ptr; if (lua_isuserdata(L,argv[0])==0 || SWIG_ConvertPtr(L,argv[0], (void **) &ptr, SWIGTYPE_p_ofPixels_T_unsigned_char_t, 0)) { - _v = 0; } else { _v = 1; } } if (_v) { return _wrap_new_Pixels__SWIG_1(L);} } if (argc == 1) { int _v; { void *ptr; - if (lua_isuserdata(L,argv[0])==0 || SWIG_ConvertPtr(L,argv[0], (void **) &ptr, SWIGTYPE_p_ofPixels_T_unsigned_char_t, 0)) { - _v = 0; } else { _v = 1; } } if (_v) { return _wrap_new_Pixels__SWIG_2(L);} } + _v = 0; } else { _v = 1; } } if (_v) { return _wrap_new_Pixels__SWIG_1(L);} } SWIG_Lua_pusherrstring(L,"Wrong arguments for overloaded function 'new_Pixels'\n" " Possible C/C++ prototypes are:\n" - " ofPixels_< unsigned char >::ofPixels_()\n" - " ofPixels_< unsigned char >::ofPixels_(ofPixels_< unsigned char > const &)\n" - " ofPixels_< unsigned char >::ofPixels_(ofPixels_< unsigned char > &&)\n"); lua_error(L);return 0; } + " ofPixels_< unsigned char >::ofPixels_()\n" " ofPixels_< unsigned char >::ofPixels_(ofPixels_< unsigned char > &&)\n"); + lua_error(L);return 0; } static int _wrap_Pixels_allocate(lua_State* L) { int SWIG_arg = 0; ofPixels_< unsigned char > *arg1 = (ofPixels_< unsigned char > *) 0 ; int arg2 ; int arg3 ; int arg4 ; SWIG_check_num_args("ofPixels_< unsigned char >::allocate",4,4) @@ -18953,14 +18905,6 @@ static int _wrap_new_FloatPixels__SWIG_0(lua_State* L) { int SWIG_arg = 0; ofPix SWIG_NewPointerObj(L,result,SWIGTYPE_p_ofPixels_T_float_t,1); SWIG_arg++; return SWIG_arg; if(0) SWIG_fail; fail: lua_error(L); return SWIG_arg; } static int _wrap_new_FloatPixels__SWIG_1(lua_State* L) { int SWIG_arg = 0; ofPixels_< float > *arg1 = 0 ; - ofPixels_< float > *result = 0 ; SWIG_check_num_args("ofPixels_< float >::ofPixels_",1,1) - if(!lua_isuserdata(L,1)) SWIG_fail_arg("ofPixels_< float >::ofPixels_",1,"ofPixels_< float > const &"); - if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_ofPixels_T_float_t,0))){ - SWIG_fail_ptr("new_FloatPixels",1,SWIGTYPE_p_ofPixels_T_float_t); } - result = (ofPixels_< float > *)new ofPixels_< float >((ofPixels_< float > const &)*arg1); - SWIG_NewPointerObj(L,result,SWIGTYPE_p_ofPixels_T_float_t,1); SWIG_arg++; return SWIG_arg; if(0) SWIG_fail; fail: - lua_error(L); return SWIG_arg; } -static int _wrap_new_FloatPixels__SWIG_2(lua_State* L) { int SWIG_arg = 0; ofPixels_< float > *arg1 = 0 ; ofPixels_< float > *result = 0 ; SWIG_check_num_args("ofPixels_< float >::ofPixels_",1,1) if(!lua_isuserdata(L,1)) SWIG_fail_arg("ofPixels_< float >::ofPixels_",1,"ofPixels_< float > &&"); if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_ofPixels_T_float_t,0))){ @@ -18971,13 +18915,9 @@ static int _wrap_new_FloatPixels__SWIG_2(lua_State* L) { int SWIG_arg = 0; ofPix static int _wrap_new_FloatPixels(lua_State* L) { int argc; int argv[2]={ 1,2} ; argc = lua_gettop(L); if (argc == 0) { return _wrap_new_FloatPixels__SWIG_0(L);} if (argc == 1) { int _v; { void *ptr; if (lua_isuserdata(L,argv[0])==0 || SWIG_ConvertPtr(L,argv[0], (void **) &ptr, SWIGTYPE_p_ofPixels_T_float_t, 0)) { - _v = 0; } else { _v = 1; } } if (_v) { return _wrap_new_FloatPixels__SWIG_1(L);} } if (argc == 1) { int _v; { - void *ptr; - if (lua_isuserdata(L,argv[0])==0 || SWIG_ConvertPtr(L,argv[0], (void **) &ptr, SWIGTYPE_p_ofPixels_T_float_t, 0)) { - _v = 0; } else { _v = 1; } } if (_v) { return _wrap_new_FloatPixels__SWIG_2(L);} } + _v = 0; } else { _v = 1; } } if (_v) { return _wrap_new_FloatPixels__SWIG_1(L);} } SWIG_Lua_pusherrstring(L,"Wrong arguments for overloaded function 'new_FloatPixels'\n" " Possible C/C++ prototypes are:\n" - " ofPixels_< float >::ofPixels_()\n" " ofPixels_< float >::ofPixels_(ofPixels_< float > const &)\n" - " ofPixels_< float >::ofPixels_(ofPixels_< float > &&)\n"); lua_error(L);return 0; } + " ofPixels_< float >::ofPixels_()\n" " ofPixels_< float >::ofPixels_(ofPixels_< float > &&)\n"); lua_error(L);return 0; } static int _wrap_FloatPixels_allocate(lua_State* L) { int SWIG_arg = 0; ofPixels_< float > *arg1 = (ofPixels_< float > *) 0 ; int arg2 ; int arg3 ; int arg4 ; SWIG_check_num_args("ofPixels_< float >::allocate",4,4) if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("ofPixels_< float >::allocate",1,"ofPixels_< float > *"); @@ -19693,14 +19633,6 @@ static int _wrap_new_ShortPixels__SWIG_0(lua_State* L) { int SWIG_arg = 0; ofPix SWIG_NewPointerObj(L,result,SWIGTYPE_p_ofPixels_T_unsigned_short_t,1); SWIG_arg++; return SWIG_arg; if(0) SWIG_fail; fail: lua_error(L); return SWIG_arg; } static int _wrap_new_ShortPixels__SWIG_1(lua_State* L) { int SWIG_arg = 0; ofPixels_< unsigned short > *arg1 = 0 ; - ofPixels_< unsigned short > *result = 0 ; SWIG_check_num_args("ofPixels_< unsigned short >::ofPixels_",1,1) - if(!lua_isuserdata(L,1)) SWIG_fail_arg("ofPixels_< unsigned short >::ofPixels_",1,"ofPixels_< unsigned short > const &"); - if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_ofPixels_T_unsigned_short_t,0))){ - SWIG_fail_ptr("new_ShortPixels",1,SWIGTYPE_p_ofPixels_T_unsigned_short_t); } - result = (ofPixels_< unsigned short > *)new ofPixels_< unsigned short >((ofPixels_< unsigned short > const &)*arg1); - SWIG_NewPointerObj(L,result,SWIGTYPE_p_ofPixels_T_unsigned_short_t,1); SWIG_arg++; return SWIG_arg; if(0) SWIG_fail; fail: - lua_error(L); return SWIG_arg; } -static int _wrap_new_ShortPixels__SWIG_2(lua_State* L) { int SWIG_arg = 0; ofPixels_< unsigned short > *arg1 = 0 ; ofPixels_< unsigned short > *result = 0 ; SWIG_check_num_args("ofPixels_< unsigned short >::ofPixels_",1,1) if(!lua_isuserdata(L,1)) SWIG_fail_arg("ofPixels_< unsigned short >::ofPixels_",1,"ofPixels_< unsigned short > &&"); if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_ofPixels_T_unsigned_short_t,0))){ @@ -19711,13 +19643,9 @@ static int _wrap_new_ShortPixels__SWIG_2(lua_State* L) { int SWIG_arg = 0; ofPix static int _wrap_new_ShortPixels(lua_State* L) { int argc; int argv[2]={ 1,2} ; argc = lua_gettop(L); if (argc == 0) { return _wrap_new_ShortPixels__SWIG_0(L);} if (argc == 1) { int _v; { void *ptr; if (lua_isuserdata(L,argv[0])==0 || SWIG_ConvertPtr(L,argv[0], (void **) &ptr, SWIGTYPE_p_ofPixels_T_unsigned_short_t, 0)) { - _v = 0; } else { _v = 1; } } if (_v) { return _wrap_new_ShortPixels__SWIG_1(L);} } if (argc == 1) { int _v; { - void *ptr; - if (lua_isuserdata(L,argv[0])==0 || SWIG_ConvertPtr(L,argv[0], (void **) &ptr, SWIGTYPE_p_ofPixels_T_unsigned_short_t, 0)) { - _v = 0; } else { _v = 1; } } if (_v) { return _wrap_new_ShortPixels__SWIG_2(L);} } + _v = 0; } else { _v = 1; } } if (_v) { return _wrap_new_ShortPixels__SWIG_1(L);} } SWIG_Lua_pusherrstring(L,"Wrong arguments for overloaded function 'new_ShortPixels'\n" " Possible C/C++ prototypes are:\n" " ofPixels_< unsigned short >::ofPixels_()\n" - " ofPixels_< unsigned short >::ofPixels_(ofPixels_< unsigned short > const &)\n" " ofPixels_< unsigned short >::ofPixels_(ofPixels_< unsigned short > &&)\n"); lua_error(L);return 0; } static int _wrap_ShortPixels_allocate(lua_State* L) { int SWIG_arg = 0; ofPixels_< unsigned short > *arg1 = (ofPixels_< unsigned short > *) 0 ; int arg2 ; int arg3 ; int arg4 ; @@ -25474,14 +25402,6 @@ static int _wrap_new_TrueTypeFont__SWIG_0(lua_State* L) { int SWIG_arg = 0; ofTr SWIG_NewPointerObj(L,result,SWIGTYPE_p_ofTrueTypeFont,1); SWIG_arg++; return SWIG_arg; if(0) SWIG_fail; fail: lua_error(L); return SWIG_arg; } static int _wrap_new_TrueTypeFont__SWIG_1(lua_State* L) { int SWIG_arg = 0; ofTrueTypeFont *arg1 = 0 ; - ofTrueTypeFont *result = 0 ; SWIG_check_num_args("ofTrueTypeFont::ofTrueTypeFont",1,1) - if(!lua_isuserdata(L,1)) SWIG_fail_arg("ofTrueTypeFont::ofTrueTypeFont",1,"ofTrueTypeFont const &"); - if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_ofTrueTypeFont,0))){ - SWIG_fail_ptr("new_TrueTypeFont",1,SWIGTYPE_p_ofTrueTypeFont); } - result = (ofTrueTypeFont *)new ofTrueTypeFont((ofTrueTypeFont const &)*arg1); - SWIG_NewPointerObj(L,result,SWIGTYPE_p_ofTrueTypeFont,1); SWIG_arg++; return SWIG_arg; if(0) SWIG_fail; fail: lua_error(L); - return SWIG_arg; } -static int _wrap_new_TrueTypeFont__SWIG_2(lua_State* L) { int SWIG_arg = 0; ofTrueTypeFont *arg1 = 0 ; ofTrueTypeFont *result = 0 ; SWIG_check_num_args("ofTrueTypeFont::ofTrueTypeFont",1,1) if(!lua_isuserdata(L,1)) SWIG_fail_arg("ofTrueTypeFont::ofTrueTypeFont",1,"ofTrueTypeFont &&"); if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_ofTrueTypeFont,0))){ @@ -25492,12 +25412,9 @@ static int _wrap_new_TrueTypeFont__SWIG_2(lua_State* L) { int SWIG_arg = 0; ofTr static int _wrap_new_TrueTypeFont(lua_State* L) { int argc; int argv[2]={ 1,2} ; argc = lua_gettop(L); if (argc == 0) { return _wrap_new_TrueTypeFont__SWIG_0(L);} if (argc == 1) { int _v; { void *ptr; if (lua_isuserdata(L,argv[0])==0 || SWIG_ConvertPtr(L,argv[0], (void **) &ptr, SWIGTYPE_p_ofTrueTypeFont, 0)) { _v = 0; } - else { _v = 1; } } if (_v) { return _wrap_new_TrueTypeFont__SWIG_1(L);} } if (argc == 1) { int _v; { void *ptr; - if (lua_isuserdata(L,argv[0])==0 || SWIG_ConvertPtr(L,argv[0], (void **) &ptr, SWIGTYPE_p_ofTrueTypeFont, 0)) { _v = 0; } - else { _v = 1; } } if (_v) { return _wrap_new_TrueTypeFont__SWIG_2(L);} } + else { _v = 1; } } if (_v) { return _wrap_new_TrueTypeFont__SWIG_1(L);} } SWIG_Lua_pusherrstring(L,"Wrong arguments for overloaded function 'new_TrueTypeFont'\n" " Possible C/C++ prototypes are:\n" - " ofTrueTypeFont::ofTrueTypeFont()\n" " ofTrueTypeFont::ofTrueTypeFont(ofTrueTypeFont const &)\n" - " ofTrueTypeFont::ofTrueTypeFont(ofTrueTypeFont &&)\n"); lua_error(L);return 0; } + " ofTrueTypeFont::ofTrueTypeFont()\n" " ofTrueTypeFont::ofTrueTypeFont(ofTrueTypeFont &&)\n"); lua_error(L);return 0; } static int _wrap_TrueTypeFont_load__SWIG_0(lua_State* L) { int SWIG_arg = 0; ofTrueTypeFont *arg1 = (ofTrueTypeFont *) 0 ; std::string *arg2 = 0 ; int arg3 ; bool arg4 ; bool arg5 ; bool arg6 ; float arg7 ; int arg8 ; std::string temp2 ; bool result; SWIG_check_num_args("ofTrueTypeFont::load",8,8) @@ -42848,7 +42765,7 @@ static swig_lua_attribute swig_SwigModule_attributes[] = { static swig_lua_const_info swig_SwigModule_constants[]= { {SWIG_LUA_CONSTTAB_INT("VERSION_MAJOR", 0)}, {SWIG_LUA_CONSTTAB_INT("VERSION_MINOR", 9)}, - {SWIG_LUA_CONSTTAB_INT("VERSION_PATCH", 2)}, + {SWIG_LUA_CONSTTAB_INT("VERSION_PATCH", 3)}, {SWIG_LUA_CONSTTAB_STRING("VERSION_PRE_RELEASE", "stable")}, {SWIG_LUA_CONSTTAB_INT("LOOP_NONE", OF_LOOP_NONE)}, {SWIG_LUA_CONSTTAB_INT("LOOP_PALINDROME", OF_LOOP_PALINDROME)}, @@ -43063,6 +42980,12 @@ static swig_lua_const_info swig_SwigModule_constants[]= { {SWIG_LUA_CONSTTAB_INT("IMAGE_FORMAT_PFM", OF_IMAGE_FORMAT_PFM)}, {SWIG_LUA_CONSTTAB_INT("IMAGE_FORMAT_PICT", OF_IMAGE_FORMAT_PICT)}, {SWIG_LUA_CONSTTAB_INT("IMAGE_FORMAT_RAW", OF_IMAGE_FORMAT_RAW)}, + {SWIG_LUA_CONSTTAB_INT("TEXTURE_LUMINANCE", 6409)}, + {SWIG_LUA_CONSTTAB_INT("TEXTURE_RGB", 6407)}, + {SWIG_LUA_CONSTTAB_INT("TEXTURE_RGBA", 6408)}, + {SWIG_LUA_CONSTTAB_INT("CLAMP_TO_EDGE", 33071)}, + {SWIG_LUA_CONSTTAB_INT("REPEAT", 10497)}, + {SWIG_LUA_CONSTTAB_INT("MIRRORED_REPEAT", 33648)}, {SWIG_LUA_CONSTTAB_INT("BoxPrimitive_SIDE_FRONT", ofBoxPrimitive::SIDE_FRONT)}, {SWIG_LUA_CONSTTAB_INT("BoxPrimitive_SIDE_RIGHT", ofBoxPrimitive::SIDE_RIGHT)}, {SWIG_LUA_CONSTTAB_INT("BoxPrimitive_SIDE_LEFT", ofBoxPrimitive::SIDE_LEFT)}, diff --git a/src/bindings/ofxLuaBindings.h b/src/bindings/ofxLuaBindings.h index 004d3ea..b855a38 100644 --- a/src/bindings/ofxLuaBindings.h +++ b/src/bindings/ofxLuaBindings.h @@ -1,6 +1,6 @@ /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). - * Version 3.0.8 + * Version 3.0.10 * * This file is not intended to be easily readable and contains a number of * coding conventions designed to improve portability and efficiency. Do not make @@ -75,9 +75,11 @@ #endif /* exporting methods */ -#if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) -# ifndef GCC_HASCLASSVISIBILITY -# define GCC_HASCLASSVISIBILITY +#if defined(__GNUC__) +# if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) +# ifndef GCC_HASCLASSVISIBILITY +# define GCC_HASCLASSVISIBILITY +# endif # endif #endif @@ -642,16 +644,16 @@ SWIG_UnpackData(const char *c, void *ptr, size_t sz) { char d = *(c++); unsigned char uu; if ((d >= '0') && (d <= '9')) - uu = ((d - '0') << 4); + uu = (unsigned char)((d - '0') << 4); else if ((d >= 'a') && (d <= 'f')) - uu = ((d - ('a'-10)) << 4); + uu = (unsigned char)((d - ('a'-10)) << 4); else return (char *) 0; d = *(c++); if ((d >= '0') && (d <= '9')) - uu |= (d - '0'); + uu |= (unsigned char)(d - '0'); else if ((d >= 'a') && (d <= 'f')) - uu |= (d - ('a'-10)); + uu |= (unsigned char)(d - ('a'-10)); else return (char *) 0; *u = uu; @@ -1526,6 +1528,44 @@ SWIGINTERN int SWIG_Lua_iterate_bases(lua_State *L, swig_type_info * SWIGUNUSED return result; } +/* The class.get method helper, performs the lookup of class attributes. + * It returns an error code. Number of function return values is passed inside 'ret'. + * first_arg is not used in this function because function always has 2 arguments. + */ +SWIGINTERN int SWIG_Lua_class_do_get_item(lua_State *L, swig_type_info *type, int SWIGUNUSED first_arg, int *ret) +{ +/* there should be 2 params passed in + (1) userdata (not the meta table) + (2) string name of the attribute +*/ + int bases_search_result; + int substack_start = lua_gettop(L)-2; + assert(first_arg == substack_start+1); + lua_checkstack(L,5); + assert(lua_isuserdata(L,-2)); /* just in case */ + lua_getmetatable(L,-2); /* get the meta table */ + assert(lua_istable(L,-1)); /* just in case */ + /* NEW: looks for the __getitem() fn + this is a user provided get fn */ + SWIG_Lua_get_table(L,"__getitem"); /* find the __getitem fn */ + if (lua_iscfunction(L,-1)) /* if its there */ + { /* found it so call the fn & return its value */ + lua_pushvalue(L,substack_start+1); /* the userdata */ + lua_pushvalue(L,substack_start+2); /* the parameter */ + lua_call(L,2,1); /* 2 value in (userdata),1 out (result) */ + lua_remove(L,-2); /* stack tidy, remove metatable */ + if(ret) *ret = 1; + return SWIG_OK; + } + lua_pop(L,1); + /* Remove the metatable */ + lua_pop(L,1); + /* Search in base classes */ + bases_search_result = SWIG_Lua_iterate_bases(L,type,substack_start+1,SWIG_Lua_class_do_get_item,ret); + return bases_search_result; /* sorry not known */ +} + + /* The class.get method helper, performs the lookup of class attributes. * It returns an error code. Number of function return values is passed inside 'ret'. * first_arg is not used in this function because function always has 2 arguments. @@ -1573,19 +1613,6 @@ SWIGINTERN int SWIG_Lua_class_do_get(lua_State *L, swig_type_info *type, int SW return SWIG_OK; } lua_pop(L,1); /* remove whatever was there */ - /* NEW: looks for the __getitem() fn - this is a user provided get fn */ - SWIG_Lua_get_table(L,"__getitem"); /* find the __getitem fn */ - if (lua_iscfunction(L,-1)) /* if its there */ - { /* found it so call the fn & return its value */ - lua_pushvalue(L,substack_start+1); /* the userdata */ - lua_pushvalue(L,substack_start+2); /* the parameter */ - lua_call(L,2,1); /* 2 value in (userdata),1 out (result) */ - lua_remove(L,-2); /* stack tidy, remove metatable */ - if(ret) *ret = 1; - return SWIG_OK; - } - lua_pop(L,1); /* Remove the metatable */ lua_pop(L,1); /* Search in base classes */ @@ -1612,6 +1639,10 @@ SWIGINTERN int SWIG_Lua_class_get(lua_State *L) if(result == SWIG_OK) return ret; + result = SWIG_Lua_class_do_get_item(L,type,1,&ret); + if(result == SWIG_OK) + return ret; + return 0; } diff --git a/src/ofxLua.cpp b/src/ofxLua.cpp index 80301db..78331a9 100644 --- a/src/ofxLua.cpp +++ b/src/ofxLua.cpp @@ -72,7 +72,6 @@ bool ofxLua::init(bool abortOnError, bool openLibs, bool ofBindings) { return true; } - void ofxLua::clear() { if(L != NULL) { diff --git a/swig b/swig index b0bc866..baa07cf 160000 --- a/swig +++ b/swig @@ -1 +1 @@ -Subproject commit b0bc866740a3555bba9a2586024accc9025855e3 +Subproject commit baa07cfd7e534e760415ad4bdbaa428bb66a8a52