From 3d1b29ec4d566d1af1892f23b1d930dea74ea753 Mon Sep 17 00:00:00 2001 From: Cyrille Henry Date: Wed, 24 Apr 2013 13:28:14 +0000 Subject: add a message to change masses a link is connected to. svn path=/trunk/externals/pmpd/; revision=17101 --- pmpd3d.c | 3 ++ pmpd3d_set.c | 123 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 123 insertions(+), 3 deletions(-) diff --git a/pmpd3d.c b/pmpd3d.c index ab6ff24..a8c3c10 100644 --- a/pmpd3d.c +++ b/pmpd3d.c @@ -100,6 +100,9 @@ void pmpd3d_setup(void) class_addmethod(pmpd3d_class, (t_method)pmpd3d_posY, gensym("setPosY"), A_GIMME, 0); class_addmethod(pmpd3d_class, (t_method)pmpd3d_posZ, gensym("setPosZ"), A_GIMME, 0); class_addmethod(pmpd3d_class, (t_method)pmpd3d_overdamp, gensym("setOverdamp"), A_GIMME, 0); + class_addmethod(pmpd3d_class, (t_method)pmpd3d_setConnection1, gensym("setConnection1"), A_GIMME, 0); + class_addmethod(pmpd3d_class, (t_method)pmpd3d_setConnection2, gensym("setConnection2"), A_GIMME, 0); + class_addmethod(pmpd3d_class, (t_method)pmpd3d_setConnection, gensym("setConnection"), A_GIMME, 0); /* pmpd3d_get diff --git a/pmpd3d_set.c b/pmpd3d_set.c index cdc2e5e..6327380 100644 --- a/pmpd3d_set.c +++ b/pmpd3d_set.c @@ -493,6 +493,17 @@ void pmpd3d_setForceZ(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv) } } } + +void pmpd3d_setActivei(t_pmpd3d *x, int i) +{ + float Lx, Ly,Lz, L; + Lx = x->link[i].mass1->posX - x->link[i].mass2->posX; + Ly = x->link[i].mass1->posY - x->link[i].mass2->posY; + Lz = x->link[i].mass1->posZ - x->link[i].mass2->posZ; + L = sqrt( sqr(Lx) + sqr(Ly) + sqr(Lz) ); + x->link[i].distance = L; + x->link[i].active = 1; +} void pmpd3d_setActive(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv) { @@ -502,7 +513,7 @@ void pmpd3d_setActive(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv) { tmp = atom_getfloatarg(0, argc, argv); tmp = max(0, min( x->nb_link-1, tmp)); - x->link[tmp].active = 1; + pmpd3d_setActivei(x,tmp); } else if ( (argc == 1) && ( argv[0].a_type == A_SYMBOL ) ) { @@ -510,7 +521,7 @@ void pmpd3d_setActive(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv) { if ( atom_getsymbolarg(0,argc,argv) == x->link[i].Id ) { - x->link[i].active = 1; + pmpd3d_setActivei(x,i); } } } @@ -518,7 +529,7 @@ void pmpd3d_setActive(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv) { for (i=0; i< x->nb_link; i++) { - x->link[i].active = 1; + pmpd3d_setActivei(x,i); } } } @@ -699,3 +710,109 @@ void pmpd3d_overdamp(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv) } } +void pmpd3d_setConnection1i(t_pmpd3d *x, int i, int j) +{ + float Lx, Ly,Lz, L; + + x->link[i].mass1=&x->mass[max(0, min( x->nb_mass-1, j))]; + Lx = x->link[i].mass1->posX - x->link[i].mass2->posX; + Ly = x->link[i].mass1->posY - x->link[i].mass2->posY; + Lz = x->link[i].mass1->posZ - x->link[i].mass2->posZ; + L = sqrt( sqr(Lx) + sqr(Ly) + sqr(Lz) ); + x->link[i].distance = L; +} + +void pmpd3d_setConnection1(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv) +{ + int tmp, i; + + if ( (argc == 2) && ( argv[0].a_type == A_FLOAT ) && ( argv[1].a_type == A_FLOAT ) ) + { + tmp = atom_getfloatarg(0, argc, argv); + tmp = max(0, min( x->nb_link-1, tmp)); + pmpd3d_setConnection1i(x,tmp,atom_getfloatarg(1, argc, argv)); + + } + else if ( (argc == 2) && ( argv[0].a_type == A_SYMBOL ) && ( argv[1].a_type == A_FLOAT ) ) + { + for (i=0; i< x->nb_link; i++) + { + if ( atom_getsymbolarg(0,argc,argv) == x->link[i].Id ) + { + pmpd3d_setConnection1i(x,i,atom_getfloatarg(1, argc, argv)); + } + } + } +} + +void pmpd3d_setConnection2i(t_pmpd3d *x, int i, int j) +{ + float Lx, Ly,Lz, L; + + x->link[i].mass2=&x->mass[max(0, min( x->nb_mass-1, j))]; + Lx = x->link[i].mass1->posX - x->link[i].mass2->posX; + Ly = x->link[i].mass1->posY - x->link[i].mass2->posY; + Lz = x->link[i].mass1->posZ - x->link[i].mass2->posZ; + L = sqrt( sqr(Lx) + sqr(Ly) + sqr(Lz) ); + x->link[i].distance = L; +} + +void pmpd3d_setConnection2(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv) +{ + int tmp, i; + + if ( (argc == 2) && ( argv[0].a_type == A_FLOAT ) && ( argv[1].a_type == A_FLOAT ) ) + { + tmp = atom_getfloatarg(0, argc, argv); + tmp = max(0, min( x->nb_link-1, tmp)); + pmpd3d_setConnection2i(x,tmp,atom_getfloatarg(1, argc, argv)); + + } + else if ( (argc == 2) && ( argv[0].a_type == A_SYMBOL ) && ( argv[1].a_type == A_FLOAT ) ) + { + for (i=0; i< x->nb_link; i++) + { + if ( atom_getsymbolarg(0,argc,argv) == x->link[i].Id ) + { + pmpd3d_setConnection2i(x,i,atom_getfloatarg(1, argc, argv)); + } + } + } +} + +void pmpd3d_setConnectioni(t_pmpd3d *x, int i, int j, int k) +{ + float Lx, Ly,Lz, L; + + x->link[i].mass1=&x->mass[max(0, min( x->nb_mass-1, j))]; + x->link[i].mass2=&x->mass[max(0, min( x->nb_mass-1, k))]; + + Lx = x->link[i].mass1->posX - x->link[i].mass2->posX; + Ly = x->link[i].mass1->posY - x->link[i].mass2->posY; + Lz = x->link[i].mass1->posZ - x->link[i].mass2->posZ; + L = sqrt( sqr(Lx) + sqr(Ly) + sqr(Lz) ); + x->link[i].distance = L; +} + +void pmpd3d_setConnection(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv) +{ + int tmp, i; + + if ( (argc == 3) && ( argv[0].a_type == A_FLOAT ) && ( argv[1].a_type == A_FLOAT ) && ( argv[2].a_type == A_FLOAT ) ) + { + tmp = atom_getfloatarg(0, argc, argv); + tmp = max(0, min( x->nb_link-1, tmp)); + pmpd3d_setConnectioni(x,tmp,atom_getfloatarg(1, argc, argv),atom_getfloatarg(2, argc, argv)); + + } + else if ( (argc == 3) && ( argv[0].a_type == A_SYMBOL ) && ( argv[1].a_type == A_FLOAT ) && ( argv[2].a_type == A_FLOAT ) ) + { + for (i=0; i< x->nb_link; i++) + { + if ( atom_getsymbolarg(0,argc,argv) == x->link[i].Id ) + { + pmpd3d_setConnectioni(x,i,atom_getfloatarg(1, argc, argv),atom_getfloatarg(2, argc, argv)); + } + } + } +} -- cgit v1.2.1