[PD-cvs] externals/nusmuk/msd 02_imsdtest.pd, 1.1, 1.2 help-msd.pd, 1.2, 1.3 main.cpp, 1.3, 1.4

21 Apr 2005


      Update of /cvsroot/pure-data/externals/nusmuk/msd
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7646/msd
Modified Files:
    02_imsdtest.pd help-msd.pd main.cpp 
Log Message:
MSD Version 0.03
Index: main.cpp
===================================================================
RCS file: /cvsroot/pure-data/externals/nusmuk/msd/main.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** main.cpp	20 Apr 2005 15:33:14 -0000	1.3
--- main.cpp	21 Apr 2005 14:28:53 -0000	1.4
***************
*** 31,35 ****
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
!  Version 0.02 -- 15.04.2005
  */
--- 31,35 ----
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
!  Version 0.03 -- 21.04.2005
  */
***************
*** 39,43 ****
// define constants
! #define MSD_VERSION  0.02
  #define nb_max_link   4000
  #define nb_max_mass   4000
--- 39,43 ----
// define constants
! #define MSD_VERSION  0.03
  #define nb_max_link   4000
  #define nb_max_mass   4000
***************
*** 70,74 ****
    t_mass *mass2;
    t_float K1, D1, D2;
! 	t_float longx, longueur;
    t_float distance_old;
  } t_link;
--- 70,74 ----
    t_mass *mass2;
    t_float K1, D1, D2;
! 	t_float longx, longueur, long_min, long_max;
    t_float distance_old;
  } t_link;
***************
*** 133,146 ****
    	// compute link forces
    		distance = link[i]->mass1->posX-link[i]->mass2->posX;		// L[n] = x1 - x2
! 			F  = link[i]->K1 * (distance - link[i]->longueur) ;		// F[n] = k1 (L[n] - L[0])
! 			F += link[i]->D1 * (distance - link[i]->distance_old) ;		// F[n] = F[n] + D1 (L[n] - L[n-1])
! 			if (distance != 0) 	{
! 				Fx = F * (link[i]->mass1->posX - link[i]->mass2->posX)/distance; // Fx = F * Lx[n]/L[n]
    		}
! 			link[i]->mass1->forceX -= Fx;					// Fx1[n] = -Fx
! 			link[i]->mass1->forceX -= link[i]->D2*link[i]->mass1->speedX; 	// Fx1[n] = Fx1[n] - D2 * vx1[n-1]
! 			link[i]->mass2->forceX += Fx;					// Fx2[n] = Fx
! 			link[i]->mass2->forceX -= link[i]->D2*link[i]->mass2->speedX; 	// Fx2[n] = Fx2[n] - D2 * vx2[n-1]
! 			link[i]->distance_old = distance;				// L[n-1] = L[n]
    	}
--- 133,153 ----
    	// compute link forces
    		distance = link[i]->mass1->posX-link[i]->mass2->posX;		// L[n] = x1 - x2
! 			if (distance < 0)
! 				distance = -distance;					// |L[n]|
! 			if (distance < link[i]->long_min || distance > link[i]->long_max)	
! 				Fx = 0;
! 			else 	{								// Lmin < L < Lmax
! 				F  = link[i]->K1 * (distance - link[i]->longueur) ;		// F[n] = k1 (L[n] - L[0])
! 				F += link[i]->D1 * (distance - link[i]->distance_old) ;		// F[n] = F[n] + D1 (L[n] - L[n-1])
! 				if (distance != 0) 	
! 					Fx = F * (link[i]->mass1->posX - link[i]->mass2->posX)/distance; // Fx = F * Lx[n]/L[n]
    		}
