Pd-cvs April 2005

pd-cvs@lists.iem.at

13 participants
303 discussions

doc/pddp pddp.pd,1.5,1.6
by Hans-Christoph Steiner 26 Apr '05

26 Apr '05

Update of /cvsroot/pure-data/doc/pddp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21395 Modified Files: pddp.pd Log Message: updated text to reflect currnet situation Index: pddp.pd =================================================================== RCS file: /cvsroot/pure-data/doc/pddp/pddp.pd,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** pddp.pd 26 Apr 2005 05:34:40 -0000 1.5 --- pddp.pd 26 Apr 2005 20:28:55 -0000 1.6 *************** *** 1,19 **** ! #N canvas 298 124 484 620 10; #X text 25 69 The PDDP was proposed initially in early 2002 by Krzysztof Czaja who suggested that Pure Data was in need of comprehensive documentation. ; ! #X text 45 191 - Michal Seta; ! #X text 45 164 - Miller Puckette; ! #X text 45 177 - Dave Sabine; ! #X text 25 118 The project is now managed un-officially by Dave Sabine ! who acts as primary author and editor. The people involved in this ! project include (alphabetically):; ! #X text 14 334 THINGS TO NOTE:; ! #X text 25 352 Authors: If you would like to participate in this project ! \, simply gather together information about objects \, tutorials \, ! examples \, etc. and contact Dave Sabine for info about formatting ! your documents. All documents should then be forwarded to Dave to be ! included in the PDDP download which is available at his web site.; ! #X text 25 440 Externals and other Libraries: Each PDDP document includes mention of "related objects from other PD libraries" as well as mention of "related native PD objects". The objects from other libraries are --- 1,11 ---- ! #N canvas 298 124 488 624 10; #X text 25 69 The PDDP was proposed initially in early 2002 by Krzysztof Czaja who suggested that Pure Data was in need of comprehensive documentation. ; ! #X text 45 181 - Michal Seta; ! #X text 45 154 - Miller Puckette; ! #X text 45 167 - Dave Sabine; ! #X text 14 324 THINGS TO NOTE:; ! #X text 25 430 Externals and other Libraries: Each PDDP document includes mention of "related objects from other PD libraries" as well as mention of "related native PD objects". The objects from other libraries are *************** *** 23,31 **** For more info about externals and other objects \, see http://www.puredata.org/ and the Pure Data Base at http://iem.kug.ac.at/pdb/; ! #X text 45 205 - Hans-Christoph Steiner; ! #X text 25 275 All comments \, corrections \, etc. regarding the PDDP reference files should be directed to the Pd Developers' list: pd-dev(a)iem.at ; ! #X text 26 225 PDDP is now part of the CVS Pd distributions. It was originally available at Dave's web site: http://www.davesabine.com/media/puredata.asp ; --- 15,23 ---- For more info about externals and other objects \, see http://www.puredata.org/ and the Pure Data Base at http://iem.kug.ac.at/pdb/; ! #X text 45 195 - Hans-Christoph Steiner; ! #X text 25 265 All comments \, corrections \, etc. regarding the PDDP reference files should be directed to the Pd Developers' list: pd-dev(a)iem.at ; ! #X text 26 215 PDDP is now part of the CVS Pd distributions. It was originally available at Dave's web site: http://www.davesabine.com/media/puredata.asp ; *************** *** 34,35 **** --- 26,34 ---- #X text 102 5 Pure Data Documentation Project; #X obj 25 38 pddp_open table_of_contents; + #X text 25 342 Authors: If you would like to participate in this project + \, simply gather together information about objects \, tutorials \, + examples \, etc. and email pd-dev(a)iem.at for info about formatting + your documents. All documents should be committed to the CVS so that + they will be included in future releases.; + #X text 25 118 The project was originally managed by Dave Sabine. The + people involved in this project include (alphabetically):;

1 0

doc/pddp all_about_looping.pd,1.1,1.2
by Hans-Christoph Steiner 26 Apr '05

26 Apr '05

Update of /cvsroot/pure-data/doc/pddp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21291 Modified Files: all_about_looping.pd Log Message: better documented first loop, got 2nd loop working properly Index: all_about_looping.pd =================================================================== RCS file: /cvsroot/pure-data/doc/pddp/all_about_looping.pd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** all_about_looping.pd 27 May 2004 16:53:47 -0000 1.1 --- all_about_looping.pd 26 Apr 2005 20:28:35 -0000 1.2 *************** *** 1,9 **** ! #N canvas 255 95 856 623 10; #X text 460 79 looping objects:; #X obj 462 101 until; #X obj 572 102 loop; ! #X obj 458 504 susloop~; ! #X obj 527 504 loop~; ! #X text 455 483 for looping samples:; #X obj 0 2 cnv 15 850 20 empty empty all_about_looping 20 10 1 18 -233017 -66577 0; --- 1,9 ---- ! #N canvas 255 95 864 631 10; #X text 460 79 looping objects:; #X obj 462 101 until; #X obj 572 102 loop; ! #X obj 437 504 susloop~; ! #X obj 506 504 loop~; ! #X text 434 483 for looping samples:; #X obj 0 2 cnv 15 850 20 empty empty all_about_looping 20 10 1 18 -233017 -66577 0; *************** *** 12,28 **** #X obj 519 127 gem_counter; #X obj 604 127 cxc.counter; ! #X obj 463 551 pdp_loop; ! #X obj 534 551 pdp_qtloop~; ! #X obj 572 504 loopsampler; ! #X text 480 395 examples:; ! #X obj 480 424 test-loop~; #X obj 695 126 for++; ! #X obj 60 167 +; ! #X floatatom 89 170 5 0 0 0 - - -; ! #X msg 59 138 1; ! #X obj 139 186 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; ! #X msg 98 138 0; ! #X obj 60 209 t f f; #X text 214 302 X; #X text 76 306 Y; --- 12,27 ---- #X obj 519 127 gem_counter; #X obj 604 127 cxc.counter; ! #X obj 442 551 pdp_loop; ! #X obj 513 551 pdp_qtloop~; ! #X obj 551 504 loopsampler; ! #X obj 429 424 test-loop~; #X obj 695 126 for++; ! #X obj 90 167 +; ! #X floatatom 119 170 5 0 0 0 - - -; ! #X msg 89 138 1; ! #X obj 169 186 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; ! #X msg 128 138 0; ! #X obj 90 209 t f f; #X text 214 302 X; #X text 76 306 Y; *************** *** 30,37 **** #N canvas 0 22 450 300 graph2 0; #X array \$0-array 100 float 1; ! #A 0 0 0.950467 0.973181 0.989041 0.997937 0.999806 0.994635 0.982459 ! 0.963366 0.937489 0.905011 0.866159 0.821209 0.770476 0.714317 0.653128 ! 0.587341 0.517417 0.44385 0.367158 0.28788 0.206575 0.123815 0.040184 ! 0.000796274 0.000796274 0.000796274 0.000796274 0.000796274 0.000796274 0.000796274 0.000796274 0.000796274 0.000796274 0.000796274 0.000796274 0.000796274 0.000796274 0.000796274 0.000796274 0.000796274 0.000796274 --- 29,36 ---- #N canvas 0 22 450 300 graph2 0; #X array \$0-array 100 float 1; ! #A 0 0 0.946674 0.967388 0.983095 0.993714 0.999191 0.999497 0.99463 ! 0.984615 0.969505 0.949378 0.924337 0.894513 0.860059 0.821154 0.778 ! 0.730819 0.679856 0.625375 0.567657 0.507002 0.443722 0.378147 0.310614 ! 0.241474 0.171084 0.0998083 0.0280163 0.000796274 0.000796274 0.000796274 0.000796274 0.000796274 0.000796274 0.000796274 0.000796274 0.000796274 0.000796274 0.000796274 0.000796274 0.000796274 0.000796274 0.000796274 *************** *** 45,109 **** 0.000796274 0.000796274 0.000796274 0.000796274 0.000796274 0.000796274 0.000796274 0.000796274 0.000796274 0.000796274 0.000796274 0.000796274 ! 0.000796274 0.000796274 0.000796274 0.000796274; #X coords 0 1 99 -1 300 100 1; #X restore 82 405 graph; #X obj 90 314 tabwrite \$0-array; ! #X obj 60 186 moses 100; ! #X obj 59 111 bng 20 250 50 0 empty empty start 0 -6 1 10 -4033 -1 -1; ! #X text 136 166 <-- counter; ! #X text 158 186 <-- split at array size to stop; ! #X text 186 199 and reset counter to 0; #X text 57 336 ^--bang for next step; - #X obj 39 198 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 - -1; - #X text 422 36 inf; #X obj 60 249 expr abs(cos( min (1.57 \, ($f1 / $f2 - 0.4)) ) ); #X obj 263 227 hsl 128 15 1 127 0 1 empty empty change_graph_shape ! -130 8 1 12 -208896 -1 -1 1100 0; ! #X text 7 29 Programming with Pd is a different way of thinking that ! standard procedural or object-oriented programming. Looping illustrates ! this. Instead of setting up a C-like [counter] or [for++] \, set up ! a condition to continue the loop \, and a condition that ends the loop. ! ; #X text 13 362 In this example \, the "bang" from [t b f] continues the loop. The [moses 100] ends the loop.; ! #X text 17 601 by Hans-Christoph Steiner <hans(a)at.or.at>; ! #X text 629 603 updated for Pd version 0.37.1; ! #X text 125 138 <-- stop; ! #X text 451 466 There are also specific loops for samples and video: ; ! #X text 458 530 video looping:; ! #X obj 660 504 xgroove~; ! #X obj 619 353 readsf~; ! #X obj 431 338 bng 15 250 50 0 empty empty play_sound 17 7 0 10 -4033 ! -1 -1; ! #X obj 619 328 spigot; ! #X obj 656 306 tgl 15 0 empty empty allow_looping 17 7 0 10 -4033 -1 -1 0 1; ! #X text 429 271 For the most basic looping of samples \, you can use [readsf~]:; ! #X msg 430 307 open ../sound/voice.wav; ! #X text 664 373 ^- "bang"ed when complete; ! #X connect 17 0 18 0; ! #X connect 17 0 28 0; ! #X connect 18 0 17 1; ! #X connect 19 0 17 0; ! #X connect 20 0 21 0; ! #X connect 21 0 18 0; ! #X connect 21 0 17 1; ! #X connect 22 0 36 0; ! #X connect 22 1 27 1; ! #X connect 25 0 34 0; ! #X connect 25 1 27 0; ! #X connect 28 0 22 0; ! #X connect 28 1 20 0; ! #X connect 29 0 19 0; ! #X connect 34 0 19 0; ! #X connect 36 0 25 0; ! #X connect 37 0 36 1; ! #X connect 46 1 48 0; ! #X connect 47 0 46 0; #X connect 48 0 46 0; ! #X connect 49 0 48 1; ! #X connect 51 0 46 0; --- 44,118 ---- 0.000796274 0.000796274 0.000796274 0.000796274 0.000796274 0.000796274 0.000796274 0.000796274 0.000796274 0.000796274 0.000796274 0.000796274 ! 0.000796274 0.000796274 0.000796274; #X coords 0 1 99 -1 300 100 1; #X restore 82 405 graph; #X obj 90 314 tabwrite \$0-array; ! #X obj 90 186 moses 100; ! #X obj 89 111 bng 20 250 50 0 empty empty start 0 -6 1 10 -4033 -1 -1; ! #X text 166 166 <-- counter; ! #X text 188 186 <-- split at array size to stop; ! #X text 216 199 and reset counter to 0; #X text 57 336 ^--bang for next step; #X obj 60 249 expr abs(cos( min (1.57 \, ($f1 / $f2 - 0.4)) ) ); #X obj 263 227 hsl 128 15 1 127 0 1 empty empty change_graph_shape ! -130 8 1 12 -208896 -1 -1 1300 0; #X text 13 362 In this example \, the "bang" from [t b f] continues the loop. The [moses 100] ends the loop.; ! #X text 155 138 <-- stop; ! #X text 430 466 There are also specific loops for samples and video: ; ! #X text 437 530 video looping:; ! #X obj 639 504 xgroove~; ! #X obj 619 373 readsf~; ! #X obj 619 306 spigot; ! #X obj 656 284 tgl 15 0 empty empty allow_looping 17 7 0 10 -4033 -1 -1 0 1; ! #X text 429 251 For the most basic looping of samples \, you can use [readsf~]:; ! #X msg 628 350 open ../sound/voice.wav; ! #X text 664 393 ^- "bang"ed when complete; ! #X msg 592 350 1; ! #X obj 611 405 dac~; ! #X obj 592 328 t b b; ! #X obj 592 285 bng 20 250 50 0 empty empty start 0 -6 1 10 -4033 -1 ! -1; ! #X text 226 608 released under the GNU GPL; ! #X text 9 594 (C) Copyright 2005 Hans-Christoph Steiner <hans(a)at.or.at> ! ; ! #X text 629 603 updated for Pd version 0.38.2; ! #X obj 38 201 bang; ! #X text 2 137 continue -->; ! #X text 7 29 Programming with Pd is a different way of thinking that ! standard procedural or object-oriented programming. Looping illustrates ! this. Instead of setting up a C-like [counter] or [for++] \, set up ! a condition to continue the loop \, and a condition that stops the ! loop.; ! #X text 429 395 other examples:; ! #X connect 16 0 17 0; ! #X connect 16 0 27 0; ! #X connect 17 0 16 1; ! #X connect 18 0 16 0; ! #X connect 19 0 20 0; ! #X connect 20 0 17 0; ! #X connect 20 0 16 1; ! #X connect 21 0 33 0; ! #X connect 21 1 26 1; ! #X connect 24 0 53 0; ! #X connect 24 1 26 0; ! #X connect 27 0 21 0; ! #X connect 27 1 19 0; ! #X connect 28 0 18 0; ! #X connect 33 0 24 0; ! #X connect 34 0 33 1; ! #X connect 40 0 47 0; ! #X connect 40 0 47 1; ! #X connect 40 1 41 0; ! #X connect 41 0 48 0; ! #X connect 42 0 41 1; ! #X connect 44 0 40 0; ! #X connect 46 0 40 0; #X connect 48 0 46 0; ! #X connect 48 1 44 0; ! #X connect 49 0 48 0; ! #X connect 53 0 18 0;

1 0

doc/pddp pddp_open.pd,1.1,1.2
by Hans-Christoph Steiner 26 Apr '05

26 Apr '05

Update of /cvsroot/pure-data/doc/pddp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25457/pddp Modified Files: pddp_open.pd Log Message: replaced [pwd] with [getdir] Index: pddp_open.pd =================================================================== RCS file: /cvsroot/pure-data/doc/pddp/pddp_open.pd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** pddp_open.pd 26 Apr 2005 05:34:40 -0000 1.1 --- pddp_open.pd 26 Apr 2005 19:36:26 -0000 1.2 *************** *** 1,5 **** ! #N canvas 177 350 518 386 10; #X obj 110 4 inlet; - #X obj 140 168 pwd; #X msg 89 227 \; pd open \$1.pd \$2; #X obj 89 194 pack s s; --- 1,4 ---- ! #N canvas 177 350 522 390 10; #X obj 110 4 inlet; #X msg 89 227 \; pd open \$1.pd \$2; #X obj 89 194 pack s s; *************** *** 17,29 **** #X text 26 282 This patch opens a patch either from the first argument or sent in as a message.; ! #X connect 0 0 5 0; ! #X connect 0 0 8 0; ! #X connect 1 0 3 1; #X connect 3 0 2 0; #X connect 4 0 3 0; ! #X connect 5 0 4 0; ! #X connect 5 1 1 0; ! #X connect 6 0 7 0; ! #X connect 7 0 5 0; ! #X connect 8 0 7 1; #X coords 0 0 1 1 20 18 1; --- 16,29 ---- #X text 26 282 This patch opens a patch either from the first argument or sent in as a message.; ! #X obj 140 168 getdir; ! #X connect 0 0 4 0; ! #X connect 0 0 7 0; ! #X connect 2 0 1 0; #X connect 3 0 2 0; #X connect 4 0 3 0; ! #X connect 4 1 12 0; ! #X connect 5 0 6 0; ! #X connect 6 0 4 0; ! #X connect 7 0 6 1; ! #X connect 12 0 2 1; #X coords 0 0 1 1 20 18 1;

1 0

doc/additional/pd-msg/2.msg_and_pd 2.open_close.pd, 1.4, 1.5
by Hans-Christoph Steiner 26 Apr '05

26 Apr '05

Update of /cvsroot/pure-data/doc/additional/pd-msg/2.msg_and_pd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25457/additional/pd-msg/2.msg_and_pd Modified Files: 2.open_close.pd Log Message: replaced [pwd] with [getdir] Index: 2.open_close.pd =================================================================== RCS file: /cvsroot/pure-data/doc/additional/pd-msg/2.msg_and_pd/2.open_close.pd,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** 2.open_close.pd 26 Apr 2005 05:06:17 -0000 1.4 --- 2.open_close.pd 26 Apr 2005 19:36:25 -0000 1.5 *************** *** 1,3 **** ! #N canvas 368 98 521 539 10; #X text 10 4 open and close an abstraction; #X text 22 231 (you have to put a corect name & valid path); --- 1,3 ---- ! #N canvas 368 98 525 543 10; #X text 10 4 open and close an abstraction; #X text 22 231 (you have to put a corect name & valid path); *************** *** 8,13 **** #X text 57 480 you have to put the name of the patch to open ($1) and complete path to it ($2); ! #X obj 226 374 pack s s; ! #X obj 276 354 pwd; #X msg 25 63 \; pd open abstraction.pd /usr/local/lib/pd/doc/7.stuff/additional/pd-msg/2.msg_and_pd ; --- 8,12 ---- #X text 57 480 you have to put the name of the patch to open ($1) and complete path to it ($2); ! #X obj 276 367 getdir; #X msg 25 63 \; pd open abstraction.pd /usr/local/lib/pd/doc/7.stuff/additional/pd-msg/2.msg_and_pd ; *************** *** 23,36 **** #X obj 114 368 symbol; #X obj 51 359 del 2000; ! #X text 27 278 OPEN THEN CLOSE; ! #X connect 6 0 4 0; ! #X connect 7 0 6 1; ! #X connect 12 0 13 0; ! #X connect 14 0 12 0; ! #X connect 15 0 16 0; ! #X connect 16 0 18 0; ! #X connect 16 1 6 0; ! #X connect 16 1 17 1; ! #X connect 16 2 7 0; ! #X connect 17 0 14 1; ! #X connect 18 0 14 0; --- 22,38 ---- #X obj 114 368 symbol; #X obj 51 359 del 2000; ! #X obj 226 387 pack s s; ! #X obj 226 368 symbol; ! #X text 27 278 OPEN \, THEN CLOSE AFTER 2 SECONDS; ! #X connect 6 0 18 1; ! #X connect 11 0 12 0; ! #X connect 13 0 11 0; ! #X connect 14 0 15 0; ! #X connect 15 0 17 0; ! #X connect 15 1 16 0; ! #X connect 15 1 19 0; ! #X connect 15 2 6 0; ! #X connect 16 0 13 1; ! #X connect 17 0 13 0; ! #X connect 18 0 4 0; ! #X connect 19 0 18 0;

1 0

externals/ggee/control getdir.c,1.1,1.2
by Guenter Geiger 26 Apr '05

26 Apr '05

Update of /cvsroot/pure-data/externals/ggee/control In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24945 Modified Files: getdir.c Log Message: huh ?, this surely never worked, hope it does now Index: getdir.c =================================================================== RCS file: /cvsroot/pure-data/externals/ggee/control/getdir.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** getdir.c 24 Feb 2005 15:21:56 -0000 1.1 --- getdir.c 26 Apr 2005 17:38:29 -0000 1.2 *************** *** 28,35 **** int i = x->x_level; t_canvas* last = x->x_canvas; ! do { i--; ! last = last->gl_owner; ! } while (last && i); outlet_symbol(x->x_outlet,canvas_getdir(last)); --- 28,36 ---- int i = x->x_level; t_canvas* last = x->x_canvas; ! ! while (i>0) { i--; ! if (last->gl_owner) last = last->gl_owner; ! } outlet_symbol(x->x_outlet,canvas_getdir(last));

1 0

externals/nusmuk/msd2D 02_msd2Dadd.pd, 1.1, 1.2 03_imsd2Dtest.pd, 1.2, 1.3 04_msd2Dperf.pd, 1.1, 1.2 help-msd2D.pd, 1.3, 1.4 main.cpp, 1.6, 1.7
by Nicolas Montgermont 26 Apr '05

26 Apr '05

