Pd-cvs May 2005

pd-cvs@lists.iem.at

14 participants
407 discussions

pd bootstrap.sh,1.1.2.1,1.1.2.2
by Tim Blechmann 02 May '05

02 May '05

Update of /cvsroot/pure-data/pd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1762 Modified Files: Tag: devel_0_38 bootstrap.sh Log Message: force automake 1.8 Index: bootstrap.sh =================================================================== RCS file: /cvsroot/pure-data/pd/Attic/bootstrap.sh,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** bootstrap.sh 5 Nov 2004 13:23:19 -0000 1.1.2.1 --- bootstrap.sh 2 May 2005 11:38:12 -0000 1.1.2.2 *************** *** 1,5 **** #! /bin/sh ! aclocal \ ! && automake --gnu --add-missing \ && autoconf \ No newline at end of file --- 1,5 ---- #! /bin/sh ! aclocal-1.8 \ ! && automake-1.8 --foreign \ && autoconf \ No newline at end of file

1 0

extensions/gui/ix q.wid,1.3,1.4
by carmen rocco 02 May '05

02 May '05

Update of /cvsroot/pure-data/extensions/gui/ix In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31550 Modified Files: q.wid Log Message: commiting cuz colorCVS 'modified' yellow hurts my eyes Index: q.wid =================================================================== RCS file: /cvsroot/pure-data/extensions/gui/ix/q.wid,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** q.wid 28 Apr 2005 22:34:07 -0000 1.3 --- q.wid 2 May 2005 11:24:19 -0000 1.4 *************** *** 30,34 **** #. @list foreach x [list .#args] {.- insert end $x} #. @add .- insert end [join [lrange [list .#args] 0 end] " "] ! #. @scroll .- yview scroll .#1 units .: puts "scrollin .#1" #. @symbol .- insert end {.#1} #. @float ::ix::qi .- .| .#1 --- 30,34 ---- #. @list foreach x [list .#args] {.- insert end $x} #. @add .- insert end [join [lrange [list .#args] 0 end] " "] ! #. @scroll .- yview scroll .#1 units #. @symbol .- insert end {.#1} #. @float ::ix::qi .- .| .#1

1 0

extensions/gui/ix ngrid-demo.pd,1.1,1.2
by carmen rocco 02 May '05

02 May '05

Update of /cvsroot/pure-data/extensions/gui/ix In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31391 Modified Files: ngrid-demo.pd Log Message: ace ---------------------------------------------------------------------- Index: ngrid-demo.pd =================================================================== RCS file: /cvsroot/pure-data/extensions/gui/ix/ngrid-demo.pd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ngrid-demo.pd 24 Apr 2005 12:10:00 -0000 1.1 --- ngrid-demo.pd 2 May 2005 11:23:19 -0000 1.2 *************** *** 1,3 **** ! #N canvas 57 204 586 521 12; #X obj 9 -29 widget ngrid n1 #w 382 #h 382 #move 0 #radius 8; #X floatatom 360 365 3 2 233 0 - - -; --- 1,3 ---- ! #N canvas 57 204 1033 585 12; #X obj 9 -29 widget ngrid n1 #w 382 #h 382 #move 0 #radius 8; #X floatatom 360 365 3 2 233 0 - - -; *************** *** 5,9 **** #X msg 394 381 radius \$1; #X msg 382 362 spread \$1; ! #X obj 403 336 bng 23 250 50 0 empty empty empty 0 -6 0 8 -24198 -1 -1; #X obj 9 418 osc~; --- 5,9 ---- #X msg 394 381 radius \$1; #X msg 382 362 spread \$1; ! #X obj 403 337 bng 23 250 50 0 empty empty empty 0 -6 0 8 -24198 -1 -1; #X obj 9 418 osc~; *************** *** 41,47 **** #X obj 86 454 prepend set; #X obj 160 442 hsl 128 15 0 2000 0 0 empty empty empty -2 -6 0 8 -262144 ! -1 -1 0 1; #X obj 160 458 hsl 128 15 0 2000 0 0 empty empty empty -2 -6 0 8 -262144 ! -1 -1 0 1; #X obj 423 50 widget ngrid m #w 64 #h 64; #X msg 407 451 add x 1 0 10 \, add y 2 0 10; --- 41,47 ---- #X obj 86 454 prepend set; #X obj 160 442 hsl 128 15 0 2000 0 0 empty empty empty -2 -6 0 8 -262144 ! -1 -1 6350 1; #X obj 160 458 hsl 128 15 0 2000 0 0 empty empty empty -2 -6 0 8 -262144 ! -1 -1 6350 1; #X obj 423 50 widget ngrid m #w 64 #h 64; #X msg 407 451 add x 1 0 10 \, add y 2 0 10; *************** *** 50,56 **** #X obj 400 147 prepend set; #X obj 435 166 hsl 128 15 0 10 0 0 empty empty empty -2 -6 0 8 -262144 ! -1 -1 0 1; #X obj 435 181 hsl 128 15 0 10 0 0 empty empty empty -2 -6 0 8 -262144 ! -1 -1 0 1; #X obj 496 50 widget ngrid m #w 64 #h 64; #X obj 510 212 widget ngrid m #w 64 #h 64; --- 50,56 ---- #X obj 400 147 prepend set; #X obj 435 166 hsl 128 15 0 10 0 0 empty empty empty -2 -6 0 8 -262144 ! -1 -1 1270 1; #X obj 435 181 hsl 128 15 0 10 0 0 empty empty empty -2 -6 0 8 -262144 ! -1 -1 2540 1; #X obj 496 50 widget ngrid m #w 64 #h 64; #X obj 510 212 widget ngrid m #w 64 #h 64; *************** *** 93,96 **** --- 93,137 ---- #X msg 472 333 0 2000; #X text 530 -25 ngrid; + #X obj 884 480 sendOSC; + #X msg 885 404 connect localhost 16180; + #X obj 884 461 prepend send; + #X obj 601 362 dumpOSC 3339; + #X obj 600 -30 widget ngrid n2 #w 382 #h 382 #move 0 #radius 8; + #X obj 601 381 OSCroute /om; + #X obj 601 400 OSCroute /new_port; + #X obj 601 419 niagara 4; + #X obj 601 438 niagara 1; + #X obj 601 476 glue; + #X obj 601 533 prepend add; + #X obj 601 457 a2l; + #X obj 984 385 t b b b; + #X msg 884 442 /om/request/all_objects 5; + #X obj 785 366 widget dm dmngr #items .(error normal swarm trails.) + ; + #X msg 732 372 move \$1; + #X msg 929 481 disconnect; + #X obj 677 437 prepend /om/synth/set_port_value 1; + #X msg 883 423 /om/engine/register_client 0 localhost 3339; + #X msg 1080 -23 -height 26 -width 26 -bg gray95; + #X obj 650 457 niagara 1; + #X obj 601 495 spigot; + #X msg 650 495 1; + #X msg 670 495 0; + #X obj 650 476 route CONTROL; + #X obj 724 399 OSCroute /control_change; + #X obj 724 416 prepend setpos; + #X obj 680 379 spigot; + #X obj 711 365 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 + 1; + #X obj 743 456 OSCroute /node_removal; + #X obj 690 495 niagara 1; + #X obj 601 514 spigot; + #X msg 650 514 1; + #X msg 670 514 0; + #X obj 690 514 route INPUT; + #X obj 744 475 prepend delete; + #X obj 932 384 loadbang; + #X text 844 524 www.nongnu.org/om-synth/; + #X text 877 514 get om:; #X connect 0 0 33 0; #X connect 1 0 4 0; *************** *** 210,211 **** --- 251,296 ---- #X connect 83 0 71 0; #X connect 84 0 81 0; + #X connect 87 0 86 0; + #X connect 88 0 86 0; + #X connect 89 0 91 0; + #X connect 90 0 103 0; + #X connect 91 0 92 0; + #X connect 91 0 113 0; + #X connect 91 0 115 0; + #X connect 92 0 93 0; + #X connect 93 0 94 0; + #X connect 93 1 95 1; + #X connect 94 0 97 0; + #X connect 94 1 106 0; + #X connect 95 0 107 0; + #X connect 96 0 90 0; + #X connect 97 0 95 0; + #X connect 98 0 99 0; + #X connect 98 1 104 0; + #X connect 98 2 87 0; + #X connect 99 0 88 0; + #X connect 100 0 101 0; + #X connect 101 0 90 0; + #X connect 102 0 86 0; + #X connect 103 0 88 0; + #X connect 104 0 88 0; + #X connect 106 0 110 0; + #X connect 106 1 116 0; + #X connect 107 0 117 0; + #X connect 108 0 107 1; + #X connect 109 0 107 1; + #X connect 110 0 108 0; + #X connect 110 1 109 0; + #X connect 111 0 112 0; + #X connect 112 0 90 0; + #X connect 113 0 111 0; + #X connect 114 0 113 1; + #X connect 115 0 121 0; + #X connect 116 0 120 0; + #X connect 117 0 96 0; + #X connect 118 0 117 1; + #X connect 119 0 117 1; + #X connect 120 0 118 0; + #X connect 120 1 119 0; + #X connect 121 0 90 0; + #X connect 122 0 98 0;

1 0

externals/nusmuk/msd2D/editor mass-set.pd,1.1,1.2
by Frank Barknecht 02 May '05

02 May '05

Update of /cvsroot/pure-data/externals/nusmuk/msd2D/editor In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30946 Modified Files: mass-set.pd Log Message: Bugfix: only set positions of fixed masses. Index: mass-set.pd =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd2D/editor/mass-set.pd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mass-set.pd 29 Apr 2005 19:28:36 -0000 1.1 --- mass-set.pd 2 May 2005 11:21:04 -0000 1.2 *************** *** 16,24 **** #X obj 251 73 r mypointer; #X obj 263 348 pointer; ! #X obj 263 509 s pointer2msd; ! #X obj 263 395 get mass mid x y; ! #X msg 263 448 posX \$1 \$2; ! #X obj 263 423 pack 0 0 0; ! #X msg 275 474 posY \$1 \$3; #X obj 91 261 t b a; #X obj 263 320 spigot; --- 16,20 ---- #X obj 251 73 r mypointer; #X obj 263 348 pointer; ! #X obj 307 585 s pointer2msd; #X obj 91 261 t b a; #X obj 263 320 spigot; *************** *** 27,30 **** --- 23,33 ---- 1; #X obj 263 274 r pollpos; + #X obj 263 453 pack 0 0 0 0; + #X obj 263 397 get mass mob mid x y; + #X obj 263 478 route 0; + #X text 320 478 = is a mobile mass \, don't set positions for these + ; + #X msg 307 536 posX \$2 \$3; + #X msg 327 562 posY \$2 \$4; #X connect 0 0 1 0; #X connect 1 0 8 0; *************** *** 32,40 **** #X connect 3 1 0 1; #X connect 4 0 0 0; ! #X connect 6 0 20 0; #X connect 7 0 6 1; #X connect 7 0 12 0; #X connect 8 0 7 0; ! #X connect 8 0 22 0; #X connect 8 1 2 2; #X connect 8 1 14 1; --- 35,43 ---- #X connect 3 1 0 1; #X connect 4 0 0 0; ! #X connect 6 0 16 0; #X connect 7 0 6 1; #X connect 7 0 12 0; #X connect 8 0 7 0; ! #X connect 8 0 18 0; #X connect 8 1 2 2; #X connect 8 1 14 1; *************** *** 42,56 **** #X connect 11 0 2 0; #X connect 13 0 3 0; ! #X connect 14 0 16 0; ! #X connect 16 0 18 0; ! #X connect 16 1 18 1; ! #X connect 16 2 18 2; ! #X connect 17 0 15 0; ! #X connect 18 0 17 0; #X connect 18 0 19 0; ! #X connect 19 0 15 0; ! #X connect 20 1 11 0; ! #X connect 21 0 14 0; ! #X connect 22 0 21 1; ! #X connect 22 0 23 0; ! #X connect 24 0 21 0; --- 45,61 ---- #X connect 11 0 2 0; #X connect 13 0 3 0; ! #X connect 14 0 22 0; ! #X connect 16 1 11 0; ! #X connect 17 0 14 0; ! #X connect 18 0 17 1; #X connect 18 0 19 0; ! #X connect 20 0 17 0; ! #X connect 21 0 23 0; ! #X connect 22 0 21 0; ! #X connect 22 1 21 1; ! #X connect 22 2 21 2; ! #X connect 22 3 21 3; ! #X connect 23 1 25 0; ! #X connect 23 1 26 0; ! #X connect 25 0 15 0; ! #X connect 26 0 15 0;

