remove unsued variable

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

16 files changed, 37 insertions, 38 deletions

diff --git a/link3D.c b/link3D.c
index bbf0987..d2177a7 100644
--- a/link3D.c
+++ b/link3D.c
@@ -32,7 +32,7 @@ void link3D_position3D2(t_link3D *x, t_floatarg f1, t_floatarg f2, t_floatarg f3
 

 void link3D_bang(t_link3D *x)

 {

-  t_float force, force2, forcex1, forcey1, forcez1, forcex2, forcey2, forcez2, distance;

+  t_float force, forcex1, forcey1, forcez1, forcex2, forcey2, forcez2, distance;

   t_atom force1[3];

 

   distance = sqrt ( pow((x->position3Dx2-x->position3Dx1), 2) + pow((x->position3Dy2-x->position3Dy1),2) + pow((x->position3Dz2-x->position3Dz1), 2) );

diff --git a/mass2D.c b/mass2D.c
index bea7cd7..16bb2ae 100644
--- a/mass2D.c
+++ b/mass2D.c
@@ -347,7 +347,7 @@ void mass2D_inter_seg(t_mass2D *x, t_symbol *s, int argc, t_atom *argv)
 {

 t_float a1, b1, c1, a2, b2, c2, a3, b3, c3, tmp;

 t_float posx1, posx2, posy1, posy2;

-t_float profondeur, prof_max;

+t_float profondeur;

 

 	if (argc == 12) 

 		// 0 : posx1

@@ -448,7 +448,7 @@ void mass2D_inter_line(t_mass2D *x, t_symbol *s, int argc, t_atom *argv)
 {

 t_float a1, b1, c1, tmp;

 t_float posx1, posx2, posy1, posy2;

-t_float profondeur, prof_max;

+t_float profondeur;

 

 	if (argc == 12) 

 		// 0 : posx1

@@ -523,10 +523,10 @@ t_float profondeur, prof_max;
 

 void mass2D_inter_circle(t_mass2D *x, t_symbol *s, int argc, t_atom *argv)

 {

-t_float posx1, posy1, Nx, Ny, dx, dy, distance, Dmax, tmp;

+t_float posx1, posy1, Nx, Ny, distance, Dmax, tmp;

 t_float deltaX_old, deltaY_old, distance_old ;

-t_float fnx=0, fny=0;

-t_float ftx=0, fty=0;

+t_float fnx=0;

+t_float ftx=0;

 

 	if (argc == 20) 

 		// 0 : Xcentre

diff --git a/mass3D.c b/mass3D.c
index e8e362b..f480aba 100644
--- a/mass3D.c
+++ b/mass3D.c
@@ -94,7 +94,7 @@ void mass3D_damp(t_mass3D *x, t_floatarg f1)
   x->damp = f1;

 }

 

-void mass3D_loadbang(t_mass3D *x, t_float posZ)

+void mass3D_loadbang(t_mass3D *x)

 {

   outlet_anything(x->position3D_new, gensym("position3D"), 3, x->pos_new);

 }

@@ -468,7 +468,7 @@ void mass3D_inter_ambient(t_mass3D *x, t_symbol *s, int argc, t_atom *argv)
 

 void mass3D_inter_plane(t_mass3D *x, t_symbol *s, int argc, t_atom *argv)

 {

-	t_float a, b, c, d, profondeur, distance, tmp, profondeur_old;

+	t_float a, b, c, d, profondeur, tmp, profondeur_old;

 

 	if (argc == 12) 

 		// 0 : Xvector

@@ -564,8 +564,7 @@ void mass3D_inter_plane(t_mass3D *x, t_symbol *s, int argc, t_atom *argv)
 

 void mass3D_inter_sphere(t_mass3D *x, t_symbol *s, int argc, t_atom *argv)

 {

-t_float posx1, posy1, posz1, Nx, Ny, Nz, dx, dy, dz, distance, Dmax, tmp;

-t_float deltaX_old, deltaY_old, deltaZ_old, distance_old ;

+t_float posx1, posy1, posz1, Nx, Ny, Nz, distance, Dmax, tmp;

 

 	if (argc == 17) 

 		// 0 : Xcentre

@@ -678,7 +677,7 @@ t_float deltaX_old, deltaY_old, deltaZ_old, distance_old ;
 

 void mass3D_inter_circle(t_mass3D *x, t_symbol *s, int argc, t_atom *argv)

 {

-	t_float a, b, c, d, profondeur, distance, tmp, profondeur_old, rayon, rayon_old;

+	t_float a, b, c, d, profondeur, tmp, profondeur_old, rayon;

 

 	if (argc == 14) 

 		// 0 : Xvector

@@ -771,7 +770,7 @@ void mass3D_inter_circle(t_mass3D *x, t_symbol *s, int argc, t_atom *argv)
 

 void mass3D_inter_cylinder(t_mass3D *x, t_symbol *s, int argc, t_atom *argv)

 {

-	t_float a, b, c, d, profondeur, profondeur_old, distance, tmp, rayon_old, rayon;

+	t_float a, b, c, d, profondeur, profondeur_old, tmp, rayon_old, rayon;

 	t_float Xb, Yb, Zb, Ta, Tb, Tc, Xb_old, Yb_old, Zb_old;

 

 	if (argc == 21) 

diff --git a/pmpd2d_get.c b/pmpd2d_get.c
index 8483d23..513566c 100644
--- a/pmpd2d_get.c
+++ b/pmpd2d_get.c
@@ -468,8 +468,8 @@ void pmpd2d_linkEnd(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv)
             SETFLOAT(&(toout[1]), i);
             SETFLOAT(&(toout[2]), x->link[i].mass1->posX);
             SETFLOAT(&(toout[3]), x->link[i].mass1->posY);
-            SETFLOAT(&(toout[5]), x->link[i].mass2->posX);
-            SETFLOAT(&(toout[6]), x->link[i].mass2->posY);
+            SETFLOAT(&(toout[4]), x->link[i].mass2->posX);
+            SETFLOAT(&(toout[5]), x->link[i].mass2->posY);
             outlet_anything(x->main_outlet, gensym("linkEnd"), 6, toout);
         }
     }
@@ -484,8 +484,8 @@ void pmpd2d_linkEnd(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv)
 				SETFLOAT(&(toout[1]), i);
                 SETFLOAT(&(toout[2]), x->link[i].mass1->posX);
                 SETFLOAT(&(toout[3]), x->link[i].mass1->posY);
-                SETFLOAT(&(toout[5]), x->link[i].mass2->posX);
-                SETFLOAT(&(toout[6]), x->link[i].mass2->posY);
+                SETFLOAT(&(toout[4]), x->link[i].mass2->posX);
+                SETFLOAT(&(toout[5]), x->link[i].mass2->posY);
                 outlet_anything(x->main_outlet, gensym("linkEnd"), 6, toout);
             }
         } 
@@ -499,8 +499,8 @@ void pmpd2d_linkEnd(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv)
             SETFLOAT(&(toout[1]), i);
             SETFLOAT(&(toout[2]), x->link[i].mass1->posX);
             SETFLOAT(&(toout[3]), x->link[i].mass1->posY);
-            SETFLOAT(&(toout[5]), x->link[i].mass2->posX);
-            SETFLOAT(&(toout[6]), x->link[i].mass2->posY);
+            SETFLOAT(&(toout[4]), x->link[i].mass2->posX);
+            SETFLOAT(&(toout[5]), x->link[i].mass2->posY);
             outlet_anything(x->main_outlet, gensym("linkEnd"), 6, toout);
         } 
     }
diff --git a/pmpd2d_interactor.c b/pmpd2d_interactor.c
index 86d6746..3104cdc 100644
--- a/pmpd2d_interactor.c
+++ b/pmpd2d_interactor.c
@@ -42,7 +42,7 @@ void pmpd2d_iCircle(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv)
 	// [7] : max radium of the interactor
 	
 	
-	t_float a, b, R, K, power, tmp, Rmin, Rmax;
+	t_float a, b, R, K, power, Rmin, Rmax;
 	t_int i;
 
 	if (!((argc>=5) && (argv[1].a_type == A_FLOAT)&& (argv[2].a_type == A_FLOAT)&& (argv[3].a_type == A_FLOAT) ))
diff --git a/pmpd2d_stat.c b/pmpd2d_stat.c
index 77c3a44..da4df05 100644
--- a/pmpd2d_stat.c
+++ b/pmpd2d_stat.c
@@ -491,14 +491,14 @@ void pmpd2d_linkPosSpeedMean(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv)
     
     SETFLOAT(&(mean[0]),sommeX);
     SETFLOAT(&(mean[1]),sommeY);
-    SETFLOAT(&(mean[3]),somme);
+    SETFLOAT(&(mean[2]),somme);
     
     outlet_anything(x->main_outlet, gensym("linkPosSpeedMean"),3 , mean);
 }
 
 void pmpd2d_linkLengthSpeedMean(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv)
 {
-	t_float sommeX, sommeY, somme, tmp;
+	t_float sommeX, sommeY, somme;
     t_int i,j;
     t_atom mean[3];
 
@@ -633,7 +633,7 @@ void pmpd2d_linkPosStd(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv)
 
 void pmpd2d_linkLengthStd(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv)
 {
-	t_float sommeX, sommeY, somme, tmp;
+	t_float sommeX, sommeY, somme;
     t_int i,j;
     t_float stdX, stdY, std;
     t_atom std_out[4];
@@ -803,7 +803,7 @@ void pmpd2d_linkPosSpeedStd(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv)
 
 void pmpd2d_linkLengthSpeedStd(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv)
 {
-	t_float sommeX, sommeY, somme, tmp;
+	t_float sommeX, sommeY, somme;
     t_float stdX, stdY, std;
     t_int i,j;
     t_atom std_out[4];
diff --git a/pmpd2d_test.c b/pmpd2d_test.c
index d352a76..795b00b 100644
--- a/pmpd2d_test.c
+++ b/pmpd2d_test.c
@@ -1,6 +1,6 @@
 int test_2d_mass(int i, t_pmpd2d *x, int argc, t_atom *argv)
 {
-	t_float tmp, tmp2;
+	t_float tmp;
 	t_int j = 1;
 	while (j < argc) 
 	{
diff --git a/pmpd2d_various.c b/pmpd2d_various.c
index 8a33f5d..32ee6e1 100644
--- a/pmpd2d_various.c
+++ b/pmpd2d_various.c
@@ -289,7 +289,7 @@ void pmpd2d_closestMass(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv)// t_fl
 
 void pmpd2d_massDistances_f_f(t_pmpd2d *x, t_int i, t_int j)
 {
-	t_float dist, tmp, dx, dy;
+	t_float dist, dx, dy;
 	t_atom to_out[5];
 
 
diff --git a/pmpd3d_interactor.c b/pmpd3d_interactor.c
index 7f005c8..70a9a12 100644
--- a/pmpd3d_interactor.c
+++ b/pmpd3d_interactor.c
@@ -270,7 +270,7 @@ void pmpd3d_iSphere(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv)
 	// [8] : max radium of the interactor
 	
 	
-	t_float a, b, c, R, K, power, tmp, Rmin, Rmax;
+	t_float a, b, c, R, K, power, 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)))
diff --git a/pmpd3d_stat.c b/pmpd3d_stat.c
index b88a93b..6f25cbe 100644
--- a/pmpd3d_stat.c
+++ b/pmpd3d_stat.c
@@ -586,7 +586,7 @@ void pmpd3d_linkPosSpeedMean(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv)
 
 void pmpd3d_linkLengthSpeedMean(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv)
 {
-	t_float sommeX, sommeY, sommeZ, somme, tmp;
+	t_float sommeX, sommeY, sommeZ, somme;
     t_int i,j;
     t_atom mean[4];
 
@@ -737,7 +737,7 @@ void pmpd3d_linkPosStd(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv)
 
 void pmpd3d_linkLengthStd(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv)
 {
-	t_float sommeX, sommeY, sommeZ, somme, tmp;
+	t_float sommeX, sommeY, sommeZ, somme;
     t_int i,j;
     t_float stdX, stdY, stdZ, std;
     t_atom std_out[4];
@@ -925,7 +925,7 @@ void pmpd3d_linkPosSpeedStd(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv)
 
 void pmpd3d_linkLengthSpeedStd(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv)
 {
-	t_float sommeX, sommeY, sommeZ, somme, tmp;
+	t_float sommeX, sommeY, sommeZ, somme;
     t_float stdX, stdY, stdZ, std;
     t_int i,j;
     t_atom std_out[4];
diff --git a/pmpd3d_test.c b/pmpd3d_test.c
index aa69eca..f6f01a6 100644
--- a/pmpd3d_test.c
+++ b/pmpd3d_test.c
@@ -1,6 +1,6 @@
 int test_3d_mass(int i, t_pmpd3d *x, int argc, t_atom *argv)
 {
-	t_float tmp, tmp2;
+	t_float tmp;
 	t_int j = 1;
 	while (j < argc) 
 	{
diff --git a/pmpd3d_various.c b/pmpd3d_various.c
index e05fc23..3b1be8b 100644
--- a/pmpd3d_various.c
+++ b/pmpd3d_various.c
@@ -355,7 +355,7 @@ void pmpd3d_closestMass(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv)
 
 void pmpd3d_massDistances_f_f(t_pmpd3d *x, t_int i, t_int j)
 {
-	t_float dist, tmp,dx,dy,dz;
+	t_float dist,dx,dy,dz;
 	t_atom to_out[6];
 
 	dx = x->mass[i].posX - x->mass[j].posX;
diff --git a/pmpd_core.c b/pmpd_core.c
index 91254b5..61b87a8 100644
--- a/pmpd_core.c
+++ b/pmpd_core.c
@@ -68,7 +68,7 @@ void *pmpd_new()
 
 void pmpd_bang(t_pmpd *x)
 { // this part is doing all the PM
-    t_float F, L, absL, tmpX, speed;
+    t_float F, L, absL, tmpX;
     t_int i;
     // post("bang");
 
diff --git a/pmpd_stat.c b/pmpd_stat.c
index bedd489..aceb5a8 100644
--- a/pmpd_stat.c
+++ b/pmpd_stat.c
@@ -374,7 +374,7 @@ void pmpd_linkPosSpeedMean(t_pmpd *x, t_symbol *s, int argc, t_atom *argv)
 
 void pmpd_linkLengthSpeedMean(t_pmpd *x, t_symbol *s, int argc, t_atom *argv)
 {
-	t_float sommeX, tmp;
+	t_float sommeX;
     t_int i,j;
     t_atom mean[1];
 
@@ -477,7 +477,7 @@ void pmpd_linkPosStd(t_pmpd *x, t_symbol *s, int argc, t_atom *argv)
 
 void pmpd_linkLengthStd(t_pmpd *x, t_symbol *s, int argc, t_atom *argv)
 {
-	t_float sommeX, somme, tmp;
+	t_float sommeX, somme;
     t_int i,j;
     t_float stdX, std;
     t_atom std_out[2];
@@ -615,7 +615,7 @@ void pmpd_linkPosSpeedStd(t_pmpd *x, t_symbol *s, int argc, t_atom *argv)
 
 void pmpd_linkLengthSpeedStd(t_pmpd *x, t_symbol *s, int argc, t_atom *argv)
 {
-	t_float sommeX, tmp;
+	t_float sommeX;
     t_float stdX;
     t_int i,j;
     t_atom std_out[1];
diff --git a/pmpd_test.c b/pmpd_test.c
index c9b9ed1..a8b9121 100644
--- a/pmpd_test.c
+++ b/pmpd_test.c
@@ -1,6 +1,6 @@
 int test_1d_mass(int i, t_pmpd *x, int argc, t_atom *argv)
 {
-	t_float tmp, tmp2;
+	t_float tmp;
 	t_int j = 1;
 	while (j < argc) 
 	{
@@ -100,7 +100,7 @@ int test_1d_mass(int i, t_pmpd *x, int argc, t_atom *argv)
 int test_1d_link(int i, t_pmpd *x, int argc, t_atom *argv)
 {
 	t_int j;
-	t_float tmp, tmp2;
+	t_float tmp;
 	j = 1;
 	
 	while (j < argc) 
diff --git a/pmpd_various.c b/pmpd_various.c
index c31041a..603933a 100644
--- a/pmpd_various.c
+++ b/pmpd_various.c
@@ -160,7 +160,7 @@ void pmpd_closestMass(t_pmpd *x, t_symbol *s, int argc, t_atom *argv)
 
 void pmpd_massDistances_f_f(t_pmpd *x, t_int i, t_int j)
 {
-	t_float dist, tmp;
+	t_float dist;
 	t_atom to_out[3];
 
 	dist = x->mass[i].posX - x->mass[j].posX;