Update of /cvsroot/pure-data/externals/nusmuk/msd2D In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13192/msd2D Modified Files: 02_msd2Dadd.pd 03_imsd2Dtest.pd 04_msd2Dperf.pd help-msd2D.pd main.cpp Log Message: MSD Version 0.04 Index: 04_msd2Dperf.pd =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd2D/04_msd2Dperf.pd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** 04_msd2Dperf.pd 12 Apr 2005 16:34:04 -0000 1.1 --- 04_msd2Dperf.pd 26 Apr 2005 16:10:07 -0000 1.2 *************** *** 8,14 **** #X msg 281 402 forceX mob 100; #X obj 167 55 t b b b b b; - #X obj 313 658 print msd; #X obj 52 583 msd2D --------------------------------; ! #X msg 461 409 0 \, destroy; #X obj 481 320 gemhead; #X obj 481 343 world_light; --- 8,13 ---- #X msg 281 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; *************** *** 53,62 **** #X obj 48 177 separator; #X obj 48 153 any; - #X obj 127 57 unpack f f; #X obj 125 136 t b f; ! #X connect 0 0 10 0; #X connect 1 0 2 0; #X connect 3 0 4 0; ! #X connect 4 0 11 0; #X connect 5 0 6 0; #X connect 6 0 1 2; --- 52,61 ---- #X obj 48 177 separator; #X obj 48 153 any; #X obj 125 136 t b f; ! #X obj 127 57 unpack f f f; ! #X connect 0 0 11 0; #X connect 1 0 2 0; #X connect 3 0 4 0; ! #X connect 4 0 10 0; #X connect 5 0 6 0; #X connect 6 0 1 2; *************** *** 64,71 **** #X connect 8 0 1 0; #X connect 9 0 8 0; ! #X connect 10 0 3 0; ! #X connect 10 1 5 0; ! #X connect 11 0 9 0; ! #X connect 11 1 1 1; #X restore 133 635 pd massrender; #N canvas 284 227 587 558 linkrender 0; --- 63,70 ---- #X connect 8 0 1 0; #X connect 9 0 8 0; ! #X connect 10 0 9 0; ! #X connect 10 1 1 1; ! #X connect 11 1 3 0; ! #X connect 11 2 5 0; #X restore 133 635 pd massrender; #N canvas 284 227 587 558 linkrender 0; *************** *** 79,84 **** #X obj 44 192 any; #X obj 93 164 t b f; - #X obj 93 69 unpack f f f f; - #X obj 44 265 curve 2; #X obj 207 121 / 12.5; #X obj 207 144 - 4; --- 78,81 ---- *************** *** 89,114 **** #X obj 207 193 pack f f; #X msg 207 216 \$1 \$2 0; ! #X connect 0 0 9 0; #X connect 1 0 2 0; #X connect 2 0 8 0; #X connect 3 0 4 0; ! #X connect 4 0 15 1; #X connect 5 0 7 1; ! #X connect 6 0 10 0; #X connect 7 0 6 0; #X connect 8 0 7 0; ! #X connect 8 1 15 0; ! #X connect 9 0 1 0; ! #X connect 9 1 3 0; ! #X connect 9 2 11 0; ! #X connect 9 3 13 0; #X connect 11 0 12 0; ! #X connect 12 0 17 0; #X connect 13 0 14 0; #X connect 14 0 17 1; #X connect 15 0 16 0; ! #X connect 16 0 10 1; ! #X connect 17 0 18 0; ! #X connect 18 0 10 2; #X restore 52 656 pd linkrender; #X msg 211 170 mass mob 1 \$1 \$2 \$3; --- 86,113 ---- #X obj 207 193 pack f f; #X msg 207 216 \$1 \$2 0; ! #X obj 44 265 curve 2; ! #X obj 94 70 unpack f f f f f; ! #X connect 0 0 18 0; #X connect 1 0 2 0; #X connect 2 0 8 0; #X connect 3 0 4 0; ! #X connect 4 0 13 1; #X connect 5 0 7 1; ! #X connect 6 0 17 0; #X connect 7 0 6 0; #X connect 8 0 7 0; ! #X connect 8 1 13 0; ! #X connect 9 0 10 0; ! #X connect 10 0 15 0; #X connect 11 0 12 0; ! #X connect 12 0 15 1; #X connect 13 0 14 0; #X connect 14 0 17 1; #X connect 15 0 16 0; ! #X connect 16 0 17 2; ! #X connect 18 1 1 0; ! #X connect 18 2 3 0; ! #X connect 18 3 9 0; ! #X connect 18 4 11 0; #X restore 52 656 pd linkrender; #X msg 211 170 mass mob 1 \$1 \$2 \$3; *************** *** 132,139 **** #X msg 167 284 link souple \$1 \$2 100 0.5 0.5; #X obj 52 278 gemhead; ! #X obj 413 432 gemwin; #X msg 52 335 bang \, get massesPos \, get linksPos; #X obj 52 606 route linksPos massesPos; ! #X msg 465 433 view 0 0 4 0 0 0 0 1 0; #X msg 281 425 forceX mob -100; #X obj 380 109 repeat 500; --- 131,138 ---- #X msg 167 284 link souple \$1 \$2 100 0.5 0.5; #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 281 425 forceX mob -100; #X obj 380 109 repeat 500; *************** *** 141,207 **** #X msg 445 53 500; #X text 478 52 change number of mass to test performance; ! #X connect 0 0 8 0; #X connect 1 0 6 0; #X connect 2 0 0 0; #X connect 3 0 6 0; ! #X connect 5 0 8 0; ! #X connect 6 0 51 0; #X connect 6 1 19 0; ! #X connect 6 1 20 0; ! #X connect 6 2 50 0; ! #X connect 6 3 12 0; #X connect 6 4 2 0; ! #X connect 6 4 39 0; ! #X connect 6 4 31 0; ! #X connect 6 4 27 0; #X connect 6 4 30 0; ! #X connect 8 0 47 0; ! #X connect 8 1 7 0; ! #X connect 9 0 45 0; ! #X connect 10 0 11 0; ! #X connect 12 0 0 0; ! #X connect 13 0 15 1; #X connect 14 0 16 0; ! #X connect 15 0 17 0; ! #X connect 15 0 18 0; ! #X connect 16 0 15 0; ! #X connect 17 0 8 0; ! #X connect 18 0 8 0; ! #X connect 19 0 15 0; ! #X connect 20 0 0 0; #X connect 21 0 45 0; ! #X connect 22 0 46 0; ! #X connect 25 0 0 0; ! #X connect 26 0 33 2; ! #X connect 27 0 26 0; ! #X connect 28 0 33 1; ! #X connect 29 0 32 0; #X connect 30 0 28 0; ! #X connect 31 0 29 0; ! #X connect 32 0 33 0; ! #X connect 33 0 25 0; ! #X connect 34 0 40 0; ! #X connect 35 0 37 0; ! #X connect 35 0 38 0; #X connect 35 0 40 1; ! #X connect 36 0 41 1; ! #X connect 37 0 36 1; ! #X connect 38 0 41 0; ! #X connect 38 1 36 0; ! #X connect 39 0 40 1; ! #X connect 40 0 35 0; ! #X connect 41 0 43 0; ! #X connect 42 0 29 0; ! #X connect 42 1 28 0; ! #X connect 42 2 26 0; ! #X connect 43 0 0 0; ! #X connect 44 0 22 0; ! #X connect 46 0 8 0; ! #X connect 47 0 24 0; ! #X connect 47 1 23 0; ! #X connect 48 0 45 0; ! #X connect 49 0 8 0; ! #X connect 50 0 42 0; ! #X connect 51 0 34 0; ! #X connect 52 0 50 1; ! #X connect 52 0 51 1; --- 140,205 ---- #X msg 445 53 500; #X text 478 52 change number of mass to test performance; ! #X connect 0 0 7 0; #X connect 1 0 6 0; #X connect 2 0 0 0; #X connect 3 0 6 0; ! #X connect 5 0 7 0; ! #X connect 6 0 50 0; ! #X connect 6 1 18 0; #X connect 6 1 19 0; ! #X connect 6 2 49 0; ! #X connect 6 3 11 0; #X connect 6 4 2 0; ! #X connect 6 4 38 0; #X connect 6 4 30 0; ! #X connect 6 4 26 0; ! #X connect 6 4 29 0; ! #X connect 7 0 46 0; ! #X connect 8 0 44 0; ! #X connect 9 0 10 0; ! #X connect 11 0 0 0; ! #X connect 12 0 14 1; ! #X connect 13 0 15 0; #X connect 14 0 16 0; ! #X connect 14 0 17 0; ! #X connect 15 0 14 0; ! #X connect 16 0 7 0; ! #X connect 17 0 7 0; ! #X connect 18 0 14 0; ! #X connect 19 0 0 0; ! #X connect 20 0 44 0; #X connect 21 0 45 0; ! #X connect 24 0 0 0; ! #X connect 25 0 32 2; ! #X connect 26 0 25 0; ! #X connect 27 0 32 1; ! #X connect 28 0 31 0; ! #X connect 29 0 27 0; #X connect 30 0 28 0; ! #X connect 31 0 32 0; ! #X connect 32 0 24 0; ! #X connect 33 0 39 0; ! #X connect 34 0 36 0; ! #X connect 34 0 37 0; ! #X connect 34 0 39 1; #X connect 35 0 40 1; ! #X connect 36 0 35 1; ! #X connect 37 0 40 0; ! #X connect 37 1 35 0; ! #X connect 38 0 39 1; ! #X connect 39 0 34 0; ! #X connect 40 0 42 0; ! #X connect 41 0 28 0; ! #X connect 41 1 27 0; ! #X connect 41 2 25 0; ! #X connect 42 0 0 0; ! #X connect 43 0 21 0; ! #X connect 45 0 7 0; ! #X connect 46 0 23 0; ! #X connect 46 1 22 0; ! #X connect 47 0 44 0; ! #X connect 48 0 7 0; ! #X connect 49 0 41 0; ! #X connect 50 0 33 0; ! #X connect 51 0 49 1; ! #X connect 51 0 50 1; Index: main.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd2D/main.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** main.cpp 26 Apr 2005 11:39:48 -0000 1.6 --- main.cpp 26 Apr 2005 16:10:07 -0000 1.7 *************** *** 31,35 **** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ! Version 0.03 -- 21.04.2005 */ --- 31,35 ---- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ! Version 0.04 -- 26.04.2005 */ *************** *** 39,43 **** // define constants ! #define MSD2D_VERSION 0.03 #define nb_max_link 4000 #define nb_max_mass 4000 --- 39,43 ---- // define constants ! #define MSD2D_VERSION 0.04 #define nb_max_link 4000 #define nb_max_mass 4000 *************** *** 266,280 **** // displace mass(es) named Id to a certain position t_int i; ! const t_symbol *sym = GetSymbol(argv[0]); if (argc != 2) ! error("posX : Idmass value"); if (GetFloat(argv[1]) < Xmax && GetFloat(argv[1]) > Xmin) ! for (i=0; i<nb_mass;i++) ! { ! if (sym == mass[i]->Id) ! mass[i]->posX = GetAFloat(argv[1]); ! } } --- 266,289 ---- // displace mass(es) named Id to a certain position t_int i; ! const t_symbol *sym = GetASymbol(argv[0]); if (argc != 2) ! error("posX : Id/Nomass value"); if (GetFloat(argv[1]) < Xmax && GetFloat(argv[1]) > Xmin) ! if (sym ==0) ! for (i=0; i<nb_mass;i++) ! { ! if (GetInt(argv[0]) == mass[i]->nbr) { ! mass[i]->posX = GetFloat(argv[1]); ! break; ! } ! } ! else ! for (i=0; i<nb_mass;i++) ! { ! if (sym == mass[i]->Id) ! mass[i]->posX = GetFloat(argv[1]); ! } } *************** *** 283,298 **** // displace mass(es) named Id to a certain position t_int i; ! const t_symbol *sym = GetSymbol(argv[0]); if (argc != 2) ! error("posY : Idmass value"); if (GetFloat(argv[1]) < Ymax && GetFloat(argv[1]) > Ymin) ! for (i=0; i<nb_mass;i++) ! { ! if (sym == mass[i]->Id) ! mass[i]->posY = GetFloat(argv[1]); ! } ! } --- 292,315 ---- // displace mass(es) named Id to a certain position t_int i; ! const t_symbol *sym = GetASymbol(argv[0]); if (argc != 2) ! error("posY : Id/Nomass value"); if (GetFloat(argv[1]) < Ymax && GetFloat(argv[1]) > Ymin) ! if (sym ==0) ! for (i=0; i<nb_mass;i++) ! { ! if (GetInt(argv[0]) == mass[i]->nbr) { ! mass[i]->posY = GetFloat(argv[1]); ! break; ! } ! } ! else ! for (i=0; i<nb_mass;i++) ! { ! if (sym == mass[i]->Id) ! mass[i]->posY = GetFloat(argv[1]); ! } } *************** *** 411,457 **** t_atom sortie[7], aux[2]; t_int i; ! if (argc < 6 || argc > 8) ! error("link : Id Nomass1 Nomass2 K D1 D2 (Lmin Lmax)"); ! link[nb_link] = new t_link; // New pointer ! link[nb_link]->Id = GetSymbol(argv[0]); // ID ! for (i=0; i<nb_mass;i++) ! if (mass[i]->nbr==GetAInt(argv[1])) // pointer to mass1 ! link[nb_link]->mass1 = mass[i]; ! else if(mass[i]->nbr==GetAInt(argv[2])) // pointer to mass2 ! link[nb_link]->mass2 = mass[i]; ! link[nb_link]->K1 = GetFloat(argv[3]); // K1 ! link[nb_link]->D1 = GetFloat(argv[4]); // D1 ! link[nb_link]->D2 = GetFloat(argv[5]); // D2 ! link[nb_link]->longx = link[nb_link]->mass1->posX - link[nb_link]->mass2->posX; // Lx[0] ! link[nb_link]->longy = link[nb_link]->mass1->posY - link[nb_link]->mass2->posY; // Ly[0] ! link[nb_link]->longueur = sqrt(pow(link[nb_link]->longx,2)+pow(link[nb_link]->longy,2)); // L[0] ! link[nb_link]->nbr = id_link; // id number ! link[nb_link]->distance_old = link[nb_link]->longueur; // L[n-1] ! switch (argc) { ! case 6 : ! link[nb_link]->long_max = 32768; ! link[nb_link]->long_min = 0; ! break; ! case 7 : ! link[nb_link]->long_min = GetFloat(argv[6]); ! link[nb_link]->long_max = 32768; ! break; ! case 8 : ! link[nb_link]->long_min = GetFloat(argv[6]); ! link[nb_link]->long_max = GetFloat(argv[7]); ! break; ! } ! nb_link++; ! id_link++; ! nb_link = min ( nb_max_link -1, nb_link ); ! SetFloat((sortie[0]),id_link-1); ! SetSymbol((sortie[1]),link[nb_link-1]->Id); ! SetFloat((sortie[2]),GetInt(argv[1])); ! SetFloat((sortie[3]),GetInt(argv[2])); ! SetFloat((sortie[4]),link[nb_link-1]->K1); ! SetFloat((sortie[5]),link[nb_link-1]->D1); ! SetFloat((sortie[6]),link[nb_link-1]->D2); ! ToOutAnything(1,S_Link,7,sortie); } --- 428,488 ---- t_atom sortie[7], aux[2]; t_int i; + t_mass *mass1 = NULL; + t_mass *mass2 = NULL; + + if (argc < 6 || argc > 8) + error("link : Id Nomass1 Nomass2 K D1 D2 (Lmin Lmax)"); + + // check for existence of link masses: + for (i=0; i<nb_mass;i++) + if (mass[i]->nbr==GetInt(argv[1])) // pointer to mass1 + // we found mass1 + mass1 = mass[i]; + else if (mass[i]->nbr==GetInt(argv[2])) // pointer to mass2 + // ... and mass2 + mass2 = mass[i]; ! if (mass1 and mass2) ! { ! link[nb_link] = new t_link; // New pointer ! link[nb_link]->Id = GetSymbol(argv[0]); // ID ! link[nb_link]->mass1 = mass1; // pointer to mass1 ! link[nb_link]->mass2 = mass2; // pointer to mass2 ! link[nb_link]->K1 = GetFloat(argv[3]); // K1 ! link[nb_link]->D1 = GetFloat(argv[4]); // D1 ! link[nb_link]->D2 = GetFloat(argv[5]); // D2 ! link[nb_link]->longx = link[nb_link]->mass1->posX - link[nb_link]->mass2->posX; // Lx[0] ! link[nb_link]->longy = link[nb_link]->mass1->posY - link[nb_link]->mass2->posY; // Ly[0] ! link[nb_link]->longueur = sqrt(pow(link[nb_link]->longx,2)+pow(link[nb_link]->longy,2)); // L[0] ! link[nb_link]->nbr = id_link; // id number ! link[nb_link]->distance_old = link[nb_link]->longueur; // L[n-1] ! switch (argc) { ! case 6 : ! link[nb_link]->long_max = 32768; ! link[nb_link]->long_min = 0; ! break; ! case 7 : ! link[nb_link]->long_min = GetFloat(argv[6]); ! link[nb_link]->long_max = 32768; ! break; ! case 8 : ! link[nb_link]->long_min = GetFloat(argv[6]); ! link[nb_link]->long_max = GetFloat(argv[7]); ! break; ! } ! nb_link++; ! id_link++; ! nb_link = min ( nb_max_link -1, nb_link ); ! SetFloat((sortie[0]),id_link-1); ! SetSymbol((sortie[1]),link[nb_link-1]->Id); ! SetFloat((sortie[2]),GetInt(argv[1])); ! SetFloat((sortie[3]),GetInt(argv[2])); ! SetFloat((sortie[4]),link[nb_link-1]->K1); ! SetFloat((sortie[5]),link[nb_link-1]->D1); ! SetFloat((sortie[6]),link[nb_link-1]->D2); ! ToOutAnything(1,S_Link,7,sortie); ! } ! else ! error("link : Cannot create link: Not all masses for this link have been created yet."); } *************** *** 590,594 **** t_int i,j; t_symbol *auxarg,*auxarg2, *auxtype; ! t_atom sortie[4]; auxtype = GetSymbol(argv[0]); auxarg = GetASymbol(argv[1]); //auxarg : & symbol, 0 else --- 621,625 ---- t_int i,j; t_symbol *auxarg,*auxarg2, *auxtype; ! t_atom sortie[5]; auxtype = GetSymbol(argv[0]); auxarg = GetASymbol(argv[1]); //auxarg : & symbol, 0 else *************** *** 599,628 **** for (i=0; i<nb_mass; i++) { ! SetFloat(sortie[0],mass[i]->posX); ! SetFloat(sortie[1],mass[i]->posY); ! ToOutAnything(0,S_massesPos,2,sortie); } else if (auxtype == S_massesForces) // get all masses forces for (i=0; i<nb_mass; i++) { ! SetFloat(sortie[0],mass[i]->out_forceX); ! SetFloat(sortie[1],mass[i]->out_forceY); ! ToOutAnything(0,S_massesForces,2,sortie); } else if (auxtype == S_linksPos) // get all links positions for (i=0; i<nb_link; i++) { ! SetFloat(sortie[0],link[i]->mass1->posX); ! SetFloat(sortie[1],link[i]->mass1->posY); ! SetFloat(sortie[2],link[i]->mass2->posX); ! SetFloat(sortie[3],link[i]->mass2->posY); ! ToOutAnything(0,S_linksPos,4,sortie); } else // get all masses speeds for (i=0; i<nb_mass; i++) { ! SetFloat(sortie[0],mass[i]->speedX); ! SetFloat(sortie[1],mass[i]->speedY); ! ToOutAnything(0,S_massesSpeeds,2,sortie); } } --- 630,663 ---- for (i=0; i<nb_mass; i++) { ! SetFloat(sortie[0],mass[i]->nbr); ! SetFloat(sortie[1],mass[i]->posX); ! SetFloat(sortie[2],mass[i]->posY); ! ToOutAnything(0,S_massesPos,3,sortie); } else if (auxtype == S_massesForces) // get all masses forces for (i=0; i<nb_mass; i++) { ! SetFloat(sortie[0],mass[i]->nbr); ! SetFloat(sortie[1],mass[i]->out_forceX); ! SetFloat(sortie[2],mass[i]->out_forceY); ! ToOutAnything(0,S_massesForces,3,sortie); } else if (auxtype == S_linksPos) // get all links positions for (i=0; i<nb_link; i++) { ! SetFloat(sortie[0],link[i]->nbr); ! SetFloat(sortie[1],link[i]->mass1->posX); ! SetFloat(sortie[2],link[i]->mass1->posY); ! SetFloat(sortie[3],link[i]->mass2->posX); ! SetFloat(sortie[4],link[i]->mass2->posY); ! ToOutAnything(0,S_linksPos,5,sortie); } else // get all masses speeds for (i=0; i<nb_mass; i++) { ! SetFloat(sortie[0],mass[i]->nbr); ! SetFloat(sortie[1],mass[i]->speedX); ! SetFloat(sortie[2],mass[i]->speedY); ! ToOutAnything(0,S_massesSpeeds,3,sortie); } } *************** *** 635,641 **** if (mass[i]->nbr==GetInt(argv[j])) { ! SetFloat(sortie[0],mass[i]->posX); ! SetFloat(sortie[1],mass[i]->posY); ! ToOutAnything(0,S_massesPosNo,2,sortie); } } --- 670,677 ---- if (mass[i]->nbr==GetInt(argv[j])) { ! SetFloat(sortie[0],mass[i]->nbr); ! SetFloat(sortie[1],mass[i]->posX); ! SetFloat(sortie[2],mass[i]->posY); ! ToOutAnything(0,S_massesPosNo,3,sortie); } } *************** *** 649,655 **** if (auxarg2==mass[i]->Id) { ! SetFloat(sortie[0],mass[i]->posX); ! SetFloat(sortie[1],mass[i]->posY); ! ToOutAnything(0,S_massesPosId,2,sortie); } } --- 685,692 ---- if (auxarg2==mass[i]->Id) { ! SetSymbol(sortie[0],mass[i]->Id); ! SetFloat(sortie[1],mass[i]->posX); ! SetFloat(sortie[2],mass[i]->posY); ! ToOutAnything(0,S_massesPosId,3,sortie); } } *************** *** 665,671 **** if (mass[i]->nbr==GetInt(argv[j])) { ! SetFloat(sortie[0],mass[i]->out_forceX); ! SetFloat(sortie[1],mass[i]->out_forceY); ! ToOutAnything(0,S_massesForcesNo,2,sortie); } } --- 702,709 ---- if (mass[i]->nbr==GetInt(argv[j])) { ! SetFloat(sortie[0],mass[i]->nbr); ! SetFloat(sortie[1],mass[i]->out_forceX); ! SetFloat(sortie[2],mass[i]->out_forceY); ! ToOutAnything(0,S_massesForcesNo,3,sortie); } } *************** *** 679,685 **** if (auxarg2==mass[i]->Id) { ! SetFloat(sortie[0],mass[i]->out_forceX); ! SetFloat(sortie[1],mass[i]->out_forceY); ! ToOutAnything(0,S_massesForcesId,2,sortie); } } --- 717,724 ---- if (auxarg2==mass[i]->Id) { ! SetSymbol(sortie[0],mass[i]->Id); ! SetFloat(sortie[1],mass[i]->out_forceX); ! SetFloat(sortie[2],mass[i]->out_forceY); ! ToOutAnything(0,S_massesForcesId,3,sortie); } } *************** *** 695,703 **** if (link[i]->nbr==GetInt(argv[j])) { ! SetFloat(sortie[0],link[i]->mass1->posX); ! SetFloat(sortie[1],link[i]->mass1->posY); ! SetFloat(sortie[2],link[i]->mass2->posX); ! SetFloat(sortie[3],link[i]->mass2->posY); ! ToOutAnything(0,S_linksPosNo,4,sortie); } } --- 734,743 ---- if (link[i]->nbr==GetInt(argv[j])) { ! SetFloat(sortie[0],link[i]->nbr); ! SetFloat(sortie[1],link[i]->mass1->posX); ! SetFloat(sortie[2],link[i]->mass1->posY); ! SetFloat(sortie[3],link[i]->mass2->posX); ! SetFloat(sortie[4],link[i]->mass2->posY); ! ToOutAnything(0,S_linksPosNo,5,sortie); } } *************** *** 711,719 **** if (auxarg2==link[i]->Id) { ! SetFloat(sortie[0],link[i]->mass1->posX); ! SetFloat(sortie[1],link[i]->mass1->posY); ! SetFloat(sortie[2],link[i]->mass2->posX); ! SetFloat(sortie[3],link[i]->mass2->posY); ! ToOutAnything(0,S_linksPosId,4,sortie); } } --- 751,760 ---- if (auxarg2==link[i]->Id) { ! SetSymbol(sortie[0],link[i]->Id); ! SetFloat(sortie[1],link[i]->mass1->posX); ! SetFloat(sortie[2],link[i]->mass1->posY); ! SetFloat(sortie[3],link[i]->mass2->posX); ! SetFloat(sortie[4],link[i]->mass2->posY); ! ToOutAnything(0,S_linksPosId,5,sortie); } } *************** *** 729,735 **** if (mass[i]->nbr==GetInt(argv[j])) { ! SetFloat(sortie[0],mass[i]->speedX); ! SetFloat(sortie[1],mass[i]->speedY); ! ToOutAnything(0,S_massesSpeedsNo,2,sortie); } } --- 770,777 ---- if (mass[i]->nbr==GetInt(argv[j])) { ! SetFloat(sortie[0],mass[i]->nbr); ! SetFloat(sortie[1],mass[i]->speedX); ! SetFloat(sortie[2],mass[i]->speedY); ! ToOutAnything(0,S_massesSpeedsNo,3,sortie); } } *************** *** 743,749 **** if (auxarg2==mass[i]->Id) { ! SetFloat(sortie[0],mass[i]->speedX); ! SetFloat(sortie[1],mass[i]->speedY); ! ToOutAnything(0,S_massesSpeedsId,2,sortie); } } --- 785,792 ---- if (auxarg2==mass[i]->Id) { ! SetSymbol(sortie[0],mass[i]->Id); ! SetFloat(sortie[1],mass[i]->speedX); ! SetFloat(sortie[2],mass[i]->speedY); ! ToOutAnything(0,S_massesSpeedsId,3,sortie); } } Index: help-msd2D.pd =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd2D/help-msd2D.pd,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** help-msd2D.pd 21 Apr 2005 14:28:54 -0000 1.3 --- help-msd2D.pd 26 Apr 2005 16:10:07 -0000 1.4 *************** *** 15,19 **** #X obj 61 403 cnv 15 610 210 empty empty DYNAMIC_SETTING 20 12 0 14 -262131 -66577 0; - #X text 350 449 \$1 : Id (symbol); #X text 350 467 \$2 : New value; #X text 348 503 \$1 : Id (symbol); --- 15,18 ---- *************** *** 61,76 **** #X msg 84 538 Xmin \$1 \, Xmax \$1 \, Ymin \$1 \, Ymax \$1; #X text 334 271 \$4 \, \$5 : initial position; ! #X connect 1 0 46 0; ! #X connect 8 0 46 0; ! #X connect 15 0 46 0; ! #X connect 18 0 46 0; ! #X connect 20 0 46 0; ! #X connect 21 0 46 0; ! #X connect 24 0 46 0; ! #X connect 28 0 46 0; ! #X connect 31 0 46 0; ! #X connect 40 0 46 0; ! #X connect 43 0 46 0; ! #X connect 48 0 46 0; #X restore 221 312 pd masses; #X text 75 312 HELP on masses --->; --- 60,76 ---- #X msg 84 538 Xmin \$1 \, Xmax \$1 \, Ymin \$1 \, Ymax \$1; #X text 334 271 \$4 \, \$5 : initial position; ! #X text 350 449 \$1 : Id (symbol) or No; ! #X connect 1 0 45 0; ! #X connect 8 0 45 0; ! #X connect 14 0 45 0; ! #X connect 17 0 45 0; ! #X connect 19 0 45 0; ! #X connect 20 0 45 0; ! #X connect 23 0 45 0; ! #X connect 27 0 45 0; ! #X connect 30 0 45 0; ! #X connect 39 0 45 0; ! #X connect 42 0 45 0; ! #X connect 47 0 45 0; #X restore 221 312 pd masses; #X text 75 312 HELP on masses --->; Index: 02_msd2Dadd.pd =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd2D/02_msd2Dadd.pd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** 02_msd2Dadd.pd 12 Apr 2005 16:34:04 -0000 1.1 --- 02_msd2Dadd.pd 26 Apr 2005 16:10:07 -0000 1.2 *************** *** 13,239 **** #X msg 191 106 mass fix 0 100 50 50; #N canvas 177 95 946 729 synthese 0; ! #X obj 140 66 t b f; ! #X obj 55 219 print x1; ! #X obj 180 139 + 1; ! #X obj 160 107 f 0; ! #X obj 236 45 inlet; ! #X msg 214 315 \$1 50; ! #X obj 214 337 line~; ! #X obj 174 341 *~; ! #X msg 309 315 \$1 50; ! #X obj 309 337 line~; ! #X obj 269 341 *~; ! #X msg 402 317 \$1 50; ! #X obj 402 339 line~; ! #X obj 362 343 *~; ! #X msg 494 315 \$1 50; ! #X obj 494 337 line~; ! #X obj 454 341 *~; ! #X obj 311 389 dac~; ! #X obj 185 255 / 200; ! #X obj 311 261 / 200; ! #X obj 402 263 / 200; ! #X obj 499 261 / 500; ! #X msg 595 318 \$1 50; ! #X obj 595 340 line~; ! #X obj 555 344 *~; ! #X msg 690 318 \$1 50; ! #X obj 690 340 line~; ! #X obj 650 344 *~; ! #X msg 783 320 \$1 50; ! #X obj 783 342 line~; ! #X obj 743 346 *~; ! #X msg 875 318 \$1 50; ! #X obj 875 340 line~; ! #X obj 835 344 *~; ! #X obj 692 392 dac~; ! #X obj 172 285 osc~ 55; ! #X obj 268 285 osc~ 110; ! #X obj 453 286 osc~ 222; ! #X obj 566 258 / 500; ! #X obj 693 264 / 500; ! #X obj 240 161 pack f f f; ! #X obj 231 72 unpack f f; ! #X obj 236 219 unpack f f; ! #X obj 425 225 unpack f f; ! #X obj 611 222 unpack f f; ! #X obj 802 229 unpack f f; ! #X obj 880 264 / 1000; ! #X obj 783 266 / 1000; ! #X obj 180 164 mod 8; ! #X obj 517 190 route 0 2 1 3 4 5 6 7; ! #X msg 204 519 \$1 50; ! #X obj 204 541 line~; ! #X obj 164 545 *~; ! #X msg 299 519 \$1 50; ! #X obj 299 541 line~; ! #X obj 259 545 *~; ! #X msg 392 521 \$1 50; ! #X obj 392 543 line~; ! #X obj 352 547 *~; ! #X msg 484 519 \$1 50; ! #X obj 484 541 line~; ! #X obj 444 545 *~; ! #X obj 301 593 dac~; ! #X obj 175 459 / 200; ! #X obj 301 465 / 200; ! #X obj 392 467 / 200; ! #X obj 489 465 / 500; ! #X msg 585 522 \$1 50; ! #X obj 585 544 line~; ! #X obj 545 548 *~; ! #X msg 680 522 \$1 50; ! #X obj 680 544 line~; ! #X obj 640 548 *~; ! #X msg 773 524 \$1 50; ! #X obj 773 546 line~; ! #X obj 733 550 *~; ! #X msg 865 522 \$1 50; ! #X obj 865 544 line~; ! #X obj 825 548 *~; ! #X obj 682 596 dac~; ! #X obj 162 489 osc~ 55; ! #X obj 258 489 osc~ 110; ! #X obj 351 491 osc~ 166; ! #X obj 443 489 osc~ 222; ! #X obj 544 492 osc~ 444; ! #X obj 639 492 osc~ 890; ! #X obj 732 494 osc~ 1113; ! #X obj 824 492 osc~ 2229; ! #X obj 556 462 / 500; ! #X obj 683 468 / 500; ! #X obj 226 423 unpack f f; ! #X obj 415 429 unpack f f; ! #X obj 601 426 unpack f f; ! #X obj 792 433 unpack f f; ! #X obj 870 468 / 1000; ! #X obj 773 470 / 1000; ! #X obj 361 287 osc~ 165; ! #X obj 554 288 osc~ 267; ! #X obj 649 288 osc~ 311; ! #X obj 742 290 osc~ 444; ! #X obj 834 288 osc~ 509; ! #X connect 0 0 3 0; ! #X connect 0 1 40 1; ! #X connect 2 0 48 0; ! #X connect 3 0 2 0; ! #X connect 4 0 41 0; ! #X connect 5 0 6 0; ! #X connect 6 0 7 1; ! #X connect 7 0 17 0; ! #X connect 8 0 9 0; ! #X connect 9 0 10 1; ! #X connect 10 0 17 0; ! #X connect 10 0 17 1; ! #X connect 11 0 12 0; #X connect 12 0 13 1; ! #X connect 13 0 17 0; ! #X connect 13 0 17 1; ! #X connect 14 0 15 0; ! #X connect 15 0 16 1; ! #X connect 16 0 17 1; ! #X connect 18 0 5 0; ! #X connect 19 0 8 0; ! #X connect 20 0 11 0; ! #X connect 21 0 14 0; ! #X connect 22 0 23 0; ! #X connect 23 0 24 1; ! #X connect 24 0 34 0; ! #X connect 25 0 26 0; ! #X connect 26 0 27 1; ! #X connect 27 0 34 0; ! #X connect 27 0 34 1; ! #X connect 28 0 29 0; #X connect 29 0 30 1; ! #X connect 30 0 34 0; ! #X connect 30 0 34 1; ! #X connect 31 0 32 0; ! #X connect 32 0 33 1; ! #X connect 33 0 34 1; ! #X connect 35 0 7 0; ! #X connect 36 0 10 0; #X connect 37 0 16 0; ! #X connect 38 0 22 0; ! #X connect 39 0 25 0; ! #X connect 40 0 49 0; ! #X connect 41 0 0 0; ! #X connect 41 1 40 2; ! #X connect 42 0 18 0; ! #X connect 42 1 19 0; ! #X connect 43 0 20 0; ! #X connect 43 1 21 0; ! #X connect 44 0 38 0; ! #X connect 44 1 39 0; ! #X connect 45 0 47 0; ! #X connect 45 1 46 0; ! #X connect 46 0 31 0; ! #X connect 47 0 28 0; ! #X connect 48 0 3 1; ! #X connect 48 0 40 0; ! #X connect 49 0 42 0; ! #X connect 49 1 43 0; ! #X connect 49 2 44 0; ! #X connect 49 3 45 0; ! #X connect 49 4 90 0; ! #X connect 49 5 91 0; ! #X connect 49 6 92 0; ! #X connect 49 7 93 0; ! #X connect 50 0 51 0; ! #X connect 51 0 52 1; ! #X connect 52 0 62 0; ! #X connect 53 0 54 0; ! #X connect 54 0 55 1; ! #X connect 55 0 62 0; ! #X connect 55 0 62 1; ! #X connect 56 0 57 0; ! #X connect 57 0 58 1; ! #X connect 58 0 62 0; ! #X connect 58 0 62 1; #X connect 59 0 60 0; #X connect 60 0 61 1; ! #X connect 61 0 62 1; ! #X connect 63 0 50 0; ! #X connect 64 0 53 0; ! #X connect 65 0 56 0; ! #X connect 66 0 59 0; ! #X connect 67 0 68 0; ! #X connect 68 0 69 1; ! #X connect 69 0 79 0; ! #X connect 70 0 71 0; ! #X connect 71 0 72 1; ! #X connect 72 0 79 0; ! #X connect 72 0 79 1; ! #X connect 73 0 74 0; ! #X connect 74 0 75 1; ! #X connect 75 0 79 0; ! #X connect 75 0 79 1; ! #X connect 76 0 77 0; ! #X connect 77 0 78 1; ! #X connect 78 0 79 1; ! #X connect 80 0 52 0; ! #X connect 81 0 55 0; ! #X connect 82 0 58 0; ! #X connect 83 0 61 0; ! #X connect 84 0 69 0; ! #X connect 85 0 72 0; ! #X connect 86 0 75 0; ! #X connect 87 0 78 0; ! #X connect 88 0 67 0; ! #X connect 89 0 70 0; ! #X connect 90 0 63 0; ! #X connect 90 1 64 0; ! #X connect 91 0 65 0; ! #X connect 91 1 66 0; ! #X connect 92 0 88 0; ! #X connect 92 1 89 0; ! #X connect 93 0 95 0; ! #X connect 93 1 94 0; ! #X connect 94 0 76 0; ! #X connect 95 0 73 0; ! #X connect 96 0 13 0; ! #X connect 97 0 24 0; ! #X connect 98 0 27 0; ! #X connect 99 0 30 0; ! #X connect 100 0 33 0; #X restore 230 679 pd synthese; #N canvas 311 224 316 299 gemmouse 0; --- 13,223 ---- #X msg 191 106 mass fix 0 100 50 50; #N canvas 177 95 946 729 synthese 0; ! #X obj 268 68 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 obj -64 164 / 200; ! #X obj 62 170 / 200; ! #X obj 153 172 / 200; ! #X obj 250 170 / 500; ! #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 317 167 / 500; ! #X obj 444 173 / 500; ! #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 obj 631 173 / 1000; ! #X obj 534 175 / 1000; ! #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 obj -74 368 / 200; ! #X obj 52 374 / 200; ! #X obj 143 376 / 200; ! #X obj 240 374 / 500; ! #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 -87 398 osc~ 55; ! #X obj 9 398 osc~ 110; ! #X obj 102 400 osc~ 166; ! #X obj 194 398 osc~ 222; ! #X obj 295 401 osc~ 444; ! #X obj 390 401 osc~ 890; ! #X obj 483 403 osc~ 1113; ! #X obj 575 401 osc~ 2229; ! #X obj 307 371 / 500; ! #X obj 434 377 / 500; ! #X obj -23 332 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 621 377 / 1000; ! #X obj 524 379 / 1000; ! #X obj 112 196 osc~ 165; ! #X obj 305 197 osc~ 267; ! #X obj 400 197 osc~ 311; ! #X obj 493 199 osc~ 444; ! #X obj 585 197 osc~ 509; ! #X obj 268 99 route 1 5 9 13 17 21 25 29; ! #X connect 0 0 93 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 connect 11 0 12 1; #X connect 12 0 13 1; ! #X connect 14 0 1 0; ! #X connect 15 0 4 0; ! #X connect 16 0 7 0; ! #X connect 17 0 10 0; ! #X connect 18 0 19 0; ! #X connect 19 0 20 1; ! #X connect 20 0 30 0; ! #X connect 21 0 22 0; ! #X connect 22 0 23 1; ! #X connect 23 0 30 0; ! #X connect 23 0 30 1; ! #X connect 24 0 25 0; ! #X connect 25 0 26 1; ! #X connect 26 0 30 0; ! #X connect 26 0 30 1; ! #X connect 27 0 28 0; ! #X connect 28 0 29 1; #X connect 29 0 30 1; ! #X connect 31 0 3 0; ! #X connect 32 0 6 0; ! #X connect 33 0 12 0; ! #X connect 34 0 18 0; ! #X connect 35 0 21 0; ! #X connect 36 0 14 0; ! #X connect 36 1 15 0; #X connect 37 0 16 0; ! #X connect 37 1 17 0; ! #X connect 38 0 34 0; ! #X connect 38 1 35 0; ! #X connect 39 0 41 0; ! #X connect 39 1 40 0; ! #X connect 40 0 27 0; ! #X connect 41 0 24 0; ! #X connect 42 0 43 0; ! #X connect 43 0 44 1; ! #X connect 44 0 54 0; ! #X connect 45 0 46 0; ! #X connect 46 0 47 1; ! #X connect 47 0 54 0; ! #X connect 47 0 54 1; ! #X connect 48 0 49 0; ! #X connect 49 0 50 1; ! #X connect 50 0 54 0; ! #X connect 50 0 54 1; ! #X connect 51 0 52 0; ! #X connect 52 0 53 1; ! #X connect 53 0 54 1; ! #X connect 55 0 42 0; ! #X connect 56 0 45 0; ! #X connect 57 0 48 0; ! #X connect 58 0 51 0; #X connect 59 0 60 0; #X connect 60 0 61 1; ! #X connect 61 0 71 0; ! #X connect 62 0 63 0; ! #X connect 63 0 64 1; ! #X connect 64 0 71 0; ! #X connect 64 0 71 1; ! #X connect 65 0 66 0; ! #X connect 66 0 67 1; ! #X connect 67 0 71 0; ! #X connect 67 0 71 1; ! #X connect 68 0 69 0; ! #X connect 69 0 70 1; ! #X connect 70 0 71 1; ! #X connect 72 0 44 0; ! #X connect 73 0 47 0; ! #X connect 74 0 50 0; ! #X connect 75 0 53 0; ! #X connect 76 0 61 0; ! #X connect 77 0 64 0; ! #X connect 78 0 67 0; ! #X connect 79 0 70 0; ! #X connect 80 0 59 0; ! #X connect 81 0 62 0; ! #X connect 82 0 55 0; ! #X connect 82 1 56 0; ! #X connect 83 0 57 0; ! #X connect 83 1 58 0; ! #X connect 84 0 80 0; ! #X connect 84 1 81 0; ! #X connect 85 0 87 0; ! #X connect 85 1 86 0; ! #X connect 86 0 68 0; ! #X connect 87 0 65 0; ! #X connect 88 0 9 0; ! #X connect 89 0 20 0; ! #X connect 90 0 23 0; ! #X connect 91 0 26 0; ! #X connect 92 0 29 0; ! #X connect 93 0 36 0; ! #X connect 93 1 37 0; ! #X connect 93 2 38 0; ! #X connect 93 3 39 0; ! #X connect 93 4 82 0; ! #X connect 93 5 83 0; ! #X connect 93 6 84 0; ! #X connect 93 7 85 0; #X restore 230 679 pd synthese; #N canvas 311 224 316 299 gemmouse 0; *************** *** 280,289 **** #X obj 48 177 separator; #X obj 48 153 any; - #X obj 127 57 unpack f f; #X obj 125 136 t b f; ! #X connect 0 0 10 0; #X connect 1 0 2 0; #X connect 3 0 4 0; ! #X connect 4 0 11 0; #X connect 5 0 6 0; #X connect 6 0 1 2; --- 264,273 ---- #X obj 48 177 separator; #X obj 48 153 any; #X obj 125 136 t b f; ! #X obj 127 57 unpack f f f; ! #X connect 0 0 11 0; #X connect 1 0 2 0; #X connect 3 0 4 0; ! #X connect 4 0 10 0; #X connect 5 0 6 0; #X connect 6 0 1 2; *************** *** 291,298 **** #X connect 8 0 1 0; #X connect 9 0 8 0; ! #X connect 10 0 3 0; ! #X connect 10 1 5 0; ! #X connect 11 0 9 0; ! #X connect 11 1 1 1; #X restore 141 657 pd massrender; #N canvas 284 227 587 558 linkrender 0; --- 275,282 ---- #X connect 8 0 1 0; #X connect 9 0 8 0; ! #X connect 10 0 9 0; ! #X connect 10 1 1 1; ! #X connect 11 1 3 0; ! #X connect 11 2 5 0; #X restore 141 657 pd massrender; #N canvas 284 227 587 558 linkrender 0; *************** *** 306,310 **** #X obj 44 192 any; #X obj 93 164 t b f; - #X obj 93 69 unpack f f f f; #X obj 44 265 curve 2; #X obj 207 121 / 12.5; --- 290,293 ---- *************** *** 316,341 **** #X obj 207 193 pack f f; #X msg 207 216 \$1 \$2 0; ! #X connect 0 0 9 0; #X connect 1 0 2 0; #X connect 2 0 8 0; #X connect 3 0 4 0; ! #X connect 4 0 15 1; #X connect 5 0 7 1; ! #X connect 6 0 10 0; #X connect 7 0 6 0; #X connect 8 0 7 0; ! #X connect 8 1 15 0; ! #X connect 9 0 1 0; ! #X connect 9 1 3 0; ! #X connect 9 2 11 0; ! #X connect 9 3 13 0; ! #X connect 11 0 12 0; ! #X connect 12 0 17 0; ! #X connect 13 0 14 0; ! #X connect 14 0 17 1; ! #X connect 15 0 16 0; ! #X connect 16 0 10 1; ! #X connect 17 0 18 0; ! #X connect 18 0 10 2; #X restore 52 678 pd linkrender; #X msg 221 231 mass mob 1 \$1 \$2 \$3; --- 299,325 ---- #X obj 207 193 pack f f; #X msg 207 216 \$1 \$2 0; ! #X obj 93 69 unpack f f f f f; ! #X connect 0 0 18 0; #X connect 1 0 2 0; #X connect 2 0 8 0; #X connect 3 0 4 0; ! #X connect 4 0 14 1; #X connect 5 0 7 1; ! #X connect 6 0 9 0; #X connect 7 0 6 0; #X connect 8 0 7 0; ! #X connect 8 1 14 0; ! #X connect 10 0 11 0; ! #X connect 11 0 16 0; ! #X connect 12 0 13 0; ! #X connect 13 0 16 1; ! #X connect 14 0 15 0; ! #X connect 15 0 9 1; ! #X connect 16 0 17 0; ! #X connect 17 0 9 2; ! #X connect 18 1 1 0; ! #X connect 18 2 3 0; ! #X connect 18 3 10 0; ! #X connect 18 4 12 0; #X restore 52 678 pd linkrender; #X msg 221 231 mass mob 1 \$1 \$2 \$3; Index: 03_imsd2Dtest.pd =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd2D/03_imsd2Dtest.pd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** 03_imsd2Dtest.pd 21 Apr 2005 14:28:54 -0000 1.2 --- 03_imsd2Dtest.pd 26 Apr 2005 16:10:07 -0000 1.3 *************** *** 30,60 **** #X obj 47 547 cnv 15 400 200 empty empty empty 20 12 0 14 -261689 -66577 0; - #N canvas 643 123 605 590 massrender 0; - #X obj 127 22 inlet; - #X obj 48 203 translateXYZ; - #X obj 127 86 / 12.5; - #X obj 127 109 - 4; - #X obj 192 87 / 12.5; - #X obj 192 110 - 4; - #X obj 64 114 gemhead; - #X obj 48 177 separator; - #X obj 48 153 any; - #X obj 127 57 unpack f f; - #X obj 125 136 t b f; - #X obj 48 229 sphere 0.2; - #X connect 0 0 9 0; - #X connect 1 0 11 0; - #X connect 2 0 3 0; - #X connect 3 0 10 0; - #X connect 4 0 5 0; - #X connect 5 0 1 2; - #X connect 6 0 8 1; - #X connect 7 0 1 0; - #X connect 8 0 7 0; - #X connect 9 0 2 0; - #X connect 9 1 4 0; - #X connect 10 0 8 0; - #X connect 10 1 1 1; - #X restore 134 591 pd massrender; #N canvas 284 227 587 558 linkrender 0; #X obj 93 25 inlet; --- 30,33 ---- *************** *** 67,71 **** #X obj 44 192 any; #X obj 93 164 t b f; - #X obj 93 69 unpack f f f f; #X obj 44 265 curve 2; #X obj 207 121 / 12.5; --- 40,43 ---- *************** *** 77,102 **** #X obj 207 193 pack f f; #X msg 207 216 \$1 \$2 0; ! #X connect 0 0 9 0; #X connect 1 0 2 0; #X connect 2 0 8 0; #X connect 3 0 4 0; ! #X connect 4 0 15 1; #X connect 5 0 7 1; ! #X connect 6 0 10 0; #X connect 7 0 6 0; #X connect 8 0 7 0; ! #X connect 8 1 15 0; ! #X connect 9 0 1 0; ! #X connect 9 1 3 0; ! #X connect 9 2 11 0; ! #X connect 9 3 13 0; ! #X connect 11 0 12 0; ! #X connect 12 0 17 0; ! #X connect 13 0 14 0; ! #X connect 14 0 17 1; ! #X connect 15 0 16 0; ! #X connect 16 0 10 1; ! #X connect 17 0 18 0; ! #X connect 18 0 10 2; #X restore 53 614 pd linkrender; #X text 465 563 1 CREATE WINDOW -->; --- 49,75 ---- #X obj 207 193 pack f f; #X msg 207 216 \$1 \$2 0; ! #X obj 93 69 unpack f f f f f; ! #X connect 0 0 18 0; #X connect 1 0 2 0; #X connect 2 0 8 0; #X connect 3 0 4 0; ! #X connect 4 0 14 1; #X connect 5 0 7 1; ! #X connect 6 0 9 0; #X connect 7 0 6 0; #X connect 8 0 7 0; ! #X connect 8 1 14 0; ! #X connect 10 0 11 0; ! #X connect 11 0 16 0; ! #X connect 12 0 13 0; ! #X connect 13 0 16 1; ! #X connect 14 0 15 0; ! #X connect 15 0 9 1; ! #X connect 16 0 17 0; ! #X connect 17 0 9 2; ! #X connect 18 1 1 0; ! #X connect 18 2 3 0; ! #X connect 18 3 10 0; ! #X connect 18 4 12 0; #X restore 53 614 pd linkrender; #X text 465 563 1 CREATE WINDOW -->; *************** *** 151,191 **** #X msg 216 384 setK inter 1; #X msg 216 404 setK inter 2; ! #X connect 0 0 36 0; #X connect 3 0 2 0; #X connect 4 0 5 0; #X connect 6 0 2 0; ! #X connect 7 0 42 0; #X connect 7 1 1 0; #X connect 9 0 7 0; ! #X connect 10 0 36 0; #X connect 11 0 9 0; ! #X connect 13 0 30 1; #X connect 14 0 9 0; #X connect 15 0 9 0; #X connect 17 0 18 0; ! #X connect 18 0 43 0; #X connect 20 0 7 0; #X connect 21 0 7 0; ! #X connect 30 0 32 0; ! #X connect 30 0 33 0; ! #X connect 31 0 30 0; #X connect 32 0 7 0; ! #X connect 33 0 7 0; ! #X connect 35 0 9 0; ! #X connect 36 0 37 0; ! #X connect 36 1 40 0; ! #X connect 36 2 13 0; ! #X connect 36 2 15 0; ! #X connect 36 3 38 0; ! #X connect 36 4 14 0; ! #X connect 36 5 11 0; ! #X connect 37 0 9 0; ! #X connect 38 0 35 0; ! #X connect 40 0 9 0; ! #X connect 41 0 5 1; ! #X connect 42 0 26 0; ! #X connect 43 0 7 0; #X connect 46 0 7 0; #X connect 47 0 7 0; #X connect 48 0 7 0; - #X connect 49 0 7 0; --- 124,164 ---- #X msg 216 384 setK inter 1; #X msg 216 404 setK inter 2; ! #X connect 0 0 35 0; #X connect 3 0 2 0; #X connect 4 0 5 0; #X connect 6 0 2 0; ! #X connect 7 0 41 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 42 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 36 0; ! #X connect 35 1 39 0; ! #X connect 35 2 13 0; ! #X connect 35 2 15 0; ! #X connect 35 3 37 0; ! #X connect 35 4 14 0; ! #X connect 35 5 11 0; ! #X connect 36 0 9 0; ! #X connect 37 0 34 0; ! #X connect 39 0 9 0; ! #X connect 40 0 5 1; ! #X connect 41 0 25 0; ! #X connect 42 0 7 0; ! #X connect 45 0 7 0; #X connect 46 0 7 0; #X connect 47 0 7 0; #X connect 48 0 7 0;

