[GEM-cvs] SF.net SVN: pd-gem:[2582] trunk/Gem/src
Brought to you by:
zmoelnig
From: <zmo...@us...> - 2008-09-17 14:07:18
|
Revision: 2582 http://pd-gem.svn.sourceforge.net/pd-gem/?rev=2582&view=rev Author: zmoelnig Date: 2008-09-17 14:07:21 +0000 (Wed, 17 Sep 2008) Log Message: ----------- embedd GLconst->const interpreter, so now we can use directly use [GEMglEnable GL_FOG] instead of quirks with [GLdefine]; this is done explicitely; there really should be a way to do it implicetly for all GLenum types Modified Paths: -------------- trunk/Gem/src/Base/GemGLUtil.cpp trunk/Gem/src/openGL/GEMglBegin.cpp trunk/Gem/src/openGL/GEMglBegin.h trunk/Gem/src/openGL/GEMglBlendFunc.cpp trunk/Gem/src/openGL/GEMglBlendFunc.h trunk/Gem/src/openGL/GEMglColorMaterial.cpp trunk/Gem/src/openGL/GEMglColorMaterial.h trunk/Gem/src/openGL/GEMglCullFace.cpp trunk/Gem/src/openGL/GEMglCullFace.h trunk/Gem/src/openGL/GEMglDepthFunc.cpp trunk/Gem/src/openGL/GEMglDepthFunc.h trunk/Gem/src/openGL/GEMglDisable.cpp trunk/Gem/src/openGL/GEMglDisable.h trunk/Gem/src/openGL/GEMglDisableClientState.cpp trunk/Gem/src/openGL/GEMglDisableClientState.h trunk/Gem/src/openGL/GEMglDrawBuffer.cpp trunk/Gem/src/openGL/GEMglDrawBuffer.h trunk/Gem/src/openGL/GEMglEnable.cpp trunk/Gem/src/openGL/GEMglEnable.h trunk/Gem/src/openGL/GEMglEnableClientState.cpp trunk/Gem/src/openGL/GEMglEnableClientState.h trunk/Gem/src/openGL/GEMglFrontFace.cpp trunk/Gem/src/openGL/GEMglFrontFace.h trunk/Gem/src/openGL/GEMglGetString.cpp trunk/Gem/src/openGL/GEMglGetString.h trunk/Gem/src/openGL/GEMglHint.cpp trunk/Gem/src/openGL/GEMglHint.h trunk/Gem/src/openGL/GEMglIsEnabled.cpp trunk/Gem/src/openGL/GEMglIsEnabled.h trunk/Gem/src/openGL/GEMglLogicOp.cpp trunk/Gem/src/openGL/GEMglLogicOp.h trunk/Gem/src/openGL/GEMglMatrixMode.cpp trunk/Gem/src/openGL/GEMglMatrixMode.h trunk/Gem/src/openGL/GEMglPolygonMode.cpp trunk/Gem/src/openGL/GEMglPolygonMode.h trunk/Gem/src/openGL/GEMglRenderMode.cpp trunk/Gem/src/openGL/GEMglRenderMode.h trunk/Gem/src/openGL/GEMglShadeModel.cpp trunk/Gem/src/openGL/GEMglShadeModel.h trunk/Gem/src/openGL/GEMglStencilOp.cpp trunk/Gem/src/openGL/GEMglStencilOp.h trunk/Gem/src/openGL/GLdefine.cpp trunk/Gem/src/openGL/GLdefine.h Modified: trunk/Gem/src/Base/GemGLUtil.cpp =================================================================== --- trunk/Gem/src/Base/GemGLUtil.cpp 2008-09-17 11:16:13 UTC (rev 2581) +++ trunk/Gem/src/Base/GemGLUtil.cpp 2008-09-17 14:07:21 UTC (rev 2582) @@ -94,12 +94,14 @@ const char *fc=fixname; int count=0; - while (*fc&&(count<MAXPDSTRING)){ + while (*fc&&(count<MAXPDSTRING-1)){ *c=toupper(*fc); c++; fc++; count++; } + *c=0; + if (count<4)return _GL_UNDEFINED; if (!(name[0]=='G' && name[1]=='L' && name[2]=='_'))return _GL_UNDEFINED; name+=3; Modified: trunk/Gem/src/openGL/GEMglBegin.cpp =================================================================== --- trunk/Gem/src/openGL/GEMglBegin.cpp 2008-09-17 11:16:13 UTC (rev 2581) +++ trunk/Gem/src/openGL/GEMglBegin.cpp 2008-09-17 14:07:21 UTC (rev 2582) @@ -14,7 +14,7 @@ #include "GEMglBegin.h" -CPPEXTERN_NEW_WITH_ONE_ARG ( GEMglBegin , t_floatarg, A_DEFFLOAT) +CPPEXTERN_NEW_WITH_GIMME ( GEMglBegin ) ///////////////////////////////////////////////////////// // @@ -23,9 +23,10 @@ ///////////////////////////////////////////////////////// // Constructor // -GEMglBegin :: GEMglBegin (t_floatarg arg0=0) : - mode((GLenum)arg0) +GEMglBegin :: GEMglBegin (int argc, t_atom*argv) : + mode(0) { + if(1==argc)modeMess(argv[0]); else if(argc) GemException("invalid number of arguments"); m_inlet[0] = inlet_new(this->x_obj, &this->x_obj->ob_pd, &s_float, gensym("mode")); } ///////////////////////////////////////////////////////// @@ -45,8 +46,8 @@ ///////////////////////////////////////////////////////// // Variables // -void GEMglBegin :: modeMess (t_float arg1) { // FUN - mode = (GLenum)arg1; +void GEMglBegin :: modeMess (t_atom arg) { // FUN + mode = (GLenum)getGLdefine(&arg); setModified(); } @@ -56,9 +57,9 @@ // void GEMglBegin :: obj_setupCallback(t_class *classPtr) { - class_addmethod(classPtr, (t_method)&GEMglBegin::modeMessCallback, gensym("mode"), A_DEFFLOAT, A_NULL); + class_addmethod(classPtr, (t_method)&GEMglBegin::modeMessCallback, gensym("mode"), A_GIMME, A_NULL); }; -void GEMglBegin :: modeMessCallback (void* data, t_floatarg arg0){ - GetMyClass(data)->modeMess ( (t_float) arg0); +void GEMglBegin :: modeMessCallback (void* data, t_symbol*, int argc, t_atom*argv){ + if(argc==1)GetMyClass(data)->modeMess ( argv[0]); } Modified: trunk/Gem/src/openGL/GEMglBegin.h =================================================================== --- trunk/Gem/src/openGL/GEMglBegin.h 2008-09-17 11:16:13 UTC (rev 2581) +++ trunk/Gem/src/openGL/GEMglBegin.h 2008-09-17 14:07:21 UTC (rev 2582) @@ -31,7 +31,7 @@ public: // Constructor - GEMglBegin (t_float); // CON + GEMglBegin (int, t_atom*); // CON protected: // Destructor @@ -41,7 +41,7 @@ // variables GLenum mode; // VAR - virtual void modeMess(t_float); // FUN + virtual void modeMess(t_atom); // FUN private: @@ -50,6 +50,6 @@ t_inlet *m_inlet[1]; // static member functions - static void modeMessCallback (void*, t_floatarg); + static void modeMessCallback (void*,t_symbol*,int,t_atom*); }; #endif // for header file Modified: trunk/Gem/src/openGL/GEMglBlendFunc.cpp =================================================================== --- trunk/Gem/src/openGL/GEMglBlendFunc.cpp 2008-09-17 11:16:13 UTC (rev 2581) +++ trunk/Gem/src/openGL/GEMglBlendFunc.cpp 2008-09-17 14:07:21 UTC (rev 2582) @@ -14,7 +14,7 @@ #include "GEMglBlendFunc.h" -CPPEXTERN_NEW_WITH_TWO_ARGS ( GEMglBlendFunc , t_floatarg, A_DEFFLOAT, t_floatarg, A_DEFFLOAT) +CPPEXTERN_NEW_WITH_GIMME ( GEMglBlendFunc ) ///////////////////////////////////////////////////////// // @@ -23,10 +23,12 @@ ///////////////////////////////////////////////////////// // Constructor // -GEMglBlendFunc :: GEMglBlendFunc (t_floatarg arg0=0, t_floatarg arg1=0) : - sfactor((GLenum)arg0), - dfactor((GLenum)arg1) +GEMglBlendFunc :: GEMglBlendFunc (int argc, t_atom*argv) : + sfactor(0), + dfactor(0) { + if(2==argc){sfactorMess(argv[0]); dfactorMess(argv[1]);} else if (argc) GemException("invalid number of arguments"); + m_inlet[0] = inlet_new(this->x_obj, &this->x_obj->ob_pd, &s_float, gensym("sfactor")); m_inlet[1] = inlet_new(this->x_obj, &this->x_obj->ob_pd, &s_float, gensym("dfactor")); } @@ -48,13 +50,13 @@ ///////////////////////////////////////////////////////// // Variables // -void GEMglBlendFunc :: sfactorMess (t_float arg1) { // FUN - sfactor = (GLenum)arg1; +void GEMglBlendFunc :: sfactorMess (t_atom arg) { // FUN + sfactor = (GLenum)getGLdefine(&arg); setModified(); } -void GEMglBlendFunc :: dfactorMess (t_float arg1) { // FUN - dfactor = (GLenum)arg1; +void GEMglBlendFunc :: dfactorMess (t_atom arg) { // FUN + dfactor = (GLenum)getGLdefine(&arg); setModified(); } @@ -64,13 +66,13 @@ // void GEMglBlendFunc :: obj_setupCallback(t_class *classPtr) { - class_addmethod(classPtr, (t_method)&GEMglBlendFunc::sfactorMessCallback, gensym("sfactor"), A_DEFFLOAT, A_NULL); - class_addmethod(classPtr, (t_method)&GEMglBlendFunc::dfactorMessCallback, gensym("dfactor"), A_DEFFLOAT, A_NULL); + class_addmethod(classPtr, (t_method)&GEMglBlendFunc::sfactorMessCallback, gensym("sfactor"), A_GIMME, A_NULL); + class_addmethod(classPtr, (t_method)&GEMglBlendFunc::dfactorMessCallback, gensym("dfactor"), A_GIMME, A_NULL); }; -void GEMglBlendFunc :: sfactorMessCallback (void* data, t_floatarg arg0){ - GetMyClass(data)->sfactorMess ( (t_float) arg0); +void GEMglBlendFunc :: sfactorMessCallback (void* data, t_symbol*, int argc, t_atom*argv){ + if(argc==1)GetMyClass(data)->sfactorMess ( argv[0]); } -void GEMglBlendFunc :: dfactorMessCallback (void* data, t_floatarg arg0){ - GetMyClass(data)->dfactorMess ( (t_float) arg0); +void GEMglBlendFunc :: dfactorMessCallback (void* data, t_symbol*, int argc, t_atom*argv){ + if(argc==1)GetMyClass(data)->dfactorMess ( argv[0]); } Modified: trunk/Gem/src/openGL/GEMglBlendFunc.h =================================================================== --- trunk/Gem/src/openGL/GEMglBlendFunc.h 2008-09-17 11:16:13 UTC (rev 2581) +++ trunk/Gem/src/openGL/GEMglBlendFunc.h 2008-09-17 14:07:21 UTC (rev 2582) @@ -31,7 +31,7 @@ public: // Constructor - GEMglBlendFunc (t_float, t_float); // CON + GEMglBlendFunc (int, t_atom*); // CON protected: // Destructor @@ -41,10 +41,10 @@ // variables GLenum sfactor; // VAR - virtual void sfactorMess(t_float); // FUN + virtual void sfactorMess(t_atom); // FUN GLenum dfactor; // VAR - virtual void dfactorMess(t_float); // FUN + virtual void dfactorMess(t_atom); // FUN private: @@ -53,7 +53,7 @@ t_inlet *m_inlet[2]; // static member functions - static void sfactorMessCallback (void*, t_floatarg); - static void dfactorMessCallback (void*, t_floatarg); + static void sfactorMessCallback (void*,t_symbol*,int,t_atom*); + static void dfactorMessCallback (void*,t_symbol*,int,t_atom*); }; #endif // for header file Modified: trunk/Gem/src/openGL/GEMglColorMaterial.cpp =================================================================== --- trunk/Gem/src/openGL/GEMglColorMaterial.cpp 2008-09-17 11:16:13 UTC (rev 2581) +++ trunk/Gem/src/openGL/GEMglColorMaterial.cpp 2008-09-17 14:07:21 UTC (rev 2582) @@ -14,7 +14,7 @@ #include "GEMglColorMaterial.h" -CPPEXTERN_NEW_WITH_TWO_ARGS ( GEMglColorMaterial , t_floatarg, A_DEFFLOAT, t_floatarg, A_DEFFLOAT) +CPPEXTERN_NEW_WITH_GIMME ( GEMglColorMaterial ) ///////////////////////////////////////////////////////// // @@ -23,10 +23,12 @@ ///////////////////////////////////////////////////////// // Constructor // -GEMglColorMaterial :: GEMglColorMaterial (t_floatarg arg0=0, t_floatarg arg1=0) : - face((GLenum)arg0), - mode((GLenum)arg1) +GEMglColorMaterial :: GEMglColorMaterial (int argc, t_atom*argv) : + face(0), + mode(0) { + if(2==argc){faceMess(argv[0]); modeMess(argv[1]);} else if (argc) GemException("invalid number of arguments"); + m_inlet[0] = inlet_new(this->x_obj, &this->x_obj->ob_pd, &s_float, gensym("face")); m_inlet[1] = inlet_new(this->x_obj, &this->x_obj->ob_pd, &s_float, gensym("mode")); } @@ -48,13 +50,13 @@ ///////////////////////////////////////////////////////// // Variables // -void GEMglColorMaterial :: faceMess (t_float arg1) { // FUN - face = (GLenum)arg1; +void GEMglColorMaterial :: faceMess (t_atom arg) { // FUN + face = (GLenum)getGLdefine(&arg); setModified(); } -void GEMglColorMaterial :: modeMess (t_float arg1) { // FUN - mode = (GLenum)arg1; +void GEMglColorMaterial :: modeMess (t_atom arg) { // FUN + mode = (GLenum)getGLdefine(&arg); setModified(); } @@ -64,13 +66,13 @@ // void GEMglColorMaterial :: obj_setupCallback(t_class *classPtr) { - class_addmethod(classPtr, (t_method)&GEMglColorMaterial::faceMessCallback, gensym("face"), A_DEFFLOAT, A_NULL); - class_addmethod(classPtr, (t_method)&GEMglColorMaterial::modeMessCallback, gensym("mode"), A_DEFFLOAT, A_NULL); + class_addmethod(classPtr, (t_method)&GEMglColorMaterial::faceMessCallback, gensym("face"), A_GIMME, A_NULL); + class_addmethod(classPtr, (t_method)&GEMglColorMaterial::modeMessCallback, gensym("mode"), A_GIMME, A_NULL); }; -void GEMglColorMaterial :: faceMessCallback (void* data, t_floatarg arg0){ - GetMyClass(data)->faceMess ( (t_float) arg0); +void GEMglColorMaterial :: faceMessCallback (void* data, t_symbol*, int argc, t_atom*argv){ + if(argc==1)GetMyClass(data)->faceMess ( argv[0]); } -void GEMglColorMaterial :: modeMessCallback (void* data, t_floatarg arg0){ - GetMyClass(data)->modeMess ( (t_float) arg0); +void GEMglColorMaterial :: modeMessCallback (void* data, t_symbol*, int argc, t_atom*argv){ + if(argc==1)GetMyClass(data)->modeMess ( argv[0]); } Modified: trunk/Gem/src/openGL/GEMglColorMaterial.h =================================================================== --- trunk/Gem/src/openGL/GEMglColorMaterial.h 2008-09-17 11:16:13 UTC (rev 2581) +++ trunk/Gem/src/openGL/GEMglColorMaterial.h 2008-09-17 14:07:21 UTC (rev 2582) @@ -31,7 +31,7 @@ public: // Constructor - GEMglColorMaterial (t_float, t_float); // CON + GEMglColorMaterial (int, t_atom*); // CON protected: // Destructor @@ -41,10 +41,10 @@ // variables GLenum face; // VAR - virtual void faceMess(t_float); // FUN + virtual void faceMess(t_atom); // FUN GLenum mode; // VAR - virtual void modeMess(t_float); // FUN + virtual void modeMess(t_atom); // FUN private: @@ -53,7 +53,7 @@ t_inlet *m_inlet[2]; // static member functions - static void faceMessCallback (void*, t_floatarg); - static void modeMessCallback (void*, t_floatarg); + static void faceMessCallback (void*,t_symbol*,int,t_atom*); + static void modeMessCallback (void*,t_symbol*,int,t_atom*); }; #endif // for header file Modified: trunk/Gem/src/openGL/GEMglCullFace.cpp =================================================================== --- trunk/Gem/src/openGL/GEMglCullFace.cpp 2008-09-17 11:16:13 UTC (rev 2581) +++ trunk/Gem/src/openGL/GEMglCullFace.cpp 2008-09-17 14:07:21 UTC (rev 2582) @@ -14,7 +14,7 @@ #include "GEMglCullFace.h" -CPPEXTERN_NEW_WITH_ONE_ARG ( GEMglCullFace , t_floatarg, A_DEFFLOAT) +CPPEXTERN_NEW_WITH_GIMME ( GEMglCullFace ) ///////////////////////////////////////////////////////// // @@ -23,9 +23,10 @@ ///////////////////////////////////////////////////////// // Constructor // -GEMglCullFace :: GEMglCullFace (t_floatarg arg0=0) : - mode((GLenum)arg0) +GEMglCullFace :: GEMglCullFace (int argc, t_atom*argv) : + mode(0) { + if(1==argc)modeMess(argv[0]); else if(argc) GemException("invalid number of arguments"); m_inlet[0] = inlet_new(this->x_obj, &this->x_obj->ob_pd, &s_float, gensym("mode")); } ///////////////////////////////////////////////////////// @@ -45,8 +46,8 @@ ///////////////////////////////////////////////////////// // Variables // -void GEMglCullFace :: modeMess (t_float arg1) { // FUN - mode = (GLenum)arg1; +void GEMglCullFace :: modeMess (t_atom arg) { // FUN + mode = (GLenum)getGLdefine(&arg); setModified(); } @@ -56,9 +57,9 @@ // void GEMglCullFace :: obj_setupCallback(t_class *classPtr) { - class_addmethod(classPtr, (t_method)&GEMglCullFace::modeMessCallback, gensym("mode"), A_DEFFLOAT, A_NULL); + class_addmethod(classPtr, (t_method)&GEMglCullFace::modeMessCallback, gensym("mode"), A_GIMME, A_NULL); }; -void GEMglCullFace :: modeMessCallback (void* data, t_floatarg arg0){ - GetMyClass(data)->modeMess ( (t_float) arg0); +void GEMglCullFace :: modeMessCallback (void* data, t_symbol*, int argc, t_atom*argv){ + if(argc==1)GetMyClass(data)->modeMess ( argv[0]); } Modified: trunk/Gem/src/openGL/GEMglCullFace.h =================================================================== --- trunk/Gem/src/openGL/GEMglCullFace.h 2008-09-17 11:16:13 UTC (rev 2581) +++ trunk/Gem/src/openGL/GEMglCullFace.h 2008-09-17 14:07:21 UTC (rev 2582) @@ -31,7 +31,7 @@ public: // Constructor - GEMglCullFace (t_float); // CON + GEMglCullFace (int, t_atom*); // CON protected: // Destructor @@ -41,7 +41,7 @@ // variables GLenum mode; // VAR - virtual void modeMess(t_float); // FUN + virtual void modeMess(t_atom); // FUN private: @@ -50,6 +50,6 @@ t_inlet *m_inlet[1]; // static member functions - static void modeMessCallback (void*, t_floatarg); + static void modeMessCallback (void*,t_symbol*,int,t_atom*); }; #endif // for header file Modified: trunk/Gem/src/openGL/GEMglDepthFunc.cpp =================================================================== --- trunk/Gem/src/openGL/GEMglDepthFunc.cpp 2008-09-17 11:16:13 UTC (rev 2581) +++ trunk/Gem/src/openGL/GEMglDepthFunc.cpp 2008-09-17 14:07:21 UTC (rev 2582) @@ -14,7 +14,7 @@ #include "GEMglDepthFunc.h" -CPPEXTERN_NEW_WITH_ONE_ARG ( GEMglDepthFunc , t_floatarg, A_DEFFLOAT) +CPPEXTERN_NEW_WITH_GIMME ( GEMglDepthFunc ) ///////////////////////////////////////////////////////// // @@ -23,9 +23,10 @@ ///////////////////////////////////////////////////////// // Constructor // -GEMglDepthFunc :: GEMglDepthFunc (t_floatarg arg0=0) : - func((GLenum)arg0) +GEMglDepthFunc :: GEMglDepthFunc (int argc, t_atom*argv) : + func(0) { + if(1==argc)funcMess(argv[0]); else if(argc) GemException("invalid number of arguments"); m_inlet[0] = inlet_new(this->x_obj, &this->x_obj->ob_pd, &s_float, gensym("func")); } ///////////////////////////////////////////////////////// @@ -45,8 +46,8 @@ ///////////////////////////////////////////////////////// // Variables // -void GEMglDepthFunc :: funcMess (t_float arg1) { // FUN - func = (GLenum)arg1; +void GEMglDepthFunc :: funcMess (t_atom arg) { // FUN + func = (GLenum)getGLdefine(&arg); setModified(); } @@ -56,9 +57,9 @@ // void GEMglDepthFunc :: obj_setupCallback(t_class *classPtr) { - class_addmethod(classPtr, (t_method)&GEMglDepthFunc::funcMessCallback, gensym("func"), A_DEFFLOAT, A_NULL); + class_addmethod(classPtr, (t_method)&GEMglDepthFunc::funcMessCallback, gensym("func"), A_GIMME, A_NULL); }; -void GEMglDepthFunc :: funcMessCallback (void* data, t_floatarg arg0){ - GetMyClass(data)->funcMess ( (t_float) arg0); +void GEMglDepthFunc :: funcMessCallback (void* data, t_symbol*, int argc, t_atom*argv){ + if(argc==1)GetMyClass(data)->funcMess ( argv[0]); } Modified: trunk/Gem/src/openGL/GEMglDepthFunc.h =================================================================== --- trunk/Gem/src/openGL/GEMglDepthFunc.h 2008-09-17 11:16:13 UTC (rev 2581) +++ trunk/Gem/src/openGL/GEMglDepthFunc.h 2008-09-17 14:07:21 UTC (rev 2582) @@ -31,7 +31,7 @@ public: // Constructor - GEMglDepthFunc (t_float); // CON + GEMglDepthFunc (int, t_atom*); // CON protected: // Destructor @@ -41,7 +41,7 @@ // variables GLenum func; // VAR - virtual void funcMess(t_float); // FUN + virtual void funcMess(t_atom); // FUN private: @@ -50,6 +50,6 @@ t_inlet *m_inlet[1]; // static member functions - static void funcMessCallback (void*, t_floatarg); + static void funcMessCallback (void*,t_symbol*,int,t_atom*); }; #endif // for header file Modified: trunk/Gem/src/openGL/GEMglDisable.cpp =================================================================== --- trunk/Gem/src/openGL/GEMglDisable.cpp 2008-09-17 11:16:13 UTC (rev 2581) +++ trunk/Gem/src/openGL/GEMglDisable.cpp 2008-09-17 14:07:21 UTC (rev 2582) @@ -14,7 +14,7 @@ #include "GEMglDisable.h" -CPPEXTERN_NEW_WITH_ONE_ARG ( GEMglDisable , t_floatarg, A_DEFFLOAT) +CPPEXTERN_NEW_WITH_GIMME ( GEMglDisable ) ///////////////////////////////////////////////////////// // @@ -23,9 +23,10 @@ ///////////////////////////////////////////////////////// // Constructor // -GEMglDisable :: GEMglDisable (t_floatarg arg0=0) : - cap((GLenum)arg0) +GEMglDisable :: GEMglDisable (int argc, t_atom*argv) : + cap(0) { + if(1==argc)capMess(argv[0]); else if(argc) GemException("invalid number of arguments"); m_inlet[0] = inlet_new(this->x_obj, &this->x_obj->ob_pd, &s_float, gensym("cap")); } ///////////////////////////////////////////////////////// @@ -45,8 +46,8 @@ ///////////////////////////////////////////////////////// // Variables // -void GEMglDisable :: capMess (t_float arg1) { // FUN - cap = (GLenum)arg1; +void GEMglDisable :: capMess (t_atom arg) { // FUN + cap = (GLenum)getGLdefine(&arg); setModified(); } @@ -56,9 +57,9 @@ // void GEMglDisable :: obj_setupCallback(t_class *classPtr) { - class_addmethod(classPtr, (t_method)&GEMglDisable::capMessCallback, gensym("cap"), A_DEFFLOAT, A_NULL); + class_addmethod(classPtr, (t_method)&GEMglDisable::capMessCallback, gensym("cap"), A_GIMME, A_NULL); }; -void GEMglDisable :: capMessCallback (void* data, t_floatarg arg0){ - GetMyClass(data)->capMess ( (t_float) arg0); +void GEMglDisable :: capMessCallback (void* data, t_symbol*, int argc, t_atom*argv){ + if(argc==1)GetMyClass(data)->capMess ( argv[0]); } Modified: trunk/Gem/src/openGL/GEMglDisable.h =================================================================== --- trunk/Gem/src/openGL/GEMglDisable.h 2008-09-17 11:16:13 UTC (rev 2581) +++ trunk/Gem/src/openGL/GEMglDisable.h 2008-09-17 14:07:21 UTC (rev 2582) @@ -31,7 +31,7 @@ public: // Constructor - GEMglDisable (t_float); // CON + GEMglDisable (int, t_atom*); // CON protected: // Destructor @@ -41,7 +41,7 @@ // variables GLenum cap; // VAR - virtual void capMess(t_float); // FUN + virtual void capMess(t_atom); // FUN private: @@ -50,6 +50,6 @@ t_inlet *m_inlet[1]; // static member functions - static void capMessCallback (void*, t_floatarg); + static void capMessCallback (void*,t_symbol*,int,t_atom*); }; #endif // for header file Modified: trunk/Gem/src/openGL/GEMglDisableClientState.cpp =================================================================== --- trunk/Gem/src/openGL/GEMglDisableClientState.cpp 2008-09-17 11:16:13 UTC (rev 2581) +++ trunk/Gem/src/openGL/GEMglDisableClientState.cpp 2008-09-17 14:07:21 UTC (rev 2582) @@ -14,7 +14,7 @@ #include "GEMglDisableClientState.h" -CPPEXTERN_NEW_WITH_ONE_ARG ( GEMglDisableClientState , t_floatarg, A_DEFFLOAT) +CPPEXTERN_NEW_WITH_GIMME ( GEMglDisableClientState ) ///////////////////////////////////////////////////////// // @@ -23,9 +23,10 @@ ///////////////////////////////////////////////////////// // Constructor // -GEMglDisableClientState :: GEMglDisableClientState (t_floatarg arg0=0) : - array((GLenum)arg0) +GEMglDisableClientState :: GEMglDisableClientState (int argc, t_atom*argv) : + array(0) { + if(1==argc)arrayMess(argv[0]); else if(argc) GemException("invalid number of arguments"); m_inlet[0] = inlet_new(this->x_obj, &this->x_obj->ob_pd, &s_float, gensym("array")); } ///////////////////////////////////////////////////////// @@ -51,8 +52,8 @@ ///////////////////////////////////////////////////////// // Variables // -void GEMglDisableClientState :: arrayMess (t_float arg1) { // FUN - array = (GLenum)arg1; +void GEMglDisableClientState :: arrayMess (t_atom arg) { // FUN + array = (GLenum)getGLdefine(&arg); setModified(); } @@ -62,9 +63,9 @@ // void GEMglDisableClientState :: obj_setupCallback(t_class *classPtr) { - class_addmethod(classPtr, (t_method)&GEMglDisableClientState::arrayMessCallback, gensym("array"), A_DEFFLOAT, A_NULL); + class_addmethod(classPtr, (t_method)&GEMglDisableClientState::arrayMessCallback, gensym("array"), A_GIMME, A_NULL); } -void GEMglDisableClientState :: arrayMessCallback (void* data, t_floatarg arg0){ - GetMyClass(data)->arrayMess ( (t_float) arg0); +void GEMglDisableClientState :: arrayMessCallback (void* data, t_symbol*, int argc, t_atom*argv){ + if(argc==1)GetMyClass(data)->arrayMess ( argv[0]); } Modified: trunk/Gem/src/openGL/GEMglDisableClientState.h =================================================================== --- trunk/Gem/src/openGL/GEMglDisableClientState.h 2008-09-17 11:16:13 UTC (rev 2581) +++ trunk/Gem/src/openGL/GEMglDisableClientState.h 2008-09-17 14:07:21 UTC (rev 2582) @@ -31,7 +31,7 @@ public: // Constructor - GEMglDisableClientState (t_float); // CON + GEMglDisableClientState (int, t_atom*); // CON protected: // Destructor @@ -44,7 +44,7 @@ // variables GLenum array; // VAR - virtual void arrayMess(t_float); // FUN + virtual void arrayMess(t_atom); // FUN private: @@ -53,6 +53,6 @@ t_inlet *m_inlet[1]; // static member functions - static void arrayMessCallback (void*, t_floatarg); + static void arrayMessCallback (void*,t_symbol*,int,t_atom*); }; #endif // for header file Modified: trunk/Gem/src/openGL/GEMglDrawBuffer.cpp =================================================================== --- trunk/Gem/src/openGL/GEMglDrawBuffer.cpp 2008-09-17 11:16:13 UTC (rev 2581) +++ trunk/Gem/src/openGL/GEMglDrawBuffer.cpp 2008-09-17 14:07:21 UTC (rev 2582) @@ -14,7 +14,7 @@ #include "GEMglDrawBuffer.h" -CPPEXTERN_NEW_WITH_ONE_ARG ( GEMglDrawBuffer , t_floatarg, A_DEFFLOAT) +CPPEXTERN_NEW_WITH_GIMME ( GEMglDrawBuffer ) ///////////////////////////////////////////////////////// // @@ -23,9 +23,10 @@ ///////////////////////////////////////////////////////// // Constructor // -GEMglDrawBuffer :: GEMglDrawBuffer (t_floatarg arg0=0) : - mode((GLenum)arg0) +GEMglDrawBuffer :: GEMglDrawBuffer (int argc, t_atom*argv) : + mode(0) { + if(1==argc)modeMess(argv[0]); else if(argc) GemException("invalid number of arguments"); m_inlet[0] = inlet_new(this->x_obj, &this->x_obj->ob_pd, &s_float, gensym("mode")); } ///////////////////////////////////////////////////////// @@ -45,8 +46,8 @@ ///////////////////////////////////////////////////////// // Variables // -void GEMglDrawBuffer :: modeMess (t_float arg1) { // FUN - mode = (GLenum)arg1; +void GEMglDrawBuffer :: modeMess (t_atom arg) { // FUN + mode = (GLenum)getGLdefine(&arg); setModified(); } @@ -56,9 +57,9 @@ // void GEMglDrawBuffer :: obj_setupCallback(t_class *classPtr) { - class_addmethod(classPtr, (t_method)&GEMglDrawBuffer::modeMessCallback, gensym("mode"), A_DEFFLOAT, A_NULL); + class_addmethod(classPtr, (t_method)&GEMglDrawBuffer::modeMessCallback, gensym("mode"), A_GIMME, A_NULL); }; -void GEMglDrawBuffer :: modeMessCallback (void* data, t_floatarg arg0){ - GetMyClass(data)->modeMess ( (t_float) arg0); +void GEMglDrawBuffer :: modeMessCallback (void* data, t_symbol*, int argc, t_atom*argv){ + if(argc==1)GetMyClass(data)->modeMess ( argv[0]); } Modified: trunk/Gem/src/openGL/GEMglDrawBuffer.h =================================================================== --- trunk/Gem/src/openGL/GEMglDrawBuffer.h 2008-09-17 11:16:13 UTC (rev 2581) +++ trunk/Gem/src/openGL/GEMglDrawBuffer.h 2008-09-17 14:07:21 UTC (rev 2582) @@ -31,7 +31,7 @@ public: // Constructor - GEMglDrawBuffer (t_float); // CON + GEMglDrawBuffer (int, t_atom*); // CON protected: // Destructor @@ -41,7 +41,7 @@ // variables GLenum mode; // VAR - virtual void modeMess(t_float); // FUN + virtual void modeMess(t_atom); // FUN private: @@ -50,6 +50,6 @@ t_inlet *m_inlet[1]; // static member functions - static void modeMessCallback (void*, t_floatarg); + static void modeMessCallback (void*,t_symbol*,int,t_atom*); }; #endif // for header file Modified: trunk/Gem/src/openGL/GEMglEnable.cpp =================================================================== --- trunk/Gem/src/openGL/GEMglEnable.cpp 2008-09-17 11:16:13 UTC (rev 2581) +++ trunk/Gem/src/openGL/GEMglEnable.cpp 2008-09-17 14:07:21 UTC (rev 2582) @@ -14,7 +14,7 @@ #include "GEMglEnable.h" -CPPEXTERN_NEW_WITH_ONE_ARG ( GEMglEnable , t_floatarg, A_DEFFLOAT) +CPPEXTERN_NEW_WITH_GIMME ( GEMglEnable ) ///////////////////////////////////////////////////////// // @@ -23,9 +23,10 @@ ///////////////////////////////////////////////////////// // Constructor // -GEMglEnable :: GEMglEnable (t_floatarg arg0=0) : - cap((GLenum)arg0) +GEMglEnable :: GEMglEnable (int argc, t_atom*argv) : + cap(0) { + if(1==argc)capMess(argv[0]); else if(argc) GemException("invalid number of arguments"); m_inlet[0] = inlet_new(this->x_obj, &this->x_obj->ob_pd, &s_float, gensym("cap")); } ///////////////////////////////////////////////////////// @@ -45,8 +46,8 @@ ///////////////////////////////////////////////////////// // Variables // -void GEMglEnable :: capMess (t_float arg1) { // FUN - cap = (GLenum)arg1; +void GEMglEnable :: capMess (t_atom arg) { // FUN + cap = (GLenum)getGLdefine(&arg); setModified(); } @@ -56,9 +57,9 @@ // void GEMglEnable :: obj_setupCallback(t_class *classPtr) { - class_addmethod(classPtr, (t_method)&GEMglEnable::capMessCallback, gensym("cap"), A_DEFFLOAT, A_NULL); + class_addmethod(classPtr, (t_method)&GEMglEnable::capMessCallback, gensym("cap"), A_GIMME, A_NULL); }; -void GEMglEnable :: capMessCallback (void* data, t_floatarg arg0){ - GetMyClass(data)->capMess ( (t_float) arg0); +void GEMglEnable :: capMessCallback (void* data, t_symbol*, int argc, t_atom*argv){ + if(argc==1)GetMyClass(data)->capMess ( argv[0]); } Modified: trunk/Gem/src/openGL/GEMglEnable.h =================================================================== --- trunk/Gem/src/openGL/GEMglEnable.h 2008-09-17 11:16:13 UTC (rev 2581) +++ trunk/Gem/src/openGL/GEMglEnable.h 2008-09-17 14:07:21 UTC (rev 2582) @@ -31,7 +31,7 @@ public: // Constructor - GEMglEnable (t_float); // CON + GEMglEnable (int, t_atom*); // CON protected: // Destructor @@ -41,7 +41,7 @@ // variables GLenum cap; // VAR - virtual void capMess(t_float); // FUN + virtual void capMess(t_atom); // FUN private: @@ -50,6 +50,6 @@ t_inlet *m_inlet[1]; // static member functions - static void capMessCallback (void*, t_floatarg); + static void capMessCallback (void*,t_symbol*,int,t_atom*); }; #endif // for header file Modified: trunk/Gem/src/openGL/GEMglEnableClientState.cpp =================================================================== --- trunk/Gem/src/openGL/GEMglEnableClientState.cpp 2008-09-17 11:16:13 UTC (rev 2581) +++ trunk/Gem/src/openGL/GEMglEnableClientState.cpp 2008-09-17 14:07:21 UTC (rev 2582) @@ -14,7 +14,7 @@ #include "GEMglEnableClientState.h" -CPPEXTERN_NEW_WITH_ONE_ARG ( GEMglEnableClientState , t_floatarg, A_DEFFLOAT) +CPPEXTERN_NEW_WITH_GIMME ( GEMglEnableClientState ) ///////////////////////////////////////////////////////// // @@ -23,9 +23,10 @@ ///////////////////////////////////////////////////////// // Constructor // -GEMglEnableClientState :: GEMglEnableClientState (t_floatarg arg0=0) : - array((GLenum)arg0) +GEMglEnableClientState :: GEMglEnableClientState (int argc, t_atom*argv) : + array(0) { + if(1==argc)arrayMess(argv[0]); else if(argc) GemException("invalid number of arguments"); m_inlet[0] = inlet_new(this->x_obj, &this->x_obj->ob_pd, &s_float, gensym("array")); } ///////////////////////////////////////////////////////// @@ -51,8 +52,8 @@ ///////////////////////////////////////////////////////// // Variables // -void GEMglEnableClientState :: arrayMess (t_float arg1) { // FUN - array = (GLenum)arg1; +void GEMglEnableClientState :: arrayMess (t_atom arg) { // FUN + array = (GLenum)getGLdefine(&arg); setModified(); } @@ -62,9 +63,9 @@ // void GEMglEnableClientState :: obj_setupCallback(t_class *classPtr) { - class_addmethod(classPtr, (t_method)&GEMglEnableClientState::arrayMessCallback, gensym("array"), A_DEFFLOAT, A_NULL); + class_addmethod(classPtr, (t_method)&GEMglEnableClientState::arrayMessCallback, gensym("array"), A_GIMME, A_NULL); } -void GEMglEnableClientState :: arrayMessCallback (void* data, t_floatarg arg0){ - GetMyClass(data)->arrayMess ( (t_float) arg0); +void GEMglEnableClientState :: arrayMessCallback (void* data, t_symbol*, int argc, t_atom*argv){ + if(argc==1)GetMyClass(data)->arrayMess ( argv[0]); } Modified: trunk/Gem/src/openGL/GEMglEnableClientState.h =================================================================== --- trunk/Gem/src/openGL/GEMglEnableClientState.h 2008-09-17 11:16:13 UTC (rev 2581) +++ trunk/Gem/src/openGL/GEMglEnableClientState.h 2008-09-17 14:07:21 UTC (rev 2582) @@ -31,7 +31,7 @@ public: // Constructor - GEMglEnableClientState (t_float); // CON + GEMglEnableClientState (int, t_atom*); // CON protected: // Destructor @@ -44,7 +44,7 @@ // variables GLenum array; // VAR - virtual void arrayMess(t_float); // FUN + virtual void arrayMess(t_atom); // FUN private: @@ -53,6 +53,6 @@ t_inlet *m_inlet[1]; // static member functions - static void arrayMessCallback (void*, t_floatarg); + static void arrayMessCallback (void*,t_symbol*,int,t_atom*); }; #endif // for header file Modified: trunk/Gem/src/openGL/GEMglFrontFace.cpp =================================================================== --- trunk/Gem/src/openGL/GEMglFrontFace.cpp 2008-09-17 11:16:13 UTC (rev 2581) +++ trunk/Gem/src/openGL/GEMglFrontFace.cpp 2008-09-17 14:07:21 UTC (rev 2582) @@ -14,7 +14,7 @@ #include "GEMglFrontFace.h" -CPPEXTERN_NEW_WITH_ONE_ARG ( GEMglFrontFace , t_floatarg, A_DEFFLOAT) +CPPEXTERN_NEW_WITH_GIMME ( GEMglFrontFace ) ///////////////////////////////////////////////////////// // @@ -23,9 +23,10 @@ ///////////////////////////////////////////////////////// // Constructor // -GEMglFrontFace :: GEMglFrontFace (t_floatarg arg0=0) : - mode((GLenum)arg0) +GEMglFrontFace :: GEMglFrontFace (int argc, t_atom*argv) : + mode(0) { + if(1==argc)modeMess(argv[0]); else if(argc) GemException("invalid number of arguments"); m_inlet[0] = inlet_new(this->x_obj, &this->x_obj->ob_pd, &s_float, gensym("mode")); } ///////////////////////////////////////////////////////// @@ -45,8 +46,8 @@ ///////////////////////////////////////////////////////// // Variables // -void GEMglFrontFace :: modeMess (t_float arg1) { // FUN - mode = (GLenum)arg1; +void GEMglFrontFace :: modeMess (t_atom arg) { // FUN + mode = (GLenum)getGLdefine(&arg); setModified(); } @@ -56,9 +57,9 @@ // void GEMglFrontFace :: obj_setupCallback(t_class *classPtr) { - class_addmethod(classPtr, (t_method)&GEMglFrontFace::modeMessCallback, gensym("mode"), A_DEFFLOAT, A_NULL); + class_addmethod(classPtr, (t_method)&GEMglFrontFace::modeMessCallback, gensym("mode"), A_GIMME, A_NULL); }; -void GEMglFrontFace :: modeMessCallback (void* data, t_floatarg arg0){ - GetMyClass(data)->modeMess ( (t_float) arg0); +void GEMglFrontFace :: modeMessCallback (void* data, t_symbol*, int argc, t_atom*argv){ + if(argc==1)GetMyClass(data)->modeMess ( argv[0]); } Modified: trunk/Gem/src/openGL/GEMglFrontFace.h =================================================================== --- trunk/Gem/src/openGL/GEMglFrontFace.h 2008-09-17 11:16:13 UTC (rev 2581) +++ trunk/Gem/src/openGL/GEMglFrontFace.h 2008-09-17 14:07:21 UTC (rev 2582) @@ -31,7 +31,7 @@ public: // Constructor - GEMglFrontFace (t_float); // CON + GEMglFrontFace (int, t_atom*); // CON protected: // Destructor @@ -41,7 +41,7 @@ // variables GLenum mode; // VAR - virtual void modeMess(t_float); // FUN + virtual void modeMess(t_atom); // FUN private: @@ -50,6 +50,6 @@ t_inlet *m_inlet[1]; // static member functions - static void modeMessCallback (void*, t_floatarg); + static void modeMessCallback (void*,t_symbol*,int,t_atom*); }; #endif // for header file Modified: trunk/Gem/src/openGL/GEMglGetString.cpp =================================================================== --- trunk/Gem/src/openGL/GEMglGetString.cpp 2008-09-17 11:16:13 UTC (rev 2581) +++ trunk/Gem/src/openGL/GEMglGetString.cpp 2008-09-17 14:07:21 UTC (rev 2582) @@ -47,8 +47,8 @@ ///////////////////////////////////////////////////////// // Variables // -void GEMglGetString :: nameMess (t_float arg1) { // FUN - name = (GLenum)arg1; +void GEMglGetString :: nameMess (t_atom arg) { // FUN + name = (GLenum)getGLdefine(&arg); setModified(); } @@ -56,9 +56,9 @@ // static member functions // void GEMglGetString :: obj_setupCallback(t_class *classPtr) { - class_addmethod(classPtr, (t_method)&GEMglGetString::nameMessCallback, gensym("name"), A_DEFFLOAT, A_NULL); + class_addmethod(classPtr, (t_method)&GEMglGetString::nameMessCallback, gensym("name"), A_GIMME, A_NULL); } -void GEMglGetString :: nameMessCallback (void* data, t_floatarg arg0){ - GetMyClass(data)->nameMess (arg0); +void GEMglGetString :: nameMessCallback (void* data, t_symbol*, int argc, t_atom*argv){ + if(argc==1)GetMyClass(data)->nameMess ( argv[0]); } Modified: trunk/Gem/src/openGL/GEMglGetString.h =================================================================== --- trunk/Gem/src/openGL/GEMglGetString.h 2008-09-17 11:16:13 UTC (rev 2581) +++ trunk/Gem/src/openGL/GEMglGetString.h 2008-09-17 14:07:21 UTC (rev 2582) @@ -41,7 +41,7 @@ // variables GLenum name; // VAR - virtual void nameMess(t_float); // FUN + virtual void nameMess(t_atom); // FUN // we need some inl/outets t_inlet *m_inlet; @@ -50,6 +50,6 @@ private: // static member functions - static void nameMessCallback (void*, t_floatarg); + static void nameMessCallback (void*, t_symbol*,int,t_atom*); }; #endif // for header file Modified: trunk/Gem/src/openGL/GEMglHint.cpp =================================================================== --- trunk/Gem/src/openGL/GEMglHint.cpp 2008-09-17 11:16:13 UTC (rev 2581) +++ trunk/Gem/src/openGL/GEMglHint.cpp 2008-09-17 14:07:21 UTC (rev 2582) @@ -14,7 +14,7 @@ #include "GEMglHint.h" -CPPEXTERN_NEW_WITH_TWO_ARGS ( GEMglHint , t_floatarg, A_DEFFLOAT, t_floatarg, A_DEFFLOAT) +CPPEXTERN_NEW_WITH_GIMME ( GEMglHint ) ///////////////////////////////////////////////////////// // @@ -23,10 +23,11 @@ ///////////////////////////////////////////////////////// // Constructor // -GEMglHint :: GEMglHint (t_floatarg arg0=0, t_floatarg arg1=0) : - target((GLenum)arg0), - mode((GLenum)arg1) +GEMglHint :: GEMglHint (int argc, t_atom*argv) : + target(0), + mode(0) { + if(2==argc){targetMess(argv[0]); modeMess(argv[1]);} else if (argc) GemException("invalid number of arguments"); m_inlet[0] = inlet_new(this->x_obj, &this->x_obj->ob_pd, &s_float, gensym("target")); m_inlet[1] = inlet_new(this->x_obj, &this->x_obj->ob_pd, &s_float, gensym("mode")); } @@ -48,13 +49,13 @@ ///////////////////////////////////////////////////////// // Variables // -void GEMglHint :: targetMess (t_float arg1) { // FUN - target = (GLenum)arg1; +void GEMglHint :: targetMess (t_atom arg) { // FUN + target = (GLenum)getGLdefine(&arg); setModified(); } -void GEMglHint :: modeMess (t_float arg1) { // FUN - mode = (GLenum)arg1; +void GEMglHint :: modeMess (t_atom arg) { // FUN + mode = (GLenum)getGLdefine(&arg); setModified(); } @@ -64,13 +65,13 @@ // void GEMglHint :: obj_setupCallback(t_class *classPtr) { - class_addmethod(classPtr, (t_method)&GEMglHint::targetMessCallback, gensym("target"), A_DEFFLOAT, A_NULL); - class_addmethod(classPtr, (t_method)&GEMglHint::modeMessCallback, gensym("mode"), A_DEFFLOAT, A_NULL); + class_addmethod(classPtr, (t_method)&GEMglHint::targetMessCallback, gensym("target"), A_GIMME, A_NULL); + class_addmethod(classPtr, (t_method)&GEMglHint::modeMessCallback, gensym("mode"), A_GIMME, A_NULL); }; -void GEMglHint :: targetMessCallback (void* data, t_floatarg arg0){ - GetMyClass(data)->targetMess ( (t_float) arg0); +void GEMglHint :: targetMessCallback (void* data, t_symbol*, int argc, t_atom*argv){ + if(argc==1)GetMyClass(data)->targetMess ( argv[0]); } -void GEMglHint :: modeMessCallback (void* data, t_floatarg arg0){ - GetMyClass(data)->modeMess ( (t_float) arg0); +void GEMglHint :: modeMessCallback (void* data, t_symbol*, int argc, t_atom*argv){ + if(argc==1)GetMyClass(data)->modeMess ( argv[0]); } Modified: trunk/Gem/src/openGL/GEMglHint.h =================================================================== --- trunk/Gem/src/openGL/GEMglHint.h 2008-09-17 11:16:13 UTC (rev 2581) +++ trunk/Gem/src/openGL/GEMglHint.h 2008-09-17 14:07:21 UTC (rev 2582) @@ -31,7 +31,7 @@ public: // Constructor - GEMglHint (t_float, t_float); // CON + GEMglHint (int, t_atom*); // CON protected: // Destructor @@ -41,10 +41,10 @@ // variables GLenum target; // VAR - virtual void targetMess(t_float); // FUN + virtual void targetMess(t_atom); // FUN GLenum mode; // VAR - virtual void modeMess(t_float); // FUN + virtual void modeMess(t_atom); // FUN private: @@ -53,7 +53,7 @@ t_inlet *m_inlet[2]; // static member functions - static void targetMessCallback (void*, t_floatarg); - static void modeMessCallback (void*, t_floatarg); + static void targetMessCallback (void*,t_symbol*,int,t_atom*); + static void modeMessCallback (void*,t_symbol*,int,t_atom*); }; #endif // for header file Modified: trunk/Gem/src/openGL/GEMglIsEnabled.cpp =================================================================== --- trunk/Gem/src/openGL/GEMglIsEnabled.cpp 2008-09-17 11:16:13 UTC (rev 2581) +++ trunk/Gem/src/openGL/GEMglIsEnabled.cpp 2008-09-17 14:07:21 UTC (rev 2582) @@ -14,7 +14,7 @@ #include "GEMglIsEnabled.h" -CPPEXTERN_NEW_WITH_ONE_ARG ( GEMglIsEnabled , t_floatarg, A_DEFFLOAT) +CPPEXTERN_NEW_WITH_GIMME ( GEMglIsEnabled ) ///////////////////////////////////////////////////////// // @@ -23,7 +23,10 @@ ///////////////////////////////////////////////////////// // Constructor // -GEMglIsEnabled :: GEMglIsEnabled (t_floatarg arg0=0) : cap((GLenum)arg0) { +GEMglIsEnabled :: GEMglIsEnabled (int argc, t_atom*argv) : + cap(0) +{ + if(1==argc)capMess(argv[0]); else if(argc) GemException("invalid number of arguments"); m_inlet = inlet_new(this->x_obj, &this->x_obj->ob_pd, &s_float, gensym("cap")); m_outlet=outlet_new(this->x_obj, 0); } @@ -54,8 +57,8 @@ ///////////////////////////////////////////////////////// // Variables // -void GEMglIsEnabled :: capMess (t_float arg1) { // FUN - cap = (GLenum)arg1; +void GEMglIsEnabled :: capMess (t_atom arg) { // FUN + cap = (GLenum)getGLdefine(&arg); setModified(); } @@ -64,9 +67,9 @@ // static member functions // void GEMglIsEnabled :: obj_setupCallback(t_class *classPtr) { - class_addmethod(classPtr, (t_method)&GEMglIsEnabled::capMessCallback, gensym("cap"), A_DEFFLOAT, A_NULL); + class_addmethod(classPtr, (t_method)&GEMglIsEnabled::capMessCallback, gensym("cap"), A_GIMME, A_NULL); } -void GEMglIsEnabled :: capMessCallback (void* data, t_floatarg arg0){ - GetMyClass(data)->capMess ( arg0); +void GEMglIsEnabled :: capMessCallback (void* data, t_symbol*, int argc, t_atom*argv){ + if(argc==1)GetMyClass(data)->capMess ( argv[0]); } Modified: trunk/Gem/src/openGL/GEMglIsEnabled.h =================================================================== --- trunk/Gem/src/openGL/GEMglIsEnabled.h 2008-09-17 11:16:13 UTC (rev 2581) +++ trunk/Gem/src/openGL/GEMglIsEnabled.h 2008-09-17 14:07:21 UTC (rev 2582) @@ -31,7 +31,7 @@ public: // Constructor - GEMglIsEnabled (t_floatarg); // CON + GEMglIsEnabled (int, t_atom*); // CON protected: // Destructor @@ -44,7 +44,7 @@ // variables GLenum cap; // VAR - virtual void capMess(t_float); // FUN + virtual void capMess(t_atom); // FUN // we need some inlets t_inlet *m_inlet; @@ -53,6 +53,6 @@ private: // static member functions - static void capMessCallback (void*, t_floatarg); + static void capMessCallback (void*,t_symbol*,int,t_atom*); }; #endif // for header file Modified: trunk/Gem/src/openGL/GEMglLogicOp.cpp =================================================================== --- trunk/Gem/src/openGL/GEMglLogicOp.cpp 2008-09-17 11:16:13 UTC (rev 2581) +++ trunk/Gem/src/openGL/GEMglLogicOp.cpp 2008-09-17 14:07:21 UTC (rev 2582) @@ -14,7 +14,7 @@ #include "GEMglLogicOp.h" -CPPEXTERN_NEW_WITH_ONE_ARG ( GEMglLogicOp , t_floatarg, A_DEFFLOAT) +CPPEXTERN_NEW_WITH_GIMME ( GEMglLogicOp) ///////////////////////////////////////////////////////// // @@ -23,9 +23,10 @@ ///////////////////////////////////////////////////////// // Constructor // -GEMglLogicOp :: GEMglLogicOp (t_floatarg arg0=0) : - opcode((GLenum)arg0) +GEMglLogicOp :: GEMglLogicOp (int argc, t_atom*argv) : + opcode(0) { + if(1==argc)opcodeMess(argv[0]); else if(argc) GemException("invalid number of arguments"); m_inlet[0] = inlet_new(this->x_obj, &this->x_obj->ob_pd, &s_float, gensym("opcode")); } ///////////////////////////////////////////////////////// @@ -45,8 +46,8 @@ ///////////////////////////////////////////////////////// // Variables // -void GEMglLogicOp :: opcodeMess (t_float arg1) { // FUN - opcode = (GLenum)arg1; +void GEMglLogicOp :: opcodeMess (t_atom arg) { // FUN + opcode = (GLenum)getGLdefine(&arg); setModified(); } @@ -56,9 +57,9 @@ // void GEMglLogicOp :: obj_setupCallback(t_class *classPtr) { - class_addmethod(classPtr, (t_method)&GEMglLogicOp::opcodeMessCallback, gensym("opcode"), A_DEFFLOAT, A_NULL); + class_addmethod(classPtr, (t_method)&GEMglLogicOp::opcodeMessCallback, gensym("opcode"), A_GIMME, A_NULL); }; -void GEMglLogicOp :: opcodeMessCallback (void* data, t_floatarg arg0){ - GetMyClass(data)->opcodeMess ( (t_float) arg0); +void GEMglLogicOp :: opcodeMessCallback (void* data, t_symbol*,int argc, t_atom*argv){ + if(argc==1)GetMyClass(data)->opcodeMess ( argv[0]); } Modified: trunk/Gem/src/openGL/GEMglLogicOp.h =================================================================== --- trunk/Gem/src/openGL/GEMglLogicOp.h 2008-09-17 11:16:13 UTC (rev 2581) +++ trunk/Gem/src/openGL/GEMglLogicOp.h 2008-09-17 14:07:21 UTC (rev 2582) @@ -31,7 +31,7 @@ public: // Constructor - GEMglLogicOp (t_float); // CON + GEMglLogicOp (int, t_atom*); // CON protected: // Destructor @@ -41,7 +41,7 @@ // variables GLenum opcode; // VAR - virtual void opcodeMess(t_float); // FUN + virtual void opcodeMess(t_atom); // FUN private: @@ -50,6 +50,6 @@ t_inlet *m_inlet[1]; // static member functions - static void opcodeMessCallback (void*, t_floatarg); + static void opcodeMessCallback (void*, t_symbol*,int,t_atom*); }; #endif // for header file Modified: trunk/Gem/src/openGL/GEMglMatrixMode.cpp =================================================================== --- trunk/Gem/src/openGL/GEMglMatrixMode.cpp 2008-09-17 11:16:13 UTC (rev 2581) +++ trunk/Gem/src/openGL/GEMglMatrixMode.cpp 2008-09-17 14:07:21 UTC (rev 2582) @@ -14,7 +14,7 @@ #include "GEMglMatrixMode.h" -CPPEXTERN_NEW_WITH_ONE_ARG ( GEMglMatrixMode , t_floatarg, A_DEFFLOAT) +CPPEXTERN_NEW_WITH_GIMME ( GEMglMatrixMode) ///////////////////////////////////////////////////////// // @@ -23,9 +23,10 @@ ///////////////////////////////////////////////////////// // Constructor // -GEMglMatrixMode :: GEMglMatrixMode (t_floatarg arg0=0) : - mode((GLenum)arg0) +GEMglMatrixMode :: GEMglMatrixMode (int argc, t_atom*argv) : + mode(0) { + if(1==argc)modeMess(argv[0]); else if(argc) GemException("invalid number of arguments"); m_inlet[0] = inlet_new(this->x_obj, &this->x_obj->ob_pd, &s_float, gensym("mode")); } ///////////////////////////////////////////////////////// @@ -45,8 +46,8 @@ ///////////////////////////////////////////////////////// // Variables // -void GEMglMatrixMode :: modeMess (t_float arg1) { // FUN - mode = (GLenum)arg1; +void GEMglMatrixMode :: modeMess (t_atom arg) { // FUN + mode = (GLenum)getGLdefine(&arg); setModified(); } @@ -56,9 +57,9 @@ // void GEMglMatrixMode :: obj_setupCallback(t_class *classPtr) { - class_addmethod(classPtr, (t_method)&GEMglMatrixMode::modeMessCallback, gensym("mode"), A_DEFFLOAT, A_NULL); + class_addmethod(classPtr, (t_method)&GEMglMatrixMode::modeMessCallback, gensym("mode"), A_GIMME, A_NULL); }; -void GEMglMatrixMode :: modeMessCallback (void* data, t_floatarg arg0){ - GetMyClass(data)->modeMess ( (t_float) arg0); +void GEMglMatrixMode :: modeMessCallback (void* data, t_symbol*, int argc, t_atom*argv){ + if(1==argc)GetMyClass(data)->modeMess (argv[0]); } Modified: trunk/Gem/src/openGL/GEMglMatrixMode.h =================================================================== --- trunk/Gem/src/openGL/GEMglMatrixMode.h 2008-09-17 11:16:13 UTC (rev 2581) +++ trunk/Gem/src/openGL/GEMglMatrixMode.h 2008-09-17 14:07:21 UTC (rev 2582) @@ -31,7 +31,7 @@ public: // Constructor - GEMglMatrixMode (t_float); // CON + GEMglMatrixMode (int, t_atom*); // CON protected: // Destructor @@ -41,7 +41,7 @@ // variables GLenum mode; // VAR - virtual void modeMess(t_float); // FUN + virtual void modeMess(t_atom); // FUN private: @@ -50,6 +50,6 @@ t_inlet *m_inlet[1]; // static member functions - static void modeMessCallback (void*, t_floatarg); + static void modeMessCallback (void*,t_symbol*,int,t_atom*); }; #endif // for header file Modified: trunk/Gem/src/openGL/GEMglPolygonMode.cpp =================================================================== --- trunk/Gem/src/openGL/GEMglPolygonMode.cpp 2008-09-17 11:16:13 UTC (rev 2581) +++ trunk/Gem/src/openGL/GEMglPolygonMode.cpp 2008-09-17 14:07:21 UTC (rev 2582) @@ -14,7 +14,7 @@ #include "GEMglPolygonMode.h" -CPPEXTERN_NEW_WITH_TWO_ARGS ( GEMglPolygonMode , t_floatarg, A_DEFFLOAT, t_floatarg, A_DEFFLOAT) +CPPEXTERN_NEW_WITH_GIMME ( GEMglPolygonMode) ///////////////////////////////////////////////////////// // @@ -23,10 +23,12 @@ ///////////////////////////////////////////////////////// // Constructor // -GEMglPolygonMode :: GEMglPolygonMode (t_floatarg arg0=0, t_floatarg arg1=0) : - face((GLenum)arg0), - mode((GLenum)arg1) +GEMglPolygonMode :: GEMglPolygonMode (int argc, t_atom*argv) : + face(0), + mode(0) { + if(2==argc){faceMess(argv[0]); modeMess(argv[1]);} else if (argc) GemException("invalid number of arguments"); + m_inlet[0] = inlet_new(this->x_obj, &this->x_obj->ob_pd, &s_float, gensym("face")); m_inlet[1] = inlet_new(this->x_obj, &this->x_obj->ob_pd, &s_float, gensym("mode")); } @@ -48,13 +50,13 @@ ///////////////////////////////////////////////////////// // Variables // -void GEMglPolygonMode :: faceMess (t_float arg1) { // FUN - face = (GLenum)arg1; +void GEMglPolygonMode :: faceMess (t_atom arg) { // FUN + face = (GLenum)getGLdefine(&arg); setModified(); } -void GEMglPolygonMode :: modeMess (t_float arg1) { // FUN - mode = (GLenum)arg1; +void GEMglPolygonMode :: modeMess (t_atom arg) { // FUN + mode = (GLenum)getGLdefine(&arg); setModified(); } @@ -64,13 +66,13 @@ // void GEMglPolygonMode :: obj_setupCallback(t_class *classPtr) { - class_addmethod(classPtr, (t_method)&GEMglPolygonMode::faceMessCallback, gensym("face"), A_DEFFLOAT, A_NULL); - class_addmethod(classPtr, (t_method)&GEMglPolygonMode::modeMessCallback, gensym("mode"), A_DEFFLOAT, A_NULL); + class_addmethod(classPtr, (t_method)&GEMglPolygonMode::faceMessCallback, gensym("face"), A_GIMME, A_NULL); + class_addmethod(classPtr, (t_method)&GEMglPolygonMode::modeMessCallback, gensym("mode"), A_GIMME, A_NULL); }; -void GEMglPolygonMode :: faceMessCallback (void* data, t_floatarg arg0){ - GetMyClass(data)->faceMess ( (t_float) arg0); +void GEMglPolygonMode :: faceMessCallback (void* data, t_symbol*, int argc, t_atom*argv){ + if(argc==1)GetMyClass(data)->faceMess ( argv[0]); } -void GEMglPolygonMode :: modeMessCallback (void* data, t_floatarg arg0){ - GetMyClass(data)->modeMess ( (t_float) arg0); +void GEMglPolygonMode :: modeMessCallback (void* data, t_symbol*, int argc, t_atom*argv){ + if(argc==1)GetMyClass(data)->modeMess ( argv[0]); } Modified: trunk/Gem/src/openGL/GEMglPolygonMode.h =================================================================== --- trunk/Gem/src/openGL/GEMglPolygonMode.h 2008-09-17 11:16:13 UTC (rev 2581) +++ trunk/Gem/src/openGL/GEMglPolygonMode.h 2008-09-17 14:07:21 UTC (rev 2582) @@ -31,7 +31,7 @@ public: // Constructor - GEMglPolygonMode (t_float, t_float); // CON + GEMglPolygonMode (int, t_atom*); // CON protected: // Destructor @@ -41,10 +41,10 @@ // variables GLenum face; // VAR - virtual void faceMess(t_float); // FUN + virtual void faceMess(t_atom); // FUN GLenum mode; // VAR - virtual void modeMess(t_float); // FUN + virtual void modeMess(t_atom); // FUN private: @@ -53,7 +53,7 @@ t_inlet *m_inlet[2]; // static member functions - static void faceMessCallback (void*, t_floatarg); - static void modeMessCallback (void*, t_floatarg); + static void faceMessCallback (void*,t_symbol*,int,t_atom*); + static void modeMessCallback (void*,t_symbol*,int,t_atom*); }; #endif // for header file Modified: trunk/Gem/src/openGL/GEMglRenderMode.cpp =================================================================== --- trunk/Gem/src/openGL/GEMglRenderMode.cpp 2008-09-17 11:16:13 UTC (rev 2581) +++ trunk/Gem/src/openGL/GEMglRenderMode.cpp 2008-09-17 14:07:21 UTC (rev 2582) @@ -14,7 +14,7 @@ #include "GEMglRenderMode.h" -CPPEXTERN_NEW_WITH_ONE_ARG ( GEMglRenderMode , t_floatarg, A_DEFFLOAT) +CPPEXTERN_NEW_WITH_GIMME ( GEMglRenderMode ) ///////////////////////////////////////////////////////// // @@ -23,7 +23,11 @@ ///////////////////////////////////////////////////////// // Constructor // -GEMglRenderMode :: GEMglRenderMode (t_floatarg arg0=0) : mode((GLenum)arg0) { +GEMglRenderMode :: GEMglRenderMode (int argc, t_atom*argv) : + mode(0) +{ + if(1==argc)modeMess(argv[0]); else if(argc) GemException("invalid number of arguments"); + m_inlet = inlet_new(this->x_obj, &this->x_obj->ob_pd, &s_float, gensym("mode")); m_outlet=outlet_new(this->x_obj, 0); } @@ -46,8 +50,8 @@ ///////////////////////////////////////////////////////// // Variables // -void GEMglRenderMode :: modeMess (t_float arg1) { // FUN - mode = (GLenum)arg1; +void GEMglRenderMode :: modeMess (t_atom arg) { // FUN + mode = (GLenum)getGLdefine(&arg); setModified(); } @@ -57,9 +61,9 @@ // void GEMglRenderMode :: obj_setupCallback(t_class *classPtr) { - class_addmethod(classPtr, (t_method)&GEMglRenderMode::modeMessCallback, gensym("mode"), A_DEFFLOAT, A_NULL); + class_addmethod(classPtr, (t_method)&GEMglRenderMode::modeMessCallback, gensym("mode"), A_GIMME, A_NULL); } -void GEMglRenderMode :: modeMessCallback (void* data, t_floatarg arg0){ - GetMyClass(data)->modeMess (arg0); +void GEMglRenderMode :: modeMessCallback (void* data, t_symbol*s, int argc, t_atom*argv){ + if(1==argc)GetMyClass(data)->modeMess (argv[0]); } Modified: trunk/Gem/src/openGL/GEMglRenderMode.h =================================================================== --- trunk/Gem/src/openGL/GEMglRenderMode.h 2008-09-17 11:16:13 UTC (rev 2581) +++ trunk/Gem/src/openGL/GEMglRenderMode.h 2008-09-17 14:07:21 UTC (rev 2582) @@ -31,7 +31,7 @@ public: // Constructor - GEMglRenderMode (t_floatarg); // CON + GEMglRenderMode (int, t_atom*); // CON protected: // Destructor @@ -41,7 +41,7 @@ // variables GLenum mode; // VAR - virtual void modeMess(t_float); // FUN + virtual void modeMess(t_atom); // FUN // we need some inlets t_inlet *m_inlet; @@ -50,6 +50,6 @@ private: // static member functions - static void modeMessCallback (void*, t_floatarg); + static void modeMessCallback (void*,t_symbol*,int,t_atom*); }; #endif // for header file Modified: trunk/Gem/src/openGL/GEMglShadeModel.cpp =================================================================== --- trunk/Gem/src/openGL/GEMglShadeModel.cpp 2008-09-17 11:16:13 UTC (rev 2581) +++ trunk/Gem/src/openGL/GEMglShadeModel.cpp 2008-09-17 14:07:21 UTC (rev 2582) @@ -14,7 +14,7 @@ #include "GEMglShadeModel.h" -CPPEXTERN_NEW_WITH_ONE_ARG ( GEMglShadeModel , t_floatarg, A_DEFFLOAT) +CPPEXTERN_NEW_WITH_GIMME ( GEMglShadeModel) ///////////////////////////////////////////////////////// // @@ -23,9 +23,11 @@ ///////////////////////////////////////////////////////// // Constructor // -GEMglShadeModel :: GEMglShadeModel (t_floatarg arg0=0) : - mode((GLenum)arg0) +GEMglShadeModel :: GEMglShadeModel (int argc, t_atom*argv) : + mode(0) { + if(1==argc)modeMess(argv[0]); else if(argc) GemException("invalid number of arguments"); + m_inlet[0] = inlet_new(this->x_obj, &this->x_obj->ob_pd, &s_float, gensym("mode")); } ///////////////////////////////////////////////////////// @@ -45,8 +47,8 @@ ///////////////////////////////////////////////////////// // Variables // -void GEMglShadeModel :: modeMess (t_float arg1) { // FUN - mode = (GLenum)arg1; +void GEMglShadeModel :: modeMess (t_atom arg) { // FUN + mode = (GLenum)getGLdefine(&arg); setModified(); } @@ -56,9 +58,9 @@ // void GEMglShadeModel :: obj_setupCallback(t_class *classPtr) { - class_addmethod(classPtr, (t_method)&GEMglShadeModel::modeMessCallback, gensym("mode"), A_DEFFLOAT, A_NULL); + class_addmethod(classPtr, (t_method)&GEMglShadeModel::modeMessCallback, gensym("mode"), A_GIMME, A_NULL); }; -void GEMglShadeModel :: modeMessCallback (void* data, t_floatarg arg0){ - GetMyClass(data)->modeMess ( (t_float) arg0); +void GEMglShadeModel :: modeMessCallback (void* data, t_symbol*, int argc, t_atom*argv){ + if(argc==1)GetMyClass(data)->modeMess ( argv[0]); } Modified: trunk/Gem/src/openGL/GEMglShadeModel.h =================================================================== --- trunk/Gem/src/openGL/GEMglShadeModel.h 2008-09-17 11:16:13 UTC (rev 2581) +++ trunk/Gem/src/openGL/GEMglShadeModel.h 2008-09-17 14:07:21 UTC (rev 2582) @@ -31,7 +31,7 @@ public: // Constructor - GEMglShadeModel (t_float); // CON + GEMglShadeModel (int, t_atom*); // CON protected: // Destructor @@ -41,7 +41,7 @@ // variables GLenum mode; // VAR - virtual void modeMess(t_float); // FUN + virtual void modeMess(t_atom); // FUN private: @@ -50,6 +50,6 @@ t_inlet *m_inlet[1]; // static member functions - static void modeMessCallback (void*, t_floatarg); + static void modeMessCallback (void*,t_symbol*,int,t_atom*); }; #endif // for header file Modified: trunk/Gem/src/openGL/GEMglStencilOp.cpp =================================================================== --- trunk/Gem/src/openGL/GEMglStencilOp.cpp 2008-09-17 11:16:13 UTC (rev 2581) +++ trunk/Gem/src/openGL/GEMglStencilOp.cpp 2008-09-17 14:07:21 UTC (rev 2582) @@ -14,7 +14,7 @@ #include "GEMglStencilOp.h" -CPPEXTERN_NEW_WITH_THREE_ARGS ( GEMglStencilOp , t_floatarg, A_DEFFLOAT, t_floatarg, A_DEFFLOAT, t_floatarg, A_DEFFLOAT) +CPPEXTERN_NEW_WITH_GIMME ( GEMglStencilOp ) ///////////////////////////////////////////////////////// // @@ -23,11 +23,13 @@ ///////////////////////////////////////////////////////// // Constructor // -GEMglStencilOp :: GEMglStencilOp (t_floatarg arg0=0, t_floatarg arg1=0, t_floatarg arg2=0) : - fail((GLenum)arg0), - zfail((GLenum)arg1), - zpass((GLenum)arg2) +GEMglStencilOp :: GEMglStencilOp (int argc, t_atom*argv) : + fail(0), + zfail(0), + zpass(0) { + if(3==argc){failMess(argv[0]); zfailMess(argv[1]); zpassMess(argv[2]);}else if(argc) GemException("invalid number of arguments"); + m_inlet[0] = inlet_new(this->x_obj, &this->x_obj->ob_pd, &s_float, gensym("fail")); m_inlet[1] = inlet_new(this->x_obj, &this->x_obj->ob_pd, &s_float, gensym("zfail")); m_inlet[2] = inlet_new(this->x_obj, &this->x_obj->ob_pd, &s_float, gensym("zpass")); @@ -51,18 +53,18 @@ ///////////////////////////////////////////////////////// // Variables // -void GEMglStencilOp :: failMess (t_float arg1) { // FUN - fail = (GLenum)arg1; +void GEMglStencilOp :: failMess (t_atom arg) { // FUN + fail = (GLenum)getGLdefine(&arg); setModified(); } -void GEMglStencilOp :: zfailMess (t_float arg1) { // FUN - zfail = (GLenum)arg1; +void GEMglStencilOp :: zfailMess (t_atom arg) { // FUN + zfail = (GLenum)getGLdefine(&arg); setModified(); } -void GEMglStencilOp :: zpassMess (t_float arg1) { // FUN - zpass = (GLenum)arg1; +void GEMglStencilOp :: zpassMess (t_atom arg) { // FUN + zpass = (GLenum)getGLdefine(&arg); setModified(); } @@ -72,17 +74,17 @@ // void GEMglStencilOp :: obj_setupCallback(t_class *classPtr) { - class_addmethod(classPtr, (t_method)&GEMglStencilOp::failMessCallback, gensym("fail"), A_DEFFLOAT, A_NULL); - class_addmethod(classPtr, (t_method)&GEMglStencilOp::zfailMessCallback, gensym("zfail"), A_DEFFLOAT, A_NULL); - class_addmethod(classPtr, (t_method)&GEMglStencilOp::zpassMessCallback, gensym("zpass"), A_DEFFLOAT, A_NULL); + class_addmethod(classPtr, (t_method)&GEMglStencilOp::failMessCallback, gensym("fail"), A_GIMME, A_NULL); + class_addmethod(classPtr, (t_method)&GEMglStencilOp::zfailMessCallback, gensym("zfail"), A_GIMME, A_NULL); + class_addmethod(classPtr, (t_method)&GEMglStencilOp::zpassMessCallback, gensym("zpass"), A_GIMME, A_NULL); }; -void GEMglStencilOp :: failMessCallback (void* data, t_floatarg arg0){ - GetMyClass(data)->failMess ( (t_float) arg0); +void GEMglStencilOp :: failMessCallback (void* data, t_symbol*, int argc, t_atom... [truncated message content] |