1 0

extensions/gui/ix ngrid.wid,1.1,1.2
by carmen rocco 02 May '05

02 May '05

Update of /cvsroot/pure-data/extensions/gui/ix In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26751 Modified Files: ngrid.wid Log Message: .:. Index: ngrid.wid =================================================================== RCS file: /cvsroot/pure-data/extensions/gui/ix/ngrid.wid,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ngrid.wid 24 Apr 2005 12:10:00 -0000 1.1 --- ngrid.wid 2 May 2005 11:01:09 -0000 1.2 *************** *** 1,10 **** namespace eval ::ix { ! proc random_int {} { ! return [expr "int(floor(rand()*16))"] ! } proc random_clr {} { return [format "\#%1X%1X%1X%1X%1X%1X" [random_int] [random_int] [random_int] [random_int] [random_int] [random_int]] } variable _ proc ngrid_new {path target w h bg ln div move spread radius max} { variable _ --- 1,9 ---- namespace eval ::ix { ! proc random_int {} {return [expr "int(floor(rand()*16))"]} proc random_clr {} { return [format "\#%1X%1X%1X%1X%1X%1X" [random_int] [random_int] [random_int] [random_int] [random_int] [random_int]] } variable _ + proc ngrid_new {path target w h bg ln div move spread radius max} { variable _ *************** *** 23,37 **** set _($target:spread) $spread set _($target:radius) $radius ! set _($target:max) $max ! } ! proc ngrid_pos {which path target what where} { variable _ array set dm {x width y height} for {set n 0 } {$n <= $_($target:n)} {incr n} { foreach xy {x y} { ! if {[info exists _($target:box$n:$xy)] && [lindex $_($target:box$n:$xy) 0] eq $what} { set x [expr [lindex [$path.ngrid coords sqr_$n] 0] + $_($target:radius)] set y [expr [lindex [$path.ngrid coords sqr_$n] 1] + $_($target:radius)] ! set $xy [expr ($where - [lindex $_($target:box$n:$xy) 1 ].0) / ([lindex $_($target:box$n:$xy) 2] - [lindex $_($target:box$n:$xy) 1 ].0) * [winfo $dm($xy) $path.ngrid]] switch $which { setpos {$path.ngrid coords sqr_$n [expr $x - $_($target:radius)] [expr $y - $_($target:radius)] [expr $x + $_($target:radius)] [expr $y + $_($target:radius)]} --- 22,36 ---- set _($target:spread) $spread set _($target:radius) $radius ! set _($target:max) $max} ! ! proc ngrid_find {which path target what udata} { variable _ array set dm {x width y height} for {set n 0 } {$n <= $_($target:n)} {incr n} { foreach xy {x y} { ! if {[$path.ngrid find withtag name_${xy}_$n] ne "" && [string match "$what*" [lindex $_($target:box$n:$xy) 0]]} { set x [expr [lindex [$path.ngrid coords sqr_$n] 0] + $_($target:radius)] set y [expr [lindex [$path.ngrid coords sqr_$n] 1] + $_($target:radius)] ! set $xy [expr ($udata - [lindex $_($target:box$n:$xy) 1 ] + 0.0) / ([lindex $_($target:box$n:$xy) 2] - [lindex $_($target:box$n:$xy) 1 ] + 0.0) * [winfo $dm($xy) $path.ngrid]] switch $which { setpos {$path.ngrid coords sqr_$n [expr $x - $_($target:radius)] [expr $y - $_($target:radius)] [expr $x + $_($target:radius)] [expr $y + $_($target:radius)]} *************** *** 40,93 **** ngrid_click $path $target $x $y } ! } ! } ! } ! } ! } ! proc ngrid_vset {path target what where} { ! variable _ ! set _($target:$what) $where ! } proc ngrid_add {path target name cur min max} { variable _ ! set fill [random_clr] ! set n $_($target:n) ! set ni 0 ! while {$ni <= $n} { ! foreach xy {x y} {if {[$path.ngrid itemcget name_${xy}_$ni -text] eq $name} {return}} ! incr ni} ! if {[$path.ngrid itemcget name_x_$n -text] eq ""} { ! set _($target:box$n:x) [list $name $min $max $fill] ! $path.ngrid create oval 0 0 0 0 -tags sqr_$n -fill $fill -outline white -width 2 ! $path.ngrid create line 0 0 0 0 -tags hist_$n -fill $fill ! $path.ngrid create text 0 [expr 5 + $n * 8.0] -tags name_y_$n -fill $fill -font {{Bitstream Vera Sans} 8} -text "" -anchor w -justify left ! $path.ngrid create text [winfo width $path.ngrid] [expr 5 + $n * 8.0] -tags name_x_$n -fill $fill -font {{Bitstream Vera Sans} 8} -text "$name" -anchor e -justify right ! $path.ngrid lower name_x_$n ! $path.ngrid lower name_y_$n ! set b1 "set ::ix::_($target:recent) $n; ::ix::ngrid_click $path $target %x %y" ! $path.ngrid bind sqr_$n <1> $b1 ! $path.ngrid bind sqr_$n <B1-Motion> $b1 ! foreach el [list sqr_$n name_x_$n name_y_$n] { ! $path.ngrid bind $el <Enter> "::ix::ngrid_highlight $path $target $n grey96" ! $path.ngrid bind $el <Leave> "::ix::ngrid_highlight $path $target $n -" } ! ngrid_move $path $target $n [expr ($cur - $min) / ($max - $min.0) * [winfo width $path.ngrid]] [expr rand() * [winfo height $path.ngrid]] ! } else { ! set _($target:box$n:y) [list $name $min $max] ! $path.ngrid itemconfigure name_y_$n -text "$name" ! ngrid_move $path $target $n [expr [lindex [$path.ngrid coords sqr_$n] 0] + $_($target:radius)] [expr ($cur - $min.0) / ($max - $min) * [winfo height $path.ngrid]] ! incr _($target:n) ! } ! } proc ngrid_highlight {path target n color} { variable _ foreach el [list name_y_$n name_x_$n sqr_$n] { ! if {$color eq "-"} { ! set color [lindex $_($target:box$n:x) 3] ! } $path.ngrid itemconfigure $el -fill $color ! set _($target:recent) $n ! } ! } proc ngrid_click {path target x y} { variable _ --- 39,96 ---- ngrid_click $path $target $x $y } ! remove { ! $path.ngrid delete name_${xy}_$n ! if {[$path.ngrid find withtag name_x_$n] eq "" && [$path.ngrid find withtag name_x_$n] eq ""} { ! $path.ngrid delete sqr_$n; $path.ngrid delete hist_$n}}}}}}} ! ! proc ngrid_vset {path target what where} {variable _; set _($target:$what) $where} ! proc ngrid_add {path target name cur min max} { variable _ ! if {$max == $min} {set max 1.0; set min 0.0} ! array set justify {x left y right} ! array set anchor {y e x w} ! for {set n 0 } {$n <= $_($target:n)} {incr n} {foreach xy {x y} { ! if {[$path.ngrid itemcget name_${xy}_$n -text] eq $name} {return}}} ! ! for {set n 0 } {$n <= $_($target:n)} {incr n} {foreach xy {x y} { ! if {[$path.ngrid find withtag name_x_$n] eq "" && [$path.ngrid find withtag name_y_$n] eq ""} { ! set fill [set _($target:box$n:fill) [random_clr]] ! $path.ngrid create oval 0 0 0 0 -tags sqr_$n -fill $fill -outline white -width 2 ! set rx [expr rand() * [winfo width $path.ngrid]]; set ry [expr rand() * [winfo height $path.ngrid]] ! $path.ngrid create line $rx $ry $rx $ry -tags hist_$n -fill $fill ! $path.ngrid bind sqr_$n <1> "set ::ix::_($target:recent) $n; ::ix::ngrid_click $path $target %x %y" ! $path.ngrid bind sqr_$n <B1-Motion> [$path.ngrid bind sqr_$n <1>] ! $path.ngrid bind sqr_$n <Enter> "::ix::ngrid_highlight $path $target $n grey96" ! $path.ngrid bind sqr_$n <Leave> "::ix::ngrid_highlight $path $target $n -" ! ngrid_move $path $target $n $rx $ry ! incr _($target:n) } ! if {[$path.ngrid find withtag name_${xy}_$n] eq ""} { ! set _($target:box$n:$xy) [list $name $min $max] ! puts "adding $xy $n $name $min $max" ! switch $xy { ! x { ! set tl [concat 0 [expr 5 + $n * 8.0]] ! set qx [expr ($cur - $min) / ($max - $min + 0.0) * [winfo width $path.ngrid]] ! set qy [expr [lindex [$path.ngrid coords sqr_$n] 1] + $_($target:radius)]} ! y { ! set tl [concat [winfo width $path.ngrid] [expr 5 + $n * 8.0]] ! set qx [expr [lindex [$path.ngrid coords sqr_$n] 0] + $_($target:radius)] ! set qy [expr ($cur - $min) / ($max - $min + 0.0) * [winfo height $path.ngrid]]}} ! $path.ngrid create text $tl -tags name_${xy}_$n -fill $_($target:box$n:fill) -font {{Bitstream Vera Sans} 8} -text $name -anchor $anchor($xy) -justify $justify($xy) ! $path.ngrid lower name_${xy}_$n ! $path.ngrid bind name_${xy}_$n <Enter> "::ix::ngrid_highlight $path $target $n grey96" ! $path.ngrid bind name_${xy}_$n <Leave> "::ix::ngrid_highlight $path $target $n -" ! ngrid_move $path $target $n $qx $qy ! return}}}} ! proc ngrid_highlight {path target n color} { variable _ foreach el [list name_y_$n name_x_$n sqr_$n] { ! if {$color eq "-"} {set color $_($target:box$n:fill)} $path.ngrid itemconfigure $el -fill $color ! set _($target:recent) $n}} ! proc ngrid_click {path target x y} { variable _ *************** *** 95,114 **** swarm { for {set n 0} {$n <= $_($target:n)} {incr n} { ! ngrid_move $path $target $n [expr rand() * $_($target:spread) - [expr $_($target:spread) / 2.0] + $x] [expr rand() * $_($target:spread) - [expr $_($target:spread) / 2.0] + $y] ! } ! } trails { for {set n 0} {$n <= $_($target:n)} {incr n} { if {[expr rand() > 0.96] == 1} { ! ngrid_move $path $target $n [expr rand() * $_($target:spread) - [expr $_($target:spread) / 2.0] + $x] [expr rand() * $_($target:spread) - [expr $_($target:spread) / 2.0] + $y] ! } ! } ! } ! error { ! ngrid_move $path $target $_($target:recent) [expr rand() * $_($target:spread) - [expr $_($target:spread) / 2.0] + $x] [expr rand() * $_($target:spread) - [expr $_($target:spread) / 2.0] + $y] ! } ! default {ngrid_move $path $target $_($target:recent) $x $y} ! } ! } proc ngrid_move {path target n px py} { variable _ --- 98,109 ---- swarm { for {set n 0} {$n <= $_($target:n)} {incr n} { ! ngrid_move $path $target $n [expr rand() * $_($target:spread) - [expr $_($target:spread) / 2.0] + $x] [expr rand() * $_($target:spread) - [expr $_($target:spread) / 2.0] + $y]}} trails { for {set n 0} {$n <= $_($target:n)} {incr n} { if {[expr rand() > 0.96] == 1} { ! ngrid_move $path $target $n [expr rand() * $_($target:spread) - [expr $_($target:spread) / 2.0] + $x] [expr rand() * $_($target:spread) - [expr $_($target:spread) / 2.0] + $y]}}} ! error {ngrid_move $path $target $_($target:recent) [expr rand() * $_($target:spread) - [expr $_($target:spread) / 2.0] + $x] [expr rand() * $_($target:spread) - [expr $_($target:spread) / 2.0] + $y]} ! default {ngrid_move $path $target $_($target:recent) $x $y}}} ! proc ngrid_move {path target n px py} { variable _ *************** *** 117,121 **** set w [winfo width $path.ngrid] foreach xy {x y} { ! if {[info exists _($target:box$n:$xy)]} { set l $_($target:box$n:$xy) set name [lindex $l 0] --- 112,116 ---- set w [winfo width $path.ngrid] foreach xy {x y} { ! if {[$path.ngrid find withtag name_${xy}_$n] ne ""} { set l $_($target:box$n:$xy) set name [lindex $l 0] *************** *** 123,130 **** set max [lindex $l 2] if {[expr $min == 0] && [expr $max == 0]} {set max $_($target:max)} ! pd "$target.rp _cb [pdtk_enquote $name] [expr ($max - $min) * [set p$xy] / $w.0 + $min] \;" ! } ! } ! } proc ngrid_gridlines {path target ln lines} { variable _ --- 118,123 ---- set max [lindex $l 2] if {[expr $min == 0] && [expr $max == 0]} {set max $_($target:max)} ! pd "$target.rp _cb [pdtk_enquote $name] [expr ($max - $min) * [set p$xy] / $w.0 + $min] \;"}}} ! proc ngrid_gridlines {path target ln lines} { variable _ *************** *** 139,148 **** set ow [expr $gw.0 * $x.0 / $lines.0] $w create line $ow 0 $ow $gh -fill $ln -tags gridlines ! $w create line 0 $oh $gw $oh -fill $ln -tags gridlines ! set fontsize [expr int(80.0/$lines.0)] ! } ! } ! } ! } #> ngrid frame #. -bd 3 #w 384 #h 144 #bg gray10 #ln gray35 #div 6 #n 3 --- 132,137 ---- set ow [expr $gw.0 * $x.0 / $lines.0] $w create line $ow 0 $ow $gh -fill $ln -tags gridlines ! $w create line 0 $oh $gw $oh -fill $ln -tags gridlines}}}} ! #> ngrid frame #. -bd 3 #w 384 #h 144 #bg gray10 #ln gray35 #div 6 #n 3 *************** *** 150,155 **** #. @list ::ix::ngrid_add .- .| {.#1} .#2 .#3 .#4 #. @add ::ix::ngrid_add .- .| {.#1} .#2 .#3 .#4 ! #. @pos ::ix::ngrid_pos pos .- .| {.#1} .#2 ! #. @setpos ::ix::ngrid_pos setpos .- .| {.#1} .#2 #. @clear ::ix::ngrid_clear .- .| all #. @radius ::ix::ngrid_vset .- .| radius .#1 --- 139,145 ---- #. @list ::ix::ngrid_add .- .| {.#1} .#2 .#3 .#4 #. @add ::ix::ngrid_add .- .| {.#1} .#2 .#3 .#4 ! #. @pos ::ix::ngrid_find pos .- .| {.#1} .#2 ! #. @setpos ::ix::ngrid_find setpos .- .| {.#1} .#2 ! #. @delete ::ix::ngrid_find remove .- .| {.#1} 0 #. @clear ::ix::ngrid_clear .- .| all #. @radius ::ix::ngrid_vset .- .| radius .#1