1 0

externals/nusmuk/msd3D 01_msd3Dtest.pd, 1.2, 1.3 02_msd3Dperf.pd, 1.1, 1.2 03_msd3Dmemb.pd, 1.1, 1.2 04_msd3Dfilet.pd, 1.1, 1.2 05_msd3Dvline.pd, 1.2, 1.3 help-msd3D.pd, 1.3, 1.4 main.cpp, 1.6, 1.7 partiel.pd, 1.2, 1.3
by Nicolas Montgermont 26 Apr '05

26 Apr '05

Update of /cvsroot/pure-data/externals/nusmuk/msd3D In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13192/msd3D Modified Files: 01_msd3Dtest.pd 02_msd3Dperf.pd 03_msd3Dmemb.pd 04_msd3Dfilet.pd 05_msd3Dvline.pd help-msd3D.pd main.cpp partiel.pd Log Message: MSD Version 0.04 Index: 02_msd3Dperf.pd =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd3D/02_msd3Dperf.pd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** 02_msd3Dperf.pd 12 Apr 2005 16:34:31 -0000 1.1 --- 02_msd3Dperf.pd 26 Apr 2005 16:10:08 -0000 1.2 *************** *** 7,11 **** #X text 197 96 reset; #X obj 159 27 t b b b b b; - #X obj 313 605 print msd; #X msg 456 528 0 \, destroy; #X obj 456 583 gemhead; --- 7,10 ---- *************** *** 25,34 **** #X obj 48 153 any; #X obj 125 136 t b f; - #X obj 127 57 unpack f f f; #X obj 247 86 / 12.5; #X obj 247 109 - 4; #X obj 48 229 sphere 0.07; ! #X connect 0 0 10 0; ! #X connect 1 0 13 0; #X connect 2 0 3 0; #X connect 3 0 9 0; --- 24,33 ---- #X obj 48 153 any; #X obj 125 136 t b f; #X obj 247 86 / 12.5; #X obj 247 109 - 4; #X obj 48 229 sphere 0.07; ! #X obj 127 57 unpack f f f f; ! #X connect 0 0 13 0; ! #X connect 1 0 12 0; #X connect 2 0 3 0; #X connect 3 0 9 0; *************** *** 40,48 **** #X connect 9 0 8 0; #X connect 9 1 1 1; ! #X connect 10 0 2 0; ! #X connect 10 1 4 0; ! #X connect 10 2 11 0; ! #X connect 11 0 12 0; ! #X connect 12 0 1 3; #X restore 52 625 pd massrender; #X obj 425 254 random 100; --- 39,47 ---- #X connect 9 0 8 0; #X connect 9 1 1 1; ! #X connect 10 0 11 0; ! #X connect 11 0 1 3; ! #X connect 13 1 2 0; ! #X connect 13 2 4 0; ! #X connect 13 3 10 0; #X restore 52 625 pd massrender; #X obj 425 254 random 100; *************** *** 83,145 **** #X msg 143 503 forceX mob -100; #X msg 459 20 900; ! #X connect 0 0 32 0; #X connect 1 0 5 0; #X connect 2 0 0 0; #X connect 3 0 5 0; ! #X connect 5 0 41 0; ! #X connect 5 1 38 0; ! #X connect 5 2 40 0; ! #X connect 5 3 10 0; #X connect 5 4 2 0; ! #X connect 5 4 26 0; ! #X connect 5 4 19 0; ! #X connect 5 4 15 0; #X connect 5 4 18 0; ! #X connect 5 4 35 0; ! #X connect 7 0 31 0; ! #X connect 8 0 9 0; ! #X connect 10 0 0 0; ! #X connect 11 0 31 0; ! #X connect 11 0 43 0; ! #X connect 12 0 45 0; ! #X connect 14 0 36 2; ! #X connect 15 0 14 0; ! #X connect 16 0 36 1; ! #X connect 17 0 20 0; #X connect 18 0 16 0; ! #X connect 19 0 17 0; ! #X connect 20 0 36 0; ! #X connect 21 0 27 0; ! #X connect 22 0 24 0; ! #X connect 22 0 25 0; #X connect 22 0 27 1; ! #X connect 23 0 28 1; ! #X connect 24 0 23 1; ! #X connect 25 0 28 0; ! #X connect 25 1 23 0; ! #X connect 26 0 27 1; ! #X connect 27 0 22 0; ! #X connect 28 0 29 0; ! #X connect 29 0 0 0; ! #X connect 30 0 12 0; ! #X connect 32 0 44 0; ! #X connect 32 1 6 0; ! #X connect 33 0 17 0; ! #X connect 33 1 16 0; ! #X connect 33 1 34 0; ! #X connect 33 2 14 0; ! #X connect 34 0 36 3; ! #X connect 35 0 34 0; ! #X connect 36 0 37 0; #X connect 37 0 0 0; ! #X connect 38 0 0 0; ! #X connect 39 0 31 0; ! #X connect 40 0 33 0; ! #X connect 41 0 21 0; ! #X connect 43 0 39 0; ! #X connect 44 0 13 0; ! #X connect 45 0 32 0; ! #X connect 47 0 32 0; ! #X connect 48 0 32 0; ! #X connect 49 0 40 1; ! #X connect 49 0 41 1; --- 82,143 ---- #X msg 143 503 forceX mob -100; #X msg 459 20 900; ! #X connect 0 0 31 0; #X connect 1 0 5 0; #X connect 2 0 0 0; #X connect 3 0 5 0; ! #X connect 5 0 40 0; ! #X connect 5 1 37 0; ! #X connect 5 2 39 0; ! #X connect 5 3 9 0; #X connect 5 4 2 0; ! #X connect 5 4 25 0; #X connect 5 4 18 0; ! #X connect 5 4 14 0; ! #X connect 5 4 17 0; ! #X connect 5 4 34 0; ! #X connect 6 0 30 0; ! #X connect 7 0 8 0; ! #X connect 9 0 0 0; ! #X connect 10 0 30 0; ! #X connect 10 0 42 0; ! #X connect 11 0 44 0; ! #X connect 13 0 35 2; ! #X connect 14 0 13 0; ! #X connect 15 0 35 1; ! #X connect 16 0 19 0; ! #X connect 17 0 15 0; #X connect 18 0 16 0; ! #X connect 19 0 35 0; ! #X connect 20 0 26 0; ! #X connect 21 0 23 0; ! #X connect 21 0 24 0; ! #X connect 21 0 26 1; #X connect 22 0 27 1; ! #X connect 23 0 22 1; ! #X connect 24 0 27 0; ! #X connect 24 1 22 0; ! #X connect 25 0 26 1; ! #X connect 26 0 21 0; ! #X connect 27 0 28 0; ! #X connect 28 0 0 0; ! #X connect 29 0 11 0; ! #X connect 31 0 43 0; ! #X connect 32 0 16 0; ! #X connect 32 1 15 0; ! #X connect 32 1 33 0; ! #X connect 32 2 13 0; ! #X connect 33 0 35 3; ! #X connect 34 0 33 0; ! #X connect 35 0 36 0; ! #X connect 36 0 0 0; #X connect 37 0 0 0; ! #X connect 38 0 30 0; ! #X connect 39 0 32 0; ! #X connect 40 0 20 0; ! #X connect 42 0 38 0; ! #X connect 43 0 12 0; ! #X connect 44 0 31 0; ! #X connect 46 0 31 0; ! #X connect 47 0 31 0; ! #X connect 48 0 39 1; ! #X connect 48 0 40 1; Index: main.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd3D/main.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** main.cpp 26 Apr 2005 11:39:49 -0000 1.6 --- main.cpp 26 Apr 2005 16:10:08 -0000 1.7 *************** *** 31,35 **** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ! Version 0.03 -- 21.04.2005 */ --- 31,35 ---- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ! Version 0.04 -- 26.04.2005 */ *************** *** 39,43 **** // define constants ! #define MSD3D_VERSION 0.03 #define nb_max_link 4000 #define nb_max_mass 4000 --- 39,43 ---- // define constants ! #define MSD3D_VERSION 0.04 #define nb_max_link 4000 #define nb_max_mass 4000 *************** *** 481,528 **** t_atom sortie[7], aux[2]; t_int i; ! if (argc < 6 || argc > 8) ! error("link : Id Nomass1 Nomass2 K D1 D2 (Lmin Lmax)"); ! link[nb_link] = new t_link; // New pointer ! link[nb_link]->Id = GetSymbol(argv[0]); // ID ! for (i=0; i<nb_mass;i++) ! if (mass[i]->nbr==GetAInt(argv[1])) // pointer to mass1 ! link[nb_link]->mass1 = mass[i]; ! else if(mass[i]->nbr==GetAInt(argv[2])) // pointer to mass2 ! link[nb_link]->mass2 = mass[i]; ! link[nb_link]->K1 = GetFloat(argv[3]); // K1 ! link[nb_link]->D1 = GetFloat(argv[4]); // D1 ! link[nb_link]->D2 = GetFloat(argv[5]); // D2 ! link[nb_link]->longx = link[nb_link]->mass1->posX - link[nb_link]->mass2->posX; // Lx[0] ! link[nb_link]->longy = link[nb_link]->mass1->posY - link[nb_link]->mass2->posY; // Ly[0] ! link[nb_link]->longz = link[nb_link]->mass1->posZ - link[nb_link]->mass2->posZ; // Lz[0] ! link[nb_link]->longueur = sqrt(pow(link[nb_link]->longx,2)+pow(link[nb_link]->longy,2)+pow(link[nb_link]->longz,2));//L[0] ! link[nb_link]->nbr = id_link; // id number ! link[nb_link]->distance_old = link[nb_link]->longueur; // L[n-1] ! switch (argc) { ! case 6 : ! link[nb_link]->long_max = 32768; ! link[nb_link]->long_min = 0; ! break; ! case 7 : ! link[nb_link]->long_min = GetFloat(argv[6]); ! link[nb_link]->long_max = 32768; ! break; ! case 8 : ! link[nb_link]->long_min = GetFloat(argv[6]); ! link[nb_link]->long_max = GetFloat(argv[7]); ! break; ! } ! nb_link++; ! id_link++; ! nb_link = min ( nb_max_link -1, nb_link ); ! SetFloat((sortie[0]),id_link-1); ! SetSymbol((sortie[1]),link[nb_link-1]->Id); ! SetFloat((sortie[2]),GetInt(argv[1])); ! SetFloat((sortie[3]),GetInt(argv[2])); ! SetFloat((sortie[4]),link[nb_link-1]->K1); ! SetFloat((sortie[5]),link[nb_link-1]->D1); ! SetFloat((sortie[6]),link[nb_link-1]->D2); ! ToOutAnything(1,S_Link,7,sortie); } --- 481,542 ---- t_atom sortie[7], aux[2]; t_int i; + t_mass *mass1 = NULL; + t_mass *mass2 = NULL; + + if (argc < 6 || argc > 8) + error("link : Id Nomass1 Nomass2 K D1 D2 (Lmin Lmax)"); + + // check for existence of link masses: + for (i=0; i<nb_mass;i++) + if (mass[i]->nbr==GetInt(argv[1])) // pointer to mass1 + // we found mass1 + mass1 = mass[i]; + else if (mass[i]->nbr==GetInt(argv[2])) // pointer to mass2 + // ... and mass2 + mass2 = mass[i]; ! if (mass1 and mass2) ! { ! link[nb_link] = new t_link; // New pointer ! link[nb_link]->Id = GetSymbol(argv[0]); // ID ! link[nb_link]->mass1 = mass1; // pointer to mass1 ! link[nb_link]->mass2 = mass2; // pointer to mass2 ! link[nb_link]->K1 = GetFloat(argv[3]); // K1 ! link[nb_link]->D1 = GetFloat(argv[4]); // D1 ! link[nb_link]->D2 = GetFloat(argv[5]); // D2 ! link[nb_link]->longx = link[nb_link]->mass1->posX - link[nb_link]->mass2->posX; // Lx[0] ! link[nb_link]->longy = link[nb_link]->mass1->posY - link[nb_link]->mass2->posY; // Ly[0] ! link[nb_link]->longz = link[nb_link]->mass1->posZ - link[nb_link]->mass2->posZ; // Lz[0] ! link[nb_link]->longueur = sqrt(pow(link[nb_link]->longx,2)+pow(link[nb_link]->longy,2)+pow(link[nb_link]->longz,2));//L[0] ! link[nb_link]->nbr = id_link; // id number ! link[nb_link]->distance_old = link[nb_link]->longueur; // L[n-1] ! switch (argc) { ! case 6 : ! link[nb_link]->long_max = 32768; ! link[nb_link]->long_min = 0; ! break; ! case 7 : ! link[nb_link]->long_min = GetFloat(argv[6]); ! link[nb_link]->long_max = 32768; ! break; ! case 8 : ! link[nb_link]->long_min = GetFloat(argv[6]); ! link[nb_link]->long_max = GetFloat(argv[7]); ! break; ! } ! nb_link++; ! id_link++; ! nb_link = min ( nb_max_link -1, nb_link ); ! SetFloat((sortie[0]),id_link-1); ! SetSymbol((sortie[1]),link[nb_link-1]->Id); ! SetFloat((sortie[2]),GetInt(argv[1])); ! SetFloat((sortie[3]),GetInt(argv[2])); ! SetFloat((sortie[4]),link[nb_link-1]->K1); ! SetFloat((sortie[5]),link[nb_link-1]->D1); ! SetFloat((sortie[6]),link[nb_link-1]->D2); ! ToOutAnything(1,S_Link,7,sortie); ! } ! else ! error("link : Cannot create link: Not all masses for this link have been created yet."); } *************** *** 661,665 **** t_int i,j; t_symbol *auxarg,*auxarg2, *auxtype; ! t_atom sortie[6]; auxtype = GetSymbol(argv[0]); auxarg = GetASymbol(argv[1]); //auxarg : & symbol, 0 else --- 675,679 ---- t_int i,j; t_symbol *auxarg,*auxarg2, *auxtype; ! t_atom sortie[7]; auxtype = GetSymbol(argv[0]); auxarg = GetASymbol(argv[1]); //auxarg : & symbol, 0 else *************** *** 670,704 **** for (i=0; i<nb_mass; i++) { ! SetFloat(sortie[0],mass[i]->posX); ! SetFloat(sortie[1],mass[i]->posY); ! SetFloat(sortie[2],mass[i]->posZ); ! ToOutAnything(0,S_massesPos,3,sortie); } else if (auxtype == S_massesForces)// get all masses forces for (i=0; i<nb_mass; i++) { ! SetFloat(sortie[0],mass[i]->out_forceX); ! SetFloat(sortie[1],mass[i]->out_forceY); ! SetFloat(sortie[2],mass[i]->out_forceZ); ! ToOutAnything(0,S_massesForces,3,sortie); } else if (auxtype == S_linksPos)// get all links positions for (i=0; i<nb_link; i++) { ! SetFloat(sortie[0],link[i]->mass1->posX); ! SetFloat(sortie[1],link[i]->mass1->posY); ! SetFloat(sortie[2],link[i]->mass1->posZ); ! SetFloat(sortie[3],link[i]->mass2->posX); ! SetFloat(sortie[4],link[i]->mass2->posY); ! SetFloat(sortie[5],link[i]->mass2->posZ); ! ToOutAnything(0,S_linksPos,6,sortie); } else // get all masses speeds for (i=0; i<nb_mass; i++) { ! SetFloat(sortie[0],mass[i]->speedX); ! SetFloat(sortie[1],mass[i]->speedY); ! SetFloat(sortie[2],mass[i]->speedZ); ! ToOutAnything(0,S_massesSpeeds,3,sortie); } } --- 684,722 ---- for (i=0; i<nb_mass; i++) { ! SetFloat(sortie[0],mass[i]->nbr); ! SetFloat(sortie[1],mass[i]->posX); ! SetFloat(sortie[2],mass[i]->posY); ! SetFloat(sortie[3],mass[i]->posZ); ! ToOutAnything(0,S_massesPos,4,sortie); } else if (auxtype == S_massesForces)// get all masses forces for (i=0; i<nb_mass; i++) { ! SetFloat(sortie[0],mass[i]->nbr); ! SetFloat(sortie[1],mass[i]->out_forceX); ! SetFloat(sortie[2],mass[i]->out_forceY); ! SetFloat(sortie[3],mass[i]->out_forceZ); ! ToOutAnything(0,S_massesForces,4,sortie); } else if (auxtype == S_linksPos)// get all links positions for (i=0; i<nb_link; i++) { ! SetFloat(sortie[0],link[i]->nbr); ! SetFloat(sortie[1],link[i]->mass1->posX); ! SetFloat(sortie[2],link[i]->mass1->posY); ! SetFloat(sortie[3],link[i]->mass1->posZ); ! SetFloat(sortie[4],link[i]->mass2->posX); ! SetFloat(sortie[5],link[i]->mass2->posY); ! SetFloat(sortie[6],link[i]->mass2->posZ); ! ToOutAnything(0,S_linksPos,7,sortie); } else // get all masses speeds for (i=0; i<nb_mass; i++) { ! SetFloat(sortie[0],mass[i]->nbr); ! SetFloat(sortie[1],mass[i]->speedX); ! SetFloat(sortie[2],mass[i]->speedY); ! SetFloat(sortie[3],mass[i]->speedZ); ! ToOutAnything(0,S_massesSpeeds,4,sortie); } } *************** *** 711,718 **** if (mass[i]->nbr==GetInt(argv[j])) { ! SetFloat(sortie[0],mass[i]->posX); ! SetFloat(sortie[1],mass[i]->posY); ! SetFloat(sortie[2],mass[i]->posZ); ! ToOutAnything(0,S_massesPosNo,3,sortie); } } --- 729,737 ---- if (mass[i]->nbr==GetInt(argv[j])) { ! SetFloat(sortie[0],mass[i]->nbr); ! SetFloat(sortie[1],mass[i]->posX); ! SetFloat(sortie[2],mass[i]->posY); ! SetFloat(sortie[3],mass[i]->posZ); ! ToOutAnything(0,S_massesPosNo,4,sortie); } } *************** *** 726,733 **** if (auxarg2==mass[i]->Id) { ! SetFloat(sortie[0],mass[i]->posX); ! SetFloat(sortie[1],mass[i]->posY); ! SetFloat(sortie[2],mass[i]->posZ); ! ToOutAnything(0,S_massesPosId,3,sortie); } } --- 745,753 ---- if (auxarg2==mass[i]->Id) { ! SetSymbol(sortie[0],mass[i]->Id); ! SetFloat(sortie[1],mass[i]->posX); ! SetFloat(sortie[2],mass[i]->posY); ! SetFloat(sortie[3],mass[i]->posZ); ! ToOutAnything(0,S_massesPosId,4,sortie); } } *************** *** 743,750 **** if (mass[i]->nbr==GetInt(argv[j])) { ! SetFloat(sortie[0],mass[i]->out_forceX); ! SetFloat(sortie[1],mass[i]->out_forceY); ! SetFloat(sortie[2],mass[i]->out_forceZ); ! ToOutAnything(0,S_massesForcesNo,3,sortie); } } --- 763,771 ---- if (mass[i]->nbr==GetInt(argv[j])) { ! SetFloat(sortie[0],mass[i]->nbr); ! SetFloat(sortie[1],mass[i]->out_forceX); ! SetFloat(sortie[2],mass[i]->out_forceY); ! SetFloat(sortie[3],mass[i]->out_forceZ); ! ToOutAnything(0,S_massesForcesNo,4,sortie); } } *************** *** 758,765 **** if (auxarg2==mass[i]->Id) { ! SetFloat(sortie[0],mass[i]->out_forceX); ! SetFloat(sortie[1],mass[i]->out_forceY); ! SetFloat(sortie[2],mass[i]->out_forceZ); ! ToOutAnything(0,S_massesForcesId,3,sortie); } } --- 779,787 ---- if (auxarg2==mass[i]->Id) { ! SetSymbol(sortie[0],mass[i]->Id); ! SetFloat(sortie[1],mass[i]->out_forceX); ! SetFloat(sortie[2],mass[i]->out_forceY); ! SetFloat(sortie[3],mass[i]->out_forceZ); ! ToOutAnything(0,S_massesForcesId,4,sortie); } } *************** *** 775,785 **** if (link[i]->nbr==GetInt(argv[j])) { ! SetFloat(sortie[0],link[i]->mass1->posX); ! SetFloat(sortie[1],link[i]->mass1->posY); ! SetFloat(sortie[2],link[i]->mass1->posZ); ! SetFloat(sortie[3],link[i]->mass2->posX); ! SetFloat(sortie[4],link[i]->mass2->posY); ! SetFloat(sortie[5],link[i]->mass2->posZ); ! ToOutAnything(0,S_linksPosNo,6,sortie); } } --- 797,808 ---- if (link[i]->nbr==GetInt(argv[j])) { ! SetFloat(sortie[0],link[i]->nbr); ! SetFloat(sortie[1],link[i]->mass1->posX); ! SetFloat(sortie[2],link[i]->mass1->posY); ! SetFloat(sortie[3],link[i]->mass1->posZ); ! SetFloat(sortie[4],link[i]->mass2->posX); ! SetFloat(sortie[5],link[i]->mass2->posY); ! SetFloat(sortie[6],link[i]->mass2->posZ); ! ToOutAnything(0,S_linksPosNo,7,sortie); } } *************** *** 793,803 **** if (auxarg2==link[i]->Id) { ! SetFloat(sortie[0],link[i]->mass1->posX); ! SetFloat(sortie[1],link[i]->mass1->posY); ! SetFloat(sortie[2],link[i]->mass1->posZ); ! SetFloat(sortie[3],link[i]->mass2->posX); ! SetFloat(sortie[4],link[i]->mass2->posY); ! SetFloat(sortie[5],link[i]->mass2->posZ); ! ToOutAnything(0,S_linksPosId,6,sortie); } } --- 816,827 ---- if (auxarg2==link[i]->Id) { ! SetSymbol(sortie[0],link[i]->Id); ! SetFloat(sortie[1],link[i]->mass1->posX); ! SetFloat(sortie[2],link[i]->mass1->posY); ! SetFloat(sortie[3],link[i]->mass1->posZ); ! SetFloat(sortie[4],link[i]->mass2->posX); ! SetFloat(sortie[5],link[i]->mass2->posY); ! SetFloat(sortie[6],link[i]->mass2->posZ); ! ToOutAnything(0,S_linksPosId,7,sortie); } } *************** *** 813,820 **** if (mass[i]->nbr==GetInt(argv[j])) { ! SetFloat(sortie[0],mass[i]->speedX); ! SetFloat(sortie[1],mass[i]->speedY); ! SetFloat(sortie[2],mass[i]->speedZ); ! ToOutAnything(0,S_massesSpeedsNo,3,sortie); } } --- 837,845 ---- if (mass[i]->nbr==GetInt(argv[j])) { ! SetFloat(sortie[0],mass[i]->nbr); ! SetFloat(sortie[1],mass[i]->speedX); ! SetFloat(sortie[2],mass[i]->speedY); ! SetFloat(sortie[3],mass[i]->speedZ); ! ToOutAnything(0,S_massesSpeedsNo,4,sortie); } } *************** *** 828,835 **** if (auxarg2==mass[i]->Id) { ! SetFloat(sortie[0],mass[i]->speedX); ! SetFloat(sortie[1],mass[i]->speedY); ! SetFloat(sortie[2],mass[i]->speedZ); ! ToOutAnything(0,S_massesSpeedsId,3,sortie); } } --- 853,861 ---- if (auxarg2==mass[i]->Id) { ! SetSymbol(sortie[0],mass[i]->Id); ! SetFloat(sortie[1],mass[i]->speedX); ! SetFloat(sortie[2],mass[i]->speedY); ! SetFloat(sortie[3],mass[i]->speedZ); ! ToOutAnything(0,S_massesSpeedsId,4,sortie); } } Index: 05_msd3Dvline.pd =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd3D/05_msd3Dvline.pd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** 05_msd3Dvline.pd 21 Apr 2005 14:28:54 -0000 1.2 --- 05_msd3Dvline.pd 26 Apr 2005 16:10:08 -0000 1.3 *************** *** 1,5 **** #N canvas 499 155 796 654 10; #X obj 32 13 loadbang; - #X obj 294 522 print msd; #X obj 457 430 gemwin; #X msg 457 408 0 \, destroy; --- 1,4 ---- *************** *** 16,33 **** #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 0 1; #X obj 444 258 f; #X obj 444 234 metro 65; #X msg 326 468 setD fil 1; - #X obj 33 257 t b b b b b; #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 0 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 0 1; #X obj 206 275 / 3.6; --- 15,31 ---- #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 326 468 setD fil 1; #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 11000 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; *************** *** 56,60 **** #N canvas 224 164 901 724 synthese 0; #X obj 232 66 inlet; - #X obj 232 88 unpack f f f; #X obj 232 176 pack f f f f; #X obj 231 316 partiel; --- 54,57 ---- *************** *** 88,92 **** #X connect 13 0 5 0; #X connect 13 1 8 0; ! #X restore 375 627 pd drone; #X obj 232 154 t f f; #X msg 143 113 reset; --- 85,89 ---- #X connect 13 0 5 0; #X connect 13 1 8 0; ! #X restore 627 480 pd drone; #X obj 232 154 t f f; #X msg 143 113 reset; *************** *** 94,149 **** #X obj 173 49 r resban; #X obj 232 110 t b f; ! #N canvas 669 177 562 569 noise 0; ! #X obj 176 62 inlet; ! #X obj 285 493 outlet~; ! #X msg 176 84 \$1; ! #X obj 176 105 abs; ! #X obj 302 190 line~; ! #X obj 285 472 *~; ! #X obj 176 149 t b; ! #X obj 248 149 t b; ! #X obj 147 425 noise~; ! #X msg 162 197 \$3; ! #X obj 162 218 abs; ! #X obj 162 239 * 50; ! #X obj 148 445 moog~; ! #X obj 179 404 sig~; ! #X obj 162 260 + 0; ! #X obj 162 351 sig~; ! #X obj 177 126 moses 0.008; ! #X msg 179 379 1; ! #X obj 162 282 max 0.5; ! #X obj 162 304 min 2.5; ! #X floatatom 245 389 5 0 0 0 - - -; ! #X msg 302 166 0.5 5; ! #X obj 162 330 * 900; ! #X msg 176 173 0 20; ! #X connect 0 0 2 0; ! #X connect 0 0 9 0; ! #X connect 2 0 3 0; ! #X connect 3 0 16 0; ! #X connect 4 0 5 1; ! #X connect 5 0 1 0; ! #X connect 6 0 23 0; ! #X connect 7 0 21 0; ! #X connect 8 0 12 0; ! #X connect 9 0 10 0; ! #X connect 10 0 11 0; ! #X connect 11 0 14 0; ! #X connect 12 0 5 0; ! #X connect 13 0 12 2; ! #X connect 14 0 18 0; ! #X connect 15 0 12 1; ! #X connect 16 0 6 0; ! #X connect 16 1 7 0; ! #X connect 17 0 13 0; ! #X connect 18 0 19 0; ! #X connect 19 0 22 0; ! #X connect 20 0 13 0; ! #X connect 21 0 4 0; ! #X connect 22 0 15 0; ! #X connect 23 0 4 0; ! #X restore 479 643 pd noise; ! #X obj 521 497 hip~ 20; #X obj 401 501 hip~ 20; #X obj 443 563 dac~; --- 91,95 ---- #X obj 173 49 r resban; #X obj 232 110 t b f; ! #X obj 521 498 hip~ 20; #X obj 401 501 hip~ 20; #X obj 443 563 dac~; *************** *** 151,154 **** --- 97,101 ---- #X obj 235 254 route 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29; + #X obj 232 88 unpack f f f f; #X obj 288 385 partiel; #X obj 250 339 partiel; *************** *** 180,333 **** #X obj 710 313 partiel; #X obj 729 336 partiel; ! #X connect 0 0 1 0; ! #X connect 1 0 9 0; ! #X connect 1 1 2 2; ! #X connect 1 2 2 3; ! #X connect 2 0 15 0; ! #X connect 3 0 11 0; ! #X connect 4 0 12 0; ! #X connect 4 0 11 0; ! #X connect 5 0 2 0; ! #X connect 6 0 14 0; ! #X connect 7 0 6 0; ! #X connect 8 0 6 0; ! #X connect 9 0 14 0; ! #X connect 9 1 2 1; ! #X connect 11 0 13 1; ! #X connect 12 0 13 0; ! #X connect 14 0 5 0; ! #X connect 15 0 3 0; ! #X connect 15 1 17 0; ! #X connect 15 2 18 0; ! #X connect 15 3 16 0; ! #X connect 15 4 19 0; ! #X connect 15 5 20 0; ! #X connect 15 6 21 0; ! #X connect 15 7 22 0; ! #X connect 15 8 23 0; ! #X connect 15 9 24 0; ! #X connect 15 10 25 0; ! #X connect 15 11 26 0; ! #X connect 15 12 27 0; ! #X connect 15 13 28 0; ! #X connect 15 14 29 0; ! #X connect 15 15 30 0; ! #X connect 15 16 31 0; ! #X connect 15 17 32 0; ! #X connect 15 18 33 0; ! #X connect 15 19 34 0; ! #X connect 15 20 35 0; ! #X connect 15 21 36 0; ! #X connect 15 22 37 0; ! #X connect 15 23 38 0; ! #X connect 15 24 39 0; ! #X connect 15 25 40 0; ! #X connect 15 26 41 0; ! #X connect 15 27 42 0; ! #X connect 15 28 43 0; ! #X connect 15 29 44 0; ! #X connect 16 0 12 0; ! #X connect 17 0 12 0; ! #X connect 18 0 11 0; ! #X connect 19 0 11 0; ! #X connect 20 0 12 0; ! #X connect 21 0 11 0; ! #X connect 22 0 12 0; ! #X connect 23 0 11 0; ! #X connect 24 0 12 0; ! #X connect 25 0 11 0; ! #X connect 26 0 12 0; ! #X connect 27 0 11 0; ! #X connect 28 0 12 0; ! #X connect 29 0 11 0; ! #X connect 30 0 12 0; ! #X connect 31 0 11 0; ! #X connect 32 0 12 0; ! #X connect 33 0 11 0; ! #X connect 34 0 12 0; ! #X connect 35 0 11 0; ! #X connect 36 0 12 0; ! #X connect 37 0 11 0; ! #X connect 38 0 12 0; ! #X connect 39 0 11 0; ! #X connect 40 0 12 0; ! #X connect 41 0 11 0; ! #X connect 42 0 12 0; ! #X connect 43 0 11 0; ! #X connect 44 0 12 0; #X restore 33 572 pd synthese; #X obj 183 219 vsl 15 128 0 30 0 0 empty empty empty 0 -8 0 8 -262131 ! -1 -1 0 1; #N canvas 571 334 938 386 massrender 0; #X obj 286 2 inlet; #X obj 35 134 gemhead; #X obj 44 192 any; ! #X obj 382 3 inlet; ! #X obj 304 88 f 0; ! #X obj 304 129 + 1; ! #X obj 443 184 pack f f f f; ! #X obj 461 153 unpack f f f; ! #X obj 282 24 t b b a; ! #X msg 383 68 0; ! #X obj 304 108 t f f; ! #X obj 303 152 % 30; #X obj 55 227 route 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29; ! #X obj 211 189 sel 0; #X obj 44 288 curve16 --------------------------------------------- ; #X connect 0 0 8 0; #X connect 1 0 2 1; ! #X connect 2 0 14 0; ! #X connect 3 0 9 0; ! #X connect 4 0 10 0; ! #X connect 5 0 11 0; ! #X connect 6 0 12 0; ! #X connect 7 0 6 1; ! #X connect 7 1 6 2; ! #X connect 7 2 6 3; ! #X connect 8 1 4 0; ! #X connect 8 2 7 0; ! #X connect 9 0 4 1; ! #X connect 10 0 5 0; ! #X connect 10 1 6 0; ! #X connect 11 0 4 1; ! #X connect 11 0 13 0; ! #X connect 12 0 14 1; ! #X connect 12 1 14 2; ! #X connect 12 2 14 3; ! #X connect 12 3 14 4; ! #X connect 12 4 14 5; ! #X connect 12 5 14 6; ! #X connect 12 6 14 7; ! #X connect 12 7 14 8; ! #X connect 12 8 14 9; ! #X connect 12 9 14 10; ! #X connect 12 10 14 11; ! #X connect 12 11 14 12; ! #X connect 12 12 14 13; ! #X connect 12 13 14 14; ! #X connect 12 14 14 15; ! #X connect 12 15 14 16; ! #X connect 12 16 14 17; ! #X connect 12 17 14 18; ! #X connect 12 18 14 19; ! #X connect 12 19 14 20; ! #X connect 12 20 14 21; ! #X connect 12 21 14 22; ! #X connect 12 22 14 23; ! #X connect 12 23 14 24; ! #X connect 12 24 14 25; ! #X connect 12 25 14 26; ! #X connect 12 26 14 27; ! #X connect 12 27 14 28; ! #X connect 12 28 14 29; ! #X connect 12 29 14 30; ! #X connect 13 0 2 0; #X restore 135 573 pd massrender; #X msg 165 140 setFixed 0 \, setFixed 29 \, setFixed 420 \, setFixed 449; #X text 459 114 Filet abstraction : x0 y0 stepx stepy ny nx; ! #X text 484 206 <-- Add constant force; #X text 240 204 <-- Add sinus force; #X text 136 360 Get middles masses; --- 127,267 ---- #X obj 710 313 partiel; #X obj 729 336 partiel; ! #X connect 0 0 14 0; ! #X connect 1 0 13 0; ! #X connect 2 0 9 0; ! #X connect 3 0 10 0; ! #X connect 3 0 9 0; ! #X connect 4 0 1 0; ! #X connect 5 0 12 0; ! #X connect 6 0 5 0; ! #X connect 7 0 5 0; ! #X connect 8 0 12 0; ! #X connect 8 1 1 1; ! #X connect 9 0 11 1; ! #X connect 10 0 11 0; ! #X connect 12 0 4 0; ! #X connect 13 0 2 0; ! #X connect 13 1 16 0; ! #X connect 13 2 17 0; ! #X connect 13 3 15 0; ! #X connect 13 4 18 0; ! #X connect 13 5 19 0; ! #X connect 13 6 20 0; ! #X connect 13 7 21 0; ! #X connect 13 8 22 0; ! #X connect 13 9 23 0; ! #X connect 13 10 24 0; ! #X connect 13 11 25 0; ! #X connect 13 12 26 0; ! #X connect 13 13 27 0; ! #X connect 13 14 28 0; ! #X connect 13 15 29 0; ! #X connect 13 16 30 0; ! #X connect 13 17 31 0; ! #X connect 13 18 32 0; ! #X connect 13 19 33 0; ! #X connect 13 20 34 0; ! #X connect 13 21 35 0; ! #X connect 13 22 36 0; ! #X connect 13 23 37 0; ! #X connect 13 24 38 0; ! #X connect 13 25 39 0; ! #X connect 13 26 40 0; ! #X connect 13 27 41 0; ! #X connect 13 28 42 0; ! #X connect 13 29 43 0; ! #X connect 14 1 8 0; ! #X connect 14 2 1 2; ! #X connect 14 3 1 3; ! #X connect 15 0 10 0; ! #X connect 16 0 10 0; ! #X connect 17 0 9 0; ! #X connect 18 0 9 0; ! #X connect 19 0 10 0; ! #X connect 20 0 9 0; ! #X connect 21 0 10 0; ! #X connect 22 0 9 0; ! #X connect 23 0 10 0; ! #X connect 24 0 9 0; ! #X connect 25 0 10 0; ! #X connect 26 0 9 0; ! #X connect 27 0 10 0; ! #X connect 28 0 9 0; ! #X connect 29 0 10 0; ! #X connect 30 0 9 0; ! #X connect 31 0 10 0; ! #X connect 32 0 9 0; ! #X connect 33 0 10 0; ! #X connect 34 0 9 0; ! #X connect 35 0 10 0; ! #X connect 36 0 9 0; ! #X connect 37 0 10 0; ! #X connect 38 0 9 0; ! #X connect 39 0 10 0; ! #X connect 40 0 9 0; ! #X connect 41 0 10 0; ! #X connect 42 0 9 0; ! #X connect 43 0 10 0; #X restore 33 572 pd synthese; #X obj 183 219 vsl 15 128 0 30 0 0 empty empty empty 0 -8 0 8 -262131 ! -1 -1 10100 1; #N canvas 571 334 938 386 massrender 0; #X obj 286 2 inlet; #X obj 35 134 gemhead; #X obj 44 192 any; ! #X obj 306 144 pack f f f f; ! #X obj 306 99 % 30; #X obj 55 227 route 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29; ! #X obj 306 119 sel 0; #X obj 44 288 curve16 --------------------------------------------- ; + #X obj 306 74 unpack f f f f; #X connect 0 0 8 0; #X connect 1 0 2 1; ! #X connect 2 0 7 0; ! #X connect 3 0 5 0; ! #X connect 4 0 6 0; ! #X connect 4 0 3 0; ! #X connect 5 0 7 1; ! #X connect 5 1 7 2; ! #X connect 5 2 7 3; ! #X connect 5 3 7 4; ! #X connect 5 4 7 5; ! #X connect 5 5 7 6; ! #X connect 5 6 7 7; ! #X connect 5 7 7 8; ! #X connect 5 8 7 9; ! #X connect 5 9 7 10; ! #X connect 5 10 7 11; ! #X connect 5 11 7 12; ! #X connect 5 12 7 13; ! #X connect 5 13 7 14; ! #X connect 5 14 7 15; ! #X connect 5 15 7 16; ! #X connect 5 16 7 17; ! #X connect 5 17 7 18; ! #X connect 5 18 7 19; ! #X connect 5 19 7 20; ! #X connect 5 20 7 21; ! #X connect 5 21 7 22; ! #X connect 5 22 7 23; ! #X connect 5 23 7 24; ! #X connect 5 24 7 25; ! #X connect 5 25 7 26; ! #X connect 5 26 7 27; ! #X connect 5 27 7 28; ! #X connect 5 28 7 29; ! #X connect 5 29 7 30; ! #X connect 6 0 2 0; ! #X connect 8 0 4 0; ! #X connect 8 1 3 1; ! #X connect 8 2 3 2; ! #X connect 8 3 3 3; #X restore 135 573 pd massrender; #X msg 165 140 setFixed 0 \, setFixed 29 \, setFixed 420 \, setFixed 449; #X text 459 114 Filet abstraction : x0 y0 stepx stepy ny nx; ! #X text 483 206 <-- Add constant force; #X text 240 204 <-- Add sinus force; #X text 136 360 Get middles masses; *************** *** 349,405 **** #X msg 33 443 get massesPos; #X obj 33 539 route massesPosNo massesPos; ! #X connect 0 0 13 0; ! #X connect 3 0 2 0; ! #X connect 4 0 5 0; ! #X connect 6 0 11 0; ! #X connect 7 0 13 0; ! #X connect 8 0 6 0; ! #X connect 9 0 19 0; ! #X connect 10 0 40 1; ! #X connect 11 0 53 0; ! #X connect 11 1 1 0; ! #X connect 13 0 50 0; ! #X connect 13 0 42 0; ! #X connect 13 1 33 0; ! #X connect 13 2 40 0; ! #X connect 13 3 8 0; ! #X connect 13 3 10 0; ! #X connect 14 0 11 0; ! #X connect 15 0 17 0; ! #X connect 16 0 14 0; ! #X connect 17 0 16 0; ! #X connect 18 0 11 0; ! #X connect 19 0 11 0; ! #X connect 19 0 29 0; ! #X connect 19 0 52 0; ! #X connect 19 0 48 0; ! #X connect 19 1 32 1; ! #X connect 19 2 29 0; ! #X connect 19 2 52 0; ! #X connect 19 3 32 1; ! #X connect 20 0 2 0; ! #X connect 20 0 38 0; ! #X connect 21 0 16 1; ! #X connect 22 0 23 0; ! #X connect 23 0 14 0; ! #X connect 24 0 26 0; ! #X connect 25 0 28 0; ! #X connect 26 0 27 0; ! #X connect 27 0 22 0; ! #X connect 28 0 24 0; ! #X connect 29 0 49 0; ! #X connect 31 0 23 1; ! #X connect 33 0 6 0; ! #X connect 38 0 51 0; ! #X connect 40 0 6 0; ! #X connect 41 0 11 0; ! #X connect 43 0 11 0; ! #X connect 44 0 11 0; ! #X connect 46 0 2 0; ! #X connect 48 0 11 0; ! #X connect 49 0 11 0; ! #X connect 50 0 6 0; ! #X connect 51 0 2 0; ! #X connect 52 0 11 0; ! #X connect 53 0 30 0; ! #X connect 53 1 32 0; --- 283,337 ---- #X msg 33 443 get massesPos; #X obj 33 539 route massesPosNo massesPos; ! #X obj 33 257 t b b; ! #X connect 0 0 12 0; ! #X connect 2 0 1 0; ! #X connect 3 0 4 0; ! #X connect 5 0 10 0; ! #X connect 6 0 12 0; ! #X connect 7 0 5 0; ! #X connect 8 0 52 0; ! #X connect 9 0 38 1; ! #X connect 10 0 51 0; ! #X connect 12 0 48 0; ! #X connect 12 0 40 0; ! #X connect 12 1 31 0; ! #X connect 12 2 38 0; ! #X connect 12 3 7 0; ! #X connect 12 3 9 0; ! #X connect 13 0 10 0; ! #X connect 14 0 16 0; ! #X connect 15 0 13 0; ! #X connect 16 0 15 0; ! #X connect 17 0 10 0; ! #X connect 18 0 1 0; ! #X connect 18 0 36 0; ! #X connect 19 0 15 1; ! #X connect 20 0 21 0; ! #X connect 21 0 13 0; ! #X connect 22 0 24 0; ! #X connect 23 0 26 0; ! #X connect 24 0 25 0; ! #X connect 25 0 20 0; ! #X connect 26 0 22 0; ! #X connect 27 0 47 0; ! #X connect 29 0 21 1; ! #X connect 31 0 5 0; ! #X connect 36 0 49 0; ! #X connect 38 0 5 0; ! #X connect 39 0 10 0; ! #X connect 41 0 10 0; ! #X connect 42 0 10 0; ! #X connect 44 0 1 0; ! #X connect 46 0 10 0; ! #X connect 47 0 10 0; ! #X connect 48 0 5 0; ! #X connect 49 0 1 0; ! #X connect 50 0 10 0; ! #X connect 51 0 28 0; ! #X connect 51 1 30 0; ! #X connect 52 0 10 0; ! #X connect 52 0 27 0; ! #X connect 52 0 50 0; ! #X connect 52 0 46 0; ! #X connect 52 1 27 0; ! #X connect 52 1 10 0; Index: partiel.pd =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd3D/partiel.pd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** partiel.pd 21 Apr 2005 14:28:54 -0000 1.2 --- partiel.pd 26 Apr 2005 16:10:08 -0000 1.3 *************** *** 10,15 **** #X msg 131 60 \$2; #X obj 131 83 / 10; ! #X obj 172 84 * -10; ! #X obj 182 112 + 110; #X connect 0 0 8 0; #X connect 0 0 5 0; --- 10,15 ---- #X msg 131 60 \$2; #X obj 131 83 / 10; ! #X obj 182 112 + 10; ! #X obj 172 84 * 5; #X connect 0 0 8 0; #X connect 0 0 5 0; *************** *** 17,25 **** #X connect 3 0 1 0; #X connect 4 0 3 0; ! #X connect 5 0 10 0; #X connect 6 0 4 0; #X connect 7 0 2 0; #X connect 8 0 9 0; #X connect 9 0 7 0; ! #X connect 10 0 11 0; ! #X connect 11 0 6 0; --- 17,25 ---- #X connect 3 0 1 0; #X connect 4 0 3 0; ! #X connect 5 0 11 0; #X connect 6 0 4 0; #X connect 7 0 2 0; #X connect 8 0 9 0; #X connect 9 0 7 0; ! #X connect 10 0 6 0; ! #X connect 11 0 10 0; Index: 04_msd3Dfilet.pd =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd3D/04_msd3Dfilet.pd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** 04_msd3Dfilet.pd 12 Apr 2005 16:34:31 -0000 1.1 --- 04_msd3Dfilet.pd 26 Apr 2005 16:10:08 -0000 1.2 *************** *** 1,5 **** #N canvas 482 80 863 802 10; #X obj 32 13 loadbang; - #X obj 294 522 print msd; #X obj 458 439 gemwin; #X msg 458 417 0 \, destroy; --- 1,4 ---- *************** *** 15,19 **** #X obj 33 321 t b; #X msg 33 343 bang \, get massesPos \, get linksPos; ! #N canvas 643 123 605 590 massrender 0; #X obj 127 22 inlet; #X obj 48 203 translateXYZ; --- 14,18 ---- #X obj 33 321 t b; #X msg 33 343 bang \, get massesPos \, get linksPos; ! #N canvas 643 123 605 590 massrender 1; #X obj 127 22 inlet; #X obj 48 203 translateXYZ; *************** *** 27,34 **** #X obj 48 153 any; #X obj 125 136 t b f; - #X obj 127 57 unpack f f f; #X obj 246 88 / 12.5; #X obj 246 111 - 4; ! #X connect 0 0 11 0; #X connect 1 0 2 0; #X connect 3 0 4 0; --- 26,33 ---- #X obj 48 153 any; #X obj 125 136 t b f; #X obj 246 88 / 12.5; #X obj 246 111 - 4; ! #X obj 127 57 unpack f f f f; ! #X connect 0 0 13 0; #X connect 1 0 2 0; #X connect 3 0 4 0; *************** *** 41,49 **** #X connect 10 0 9 0; #X connect 10 1 1 1; ! #X connect 11 0 3 0; ! #X connect 11 1 5 0; ! #X connect 11 2 12 0; ! #X connect 12 0 13 0; ! #X connect 13 0 1 3; #X restore 114 589 pd massrender; #N canvas 284 227 587 558 linkrender 0; --- 40,48 ---- #X connect 10 0 9 0; #X connect 10 1 1 1; ! #X connect 11 0 12 0; ! #X connect 12 0 1 3; ! #X connect 13 1 3 0; ! #X connect 13 2 5 0; ! #X connect 13 3 11 0; #X restore 114 589 pd massrender; #N canvas 284 227 587 558 linkrender 0; *************** *** 57,66 **** #X obj 44 192 any; #X obj 93 164 t b f; - #X obj 44 265 curve 2; #X obj 266 117 / 12.5; #X obj 266 140 - 4; #X obj 320 118 / 12.5; #X obj 320 141 - 4; - #X obj 93 69 unpack f f f f f f; #X obj 197 117 / 12.5; #X obj 197 142 - 4; --- 56,63 ---- *************** *** 71,102 **** #X obj 266 189 pack f f f; #X msg 266 212 \$1 \$2 \$3; ! #X connect 0 0 14 0; #X connect 1 0 2 0; #X connect 2 0 8 0; #X connect 3 0 4 0; ! #X connect 4 0 17 1; #X connect 5 0 7 1; ! #X connect 6 0 9 0; #X connect 7 0 6 0; #X connect 8 0 7 0; ! #X connect 8 1 17 0; ! #X connect 10 0 11 0; ! #X connect 11 0 21 0; ! #X connect 12 0 13 0; ! #X connect 13 0 21 1; ! #X connect 14 0 1 0; ! #X connect 14 1 3 0; ! #X connect 14 2 15 0; ! #X connect 14 3 10 0; ! #X connect 14 4 12 0; ! #X connect 14 5 19 0; #X connect 15 0 16 0; ! #X connect 16 0 17 2; #X connect 17 0 18 0; ! #X connect 18 0 9 1; #X connect 19 0 20 0; #X connect 20 0 21 2; ! #X connect 21 0 22 0; ! #X connect 22 0 9 2; #X restore 33 610 pd linkrender; #X obj 33 539 route linksPos massesPos; --- 68,101 ---- #X obj 266 189 pack f f f; #X msg 266 212 \$1 \$2 \$3; ! #X obj 44 265 curve 2; ! #X obj 93 69 unpack f f f f f f f; ! #X connect 0 0 22 0; #X connect 1 0 2 0; #X connect 2 0 8 0; #X connect 3 0 4 0; ! #X connect 4 0 15 1; #X connect 5 0 7 1; ! #X connect 6 0 21 0; #X connect 7 0 6 0; #X connect 8 0 7 0; ! #X connect 8 1 15 0; ! #X connect 9 0 10 0; ! #X connect 10 0 19 0; ! #X connect 11 0 12 0; ! #X connect 12 0 19 1; ! #X connect 13 0 14 0; ! #X connect 14 0 15 2; #X connect 15 0 16 0; ! #X connect 16 0 21 1; #X connect 17 0 18 0; ! #X connect 18 0 19 2; #X connect 19 0 20 0; #X connect 20 0 21 2; ! #X connect 22 1 1 0; ! #X connect 22 2 3 0; ! #X connect 22 3 13 0; ! #X connect 22 4 9 0; ! #X connect 22 5 11 0; ! #X connect 22 6 17 0; #X restore 33 610 pd linkrender; #X obj 33 539 route linksPos massesPos; *************** *** 104,113 **** #X msg 203 83 symbol reset; #X obj 33 497 msd3D --------------------------------; ! #X msg 32 410 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 msg 458 371 view 0 0 4 0 0 0 0 1 0; #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; --- 103,111 ---- #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; *************** *** 115,146 **** #X text 648 380 Select view; #X obj 145 38 t b b b b; - #X text 383 114 Filet abstraction : x0 y0 stepx stepy nx ny; #X text 244 587 Connect mass or link to be viewed \, or both with good computer!; ! #X connect 0 0 28 0; ! #X connect 3 0 2 0; ! #X connect 4 0 5 0; ! #X connect 6 0 2 0; ! #X connect 7 0 19 0; ! #X connect 8 0 28 0; ! #X connect 9 0 7 0; #X connect 11 0 12 0; ! #X connect 12 0 13 0; ! #X connect 13 0 19 0; ! #X connect 13 0 20 0; ! #X connect 16 1 14 0; ! #X connect 17 0 2 0; ! #X connect 18 0 24 1; ! #X connect 19 0 16 0; ! #X connect 19 1 1 0; ! #X connect 20 0 19 0; ! #X connect 21 0 7 0; ! #X connect 22 0 7 0; ! #X connect 23 0 2 0; ! #X connect 24 0 7 0; ! #X connect 25 0 2 0; ! #X connect 28 0 21 0; ! #X connect 28 1 22 0; ! #X connect 28 2 24 0; ! #X connect 28 3 9 0; ! #X connect 28 3 18 0; --- 113,144 ---- #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 connect 0 0 26 0; ! #X connect 2 0 1 0; ! #X connect 3 0 4 0; ! #X connect 5 0 1 0; ! #X connect 6 0 18 0; ! #X connect 7 0 26 0; ! #X connect 8 0 6 0; ! #X connect 10 0 11 0; #X connect 11 0 12 0; ! #X connect 12 0 19 0; ! #X connect 12 0 18 0; ! #X connect 15 1 13 0; ! #X connect 16 0 1 0; ! #X connect 17 0 22 1; ! #X connect 18 0 15 0; ! #X connect 19 0 18 0; ! #X connect 20 0 6 0; ! #X connect 21 0 6 0; ! #X connect 22 0 6 0; ! #X connect 23 0 1 0; ! #X connect 26 0 20 0; ! #X connect 26 1 21 0; ! #X connect 26 2 22 0; ! #X connect 26 3 8 0; ! #X connect 26 3 17 0; ! #X connect 29 0 1 0; Index: 03_msd3Dmemb.pd =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd3D/03_msd3Dmemb.pd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** 03_msd3Dmemb.pd 12 Apr 2005 16:34:31 -0000 1.1 --- 03_msd3Dmemb.pd 26 Apr 2005 16:10:08 -0000 1.2 *************** *** 32,36 **** #X obj 320 118 / 12.5; #X obj 320 141 - 4; - #X obj 93 69 unpack f f f f f f; #X obj 197 117 / 12.5; #X obj 197 142 - 4; --- 32,35 ---- *************** *** 41,72 **** #X obj 266 189 pack f f f; #X msg 266 212 \$1 \$2 \$3; ! #X connect 0 0 14 0; #X connect 1 0 2 0; #X connect 2 0 8 0; #X connect 3 0 4 0; ! #X connect 4 0 17 1; #X connect 5 0 7 1; #X connect 6 0 9 0; #X connect 7 0 6 0; #X connect 8 0 7 0; ! #X connect 8 1 17 0; #X connect 10 0 11 0; ! #X connect 11 0 21 0; #X connect 12 0 13 0; ! #X connect 13 0 21 1; ! #X connect 14 0 1 0; ! #X connect 14 1 3 0; ! #X connect 14 2 15 0; ! #X connect 14 3 10 0; ! #X connect 14 4 12 0; ! #X connect 14 5 19 0; ! #X connect 15 0 16 0; ! #X connect 16 0 17 2; ! #X connect 17 0 18 0; ! #X connect 18 0 9 1; ! #X connect 19 0 20 0; ! #X connect 20 0 21 2; ! #X connect 21 0 22 0; ! #X connect 22 0 9 2; #X restore 33 666 pd linkrender; #X obj 33 616 msd3D --------------------------------; --- 40,72 ---- #X obj 266 189 pack f f f; #X msg 266 212 \$1 \$2 \$3; ! #X obj 93 69 unpack f f f f f f f; ! #X connect 0 0 22 0; #X connect 1 0 2 0; #X connect 2 0 8 0; #X connect 3 0 4 0; ! #X connect 4 0 16 1; #X connect 5 0 7 1; #X connect 6 0 9 0; #X connect 7 0 6 0; #X connect 8 0 7 0; ! #X connect 8 1 16 0; #X connect 10 0 11 0; ! #X connect 11 0 20 0; #X connect 12 0 13 0; ! #X connect 13 0 20 1; ! #X connect 14 0 15 0; ! #X connect 15 0 16 2; ! #X connect 16 0 17 0; ! #X connect 17 0 9 1; ! #X connect 18 0 19 0; ! #X connect 19 0 20 2; ! #X connect 20 0 21 0; ! #X connect 21 0 9 2; ! #X connect 22 1 1 0; ! #X connect 22 2 3 0; ! #X connect 22 3 14 0; ! #X connect 22 4 10 0; ! #X connect 22 5 12 0; ! #X connect 22 6 18 0; #X restore 33 666 pd linkrender; #X obj 33 616 msd3D --------------------------------; *************** *** 91,95 **** #X obj 312 479 f; #X floatatom 333 456 5 0 0 0 - - -; ! #X obj 312 403 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 1 1; #X msg 312 504 forceZ mob \$1; --- 91,95 ---- #X obj 312 479 f; #X floatatom 333 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; *************** *** 102,108 **** 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 -262144 ! -1 -1 3000 1; ! #X text 573 463 Change altitude of corners; #X obj 33 427 t b b b; #X text 385 455 Amplitude; --- 102,108 ---- 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 0 1; ! #X text 559 457 Change altitude of corners; #X obj 33 427 t b b b; #X text 385 455 Amplitude; Index: help-msd3D.pd =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd3D/help-msd3D.pd,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** help-msd3D.pd 21 Apr 2005 14:28:54 -0000 1.3 --- help-msd3D.pd 26 Apr 2005 16:10:08 -0000 1.4 *************** *** 15,19 **** #X obj 61 403 cnv 15 610 210 empty empty DYNAMIC_SETTING 20 12 0 14 -262131 -66577 0; - #X text 350 449 \$1 : Id (symbol); #X text 350 467 \$2 : New value; #X text 348 503 \$1 : Id (symbol); --- 15,18 ---- *************** *** 64,79 **** #X msg 83 548 Zmin \$1 \, Zmax \$1; #X obj 33 821 msd3D; ! #X connect 1 0 52 0; ! #X connect 8 0 52 0; ! #X connect 15 0 52 0; ! #X connect 18 0 52 0; ! #X connect 20 0 52 0; ! #X connect 21 0 52 0; ! #X connect 24 0 52 0; ! #X connect 28 0 52 0; ! #X connect 31 0 52 0; ! #X connect 40 0 52 0; ! #X connect 46 0 52 0; ! #X connect 47 0 52 0; #X restore 158 305 pd masses; #X text 12 305 HELP on masses --->; --- 63,79 ---- #X msg 83 548 Zmin \$1 \, Zmax \$1; #X obj 33 821 msd3D; ! #X text 350 449 \$1 : Id (symbol) or No; ! #X connect 1 0 51 0; ! #X connect 8 0 51 0; ! #X connect 14 0 51 0; ! #X connect 17 0 51 0; ! #X connect 19 0 51 0; ! #X connect 20 0 51 0; ! #X connect 23 0 51 0; ! #X connect 27 0 51 0; ! #X connect 30 0 51 0; ! #X connect 39 0 51 0; ! #X connect 45 0 51 0; ! #X connect 46 0 51 0; #X restore 158 305 pd masses; #X text 12 305 HELP on masses --->; Index: 01_msd3Dtest.pd =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd3D/01_msd3Dtest.pd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** 01_msd3Dtest.pd 15 Apr 2005 18:14:27 -0000 1.2 --- 01_msd3Dtest.pd 26 Apr 2005 16:10:08 -0000 1.3 *************** *** 34,38 **** #X obj 27 545 cnv 15 400 200 empty empty empty 20 12 0 14 -261689 -66577 0; ! #N canvas 643 123 605 590 massrender 0; #X obj 127 22 inlet; #X obj 48 203 translateXYZ; --- 34,38 ---- #X obj 27 545 cnv 15 400 200 empty empty empty 20 12 0 14 -261689 -66577 0; ! #N canvas 643 123 605 590 massrender 1; #X obj 127 22 inlet; #X obj 48 203 translateXYZ; *************** *** 46,53 **** #X obj 48 153 any; #X obj 125 136 t b f; - #X obj 127 57 unpack f f f; #X obj 244 87 / 12.5; #X obj 244 110 - 4; ! #X connect 0 0 11 0; #X connect 1 0 2 0; #X connect 3 0 4 0; --- 46,53 ---- #X obj 48 153 any; #X obj 125 136 t b f; #X obj 244 87 / 12.5; #X obj 244 110 - 4; ! #X obj 127 57 unpack f f f f; ! #X connect 0 0 13 0; #X connect 1 0 2 0; #X connect 3 0 4 0; *************** *** 60,68 **** #X connect 10 0 9 0; #X connect 10 1 1 1; ! #X connect 11 0 3 0; ! #X connect 11 1 5 0; ! #X connect 11 2 12 0; ! #X connect 12 0 13 0; ! #X connect 13 0 1 3; #X restore 114 589 pd massrender; #N canvas 284 227 587 558 linkrender 0; --- 60,68 ---- #X connect 10 0 9 0; #X connect 10 1 1 1; ! #X connect 11 0 12 0; ! #X connect 12 0 1 3; ! #X connect 13 1 3 0; ! #X connect 13 2 5 0; ! #X connect 13 3 11 0; #X restore 114 589 pd massrender; #N canvas 284 227 587 558 linkrender 0; *************** *** 81,85 **** #X obj 320 118 / 12.5; #X obj 320 141 - 4; - #X obj 93 69 unpack f f f f f f; #X obj 197 117 / 12.5; #X obj 197 142 - 4; --- 81,84 ---- *************** *** 90,121 **** #X obj 266 189 pack f f f; #X msg 266 212 \$1 \$2 \$3; ! #X connect 0 0 14 0; #X connect 1 0 2 0; #X connect 2 0 8 0; #X connect 3 0 4 0; ! #X connect 4 0 17 1; #X connect 5 0 7 1; #X connect 6 0 9 0; #X connect 7 0 6 0; #X connect 8 0 7 0; ! #X connect 8 1 17 0; #X connect 10 0 11 0; ! #X connect 11 0 21 0; #X connect 12 0 13 0; ! #X connect 13 0 21 1; ! #X connect 14 0 1 0; ! #X connect 14 1 3 0; ! #X connect 14 2 15 0; ! #X connect 14 3 10 0; ! #X connect 14 4 12 0; ! #X connect 14 5 19 0; ! #X connect 15 0 16 0; ! #X connect 16 0 17 2; ! #X connect 17 0 18 0; ! #X connect 18 0 9 1; ! #X connect 19 0 20 0; ! #X connect 20 0 21 2; ! #X connect 21 0 22 0; ! #X connect 22 0 9 2; #X restore 33 610 pd linkrender; #X obj 33 560 route linksPos massesPos; --- 89,121 ---- #X obj 266 189 pack f f f; #X msg 266 212 \$1 \$2 \$3; ! #X obj 93 69 unpack f f f f f f f; ! #X connect 0 0 22 0; #X connect 1 0 2 0; #X connect 2 0 8 0; #X connect 3 0 4 0; ! #X connect 4 0 16 1; #X connect 5 0 7 1; #X connect 6 0 9 0; #X connect 7 0 6 0; #X connect 8 0 7 0; ! #X connect 8 1 16 0; #X connect 10 0 11 0; ! #X connect 11 0 20 0; #X connect 12 0 13 0; ! #X connect 13 0 20 1; ! #X connect 14 0 15 0; ! #X connect 15 0 16 2; ! #X connect 16 0 17 0; ! #X connect 17 0 9 1; ! #X connect 18 0 19 0; ! #X connect 19 0 20 2; ! #X connect 20 0 21 0; ! #X connect 21 0 9 2; ! #X connect 22 1 1 0; ! #X connect 22 2 3 0; ! #X connect 22 3 14 0; ! #X connect 22 4 10 0; ! #X connect 22 5 12 0; ! #X connect 22 6 18 0; #X restore 33 610 pd linkrender; #X obj 33 560 route linksPos massesPos;

