bugfix

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

1 files changed, 139 insertions, 24 deletions

diff --git a/pmpd3d_interactor.c b/pmpd3d_interactor.c
index 57fcd82..7f005c8 100644
--- a/pmpd3d_interactor.c
+++ b/pmpd3d_interactor.c
@@ -1,6 +1,6 @@
 void pmpd3d_iCylinder_i(t_pmpd3d *x, int i, t_float xc, t_float yc, t_float zc, t_float a, t_float b, t_float c, t_float d, t_float R, t_float K, t_float power, t_float Kt, t_float powert, t_float Rmin, t_float Rmax)
 {
-	t_float profondeur, rayon, Xb, Yb, Zb, Xt, Yt, Zt, tmp;
+	t_float profondeur, distance, rayon, Xb, Yb, Zb, Xt, Yt, Zt, tmp;
 
 	profondeur = a * x->mass[i].posX + b * x->mass[i].posY + c * x->mass[i].posZ - d;
 
@@ -9,7 +9,8 @@ void pmpd3d_iCylinder_i(t_pmpd3d *x, int i, t_float xc, t_float yc, t_float zc,
 	Zb = x->mass[i].posZ -zc - profondeur * c;
 
 	rayon = sqrt ( sqr(Xb) + sqr(Yb)  + sqr(Zb) );
-
+	distance = R - rayon;
+	
 	if (rayon != 0)
 	{
 		Xb /= rayon;  // normalisation
@@ -31,16 +32,14 @@ void pmpd3d_iCylinder_i(t_pmpd3d *x, int i, t_float xc, t_float yc, t_float zc,
 // Xt, Yt, Zt : vecteur unitaire tengent au cercle
 // rayon : distance au centre.
 	
-	if ( ((rayon>Rmin) || (Rmin<0)) && ((rayon<Rmax) || (Rmax<0)) )
+	if ( (rayon>Rmin) && (rayon<=Rmax) )
 	{
-		rayon -= R;
-		
-		tmp = pow(K * R, power);
+		tmp = pow_ch(K * distance, power);
 		x->mass[i].forceX += Xb * tmp;
 		x->mass[i].forceY += Yb * tmp;
 		x->mass[i].forceZ += Zb * tmp;
 
-		tmp = pow(Kt * R, powert);
+		tmp =  pow_ch(Kt * distance, powert);
 		x->mass[i].forceX += Xt * tmp;
 		x->mass[i].forceY += Yt * tmp;
 		x->mass[i].forceZ += Zt * tmp;
@@ -61,6 +60,11 @@ void pmpd3d_iCylinder(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv)
 	// [12] : min radium of the interactor
 	// [13] : max radium of the interactor
 	
+	if (!((argc>=9) && (argv[1].a_type == A_FLOAT)&& (argv[2].a_type == A_FLOAT)&& (argv[3].a_type == A_FLOAT)&& (argv[4].a_type == A_FLOAT)&& (argv[5].a_type == A_FLOAT)&& (argv[6].a_type == A_FLOAT)&& (argv[7].a_type == A_FLOAT)&& (argv[8].a_type == A_FLOAT)))
+	{
+		post("bad argument for iCylinder");
+		return;
+	}
 	t_float xc, yc, zc, a, b, c, d, r, K, Kt, power, powert, tmp, Rmin, Rmax;
 	t_int i;
 	
@@ -95,25 +99,25 @@ void pmpd3d_iCylinder(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv)
 
 	Kt = atom_getfloatarg(10, argc, argv);
 	powert = atom_getfloatarg(11, argc, argv);
-	if (powert == 0) power = 1;
+	if (powert == 0) powert = 1;
 	
 	Rmin = -1;
-	Rmax = -1;
+	Rmax = 1000000;
 	if (argc > 12) { Rmin = atom_getfloatarg(12, argc, argv); }
 	if (argc > 13) { Rmax = atom_getfloatarg(13, argc, argv); }
 	
-	if (atom_getfloatarg(0,argc,argv) == -1) // all
+	if ((argc>0) && (argv[0].a_type == A_FLOAT) && (atom_getfloatarg(0,argc,argv) == -1)) // all
 	{
 		for (i=0; i < x->nb_mass; i++)
 		{
 			pmpd3d_iCylinder_i(x, i, xc, yc, zc, a, b, c, d, r, K, power, Kt, powert, Rmin, Rmax);
 		}
 	}
-	else if (argv[0].a_type == A_FLOAT)
+	else if ((argc>0) && (argv[0].a_type == A_FLOAT))
 	{
 		pmpd3d_iCylinder_i(x, atom_getfloatarg(0,argc,argv), xc, yc, zc, a, b, c, d, r, K, power, Kt, powert, Rmin, Rmax);
 	}
-	else if (argv[0].a_type == A_SYMBOL)
+	else if ((argc>0) && (argv[0].a_type == A_SYMBOL))
 	{
 		for (i=0; i < x->nb_mass; i++)
 		{
@@ -125,20 +129,21 @@ void pmpd3d_iCylinder(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv)
 	}
 }
 
-void pmpd3d_iPlane_i(t_pmpd3d *x, int i, t_float a, t_float b, t_float c, t_float d, t_float K, t_float power)
+void pmpd3d_iPlane_i(t_pmpd3d *x, int i, t_float a, t_float b, t_float c, t_float d, t_float K, t_float power, t_float Pmin, t_float Pmax)
 {
 
 	t_float profondeur, force;
 	
 	profondeur = a * x->mass[i].posX + b * x->mass[i].posY + c * x->mass[i].posZ - d;
-	if (profondeur < 0)
+
+	if ((profondeur <= Pmax) && (profondeur > Pmin) )
 	{
-		force = K * pow(abs(profondeur), power);
+		force = K * pow_ch(-profondeur, power);
 		
 		x->mass[i].forceX += a * force;
 		x->mass[i].forceY += b * force;
 		x->mass[i].forceZ += c * force;
-	}
+	 }
 }
 
 void pmpd3d_iPlane(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv)
@@ -148,13 +153,22 @@ void pmpd3d_iPlane(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv)
 	// 1,2,3 : XYZ : vector perpendicular to the plane
 	// 4,5,6 : XYZ : one point of the plane
 	// 7 : K
-	// 8 : power of the force
+	// [8] : power of the force
+	// [9] : Pmin
+	// [10] : Pmax
 	
 	// ax+by+cz-d=0
 	// d est tel que aXcenter +bYcenter + cYcenter = d
-	t_float a, b, c, d, K, power, tmp;
+	
+	t_float a, b, c, d, K, power, tmp, Pmin, Pmax;
 	t_int i;
 
+	if (!((argc>=8) && (argv[1].a_type == A_FLOAT)&& (argv[2].a_type == A_FLOAT)&& (argv[3].a_type == A_FLOAT)&& (argv[4].a_type == A_FLOAT)&& (argv[5].a_type == A_FLOAT)&& (argv[6].a_type == A_FLOAT)&& (argv[7].a_type == A_FLOAT)))
+	{
+		post("bad argument for iPlane");
+		return;
+	}
+	
 	a = atom_getfloatarg(1, argc, argv);
 	b = atom_getfloatarg(2, argc, argv);
 	c = atom_getfloatarg(3, argc, argv);
@@ -179,24 +193,125 @@ void pmpd3d_iPlane(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv)
 	power = atom_getfloatarg(8, argc, argv);
 	if (power == 0) power = 1;
 	
-	if (atom_getfloatarg(0,argc,argv) == -1) // all
+	Pmin = -1000000;
+	if ((argc>=10) && (argv[9].a_type == A_FLOAT)) { Pmin = (atom_getfloatarg(9,argc,argv));}
+	Pmax =  1000000;
+	if ((argc>=11) && (argv[9].a_type == A_FLOAT)) { Pmax = (atom_getfloatarg(10,argc,argv));}
+
+	if ((argc>0) && (argv[0].a_type == A_FLOAT) && (atom_getfloatarg(0,argc,argv) == -1)) // all
+	{
+		for (i=0; i < x->nb_mass; i++)
+		{
+			pmpd3d_iPlane_i(x, i, a, b, c, d, K, power, Pmin, Pmax);
+		}
+	}
+	else if (((argc>0) && argv[0].a_type == A_FLOAT))
+	{
+		pmpd3d_iPlane_i(x,atom_getfloatarg(0,argc,argv), a, b, c, d, K, power, Pmin, Pmax);
+	}
+	else if ((argc>0) && (argv[0].a_type == A_SYMBOL))
+	{
+		for (i=0; i < x->nb_mass; i++)
+		{
+			if (atom_getsymbolarg(0,argc,argv) == x->mass[i].Id)
+			{
+				pmpd3d_iPlane_i(x, i, a, b, c, d, K, power, Pmin, Pmax);
+			}
+		}
+	}	
+}
+
+void pmpd3d_iSphere_i(t_pmpd3d *x, int i, t_float a, t_float b, t_float c, t_float r, t_float K, t_float power, t_float Rmin, t_float Rmax)
+{
+	t_float distance, X, Y, Z, rayon, tmp;
+
+	X = x->mass[i].posX - a;
+	Y = x->mass[i].posY - b;
+	Z = x->mass[i].posZ - c;
+
+	rayon = sqrt ( sqr(X) + sqr(Y)  + sqr(Z) );
+	distance = r - rayon;
+	
+	if (rayon != 0)
+	{
+		X /= rayon;  // normalisation
+		Y /= rayon;
+		Z /= rayon;
+	}
+	else
+	{
+		X = 0;  // normalisation
+		Y = 0;
+		Z = 0;
+	}
+	
+// X, Y, Z : vecteur unitaire normal au cercle
+// rayon : distance au centre.
+	
+	if ( (rayon>Rmin) && (rayon<=Rmax) )
+	{
+		tmp = pow_ch(K * distance, power);
+		x->mass[i].forceX += X * tmp;
+		x->mass[i].forceY += Y * tmp;
+		x->mass[i].forceZ += Z * tmp;
+	}
+}
+
+
+void pmpd3d_iSphere(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv)
+{
+	// Argument : 
+	// 0 : mass to apply this interactor
+	// 1,2,3 : XYZ : center of the sphere
+	// 4 : sphere radius
+	// 5 : K
+	// [6] : power of the force
+	// [7] : min radium of the interactor
+	// [8] : max radium of the interactor
+	
+	
+	t_float a, b, c, R, K, power, tmp, Rmin, Rmax;
+	t_int i;
+
+	if (!((argc>=6) && (argv[1].a_type == A_FLOAT)&& (argv[2].a_type == A_FLOAT)&& (argv[3].a_type == A_FLOAT)&& (argv[4].a_type == A_FLOAT)))
+	{
+		post("bad argument for iSphere");
+		return;
+	}
+	
+	a = atom_getfloatarg(1, argc, argv);
+	b = atom_getfloatarg(2, argc, argv);
+	c = atom_getfloatarg(3, argc, argv);
+
+	R = atom_getfloatarg(4, argc, argv);
+
+	K = atom_getfloatarg(5, argc, argv);
+	power = atom_getfloatarg(6, argc, argv);
+	if (power == 0) power = 1;
+	
+	Rmin = 0;
+	if ((argc>=8) && (argv[7].a_type == A_FLOAT)) { Rmin = (atom_getfloatarg(7,argc,argv));}
+	Rmax =  1000000;
+	if ((argc>=9) && (argv[8].a_type == A_FLOAT)) { Rmax = (atom_getfloatarg(8,argc,argv));}
+
+	if ((argc>0) && (argv[0].a_type == A_FLOAT) && (atom_getfloatarg(0,argc,argv) == -1)) // all
 	{
 		for (i=0; i < x->nb_mass; i++)
 		{
-			pmpd3d_iPlane_i(x, i, a, b, c, d, K, power);
+			pmpd3d_iSphere_i(x, i, a, b, c, R, K, power, Rmin, Rmax);
 		}
 	}
-	else if (argv[0].a_type == A_FLOAT)
+	else if (((argc>0) && argv[0].a_type == A_FLOAT))
 	{
-		pmpd3d_iPlane_i(x,atom_getfloatarg(0,argc,argv), a, b, c, d, K, power);
+		pmpd3d_iSphere_i(x, atom_getfloatarg(0,argc,argv), a, b, c, R, K, power, Rmin, Rmax);
 	}
-	else if (argv[0].a_type == A_SYMBOL)
+	else if ((argc>0) && (argv[0].a_type == A_SYMBOL))
 	{
 		for (i=0; i < x->nb_mass; i++)
 		{
 			if (atom_getsymbolarg(0,argc,argv) == x->mass[i].Id)
 			{
-				pmpd3d_iPlane_i(x, i, a, b, c, d, K, power);
+				pmpd3d_iSphere_i(x, i, a, b, c, R, K, power, Rmin, Rmax);
 			}
 		}
 	}