! 				link[i]->mass1->forceX -= Fx;					// Fx1[n] = -Fx
! 				link[i]->mass1->forceX -= link[i]->D2*link[i]->mass1->speedX; 	// Fx1[n] = Fx1[n] - D2 * vx1[n-1]
! 				link[i]->mass2->forceX += Fx;					// Fx2[n] = Fx
! 				link[i]->mass2->forceX -= link[i]->D2*link[i]->mass2->speedX; 	// Fx2[n] = Fx2[n] - D2 * vx2[n-1]
! 				link[i]->distance_old = distance;				// L[n-1] = L[n]			
! 			
! 			
    	}
***************
*** 170,173 ****
--- 177,183 ----
    	t_float M;
+ 		if (argc != 4)
+ 			error("mass : Id mobile mass X");
+ 
    	mass[nb_mass] = new t_mass;			// new mass
    	mass[nb_mass]->Id = GetSymbol(argv[0]);		// ID
***************
*** 199,202 ****
--- 209,215 ----
    	const t_symbol *sym = GetSymbol(argv[0]);
+ 		if (argc != 2)
+ 			error("forceX : Idmass value");
+ 
    	for (i=0; i<nb_mass;i++)
    	{
***************
*** 212,215 ****
--- 225,231 ----
    	const t_symbol *sym = GetSymbol(argv[0]);
+ 		if (argc != 2)
+ 			error("posX : Idmass value");
+ 
    	if (GetFloat(argv[1]) < Xmax && GetFloat(argv[1]) > Xmin)
    		for (i=0; i<nb_mass;i++)
***************
*** 224,228 ****
    // set mass No to mobile
    	t_int i,aux;
! 		
    	aux = GetInt(argv[0]);	
    	for (i=0; i<nb_mass;i++)
--- 240,247 ----
    // set mass No to mobile
    	t_int i,aux;
! 	
! 		if (argc != 1)
! 			error("setMobile : Idmass");
! 	
    	aux = GetInt(argv[0]);	
    	for (i=0; i<nb_mass;i++)
***************
*** 239,242 ****
--- 258,264 ----
    	t_int i,aux;
    	
+ 		if (argc != 1)
+ 			error("setFixed : Idmass");
+ 
    	aux = GetInt(argv[0]);	
    	for (i=0; i<nb_mass;i++)
***************
*** 251,284 ****
    {
    // Delete mass
! 	t_int i,nb_link_delete=0;
! 	t_atom sortie[5], aux[nb_link];
! 	// Delete all associated links 
! 	for (i=0; i<nb_link;i++)	{
! 		if (link[i]->mass1->nbr == GetAInt(argv[0]) || link[i]->mass2->nbr == GetAInt(argv[0]))	{
! 			SetFloat((aux[nb_link_delete]),link[i]->nbr);
! 			nb_link_delete++;
    	}
- 	}
! 	for (i=0; i<nb_link_delete;i++)
! 		m_delete_link(1,&aux[i]);
    
! 	// Delete mass
! 	for (i=0; i<nb_mass;i++)
! 		if (mass[i]->nbr == GetAInt(argv[0]))	{
! 			SetFloat((sortie[0]),mass[i]->nbr);
! 			SetSymbol((sortie[1]),mass[i]->Id);
! 			SetFloat((sortie[2]),mass[i]->mobile);
! 			SetFloat((sortie[3]),1/mass[i]->invM);
! 			SetFloat((sortie[4]),mass[i]->posX);
! 			delete mass[i];
! 			mass[i] = mass[nb_mass-1]; 	// copy last mass instead 
! 			nb_mass--;
! 			ToOutAnything(1,S_Mass_deleted,5,sortie);
! 			break;
    	}
- 
    }
--- 273,307 ----
    {
    // Delete mass
! 		t_int i,nb_link_delete=0;
! 		t_atom sortie[5], aux[nb_link];
    
+ 		if (argc != 1)
+ 			error("deleteMass : Nomass");
! 		// Delete all associated links 
! 		for (i=0; i<nb_link;i++)	{
! 			if (link[i]->mass1->nbr == GetAInt(argv[0]) || link[i]->mass2->nbr == GetAInt(argv[0]))	{
! 				SetFloat((aux[nb_link_delete]),link[i]->nbr);
! 				nb_link_delete++;
! 			}
    	}
! 		for (i=0; i<nb_link_delete;i++)
! 			m_delete_link(1,&aux[i]);
    
! 		// Delete mass
! 		for (i=0; i<nb_mass;i++)
! 			if (mass[i]->nbr == GetAInt(argv[0]))	{
! 				SetFloat((sortie[0]),mass[i]->nbr);
! 				SetSymbol((sortie[1]),mass[i]->Id);
! 				SetFloat((sortie[2]),mass[i]->mobile);
! 				SetFloat((sortie[3]),1/mass[i]->invM);
! 				SetFloat((sortie[4]),mass[i]->posX);
! 				delete mass[i];
! 				mass[i] = mass[nb_mass-1]; 	// copy last mass instead 
! 				nb_mass--;
! 				ToOutAnything(1,S_Mass_deleted,5,sortie);
! 				break;
    	}
    }
***************
*** 287,291 ****
    {
    // set X max
! 	Xmax = GetFloat(argv[0]);
    }
--- 310,316 ----
    {
    // set X max
! 		if (argc != 1)
! 			error("Xmax : Value");
! 		Xmax = GetFloat(argv[0]);
    }
***************
*** 293,297 ****
    {
    // set X min
! 	Xmin = GetFloat(argv[0]);
    }
--- 318,324 ----
    {
    // set X min
! 		if (argc != 1)
! 			error("Xmin : Value");
! 		Xmin = GetFloat(argv[0]);
    }
***************
*** 301,309 ****
    void m_link(int argc,t_atom *argv) 
    // add a link
! 	// Id, nbr, *mass1, *mass2, K1, D1
    {
    	t_atom sortie[7], aux[2];
    	t_int i;
link[nb_link] = new t_link;			// New pointer
    	link[nb_link]->Id = GetSymbol(argv[0]);		// ID
--- 328,338 ----
    void m_link(int argc,t_atom *argv) 
    // add a link
! 	// Id, *mass1, *mass2, K1, D1, D2, (Lmin,Lmax)
    {
    	t_atom sortie[7], aux[2];
    	t_int i;
+ 		if (argc < 6 || argc > 8)
+ 			error("link : Id Nomass1 Nomass2 K D1 D2 (Lmin Lmax)");
    	link[nb_link] = new t_link;			// New pointer
    	link[nb_link]->Id = GetSymbol(argv[0]);		// ID
***************
*** 317,323 ****
    	link[nb_link]->D2 = GetFloat(argv[5]);		// D2
    	link[nb_link]->longx = link[nb_link]->mass1->posX - link[nb_link]->mass2->posX;	// Lx[0]
! 		link[nb_link]->longueur = link[nb_link]->longx ;// L[0]
    	link[nb_link]->nbr = id_link;			// id number
    	link[nb_link]->distance_old = link[nb_link]->longueur;	// L[n-1]
    	nb_link++;
    	id_link++;
--- 346,369 ----
    	link[nb_link]->D2 = GetFloat(argv[5]);		// D2
    	link[nb_link]->longx = link[nb_link]->mass1->posX - link[nb_link]->mass2->posX;	// Lx[0]
! 		if (link[nb_link]->longx < 0)
! 			link[nb_link]->longueur = -link[nb_link]->longx;
! 		else
! 			link[nb_link]->longueur = link[nb_link]->longx ;// L[0]
    	link[nb_link]->nbr = id_link;			// id number
    	link[nb_link]->distance_old = link[nb_link]->longueur;	// L[n-1]
+ 		switch (argc)	{
+ 			case 6 :	
+ 				link[nb_link]->long_max = 32768;
+ 				link[nb_link]->long_min = 0;
+ 				break;
+ 			case 7 :	
+ 				link[nb_link]->long_min = GetFloat(argv[6]);
+ 				link[nb_link]->long_max = 32768;
+ 				break;
+ 			case 8 :	
+ 				link[nb_link]->long_min = GetFloat(argv[6]);
+ 				link[nb_link]->long_max = GetFloat(argv[7]);
+ 				break;	
+ 		}
    	nb_link++;
    	id_link++;
***************
*** 335,344 ****
    void m_ilink(int argc,t_atom *argv) 
    // add interactor link
! 	// Id, nbr, Id masses1, Id masses2, K1, D1
    {
! 		t_atom aux[2], arglist[6];
    	t_int i,j, imass1[nb_mass], nbmass1=0, imass2[nb_mass], nbmass2=0;
    	t_symbol *Id1, *Id2;
Id1 = GetSymbol(argv[1]);
    	Id2 = GetSymbol(argv[2]);
--- 381,393 ----
    void m_ilink(int argc,t_atom *argv) 
    // add interactor link
! 	// Id, Id masses1, Id masses2, K1, D1, D2, (Lmin, Lmax)
    {
! 		t_atom aux[2], arglist[8];
    	t_int i,j, imass1[nb_mass], nbmass1=0, imass2[nb_mass], nbmass2=0;
    	t_symbol *Id1, *Id2;
+ 		if (argc < 6 || argc > 8)
+ 			error("ilink : Id Idmass1 Idmass2 K D1 D2 (Lmin Lmax)");
+ 
    	Id1 = GetSymbol(argv[1]);
    	Id2 = GetSymbol(argv[2]);
***************
*** 365,369 ****
    				SetFloat((arglist[4]),GetFloat(argv[4]));
    				SetFloat((arglist[5]),GetFloat(argv[5]));
! 					m_link(6,arglist);
    			}
    }
--- 414,427 ----
    				SetFloat((arglist[4]),GetFloat(argv[4]));
    				SetFloat((arglist[5]),GetFloat(argv[5]));
! 					switch (argc)	{
! 						case 7 :	
! 							SetFloat(arglist[6],GetFloat(argv[6]));
! 							break;
! 						case 8 :	
! 							SetFloat(arglist[6],GetFloat(argv[6]));
! 							SetFloat(arglist[7],GetFloat(argv[7]));
! 							break;	
! 					}
! 					m_link(argc,arglist);
    			}
    }
***************
*** 375,378 ****
--- 433,439 ----
    	const t_symbol *sym = GetSymbol(argv[0]);
+ 		if (argc != 2)
+ 			error("setK : IdLink Value");
+ 
    	for (i=0; i<nb_link;i++)
    	{
***************
*** 388,391 ****
--- 449,455 ----
    	const t_symbol *sym = GetSymbol(argv[0]);
+ 		if (argc != 2)
+ 			error("setD : IdLink Value");
+ 
    	for (i=0; i<nb_link;i++)
    	{
***************
*** 401,404 ****
--- 465,471 ----
    	const t_symbol *sym = GetSymbol(argv[0]);
+ 		if (argc != 2)
+ 			error("setD2 : IdLink Value");
+ 
    	for (i=0; i<nb_link;i++)
    	{
***************
*** 411,431 ****
    {
    // Delete link
! 	t_int i;
! 	t_atom sortie[7];
! 	for (i=0; i<nb_link;i++)
! 		if (link[i]->nbr == GetInt(argv[0]))	{
! 			SetFloat((sortie[0]),link[i]->nbr);
! 			SetSymbol((sortie[1]),link[i]->Id);
! 			SetFloat((sortie[2]),link[i]->mass1->nbr);
! 			SetFloat((sortie[3]),link[i]->mass2->nbr);
! 			SetFloat((sortie[4]),link[i]->K1);
! 			SetFloat((sortie[5]),link[i]->D1);
! 			SetFloat((sortie[6]),link[i]->D2);
! 			delete link[i];
! 			link[i]=link[nb_link-1];	// copy last link instead
! 			nb_link--;
! 			ToOutAnything(1,S_Link_deleted,7,sortie);
! 			break;
    	}
    }
--- 478,501 ----
    {
    // Delete link
! 		t_int i;
! 		t_atom sortie[7];
! 		if (argc != 1)
! 			error("deleteLink : NoLink");
! 
! 		for (i=0; i<nb_link;i++)
! 			if (link[i]->nbr == GetInt(argv[0]))	{
! 				SetFloat((sortie[0]),link[i]->nbr);
! 				SetSymbol((sortie[1]),link[i]->Id);
! 				SetFloat((sortie[2]),link[i]->mass1->nbr);
! 				SetFloat((sortie[3]),link[i]->mass2->nbr);
! 				SetFloat((sortie[4]),link[i]->K1);
! 				SetFloat((sortie[5]),link[i]->D1);
! 				SetFloat((sortie[6]),link[i]->D2);
! 				delete link[i];
! 				link[i]=link[nb_link-1];	// copy last link instead
! 				nb_link--;
! 				ToOutAnything(1,S_Link_deleted,7,sortie);
! 				break;
    	}
    }
***************
*** 442,449 ****
    	t_atom sortie[4];
    	auxtype = GetSymbol(argv[0]);
! 		auxarg = GetASymbol(argv[1]);		//auxarg : & symbol, 0 else
    	if (argc == 1)
    	{
! 			if (auxtype == S_massesPos)// get all masses positions
    			for (i=0; i<nb_mass; i++)
    			{		
--- 512,519 ----
    	t_atom sortie[4];
    	auxtype = GetSymbol(argv[0]);
! 		auxarg = GetASymbol(argv[1]);			//auxarg : & symbol, 0 else
    	if (argc == 1)
    	{
! 			if (auxtype == S_massesPos)		// get all masses positions
    			for (i=0; i<nb_mass; i++)
    			{		
***************
*** 451,455 ****
    				ToOutAnything(0,S_massesPos,1,sortie);
    			}
! 			else if (auxtype == S_massesForces)// get all masses forces
    			for (i=0; i<nb_mass; i++)
    			{
--- 521,525 ----
    				ToOutAnything(0,S_massesPos,1,sortie);
    			}
! 			else if (auxtype == S_massesForces)	// get all masses forces
    			for (i=0; i<nb_mass; i++)
    			{
***************
*** 457,461 ****
    				ToOutAnything(0,S_massesForces,1,sortie);
    			}
! 			else if (auxtype == S_linksPos)// get all links positions
    			for (i=0; i<nb_link; i++)
    			{
--- 527,531 ----
    				ToOutAnything(0,S_massesForces,1,sortie);
    			}
! 			else if (auxtype == S_linksPos)		// get all links positions
    			for (i=0; i<nb_link; i++)
    			{
***************
*** 464,468 ****
    				ToOutAnything(0,S_linksPos,2,sortie);
    			}
! 			else 		// get all masses speeds
    			for (i=0; i<nb_mass; i++)
    			{
--- 534,538 ----
    				ToOutAnything(0,S_linksPos,2,sortie);
    			}
! 			else 					// get all masses speeds
    			for (i=0; i<nb_mass; i++)
    			{
***************
*** 471,475 ****
    			}
    	}
! 		else if (auxtype == S_massesPos) // get mass positions
    	{
    		if (auxarg == 0) // No
--- 541,545 ----
    			}
    	}
! 		else if (auxtype == S_massesPos) 	// get mass positions
    	{
    		if (auxarg == 0) // No
***************
*** 499,503 ****
    		}
    	}
! 		else if (auxtype == S_massesForces)			 // get mass forces
    	{
    		if (auxarg == 0) // No
--- 569,573 ----
    		}
    	}
! 		else if (auxtype == S_massesForces)	// get mass forces
    	{
    		if (auxarg == 0) // No
***************
*** 527,531 ****
    		}
    	}
! 		else if (auxtype == S_linksPos)			 // get links positions
    	{
    		if (auxarg == 0) // No
--- 597,601 ----
    		}
    	}
! 		else if (auxtype == S_linksPos)		// get links positions
    	{
    		if (auxarg == 0) // No
***************
*** 557,561 ****
    		}
    	}