1 0

[PD-cvs] externals/nusmuk/msd 02_imsdtest.pd, 1.2, 1.3 03_msdwave.pd, 1.1, 1.2 main.cpp, 1.6, 1.7
by Nicolas Montgermont 26 Apr '05

26 Apr '05

Update of /cvsroot/pure-data/externals/nusmuk/msd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13192/msd Modified Files: 02_imsdtest.pd 03_msdwave.pd main.cpp Log Message: MSD Version 0.04 Index: main.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd/main.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** main.cpp 26 Apr 2005 11:39:49 -0000 1.6 --- main.cpp 26 Apr 2005 16:10:07 -0000 1.7 *************** *** 31,35 **** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ! Version 0.03 -- 21.04.2005 */ --- 31,35 ---- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ! Version 0.04 -- 26.04.2005 */ *************** *** 39,43 **** // define constants ! #define MSD_VERSION 0.03 #define nb_max_link 4000 #define nb_max_mass 4000 --- 39,43 ---- // define constants ! #define MSD_VERSION 0.04 #define nb_max_link 4000 #define nb_max_mass 4000 *************** *** 136,140 **** t_int i; struct _mass mass_1, mass_2; ! for (i=0; i<nb_link; i++) { // compute link forces --- 136,142 ---- t_int i; struct _mass mass_1, mass_2; ! ! ! for (i=0; i<nb_link; i++) { // compute link forces *************** *** 155,162 **** link[i]->mass2->forceX -= link[i]->D2*link[i]->mass2->speedX; // Fx2[n] = Fx2[n] - D2 * vx2[n-1] link[i]->distance_old = distance; // L[n-1] = L[n] - - } for (i=0; i<nb_mass; i++) // compute new masses position only if mobile = 1 --- 157,164 ---- link[i]->mass2->forceX -= link[i]->D2*link[i]->mass2->speedX; // Fx2[n] = Fx2[n] - D2 * vx2[n-1] link[i]->distance_old = distance; // L[n-1] = L[n] } + + for (i=0; i<nb_mass; i++) // compute new masses position only if mobile = 1 *************** *** 199,203 **** mass[nb_mass]->forceX = 0; // Fx[n] mass[nb_mass]->nbr = id_mass; // id number ! nb_mass++ ; id_mass++; nb_mass = min ( nb_max_mass -1, nb_mass ); --- 201,205 ---- mass[nb_mass]->forceX = 0; // Fx[n] mass[nb_mass]->nbr = id_mass; // id number ! nb_mass++; id_mass++; nb_mass = min ( nb_max_mass -1, nb_mass ); *************** *** 351,399 **** t_atom sortie[7], aux[2]; t_int i; ! if (argc < 6 || argc > 8) ! error("link : Id Nomass1 Nomass2 K D1 D2 (Lmin Lmax)"); ! link[nb_link] = new t_link; // New pointer ! link[nb_link]->Id = GetSymbol(argv[0]); // ID ! for (i=0; i<nb_mass;i++) ! if (mass[i]->nbr==GetAInt(argv[1])) // pointer to mass1 ! link[nb_link]->mass1 = mass[i]; ! else if(mass[i]->nbr==GetAInt(argv[2])) // pointer to mass2 ! link[nb_link]->mass2 = mass[i]; ! link[nb_link]->K1 = GetFloat(argv[3]); // K1 ! link[nb_link]->D1 = GetFloat(argv[4]); // D1 ! link[nb_link]->D2 = GetFloat(argv[5]); // D2 ! link[nb_link]->longx = link[nb_link]->mass1->posX - link[nb_link]->mass2->posX; // Lx[0] ! if (link[nb_link]->longx < 0) ! link[nb_link]->longueur = -link[nb_link]->longx; ! else ! link[nb_link]->longueur = link[nb_link]->longx ;// L[0] ! link[nb_link]->nbr = id_link; // id number ! link[nb_link]->distance_old = link[nb_link]->longueur; // L[n-1] ! switch (argc) { ! case 6 : ! link[nb_link]->long_max = 32768; ! link[nb_link]->long_min = 0; ! break; ! case 7 : ! link[nb_link]->long_min = GetFloat(argv[6]); ! link[nb_link]->long_max = 32768; ! break; ! case 8 : ! link[nb_link]->long_min = GetFloat(argv[6]); ! link[nb_link]->long_max = GetFloat(argv[7]); ! break; ! } ! nb_link++; ! id_link++; ! nb_link = min ( nb_max_link -1, nb_link ); ! SetFloat((sortie[0]),id_link-1); ! SetSymbol((sortie[1]),link[nb_link-1]->Id); ! SetFloat((sortie[2]),GetInt(argv[1])); ! SetFloat((sortie[3]),GetInt(argv[2])); ! SetFloat((sortie[4]),link[nb_link-1]->K1); ! SetFloat((sortie[5]),link[nb_link-1]->D1); ! SetFloat((sortie[6]),link[nb_link-1]->D2); ! ToOutAnything(1,S_Link,7,sortie); } --- 353,415 ---- t_atom sortie[7], aux[2]; t_int i; + t_mass *mass1 = NULL; + t_mass *mass2 = NULL; + + if (argc < 6 || argc > 8) + error("link : Id Nomass1 Nomass2 K D1 D2 (Lmin Lmax)"); + + // check for existence of link masses: + for (i=0; i<nb_mass;i++) + if (mass[i]->nbr==GetInt(argv[1])) // pointer to mass1 + // we found mass1 + mass1 = mass[i]; + else if (mass[i]->nbr==GetInt(argv[2])) // pointer to mass2 + // ... and mass2 + mass2 = mass[i]; ! if (mass1 and mass2) ! { ! link[nb_link] = new t_link; // New pointer ! link[nb_link]->Id = GetSymbol(argv[0]); // ID ! link[nb_link]->mass1 = mass1; // pointer to mass1 ! link[nb_link]->mass2 = mass2; // pointer to mass2 ! link[nb_link]->K1 = GetFloat(argv[3]); // K1 ! link[nb_link]->D1 = GetFloat(argv[4]); // D1 ! link[nb_link]->D2 = GetFloat(argv[5]); // D2 ! link[nb_link]->longx = link[nb_link]->mass1->posX - link[nb_link]->mass2->posX; // Lx[0] ! if (link[nb_link]->longx < 0) ! link[nb_link]->longueur = -link[nb_link]->longx; ! else ! link[nb_link]->longueur = link[nb_link]->longx ;// L[0] ! link[nb_link]->nbr = id_link; // id number ! link[nb_link]->distance_old = link[nb_link]->longueur; // L[n-1] ! switch (argc) { ! case 6 : ! link[nb_link]->long_max = 32768; ! link[nb_link]->long_min = 0; ! break; ! case 7 : ! link[nb_link]->long_min = GetFloat(argv[6]); ! link[nb_link]->long_max = 32768; ! break; ! case 8 : ! link[nb_link]->long_min = GetFloat(argv[6]); ! link[nb_link]->long_max = GetFloat(argv[7]); ! break; ! } ! nb_link++; ! id_link++; ! nb_link = min ( nb_max_link -1, nb_link ); ! SetFloat((sortie[0]),id_link-1); ! SetSymbol((sortie[1]),link[nb_link-1]->Id); ! SetFloat((sortie[2]),GetInt(argv[1])); ! SetFloat((sortie[3]),GetInt(argv[2])); ! SetFloat((sortie[4]),link[nb_link-1]->K1); ! SetFloat((sortie[5]),link[nb_link-1]->D1); ! SetFloat((sortie[6]),link[nb_link-1]->D2); ! ToOutAnything(1,S_Link,7,sortie); ! } ! else ! error("link : Cannot create link: Not all masses for this link have been created yet."); } *************** *** 534,538 **** t_int i,j; t_symbol *auxarg,*auxarg2, *auxtype; ! t_atom sortie[4]; auxtype = GetSymbol(argv[0]); auxarg = GetASymbol(argv[1]); //auxarg : & symbol, 0 else --- 550,554 ---- t_int i,j; t_symbol *auxarg,*auxarg2, *auxtype; ! t_atom sortie[3]; auxtype = GetSymbol(argv[0]); auxarg = GetASymbol(argv[1]); //auxarg : & symbol, 0 else *************** *** 541,566 **** if (auxtype == S_massesPos) // get all masses positions for (i=0; i<nb_mass; i++) ! { ! SetFloat(sortie[0],mass[i]->posX); ! ToOutAnything(0,S_massesPos,1,sortie); } else if (auxtype == S_massesForces) // get all masses forces for (i=0; i<nb_mass; i++) { ! SetFloat(sortie[0],mass[i]->out_forceX); ! ToOutAnything(0,S_massesForces,1,sortie); } else if (auxtype == S_linksPos) // get all links positions for (i=0; i<nb_link; i++) { ! SetFloat(sortie[0],link[i]->mass1->posX); ! SetFloat(sortie[1],link[i]->mass2->posX); ! ToOutAnything(0,S_linksPos,2,sortie); } else // get all masses speeds for (i=0; i<nb_mass; i++) { ! SetFloat(sortie[0],mass[i]->speedX); ! ToOutAnything(0,S_massesSpeeds,1,sortie); } } --- 557,586 ---- if (auxtype == S_massesPos) // get all masses positions for (i=0; i<nb_mass; i++) ! { ! SetFloat(sortie[0],mass[i]->nbr); ! SetFloat(sortie[1],mass[i]->posX); ! ToOutAnything(0,S_massesPos,2,sortie); } else if (auxtype == S_massesForces) // get all masses forces for (i=0; i<nb_mass; i++) { ! SetFloat(sortie[0],mass[i]->nbr); ! SetFloat(sortie[1],mass[i]->out_forceX); ! ToOutAnything(0,S_massesForces,2,sortie); } else if (auxtype == S_linksPos) // get all links positions for (i=0; i<nb_link; i++) { ! SetFloat(sortie[0],link[i]->nbr); ! SetFloat(sortie[1],link[i]->mass1->posX); ! SetFloat(sortie[2],link[i]->mass2->posX); ! ToOutAnything(0,S_linksPos,3,sortie); } else // get all masses speeds for (i=0; i<nb_mass; i++) { ! SetFloat(sortie[0],mass[i]->nbr); ! SetFloat(sortie[1],mass[i]->speedX); ! ToOutAnything(0,S_massesSpeeds,2,sortie); } } *************** *** 573,578 **** if (mass[i]->nbr==GetInt(argv[j])) { ! SetFloat(sortie[0],mass[i]->posX); ! ToOutAnything(0,S_massesPosNo,1,sortie); } } --- 593,599 ---- if (mass[i]->nbr==GetInt(argv[j])) { ! SetFloat(sortie[0],mass[i]->nbr); ! SetFloat(sortie[1],mass[i]->posX); ! ToOutAnything(0,S_massesPosNo,2,sortie); } } *************** *** 586,591 **** if (auxarg2==mass[i]->Id) { ! SetFloat(sortie[0],mass[i]->posX); ! ToOutAnything(0,S_massesPosId,1,sortie); } } --- 607,613 ---- if (auxarg2==mass[i]->Id) { ! SetSymbol(sortie[0],mass[i]->Id); ! SetFloat(sortie[1],mass[i]->posX); ! ToOutAnything(0,S_massesPosId,2,sortie); } } *************** *** 601,606 **** if (mass[i]->nbr==GetInt(argv[j])) { ! SetFloat(sortie[0],mass[i]->out_forceX); ! ToOutAnything(0,S_massesForcesNo,1,sortie); } } --- 623,629 ---- if (mass[i]->nbr==GetInt(argv[j])) { ! SetFloat(sortie[0],mass[i]->nbr); ! SetFloat(sortie[1],mass[i]->out_forceX); ! ToOutAnything(0,S_massesForcesNo,2,sortie); } } *************** *** 614,619 **** if (auxarg2==mass[i]->Id) { ! SetFloat(sortie[0],mass[i]->out_forceX); ! ToOutAnything(0,S_massesForcesId,1,sortie); } } --- 637,643 ---- if (auxarg2==mass[i]->Id) { ! SetSymbol(sortie[0],mass[i]->Id); ! SetFloat(sortie[1],mass[i]->out_forceX); ! ToOutAnything(0,S_massesForcesId,2,sortie); } } *************** *** 629,635 **** if (link[i]->nbr==GetInt(argv[j])) { ! SetFloat(sortie[0],link[i]->mass1->posX); ! SetFloat(sortie[1],link[i]->mass2->posX); ! ToOutAnything(0,S_linksPosNo,2,sortie); } } --- 653,660 ---- if (link[i]->nbr==GetInt(argv[j])) { ! SetFloat(sortie[0],link[i]->nbr); ! SetFloat(sortie[1],link[i]->mass1->posX); ! SetFloat(sortie[2],link[i]->mass2->posX); ! ToOutAnything(0,S_linksPosNo,3,sortie); } } *************** *** 643,649 **** if (auxarg2==link[i]->Id) { ! SetFloat(sortie[0],link[i]->mass1->posX); ! SetFloat(sortie[1],link[i]->mass2->posX); ! ToOutAnything(0,S_linksPosId,2,sortie); } } --- 668,675 ---- if (auxarg2==link[i]->Id) { ! SetSymbol(sortie[0],link[i]->Id); ! SetFloat(sortie[1],link[i]->mass1->posX); ! SetFloat(sortie[2],link[i]->mass2->posX); ! ToOutAnything(0,S_linksPosId,3,sortie); } } *************** *** 659,664 **** if (mass[i]->nbr==GetInt(argv[j])) { ! SetFloat(sortie[0],mass[i]->speedX); ! ToOutAnything(0,S_massesSpeedsNo,1,sortie); } } --- 685,691 ---- if (mass[i]->nbr==GetInt(argv[j])) { ! SetFloat(sortie[0],mass[i]->nbr); ! SetFloat(sortie[1],mass[i]->speedX); ! ToOutAnything(0,S_massesSpeedsNo,2,sortie); } } *************** *** 672,677 **** if (auxarg2==mass[i]->Id) { ! SetFloat(sortie[0],mass[i]->speedX); ! ToOutAnything(0,S_massesSpeedsId,1,sortie); } } --- 699,705 ---- if (auxarg2==mass[i]->Id) { ! SetSymbol(sortie[0],mass[i]->Id); ! SetFloat(sortie[1],mass[i]->speedX); ! ToOutAnything(0,S_massesSpeedsId,2,sortie); } } Index: 03_msdwave.pd =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd/03_msdwave.pd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** 03_msdwave.pd 25 Apr 2005 16:18:38 -0000 1.1 --- 03_msdwave.pd 26 Apr 2005 16:10:06 -0000 1.2 *************** *** 18,22 **** #X obj 127 136 t b f; #X obj 127 57 unpack f f f; ! #X obj 45 283 cuboid 0.065 0.065 0.07; #X connect 0 0 6 0; #X connect 1 0 7 0; --- 18,22 ---- #X obj 127 136 t b f; #X obj 127 57 unpack f f f; ! #X obj 48 283 cuboid 0.065 0.065 0.07; #X connect 0 0 6 0; #X connect 1 0 7 0; *************** *** 35,51 **** #X text 418 114 Filet abstraction : x0 y0 stepx stepy ny nx; #X obj 454 464 msd -------------; - #X obj 568 488 print msd; #X obj 33 497 msd2D --------------------------------; - #X obj 294 522 print 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 33 539 route massesPos; #X msg 33 343 bang \, get massesPos; #X obj 33 321 t b b; #X obj 265 600 pack f f f; - #X obj 33 561 unpack f f; - #X obj 33 583 t f b; #N canvas 0 0 450 300 getmasses 0; #X obj 84 33 inlet; --- 35,47 ---- #X text 418 114 Filet abstraction : x0 y0 stepx stepy ny nx; #X obj 454 464 msd -------------; #X obj 33 497 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 33 517 route massesPos; #X msg 33 343 bang \, get massesPos; #X obj 33 321 t b b; #X obj 265 600 pack f f f; #N canvas 0 0 450 300 getmasses 0; #X obj 84 33 inlet; *************** *** 67,72 **** #X connect 6 0 2 1; #X connect 8 0 2 1; ! #X restore 63 698 pd getmasses; ! #X obj 454 507 route massesPosNo; #X msg 63 718 get massesPos \$1; #X obj 602 334 rotateXYZ; --- 63,68 ---- #X connect 6 0 2 1; #X connect 8 0 2 1; ! #X restore 72 657 pd getmasses; ! #X obj 454 488 route massesPosNo; #X msg 63 718 get massesPos \$1; #X obj 602 334 rotateXYZ; *************** *** 95,99 **** #X msg 670 605 posX 39 \$1; #X msg 689 625 posX 799 \$1; ! #X msg 708 645 posX 760 \$1; #X text 734 508 Move corners to send a wave!; #X text 194 703 Each time a mass2D position is send \, the corresponding --- 91,95 ---- #X msg 670 605 posX 39 \$1; #X msg 689 625 posX 799 \$1; ! #X msg 707 645 posX 760 \$1; #X text 734 508 Move corners to send a wave!; #X text 194 703 Each time a mass2D position is send \, the corresponding *************** *** 107,169 **** #X text 31 455 The 2D model is just here to help display masses and test synchronization between msd objects; #X connect 0 0 12 0; #X connect 2 0 1 0; ! #X connect 3 0 31 0; #X connect 5 0 18 0; - #X connect 5 0 20 0; #X connect 6 0 12 0; #X connect 7 0 5 0; ! #X connect 8 0 24 0; ! #X connect 10 0 28 1; ! #X connect 10 0 45 1; ! #X connect 12 0 42 0; ! #X connect 12 0 43 0; ! #X connect 12 1 46 0; ! #X connect 12 2 45 0; #X connect 12 3 7 0; #X connect 12 3 10 0; ! #X connect 14 0 29 0; ! #X connect 14 1 15 0; ! #X connect 16 0 22 0; ! #X connect 16 1 17 0; #X connect 18 0 19 0; ! #X connect 18 1 14 0; ! #X connect 19 0 14 0; ! #X connect 20 0 21 0; ! #X connect 20 1 16 0; ! #X connect 21 0 16 0; ! #X connect 22 0 26 0; ! #X connect 23 0 16 0; ! #X connect 24 0 23 0; ! #X connect 24 1 14 0; ! #X connect 25 0 9 0; ! #X connect 26 0 27 0; ! #X connect 26 1 25 1; ! #X connect 27 0 25 0; ! #X connect 27 1 28 0; ! #X connect 28 0 30 0; ! #X connect 29 0 25 2; ! #X connect 30 0 14 0; ! #X connect 31 0 4 0; ! #X connect 32 0 36 0; ! #X connect 33 0 48 0; ! #X connect 34 0 49 0; ! #X connect 35 0 50 0; ! #X connect 36 0 14 0; ! #X connect 37 0 31 1; ! #X connect 38 0 1 0; ! #X connect 39 0 1 0; ! #X connect 40 0 31 2; ! #X connect 41 0 1 0; ! #X connect 41 0 44 0; ! #X connect 42 0 16 0; ! #X connect 43 0 14 0; ! #X connect 44 0 39 0; ! #X connect 44 0 40 0; ! #X connect 44 0 37 0; ! #X connect 45 0 5 0; ! #X connect 46 0 5 0; ! #X connect 47 0 1 0; ! #X connect 48 0 14 0; ! #X connect 49 0 14 0; ! #X connect 50 0 14 0; --- 103,169 ---- #X text 31 455 The 2D model is just here to help display masses and test synchronization between msd objects; + #X obj 33 537 unpack f f f; + #X obj 443 546 unpack f f; + #X obj 173 598 f; + #X obj 33 574 t b f; #X connect 0 0 12 0; #X connect 2 0 1 0; ! #X connect 3 0 27 0; ! #X connect 5 0 16 0; #X connect 5 0 18 0; #X connect 6 0 12 0; #X connect 7 0 5 0; ! #X connect 8 0 22 0; ! #X connect 10 0 24 1; ! #X connect 10 0 41 1; ! #X connect 12 0 38 0; ! #X connect 12 0 39 0; ! #X connect 12 1 42 0; ! #X connect 12 2 41 0; #X connect 12 3 7 0; #X connect 12 3 10 0; ! #X connect 14 0 25 0; ! #X connect 15 0 20 0; ! #X connect 16 0 17 0; ! #X connect 16 1 14 0; ! #X connect 17 0 14 0; #X connect 18 0 19 0; ! #X connect 18 1 15 0; ! #X connect 19 0 15 0; ! #X connect 20 0 55 0; ! #X connect 21 0 15 0; ! #X connect 22 0 21 0; ! #X connect 22 1 14 0; ! #X connect 23 0 9 0; ! #X connect 25 0 56 0; ! #X connect 26 0 14 0; ! #X connect 27 0 4 0; ! #X connect 28 0 32 0; ! #X connect 29 0 44 0; ! #X connect 30 0 45 0; ! #X connect 31 0 46 0; ! #X connect 32 0 14 0; ! #X connect 33 0 27 1; ! #X connect 34 0 1 0; ! #X connect 35 0 1 0; ! #X connect 36 0 27 2; ! #X connect 37 0 1 0; ! #X connect 37 0 40 0; ! #X connect 38 0 15 0; ! #X connect 39 0 14 0; ! #X connect 40 0 35 0; ! #X connect 40 0 36 0; ! #X connect 40 0 33 0; ! #X connect 41 0 5 0; ! #X connect 42 0 5 0; ! #X connect 43 0 1 0; ! #X connect 44 0 14 0; ! #X connect 45 0 14 0; ! #X connect 46 0 14 0; ! #X connect 55 0 58 0; ! #X connect 55 1 57 1; ! #X connect 55 2 23 1; ! #X connect 56 1 23 2; ! #X connect 57 0 23 0; ! #X connect 58 0 57 0; ! #X connect 58 1 26 0; Index: 02_imsdtest.pd =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd/02_imsdtest.pd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** 02_imsdtest.pd 21 Apr 2005 14:28:53 -0000 1.2 --- 02_imsdtest.pd 26 Apr 2005 16:10:06 -0000 1.3 *************** *** 22,29 **** #X obj 46 380 cnv 15 700 90 empty empty empty 20 12 0 14 -262131 -66577 0; - #X msg 176 385 setD souple 0.01; - #X msg 66 384 setK souple 1; - #X msg 176 407 setD souple 1; - #X msg 66 406 setK souple 2; #X text 455 399 SET RIGIDITY AND VISCOSITY OF LINKS; #X text 455 438 ADD FORCE ON ALL MOBILE MASSES; --- 22,25 ---- *************** *** 32,45 **** 0; #X obj 88 590 vsl 15 128 0 100 0 0 empty empty empty 0 -8 0 8 -261689 ! -1 -1 6249 1; #X obj 111 590 vsl 15 128 0 100 0 0 empty empty empty 0 -8 0 8 -261689 ! -1 -1 0 1; #X obj 66 590 vsl 15 128 0 100 0 0 empty empty empty 0 -8 0 8 -261689 ! -1 -1 6860 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 0 1; #X obj 134 590 vsl 15 128 0 100 0 0 empty empty empty 0 -8 0 8 -261689 ! -1 -1 0 1; #X text 199 638 MOVE FIRST SLIDER; #X text 182 662 TO MOVE THE FIXED MASS; --- 28,41 ---- 0; #X obj 88 590 vsl 15 128 0 100 0 0 empty empty empty 0 -8 0 8 -261689 ! -1 -1 12166 1; #X obj 111 590 vsl 15 128 0 100 0 0 empty empty empty 0 -8 0 8 -261689 ! -1 -1 7166 1; #X obj 66 590 vsl 15 128 0 100 0 0 empty empty empty 0 -8 0 8 -261689 ! -1 -1 9960 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 2370 1; #X obj 134 590 vsl 15 128 0 100 0 0 empty empty empty 0 -8 0 8 -261689 ! -1 -1 12700 1; #X text 199 638 MOVE FIRST SLIDER; #X text 182 662 TO MOVE THE FIXED MASS; *************** *** 52,63 **** #X obj 52 545 unpack f f f f f; #X text 490 126 CREATION : 5 MASSES \, 1 iLINK; ! #X msg 184 223 iLink inter fix mob 10 2.5 0.5 5 20; ! #X connect 0 0 35 0; ! #X connect 2 0 37 0; #X connect 2 1 1 0; #X connect 3 0 6 0; ! #X connect 6 0 38 0; #X connect 9 0 2 0; ! #X connect 10 0 35 0; #X connect 11 0 9 0; #X connect 12 0 9 0; --- 48,63 ---- #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 iLink inter fix mob 10 2.5 0.5 5; ! #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; *************** *** 65,92 **** #X connect 14 0 9 0; #X connect 15 0 12 0; ! #X connect 17 0 2 0; ! #X connect 18 0 2 0; ! #X connect 19 0 2 0; ! #X connect 20 0 2 0; ! #X connect 23 0 3 0; ! #X connect 27 0 28 0; ! #X connect 28 0 2 0; ! #X connect 33 0 2 0; #X connect 34 0 2 0; ! #X connect 35 0 33 0; ! #X connect 35 0 3 0; ! #X connect 35 1 23 0; ! #X connect 35 1 41 0; ! #X connect 35 2 13 0; ! #X connect 35 3 15 0; ! #X connect 35 4 14 0; ! #X connect 35 5 11 0; ! #X connect 37 0 39 0; ! #X connect 37 1 1 0; #X connect 38 0 2 0; ! #X connect 39 0 27 0; ! #X connect 39 1 25 0; ! #X connect 39 2 26 0; ! #X connect 39 3 30 0; ! #X connect 39 4 29 0; #X connect 41 0 9 0; --- 65,91 ---- #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;

