[PD-cvs] externals/nusmuk msd.h,1.9,1.10

[Nicolas Montgermont]

Update of /cvsroot/pure-data/externals/nusmuk
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8234

Modified Files:
	msd.h 
Log Message:
Generalized ND methods


Index: msd.h
===================================================================
RCS file: /cvsroot/pure-data/externals/nusmuk/msd.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** msd.h	17 May 2005 15:37:42 -0000	1.9
--- msd.h	1 Jun 2005 09:48:46 -0000	1.10
***************
*** 496,499 ****
--- 496,514 ----
  	inline void m_forceY(int argc,t_atom *argv) { m_force(argc,argv,1); }
  	inline void m_forceZ(int argc,t_atom *argv) { m_force(argc,argv,2); }
+ 	inline void m_forceN(int argc,t_atom *argv) {
+ 		t_atom arglist[2];
+ 
+ 		if(argc != 3) {
+ 			error("%s - %s Syntax : N Id/Nomass value",thisName(),GetString(thisTag()));
+ 			return;
+ 		}
+ 
+ 		if (IsSymbol(argv[1]))
+ 			SetSymbol(arglist[0],GetSymbol(argv[1]));
+ 		else
+ 			SetInt(arglist[0],GetAInt(argv[1]));
+ 		SetFloat(arglist[1],GetFloat(argv[2]));
+ 		m_force(argc-1,arglist,GetAInt(argv[0])-1);
+ 	 }
  
  	// displace mass(es) named Id or No to a certain position
***************
*** 525,529 ****
--- 540,558 ----
  	inline void m_posY(int argc,t_atom *argv) { m_pos(argc,argv,1); }
  	inline void m_posZ(int argc,t_atom *argv) { m_pos(argc,argv,2); }
+ 	inline void m_posN(int argc,t_atom *argv) {
+ 		t_atom arglist[2];
+ 
+ 		if(argc != 3) {
+ 			error("%s - %s Syntax : N Id/Nomass value",thisName(),GetString(thisTag()));
+ 			return;
+ 		}
  
+ 		if (IsSymbol(argv[1]))
+ 			SetSymbol(arglist[0],GetSymbol(argv[1]));
+ 		else
+ 			SetInt(arglist[0],GetAInt(argv[1]));
+ 		SetFloat(arglist[1],GetFloat(argv[2]));
+ 		m_pos(argc-1,arglist,GetAInt(argv[0])-1);
+ 	 }
  	// set mass No to mobile
  	void m_set_mobile(int argc,t_atom *argv,bool mob = true) 
***************
*** 591,598 ****
--- 620,649 ----
  	inline void m_Ymin(int argc,t_atom *argv) { m_limit(argc,argv,1,0); }
  	inline void m_Zmin(int argc,t_atom *argv) { m_limit(argc,argv,2,0); }
+ 	inline void m_Nmin(int argc,t_atom *argv) {
+ 		t_atom arglist[1];
+ 
+ 		if(argc != 2) {
+ 			error("%s - %s Syntax : N value",thisName(),GetString(thisTag()));
+ 			return;
+ 		}
+ 
+ 		SetFloat(arglist[0],GetFloat(argv[1]));
+ 		m_limit(argc-1,arglist,GetAInt(argv[0])-1,0);
+ 	 }
  
  	inline void m_Xmax(int argc,t_atom *argv) { m_limit(argc,argv,0,1); }
  	inline void m_Ymax(int argc,t_atom *argv) { m_limit(argc,argv,1,1); }
  	inline void m_Zmax(int argc,t_atom *argv) { m_limit(argc,argv,2,1); }
+ 	inline void m_Nmax(int argc,t_atom *argv) {
+ 		t_atom arglist[1];
+ 
+ 		if(argc != 2) {
+ 			error("%s - %s Syntax : N value",thisName(),GetString(thisTag()));
+ 			return;
+ 		}
+ 
+ 		SetFloat(arglist[0],GetFloat(argv[1]));
+ 		m_limit(argc-1,arglist,GetAInt(argv[0])-1,1);
+ 	 }
  
  	void m_grab_mass(int argc,t_atom *argv) 
***************
*** 1497,1500 ****
--- 1548,1555 ----
  		FLEXT_CADDMETHOD_(c,0,"Xmax",m_Xmax);
  		FLEXT_CADDMETHOD_(c,0,"Xmin",m_Xmin);
+ 		FLEXT_CADDMETHOD_(c,0,"forceN",m_forceN);
+ 		FLEXT_CADDMETHOD_(c,0,"posN",m_posN);
+ 		FLEXT_CADDMETHOD_(c,0,"Nmax",m_Nmax);
+ 		FLEXT_CADDMETHOD_(c,0,"Nmin",m_Nmin);
  		FLEXT_CADDMETHOD_(c,0,"massesPosL",m_mass_dumpl);
  		FLEXT_CADDMETHOD_(c,0,"massesPosXL",m_mass_dump_xl);
***************
*** 1561,1564 ****
--- 1616,1623 ----
  	FLEXT_CALLBACK_V(m_forceZ)
  	FLEXT_CALLBACK_V(m_posZ)
+ 	FLEXT_CALLBACK_V(m_Nmax)
+ 	FLEXT_CALLBACK_V(m_Nmin)
+ 	FLEXT_CALLBACK_V(m_forceN)
+ 	FLEXT_CALLBACK_V(m_posN)
  	FLEXT_CALLBACK_V(m_setK)
  	FLEXT_CALLBACK_V(m_setD)