Pd-cvs March 2008

pd-cvs@lists.iem.at

20 participants
221 discussions

SF.net SVN: pure-data: [9640] tags/pd
by eighthave＠users.sourceforge.net 31 Mar '08

31 Mar '08

Revision: 9640 http://pure-data.svn.sourceforge.net/pure-data/?rev=9640&view=rev Author: eighthave Date: 2008-03-31 10:14:33 -0700 (Mon, 31 Mar 2008) Log Message: ----------- stripped 'pd-' from tag name since it is redudant Added Paths: ----------- tags/pd/0.36-0/ Removed Paths: ------------- tags/pd/pd-0.36-0/ Copied: tags/pd/0.36-0 (from rev 9639, tags/pd/pd-0.36-0) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data: [9639] trunk/externals/tof
by mrtof＠users.sourceforge.net 31 Mar '08

31 Mar '08

Revision: 9639 http://pure-data.svn.sourceforge.net/pure-data/?rev=9639&view=rev Author: mrtof Date: 2008-03-31 08:41:33 -0700 (Mon, 31 Mar 2008) Log Message: ----------- Added breakpoint and breakpoints to tof externals Added Paths: ----------- trunk/externals/tof/help/breakpoints-help.pd trunk/externals/tof/help/breakpoints~-help.pd trunk/externals/tof/src/Makefile trunk/externals/tof/src/breakpoints.c trunk/externals/tof/src/breakpoints~.c trunk/externals/tof/src/breakpoints~.h trunk/externals/tof/src/g_canvas.h trunk/externals/tof/src/w_breakpoints.h Added: trunk/externals/tof/help/breakpoints-help.pd =================================================================== --- trunk/externals/tof/help/breakpoints-help.pd (rev 0) +++ trunk/externals/tof/help/breakpoints-help.pd 2008-03-31 15:41:33 UTC (rev 9639) @@ -0,0 +1,86 @@ +#N canvas 1047 72 917 561 10; +#X obj 89 148 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1 +-1; +#X obj 31 251 breakpoints; +#X obj 29 452 line~; +#X obj 29 497 snapshot~; +#X obj 75 447 loadbang; +#X obj 75 471 metro 100; +#X obj 29 529 nbx 5 28 -1e+037 1e+037 0 0 empty empty empty 0 -8 0 +22 -262144 -1 -1 0 256; +#X msg 29 114 0 1125 0.671429 300 0.557143 700 0.571429 0 0.792857 +375 1 100 0.0857143 1250 0.492857 1150 0; +#X obj 29 78 loadbang; +#X obj 23 48 cnv 15 15 15 empty empty empty 20 12 0 14 -258113 -66577 +0; +#X obj 509 45 cnv 15 15 15 empty empty empty 20 12 0 14 -258113 -66577 +0; +#X text 525 43 Creation arguments; +#X text 506 115 The following breakpoints was created with this line: +breakpoints 100 50 3000 \$0r \$0s \$0d; +#X obj 511 189 breakpoints 100 50 3000 \$0r \$0s \$0d; +#X obj 694 176 r \$0s; +#X obj 639 176 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 +-1 -1; +#X msg 640 224 dump; +#X obj 696 224 r \$0d; +#X obj 639 197 s \$0r; +#X obj 640 246 s \$0r; +#X text 639 150 The beakpoints can now be controlld remotely:; +#X text 28 12 Description: A graphical breakpoint envelope generator +based on envgen by ggee.; +#X msg 110 175 duration 5000; +#X text 39 42 Breakpoints delivers values for line or line~ when it +is banged.; +#X obj 189 452 line; +#X obj 189 526 nbx 5 28 -1e+037 1e+037 0 0 empty empty empty 0 -8 0 +22 -262144 -1 -1 0 256; +#X text 112 147 Deliver the point data to a line or line~; +#X text 90 68 You can set the point data by sending a list with the +following format: initialValue delay1 value1 delay2 value2 ...; +#X msg 567 340 -1 500 3 100 -5; +#X floatatom 516 284 5 0 600 0 - - -; +#X obj 518 377 breakpoints 200 100; +#X obj 567 312 loadbang; +#X floatatom 516 493 5 0 0 0 - - -; +#X text 554 279 By sending a float you can get the an interpolated +point value for the corresponding duration.; +#X text 673 339 Total duration is 600 (500+100); +#X obj 715 499 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 +-1 -1; +#X msg 104 209 dump; +#X text 144 208 Dump the current point data out the second outlet; +#X obj 128 403 print DUMP; +#X msg 272 267 1 100 -5; +#X text 507 64 width height duration receive_symbol send_symbol dump_symbol +change_symbol; +#X obj 694 196 print data; +#X obj 696 249 print dump; +#X text 198 175 set the total duration in milliseconds; +#X obj 228 403 bng 15 250 50 0 empty empty Change 17 7 0 10 -262144 +-1 -1; +#X text 228 418 Bangs when gui is used.; +#X connect 0 0 1 0; +#X connect 1 0 2 0; +#X connect 1 0 24 0; +#X connect 1 1 38 0; +#X connect 1 2 44 0; +#X connect 2 0 3 0; +#X connect 3 0 6 0; +#X connect 4 0 5 0; +#X connect 5 0 3 0; +#X connect 7 0 1 0; +#X connect 8 0 7 0; +#X connect 14 0 41 0; +#X connect 15 0 18 0; +#X connect 16 0 19 0; +#X connect 17 0 42 0; +#X connect 22 0 1 0; +#X connect 24 0 25 0; +#X connect 28 0 30 0; +#X connect 29 0 30 0; +#X connect 30 0 32 0; +#X connect 30 2 35 0; +#X connect 31 0 28 0; +#X connect 36 0 1 0; +#X connect 39 0 1 0; Property changes on: trunk/externals/tof/help/breakpoints-help.pd ___________________________________________________________________ Name: svn:executable + * Added: trunk/externals/tof/help/breakpoints~-help.pd =================================================================== --- trunk/externals/tof/help/breakpoints~-help.pd (rev 0) +++ trunk/externals/tof/help/breakpoints~-help.pd 2008-03-31 15:41:33 UTC (rev 9639) @@ -0,0 +1,54 @@ +#N canvas 10 20 849 503 10; +#X floatatom 23 59 5 0 0 0 - - -; +#X obj 18 447 dac~; +#X obj 223 359 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 +-1 -1; +#X obj 440 208 cnv 15 15 15 empty empty empty 20 12 0 14 -258113 -66577 +0; +#X text 456 206 Creation arguments; +#X text 435 226 width height duration receive_symbol dump_symbol change_symbol +; +#X msg 575 330 dump; +#X obj 629 379 r \$0d; +#X obj 575 352 s \$0r; +#X text 572 305 The beakpoints can now be controlld remotely:; +#X text 439 270 The following breakpoints was created with this line: +breakpoints~ 100 50 3000 \$0r \$0d \$0c; +#X obj 629 403 print dump; +#X obj 446 325 breakpoints~ 100 50 3000 \$0r \$0d \$0c; +#X obj 26 204 breakpoints~; +#X obj 627 331 r \$0c; +#X obj 627 352 print change; +#X obj 129 54 loadbang; +#X text 131 97 You can set the point data by sending a list with the +following format: initialValue delay1 value1 delay2 value2 ...; +#X msg 129 78 0 50 1 50 -1 50 0; +#X obj 24 126 *~ 150; +#X obj 25 404 *~ 0.1; +#X obj 61 381 hsl 128 15 0 1 0 0 empty empty empty -2 -8 0 10 -262144 +-1 -1 0 1; +#X text 28 7 Description: A signal~ graphical breakpoint envelope generator +(based on envgen by ggee).; +#X obj 23 101 phasor~ 200; +#X msg 132 146 duration 150; +#X text 220 146 set the total duration in milliseconds; +#X msg 137 171 dump; +#X text 177 170 Dump the current point data out the second outlet; +#X text 220 374 Bangs when gui is changed; +#X obj 123 356 print DUMP; +#X connect 0 0 23 0; +#X connect 6 0 8 0; +#X connect 7 0 11 0; +#X connect 13 0 20 0; +#X connect 13 1 29 0; +#X connect 13 2 2 0; +#X connect 14 0 15 0; +#X connect 16 0 18 0; +#X connect 18 0 13 0; +#X connect 19 0 13 0; +#X connect 20 0 1 0; +#X connect 20 0 1 1; +#X connect 21 0 20 1; +#X connect 23 0 19 0; +#X connect 24 0 13 0; +#X connect 26 0 13 0; Property changes on: trunk/externals/tof/help/breakpoints~-help.pd ___________________________________________________________________ Name: svn:executable + * Added: trunk/externals/tof/src/Makefile =================================================================== --- trunk/externals/tof/src/Makefile (rev 0) +++ trunk/externals/tof/src/Makefile 2008-03-31 15:41:33 UTC (rev 9639) @@ -0,0 +1,61 @@ +current: + echo make pd_linux, pd_win, or pd_darwin + +clean: ; rm -f *.pd_linux *.o + +# ----------------------- WINDOWS ----------------------- + +pd_win: breakpoints.dll breakpoints~.dll destroysend.dll folderpanel.dll getdollarzero.dll + +.SUFFIXES: .dll + +WINCFLAGS = -Wall -W -Wshadow -Wstrict-prototypes -DPD -DNT -W3 -WX -Wno-unused -mms-bitfields -Wno-parentheses -Wno-switch -O6 -funroll-loops -fomit-frame-pointer + +WINPDPATH = /d/pd/bin + +WININCLUDE = -I.. -I../include -I$(WINPDPATH)/src + +LDFLAGS = -shared + +.c.dll: + gcc -mms-bitfields $(WINCFLAGS) $(WININCLUDE) -o $*.o -c $*.c + gcc $(LDFLAGS) -o $*.dll $*.o $(WINPDPATH)/bin/pd.dll + strip --strip-unneeded $*.dll + rm -f $*.o + + + +# ----------------------- LINUX i386 ----------------------- + +pd_linux: breakpoints.pd_linux breakpoints~.pd_linux destroysend.pd_linux folderpanel.pd_linux getdollarzero.pd_linux + +.SUFFIXES: .pd_linux + +PDPATH = /home/tom/pd/cvs/pd + +LINUXCFLAGS = -DPD -O2 -funroll-loops -fomit-frame-pointer \ + -Wall -W -Wshadow -Wstrict-prototypes \ + -Wno-unused -Wno-parentheses -Wno-switch + +LINUXINCLUDE = -I$(PDPATH)/src + +.c.pd_linux: + cc $(LINUXCFLAGS) $(LINUXINCLUDE) -o $*.o -c $*.c + ld -export_dynamic -shared -o $*.pd_linux $*.o -lc -lm + strip --strip-unneeded $*.pd_linux + rm $*.o + +# ----------------------- Mac OSX ----------------------- + +pd_darwin: breakpoints~.pd_darwin breakpoints.pd_darwin destroysend.pd_darwin folderpanel.pd_darwin getdollarzero.pd_darwin + +.SUFFIXES: .pd_darwin + +DARWINCFLAGS = -DPD -O2 -Wall -W -Wshadow -Wstrict-prototypes \ + -Wno-unused -Wno-parentheses -Wno-switch + +.c.pd_darwin: + cc $(DARWINCFLAGS) $(LINUXINCLUDE) -o $*.o -c $*.c + cc -bundle -undefined suppress -flat_namespace -o $*.pd_darwin $*.o + rm -f $*.o + Property changes on: trunk/externals/tof/src/Makefile ___________________________________________________________________ Name: svn:executable + * Added: trunk/externals/tof/src/breakpoints.c =================================================================== --- trunk/externals/tof/src/breakpoints.c (rev 0) +++ trunk/externals/tof/src/breakpoints.c 2008-03-31 15:41:33 UTC (rev 9639) @@ -0,0 +1,449 @@ +/* (C) Guenter Geiger <geiger(a)epy.co.at> */ + +#include <m_pd.h> + +//#define DEBUG +/* ------------------------ breakpoints~ ----------------------------- */ + +#define NONE 0 +#define ATTACK 1 +#define SUSTAIN -1 +#define STATES 100 + + + +#include "breakpoints~.h" + +#define BACKGROUNDWIDTH "1" +#include "w_breakpoints.h" + +static t_class *breakpoints_class; + + +#define OUT_LIST(x,nr,a) \ + outlet_list(x->x_obj.ob_outlet,&s_list,nr,(t_atom*)&a);\ + if (x->s_sym != &s_ && x->s_sym->s_thing) pd_list(x->s_sym->s_thing, &s_list, nr, (t_atom*)&a); + + +char dumpy[2000]; + +/* initialize envelope with argument vector */ + +#include <stdio.h> + +/* + breakpoints crashes frequently when reallocating memory .... + I really don't know why, it crashes during resizebytes, + which means it is unable to realloc() the memory ????? + the pointer seems to be ok, I don't know what else could + cause the problem. for the moment we prevent from reallocating + by setting the STATES variable to 100 */ + +void breakpoints_resize(t_breakpoints* x,int ns) +{ + if (ns > x->args) { + int newargs = ns*sizeof(t_float); + + x->duration = resizebytes(x->duration,x->args*sizeof(t_float),newargs); + x->finalvalues = resizebytes(x->finalvalues,x->args*sizeof(t_float),newargs); + x->args = ns; + } +} + + + +void breakpoints_totaldur(t_breakpoints* x,t_float dur) +{ + int i; + float f = dur/x->duration[x->last_state]; + + if (dur < 10) { + post("breakpoints: duration too small %f",dur); + return; + } + + for (i=1;i<=x->last_state;i++) + x->duration[i]*=f; +} + + +static void breakpoints_dump(t_breakpoints* e) +{ + t_atom argv[50]; + int argc= 0; + t_atom* a = argv; + int i; + + SETFLOAT(a,e->finalvalues[0]);argc++; + for (i=1;i <= e->last_state;i++) { + SETFLOAT(argv+argc,e->duration[i] - e->duration[i-1]); + argc++; + SETFLOAT(argv+argc,e->finalvalues[i]); + argc++; + } + outlet_list(e->out2,&s_list,argc,(t_atom*)&argv); + if (e->d_sym != &s_) pd_list(e->d_sym->s_thing, &s_list, argc, argv); + //pd_float(x->s_sym->s_thing, val); + //EXTERN void pd_float(t_pd *x, t_float f); + //EXTERN void outlet_list(t_outlet *x, t_symbol *s, int argc, t_atom *argv); + //EXTERN void pd_list(t_pd *x, t_symbol *s, int argc, t_atom *argv); + ///////////////////////////////////////////////////// +} + +void breakpoints_init(t_breakpoints *x,int argc,t_atom* argv) +{ + t_float* dur; + t_float* val; + t_float tdur = 0; + + if (!argc) return; + + x->duration[0] = 0; + + x->last_state = argc>>1; + breakpoints_resize(x,argc>>1); + + dur = x->duration; + val = x->finalvalues; + + // get the first value + if (argc) { + *val = atom_getfloat(argv++); + *dur = 0.0; + x->max = *val; + x->min = *val; + } + dur++;val++;argc--; + // get the following + for (;argc > 0;argc--) { + tdur += atom_getfloat(argv++); +#ifdef DEBUG + post("dur =%f",tdur); +#endif + *dur++ = tdur; + argc--; + if (argc > 0) { + *val = atom_getfloat(argv++); + if (*val > x->max ) x->max = *val; + if (*val < x->min ) x->min = *val; + *val++; + } else { + *val = 0; + if (*val > x->max ) x->max = *val; + if (*val < x->min ) x->min = *val; + *val++; + } +#ifdef DEBUG + post("val =%f",*(val-1)); +#endif + + } + + + + if ( x->max == x->min ) { + if ( x->max == 0 ) { + x->max = 1; + } else { + if (x->max > 0) { + x->min = 0; + } else { + x->max = 0; + } + } + } + +} + + + + + +void breakpoints_list(t_breakpoints *x,t_symbol* s, int argc,t_atom* argv) +{ + breakpoints_init(x,argc,argv); + if (glist_isvisible(x->w.glist)) { + breakpoints_drawme(x, x->w.glist, 0); + } +} + +void breakpoints_setresize(t_breakpoints *x, t_floatarg f) +{ + x->resizeable = f; +} + + + + + +void breakpoints_float(t_breakpoints *x, t_floatarg f) +{ + int state = 0; + float val; + + + + while (x->duration[state] < f && state < x->last_state) state++; + + if (state == 0 || f >= x->duration[x->last_state]) { + val = x->finalvalues[state]; + outlet_float(x->x_obj.ob_outlet,val); + if (x->s_sym != &s_) pd_float(x->s_sym->s_thing, f); + return; + } + + val = x->finalvalues[state-1] + + (f - x->duration[state-1])* + (x->finalvalues[state] - x->finalvalues[state-1])/ + (x->duration[state] - x->duration[state-1]); + + //val *= (x->max - x->min); + outlet_float(x->x_obj.ob_outlet,val); + if (x->s_sym != &s_) pd_float(x->s_sym->s_thing, val); +} + + + +void breakpoints_bang(t_breakpoints *x) +{ + t_atom a[2]; + + SETFLOAT(a,x->finalvalues[NONE]); + SETFLOAT(a+1,0); + + OUT_LIST(x,2,a); + + // we don't force the first value anymore, so the first value + //is actually with what we have left off at the end ... + //this reduces clicks + + x->x_state = ATTACK; + x->x_val = x->finalvalues[NONE]; + + SETFLOAT(a,x->finalvalues[x->x_state]); + SETFLOAT(a+1,x->duration[x->x_state]); + + OUT_LIST(x,2,a); + clock_delay(x->x_clock,x->duration[x->x_state]); +} + +/* + +void breakpoints_release(t_breakpoints* x) { + t_atom a[2]; + float del = x->duration[x->x_state] - x->duration[x->x_state-1]; + if (x->x_state <= x->sustain_state) { + x->x_state = x->sustain_state+1; // skip sustain state + clock_delay(x->x_clock,del); + SETFLOAT(a,x->finalvalues[x->x_state]*(x->max-x->min)); + SETFLOAT(a+1,del); + OUT_LIST(x,2,a); + } +} + +static void breakpoints_sustain(t_breakpoints *x, t_floatarg f) +{ + if (f > 0 && f < x->last_state) + x->sustain_state = f; + else + pd_error(x,"sustain value not betweem 0 and %f, ignoring message", x->last_state); +} + +*/ + + +static void breakpoints_tick(t_breakpoints* x) +{ + t_atom a[2]; + x->x_state++; + if (x->x_state <= x->last_state && x->x_state != x->sustain_state) { + float del = x->duration[x->x_state] - x->duration[x->x_state-1]; + clock_delay(x->x_clock,del); + SETFLOAT(a,x->finalvalues[x->x_state]); + SETFLOAT(a+1,del); + OUT_LIST(x,2,a); + } +// else +// clock_unset(x->x_clock); +} + + + +/* +static void breakpoints_freeze(t_breakpoints* x, t_floatarg f) +{ + x->x_freeze = f; +} +*/ + +static void bindsym(t_pd* x,t_symbol* o,t_symbol* s) +{ + if (o != &s_) pd_unbind(x,o); + o = s; + pd_bind(x,s); +} + + + + + + + + + +static void *breakpoints_new(t_symbol *s,int argc,t_atom* argv) +{ + t_breakpoints *x = (t_breakpoints *)pd_new(breakpoints_class); + + + + x->x_f = 0; + x->args = STATES; + x->finalvalues = getbytes( x->args*sizeof(t_float)); + x->duration = getbytes( x->args*sizeof(t_float)); +#ifdef DEBUG + post("finalvalues %x",x->finalvalues); +#endif + /* widget */ + + x->w.grabbed = 0; + x->resizing = 0; + x->resizeable = 0; + x->w.glist = (t_glist*) canvas_getcurrent(); + + x->w.width = 200; + if (argc) x->w.width = atom_getfloat(argv++),argc--; + x->w.height = 140; + if (argc) x->w.height = atom_getfloat(argv++),argc--; + + t_float initialDuration = 100; + if (argc) initialDuration = atom_getfloat(argv++),argc--; + + x->r_sym = &s_; + if (argc) { + t_symbol* n; + + n = atom_getsymbol(argv++); + bindsym(&x->x_obj.ob_pd,x->r_sym,n); + x->r_sym = n; + argc--; + } + #ifdef DEBUG + post("recv %s",x->r_sym->s_name); +#endif + x->s_sym = &s_; + if (argc) x->s_sym = atom_getsymbol(argv++),argc--; + #ifdef DEBUG + post("send %s",x->s_sym->s_name); + #endif + x->d_sym = &s_; + if (argc) x->d_sym = atom_getsymbol(argv++),argc--; + #ifdef DEBUG + post("send %s",x->d_sym->s_name); + #endif + + x->c_sym = &s_; + if (argc) x->c_sym = atom_getsymbol(argv++),argc--; + #ifdef DEBUG + post("change %s",x->d_sym->s_name); + #endif + + if (argc>2) + breakpoints_init(x,argc,argv); + else { + t_atom a[5]; + SETFLOAT(a,0); + SETFLOAT(a+1,50); + SETFLOAT(a+2,1); + SETFLOAT(a+3,50); + SETFLOAT(a+4,0); + breakpoints_init(x,5,a); + } + + x->x_val = 0.0; + x->x_state = NONE; + x->sustain_state = SUSTAIN; + x->x_freeze = 0; + + + breakpoints_totaldur(x,initialDuration); + + + //outlet_new(&x->x_obj, gensym("signal")); + outlet_new(&x->x_obj, &s_float); + x->out2 = outlet_new(&x->x_obj, &s_float); + x->out3 = outlet_new(&x->x_obj, &s_bang); + + x->x_clock = clock_new(x, (t_method) breakpoints_tick); + return (x); +} + + +void breakpoints_motion(t_breakpoints *x, t_floatarg dx, t_floatarg dy); +void breakpoints_click(t_breakpoints *x, + t_floatarg xpos, t_floatarg ypos, t_floatarg shift, t_floatarg ctrl, + t_floatarg alt); +void breakpoints_key(t_breakpoints *x, t_floatarg f); + +t_widgetbehavior breakpoints_widgetbehavior; + + +static void breakpoints_free(t_breakpoints *x) { + + + if (x->r_sym != &s_) pd_unbind(&x->x_obj.ob_pd, x->r_sym); + +} + +void breakpoints_setup(void) +{ + breakpoints_class = class_new(gensym("breakpoints"), (t_newmethod)breakpoints_new, (t_method)breakpoints_free, + sizeof(t_breakpoints), 0,A_GIMME,0); + + //CLASS_MAINSIGNALIN(breakpoints_class, t_breakpoints, x_f); + /* here we tell Pd about the "dsp" method, which is called back + when DSP is turned on. */ + //class_addmethod(breakpoints_class, (t_method)breakpointssig_dsp, gensym("dsp"), 0); + + + //class_addcreator((t_newmethod)breakpoints_new,gensym("breakpoints~"),A_GIMME,0); + + class_addfloat(breakpoints_class, breakpoints_float); + + class_addbang(breakpoints_class,breakpoints_bang); + class_addlist(breakpoints_class,breakpoints_list); + //class_addmethod(breakpoints_class,(t_method)breakpoints_sustain,gensym("sustain"),A_FLOAT,A_NULL); + + class_addmethod(breakpoints_class, (t_method)breakpoints_motion, gensym("motion"),A_FLOAT, A_FLOAT, 0); + class_addmethod(breakpoints_class, (t_method)breakpoints_key, gensym("key"), + A_FLOAT, 0); + + class_addmethod(breakpoints_class,(t_method)breakpoints_totaldur,gensym("duration"),A_FLOAT,NULL); + //class_addmethod(breakpoints_class,(t_method)breakpoints_freeze,gensym("freeze"),A_FLOAT,NULL); + class_addmethod(breakpoints_class,(t_method)breakpoints_setresize,gensym("resize"),A_FLOAT,A_NULL); + + //class_addmethod(breakpoints_class,(t_method)breakpoints_release,gensym("release"),A_NULL); + breakpoints_widgetbehavior.w_getrectfn = breakpoints_getrect; + breakpoints_widgetbehavior.w_displacefn = breakpoints_displace; + breakpoints_widgetbehavior.w_selectfn = breakpoints_select; + breakpoints_widgetbehavior.w_activatefn = breakpoints_activate; + breakpoints_widgetbehavior.w_deletefn = breakpoints_delete; + breakpoints_widgetbehavior.w_visfn = breakpoints_vis; + breakpoints_widgetbehavior.w_clickfn = (t_clickfn) breakpoints_newclick; + //breakpoints_widgetbehavior.w_clickfn = NULL; +#if PD_MINOR_VERSION < 37 + breakpoints_widgetbehavior.w_propertiesfn = NULL; + //breakpoints_widgetbehavior.w_savefn = breakpoints_save; + breakpoints_widgetbehavior.w_savefn = NULL; +#endif + + class_setwidget(breakpoints_class,&breakpoints_widgetbehavior); +#if PD_MINOR_VERSION >= 37 + //class_setsavefn(breakpoints_class,&breakpoints_save); +#endif + class_addmethod(breakpoints_class,(t_method)breakpoints_dump,gensym("dump"),A_NULL); + + +} + + Property changes on: trunk/externals/tof/src/breakpoints.c ___________________________________________________________________ Name: svn:executable + * Added: trunk/externals/tof/src/breakpoints~.c =================================================================== --- trunk/externals/tof/src/breakpoints~.c (rev 0) +++ trunk/externals/tof/src/breakpoints~.c 2008-03-31 15:41:33 UTC (rev 9639) @@ -0,0 +1,479 @@ +/* (C) Guenter Geiger <geiger(a)epy.co.at> */ + +#include <m_pd.h> + +//#define DEBUG +/* ------------------------ breakpoints~ ----------------------------- */ + +#define NONE 0 +#define ATTACK 1 +#define SUSTAIN -1 +#define STATES 100 + + + +#include "breakpoints~.h" + +#define BACKGROUNDWIDTH "2" +#include "w_breakpoints.h" + +static t_class *breakpoints_class; + + +#define OUT_LIST(x,nr,a) \ + outlet_list(x->x_obj.ob_outlet,&s_list,nr,(t_atom*)&a);\ + if (x->s_sym != &s_ && x->s_sym->s_thing) pd_list(x->s_sym->s_thing, &s_list, nr, (t_atom*)&a); + + +char dumpy[2000]; + +/* initialize envelope with argument vector */ + +#include <stdio.h> + +/* + breakpoints crashes frequently when reallocating memory .... + I really don't know why, it crashes during resizebytes, + which means it is unable to realloc() the memory ????? + the pointer seems to be ok, I don't know what else could + cause the problem. for the moment we prevent from reallocating + by setting the STATES variable to 100 */ + +void breakpoints_resize(t_breakpoints* x,int ns) +{ + if (ns > x->args) { + int newargs = ns*sizeof(t_float); + + x->duration = resizebytes(x->duration,x->args*sizeof(t_float),newargs); + x->finalvalues = resizebytes(x->finalvalues,x->args*sizeof(t_float),newargs); + x->args = ns; + } +} + + /* this is the actual performance routine which acts on the samples. + It's called with a single pointer "w" which is our location in the + DSP call list. We return a new "w" which will point to the next item + after us. Meanwhile, w[0] is just a pointer to dsp-perform itself + (no use to us), w[1] and w[2] are the input and output vector locations, + and w[3] is the number of points to calculate. */ +static t_int *breakpointssig_perform(t_int *w) +{ + + t_breakpoints *x = (t_breakpoints *)(w[1]); + t_float *in = (t_float *)(w[2]); + t_float *out = (t_float *)(w[3]); + int n = (int)(w[4]); + + int state; + float f; + float val; + + while (n--) + { + + // STUFF + state = 0; + f = *(in++); + + while (x->duration[state] < f && state < x->last_state) state++; + + if (state == 0 || f >= x->duration[x->last_state]) { + val = x->finalvalues[state]; + + } else { + val = x->finalvalues[state-1] + (f - x->duration[state-1]) * + (x->finalvalues[state] - x->finalvalues[state-1]) / + (x->duration[state] - x->duration[state-1]); + + + + } + // STUFF END + + + *out++ = val; + } + return (w+5); +} + + + + /* called to start DSP. Here we call Pd back to add our perform + routine to a linear callback list which Pd in turn calls to grind + out the samples. */ +static void breakpointssig_dsp(t_breakpoints *x, t_signal **sp) +{ + dsp_add(breakpointssig_perform, 4, x,sp[0]->s_vec, sp[1]->s_vec, sp[0]->s_n); +} + +void breakpoints_totaldur(t_breakpoints* x,t_float dur) +{ + int i; + float f = dur/x->duration[x->last_state]; + + if (dur < 10) { + post("breakpoints: duration too small %f",dur); + return; + } + + for (i=1;i<=x->last_state;i++) + x->duration[i]*=f; +} + + +static void breakpoints_dump(t_breakpoints* e) +{ + t_atom argv[50]; + int argc= 0; + t_atom* a = argv; + int i; + + SETFLOAT(a,e->finalvalues[0]);argc++; + for (i=1;i <= e->last_state;i++) { + SETFLOAT(argv+argc,e->duration[i] - e->duration[i-1]); + argc++; + SETFLOAT(argv+argc,e->finalvalues[i]); + argc++; + } + outlet_list(e->out2,&s_list,argc,(t_atom*)&argv); + if (e->d_sym != &s_) pd_list(e->d_sym->s_thing, &s_list, argc, argv); + //pd_float(x->s_sym->s_thing, val); + //EXTERN void pd_float(t_pd *x, t_float f); + //EXTERN void outlet_list(t_outlet *x, t_symbol *s, int argc, t_atom *argv); + //EXTERN void pd_list(t_pd *x, t_symbol *s, int argc, t_atom *argv); + ///////////////////////////////////////////////////// +} + +void breakpoints_init(t_breakpoints *x,int argc,t_atom* argv) +{ + t_float* dur; + t_float* val; + t_float tdur = 0; + + if (!argc) return; + + x->duration[0] = 0; + + x->last_state = argc>>1; + breakpoints_resize(x,argc>>1); + + dur = x->duration; + val = x->finalvalues; + + // get the first value + if (argc) { + *val = atom_getfloat(argv++); + *dur = 0.0; + x->max = *val; + x->min = *val; + } + dur++;val++;argc--; + // get the following + for (;argc > 0;argc--) { + tdur += atom_getfloat(argv++); +#ifdef DEBUG + post("dur =%f",tdur); +#endif + *dur++ = tdur; + argc--; + if (argc > 0) { + *val = atom_getfloat(argv++); + if (*val > x->max ) x->max = *val; + if (*val < x->min ) x->min = *val; + *val++; + } else { + *val = 0; + if (*val > x->max ) x->max = *val; + if (*val < x->min ) x->min = *val; + *val++; + } +#ifdef DEBUG + post("val =%f",*(val-1)); +#endif + + } + + if ( x->max == x->min ) { + if ( x->max == 0 ) { + x->max = 1; + } else { + if (x->max > 0) { + x->min = 0; + } else { + x->max = 0; + } + } + } + +} + + + + + +void breakpoints_list(t_breakpoints *x,t_symbol* s, int argc,t_atom* argv) +{ + breakpoints_init(x,argc,argv); + if (glist_isvisible(x->w.glist)) { + breakpoints_drawme(x, x->w.glist, 0); + } +} + +void breakpoints_setresize(t_breakpoints *x, t_floatarg f) +{ + x->resizeable = f; +} + + + + + +void breakpoints_float(t_breakpoints *x, t_floatarg f) +{ + int state = 0; + float val; + + + + while (x->duration[state] < f && state < x->last_state) state++; + + if (state == 0 || f >= x->duration[x->last_state]) { + val = x->finalvalues[state]*(x->max-x->min); + outlet_float(x->x_obj.ob_outlet,f); + if (x->s_sym != &s_) pd_float(x->s_sym->s_thing, f); + return; + } + + val = x->finalvalues[state-1] + + (f - x->duration[state-1])* + (x->finalvalues[state] - x->finalvalues[state-1])/ + (x->duration[state] - x->duration[state-1]); + + val *= (x->max - x->min); + outlet_float(x->x_obj.ob_outlet,val); + if (x->s_sym != &s_) pd_float(x->s_sym->s_thing, val); +} + + + + + + +/* + +void breakpoints_release(t_breakpoints* x) { + t_atom a[2]; + float del = x->duration[x->x_state] - x->duration[x->x_state-1]; + if (x->x_state <= x->sustain_state) { + x->x_state = x->sustain_state+1; // skip sustain state + clock_delay(x->x_clock,del); + SETFLOAT(a,x->finalvalues[x->x_state]*(x->max-x->min)); + SETFLOAT(a+1,del); + OUT_LIST(x,2,a); + } +} + +static void breakpoints_sustain(t_breakpoints *x, t_floatarg f) +{ + if (f > 0 && f < x->last_state) + x->sustain_state = f; + else + pd_error(x,"sustain value not betweem 0 and %f, ignoring message", x->last_state); +} + +*/ + +/* +static void breakpoints_tick(t_breakpoints* x) +{ + t_atom a[2]; + x->x_state++; + if (x->x_state <= x->last_state && x->x_state != x->sustain_state) { + float del = x->duration[x->x_state] - x->duration[x->x_state-1]; + clock_delay(x->x_clock,del); + SETFLOAT(a,x->finalvalues[x->x_state]*(x->max-x->min)); + SETFLOAT(a+1,del); + OUT_LIST(x,2,a); + } +// else +// clock_unset(x->x_clock); +} + +*/ + +/* +static void breakpoints_freeze(t_breakpoints* x, t_floatarg f) +{ + x->x_freeze = f; +} +*/ + +static void bindsym(t_pd* x,t_symbol* o,t_symbol* s) +{ + if (o != &s_) pd_unbind(x,o); + o = s; + pd_bind(x,s); +} + + + + + + + + +static void *breakpoints_new(t_symbol *s,int argc,t_atom* argv) +{ + t_breakpoints *x = (t_breakpoints *)pd_new(breakpoints_class); + + + + x->x_f = 0; + x->args = STATES; + x->finalvalues = getbytes( x->args*sizeof(t_float)); + x->duration = getbytes( x->args*sizeof(t_float)); +#ifdef DEBUG + post("finalvalues %x",x->finalvalues); +#endif + /* widget */ + + x->w.grabbed = 0; + x->resizing = 0; + x->resizeable = 0; + x->w.glist = (t_glist*) canvas_getcurrent(); + + x->w.width = 200; + if (argc) x->w.width = atom_getfloat(argv++),argc--; + x->w.height = 140; + if (argc) x->w.height = atom_getfloat(argv++),argc--; + + t_float initialDuration = 100; + if (argc) initialDuration = atom_getfloat(argv++),argc--; + + x->r_sym = &s_; + if (argc) { + t_symbol* n; + + n = atom_getsymbol(argv++); + bindsym(&x->x_obj.ob_pd,x->r_sym,n); + x->r_sym = n; + argc--; + } + #ifdef DEBUG + post("recv %s",x->r_sym->s_name); + #endif + /* + x->s_sym = &s_; + if (argc) x->s_sym = atom_getsymbol(argv++),argc--; + #ifdef DEBUG + post("send %s",x->s_sym->s_name); + #endif + */ + x->d_sym = &s_; + if (argc) x->d_sym = atom_getsymbol(argv++),argc--; + #ifdef DEBUG + post("dump %s",x->d_sym->s_name); + #endif + + x->c_sym = &s_; + if (argc) x->c_sym = atom_getsymbol(argv++),argc--; + + if (argc>2) + breakpoints_init(x,argc,argv); + else { + t_atom a[5]; + SETFLOAT(a,0); + SETFLOAT(a+1,50); + SETFLOAT(a+2,1); + SETFLOAT(a+3,50); + SETFLOAT(a+4,0); + breakpoints_init(x,5,a); + } + + x->x_val = 0.0; + x->x_state = NONE; + x->sustain_state = SUSTAIN; + x->x_freeze = 0; + + breakpoints_totaldur(x,initialDuration); + + outlet_new(&x->x_obj, gensym("signal")); + //outlet_new(&x->x_obj, &s_float); + x->out2 = outlet_new(&x->x_obj, &s_float); + x->out3 = outlet_new(&x->x_obj, &s_bang); + + //x->x_clock = clock_new(x, (t_method) breakpoints_tick); + return (x); +} + + + + +void breakpoints_motion(t_breakpoints *x, t_floatarg dx, t_floatarg dy); +void breakpoints_click(t_breakpoints *x, + t_floatarg xpos, t_floatarg ypos, t_floatarg shift, t_floatarg ctrl, + t_floatarg alt); +void breakpoints_key(t_breakpoints *x, t_floatarg f); + +t_widgetbehavior breakpoints_widgetbehavior; + + + +static void breakpoints_free(t_breakpoints *x) { + + + if (x->r_sym != &s_) pd_unbind(&x->x_obj.ob_pd, x->r_sym); + +} + +void breakpoints_tilde_setup(void) +{ + breakpoints_class = class_new(gensym("breakpoints~"), (t_newmethod)breakpoints_new, (t_method)breakpoints_free, + sizeof(t_breakpoints), 0,A_GIMME,0); + + CLASS_MAINSIGNALIN(breakpoints_class, t_breakpoints, x_f); + /* here we tell Pd about the "dsp" method, which is called back + when DSP is turned on. */ + class_addmethod(breakpoints_class, (t_method)breakpointssig_dsp, gensym("dsp"), 0); + + + //class_addcreator((t_newmethod)breakpoints_new,gensym("breakpoints~"),A_GIMME,0); + //class_addfloat(breakpoints_class, breakpoints_float); + + //class_addbang(breakpoints_class,breakpoints_bang); + class_addlist(breakpoints_class,breakpoints_list); + //class_addmethod(breakpoints_class,(t_method)breakpoints_sustain,gensym("sustain"),A_FLOAT,A_NULL); + + class_addmethod(breakpoints_class, (t_method)breakpoints_motion, gensym("motion"),A_FLOAT, A_FLOAT, 0); + class_addmethod(breakpoints_class, (t_method)breakpoints_key, gensym("key"), + A_FLOAT, 0); + + class_addmethod(breakpoints_class,(t_method)breakpoints_totaldur,gensym("duration"),A_FLOAT,NULL); + //class_addmethod(breakpoints_class,(t_method)breakpoints_freeze,gensym("freeze"),A_FLOAT,NULL); + class_addmethod(breakpoints_class,(t_method)breakpoints_setresize,gensym("resize"),A_FLOAT,A_NULL); + + //class_addmethod(breakpoints_class,(t_method)breakpoints_release,gensym("release"),A_NULL); + breakpoints_widgetbehavior.w_getrectfn = breakpoints_getrect; + breakpoints_widgetbehavior.w_displacefn = breakpoints_displace; + breakpoints_widgetbehavior.w_selectfn = breakpoints_select; + breakpoints_widgetbehavior.w_activatefn = breakpoints_activate; + breakpoints_widgetbehavior.w_deletefn = breakpoints_delete; + breakpoints_widgetbehavior.w_visfn = breakpoints_vis; + breakpoints_widgetbehavior.w_clickfn = (t_clickfn) breakpoints_newclick; + //breakpoints_widgetbehavior.w_clickfn = NULL; +#if PD_MINOR_VERSION < 37 + breakpoints_widgetbehavior.w_propertiesfn = NULL; + //breakpoints_widgetbehavior.w_savefn = breakpoints_save; + breakpoints_widgetbehavior.w_savefn = NULL; +#endif + + class_setwidget(breakpoints_class,&breakpoints_widgetbehavior); +#if PD_MINOR_VERSION >= 37 + //class_setsavefn(breakpoints_class,&breakpoints_save); +#endif + class_addmethod(breakpoints_class,(t_method)breakpoints_dump,gensym("dump"),A_NULL); + + +} + + Property changes on: trunk/externals/tof/src/breakpoints~.c ___________________________________________________________________ Name: svn:executable + * Added: trunk/externals/tof/src/breakpoints~.h =================================================================== --- trunk/externals/tof/src/breakpoints~.h (rev 0) +++ trunk/externals/tof/src/breakpoints~.h 2008-03-31 15:41:33 UTC (rev 9639) @@ -0,0 +1,63 @@ +#ifndef __GG_breakpoints_H__ +#define __GG_breakpoints_H__ + +#include "g_canvas.h" + +typedef struct _wbreakpoints { + t_glist* glist; + int width; + int height; + int numdoodles; + int grabbed; /* for moving points */ + int shift; /* move 100th */ + float pointerx; + float pointery; + + t_clock* numclock; +} t_wbreakpoints; + +typedef struct _breakpoints +{ + t_object x_obj; + + t_float x_val; + + int x_state; + int last_state; + int sustain_state; + int envchanged; + + t_float* finalvalues; + t_float* duration; + t_float totaldur; + t_int args; /* get rid of that */ + t_int resizing; + t_int resizeable; + + t_symbol* r_sym; //receive symbol + t_symbol* s_sym; //send symbol + t_symbol* d_sym; //dump symbol + t_symbol* c_sym; //change symbol + + t_float min; + t_float max; + + t_clock* x_clock; + t_float x_freeze; + + t_float x_f; /* place to hold inlet's value if it's set by message */ + + + t_outlet* out2; + t_outlet* out3; + /* widget parameters */ + t_wbreakpoints w; +} t_breakpoints; + + +t_widgetbehavior breakpoints_widgetbehavior; +void breakpoints_drawme(t_breakpoints *x, t_glist *glist, int firsttime); +int breakpoints_set_values(t_breakpoints * x); +void breakpoints_resize(t_breakpoints* x,int ns); + +#endif Property changes on: trunk/externals/tof/src/breakpoints~.h ___________________________________________________________________ Name: svn:executable + * Added: trunk/externals/tof/src/g_canvas.h =================================================================== --- trunk/externals/tof/src/g_canvas.h (rev 0) +++ trunk/externals/tof/src/g_canvas.h 2008-03-31 15:41:33 UTC (rev 9639) @@ -0,0 +1,615 @@ +/* Copyright (c) 1997-1999 Miller Puckette. +* For information on usage and redistribution, and for a DISCLAIMER OF ALL +* WARRANTIES, see the file, "LICENSE.txt," in this distribution. */ + +/* this file defines the structure for "glists" and related structures and +functions. "Glists" and "canvases" and "graphs" used to be different +structures until being unified in version 0.35. + +A glist occupies its own window if the "gl_havewindow" flag is set. Its +appearance on its "parent" or "owner" (if it has one) is as a graph if +"gl_isgraph" is set, and otherwise as a text box. + +A glist is "root" if it has no owner, i.e., a document window. In this +case "gl_havewindow" is always set. + +We maintain a list of root windows, so that we can traverse the whole +collection of everything in a Pd process. + +If a glist has a window it may still not be "mapped." Miniaturized +windows aren't mapped, for example, but a window is also not mapped +immediately upon creation. In either case gl_havewindow is true but +gl_mapped is false. + +Closing a non-root window makes it invisible; closing a root destroys it. + +A glist that's just a text object on its parent is always "toplevel." An +embedded glist can switch back and forth to appear as a toplevel by double- +clicking on it. Single-clicking a text box makes the toplevel become visible +and raises the window it's in. + +If a glist shows up as a graph on its parent, the graph is blanked while the +glist has its own window, even if miniaturized. + +*/ + +/* NOTE: this file describes Pd implementation details which may change +in future releases. The public (stable) API is in m_pd.h. */ + +#if defined(_LANGUAGE_C_PLUS_PLUS) || defined(__cplusplus) +extern "C" { +#endif + +/* --------------------- geometry ---------------------------- */ +#define IOWIDTH 7 /* width of an inlet/outlet in pixels */ +#define IOMIDDLE ((IOWIDTH-1)/2) +#define GLIST_DEFGRAPHWIDTH 200 +#define GLIST_DEFGRAPHHEIGHT 140 +/* ----------------------- data ------------------------------- */ + +typedef struct _updateheader +{ + struct _updateheader *upd_next; + unsigned int upd_array:1; /* true if array, false if glist */ + unsigned int upd_queued:1; /* true if we're queued */ +} t_updateheader; + + /* types to support glists grabbing mouse motion or keys from parent */ +typedef void (*t_glistmotionfn)(void *z, t_floatarg dx, t_floatarg dy); +typedef void (*t_glistkeyfn)(void *z, t_floatarg key); + +EXTERN_STRUCT _rtext; +#define t_rtext struct _rtext + +EXTERN_STRUCT _gtemplate; +#define t_gtemplate struct _gtemplate + +EXTERN_STRUCT _guiconnect; +#define t_guiconnect struct _guiconnect + +EXTERN_STRUCT _tscalar; +#define t_tscalar struct _tscalar + +EXTERN_STRUCT _canvasenvironment; +#define t_canvasenvironment struct _canvasenvironment + +EXTERN_STRUCT _fielddesc; +#define t_fielddesc struct _fielddesc + +typedef struct _selection +{ + t_gobj *sel_what; + struct _selection *sel_next; +} t_selection; + + /* this structure is instantiated whenever a glist becomes visible. */ +typedef struct _editor +{ + t_updateheader e_upd; /* update header structure */ + t_selection *e_updlist; /* list of objects to update */ + t_rtext *e_rtext; /* text responder linked list */ + t_selection *e_selection; /* head of the selection list */ + t_rtext *e_textedfor; /* the rtext if any that we are editing */ + t_gobj *e_grab; /* object being "dragged" */ + t_glistmotionfn e_motionfn; /* ... motion callback */ + t_glistkeyfn e_keyfn; /* ... keypress callback */ + t_binbuf *e_connectbuf; /* connections to deleted objects */ + t_binbuf *e_deleted; /* last stuff we deleted */ + t_guiconnect *e_guiconnect; /* GUI connection for filtering messages */ + struct _glist *e_glist; /* glist which owns this */ + int e_xwas; /* xpos on last mousedown or motion event */ + int e_ywas; /* ypos, similarly */ + int e_selectline_index1; /* indices for the selected line if any */ + int e_selectline_outno; /* (only valid if e_selectedline is set) */ + int e_selectline_index2; + int e_selectline_inno; + t_outconnect *e_selectline_tag; + unsigned int e_onmotion: 3; /* action to take on motion */ + unsigned int e_lastmoved: 1; /* one if mouse has moved since click */ + unsigned int e_textdirty: 1; /* one if e_textedfor has changed */ + unsigned int e_selectedline: 1; /* one if a line is selected */ +} t_editor; + +#define MA_NONE 0 /* e_onmotion: do nothing on mouse motion */ +#define MA_MOVE 1 /* drag the selection around */ +#define MA_CONNECT 2 /* make a connection */ +#define MA_REGION 3 /* selection region */ +#define MA_PASSOUT 4 /* send on to e_grab */ +#define MA_DRAGTEXT 5 /* drag in text editor to alter selection */ + +/* editor structure for "garrays". We don't bother to delete and regenerate +this structure when the "garray" becomes invisible or visible, although we +could do so if the structure gets big (like the "editor" above.) */ + +typedef struct _arrayvis +{ + t_updateheader av_upd; /* update header structure */ + t_garray *av_garray; /* owning structure */ +} t_arrayvis; + +/* the t_tick structure describes where to draw x and y "ticks" for a glist */ + +typedef struct _tick /* where to put ticks on x or y axes */ +{ + float k_point; /* one point to draw a big tick at */ + float k_inc; /* x or y increment per little tick */ + int k_lperb; /* little ticks per big; 0 if no ticks to draw */ +} t_tick; + +/* the t_glist structure, which describes a list of elements that live on an +area of a window. + +*/ + +struct _glist +{ + t_object gl_obj; /* header in case we're a glist */ + t_gobj *gl_list; /* the actual data */ + struct _gstub *gl_stub; /* safe pointer handler */ + int gl_valid; /* incremented when pointers might be stale */ + struct _glist *gl_owner; /* parent glist, supercanvas, or 0 if none */ + int gl_pixwidth; /* width in pixels (on parent, if a graph) */ + int gl_pixheight; + float gl_x1; /* bounding rectangle in our own coordinates */ + float gl_y1; + float gl_x2; + float gl_y2; + int gl_screenx1; /* screen coordinates when toplevel */ + int gl_screeny1; + int gl_screenx2; + int gl_screeny2; + int gl_xmargin; /* origin for GOP rectangle */ + int gl_ymargin; + t_tick gl_xtick; /* ticks marking X values */ + int gl_nxlabels; /* number of X coordinate labels */ + t_symbol **gl_xlabel; /* ... an array to hold them */ + float gl_xlabely; /* ... and their Y coordinates */ + t_tick gl_ytick; /* same as above for Y ticks and labels */ + int gl_nylabels; + t_symbol **gl_ylabel; + float gl_ylabelx; + t_editor *gl_editor; /* editor structure when visible */ + t_symbol *gl_name; /* symbol bound here */ + int gl_font; /* nominal font size in points, e.g., 10 */ + struct _glist *gl_next; /* link in list of toplevels */ + t_canvasenvironment *gl_env; /* root canvases and abstractions only */ + unsigned int gl_havewindow:1; /* true if we own a window */ + unsigned int gl_mapped:1; /* true if, moreover, it's "mapped" */ + unsigned int gl_dirty:1; /* (root canvas only:) patch has changed */ + unsigned int gl_loading:1; /* am now loading from file */ + unsigned int gl_willvis:1; /* make me visible after loading */ + unsigned int gl_edit:1; /* edit mode */ + unsigned int gl_isdeleting:1; /* we're inside glist_delete -- hack! */ + unsigned int gl_goprect:1; /* draw rectangle for graph-on-parent */ + unsigned int gl_isgraph:1; /* show as graph on parent */ +}; + +#define gl_gobj gl_obj.te_g +#define gl_pd gl_gobj.g_pd + +/* a data structure to describe a field in a pure datum */ + +#define DT_FLOAT 0 +#define DT_SYMBOL 1 +#define DT_LIST 2 +#define DT_ARRAY 3 + +typedef struct _dataslot +{ + int ds_type; + t_symbol *ds_name; + t_symbol *ds_arraytemplate; /* filled in for arrays only */ +} t_dataslot; + +typedef struct _template +{ + t_pd t_pdobj; /* header */ + struct _gtemplate *t_list; /* list of "struct"/gtemplate objects */ + t_symbol *t_sym; /* name */ + int t_n; /* number of dataslots (fields) */ + t_dataslot *t_vec; /* array of dataslots */ +} t_template; + +struct _array +{ + int a_n; /* number of elements */ + int a_elemsize; /* size in bytes; LATER get this from template */ + char *a_vec; /* array of elements */ + t_symbol *a_templatesym; /* template for elements */ + int a_valid; /* protection against stale pointers into array */ + t_gpointer a_gp; /* pointer to scalar or array element we're in */ + t_gstub *a_stub; /* stub for pointing into this array */ +}; + + /* structure for traversing all the connections in a glist */ +typedef struct _linetraverser +{ + t_canvas *tr_x; + t_object *tr_ob; + int tr_nout; + int tr_outno; + t_object *tr_ob2; + t_outlet *tr_outlet; + t_inlet *tr_inlet; + int tr_nin; + int tr_inno; + int tr_x11, tr_y11, tr_x12, tr_y12; + int tr_x21, tr_y21, tr_x22, tr_y22; + int tr_lx1, tr_ly1, tr_lx2, tr_ly2; + t_outconnect *tr_nextoc; + int tr_nextoutno; +} t_linetraverser; + +/* function types used to define graphical behavior for gobjs, a bit like X +widgets. We don't use Pd methods because Pd's typechecking can't specify the +types of pointer arguments. Also it's more convenient this way, since +every "patchable" object can just get the "text" behaviors. */ + + /* Call this to get a gobj's bounding rectangle in pixels */ +typedef void (*t_getrectfn)(t_gobj *x, struct _glist *glist, + int *x1, int *y1, int *x2, int *y2); + /* and this to displace a gobj: */ +typedef void (*t_displacefn)(t_gobj *x, struct _glist *glist, int dx, int dy); + /* change color to show selection: */ +typedef void (*t_selectfn)(t_gobj *x, struct _glist *glist, int state); + /* change appearance to show activation/deactivation: */ +typedef void (*t_activatefn)(t_gobj *x, struct _glist *glist, int state); + /* warn a gobj it's about to be deleted */ +typedef void (*t_deletefn)(t_gobj *x, struct _glist *glist); + /* making visible or invisible */ +typedef void (*t_visfn)(t_gobj *x, struct _glist *glist, int flag); + /* field a mouse click (when not in "edit" mode) */ +typedef int (*t_clickfn)(t_gobj *x, struct _glist *glist, + int xpix, int ypix, int shift, int alt, int dbl, int doit); + /* ... and later, resizing; getting/setting font or color... */ + +struct _widgetbehavior +{ + t_getrectfn w_getrectfn; + t_displacefn w_displacefn; + t_selectfn w_selectfn; + t_activatefn w_activatefn; + t_deletefn w_deletefn; + t_visfn w_visfn; + t_clickfn w_clickfn; +}; + +/* -------- behaviors for scalars defined by objects in template --------- */ +/* these are set by "drawing commands" in g_template.c which add appearance to +scalars, which live in some other window. If the scalar is just included +in a canvas the "parent" is a misnomer. There is also a text scalar object +which really does draw the scalar on the parent window; see g_scalar.c. */ + +/* note how the click function wants the whole scalar, not the "data", so +doesn't work on array elements... LATER reconsider this */ + + /* bounding rectangle: */ +typedef void (*t_parentgetrectfn)(t_gobj *x, struct _glist *glist, + t_word *data, t_template *tmpl, float basex, float basey, + int *x1, int *y1, int *x2, int *y2); + /* displace it */ +typedef void (*t_parentdisplacefn)(t_gobj *x, struct _glist *glist, + t_word *data, t_template *tmpl, float basex, float basey, + int dx, int dy); + /* change color to show selection */ +typedef void (*t_parentselectfn)(t_gobj *x, struct _glist *glist, + t_word *data, t_template *tmpl, float basex, float basey, + int state); + /* change appearance to show activation/deactivation: */ +typedef void (*t_parentactivatefn)(t_gobj *x, struct _glist *glist, + t_word *data, t_template *tmpl, float basex, float basey, + int state); + /* making visible or invisible */ +typedef void (*t_parentvisfn)(t_gobj *x, struct _glist *glist, + t_word *data, t_template *tmpl, float basex, float basey, + int flag); + /* field a mouse click */ +typedef int (*t_parentclickfn)(t_gobj *x, struct _glist *glist, + t_word *data, t_template *tmpl, t_scalar *sc, t_array *ap, + float basex, float basey, + int xpix, int ypix, int shift, int alt, int dbl, int doit); + +struct _parentwidgetbehavior +{ + t_parentgetrectfn w_parentgetrectfn; + t_parentdisplacefn w_parentdisplacefn; + t_parentselectfn w_parentselectfn; + t_parentactivatefn w_parentactivatefn; + t_parentvisfn w_parentvisfn; + t_parentclickfn w_parentclickfn; +}; + + /* cursor definitions; used as return value for t_parentclickfn */ +#define CURSOR_RUNMODE_NOTHING 0 +#define CURSOR_RUNMODE_CLICKME 1 +#define CURSOR_RUNMODE_THICKEN 2 +#define CURSOR_RUNMODE_ADDPOINT 3 +#define CURSOR_EDITMODE_NOTHING 4 +#define CURSOR_EDITMODE_CONNECT 5 +#define CURSOR_EDITMODE_DISCONNECT 6 +EXTERN void canvas_setcursor(t_glist *x, unsigned int cursornum); + +extern t_canvas *canvas_editing; /* last canvas to start text edting */ +extern t_canvas *canvas_whichfind; /* last canvas we did a find in */ +extern t_canvas *canvas_list; /* list of all root canvases */ +extern t_class *vinlet_class, *voutlet_class; +extern int glist_valid; /* incremented when pointers might be stale */ + +#define PLOTSTYLE_POINTS 0 /* plotting styles for arrays */ +#define PLOTSTYLE_POLY 1 +#define PLOTSTYLE_BEZ 2 + +/* ------------------- functions on any gobj ----------------------------- */ +EXTERN void gobj_getrect(t_gobj *x, t_glist *owner, int *x1, int *y1, + int *x2, int *y2); +EXTERN void gobj_displace(t_gobj *x, t_glist *owner, int dx, int dy); +EXTERN void gobj_select(t_gobj *x, t_glist *owner, int state); +EXTERN void gobj_activate(t_gobj *x, t_glist *owner, int state); +EXTERN void gobj_delete(t_gobj *x, t_glist *owner); +EXTERN void gobj_vis(t_gobj *x, t_glist *glist, int flag); +EXTERN int gobj_click(t_gobj *x, struct _glist *glist, + int xpix, int ypix, int shift, int alt, int dbl, int doit); +EXTERN void gobj_save(t_gobj *x, t_binbuf *b); +EXTERN void gobj_properties(t_gobj *x, struct _glist *glist); +EXTERN void gobj_save(t_gobj *x, t_binbuf *b); + +/* -------------------- functions on glists --------------------- */ +EXTERN t_glist *glist_new( void); +EXTERN void glist_init(t_glist *x); +EXTERN void glist_add(t_glist *x, t_gobj *g); +EXTERN void glist_cleanup(t_glist *x); +EXTERN void glist_free(t_glist *x); + +EXTERN void glist_clear(t_glist *x); +EXTERN t_canvas *glist_getcanvas(t_glist *x); +EXTERN int glist_isselected(t_glist *x, t_gobj *y); +EXTERN void glist_select(t_glist *x, t_gobj *y); +EXTERN void glist_deselect(t_glist *x, t_gobj *y); +EXTERN void glist_noselect(t_glist *x); +EXTERN void glist_selectall(t_glist *x); +EXTERN void glist_delete(t_glist *x, t_gobj *y); +EXTERN void glist_retext(t_glist *x, t_text *y); +EXTERN void glist_grab(t_glist *x, t_gobj *y, t_glistmotionfn motionfn, + t_glistkeyfn keyfn, int xpos, int ypos); +EXTERN int glist_isvisible(t_glist *x); +EXTERN int glist_istoplevel(t_glist *x); +EXTERN t_glist *glist_findgraph(t_glist *x); +EXTERN int glist_getfont(t_glist *x); +EXTERN void glist_sort(t_glist *canvas); +EXTERN void glist_read(t_glist *x, t_symbol *filename, t_symbol *format); +EXTERN void glist_mergefile(t_glist *x, t_symbol *filename, t_symbol *format); + +EXTERN float glist_pixelstox(t_glist *x, float xpix); +EXTERN float glist_pixelstoy(t_glist *x, float ypix); +EXTERN float glist_xtopixels(t_glist *x, float xval); +EXTERN float glist_ytopixels(t_glist *x, float yval); +EXTERN float glist_dpixtodx(t_glist *x, float dxpix); +EXTERN float glist_dpixtody(t_glist *x, float dypix); + +EXTERN void glist_getnextxy(t_glist *gl, int *xval, int *yval); +EXTERN void glist_glist(t_glist *g, t_symbol *s, int argc, t_atom *argv); +EXTERN t_glist *glist_addglist(t_glist *g, t_symbol *sym, + float x1, float y1, float x2, float y2, + float px1, float py1, float px2, float py2); +EXTERN void glist_arraydialog(t_glist *parent, t_symbol *name, + t_floatarg size, t_floatarg saveit, t_floatarg newgraph); +EXTERN t_binbuf *glist_writetobinbuf(t_glist *x, int wholething); +EXTERN int glist_isgraph(t_glist *x); +EXTERN void glist_redraw(t_glist *x); +EXTERN void glist_drawiofor(t_glist *glist, t_object *ob, int firsttime, + char *tag, int x1, int y1, int x2, int y2); +EXTERN void glist_eraseiofor(t_glist *glist, t_object *ob, char *tag); +EXTERN void canvas_create_editor(t_glist *x, int createit); +void canvas_deletelinesforio(t_canvas *x, t_text *text, + t_inlet *inp, t_outlet *outp); + + +/* -------------------- functions on texts ------------------------- */ +EXTERN void text_setto(t_text *x, t_glist *glist, char *buf, int bufsize); +EXTERN void text_drawborder(t_text *x, t_glist *glist, char *tag, + int width, int height, int firsttime); +EXTERN void text_eraseborder(t_text *x, t_glist *glist, char *tag); +EXTERN int text_xcoord(t_text *x, t_glist *glist); +EXTERN int text_ycoord(t_text *x, t_glist *glist); +EXTERN int text_xpix(t_text *x, t_glist *glist); +EXTERN int text_ypix(t_text *x, t_glist *glist); +EXTERN int text_shouldvis(t_text *x, t_glist *glist); + +/* -------------------- functions on rtexts ------------------------- */ +#define RTEXT_DOWN 1 +#define RTEXT_DRAG 2 +#define RTEXT_DBL 3 +#define RTEXT_SHIFT 4 + +EXTERN t_rtext *rtext_new(t_glist *glist, t_text *who); +EXTERN t_rtext *glist_findrtext(t_glist *gl, t_text *who); +EXTERN void rtext_draw(t_rtext *x); +EXTERN void rtext_erase(t_rtext *x); +EXTERN t_rtext *rtext_remove(t_rtext *first, t_rtext *x); +EXTERN int rtext_height(t_rtext *x); +EXTERN void rtext_displace(t_rtext *x, int dx, int dy); +EXTERN void rtext_select(t_rtext *x, int state); +EXTERN void rtext_activate(t_rtext *x, int state); +EXTERN void rtext_free(t_rtext *x); +EXTERN void rtext_key(t_rtext *x, int n, t_symbol *s); +EXTERN void rtext_mouse(t_rtext *x, int xval, int yval, int flag); +EXTERN void rtext_retext(t_rtext *x); +EXTERN int rtext_width(t_rtext *x); +EXTERN int rtext_height(t_rtext *x); +EXTERN char *rtext_gettag(t_rtext *x); +EXTERN void rtext_gettext(t_rtext *x, char **buf, int *bufsize); +EXTERN void rtext_getseltext(t_rtext *x, char **buf, int *bufsize); + +/* -------------------- functions on canvases ------------------------ */ +EXTERN t_class *canvas_class; + +EXTERN t_canvas *canvas_new(void *dummy, t_symbol *sel, int argc, t_atom *argv); +EXTERN t_symbol *canvas_makebindsym(t_symbol *s); +EXTERN void canvas_vistext(t_canvas *x, t_text *y); +EXTERN void canvas_fixlinesfor(t_canvas *x, t_text *text); +EXTERN void canvas_deletelinesfor(t_canvas *x, t_text *text); +EXTERN void canvas_stowconnections(t_canvas *x); +EXTERN void canvas_restoreconnections(t_canvas *x); +EXTERN void canvas_redraw(t_canvas *x); + +EXTERN t_inlet *canvas_addinlet(t_canvas *x, t_pd *who, t_symbol *sym); +EXTERN void canvas_rminlet(t_canvas *x, t_inlet *ip); +EXTERN t_outlet *canvas_addoutlet(t_canvas *x, t_pd *who, t_symbol *sym); +EXTERN void canvas_rmoutlet(t_canvas *x, t_outlet *op); +EXTERN void canvas_redrawallfortemplate(t_template *tmpl, int action); +EXTERN void canvas_redrawallfortemplatecanvas(t_canvas *x, int action); +EXTERN void canvas_zapallfortemplate(t_canvas *tmpl); +EXTERN void canvas_setusedastemplate(t_canvas *x); +EXTERN t_canvas *canvas_getcurrent(void); +EXTERN void canvas_setcurrent(t_canvas *x); +EXTERN void canvas_unsetcurrent(t_canvas *x); +EXTERN t_symbol *canvas_realizedollar(t_canvas *x, t_symbol *s); +EXTERN t_canvas *canvas_getrootfor(t_canvas *x); +EXTERN void canvas_dirty(t_canvas *x, t_int n); +EXTERN int canvas_getfont(t_canvas *x); +typedef int (*t_canvasapply)(t_canvas *x, t_int x1, t_int x2, t_int x3); + +EXTERN t_int *canvas_recurapply(t_canvas *x, t_canvasapply *fn, + t_int x1, t_int x2, t_int x3); + +EXTERN void canvas_resortinlets(t_canvas *x); +EXTERN void canvas_resortoutlets(t_canvas *x); +EXTERN void canvas_free(t_canvas *x); +EXTERN void canvas_updatewindowlist( void); +EXTERN void canvas_editmode(t_canvas *x, t_floatarg yesplease); +EXTERN int canvas_isabstraction(t_canvas *x); +EXTERN int canvas_istable(t_canvas *x); +EXTERN int canvas_showtext(t_canvas *x); +EXTERN void canvas_vis(t_canvas *x, t_floatarg f); +EXTERN t_canvasenvironment *canvas_getenv(t_canvas *x); +EXTERN void canvas_rename(t_canvas *x, t_symbol *s, t_symbol *dir); +EXTERN void canvas_loadbang(t_canvas *x); +EXTERN int canvas_hitbox(t_canvas *x, t_gobj *y, int xpos, int ypos, + int *x1p, int *y1p, int *x2p, int *y2p); +EXTERN int canvas_setdeleting(t_canvas *x, int flag); + +typedef void (*t_undofn)(t_canvas *canvas, void *buf, + int action); /* a function that does UNDO/REDO */ +#define UNDO_FREE 0 /* free current undo/redo buffer */ +#define UNDO_UNDO 1 /* undo */ +#define UNDO_REDO 2 /* redo */ +EXTERN void canvas_setundo(t_canvas *x, t_undofn undofn, void *buf, + const char *name); +EXTERN void canvas_noundo(t_canvas *x); +EXTERN int canvas_getindex(t_canvas *x, t_gobj *y); + +EXTERN void canvas_connect(t_canvas *x, + t_floatarg fwhoout, t_floatarg foutno,t_floatarg fwhoin, t_floatarg finno); +EXTERN void canvas_disconnect(t_canvas *x, + float index1, float outno, float index2, float inno); +EXTERN int canvas_isconnected (t_canvas *x, + t_text *ob1, int n1, t_text *ob2, int n2); +EXTERN void canvas_selectinrect(t_canvas *x, int lox, int loy, int hix, int hiy); + + +/* ---- functions on canvasses as objects --------------------- */ + +EXTERN void canvas_fattenforscalars(t_canvas *x, + int *x1, int *y1, int *x2, int *y2); +EXTERN void canvas_visforscalars(t_canvas *x, t_glist *glist, int vis); +EXTERN int canvas_clicksub(t_canvas *x, int xpix, int ypix, int shift, + int alt, int dbl, int doit); +EXTERN t_glist *canvas_getglistonsuper(void); + +EXTERN void linetraverser_start(t_linetraverser *t, t_canvas *x); +EXTERN t_outconnect *linetraverser_next(t_linetraverser *t); +EXTERN void linetraverser_skipobject(t_linetraverser *t); + +/* --------- functions on garrays (graphical arrays) -------------------- */ + +EXTERN t_template *garray_template(t_garray *x); + +/* -------------------- arrays --------------------- */ +EXTERN t_garray *graph_array(t_glist *gl, t_symbol *s, t_symbol *tmpl, + t_floatarg f, t_floatarg saveit); +EXTERN t_array *array_new(t_symbol *templatesym, t_gpointer *parent); +EXTERN void array_resize(t_array *x, int n); +EXTERN void array_free(t_array *x); + +/* --------------------- gpointers and stubs ---------------- */ +EXTERN t_gstub *gstub_new(t_glist *gl, t_array *a); +EXTERN void gstub_cutoff(t_gstub *gs); +EXTERN void gpointer_setglist(t_gpointer *gp, t_glist *glist, t_scalar *x); + +/* --------------------- scalars ------------------------- */ +EXTERN void word_init(t_word *wp, t_template *tmpl, t_gpointer *gp); +EXTERN void word_restore(t_word *wp, t_template *tmpl, + int argc, t_atom *argv); +EXTERN t_scalar *scalar_new(t_glist *owner, + t_symbol *templatesym); +EXTERN void word_free(t_word *wp, t_template *tmpl); +EXTERN void scalar_getbasexy(t_scalar *x, float *basex, float *basey); +EXTERN void scalar_redraw(t_scalar *x, t_glist *glist); + +/* ------helper routines for "garrays" and "plots" -------------- */ +EXTERN int array_doclick(t_array *array, t_glist *glist, t_scalar *sc, t_array *ap, + t_symbol *elemtemplatesym, + float linewidth, float xloc, float xinc, float yloc, float scalarvis, + t_fielddesc *xfield, t_fielddesc *yfield, t_fielddesc *wfield, + int xpix, int ypix, int shift, int alt, int dbl, int doit); + +EXTERN void array_getcoordinate(t_glist *glist, + char *elem, int xonset, int yonset, int wonset, int indx, + float basex, float basey, float xinc, + t_fielddesc *xfielddesc, t_fielddesc *yfielddesc, t_fielddesc *wfielddesc, + float *xp, float *yp, float *wp); + +EXTERN int array_getfields(t_symbol *elemtemplatesym, + t_canvas **elemtemplatecanvasp, + t_template **elemtemplatep, int *elemsizep, + t_fielddesc *xfielddesc, t_fielddesc *yfielddesc, t_fielddesc *wfielddesc, + int *xonsetp, int *yonsetp, int *wonsetp); + +/* --------------------- templates ------------------------- */ +EXTERN t_template *template_new(t_symbol *sym, int argc, t_atom *argv); +EXTERN void template_free(t_template *x); +EXTERN int template_match(t_template *x1, t_template *x2); +EXTERN int template_find_field(t_template *x, t_symbol *name, int *p_onset, + int *p_type, t_symbol **p_arraytype); +EXTERN t_float template_getfloat(t_template *x, t_symbol *fieldname, t_word *wp, + int loud); +EXTERN void template_setfloat(t_template *x, t_symbol *fieldname, t_word *wp, + t_float f, int loud); +EXTERN t_symbol *template_getsymbol(t_template *x, t_symbol *fieldname, + t_word *wp, int loud); +EXTERN void template_setsymbol(t_template *x, t_symbol *fieldname, + t_word *wp, t_symbol *s, int loud); + +EXTERN t_template *gtemplate_get(t_gtemplate *x); +EXTERN t_template *template_findbyname(t_symbol *s); +EXTERN t_canvas *template_findcanvas(t_template *tmpl); +EXTERN void template_notify(t_template *tmpl, + t_symbol *s, int argc, t_atom *argv); + +EXTERN t_float template_getfloat(t_template *x, t_symbol *fieldname, + t_word *wp, int loud); +EXTERN void template_setfloat(t_template *x, t_symbol *fieldname, + t_word *wp, t_float f, int loud); +EXTERN t_symbol *template_getsymbol(t_template *x, t_symbol *fieldname, + t_word *wp, int loud); +EXTERN void template_setsymbol(t_template *x, t_symbol *fieldname, + t_word *wp, t_symbol *s, int loud); +EXTERN t_float fielddesc_getcoord(t_fielddesc *f, t_template *tmpl, + t_word *wp, int loud); +EXTERN void fielddesc_setcoord(t_fielddesc *f, t_template *tmpl, + t_word *wp, float pix, int loud); +EXTERN t_float fielddesc_cvttocoord(t_fielddesc *f, float val); +EXTERN float fielddesc_cvtfromcoord(t_fielddesc *f, float coord); + + +/* ----------------------- guiconnects, g_guiconnect.c --------- */ +EXTERN t_guiconnect *guiconnect_new(t_pd *who, t_symbol *sym); +EXTERN void guiconnect_notarget(t_guiconnect *x, double timedelay); + +/* ------------- IEMGUI routines used in other g_ files ---------------- */ +EXTERN t_symbol *iemgui_raute2dollar(t_symbol *s); +EXTERN t_symbol *iemgui_dollar2raute(t_symbol *s); + +#if defined(_LANGUAGE_C_PLUS_PLUS) || defined(__cplusplus) +} +#endif Property changes on: trunk/externals/tof/src/g_canvas.h ___________________________________________________________________ Name: svn:executable + * Added: trunk/externals/tof/src/w_breakpoints.h =================================================================== --- trunk/externals/tof/src/w_breakpoints.h (rev 0) +++ trunk/externals/tof/src/w_breakpoints.h 2008-03-31 15:41:33 UTC (rev 9639) @@ -0,0 +1,569 @@ +#include <stdio.h> +#include <string.h> +#include <math.h> +#ifdef _WIN32 +//#pragma warning( disable : 4244 ) +//#pragma warning( disable : 4305 ) +#define abs fabs +#endif + +#define BACKGROUNDCOLOR "grey" +#define LINECOLOR "grey30" +#ifndef BACKGROUNDWIDTH +#define BACKGROUNDWIDTH "1" +#endif +#define BORDER 2 + + +static void draw_inlets(t_breakpoints *x, t_glist *glist, int firsttime, int nin, int nout) +{ + + if (x->r_sym == &s_) { + int n = nout; + int nplus, i; + int xpos = text_xpix(&x->x_obj,glist); + int ypos = text_ypix(&x->x_obj,glist); + + nplus = (n == 1 ? 1 : n-1); + for (i = 0; i < n; i++) + { + int onset = xpos + (x->w.width - IOWIDTH + 3 * BORDER) * i / nplus - BORDER; + // OUTLETS + if (firsttime) + sys_vgui(".x%x.c create rectangle %d %d %d %d -tags %xo%d \n", + glist_getcanvas(glist), + onset, ypos + x->w.height - 2 + 2*BORDER, + onset + IOWIDTH, ypos + x->w.height - 1+ 2*BORDER, + x, i); + else + sys_vgui(".x%x.c coords %xo%d %d %d %d %d\n", + glist_getcanvas(glist), x, i, + onset, ypos + x->w.height - 2 + 2*BORDER, + onset + IOWIDTH, ypos + x->w.height -1 + 2*BORDER); + } + n = nin; + nplus = (n == 1 ? 1 : n-1); + for (i = 0; i < n; i++) + { + int onset = xpos + (x->w.width - IOWIDTH + 3 * BORDER) * i / nplus - BORDER; + // INLETS + if (firsttime) + sys_vgui(".x%x.c create rectangle %d %d %d %d -tags %xi%d\n", + glist_getcanvas(glist), + onset, ypos - BORDER + 1, + onset + IOWIDTH, ypos + 2 - BORDER, + x, i); + else + sys_vgui(".x%x.c coords %xi%d %d %d %d %d\n", + glist_getcanvas(glist), x, i, + onset, ypos - BORDER + 1, + onset + IOWIDTH, ypos + 2 - BORDER); + + } + } +} + + + +static int breakpoints_next_doodle(t_breakpoints *x, struct _glist *glist, + int xpos,int ypos) +{ + int ret = -1; + float xscale,yscale; + int dxpos,dypos; + float minval = 100000.0; + float tval; + int i; + int insertpos = -1; + float ySize = x->max - x->min; + float yBase = x->min; + + if (xpos > text_xpix(&x->x_obj,glist) + x->w.width) + xpos = text_xpix(&x->x_obj,glist) + x->w.width; + + xscale = x->w.width/x->duration[x->last_state]; + yscale = x->w.height; + + dxpos = text_xpix(&x->x_obj,glist);/* + BORDER */; + dypos = text_ypix(&x->x_obj,glist) + BORDER; + + for (i=0;i<=x->last_state;i++) { + float dx2 = (dxpos + (x->duration[i] * xscale)) - xpos; + float dy2 = (dypos + yscale - ( (x->finalvalues[i] - yBase) / ySize * yscale)) - ypos; + + dx2*=dx2; + dy2*=dy2; + tval = sqrt(dx2+dy2); + + if (tval <= minval) { + minval = tval; + insertpos = i; + } + } + + /* decide if we want to make a new one */ + if (minval > /*5*/ 8 && insertpos >= 0 && !x->x_freeze) { + + while (((dxpos + (x->duration[insertpos] * xscale)) - xpos) < 0) + insertpos++; + while (((dxpos + (x->duration[insertpos-1] * xscale)) - xpos) > 0) + insertpos--; + + if (x->last_state+1 >= x->args) + breakpoints_resize(x,x->args+1); + + for (i=x->last_state;i>=insertpos;i--) { + x->duration[i+1] = x->duration[i]; + x->finalvalues[i+1] = x->finalvalues[i]; + } + x->duration[insertpos] = (float)(xpos-dxpos)/x->w.width*x->duration[x->last_state++]; + x->w.pointerx = xpos; + x->w.pointery = ypos; + } + else { + x->w.pointerx = text_xpix(&x->x_obj,glist) + x->duration[insertpos]*x->w.width/x->duration[x->last_state]; + + + x->w.pointery = ypos; + //x->w.pointery = text_ypix(&x->x_obj,glist) + (1.f - (x->finalvalues[i] - yBase) / ySize) * yscale; + } + #ifdef DEBUG + post("pointery =%f",x->w.pointery); + post("insertpos =%f",insertpos); + #endif + x->w.grabbed = insertpos; + return insertpos; +} + +static void breakpoints_create_doodles(t_breakpoints *x, t_glist *glist) +{ + float xscale,yscale; + int xpos,ypos; + int i; + char guistr[255]; + float ySize = x->max - x->min; + float yBase = x->min; + float yvalue; + + xscale = x->w.width/x->duration[x->last_state]; + yscale = x->w.height; + + xpos = text_xpix(&x->x_obj,glist); + ypos = (int) (text_ypix(&x->x_obj,glist) + x->w.height); + for (i=0;i<=x->last_state;i++) { + yvalue = (x->finalvalues[i] - yBase) / ySize * yscale; + sprintf(guistr,".x%x.c create oval %d %d %d %d -tags %xD%d",(unsigned int)glist_getcanvas(glist), + (int) (xpos+(x->duration[i] * xscale) - 2), + (int) (ypos - yvalue - 2), + (int) (xpos+(x->duration[i] * xscale)+2), + (int) (ypos - yvalue + 2), + (unsigned int)x,i); + + if (i == x->w.grabbed) { + strcat(guistr," -fill red\n"); + } else { + strcat(guistr," -fill "LINECOLOR"\n"); + } + sys_vgui("%s",guistr); + } + x->w.numdoodles = i; +} + + +static void breakpoints_delete_doodles(t_breakpoints *x, t_glist *glist) +{ + int i; + for (i=0;i<=x->w.numdoodles;i++) { + sys_vgui(".x%x.c delete %xD%d\n",glist_getcanvas(glist),x,i); + } +} + +static void breakpoints_update_doodles(t_breakpoints *x, t_glist *glist) +{ + + breakpoints_delete_doodles(x,glist); +/* LATER only create new doodles if necessary */ + breakpoints_create_doodles(x, glist); +} + + +static void breakpoints_delnum(t_breakpoints *x) +{ + sys_vgui(".x%x.c delete %xT\n",glist_getcanvas(x->w.glist),x); + +} + + +static void breakpoints_shownum(t_breakpoints *x,t_glist* glist) +{ + float xscale,yscale; + int xpos,ypos; + int i= x->w.grabbed; + float ySize = x->max - x->min; + float yBase = x->min; + + xscale = x->w.width/x->duration[x->last_state]; + yscale = x->w.height; + + xpos = text_xpix(&x->x_obj,glist); + ypos = (int) (text_ypix(&x->x_obj,glist) + x->w.height); + + breakpoints_delnum(x); + + sys_vgui(".x%x.c create text %d %d -text %.2fx%.2f -tags %xT\n", + (unsigned int)glist_getcanvas(x->w.glist), + + (int) (xpos+(x->duration[i] * xscale) +3), + (int) (ypos - (x->finalvalues[i]-yBase)/ySize*yscale - 10), + + x->finalvalues[i], + x->duration[i], + (unsigned int)x); + clock_delay(x->w.numclock,700); +} + + + +static void breakpoints_create(t_breakpoints *x, t_glist *glist) +{ + int i; + static char buf[1024]; + float xscale,yscale; + int xpos,ypos; + char num[40]; + float ySize = x->max - x->min; + float yBase = x->min; + + xpos = text_xpix(&x->x_obj,glist); + ypos = (int) text_ypix(&x->x_obj,glist); + x->w.numclock = clock_new(x, (t_method) breakpoints_delnum); + sys_vgui(".x%x.c create rectangle \ +%d %d %d %d -tags %xS -fill "BACKGROUNDCOLOR" -width "BACKGROUNDWIDTH"\n", + glist_getcanvas(glist), + xpos-BORDER, ypos-BORDER, + xpos + x->w.width+2*BORDER, ypos + x->w.height+2*BORDER, + x); + + xscale = x->w.width/x->duration[x->last_state]; + yscale = x->w.height; + + sprintf(buf,".x%x.c create line",(unsigned int)glist_getcanvas(glist)); + for (i=0;i<=x->last_state;i++) { + sprintf(num," %d %d ",(int)(xpos + x->duration[i]*xscale), + (int)(ypos + x->w.height- (x->finalvalues[i]-yBase)/ySize*yscale)); + strcat(buf,num); + } + + sprintf(num,"-tags %pP -fill "LINECOLOR"\n",x); + strcat(buf,num); + sys_vgui("%s",buf); + breakpoints_create_doodles(x,glist); +} + + +static void breakpoints_update(t_breakpoints *x, t_glist *glist) +{ +int i; + static char buf[1024]; + float xscale,yscale; + char num[40]; + int xpos = text_xpix(&x->x_obj,glist); + int ypos = text_ypix(&x->x_obj,glist); + float ySize = x->max - x->min; + float yBase = x->min; + + sys_vgui(".x%x.c coords %xS \ +%d %d %d %d\n", + glist_getcanvas(glist), x, + xpos - BORDER, ypos -BORDER, + xpos + x->w.width+2*BORDER, ypos + x->w.height+2*BORDER); + + + xscale = x->w.width/x->duration[x->last_state]; + yscale = x->w.height; + + sprintf(buf,".x%x.c coords %pP",(unsigned int)glist_getcanvas(glist),x); + + for (i=0;i<=x->last_state;i++) { + sprintf(num," %d %d ",(int)(xpos + x->duration[i]*xscale), + (int) (ypos + x->w.height - (x->finalvalues[i]-yBase)/ySize*yscale)); + strcat(buf,num); + } + strcat(buf,"\n"); + sys_vgui("%s",buf); + breakpoints_update_doodles(x,glist); + draw_inlets(x, glist, 0,1,3); +} + + + +void breakpoints_drawme(t_breakpoints *x, t_glist *glist, int firsttime) +{ + + if (firsttime) breakpoints_create(x,glist); + else breakpoints_update(x,glist); + + draw_inlets(x, glist, firsttime, 1,3); +} + + + + +void breakpoints_erase(t_breakpoints* x,t_glist* glist) +{ + int n; + sys_vgui(".x%x.c delete %xS\n", + glist_getcanvas(glist), x); + + sys_vgui(".x%x.c delete %pP\n", + glist_getcanvas(glist), x); + + if (x->r_sym == &s_) { + sys_vgui(".x%x.c delete %xi0\n",glist_getcanvas(glist),x); + sys_vgui(".x%x.c delete %xo0\n",glist_getcanvas(glist),x); + sys_vgui(".x%x.c delete %xo1\n",glist_getcanvas(glist),x); + sys_vgui(".x%x.c delete %xo2\n",glist_getcanvas(glist),x); + } + breakpoints_delete_doodles(x,glist); +} + + + +/* ------------------------ breakpoints widgetbehaviour----------------------------- */ + + +static void breakpoints_getrect(t_gobj *z, t_glist *owner, + int *xp1, int *yp1, int *xp2, int *yp2) +{ + int width, height; + t_breakpoints* s = (t_breakpoints*)z; + + width = s->w.width + 2*BORDER; + height = s->w.height + 2*BORDER; + *xp1 = text_xpix(&s->x_obj,owner)-BORDER; + *yp1 = text_ypix(&s->x_obj,owner)-BORDER; + *xp2 = text_xpix(&s->x_obj,owner) + width ; //+ 4 + *yp2 = text_ypix(&s->x_obj,owner) + height ; //+ 4 +} + +static void breakpoints_displace(t_gobj *z, t_glist *glist, + int dx, int dy) +{ + t_breakpoints *x = (t_breakpoints *)z; + x->x_obj.te_xpix += dx; + x->x_obj.te_ypix += dy; + + breakpoints_drawme(x, glist, 0); + canvas_fixlinesfor(glist_getcanvas(glist),(t_text*) x); +} + +static void breakpoints_select(t_gobj *z, t_glist *glist, int state) +{ + t_breakpoints *x = (t_breakpoints *)z; + sys_vgui(".x%x.c itemconfigure %xS -fill %s\n", glist, + x, (state? "blue" : BACKGROUNDCOLOR)); +} + + +static void breakpoints_activate(t_gobj *z, t_glist *glist, int state) +{ +/* t_text *x = (t_text *)z; + t_rtext *y = glist_findrtext(glist, x); + if (z->g_pd != gatom_class) rtext_activate(y, state);*/ +} + +static void breakpoints_delete(t_gobj *z, t_glist *glist) +{ + t_text *x = (t_text *)z; + canvas_deletelinesfor(glist_getcanvas(glist), x); +} + + +static void breakpoints_vis(t_gobj *z, t_glist *glist, int vis) +{ + t_breakpoints* s = (t_breakpoints*)z; + if (vis) + breakpoints_drawme(s, glist, 1); + else + breakpoints_erase(s,glist); +} + +/* + +static void breakpoints_save(t_gobj *z, t_binbuf *b) +{ + t_breakpoints *x = (t_breakpoints *)z; + binbuf_addv(b, "ssiisiiffss", gensym("#X"), gensym("obj"), + (t_int)x->x_obj.te_xpix, (t_int)x->x_obj.te_ypix, + atom_getsymbol(binbuf_getvec(x->x_obj.te_binbuf)), + x->w.width,x->w.height,x->max,x->min,x->r_sym,x->s_sym); + binbuf_addv(b, ";"); +} + +*/ + +static void breakpoints_followpointer(t_breakpoints* x,t_glist* glist) +{ + float dur; + float xscale = x->duration[x->last_state]/x->w.width; + float ySize = x->max - x->min; + float yBase = x->min; + + if ((x->w.grabbed > 0) && (x->w.grabbed < x->last_state)) { + + dur = (x->w.pointerx - text_xpix(&x->x_obj,glist))*xscale; + if (dur < x->duration[x->w.grabbed-1]) + dur = x->duration[x->w.grabbed-1]; + if (dur > x->duration[x->w.grabbed+1]) + dur = x->duration[x->w.grabbed+1]; + + x->duration[x->w.grabbed] = dur; + } + + float grabbed = (1.0f - (x->w.pointery - (float)text_ypix(&x->x_obj,glist))/(float)x->w.height); + #ifdef DEBUG + post("grabbed =%f",grabbed); + #endif + + if (grabbed < 0.0) + grabbed= 0.0; + else if (grabbed > 1.0) + grabbed= 1.0; + + x->finalvalues[x->w.grabbed] = grabbed * ySize + yBase; + + + outlet_bang(x->out3); + if (x->c_sym != &s_) pd_bang(x->c_sym->s_thing); + +} + + +void breakpoints_motion(t_breakpoints *x, t_floatarg dx, t_floatarg dy) +{ + if (x->w.shift) { + x->w.pointerx+=dx/1000.f; + x->w.pointery+=dy/1000.f; + } + else + { + x->w.pointerx+=dx; + x->w.pointery+=dy; + } + if (!x->resizing) + breakpoints_followpointer(x,x->w.glist); + else { + x->w.width+=dx; + x->w.height+=dy; + } + breakpoints_shownum(x,x->w.glist); + breakpoints_update(x,x->w.glist); +} + +void breakpoints_key(t_breakpoints *x, t_floatarg f) +{ + if (f == 8.0 && x->w.grabbed < x->last_state && x->w.grabbed > 0) { + int i; + + for (i=x->w.grabbed;i<=x->last_state;i++) { + x->duration[i] = x->duration[i+1]; + x->finalvalues[i] = x->finalvalues[i+1]; + } + + x->last_state--; + x->w.grabbed--; + breakpoints_update(x,x->w.glist); + outlet_bang(x->out3); + if (x->c_sym != &s_) pd_bang(x->c_sym->s_thing); + } +} + + +/* +static int bng_newclick(t_gobj *z, struct _glist *glist, int xpix, int ypix, int shift, int alt, int dbl, int doit) +{ + if(doit) + bng_click((t_bng *)z, (t_floatarg)xpix, (t_floatarg)ypix, (t_floatarg)shift, 0, (t_floatarg)alt); + return (1); +} +*/ + +static int breakpoints_newclick(t_breakpoints *x, struct _glist *glist, + int xpos, int ypos, int shift, int alt, int dbl, int doit) +{ + // check if user wants to resize + float wxpos = text_xpix(&x->x_obj,glist); + float wypos = (text_ypix(&x->x_obj,glist)); + + if (doit){ + + #ifdef DEBUG + + post("clicked"); + #endif + + + /* + + if ( (xpos >= wxpos + BORDER) && (xpos <= wxpos + x->w.width - BORDER) \ + && (ypos >= wypos + BORDER) && (ypos <= wypos + x->w.height - BORDER) ) { + */ + + + if ( (xpos >= wxpos ) && (xpos <= wxpos + x->w.width ) \ + && (ypos >= wypos ) && (ypos <= wypos + x->w.height ) ) { + #ifdef DEBUG + post("inside"); + #endif + + breakpoints_next_doodle(x,glist,xpos,ypos); + + glist_grab(x->w.glist, &x->x_obj.te_g, (t_glistmotionfn) breakpoints_motion, + (t_glistkeyfn) breakpoints_key, xpos, ypos); + + x->w.shift = shift; + breakpoints_followpointer(x,glist); + breakpoints_shownum(x,glist); + breakpoints_update(x,glist); + + + } + + } + return (1); +} + +/* +static int breakpoints_newclick(t_breakpoints *x, struct _glist *glist, + int xpos, int ypos, int shift, int alt, int dbl, int doit) +{ + //check if user wants to resize + float wxpos = text_xpix(&x->x_obj,glist); + float wypos = (int) (text_ypix(&x->x_obj,glist) + x->w.height); + + if (doit){ + breakpoints_next_doodle(x,glist,xpos,ypos); + + glist_grab(x->w.glist, &x->x_obj.te_g, (t_glistmotionfn) breakpoints_motion, + (t_glistkeyfn) breakpoints_key, xpos, ypos); + + x->resizing = 0; + if (x->resizeable && (xpos > wxpos + x->w.width) && + (ypos > wypos)) { + x->resizing = 1; + + } + + if (xpos > wxpos + BORDER && (xpos < wxpos + x->w.width - BORDER) \ + ypos > wypos + BORDER && (ypos < wypos + x->w.height - BORDER) ) { + x->w.shift = shift; + breakpoints_followpointer(x,glist); + breakpoints_shownum(x,glist); + breakpoints_update(x,glist); + } + } + return (1); +} + +*/ + Property changes on: trunk/externals/tof/src/w_breakpoints.h ___________________________________________________________________ Name: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data: [9638] trunk/externals/moocow/flite
by mukau＠users.sourceforge.net 28 Mar '08

28 Mar '08

Revision: 9638 http://pure-data.svn.sourceforge.net/pure-data/?rev=9638&view=rev Author: mukau Date: 2008-03-28 14:23:51 -0700 (Fri, 28 Mar 2008) Log Message: ----------- + cleaned up build a bit, removed class_sethelpsymbol() Modified Paths: -------------- trunk/externals/moocow/flite/configure.in trunk/externals/moocow/flite/flite.c Added Paths: ----------- trunk/externals/moocow/flite/.cvsignore trunk/externals/moocow/flite/config/.cvsignore Property Changed: ---------------- trunk/externals/moocow/flite/ trunk/externals/moocow/flite/config/ Property changes on: trunk/externals/moocow/flite ___________________________________________________________________ Name: svn:ignore + *~ .*~ *.o *.pd_linux aclocal.m4 Makefile Makefile.in configure config.log config.status .deps install-sh mkinstalldirs missing config.guess config.sub depcomp ltmain.sh stamp-h* config.h config.h.in autom4te.cache Added: trunk/externals/moocow/flite/.cvsignore =================================================================== --- trunk/externals/moocow/flite/.cvsignore (rev 0) +++ trunk/externals/moocow/flite/.cvsignore 2008-03-28 21:23:51 UTC (rev 9638) @@ -0,0 +1,23 @@ +*~ +.*~ +*.o +*.pd_linux +aclocal.m4 +Makefile +Makefile.in +configure +config.log +config.status +.deps +install-sh +mkinstalldirs +missing +config.guess +config.sub +depcomp +ltmain.sh +stamp-h* +config.h +config.h.in +autom4te.cache + Property changes on: trunk/externals/moocow/flite/config ___________________________________________________________________ Name: svn:ignore + *~ .*~ *.o *.pd_linux aclocal.m4 Makefile Makefile.in configure config.log config.status .deps install-sh mkinstalldirs missing config.guess config.sub depcomp ltmain.sh stamp-h* config.h config.h.in autom4te.cache Added: trunk/externals/moocow/flite/config/.cvsignore =================================================================== --- trunk/externals/moocow/flite/config/.cvsignore (rev 0) +++ trunk/externals/moocow/flite/config/.cvsignore 2008-03-28 21:23:51 UTC (rev 9638) @@ -0,0 +1,23 @@ +*~ +.*~ +*.o +*.pd_linux +aclocal.m4 +Makefile +Makefile.in +configure +config.log +config.status +.deps +install-sh +mkinstalldirs +missing +config.guess +config.sub +depcomp +ltmain.sh +stamp-h* +config.h +config.h.in +autom4te.cache + Modified: trunk/externals/moocow/flite/configure.in =================================================================== --- trunk/externals/moocow/flite/configure.in 2008-03-28 13:28:03 UTC (rev 9637) +++ trunk/externals/moocow/flite/configure.in 2008-03-28 21:23:51 UTC (rev 9638) @@ -1,8 +1,14 @@ dnl Process this file with autoconf to produce a configure script. dnl -- adapted from 'configure.in' in ggee distribution by Guenter Geiger AC_PREREQ(2.5) -AC_INIT(pd-flite, [0.01], [moocow(a)ling.uni-potsdam.de]) +dnl Some handy macros +define([THE_PACKAGE_NAME], [pdflite]) +define([THE_PACKAGE_VERSION], [0.02]) +define([THE_PACKAGE_AUTHOR], [moocow(a)ling.uni-potsdam.de]) + +AC_INIT(THE_PACKAGE_NAME, THE_PACKAGE_VERSION, THE_PACKAGE_AUTHOR) + dnl dnl source & aux dnl @@ -11,7 +17,7 @@ dnl dnl use automake dnl -AM_INIT_AUTOMAKE(pd-flite, [0.01]) +AM_INIT_AUTOMAKE(THE_PACKAGE_NAME, THE_PACKAGE_VERSION) dnl dnl use autoheader @@ -23,9 +29,8 @@ dnl AC_PREFIX_DEFAULT(/usr/local/lib/pd) -dnl -dnl Save user flags -dnl +##-- save user *FLAGS +UCPPFLAGS="$CPPFLAGS" UCFLAGS="$CFLAGS" ULDFLAGS="$LDFLAGS" ULIBS="$LIBS" @@ -53,7 +58,14 @@ AC_SUBST(PACKAGE_NAME) AC_SUBST(BUGREPORT) +##-- banner stuff +compiled_by="${LOGNAME:-${USER:-(unknown)}}" +compiled_on="`date`" +test -z "$compiled_on" && compiled_on="?" +AC_DEFINE_UNQUOTED(PDFLITE_COMPILED_BY, "$compiled_by", [User who compiled this external]) +AC_DEFINE_UNQUOTED(PDFLITE_COMPILED_ON, "$compiled_on", [When this external was compiled]) + dnl dnl pd-directory/ies dnl @@ -89,53 +101,48 @@ dnl flite source directory dnl AC_ARG_WITH(flite-dir, - AC_HELP_STRING([--with-flite-dir=DIR], [Flite base directory (default=/usr/local/lib/flite-1.1-release)]), - [FLITE_DIR="$withval"] + AC_HELP_STRING([--with-flite-dir=DIR], [Flite source directory (default=none)]), + [FLITE_DIR="$withval"], ) if test -n "$FLITE_DIR"; then - FLITE_INCDIR="${FLITE_DIR}/include" - FLITE_LIBDIR="${FLITE_DIR}/lib" - #IFLAGS="$IFLAGS -I${FLITE_DIR}/include" - #LFLAGS="$LFLAGS -L${FLITE_DIR}/lib" + IFLAGS="$IFLAGS -I${FLITE_DIR}/include" + LFLAGS="$LFLAGS -L${FLITE_DIR}/lib" fi -##-- check: headers -UCPPFLAGS="$CPPFLAGS" -if test -z "$FLITE_INCDIR"; then - for d_base in /usr /usr/local /sw ; do - for d_sub in 'include' 'include/flite' 'flite' 'flite/include' ; do - d="${d_base}/${d_sub}" - CPPFLAGS="$UCPPFLAGS -I$d" - AC_CHECK_HEADER($d/flite.h,[FLITE_INCDIR="$d"; break],[],[ ]) - done - if test -n "$FLITE_INCDIR"; then break; fi - done - ##-- flite.h: final check - if test -z "$FLITE_INCDIR"; then - AC_MSG_ERROR([Required header 'flite.h' not found: aborting],1) - fi - IFLAGS="$IFLAGS -I${FLITE_INCDIR}" +##-- check: headers: flite.h +CPPFLAGS="$UCPPFLAGS $IFLAGS" +AC_CHECK_HEADER([flite/flite.h],[pdflite_have_header=yes],[pdflite_have_header=no],[ ]) +if test "$pdflite_have_header" != "yes"; then + AC_MSG_WARN([Required header 'flite.h' not found]) + AC_MSG_WARN([- is the directory containing 'flite.h' in your CPPFLAGS variable?]) + AC_MSG_ERROR([Required header not found: aborting],1) fi -##--/FLITE_INCDIR ##-- check libs: libflite.a -ULDFLAGS="$LDFLAGS" -if test -z "$FLITE_LIBDIR"; then - for d_base in /usr /usr/local /sw ; do - for d_sub in 'lib' 'lib/flite' 'flite' 'flite/lib' ; do - d="${d_base}/${d_sub}" - LDFLAGS="$ULDFLAGS -L$d" - AC_CHECK_LIB(flite,[flite_init],[FLITE_LIBDIR="$d"; break],[],[-lm]) - done - if test -n "$FLITE_LIBDIR"; then break; fi +LDFLAGS="$ULDFLAGS $LFLAGS" +AC_CHECK_LIB(flite,[flite_init],[pdflite_have_lib=yes],[pdflite_have_lib=no],[-lm]) +if test "$pdflite_have_lib" != "yes"; then + for d in \ + /usr/lib /usr/local/lib /sw/lib \ + /usr/lib/flite /usr/local/lib/flite /sw/lib/flite \ + /usr/flite/lib /usr/local/flite/lib /sw/flite/lib \ + /usr/lib/flite/lib /usr/local/lib/flite/lib /sw/lib/flite/lib + do + LDFLAGS="$ULDFLAGS $LFLAGS -L$d" + AC_CHECK_LIB(flite,[flite_init],[pdflite_have_lib=yes],[pdflite_have_lib=no],[-lm]) + if test "$pdflite_have_lib" = "yes"; then + LFLAGS="$LFLAGS -L$d" + break + fi done + ## ##-- libflite.a: final check - if test -z "$FLITE_LIBDIR"; then - AC_MSG_ERROR([Required library 'flite' not found: aborting],1) + if test "$pdflite_have_lib" != "yes"; then + AC_MSG_WARN([Required library 'flite' not found]) + AC_MSG_WARN([- is the directory containing the 'flite' library in your LDFLAGS variable?]) + AC_MSG_ERROR([Required library not found: aborting],1) fi - LFLAGS="$LFLAGS -L${FLITE_LIBDIR}" fi -##--/FLITE_LIBDIR ##-- flite: libs: base FLITE_LIBS="-lflite -lm" Modified: trunk/externals/moocow/flite/flite.c =================================================================== --- trunk/externals/moocow/flite/flite.c 2008-03-28 13:28:03 UTC (rev 9637) +++ trunk/externals/moocow/flite/flite.c 2008-03-28 21:23:51 UTC (rev 9638) @@ -22,8 +22,8 @@ #endif #include <math.h> -#include <flite.h> -#include <cst_wave.h> +#include <flite/flite.h> +#include "flite/cst_wave.h" /*-------------------------------------------------------------------- * DEBUG @@ -45,8 +45,10 @@ * Structures and Types *=====================================================================*/ -static char *flite_description = - "flite: Text-to-Speech external v%s by Bryan Jurish"; +static const char *flite_description = + "flite: Text-to-Speech external v" PACKAGE_VERSION " by Bryan Jurish\n" + "flite: compiled on " PDFLITE_COMPILED_ON " by " PDFLITE_COMPILED_BY "\n" + ; //static char *flite_acknowledge = "flite: based on code by "; //static char *flite_version = "flite: PD external v%s by Bryan Jurish"; @@ -237,7 +239,7 @@ *--------------------------------------------------------------------*/ void flite_setup(void) { post(""); - post(flite_description, PACKAGE_VERSION); + post(flite_description); post(""); // --- setup synth @@ -260,5 +262,5 @@ class_addmethod(flite_class, (t_method)flite_synth, gensym("synth"), 0); // --- help patch - class_sethelpsymbol(flite_class, gensym("flite-help.pd")); + //class_sethelpsymbol(flite_class, gensym("flite-help.pd")); /* breaks pd-extended help lookup */ } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data: [9637] trunk/externals/moocow/flite/configure.in
by mukau＠users.sourceforge.net 28 Mar '08

28 Mar '08

Revision: 9637 http://pure-data.svn.sourceforge.net/pure-data/?rev=9637&view=rev Author: mukau Date: 2008-03-28 06:28:03 -0700 (Fri, 28 Mar 2008) Log Message: ----------- + updated configure.in to handle distribution-default flite installlations better Modified Paths: -------------- trunk/externals/moocow/flite/configure.in Modified: trunk/externals/moocow/flite/configure.in =================================================================== --- trunk/externals/moocow/flite/configure.in 2008-03-28 11:49:00 UTC (rev 9636) +++ trunk/externals/moocow/flite/configure.in 2008-03-28 13:28:03 UTC (rev 9637) @@ -86,38 +86,58 @@ dnl -dnl flite-directory +dnl flite source directory dnl AC_ARG_WITH(flite-dir, AC_HELP_STRING([--with-flite-dir=DIR], [Flite base directory (default=/usr/local/lib/flite-1.1-release)]), - [FLITE_DIR="$withval"], - [FLITE_DIR="/usr/local/lib/flite-1.1-release"]) -AC_SUBST(FLITE_DIR) -IFLAGS="$IFLAGS -I${FLITE_DIR}/include" -LFLAGS="$LFLAGS -L${FLITE_DIR}/lib" + [FLITE_DIR="$withval"] + ) +if test -n "$FLITE_DIR"; then + FLITE_INCDIR="${FLITE_DIR}/include" + FLITE_LIBDIR="${FLITE_DIR}/lib" + #IFLAGS="$IFLAGS -I${FLITE_DIR}/include" + #LFLAGS="$LFLAGS -L${FLITE_DIR}/lib" +fi -dnl -dnl Check for flite : headers -dnl +##-- check: headers UCPPFLAGS="$CPPFLAGS" -CPPFLAGS="$UCPPFLAGS $IFLAGS" -for h in flite.h ; do - AC_CHECK_HEADER($h,[pdflite_have_header="yes"],[pdflite_have_header="no"],[ ]) - if test "$pdflite_have_header" = "no" ; then - AC_MSG_ERROR([required header 'flite.h' not found -- quitting],1) +if test -z "$FLITE_INCDIR"; then + for d_base in /usr /usr/local /sw ; do + for d_sub in 'include' 'include/flite' 'flite' 'flite/include' ; do + d="${d_base}/${d_sub}" + CPPFLAGS="$UCPPFLAGS -I$d" + AC_CHECK_HEADER($d/flite.h,[FLITE_INCDIR="$d"; break],[],[ ]) + done + if test -n "$FLITE_INCDIR"; then break; fi + done + ##-- flite.h: final check + if test -z "$FLITE_INCDIR"; then + AC_MSG_ERROR([Required header 'flite.h' not found: aborting],1) fi -done -CPPFLAGS="$UCPPFLAGS" + IFLAGS="$IFLAGS -I${FLITE_INCDIR}" +fi +##--/FLITE_INCDIR -dnl -dnl Check for flite : libs : flite -dnl -LDFLAGS="$ULDFLAGS $LFLAGS" -LIBS="$LIBS -lm" -AC_CHECK_LIB(flite,[flite_init],[], - [AC_MSG_ERROR([required library 'libflite.a' not found -- quitting],1)], - [-lm]) -LDFLAGS="$ULDFLAGS" +##-- check libs: libflite.a +ULDFLAGS="$LDFLAGS" +if test -z "$FLITE_LIBDIR"; then + for d_base in /usr /usr/local /sw ; do + for d_sub in 'lib' 'lib/flite' 'flite' 'flite/lib' ; do + d="${d_base}/${d_sub}" + LDFLAGS="$ULDFLAGS -L$d" + AC_CHECK_LIB(flite,[flite_init],[FLITE_LIBDIR="$d"; break],[],[-lm]) + done + if test -n "$FLITE_LIBDIR"; then break; fi + done + ##-- libflite.a: final check + if test -z "$FLITE_LIBDIR"; then + AC_MSG_ERROR([Required library 'flite' not found: aborting],1) + fi + LFLAGS="$LFLAGS -L${FLITE_LIBDIR}" +fi +##--/FLITE_LIBDIR + +##-- flite: libs: base FLITE_LIBS="-lflite -lm" AC_SUBST(FLITE_LIBS) @@ -126,7 +146,7 @@ dnl LDFLAGS="$ULDFLAGS $LFLAGS" AC_CHECK_LIB(flite_cmulex,[cmu_lex_init],[], - [AC_MSG_ERROR([required library 'libflite_cmulex.a' not found -- quitting],1)], + [AC_MSG_ERROR([required library 'flite_cmulex' not found -- quitting],1)], [-lflite -lm]) FLITE_LEXLIBS="-lflite_cmulex" AC_SUBST(FLITE_LEXLIBS) @@ -136,7 +156,7 @@ dnl LDFLAGS="$ULDFLAGS $LFLAGS" AC_CHECK_LIB(flite_usenglish,[usenglish_init],[], - [AC_MSG_ERROR([required library 'libflite_usenglish.a' not found -- quitting],1)], + [AC_MSG_ERROR([required library 'flite_usenglish' not found -- quitting],1)], [-lflite_cmulex -lflite -lm]) FLITE_LANGLIBS="-lflite_usenglish" AC_SUBST(FLITE_LANGLIBS) @@ -145,7 +165,7 @@ dnl LDFLAGS="$ULDFLAGS $LFLAGS" AC_CHECK_LIB(flite_cmu_us_kal16,[register_cmu_us_kal],[], - [AC_MSG_ERROR([required library 'libflite_cmu_us_kal16.a' not found -- quitting],1)], + [AC_MSG_ERROR([required library 'flite_cmu_us_kal16' not found -- quitting],1)], [-lflite_usenglish -lflite_cmulex -lflite -lm]) FLITE_VOICELIBS="-lflite_cmu_us_kal16" AC_SUBST(FLITE_VOICELIBS) @@ -187,7 +207,7 @@ LFLAGS="$LFLAGS -export_dynamic -shared" if test "$DEBUG" = "no"; then #OFLAGS="-O6 -funroll-loops -fomit-frame-pointer" - OFLAGS="-O3 -funroll-loops -fomit-frame-pointer -pipe" + OFLAGS="-O3 -pipe" else OFLAGS="-g" fi @@ -238,8 +258,9 @@ dnl dnl Restore user flags dnl +CPPFLAGS="$UCPPFLAGS" +CFLAGS="$UCFLAGS" LDFLAGS="$ULDFLAGS" -CFLAGS="$UCFLAGS" LIBS="$ULIBS" AC_OUTPUT(config/Makefile Makefile) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data: [9636] trunk/externals/moocow/pdstring/src
by mukau＠users.sourceforge.net 28 Mar '08

28 Mar '08

Revision: 9636 http://pure-data.svn.sourceforge.net/pure-data/?rev=9636&view=rev Author: mukau Date: 2008-03-28 04:49:00 -0700 (Fri, 28 Mar 2008) Log Message: ----------- + removed class_sethelpsymbol() calls Modified Paths: -------------- trunk/externals/moocow/pdstring/src/any2string.c trunk/externals/moocow/pdstring/src/pdstring.c trunk/externals/moocow/pdstring/src/string2any.c Modified: trunk/externals/moocow/pdstring/src/any2string.c =================================================================== --- trunk/externals/moocow/pdstring/src/any2string.c 2008-03-28 02:17:07 UTC (rev 9635) +++ trunk/externals/moocow/pdstring/src/any2string.c 2008-03-28 11:49:00 UTC (rev 9636) @@ -4,7 +4,7 @@ * Author: Bryan Jurish <moocow(a)ling.uni-potsdam.de> * Description: convert pd messages to strings (dynamic allocation) * - * Copyright (c) 2004 - 2007 Bryan Jurish. + * Copyright (c) 2004 - 2008 Bryan Jurish. * * For information on usage and redistribution, and for a DISCLAIMER OF ALL * WARRANTIES, see the file "COPYING", in this distribution. @@ -222,7 +222,7 @@ //-- help symbol - class_sethelpsymbol(any2string_class, gensym("any2string-help.pd")); + //class_sethelpsymbol(any2string_class, gensym("any2string-help.pd")); //-- breaks pd-extended help lookup } /*-------------------------------------------------------------------- Modified: trunk/externals/moocow/pdstring/src/pdstring.c =================================================================== --- trunk/externals/moocow/pdstring/src/pdstring.c 2008-03-28 02:17:07 UTC (rev 9635) +++ trunk/externals/moocow/pdstring/src/pdstring.c 2008-03-28 11:49:00 UTC (rev 9636) @@ -4,7 +4,7 @@ * Author: Bryan Jurish <moocow(a)ling.uni-potsdam.de> * Description: pd string conversions : library * - * Copyright (c) 2004-2006 Bryan Jurish. + * Copyright (c) 2004-2008 Bryan Jurish. * * For information on usage and redistribution, and for a DISCLAIMER OF ALL * WARRANTIES, see the file "COPYING", in this distribution. @@ -104,5 +104,5 @@ class_addmethod(pdstring_class, (t_method)pdstring_help, gensym("help"), A_NULL); //-- help symbol - class_sethelpsymbol(pdstring_class, gensym("pdstring-help.pd")); + //class_sethelpsymbol(pdstring_class, gensym("pdstring-help.pd")); //-- breaks pd-extended help lookup } Modified: trunk/externals/moocow/pdstring/src/string2any.c =================================================================== --- trunk/externals/moocow/pdstring/src/string2any.c 2008-03-28 02:17:07 UTC (rev 9635) +++ trunk/externals/moocow/pdstring/src/string2any.c 2008-03-28 11:49:00 UTC (rev 9636) @@ -4,7 +4,7 @@ * Author: Bryan Jurish <moocow(a)ling.uni-potsdam.de> * Description: convert strings to pd messages * - * Copyright (c) 2004 Bryan Jurish. + * Copyright (c) 2004-2008 Bryan Jurish. * * For information on usage and redistribution, and for a DISCLAIMER OF ALL * WARRANTIES, see the file "COPYING", in this distribution. @@ -233,7 +233,7 @@ //-- help symbol - class_sethelpsymbol(string2any_class, gensym("string2any-help.pd")); + //class_sethelpsymbol(string2any_class, gensym("string2any-help.pd")); //-- breaks pd-extended help lookup } /*-------------------------------------------------------------------- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data: [9635] trunk/externals/nusmuk/msd
by nimon＠users.sourceforge.net 28 Mar '08

28 Mar '08

Revision: 9635 http://pure-data.svn.sourceforge.net/pure-data/?rev=9635&view=rev Author: nimon Date: 2008-03-27 19:17:07 -0700 (Thu, 27 Mar 2008) Log Message: ----------- examples modified Modified Paths: -------------- trunk/externals/nusmuk/msd/01_msdtest.pd trunk/externals/nusmuk/msd/02_msdstring.pd trunk/externals/nusmuk/msd/03_msdwave.pd trunk/externals/nusmuk/msd2D/01_msd2Dtest.pd trunk/externals/nusmuk/msd2D/06_msd2Dgravit.pd trunk/externals/nusmuk/msd3D/01_msd3Dtest.pd trunk/externals/nusmuk/msd3D/02_msd3Dperf.pd trunk/externals/nusmuk/msd3D/03_msd3Dmemb.pd trunk/externals/nusmuk/msd3D/04_msd3Dfilet.pd trunk/externals/nusmuk/msd3D/05_msd3Dvline.pd Modified: trunk/externals/nusmuk/msd/01_msdtest.pd =================================================================== --- trunk/externals/nusmuk/msd/01_msdtest.pd 2008-03-28 00:54:03 UTC (rev 9634) +++ trunk/externals/nusmuk/msd/01_msdtest.pd 2008-03-28 02:17:07 UTC (rev 9635) @@ -1,6 +1,6 @@ #N canvas 392 22 616 594 10; #X obj 20 33 loadbang; -#X obj 366 197 print msd; +#X obj 382 197 print msd; #X obj 309 58 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 1 1 ; #X text 329 56 ON / OFF; @@ -14,27 +14,21 @@ #X msg 128 394 setD souple 1; #X msg 18 393 setK souple 2; #X obj 331 392 vsl 15 128 0 100 0 0 empty empty empty 0 -8 0 8 -262144 --1 -1 5250 1; +-1 -1 7025 1; #X obj 354 392 vsl 15 128 0 100 0 0 empty empty empty 0 -8 0 8 -262144 --1 -1 5250 1; +-1 -1 7484 1; #X obj 308 392 vsl 15 128 0 100 0 0 empty empty empty 0 -8 0 8 -262144 --1 -1 5250 1; +-1 -1 6450 1; #X msg 308 538 posX fix \$1; #X obj 401 392 vsl 15 128 0 100 0 0 empty empty empty 0 -8 0 8 -262144 --1 -1 5250 1; +-1 -1 7901 1; #X obj 377 392 vsl 15 128 0 100 0 0 empty empty empty 0 -8 0 8 -262144 --1 -1 5250 1; +-1 -1 7771 1; #X msg 20 256 0 1 \, 1 2 \, 2 3 \, 3 4; #X obj 308 347 unpack f f f f f; #X obj 308 325 route massesPosL; #X msg 309 103 bang \, massesPosL; #X msg 20 278 link souple \$1 \$2 10 10; -#X obj 83 314 s msdin; -#X obj 319 138 r msdin; -#X obj 309 197 s msdout; -#X obj 308 302 r msdout; -#X obj 308 560 s msdin; -#X obj 18 421 s msdin; #X obj 309 167 msd; #X obj 309 31 loadbang; #X obj 20 77 t b b b b b; @@ -47,24 +41,30 @@ #X text 429 453 to move the fixed mass; #X msg 19 503 forceX mob 300; #X msg 19 479 forceX mob -300; -#X obj 19 530 s msdin; #X text 307 279 display and interaction; #X msg 51 201 mass mob 1 100 50; #X msg 51 159 4; #X obj 51 180 until; #X msg 67 139 mass fix 0 100 50; -#X connect 0 0 31 0; +#X obj 83 314 s \$0-msdin; +#X obj 18 421 s \$0-msdin; +#X obj 19 530 s \$0-msdin; +#X obj 319 138 r \$0-msdin; +#X obj 309 197 s \$0-msdout; +#X obj 308 302 r \$0-msdout; +#X obj 308 560 s \$0-msdin; +#X connect 0 0 25 0; #X connect 2 0 4 0; #X connect 4 0 21 0; -#X connect 5 0 31 0; -#X connect 6 0 23 0; -#X connect 7 0 23 0; -#X connect 8 0 28 0; -#X connect 9 0 28 0; -#X connect 10 0 28 0; -#X connect 11 0 28 0; +#X connect 5 0 25 0; +#X connect 6 0 40 0; +#X connect 7 0 40 0; +#X connect 8 0 41 0; +#X connect 9 0 41 0; +#X connect 10 0 41 0; +#X connect 11 0 41 0; #X connect 14 0 15 0; -#X connect 15 0 27 0; +#X connect 15 0 46 0; #X connect 18 0 22 0; #X connect 19 0 14 0; #X connect 19 1 12 0; @@ -72,21 +72,21 @@ #X connect 19 3 17 0; #X connect 19 4 16 0; #X connect 20 0 19 0; -#X connect 21 0 29 0; -#X connect 22 0 23 0; -#X connect 24 0 29 0; -#X connect 26 0 20 0; -#X connect 29 0 25 0; -#X connect 29 1 1 0; -#X connect 30 0 2 0; -#X connect 31 0 18 0; -#X connect 31 1 7 0; -#X connect 31 2 44 0; -#X connect 31 3 46 0; -#X connect 31 4 6 0; -#X connect 39 0 41 0; -#X connect 40 0 41 0; +#X connect 21 0 23 0; +#X connect 22 0 40 0; +#X connect 23 0 44 0; +#X connect 23 1 1 0; +#X connect 24 0 2 0; +#X connect 25 0 18 0; +#X connect 25 1 7 0; +#X connect 25 2 37 0; +#X connect 25 3 39 0; +#X connect 25 4 6 0; +#X connect 33 0 42 0; +#X connect 34 0 42 0; +#X connect 36 0 40 0; +#X connect 37 0 38 0; +#X connect 38 0 36 0; +#X connect 39 0 40 0; #X connect 43 0 23 0; -#X connect 44 0 45 0; -#X connect 45 0 43 0; -#X connect 46 0 23 0; +#X connect 45 0 20 0; Modified: trunk/externals/nusmuk/msd/02_msdstring.pd =================================================================== --- trunk/externals/nusmuk/msd/02_msdstring.pd 2008-03-28 00:54:03 UTC (rev 9634) +++ trunk/externals/nusmuk/msd/02_msdstring.pd 2008-03-28 02:17:07 UTC (rev 9635) @@ -2,7 +2,7 @@ #X obj 24 54 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262131 -1 -1; #X text 49 54 reset; -#N canvas 0 22 454 304 creation_structure 0; +#N canvas 0 22 610 333 creation_structure 0; #X obj 52 15 loadbang; #X obj 135 20 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262131 -1 -1; @@ -80,26 +80,25 @@ #X obj 135 42 t b b b b; #X text 252 82 CREATION : 2 masses fixes (fix) \, 80 mobiles (corde) \, 80 liens (souple) \, 78 tLink (D2); -#X obj 135 160 s msdin; #X msg 135 132 Xmax 100 \, Xmin -100; #X obj 247 23 inlet; #X obj 121 213 loadbang; #X obj 121 237 s load; +#X obj 135 160 s \$0-msdin; #X connect 0 0 6 0; #X connect 1 0 6 0; -#X connect 2 0 8 0; -#X connect 4 0 8 0; -#X connect 5 0 8 0; -#X connect 6 0 9 0; +#X connect 2 0 12 0; +#X connect 4 0 12 0; +#X connect 5 0 12 0; +#X connect 6 0 8 0; #X connect 6 1 5 0; #X connect 6 2 4 0; #X connect 6 3 2 0; -#X connect 9 0 8 0; -#X connect 10 0 6 0; -#X connect 11 0 12 0; +#X connect 8 0 12 0; +#X connect 9 0 6 0; +#X connect 10 0 11 0; #X restore 24 76 pd creation_structure; #N canvas 508 227 516 328 compute 0; -#X obj 274 162 print msd; #X obj 27 30 gemhead; #N canvas 735 244 537 479 corde 0; #X obj 139 41 inlet; @@ -176,7 +175,6 @@ #X obj 186 219 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1; #X obj 27 136 msd --------------------------------; -#X obj 95 100 r msdin; #X obj 27 53 t b b b b b b b; #X obj 27 195 route massesPos massesSpeeds massesForces; #X text 208 240 Afficher les vitesses en haut; @@ -227,27 +225,27 @@ #X restore 215 278 pd forces; #X msg 27 75 bang \, get massesPos \, get massesSpeeds \, get massesForces ; -#X connect 1 0 7 0; -#X connect 4 0 3 1; -#X connect 5 0 8 0; -#X connect 5 1 0 0; -#X connect 6 0 5 0; -#X connect 7 0 15 0; -#X connect 7 1 5 0; -#X connect 7 2 5 0; -#X connect 7 3 5 0; -#X connect 7 4 5 0; -#X connect 7 5 5 0; -#X connect 7 6 5 0; -#X connect 8 0 2 0; -#X connect 8 1 3 0; -#X connect 8 2 14 0; -#X connect 11 0 14 1; -#X connect 11 0 3 1; -#X connect 12 0 13 0; -#X connect 15 0 5 0; +#X obj 95 100 r \$0-msdin; +#X connect 0 0 5 0; +#X connect 3 0 2 1; +#X connect 4 0 6 0; +#X connect 5 0 13 0; +#X connect 5 1 4 0; +#X connect 5 2 4 0; +#X connect 5 3 4 0; +#X connect 5 4 4 0; +#X connect 5 5 4 0; +#X connect 5 6 4 0; +#X connect 6 0 1 0; +#X connect 6 1 2 0; +#X connect 6 2 12 0; +#X connect 9 0 12 1; +#X connect 9 0 2 1; +#X connect 10 0 11 0; +#X connect 13 0 4 0; +#X connect 14 0 4 0; #X restore 24 165 pd compute; -#X obj 24 143 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1 +#X obj 24 143 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0 1; #X obj 307 151 hsl 128 15 0 30 0 0 empty empty empty -2 -6 0 8 -262144 -1 -1 0 1; @@ -264,7 +262,7 @@ #X msg 206 231 36 \$1 \, 37 \$1 \, 38 \$1 \, 45 \$1 \, 46 \$1 \, 47 \$1; #X obj 206 207 / 3; -#X obj 173 286 s msdin; +#X obj 173 286 s \$0-msdin; #X connect 0 0 3 0; #X connect 0 0 4 0; #X connect 0 0 7 0; @@ -292,24 +290,24 @@ ; #X text 44 142 display forces (green) and speeds (red); #N canvas 0 22 450 300 forces 0; -#X obj 167 157 s msdin; #X msg 167 134 forceX corde \$1; #X obj 167 89 inlet; #X obj 167 112 / 300; -#X connect 1 0 0 0; -#X connect 2 0 3 0; -#X connect 3 0 1 0; +#X obj 167 157 s \$0-msdin; +#X connect 0 0 3 0; +#X connect 1 0 2 0; +#X connect 2 0 0 0; #X restore 304 56 pd forces; #X obj 307 34 hsl 128 15 0 127 0 0 empty empty empty -2 -6 0 8 -262144 --1 -1 2500 1; +-1 -1 0 1; #N canvas 0 22 450 300 general_damping 0; #X msg 172 143 setD D2 \$1; -#X obj 172 166 s msdin; #X obj 172 121 / 5; #X obj 173 100 inlet; -#X connect 0 0 1 0; -#X connect 2 0 0 0; -#X connect 3 0 2 0; +#X obj 172 166 s \$0-msdin; +#X connect 0 0 3 0; +#X connect 1 0 0 0; +#X connect 2 0 1 0; #X restore 304 171 pd general_damping; #X text 302 74 Send forces in the middle; #X text 302 16 Send forces; Modified: trunk/externals/nusmuk/msd/03_msdwave.pd =================================================================== --- trunk/externals/nusmuk/msd/03_msdwave.pd 2008-03-28 00:54:03 UTC (rev 9634) +++ trunk/externals/nusmuk/msd/03_msdwave.pd 2008-03-28 02:17:07 UTC (rev 9635) @@ -1,4 +1,4 @@ -#N canvas 360 104 602 232 10; +#N canvas 617 175 594 188 10; #X obj 29 20 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1 -1; #X text 49 19 Reset; @@ -7,7 +7,6 @@ #N canvas 0 22 981 585 structure_creation 0; #X msg 681 243 mass filet 1 100 0; #X msg 663 64 reset; -#X obj 690 527 s msdin; #X obj 418 25 t b b b b b b b b b b b b; #X obj 681 201 until; #X msg 681 170 400; @@ -37,47 +36,48 @@ 399; #X obj 418 -8 inlet; #X obj 326 61 loadbang; -#X connect 0 0 2 0; -#X connect 1 0 2 0; -#X connect 3 5 28 0; -#X connect 3 6 15 0; -#X connect 3 7 19 0; -#X connect 3 8 7 0; -#X connect 3 9 11 0; -#X connect 3 10 5 0; -#X connect 3 11 1 0; -#X connect 4 0 0 0; -#X connect 5 0 4 0; -#X connect 6 0 2 0; +#X obj 690 527 s \$0-msdin; +#X connect 0 0 30 0; +#X connect 1 0 30 0; +#X connect 2 5 27 0; +#X connect 2 6 14 0; +#X connect 2 7 18 0; +#X connect 2 8 6 0; +#X connect 2 9 10 0; +#X connect 2 10 4 0; +#X connect 2 11 1 0; +#X connect 3 0 0 0; +#X connect 4 0 3 0; +#X connect 5 0 30 0; +#X connect 6 0 7 0; #X connect 7 0 8 0; #X connect 8 0 9 0; -#X connect 9 0 10 0; -#X connect 9 0 14 0; -#X connect 10 0 9 1; -#X connect 11 0 9 1; -#X connect 12 0 13 1; -#X connect 13 0 6 0; -#X connect 14 0 13 0; -#X connect 14 1 12 0; +#X connect 8 0 13 0; +#X connect 9 0 8 1; +#X connect 10 0 8 1; +#X connect 11 0 12 1; +#X connect 12 0 5 0; +#X connect 13 0 12 0; +#X connect 13 1 11 0; +#X connect 14 0 15 0; #X connect 15 0 16 0; #X connect 16 0 17 0; -#X connect 17 0 18 0; -#X connect 17 0 20 0; -#X connect 18 0 17 1; -#X connect 19 0 17 1; -#X connect 20 0 23 0; -#X connect 20 1 21 0; -#X connect 21 0 22 0; -#X connect 22 0 23 1; -#X connect 23 0 25 0; -#X connect 24 0 27 0; -#X connect 25 0 24 0; -#X connect 25 1 26 0; -#X connect 26 0 24 1; -#X connect 27 0 2 0; +#X connect 16 0 19 0; +#X connect 17 0 16 1; +#X connect 18 0 16 1; +#X connect 19 0 22 0; +#X connect 19 1 20 0; +#X connect 20 0 21 0; +#X connect 21 0 22 1; +#X connect 22 0 24 0; +#X connect 23 0 26 0; +#X connect 24 0 23 0; +#X connect 24 1 25 0; +#X connect 25 0 23 1; +#X connect 26 0 30 0; +#X connect 27 0 30 0; #X connect 28 0 2 0; -#X connect 29 0 3 0; -#X connect 30 0 3 0; +#X connect 29 0 2 0; #X restore 29 39 pd structure_creation; #N canvas 813 63 450 300 gem 0; #X obj 114 171 gemwin; @@ -91,21 +91,21 @@ #X connect 4 0 2 0; #X connect 4 1 1 0; #X restore 30 85 pd gem; -#X obj 30 63 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0 1 +#X obj 30 63 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1 1 ; #X text 200 -6 send forces; #X text 200 7 on a row; #N canvas 0 22 450 300 damping 0; #X msg 151 90 setD fil \$1; -#X obj 151 113 s msdin; #X obj 151 70 / 8; #X obj 151 47 inlet; -#X connect 0 0 1 0; -#X connect 2 0 0 0; -#X connect 3 0 2 0; +#X obj 151 113 s \$0-msdin; +#X connect 0 0 3 0; +#X connect 1 0 0 0; +#X connect 2 0 1 0; #X restore 301 119 pd damping; #X obj 304 100 hsl 128 15 0 127 0 0 empty empty empty -2 -8 0 10 -262144 --1 -1 0 1; +-1 -1 12700 1; #X text 300 79 change viscosity; #N canvas 0 22 450 300 row 0; #X msg 149 87 20; @@ -115,8 +115,8 @@ #X msg 208 113 6; #X obj 149 63 t b b; #X msg 149 153 forceX \$1 30; -#X obj 149 183 s msdin; #X obj 149 38 inlet; +#X obj 149 183 s \$0-msdin; #X connect 0 0 2 0; #X connect 1 0 3 0; #X connect 1 0 6 0; @@ -125,48 +125,46 @@ #X connect 4 0 1 1; #X connect 5 0 0 0; #X connect 5 1 4 0; -#X connect 6 0 7 0; -#X connect 8 0 5 0; +#X connect 6 0 8 0; +#X connect 7 0 5 0; #X restore 202 51 pd row; #X obj 201 105 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1 -1; #X text 199 70 send forces; #X text 50 63 Gem on/off; #X obj 305 38 hsl 128 15 0 127 0 0 empty empty empty -2 -8 0 10 -262144 --1 -1 0 1; +-1 -1 1300 1; #X text 300 17 change rigidity; #N canvas 0 22 450 300 rigi 0; -#X obj 151 113 s msdin; #X obj 151 47 inlet; #X obj 151 70 / 4; #X msg 151 90 setK fil \$1; +#X obj 151 113 s \$0-msdin; +#X connect 0 0 1 0; #X connect 1 0 2 0; #X connect 2 0 3 0; -#X connect 3 0 0 0; #X restore 302 57 pd rigi; #X text 199 83 on a point; #N canvas 0 22 450 300 point 0; -#X obj 192 156 s msdin; #X msg 192 123 forceX 10 100; #X obj 193 95 inlet; +#X obj 192 156 s \$0-msdin; +#X connect 0 0 2 0; #X connect 1 0 0 0; -#X connect 2 0 1 0; #X restore 201 126 pd point; -#X text 469 -9 move a corner; +#X text 469 -2 move a corner; #N canvas 0 22 450 300 corner 0; #X msg 222 89 posX 0 \$1; #X obj 222 65 / 30; -#X obj 222 115 s msdin; #X obj 223 32 inlet; -#X connect 0 0 2 0; +#X obj 222 115 s \$0-msdin; +#X connect 0 0 3 0; #X connect 1 0 0 0; -#X connect 3 0 1 0; +#X connect 2 0 1 0; #X restore 471 155 pd corner; #X obj 471 17 vsl 15 128 0 127 0 0 empty empty empty 0 -9 0 10 -262144 -1 -1 0 1; #N canvas 696 124 709 588 compute 0; -#X obj 301 215 print msd; -#X obj 141 153 r msdin; #X msg 126 130 bang \, get massesPos; #X obj 126 27 gemhead; #X obj 126 224 route massesPos; @@ -193,35 +191,35 @@ ; #X obj 34 443 translateXYZ 0 0 -2; #X obj 34 477 rotateXYZ 0 20 0; -#X connect 1 0 18 0; -#X connect 2 0 18 0; +#X obj 141 153 r \$0-msdin; +#X connect 0 0 16 0; +#X connect 1 0 21 0; +#X connect 2 0 10 0; #X connect 3 0 23 0; -#X connect 4 0 12 0; -#X connect 5 0 25 0; -#X connect 6 0 5 0; +#X connect 4 0 3 0; +#X connect 5 0 7 0; +#X connect 5 0 11 0; +#X connect 5 1 6 3; +#X connect 6 0 20 0; #X connect 7 0 9 0; -#X connect 7 0 13 0; -#X connect 7 1 8 3; -#X connect 8 0 22 0; -#X connect 9 0 11 0; -#X connect 10 0 8 1; -#X connect 11 0 10 0; -#X connect 12 0 5 0; -#X connect 12 1 7 0; +#X connect 8 0 6 1; +#X connect 9 0 8 0; +#X connect 10 0 3 0; +#X connect 10 1 5 0; +#X connect 11 0 12 0; +#X connect 12 0 13 0; #X connect 13 0 14 0; -#X connect 14 0 15 0; -#X connect 15 0 16 0; -#X connect 16 0 8 2; -#X connect 17 0 6 0; -#X connect 18 0 4 0; -#X connect 18 1 0 0; -#X connect 19 0 21 0; -#X connect 21 0 20 0; -#X connect 23 0 2 0; -#X connect 23 1 24 0; -#X connect 24 0 18 0; -#X connect 25 0 26 0; -#X connect 26 0 8 0; +#X connect 14 0 6 2; +#X connect 15 0 4 0; +#X connect 16 0 2 0; +#X connect 17 0 19 0; +#X connect 19 0 18 0; +#X connect 21 0 0 0; +#X connect 21 1 22 0; +#X connect 22 0 16 0; +#X connect 23 0 24 0; +#X connect 24 0 6 0; +#X connect 25 0 16 0; #X restore 30 109 pd compute; #X connect 0 0 3 0; #X connect 2 0 11 0; Modified: trunk/externals/nusmuk/msd2D/01_msd2Dtest.pd =================================================================== --- trunk/externals/nusmuk/msd2D/01_msd2Dtest.pd 2008-03-28 00:54:03 UTC (rev 9634) +++ trunk/externals/nusmuk/msd2D/01_msd2Dtest.pd 2008-03-28 02:17:07 UTC (rev 9635) @@ -1,6 +1,6 @@ #N canvas 520 22 626 507 10; #X obj 27 26 loadbang; -#X obj 110 419 print msd; +#X obj 127 419 print msd; #X obj 369 155 gemwin; #X msg 384 132 0 \, destroy; #X text 260 26 2 DRAG THE STRUCTURE WITH THE MOUSE; @@ -115,9 +115,7 @@ #X restore 366 289 pd linkrender; #X msg 194 139 50 50; #X msg 74 96 mass fix 0 100 50 50; -#X obj 90 259 s msdin; #X msg 58 139 mass mob 1 100 \$1 \$2; -#X obj 84 373 r msdin; #X msg 58 118 40 60 \, 60 60 \, 60 40 \, 40 40; #X obj 194 162 s mouse_init; #X msg 27 207 link souple mob mob 10 5; @@ -125,44 +123,46 @@ #X text 25 1 creation : 5 masses and 20 links; #X text 52 281 compute and get masses and links positions; #X obj 53 397 msd2D; -#X obj 52 419 s msdout; -#X obj 365 423 s msdin; -#X obj 366 218 r msdout; #X text 364 315 move mass to mouse position; #X text 365 197 display masses with gem; #X msg 369 109 reset \, create \, 1; #X text 261 6 1 CREATE WINDOW; #X text 108 26 reset struct; +#X obj 90 259 s \$0-msdin; +#X obj 84 373 r \$0-msdin; +#X obj 52 419 s \$0-msdout; +#X obj 365 423 s \$0-msdin; +#X obj 366 218 r \$0-msdout; #X connect 0 0 7 0; #X connect 3 0 2 0; #X connect 5 0 7 0; -#X connect 6 0 21 0; -#X connect 7 0 26 0; +#X connect 6 0 34 0; +#X connect 7 0 24 0; #X connect 7 1 19 0; #X connect 7 1 8 0; -#X connect 7 2 24 0; +#X connect 7 2 22 0; #X connect 7 3 20 0; #X connect 7 4 6 0; -#X connect 8 0 21 0; +#X connect 8 0 34 0; #X connect 9 0 10 0; #X connect 10 0 11 0; -#X connect 11 0 30 0; +#X connect 11 0 28 0; #X connect 13 0 18 0; #X connect 13 1 12 0; #X connect 14 0 16 0; #X connect 14 0 17 0; #X connect 15 0 14 0; -#X connect 16 0 32 0; -#X connect 17 0 32 0; -#X connect 19 0 25 0; -#X connect 20 0 21 0; +#X connect 16 0 37 0; +#X connect 17 0 37 0; +#X connect 19 0 23 0; +#X connect 20 0 34 0; +#X connect 21 0 34 0; #X connect 22 0 21 0; -#X connect 23 0 30 0; -#X connect 24 0 22 0; -#X connect 26 0 27 0; -#X connect 26 0 21 0; -#X connect 27 0 21 0; -#X connect 30 0 31 0; -#X connect 30 1 1 0; -#X connect 33 0 13 0; -#X connect 36 0 2 0; +#X connect 24 0 25 0; +#X connect 24 0 34 0; +#X connect 25 0 34 0; +#X connect 28 0 36 0; +#X connect 28 1 1 0; +#X connect 31 0 2 0; +#X connect 35 0 28 0; +#X connect 38 0 13 0; Modified: trunk/externals/nusmuk/msd2D/06_msd2Dgravit.pd =================================================================== --- trunk/externals/nusmuk/msd2D/06_msd2Dgravit.pd 2008-03-28 00:54:03 UTC (rev 9634) +++ trunk/externals/nusmuk/msd2D/06_msd2Dgravit.pd 2008-03-28 02:17:07 UTC (rev 9635) @@ -1,7 +1,27 @@ -#N canvas 597 49 847 803 10; -#X obj 119 28 cnv 15 400 300 empty empty CREATION 20 12 1 14 -260818 --66577 0; -#X obj 167 310 t a; +#N canvas 386 22 491 156 10; +#X obj 18 21 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 +-1; +#X text 39 18 reset; +#N canvas 0 22 450 300 gem_stuff 0; +#X msg 30 89 0 \, destroy; +#X obj 30 185 gemhead; +#X obj 30 238 world_light; +#X obj 30 148 gemwin; +#X msg 30 66 reset \, dimen 800 800 \, create \, lighting 1 \, 1; +#X obj 30 212 rotateXYZ 30 20 0; +#X obj 32 10 inlet; +#X obj 32 37 sel 1 0; +#X connect 0 0 3 0; +#X connect 1 0 5 0; +#X connect 4 0 3 0; +#X connect 5 0 2 0; +#X connect 6 0 7 0; +#X connect 7 0 4 0; +#X connect 7 1 0 0; +#X restore 18 87 pd gem_stuff; +#X obj 18 69 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1 1 +; +#N canvas 0 22 804 395 creation 0; #X obj 42 28 bng 20 250 50 0 empty empty empty 0 -6 0 8 -258699 -1 -1; #X msg 239 84 reset; @@ -84,26 +104,37 @@ #X text 292 146 Particules; #X msg 185 268 link sun fix mob 0.2 0 -2 0.4; #X msg 167 178 forceX mob 5.9; -#X obj 453 353 cnv 15 300 300 empty empty GEM_STUFF 20 12 1 14 -241291 --66577 0; -#X msg 460 409 0 \, destroy; -#X obj 460 525 gemhead; -#X obj 460 578 world_light; -#X obj 460 488 gemwin; -#X msg 460 433 view 0 0 4 0 0 0 0 1 0; -#X msg 460 386 reset \, dimen 800 800 \, create \, lighting 1 \, 1 -; -#X obj 460 552 rotateXYZ 30 20 0; -#X obj 38 359 cnv 15 350 250 empty empty COMPUTING 20 12 1 14 -260818 --66577 0; -#X obj 52 542 msd2D --------------------------------; -#X obj 52 424 t b; -#X obj 52 401 gemhead; -#X msg 197 483 forceX mob 0.051; -#X msg 197 509 forceY mob 0.1; -#X msg 52 458 bang \, bang \, get massesPos; -#X obj 37 639 cnv 15 300 100 empty empty DISPLAYING 20 12 1 14 -241291 --66577 0; +#X obj 167 310 s \$0-msdin; +#X obj 166 25 inlet; +#X connect 0 0 4 0; +#X connect 1 0 19 0; +#X connect 2 0 4 0; +#X connect 4 0 9 0; +#X connect 4 0 18 0; +#X connect 4 1 8 0; +#X connect 4 1 17 0; +#X connect 4 2 14 0; +#X connect 4 3 10 0; +#X connect 4 4 1 0; +#X connect 7 0 14 1; +#X connect 8 0 19 0; +#X connect 9 0 19 0; +#X connect 10 0 19 0; +#X connect 14 0 19 0; +#X connect 17 0 19 0; +#X connect 18 0 19 0; +#X connect 20 0 4 0; +#X restore 18 43 pd creation; +#X text 116 58 gravity field simulation; +#X text 115 72 if you have cpu problem \, you can reduce the mass number +in "creation"; +#N canvas 0 22 450 300 compute 0; +#X obj 52 182 msd2D --------------------------------; +#X obj 52 64 t b; +#X obj 52 41 gemhead; +#X msg 197 123 forceX mob 0.051; +#X msg 197 149 forceY mob 0.1; +#X msg 52 98 bang \, bang \, get massesPos; #N canvas 637 205 609 594 massrender 0; #X obj 124 5 inlet; #X obj 291 245 translateXYZ; @@ -165,35 +196,17 @@ #X connect 27 0 2 0; #X connect 27 0 13 0; #X connect 27 0 6 0; -#X restore 52 709 pd massrender; -#X obj 52 672 route massesPos; -#X connect 1 0 30 0; -#X connect 2 0 6 0; -#X connect 3 0 1 0; -#X connect 4 0 6 0; -#X connect 6 0 11 0; -#X connect 6 0 20 0; -#X connect 6 1 10 0; -#X connect 6 1 19 0; -#X connect 6 2 16 0; -#X connect 6 3 12 0; -#X connect 6 4 3 0; -#X connect 9 0 16 1; -#X connect 10 0 1 0; -#X connect 11 0 1 0; -#X connect 12 0 1 0; -#X connect 16 0 1 0; -#X connect 19 0 1 0; -#X connect 20 0 1 0; -#X connect 22 0 25 0; -#X connect 23 0 28 0; -#X connect 26 0 25 0; -#X connect 27 0 25 0; -#X connect 28 0 24 0; -#X connect 30 0 38 0; -#X connect 31 0 35 0; -#X connect 32 0 31 0; -#X connect 33 0 30 0; -#X connect 34 0 30 0; -#X connect 35 0 30 0; -#X connect 38 0 37 0; +#X restore 52 239 pd massrender; +#X obj 52 212 route massesPos; +#X obj 63 147 r \$0-msdin; +#X connect 0 0 7 0; +#X connect 1 0 5 0; +#X connect 2 0 1 0; +#X connect 3 0 0 0; +#X connect 4 0 0 0; +#X connect 5 0 0 0; +#X connect 7 0 6 0; +#X connect 8 0 0 0; +#X restore 18 107 pd compute; +#X connect 0 0 4 0; +#X connect 3 0 2 0; Modified: trunk/externals/nusmuk/msd3D/01_msd3Dtest.pd =================================================================== --- trunk/externals/nusmuk/msd3D/01_msd3Dtest.pd 2008-03-28 00:54:03 UTC (rev 9634) +++ trunk/externals/nusmuk/msd3D/01_msd3Dtest.pd 2008-03-28 02:17:07 UTC (rev 9635) @@ -1,133 +1,53 @@ -#N canvas 524 22 867 806 10; -#X obj 32 13 loadbang; -#X obj 294 522 print msd; -#X obj 642 647 gemwin; -#X msg 642 625 0 \, destroy; -#X obj 532 707 gemhead; -#X obj 532 730 world_light; -#X msg 642 562 reset \, create \, lighting 1 \, 1; -#X obj 102 13 cnv 15 500 270 empty empty empty 20 12 0 14 -262131 -66577 -0; -#X obj 115 259 t a; -#X obj 115 18 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262131 -1 +#N canvas 499 22 653 522 10; +#X obj 27 26 loadbang; +#X obj 127 419 print msd; +#X obj 263 104 gemwin; +#X msg 278 81 0 \, destroy; +#X text 260 26 2 DRAG THE STRUCTURE WITH THE MOUSE; +#X obj 87 27 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; -#X msg 187 69 reset; -#X text 153 19 reset; -#X obj 115 40 t b b b b b; -#X msg 133 158 50 50; -#X obj 30 290 cnv 15 572 80 empty empty empty 20 12 0 14 -261689 -66577 -0; -#X obj 33 298 gemhead; -#X obj 33 321 t b; -#X msg 33 343 bang \, get massesPos \, get linksPos; -#X text 393 85 CREATION : 3 MASSES \, 2 LINKS; -#X text 272 311 COMPUTE AND GET ALL MASSES AND LINKS POSITIONS; -#X obj 30 374 cnv 15 572 110 empty empty empty 20 12 0 14 -262131 -66577 -0; -#X msg 65 381 setD souple 0.01; -#X msg 196 382 setK souple 1; -#X msg 65 401 setD souple 1; -#X msg 196 402 setK souple 2; -#X text 331 394 SET RIGIDITY AND VISCOSITY OF LINKS; -#X text 347 440 ADD FORCE ON ALL MOBILE MASSES; -#X obj 27 545 cnv 15 400 200 empty empty empty 20 12 0 14 -261689 -66577 -0; -#N canvas 643 123 617 602 massrender 0; -#X obj 183 15 inlet; +#X msg 90 76 reset; +#X obj 27 47 t b b b b b; +#X msg 42 186 Xmax 100 \, Xmin 0 \, Ymax 100 \, Ymin 0; +#X obj 53 300 gemhead; +#X obj 53 323 t b; +#X msg 53 345 bang \, get massesPos \, get linksPos; +#N canvas 643 123 308 285 massrender 0; +#X obj 127 22 inlet; #X obj 48 203 translateXYZ; -#X obj 48 229 sphere 0.1; -#X obj 183 79 / 12.5; -#X obj 183 102 - 4; -#X obj 248 80 / 12.5; -#X obj 248 103 - 4; +#X obj 127 86 / 12.5; +#X obj 127 109 - 4; +#X obj 192 87 / 12.5; +#X obj 192 110 - 4; #X obj 48 177 separator; -#X obj 181 129 t b f; -#X obj 300 80 / 12.5; -#X obj 300 103 - 4; -#X obj 183 50 unpack f f f f; -#X obj 48 148 gemhead 45; -#X obj 48 90 loadbang; -#X msg 48 118 0; +#X obj 125 136 t b f; +#X obj 48 141 gemhead 45; +#X msg 48 104 0; +#X obj 47 58 loadbang; +#X obj 127 57 unpack f f f f; +#X obj 238 88 / 12.5; +#X obj 238 111 - 4; +#X obj 48 229 sphere 0.1; #X connect 0 0 11 0; -#X connect 1 0 2 0; -#X connect 3 0 4 0; -#X connect 4 0 8 0; -#X connect 5 0 6 0; -#X connect 6 0 1 2; -#X connect 7 0 1 0; -#X connect 8 0 12 0; -#X connect 8 1 1 1; -#X connect 9 0 10 0; -#X connect 10 0 1 3; -#X connect 11 1 3 0; -#X connect 11 2 5 0; -#X connect 11 3 9 0; -#X connect 12 0 7 0; -#X connect 13 0 14 0; -#X connect 14 0 12 0; -#X restore 114 589 pd massrender; -#N canvas 284 227 595 566 linkrender 0; -#X obj 113 25 inlet; -#X obj 113 117 / 12.5; -#X obj 113 140 - 4; -#X obj 167 118 / 12.5; -#X obj 167 141 - 4; -#X obj 44 222 separator; -#X obj 113 164 t b f; -#X obj 44 265 curve 2; -#X obj 286 117 / 12.5; -#X obj 286 140 - 4; -#X obj 340 118 / 12.5; -#X obj 340 141 - 4; -#X obj 217 117 / 12.5; -#X obj 217 142 - 4; -#X obj 143 194 pack f f f; -#X msg 143 217 \$1 \$2 \$3; -#X obj 391 118 / 12.5; -#X obj 391 141 - 4; -#X obj 286 189 pack f f f; -#X msg 286 212 \$1 \$2 \$3; -#X obj 113 69 unpack f f f f f f f; -#X obj 44 198 gemhead 45; -#X obj 44 105 loadbang; -#X msg 44 133 0; -#X connect 0 0 20 0; -#X connect 1 0 2 0; -#X connect 2 0 6 0; -#X connect 3 0 4 0; -#X connect 4 0 14 1; -#X connect 5 0 7 0; -#X connect 6 0 21 0; -#X connect 6 1 14 0; -#X connect 8 0 9 0; -#X connect 9 0 18 0; -#X connect 10 0 11 0; -#X connect 11 0 18 1; +#X connect 1 0 14 0; +#X connect 2 0 3 0; +#X connect 3 0 7 0; +#X connect 4 0 5 0; +#X connect 5 0 1 2; +#X connect 6 0 1 0; +#X connect 7 0 8 0; +#X connect 7 1 1 1; +#X connect 8 0 6 0; +#X connect 9 0 8 0; +#X connect 10 0 9 0; +#X connect 11 1 2 0; +#X connect 11 2 4 0; +#X connect 11 3 12 0; #X connect 12 0 13 0; -#X connect 13 0 14 2; -#X connect 14 0 15 0; -#X connect 15 0 7 1; -#X connect 16 0 17 0; -#X connect 17 0 18 2; -#X connect 18 0 19 0; -#X connect 19 0 7 2; -#X connect 20 1 1 0; -#X connect 20 2 3 0; -#X connect 20 3 12 0; -#X connect 20 4 8 0; -#X connect 20 5 10 0; -#X connect 20 6 16 0; -#X connect 21 0 5 0; -#X connect 22 0 23 0; -#X connect 23 0 21 0; -#X restore 33 610 pd linkrender; -#X obj 33 560 route linksPos massesPos; -#X text 241 570 DISPLAY MASSES AND LINKS; -#X text 289 592 WITH GEM; -#X text 445 561 1 CREATE WINDOW -->; -#X text 444 624 3 AND DESTROY IT! -->; -#X text 444 592 2 DRAG THE STRUCTURE WITH THE MOUSE; -#N canvas 731 296 454 304 gemmouse 0; +#X connect 13 0 1 3; +#X restore 436 267 pd massrender; +#X obj 366 244 route linksPos massesPos; +#N canvas 731 296 458 308 gemmouse 0; #X obj 189 77 gemmouse; #X obj 189 184 pack f f; #X obj 189 218 spigot; @@ -137,73 +57,136 @@ #X obj 189 108 / 5; #X obj 216 108 / -5; #X obj 79 51 inlet; -#X obj 140 75 inlet; #X obj 109 98 t b; #X obj 141 120 list; +#X obj 141 41 r mouse_init; #X connect 0 0 6 0; #X connect 0 1 7 0; #X connect 0 2 2 1; #X connect 1 0 2 0; -#X connect 2 0 11 1; +#X connect 2 0 10 1; #X connect 4 0 1 0; #X connect 5 0 1 1; #X connect 6 0 4 0; #X connect 7 0 5 0; -#X connect 8 0 10 0; -#X connect 9 0 11 1; -#X connect 10 0 11 0; -#X connect 11 0 3 0; -#X restore 33 672 pd gemmouse; -#X obj 33 651 gemhead; -#X msg 33 693 posX fix \$1; -#X msg 33 714 posY fix \$2; -#X text 184 675 SET FIXED MASS TO MOUSE POSITION; -#X obj 33 497 msd3D --------------------------------; -#X msg 62 440 forceZ mob 200; -#X msg 188 441 forceZ mob -200; -#X msg 151 138 mass mob 1 \$1 \$2 \$3 \$4; -#X msg 133 179 Xmax 100 \, Xmin 0 \, Ymax 100 \, Ymin 0 \, Zmax 70 -\, Zmin 0; -#X msg 169 89 mass fix 0 100 50 50 50; -#X msg 115 232 link souple \$1 \$2 5 10; -#X msg 115 211 0 1 \, 1 2; -#X msg 151 114 100 20 10 20 \, 200 20 25 0; -#X connect 0 0 12 0; -#X connect 3 0 2 0; -#X connect 4 0 5 0; -#X connect 6 0 2 0; -#X connect 8 0 41 0; -#X connect 9 0 12 0; -#X connect 10 0 8 0; -#X connect 12 0 48 0; -#X connect 12 1 13 0; -#X connect 12 1 45 0; -#X connect 12 2 49 0; -#X connect 12 3 46 0; -#X connect 12 4 10 0; -#X connect 13 0 36 1; +#X connect 8 0 9 0; +#X connect 9 0 10 0; +#X connect 10 0 3 0; +#X connect 11 0 10 1; +#X restore 366 356 pd gemmouse; +#X obj 366 335 gemhead; +#X msg 366 377 posX fix \$1; +#X msg 366 398 posY fix \$2; +#N canvas 0 22 454 304 linkrender 0; +#X obj 127 22 inlet; +#X obj 128 86 / 12.5; +#X obj 128 109 - 4; +#X obj 183 87 / 12.5; +#X obj 183 110 - 4; +#X obj 48 177 separator; +#X obj 128 136 t b f; +#X obj 262 88 / 12.5; +#X obj 262 111 - 4; +#X obj 290 112 / 12.5; +#X obj 290 135 - 4; +#X obj 48 222 curve 2; +#X obj 155 189 pack f f 0; +#X obj 262 192 pack f f 0; +#X obj 48 130 gemhead 45; +#X obj 47 44 loadbang; +#X msg 47 68 0; +#X obj 127 57 unpack f f f f f f f; +#X obj 212 112 / 12.5; +#X obj 212 135 - 4; +#X obj 319 135 / 12.5; +#X obj 319 158 - 4; +#X connect 0 0 17 0; +#X connect 1 0 2 0; +#X connect 2 0 6 0; +#X connect 3 0 4 0; +#X connect 4 0 12 1; +#X connect 5 0 11 0; +#X connect 6 0 14 0; +#X connect 6 1 12 0; +#X connect 7 0 8 0; +#X connect 8 0 13 0; +#X connect 9 0 10 0; +#X connect 10 0 13 1; +#X connect 12 0 11 1; +#X connect 13 0 11 2; +#X connect 14 0 5 0; #X connect 15 0 16 0; -#X connect 16 0 17 0; -#X connect 17 0 41 0; -#X connect 21 0 41 0; -#X connect 22 0 41 0; -#X connect 23 0 41 0; -#X connect 24 0 41 0; -#X connect 30 0 29 0; -#X connect 30 1 28 0; -#X connect 30 2 1 0; -#X connect 36 0 38 0; -#X connect 36 0 39 0; -#X connect 37 0 36 0; -#X connect 38 0 41 0; -#X connect 39 0 41 0; -#X connect 41 0 30 0; -#X connect 41 1 1 0; -#X connect 42 0 41 0; -#X connect 43 0 41 0; -#X connect 44 0 8 0; -#X connect 45 0 8 0; -#X connect 46 0 8 0; -#X connect 47 0 8 0; -#X connect 48 0 47 0; -#X connect 49 0 44 0; +#X connect 16 0 14 0; +#X connect 17 1 1 0; +#X connect 17 2 3 0; +#X connect 17 3 18 0; +#X connect 17 4 7 0; +#X connect 17 5 9 0; +#X connect 17 6 20 0; +#X connect 18 0 19 0; +#X connect 19 0 12 2; +#X connect 20 0 21 0; +#X connect 21 0 13 2; +#X restore 366 289 pd linkrender; +#X msg 206 139 50 50; +#X msg 58 118 40 60 \, 60 60 \, 60 40 \, 40 40; +#X obj 206 162 s mouse_init; +#X msg 27 207 link souple mob mob 10 5; +#X msg 27 230 link souple fix mob 10 5; +#X text 25 1 creation : 5 masses and 20 links; +#X text 52 281 compute and get masses and links positions; +#X text 364 315 move mass to mouse position; +#X text 365 197 display masses with gem; +#X text 261 6 1 CREATE WINDOW; +#X text 108 26 reset struct; +#X obj 90 259 s \$0-msdin; +#X obj 84 373 r \$0-msdin; +#X obj 52 419 s \$0-msdout; +#X obj 365 423 s \$0-msdin; +#X obj 366 218 r \$0-msdout; +#X msg 74 96 mass fix 0 100 50 50 50; +#X msg 58 139 mass mob 1 100 \$1 \$2 50; +#X obj 53 397 msd3D; +#X obj 368 177 s \$0-msdin; +#X msg 369 129 forceZ mob 200; +#X msg 368 153 forceZ mob 200; +#X text 367 108 send vertical forces; +#X msg 263 58 reset \, create \, lighting 1 \, 1; +#X obj 51 454 gemhead; +#X obj 51 476 world_light; +#X connect 0 0 7 0; +#X connect 3 0 2 0; +#X connect 5 0 7 0; +#X connect 6 0 30 0; +#X connect 7 0 22 0; +#X connect 7 1 19 0; +#X connect 7 1 8 0; +#X connect 7 2 20 0; +#X connect 7 3 35 0; +#X connect 7 4 6 0; +#X connect 8 0 30 0; +#X connect 9 0 10 0; +#X connect 10 0 11 0; +#X connect 11 0 37 0; +#X connect 13 0 18 0; +#X connect 13 1 12 0; +#X connect 14 0 16 0; +#X connect 14 0 17 0; +#X connect 15 0 14 0; +#X connect 16 0 33 0; +#X connect 17 0 33 0; +#X connect 19 0 21 0; +#X connect 20 0 36 0; +#X connect 22 0 23 0; +#X connect 22 0 30 0; +#X connect 23 0 30 0; +#X connect 31 0 37 0; +#X connect 34 0 13 0; +#X connect 35 0 30 0; +#X connect 36 0 30 0; +#X connect 37 0 32 0; +#X connect 37 1 1 0; +#X connect 39 0 38 0; +#X connect 40 0 38 0; +#X connect 42 0 2 0; +#X connect 43 0 44 0; Modified: trunk/externals/nusmuk/msd3D/02_msd3Dperf.pd =================================================================== --- trunk/externals/nusmuk/msd3D/02_msd3Dperf.pd 2008-03-28 00:54:03 UTC (rev 9634) +++ trunk/externals/nusmuk/msd3D/02_msd3Dperf.pd 2008-03-28 02:17:07 UTC (rev 9635) @@ -1,54 +1,24 @@ -#N canvas 545 25 704 830 10; -#X obj 159 280 t a; +#N canvas 652 25 483 246 10; +#X obj 20 12 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 +-1; +#X text 43 12 reset; +#X text 323 102 <-- Move masses; +#X obj 83 13 nbx 5 14 200 20000 1 0 empty empty empty 0 -6 0 10 -262144 +-1 -1 347.56 1000; +#X msg 206 45 forceX mob 10; +#X msg 206 69 forceX mob -10; +#X msg 225 95 forceY mob 10; +#X msg 224 119 forceY mob -10; +#X msg 238 143 forceZ mob 10; +#X msg 237 167 forceZ mob -10; +#N canvas 0 22 659 390 creation 0; #X obj 159 5 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; #X msg 231 60 reset; #X obj 37 10 loadbang; #X text 182 5 reset; #X obj 159 27 t b b b b b; -#X msg 456 528 0 \, destroy; -#X obj 456 583 gemhead; -#X obj 456 628 world_light; -#X msg 456 468 reset \, create \, lighting 1 \, 1; -#X obj 52 380 t b; -#N canvas 643 123 617 602 massrender 0; -#X obj 127 22 inlet; -#X obj 48 203 translateXYZ; -#X obj 48 153 gemhead; -#X obj 48 177 separator; -#X obj 125 136 t b f; -#X obj 127 57 unpack f f f f; -#X obj 48 229 cube 0.03; -#X obj 48 99 loadbang; -#X msg 48 127 0; -#X connect 0 0 5 0; -#X connect 1 0 6 0; -#X connect 2 0 3 0; -#X connect 3 0 1 0; -#X connect 4 0 2 0; -#X connect 4 1 1 1; -#X connect 5 1 4 0; -#X connect 5 2 1 2; -#X connect 5 3 1 3; -#X connect 7 0 8 0; -#X connect 8 0 2 0; -#X restore 52 699 pd massrender; -#X obj 52 357 gemhead; -#X obj 456 548 gemwin; -#X obj 52 655 msd3D --------------------------------; -#X msg 456 508 view 8 0 0.5 0 0 0 0 0 1; -#X text 434 160 <-- Number of masses; -#X obj 456 487 t b; -#X obj 52 678 route massesPos; -#X msg 52 414 bang \, get massesPos; -#X text 300 485 <-- Move masses; -#X obj 456 605 rotateXYZ 30 30 0; #X msg 213 116 mass fix 0 100 50 50 0; -#X obj 75 491 metro 10; -#X obj 76 469 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1 -; -#X floatatom 107 470 5 0 0 0 - - -; -#X text 74 453 instead of GEM; #N canvas 557 309 632 363 masses 0; #X msg 417 145 seed 1; #X msg 342 144 seed 2; @@ -149,49 +119,96 @@ #X connect 11 0 3 0; #X connect 12 0 10 1; #X restore 159 191 pd links; -#X obj 369 162 nbx 5 14 200 20000 1 0 empty empty empty 0 -6 0 10 -262144 --1 -1 200 1000; #X msg 177 228 Xmax 4 \, Xmin -4 \, Ymax 4 \, Ymin -4 \, Zmax 4 \, Zmin -4; -#X msg 178 477 forceX mob 10; -#X msg 179 501 forceX mob -10; -#X msg 198 527 forceY mob 10; -#X msg 197 551 forceY mob -10; -#X msg 211 575 forceZ mob 10; -#X msg 210 599 forceZ mob -10; -#X connect 0 0 14 0; -#X connect 1 0 5 0; +#X obj 386 54 inlet; +#X obj 232 7 inlet; +#X obj 159 280 s \$0-msdin; +#X connect 0 0 4 0; +#X connect 1 0 11 0; +#X connect 2 0 4 0; +#X connect 4 0 7 0; +#X connect 4 1 8 0; +#X connect 4 2 6 0; +#X connect 4 3 5 0; +#X connect 4 4 1 0; +#X connect 5 0 11 0; +#X connect 6 0 11 0; +#X connect 7 0 11 0; +#X connect 8 0 11 0; +#X connect 9 0 6 1; +#X connect 9 0 7 1; +#X connect 10 0 4 0; +#X restore 20 32 pd creation; +#X text 148 11 <-- Number of masses (change and reset); +#N canvas 0 22 450 300 compute 0; +#X obj 52 50 t b; +#N canvas 643 123 617 602 massrender 0; +#X obj 127 22 inlet; +#X obj 48 203 translateXYZ; +#X obj 48 153 gemhead; +#X obj 48 177 separator; +#X obj 125 136 t b f; +#X obj 127 57 unpack f f f f; +#X obj 48 229 cube 0.03; +#X obj 48 99 loadbang; +#X msg 48 127 0; +#X connect 0 0 5 0; +#X connect 1 0 6 0; +#X connect 2 0 3 0; +#X connect 3 0 1 0; +#X connect 4 0 2 0; +#X connect 4 1 1 1; +#X connect 5 1 4 0; +#X connect 5 2 1 2; +#X connect 5 3 1 3; +#X connect 7 0 8 0; +#X connect 8 0 2 0; +#X restore 52 209 pd massrender; +#X obj 52 27 gemhead; +#X obj 52 188 route massesPos; +#X msg 52 84 bang \, get massesPos; +#X obj 52 165 msd3D; +#X obj 79 132 r \$0-msdin; +#X connect 0 0 4 0; #X connect 2 0 0 0; -#X connect 3 0 5 0; -#X connect 5 0 28 0; -#X connect 5 1 30 0; -#X connect 5 2 27 0; -#X connect 5 3 22 0; -#X connect 5 4 2 0; +#X connect 3 0 1 0; +#X connect 4 0 5 0; +#X connect 5 0 3 0; +#X connect 6 0 5 0; +#X restore 20 53 pd compute; +#X obj 206 196 s \$0-msdin; +#N canvas 0 22 450 300 gem 0; +#X msg 106 118 0 \, destroy; +#X obj 86 173 gemhead; +#X obj 86 218 world_light; +#X msg 86 58 reset \, create \, lighting 1 \, 1; +#X obj 86 138 gemwin; +#X msg 86 98 view 8 0 0.5 0 0 0 0 0 1; +#X obj 86 77 t b; +#X obj 86 195 rotateXYZ 30 30 0; +#X obj 83 10 inlet; +#X obj 85 32 sel 1 0; +#X connect 0 0 4 0; +#X connect 1 0 7 0; +#X connect 3 0 4 0; +#X connect 3 0 6 0; +#X connect 5 0 4 0; +#X connect 6 0 5 0; +#X connect 7 0 2 0; +#X connect 8 0 9 0; +#X connect 9 0 3 0; +#X connect 9 1 0 0; +#X restore 20 92 pd gem; +#X obj 20 74 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1 1 +; +#X text 41 73 gem on/off; +#X connect 0 0 10 0; +#X connect 3 0 10 1; +#X connect 4 0 13 0; +#X connect 5 0 13 0; #X connect 6 0 13 0; -#X connect 7 0 21 0; +#X connect 7 0 13 0; +#X connect 8 0 13 0; #X connect 9 0 13 0; -#X connect 9 0 17 0; -#X connect 10 0 19 0; -#X connect 12 0 10 0; -#X connect 14 0 18 0; -#X connect 15 0 13 0; -#X connect 17 0 15 0; -#X connect 18 0 11 0; -#X connect 19 0 14 0; -#X connect 21 0 8 0; -#X connect 22 0 0 0; -#X connect 23 0 14 0; -#X connect 24 0 23 0; -#X connect 25 0 23 1; -#X connect 27 0 0 0; -#X connect 28 0 0 0; -#X connect 29 0 27 1; -#X connect 29 0 28 1; -#X connect 30 0 0 0; -#X connect 31 0 14 0; -#X connect 32 0 14 0; -#X connect 33 0 14 0; -#X connect 34 0 14 0; -#X connect 35 0 14 0; -#X connect 36 0 14 0; +#X connect 15 0 14 0; Modified: trunk/externals/nusmuk/msd3D/03_msd3Dmemb.pd =================================================================== --- trunk/externals/nusmuk/msd3D/03_msd3Dmemb.pd 2008-03-28 00:54:03 UTC (rev 9634) +++ trunk/externals/nusmuk/msd3D/03_msd3Dmemb.pd 2008-03-28 02:17:07 UTC (rev 9635) @@ -1,18 +1,55 @@ -#N canvas 580 22 794 809 10; +#N canvas 807 173 535 198 10; +#X obj 26 16 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 +-1; +#X text 50 15 reset; +#X text 182 65 Add a constant force; +#X msg 338 127 posZ fix \$1; +#X text 337 86 Change altitude of corners; +#N canvas 0 22 616 405 creation 0; #X obj 32 13 loadbang; -#X obj 294 641 print msd; -#X obj 461 703 gemwin; -#X msg 461 681 0 \, destroy; -#X obj 688 623 gemhead; -#X obj 688 646 world_light; -#X obj 130 361 t a; #X obj 129 18 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262131 -1 -1; #X msg 202 59 reset; #X text 167 19 reset; -#X msg 65 500 setD souple 0.01; -#X msg 65 520 setD souple 1; -#X msg 196 521 setK souple 2; +#X msg 148 229 Xmax 100 \, Xmin 0 \, Ymax 100 \, Ymin 0 \, Zmax 70 +\, Zmin 0; +#X msg 130 255 0 4 \, 4 5 \, 5 6 \, 6 1 \, 7 8 \, 8 9 \, 9 10 \, 10 +11 \, 12 13 \, 13 14 \, 14 15 \, 15 16 \, 17 18 \, 18 19 \, 19 20 \, +20 21 \, 2 22 \, 22 23 \, 23 24 \, 24 3 \, 0 7 \, 4 8 \, 5 9 \, 6 10 +\, 1 11 \, 7 12 \, 8 13 \, 9 14 \, 10 15 \, 11 16 \, 12 17 \, 13 18 +\, 14 19 \, 15 20 \, 16 21 \, 2 17 \, 18 22 \, 19 23 \, 20 24 \, 21 +3; +#X msg 166 130 30 40 40 \, 30 50 40 \, 30 60 40 \, 40 30 40 \, 40 40 +40 \, 40 50 40 \, 40 60 40 \, 40 70 40 \, 50 30 40 \, 50 40 40 \, 50 +50 40 \, 50 60 40 \, 50 70 40 \, 60 30 40 \, 60 40 40 \, 60 50 40 \, +60 60 40 \, 60 70 40 \, 70 40 40 \, 70 50 40 \, 70 60 40; +#X msg 184 82 mass fix 0 100 30 30 40 \, mass fix 0 100 30 70 40 \, +mass fix 0 100 70 30 40 \, mass fix 0 100 70 70 40; +#X obj 130 38 t b b b b b; +#X msg 166 193 mass mob 1 70 \$1 \$2 \$3; +#X msg 130 335 link souple \$1 \$2 2 10; +#X msg 71 72 posZ fix 70; +#X obj 130 361 s \$0-msdin; +#X obj 204 14 inlet; +#X connect 0 0 8 0; +#X connect 1 0 8 0; +#X connect 2 0 12 0; +#X connect 4 0 12 0; +#X connect 5 0 10 0; +#X connect 6 0 9 0; +#X connect 7 0 12 0; +#X connect 8 0 5 0; +#X connect 8 0 11 0; +#X connect 8 1 4 0; +#X connect 8 2 6 0; +#X connect 8 3 7 0; +#X connect 8 4 2 0; +#X connect 9 0 12 0; +#X connect 10 0 12 0; +#X connect 11 0 12 0; +#X connect 13 0 8 0; +#X restore 26 36 pd creation; +#N canvas 0 22 450 300 compute 0; #N canvas 613 332 591 562 linkrender 0; #X obj 93 25 inlet; #X obj 93 117 / 12.5; @@ -86,95 +123,85 @@ #X connect 30 0 5 0; #X connect 31 0 32 0; #X connect 32 0 29 0; -#X restore 33 666 pd linkrender; -#X obj 33 616 msd3D --------------------------------; -#X msg 62 559 forceZ mob 200; -#X msg 148 229 Xmax 100 \, Xmin 0 \, Ymax 100 \, Ymin 0 \, Zmax 70 -\, Zmin 0; -#X msg 130 255 0 4 \, 4 5 \, 5 6 \, 6 1 \, 7 8 \, 8 9 \, 9 10 \, 10 -11 \, 12 13 \, 13 14 \, 14 15 \, 15 16 \, 17 18 \, 18 19 \, 19 20 \, -20 21 \, 2 22 \, 22 23 \, 23 24 \, 24 3 \, 0 7 \, 4 8 \, 5 9 \, 6 10 -\, 1 11 \, 7 12 \, 8 13 \, 9 14 \, 10 15 \, 11 16 \, 12 17 \, 13 18 -\, 14 19 \, 15 20 \, 16 21 \, 2 17 \, 18 22 \, 19 23 \, 20 24 \, 21 -3; -#X msg 166 130 30 40 40 \, 30 50 40 \, 30 60 40 \, 40 30 40 \, 40 40 -40 \, 40 50 40 \, 40 60 40 \, 40 70 40 \, 50 30 40 \, 50 40 40 \, 50 -50 40 \, 50 60 40 \, 50 70 40 \, 60 30 40 \, 60 40 40 \, 60 50 40 \, -60 60 40 \, 60 70 40 \, 70 40 40 \, 70 50 40 \, 70 60 40; -#X msg 461 656 view 0 4 0 0 0 0 0 0 1; -#X msg 461 614 view 4 0 0.5 0 0 0 0 0 1; -#X obj 312 479 f; -#X floatatom 328 456 5 0 0 0 - - -; -#X obj 312 403 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 -1; -#X msg 312 504 forceZ mob \$1; -#X obj 312 423 metro 65; -#X msg 461 635 view 0 0 4 0 0 0 0 1 0; -#X text 370 401 Add a constant force; -#X obj 33 641 route linksPos; -#X msg 184 82 mass fix 0 100 30 30 40 \, mass fix 0 100 30 70 40 \, -mass fix 0 100 70 30 40 \, mass fix 0 100 70 70 40; -#X msg 527 543 posZ fix \$1; -#X obj 527 402 vsl 15 128 0 70 0 0 empty empty empty 0 -8 0 8 -262131 --1 -1 10900 1; -#X text 559 457 Change altitude of corners; -#X text 385 455 Amplitude; -#X text 357 587 Create window; -#X text 369 636 Change view; -#X obj 130 38 t b b b b b; -#X text 98 428 Multiple draw; -#X msg 188 560 forceZ mob -0.1; -#X msg 166 193 mass mob 1 70 \$1 \$2 \$3; -#X msg 461 590 reset \, dimen 800 800 \, create \, lighting 1 \, 1 +#X restore 33 225 pd linkrender; +#X obj 33 200 route linksPos; +#X text 98 93 Multiple draw; +#X obj 33 64 gemhead 15; +#X msg 33 127 bang \, get linksPos; +#X obj 33 92 t b b b b; +#X obj 33 175 msd3D; +#X obj 75 148 r \$0-msdin; +#X connect 1 0 0 0; +#X connect 3 0 5 0; +#X connect 4 0 6 0; +#X connect 5 0 4 0; +#X connect 5 1 4 0; +#X connect 5 2 4 0; +#X connect 5 3 4 0; +#X connect 6 0 1 0; +#X connect 7 0 6 0; +#X restore 26 59 pd compute; +#X text 182 23 membrane with a multiple drawing; +#N canvas 0 22 450 300 constant 0; +#X obj 122 129 f; +#X msg 122 154 forceZ mob \$1; +#X obj 122 73 metro 65; +#X obj 122 25 inlet; +#X obj 225 25 inlet; +#X obj 122 180 s \$0-msdin; +#X connect 0 0 1 0; +#X connect 1 0 5 0; +#X connect 2 0 0 0; +#X connect 3 0 2 0; +#X connect 4 0 0 1; +#X restore 183 126 pd constant; +#X obj 183 83 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 1 1 ; -#X msg 130 335 link souple \$1 \$2 2 10; -#X msg 196 501 setK souple 10; -#X msg 71 72 posZ fix 70; -#X obj 33 399 gemhead 15; -#X msg 33 462 bang \, get linksPos; -#X obj 33 427 t b b b; -#X connect 0 0 36 0; -#X connect 3 0 2 0; -#X connect 4 0 5 0; -#X connect 6 0 14 0; -#X connect 7 0 36 0; -#X connect 8 0 6 0; -#X connect 10 0 14 0; -#X connect 11 0 14 0; -#X connect 12 0 14 0; -#X connect 14 0 28 0; -#X connect 14 1 1 0; -#X connect 15 0 14 0; -#X connect 16 0 6 0; -#X connect 17 0 41 0; -#X connect 18 0 39 0; -#X connect 19 0 2 0; -#X connect 20 0 2 0; -#X connect 21 0 24 0; -#X connect 22 0 21 1; -#X connect 23 0 25 0; -#X connect 24 0 14 0; -#X connect 25 0 21 0; -#X connect 26 0 2 0; -#X connect 28 0 13 0; -#X connect 29 0 6 0; -#X connect 30 0 14 0; -#X connect 31 0 30 0; -#X connect 36 0 17 0; -#X connect 36 0 43 0; -#X connect 36 1 16 0; -#X connect 36 2 18 0; -#X connect 36 3 29 0; -#X connect 36 3 13 2; -#X connect 36 4 8 0; -#X connect 38 0 14 0; -#X connect 39 0 6 0; -#X connect 40 0 2 0; -#X connect 41 0 6 0; -#X connect 42 0 14 0; -#X connect 43 0 6 0; -#X connect 44 0 46 0; -#X connect 45 0 14 0; -#X connect 46 0 45 0; -#X connect 46 1 45 0; -#X connect 46 2 45 0; +#X text 221 82 on/off; +#X floatatom 183 104 5 0 0 0 - - -; +#N canvas 583 304 450 300 gem 0; +#X obj 101 220 gemwin; +#X msg 120 102 0 \, destroy; +#X obj 13 211 gemhead; +#X obj 13 234 world_light; +#X msg 219 198 view 0 4 0 0 0 0 0 0 1; +#X msg 219 156 view 4 0 0.5 0 0 0 0 0 1; +#X msg 219 177 view 0 0 4 0 0 0 0 1 0; +#X text -3 77 Create window; +#X text 9 126 Change view; +#X msg 101 80 reset \, dimen 800 800 \, create \, lighting 1 \, 1; +#X obj 101 17 inlet; +#X obj 101 47 sel 1 0; +#X obj 219 104 inlet; +#X obj 219 134 sel 2 1 0; +#X connect 1 0 0 0; +#X connect 2 0 3 0; +#X connect 4 0 0 0; +#X connect 5 0 0 0; +#X connect 6 0 0 0; +#X connect 9 0 0 0; +#X connect 10 0 11 0; +#X connect 11 0 9 0; +#X connect 11 1 1 0; +#X connect 12 0 13 0; +#X connect 13 0 5 0; +#X connect 13 1 6 0; +#X connect 13 2 4 0; +#X restore 26 135 pd gem; +#X obj 26 87 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1 1 +; +#X text 79 84 gem on/off; +#X obj 26 111 hradio 15 1 0 3 empty empty empty 0 -8 0 10 -262144 -1 +-1 1; +#X text 79 110 change view; +#X obj 341 107 hsl 128 15 0 127 0 0 empty empty empty -2 -8 0 10 -262144 +-1 -1 0 1; +#X text 221 103 amplitude; +#X obj 338 150 s \$0-msdin; +#X connect 0 0 5 0; +#X connect 3 0 19 0; +#X connect 9 0 8 0; +#X connect 11 0 8 1; +#X connect 13 0 12 0; +#X connect 15 0 12 1; +#X connect 17 0 3 0; Modified: trunk/externals/nusmuk/msd3D/04_msd3Dfilet.pd =================================================================== --- trunk/externals/nusmuk/msd3D/04_msd3Dfilet.pd 2008-03-28 00:54:03 UTC (rev 9634) +++ trunk/externals/nusmuk/msd3D/04_msd3Dfilet.pd 2008-03-28 02:17:07 UTC (rev 9635) @@ -1,18 +1,70 @@ -#N canvas 579 22 867 806 10; -#X obj 32 13 loadbang; -#X obj 458 439 gemwin; -#X msg 458 417 0 \, destroy; -#X obj 457 469 gemhead; -#X obj 457 492 world_light; -#X msg 458 328 reset \, create \, lighting 1 \, 1; -#X obj 145 205 t a; -#X obj 144 18 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262131 -1 +#N canvas 719 216 416 177 10; +#X obj 26 32 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; +#X text 47 31 reset; +#N canvas 530 297 450 300 gem 0; +#X obj 101 220 gemwin; +#X msg 120 102 0 \, destroy; +#X obj 13 211 gemhead; +#X obj 13 234 world_light; +#X msg 101 80 reset \, dimen 800 800 \, create \, lighting 1 \, 1; +#X obj 101 17 inlet; +#X obj 101 47 sel 1 0; +#X obj 219 104 inlet; +#X obj 219 134 sel 2 1 0; +#X msg 219 177 view 0 0 2 0 0 0 0 1 0; +#X msg 219 198 view 0 4 4 0 0 0 0 0 1; +#X msg 219 156 view 2 0 3.5 0 0 0 0 0 1; +#X connect 1 0 0 0; +#X connect 2 0 3 0; +#X connect 4 0 0 0; +#X connect 5 0 6 0; +#X connect 6 0 4 0; +#X connect 6 1 1 0; +#X connect 7 0 8 0; +#X connect 8 0 11 0; +#X connect 8 1 9 0; +#X connect 8 2 10 0; +#X connect 9 0 0 0; +#X connect 10 0 0 0; +#X connect 11 0 0 0; +#X restore 26 135 pd gem; +#X obj 26 87 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1 1 +; +#X text 79 84 gem on/off; +#X obj 26 111 hradio 15 1 0 3 empty empty empty 0 -8 0 10 -262144 -1 +-1 0; +#X text 79 110 change view; +#N canvas 0 22 584 305 creation 0; #X msg 203 63 reset; -#X text 182 19 reset; -#X obj 33 298 gemhead; -#X obj 33 321 t b; -#X msg 33 343 bang \, get massesPos \, get linksPos; +#X msg 203 83 symbol reset; +#X msg 145 173 Xmax 100 \, Xmin 0 \, Ymax 100 \, Ymin 0 \, Zmax 70 +\, Zmin -40; +#X msg 164 140 setFixed 62 \, setFixed 87 \, setFixed 512 \, setFixed +537; +#X obj 183 113 filet 20 30 2 2 20 30; +#X obj 145 38 t b b b b; +#X text 383 114 Filet abstraction : x0 y0 stepx stepy ny nx; +#X obj 94 15 loadbang; +#X obj 150 14 inlet; +#X obj 145 205 s \$0-msdin; +#X connect 0 0 9 0; +#X connect 1 0 4 1; +#X connect 2 0 9 0; +#X connect 3 0 9 0; +#X connect 4 0 9 0; +#X connect 5 0 2 0; +#X connect 5 1 3 0; +#X connect 5 2 4 0; +#X connect 5 3 0 0; +#X connect 5 3 1 0; +#X connect 7 0 5 0; +#X connect 8 0 5 0; +#X restore 26 52 pd creation; +#N canvas 0 22 563 472 compute 0; +#X obj 33 28 gemhead; +#X obj 33 51 t b; +#X msg 33 73 bang \, get massesPos \, get linksPos; #N canvas 643 123 613 598 massrender 0; #X obj 130 9 inlet; #X obj 48 203 translateXYZ; @@ -46,7 +98,7 @@ #X connect 12 3 10 0; #X connect 13 0 14 0; #X connect 14 0 7 0; -#X restore 114 589 pd massrender; +#X restore 114 359 pd massrender; #N canvas 284 227 595 566 linkrender 0; #X obj 93 25 inlet; #X obj 93 117 / 12.5; @@ -101,48 +153,36 @@ #X connect 21 6 16 0; #X connect 22 0 23 0; #X connect 23 0 5 0; -#X restore 33 610 pd linkrender; -#X obj 33 539 route linksPos massesPos; -#X msg 203 83 symbol reset; -#X obj 33 497 msd3D --------------------------------; -#X msg 107 430 forceZ filet -0.2; -#X msg 145 173 Xmax 100 \, Xmin 0 \, Ymax 100 \, Ymin 0 \, Zmax 70 -\, Zmin -40; -#X msg 164 140 setFixed 62 \, setFixed 87 \, setFixed 512 \, setFixed -537; -#X obj 183 113 filet 20 30 2 2 20 30; -#X msg 458 349 view 4 0 0.5 0 0 0 0 0 1; -#X text 187 408 Ambient force; -#X text 648 380 Select view; -#X obj 145 38 t b b b b; -#X text 244 587 Connect mass or link to be viewed \, or both with good -computer!; -#X text 383 114 Filet abstraction : x0 y0 stepx stepy ny nx; -#X msg 458 371 view 0 0 2 0 0 0 0 1 0; -#X msg 458 392 view 0 4 4 0 0 0 0 0 1; -#X connect 0 0 25 0; -#X connect 2 0 1 0; -#X connect 3 0 4 0; -#X connect 5 0 1 0; -#X connect 6 0 17 0; -#X connect 7 0 25 0; -#X connect 8 0 6 0; -#X connect 10 0 11 0; -#X connect 11 0 12 0; -#X connect 12 0 18 0; -#X connect 12 0 17 0; -#X connect 15 1 13 0; -#X connect 16 0 21 1; -#X connect 17 0 15 0; -#X connect 18 0 17 0; -#X connect 19 0 6 0; -#X connect 20 0 6 0; -#X connect 21 0 6 0; -#X connect 22 0 1 0; -#X connect 25 0 19 0; -#X connect 25 1 20 0; -#X connect 25 2 21 0; -#X connect 25 3 8 0; -#X connect 25 3 16 0; -#X connect 28 0 1 0; -#X connect 29 0 1 0; +#X restore 33 380 pd linkrender; +#X obj 33 269 route linksPos massesPos; +#X msg 46 145 forceZ filet -0.2; +#X text 61 122 Ambient force; +#X obj 47 188 r \$0-msdin; +#X obj 147 296 inlet; +#X obj 114 337 spigot; +#X obj 33 341 spigot 1; +#X obj 78 318 == 0; +#X obj 33 227 msd3D; +#X connect 0 0 1 0; +#X connect 1 0 2 0; +#X connect 2 0 6 0; +#X connect 2 0 13 0; +#X connect 5 0 11 0; +#X connect 5 1 10 0; +#X connect 6 0 13 0; +#X connect 8 0 13 0; +#X connect 9 0 10 1; +#X connect 9 0 12 0; +#X connect 10 0 3 0; +#X connect 11 0 4 0; +#X connect 12 0 11 1; +#X connect 13 0 5 0; +#X restore 204 131 pd compute; +#X obj 204 106 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0 +1; +#X text 225 105 display links or masses; +#X text 201 27 grid in a gravity field; +#X connect 0 0 7 0; +#X connect 3 0 2 0; +#X connect 5 0 2 1; +#X connect 9 0 8 0; Modified: trunk/externals/nusmuk/msd3D/05_msd3Dvline.pd =================================================================== --- trunk/externals/nusmuk/msd3D/05_msd3Dvline.pd 2008-03-28 00:54:03 UTC (rev 9634) +++ trunk/externals/nusmuk/msd3D/05_msd3Dvline.pd 2008-03-28 02:17:07 UTC (rev 9635) @@ -1,34 +1,56 @@ -#N canvas 799 61 800 658 10; +#N canvas 711 237 465 154 10; +#N canvas 530 297 450 300 gem 0; +#X obj 101 220 gemwin; +#X msg 120 102 0 \, destroy; +#X obj 13 211 gemhead; +#X obj 13 234 world_light; +#X msg 101 80 reset \, dimen 800 800 \, create \, lighting 1 \, 1; +#X obj 101 17 inlet; +#X obj 101 47 sel 1 0; +#X msg 219 156 view 0 0 11 0 0 0 1 0 0; +#X connect 1 0 0 0; +#X connect 2 0 3 0; +#X connect 4 0 0 0; +#X connect 4 0 7 0; +#X connect 5 0 6 0; +#X connect 6 0 4 0; +#X connect 6 1 1 0; +#X connect 7 0 0 0; +#X restore 14 85 pd gem; +#X obj 14 62 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0 1 +; +#X text 33 60 gem on/off; +#N canvas 0 22 563 316 creation 0; #X obj 32 13 loadbang; -#X obj 457 430 gemwin; -#X msg 457 408 0 \, destroy; -#X obj 288 577 gemhead; -#X obj 288 599 world_light; -#X obj 146 205 t a; -#X obj 146 16 bng 20 250 50 0 empty empty empty 0 -6 0 8 -262131 -1 --1; #X msg 204 68 reset; -#X obj 33 179 gemhead; #X msg 204 88 symbol reset; -#X obj 33 497 msd3D --------------------------------; #X obj 146 42 t b b b b; -#X msg 296 393 forceZ filet \$1; -#X obj 444 207 tgl 20 0 empty empty empty 0 -6 0 8 -262131 -1 -1 1 -1; -#X obj 444 258 f; -#X obj 444 234 metro 65; -#X msg 457 327 reset \, dimen 800 800 \, create \, lighting 1 \, 1 -; -#X obj 421 221 vsl 15 128 -1 1 0 0 empty empty empty 0 -8 0 8 -262131 --1 -1 10000 1; -#X obj 206 315 sin; -#X obj 206 335 *; -#X obj 206 255 counter 0 360; -#X obj 206 204 tgl 20 0 empty empty empty 0 -6 0 8 -262131 -1 -1 1 -1; -#X obj 206 275 / 3.6; -#X obj 206 295 * 6.28319; -#X obj 206 232 metro 35; +#X msg 165 139 setFixed 0 \, setFixed 29 \, setFixed 420 \, setFixed +449; +#X obj 184 115 filet -3.2 -3.2 0.22068 0.45714 15 30; +#X msg 146 173 Xmax 4 \, Xmin -4 \, Ymax 4 \, Ymin -4 \, Zmax 9 \, +Zmin -6; +#X obj 146 205 s \$0-msdin; +#X obj 147 19 inlet; +#X connect 0 0 3 0; +#X connect 1 0 7 0; +#X connect 2 0 5 1; +#X connect 3 0 6 0; +#X connect 3 1 4 0; +#X connect 3 2 5 0; +#X connect 3 3 1 0; +#X connect 3 3 2 0; +#X connect 4 0 7 0; +#X connect 5 0 7 0; +#X connect 6 0 7 0; +#X connect 8 0 3 0; +#X restore 14 38 pd creation; +#X text 34 17 reset; +#X obj 14 20 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1 +-1; +#N canvas 0 22 450 300 compute 0; +#X obj 33 23 gemhead; +#X obj 33 201 msd3D --------------------------------; #N canvas 646 294 504 533 getmmasses 0; #X obj 154 13 inlet; #X obj 152 238 outlet; @@ -45,9 +67,7 @@ #X connect 4 0 3 1; #X connect 5 0 3 1; #X connect 6 0 3 0; -#X restore 51 364 pd getmmasses; -#X obj 183 219 vsl 15 128 0 30 0 0 empty empty empty 0 -8 0 8 -262131 --1 -1 5000 1; +#X restore 60 116 pd getmmasses; #N canvas 259 464 942 390 massrender 0; #X obj 286 2 inlet; #X obj 306 144 pack f f f f; @@ -115,75 +135,75 @@ #X connect 12 0 4 0; #X connect 13 0 14 0; #X connect 14 0 12 0; -#X restore 33 565 pd massrender; -#X msg 165 139 setFixed 0 \, setFixed 29 \, setFixed 420 \, setFixed -449; -#X text 459 113 Filet abstraction : x0 y0 stepx stepy ny nx; -#X text 483 206 <-- Add constant force; -#X text 240 204 <-- Add sinus force; -#X obj 457 348 t b; -#X text 179 18 Reset; -#X obj 184 115 filet -3.2 -3.2 0.22068 0.45714 15 30; -#X msg 327 449 setK fil 20; -#X obj 104 93 s resban; -#X msg 425 449 setK fil 10; -#X text 528 458 Change physical parameters of links; -#X msg 457 388 view 0 0 5 0 0 0 1 0 0; -#X text 624 390 <-- Zoom in; -#X msg 51 388 get massesPos \$1; -#X msg 146 173 Xmax 4 \, Xmin -4 \, Ymax 4 \, Ymin -4 \, Zmax 9 \, -Zmin -6; -#X msg 457 369 view 0 0 11 0 0 0 1 0 0; -#X obj 33 257 t b b; -#X msg 29 323 bang; -#X text 154 365 Get masses in order; -#X obj 33 539 route massesPosNo; -#X msg 425 468 setD fil 25; -#X msg 326 468 setD fil 2; -#X connect 0 0 11 0; -#X connect 2 0 1 0; -#X connect 3 0 4 0; -#X connect 5 0 10 0; -#X connect 6 0 11 0; -#X connect 7 0 5 0; -#X connect 8 0 44 0; -#X connect 9 0 34 1; -#X connect 10 0 47 0; -#X connect 11 0 42 0; -#X connect 11 1 28 0; -#X connect 11 2 34 0; -#X connect 11 3 7 0; -#X connect 11 3 9 0; -#X connect 12 0 10 0; -#X connect 13 0 15 0; -#X connect 14 0 12 0; -#X connect 15 0 14 0; -#X connect 16 0 1 0; -#X connect 16 0 32 0; -#X connect 17 0 14 1; -#X connect 18 0 19 0; -#X connect 19 0 12 0; -#X connect 20 0 22 0; -#X connect 21 0 24 0; -#X connect 22 0 23 0; -#X connect 23 0 18 0; -#X connect 24 0 20 0; -#X connect 25 0 41 0; -#X connect 26 0 19 1; -#X connect 28 0 5 0; -#X connect 32 0 43 0; -#X connect 34 0 5 0; -#X connect 35 0 10 0; -#X connect 37 0 10 0; -#X connect 39 0 1 0; -#X connect 41 0 10 0; -#X connect 42 0 5 0; -#X connect 43 0 1 0; -#X connect 44 0 25 0; -#X connect 44 0 45 0; -#X connect 44 1 25 0; -#X connect 44 1 45 0; -#X connect 45 0 10 0; -#X connect 47 0 27 0; -#X connect 48 0 10 0; -#X connect 49 0 10 0; +#X restore 33 253 pd massrender; +#X msg 60 140 get massesPos \$1; +#X obj 33 47 t b b; +#X msg 33 75 bang; +#X text 154 155 Get masses in order; +#X obj 33 227 route massesPosNo; +#X obj 60 162 r \$0-msdin; +#X connect 0 0 5 0; +#X connect 1 0 8 0; +#X connect 2 0 4 0; +#X connect 4 0 1 0; +#X connect 5 0 2 0; +#X connect 5 0 6 0; +#X connect 5 1 2 0; +#X connect 5 1 6 0; +#X connect 6 0 1 0; +#X connect 8 0 3 0; +#X connect 9 0 1 0; +#X restore 14 106 pd compute; +#N canvas 0 22 450 300 sinus 0; +#X msg 206 243 forceZ filet \$1; +#X obj 116 165 sin; +#X obj 116 185 *; +#X obj 116 105 counter 0 360; +#X obj 116 54 tgl 20 0 empty empty empty 0 -6 0 8 -262131 -1 -1 0 0.23622 +; +#X obj 116 125 / 3.6; +#X obj 116 145 * 6.28319; +#X obj 116 82 metro 35; +#X obj 93 69 vsl 15 128 0 30 0 0 empty empty empty 0 -8 0 8 -262131 +-1 -1 0 1; +#X text 64 215 Get masses in order; +#X obj 206 264 s \$0-msdin; +#X obj 163 51 inlet; +#X connect 0 0 10 0; +#X connect 1 0 2 0; +#X connect 2 0 0 0; +#X connect 3 0 5 0; +#X connect 4 0 7 0; +#X connect 5 0 6 0; +#X connect 6 0 1 0; +#X connect 7 0 3 0; +#X connect 8 0 4 0; +#X connect 11 0 2 1; +#X connect 11 0 4 0; +#X restore 150 106 pd sinus; +#X obj 153 85 hsl 128 15 0 127 0 0 empty empty empty -2 -8 0 10 -262144 +-1 -1 0 1; +#X text 149 66 add sinusoidal force; +#X text 290 67 add constant force; +#N canvas 0 22 450 300 constant 0; +#X msg 176 111 forceZ filet \$1; +#X obj 176 33 tgl 20 0 empty empty empty 0 -6 0 8 -262131 -1 -1 0 1 +; +#X obj 176 84 f; +#X obj 176 60 metro 65; +#X obj 176 132 s \$0-msdin; +#X obj 225 28 inlet; +#X connect 0 0 4 0; +#X connect 1 0 3 0; +#X connect 2 0 0 0; +#X connect 3 0 2 0; +#X connect 5 0 1 0; +#X connect 5 0 2 1; +#X restore 292 105 pd constant; +#X obj 295 85 hsl 128 15 0 127 0 0 empty empty empty -2 -8 0 10 -262144 +-1 -1 0 1; +#X text 151 26 vertical lines under various forces; +#X connect 1 0 0 0; +#X connect 5 0 3 0; +#X connect 8 0 7 0; +#X connect 12 0 11 0; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data: [9634] trunk/externals/nusmuk/msd2D
by nimon＠users.sourceforge.net 28 Mar '08

28 Mar '08

Revision: 9634 http://pure-data.svn.sourceforge.net/pure-data/?rev=9634&view=rev Author: nimon Date: 2008-03-27 17:54:03 -0700 (Thu, 27 Mar 2008) Log Message: ----------- modified examples Modified Paths: -------------- trunk/externals/nusmuk/msd2D/01_msd2Dtest.pd trunk/externals/nusmuk/msd2D/02_msd2Dadd.pd trunk/externals/nusmuk/msd2D/03_imsd2Dtest.pd trunk/externals/nusmuk/msd2D/04_msd2Dperf.pd trunk/externals/nusmuk/msd2D/05_msd2DDataStruct.pd trunk/externals/nusmuk/msd2D/make_anim.pd Modified: trunk/externals/nusmuk/msd2D/01_msd2Dtest.pd =================================================================== --- trunk/externals/nusmuk/msd2D/01_msd2Dtest.pd 2008-03-27 23:37:34 UTC (rev 9633) +++ trunk/externals/nusmuk/msd2D/01_msd2Dtest.pd 2008-03-28 00:54:03 UTC (rev 9634) @@ -1,47 +1,20 @@ -#N canvas 552 22 843 838 10; -#X obj 52 15 loadbang; -#X obj 314 524 print msd; -#X obj 633 647 gemwin; -#X msg 633 625 0 \, destroy; -#X obj 554 709 gemhead; -#X obj 554 732 world_light; -#X msg 633 562 reset \, create \, lighting 1 \, 1; -#X obj 53 499 msd2D --------------------------------; -#X text 309 594 WITH GEM; -#X text 465 563 1 CREATE WINDOW -->; -#X text 464 626 3 AND DESTROY IT! -->; -#X text 464 594 2 DRAG THE STRUCTURE WITH THE MOUSE; -#X obj 118 11 cnv 15 520 275 empty empty empty 20 12 0 14 -262131 -66577 -0; -#X obj 43 291 cnv 15 595 80 empty empty empty 20 12 0 14 -261689 -66577 -0; -#X obj 44 374 cnv 15 595 120 empty empty empty 20 12 0 14 -262131 -66577 -0; -#X obj 47 556 cnv 15 400 200 empty empty empty 20 12 0 14 -261689 -66577 -0; -#X obj 135 261 t a; -#X obj 135 20 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262131 -1 +#N canvas 520 22 626 507 10; +#X obj 27 26 loadbang; +#X obj 110 419 print msd; +#X obj 369 155 gemwin; +#X msg 384 132 0 \, destroy; +#X text 260 26 2 DRAG THE STRUCTURE WITH THE MOUSE; +#X obj 87 27 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; -#X msg 207 71 reset; -#X text 173 21 reset; -#X obj 135 42 t b b b b b; -#X msg 153 181 Xmax 100 \, Xmin 0 \, Ymax 100 \, Ymin 0; -#X text 413 87 CREATION : 3 MASSES \, 2 LINKS; +#X msg 90 76 reset; +#X obj 27 47 t b b b b b; +#X msg 42 186 Xmax 100 \, Xmin 0 \, Ymax 100 \, Ymin 0; #X obj 53 300 gemhead; #X obj 53 323 t b; #X msg 53 345 bang \, get massesPos \, get linksPos; -#X text 292 313 COMPUTE AND GET ALL MASSES AND LINKS POSITIONS; -#X msg 216 384 setK souple 1; -#X msg 85 403 setD souple 1; -#X msg 216 404 setK souple 2; -#X text 367 442 ADD FORCE ON ALL MOBILE MASSES; -#X text 351 396 SET RIGIDITY AND VISCOSITY OF LINKS; -#X msg 82 442 forceX mob 100; -#X msg 208 443 forceY mob 100; #N canvas 643 123 609 594 massrender 0; #X obj 127 22 inlet; #X obj 48 203 translateXYZ; -#X obj 48 229 sphere 0.1; #X obj 127 86 / 12.5; #X obj 127 109 - 4; #X obj 192 87 / 12.5; @@ -52,23 +25,23 @@ #X obj 48 141 gemhead 45; #X msg 48 104 0; #X obj 47 58 loadbang; -#X connect 0 0 9 0; -#X connect 1 0 2 0; -#X connect 3 0 4 0; -#X connect 4 0 8 0; -#X connect 5 0 6 0; -#X connect 6 0 1 2; -#X connect 7 0 1 0; -#X connect 8 0 10 0; -#X connect 8 1 1 1; -#X connect 9 1 3 0; -#X connect 9 2 5 0; -#X connect 10 0 7 0; +#X obj 48 229 circle 0.1; +#X connect 0 0 8 0; +#X connect 1 0 12 0; +#X connect 2 0 3 0; +#X connect 3 0 7 0; +#X connect 4 0 5 0; +#X connect 5 0 1 2; +#X connect 6 0 1 0; +#X connect 7 0 9 0; +#X connect 7 1 1 1; +#X connect 8 1 2 0; +#X connect 8 2 4 0; +#X connect 9 0 6 0; +#X connect 10 0 9 0; #X connect 11 0 10 0; -#X connect 12 0 11 0; -#X restore 134 591 pd massrender; -#X obj 53 562 route linksPos massesPos; -#X text 261 572 DISPLAY MASSES AND LINKS; +#X restore 436 267 pd massrender; +#X obj 366 244 route linksPos massesPos; #N canvas 731 296 458 308 gemmouse 0; #X obj 189 77 gemmouse; #X obj 189 184 pack f f; @@ -79,29 +52,26 @@ #X obj 189 108 / 5; #X obj 216 108 / -5; #X obj 79 51 inlet; -#X obj 140 75 inlet; #X obj 109 98 t b; #X obj 141 120 list; +#X obj 141 41 r mouse_init; #X connect 0 0 6 0; #X connect 0 1 7 0; #X connect 0 2 2 1; #X connect 1 0 2 0; -#X connect 2 0 11 1; +#X connect 2 0 10 1; #X connect 4 0 1 0; #X connect 5 0 1 1; #X connect 6 0 4 0; #X connect 7 0 5 0; -#X connect 8 0 10 0; -#X connect 9 0 11 1; -#X connect 10 0 11 0; -#X connect 11 0 3 0; -#X restore 53 674 pd gemmouse; -#X obj 53 653 gemhead; -#X msg 53 695 posX fix \$1; -#X msg 53 716 posY fix \$2; -#X text 204 677 SET FIXED MASS TO MOUSE POSITION; -#X msg 171 134 mass mob 1 \$1 \$2 \$3; -#X msg 171 113 100 50 90 \, 100 40 10; +#X connect 8 0 9 0; +#X connect 9 0 10 0; +#X connect 10 0 3 0; +#X connect 11 0 10 1; +#X restore 366 356 pd gemmouse; +#X obj 366 335 gemhead; +#X msg 366 377 posX fix \$1; +#X msg 366 398 posY fix \$2; #N canvas 0 22 454 304 linkrender 0; #X obj 127 22 inlet; #X obj 127 86 / 12.5; @@ -142,48 +112,57 @@ #X connect 15 0 5 0; #X connect 16 0 17 0; #X connect 17 0 15 0; -#X restore 53 613 pd linkrender; -#X msg 153 160 50 50; -#X msg 189 91 mass fix 0 100 50 50; -#X msg 85 383 setD souple 0; -#X msg 135 226 link souple \$1 \$2 \$3 \$4; -#X msg 135 205 0 1 10 10 \, 1 2 10 10; -#X connect 0 0 20 0; +#X restore 366 289 pd linkrender; +#X msg 194 139 50 50; +#X msg 74 96 mass fix 0 100 50 50; +#X obj 90 259 s msdin; +#X msg 58 139 mass mob 1 100 \$1 \$2; +#X obj 84 373 r msdin; +#X msg 58 118 40 60 \, 60 60 \, 60 40 \, 40 40; +#X obj 194 162 s mouse_init; +#X msg 27 207 link souple mob mob 10 5; +#X msg 27 230 link souple fix mob 10 5; +#X text 25 1 creation : 5 masses and 20 links; +#X text 52 281 compute and get masses and links positions; +#X obj 53 397 msd2D; +#X obj 52 419 s msdout; +#X obj 365 423 s msdin; +#X obj 366 218 r msdout; +#X text 364 315 move mass to mouse position; +#X text 365 197 display masses with gem; +#X msg 369 109 reset \, create \, 1; +#X text 261 6 1 CREATE WINDOW; +#X text 108 26 reset struct; +#X connect 0 0 7 0; #X connect 3 0 2 0; -#X connect 4 0 5 0; -#X connect 6 0 2 0; -#X connect 7 0 35 0; -#X connect 7 1 1 0; -#X connect 16 0 7 0; -#X connect 17 0 20 0; -#X connect 18 0 16 0; -#X connect 20 0 49 0; -#X connect 20 1 45 0; -#X connect 20 1 21 0; -#X connect 20 2 43 0; -#X connect 20 3 46 0; -#X connect 20 4 18 0; -#X connect 21 0 16 0; -#X connect 23 0 24 0; -#X connect 24 0 25 0; -#X connect 25 0 7 0; -#X connect 27 0 7 0; -#X connect 28 0 7 0; -#X connect 29 0 7 0; -#X connect 32 0 7 0; -#X connect 33 0 7 0; -#X connect 35 0 44 0; -#X connect 35 1 34 0; -#X connect 35 2 1 0; -#X connect 37 0 39 0; -#X connect 37 0 40 0; -#X connect 38 0 37 0; -#X connect 39 0 7 0; -#X connect 40 0 7 0; -#X connect 42 0 16 0; -#X connect 43 0 42 0; -#X connect 45 0 37 1; -#X connect 46 0 16 0; -#X connect 47 0 7 0; -#X connect 48 0 16 0; -#X connect 49 0 48 0; +#X connect 5 0 7 0; +#X connect 6 0 21 0; +#X connect 7 0 26 0; +#X connect 7 1 19 0; +#X connect 7 1 8 0; +#X connect 7 2 24 0; +#X connect 7 3 20 0; +#X connect 7 4 6 0; +#X connect 8 0 21 0; +#X connect 9 0 10 0; +#X connect 10 0 11 0; +#X connect 11 0 30 0; +#X connect 13 0 18 0; +#X connect 13 1 12 0; +#X connect 14 0 16 0; +#X connect 14 0 17 0; +#X connect 15 0 14 0; +#X connect 16 0 32 0; +#X connect 17 0 32 0; +#X connect 19 0 25 0; +#X connect 20 0 21 0; +#X connect 22 0 21 0; +#X connect 23 0 30 0; +#X connect 24 0 22 0; +#X connect 26 0 27 0; +#X connect 26 0 21 0; +#X connect 27 0 21 0; +#X connect 30 0 31 0; +#X connect 30 1 1 0; +#X connect 33 0 13 0; +#X connect 36 0 2 0; Modified: trunk/externals/nusmuk/msd2D/02_msd2Dadd.pd =================================================================== --- trunk/externals/nusmuk/msd2D/02_msd2Dadd.pd 2008-03-27 23:37:34 UTC (rev 9633) +++ trunk/externals/nusmuk/msd2D/02_msd2Dadd.pd 2008-03-28 00:54:03 UTC (rev 9634) @@ -1,348 +1,223 @@ -#N canvas 572 22 720 780 10; -#X obj 137 211 t a; -#X obj 137 39 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 +#N canvas 572 22 686 162 10; +#X obj 22 16 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; -#X msg 195 86 reset; -#X obj 52 15 loadbang; -#X obj 313 571 print msd; -#X obj 52 549 msd2D --------------------------------; -#X msg 448 219 0 \, destroy; -#X obj 539 576 gemhead; -#X obj 539 599 world_light; #N canvas 177 95 954 737 synthese 0; -#X obj 267 9 inlet; -#X msg -35 224 \$1 50; -#X obj -35 246 line~; -#X obj -75 250 *~; -#X msg 60 224 \$1 50; -#X obj 60 246 line~; -#X obj 20 250 *~; -#X msg 153 226 \$1 50; -#X obj 153 248 line~; -#X obj 113 252 *~; -#X msg 245 224 \$1 50; -#X obj 245 246 line~; -#X obj 205 250 *~; -#X obj 62 298 dac~; -#X msg 346 227 \$1 50; -#X obj 346 249 line~; -#X obj 306 253 *~; -#X msg 441 227 \$1 50; -#X obj 441 249 line~; -#X obj 401 253 *~; -#X msg 534 229 \$1 50; -#X obj 534 251 line~; -#X obj 494 255 *~; -#X msg 626 227 \$1 50; -#X obj 626 249 line~; -#X obj 586 253 *~; -#X obj 443 301 dac~; -#X obj -77 194 osc~ 55; -#X obj 19 194 osc~ 110; -#X obj 204 195 osc~ 222; -#X obj -13 128 unpack f f; -#X obj 176 134 unpack f f; -#X obj 362 131 unpack f f; -#X obj 553 138 unpack f f; -#X msg -45 428 \$1 50; -#X obj -45 450 line~; -#X obj -85 454 *~; -#X msg 50 428 \$1 50; -#X obj 50 450 line~; -#X obj 10 454 *~; -#X msg 143 430 \$1 50; -#X obj 143 452 line~; -#X obj 103 456 *~; -#X msg 235 428 \$1 50; -#X obj 235 450 line~; -#X obj 195 454 *~; -#X obj 52 502 dac~; -#X msg 336 431 \$1 50; -#X obj 336 453 line~; -#X obj 296 457 *~; -#X msg 431 431 \$1 50; -#X obj 431 453 line~; -#X obj 391 457 *~; -#X msg 524 433 \$1 50; -#X obj 524 455 line~; -#X obj 484 459 *~; -#X msg 616 431 \$1 50; -#X obj 616 453 line~; -#X obj 576 457 *~; -#X obj 433 505 dac~; -#X obj 483 403 osc~ 1113; -#X obj 575 401 osc~ 2229; -#X obj -15 343 unpack f f; -#X obj 166 338 unpack f f; -#X obj 352 335 unpack f f; -#X obj 543 342 unpack f f; -#X obj 112 196 osc~ 165; -#X obj 305 197 osc~ 267; -#X obj 400 197 osc~ 311; -#X obj 268 44 route 1 5 9 13 17 21 25 29; -#X obj 493 199 osc~ 366; -#X obj 585 197 osc~ 421; -#X obj -87 398 osc~ 444; -#X obj 9 398 osc~ 554; -#X obj 102 400 osc~ 664; -#X obj 194 398 osc~ 776; -#X obj 295 401 osc~ 888; -#X obj 390 401 osc~ 1000; -#X obj -75 368 / 20; -#X obj 52 374 / 20; -#X obj 144 376 / 20; -#X obj 240 374 / 50; -#X obj 307 371 / 50; -#X obj 434 377 / 50; -#X obj 524 379 / 100; -#X obj 621 377 / 100; -#X obj 631 173 / 100; -#X obj 532 176 / 100; -#X obj 444 174 / 50; -#X obj 317 167 / 50; -#X obj 250 170 / 50; -#X obj 153 172 / 20; -#X obj 61 171 / 20; -#X obj -64 164 / 20; -#X connect 0 0 69 0; -#X connect 1 0 2 0; -#X connect 2 0 3 1; -#X connect 3 0 13 0; -#X connect 4 0 5 0; -#X connect 5 0 6 1; -#X connect 6 0 13 0; -#X connect 6 0 13 1; -#X connect 7 0 8 0; -#X connect 8 0 9 1; -#X connect 9 0 13 0; -#X connect 9 0 13 1; -#X connect 10 0 11 0; +#X msg -35 254 \$1 50; +#X obj -35 276 line~; +#X obj -75 280 *~; +#X msg 60 254 \$1 50; +#X obj 60 276 line~; +#X obj 20 280 *~; +#X msg 153 256 \$1 50; +#X obj 153 278 line~; +#X obj 113 282 *~; +#X msg 245 254 \$1 50; +#X obj 245 276 line~; +#X obj 205 280 *~; +#X obj 62 328 dac~; +#X msg 346 257 \$1 50; +#X obj 346 279 line~; +#X obj 306 283 *~; +#X msg 441 257 \$1 50; +#X obj 441 279 line~; +#X obj 401 283 *~; +#X msg 534 259 \$1 50; +#X obj 534 281 line~; +#X obj 494 285 *~; +#X msg 626 257 \$1 50; +#X obj 626 279 line~; +#X obj 586 283 *~; +#X obj 443 331 dac~; +#X obj -77 224 osc~ 55; +#X obj 19 224 osc~ 110; +#X obj 204 225 osc~ 222; +#X obj -13 158 unpack f f; +#X obj 176 164 unpack f f; +#X obj 362 161 unpack f f; +#X obj 553 168 unpack f f; +#X msg -45 458 \$1 50; +#X obj -45 480 line~; +#X obj -85 484 *~; +#X msg 50 458 \$1 50; +#X obj 50 480 line~; +#X obj 10 484 *~; +#X msg 143 460 \$1 50; +#X obj 143 482 line~; +#X obj 103 486 *~; +#X msg 235 458 \$1 50; +#X obj 235 480 line~; +#X obj 195 484 *~; +#X obj 52 532 dac~; +#X msg 336 461 \$1 50; +#X obj 336 483 line~; +#X obj 296 487 *~; +#X msg 431 461 \$1 50; +#X obj 431 483 line~; +#X obj 391 487 *~; +#X msg 524 463 \$1 50; +#X obj 524 485 line~; +#X obj 484 489 *~; +#X msg 616 461 \$1 50; +#X obj 616 483 line~; +#X obj 576 487 *~; +#X obj 433 535 dac~; +#X obj 483 433 osc~ 1113; +#X obj 575 431 osc~ 2229; +#X obj -15 373 unpack f f; +#X obj 166 368 unpack f f; +#X obj 352 365 unpack f f; +#X obj 543 372 unpack f f; +#X obj 112 226 osc~ 165; +#X obj 305 227 osc~ 267; +#X obj 400 227 osc~ 311; +#X obj 268 74 route 1 5 9 13 17 21 25 29; +#X obj 493 229 osc~ 366; +#X obj 585 227 osc~ 421; +#X obj -87 428 osc~ 444; +#X obj 9 428 osc~ 554; +#X obj 102 430 osc~ 664; +#X obj 194 428 osc~ 776; +#X obj 295 431 osc~ 888; +#X obj 390 431 osc~ 1000; +#X obj -75 398 / 20; +#X obj 52 404 / 20; +#X obj 144 406 / 20; +#X obj 240 404 / 50; +#X obj 307 401 / 50; +#X obj 434 407 / 50; +#X obj 524 409 / 100; +#X obj 621 407 / 100; +#X obj 631 203 / 100; +#X obj 532 206 / 100; +#X obj 444 204 / 50; +#X obj 317 197 / 50; +#X obj 250 200 / 50; +#X obj 153 202 / 20; +#X obj 61 201 / 20; +#X obj -64 194 / 20; +#X obj 268 49 route massesSpeedsNo; +#X obj 268 27 r \$0-msdout; +#X connect 0 0 1 0; +#X connect 1 0 2 1; +#X connect 2 0 12 0; +#X connect 3 0 4 0; +#X connect 4 0 5 1; +#X connect 5 0 12 0; +#X connect 5 0 12 1; +#X connect 6 0 7 0; +#X connect 7 0 8 1; +#X connect 8 0 12 0; +#X connect 8 0 12 1; +#X connect 9 0 10 0; +#X connect 10 0 11 1; #X connect 11 0 12 1; -#X connect 12 0 13 1; -#X connect 14 0 15 0; -#X connect 15 0 16 1; -#X connect 16 0 26 0; -#X connect 17 0 18 0; -#X connect 18 0 19 1; -#X connect 19 0 26 0; -#X connect 19 0 26 1; -#X connect 20 0 21 0; -#X connect 21 0 22 1; -#X connect 22 0 26 0; -#X connect 22 0 26 1; -#X connect 23 0 24 0; +#X connect 13 0 14 0; +#X connect 14 0 15 1; +#X connect 15 0 25 0; +#X connect 16 0 17 0; +#X connect 17 0 18 1; +#X connect 18 0 25 0; +#X connect 18 0 25 1; +#X connect 19 0 20 0; +#X connect 20 0 21 1; +#X connect 21 0 25 0; +#X connect 21 0 25 1; +#X connect 22 0 23 0; +#X connect 23 0 24 1; #X connect 24 0 25 1; -#X connect 25 0 26 1; -#X connect 27 0 3 0; -#X connect 28 0 6 0; -#X connect 29 0 12 0; -#X connect 30 0 93 0; -#X connect 30 1 92 0; -#X connect 31 0 91 0; -#X connect 31 1 90 0; -#X connect 32 0 89 0; -#X connect 32 1 88 0; -#X connect 33 0 87 0; -#X connect 33 1 86 0; -#X connect 34 0 35 0; -#X connect 35 0 36 1; -#X connect 36 0 46 0; -#X connect 37 0 38 0; -#X connect 38 0 39 1; -#X connect 39 0 46 0; -#X connect 39 0 46 1; -#X connect 40 0 41 0; -#X connect 41 0 42 1; -#X connect 42 0 46 0; -#X connect 42 0 46 1; -#X connect 43 0 44 0; +#X connect 26 0 2 0; +#X connect 27 0 5 0; +#X connect 28 0 11 0; +#X connect 29 0 92 0; +#X connect 29 1 91 0; +#X connect 30 0 90 0; +#X connect 30 1 89 0; +#X connect 31 0 88 0; +#X connect 31 1 87 0; +#X connect 32 0 86 0; +#X connect 32 1 85 0; +#X connect 33 0 34 0; +#X connect 34 0 35 1; +#X connect 35 0 45 0; +#X connect 36 0 37 0; +#X connect 37 0 38 1; +#X connect 38 0 45 0; +#X connect 38 0 45 1; +#X connect 39 0 40 0; +#X connect 40 0 41 1; +#X connect 41 0 45 0; +#X connect 41 0 45 1; +#X connect 42 0 43 0; +#X connect 43 0 44 1; #X connect 44 0 45 1; -#X connect 45 0 46 1; -#X connect 47 0 48 0; -#X connect 48 0 49 1; -#X connect 49 0 59 0; -#X connect 50 0 51 0; -#X connect 51 0 52 1; -#X connect 52 0 59 0; -#X connect 52 0 59 1; -#X connect 53 0 54 0; -#X connect 54 0 55 1; -#X connect 55 0 59 0; -#X connect 55 0 59 1; -#X connect 56 0 57 0; +#X connect 46 0 47 0; +#X connect 47 0 48 1; +#X connect 48 0 58 0; +#X connect 49 0 50 0; +#X connect 50 0 51 1; +#X connect 51 0 58 0; +#X connect 51 0 58 1; +#X connect 52 0 53 0; +#X connect 53 0 54 1; +#X connect 54 0 58 0; +#X connect 54 0 58 1; +#X connect 55 0 56 0; +#X connect 56 0 57 1; #X connect 57 0 58 1; -#X connect 58 0 59 1; -#X connect 60 0 55 0; -#X connect 61 0 58 0; -#X connect 62 0 78 0; -#X connect 62 1 79 0; -#X connect 63 0 80 0; -#X connect 63 1 81 0; -#X connect 64 0 82 0; -#X connect 64 1 83 0; -#X connect 65 0 84 0; -#X connect 65 1 85 0; -#X connect 66 0 9 0; -#X connect 67 0 16 0; -#X connect 68 0 19 0; -#X connect 69 0 30 0; -#X connect 69 1 31 0; -#X connect 69 2 32 0; -#X connect 69 3 33 0; -#X connect 69 4 62 0; -#X connect 69 5 63 0; -#X connect 69 6 64 0; -#X connect 69 7 65 0; -#X connect 70 0 22 0; -#X connect 71 0 25 0; -#X connect 72 0 36 0; -#X connect 73 0 39 0; -#X connect 74 0 42 0; -#X connect 75 0 45 0; -#X connect 76 0 49 0; -#X connect 77 0 52 0; -#X connect 78 0 34 0; -#X connect 79 0 37 0; -#X connect 80 0 40 0; -#X connect 81 0 43 0; -#X connect 82 0 47 0; -#X connect 83 0 50 0; -#X connect 84 0 53 0; -#X connect 85 0 56 0; -#X connect 86 0 23 0; -#X connect 87 0 20 0; -#X connect 88 0 17 0; -#X connect 89 0 14 0; -#X connect 90 0 10 0; -#X connect 91 0 7 0; -#X connect 92 0 4 0; -#X connect 93 0 1 0; -#X restore 230 645 pd synthese; -#X obj 374 461 gemhead; +#X connect 59 0 54 0; +#X connect 60 0 57 0; +#X connect 61 0 77 0; +#X connect 61 1 78 0; +#X connect 62 0 79 0; +#X connect 62 1 80 0; +#X connect 63 0 81 0; +#X connect 63 1 82 0; +#X connect 64 0 83 0; +#X connect 64 1 84 0; +#X connect 65 0 8 0; +#X connect 66 0 15 0; +#X connect 67 0 18 0; +#X connect 68 0 29 0; +#X connect 68 1 30 0; +#X connect 68 2 31 0; +#X connect 68 3 32 0; +#X connect 68 4 61 0; +#X connect 68 5 62 0; +#X connect 68 6 63 0; +#X connect 68 7 64 0; +#X connect 69 0 21 0; +#X connect 70 0 24 0; +#X connect 71 0 35 0; +#X connect 72 0 38 0; +#X connect 73 0 41 0; +#X connect 74 0 44 0; +#X connect 75 0 48 0; +#X connect 76 0 51 0; +#X connect 77 0 33 0; +#X connect 78 0 36 0; +#X connect 79 0 39 0; +#X connect 80 0 42 0; +#X connect 81 0 46 0; +#X connect 82 0 49 0; +#X connect 83 0 52 0; +#X connect 84 0 55 0; +#X connect 85 0 22 0; +#X connect 86 0 19 0; +#X connect 87 0 16 0; +#X connect 88 0 13 0; +#X connect 89 0 9 0; +#X connect 90 0 6 0; +#X connect 91 0 3 0; +#X connect 92 0 0 0; +#X connect 93 0 68 0; +#X connect 94 0 93 0; +#X restore 23 107 pd synthese; +#X text 40 16 Reset; +#N canvas 0 22 450 300 structure_creation 0; +#X msg 195 86 reset; +#X obj 52 15 loadbang; #X msg 156 145 Xmax 100 \, Xmin 0 \, Ymax 100 \, Ymin 0; -#X msg 448 196 reset \, create \, lighting 1 \, 1; -#X obj 52 399 t b; -#N canvas 643 123 617 602 massrender 0; -#X obj 127 22 inlet; -#X obj 62 267 translateXYZ; -#X obj 166 123 / 12.5; -#X obj 166 146 - 4; -#X obj 231 124 / 12.5; -#X obj 231 147 - 4; -#X obj 62 241 separator; -#X obj 127 57 unpack f f f; -#X msg 128 194 \$1; -#X obj 62 314 sphere 0.1; -#X obj 62 219 colorRGB 1 1 1; -#X obj 128 174 / 29; -#X obj 127 85 t b f; -#X obj 62 135 gemhead 45; -#X obj 62 63 loadbang; -#X msg 62 93 0; -#X connect 0 0 7 0; -#X connect 1 0 9 0; -#X connect 2 0 3 0; -#X connect 3 0 1 1; -#X connect 4 0 5 0; -#X connect 5 0 1 2; -#X connect 6 0 1 0; -#X connect 7 0 12 0; -#X connect 7 1 2 0; -#X connect 7 2 4 0; -#X connect 8 0 10 2; -#X connect 8 0 10 3; -#X connect 10 0 6 0; -#X connect 11 0 8 0; -#X connect 12 0 13 0; -#X connect 12 1 11 0; -#X connect 13 0 10 0; -#X connect 14 0 15 0; -#X connect 15 0 13 0; -#X restore 141 623 pd massrender; -#N canvas 284 227 595 566 linkrender 0; -#X obj 261 87 inlet; -#X obj 261 179 / 12.5; -#X obj 261 202 - 4; -#X obj 315 180 / 12.5; -#X obj 315 203 - 4; -#X obj 189 288 separator; -#X obj 261 226 t b f; -#X obj 189 331 curve 2; -#X obj 375 183 / 12.5; -#X obj 375 206 - 4; -#X obj 429 184 / 12.5; -#X obj 429 207 - 4; -#X obj 291 256 pack f f; -#X msg 291 279 \$1 \$2 0; -#X obj 375 255 pack f f; -#X msg 375 278 \$1 \$2 0; -#X obj 261 131 unpack f f f f f; -#X obj 189 310 colorRGB 1 1 1; -#X obj 189 262 gemhead 45; -#X obj 189 180 loadbang; -#X msg 189 229 0; -#X connect 0 0 16 0; -#X connect 1 0 2 0; -#X connect 2 0 6 0; -#X connect 3 0 4 0; -#X connect 4 0 12 1; -#X connect 5 0 17 0; -#X connect 6 0 18 0; -#X connect 6 1 12 0; -#X connect 8 0 9 0; -#X connect 9 0 14 0; -#X connect 10 0 11 0; -#X connect 11 0 14 1; -#X connect 12 0 13 0; -#X connect 13 0 7 1; -#X connect 14 0 15 0; -#X connect 15 0 7 2; -#X connect 16 1 1 0; -#X connect 16 2 3 0; -#X connect 16 3 8 0; -#X connect 16 4 10 0; -#X connect 17 0 7 0; -#X connect 18 0 5 0; -#X connect 19 0 20 0; -#X connect 20 0 18 0; -#X restore 52 644 pd linkrender; -#X obj 52 359 gemhead; -#X obj 448 240 gemwin; -#X text 175 41 Reset; -#X text 281 106 Random positions and masses; -#X text 304 195 1 Create window -->; -#X text 225 464 Add force; -#X msg 446 268 \; pd dsp 1; -#X text 320 274 2 SET DSP ON -->; -#N canvas 311 224 413 534 gemmouse2 0; -#X obj 114 29 gemmouse; -#X obj 96 266 outlet; -#X obj 114 83 - 0; -#X obj 165 97 + 100; -#X obj 114 60 / 5; -#X obj 165 74 / -5; -#X obj 32 81 t b; -#X obj 32 37 inlet; -#X obj 96 177 f; -#X obj 96 206 pack 0 0 0; -#X connect 0 0 4 0; -#X connect 0 1 5 0; -#X connect 0 2 9 2; -#X connect 2 0 8 1; -#X connect 3 0 9 1; -#X connect 4 0 2 0; -#X connect 5 0 3 0; -#X connect 6 0 8 0; -#X connect 7 0 6 0; -#X connect 8 0 9 0; -#X connect 9 0 1 0; -#X restore 374 483 pd gemmouse2; -#X msg 374 506 grabMass \$1 \$2 \$3; -#X obj 52 594 route linksPos massesPos massesSpeedsNo; -#X msg 52 420 bang \, get massesPos \, get linksPos \, get massesSpeeds -1 5 9 13 17 21 25 29; -#X text 130 679 Move red masses for bass and white ones for high tones... -; +#X text 238 112 Random positions and masses; #N canvas 557 309 487 357 masses 0; #X msg 245 215 mass mob 1 \$1 \$2 \$3; #X obj 417 165 random 100; @@ -419,33 +294,170 @@ #X connect 11 0 3 0; #X restore 137 176 pd links; #X obj 137 62 t b b b b; -#X text 491 431 Get a few masses speeds; -#X msg 94 458 forceX mob 100; -#X msg 95 484 forceX mob -100; -#X connect 0 0 5 0; -#X connect 1 0 31 0; -#X connect 2 0 0 0; -#X connect 3 0 31 0; -#X connect 5 0 26 0; -#X connect 5 1 4 0; -#X connect 6 0 17 0; -#X connect 7 0 8 0; -#X connect 10 0 24 0; -#X connect 11 0 0 0; -#X connect 12 0 17 0; -#X connect 13 0 27 0; -#X connect 16 0 13 0; -#X connect 24 0 25 0; -#X connect 25 0 5 0; -#X connect 26 0 15 0; -#X connect 26 1 14 0; -#X connect 26 2 9 0; -#X connect 27 0 5 0; -#X connect 29 0 0 0; -#X connect 30 0 0 0; -#X connect 31 0 30 0; -#X connect 31 1 11 0; -#X connect 31 2 29 0; -#X connect 31 3 2 0; -#X connect 33 0 5 0; -#X connect 34 0 5 0; +#X obj 137 15 inlet; +#X obj 137 211 s \$0-msdin; +#X connect 0 0 8 0; +#X connect 1 0 6 0; +#X connect 2 0 8 0; +#X connect 4 0 8 0; +#X connect 5 0 8 0; +#X connect 6 0 5 0; +#X connect 6 1 2 0; +#X connect 6 2 4 0; +#X connect 6 3 0 0; +#X connect 7 0 6 0; +#X restore 22 39 pd structure_creation; +#N canvas 0 22 763 327 gem_stuff 0; +#X msg 137 179 0 \, destroy; +#X obj 118 200 gemwin; +#X obj 118 104 inlet; +#X obj 118 129 sel 1 0; +#X msg 118 156 reset \, create \, 1; +#X obj 274 105 gemhead; +#N canvas 311 224 413 534 gemmouse2 0; +#X obj 114 29 gemmouse; +#X obj 96 266 outlet; +#X obj 114 83 - 0; +#X obj 165 97 + 100; +#X obj 114 60 / 5; +#X obj 165 74 / -5; +#X obj 32 81 t b; +#X obj 32 37 inlet; +#X obj 96 177 f; +#X obj 96 206 pack 0 0 0; +#X connect 0 0 4 0; +#X connect 0 1 5 0; +#X connect 0 2 9 2; +#X connect 2 0 8 1; +#X connect 3 0 9 1; +#X connect 4 0 2 0; +#X connect 5 0 3 0; +#X connect 6 0 8 0; +#X connect 7 0 6 0; +#X connect 8 0 9 0; +#X connect 9 0 1 0; +#X restore 274 127 pd gemmouse2; +#X msg 274 150 grabMass \$1 \$2 \$3; +#N canvas 643 123 617 602 massrender 0; +#X obj 127 22 inlet; +#X obj 62 267 translateXYZ; +#X obj 166 123 / 12.5; +#X obj 166 146 - 4; +#X obj 231 124 / 12.5; +#X obj 231 147 - 4; +#X obj 62 241 separator; +#X obj 127 57 unpack f f f; +#X msg 128 194 \$1; +#X obj 62 219 colorRGB 1 1 1; +#X obj 128 174 / 29; +#X obj 127 85 t b f; +#X obj 62 135 gemhead 45; +#X obj 62 63 loadbang; +#X msg 62 93 0; +#X obj 62 314 circle 0.1; +#X connect 0 0 7 0; +#X connect 1 0 15 0; +#X connect 2 0 3 0; +#X connect 3 0 1 1; +#X connect 4 0 5 0; +#X connect 5 0 1 2; +#X connect 6 0 1 0; +#X connect 7 0 11 0; +#X connect 7 1 2 0; +#X connect 7 2 4 0; +#X connect 8 0 9 2; +#X connect 8 0 9 3; +#X connect 9 0 6 0; +#X connect 10 0 8 0; +#X connect 11 0 12 0; +#X connect 11 1 10 0; +#X connect 12 0 9 0; +#X connect 13 0 14 0; +#X connect 14 0 12 0; +#X restore 502 153 pd massrender; +#N canvas 284 227 595 566 linkrender 0; +#X obj 261 87 inlet; +#X obj 261 179 / 12.5; +#X obj 261 202 - 4; +#X obj 315 180 / 12.5; +#X obj 315 203 - 4; +#X obj 189 288 separator; +#X obj 261 226 t b f; +#X obj 189 331 curve 2; +#X obj 375 183 / 12.5; +#X obj 375 206 - 4; +#X obj 429 184 / 12.5; +#X obj 429 207 - 4; +#X obj 291 256 pack f f; +#X msg 291 279 \$1 \$2 0; +#X obj 375 255 pack f f; +#X msg 375 278 \$1 \$2 0; +#X obj 261 131 unpack f f f f f; +#X obj 189 310 colorRGB 1 1 1; +#X obj 189 262 gemhead 45; +#X obj 189 180 loadbang; +#X msg 189 229 0; +#X connect 0 0 16 0; +#X connect 1 0 2 0; +#X connect 2 0 6 0; +#X connect 3 0 4 0; +#X connect 4 0 12 1; +#X connect 5 0 17 0; +#X connect 6 0 18 0; +#X connect 6 1 12 0; +#X connect 8 0 9 0; +#X connect 9 0 14 0; +#X connect 10 0 11 0; +#X connect 11 0 14 1; +#X connect 12 0 13 0; +#X connect 13 0 7 1; +#X connect 14 0 15 0; +#X connect 15 0 7 2; +#X connect 16 1 1 0; +#X connect 16 2 3 0; +#X connect 16 3 8 0; +#X connect 16 4 10 0; +#X connect 17 0 7 0; +#X connect 18 0 5 0; +#X connect 19 0 20 0; +#X connect 20 0 18 0; +#X restore 432 174 pd linkrender; +#X obj 432 124 route linksPos massesPos; +#X obj 273 174 s \$0-msdin; +#X obj 432 101 r \$0-msdout; +#X connect 0 0 1 0; +#X connect 2 0 3 0; +#X connect 3 0 4 0; +#X connect 3 1 0 0; +#X connect 4 0 1 0; +#X connect 5 0 6 0; +#X connect 6 0 7 0; +#X connect 7 0 11 0; +#X connect 10 0 9 0; +#X connect 10 1 8 0; +#X connect 12 0 10 0; +#X restore 23 86 pd gem_stuff; +#X obj 23 64 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1 1 +; +#X text 43 63 gem on/off; +#X text 196 54 1 Create window; +#X text 196 74 2 Set dsp on; +#N canvas 0 22 450 300 compute 0; +#X obj 110 186 print msd; +#X obj 52 69 gemhead; +#X msg 52 96 bang \, get massesPos \, get linksPos \, get massesSpeeds +1 5 9 13 17 21 25 29; +#X obj 52 162 msd2D; +#X obj 67 133 r \$0-msdin; +#X obj 52 186 s \$0-msdout; +#X connect 1 0 2 0; +#X connect 2 0 3 0; +#X connect 3 0 5 0; +#X connect 3 1 0 0; +#X connect 4 0 3 0; +#X restore 23 129 pd compute; +#X text 196 94 Drag red masses for bass and white ones for high tones... +; +#X text 196 17 Additive synthesis example; +#X connect 0 0 3 0; +#X connect 5 0 4 0; Modified: trunk/externals/nusmuk/msd2D/03_imsd2Dtest.pd =================================================================== --- trunk/externals/nusmuk/msd2D/03_imsd2Dtest.pd 2008-03-27 23:37:34 UTC (rev 9633) +++ trunk/externals/nusmuk/msd2D/03_imsd2Dtest.pd 2008-03-28 00:54:03 UTC (rev 9634) @@ -1,34 +1,13 @@ -#N canvas 574 52 843 838 10; -#X obj 52 15 loadbang; -#X obj 314 524 print msd; -#X obj 633 647 gemwin; -#X msg 633 625 0 \, destroy; -#X obj 553 709 gemhead; -#X obj 553 732 world_light; -#X msg 633 562 reset \, create \, lighting 1 \, 1; -#X obj 53 499 msd2D --------------------------------; -#X obj 122 15 cnv 15 500 270 empty empty empty 20 12 0 14 -262131 -66577 -0; -#X obj 135 261 t a; -#X obj 135 20 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262131 -1 +#N canvas 568 230 687 149 10; +#X obj 23 17 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; -#X msg 221 71 reset; -#X text 173 21 reset; -#X msg 153 170 50 50; -#X msg 203 91 mass fix 0 100 50 50; -#X msg 169 192 Xmax 100 \, Xmin 0 \, Ymax 100 \, Ymin 0; -#X obj 50 292 cnv 15 572 80 empty empty empty 20 12 0 14 -261689 -66577 -0; -#X obj 53 300 gemhead; -#X obj 53 323 t b; -#X obj 50 376 cnv 15 572 110 empty empty empty 20 12 0 14 -262131 -66577 -0; -#X msg 82 442 forceX mob 100; -#X msg 208 443 forceY mob 100; -#X text 351 396 SET RIGIDITY AND VISCOSITY OF LINKS; -#X text 367 442 ADD FORCE ON ALL MOBILE MASSES; -#X obj 47 547 cnv 15 400 200 empty empty empty 20 12 0 14 -261689 -66577 -0; +#X text 43 16 reset; +#N canvas 0 22 763 327 gem_stuff 0; +#X msg 137 179 0 \, destroy; +#X obj 118 200 gemwin; +#X obj 118 104 inlet; +#X obj 118 129 sel 1 0; +#X msg 118 156 reset \, create \, 1; #N canvas 284 227 591 562 linkrender 0; #X obj 150 9 inlet; #X obj 150 101 / 12.5; @@ -73,10 +52,9 @@ #X connect 17 0 5 0; #X connect 18 0 19 0; #X connect 19 0 17 0; -#X restore 62 601 pd linkrender; -#X text 465 563 1 CREATE WINDOW -->; -#X text 464 626 3 AND DESTROY IT! -->; -#X text 464 594 2 DRAG THE STRUCTURE WITH THE MOUSE; +#X restore 262 171 pd linkrender; +#X obj 262 133 route linksPos; +#X obj 262 110 r \$0-msdout; #N canvas 731 296 454 304 gemmouse 0; #X obj 189 77 gemmouse; #X obj 189 184 pack f f; @@ -87,78 +65,92 @@ #X obj 189 108 / 5; #X obj 216 108 / -5; #X obj 79 51 inlet; -#X obj 140 75 inlet; #X obj 109 98 t b; #X obj 108 139 list; +#X obj 141 42 r mouse_init; #X connect 0 0 6 0; #X connect 0 1 7 0; #X connect 0 2 2 1; #X connect 1 0 2 0; -#X connect 2 0 11 1; +#X connect 2 0 10 1; #X connect 4 0 1 0; #X connect 5 0 1 1; #X connect 6 0 4 0; #X connect 7 0 5 0; +#X connect 8 0 9 0; +#X connect 9 0 10 0; +#X connect 10 0 3 0; +#X connect 11 0 10 1; +#X restore 404 127 pd gemmouse; +#X obj 404 106 gemhead; +#X msg 405 147 posX fix \$1; +#X msg 406 168 posY fix \$2; +#X obj 405 194 s \$0-msdin; +#X connect 0 0 1 0; +#X connect 2 0 3 0; +#X connect 3 0 4 0; +#X connect 3 1 0 0; +#X connect 4 0 1 0; +#X connect 6 0 5 0; +#X connect 7 0 6 0; #X connect 8 0 10 0; -#X connect 9 0 11 1; -#X connect 10 0 11 0; -#X connect 11 0 3 0; -#X restore 104 657 pd gemmouse; -#X obj 104 636 gemhead; -#X msg 105 677 posX fix \$1; -#X msg 106 698 posY fix \$2; -#X text 204 677 SET FIXED MASS TO MOUSE POSITION; +#X connect 8 0 11 0; +#X connect 9 0 8 0; +#X connect 10 0 12 0; +#X connect 11 0 12 0; +#X restore 23 86 pd gem_stuff; +#X obj 23 64 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0 1 +; +#X text 43 63 gem on/off; +#N canvas 487 334 635 333 creation 0; +#X obj 52 15 loadbang; +#X msg 221 71 reset; +#X msg 153 170 50 50; +#X msg 203 91 mass fix 0 100 50 50; +#X msg 169 192 Xmax 100 \, Xmin 0 \, Ymax 100 \, Ymin 0; #X msg 186 150 mass mob 1 100 \$1 \$2; #X obj 135 42 t b b b b b b; #X msg 186 116 20 50 \, 23 61 \, 29 71 \, 39 77 \, 50 80 \, 61 77 \, 71 71 \, 77 61 \, 80 50 \, 77 39 \, 71 29 \, 61 23 \, 50 20 \, 39 23 \, 29 29 \, 23 39; -#X msg 625 711 0.9 0.9 0.9; -#X obj 62 563 route linksPos; -#X msg 53 345 bang \, get linksPos; -#X text 292 313 COMPUTE AND GET ALL LINKS POSITIONS; -#X text 260 572 DISPLAY LINKS WITH GEM; -#X msg 85 383 setD inter 0; -#X msg 216 384 setK inter 1; -#X msg 216 404 setK inter 2; #X msg 144 211 link intf mob 0 10 2.5; #X msg 135 234 link inter mob mob 1 2.5; -#X text 290 43 CREATION : 17 MASSES \, 2 interactor LINKS; -#X connect 0 0 35 0; -#X connect 3 0 2 0; +#X obj 192 270 s mouse_init; +#X obj 135 261 s \$0-msdin; +#X obj 239 25 inlet; +#X text 303 226 all links are created with these two messages; +#X connect 0 0 6 0; +#X connect 1 0 11 0; +#X connect 2 0 10 0; +#X connect 3 0 11 0; +#X connect 4 0 11 0; +#X connect 5 0 11 0; +#X connect 6 0 9 0; +#X connect 6 1 8 0; +#X connect 6 2 2 0; +#X connect 6 2 4 0; +#X connect 6 3 7 0; +#X connect 6 4 3 0; +#X connect 6 5 1 0; +#X connect 7 0 5 0; +#X connect 8 0 11 0; +#X connect 9 0 11 0; +#X connect 12 0 6 0; +#X restore 23 40 pd creation; +#N canvas 0 22 450 300 compute 0; +#X obj 53 100 gemhead; +#X obj 53 123 t b; +#X msg 53 145 bang \, get linksPos; +#X obj 53 224 s \$0-msdout; +#X obj 63 174 r \$0-msdin; +#X obj 53 198 msd2D; +#X connect 0 0 1 0; +#X connect 1 0 2 0; +#X connect 2 0 5 0; #X connect 4 0 5 0; -#X connect 6 0 2 0; -#X connect 7 0 38 0; -#X connect 7 1 1 0; -#X connect 9 0 7 0; -#X connect 10 0 35 0; -#X connect 11 0 9 0; -#X connect 13 0 29 1; -#X connect 14 0 9 0; -#X connect 15 0 9 0; -#X connect 17 0 18 0; -#X connect 18 0 39 0; -#X connect 20 0 7 0; -#X connect 21 0 7 0; -#X connect 29 0 31 0; -#X connect 29 0 32 0; -#X connect 30 0 29 0; -#X connect 31 0 7 0; -#X connect 32 0 7 0; -#X connect 34 0 9 0; -#X connect 35 0 46 0; -#X connect 35 1 45 0; -#X connect 35 2 13 0; -#X connect 35 2 15 0; -#X connect 35 3 36 0; -#X connect 35 4 14 0; -#X connect 35 5 11 0; -#X connect 36 0 34 0; -#X connect 37 0 5 1; -#X connect 38 0 25 0; -#X connect 39 0 7 0; -#X connect 42 0 7 0; -#X connect 43 0 7 0; -#X connect 44 0 7 0; -#X connect 45 0 9 0; -#X connect 46 0 9 0; +#X connect 5 0 3 0; +#X restore 23 111 pd compute; +#X text 164 54 create window; +#X text 164 69 and drag the structure with the mouse; +#X connect 0 0 5 0; +#X connect 3 0 2 0; Modified: trunk/externals/nusmuk/msd2D/04_msd2Dperf.pd =================================================================== --- trunk/externals/nusmuk/msd2D/04_msd2Dperf.pd 2008-03-27 23:37:34 UTC (rev 9633) +++ trunk/externals/nusmuk/msd2D/04_msd2Dperf.pd 2008-03-28 00:54:03 UTC (rev 9634) @@ -1,108 +1,18 @@ -#N canvas 590 22 847 803 10; -#X obj 167 221 t a; -#X obj 167 33 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 +#N canvas 521 54 428 182 10; +#X msg 144 71 forceX mob 100; +#X msg 144 94 forceX mob -100; +#X text 141 13 change number of mass to test performance; +#X text 141 26 (and reset afterwards); +#X obj 81 19 nbx 5 14 1 20000 1 1 empty empty empty 0 -6 0 10 -262144 +-1 -1 125.925 256; +#X obj 18 18 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; +#X text 38 16 reset; +#N canvas 487 334 635 333 creation 0; #X msg 239 84 reset; -#X obj 52 15 loadbang; -#X text 205 34 reset; -#X msg 300 402 forceX mob 100; #X obj 167 55 t b b b b b; -#X obj 52 583 msd2D --------------------------------; -#X msg 460 409 0 \, destroy; -#X obj 481 320 gemhead; -#X obj 481 343 world_light; -#X msg 460 386 reset \, create \, lighting 1 \, 1; -#X obj 52 301 t b; -#N canvas 643 123 311 308 massrender 0; -#X obj 24 196 translateXYZ; -#X obj 24 222 sphere 0.1; -#X obj 24 170 separator; -#X obj 24 144 gemhead 45; -#X obj 103 17 inlet; -#X obj 103 55 unpack f f f; -#X obj 109 83 t b f; -#X obj 24 56 loadbang; -#X msg 24 80 0; -#X connect 0 0 1 0; -#X connect 2 0 0 0; -#X connect 3 0 2 0; -#X connect 4 0 5 0; -#X connect 5 1 6 0; -#X connect 5 2 0 2; -#X connect 6 0 3 0; -#X connect 6 1 0 1; -#X connect 7 0 8 0; -#X connect 8 0 3 0; -#X restore 133 635 pd massrender; -#N canvas 284 227 394 269 linkrender 0; -#X obj 121 20 inlet; -#X obj 57 175 separator; -#X obj 57 220 curve 2; -#X obj 43 130 gemhead 45; -#X msg 213 69 \$4 \$5 0; -#X msg 141 65 \$2 \$3 0; -#X obj 140 94 t b a; -#X obj 44 46 loadbang; -#X msg 44 75 0; -#X connect 0 0 4 0; -#X connect 0 0 5 0; -#X connect 1 0 2 0; -#X connect 3 0 1 0; -#X connect 4 0 2 2; -#X connect 5 0 6 0; -#X connect 6 0 3 0; -#X connect 6 1 2 1; -#X connect 7 0 8 0; -#X connect 8 0 3 0; -#X restore 52 656 pd linkrender; -#X obj 52 278 gemhead; -#X obj 460 458 gemwin; -#X msg 52 335 bang \, get massesPos \, get linksPos; -#X obj 52 606 route linksPos massesPos; -#X msg 460 433 view 0 0 4 0 0 0 0 1 0; -#X msg 300 425 forceX mob -100; #X obj 441 55 f; -#X obj 91 421 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1 -; -#X obj 91 442 metro 10; -#X floatatom 141 421 5 0 0 0 - - -; -#X text 501 28 change number of mass to test performance; -#X text 501 41 (and reset afterwards); -#X obj 441 34 nbx 5 14 1 20000 1 1 empty empty empty 0 -6 0 10 -262144 --1 -1 381.385 256; -#X text 76 390 instead of GEM doing the timing; #X msg 221 104 mass fix 0 100 0 0; -#N canvas 731 296 454 304 gemmouse 0; -#X obj 189 77 gemmouse; -#X obj 189 184 pack f f; -#X obj 189 218 spigot; -#X obj 109 243 outlet; -#X obj 109 36 inlet; -#X obj 109 98 t b; -#X obj 238 131 + 4; -#X msg 57 182 posX fix \$1; -#X msg 57 203 posY fix \$2; -#X obj 189 108 / 62.5; -#X obj 237 107 / -62.5; -#X obj 189 131 - 4; -#X obj 109 125 list 0 0; -#X connect 0 0 9 0; -#X connect 0 1 10 0; -#X connect 0 2 2 1; -#X connect 1 0 2 0; -#X connect 2 0 12 1; -#X connect 4 0 5 0; -#X connect 5 0 12 0; -#X connect 6 0 1 1; -#X connect 7 0 3 0; -#X connect 8 0 3 0; -#X connect 9 0 11 0; -#X connect 10 0 6 0; -#X connect 11 0 1 0; -#X connect 12 0 7 0; -#X connect 12 0 8 0; -#X restore 372 536 pd gemmouse; -#X obj 372 515 gemhead; #N canvas 0 22 450 300 links 0; #X obj 136 72 t b; #X obj 136 116 + 1; @@ -193,36 +103,111 @@ #X connect 26 0 4 0; #X restore 203 129 pd masses; #X msg 185 155 Xmax 4 \, Xmin -4 \, Ymax 4 \, Ymin -4; -#X connect 0 0 7 0; -#X connect 1 0 6 0; -#X connect 2 0 0 0; +#X obj 166 29 inlet; +#X obj 205 30 loadbang; +#X obj 441 33 inlet; +#X obj 167 221 s \$0-msdin; +#X connect 0 0 10 0; +#X connect 1 0 4 0; +#X connect 1 1 6 0; +#X connect 1 2 5 0; +#X connect 1 3 3 0; +#X connect 1 4 0 0; +#X connect 2 0 4 1; +#X connect 2 0 5 1; +#X connect 3 0 10 0; +#X connect 4 0 10 0; +#X connect 5 0 10 0; +#X connect 6 0 10 0; +#X connect 7 0 1 0; +#X connect 8 0 1 0; +#X connect 9 0 2 0; +#X restore 18 41 pd creation; +#N canvas 0 22 450 300 gem 0; +#X msg 30 99 0 \, destroy; +#X msg 30 76 reset \, create \, lighting 1 \, 1; +#X obj 30 148 gemwin; +#X obj 32 25 inlet; +#X obj 32 53 sel 1 0; +#X obj 241 50 gemhead; +#X obj 241 73 world_light; +#X connect 0 0 2 0; +#X connect 1 0 2 0; +#X connect 3 0 4 0; +#X connect 4 0 1 0; +#X connect 4 1 0 0; +#X connect 5 0 6 0; +#X restore 18 91 pd gem; +#X obj 18 68 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0 1 +; +#X text 38 66 gem on/off; +#N canvas 0 22 450 300 compute 0; +#N canvas 643 123 311 308 massrender 0; +#X obj 24 196 translateXYZ; +#X obj 24 170 separator; +#X obj 24 144 gemhead 45; +#X obj 103 17 inlet; +#X obj 103 55 unpack f f f; +#X obj 109 83 t b f; +#X obj 24 56 loadbang; +#X msg 24 80 0; +#X obj 24 222 sphere 0.1; +#X connect 0 0 8 0; +#X connect 1 0 0 0; +#X connect 2 0 1 0; +#X connect 3 0 4 0; +#X connect 4 1 5 0; +#X connect 4 2 0 2; +#X connect 5 0 2 0; +#X connect 5 1 0 1; +#X connect 6 0 7 0; +#X connect 7 0 2 0; +#X restore 133 205 pd massrender; +#N canvas 284 227 394 269 linkrender 0; +#X obj 121 20 inlet; +#X obj 57 175 separator; +#X obj 57 220 curve 2; +#X obj 43 130 gemhead 45; +#X msg 213 69 \$4 \$5 0; +#X msg 141 65 \$2 \$3 0; +#X obj 140 94 t b a; +#X obj 44 46 loadbang; +#X msg 44 75 0; +#X connect 0 0 4 0; +#X connect 0 0 5 0; +#X connect 1 0 2 0; +#X connect 3 0 1 0; +#X connect 4 0 2 2; +#X connect 5 0 6 0; +#X connect 6 0 3 0; +#X connect 6 1 2 1; +#X connect 7 0 8 0; +#X connect 8 0 3 0; +#X restore 52 256 pd linkrender; +#X obj 52 28 gemhead; +#X msg 52 85 bang \, get massesPos \, get linksPos; +#X obj 52 176 route linksPos massesPos; +#X obj 82 127 r \$0-msdin; +#X obj 52 153 msd2D; +#X obj 85 198 inlet; +#X obj 52 227 spigot; +#X connect 2 0 3 0; #X connect 3 0 6 0; +#X connect 4 0 8 0; +#X connect 4 1 0 0; +#X connect 5 0 6 0; +#X connect 6 0 4 0; +#X connect 7 0 8 1; +#X connect 8 0 1 0; +#X restore 19 137 pd compute; +#X obj 144 118 s \$0-msdin; +#X text 260 80 click to move; +#X obj 19 115 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0 +1; +#X text 39 114 display links; +#X connect 0 0 12 0; +#X connect 1 0 12 0; +#X connect 4 0 7 1; #X connect 5 0 7 0; -#X connect 6 0 32 0; -#X connect 6 1 34 0; -#X connect 6 2 33 0; -#X connect 6 3 29 0; -#X connect 6 4 2 0; -#X connect 7 0 18 0; -#X connect 8 0 16 0; -#X connect 9 0 10 0; -#X connect 11 0 16 0; -#X connect 12 0 17 0; -#X connect 15 0 12 0; -#X connect 17 0 7 0; -#X connect 18 0 14 0; -#X connect 18 1 13 0; -#X connect 19 0 16 0; -#X connect 20 0 7 0; -#X connect 21 0 32 1; -#X connect 21 0 33 1; -#X connect 22 0 23 0; -#X connect 23 0 7 0; -#X connect 24 0 23 1; -#X connect 27 0 21 0; -#X connect 29 0 0 0; -#X connect 30 0 7 0; -#X connect 31 0 30 0; -#X connect 32 0 0 0; -#X connect 33 0 0 0; -#X connect 34 0 0 0; +#X connect 9 0 8 0; +#X connect 14 0 11 0; Modified: trunk/externals/nusmuk/msd2D/05_msd2DDataStruct.pd =================================================================== --- trunk/externals/nusmuk/msd2D/05_msd2DDataStruct.pd 2008-03-27 23:37:34 UTC (rev 9633) +++ trunk/externals/nusmuk/msd2D/05_msd2DDataStruct.pd 2008-03-28 00:54:03 UTC (rev 9634) @@ -2,107 +2,116 @@ mid2 float lid; #N struct mass float x float y float mid float mob; #N struct fixmass float x float y float mid; -#N canvas 391 53 852 890 10; -#X obj 52 15 loadbang; -#X obj 52 501 msd2D --------------------------------; -#X obj 135 274 t a; -#X obj 135 20 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262131 -1 +#N canvas 241 22 630 524 10; +#X obj 15 58 structures; +#X obj 16 96 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 1 1 +; +#X msg 16 153 forceY mob 8; +#X obj 16 125 metro 10; +#N canvas 0 22 307 306 \$0-anim 0; +#X scalar liaison 90.3805 300 139.692 181.359 0 0 0 \;; +#X scalar liaison 89.4172 189.783 104.878 200.197 0 0 0 \;; +#X scalar liaison 89.4172 189.783 139.692 181.359 0 0 0 \;; +#X scalar liaison 145.861 231.953 90.3805 300 0 0 0 \;; +#X scalar liaison 81.2748 184.111 102.254 162.589 0 0 0 \;; +#X scalar liaison 89.4172 189.783 52.423 226.527 0 0 0 \;; +#X scalar liaison 156.503 300 89.4172 189.783 0 0 0 \;; +#X scalar liaison 104.878 200.197 121.885 186.762 0 0 0 \;; +#X scalar liaison 145.861 231.953 89.4172 189.783 0 0 0 \;; +#X scalar liaison 156.503 300 145.861 231.953 0 0 0 \;; +#X scalar liaison 121.885 186.762 81.2748 184.111 0 0 0 \;; +#X scalar liaison 52.423 226.527 139.692 181.359 0 0 0 \;; +#X scalar liaison 156.503 300 97.1881 236.113 0 0 0 \;; +#X scalar liaison 139.692 181.359 121.885 186.762 0 0 0 \;; +#X scalar liaison 139.692 181.359 145.861 231.953 0 0 0 \;; +#X scalar liaison 90.3805 300 97.1881 236.113 0 0 0 \;; +#X scalar liaison 102.254 162.589 121.885 186.762 0 0 0 \;; +#X scalar liaison 139.692 181.359 187.622 200.002 0 0 0 \;; +#X scalar liaison 97.1881 236.113 145.861 231.953 0 0 0 \;; +#X scalar liaison 104.878 200.197 81.2748 184.111 0 0 0 \;; +#X scalar liaison 97.1881 236.113 139.692 181.359 0 0 0 \;; +#X scalar liaison 97.1881 236.113 89.4172 189.783 0 0 0 \;; +#X scalar liaison 104.878 200.197 102.254 162.589 0 0 0 \;; +#X scalar liaison 89.4172 189.783 187.622 200.002 0 0 0 \;; +#X scalar mass 90.3805 300 0 0 \;; +#X scalar mass 104.878 200.197 8 0 \;; +#X scalar mass 89.4172 189.783 4 0 \;; +#X scalar mass 97.1881 236.113 2 0 \;; +#X scalar mass 81.2748 184.111 10 0 \;; +#X scalar mass 52.423 226.527 6 0 \;; +#X scalar mass 156.503 300 1 0 \;; +#X scalar mass 121.885 186.762 9 0 \;; +#X scalar mass 139.692 181.359 5 0 \;; +#X scalar mass 145.861 231.953 3 0 \;; +#X scalar mass 102.254 162.589 11 0 \;; +#X scalar mass 187.622 200.002 7 0 \;; +#X coords 0 0 300 300 300 300 1; +#X restore 255 92 pd \$0-anim; +#X obj 16 212 make_anim \$0-anim; +#X msg 15 358 forceY mob -200; +#X msg 15 380 forceY mob 200; +#X msg 15 316 forceX mob 200; +#X msg 15 337 forceX mob -200; +#X msg 15 400 forceX 0 -200 \, forceX 1 200; +#X msg 15 442 forceY 0 -200 \, forceY 1 -200 \, forceX 0 -200 \, forceX +1 200; +#X msg 15 421 forceY 6 -200 \, forceY 7 -200; +#X obj 15 182 r \$0-msdin; +#N canvas 0 22 450 300 creation 0; +#X obj 45 20 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262131 -1 -1; -#X msg 207 71 reset; -#X text 173 21 reset; -#X obj 135 42 t b b b b b; -#X obj 574 252 structures; -#X obj 53 188 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1 -; -#X msg 153 181 Xmax 300 \, Xmin 0 \, Ymax 300 \, Ymin 0; -#X msg 186 317 forceY mob 8; -#X msg 171 113 100 300 \, 150 300 \, 100 230 \, 150 230 \, 100 180 -\, 150 180 \, 50 180 \, 200 180 \, 115 180 \, 135 180 \, 110 150 \, -140 150; -#X msg 135 205 0 5 \, 1 2 \, 1 4 \, 2 3 \, 3 0 \, 0 2 \, 1 3 \, 2 4 +#X msg 117 71 reset; +#X text 83 21 reset; +#X obj 45 42 t b b b b b; +#X msg 63 181 Xmax 300 \, Xmin 0 \, Ymax 300 \, Ymin 0; +#X msg 81 113 100 300 \, 150 300 \, 100 230 \, 150 230 \, 100 180 \, +150 180 \, 50 180 \, 200 180 \, 115 180 \, 135 180 \, 110 150 \, 140 +150; +#X msg 45 205 0 5 \, 1 2 \, 1 4 \, 2 3 \, 3 0 \, 0 2 \, 1 3 \, 2 4 \, 4 5 \, 5 3 \, 3 4 \, 2 5 \, 4 6 \, 5 7 \, 6 5 \, 4 7 \, 4 8 \, 5 9 \, 8 9 \, 8 10 \, 10 11 \, 11 9 \, 9 10 \, 8 11; -#X obj 53 217 metro 10; -#N canvas 0 0 307 306 1028-anim 0; -#X scalar liaison 100 300 150 180 0 0 0 \;; -#X scalar liaison 100 180 115 180 0 0 0 \;; -#X scalar liaison 100 180 150 180 0 0 0 \;; -#X scalar liaison 150 230 100 300 0 0 0 \;; -#X scalar liaison 110 150 140 150 0 0 0 \;; -#X scalar liaison 100 180 50 180 0 0 0 \;; -#X scalar liaison 150 300 100 180 0 0 0 \;; -#X scalar liaison 115 180 135 180 0 0 0 \;; -#X scalar liaison 150 230 100 180 0 0 0 \;; -#X scalar liaison 150 300 150 230 0 0 0 \;; -#X scalar liaison 135 180 110 150 0 0 0 \;; -#X scalar liaison 50 180 150 180 0 0 0 \;; -#X scalar liaison 150 300 100 230 0 0 0 \;; -#X scalar liaison 150 180 135 180 0 0 0 \;; -#X scalar liaison 150 180 150 230 0 0 0 \;; -#X scalar liaison 100 300 100 230 0 0 0 \;; -#X scalar liaison 140 150 135 180 0 0 0 \;; -#X scalar liaison 150 180 200 180 0 0 0 \;; -#X scalar liaison 100 230 150 230 0 0 0 \;; -#X scalar liaison 115 180 110 150 0 0 0 \;; -#X scalar liaison 100 230 150 180 0 0 0 \;; -#X scalar liaison 100 230 100 180 0 0 0 \;; -#X scalar liaison 115 180 140 150 0 0 0 \;; -#X scalar liaison 100 180 200 180 0 0 0 \;; -#X scalar mass 100 300 0 0 \;; -#X scalar mass 115 180 8 0 \;; -#X scalar mass 100 180 4 0 \;; -#X scalar mass 100 230 2 0 \;; -#X scalar mass 110 150 10 0 \;; -#X scalar mass 50 180 6 0 \;; -#X scalar mass 150 300 1 0 \;; -#X scalar mass 135 180 9 0 \;; -#X scalar mass 150 180 5 0 \;; -#X scalar mass 150 230 3 0 \;; -#X scalar mass 140 150 11 0 \;; -#X scalar mass 200 180 7 0 \;; -#X coords 0 0 300 300 300 300 1; -#X restore 466 370 pd \$0-anim; -#X obj 52 290 make_anim \$0-anim; -#X text 26 165 3 - metro ON; -#X text 333 302 1 - Create the Datastructre; -#X text 333 321 2 - notch the "poll" case to set DS to actual model +#X msg 45 252 link souple \$1 \$2 12 20; +#X msg 81 146 mass mob 1 100 \$1 \$2; +#X obj 45 274 s \$0-msdin; +#X obj 69 6 inlet; +#X obj 141 26 loadbang; +#X connect 0 0 3 0; +#X connect 1 0 9 0; +#X connect 3 0 6 0; +#X connect 3 1 4 0; +#X connect 3 2 5 0; +#X connect 3 4 1 0; +#X connect 4 0 9 0; +#X connect 5 0 8 0; +#X connect 6 0 7 0; +#X connect 7 0 9 0; +#X connect 8 0 9 0; +#X connect 10 0 3 0; +#X connect 11 0 3 0; +#X restore 15 37 pd creation; +#X obj 15 14 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1 +-1; +#X text 36 14 reset; +#X obj 15 467 s \$0-msdin; +#X obj 15 286 msd2D; +#X text 38 95 compute; +#X text 252 28 1 - notch the "poll" case to set DS to actual model state; -#X text 95 417 4 - "force" the dancer to move; -#X msg 135 252 link souple \$1 \$2 12 20; -#X msg 211 443 forceY mob -200; -#X msg 212 466 forceY mob 200; -#X msg 86 441 forceX mob 200; -#X msg 86 464 forceX mob -200; -#X msg 52 540 forceX 0 -200 \, forceX 1 200; -#X msg 52 609 forceY 0 -200 \, forceY 1 -200 \, forceX 0 -200 \, forceX -1 200; -#X msg 52 571 forceY 6 -200 \, forceY 7 -200; -#X msg 171 146 mass mob 1 100 \$1 \$2; -#X text 417 61 NOT UPDATED...; -#X connect 0 0 6 0; -#X connect 1 0 15 0; -#X connect 1 1 15 0; -#X connect 2 0 1 0; -#X connect 3 0 6 0; -#X connect 4 0 2 0; -#X connect 6 0 12 0; -#X connect 6 1 9 0; -#X connect 6 2 11 0; -#X connect 6 4 4 0; -#X connect 8 0 13 0; -#X connect 9 0 2 0; -#X connect 10 0 1 0; -#X connect 11 0 28 0; -#X connect 12 0 20 0; -#X connect 13 0 1 0; -#X connect 13 0 10 0; -#X connect 15 0 1 0; -#X connect 20 0 2 0; -#X connect 21 0 1 0; -#X connect 22 0 1 0; -#X connect 23 0 1 0; -#X connect 24 0 1 0; -#X connect 25 0 1 0; -#X connect 26 0 1 0; -#X connect 27 0 1 0; -#X connect 28 0 2 0; +#X text 252 47 2 - compute ON; +#X text 252 64 3 - "force" the dancer to move; +#X connect 1 0 3 0; +#X connect 2 0 18 0; +#X connect 3 0 2 0; +#X connect 3 0 18 0; +#X connect 5 0 18 0; +#X connect 6 0 17 0; +#X connect 7 0 17 0; +#X connect 8 0 17 0; +#X connect 9 0 17 0; +#X connect 10 0 17 0; +#X connect 11 0 17 0; +#X connect 12 0 17 0; +#X connect 13 0 18 0; +#X connect 15 0 14 0; +#X connect 18 0 5 0; +#X connect 18 1 5 0; Modified: trunk/externals/nusmuk/msd2D/make_anim.pd =================================================================== --- trunk/externals/nusmuk/msd2D/make_anim.pd 2008-03-27 23:37:34 UTC (rev 9633) +++ trunk/externals/nusmuk/msd2D/make_anim.pd 2008-03-28 00:54:03 UTC (rev 9634) @@ -1,9 +1,9 @@ #N struct mass float x float y float mid float mob; #N struct fixmass float x float y float mid; -#N canvas 327 365 669 506 10; +#N canvas 445 254 669 506 10; #X obj 352 260 pointer; #X obj 86 83 spigot; -#X obj 227 148 bng 24 250 50 0 \$0-create empty Create 0 -6 0 8 -262144 +#X obj 400 20 bng 15 250 50 0 \$0-create empty Create 22 6 0 10 -258113 -1 -1; #X obj 316 76 r \$0-create; #X obj 123 50 r \$0-listen; @@ -12,7 +12,7 @@ #X obj 316 98 t b b b b b; #X obj 199 217 s \$0-listen; #X msg 199 191 0; -#N canvas 0 0 870 770 1002-anim 0; +#N canvas 0 22 870 770 \$0-anim 0; #X scalar mass 501.859 143.462 2 0 \;; #X scalar mass 385.528 207.845 3 0 \;; #X scalar mass 563.885 96.7994 4 0 \;; @@ -31,12 +31,10 @@ #X obj 352 137 symbol; #X msg 352 228 traverse \$1 \, bang; #X obj 86 27 inlet; -#X obj 143 326 tgl 15 0 empty empty poll 0 -6 0 8 -262144 -1 -1 1 1 +#X obj 400 35 tgl 15 0 empty empty poll 22 6 0 10 -262144 -1 -1 1 1 ; #X msg 400 160 \; \$1 clear \;; #X obj 464 376 r \$0-cnv; -#X obj 413 334 tgl 15 0 empty empty view 0 -6 0 8 -262144 -1 -1 0 1 -; #X obj 413 403 pack 0 s; #X msg 413 434 \; \$2 vis \$1; #X obj 59 376 metro 40; @@ -50,7 +48,7 @@ #X obj 334 305 r \$0-mass2; #X obj 293 283 r \$0-mass1; #X obj 203 159 s \$0-mass1; -#N canvas 0 0 591 644 look4mass2 0; +#N canvas 0 22 591 644 look4mass2 0; #X msg 228 199 next; #X obj 228 463 spigot; #X obj 228 386 pack 0 0; @@ -93,7 +91,7 @@ #X obj 165 67 t b b a a; #X msg 203 113 \$3; #X msg 236 113 \$4; -#N canvas 0 0 591 644 look4mass1 0; +#N canvas 0 22 591 644 look4mass1 0; #X msg 228 199 next; #X obj 228 463 spigot; #X obj 228 386 pack 0 0; @@ -162,43 +160,45 @@ #X msg 62 166 \$3; #X obj 62 283 set mass mob; #X obj 62 229 * 0; -#X connect 0 0 30 1; -#X connect 0 0 34 4; -#X connect 0 0 36 3; -#X connect 1 0 32 0; +#X obj 400 50 tgl 15 0 empty empty view 22 6 0 10 -262144 -1 -1 0 1 +; +#X connect 0 0 29 1; +#X connect 0 0 33 4; +#X connect 0 0 35 3; +#X connect 1 0 31 0; #X connect 3 0 7 0; #X connect 4 0 1 1; #X connect 6 0 5 0; #X connect 7 0 9 0; -#X connect 7 1 33 0; +#X connect 7 1 32 0; #X connect 7 2 17 0; #X connect 7 3 15 0; #X connect 7 4 6 0; #X connect 7 4 13 0; #X connect 9 0 8 0; #X connect 11 0 14 0; -#X connect 12 0 29 0; -#X connect 13 0 29 0; +#X connect 12 0 28 0; +#X connect 13 0 28 0; #X connect 15 0 21 0; #X connect 16 0 15 1; #X connect 16 0 17 1; #X connect 17 0 18 0; #X connect 18 0 0 0; #X connect 19 0 1 0; -#X connect 20 0 26 0; -#X connect 22 0 24 1; +#X connect 20 0 25 0; +#X connect 22 0 23 1; #X connect 23 0 24 0; -#X connect 24 0 25 0; -#X connect 26 0 27 0; -#X connect 29 0 11 0; -#X connect 32 0 38 0; -#X connect 32 1 35 0; -#X connect 33 0 28 0; -#X connect 35 0 34 0; -#X connect 36 0 40 1; -#X connect 37 0 36 0; -#X connect 38 0 39 0; -#X connect 38 1 37 0; -#X connect 39 0 41 0; -#X connect 41 0 40 0; -#X coords 0 0 1 1 120 80 1; +#X connect 25 0 26 0; +#X connect 28 0 11 0; +#X connect 31 0 37 0; +#X connect 31 1 34 0; +#X connect 32 0 27 0; +#X connect 34 0 33 0; +#X connect 35 0 39 1; +#X connect 36 0 35 0; +#X connect 37 0 38 0; +#X connect 37 1 36 0; +#X connect 38 0 40 0; +#X connect 40 0 39 0; +#X connect 41 0 23 0; +#X coords 0 -1 1 1 120 65 1 400 0; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data: [9633] trunk/externals/nusmuk/msd
by nimon＠users.sourceforge.net 28 Mar '08

28 Mar '08

Revision: 9633 http://pure-data.svn.sourceforge.net/pure-data/?rev=9633&view=rev Author: nimon Date: 2008-03-27 16:37:34 -0700 (Thu, 27 Mar 2008) Log Message: ----------- examples modified -This line, and those below, will be ignored-- D msd/filet.pd M msd/02_msdstring.pd Modified Paths: -------------- trunk/externals/nusmuk/msd/02_msdstring.pd Removed Paths: ------------- trunk/externals/nusmuk/msd/filet.pd Modified: trunk/externals/nusmuk/msd/02_msdstring.pd =================================================================== --- trunk/externals/nusmuk/msd/02_msdstring.pd 2008-03-27 23:25:08 UTC (rev 9632) +++ trunk/externals/nusmuk/msd/02_msdstring.pd 2008-03-27 23:37:34 UTC (rev 9633) @@ -1,91 +1,323 @@ -#N canvas 489 48 887 847 10; -#X obj 53 15 loadbang; -#X obj 299 517 print msd; -#X obj 52 490 msd --------------------------------; -#X obj 52 243 tgl 25 0 empty empty empty 0 -6 0 8 -262144 -1 -1 1 1 -; -#X text 83 242 ON / OFF; -#X obj 45 305 cnv 15 700 60 empty empty empty 20 12 0 14 -261689 -66577 -0; -#X obj 52 312 metro 50; -#X text 474 328 COMPUTE AND GET MASSES POSITIONS; -#X obj 151 28 cnv 15 595 270 empty empty empty 20 12 0 14 -262131 -66577 -0; -#X obj 167 274 t a; -#X obj 167 33 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262131 -1 +#N canvas 518 31 480 222 10; +#X obj 24 54 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262131 -1 -1; -#X msg 253 78 reset; -#X msg 218 153 mass mob 1 \$1 \$2; -#X msg 201 181 Xmax 100 \, Xmin 0; -#X msg 235 104 mass fix 0 100 80; -#X msg 218 129 100 65 \, 100 50 \, 100 35 \, 100 20; -#X obj 46 380 cnv 15 700 90 empty empty empty 20 12 0 14 -262131 -66577 -0; -#X text 455 399 SET RIGIDITY AND VISCOSITY OF LINKS; -#X text 455 438 ADD FORCE ON ALL MOBILE MASSES; -#X msg 184 153 0; -#X obj 45 576 cnv 15 300 200 empty empty empty 20 12 0 14 -261689 -66577 -0; -#X obj 88 590 vsl 15 128 0 100 0 0 empty empty empty 0 -8 0 8 -261689 --1 -1 6955 1; -#X obj 111 590 vsl 15 128 0 100 0 0 empty empty empty 0 -8 0 8 -261689 --1 -1 5050 1; -#X obj 66 590 vsl 15 128 0 100 0 0 empty empty empty 0 -8 0 8 -261689 --1 -1 8860 1; -#X msg 52 736 posX fix \$1; -#X obj 156 590 vsl 15 128 0 100 0 0 empty empty empty 0 -8 0 8 -261689 --1 -1 1240 1; -#X obj 134 590 vsl 15 128 0 100 0 0 empty empty empty 0 -8 0 8 -261689 --1 -1 3145 1; -#X text 199 638 MOVE FIRST SLIDER; -#X text 182 662 TO MOVE THE FIXED MASS; -#X msg 66 438 forceX mob 300; -#X msg 180 438 forceX mob -300; -#X obj 167 55 t b b b b b b; -#X text 205 34 RESET; -#X obj 52 523 route massesPosL; -#X msg 52 335 bang \, massesPosL; -#X obj 52 545 unpack f f f f f; -#X text 490 126 CREATION : 5 MASSES \, 1 iLINK; -#X msg 66 384 setK inter 1; -#X msg 66 406 setK inter 2; -#X msg 176 385 setD inter 0.01; -#X msg 176 407 setD inter 1; -#X msg 184 223 link inter fix mob 10 10; -#X connect 0 0 31 0; -#X connect 2 0 33 0; -#X connect 2 1 1 0; +#X text 49 54 reset; +#N canvas 0 22 454 304 creation_structure 0; +#X obj 52 15 loadbang; +#X obj 135 20 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262131 -1 +-1; +#X msg 193 65 reset; +#X text 173 21 reset; +#N canvas 77 152 608 525 masses 0; +#X obj 109 15 inlet; +#X obj 112 338 outlet; +#X obj 200 343 print; +#X obj 112 64 t b b b b; +#X obj 150 158 until 17; +#X msg 150 184 mass corde 1 50 0; +#X msg 112 276 mass zero 0 1 0; +#X msg 150 134 80; +#X text 232 275 masse nulle pour l'amortissement general; +#X text 302 90 extremite gauche no 0; +#X text 283 184 masses mobiles no 1->80; +#X text 278 220 extremite droite no 81; +#X msg 170 89 mass corde 0 100 0; +#X msg 131 218 mass corde 0 100 0; +#X connect 0 0 3 0; #X connect 3 0 6 0; -#X connect 6 0 34 0; -#X connect 9 0 2 0; -#X connect 10 0 31 0; -#X connect 11 0 9 0; -#X connect 12 0 9 0; -#X connect 13 0 9 0; -#X connect 14 0 9 0; -#X connect 15 0 12 0; -#X connect 19 0 3 0; -#X connect 23 0 24 0; -#X connect 24 0 2 0; -#X connect 29 0 2 0; -#X connect 30 0 2 0; -#X connect 31 0 3 0; -#X connect 31 1 19 0; -#X connect 31 1 41 0; -#X connect 31 2 13 0; -#X connect 31 3 15 0; -#X connect 31 4 14 0; -#X connect 31 5 11 0; -#X connect 33 0 35 0; -#X connect 33 1 1 0; -#X connect 34 0 2 0; -#X connect 35 0 23 0; -#X connect 35 1 21 0; -#X connect 35 2 22 0; -#X connect 35 3 26 0; -#X connect 35 4 25 0; -#X connect 37 0 2 0; -#X connect 38 0 2 0; -#X connect 39 0 2 0; -#X connect 40 0 2 0; -#X connect 41 0 9 0; +#X connect 3 1 13 0; +#X connect 3 2 7 0; +#X connect 3 3 12 0; +#X connect 4 0 5 0; +#X connect 5 0 1 0; +#X connect 6 0 1 0; +#X connect 7 0 4 0; +#X connect 12 0 1 0; +#X connect 13 0 1 0; +#X restore 173 87 pd masses; +#N canvas 579 114 813 597 link 0; +#X obj 157 35 inlet; +#X obj 185 490 outlet; +#X msg 176 320 link souple \$1 \$2 10 10; +#X obj 236 210 + 1; +#X obj 176 293 pack f f; +#X obj 253 493 print; +#X obj 176 241 t f f f; +#X obj 176 212 f 0; +#X obj 157 64 t b b b b; +#X text 305 254 liens entre les masses mobiles; +#X text 384 406 tlink qui fait un amortissement vertical general; +#X obj 386 323 s rigidite; +#X msg 386 300 10; +#X msg 157 403 link D2 zero corde 0 0; +#X msg 266 169 0; +#X obj 203 269 + 1; +#X obj 176 188 until; +#X floatatom 267 251 5 0 0 0 - - -; +#X msg 176 165 81; +#X obj 467 324 s amort; +#X connect 0 0 8 0; +#X connect 2 0 1 0; +#X connect 3 0 7 1; +#X connect 4 0 2 0; +#X connect 6 0 4 0; +#X connect 6 1 15 0; +#X connect 6 2 3 0; +#X connect 7 0 6 0; +#X connect 7 0 17 0; +#X connect 8 0 12 0; +#X connect 8 0 13 0; +#X connect 8 1 18 0; +#X connect 8 2 14 0; +#X connect 12 0 11 0; +#X connect 12 0 19 0; +#X connect 13 0 1 0; +#X connect 14 0 7 1; +#X connect 15 0 4 1; +#X connect 16 0 7 0; +#X connect 18 0 16 0; +#X restore 154 111 pd link; +#X obj 135 42 t b b b b; +#X text 252 82 CREATION : 2 masses fixes (fix) \, 80 mobiles (corde) +\, 80 liens (souple) \, 78 tLink (D2); +#X obj 135 160 s msdin; +#X msg 135 132 Xmax 100 \, Xmin -100; +#X obj 247 23 inlet; +#X obj 121 213 loadbang; +#X obj 121 237 s load; +#X connect 0 0 6 0; +#X connect 1 0 6 0; +#X connect 2 0 8 0; +#X connect 4 0 8 0; +#X connect 5 0 8 0; +#X connect 6 0 9 0; +#X connect 6 1 5 0; +#X connect 6 2 4 0; +#X connect 6 3 2 0; +#X connect 9 0 8 0; +#X connect 10 0 6 0; +#X connect 11 0 12 0; +#X restore 24 76 pd creation_structure; +#N canvas 508 227 516 328 compute 0; +#X obj 274 162 print msd; +#X obj 27 30 gemhead; +#N canvas 735 244 537 479 corde 0; +#X obj 139 41 inlet; +#X obj 81 333 translateXYZ; +#X obj 139 167 / 12.5; +#X obj 139 190 - 4; +#X obj 81 307 separator; +#X obj 139 238 t b f; +#X obj 81 273 gemhead 45; +#X obj 204 188 / 0.2; +#X obj 139 106 unpack f f; +#X msg 81 238 0; +#X obj 81 213 loadbang; +#X obj 81 369 color 1 1 1; +#X obj 139 139 + 10; +#X obj 81 398 cube 0.02; +#X obj 139 80 route 82; +#X connect 0 0 14 0; +#X connect 1 0 11 0; +#X connect 2 0 3 0; +#X connect 3 0 5 0; +#X connect 4 0 1 0; +#X connect 5 0 6 0; +#X connect 5 1 1 1; +#X connect 6 0 4 0; +#X connect 7 0 1 2; +#X connect 8 0 12 0; +#X connect 8 1 7 0; +#X connect 9 0 6 0; +#X connect 10 0 9 0; +#X connect 11 0 13 0; +#X connect 12 0 2 0; +#X connect 14 1 8 0; +#X restore 27 252 pd corde; +#N canvas 643 123 605 590 vitesse 0; +#X obj 127 22 inlet; +#X obj 62 333 translateXYZ; +#X obj 129 200 / 12.5; +#X obj 129 223 - 4; +#X obj 62 307 separator; +#X obj 129 250 t b f; +#X obj 62 280 gemhead 45; +#X obj 62 398 cube 0.01; +#X obj 431 25 inlet; +#X obj 236 46 spigot; +#X obj 195 216 + 2; +#X obj 78 81 route 82; +#X obj 129 107 unpack f f; +#X obj 62 232 loadbang; +#X msg 62 256 0; +#X obj 129 172 + 10; +#X obj 195 193 * 200; +#X obj 62 369 color 1 0 0; +#X connect 0 0 9 0; +#X connect 1 0 17 0; +#X connect 2 0 3 0; +#X connect 3 0 5 0; +#X connect 4 0 1 0; +#X connect 5 0 6 0; +#X connect 5 1 1 1; +#X connect 6 0 4 0; +#X connect 8 0 9 1; +#X connect 9 0 11 0; +#X connect 10 0 1 2; +#X connect 11 1 12 0; +#X connect 12 0 15 0; +#X connect 12 1 16 0; +#X connect 13 0 14 0; +#X connect 14 0 6 0; +#X connect 15 0 2 0; +#X connect 16 0 10 0; +#X connect 17 0 7 0; +#X restore 121 239 pd vitesse; +#X obj 186 219 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 +1; +#X obj 27 136 msd --------------------------------; +#X obj 95 100 r msdin; +#X obj 27 53 t b b b b b b b; +#X obj 27 195 route massesPos massesSpeeds massesForces; +#X text 208 240 Afficher les vitesses en haut; +#X text 310 279 Afficher les forces en bas; +#X obj 379 185 inlet; +#X obj 355 119 gemhead; +#X obj 355 142 world_light; +#N canvas 643 123 605 590 forces 0; +#X obj 53 99 inlet; +#X obj 60 377 translateXYZ; +#X obj 139 260 / 12.5; +#X obj 139 283 - 4; +#X obj 204 261 / 12.5; +#X obj 60 351 separator; +#X obj 137 310 t b f; +#X obj 60 325 gemhead 45; +#X obj 60 434 cube 0.02; +#X obj 111 99 inlet; +#X obj 53 129 spigot; +#X obj 60 284 loadbang; +#X msg 60 306 0; +#X obj 139 207 unpack f f; +#X obj 139 232 + 10; +#X obj 204 284 - 2; +#X obj 53 180 route 0 81 82; +#X obj 204 239 * 400; +#X obj 60 405 color 0 1 0; +#X connect 0 0 10 0; +#X connect 1 0 18 0; +#X connect 2 0 3 0; +#X connect 3 0 6 0; +#X connect 4 0 15 0; +#X connect 5 0 1 0; +#X connect 6 0 7 0; +#X connect 6 1 1 1; +#X connect 7 0 5 0; +#X connect 9 0 10 1; +#X connect 10 0 16 0; +#X connect 11 0 12 0; +#X connect 12 0 7 0; +#X connect 13 0 14 0; +#X connect 13 1 17 0; +#X connect 14 0 2 0; +#X connect 15 0 1 2; +#X connect 16 3 13 0; +#X connect 17 0 4 0; +#X connect 18 0 8 0; +#X restore 215 278 pd forces; +#X msg 27 75 bang \, get massesPos \, get massesSpeeds \, get massesForces +; +#X connect 1 0 7 0; +#X connect 4 0 3 1; +#X connect 5 0 8 0; +#X connect 5 1 0 0; +#X connect 6 0 5 0; +#X connect 7 0 15 0; +#X connect 7 1 5 0; +#X connect 7 2 5 0; +#X connect 7 3 5 0; +#X connect 7 4 5 0; +#X connect 7 5 5 0; +#X connect 7 6 5 0; +#X connect 8 0 2 0; +#X connect 8 1 3 0; +#X connect 8 2 14 0; +#X connect 11 0 14 1; +#X connect 11 0 3 1; +#X connect 12 0 13 0; +#X connect 15 0 5 0; +#X restore 24 165 pd compute; +#X obj 24 143 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1 +1; +#X obj 307 151 hsl 128 15 0 30 0 0 empty empty empty -2 -6 0 8 -262144 +-1 -1 0 1; +#X text 303 134 Amortissement general; +#X obj 307 93 hsl 128 15 0 127 0 0 empty empty empty -2 -6 0 8 -262144 +-1 -1 0 1; +#N canvas 0 22 611 439 milieu 0; +#X obj 174 107 / 120; +#X obj 174 84 inlet; +#X msg 173 258 forceX \$1 \$2; +#X msg 174 135 41 \$1 \, 42 \$1; +#X obj 191 161 / 1.5; +#X msg 191 185 39 \$1 \, 40 \$1 \, 43 \$1 \, 44 \$1; +#X msg 206 231 36 \$1 \, 37 \$1 \, 38 \$1 \, 45 \$1 \, 46 \$1 \, 47 +\$1; +#X obj 206 207 / 3; +#X obj 173 286 s msdin; +#X connect 0 0 3 0; +#X connect 0 0 4 0; +#X connect 0 0 7 0; +#X connect 1 0 0 0; +#X connect 2 0 8 0; +#X connect 3 0 2 0; +#X connect 4 0 5 0; +#X connect 5 0 2 0; +#X connect 6 0 2 0; +#X connect 7 0 6 0; +#X restore 304 116 pd milieu; +#N canvas 0 22 450 300 gem 0; +#X obj 179 135 gemwin; +#X msg 198 113 0 \, destroy; +#X msg 179 90 reset \, create \, lighting 1 \, 1; +#X obj 179 39 inlet; +#X obj 179 68 sel 1 0; +#X connect 1 0 0 0; +#X connect 2 0 0 0; +#X connect 3 0 4 0; +#X connect 4 0 2 0; +#X connect 4 1 1 0; +#X restore 24 118 pd gem; +#X obj 24 99 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1 1 +; +#X text 44 142 display forces (green) and speeds (red); +#N canvas 0 22 450 300 forces 0; +#X obj 167 157 s msdin; +#X msg 167 134 forceX corde \$1; +#X obj 167 89 inlet; +#X obj 167 112 / 300; +#X connect 1 0 0 0; +#X connect 2 0 3 0; +#X connect 3 0 1 0; +#X restore 304 56 pd forces; +#X obj 307 34 hsl 128 15 0 127 0 0 empty empty empty -2 -6 0 8 -262144 +-1 -1 2500 1; +#N canvas 0 22 450 300 general_damping 0; +#X msg 172 143 setD D2 \$1; +#X obj 172 166 s msdin; +#X obj 172 121 / 5; +#X obj 173 100 inlet; +#X connect 0 0 1 0; +#X connect 2 0 0 0; +#X connect 3 0 2 0; +#X restore 304 171 pd general_damping; +#X text 302 74 Send forces in the middle; +#X text 302 16 Send forces; +#X text 45 98 gem on/off; +#X text 24 20 1D string model; +#X connect 0 0 2 0; +#X connect 4 0 3 0; +#X connect 5 0 14 0; +#X connect 7 0 8 0; +#X connect 10 0 9 0; +#X connect 13 0 12 0; Deleted: trunk/externals/nusmuk/msd/filet.pd =================================================================== --- trunk/externals/nusmuk/msd/filet.pd 2008-03-27 23:25:08 UTC (rev 9632) +++ trunk/externals/nusmuk/msd/filet.pd 2008-03-27 23:37:34 UTC (rev 9633) @@ -1,110 +0,0 @@ -#N canvas 543 268 669 547 10; -#X obj 54 407 outlet; -#X obj 152 71 f \$5; -#X obj 188 72 f \$6; -#X obj 115 17 loadbang; -#X obj 46 134 repeat 0; -#X obj 172 101 *; -#X obj 130 45 t b b b b; -#X obj 46 164 f -1; -#X obj 46 188 + 1; -#X msg 297 77 -1; -#X obj 46 211 t f f; -#X obj 46 50 inlet; -#X obj 297 28 select reset; -#X obj 297 5 inlet; -#X obj 46 89 t b b; -#X obj 330 175 repeat 0; -#X obj 330 197 f -1; -#X obj 330 218 + 1; -#X obj 381 153 - 1; -#X obj 387 340 moses; -#X obj 46 280 + \$1; -#X obj 176 278 + \$2; -#X obj 46 234 mod \$6; -#X obj 176 234 div \$6; -#X obj 414 314 - 1; -#X obj 357 297 mod \$6; -#X obj 474 300 div \$6; -#X obj 366 396 + 1; -#X obj 336 432 pack f f; -#X obj 344 59 t b b; -#X obj 375 370 t b; -#X obj 334 391 f; -#X obj 330 253 t f f f f; -#X obj 494 339 moses; -#X obj 443 431 pack f f; -#X obj 482 369 t b; -#X obj 441 390 f; -#X obj 473 395 + \$6; -#X obj 521 313 - 1; -#X obj 46 257 * \$3; -#X obj 176 256 * \$4; -#X msg 335 468 link fil \$1 \$2 10 10; -#X obj 150 323 pack f f 50; -#X obj 228 269 loadbang; -#X obj 230 300 f \$7; -#X msg 54 359 mass filet 1 \$3 \$1 \$2 0; -#X text 325 106 Filet abstraction : x0 y0 stepx stepy ny nx M; -#X connect 1 0 5 0; -#X connect 1 0 38 0; -#X connect 2 0 5 1; -#X connect 2 0 24 0; -#X connect 3 0 6 0; -#X connect 4 0 7 0; -#X connect 5 0 4 1; -#X connect 5 0 18 0; -#X connect 6 2 1 0; -#X connect 6 3 2 0; -#X connect 6 3 9 0; -#X connect 7 0 8 0; -#X connect 8 0 7 1; -#X connect 8 0 10 0; -#X connect 9 0 7 1; -#X connect 9 0 16 1; -#X connect 10 0 22 0; -#X connect 10 1 23 0; -#X connect 11 0 14 0; -#X connect 12 0 9 0; -#X connect 12 0 29 0; -#X connect 13 0 12 0; -#X connect 14 0 15 0; -#X connect 14 1 4 0; -#X connect 15 0 16 0; -#X connect 16 0 17 0; -#X connect 17 0 16 1; -#X connect 17 0 32 0; -#X connect 18 0 15 1; -#X connect 19 0 30 0; -#X connect 20 0 42 0; -#X connect 21 0 42 1; -#X connect 22 0 39 0; -#X connect 23 0 40 0; -#X connect 24 0 19 1; -#X connect 25 0 19 0; -#X connect 26 0 33 0; -#X connect 27 0 28 1; -#X connect 28 0 41 0; -#X connect 29 0 1 0; -#X connect 29 1 2 0; -#X connect 30 0 31 0; -#X connect 31 0 28 0; -#X connect 32 0 25 0; -#X connect 32 1 27 0; -#X connect 32 1 31 1; -#X connect 32 2 26 0; -#X connect 32 3 37 0; -#X connect 32 3 36 1; -#X connect 33 0 35 0; -#X connect 34 0 41 0; -#X connect 35 0 36 0; -#X connect 36 0 34 0; -#X connect 37 0 34 1; -#X connect 38 0 33 1; -#X connect 39 0 20 0; -#X connect 40 0 21 0; -#X connect 41 0 0 0; -#X connect 42 0 45 0; -#X connect 43 0 44 0; -#X connect 44 0 42 2; -#X connect 45 0 0 0; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data: [9632] trunk/externals/nusmuk/msd
by nimon＠users.sourceforge.net 28 Mar '08

28 Mar '08

Revision: 9632 http://pure-data.svn.sourceforge.net/pure-data/?rev=9632&view=rev Author: nimon Date: 2008-03-27 16:25:08 -0700 (Thu, 27 Mar 2008) Log Message: ----------- Modified Paths: -------------- trunk/externals/nusmuk/msd/03_msdwave.pd Added Paths: ----------- trunk/externals/nusmuk/msd/02_msdstring.pd Removed Paths: ------------- trunk/externals/nusmuk/msd/02_imsdtest.pd Deleted: trunk/externals/nusmuk/msd/02_imsdtest.pd =================================================================== --- trunk/externals/nusmuk/msd/02_imsdtest.pd 2008-03-27 22:21:58 UTC (rev 9631) +++ trunk/externals/nusmuk/msd/02_imsdtest.pd 2008-03-27 23:25:08 UTC (rev 9632) @@ -1,91 +0,0 @@ -#N canvas 489 48 887 847 10; -#X obj 53 15 loadbang; -#X obj 299 517 print msd; -#X obj 52 490 msd --------------------------------; -#X obj 52 243 tgl 25 0 empty empty empty 0 -6 0 8 -262144 -1 -1 1 1 -; -#X text 83 242 ON / OFF; -#X obj 45 305 cnv 15 700 60 empty empty empty 20 12 0 14 -261689 -66577 -0; -#X obj 52 312 metro 50; -#X text 474 328 COMPUTE AND GET MASSES POSITIONS; -#X obj 151 28 cnv 15 595 270 empty empty empty 20 12 0 14 -262131 -66577 -0; -#X obj 167 274 t a; -#X obj 167 33 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262131 -1 --1; -#X msg 253 78 reset; -#X msg 218 153 mass mob 1 \$1 \$2; -#X msg 201 181 Xmax 100 \, Xmin 0; -#X msg 235 104 mass fix 0 100 80; -#X msg 218 129 100 65 \, 100 50 \, 100 35 \, 100 20; -#X obj 46 380 cnv 15 700 90 empty empty empty 20 12 0 14 -262131 -66577 -0; -#X text 455 399 SET RIGIDITY AND VISCOSITY OF LINKS; -#X text 455 438 ADD FORCE ON ALL MOBILE MASSES; -#X msg 184 153 0; -#X obj 45 576 cnv 15 300 200 empty empty empty 20 12 0 14 -261689 -66577 -0; -#X obj 88 590 vsl 15 128 0 100 0 0 empty empty empty 0 -8 0 8 -261689 --1 -1 6955 1; -#X obj 111 590 vsl 15 128 0 100 0 0 empty empty empty 0 -8 0 8 -261689 --1 -1 5050 1; -#X obj 66 590 vsl 15 128 0 100 0 0 empty empty empty 0 -8 0 8 -261689 --1 -1 8860 1; -#X msg 52 736 posX fix \$1; -#X obj 156 590 vsl 15 128 0 100 0 0 empty empty empty 0 -8 0 8 -261689 --1 -1 1240 1; -#X obj 134 590 vsl 15 128 0 100 0 0 empty empty empty 0 -8 0 8 -261689 --1 -1 3145 1; -#X text 199 638 MOVE FIRST SLIDER; -#X text 182 662 TO MOVE THE FIXED MASS; -#X msg 66 438 forceX mob 300; -#X msg 180 438 forceX mob -300; -#X obj 167 55 t b b b b b b; -#X text 205 34 RESET; -#X obj 52 523 route massesPosL; -#X msg 52 335 bang \, massesPosL; -#X obj 52 545 unpack f f f f f; -#X text 490 126 CREATION : 5 MASSES \, 1 iLINK; -#X msg 66 384 setK inter 1; -#X msg 66 406 setK inter 2; -#X msg 176 385 setD inter 0.01; -#X msg 176 407 setD inter 1; -#X msg 184 223 link inter fix mob 10 10; -#X connect 0 0 31 0; -#X connect 2 0 33 0; -#X connect 2 1 1 0; -#X connect 3 0 6 0; -#X connect 6 0 34 0; -#X connect 9 0 2 0; -#X connect 10 0 31 0; -#X connect 11 0 9 0; -#X connect 12 0 9 0; -#X connect 13 0 9 0; -#X connect 14 0 9 0; -#X connect 15 0 12 0; -#X connect 19 0 3 0; -#X connect 23 0 24 0; -#X connect 24 0 2 0; -#X connect 29 0 2 0; -#X connect 30 0 2 0; -#X connect 31 0 3 0; -#X connect 31 1 19 0; -#X connect 31 1 41 0; -#X connect 31 2 13 0; -#X connect 31 3 15 0; -#X connect 31 4 14 0; -#X connect 31 5 11 0; -#X connect 33 0 35 0; -#X connect 33 1 1 0; -#X connect 34 0 2 0; -#X connect 35 0 23 0; -#X connect 35 1 21 0; -#X connect 35 2 22 0; -#X connect 35 3 26 0; -#X connect 35 4 25 0; -#X connect 37 0 2 0; -#X connect 38 0 2 0; -#X connect 39 0 2 0; -#X connect 40 0 2 0; -#X connect 41 0 9 0; Copied: trunk/externals/nusmuk/msd/02_msdstring.pd (from rev 9628, trunk/externals/nusmuk/msd/02_imsdtest.pd) =================================================================== --- trunk/externals/nusmuk/msd/02_msdstring.pd (rev 0) +++ trunk/externals/nusmuk/msd/02_msdstring.pd 2008-03-27 23:25:08 UTC (rev 9632) @@ -0,0 +1,91 @@ +#N canvas 489 48 887 847 10; +#X obj 53 15 loadbang; +#X obj 299 517 print msd; +#X obj 52 490 msd --------------------------------; +#X obj 52 243 tgl 25 0 empty empty empty 0 -6 0 8 -262144 -1 -1 1 1 +; +#X text 83 242 ON / OFF; +#X obj 45 305 cnv 15 700 60 empty empty empty 20 12 0 14 -261689 -66577 +0; +#X obj 52 312 metro 50; +#X text 474 328 COMPUTE AND GET MASSES POSITIONS; +#X obj 151 28 cnv 15 595 270 empty empty empty 20 12 0 14 -262131 -66577 +0; +#X obj 167 274 t a; +#X obj 167 33 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262131 -1 +-1; +#X msg 253 78 reset; +#X msg 218 153 mass mob 1 \$1 \$2; +#X msg 201 181 Xmax 100 \, Xmin 0; +#X msg 235 104 mass fix 0 100 80; +#X msg 218 129 100 65 \, 100 50 \, 100 35 \, 100 20; +#X obj 46 380 cnv 15 700 90 empty empty empty 20 12 0 14 -262131 -66577 +0; +#X text 455 399 SET RIGIDITY AND VISCOSITY OF LINKS; +#X text 455 438 ADD FORCE ON ALL MOBILE MASSES; +#X msg 184 153 0; +#X obj 45 576 cnv 15 300 200 empty empty empty 20 12 0 14 -261689 -66577 +0; +#X obj 88 590 vsl 15 128 0 100 0 0 empty empty empty 0 -8 0 8 -261689 +-1 -1 6955 1; +#X obj 111 590 vsl 15 128 0 100 0 0 empty empty empty 0 -8 0 8 -261689 +-1 -1 5050 1; +#X obj 66 590 vsl 15 128 0 100 0 0 empty empty empty 0 -8 0 8 -261689 +-1 -1 8860 1; +#X msg 52 736 posX fix \$1; +#X obj 156 590 vsl 15 128 0 100 0 0 empty empty empty 0 -8 0 8 -261689 +-1 -1 1240 1; +#X obj 134 590 vsl 15 128 0 100 0 0 empty empty empty 0 -8 0 8 -261689 +-1 -1 3145 1; +#X text 199 638 MOVE FIRST SLIDER; +#X text 182 662 TO MOVE THE FIXED MASS; +#X msg 66 438 forceX mob 300; +#X msg 180 438 forceX mob -300; +#X obj 167 55 t b b b b b b; +#X text 205 34 RESET; +#X obj 52 523 route massesPosL; +#X msg 52 335 bang \, massesPosL; +#X obj 52 545 unpack f f f f f; +#X text 490 126 CREATION : 5 MASSES \, 1 iLINK; +#X msg 66 384 setK inter 1; +#X msg 66 406 setK inter 2; +#X msg 176 385 setD inter 0.01; +#X msg 176 407 setD inter 1; +#X msg 184 223 link inter fix mob 10 10; +#X connect 0 0 31 0; +#X connect 2 0 33 0; +#X connect 2 1 1 0; +#X connect 3 0 6 0; +#X connect 6 0 34 0; +#X connect 9 0 2 0; +#X connect 10 0 31 0; +#X connect 11 0 9 0; +#X connect 12 0 9 0; +#X connect 13 0 9 0; +#X connect 14 0 9 0; +#X connect 15 0 12 0; +#X connect 19 0 3 0; +#X connect 23 0 24 0; +#X connect 24 0 2 0; +#X connect 29 0 2 0; +#X connect 30 0 2 0; +#X connect 31 0 3 0; +#X connect 31 1 19 0; +#X connect 31 1 41 0; +#X connect 31 2 13 0; +#X connect 31 3 15 0; +#X connect 31 4 14 0; +#X connect 31 5 11 0; +#X connect 33 0 35 0; +#X connect 33 1 1 0; +#X connect 34 0 2 0; +#X connect 35 0 23 0; +#X connect 35 1 21 0; +#X connect 35 2 22 0; +#X connect 35 3 26 0; +#X connect 35 4 25 0; +#X connect 37 0 2 0; +#X connect 38 0 2 0; +#X connect 39 0 2 0; +#X connect 40 0 2 0; +#X connect 41 0 9 0; Modified: trunk/externals/nusmuk/msd/03_msdwave.pd =================================================================== --- trunk/externals/nusmuk/msd/03_msdwave.pd 2008-03-27 22:21:58 UTC (rev 9631) +++ trunk/externals/nusmuk/msd/03_msdwave.pd 2008-03-27 23:25:08 UTC (rev 9632) @@ -1,152 +1,232 @@ -#N canvas 820 22 951 769 10; -#X obj 32 13 loadbang; -#X obj 603 265 gemwin; -#X msg 603 243 0 \, destroy; -#X obj 602 291 gemhead; -#X obj 602 355 world_light; -#X obj 145 226 t a; -#X obj 145 12 bng 20 250 50 0 empty empty empty 0 -6 0 8 -262131 -1 +#N canvas 360 104 602 232 10; +#X obj 29 20 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1 -1; -#X msg 203 63 reset; -#X obj 33 298 gemhead; -#N canvas 721 124 609 594 massrender 0; -#X obj 127 22 inlet; -#X obj 48 203 translateXYZ; -#X obj 48 177 separator; -#X obj 127 136 t b f; -#X obj 127 57 unpack f f f; -#X obj 48 154 gemhead 45; -#X obj 48 283 cuboid 0.005 0.15 0.08; -#X obj 48 239 color 0.8 0.8 0.8; -#X obj 48 90 loadbang; -#X msg 48 118 0; -#X connect 0 0 4 0; -#X connect 1 0 7 0; -#X connect 2 0 1 0; -#X connect 3 0 5 0; -#X connect 3 1 1 1; -#X connect 4 0 3 0; -#X connect 4 1 1 2; -#X connect 4 2 6 3; -#X connect 5 0 2 0; -#X connect 7 0 6 0; +#X text 49 19 Reset; +#X obj 202 27 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1 +-1; +#N canvas 0 22 981 585 structure_creation 0; +#X msg 681 243 mass filet 1 100 0; +#X msg 663 64 reset; +#X obj 690 527 s msdin; +#X obj 418 25 t b b b b b b b b b b b b; +#X obj 681 201 until; +#X msg 681 170 400; +#X msg 561 378 link fil \$1 \$2 10 1; +#X msg 561 174 380; +#X obj 561 206 until; +#X obj 561 245 f 0; +#X obj 609 261 + 1; +#X msg 618 226 0; +#X obj 636 312 + 20; +#X obj 561 339 pack f f; +#X obj 561 288 t f f; +#X msg 397 151 400; +#X obj 397 189 until; +#X obj 397 231 f 0; +#X obj 445 247 + 1; +#X msg 454 212 0; +#X obj 397 292 t f f; +#X obj 452 325 mod 20; +#X obj 452 355 != 19; +#X obj 397 393 spigot; +#X obj 397 475 pack f f; +#X obj 397 424 t f f; +#X obj 472 448 + 1; +#X msg 397 505 link fil \$1 \$2 10 1; +#X msg 403 107 setFixed 0 \, setFixed 19 \, setFixed 380 \, setFixed +399; +#X obj 418 -8 inlet; +#X obj 326 61 loadbang; +#X connect 0 0 2 0; +#X connect 1 0 2 0; +#X connect 3 5 28 0; +#X connect 3 6 15 0; +#X connect 3 7 19 0; +#X connect 3 8 7 0; +#X connect 3 9 11 0; +#X connect 3 10 5 0; +#X connect 3 11 1 0; +#X connect 4 0 0 0; +#X connect 5 0 4 0; +#X connect 6 0 2 0; +#X connect 7 0 8 0; #X connect 8 0 9 0; -#X connect 9 0 5 0; -#X restore 274 531 pd massrender; -#X msg 203 83 symbol reset; -#X text 793 205 Select view; -#X obj 145 38 t b b b b; -#X obj 63 403 msd -------------; -#X obj 425 423 msd2D --------------------------------; -#X obj 305 254 route mass; -#X msg 305 275 mass msd1 \$1 \$2 \$5; -#X obj 145 253 route mass; -#X msg 145 274 mass msd2 \$1 \$2 \$3 \$4; -#X obj 425 443 route massesPos; -#X msg 33 343 bang \, get massesPos; -#X obj 33 321 t b b; -#X obj 274 506 pack f f f; -#X obj 63 427 route massesPosNo; -#X msg 421 523 get massesPos \$1; -#X obj 602 334 rotateXYZ; -#X obj 56 547 vsl 15 128 0 4 0 0 empty empty empty 0 -8 0 8 -262131 --1 -1 6200 1; -#X obj 75 547 vsl 15 128 0 4 0 0 empty empty empty 0 -8 0 8 -262131 --1 -1 6500 1; -#X obj 94 547 vsl 15 128 0 4 0 0 empty empty empty 0 -8 0 8 -262131 --1 -1 7600 1; -#X obj 112 547 vsl 15 128 0 4 0 0 empty empty empty 0 -8 0 8 -262131 --1 -1 6800 1; -#X msg 56 682 posX 0 \$1; -#X msg 603 138 reset \, dimen 800 800 \, create \, lighting 1 \, 1 +#X connect 9 0 10 0; +#X connect 9 0 14 0; +#X connect 10 0 9 1; +#X connect 11 0 9 1; +#X connect 12 0 13 1; +#X connect 13 0 6 0; +#X connect 14 0 13 0; +#X connect 14 1 12 0; +#X connect 15 0 16 0; +#X connect 16 0 17 0; +#X connect 17 0 18 0; +#X connect 17 0 20 0; +#X connect 18 0 17 1; +#X connect 19 0 17 1; +#X connect 20 0 23 0; +#X connect 20 1 21 0; +#X connect 21 0 22 0; +#X connect 22 0 23 1; +#X connect 23 0 25 0; +#X connect 24 0 27 0; +#X connect 25 0 24 0; +#X connect 25 1 26 0; +#X connect 26 0 24 1; +#X connect 27 0 2 0; +#X connect 28 0 2 0; +#X connect 29 0 3 0; +#X connect 30 0 3 0; +#X restore 29 39 pd structure_creation; +#N canvas 813 63 450 300 gem 0; +#X obj 114 171 gemwin; +#X msg 134 149 0 \, destroy; +#X msg 114 125 reset \, create \, 1 \, lighting 1; +#X obj 114 71 inlet; +#X obj 114 97 sel 1 0; +#X connect 1 0 0 0; +#X connect 2 0 0 0; +#X connect 3 0 4 0; +#X connect 4 0 2 0; +#X connect 4 1 1 0; +#X restore 30 85 pd gem; +#X obj 30 63 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0 1 ; -#X msg 145 173 Xmax 4 \, Xmin -4 \, Ymax 4 \, Ymin -4; -#X msg 145 199 Xmax 4 \, Xmin -4; -#X obj 603 161 t b; -#X msg 164 140 setFixed 0 \, setFixed 39 \, setFixed 760 \, setFixed -799; -#X msg 603 204 view 0 5 0 0 0 0 0 0 1; -#X msg 75 702 posX 39 \$1; -#X msg 94 722 posX 799 \$1; -#X msg 112 742 posX 760 \$1; -#X text 28 514 Move corners to send a wave!; -#X text 327 559 Each time a mass2D position is send \, the corresponding -z is asked to the 1D model.; -#X text 389 35 X-Y : 2D model; -#X text 389 49 Z : 1D model; -#X text 146 300 If it's a mass message : send XY to ms2D and Z to msd +#X text 200 -6 send forces; +#X text 200 7 on a row; +#N canvas 0 22 450 300 damping 0; +#X msg 151 90 setD fil \$1; +#X obj 151 113 s msdin; +#X obj 151 70 / 8; +#X obj 151 47 inlet; +#X connect 0 0 1 0; +#X connect 2 0 0 0; +#X connect 3 0 2 0; +#X restore 301 119 pd damping; +#X obj 304 100 hsl 128 15 0 127 0 0 empty empty empty -2 -8 0 10 -262144 +-1 -1 0 1; +#X text 300 79 change viscosity; +#N canvas 0 22 450 300 row 0; +#X msg 149 87 20; +#X obj 149 132 f 6; +#X obj 149 112 until; +#X obj 192 133 + 20; +#X msg 208 113 6; +#X obj 149 63 t b b; +#X msg 149 153 forceX \$1 30; +#X obj 149 183 s msdin; +#X obj 149 38 inlet; +#X connect 0 0 2 0; +#X connect 1 0 3 0; +#X connect 1 0 6 0; +#X connect 2 0 1 0; +#X connect 3 0 1 1; +#X connect 4 0 1 1; +#X connect 5 0 0 0; +#X connect 5 1 4 0; +#X connect 6 0 7 0; +#X connect 8 0 5 0; +#X restore 202 51 pd row; +#X obj 201 105 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 +-1 -1; +#X text 199 70 send forces; +#X text 50 63 Gem on/off; +#X obj 305 38 hsl 128 15 0 127 0 0 empty empty empty -2 -8 0 10 -262144 +-1 -1 0 1; +#X text 300 17 change rigidity; +#N canvas 0 22 450 300 rigi 0; +#X obj 151 113 s msdin; +#X obj 151 47 inlet; +#X obj 151 70 / 4; +#X msg 151 90 setK fil \$1; +#X connect 1 0 2 0; +#X connect 2 0 3 0; +#X connect 3 0 0 0; +#X restore 302 57 pd rigi; +#X text 199 83 on a point; +#N canvas 0 22 450 300 point 0; +#X obj 192 156 s msdin; +#X msg 192 123 forceX 10 100; +#X obj 193 95 inlet; +#X connect 1 0 0 0; +#X connect 2 0 1 0; +#X restore 201 126 pd point; +#X text 469 -9 move a corner; +#N canvas 0 22 450 300 corner 0; +#X msg 222 89 posX 0 \$1; +#X obj 222 65 / 30; +#X obj 222 115 s msdin; +#X obj 223 32 inlet; +#X connect 0 0 2 0; +#X connect 1 0 0 0; +#X connect 3 0 1 0; +#X restore 471 155 pd corner; +#X obj 471 17 vsl 15 128 0 127 0 0 empty empty empty 0 -9 0 10 -262144 +-1 -1 0 1; +#N canvas 696 124 709 588 compute 0; +#X obj 301 215 print msd; +#X obj 141 153 r msdin; +#X msg 126 130 bang \, get massesPos; +#X obj 126 27 gemhead; +#X obj 126 224 route massesPos; +#X obj 34 306 gemhead; +#X msg 34 268 0; +#X obj 126 290 unpack f f; +#X obj 34 539 translateXYZ; +#X obj 126 334 mod 20; +#X obj 126 389 - 3; +#X obj 126 363 * 0.3; +#X obj 126 257 t b a; +#X obj 197 326 / 20; +#X obj 197 356 int; +#X obj 197 383 * -0.3; +#X obj 197 410 + 3; +#X obj 34 238 loadbang; +#X obj 126 184 msd --------------; +#X obj 439 286 gemhead; +#X obj 439 349 light; +#X obj 439 318 translateXYZ 0 0 1; +#X obj 33 572 cube 0.08; +#X obj 126 58 t b b; +#X msg 171 97 bang \, bang \, bang \, bang \, bang \, bang \, bang ; -#X text 178 14 Reset; -#X text 304 228 800 masses / 1540 links for each model; -#X text 423 381 The 2D model is just here to help display masses and -test synchronization between msd objects; -#X obj 425 463 unpack f f f; -#X obj 91 462 unpack f f; -#X obj 481 502 f; -#X obj 425 485 t b f; -#X text 453 114 Filet abstraction : x0 y0 stepx stepy ny nx M; -#X msg 603 223 view 5 -1 0.5 0 0 0 0 0 1; -#X msg 621 311 45; -#X msg 650 311 45; -#X msg 603 185 view 0 0.5 6 0 0 0 0 1 0; -#X obj 183 113 filet -3.2 -3 0.1685 0.3 20 40 100; -#X connect 0 0 12 0; -#X connect 2 0 1 0; -#X connect 3 0 25 0; -#X connect 5 0 15 0; -#X connect 5 0 17 0; -#X connect 6 0 12 0; -#X connect 7 0 5 0; -#X connect 8 0 21 0; -#X connect 10 0 57 1; -#X connect 12 0 32 0; -#X connect 12 0 33 0; -#X connect 12 1 35 0; -#X connect 12 2 57 0; -#X connect 12 3 7 0; -#X connect 12 3 10 0; -#X connect 13 0 23 0; -#X connect 14 0 19 0; +#X obj 34 443 translateXYZ 0 0 -2; +#X obj 34 477 rotateXYZ 0 20 0; +#X connect 1 0 18 0; +#X connect 2 0 18 0; +#X connect 3 0 23 0; +#X connect 4 0 12 0; +#X connect 5 0 25 0; +#X connect 6 0 5 0; +#X connect 7 0 9 0; +#X connect 7 0 13 0; +#X connect 7 1 8 3; +#X connect 8 0 22 0; +#X connect 9 0 11 0; +#X connect 10 0 8 1; +#X connect 11 0 10 0; +#X connect 12 0 5 0; +#X connect 12 1 7 0; +#X connect 13 0 14 0; +#X connect 14 0 15 0; #X connect 15 0 16 0; -#X connect 15 1 13 0; -#X connect 16 0 13 0; -#X connect 17 0 18 0; -#X connect 17 1 14 0; -#X connect 18 0 14 0; -#X connect 19 0 48 0; -#X connect 20 0 14 0; +#X connect 16 0 8 2; +#X connect 17 0 6 0; +#X connect 18 0 4 0; +#X connect 18 1 0 0; +#X connect 19 0 21 0; #X connect 21 0 20 0; -#X connect 21 1 13 0; -#X connect 22 0 9 0; -#X connect 23 0 49 0; -#X connect 24 0 13 0; -#X connect 25 0 4 0; -#X connect 26 0 30 0; -#X connect 27 0 37 0; -#X connect 28 0 38 0; -#X connect 29 0 39 0; -#X connect 30 0 13 0; -#X connect 31 0 1 0; -#X connect 31 0 34 0; -#X connect 32 0 14 0; -#X connect 33 0 13 0; -#X connect 34 0 56 0; -#X connect 34 0 55 0; -#X connect 34 0 54 0; -#X connect 35 0 5 0; -#X connect 36 0 1 0; -#X connect 37 0 13 0; -#X connect 38 0 13 0; -#X connect 39 0 13 0; -#X connect 48 0 51 0; -#X connect 48 1 50 1; -#X connect 48 2 22 1; -#X connect 49 1 22 2; -#X connect 50 0 22 0; -#X connect 51 0 50 0; -#X connect 51 1 24 0; -#X connect 53 0 1 0; -#X connect 54 0 25 1; -#X connect 55 0 25 2; -#X connect 56 0 1 0; -#X connect 57 0 5 0; +#X connect 23 0 2 0; +#X connect 23 1 24 0; +#X connect 24 0 18 0; +#X connect 25 0 26 0; +#X connect 26 0 8 0; +#X restore 30 109 pd compute; +#X connect 0 0 3 0; +#X connect 2 0 11 0; +#X connect 5 0 4 0; +#X connect 9 0 8 0; +#X connect 12 0 19 0; +#X connect 15 0 17 0; +#X connect 22 0 21 0; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data: [9631] trunk/externals/nusmuk/msd.h
by nimon＠users.sourceforge.net 27 Mar '08

27 Mar '08

Revision: 9631 http://pure-data.svn.sourceforge.net/pure-data/?rev=9631&view=rev Author: nimon Date: 2008-03-27 15:21:58 -0700 (Thu, 27 Mar 2008) Log Message: ----------- added setM function Modified Paths: -------------- trunk/externals/nusmuk/msd.h Modified: trunk/externals/nusmuk/msd.h =================================================================== --- trunk/externals/nusmuk/msd.h 2008-03-27 22:00:02 UTC (rev 9630) +++ trunk/externals/nusmuk/msd.h 2008-03-27 22:21:58 UTC (rev 9631) @@ -1200,6 +1200,31 @@ } } + // set mass of mass(s) named Id or number No + void m_setM(int argc,t_atom *argv) + { + if (argc != 2) { + error("%s - %s Syntax : Id/NoLink Value",thisName(),GetString(thisTag())); + return; + } + + const t_float ma = GetAFloat(argv[1]); + + if(IsSymbol(argv[0])) { + typename IDMap<t_mass *>::iterator it; + //typename IDMap<t_link *>::iterator it; + for(it = massids.find(GetSymbol(argv[0])); it; ++it) + it.data()->M = ma; + } + else { + t_mass *m = mass.find(GetAInt(argv[0])); + if(m) + m->M = ma; + else + error("%s - %s : Index not found",thisName(),GetString(thisTag())); + } + } + // set damping of link(s) named Id void m_setD2(int argc,t_atom *argv) { @@ -1867,6 +1892,7 @@ FLEXT_CADDMETHOD_(c,0,"setK",m_setK); FLEXT_CADDMETHOD_(c,0,"setD",m_setD); FLEXT_CADDMETHOD_(c,0,"setL",m_setL); + FLEXT_CADDMETHOD_(c,0,"setM",m_setM); FLEXT_CADDMETHOD_(c,0,"setD2",m_setD2); FLEXT_CADDMETHOD_(c,0,"mass",m_mass); FLEXT_CADDMETHOD_(c,0,"link",m_link); @@ -1917,6 +1943,7 @@ FLEXT_CALLBACK_V(m_setK) FLEXT_CALLBACK_V(m_setD) FLEXT_CALLBACK_V(m_setL) + FLEXT_CALLBACK_V(m_setM) FLEXT_CALLBACK_V(m_setD2) FLEXT_CALLBACK_V(m_get) FLEXT_CALLBACK_V(m_delete_link) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

← Newer
1
2
3
4
5
6
7
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

Pd-cvs March 2008