1 0

externals/nusmuk/msd3D main.cpp,1.5,1.6
by Thomas Grill 26 Apr '05

26 Apr '05

Update of /cvsroot/pure-data/externals/nusmuk/msd3D In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7919/nusmuk/msd3D Modified Files: main.cpp Log Message: some small changes for Windows compilation Index: main.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd3D/main.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** main.cpp 22 Apr 2005 09:33:32 -0000 1.5 --- main.cpp 26 Apr 2005 11:39:49 -0000 1.6 *************** *** 40,45 **** // define constants #define MSD3D_VERSION 0.03 ! #define nb_max_link 4000 ! #define nb_max_mass 4000 #define Id_length 20 --- 40,45 ---- // define constants #define MSD3D_VERSION 0.03 ! #define nb_max_link 4000 ! #define nb_max_mass 4000 #define Id_length 20 *************** *** 49,82 **** #endif ! #define max(a,b) ( ((a) > (b)) ? (a) : (b) ) #define min(a,b) ( ((a) < (b)) ? (a) : (b) ) ! typedef struct _mass { t_symbol *Id; t_int nbr; ! t_int mobile; ! t_float invM; ! t_float speedX; t_float posX; ! t_float posX2; t_float forceX; t_float out_forceX; ! t_float speedY; t_float posY; ! t_float posY2; t_float forceY; t_float out_forceY; t_float speedZ; t_float posZ; ! t_float posZ2; t_float forceZ; t_float out_forceZ; ! } t_mass; ! ! typedef struct _link { t_symbol *Id; ! t_int nbr; ! t_mass *mass1; ! t_mass *mass2; t_float K1, D1, D2; t_float longx, longy, longz, longueur, long_min, long_max; --- 49,92 ---- #endif ! #define max(a,b) ( ((a) > (b)) ? (a) : (b) ) #define min(a,b) ( ((a) < (b)) ? (a) : (b) ) ! #ifdef _MSC_VER ! #define NEWARR(type,var,size) type *var = new type[size] ! #define DELARR(var) delete[] var ! #else ! #define NEWARR(type,var,size) type var[size] ! #define DELARR(var) ((void)0) ! #endif ! ! ! ! typedef struct _mass { t_symbol *Id; t_int nbr; ! t_int mobile; ! t_float invM; ! t_float speedX; t_float posX; ! t_float posX2; t_float forceX; t_float out_forceX; ! t_float speedY; t_float posY; ! t_float posY2; t_float forceY; t_float out_forceY; t_float speedZ; t_float posZ; ! t_float posZ2; t_float forceZ; t_float out_forceZ; ! } t_mass; ! ! typedef struct _link { t_symbol *Id; ! t_int nbr; ! t_mass *mass1; ! t_mass *mass2; t_float K1, D1, D2; t_float longx, longy, longz, longueur, long_min, long_max; *************** *** 111,115 **** { t_int i; ! t_atom sortie[0]; for (i=0; i<nb_mass; i++) { --- 121,125 ---- { t_int i; ! // t_atom sortie[0]; for (i=0; i<nb_mass; i++) { *************** *** 119,124 **** delete link[i]; } ! ToOutAnything(1,S_Reset,0,sortie); ! nb_link = 0; nb_mass = 0; id_mass = 0; --- 129,134 ---- delete link[i]; } ! ToOutAnything(1,S_Reset,0,NULL); ! nb_link = 0; nb_mass = 0; id_mass = 0; *************** *** 130,138 **** void m_bang() { ! t_float F=0,Fx=0,Fy=0, Fz=0,distance,vitesse, X_new, Y_new, Z_new; t_int i; ! struct _mass mass_1, mass_2; ! for (i=0; i<nb_link; i++) { // compute link forces distance = sqrt(pow(link[i]->mass1->posX-link[i]->mass2->posX,2) + pow(link[i]->mass1->posY --- 140,148 ---- void m_bang() { ! t_float F=0,Fx=0,Fy=0, Fz=0,distance,vitesse, X_new, Y_new, Z_new; t_int i; ! struct _mass mass_1, mass_2; ! for (i=0; i<nb_link; i++) { // compute link forces distance = sqrt(pow(link[i]->mass1->posX-link[i]->mass2->posX,2) + pow(link[i]->mass1->posY *************** *** 151,173 **** Fz = F * (link[i]->mass1->posZ - link[i]->mass2->posZ)/distance; // Fy[n] = F * Lz[n]/L[n] } ! } link[i]->mass1->forceX -= Fx; // Fx1[n] = -Fx ! link[i]->mass1->forceX -= link[i]->D2*link[i]->mass1->speedX; // Fx1[n] = Fx1[n] - D2 * vx1[n-1] link[i]->mass2->forceX += Fx; // Fx2[n] = Fx link[i]->mass2->forceX -= link[i]->D2*link[i]->mass2->speedX; // Fx2[n] = Fx2[n] - D2 * vx2[n-1] link[i]->mass1->forceY -= Fy; // Fy1[n] = -Fy ! link[i]->mass1->forceY -= link[i]->D2*link[i]->mass1->speedY; // Fy1[n] = Fy1[n] - D2 * vy1[n-1] link[i]->mass2->forceY += Fy; // Fy2[n] = Fy link[i]->mass2->forceY -= link[i]->D2*link[i]->mass2->speedY; // Fy2[n] = Fy2[n] - D2 * vy2[n-1] link[i]->mass1->forceZ -= Fz; // Fz1[n] = -Fz ! link[i]->mass1->forceZ -= link[i]->D2*link[i]->mass1->speedZ; // Fz1[n] = Fz1[n] - D2 * vz1[n-1] link[i]->mass2->forceZ += Fz; // Fz2[n] = Fz link[i]->mass2->forceZ -= link[i]->D2*link[i]->mass2->speedZ; // Fz2[n] = Fz2[n] - D2 * vz2[n-1] link[i]->distance_old = distance; // L[n-1] = L[n] } ! ! for (i=0; i<nb_mass; i++) ! // compute new masses position only if mobile = 1 ! if (mass[i]->mobile == 1) { X_new = mass[i]->forceX * mass[i]->invM + 2*mass[i]->posX - mass[i]->posX2; // x[n] =Fx[n]/M+2x[n]-x[n-1] mass[i]->posX2 = mass[i]->posX; // x[n-2] = x[n-1] --- 161,183 ---- Fz = F * (link[i]->mass1->posZ - link[i]->mass2->posZ)/distance; // Fy[n] = F * Lz[n]/L[n] } ! } link[i]->mass1->forceX -= Fx; // Fx1[n] = -Fx ! link[i]->mass1->forceX -= link[i]->D2*link[i]->mass1->speedX; // Fx1[n] = Fx1[n] - D2 * vx1[n-1] link[i]->mass2->forceX += Fx; // Fx2[n] = Fx link[i]->mass2->forceX -= link[i]->D2*link[i]->mass2->speedX; // Fx2[n] = Fx2[n] - D2 * vx2[n-1] link[i]->mass1->forceY -= Fy; // Fy1[n] = -Fy ! link[i]->mass1->forceY -= link[i]->D2*link[i]->mass1->speedY; // Fy1[n] = Fy1[n] - D2 * vy1[n-1] link[i]->mass2->forceY += Fy; // Fy2[n] = Fy link[i]->mass2->forceY -= link[i]->D2*link[i]->mass2->speedY; // Fy2[n] = Fy2[n] - D2 * vy2[n-1] link[i]->mass1->forceZ -= Fz; // Fz1[n] = -Fz ! link[i]->mass1->forceZ -= link[i]->D2*link[i]->mass1->speedZ; // Fz1[n] = Fz1[n] - D2 * vz1[n-1] link[i]->mass2->forceZ += Fz; // Fz2[n] = Fz link[i]->mass2->forceZ -= link[i]->D2*link[i]->mass2->speedZ; // Fz2[n] = Fz2[n] - D2 * vz2[n-1] link[i]->distance_old = distance; // L[n-1] = L[n] } ! ! for (i=0; i<nb_mass; i++) ! // compute new masses position only if mobile = 1 ! if (mass[i]->mobile == 1) { X_new = mass[i]->forceX * mass[i]->invM + 2*mass[i]->posX - mass[i]->posX2; // x[n] =Fx[n]/M+2x[n]-x[n-1] mass[i]->posX2 = mass[i]->posX; // x[n-2] = x[n-1] *************** *** 184,203 **** } ! for (i=0; i<nb_mass; i++) { // clear forces ! mass[i]->out_forceX = mass[i]->forceX; mass[i]->forceX = 0; ! mass[i]->out_forceY = mass[i]->forceY; mass[i]->forceY = 0; ! mass[i]->out_forceZ = mass[i]->forceZ; mass[i]->forceZ = 0; ! } } // -------------------------------------------------------------- MASSES // ---------------------------------------------------------------------- ! void m_mass(int argc,t_atom *argv) ! // add a mass ! // Id, nbr, mobile, invM, speedX, posX, forceX { t_atom sortie[7], aux[2]; --- 194,213 ---- } ! for (i=0; i<nb_mass; i++) { // clear forces ! mass[i]->out_forceX = mass[i]->forceX; mass[i]->forceX = 0; ! mass[i]->out_forceY = mass[i]->forceY; mass[i]->forceY = 0; ! mass[i]->out_forceZ = mass[i]->forceZ; mass[i]->forceZ = 0; ! } } // -------------------------------------------------------------- MASSES // ---------------------------------------------------------------------- ! void m_mass(int argc,t_atom *argv) ! // add a mass ! // Id, nbr, mobile, invM, speedX, posX, forceX { t_atom sortie[7], aux[2]; *************** *** 207,211 **** error("mass : Id mobile mass X Y Z"); ! mass[nb_mass] = new t_mass; // new mass mass[nb_mass]->Id = GetSymbol(argv[0]); // Id mass[nb_mass]->mobile = GetInt(argv[1]); // mobile --- 217,221 ---- error("mass : Id mobile mass X Y Z"); ! mass[nb_mass] = new t_mass; // new mass mass[nb_mass]->Id = GetSymbol(argv[0]); // Id mass[nb_mass]->mobile = GetInt(argv[1]); // mobile *************** *** 214,232 **** else M = GetFloat(argv[2]); mass[nb_mass]->invM = 1/(M); // 1/M ! mass[nb_mass]->speedX = 0; // vx[n] mass[nb_mass]->posX = GetFloat(argv[3]); // x[n] ! mass[nb_mass]->posX2 = GetFloat(argv[3]); // x[n-1] mass[nb_mass]->forceX = 0; // Fx[n] ! mass[nb_mass]->speedY = 0; // vy[n] mass[nb_mass]->posY = GetFloat(argv[4]); // y[n] ! mass[nb_mass]->posY2 = GetFloat(argv[4]); // y[n-1] mass[nb_mass]->forceY = 0; // Fz[n] ! mass[nb_mass]->speedZ = 0; // vz[n] mass[nb_mass]->posZ = GetFloat(argv[5]); // z[n] ! mass[nb_mass]->posZ2 = GetFloat(argv[5]); // z[n-1] mass[nb_mass]->forceZ = 0; // Fz[n] mass[nb_mass]->nbr = id_mass; // id number nb_mass++ ; ! id_mass++; nb_mass = min ( nb_max_mass -1, nb_mass ); SetFloat((sortie[0]),id_mass-1); --- 224,242 ---- else M = GetFloat(argv[2]); mass[nb_mass]->invM = 1/(M); // 1/M ! mass[nb_mass]->speedX = 0; // vx[n] mass[nb_mass]->posX = GetFloat(argv[3]); // x[n] ! mass[nb_mass]->posX2 = GetFloat(argv[3]); // x[n-1] mass[nb_mass]->forceX = 0; // Fx[n] ! mass[nb_mass]->speedY = 0; // vy[n] mass[nb_mass]->posY = GetFloat(argv[4]); // y[n] ! mass[nb_mass]->posY2 = GetFloat(argv[4]); // y[n-1] mass[nb_mass]->forceY = 0; // Fz[n] ! mass[nb_mass]->speedZ = 0; // vz[n] mass[nb_mass]->posZ = GetFloat(argv[5]); // z[n] ! mass[nb_mass]->posZ2 = GetFloat(argv[5]); // z[n-1] mass[nb_mass]->forceZ = 0; // Fz[n] mass[nb_mass]->nbr = id_mass; // id number nb_mass++ ; ! id_mass++; nb_mass = min ( nb_max_mass -1, nb_mass ); SetFloat((sortie[0]),id_mass-1); *************** *** 240,245 **** } ! void m_forceX(int argc,t_atom *argv) ! { // add a force to mass(es) named Id t_int i; --- 250,255 ---- } ! void m_forceX(int argc,t_atom *argv) ! { // add a force to mass(es) named Id t_int i; *************** *** 256,261 **** } ! void m_forceY(int argc,t_atom *argv) ! { // add a force to mass(es) named Id t_int i; --- 266,271 ---- } ! void m_forceY(int argc,t_atom *argv) ! { // add a force to mass(es) named Id t_int i; *************** *** 272,277 **** } ! void m_forceZ(int argc,t_atom *argv) ! { // add a force to mass(es) named Id t_int i; --- 282,287 ---- } ! void m_forceZ(int argc,t_atom *argv) ! { // add a force to mass(es) named Id t_int i; *************** *** 289,294 **** void m_posX(int argc,t_atom *argv) ! { ! // displace mass(es) named Id to a certain position t_int i; const t_symbol *sym = GetSymbol(argv[0]); --- 299,304 ---- void m_posX(int argc,t_atom *argv) ! { ! // displace mass(es) named Id to a certain position t_int i; const t_symbol *sym = GetSymbol(argv[0]); *************** *** 306,311 **** void m_posY(int argc,t_atom *argv) ! { ! // displace mass(es) named Id to a certain position t_int i; const t_symbol *sym = GetSymbol(argv[0]); --- 316,321 ---- void m_posY(int argc,t_atom *argv) ! { ! // displace mass(es) named Id to a certain position t_int i; const t_symbol *sym = GetSymbol(argv[0]); *************** *** 324,329 **** void m_posZ(int argc,t_atom *argv) ! { ! // displace mass(es) named Id to a certain position t_int i; const t_symbol *sym = GetSymbol(argv[0]); --- 334,339 ---- void m_posZ(int argc,t_atom *argv) ! { ! // displace mass(es) named Id to a certain position t_int i; const t_symbol *sym = GetSymbol(argv[0]); *************** *** 342,347 **** void m_set_mobile(int argc,t_atom *argv) ! { ! // set mass No to mobile t_int i,aux; --- 352,357 ---- void m_set_mobile(int argc,t_atom *argv) ! { ! // set mass No to mobile t_int i,aux; *************** *** 359,364 **** void m_set_fixe(int argc,t_atom *argv) ! { ! // set mass No to fixed t_int i,aux; --- 369,374 ---- void m_set_fixe(int argc,t_atom *argv) ! { ! // set mass No to fixed t_int i,aux; *************** *** 379,383 **** // Delete mass t_int i,nb_link_delete=0; ! t_atom sortie[7], aux[nb_link]; if (argc != 1) --- 389,394 ---- // Delete mass t_int i,nb_link_delete=0; ! t_atom sortie[7]; ! NEWARR(t_atom,aux,nb_link); if (argc != 1) *************** *** 411,419 **** break; } } void m_Xmax(int argc,t_atom *argv) ! { // set X max if (argc != 1) --- 422,431 ---- break; } + DELARR(aux); } void m_Xmax(int argc,t_atom *argv) ! { // set X max if (argc != 1) *************** *** 423,427 **** void m_Xmin(int argc,t_atom *argv) ! { // set X min if (argc != 1) --- 435,439 ---- void m_Xmin(int argc,t_atom *argv) ! { // set X min if (argc != 1) *************** *** 430,434 **** } void m_Ymax(int argc,t_atom *argv) ! { // set Y max if (argc != 1) --- 442,446 ---- } void m_Ymax(int argc,t_atom *argv) ! { // set Y max if (argc != 1) *************** *** 438,442 **** void m_Ymin(int argc,t_atom *argv) ! { // set Y min if (argc != 1) --- 450,454 ---- void m_Ymin(int argc,t_atom *argv) ! { // set Y min if (argc != 1) *************** *** 446,450 **** void m_Zmax(int argc,t_atom *argv) ! { // set maximum Z of all masses if (argc != 1) --- 458,462 ---- void m_Zmax(int argc,t_atom *argv) ! { // set maximum Z of all masses if (argc != 1) *************** *** 454,458 **** void m_Zmin(int argc,t_atom *argv) ! { // set minimum Z of all masses if (argc != 1) --- 466,470 ---- void m_Zmin(int argc,t_atom *argv) ! { // set minimum Z of all masses if (argc != 1) *************** *** 464,470 **** // --------------------------------------------------------------------- void m_link(int argc,t_atom *argv) ! // add a link ! // Id, *mass1, *mass2, K1, D1, D2, (Lmin,Lmax) ! { t_atom sortie[7], aux[2]; t_int i; --- 476,482 ---- // --------------------------------------------------------------------- void m_link(int argc,t_atom *argv) ! // add a link ! // Id, *mass1, *mass2, K1, D1, D2, (Lmin,Lmax) ! { t_atom sortie[7], aux[2]; t_int i; *************** *** 479,483 **** else if(mass[i]->nbr==GetAInt(argv[2])) // pointer to mass2 link[nb_link]->mass2 = mass[i]; ! link[nb_link]->K1 = GetFloat(argv[3]); // K1 link[nb_link]->D1 = GetFloat(argv[4]); // D1 link[nb_link]->D2 = GetFloat(argv[5]); // D2 --- 491,495 ---- else if(mass[i]->nbr==GetAInt(argv[2])) // pointer to mass2 link[nb_link]->mass2 = mass[i]; ! link[nb_link]->K1 = GetFloat(argv[3]); // K1 link[nb_link]->D1 = GetFloat(argv[4]); // D1 link[nb_link]->D2 = GetFloat(argv[5]); // D2 *************** *** 503,507 **** } nb_link++; ! id_link++; nb_link = min ( nb_max_link -1, nb_link ); SetFloat((sortie[0]),id_link-1); --- 515,519 ---- } nb_link++; ! id_link++; nb_link = min ( nb_max_link -1, nb_link ); SetFloat((sortie[0]),id_link-1); *************** *** 512,524 **** SetFloat((sortie[5]),link[nb_link-1]->D1); SetFloat((sortie[6]),link[nb_link-1]->D2); ! ToOutAnything(1,S_Link,7,sortie); } void m_ilink(int argc,t_atom *argv) ! // add interactor link ! // Id, Id masses1, Id masses2, K1, D1, D2, (Lmin, Lmax) ! { t_atom aux[2], arglist[8]; ! t_int i,j, imass1[nb_mass], nbmass1=0, imass2[nb_mass], nbmass2=0; t_symbol *Id1, *Id2; --- 524,538 ---- SetFloat((sortie[5]),link[nb_link-1]->D1); SetFloat((sortie[6]),link[nb_link-1]->D2); ! ToOutAnything(1,S_Link,7,sortie); } void m_ilink(int argc,t_atom *argv) ! // add interactor link ! // Id, Id masses1, Id masses2, K1, D1, D2, (Lmin, Lmax) ! { t_atom aux[2], arglist[8]; ! t_int i,j, nbmass1=0, nbmass2=0; ! NEWARR(t_int,imass1,nb_mass); ! NEWARR(t_int,imass2,nb_mass); t_symbol *Id1, *Id2; *************** *** 561,568 **** m_link(argc,arglist); } } void m_setK(int argc,t_atom *argv) ! { // set rigidity of link(s) named Id t_int i; --- 575,584 ---- m_link(argc,arglist); } + DELARR(imass1); + DELARR(imass2); } void m_setK(int argc,t_atom *argv) ! { // set rigidity of link(s) named Id t_int i; *************** *** 580,584 **** void m_setD(int argc,t_atom *argv) ! { // set damping of link(s) named Id t_int i; --- 596,600 ---- void m_setD(int argc,t_atom *argv) ! { // set damping of link(s) named Id t_int i; *************** *** 596,600 **** void m_setD2(int argc,t_atom *argv) ! { // set damping of link(s) named Id t_int i; --- 612,616 ---- void m_setD2(int argc,t_atom *argv) ! { // set damping of link(s) named Id t_int i; *************** *** 828,832 **** // List of masses positions on first outlet { ! t_atom sortie[3*nb_mass]; t_int i; --- 844,848 ---- // List of masses positions on first outlet { ! NEWARR(t_atom,sortie,3*nb_mass); t_int i; *************** *** 837,840 **** --- 853,857 ---- } ToOutAnything(0, S_massesPosL, 3*nb_mass, sortie); + DELARR(sortie); } *************** *** 842,846 **** // List of masses positions on first outlet { ! t_atom sortie[3*nb_mass]; t_int i; --- 859,863 ---- // List of masses positions on first outlet { ! NEWARR(t_atom,sortie,3*nb_mass); t_int i; *************** *** 851,854 **** --- 868,872 ---- } ToOutAnything(0, S_massesForcesL, 3*nb_mass, sortie); + DELARR(sortie); } *************** *** 885,889 **** // -------------------------------------------------------------- GLOBAL VARIABLES // -------------------------------------------------------------------------------- ! t_link * link[nb_max_link]; t_mass * mass[nb_max_mass]; t_float Xmin, Xmax, Ymin, Ymax, Zmin, Zmax; --- 903,907 ---- // -------------------------------------------------------------- GLOBAL VARIABLES // -------------------------------------------------------------------------------- ! t_link * link[nb_max_link]; t_mass * mass[nb_max_mass]; t_float Xmin, Xmax, Ymin, Ymax, Zmin, Zmax;

