From d3b52006f4b089bdc764ba163fe970abdec10ca3 Mon Sep 17 00:00:00 2001
From: Cyrille Henry <nusmuk@users.sourceforge.net>
Date: Fri, 28 Dec 2012 22:29:37 +0000
Subject: few debug

svn path=/trunk/externals/pmpd/; revision=16791
---
 pmpd2d.c | 22 +++++++++++-----------
 pmpd3d.c | 14 +++++++-------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/pmpd2d.c b/pmpd2d.c
index 1101485..15057b5 100644
--- a/pmpd2d.c
+++ b/pmpd2d.c
@@ -3192,7 +3192,7 @@ void pmpd2d_linksPosT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv)
 			j = 0;
 			while ((i < vecsize-2) && (j < x->nb_link))
 			{
-				if (atom_getsymbolarg(1,argc,argv) == x->mass[j].Id)
+				if (atom_getsymbolarg(1,argc,argv) == x->link[j].Id)
 				{
 					vec[i].w_float = (x->link[j].mass2->posX + x->link[j].mass1->posX)/2;
 					i++;
@@ -3245,7 +3245,7 @@ void pmpd2d_linksLengthT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv)
 			j = 0;
 			while ((i < vecsize-2) && (j < x->nb_link))
 			{
-				if (atom_getsymbolarg(1,argc,argv) == x->mass[j].Id)
+				if (atom_getsymbolarg(1,argc,argv) == x->link[j].Id)
 				{
 					vec[i].w_float = x->link[j].mass2->posX + x->link[j].mass1->posX;
 					i++;
@@ -3298,7 +3298,7 @@ void pmpd2d_linksPosSpeedT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv)
 			j = 0;
 			while ((i < vecsize-2) && (j < x->nb_link))
 			{
-				if (atom_getsymbolarg(1,argc,argv) == x->mass[j].Id)
+				if (atom_getsymbolarg(1,argc,argv) == x->link[j].Id)
 				{
 					vec[i].w_float = (x->link[j].mass2->speedX + x->link[j].mass1->speedX)/2;
 					i++;
@@ -3351,7 +3351,7 @@ void pmpd2d_linksLengthSpeedT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv)
 			j = 0;
 			while ((i < vecsize-2) && (j < x->nb_link))
 			{
-				if (atom_getsymbolarg(1,argc,argv) == x->mass[j].Id)
+				if (atom_getsymbolarg(1,argc,argv) == x->link[j].Id)
 				{
 					vec[i].w_float = x->link[j].mass2->speedX + x->link[j].mass1->speedX;
 					i++;
@@ -3654,13 +3654,13 @@ void pmpd2d_linksExtremT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv)
 		else
 		{
 			int taille_max = x->nb_link;
-			taille_max = min(taille_max, (vecsize-2)/4);
+			taille_max = min(taille_max, (vecsize-3)/4);
 			for (i=0; i < taille_max ; i++)
 			{
-				vec[6*i  ].w_float = x->link[i].mass1->posX;
-				vec[6*i+1].w_float = x->link[i].mass1->posY;
-				vec[6*i+2].w_float = x->link[i].mass2->posX;
-				vec[6*i+3].w_float = x->link[i].mass2->posY;
+				vec[4*i  ].w_float = x->link[i].mass1->posX;
+				vec[4*i+1].w_float = x->link[i].mass1->posY;
+				vec[4*i+2].w_float = x->link[i].mass2->posX;
+				vec[4*i+3].w_float = x->link[i].mass2->posY;
 			}
 			garray_redraw(a);
 		}
@@ -3677,9 +3677,9 @@ void pmpd2d_linksExtremT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv)
 		{	
 			i = 0;
 			j = 0;
-			while ((i < vecsize-2) && (j < x->nb_link))
+			while ((i < vecsize-3) && (j < x->nb_link))
 			{
-				if (atom_getsymbolarg(1,argc,argv) == x->mass[j].Id)
+				if (atom_getsymbolarg(1,argc,argv) == x->link[j].Id)
 				{
 					vec[i].w_float = x->link[j].mass1->posX;
 					i++;
diff --git a/pmpd3d.c b/pmpd3d.c
index 18a9c40..e45676b 100644
--- a/pmpd3d.c
+++ b/pmpd3d.c
@@ -3895,7 +3895,7 @@ void pmpd3d_linksPosT(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv)
 			j = 0;
 			while ((i < vecsize-2) && (j < x->nb_link))
 			{
-				if (atom_getsymbolarg(1,argc,argv) == x->mass[j].Id)
+				if (atom_getsymbolarg(1,argc,argv) == x->link[j].Id)
 				{
 					vec[i].w_float = (x->link[j].mass2->posX + x->link[j].mass1->posX)/2;
 					i++;
@@ -3951,7 +3951,7 @@ void pmpd3d_linksLengthT(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv)
 			j = 0;
 			while ((i < vecsize-2) && (j < x->nb_link))
 			{
-				if (atom_getsymbolarg(1,argc,argv) == x->mass[j].Id)
+				if (atom_getsymbolarg(1,argc,argv) == x->link[j].Id)
 				{
 					vec[i].w_float = x->link[j].mass2->posX + x->link[j].mass1->posX;
 					i++;
@@ -4007,7 +4007,7 @@ void pmpd3d_linksPosSpeedT(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv)
 			j = 0;
 			while ((i < vecsize-2) && (j < x->nb_link))
 			{
-				if (atom_getsymbolarg(1,argc,argv) == x->mass[j].Id)
+				if (atom_getsymbolarg(1,argc,argv) == x->link[j].Id)
 				{
 					vec[i].w_float = (x->link[j].mass2->speedX + x->link[j].mass1->speedX)/2;
 					i++;
@@ -4063,7 +4063,7 @@ void pmpd3d_linksLengthSpeedT(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv)
 			j = 0;
 			while ((i < vecsize-2) && (j < x->nb_link))
 			{
-				if (atom_getsymbolarg(1,argc,argv) == x->mass[j].Id)
+				if (atom_getsymbolarg(1,argc,argv) == x->link[j].Id)
 				{
 					vec[i].w_float = x->link[j].mass2->speedX + x->link[j].mass1->speedX;
 					i++;
@@ -4379,7 +4379,7 @@ void pmpd3d_linksExtremT(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv)
 		else
 		{
 			int taille_max = x->nb_link;
-			taille_max = min(taille_max, (vecsize-2)/6);
+			taille_max = min(taille_max, (vecsize-5)/6);
 			for (i=0; i < taille_max ; i++)
 			{
 				vec[6*i  ].w_float = x->link[i].mass1->posX;
@@ -4405,9 +4405,9 @@ void pmpd3d_linksExtremT(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv)
 		{	
 			i = 0;
 			j = 0;
-			while ((i < vecsize-2) && (j < x->nb_link))
+			while ((i < vecsize-6) && (j < x->nb_link))
 			{
-				if (atom_getsymbolarg(1,argc,argv) == x->mass[j].Id)
+				if (atom_getsymbolarg(1,argc,argv) == x->link[j].Id)
 				{
 					vec[i].w_float = x->link[j].mass1->posX;
 					i++;
-- 
cgit v1.2.1