[GEM-cvs] Gem/src/Geos trapezoid.cpp,1.2,1.3 trapezoid.h,1.1,1.2
Brought to you by:
zmoelnig
From: IOhannes m z. <zmo...@us...> - 2008-06-13 07:37:16
|
Update of /cvsroot/pd-gem/Gem/src/Geos In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv569/Geos Modified Files: trapezoid.cpp trapezoid.h Log Message: use member functions rather Index: trapezoid.h =================================================================== RCS file: /cvsroot/pd-gem/Gem/src/Geos/trapezoid.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** trapezoid.h 12 Jun 2008 17:50:23 -0000 1.1 --- trapezoid.h 13 Jun 2008 07:37:23 -0000 1.2 *************** *** 46,55 **** // Destructor virtual ~trapezoid(); ! t_inlet *m_topinlet; t_float m_top; ! t_inlet *m_scaleinlet; t_float m_scale_texcoord; ////////// --- 46,62 ---- // Destructor virtual ~trapezoid(); ! ! ! ! ////////// ! // length of the upper side of the trapezoid t_inlet *m_topinlet; t_float m_top; + void toplengthMess(t_float len); ! ////////// ! // a texture scale factor t_float m_scale_texcoord; + void texscaleMess(t_float scale); ////////// Index: trapezoid.cpp =================================================================== RCS file: /cvsroot/pd-gem/Gem/src/Geos/trapezoid.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** trapezoid.cpp 13 Jun 2008 07:20:00 -0000 1.2 --- trapezoid.cpp 13 Jun 2008 07:37:23 -0000 1.3 *************** *** 37,41 **** m_topinlet=floatinlet_new(this->x_obj, &m_top); - m_scaleinlet=floatinlet_new(this->x_obj, &m_scale_texcoord); } --- 37,40 ---- *************** *** 47,51 **** { inlet_free(m_topinlet); - inlet_free(m_scaleinlet); } --- 46,49 ---- *************** *** 91,96 **** --- 89,115 ---- glEnd(); + } + ///////////////////////////////////////////////////////// + // toplengthMess + // + ///////////////////////////////////////////////////////// + void trapezoid :: toplengthMess(float top) + { + m_top = top; + setModified(); } + + + ///////////////////////////////////////////////////////// + // texscaleMess + // + ///////////////////////////////////////////////////////// + void trapezoid :: texscaleMess(float scale) + { + m_scale_texcoord=scale; + setModified(); + } + ///////////////////////////////////////////////////////// *************** *** 103,116 **** gensym("top"), A_FLOAT, A_NULL); class_addmethod(classPtr, (t_method)&trapezoid::scaleMessCallback, ! gensym("scale"), A_FLOAT, A_NULL); } void trapezoid :: scaleMessCallback(void *data, t_floatarg scale) { ! GetMyClass(data)->m_scale_texcoord=(scale); } void trapezoid :: topMessCallback(void *data, t_floatarg top) { ! GetMyClass(data)->m_top=top; } --- 122,135 ---- gensym("top"), A_FLOAT, A_NULL); class_addmethod(classPtr, (t_method)&trapezoid::scaleMessCallback, ! gensym("texscale"), A_FLOAT, A_NULL); } void trapezoid :: scaleMessCallback(void *data, t_floatarg scale) { ! GetMyClass(data)->texscaleMess(scale); } void trapezoid :: topMessCallback(void *data, t_floatarg top) { ! GetMyClass(data)->toplengthMess(top); } |