add delMass and delLink messages ((they are a bit slow for real time use if to much things to destroy, but can still be usefull)

svn path=/trunk/externals/pmpd/; revision=17252

6 files changed, 219 insertions, 24 deletions

diff --git a/pmpd.c b/pmpd.c
index 4e09403..470b407 100644
--- a/pmpd.c
+++ b/pmpd.c
@@ -59,6 +59,8 @@ void pmpd_setup(void)
     class_addmethod(pmpd_class, (t_method)pmpd_mass,            gensym("mass"), A_GIMME, 0);

     class_addmethod(pmpd_class, (t_method)pmpd_link,            gensym("link"), A_GIMME, 0);

     class_addmethod(pmpd_class, (t_method)pmpd_tabLink,         gensym("tabLink"), A_GIMME, 0);

+    class_addmethod(pmpd_class, (t_method)pmpd_delLink,         gensym("delLink"), A_GIMME, 0);    

+    class_addmethod(pmpd_class, (t_method)pmpd_delMass,         gensym("delMass"), A_GIMME, 0);   

 

 /*    

  pmpd_set

diff --git a/pmpd2d.c b/pmpd2d.c
index eb9abf9..a5be220 100644
--- a/pmpd2d.c
+++ b/pmpd2d.c
@@ -61,6 +61,8 @@ void pmpd2d_setup(void)
     class_addmethod(pmpd2d_class, (t_method)pmpd2d_link,            gensym("link"), A_GIMME, 0);

     class_addmethod(pmpd2d_class, (t_method)pmpd2d_tLink,           gensym("tLink"), A_GIMME, 0);

     class_addmethod(pmpd2d_class, (t_method)pmpd2d_tabLink,         gensym("tabLink"), A_GIMME, 0);

+    class_addmethod(pmpd2d_class, (t_method)pmpd2d_delLink,         gensym("delLink"), A_GIMME, 0);    

+    class_addmethod(pmpd2d_class, (t_method)pmpd2d_delMass,         gensym("delMass"), A_GIMME, 0);    

 

 /*    

  pmpd2d_set

diff --git a/pmpd2d_core.c b/pmpd2d_core.c
index b60c148..def6fb0 100644
--- a/pmpd2d_core.c
+++ b/pmpd2d_core.c
@@ -315,14 +315,13 @@ void pmpd2d_tLink(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv)
     t_float Lmax =  1000000;
     if (argc > 9) Lmax = atom_getfloatarg(9, argc, argv);
 
-    if ( ( argv[1].a_type == A_FLOAT ) && ( argv[2].a_type == A_FLOAT ) )
+    if ( (argc > 6) && ( argv[1].a_type == A_FLOAT ) && ( argv[2].a_type == A_FLOAT ) )
     {
         pmpd2d_create_link(x, Id, mass1, mass2, K, D, Pow, Lmin, Lmax, 1);
         x->link[x->nb_link-1].VX = vecteurX;
         x->link[x->nb_link-1].VY = vecteurY;
     }
-    else
-    if ( ( argv[1].a_type == A_SYMBOL ) && ( argv[2].a_type == A_FLOAT ) )
+    else if ( (argc > 6) && ( argv[1].a_type == A_SYMBOL ) && ( argv[2].a_type == A_FLOAT ) )
     {
         for (i=0; i< x->nb_mass; i++)
         {
@@ -334,8 +333,7 @@ void pmpd2d_tLink(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv)
             }
         }
     }
-    else
-    if ( ( argv[1].a_type == A_FLOAT ) && ( argv[2].a_type == A_SYMBOL ) )
+    else if ( (argc > 6) && ( argv[1].a_type == A_FLOAT ) && ( argv[2].a_type == A_SYMBOL ) )
     {
         for (i=0; i< x->nb_mass; i++)
         {
@@ -347,8 +345,7 @@ void pmpd2d_tLink(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv)
             }
         }
     }
-    else
-    if ( ( argv[1].a_type == A_SYMBOL ) && ( argv[2].a_type == A_SYMBOL ) )
+    else if ( (argc > 6) && ( argv[1].a_type == A_SYMBOL ) && ( argv[2].a_type == A_SYMBOL ) )
     {
         for (i=0; i< x->nb_mass; i++)
         {
@@ -384,7 +381,7 @@ void pmpd2d_tabLink(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv)
     t_float Dl = atom_getfloatarg(6, argc, argv);
     if (Dl <= 0) Dl = 1;
 
-    if ( ( argv[1].a_type == A_FLOAT ) && ( argv[2].a_type == A_FLOAT ) )
+    if ( (argc > 5) && ( argv[1].a_type == A_FLOAT ) && ( argv[2].a_type == A_FLOAT ) )
     {
         pmpd2d_create_link(x, Id, mass1, mass2, 1, 1, 1, 0, 1000000, 2);
         x->link[x->nb_link-1].arrayK = arrayK;
@@ -392,8 +389,7 @@ void pmpd2d_tabLink(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv)
         x->link[x->nb_link-1].K_L = Kl;
         x->link[x->nb_link-1].D_L = Dl;    
     }
-    else
-    if ( ( argv[1].a_type == A_SYMBOL ) && ( argv[2].a_type == A_FLOAT ) )
+    else if ( (argc > 5) && ( argv[1].a_type == A_SYMBOL ) && ( argv[2].a_type == A_FLOAT ) )
     {
         for (i=0; i< x->nb_mass; i++)
         {
@@ -407,8 +403,7 @@ void pmpd2d_tabLink(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv)
             }
         }
     }
-    else
-    if ( ( argv[1].a_type == A_FLOAT ) && ( argv[2].a_type == A_SYMBOL ) )
+    else if ( (argc > 5) && ( argv[1].a_type == A_FLOAT ) && ( argv[2].a_type == A_SYMBOL ) )
     {
         for (i=0; i< x->nb_mass; i++)
         {
@@ -422,8 +417,7 @@ void pmpd2d_tabLink(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv)
             }
         }
     }
-    else
-    if ( ( argv[1].a_type == A_SYMBOL ) && ( argv[2].a_type == A_SYMBOL ) )
+    else if ( (argc > 5) && ( argv[1].a_type == A_SYMBOL ) && ( argv[2].a_type == A_SYMBOL ) )
     {
         for (i=0; i< x->nb_mass; i++)
         {
@@ -444,6 +438,70 @@ void pmpd2d_tabLink(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv)
             }   
         }
     }
+}
+
+void pmpd2d_delLink_int(t_pmpd2d *x, int dellink)
+{
+	int i;
+	if ( ( dellink < x->nb_link ) && ( dellink >= 0) )
+	{
+		x->nb_link--;
+		for (i=dellink; i < x->nb_link; i++)
+		x->link[i]=x->link[i+1]; 
+	}
+}
+
+void pmpd2d_delLink(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv)
+{
+	int i;
+	if ( (argc > 0) && ( argv[0].a_type == A_FLOAT ) )
+		pmpd2d_delLink_int(x, atom_getfloatarg(0, argc, argv));
+	if ( (argc > 0) && ( argv[0].a_type == A_SYMBOL ) )
+		for (i=0; i<x->nb_link; )
+			if ( atom_getsymbolarg(0,argc,argv) == x->link[i].Id )
+				pmpd2d_delLink_int(x, i);
+			else i++;
 
 }
 
+void pmpd2d_delMass_int(t_pmpd2d *x, int delmass)
+{
+	int i;
+
+	if ( ( delmass < x->nb_mass ) && ( delmass >= 0) )
+	{
+		for (i=0; i < x->nb_link; ) // delete link connected to the mass to delete
+		{
+			if ( (x->link[i].mass1->num == delmass) || (x->link[i].mass2->num == delmass) )
+			pmpd2d_delLink_int(x, i);
+			else i++;
+			// post("loop %d sur %d", i, x->nb_link);
+		}
+		for (i=0; i < x->nb_link; i++) // change pointer to mass that index moved
+		{
+			if (x->link[i].mass1->num > delmass )
+			{ x->link[i].mass1 = &x->mass[x->link[i].mass1->num-1]; }
+			if (x->link[i].mass2->num > delmass )
+			{ x->link[i].mass2 = &x->mass[x->link[i].mass2->num-1]; }
+		}
+		x->nb_mass--;
+		for (i=delmass; i < x->nb_mass; i++)
+		{
+			x->mass[i]=x->mass[i+1];
+			x->mass[i].num=i;
+		}
+	}
+}
+
+void pmpd2d_delMass(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv)
+{
+	int i, delmass;
+	if ( (argc > 0) && ( argv[0].a_type == A_FLOAT ) )
+		pmpd2d_delMass_int(x, atom_getfloatarg(0, argc, argv));
+	if ( (argc > 0) && ( argv[0].a_type == A_SYMBOL ) )
+		for (i=0; i<x->nb_mass; )
+			if ( atom_getsymbolarg(0,argc,argv) == x->mass[i].Id )
+				pmpd2d_delMass_int(x, i);
+			else i++;
+
+}
diff --git a/pmpd3d.c b/pmpd3d.c
index 8c17057..037ba97 100644
--- a/pmpd3d.c
+++ b/pmpd3d.c
@@ -63,7 +63,8 @@ void pmpd3d_setup(void)
     class_addmethod(pmpd3d_class, (t_method)pmpd3d_link,            		gensym("link"), A_GIMME, 0);

     class_addmethod(pmpd3d_class, (t_method)pmpd3d_tLink,           		gensym("tLink"), A_GIMME, 0);

     class_addmethod(pmpd3d_class, (t_method)pmpd3d_tabLink,         		gensym("tabLink"), A_GIMME, 0);

-

+    class_addmethod(pmpd3d_class, (t_method)pmpd3d_delLink,         		gensym("delLink"), A_GIMME, 0);    

+    class_addmethod(pmpd3d_class, (t_method)pmpd3d_delMass,         		gensym("delMass"), A_GIMME, 0);   

 /*    

  pmpd3d_set

  --

diff --git a/pmpd3d_core.c b/pmpd3d_core.c
index 5925c7a..aefbc8d 100644
--- a/pmpd3d_core.c
+++ b/pmpd3d_core.c
@@ -190,13 +190,13 @@ void pmpd3d_mass(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv)
 // t_symbol *Id, t_float mobile, t_float M, t_float posX, t_float posY, t_float posZ )
 { 
 	x->mass[x->nb_mass].Id = gensym("mass");
-	if ((argc >= 1) &&  (argv[0].a_type == A_SYMBOL))
+	if ((argc >= 1) && (argv[0].a_type == A_SYMBOL))
 		x->mass[x->nb_mass].Id = atom_getsymbolarg(0,argc,argv);
 	x->mass[x->nb_mass].mobile = 1;
 	if ((argc >= 2) &&  (argv[1].a_type == A_FLOAT))
 		x->mass[x->nb_mass].mobile = (int) atom_getfloatarg(1, argc, argv);
 	t_float M = 1;
-	if ((argc >= 3) &&  (argv[2].a_type == A_FLOAT))
+	if ((argc >= 3) && (argv[2].a_type == A_FLOAT))
 		M = atom_getfloatarg(2, argc, argv);
 	if (M<=0) M=1;
 	x->mass[x->nb_mass].invM = 1/M;
@@ -276,7 +276,7 @@ void pmpd3d_link(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv)
     {
         pmpd3d_create_link(x, Id, atom_getfloatarg(1, argc, argv), atom_getfloatarg(2, argc, argv), K, D, Pow, Lmin, Lmax, 0);
     }
-    else if ( ( argv[1].a_type == A_SYMBOL ) && ( argv[2].a_type == A_FLOAT ) )
+    else if ( (argc >= 3) && ( argv[1].a_type == A_SYMBOL ) && ( argv[2].a_type == A_FLOAT ) )
 	{
 		for (i=0; i< x->nb_mass; i++)
 		{
@@ -286,7 +286,7 @@ void pmpd3d_link(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv)
 			}
 		}
 	}
-	else if ( ( argv[1].a_type == A_FLOAT ) && ( argv[2].a_type == A_SYMBOL ) )
+	else if ( (argc >= 3) && ( argv[1].a_type == A_FLOAT ) && ( argv[2].a_type == A_SYMBOL ) )
 	{
 		for (i=0; i< x->nb_mass; i++)
 		{
@@ -296,7 +296,7 @@ void pmpd3d_link(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv)
 			}
 		}
 	}
-	else if ( ( argv[1].a_type == A_SYMBOL ) && ( argv[2].a_type == A_SYMBOL ) )
+	else if ( (argc >= 3) && ( argv[1].a_type == A_SYMBOL ) && ( argv[2].a_type == A_SYMBOL ) )
 	{
 		for (i=0; i< x->nb_mass; i++)
 		{
@@ -339,14 +339,14 @@ void pmpd3d_tLink(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv)
     t_float Lmax =  1000000;
     if (argc > 10) Lmax = atom_getfloatarg(10, argc, argv);
 	
-    if ( ( argv[1].a_type == A_FLOAT ) && ( argv[2].a_type == A_FLOAT ) )
+    if ( (argc >= 3) && ( argv[1].a_type == A_FLOAT ) && ( argv[2].a_type == A_FLOAT ) )
     {
         pmpd3d_create_link(x, Id, mass1, mass2, K, D, Pow, Lmin, Lmax, 1);
         x->link[x->nb_link-1].VX = vecteurX;
         x->link[x->nb_link-1].VY = vecteurY;
         x->link[x->nb_link-1].VZ = vecteurZ;
     }
-    else if ( ( argv[1].a_type == A_SYMBOL ) && ( argv[2].a_type == A_FLOAT ) )
+    else if ( (argc >= 3) && ( argv[1].a_type == A_SYMBOL ) && ( argv[2].a_type == A_FLOAT ) )
 	{
 		for (i=0; i< x->nb_mass; i++)
 		{
@@ -359,7 +359,7 @@ void pmpd3d_tLink(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv)
 			}
 		}
 	}
-	else if ( ( argv[1].a_type == A_FLOAT ) && ( argv[2].a_type == A_SYMBOL ) )
+	else if ( (argc >= 3) && ( argv[1].a_type == A_FLOAT ) && ( argv[2].a_type == A_SYMBOL ) )
 	{
 		for (i=0; i< x->nb_mass; i++)
 		{
@@ -372,7 +372,7 @@ void pmpd3d_tLink(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv)
 			}
 		}
 	}
-	else if ( ( argv[1].a_type == A_SYMBOL ) && ( argv[2].a_type == A_SYMBOL ) )
+	else if ( (argc >= 3) && ( argv[1].a_type == A_SYMBOL ) && ( argv[2].a_type == A_SYMBOL ) )
 	{
 		for (i=0; i< x->nb_mass; i++)
 		{
@@ -466,3 +466,69 @@ void pmpd3d_tabLink(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv)
 		}
 	}
 }
+
+void pmpd3d_delLink_int(t_pmpd3d *x, int dellink)
+{
+	int i;
+	if ( ( dellink < x->nb_link ) && ( dellink >= 0) )
+	{
+		x->nb_link--;
+		for (i=dellink; i < x->nb_link; i++)
+		x->link[i]=x->link[i+1]; 
+	}
+}
+
+void pmpd3d_delLink(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv)
+{
+	int i;
+	if ( (argc > 0) && ( argv[0].a_type == A_FLOAT ) )
+		pmpd2d_delLink_int(x, atom_getfloatarg(0, argc, argv));
+	if ( (argc > 0) && ( argv[0].a_type == A_SYMBOL ) )
+		for (i=0; i<x->nb_link; )
+			if ( atom_getsymbolarg(0,argc,argv) == x->link[i].Id )
+				pmpd2d_delLink_int(x, i);
+			else i++;
+
+}
+
+void pmpd3d_delMass_int(t_pmpd3d *x, int delmass)
+{
+	int i;
+
+	if ( ( delmass < x->nb_mass ) && ( delmass >= 0) )
+	{
+		for (i=0; i < x->nb_link; ) // delete link connected to the mass to delete
+		{
+			if ( (x->link[i].mass1->num == delmass) || (x->link[i].mass2->num == delmass) )
+			pmpd2d_delLink_int(x, i);
+			else i++;
+			// post("loop %d sur %d", i, x->nb_link);
+		}
+		for (i=0; i < x->nb_link; i++) // change pointer to mass that index moved
+		{
+			if (x->link[i].mass1->num > delmass )
+			{ x->link[i].mass1 = &x->mass[x->link[i].mass1->num-1]; }
+			if (x->link[i].mass2->num > delmass )
+			{ x->link[i].mass2 = &x->mass[x->link[i].mass2->num-1]; }
+		}
+		x->nb_mass--;
+		for (i=delmass; i < x->nb_mass; i++)
+		{
+			x->mass[i]=x->mass[i+1];
+			x->mass[i].num=i;
+		}
+	}
+}
+
+void pmpd3d_delMass(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv)
+{
+	int i, delmass;
+	if ( (argc > 0) && ( argv[0].a_type == A_FLOAT ) )
+		pmpd2d_delMass_int(x, atom_getfloatarg(0, argc, argv));
+	if ( (argc > 0) && ( argv[0].a_type == A_SYMBOL ) )
+		for (i=0; i<x->nb_mass; )
+			if ( atom_getsymbolarg(0,argc,argv) == x->mass[i].Id )
+				pmpd2d_delMass_int(x, i);
+			else i++;
+
+}
diff --git a/pmpd_core.c b/pmpd_core.c
index f6eaa2f..9e91d8d 100644
--- a/pmpd_core.c
+++ b/pmpd_core.c
@@ -319,3 +319,69 @@ void pmpd_tabLink(t_pmpd *x, t_symbol *s, int argc, t_atom *argv)
     }
 }
 
+
+void pmpd_delLink_int(t_pmpd *x, int dellink)
+{
+	int i;
+	if ( ( dellink < x->nb_link ) && ( dellink >= 0) )
+	{
+		x->nb_link--;
+		for (i=dellink; i < x->nb_link; i++)
+		x->link[i]=x->link[i+1]; 
+	}
+}
+
+void pmpd_delLink(t_pmpd *x, t_symbol *s, int argc, t_atom *argv)
+{
+	int i;
+	if ( (argc > 0) && ( argv[0].a_type == A_FLOAT ) )
+		pmpd2d_delLink_int(x, atom_getfloatarg(0, argc, argv));
+	if ( (argc > 0) && ( argv[0].a_type == A_SYMBOL ) )
+		for (i=0; i<x->nb_link; )
+			if ( atom_getsymbolarg(0,argc,argv) == x->link[i].Id )
+				pmpd2d_delLink_int(x, i);
+			else i++;
+
+}
+
+void pmpd_delMass_int(t_pmpd *x, int delmass)
+{
+	int i;
+
+	if ( ( delmass < x->nb_mass ) && ( delmass >= 0) )
+	{
+		for (i=0; i < x->nb_link; ) // delete link connected to the mass to delete
+		{
+			if ( (x->link[i].mass1->num == delmass) || (x->link[i].mass2->num == delmass) )
+			pmpd2d_delLink_int(x, i);
+			else i++;
+			// post("loop %d sur %d", i, x->nb_link);
+		}
+		for (i=0; i < x->nb_link; i++) // change pointer to mass that index moved
+		{
+			if (x->link[i].mass1->num > delmass )
+			{ x->link[i].mass1 = &x->mass[x->link[i].mass1->num-1]; }
+			if (x->link[i].mass2->num > delmass )
+			{ x->link[i].mass2 = &x->mass[x->link[i].mass2->num-1]; }
+		}
+		x->nb_mass--;
+		for (i=delmass; i < x->nb_mass; i++)
+		{
+			x->mass[i]=x->mass[i+1];
+			x->mass[i].num=i;
+		}
+	}
+}
+
+void pmpd_delMass(t_pmpd *x, t_symbol *s, int argc, t_atom *argv)
+{
+	int i, delmass;
+	if ( (argc > 0) && ( argv[0].a_type == A_FLOAT ) )
+		pmpd2d_delMass_int(x, atom_getfloatarg(0, argc, argv));
+	if ( (argc > 0) && ( argv[0].a_type == A_SYMBOL ) )
+		for (i=0; i<x->nb_mass; )
+			if ( atom_getsymbolarg(0,argc,argv) == x->mass[i].Id )
+				pmpd2d_delMass_int(x, i);
+			else i++;
+
+}