1 0

externals/nusmuk/msd2D/editor butterfly.txt, 1.1, 1.2 dancer.txt, 1.1, 1.2 link2masses.pd, 1.1, 1.2 morelinks.pd, 1.3, 1.4 msd2d-editor.pd, 1.4, 1.5 msd_append.pd, 1.2, 1.3 structures.pd, 1.1, 1.2 ilinker.pd, 1.1, NONE
by Frank Barknecht 02 May '05

02 May '05

Update of /cvsroot/pure-data/externals/nusmuk/msd2D/editor In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21814 Modified Files: butterfly.txt dancer.txt link2masses.pd morelinks.pd msd2d-editor.pd msd_append.pd structures.pd Removed Files: ilinker.pd Log Message: Link and Mass structures now carry info about physical parameters, this is settable on creation of links. Index: msd2d-editor.pd =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd2D/editor/msd2d-editor.pd,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** msd2d-editor.pd 1 May 2005 22:46:11 -0000 1.4 --- msd2d-editor.pd 2 May 2005 10:36:10 -0000 1.5 *************** *** 1,28 **** - #N struct liaison float x1 float y1 float x2 float y2 float mid1 float - mid2 float lid; - #N struct mass float x float y float mid float mob; #N canvas 130 52 866 562 10; #N canvas 610 84 617 552 data 1; - #X scalar liaison 473.44 182.541 548 179 7 8 0 \;; - #X scalar liaison 391.87 183.337 473.44 182.541 6 7 1 \;; - #X scalar liaison 313.233 178.369 391.87 183.337 5 6 2 \;; - #X scalar liaison 260.779 172.377 313.233 178.369 4 5 3 \;; - #X scalar liaison 196.229 164.351 260.779 172.377 3 4 4 \;; - #X scalar liaison 137.18 159.608 196.229 164.351 2 3 5 \;; - #X scalar liaison 79.9374 158.402 137.18 159.608 1 2 6 \;; - #X scalar liaison 36 159 79.9374 158.402 0 1 7 \;; - #X scalar mass 36 159 0 900 \;; - #X scalar mass 79.9374 158.402 1 0 \;; - #X scalar mass 137.18 159.608 2 0 \;; - #X scalar mass 196.229 164.351 3 0 \;; - #X scalar mass 260.779 172.377 4 0 \;; - #X scalar mass 313.233 178.369 5 0 \;; - #X scalar mass 391.87 183.337 6 0 \;; - #X scalar mass 473.44 182.541 7 0 \;; - #X scalar mass 548 179 8 900 \;; #X restore 735 71 pd data; #X obj 56 517 structures; #X msg 152 72 \; pd-data clear; ! #X obj 60 298 bng 24 250 50 0 empty \$0-generate generate 0 -6 0 8 -24198 -1 -1; #X text 57 493 Data Struct Definitions; --- 1,8 ---- #N canvas 130 52 866 562 10; #N canvas 610 84 617 552 data 1; #X restore 735 71 pd data; #X obj 56 517 structures; #X msg 152 72 \; pd-data clear; ! #X obj 62 308 bng 24 250 50 0 empty \$0-generate generate 0 -6 0 8 -24198 -1 -1; #X text 57 493 Data Struct Definitions; *************** *** 58,62 **** #X restore 723 150 pd save; #X text 728 46 Edit here:; ! #N canvas 564 255 781 748 generator 0; #N canvas 210 99 931 555 getter 0; #X obj 244 89 inlet; --- 38,42 ---- #X restore 723 150 pd save; #X text 728 46 Edit here:; ! #N canvas 257 131 781 748 generator 0; #N canvas 210 99 931 555 getter 0; #X obj 244 89 inlet; *************** *** 147,155 **** #X msg 215 362 next; #X obj 264 288 pointer mass; ! #X obj 347 432 get mass x y mid mob; ! #X obj 482 459 select 0; ! #X msg 522 484 0; ! #X obj 347 514 pack 0 0 0 0; ! #X msg 481 483 1; #X obj 328 193 s \$0-reset-counter; #N canvas 331 520 708 349 counter 0; --- 127,133 ---- #X msg 215 362 next; #X obj 264 288 pointer mass; ! #X obj 458 455 select 0; ! #X msg 498 480 0; ! #X msg 457 479 1; #X obj 328 193 s \$0-reset-counter; #N canvas 331 520 708 349 counter 0; *************** *** 183,219 **** #X obj 605 640 print mass-as-in-struct; #X obj 612 368 outlet; #X connect 0 5 1 0; ! #X connect 0 6 9 0; ! #X connect 0 6 14 0; #X connect 1 0 3 0; #X connect 2 0 3 0; ! #X connect 3 0 11 0; #X connect 3 1 2 0; ! #X connect 3 2 26 0; ! #X connect 4 0 7 0; ! #X connect 4 1 7 1; ! #X connect 4 2 7 2; ! #X connect 4 2 13 0; ! #X connect 4 3 5 0; ! #X connect 5 0 8 0; ! #X connect 5 1 6 0; ! #X connect 6 0 7 3; ! #X connect 7 0 19 0; ! #X connect 8 0 7 3; ! #X connect 10 0 12 0; ! #X connect 11 0 2 0; ! #X connect 11 5 4 0; ! #X connect 11 6 10 0; ! #X connect 14 0 15 0; ! #X connect 14 0 16 0; ! #X connect 18 0 0 0; ! #X connect 20 0 23 1; #X connect 21 0 23 0; ! #X connect 23 0 22 0; ! #X connect 23 0 25 0; #X restore 244 115 pd get-masses; #N canvas 0 0 768 708 make-links 0; - #X obj 156 275 get liaison mid1 mid2; - #X obj 174 318 pack 0 0; #X obj 156 229 pointer liaison; #X msg 156 203 next; --- 161,198 ---- #X obj 605 640 print mass-as-in-struct; #X obj 612 368 outlet; + #X obj 347 432 get mass x y mid mob M; + #X obj 347 514 pack 0 0 0 0 0; #X connect 0 5 1 0; ! #X connect 0 6 7 0; ! #X connect 0 6 12 0; #X connect 1 0 3 0; #X connect 2 0 3 0; ! #X connect 3 0 9 0; #X connect 3 1 2 0; ! #X connect 3 2 24 0; ! #X connect 4 0 6 0; ! #X connect 4 1 5 0; ! #X connect 5 0 26 3; ! #X connect 6 0 26 3; ! #X connect 8 0 10 0; ! #X connect 9 0 2 0; ! #X connect 9 5 25 0; ! #X connect 9 6 8 0; ! #X connect 12 0 13 0; ! #X connect 12 0 14 0; ! #X connect 16 0 0 0; ! #X connect 18 0 21 1; ! #X connect 19 0 21 0; ! #X connect 21 0 20 0; #X connect 21 0 23 0; ! #X connect 25 0 26 0; ! #X connect 25 1 26 1; ! #X connect 25 2 11 0; ! #X connect 25 2 26 2; ! #X connect 25 3 4 0; ! #X connect 25 4 26 4; ! #X connect 26 0 17 0; #X restore 244 115 pd get-masses; #N canvas 0 0 768 708 make-links 0; #X obj 156 229 pointer liaison; #X msg 156 203 next; *************** *** 224,238 **** #X obj 388 303 outlet; #X text 440 302 Now set lid field of links.; ! #X connect 0 0 1 0; ! #X connect 0 1 1 1; ! #X connect 1 0 6 0; ! #X connect 2 0 5 0; ! #X connect 2 1 3 0; ! #X connect 2 2 8 0; ! #X connect 3 0 2 0; ! #X connect 4 0 2 0; ! #X connect 5 0 3 0; ! #X connect 5 1 0 0; ! #X connect 7 0 4 0; #X restore 148 257 pd make-links; #N canvas 0 0 590 588 get-ids-from-msd 0; --- 203,222 ---- #X obj 388 303 outlet; #X text 440 302 Now set lid field of links.; ! #X obj 156 275 get liaison mid1 mid2 K D D2; ! #X obj 174 318 pack 0 0 0 0 0; ! #X connect 0 0 3 0; ! #X connect 0 1 1 0; ! #X connect 0 2 6 0; ! #X connect 1 0 0 0; ! #X connect 2 0 0 0; ! #X connect 3 0 1 0; ! #X connect 3 1 8 0; ! #X connect 5 0 2 0; ! #X connect 8 0 9 0; ! #X connect 8 1 9 1; ! #X connect 8 2 9 2; ! #X connect 8 3 9 3; ! #X connect 8 4 9 4; ! #X connect 9 0 4 0; #X restore 148 257 pd make-links; #N canvas 0 0 590 588 get-ids-from-msd 0; *************** *** 310,315 **** #X msg 288 163 infosL; #X obj 162 231 route Link; - #X obj 175 352 set liaison lid mid1 mid2; - #X msg 175 327 \$1 \$3 \$4; #X msg 272 307 next; #X obj 145 254 t b a; --- 294,297 ---- *************** *** 320,323 **** --- 302,307 ---- turn and crashed the car and left the toilet seat open.; #X text 104 481 Shouldn't happen.; + #X msg 175 332 \$1 \$3 \$4 \$5 \$6 \$7; + #X obj 175 357 set liaison lid mid1 mid2 K D D2; #X connect 0 0 2 0; #X connect 2 0 10 0; *************** *** 329,341 **** #X connect 6 3 3 0; #X connect 6 4 8 0; ! #X connect 7 0 11 3; ! #X connect 7 1 13 0; #X connect 8 0 7 0; #X connect 9 0 1 0; ! #X connect 10 0 14 0; #X connect 12 0 11 0; ! #X connect 13 0 7 0; ! #X connect 14 0 13 0; ! #X connect 14 1 12 0; #X restore 234 286 pd set-lid; #X text 314 284 Correct lids to match what msd2D tells us; --- 313,325 ---- #X connect 6 3 3 0; #X connect 6 4 8 0; ! #X connect 7 0 16 6; ! #X connect 7 1 11 0; #X connect 8 0 7 0; #X connect 9 0 1 0; ! #X connect 10 0 12 0; ! #X connect 11 0 7 0; #X connect 12 0 11 0; ! #X connect 12 1 15 0; ! #X connect 15 0 16 0; #X restore 234 286 pd set-lid; #X text 314 284 Correct lids to match what msd2D tells us; *************** *** 356,360 **** #X obj 175 200 s \$0-msd; #X msg 175 175 Xmin 0 \, Xmax 800 \, Ymin 0 \, Ymax 800; ! #X msg 239 300 mass fix 0 100 \$1 \$2; #X obj 112 132 t b b b b; #N canvas 376 279 682 601 make-setters 0; --- 340,344 ---- #X obj 175 200 s \$0-msd; #X msg 175 175 Xmin 0 \, Xmax 800 \, Ymin 0 \, Ymax 800; ! #X msg 368 473 mass fix 0 100 \$1 \$2; #X obj 112 132 t b b b b; #N canvas 376 279 682 601 make-setters 0; *************** *** 406,415 **** #X connect 16 0 17 0; #X restore 112 401 pd make-setters; ! #X obj 201 354 r pointer2msd; #X obj 112 91 inlet; ! #X msg 189 275 mass id \$4 100 \$1 \$2; ! #X msg 131 324 link ml \$1 \$2 10 2.5 1.5; ! #X connect 0 0 11 0; ! #X connect 0 1 10 0; #X connect 2 0 3 0; #X connect 4 0 3 0; --- 390,399 ---- #X connect 16 0 17 0; #X restore 112 401 pd make-setters; ! #X obj 181 344 r pointer2msd; #X obj 112 91 inlet; ! #X msg 131 324 link ml \$1 \$2 \$3 \$4 \$5; ! #X msg 189 275 mass id \$4 \$5 \$1 \$2; ! #X connect 0 0 10 0; ! #X connect 0 1 11 0; #X connect 2 0 3 0; #X connect 4 0 3 0; *************** *** 422,426 **** #X connect 10 0 1 0; #X connect 11 0 1 0; ! #X restore 60 329 pd generator; #N canvas 0 0 718 819 activate 0; #X obj 233 284 msd2D; --- 406,410 ---- #X connect 10 0 1 0; #X connect 11 0 1 0; ! #X restore 62 337 pd generator; #N canvas 0 0 718 819 activate 0; #X obj 233 284 msd2D; *************** *** 444,448 **** #X obj 233 510 s masspositions; #X obj 313 488 s linkspositions; ! #X obj 167 69 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 1 1 ; #X obj 233 421 spigot; --- 428,432 ---- #X obj 233 510 s masspositions; #X obj 313 488 s linkspositions; ! #X obj 167 69 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1 ; #X obj 233 421 spigot; *************** *** 513,517 **** #X obj 61 378 tgl 24 0 empty empty GEM 0 -6 0 8 -233017 -1 -1 0 1; #X obj 97 378 tgl 24 0 empty empty Graphical_Datastructures 0 -6 0 ! 8 -1 -262144 -1 1 1; #X text 275 306 Press "generate" to generate messages to msd2D and create the physical model inside.; --- 497,501 ---- #X obj 61 378 tgl 24 0 empty empty GEM 0 -6 0 8 -233017 -1 -1 0 1; #X obj 97 378 tgl 24 0 empty empty Graphical_Datastructures 0 -6 0 ! 8 -1 -262144 -1 0 1; #X text 275 306 Press "generate" to generate messages to msd2D and create the physical model inside.; *************** *** 528,550 **** #X obj 281 212 r \$0-msd-out; #N canvas 0 0 578 686 setter 0; ! #X obj 452 168 mass-set 8; ! #X obj 393 207 mass-set 7; ! #X obj 317 227 mass-set 6; ! #X obj 290 156 mass-set 5; ! #X obj 243 172 mass-set 4; ! #X obj 185 152 mass-set 3; ! #X obj 129 151 mass-set 2; ! #X obj 76 155 mass-set 1; ! #X obj 36 159 mass-set 0; #X restore 305 122 pd setter; #N canvas 0 0 822 675 lsetter 0; ! #X obj 36 159 link-set 7; ! #X obj 76 155 link-set 6; ! #X obj 129 151 link-set 5; ! #X obj 185 152 link-set 4; ! #X obj 243 172 link-set 3; ! #X obj 290 156 link-set 2; ! #X obj 317 227 link-set 1; ! #X obj 393 207 link-set 0; #X restore 304 145 pd lsetter; #X text 288 98 Automatic scripting targets; --- 512,554 ---- #X obj 281 212 r \$0-msd-out; #N canvas 0 0 578 686 setter 0; ! #X obj 137 196 mass-set 12; ! #X obj 164 167 mass-set 11; ! #X obj 133 167 mass-set 10; ! #X obj 160 196 mass-set 9; ! #X obj 215 220 mass-set 8; ! #X obj 82 220 mass-set 7; ! #X obj 175 187 mass-set 6; ! #X obj 122 187 mass-set 5; ! #X obj 173 235 mass-set 4; ! #X obj 124 235 mass-set 3; ! #X obj 184 300 mass-set 2; ! #X obj 113 300 mass-set 1; ! #X obj 149 100 mass-set 0; #X restore 305 122 pd setter; #N canvas 0 0 822 675 lsetter 0; ! #X obj 133 167 link-set 23; ! #X obj 160 196 link-set 22; ! #X obj 164 167 link-set 21; ! #X obj 137 196 link-set 20; ! #X obj 133 167 link-set 19; ! #X obj 133 167 link-set 18; ! #X obj 124 235 link-set 17; ! #X obj 175 187 link-set 16; ! #X obj 173 235 link-set 15; ! #X obj 122 187 link-set 14; ! #X obj 124 235 link-set 13; ! #X obj 175 187 link-set 12; ! #X obj 122 187 link-set 11; ! #X obj 82 220 link-set 10; ! #X obj 175 187 link-set 9; ! #X obj 215 220 link-set 8; ! #X obj 113 300 link-set 7; ! #X obj 113 300 link-set 6; ! #X obj 184 300 link-set 5; ! #X obj 173 235 link-set 4; ! #X obj 149 100 link-set 3; ! #X obj 164 167 link-set 2; ! #X obj 122 187 link-set 1; ! #X obj 160 196 link-set 0; #X restore 304 145 pd lsetter; #X text 288 98 Automatic scripting targets; *************** *** 574,581 **** at the same time. In GDS-mode you can set the frequency of the internal metro \, to accelerate or slow down the simulation.; - #X text 274 23 First create structure inside [pd data] using msd_append. - Add mobile masses with black bang \, add fixed masses with the red - bang.; - #X obj 57 24 msd_append; #X text 273 110 Links are created by selecting at least two masses in edit mode \, then press "L" to connect those with a link. If you --- 578,581 ---- *************** *** 640,644 **** forces from the model. Use the "forces" and "props" subpatches to change parameters of links and send forces.; - #X obj 56 114 morelinks; #X text 271 219 More ways to create links: left-to-right connects masses from left to right. one2many will connect one mass to many others. --- 640,643 ---- *************** *** 649,652 **** --- 648,656 ---- set to on. Otherwise use the yellow "link" bang.; #X text 705 123 Save network to disk:; + #X obj 56 114 morelinks; + #X obj 57 8 msd_append; + #X text 274 23 First create structure inside [pd data] using msd_append. + Add mobile masses with black bang \, add fixed masses with the red + bang. Set weight of mass with the "M" number box.; #X connect 3 0 7 0; #X connect 8 0 9 0; Index: butterfly.txt =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd2D/editor/butterfly.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** butterfly.txt 29 Apr 2005 19:28:36 -0000 1.1 --- butterfly.txt 2 May 2005 10:36:10 -0000 1.2 *************** *** 16,52 **** ; ; ! liaison 140 278 94 339 3 11 0; ! liaison 95 230 140 278 12 3 0; ! liaison 210 267 95 230 2 12 0; ! liaison 95 230 211 303 12 6 0; ! liaison 94 339 211 303 11 6 0; ! liaison 94 339 210 267 11 2 0; ! mass 95 230 12 0; ! mass 94 339 11 0; ! liaison 242 303 140 278 5 3 0; ! liaison 140 278 241 268 3 4 0; ! liaison 211 303 293 284 6 7 0; ! liaison 293 284 210 267 7 2 0; ! liaison 293 284 333 348 7 0 0; ! liaison 293 284 330 222 7 1 0; ! liaison 333 348 242 303 0 5 0; ! liaison 241 268 333 348 4 0 0; ! liaison 330 222 241 268 1 4 0; ! liaison 330 222 242 303 1 5 0; ! liaison 221 187 241 268 8 4 0; ! liaison 221 187 210 267 8 2 0; ! liaison 242 303 241 268 5 4 0; ! liaison 210 267 211 303 2 6 0; ! liaison 242 303 210 267 5 2 0; ! liaison 211 303 242 303 6 5 0; ! liaison 241 268 211 303 4 6 0; ! liaison 210 267 241 268 2 4 0; ! mass 221 187 8 900; ! mass 293 284 7 0; ! mass 211 303 6 0; ! mass 242 303 5 0; ! mass 241 268 4 0; ! mass 140 278 3 0; ! mass 210 267 2 0; ! mass 330 222 1 0; ! mass 333 348 0 0; --- 16,52 ---- ; ; ! liaison 140 278 94 339 3 11 0 10 2.5 1.5; ! liaison 95 230 140 278 12 3 0 10 2.5 1.5; ! liaison 210 267 95 230 2 12 0 10 2.5 1.5; ! liaison 95 230 211 303 12 6 0 10 2.5 1.5; ! liaison 94 339 211 303 11 6 0 10 2.5 1.5; ! liaison 94 339 210 267 11 2 0 10 2.5 1.5; ! mass 95 230 12 0 100; ! mass 94 339 11 0 100; ! liaison 242 303 140 278 5 3 0 10 2.5 1.5; ! liaison 140 278 241 268 3 4 0 10 2.5 1.5; ! liaison 211 303 293 284 6 7 0 10 2.5 1.5; ! liaison 293 284 210 267 7 2 0 10 2.5 1.5; ! liaison 293 284 333 348 7 0 0 10 2.5 1.5; ! liaison 293 284 330 222 7 1 0 10 2.5 1.5; ! liaison 333 348 242 303 0 5 0 10 2.5 1.5; ! liaison 241 268 333 348 4 0 0 10 2.5 1.5; ! liaison 330 222 241 268 1 4 0 10 2.5 1.5; ! liaison 330 222 242 303 1 5 0 10 2.5 1.5; ! liaison 221 187 241 268 8 4 0 10 2.5 1.5; ! liaison 221 187 210 267 8 2 0 10 2.5 1.5; ! liaison 242 303 241 268 5 4 0 10 2.5 1.5; ! liaison 210 267 211 303 2 6 0 10 2.5 1.5; ! liaison 242 303 210 267 5 2 0 10 2.5 1.5; ! liaison 211 303 242 303 6 5 0 10 2.5 1.5; ! liaison 241 268 211 303 4 6 0 10 2.5 1.5; ! liaison 210 267 241 268 2 4 0 10 2.5 1.5; ! mass 221 187 8 900 100; ! mass 293 284 7 0 100; ! mass 211 303 6 0 100; ! mass 242 303 5 0 100; ! mass 241 268 4 0 100; ! mass 140 278 3 0 100; ! mass 210 267 2 0 100; ! mass 330 222 1 0 100; ! mass 333 348 0 0 100; Index: msd_append.pd =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd2D/editor/msd_append.pd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** msd_append.pd 1 May 2005 22:46:11 -0000 1.2 --- msd_append.pd 2 May 2005 10:36:10 -0000 1.3 *************** *** 1,8 **** ! #N canvas 862 152 86 80 10; #X obj 2 16 cnv 15 80 60 empty empty empty 20 12 0 14 -233017 -66577 0; ! #X obj 13 29 bng 15 250 50 0 empty empty mass 0 -6 0 8 -1 -262144 -1 ; ! #X obj 46 29 bng 15 250 50 0 empty empty fix 0 -6 0 8 -258699 -1 -1 ; #N canvas 355 457 863 719 guts 0; --- 1,8 ---- ! #N canvas 862 152 84 110 10; #X obj 2 16 cnv 15 80 60 empty empty empty 20 12 0 14 -233017 -66577 0; ! #X obj 16 29 bng 15 250 50 0 empty empty mass 0 -6 0 8 -1 -262144 -1 ; ! #X obj 54 29 bng 15 250 50 0 empty empty fix 0 -6 0 8 -258699 -1 -1 ; #N canvas 355 457 863 719 guts 0; *************** *** 16,22 **** #X obj 355 291 r \$0-counter-bng; #X obj 355 393 s \$0-nextmass; ! #X obj 144 200 r \$0-nextmass; #X obj 70 97 s \$0-counter-bng; - #X obj 66 231 append mass x y mid mob; #X obj 70 71 t b b b b b f b; #X msg 70 47 0; --- 16,21 ---- #X obj 355 291 r \$0-counter-bng; #X obj 355 393 s \$0-nextmass; ! #X obj 145 153 r \$0-nextmass; #X obj 70 97 s \$0-counter-bng; #X obj 70 71 t b b b b b f b; #X msg 70 47 0; *************** *** 31,66 **** #X obj 66 203 + 20; #X obj 105 148 + 20; ! #X connect 0 0 11 4; ! #X connect 1 0 22 0; #X connect 2 0 0 0; ! #X connect 3 0 23 0; ! #X connect 4 0 13 0; ! #X connect 5 0 16 0; ! #X connect 6 0 17 1; ! #X connect 7 0 17 0; ! #X connect 9 0 11 2; ! #X connect 12 0 10 0; ! #X connect 12 1 1 0; ! #X connect 12 3 3 0; ! #X connect 12 5 11 3; ! #X connect 12 6 2 0; ! #X connect 13 0 12 0; ! #X connect 16 0 12 0; ! #X connect 17 0 6 0; ! #X connect 17 0 8 0; ! #X connect 17 0 20 0; ! #X connect 18 0 17 0; ! #X connect 19 0 17 0; ! #X connect 20 0 21 0; ! #X connect 22 0 11 0; ! #X connect 23 0 11 1; ! #X restore 119 47 pd guts; #X obj 126 6 inlet; #X obj 169 5 inlet; ! #X obj 16 59 nbx 5 14 -1e+37 1e+37 0 0 \$0-counter \$0-counter-in next ! 0 -6 0 10 -262144 -1 -1 0 256; #X connect 1 0 3 0; #X connect 2 0 3 1; #X connect 4 0 3 0; #X connect 5 0 3 1; ! #X coords 0 0 1 1 82 80 1; --- 30,82 ---- #X obj 66 203 + 20; #X obj 105 148 + 20; ! #X obj 192 177 r \$0-M; ! #X obj 68 231 append mass x y mid mob M; ! #X obj 553 175 f \$1; ! #X obj 553 199 select 0; ! #X obj 553 254 s \$0-M; ! #X msg 552 224 100; ! #X obj 558 152 loadbang; ! #X connect 0 0 24 5; ! #X connect 1 0 21 0; #X connect 2 0 0 0; ! #X connect 3 0 22 0; ! #X connect 4 0 12 0; ! #X connect 5 0 15 0; ! #X connect 6 0 16 1; ! #X connect 7 0 16 0; ! #X connect 9 0 24 2; ! #X connect 11 0 10 0; ! #X connect 11 1 1 0; ! #X connect 11 3 3 0; ! #X connect 11 5 24 3; ! #X connect 11 6 2 0; ! #X connect 12 0 11 0; ! #X connect 15 0 11 0; ! #X connect 16 0 6 0; ! #X connect 16 0 8 0; ! #X connect 16 0 19 0; ! #X connect 17 0 16 0; ! #X connect 18 0 16 0; ! #X connect 19 0 20 0; ! #X connect 21 0 24 0; ! #X connect 22 0 24 1; ! #X connect 23 0 24 4; ! #X connect 25 0 26 0; ! #X connect 26 0 28 0; ! #X connect 26 1 27 0; ! #X connect 28 0 27 0; ! #X connect 29 0 25 0; ! #X restore 105 79 pd guts; #X obj 126 6 inlet; #X obj 169 5 inlet; ! #X obj 25 59 nbx 5 14 -1e+37 1e+37 0 0 \$0-counter \$0-counter-in id ! -22 8 0 10 -262144 -1 -1 8 256; ! #X obj 2 77 cnv 15 80 30 empty empty empty 10 10 0 10 -195568 -1 0 ! ; ! #X obj 26 85 nbx 5 14 -1e+37 1e+37 0 0 \$0-M \$0-M M -12 8 0 10 -225271 ! -1 -1 0 256; #X connect 1 0 3 0; #X connect 2 0 3 1; #X connect 4 0 3 0; #X connect 5 0 3 1; ! #X coords 0 0 1 1 82 100 1; Index: link2masses.pd =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd2D/editor/link2masses.pd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** link2masses.pd 29 Apr 2005 19:28:36 -0000 1.1 --- link2masses.pd 2 May 2005 10:36:10 -0000 1.2 *************** *** 2,25 **** #X obj 42 51 inlet; #X obj 42 83 t a b; ! #X obj 191 213 append liaison mid1 x1 y1; ! #X obj 42 249 set liaison mid2 x2 y2; ! #X obj 361 190 pointer; ! #X msg 361 161 traverse pd-data \, bang; #X obj 42 118 unpack p p; ! #X obj 191 162 get mass mid x y; #X obj 42 177 get mass mid x y; ! #X text 183 56 Link two masses with a link in [pd data]; #X connect 0 0 1 0; ! #X connect 1 0 6 0; ! #X connect 1 1 5 0; ! #X connect 2 0 3 3; ! #X connect 4 0 2 3; ! #X connect 5 0 4 0; ! #X connect 6 0 8 0; ! #X connect 6 1 7 0; ! #X connect 7 0 2 0; ! #X connect 7 1 2 1; ! #X connect 7 2 2 2; ! #X connect 8 0 3 0; ! #X connect 8 1 3 1; ! #X connect 8 2 3 2; --- 2,32 ---- #X obj 42 51 inlet; #X obj 42 83 t a b; ! #X obj 259 221 append liaison mid1 x1 y1; ! #X obj 429 198 pointer; ! #X msg 429 169 traverse pd-data \, bang; #X obj 42 118 unpack p p; ! #X obj 259 170 get mass mid x y; #X obj 42 177 get mass mid x y; ! #X text 199 24 Link two masses with a link in [pd data]; ! #X obj 178 55 inlet; ! #X obj 178 89 unpack 0 0 0; ! #X obj 42 249 set liaison mid2 x2 y2 K D D2; ! #X text 227 54 List: K \, D \, D2; #X connect 0 0 1 0; ! #X connect 1 0 5 0; ! #X connect 1 1 4 0; ! #X connect 2 0 11 6; ! #X connect 3 0 2 3; ! #X connect 4 0 3 0; ! #X connect 5 0 7 0; ! #X connect 5 1 6 0; ! #X connect 6 0 2 0; ! #X connect 6 1 2 1; ! #X connect 6 2 2 2; ! #X connect 7 0 11 0; ! #X connect 7 1 11 1; ! #X connect 7 2 11 2; ! #X connect 9 0 10 0; ! #X connect 10 0 11 3; ! #X connect 10 1 11 4; ! #X connect 10 2 11 5; Index: morelinks.pd =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd2D/editor/morelinks.pd,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** morelinks.pd 1 May 2005 22:46:11 -0000 1.3 --- morelinks.pd 2 May 2005 10:36:10 -0000 1.4 *************** *** 1,7 **** ! #N canvas 225 469 136 103 10; #N canvas 375 417 614 523 left-right-links 0; #X msg 111 227 vnext 1; #X obj 192 225 pointer mass; - #X obj 184 454 link2masses; #X obj 184 423 pack p p; #X msg 192 193 traverse pd-data \, vnext 1; --- 1,6 ---- ! #N canvas 225 469 135 183 10; #N canvas 375 417 614 523 left-right-links 0; #X msg 111 227 vnext 1; #X obj 192 225 pointer mass; #X obj 184 423 pack p p; #X msg 192 193 traverse pd-data \, vnext 1; *************** *** 23,45 **** #X msg 206 321 1; #X text 258 384 Skip the first mass; #X connect 0 0 1 0; ! #X connect 1 0 13 0; #X connect 1 1 0 0; ! #X connect 3 0 2 0; ! #X connect 4 0 1 0; ! #X connect 5 0 12 0; ! #X connect 8 0 7 0; ! #X connect 12 0 4 0; ! #X connect 12 1 16 0; ! #X connect 12 2 8 0; ! #X connect 13 0 0 0; ! #X connect 13 1 18 0; ! #X connect 13 2 15 0; ! #X connect 14 0 12 0; ! #X connect 15 0 3 1; ! #X connect 15 1 17 0; ! #X connect 16 0 17 1; ! #X connect 17 0 3 0; ! #X connect 18 0 17 1; #X restore 141 68 pd left-right-links; #X obj 2 19 cnv 15 130 80 empty empty empty 20 12 0 14 -233017 -66577 --- 22,47 ---- #X msg 206 321 1; #X text 258 384 Skip the first mass; + #X obj 184 454 link2masses; + #X obj 256 416 r \$0-link-param; #X connect 0 0 1 0; ! #X connect 1 0 12 0; #X connect 1 1 0 0; ! #X connect 2 0 19 0; ! #X connect 3 0 1 0; ! #X connect 4 0 11 0; ! #X connect 7 0 6 0; ! #X connect 11 0 3 0; ! #X connect 11 1 15 0; ! #X connect 11 2 7 0; ! #X connect 12 0 0 0; ! #X connect 12 1 17 0; ! #X connect 12 2 14 0; ! #X connect 13 0 11 0; ! #X connect 14 0 2 1; ! #X connect 14 1 16 0; ! #X connect 15 0 16 1; ! #X connect 16 0 2 0; ! #X connect 17 0 16 1; ! #X connect 20 0 19 1; #X restore 141 68 pd left-right-links; #X obj 2 19 cnv 15 130 80 empty empty empty 20 12 0 14 -233017 -66577 *************** *** 49,53 **** #N canvas 487 247 771 749 one-to-many 0; #X obj 203 173 pointer mass; - #X obj 182 473 link2masses; #X obj 182 442 pack p p; #X msg 203 141 traverse pd-data \, vnext 1; --- 51,54 ---- *************** *** 63,89 **** #X msg 281 351 label one2many-Ends; #X obj 69 146 select 0 1; ! #X connect 0 0 8 0; ! #X connect 2 0 1 0; ! #X connect 3 0 0 0; ! #X connect 4 0 7 0; ! #X connect 4 1 2 0; ! #X connect 5 0 14 0; ! #X connect 6 0 4 0; ! #X connect 6 1 7 0; ! #X connect 6 2 12 0; ! #X connect 7 0 6 0; ! #X connect 8 0 13 0; ! #X connect 8 1 2 1; ! #X connect 9 0 7 0; ! #X connect 9 1 10 0; ! #X connect 10 0 6 0; ! #X connect 12 0 11 0; ! #X connect 13 0 11 0; ! #X connect 14 0 9 0; ! #X connect 14 1 3 0; #X restore 143 95 pd one-to-many; ! #X obj 9 80 tgl 15 0 empty empty one2many-Start 20 8 0 8 -262131 -1 -1 0 1; - #X obj 149 46 ilinker; #X obj 10 31 bng 15 250 50 0 empty empty all_selected 20 8 0 8 -241291 -1 -1; --- 64,92 ---- #X msg 281 351 label one2many-Ends; #X obj 69 146 select 0 1; ! #X obj 182 473 link2masses; ! #X obj 254 440 r \$0-link-param; ! #X connect 0 0 7 0; ! #X connect 1 0 14 0; ! #X connect 2 0 0 0; ! #X connect 3 0 6 0; ! #X connect 3 1 1 0; ! #X connect 4 0 13 0; ! #X connect 5 0 3 0; ! #X connect 5 1 6 0; ! #X connect 5 2 11 0; ! #X connect 6 0 5 0; ! #X connect 7 0 12 0; ! #X connect 7 1 1 1; ! #X connect 8 0 6 0; ! #X connect 8 1 9 0; ! #X connect 9 0 5 0; ! #X connect 11 0 10 0; ! #X connect 12 0 10 0; ! #X connect 13 0 8 0; ! #X connect 13 1 2 0; ! #X connect 15 0 14 1; #X restore 143 95 pd one-to-many; ! #X obj 10 76 tgl 15 0 empty empty one2many-Start 20 8 0 8 -262131 -1 -1 0 1; #X obj 10 31 bng 15 250 50 0 empty empty all_selected 20 8 0 8 -241291 -1 -1; *************** *** 93,103 **** #X obj 211 48 select 108; #X obj 211 27 spigot; #X connect 2 0 0 0; #X connect 3 0 4 0; #X connect 4 0 3 0; ! #X connect 6 0 5 0; ! #X connect 7 0 10 1; ! #X connect 8 0 10 0; ! #X connect 9 0 5 0; ! #X connect 10 0 9 0; ! #X coords 0 0 1 1 132 100 1; --- 96,190 ---- #X obj 211 48 select 108; #X obj 211 27 spigot; + #X obj 2 101 cnv 15 130 80 empty empty Link_Params 10 10 0 10 -195568 + -1 0; + #X obj 44 121 nbx 5 14 -1e+37 1e+37 0 0 \$0-K \$0-K K -12 8 0 10 -225271 + -1 -1 10 256; + #X obj 44 156 nbx 5 14 -1e+37 1e+37 0 0 \$0-D2 \$0-D2 D2 -22 8 0 10 + -225271 -1 -1 1.5 256; + #X obj 44 138 nbx 5 14 -1e+37 1e+37 0 0 \$0-D \$0-D D -12 8 0 10 -225271 + -1 -1 2.5 256; + #N canvas 374 319 630 363 linkparam 0; + #X obj 40 195 s \$0-link-param; + #X obj 40 162 pack 0 0 0; + #X obj 50 128 t b f; + #X obj 93 130 t b f; + #X obj 40 51 r \$0-K; + #X obj 50 80 r \$0-D; + #X obj 93 104 r \$0-D2; + #X obj 240 240 s \$0-K; + #X obj 320 233 s \$0-D; + #X obj 402 236 s \$0-D2; + #X obj 240 147 f \$1; + #X obj 320 157 f \$2; + #X obj 402 156 f \$3; + #X obj 240 178 select 0; + #X msg 240 204 10; + #X obj 320 181 select 0; + #X obj 402 177 select 0; + #X msg 320 207 2.5; + #X msg 402 203 1.5; + #X obj 300 97 loadbang; + #X text 295 75 Init; + #X connect 1 0 0 0; + #X connect 2 0 1 0; + #X connect 2 1 1 1; + #X connect 3 0 1 0; + #X connect 3 1 1 2; + #X connect 4 0 1 0; + #X connect 5 0 2 0; + #X connect 6 0 3 0; + #X connect 10 0 13 0; + #X connect 11 0 15 0; + #X connect 12 0 16 0; + #X connect 13 0 14 0; + #X connect 13 1 7 0; + #X connect 14 0 7 0; + #X connect 15 0 17 0; + #X connect 15 1 8 0; + #X connect 16 0 18 0; + #X connect 16 1 9 0; + #X connect 17 0 8 0; + #X connect 18 0 9 0; + #X connect 19 0 10 0; + #X connect 19 0 11 0; + #X connect 19 0 12 0; + #X restore 145 127 pd linkparam; + #N canvas 0 0 483 507 ilinker 0; + #X obj 195 306 pointer mass; + #X msg 147 260 vnext 1; + #X msg 274 218 vnext 1; + #X obj 197 167 pointer mass; + #X obj 197 190 t b p; + #X obj 177 418 link2masses; + #X obj 177 387 pack p p; + #X msg 197 135 traverse pd-data \, vnext 1; + #X obj 147 330 t b p; + #X obj 197 106 inlet; + #X text 111 48 This will create all possible links between all selected + masses like iLink.; + #X obj 249 386 r \$0-link-param; + #X connect 0 0 8 0; + #X connect 0 1 1 0; + #X connect 0 2 2 0; + #X connect 1 0 0 0; + #X connect 2 0 3 0; + #X connect 3 0 4 0; + #X connect 3 1 2 0; + #X connect 4 0 1 0; + #X connect 4 1 6 1; + #X connect 4 1 0 1; + #X connect 6 0 5 0; + #X connect 7 0 3 0; + #X connect 8 0 1 0; + #X connect 8 1 6 0; + #X connect 9 0 7 0; + #X connect 11 0 5 1; + #X restore 137 46 pd ilinker; #X connect 2 0 0 0; #X connect 3 0 4 0; #X connect 4 0 3 0; ! #X connect 5 0 15 0; ! #X connect 6 0 9 1; ! #X connect 7 0 9 0; ! #X connect 9 0 8 0; ! #X coords 0 0 1 1 132 180 1; Index: structures.pd =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd2D/editor/structures.pd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** structures.pd 29 Apr 2005 19:28:36 -0000 1.1 --- structures.pd 2 May 2005 10:36:10 -0000 1.2 *************** *** 2,27 **** #N canvas 389 332 664 321 mass 0; #X obj 62 182 drawnumber mid 0 -18 0 m; - #X obj 64 72 struct mass float x float y float mid float mob; #X obj 61 136 filledpolygon mob mob 1 -5 0 -4 4 0 5 4 4 5 0 4 -4 0 -5 -4 -4; #X restore 132 125 pd mass; #N canvas 73 302 487 201 liaison 0; #X obj 19 25 struct liaison float x1 float y1 float x2 float y2 float ! mid1 float mid2 float lid; #X obj 23 73 drawpolygon 444 2 x1 y1 x2 y2; ! #X restore 132 169 pd liaison; ! #N canvas 0 0 450 300 model 0; ! #X obj 50 102 plot m 0 0 0 0; ! #X obj 51 135 plot l 0 0 0 0; ! #X obj 45 72 struct model float x1 array m mass array l liaison; ! #X restore 132 147 pd model; ! #N canvas 389 332 664 321 fixmass 0; ! #X obj 64 72 struct fixmass float x float y float mid; ! #X obj 61 136 filledpolygon 900 900 1 -5 0 -4 4 0 5 4 4 5 0 4 -4 0 ! -5 -4 -4; ! #X obj 51 203 drawnumber mid 0 -18 900 m; ! #X restore 132 191 pd fixmass; ! #N canvas 0 0 450 300 fixed 0; ! #X obj 50 97 plot f 0 0 0 0; ! #X obj 49 56 struct fixed float x float y array f fixmass; ! #X restore 132 213 pd fixed; --- 2,13 ---- #N canvas 389 332 664 321 mass 0; #X obj 62 182 drawnumber mid 0 -18 0 m; #X obj 61 136 filledpolygon mob mob 1 -5 0 -4 4 0 5 4 4 5 0 4 -4 0 -5 -4 -4; + #X obj 64 72 struct mass float x float y float mid float mob float + M; #X restore 132 125 pd mass; #N canvas 73 302 487 201 liaison 0; #X obj 19 25 struct liaison float x1 float y1 float x2 float y2 float ! mid1 float mid2 float lid float K float D float D2; #X obj 23 73 drawpolygon 444 2 x1 y1 x2 y2; ! #X restore 132 147 pd liaison; Index: dancer.txt =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd2D/editor/dancer.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** dancer.txt 29 Apr 2005 19:28:36 -0000 1.1 --- dancer.txt 2 May 2005 10:36:10 -0000 1.2 *************** *** 16,54 **** ; ; ! liaison 160.067 196.866 175.068 187.056 9 6 0; ! liaison 122.843 187.056 137.844 196.866 5 12 0; ! liaison 164.966 167.633 149 100 11 0 0; ! liaison 149 100 133.946 167.633 0 10 1; ! mass 149 100 0 900; ! liaison 173.155 235.499 184.692 300 4 2 2; ! liaison 184.692 300 122.843 187.056 2 5 3; ! liaison 113.219 300 124.756 235.499 1 3 4; ! liaison 113.219 300 175.068 187.056 1 6 5; ! liaison 215.173 220.483 122.843 187.056 8 5 6; ! liaison 175.068 187.056 215.173 220.483 6 8 7; ! liaison 82.7376 220.483 175.068 187.056 7 6 8; ! liaison 122.843 187.056 82.7376 220.483 5 7 9; ! liaison 175.068 187.056 122.843 187.056 6 5 10; ! liaison 124.756 235.499 173.155 235.499 3 4 11; ! liaison 122.843 187.056 124.756 235.499 5 3 12; ! liaison 173.155 235.499 122.843 187.056 4 5 13; ! liaison 175.068 187.056 173.155 235.499 6 4 14; ! liaison 124.756 235.499 175.068 187.056 3 6 15; ! liaison 133.946 167.633 164.966 167.633 10 11 16; ! liaison 133.946 167.633 137.844 196.866 10 12 17; ! liaison 137.844 196.866 160.067 196.866 12 9 18; ! liaison 164.966 167.633 137.844 196.866 11 12 19; ! liaison 160.067 196.866 164.966 167.633 9 11 20; ! liaison 133.946 167.633 160.067 196.866 10 9 21; ! mass 113.219 300 1 0; ! mass 184.692 300 2 0; ! mass 124.756 235.499 3 0; ! mass 173.155 235.499 4 0; ! mass 122.843 187.056 5 0; ! mass 175.068 187.056 6 0; ! mass 82.7376 220.483 7 0; ! mass 215.173 220.483 8 0; ! mass 160.067 196.866 9 0; ! mass 133.946 167.633 10 0; ! mass 164.966 167.633 11 0; ! mass 137.844 196.866 12 0; --- 16,54 ---- ; ; ! liaison 160.067 196.866 175.068 187.056 9 6 0 10 2.5 1.5; ! liaison 122.843 187.056 137.844 196.866 5 12 0 10 2.5 1.5; ! liaison 164.966 167.633 149 100 11 0 0 10 2.5 1.5; ! liaison 149 100 133.946 167.633 0 10 1 10 2.5 1.5; ! mass 149 100 0 900 100; ! liaison 173.155 235.499 184.692 300 4 2 2 10 2.5 1.5; ! liaison 184.692 300 122.843 187.056 2 5 3 10 2.5 1.5; ! liaison 113.219 300 124.756 235.499 1 3 4 10 2.5 1.5; ! liaison 113.219 300 175.068 187.056 1 6 5 10 2.5 1.5; ! liaison 215.173 220.483 122.843 187.056 8 5 6 10 2.5 1.5; ! liaison 175.068 187.056 215.173 220.483 6 8 7 10 2.5 1.5; ! liaison 82.7376 220.483 175.068 187.056 7 6 8 10 2.5 1.5; ! liaison 122.843 187.056 82.7376 220.483 5 7 9 10 2.5 1.5; ! liaison 175.068 187.056 122.843 187.056 6 5 10 10 2.5 1.5; ! liaison 124.756 235.499 173.155 235.499 3 4 11 10 2.5 1.5; ! liaison 122.843 187.056 124.756 235.499 5 3 12 10 2.5 1.5; ! liaison 173.155 235.499 122.843 187.056 4 5 13 10 2.5 1.5; ! liaison 175.068 187.056 173.155 235.499 6 4 14 10 2.5 1.5; ! liaison 124.756 235.499 175.068 187.056 3 6 15 10 2.5 1.5; ! liaison 133.946 167.633 164.966 167.633 10 11 16 10 2.5 1.5; ! liaison 133.946 167.633 137.844 196.866 10 12 17 10 2.5 1.5; ! liaison 137.844 196.866 160.067 196.866 12 9 18 10 2.5 1.5; ! liaison 164.966 167.633 137.844 196.866 11 12 19 10 2.5 1.5; ! liaison 160.067 196.866 164.966 167.633 9 11 20 10 2.5 1.5; ! liaison 133.946 167.633 160.067 196.866 10 9 21 10 2.5 1.5; ! mass 113.219 300 1 0 100; ! mass 184.692 300 2 0 100; ! mass 124.756 235.499 3 0 100; ! mass 173.155 235.499 4 0 100; ! mass 122.843 187.056 5 0 100; ! mass 175.068 187.056 6 0 100; ! mass 82.7376 220.483 7 0 100; ! mass 215.173 220.483 8 0 100; ! mass 160.067 196.866 9 0 100; ! mass 133.946 167.633 10 0 100; ! mass 164.966 167.633 11 0 100; ! mass 137.844 196.866 12 0 100; --- ilinker.pd DELETED ---