! 		else 			 // get mass speeds
    	{
    		if (auxarg == 0) // No
--- 627,631 ----
    		}
    	}
! 		else 			 		// get mass speeds
    	{
    		if (auxarg == 0) // No
***************
*** 614,618 ****
void m_info_dumpl()
! 	// List of masses and links infos on first outlet
    {	
    	t_atom sortie[7];
--- 684,688 ----
void m_info_dumpl()
! 	// List of masses and links infos on second outlet
    {	
    	t_atom sortie[7];
Index: help-msd.pd
===================================================================
RCS file: /cvsroot/pure-data/externals/nusmuk/msd/help-msd.pd,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** help-msd.pd	20 Apr 2005 15:33:14 -0000	1.2
--- help-msd.pd	21 Apr 2005 14:28:53 -0000	1.3
***************
*** 1,4 ****
  #N canvas 367 274 570 449 10;
! #N canvas 271 52 742 843 masses 1;
  #X obj 33 821 msd;
  #X obj 62 154 cnv 15 610 180 empty empty CREATION 20 12 0 14 -262131
--- 1,4 ----
  #N canvas 367 274 570 449 10;
! #N canvas 271 52 742 843 masses 0;
  #X obj 33 821 msd;
  #X obj 62 154 cnv 15 610 180 empty empty CREATION 20 12 0 14 -262131
***************
*** 74,88 ****
  #N canvas 222 83 808 841 links 0;
  #X obj 33 821 msd;
! #X obj 62 250 cnv 15 610 305 empty empty CREATION 20 12 0 14 -262131
  -66577 0;
! #X msg 79 279 reset;
! #X text 338 308 $1 : Id (symbol);
! #X text 250 308 Add a link;
! #X text 337 328 $2 : creation No of mass1;
! #X text 337 346 $3 : creation No of mass2;
! #X text 336 364 $4 : rigidity;
! #X text 251 280 Delete all masses and links;
! #X text 336 382 $5 : viscosity;
! #X text 336 399 $6 : damping;
  #X obj 61 561 cnv 15 610 82 empty empty DYNAMIC_SETTING 20 12 0 14
  -262131 -66577 0;
--- 74,88 ----
  #N canvas 222 83 808 841 links 0;
  #X obj 33 821 msd;
! #X obj 62 192 cnv 15 610 360 empty empty CREATION 20 12 0 14 -262131
  -66577 0;
! #X msg 79 221 reset;
! #X text 402 247 $1 : Id (symbol);
! #X text 314 247 Add a link;
! #X text 401 267 $2 : creation No of mass1;
! #X text 401 285 $3 : creation No of mass2;
! #X text 400 303 $4 : rigidity;
! #X text 251 222 Delete all masses and links;
! #X text 400 321 $5 : viscosity;
! #X text 400 338 $6 : damping;
  #X obj 61 561 cnv 15 610 82 empty empty DYNAMIC_SETTING 20 12 0 14
  -262131 -66577 0;
***************
*** 100,126 ****
  / linksPos );
  #X text 237 742 $2 : Id (symbol or creations numbers);
! #X msg 78 308 link $1 $2 $3 $4 $5 $6;
! #X msg 74 532 deleteLink $1;
! #X text 239 534 Delete a link;
! #X text 340 534 $1 : Creation No of link;
  #X msg 73 762 infosL;
  #X text 236 762 Get infos on all masses and links on outlet No 2;
! #X msg 73 423 iLink $1 $2 $3 $4 $5 $6;
! #X text 338 308 $1 : Id (symbol);
! #X text 250 308 Add a link;
! #X text 337 328 $2 : creation No of mass1;
! #X text 337 346 $3 : creation No of mass2;
! #X text 336 364 $4 : rigidity;
! #X text 336 382 $5 : viscosity;
! #X text 336 399 $6 : damping;
! #X text 410 422 $1 : Id (symbol);
! #X text 409 478 $4 : rigidity;
! #X text 409 496 $5 : viscosity;
! #X text 409 513 $6 : damping;
! #X text 410 422 $1 : Id (symbol);
! #X text 409 478 $4 : rigidity;
! #X text 409 496 $5 : viscosity;
! #X text 409 513 $6 : damping;
! #X text 248 423 Add an interactor link;
  #X text 94 52 LINKS :;
  #X text 71 91 parameters : length , rigidity , viscosity and damping.
--- 100,124 ----
  / linksPos );
  #X text 237 742 $2 : Id (symbol or creations numbers);
! #X msg 74 533 deleteLink $1;
! #X text 239 535 Delete a link;
! #X text 340 535 $1 : Creation No of link;
  #X msg 73 762 infosL;
  #X text 236 762 Get infos on all masses and links on outlet No 2;
! #X text 402 247 $1 : Id (symbol);
! #X text 314 247 Add a link;
! #X text 401 267 $2 : creation No of mass1;
! #X text 401 285 $3 : creation No of mass2;
! #X text 400 303 $4 : rigidity;
! #X text 400 321 $5 : viscosity;
! #X text 400 338 $6 : damping;
! #X text 463 392 $1 : Id (symbol);
! #X text 462 448 $4 : rigidity;
! #X text 462 466 $5 : viscosity;
! #X text 462 483 $6 : damping;
! #X text 463 392 $1 : Id (symbol);
! #X text 462 448 $4 : rigidity;
! #X text 462 466 $5 : viscosity;
! #X text 462 483 $6 : damping;
! #X text 301 393 Add an interactor link;
  #X text 94 52 LINKS :;
  #X text 71 91 parameters : length , rigidity , viscosity and damping.
***************
*** 131,138 ****
  #X text 71 120 message. The lenght is initialised to the distance between
  ;
! #X text 71 106 Rigidity , viscosity and damping are defined by the
  creation;
- #X text 409 442 $2 : Id (symbol) of masses type 1;
- #X text 409 460 $3 : Id (symbol) of masses type 2;
  #X text 70 148 Interactor links are links between mutiples masses ,
  instead;
--- 129,134 ----
  #X text 71 120 message. The lenght is initialised to the distance between
  ;
! #X text 71 107 Rigidity , viscosity and damping are defined by the
  creation;
  #X text 70 148 Interactor links are links between mutiples masses ,
  instead;
***************
*** 140,151 ****
  with;
  #X text 69 175 their Id.;
  #X connect 2 0 0 0;
  #X connect 15 0 0 0;
  #X connect 19 0 0 0;
  #X connect 23 0 0 0;
! #X connect 24 0 0 0;
! #X connect 27 0 0 0;
! #X connect 29 0 0 0;
! #X restore 283 353 pd links;
  #X text 135 323 HELP on masses --->;
  #X text 134 354 HELP on links --->;
--- 136,155 ----
  with;
  #X text 69 175 their Id.;
+ #X text 397 356 ($7) : minimum lenght of link;
+ #X text 397 373 ($8) : maximum lenght of link;
+ #X msg 78 247 link $1 $2 $3 $4 $5 $6 ($7 $8);
+ #X text 462 412 $2 : Id (symbol) of masses 1;
+ #X text 462 430 $3 : Id (symbol) of masses 2;
+ #X msg 73 393 iLink $1 $2 $3 $4 $5 $6 ($7 $8);
+ #X text 458 500 ($7) : minimum lenght of links;
+ #X text 458 517 ($8) : maximum lenght of links;
  #X connect 2 0 0 0;
  #X connect 15 0 0 0;
  #X connect 19 0 0 0;
  #X connect 23 0 0 0;
! #X connect 26 0 0 0;
! #X connect 55 0 0 0;
! #X connect 58 0 0 0;
! #X restore 284 353 pd links;
  #X text 135 323 HELP on masses --->;
  #X text 134 354 HELP on links --->;
Index: 02_imsdtest.pd
===================================================================
RCS file: /cvsroot/pure-data/externals/nusmuk/msd/02_imsdtest.pd,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** 02_imsdtest.pd	12 Apr 2005 18:09:20 -0000	1.1
--- 02_imsdtest.pd	21 Apr 2005 14:28:53 -0000	1.2
***************
*** 32,45 ****
  0;
  #X obj 88 590 vsl 15 128 0 100 0 0 empty empty empty 0 -8 0 8 -261689
! -1 -1 8228 1;
  #X obj 111 590 vsl 15 128 0 100 0 0 empty empty empty 0 -8 0 8 -261689
! -1 -1 6323 1;
  #X obj 66 590 vsl 15 128 0 100 0 0 empty empty empty 0 -8 0 8 -261689
! -1 -1 10160 1;
  #X msg 52 736 posX fix $1;
  #X obj 156 590 vsl 15 128 0 100 0 0 empty empty empty 0 -8 0 8 -261689
! -1 -1 2513 1;
  #X obj 134 590 vsl 15 128 0 100 0 0 empty empty empty 0 -8 0 8 -261689
! -1 -1 4418 1;
  #X text 199 638 MOVE FIRST SLIDER;
  #X text 182 662 TO MOVE THE FIXED MASS;
--- 32,45 ----
  0;
  #X obj 88 590 vsl 15 128 0 100 0 0 empty empty empty 0 -8 0 8 -261689
! -1 -1 6249 1;
  #X obj 111 590 vsl 15 128 0 100 0 0 empty empty empty 0 -8 0 8 -261689
! -1 -1 0 1;
  #X obj 66 590 vsl 15 128 0 100 0 0 empty empty empty 0 -8 0 8 -261689
! -1 -1 6860 1;
  #X msg 52 736 posX fix $1;
  #X obj 156 590 vsl 15 128 0 100 0 0 empty empty empty 0 -8 0 8 -261689
! -1 -1 0 1;
  #X obj 134 590 vsl 15 128 0 100 0 0 empty empty empty 0 -8 0 8 -261689
! -1 -1 0 1;
  #X text 199 638 MOVE FIRST SLIDER;
  #X text 182 662 TO MOVE THE FIXED MASS;
***************
*** 51,56 ****
  #X msg 52 335 bang , massesPosL;
  #X obj 52 545 unpack f f f f f;
- #X msg 184 223 iLink inter fix mob 10 2.5 0.5;
  #X text 490 126 CREATION : 5 MASSES , 1 iLINK;
  #X connect 0 0 35 0;
  #X connect 2 0 37 0;
--- 51,56 ----
  #X msg 52 335 bang , massesPosL;
  #X obj 52 545 unpack f f f f f;
  #X text 490 126 CREATION : 5 MASSES , 1 iLINK;
+ #X msg 184 223 iLink inter fix mob 10 2.5 0.5 5 20;
  #X connect 0 0 35 0;
  #X connect 2 0 37 0;
***************
*** 77,81 ****
  #X connect 35 0 3 0;
  #X connect 35 1 23 0;
! #X connect 35 1 40 0;
  #X connect 35 2 13 0;
  #X connect 35 3 15 0;
--- 77,81 ----
  #X connect 35 0 3 0;
  #X connect 35 1 23 0;
! #X connect 35 1 41 0;
  #X connect 35 2 13 0;
  #X connect 35 3 15 0;
***************
*** 90,92 ****
  #X connect 39 3 30 0;
  #X connect 39 4 29 0;
! #X connect 40 0 9 0;
--- 90,92 ----
  #X connect 39 3 30 0;
  #X connect 39 4 29 0;
! #X connect 41 0 9 0;

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

[PD-cvs] externals/nusmuk/msd 02_imsdtest.pd, 1.1, 1.2 help-msd.pd, 1.2, 1.3 main.cpp, 1.3, 1.4