From d3feb3102308906b8a5b68687011520417f2c4f2 Mon Sep 17 00:00:00 2001 From: Cyrille Henry Date: Wed, 13 Feb 2013 15:36:37 +0000 Subject: bugfix svn path=/trunk/externals/pmpd/; revision=17033 --- TODO.txt | 48 ++++++++++++++++++++++++------------------------ pmpd3d_list.c | 11 ++++++----- 2 files changed, 30 insertions(+), 29 deletions(-) diff --git a/TODO.txt b/TODO.txt index 29223f3..af9b1d2 100644 --- a/TODO.txt +++ b/TODO.txt @@ -17,9 +17,9 @@ DONE : - new statistics messages for links - interactors messages -messages mass list : mette la sortie au synguler TODO : +messages mass list : mette la sortie au singuler setLFactor [Id] multiplication_factor closestNeighbor linkEndL @@ -48,30 +48,30 @@ messages a tester : # class_addmethod(pmpd3d_class, (t_method)pmpd3d_massesPosZL, gensym("massPosZL"), A_GIMME, 0); # class_addmethod(pmpd3d_class, (t_method)pmpd3d_massesSpeedsZL, gensym("massSpeedZL"), A_GIMME, 0); # class_addmethod(pmpd3d_class, (t_method)pmpd3d_massesForcesZL, gensym("massForceZL"), A_GIMME, 0); - class_addmethod(pmpd3d_class, (t_method)pmpd3d_massesPosNormL, gensym("massPosNormL"), A_GIMME, 0); - class_addmethod(pmpd3d_class, (t_method)pmpd3d_massesSpeedsNormL, gensym("massSpeedNormL"), A_GIMME, 0); - class_addmethod(pmpd3d_class, (t_method)pmpd3d_massesForcesNormL, gensym("massForceNormL"), A_GIMME, 0); +# class_addmethod(pmpd3d_class, (t_method)pmpd3d_massesPosNormL, gensym("massPosNormL"), A_GIMME, 0); +# class_addmethod(pmpd3d_class, (t_method)pmpd3d_massesSpeedsNormL, gensym("massSpeedNormL"), A_GIMME, 0); +# class_addmethod(pmpd3d_class, (t_method)pmpd3d_massesForcesNormL, gensym("massForceNormL"), A_GIMME, 0); - class_addmethod(pmpd3d_class, (t_method)pmpd3d_linksPosL, gensym("linkPosL"), A_GIMME, 0); - class_addmethod(pmpd3d_class, (t_method)pmpd3d_linksLengthL, gensym("linkLengthL"), A_GIMME, 0); - class_addmethod(pmpd3d_class, (t_method)pmpd3d_linksPosSpeedL, gensym("linkPosSpeedL"), A_GIMME, 0); - class_addmethod(pmpd3d_class, (t_method)pmpd3d_linksLengthSpeedL, gensym("linkLengthSpeedL"), A_GIMME, 0); - class_addmethod(pmpd3d_class, (t_method)pmpd3d_linksPosXL, gensym("linkPosXL"), A_GIMME, 0); - class_addmethod(pmpd3d_class, (t_method)pmpd3d_linksLengthXL, gensym("linkLengthXL"), A_GIMME, 0); - class_addmethod(pmpd3d_class, (t_method)pmpd3d_linksPosSpeedXL, gensym("linkPosSpeedXL"), A_GIMME, 0); - class_addmethod(pmpd3d_class, (t_method)pmpd3d_linksLengthSpeedXL, gensym("linkLengthSpeedXL"), A_GIMME, 0); - class_addmethod(pmpd3d_class, (t_method)pmpd3d_linksPosYL, gensym("linkPosYL"), A_GIMME, 0); - class_addmethod(pmpd3d_class, (t_method)pmpd3d_linksLengthYL, gensym("linkLengthYL"), A_GIMME, 0); - class_addmethod(pmpd3d_class, (t_method)pmpd3d_linksPosSpeedYL, gensym("linkPosSpeedYL"), A_GIMME, 0); - class_addmethod(pmpd3d_class, (t_method)pmpd3d_linksLengthSpeedYL, gensym("linkLengthSpeedYL"), A_GIMME, 0); - class_addmethod(pmpd3d_class, (t_method)pmpd3d_linksPosZL, gensym("linkPosZL"), A_GIMME, 0); - class_addmethod(pmpd3d_class, (t_method)pmpd3d_linksLengthZL, gensym("linkLengthZL"), A_GIMME, 0); - class_addmethod(pmpd3d_class, (t_method)pmpd3d_linksPosSpeedZL, gensym("linkPosSpeedZL"), A_GIMME, 0); - class_addmethod(pmpd3d_class, (t_method)pmpd3d_linksLengthSpeedZL, gensym("linkLengthSpeedZL"), A_GIMME, 0); - class_addmethod(pmpd3d_class, (t_method)pmpd3d_linksPosNormL, gensym("linkPosNormL"), A_GIMME, 0); - class_addmethod(pmpd3d_class, (t_method)pmpd3d_linksLengthNormL, gensym("linkLengthNormL"), A_GIMME, 0); - class_addmethod(pmpd3d_class, (t_method)pmpd3d_linksPosSpeedNormL, gensym("linkPosSpeedNormL"), A_GIMME, 0); - class_addmethod(pmpd3d_class, (t_method)pmpd3d_linksLengthSpeedNormL, gensym("linkLengthSpeedNormL"), A_GIMME, 0); +# class_addmethod(pmpd3d_class, (t_method)pmpd3d_linksPosL, gensym("linkPosL"), A_GIMME, 0); +# class_addmethod(pmpd3d_class, (t_method)pmpd3d_linksLengthL, gensym("linkLengthL"), A_GIMME, 0); +# class_addmethod(pmpd3d_class, (t_method)pmpd3d_linksPosSpeedL, gensym("linkPosSpeedL"), A_GIMME, 0); +# class_addmethod(pmpd3d_class, (t_method)pmpd3d_linksLengthSpeedL, gensym("linkLengthSpeedL"), A_GIMME, 0); +# class_addmethod(pmpd3d_class, (t_method)pmpd3d_linksPosXL, gensym("linkPosXL"), A_GIMME, 0); +# class_addmethod(pmpd3d_class, (t_method)pmpd3d_linksLengthXL, gensym("linkLengthXL"), A_GIMME, 0); +# class_addmethod(pmpd3d_class, (t_method)pmpd3d_linksPosSpeedXL, gensym("linkPosSpeedXL"), A_GIMME, 0); +# class_addmethod(pmpd3d_class, (t_method)pmpd3d_linksLengthSpeedXL, gensym("linkLengthSpeedXL"), A_GIMME, 0); +# class_addmethod(pmpd3d_class, (t_method)pmpd3d_linksPosYL, gensym("linkPosYL"), A_GIMME, 0); +# class_addmethod(pmpd3d_class, (t_method)pmpd3d_linksLengthYL, gensym("linkLengthYL"), A_GIMME, 0); +# class_addmethod(pmpd3d_class, (t_method)pmpd3d_linksPosSpeedYL, gensym("linkPosSpeedYL"), A_GIMME, 0); +# class_addmethod(pmpd3d_class, (t_method)pmpd3d_linksLengthSpeedYL, gensym("linkLengthSpeedYL"), A_GIMME, 0); +# class_addmethod(pmpd3d_class, (t_method)pmpd3d_linksPosZL, gensym("linkPosZL"), A_GIMME, 0); +# class_addmethod(pmpd3d_class, (t_method)pmpd3d_linksLengthZL, gensym("linkLengthZL"), A_GIMME, 0); +# class_addmethod(pmpd3d_class, (t_method)pmpd3d_linksPosSpeedZL, gensym("linkPosSpeedZL"), A_GIMME, 0); +# class_addmethod(pmpd3d_class, (t_method)pmpd3d_linksLengthSpeedZL, gensym("linkLengthSpeedZL"), A_GIMME, 0); +# class_addmethod(pmpd3d_class, (t_method)pmpd3d_linksPosNormL, gensym("linkPosNormL"), A_GIMME, 0); +# class_addmethod(pmpd3d_class, (t_method)pmpd3d_linksLengthNormL, gensym("linkLengthNormL"), A_GIMME, 0); +# class_addmethod(pmpd3d_class, (t_method)pmpd3d_linksPosSpeedNormL, gensym("linkPosSpeedNormL"), A_GIMME, 0); +# class_addmethod(pmpd3d_class, (t_method)pmpd3d_linksLengthSpeedNormL, gensym("linkLengthSpeedNormL"), A_GIMME, 0); // pmpd3d_tab class_addmethod(pmpd3d_class, (t_method)pmpd3d_linksEndT, gensym("linkEndT"), A_GIMME, 0); diff --git a/pmpd3d_list.c b/pmpd3d_list.c index d212107..5be7083 100644 --- a/pmpd3d_list.c +++ b/pmpd3d_list.c @@ -1094,8 +1094,9 @@ void pmpd3d_linksLengthNormL(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv) sqr(x->link[i].mass2->posX - x->link[i].mass1->posX) + \ sqr(x->link[i].mass2->posY - x->link[i].mass1->posY) + \ sqr(x->link[i].mass2->posZ - x->link[i].mass1->posZ) )); - } - j++; + + j++; + } } outlet_anything(x->main_outlet, gensym("linksLengthNormL"), j, pos_list); } @@ -1129,8 +1130,8 @@ void pmpd3d_linksPosSpeedNormL(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv) sqr((x->link[i].mass1->speedX + x->link[i].mass2->speedX)/2) + \ sqr((x->link[i].mass1->speedY + x->link[i].mass2->speedY)/2) + \ sqr((x->link[i].mass1->speedZ + x->link[i].mass2->speedZ)/2) )); + j++; } - j++; } outlet_anything(x->main_outlet, gensym("linksPosSpeedNormL"), j, pos_list); } @@ -1164,8 +1165,8 @@ void pmpd3d_linksLengthSpeedNormL(t_pmpd3d *x, t_symbol *s, int argc, t_atom *ar sqr((x->link[i].mass1->speedX + x->link[i].mass2->speedX)/2) + \ sqr((x->link[i].mass1->speedY + x->link[i].mass2->speedY)/2) + \ sqr((x->link[i].mass1->speedZ + x->link[i].mass2->speedZ)/2) )); - } - j++; + j++; + } } outlet_anything(x->main_outlet, gensym("linksLengthSpeedNormL"), j, pos_list); } -- cgit v1.2.1