1 0

pd/src s_midi_alsa.c,1.1.2.1,1.1.2.2
by Tim Blechmann 02 May '05

02 May '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3400 Modified Files: Tag: devel_0_38 s_midi_alsa.c Log Message: hopefully fixed memory leak ... Index: s_midi_alsa.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/s_midi_alsa.c,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** s_midi_alsa.c 5 Nov 2004 13:33:19 -0000 1.1.2.1 --- s_midi_alsa.c 2 May 2005 09:29:47 -0000 1.1.2.2 *************** *** 26,42 **** static snd_seq_t *midi_handle; ! static int alsa_port; ! static int alsa_initialized; ! static void alsa_midiout(int fd, int n) ! { ! /*snd_midi_event_encode_byte(); ! char b = n; ! if ((write(fd, (char *) &b, 1)) != 1) ! perror("midi write");*/ ! } - #define O_MIDIFLAG O_NDELAY ! unsigned short CombineBytes(unsigned char First, unsigned char Second) { unsigned short _14bit; --- 26,34 ---- static snd_seq_t *midi_handle; ! static snd_midi_event_t *midiev; ! ! static unsigned short CombineBytes(unsigned char First, unsigned char Second) { unsigned short _14bit; *************** *** 52,58 **** char portname[50]; ! int err; int client; int i; if (nmidiin>0 && nmidiout>0) err = snd_seq_open(&midi_handle,"default",SND_SEQ_OPEN_DUPLEX,0); --- 44,53 ---- char portname[50]; ! int err = 0; int client; int i; + alsa_nmidiin = 0; + alsa_nmidiout = 0; + if (nmidiin>0 && nmidiout>0) err = snd_seq_open(&midi_handle,"default",SND_SEQ_OPEN_DUPLEX,0); *************** *** 70,92 **** for (i=0;i<nmidiout;i++) { sprintf(portname,"Pure Data Midi-In %d",i+1); ! alsa_port = snd_seq_create_simple_port(midi_handle,portname,SND_SEQ_PORT_CAP_WRITE |SND_SEQ_PORT_CAP_SUBS_WRITE , SND_SEQ_PORT_TYPE_APPLICATION); ! alsa_midiinfd[i] = alsa_port; } for (i=0;i<nmidiin;i++) { sprintf(portname,"Pure Data Midi-Out %d",i+1); ! alsa_port = snd_seq_create_simple_port(midi_handle,portname, SND_SEQ_PORT_CAP_SUBS_READ | SND_SEQ_PORT_CAP_READ, SND_SEQ_PORT_TYPE_APPLICATION); ! alsa_midioutfd[i] = alsa_port; ! } ! ! // alsa_port = snd_seq_create_simple_port(midi_handle,portname,SND_SEQ_PORT_CAP_DUPLEX |SND_SEQ_PORT_CAP_SUBS_WRITE | SND_SEQ_PORT_CAP_SUBS_READ , SND_SEQ_PORT_TYPE_APPLICATION); ! //alsa_port = snd_seq_create_simple_port(midi_handle,portname,SND_SEQ_PORT_CAP_READ | SND_SEQ_PORT_CAP_SUBS_READ , SND_SEQ_PORT_TYPE_APPLICATION); ! if (alsa_port < 0) ! { ! sys_setalarm(1000000); ! post("couldn't open alsa MIDI output device"); ! return; } snd_seq_client_info_t *alsainfo; snd_seq_client_info_malloc(&alsainfo); --- 65,85 ---- for (i=0;i<nmidiout;i++) { + int port; sprintf(portname,"Pure Data Midi-In %d",i+1); ! port = snd_seq_create_simple_port(midi_handle,portname,SND_SEQ_PORT_CAP_WRITE |SND_SEQ_PORT_CAP_SUBS_WRITE , SND_SEQ_PORT_TYPE_APPLICATION); ! alsa_midiinfd[i] = port; ! if (port < 0) goto error; } + for (i=0;i<nmidiin;i++) { + int port; sprintf(portname,"Pure Data Midi-Out %d",i+1); ! port = snd_seq_create_simple_port(midi_handle,portname, SND_SEQ_PORT_CAP_SUBS_READ | SND_SEQ_PORT_CAP_READ, SND_SEQ_PORT_TYPE_APPLICATION); ! alsa_midioutfd[i] = port; ! if (port < 0) goto error; } + + if (nmidiout == 0 && nmidiin == 0) return; snd_seq_client_info_t *alsainfo; snd_seq_client_info_malloc(&alsainfo); *************** *** 95,102 **** client = snd_seq_client_info_get_client(alsainfo); snd_seq_set_client_info(midi_handle,alsainfo); post("Opened Alsa Client %d in:%d out:%d",client,nmidiin,nmidiout); sys_setalarm(0); alsa_nmidiout = nmidiout; ! alsa_initialized = nmidiin; } --- 88,102 ---- client = snd_seq_client_info_get_client(alsainfo); snd_seq_set_client_info(midi_handle,alsainfo); + snd_seq_client_info_free(alsainfo); post("Opened Alsa Client %d in:%d out:%d",client,nmidiin,nmidiout); sys_setalarm(0); + snd_midi_event_new(20,&midiev); alsa_nmidiout = nmidiout; ! alsa_nmidiin = nmidiin; ! return; ! error: ! sys_setalarm(1000000); ! post("couldn't open alsa MIDI output device"); ! return; } *************** *** 106,115 **** void sys_putmidimess(int portno, int a, int b, int c) { ! int aa; ! int channel; ! snd_midi_event_t *dev; snd_seq_event_t ev; snd_seq_ev_clear(&ev); - dev = (snd_midi_event_t*)malloc(30); if (portno >= 0 && portno < alsa_nmidiout) { --- 106,112 ---- void sys_putmidimess(int portno, int a, int b, int c) { ! int channel; snd_seq_event_t ev; snd_seq_ev_clear(&ev); if (portno >= 0 && portno < alsa_nmidiout) { *************** *** 157,160 **** --- 154,159 ---- void sys_putmidibyte(int portno, int byte) { + + post("putmidibyte not implemented, please report as a bug"); /* snd_midi_event_t *dev; snd_seq_event_t ev; *************** *** 172,214 **** } - #if 0 /* this is the "select" version which doesn't work with OSS - driver for emu10k1 (it doesn't implement select.) */ - void sys_poll_midi(void) - { - int i, throttle = 100; - struct timeval timout; - int did = 1, maxfd = 0; - while (did) - { - fd_set readset, writeset, exceptset; - did = 0; - if (throttle-- < 0) - break; - timout.tv_sec = 0; - timout.tv_usec = 0; - - FD_ZERO(&writeset); - FD_ZERO(&readset); - FD_ZERO(&exceptset); - for (i = 0; i < alsa_nmidiin; i++) - { - if (alsa_midiinfd[i] > maxfd) - maxfd = alsa_midiinfd[i]; - FD_SET(alsa_midiinfd[i], &readset); - } - select(maxfd+1, &readset, &writeset, &exceptset, &timout); - for (i = 0; i < alsa_nmidiin; i++) - if (FD_ISSET(alsa_midiinfd[i], &readset)) - { - char c; - int ret = read(alsa_midiinfd[i], &c, 1); - if (ret <= 0) - fprintf(stderr, "Midi read error\n"); - else sys_midibytein(i, (c & 0xff)); - did = 1; - } - } - } - #else /* this version uses the asynchronous "read()" ... */ --- 171,174 ---- *************** *** 218,225 **** int count, alsa_source; int i; - snd_midi_event_t *dev; snd_seq_event_t *midievent = NULL; ! snd_midi_event_new(20,&dev); ! snd_midi_event_init(dev); count = snd_seq_event_input_pending(midi_handle,1); if (count != 0) --- 178,188 ---- int count, alsa_source; int i; snd_seq_event_t *midievent = NULL; ! ! if (alsa_nmidiout == 0 && alsa_nmidiin == 0) return; ! ! snd_midi_event_init(midiev); ! ! if (!alsa_nmidiout && !alsa_nmidiin) return; count = snd_seq_event_input_pending(midi_handle,1); if (count != 0) *************** *** 227,231 **** if (midievent != NULL) { ! count = snd_midi_event_decode(dev,buf,20,midievent); alsa_source = midievent->dest.port; for(i=0;i<count;i++) --- 190,194 ---- if (midievent != NULL) { ! count = snd_midi_event_decode(midiev,buf,20,midievent); alsa_source = midievent->dest.port; for(i=0;i<count;i++) *************** *** 233,249 **** //post("received %d midi bytes\n",count); } - snd_midi_event_free(dev); } - #endif void sys_close_midi() { - /*int i; - for (i = 0; i < alsa_nmidiin; i++) - close(alsa_midiinfd[i]); - for (i = 0; i < alsa_nmidiout; i++) - close(alsa_midioutfd[i]);*/ alsa_nmidiin = alsa_nmidiout = 0; snd_seq_close(midi_handle); } --- 196,206 ---- //post("received %d midi bytes\n",count); } } void sys_close_midi() { alsa_nmidiin = alsa_nmidiout = 0; snd_seq_close(midi_handle); + snd_midi_event_free(midiev); } *************** *** 266,270 **** ndev = maxndev; for (i = 0; i < ndev; i++) ! sprintf(indevlist + i * devdescsize, "OSS MIDI device #%d", i+1); *nindevs = ndev; --- 223,227 ---- ndev = maxndev; for (i = 0; i < ndev; i++) ! sprintf(indevlist + i * devdescsize, "ALSA MIDI device #%d", i+1); *nindevs = ndev; *************** *** 272,276 **** ndev = maxndev; for (i = 0; i < ndev; i++) ! sprintf(outdevlist + i * devdescsize, "OSS MIDI device #%d", i+1); *noutdevs = ndev; } --- 229,233 ---- ndev = maxndev; for (i = 0; i < ndev; i++) ! sprintf(outdevlist + i * devdescsize, "ALSA MIDI device #%d", i+1); *noutdevs = ndev; }

1 0

pd/src s_main.c, 1.7.4.15, 1.7.4.16 s_path.c, 1.3.4.4, 1.3.4.5
by IOhannes m zmölnig 02 May '05

02 May '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21835 Modified Files: Tag: devel_0_38 s_main.c s_path.c Log Message: added a "-rcfile" flag that allows to override(ignore) the default-settings; rcfiles are stackable (e.g. you can add another rcfile in your rcfile) Index: s_main.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_main.c,v retrieving revision 1.7.4.15 retrieving revision 1.7.4.16 diff -C2 -d -r1.7.4.15 -r1.7.4.16 *** s_main.c 2 May 2005 07:39:49 -0000 1.7.4.15 --- s_main.c 2 May 2005 08:36:17 -0000 1.7.4.16 *************** *** 286,290 **** for (i = 0; i != argc; ++i) { ! if (!strcmp(argv[i],"-no-prefs")) defeat_presets = 1; } --- 286,290 ---- for (i = 0; i != argc; ++i) { ! if (!strcmp(argv[i],"-no-prefs") || !strcmp(argv[i], "-rcfile")) defeat_presets = 1; } *************** *** 418,421 **** --- 418,422 ---- "\nother flags:\n", + "-rcfile <file> -- read this rcfile instead of default pd-settings\n", "-path <path> -- add to file search path\n", "-nostdpath -- don't search standard (\"extra\") directory\n", *************** *** 814,817 **** --- 815,826 ---- } /* } tb */ + /* jmz: read an alternative rcfile { */ + else if (!strcmp(*argv, "-rcfile")) + { + sys_parsercfile(*(argv+1)); + argc -= 2; + argv += 2; + } + /* } jmz */ else if (!strcmp(*argv, "-verbose")) { Index: s_path.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_path.c,v retrieving revision 1.3.4.4 retrieving revision 1.3.4.5 diff -C2 -d -r1.3.4.4 -r1.3.4.5 *** s_path.c 14 Dec 2004 09:56:04 -0000 1.3.4.4 --- s_path.c 2 May 2005 08:36:17 -0000 1.3.4.5 *************** *** 362,371 **** int sys_argparse(int argc, char **argv); - #ifndef MSW - - #define STARTUPNAME ".pdrc" #define NUMARGS 1000 ! int sys_rcfile(void) { FILE* file; --- 362,368 ---- int sys_argparse(int argc, char **argv); #define NUMARGS 1000 ! int sys_parsercfile(char*filename) { FILE* file; *************** *** 375,393 **** char* rcargv[NUMARGS]; char* buffer; ! char fname[MAXPDSTRING], buf[1000], *home = getenv("HOME"); /* parse a startup file */ ! *fname = '\0'; ! ! strncat(fname, home? home : ".", MAXPDSTRING-10); ! strcat(fname, "/"); ! ! strcat(fname, STARTUPNAME); ! ! if (!(file = fopen(fname, "r"))) return 1; ! post("reading startup file: %s", fname); rcargv[0] = "."; /* this no longer matters to sys_argparse() */ --- 372,383 ---- char* rcargv[NUMARGS]; char* buffer; ! char buf[1000]; /* parse a startup file */ ! if (!(file = fopen(filename, "r"))) return 1; ! post("reading startup file: %s", filename); rcargv[0] = "."; /* this no longer matters to sys_argparse() */ *************** *** 446,449 **** --- 436,461 ---- return (0); } + + + #ifndef MSW + + #define STARTUPNAME ".pdrc" + + int sys_rcfile(void) + { + char fname[MAXPDSTRING], *home = getenv("HOME"); + + // parse a startup file */ + *fname = '\0'; + + strncat(fname, home? home : ".", MAXPDSTRING-10); + strcat(fname, "/"); + + strcat(fname, STARTUPNAME); + + return sys_parsercfile(fname); + } + + #endif /* MSW */

1 0

pd/src m_pd.h, 1.4.4.10, 1.4.4.11 s_main.c, 1.7.4.14, 1.7.4.15 s_print.c, 1.2, 1.2.4.1
by IOhannes m zmölnig 02 May '05

02 May '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10404 Modified Files: Tag: devel_0_38 m_pd.h s_main.c s_print.c Log Message: verbose(), for user-defined verbosity Index: m_pd.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_pd.h,v retrieving revision 1.4.4.10 retrieving revision 1.4.4.11 diff -C2 -d -r1.4.4.10 -r1.4.4.11 *** m_pd.h 9 Apr 2005 06:49:24 -0000 1.4.4.10 --- m_pd.h 2 May 2005 07:39:49 -0000 1.4.4.11 *************** *** 455,458 **** --- 455,459 ---- EXTERN void endpost(void); EXTERN void error(const char *fmt, ...); + EXTERN void verbose(int level, const char *fmt, ...); EXTERN void bug(const char *fmt, ...); EXTERN void pd_error(void *object, const char *fmt, ...); Index: s_print.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_print.c,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** s_print.c 6 Sep 2004 20:20:36 -0000 1.2 --- s_print.c 2 May 2005 07:39:50 -0000 1.2.4.1 *************** *** 111,114 **** --- 111,132 ---- } + void verbose(int level, const char *fmt, ...) + { + char buf[MAXPDSTRING]; + va_list ap; + t_int arg[8]; + int i; + if(level>sys_verbose)return; + dopost("verbose("); + postfloat((float)level); + dopost("):"); + + va_start(ap, fmt); + vsnprintf(buf, MAXPDSTRING-1, fmt, ap); + va_end(ap); + strcat(buf, "\n"); + dopost(buf); + } + /* here's the good way to log errors -- keep a pointer to the offending or offended object around so the user can search for it Index: s_main.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_main.c,v retrieving revision 1.7.4.14 retrieving revision 1.7.4.15 diff -C2 -d -r1.7.4.14 -r1.7.4.15 *** s_main.c 8 Apr 2005 12:37:48 -0000 1.7.4.14 --- s_main.c 2 May 2005 07:39:49 -0000 1.7.4.15 *************** *** 816,820 **** else if (!strcmp(*argv, "-verbose")) { ! sys_verbose = 1; argc--; argv++; } --- 816,820 ---- else if (!strcmp(*argv, "-verbose")) { ! sys_verbose++; argc--; argv++; }

1 0

doc/pddp all_about_arrays.pd,1.2,1.3
by Hans-Christoph Steiner 02 May '05

02 May '05

Update of /cvsroot/pure-data/doc/pddp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12134 Modified Files: all_about_arrays.pd Log Message: added discussion about array start point and cleaned things up a little Index: all_about_arrays.pd =================================================================== RCS file: /cvsroot/pure-data/doc/pddp/all_about_arrays.pd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** all_about_arrays.pd 28 Apr 2005 00:25:04 -0000 1.2 --- all_about_arrays.pd 2 May 2005 04:56:02 -0000 1.3 *************** *** 1,677 **** ! #N canvas 0 0 653 613 12; ! #N canvas 132 0 591 609 What_is_an_array_in_PD 0; ! #X text 27 17 WHAT IS AN ARRAY IN PURE DATA?; ! #X text 45 42 Arrays \, in most programming environments \, are considered ! to be "a sequence of objects all of which have the same variable type" ! wherein each object is called an element and the elements are numbered ! in a row 0 \, 1 \, 2 \, 3 \, etc. These numbers are called indices. ! Each index holds a corresponding value.; ! #X text 46 222 Arrays in Pd look like this:; ! #N canvas 0 0 450 300 graph18 0; [...1374 lines suppressed...] ! cut-n-paste \, pitch-shift \, time expansion \, down/upsampling \, ! and other tools typically found in commercial wave editors.; ! #X text 49 128 1 Audio sample data: when an array's values are limited ! to a range between -1 and 1 \, the numbers are suitable for conversion ! to analog audio signal. These arrays are typically many thousands of ! elements and stored on hard disk in the form of aiff \, wav or pure ! text.; ! #X restore 40 239 pd Common_uses_for_arrays_in_PD; ! #X text 39 309 NOTE: I strongly recommend that you download the [arraysize] ! external to your "pd/extra" folder before continuing. Some of these ! examples are impossible without it -- I personally feel that [arraysize] ! should be considered for permanent inclusion in future Pd distributions. ! Check the CVS Repository or Pure-data.org for [arraysize].; ! #X text 40 459 This document is meant to supplement the help documentation ! for [table] \, [tabread] \, [tabwrite] \, [soundfiler] \, [tabsend~] ! \, [tabreceive~] \, [tabplay~] \, etc.; ! #X obj 4 4 cnv 15 500 20 empty empty all_about_arrays 20 10 1 18 -233017 ! -66577 0; ! #X obj 471 5 pddp; ! #X text 316 528 updated for Pd 0.38-2;

1 0

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 May 2005