aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCyrille Henry <nusmuk@users.sourceforge.net>2013-02-26 16:25:07 +0000
committerCyrille Henry <nusmuk@users.sourceforge.net>2013-02-26 16:25:07 +0000
commitb064e772bf2dd33d07c30640a47345a3595c9c50 (patch)
tree896dcdcbff8601dcf4d007b0c36695e39169afa7
parent08b61bd8350daef7499bae14ecb00d012b342ea4 (diff)
bugfix
svn path=/trunk/externals/pmpd/; revision=17052
-rw-r--r--TODO.txt105
-rw-r--r--pmpd3d_core.c149
-rw-r--r--pmpd3d_deprecated.c2
-rw-r--r--pmpd3d_list.c1
-rw-r--r--pmpd3d_set.c2
-rw-r--r--pmpd3d_tab.c1
-rw-r--r--pmpd3d_various.c1
7 files changed, 126 insertions, 135 deletions
diff --git a/TODO.txt b/TODO.txt
index af9b1d2..262ae72 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -19,8 +19,6 @@ DONE :
TODO :
-messages mass list : mette la sortie au singuler
-setLFactor [Id] multiplication_factor
closestNeighbor
linkEndL
add creation parametter to fix maximum number of link and mass
@@ -53,62 +51,67 @@ messages a tester :
# 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_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);
- class_addmethod(pmpd3d_class, (t_method)pmpd3d_linksEnd1T, gensym("linkEnd1T"), A_GIMME, 0);
- class_addmethod(pmpd3d_class, (t_method)pmpd3d_linksEnd2T, gensym("linkEnd2T"), A_GIMME, 0);
- class_addmethod(pmpd3d_class, (t_method)pmpd3d_linksEndXT, gensym("linkEndXT"), A_GIMME, 0);
- class_addmethod(pmpd3d_class, (t_method)pmpd3d_linksEnd1XT, gensym("linkEnd1XT"), A_GIMME, 0);
- class_addmethod(pmpd3d_class, (t_method)pmpd3d_linksEnd2XT, gensym("linkEnd2XT"), A_GIMME, 0);
- class_addmethod(pmpd3d_class, (t_method)pmpd3d_linksEndYT, gensym("linkEndYT"), A_GIMME, 0);
- class_addmethod(pmpd3d_class, (t_method)pmpd3d_linksEnd1YT, gensym("linkEnd1YT"), A_GIMME, 0);
- class_addmethod(pmpd3d_class, (t_method)pmpd3d_linksEnd2YT, gensym("linkEnd2YT"), A_GIMME, 0);
- class_addmethod(pmpd3d_class, (t_method)pmpd3d_linksEndZT, gensym("linkEndZT"), A_GIMME, 0);
- class_addmethod(pmpd3d_class, (t_method)pmpd3d_linksEnd1ZT, gensym("linkEnd1ZT"), A_GIMME, 0);
- class_addmethod(pmpd3d_class, (t_method)pmpd3d_linksEnd2ZT, gensym("linkEnd2ZT"), A_GIMME, 0);
+# class_addmethod(pmpd3d_class, (t_method)pmpd3d_linksEndT, gensym("linkEndT"), A_GIMME, 0);
+# class_addmethod(pmpd3d_class, (t_method)pmpd3d_linksEnd1T, gensym("linkEnd1T"), A_GIMME, 0);
+# class_addmethod(pmpd3d_class, (t_method)pmpd3d_linksEnd2T, gensym("linkEnd2T"), A_GIMME, 0);
+# class_addmethod(pmpd3d_class, (t_method)pmpd3d_linksEndXT, gensym("linkEndXT"), A_GIMME, 0);
+# class_addmethod(pmpd3d_class, (t_method)pmpd3d_linksEnd1XT, gensym("linkEnd1XT"), A_GIMME, 0);
+# class_addmethod(pmpd3d_class, (t_method)pmpd3d_linksEnd2XT, gensym("linkEnd2XT"), A_GIMME, 0);
+# class_addmethod(pmpd3d_class, (t_method)pmpd3d_linksEndYT, gensym("linkEndYT"), A_GIMME, 0);
+# class_addmethod(pmpd3d_class, (t_method)pmpd3d_linksEnd1YT, gensym("linkEnd1YT"), A_GIMME, 0);
+# class_addmethod(pmpd3d_class, (t_method)pmpd3d_linksEnd2YT, gensym("linkEnd2YT"), A_GIMME, 0);
+# class_addmethod(pmpd3d_class, (t_method)pmpd3d_linksEndZT, gensym("linkEndZT"), A_GIMME, 0);
+# class_addmethod(pmpd3d_class, (t_method)pmpd3d_linksEnd1ZT, gensym("linkEnd1ZT"), A_GIMME, 0);
+# class_addmethod(pmpd3d_class, (t_method)pmpd3d_linksEnd2ZT, gensym("linkEnd2ZT"), A_GIMME, 0);
// pmpd3d_test
- class_addmethod(pmpd3d_class, (t_method)pmpd3d_testMass, gensym("testMass"), A_GIMME, 0);
- class_addmethod(pmpd3d_class, (t_method)pmpd3d_testLink, gensym("testLink"), A_GIMME, 0);
- class_addmethod(pmpd3d_class, (t_method)pmpd3d_testMassT, gensym("testMassT"), A_GIMME, 0);
- class_addmethod(pmpd3d_class, (t_method)pmpd3d_testLinkT, gensym("testLinkT"), A_GIMME, 0);
- class_addmethod(pmpd3d_class, (t_method)pmpd3d_testMassT, gensym("testMassL"), A_GIMME, 0);
- class_addmethod(pmpd3d_class, (t_method)pmpd3d_testLinkT, gensym("testLinkL"), A_GIMME, 0);
+# class_addmethod(pmpd3d_class, (t_method)pmpd3d_testMass, gensym("testMass"), A_GIMME, 0);
+# class_addmethod(pmpd3d_class, (t_method)pmpd3d_testLink, gensym("testLink"), A_GIMME, 0);
+# class_addmethod(pmpd3d_class, (t_method)pmpd3d_testMassT, gensym("testMassT"), A_GIMME, 0);
+# class_addmethod(pmpd3d_class, (t_method)pmpd3d_testLinkT, gensym("testLinkT"), A_GIMME, 0);
+# class_addmethod(pmpd3d_class, (t_method)pmpd3d_testMassL, gensym("testMassL"), A_GIMME, 0);
+# class_addmethod(pmpd3d_class, (t_method)pmpd3d_testLinkL, gensym("testLinkL"), A_GIMME, 0);
// pmpd3d_stat
- class_addmethod(pmpd3d_class, (t_method)pmpd3d_linkPosMean, gensym("linkPosMean"), A_GIMME, 0);
- class_addmethod(pmpd3d_class, (t_method)pmpd3d_linkLengthMean, gensym("linkLengthMean"), A_GIMME, 0);
- class_addmethod(pmpd3d_class, (t_method)pmpd3d_linkPosSpeedMean, gensym("linkPosSpeedMean"), A_GIMME, 0);
- class_addmethod(pmpd3d_class, (t_method)pmpd3d_linkLengthSpeedMean, gensym("linkLengthSpeedMean"), A_GIMME, 0);
- class_addmethod(pmpd3d_class, (t_method)pmpd3d_linkPosStd, gensym("linkPosStd"), A_GIMME, 0);
- class_addmethod(pmpd3d_class, (t_method)pmpd3d_linkLengthStd, gensym("linkLengthStd"), A_GIMME, 0);
- class_addmethod(pmpd3d_class, (t_method)pmpd3d_linkPosSpeedStd, gensym("linkPosSpeedStd"), A_GIMME, 0);
- class_addmethod(pmpd3d_class, (t_method)pmpd3d_linkLengthSpeedStd, gensym("linkLengthSpeedStd"), A_GIMME, 0);
+# class_addmethod(pmpd3d_class, (t_method)pmpd3d_linkPosMean, gensym("linkPosMean"), A_GIMME, 0);
+# class_addmethod(pmpd3d_class, (t_method)pmpd3d_linkLengthMean, gensym("linkLengthMean"), A_GIMME, 0);
+# class_addmethod(pmpd3d_class, (t_method)pmpd3d_linkPosSpeedMean, gensym("linkPosSpeedMean"), A_GIMME, 0);
+# class_addmethod(pmpd3d_class, (t_method)pmpd3d_linkLengthSpeedMean, gensym("linkLengthSpeedMean"), A_GIMME, 0);
+# class_addmethod(pmpd3d_class, (t_method)pmpd3d_linkPosStd, gensym("linkPosStd"), A_GIMME, 0);
+# class_addmethod(pmpd3d_class, (t_method)pmpd3d_linkLengthStd, gensym("linkLengthStd"), A_GIMME, 0);
+# class_addmethod(pmpd3d_class, (t_method)pmpd3d_linkPosSpeedStd, gensym("linkPosSpeedStd"), A_GIMME, 0);
+# class_addmethod(pmpd3d_class, (t_method)pmpd3d_linkLengthSpeedStd, gensym("linkLengthSpeedStd"), A_GIMME, 0);
// pmpd3d_interactor
- class_addmethod(pmpd3d_class, (t_method)pmpd3d_iCylinder, gensym("iCylinder"), A_GIMME, 0);
- class_addmethod(pmpd3d_class, (t_method)pmpd3d_iCylinder, gensym("iPlane"), A_GIMME, 0);
-
+# class_addmethod(pmpd3d_class, (t_method)pmpd3d_iCylinder, gensym("iCylinder"), A_GIMME, 0);
+# class_addmethod(pmpd3d_class, (t_method)pmpd3d_iPlane, gensym("iPlane"), A_GIMME, 0);
+# class_addmethod(pmpd3d_class, (t_method)pmpd3d_iSphere, gensym("iSphere"), A_GIMME, 0);
+
// pmpd3d_various
- class_addmethod(pmpd3d_class, (t_method)pmpd3d_massesDistances, gensym("massDistance"), A_GIMME, 0);
+# class_addmethod(pmpd3d_class, (t_method)pmpd3d_massesDistances, gensym("massDistance"), A_GIMME, 0);
+# class_addmethod(pmpd3d_class, (t_method)pmpd3d_forcesXT, gensym("forceXT"), A_GIMME, 0);
+# class_addmethod(pmpd3d_class, (t_method)pmpd3d_forcesYT, gensym("forceYT"), A_GIMME, 0);
+# class_addmethod(pmpd3d_class, (t_method)pmpd3d_forcesZT, gensym("forceZT"), A_GIMME, 0);
+
diff --git a/pmpd3d_core.c b/pmpd3d_core.c
index dff772d..a2a0d16 100644
--- a/pmpd3d_core.c
+++ b/pmpd3d_core.c
@@ -309,55 +309,52 @@ void pmpd3d_tLink(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv)
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 ( ( argv[1].a_type == A_SYMBOL ) && ( argv[2].a_type == A_FLOAT ) )
+ {
+ for (i=0; i< x->nb_mass; i++)
{
- for (i=0; i< x->nb_mass; i++)
+ if ( atom_getsymbolarg(1,argc,argv) == x->mass[i].Id)
{
- if ( atom_getsymbolarg(1,argc,argv) == x->mass[i].Id)
- {
- pmpd3d_create_link(x, Id, i, 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;
- }
+ pmpd3d_create_link(x, Id, i, 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_FLOAT ) && ( argv[2].a_type == A_SYMBOL ) )
+ }
+ else if ( ( argv[1].a_type == A_FLOAT ) && ( argv[2].a_type == A_SYMBOL ) )
+ {
+ for (i=0; i< x->nb_mass; i++)
+ {
+ if ( atom_getsymbolarg(2,argc,argv) == x->mass[i].Id)
{
- for (i=0; i< x->nb_mass; i++)
+ pmpd3d_create_link(x, Id, mass1, i, 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_SYMBOL ) )
+ {
+ for (i=0; i< x->nb_mass; i++)
+ {
+ for (j=0; j< x->nb_mass; j++)
+ {
+ if ( (atom_getsymbolarg(1,argc,argv) == x->mass[i].Id)&(atom_getsymbolarg(2,argc,argv) == x->mass[j].Id))
{
- if ( atom_getsymbolarg(2,argc,argv) == x->mass[i].Id)
+ if (!( (x->mass[i].Id == x->mass[j].Id) && (i>j) ))
+ // si lien entre 2 serie de masses identique entres elle, alors on ne creer qu'un lien sur 2, pour evider les redondances
{
- pmpd3d_create_link(x, Id, mass1, i, K, D, Pow, Lmin, Lmax, 1);
+ pmpd3d_create_link(x, Id, i, j, 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_SYMBOL ) )
- {
- for (i=0; i< x->nb_mass; i++)
- {
- for (j=0; j< x->nb_mass; j++)
- {
- if ( (atom_getsymbolarg(1,argc,argv) == x->mass[i].Id)&(atom_getsymbolarg(2,argc,argv) == x->mass[j].Id))
- {
- if (!( (x->mass[i].Id == x->mass[j].Id) && (i>j) ))
- // si lien entre 2 serie de masses identique entres elle, alors on ne creer qu'un lien sur 2, pour evider les redondances
- {
- pmpd3d_create_link(x, Id, i, j, 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;
- }
- }
- }
- }
- }
+ }
+ }
+ }
}
void pmpd3d_tabLink(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv)
@@ -382,57 +379,53 @@ void pmpd3d_tabLink(t_pmpd3d *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 ( ( argv[1].a_type == A_SYMBOL ) && ( argv[2].a_type == A_FLOAT ) )
+ {
+ for (i=0; i< x->nb_mass; i++)
{
- for (i=0; i< x->nb_mass; i++)
+ if ( atom_getsymbolarg(1,argc,argv) == x->mass[i].Id)
{
- if ( atom_getsymbolarg(1,argc,argv) == x->mass[i].Id)
- {
- pmpd3d_create_link(x, Id, i, mass2, 1, 1, 1, 0, 1000000, 2);
- x->link[x->nb_link-1].arrayK = arrayK;
- x->link[x->nb_link-1].arrayD = arrayD;
- x->link[x->nb_link-1].K_L = Kl;
- x->link[x->nb_link-1].D_L = Dl;
- }
+ pmpd3d_create_link(x, Id, i, mass2, 1, 1, 1, 0, 1000000, 2);
+ x->link[x->nb_link-1].arrayK = arrayK;
+ x->link[x->nb_link-1].arrayD = arrayD;
+ 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_FLOAT ) && ( argv[2].a_type == A_SYMBOL ) )
+ }
+ else if ( ( argv[1].a_type == A_FLOAT ) && ( argv[2].a_type == A_SYMBOL ) )
+ {
+ for (i=0; i< x->nb_mass; i++)
+ {
+ if ( atom_getsymbolarg(2,argc,argv) == x->mass[i].Id)
{
- for (i=0; i< x->nb_mass; i++)
+ pmpd3d_create_link(x, Id, mass1, i, 1, 1, 1, 0, 1000000, 2);
+ x->link[x->nb_link-1].arrayK = arrayK;
+ x->link[x->nb_link-1].arrayD = arrayD;
+ 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_SYMBOL ) )
+ {
+ for (i=0; i< x->nb_mass; i++)
+ {
+ for (j=0; j< x->nb_mass; j++)
+ {
+ if ( (atom_getsymbolarg(1,argc,argv) == x->mass[i].Id)&(atom_getsymbolarg(2,argc,argv) == x->mass[j].Id))
{
- if ( atom_getsymbolarg(2,argc,argv) == x->mass[i].Id)
+ if (!( (x->mass[i].Id == x->mass[j].Id) && (i>j) ))
+ // si lien entre 2 serie de masses identique entres elle, alors on ne creer qu'un lien sur 2, pour evider les redondances
{
- pmpd3d_create_link(x, Id, mass1, i, 1, 1, 1, 0, 1000000, 2);
+ pmpd3d_create_link(x, Id, i, j, 1, 1, 1, 0, 1000000, 2);
x->link[x->nb_link-1].arrayK = arrayK;
x->link[x->nb_link-1].arrayD = arrayD;
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_SYMBOL ) )
- {
- for (i=0; i< x->nb_mass; i++)
- {
- for (j=0; j< x->nb_mass; j++)
- {
- if ( (atom_getsymbolarg(1,argc,argv) == x->mass[i].Id)&(atom_getsymbolarg(2,argc,argv) == x->mass[j].Id))
- {
- if (!( (x->mass[i].Id == x->mass[j].Id) && (i>j) ))
- // si lien entre 2 serie de masses identique entres elle, alors on ne creer qu'un lien sur 2, pour evider les redondances
- {
- pmpd3d_create_link(x, Id, i, j, 1, 1, 1, 0, 1000000, 2);
- x->link[x->nb_link-1].arrayK = arrayK;
- x->link[x->nb_link-1].arrayD = arrayD;
- x->link[x->nb_link-1].K_L = Kl;
- x->link[x->nb_link-1].D_L = Dl;
- }
- }
- }
- }
- }
-
-} \ No newline at end of file
+ }
+ }
+ }
+}
diff --git a/pmpd3d_deprecated.c b/pmpd3d_deprecated.c
index e1f6f7a..aa38afa 100644
--- a/pmpd3d_deprecated.c
+++ b/pmpd3d_deprecated.c
@@ -843,5 +843,3 @@ void pmpd3d_linksLengthSpeedNormL(t_pmpd3d *x)
}
outlet_anything(x->main_outlet, gensym("linksLengthSpeedNormL"),x->nb_link , pos_list);
}
-
-
diff --git a/pmpd3d_list.c b/pmpd3d_list.c
index b750fd0..a362b69 100644
--- a/pmpd3d_list.c
+++ b/pmpd3d_list.c
@@ -1171,4 +1171,3 @@ void pmpd3d_linkLengthSpeedNormL(t_pmpd3d *x, t_symbol *s, int argc, t_atom *arg
outlet_anything(x->main_outlet, gensym("linkLengthSpeedNormL"), j, pos_list);
}
}
-
diff --git a/pmpd3d_set.c b/pmpd3d_set.c
index 3577613..1945ea8 100644
--- a/pmpd3d_set.c
+++ b/pmpd3d_set.c
@@ -676,4 +676,4 @@ void pmpd3d_posZ(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv)
}
}
}
-
+s
diff --git a/pmpd3d_tab.c b/pmpd3d_tab.c
index 4df8bc0..be7f9ff 100644
--- a/pmpd3d_tab.c
+++ b/pmpd3d_tab.c
@@ -2459,4 +2459,3 @@ void pmpd3d_linkEnd2ZT(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv)
}
}
}
-
diff --git a/pmpd3d_various.c b/pmpd3d_various.c
index 912dd00..d33828d 100644
--- a/pmpd3d_various.c
+++ b/pmpd3d_various.c
@@ -585,4 +585,3 @@ void pmpd3d_forcesZT(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv)
}
}
}
-