1 0

externals/nusmuk/msd2D main.cpp,1.5,1.6
by Thomas Grill 26 Apr '05

26 Apr '05

Update of /cvsroot/pure-data/externals/nusmuk/msd2D In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7919/nusmuk/msd2D Modified Files: main.cpp Log Message: some small changes for Windows compilation Index: main.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd2D/main.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** main.cpp 22 Apr 2005 09:33:31 -0000 1.5 --- main.cpp 26 Apr 2005 11:39:48 -0000 1.6 *************** *** 40,45 **** // define constants #define MSD2D_VERSION 0.03 ! #define nb_max_link 4000 ! #define nb_max_mass 4000 #define Id_length 20 --- 40,45 ---- // define constants #define MSD2D_VERSION 0.03 ! #define nb_max_link 4000 ! #define nb_max_mass 4000 #define Id_length 20 *************** *** 49,77 **** #endif ! #define max(a,b) ( ((a) > (b)) ? (a) : (b) ) #define min(a,b) ( ((a) < (b)) ? (a) : (b) ) ! typedef struct _mass { t_symbol *Id; t_int nbr; ! t_int mobile; ! t_float invM; ! t_float speedX; t_float posX; ! t_float posX2; t_float forceX; t_float out_forceX; ! t_float speedY; t_float posY; ! t_float posY2; t_float forceY; t_float out_forceY; ! } t_mass; ! ! typedef struct _link { t_symbol *Id; ! t_int nbr; ! t_mass *mass1; ! t_mass *mass2; t_float K1, D1, D2; t_float longx, longy, longueur, long_min, long_max; --- 49,86 ---- #endif ! #define max(a,b) ( ((a) > (b)) ? (a) : (b) ) #define min(a,b) ( ((a) < (b)) ? (a) : (b) ) ! #ifdef _MSC_VER ! #define NEWARR(type,var,size) type *var = new type[size] ! #define DELARR(var) delete[] var ! #else ! #define NEWARR(type,var,size) type var[size] ! #define DELARR(var) ((void)0) ! #endif ! ! ! typedef struct _mass { t_symbol *Id; t_int nbr; ! t_int mobile; ! t_float invM; ! t_float speedX; t_float posX; ! t_float posX2; t_float forceX; t_float out_forceX; ! t_float speedY; t_float posY; ! t_float posY2; t_float forceY; t_float out_forceY; ! } t_mass; ! ! typedef struct _link { t_symbol *Id; ! t_int nbr; ! t_mass *mass1; ! t_mass *mass2; t_float K1, D1, D2; t_float longx, longy, longueur, long_min, long_max; *************** *** 107,111 **** { t_int i; ! t_atom sortie[0]; for (i=0; i<nb_mass; i++) { --- 116,120 ---- { t_int i; ! // t_atom sortie; for (i=0; i<nb_mass; i++) { *************** *** 115,120 **** delete link[i]; } ! ToOutAnything(1,S_Reset,0,sortie); ! nb_link = 0; nb_mass = 0; id_mass = 0; --- 124,129 ---- delete link[i]; } ! ToOutAnything(1,S_Reset,0,NULL); ! nb_link = 0; nb_mass = 0; id_mass = 0; *************** *** 127,135 **** void m_bang() { ! t_float F=0,Fx=0,Fy=0,distance,vitesse, X_new, Y_new; t_int i; ! struct _mass mass_1, mass_2; ! for (i=0; i<nb_link; i++) { // compute link forces distance = sqrt(pow(link[i]->mass1->posX-link[i]->mass2->posX,2) + --- 136,144 ---- void m_bang() { ! t_float F=0,Fx=0,Fy=0,distance,vitesse, X_new, Y_new; t_int i; ! struct _mass mass_1, mass_2; ! for (i=0; i<nb_link; i++) { // compute link forces distance = sqrt(pow(link[i]->mass1->posX-link[i]->mass2->posX,2) + *************** *** 146,164 **** Fy = F * (link[i]->mass1->posY - link[i]->mass2->posY)/distance; // Fy = F * Ly[n]/L[n] } ! } link[i]->mass1->forceX -= Fx; // Fx1[n] = -Fx ! link[i]->mass1->forceX -= link[i]->D2*link[i]->mass1->speedX; // Fx1[n] = Fx1[n] - D2 * vx1[n-1] link[i]->mass2->forceX += Fx; // Fx2[n] = Fx link[i]->mass2->forceX -= link[i]->D2*link[i]->mass2->speedX; // Fx2[n] = Fx2[n] - D2 * vx2[n-1] link[i]->mass1->forceY -= Fy; // Fy1[n] = -Fy ! link[i]->mass1->forceY -= link[i]->D2*link[i]->mass1->speedY; // Fy1[n] = Fy1[n] - D2 * vy1[n-1] link[i]->mass2->forceY += Fy; // Fy2[n] = Fy link[i]->mass2->forceY -= link[i]->D2*link[i]->mass2->speedY; // Fy1[n] = Fy1[n] - D2 * vy1[n-1] link[i]->distance_old = distance; // L[n-1] = L[n] } ! ! for (i=0; i<nb_mass; i++) ! // compute new masses position only if mobile = 1 ! if (mass[i]->mobile == 1) { X_new = mass[i]->forceX * mass[i]->invM + 2*mass[i]->posX - mass[i]->posX2; // x[n] =Fx[n]/M+2x[n]-x[n-1] mass[i]->posX2 = mass[i]->posX; // x[n-2] = x[n-1] --- 155,173 ---- Fy = F * (link[i]->mass1->posY - link[i]->mass2->posY)/distance; // Fy = F * Ly[n]/L[n] } ! } link[i]->mass1->forceX -= Fx; // Fx1[n] = -Fx ! link[i]->mass1->forceX -= link[i]->D2*link[i]->mass1->speedX; // Fx1[n] = Fx1[n] - D2 * vx1[n-1] link[i]->mass2->forceX += Fx; // Fx2[n] = Fx link[i]->mass2->forceX -= link[i]->D2*link[i]->mass2->speedX; // Fx2[n] = Fx2[n] - D2 * vx2[n-1] link[i]->mass1->forceY -= Fy; // Fy1[n] = -Fy ! link[i]->mass1->forceY -= link[i]->D2*link[i]->mass1->speedY; // Fy1[n] = Fy1[n] - D2 * vy1[n-1] link[i]->mass2->forceY += Fy; // Fy2[n] = Fy link[i]->mass2->forceY -= link[i]->D2*link[i]->mass2->speedY; // Fy1[n] = Fy1[n] - D2 * vy1[n-1] link[i]->distance_old = distance; // L[n-1] = L[n] } ! ! for (i=0; i<nb_mass; i++) ! // compute new masses position only if mobile = 1 ! if (mass[i]->mobile == 1) { X_new = mass[i]->forceX * mass[i]->invM + 2*mass[i]->posX - mass[i]->posX2; // x[n] =Fx[n]/M+2x[n]-x[n-1] mass[i]->posX2 = mass[i]->posX; // x[n-2] = x[n-1] *************** *** 171,181 **** } ! for (i=0; i<nb_mass; i++) { // clear forces ! mass[i]->out_forceX = mass[i]->forceX; mass[i]->forceX = 0; // Fx[n] = 0 ! mass[i]->out_forceY = mass[i]->forceY; mass[i]->forceY = 0; // Fy[n] = 0 ! } } --- 180,190 ---- } ! for (i=0; i<nb_mass; i++) { // clear forces ! mass[i]->out_forceX = mass[i]->forceX; mass[i]->forceX = 0; // Fx[n] = 0 ! mass[i]->out_forceY = mass[i]->forceY; mass[i]->forceY = 0; // Fy[n] = 0 ! } } *************** *** 183,189 **** // ---------------------------------------------------------------------- ! void m_mass(int argc,t_atom *argv) ! // add a mass ! // Id, nbr, mobile, invM, speedX Y, posX Y, forceX Y { t_atom sortie[6], aux[2]; --- 192,198 ---- // ---------------------------------------------------------------------- ! void m_mass(int argc,t_atom *argv) ! // add a mass ! // Id, nbr, mobile, invM, speedX Y, posX Y, forceX Y { t_atom sortie[6], aux[2]; *************** *** 193,197 **** error("mass : Id mobile mass X Y"); ! mass[nb_mass] = new t_mass; // new mass mass[nb_mass]->Id = GetSymbol(argv[0]); // ID mass[nb_mass]->mobile = GetInt(argv[1]); // mobile --- 202,206 ---- error("mass : Id mobile mass X Y"); ! mass[nb_mass] = new t_mass; // new mass mass[nb_mass]->Id = GetSymbol(argv[0]); // ID mass[nb_mass]->mobile = GetInt(argv[1]); // mobile *************** *** 200,214 **** else M = GetFloat(argv[2]); mass[nb_mass]->invM = 1/(M); // invM ! mass[nb_mass]->speedX = 0; // vx[n] mass[nb_mass]->posX = GetFloat(argv[3]); // x[n] ! mass[nb_mass]->posX2 = GetFloat(argv[3]); // x[n-1] mass[nb_mass]->forceX = 0; // Fx[n] ! mass[nb_mass]->speedY = 0; // vy[n] mass[nb_mass]->posY = GetFloat(argv[4]); // y[n] ! mass[nb_mass]->posY2 = GetFloat(argv[4]); // y[n-1] mass[nb_mass]->forceY = 0; // Fy[n] mass[nb_mass]->nbr = id_mass; // id number nb_mass++ ; ! id_mass++; nb_mass = min ( nb_max_mass -1, nb_mass ); SetFloat((sortie[0]),id_mass-1); --- 209,223 ---- else M = GetFloat(argv[2]); mass[nb_mass]->invM = 1/(M); // invM ! mass[nb_mass]->speedX = 0; // vx[n] mass[nb_mass]->posX = GetFloat(argv[3]); // x[n] ! mass[nb_mass]->posX2 = GetFloat(argv[3]); // x[n-1] mass[nb_mass]->forceX = 0; // Fx[n] ! mass[nb_mass]->speedY = 0; // vy[n] mass[nb_mass]->posY = GetFloat(argv[4]); // y[n] ! mass[nb_mass]->posY2 = GetFloat(argv[4]); // y[n-1] mass[nb_mass]->forceY = 0; // Fy[n] mass[nb_mass]->nbr = id_mass; // id number nb_mass++ ; ! id_mass++; nb_mass = min ( nb_max_mass -1, nb_mass ); SetFloat((sortie[0]),id_mass-1); *************** *** 221,226 **** } ! void m_forceX(int argc,t_atom *argv) ! { // add a force to mass(es) named Id t_int i; --- 230,235 ---- } ! void m_forceX(int argc,t_atom *argv) ! { // add a force to mass(es) named Id t_int i; *************** *** 237,242 **** } ! void m_forceY(int argc,t_atom *argv) ! { // add a force to mass(es) named Id t_int i; --- 246,251 ---- } ! void m_forceY(int argc,t_atom *argv) ! { // add a force to mass(es) named Id t_int i; *************** *** 254,259 **** void m_posX(int argc,t_atom *argv) ! { ! // displace mass(es) named Id to a certain position t_int i; const t_symbol *sym = GetSymbol(argv[0]); --- 263,268 ---- void m_posX(int argc,t_atom *argv) ! { ! // displace mass(es) named Id to a certain position t_int i; const t_symbol *sym = GetSymbol(argv[0]); *************** *** 271,276 **** void m_posY(int argc,t_atom *argv) ! { ! // displace mass(es) named Id to a certain position t_int i; const t_symbol *sym = GetSymbol(argv[0]); --- 280,285 ---- void m_posY(int argc,t_atom *argv) ! { ! // displace mass(es) named Id to a certain position t_int i; const t_symbol *sym = GetSymbol(argv[0]); *************** *** 289,294 **** void m_set_mobile(int argc,t_atom *argv) ! { ! // set mass No to mobile t_int i,aux; --- 298,303 ---- void m_set_mobile(int argc,t_atom *argv) ! { ! // set mass No to mobile t_int i,aux; *************** *** 306,311 **** void m_set_fixe(int argc,t_atom *argv) ! { ! // set mass No to fixed t_int i,aux; --- 315,320 ---- void m_set_fixe(int argc,t_atom *argv) ! { ! // set mass No to fixed t_int i,aux; *************** *** 326,330 **** // Delete mass t_int i,nb_link_delete=0; ! t_atom sortie[6], aux[nb_link]; if (argc != 1) --- 335,340 ---- // Delete mass t_int i,nb_link_delete=0; ! t_atom sortie[6]; ! NEWARR(t_atom,aux,nb_link); if (argc != 1) *************** *** 357,365 **** break; } } void m_Xmax(int argc,t_atom *argv) ! { // set X max if (argc != 1) --- 367,376 ---- break; } + DELARR(aux); } void m_Xmax(int argc,t_atom *argv) ! { // set X max if (argc != 1) *************** *** 369,373 **** void m_Xmin(int argc,t_atom *argv) ! { // set X min if (argc != 1) --- 380,384 ---- void m_Xmin(int argc,t_atom *argv) ! { // set X min if (argc != 1) *************** *** 376,380 **** } void m_Ymax(int argc,t_atom *argv) ! { // set Y max if (argc != 1) --- 387,391 ---- } void m_Ymax(int argc,t_atom *argv) ! { // set Y max if (argc != 1) *************** *** 384,388 **** void m_Ymin(int argc,t_atom *argv) ! { // set Y min if (argc != 1) --- 395,399 ---- void m_Ymin(int argc,t_atom *argv) ! { // set Y min if (argc != 1) *************** *** 395,401 **** void m_link(int argc,t_atom *argv) ! // add a link ! // Id, *mass1, *mass2, K1, D1, D2, (Lmin,Lmax) ! { t_atom sortie[7], aux[2]; t_int i; --- 406,412 ---- void m_link(int argc,t_atom *argv) ! // add a link ! // Id, *mass1, *mass2, K1, D1, D2, (Lmin,Lmax) ! { t_atom sortie[7], aux[2]; t_int i; *************** *** 410,414 **** else if(mass[i]->nbr==GetAInt(argv[2])) // pointer to mass2 link[nb_link]->mass2 = mass[i]; ! link[nb_link]->K1 = GetFloat(argv[3]); // K1 link[nb_link]->D1 = GetFloat(argv[4]); // D1 link[nb_link]->D2 = GetFloat(argv[5]); // D2 --- 421,425 ---- else if(mass[i]->nbr==GetAInt(argv[2])) // pointer to mass2 link[nb_link]->mass2 = mass[i]; ! link[nb_link]->K1 = GetFloat(argv[3]); // K1 link[nb_link]->D1 = GetFloat(argv[4]); // D1 link[nb_link]->D2 = GetFloat(argv[5]); // D2 *************** *** 433,437 **** } nb_link++; ! id_link++; nb_link = min ( nb_max_link -1, nb_link ); SetFloat((sortie[0]),id_link-1); --- 444,448 ---- } nb_link++; ! id_link++; nb_link = min ( nb_max_link -1, nb_link ); SetFloat((sortie[0]),id_link-1); *************** *** 442,454 **** SetFloat((sortie[5]),link[nb_link-1]->D1); SetFloat((sortie[6]),link[nb_link-1]->D2); ! ToOutAnything(1,S_Link,7,sortie); } void m_ilink(int argc,t_atom *argv) ! // add interactor link ! // Id, Id masses1, Id masses2, K1, D1, D2, (Lmin, Lmax) ! { t_atom aux[2], arglist[8]; ! t_int i,j, imass1[nb_mass], nbmass1=0, imass2[nb_mass], nbmass2=0; t_symbol *Id1, *Id2; --- 453,467 ---- SetFloat((sortie[5]),link[nb_link-1]->D1); SetFloat((sortie[6]),link[nb_link-1]->D2); ! ToOutAnything(1,S_Link,7,sortie); } void m_ilink(int argc,t_atom *argv) ! // add interactor link ! // Id, Id masses1, Id masses2, K1, D1, D2, (Lmin, Lmax) ! { t_atom aux[2], arglist[8]; ! t_int i,j, nbmass1=0, nbmass2=0; ! NEWARR(t_int,imass1,nb_mass); ! NEWARR(t_int,imass2,nb_mass); t_symbol *Id1, *Id2; *************** *** 491,498 **** m_link(argc,arglist); } } void m_setK(int argc,t_atom *argv) ! { // set rigidity of link(s) named Id t_int i; --- 504,513 ---- m_link(argc,arglist); } + DELARR(imass1); + DELARR(imass2); } void m_setK(int argc,t_atom *argv) ! { // set rigidity of link(s) named Id t_int i; *************** *** 510,514 **** void m_setD(int argc,t_atom *argv) ! { // set damping of link(s) named Id t_int i; --- 525,529 ---- void m_setD(int argc,t_atom *argv) ! { // set damping of link(s) named Id t_int i; *************** *** 526,530 **** void m_setD2(int argc,t_atom *argv) ! { // set damping of link(s) named Id t_int i; --- 541,545 ---- void m_setD2(int argc,t_atom *argv) ! { // set damping of link(s) named Id t_int i; *************** *** 743,747 **** // List of masses positions on first outlet { ! t_atom sortie[2*nb_mass]; t_int i; --- 758,762 ---- // List of masses positions on first outlet { ! NEWARR(t_atom,sortie,2*nb_mass); t_int i; *************** *** 751,754 **** --- 766,770 ---- } ToOutAnything(0, S_massesPosL, 2*nb_mass, sortie); + DELARR(sortie); } *************** *** 756,760 **** // List of masses forces on first outlet { ! t_atom sortie[2*nb_mass]; t_int i; --- 772,776 ---- // List of masses forces on first outlet { ! NEWARR(t_atom,sortie,2*nb_mass); t_int i; *************** *** 764,767 **** --- 780,784 ---- } ToOutAnything(0, S_massesForcesL, 2*nb_mass, sortie); + DELARR(sortie); } *************** *** 798,802 **** // -------------------------------------------------------------------------------- ! t_link * link[nb_max_link]; t_mass * mass[nb_max_mass]; t_float Xmin, Xmax, Ymin, Ymax; --- 815,819 ---- // -------------------------------------------------------------------------------- ! t_link * link[nb_max_link]; t_mass * mass[nb_max_mass]; t_float Xmin, Xmax, Ymin, Ymax;

1 0

← Newer
1
2
3
4
5
6
7
8
...
31
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 April 2005