Mercurial > hg > weather-synthesis-prototyping
changeset 86:5c8267c02763
obsPosition object created
| author | Rod Selfridge <r.selfridge@qmul.ac.uk> |
|---|---|
| date | Mon, 29 Jun 2015 22:13:55 +0100 |
| parents | 9fbf39788338 |
| children | 94fdafb68c3e |
| files | June/.DS_Store June/obsPosition.pd June/tenSource.pd June/woosh_D2.pd June/woosh_D3.pd |
| diffstat | 5 files changed, 237 insertions(+), 858 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/June/obsPosition.pd Mon Jun 29 22:13:55 2015 +0100 @@ -0,0 +1,67 @@ +#N canvas 199 51 694 515 10; +#X obj -122 343 r obsDistance; +#X obj 40 155 r obsAngle; +#X obj -117 35 inlet; +#X obj 265 82 r bladeLen; +#X obj 280 188 r armLength; +#X obj -117 58 s \$0_sourceNo; +#X obj 279 103 r NoOfSources; +#X obj 265 213 +; +#X obj 265 123 /; +#X obj 265 167 *; +#X obj 280 144 r \$0_sourceNo; +#X obj 25 210 / 360; +#X obj 25 232 * 6.28319; +#X floatatom -33 283 8 0 0 0 - - -; +#X obj 25 283 *; +#X floatatom -32 345 8 0 0 0 - - -; +#X obj 49 397 hsl 128 15 15 25 0 0 empty empty empty -2 -8 0 10 -262144 +-1 -1 0 1; +#X obj 25 133 r currentAngle; +#X floatatom -53 403 8 0 0 0 - - -; +#X obj 25 345 t f b; +#X obj 25 178 +; +#X obj 10 376 +; +#X obj 25 257 cos; +#X obj -80 150 hsl 75 25 -360 360 0 0 empty empty empty -2 -8 0 10 +-262144 -1 -1 0 1; +#X floatatom -83 182 5 0 0 0 - - -; +#X obj 10 418 outlet; +#X floatatom -19 211 5 0 0 0 - - -; +#X obj 73 211 outlet; +#X text 67 176 Combine observer angle; +#X text 67 188 and angle of swing; +#X text 291 213 Distance from centre of arc to the source; +#X obj 25 320 * -1; +#X text 61 284 Distance between the centre of the arc and source in +line between centre and observer; +#X text 54 427 Total distance between observer and the specific source +in line from centre; +#X connect 0 0 21 0; +#X connect 1 0 20 1; +#X connect 2 0 5 0; +#X connect 3 0 8 0; +#X connect 4 0 7 1; +#X connect 6 0 8 1; +#X connect 7 0 14 1; +#X connect 8 0 9 0; +#X connect 9 0 7 0; +#X connect 10 0 9 1; +#X connect 11 0 12 0; +#X connect 12 0 22 0; +#X connect 14 0 31 0; +#X connect 17 0 20 0; +#X connect 17 0 23 0; +#X connect 19 0 21 1; +#X connect 19 1 21 0; +#X connect 20 0 11 0; +#X connect 20 0 26 0; +#X connect 20 0 27 0; +#X connect 21 0 16 0; +#X connect 21 0 18 0; +#X connect 21 0 25 0; +#X connect 22 0 13 0; +#X connect 22 0 14 0; +#X connect 23 0 24 0; +#X connect 31 0 19 0; +#X connect 31 0 15 0;
--- a/June/tenSource.pd Mon Jun 29 18:55:30 2015 +0100 +++ b/June/tenSource.pd Mon Jun 29 22:13:55 2015 +0100 @@ -119,706 +119,7 @@ #X obj 872 15 inlet; #X obj 872 39 s \$0_obAngle; #X obj 780 40 s \$0_obDist; -#N canvas 1051 49 396 632 obsPosition 0; -#X obj -49 337 r obsDistance; -#X obj 113 149 r obsAngle; -#X obj -44 29 inlet; -#X obj 188 108 r bladeLen; -#X obj 203 214 r armLength; -#X obj -44 52 s \$0_sourceNo; -#X obj 202 129 r NoOfSources; -#X obj 188 239 +; -#X obj 188 149 /; -#X obj 188 193 *; -#X obj 203 170 r \$0_sourceNo; -#X floatatom 61 53 5 0 0 0 - - -; -#X obj 98 204 / 360; -#X obj 98 226 * 6.28319; -#X floatatom 40 277 8 0 0 0 - - -; -#X obj 98 277 *; -#X floatatom 41 339 8 0 0 0 - - -; -#X obj 122 391 hsl 128 15 15 25 0 0 empty empty empty -2 -8 0 10 -262144 --1 -1 7549 1; -#X obj 98 127 r currentAngle; -#X floatatom 55 147 5 0 0 0 - - -; -#X floatatom 20 397 8 0 0 0 - - -; -#X obj 98 339 t f b; -#X obj 98 172 +; -#X obj 116 36 hsl 128 15 180 -180 0 0 empty empty empty -2 -8 0 10 --262144 -1 -1 0 1; -#X floatatom 124 63 5 0 0 0 - - -; -#X obj 83 370 +; -#X obj 98 251 cos; -#X obj 98 314 * -1; -#X obj -36 158 hsl 75 25 -60 180 0 0 empty empty empty -2 -8 0 10 -262144 --1 -1 6475 1; -#X floatatom -23 203 5 0 0 0 - - -; -#X obj 83 412 outlet; -#X floatatom 54 205 5 0 0 0 - - -; -#X obj 146 205 outlet; -#X connect 0 0 25 0; -#X connect 1 0 22 1; -#X connect 2 0 5 0; -#X connect 2 0 11 0; -#X connect 3 0 8 0; -#X connect 4 0 7 1; -#X connect 6 0 8 1; -#X connect 7 0 15 1; -#X connect 8 0 9 0; -#X connect 9 0 7 0; -#X connect 10 0 9 1; -#X connect 12 0 13 0; -#X connect 13 0 26 0; -#X connect 15 0 27 0; -#X connect 18 0 19 0; -#X connect 18 0 22 0; -#X connect 19 0 28 0; -#X connect 21 0 25 1; -#X connect 21 1 25 0; -#X connect 22 0 12 0; -#X connect 22 0 31 0; -#X connect 22 0 32 0; -#X connect 23 0 24 0; -#X connect 25 0 17 0; -#X connect 25 0 20 0; -#X connect 25 0 30 0; -#X connect 26 0 14 0; -#X connect 26 0 15 0; -#X connect 27 0 21 0; -#X connect 27 0 16 0; -#X connect 28 0 29 0; -#X connect 28 0 22 0; -#X restore -137 194 pd obsPosition; #X obj 313 223 freqCalcWoo; -#N canvas 1051 49 396 632 obsPosition 0; -#X obj -49 337 r obsDistance; -#X obj 113 149 r obsAngle; -#X obj -44 29 inlet; -#X obj 188 108 r bladeLen; -#X obj 203 214 r armLength; -#X obj -44 52 s \$0_sourceNo; -#X obj 202 129 r NoOfSources; -#X obj 188 239 +; -#X obj 188 149 /; -#X obj 188 193 *; -#X obj 203 170 r \$0_sourceNo; -#X floatatom 61 53 5 0 0 0 - - -; -#X obj 98 204 / 360; -#X obj 98 226 * 6.28319; -#X floatatom 40 277 8 0 0 0 - - -; -#X obj 98 277 *; -#X floatatom 41 339 8 0 0 0 - - -; -#X obj 122 391 hsl 128 15 15 25 0 0 empty empty empty -2 -8 0 10 -262144 --1 -1 7549 1; -#X obj 98 127 r currentAngle; -#X floatatom 55 147 5 0 0 0 - - -; -#X floatatom 20 397 8 0 0 0 - - -; -#X obj 98 339 t f b; -#X obj 98 172 +; -#X obj 116 36 hsl 128 15 180 -180 0 0 empty empty empty -2 -8 0 10 --262144 -1 -1 0 1; -#X floatatom 124 63 5 0 0 0 - - -; -#X obj 83 370 +; -#X obj 98 251 cos; -#X obj 98 314 * -1; -#X obj -36 158 hsl 75 25 -60 180 0 0 empty empty empty -2 -8 0 10 -262144 --1 -1 6475 1; -#X floatatom -23 203 5 0 0 0 - - -; -#X obj 83 412 outlet; -#X floatatom 54 205 5 0 0 0 - - -; -#X obj 146 205 outlet; -#X connect 0 0 25 0; -#X connect 1 0 22 1; -#X connect 2 0 5 0; -#X connect 2 0 11 0; -#X connect 3 0 8 0; -#X connect 4 0 7 1; -#X connect 6 0 8 1; -#X connect 7 0 15 1; -#X connect 8 0 9 0; -#X connect 9 0 7 0; -#X connect 10 0 9 1; -#X connect 12 0 13 0; -#X connect 13 0 26 0; -#X connect 15 0 27 0; -#X connect 18 0 19 0; -#X connect 18 0 22 0; -#X connect 19 0 28 0; -#X connect 21 0 25 1; -#X connect 21 1 25 0; -#X connect 22 0 12 0; -#X connect 22 0 31 0; -#X connect 22 0 32 0; -#X connect 23 0 24 0; -#X connect 25 0 17 0; -#X connect 25 0 20 0; -#X connect 25 0 30 0; -#X connect 26 0 14 0; -#X connect 26 0 15 0; -#X connect 27 0 21 0; -#X connect 27 0 16 0; -#X connect 28 0 29 0; -#X connect 28 0 22 0; -#X restore -138 681 pd obsPosition; -#N canvas 1051 49 396 632 obsPosition 0; -#X obj -49 337 r obsDistance; -#X obj 113 149 r obsAngle; -#X obj -44 29 inlet; -#X obj 188 108 r bladeLen; -#X obj 203 214 r armLength; -#X obj -44 52 s \$0_sourceNo; -#X obj 202 129 r NoOfSources; -#X obj 188 239 +; -#X obj 188 149 /; -#X obj 188 193 *; -#X obj 203 170 r \$0_sourceNo; -#X floatatom 61 53 5 0 0 0 - - -; -#X obj 98 204 / 360; -#X obj 98 226 * 6.28319; -#X floatatom 40 277 8 0 0 0 - - -; -#X obj 98 277 *; -#X floatatom 41 339 8 0 0 0 - - -; -#X obj 122 391 hsl 128 15 15 25 0 0 empty empty empty -2 -8 0 10 -262144 --1 -1 7549 1; -#X obj 98 127 r currentAngle; -#X floatatom 55 147 5 0 0 0 - - -; -#X floatatom 20 397 8 0 0 0 - - -; -#X obj 98 339 t f b; -#X obj 98 172 +; -#X obj 116 36 hsl 128 15 180 -180 0 0 empty empty empty -2 -8 0 10 --262144 -1 -1 0 1; -#X floatatom 124 63 5 0 0 0 - - -; -#X obj 83 370 +; -#X obj 98 251 cos; -#X obj 98 314 * -1; -#X obj -36 158 hsl 75 25 -60 180 0 0 empty empty empty -2 -8 0 10 -262144 --1 -1 6475 1; -#X floatatom -23 203 5 0 0 0 - - -; -#X obj 83 412 outlet; -#X floatatom 54 205 5 0 0 0 - - -; -#X obj 146 205 outlet; -#X connect 0 0 25 0; -#X connect 1 0 22 1; -#X connect 2 0 5 0; -#X connect 2 0 11 0; -#X connect 3 0 8 0; -#X connect 4 0 7 1; -#X connect 6 0 8 1; -#X connect 7 0 15 1; -#X connect 8 0 9 0; -#X connect 9 0 7 0; -#X connect 10 0 9 1; -#X connect 12 0 13 0; -#X connect 13 0 26 0; -#X connect 15 0 27 0; -#X connect 18 0 19 0; -#X connect 18 0 22 0; -#X connect 19 0 28 0; -#X connect 21 0 25 1; -#X connect 21 1 25 0; -#X connect 22 0 12 0; -#X connect 22 0 31 0; -#X connect 22 0 32 0; -#X connect 23 0 24 0; -#X connect 25 0 17 0; -#X connect 25 0 20 0; -#X connect 25 0 30 0; -#X connect 26 0 14 0; -#X connect 26 0 15 0; -#X connect 27 0 21 0; -#X connect 27 0 16 0; -#X connect 28 0 29 0; -#X connect 28 0 22 0; -#X restore -133 427 pd obsPosition; -#N canvas 1051 49 396 632 obsPosition 0; -#X obj -49 337 r obsDistance; -#X obj 113 149 r obsAngle; -#X obj -44 29 inlet; -#X obj 188 108 r bladeLen; -#X obj 203 214 r armLength; -#X obj -44 52 s \$0_sourceNo; -#X obj 202 129 r NoOfSources; -#X obj 188 239 +; -#X obj 188 149 /; -#X obj 188 193 *; -#X obj 203 170 r \$0_sourceNo; -#X floatatom 61 53 5 0 0 0 - - -; -#X obj 98 204 / 360; -#X obj 98 226 * 6.28319; -#X floatatom 40 277 8 0 0 0 - - -; -#X obj 98 277 *; -#X floatatom 41 339 8 0 0 0 - - -; -#X obj 122 391 hsl 128 15 15 25 0 0 empty empty empty -2 -8 0 10 -262144 --1 -1 7549 1; -#X obj 98 127 r currentAngle; -#X floatatom 55 147 5 0 0 0 - - -; -#X floatatom 20 397 8 0 0 0 - - -; -#X obj 98 339 t f b; -#X obj 98 172 +; -#X obj 116 36 hsl 128 15 180 -180 0 0 empty empty empty -2 -8 0 10 --262144 -1 -1 0 1; -#X floatatom 124 63 5 0 0 0 - - -; -#X obj 83 370 +; -#X obj 98 251 cos; -#X obj 98 314 * -1; -#X obj -36 158 hsl 75 25 -60 180 0 0 empty empty empty -2 -8 0 10 -262144 --1 -1 6475 1; -#X floatatom -23 203 5 0 0 0 - - -; -#X obj 83 412 outlet; -#X floatatom 54 205 5 0 0 0 - - -; -#X obj 146 205 outlet; -#X connect 0 0 25 0; -#X connect 1 0 22 1; -#X connect 2 0 5 0; -#X connect 2 0 11 0; -#X connect 3 0 8 0; -#X connect 4 0 7 1; -#X connect 6 0 8 1; -#X connect 7 0 15 1; -#X connect 8 0 9 0; -#X connect 9 0 7 0; -#X connect 10 0 9 1; -#X connect 12 0 13 0; -#X connect 13 0 26 0; -#X connect 15 0 27 0; -#X connect 18 0 19 0; -#X connect 18 0 22 0; -#X connect 19 0 28 0; -#X connect 21 0 25 1; -#X connect 21 1 25 0; -#X connect 22 0 12 0; -#X connect 22 0 31 0; -#X connect 22 0 32 0; -#X connect 23 0 24 0; -#X connect 25 0 17 0; -#X connect 25 0 20 0; -#X connect 25 0 30 0; -#X connect 26 0 14 0; -#X connect 26 0 15 0; -#X connect 27 0 21 0; -#X connect 27 0 16 0; -#X connect 28 0 29 0; -#X connect 28 0 22 0; -#X restore 99 328 pd obsPosition; -#N canvas 1051 49 396 632 obsPosition 0; -#X obj -49 337 r obsDistance; -#X obj 113 149 r obsAngle; -#X obj -44 29 inlet; -#X obj 188 108 r bladeLen; -#X obj 203 214 r armLength; -#X obj -44 52 s \$0_sourceNo; -#X obj 202 129 r NoOfSources; -#X obj 188 239 +; -#X obj 188 149 /; -#X obj 188 193 *; -#X obj 203 170 r \$0_sourceNo; -#X floatatom 61 53 5 0 0 0 - - -; -#X obj 98 204 / 360; -#X obj 98 226 * 6.28319; -#X floatatom 40 277 8 0 0 0 - - -; -#X obj 98 277 *; -#X floatatom 41 339 8 0 0 0 - - -; -#X obj 122 391 hsl 128 15 15 25 0 0 empty empty empty -2 -8 0 10 -262144 --1 -1 7549 1; -#X obj 98 127 r currentAngle; -#X floatatom 55 147 5 0 0 0 - - -; -#X floatatom 20 397 8 0 0 0 - - -; -#X obj 98 339 t f b; -#X obj 98 172 +; -#X obj 116 36 hsl 128 15 180 -180 0 0 empty empty empty -2 -8 0 10 --262144 -1 -1 0 1; -#X floatatom 124 63 5 0 0 0 - - -; -#X obj 83 370 +; -#X obj 98 251 cos; -#X obj 98 314 * -1; -#X obj -36 158 hsl 75 25 -60 180 0 0 empty empty empty -2 -8 0 10 -262144 --1 -1 6475 1; -#X floatatom -23 203 5 0 0 0 - - -; -#X obj 83 412 outlet; -#X floatatom 54 205 5 0 0 0 - - -; -#X obj 146 205 outlet; -#X connect 0 0 25 0; -#X connect 1 0 22 1; -#X connect 2 0 5 0; -#X connect 2 0 11 0; -#X connect 3 0 8 0; -#X connect 4 0 7 1; -#X connect 6 0 8 1; -#X connect 7 0 15 1; -#X connect 8 0 9 0; -#X connect 9 0 7 0; -#X connect 10 0 9 1; -#X connect 12 0 13 0; -#X connect 13 0 26 0; -#X connect 15 0 27 0; -#X connect 18 0 19 0; -#X connect 18 0 22 0; -#X connect 19 0 28 0; -#X connect 21 0 25 1; -#X connect 21 1 25 0; -#X connect 22 0 12 0; -#X connect 22 0 31 0; -#X connect 22 0 32 0; -#X connect 23 0 24 0; -#X connect 25 0 17 0; -#X connect 25 0 20 0; -#X connect 25 0 30 0; -#X connect 26 0 14 0; -#X connect 26 0 15 0; -#X connect 27 0 21 0; -#X connect 27 0 16 0; -#X connect 28 0 29 0; -#X connect 28 0 22 0; -#X restore 102 688 pd obsPosition; -#N canvas 786 66 743 719 obsPosition 0; -#X obj -49 337 r obsDistance; -#X obj 113 149 r obsAngle; -#X obj -44 29 inlet; -#X obj 338 76 r bladeLen; -#X obj 353 182 r armLength; -#X obj -44 52 s \$0_sourceNo; -#X obj 352 97 r NoOfSources; -#X obj 338 207 +; -#X obj 338 117 /; -#X obj 338 161 *; -#X obj 353 138 r \$0_sourceNo; -#X obj 98 204 / 360; -#X obj 98 226 * 6.28319; -#X floatatom 40 277 8 0 0 0 - - -; -#X obj 98 277 *; -#X floatatom 41 339 8 0 0 0 - - -; -#X obj 122 391 hsl 128 15 15 25 0 0 empty empty empty -2 -8 0 10 -262144 --1 -1 4620 1; -#X obj 98 127 r currentAngle; -#X floatatom 20 397 8 0 0 0 - - -; -#X obj 98 339 t f b; -#X obj 98 172 +; -#X obj 83 370 +; -#X obj 98 251 cos; -#X obj -7 144 hsl 75 25 -360 360 0 0 empty empty empty -2 -8 0 10 -262144 --1 -1 5242 1; -#X floatatom -10 176 5 0 0 0 - - -; -#X obj 83 412 outlet; -#X floatatom 54 205 5 0 0 0 - - -; -#X obj 146 205 outlet; -#X text 140 170 Combine observer angle; -#X text 140 182 and angle of swing; -#X text 364 207 Distance from centre of arc to the source; -#X obj 98 314 * -1; -#X text 134 278 Distance between the centre of the arc and source in -line between centre and observer; -#X text 127 421 Total distance between observer and the specific source -in line from centre; -#X connect 0 0 21 0; -#X connect 1 0 20 1; -#X connect 2 0 5 0; -#X connect 3 0 8 0; -#X connect 4 0 7 1; -#X connect 6 0 8 1; -#X connect 7 0 14 1; -#X connect 8 0 9 0; -#X connect 9 0 7 0; -#X connect 10 0 9 1; -#X connect 11 0 12 0; -#X connect 12 0 22 0; -#X connect 14 0 31 0; -#X connect 17 0 20 0; -#X connect 17 0 23 0; -#X connect 19 0 21 1; -#X connect 19 1 21 0; -#X connect 20 0 11 0; -#X connect 20 0 26 0; -#X connect 20 0 27 0; -#X connect 21 0 16 0; -#X connect 21 0 18 0; -#X connect 21 0 25 0; -#X connect 22 0 13 0; -#X connect 22 0 14 0; -#X connect 23 0 24 0; -#X connect 31 0 19 0; -#X connect 31 0 15 0; -#X restore 335 315 pd obsPosition; -#N canvas 1051 49 396 632 obsPosition 0; -#X obj -49 337 r obsDistance; -#X obj 113 149 r obsAngle; -#X obj -44 29 inlet; -#X obj 188 108 r bladeLen; -#X obj 203 214 r armLength; -#X obj -44 52 s \$0_sourceNo; -#X obj 202 129 r NoOfSources; -#X obj 188 239 +; -#X obj 188 149 /; -#X obj 188 193 *; -#X obj 203 170 r \$0_sourceNo; -#X floatatom 61 53 5 0 0 0 - - -; -#X obj 98 204 / 360; -#X obj 98 226 * 6.28319; -#X floatatom 40 277 8 0 0 0 - - -; -#X obj 98 277 *; -#X floatatom 41 339 8 0 0 0 - - -; -#X obj 122 391 hsl 128 15 15 25 0 0 empty empty empty -2 -8 0 10 -262144 --1 -1 7549 1; -#X obj 98 127 r currentAngle; -#X floatatom 55 147 5 0 0 0 - - -; -#X floatatom 20 397 8 0 0 0 - - -; -#X obj 98 339 t f b; -#X obj 98 172 +; -#X obj 116 36 hsl 128 15 180 -180 0 0 empty empty empty -2 -8 0 10 --262144 -1 -1 0 1; -#X floatatom 124 63 5 0 0 0 - - -; -#X obj 83 370 +; -#X obj 98 251 cos; -#X obj 98 314 * -1; -#X obj -36 158 hsl 75 25 -60 180 0 0 empty empty empty -2 -8 0 10 -262144 --1 -1 6475 1; -#X floatatom -23 203 5 0 0 0 - - -; -#X obj 83 412 outlet; -#X floatatom 54 205 5 0 0 0 - - -; -#X obj 146 205 outlet; -#X connect 0 0 25 0; -#X connect 1 0 22 1; -#X connect 2 0 5 0; -#X connect 2 0 11 0; -#X connect 3 0 8 0; -#X connect 4 0 7 1; -#X connect 6 0 8 1; -#X connect 7 0 15 1; -#X connect 8 0 9 0; -#X connect 9 0 7 0; -#X connect 10 0 9 1; -#X connect 12 0 13 0; -#X connect 13 0 26 0; -#X connect 15 0 27 0; -#X connect 18 0 19 0; -#X connect 18 0 22 0; -#X connect 19 0 28 0; -#X connect 21 0 25 1; -#X connect 21 1 25 0; -#X connect 22 0 12 0; -#X connect 22 0 31 0; -#X connect 22 0 32 0; -#X connect 23 0 24 0; -#X connect 25 0 17 0; -#X connect 25 0 20 0; -#X connect 25 0 30 0; -#X connect 26 0 14 0; -#X connect 26 0 15 0; -#X connect 27 0 21 0; -#X connect 27 0 16 0; -#X connect 28 0 29 0; -#X connect 28 0 22 0; -#X restore 325 679 pd obsPosition; -#N canvas 1051 49 396 632 obsPosition 0; -#X obj -49 337 r obsDistance; -#X obj 113 149 r obsAngle; -#X obj -44 29 inlet; -#X obj 188 108 r bladeLen; -#X obj 203 214 r armLength; -#X obj -44 52 s \$0_sourceNo; -#X obj 202 129 r NoOfSources; -#X obj 188 239 +; -#X obj 188 149 /; -#X obj 188 193 *; -#X obj 203 170 r \$0_sourceNo; -#X floatatom 61 53 5 0 0 0 - - -; -#X obj 98 204 / 360; -#X obj 98 226 * 6.28319; -#X floatatom 40 277 8 0 0 0 - - -; -#X obj 98 277 *; -#X floatatom 41 339 8 0 0 0 - - -; -#X obj 122 391 hsl 128 15 15 25 0 0 empty empty empty -2 -8 0 10 -262144 --1 -1 7549 1; -#X obj 98 127 r currentAngle; -#X floatatom 55 147 5 0 0 0 - - -; -#X floatatom 20 397 8 0 0 0 - - -; -#X obj 98 339 t f b; -#X obj 98 172 +; -#X obj 116 36 hsl 128 15 180 -180 0 0 empty empty empty -2 -8 0 10 --262144 -1 -1 0 1; -#X floatatom 124 63 5 0 0 0 - - -; -#X obj 83 370 +; -#X obj 98 251 cos; -#X obj 98 314 * -1; -#X obj -36 158 hsl 75 25 -60 180 0 0 empty empty empty -2 -8 0 10 -262144 --1 -1 6475 1; -#X floatatom -23 203 5 0 0 0 - - -; -#X obj 83 412 outlet; -#X floatatom 54 205 5 0 0 0 - - -; -#X obj 146 205 outlet; -#X connect 0 0 25 0; -#X connect 1 0 22 1; -#X connect 2 0 5 0; -#X connect 2 0 11 0; -#X connect 3 0 8 0; -#X connect 4 0 7 1; -#X connect 6 0 8 1; -#X connect 7 0 15 1; -#X connect 8 0 9 0; -#X connect 9 0 7 0; -#X connect 10 0 9 1; -#X connect 12 0 13 0; -#X connect 13 0 26 0; -#X connect 15 0 27 0; -#X connect 18 0 19 0; -#X connect 18 0 22 0; -#X connect 19 0 28 0; -#X connect 21 0 25 1; -#X connect 21 1 25 0; -#X connect 22 0 12 0; -#X connect 22 0 31 0; -#X connect 22 0 32 0; -#X connect 23 0 24 0; -#X connect 25 0 17 0; -#X connect 25 0 20 0; -#X connect 25 0 30 0; -#X connect 26 0 14 0; -#X connect 26 0 15 0; -#X connect 27 0 21 0; -#X connect 27 0 16 0; -#X connect 28 0 29 0; -#X connect 28 0 22 0; -#X restore 559 306 pd obsPosition; -#N canvas 1051 49 396 632 obsPosition 0; -#X obj -49 337 r obsDistance; -#X obj 113 149 r obsAngle; -#X obj -44 29 inlet; -#X obj 188 108 r bladeLen; -#X obj 203 214 r armLength; -#X obj -44 52 s \$0_sourceNo; -#X obj 202 129 r NoOfSources; -#X obj 188 239 +; -#X obj 188 149 /; -#X obj 188 193 *; -#X obj 203 170 r \$0_sourceNo; -#X floatatom 61 53 5 0 0 0 - - -; -#X obj 98 204 / 360; -#X obj 98 226 * 6.28319; -#X floatatom 40 277 8 0 0 0 - - -; -#X obj 98 277 *; -#X floatatom 41 339 8 0 0 0 - - -; -#X obj 122 391 hsl 128 15 15 25 0 0 empty empty empty -2 -8 0 10 -262144 --1 -1 7549 1; -#X obj 98 127 r currentAngle; -#X floatatom 55 147 5 0 0 0 - - -; -#X floatatom 20 397 8 0 0 0 - - -; -#X obj 98 339 t f b; -#X obj 98 172 +; -#X obj 116 36 hsl 128 15 180 -180 0 0 empty empty empty -2 -8 0 10 --262144 -1 -1 0 1; -#X floatatom 124 63 5 0 0 0 - - -; -#X obj 83 370 +; -#X obj 98 251 cos; -#X obj 98 314 * -1; -#X obj -36 158 hsl 75 25 -60 180 0 0 empty empty empty -2 -8 0 10 -262144 --1 -1 6475 1; -#X floatatom -23 203 5 0 0 0 - - -; -#X obj 83 412 outlet; -#X floatatom 54 205 5 0 0 0 - - -; -#X obj 146 205 outlet; -#X connect 0 0 25 0; -#X connect 1 0 22 1; -#X connect 2 0 5 0; -#X connect 2 0 11 0; -#X connect 3 0 8 0; -#X connect 4 0 7 1; -#X connect 6 0 8 1; -#X connect 7 0 15 1; -#X connect 8 0 9 0; -#X connect 9 0 7 0; -#X connect 10 0 9 1; -#X connect 12 0 13 0; -#X connect 13 0 26 0; -#X connect 15 0 27 0; -#X connect 18 0 19 0; -#X connect 18 0 22 0; -#X connect 19 0 28 0; -#X connect 21 0 25 1; -#X connect 21 1 25 0; -#X connect 22 0 12 0; -#X connect 22 0 31 0; -#X connect 22 0 32 0; -#X connect 23 0 24 0; -#X connect 25 0 17 0; -#X connect 25 0 20 0; -#X connect 25 0 30 0; -#X connect 26 0 14 0; -#X connect 26 0 15 0; -#X connect 27 0 21 0; -#X connect 27 0 16 0; -#X connect 28 0 29 0; -#X connect 28 0 22 0; -#X restore 563 655 pd obsPosition; -#N canvas 1051 49 396 632 obsPosition 0; -#X obj -49 337 r obsDistance; -#X obj 113 149 r obsAngle; -#X obj -44 29 inlet; -#X obj 188 108 r bladeLen; -#X obj 203 214 r armLength; -#X obj -44 52 s \$0_sourceNo; -#X obj 202 129 r NoOfSources; -#X obj 188 239 +; -#X obj 188 149 /; -#X obj 188 193 *; -#X obj 203 170 r \$0_sourceNo; -#X floatatom 61 53 5 0 0 0 - - -; -#X obj 98 204 / 360; -#X obj 98 226 * 6.28319; -#X floatatom 40 277 8 0 0 0 - - -; -#X obj 98 277 *; -#X floatatom 41 339 8 0 0 0 - - -; -#X obj 122 391 hsl 128 15 15 25 0 0 empty empty empty -2 -8 0 10 -262144 --1 -1 7549 1; -#X obj 98 127 r currentAngle; -#X floatatom 55 147 5 0 0 0 - - -; -#X floatatom 20 397 8 0 0 0 - - -; -#X obj 98 339 t f b; -#X obj 98 172 +; -#X obj 116 36 hsl 128 15 180 -180 0 0 empty empty empty -2 -8 0 10 --262144 -1 -1 0 1; -#X floatatom 124 63 5 0 0 0 - - -; -#X obj 83 370 +; -#X obj 98 251 cos; -#X obj 98 314 * -1; -#X obj -36 158 hsl 75 25 -60 180 0 0 empty empty empty -2 -8 0 10 -262144 --1 -1 6475 1; -#X floatatom -23 203 5 0 0 0 - - -; -#X obj 83 412 outlet; -#X floatatom 54 205 5 0 0 0 - - -; -#X obj 146 205 outlet; -#X connect 0 0 25 0; -#X connect 1 0 22 1; -#X connect 2 0 5 0; -#X connect 2 0 11 0; -#X connect 3 0 8 0; -#X connect 4 0 7 1; -#X connect 6 0 8 1; -#X connect 7 0 15 1; -#X connect 8 0 9 0; -#X connect 9 0 7 0; -#X connect 10 0 9 1; -#X connect 12 0 13 0; -#X connect 13 0 26 0; -#X connect 15 0 27 0; -#X connect 18 0 19 0; -#X connect 18 0 22 0; -#X connect 19 0 28 0; -#X connect 21 0 25 1; -#X connect 21 1 25 0; -#X connect 22 0 12 0; -#X connect 22 0 31 0; -#X connect 22 0 32 0; -#X connect 23 0 24 0; -#X connect 25 0 17 0; -#X connect 25 0 20 0; -#X connect 25 0 30 0; -#X connect 26 0 14 0; -#X connect 26 0 15 0; -#X connect 27 0 21 0; -#X connect 27 0 16 0; -#X connect 28 0 29 0; -#X connect 28 0 22 0; -#X restore 794 427 pd obsPosition; -#X obj 313 375 woSoFreq; #X obj 973 15 inlet; #X obj 973 39 s \$0_elev; #X obj 373 353 r \$0_elev; @@ -832,14 +133,6 @@ #X obj 541 573 freqCalcWoo; #X obj 772 347 freqCalcWoo; #X obj -158 490 woSoFreq; -#X obj -159 239 woSoFreq; -#X obj -155 727 woSoFreq; -#X obj 77 385 woSoFreq; -#X obj 80 750 woSoFreq; -#X obj 303 724 woSoFreq; -#X obj 537 352 woSoFreq; -#X obj 541 702 woSoFreq; -#X obj 772 476 woSoFreq; #X obj 150 368 r \$0_elev; #X obj -39 195 r \$0_elev; #X obj -80 470 r \$0_elev; @@ -849,19 +142,38 @@ #X obj 630 685 r \$0_elev; #X obj 855 457 r \$0_elev; #X obj 627 334 r \$0_elev; +#X obj 313 375 woSoFreq; +#X obj -159 239 woSoFreq; +#X obj -155 727 woSoFreq; +#X obj 77 385 woSoFreq; +#X obj 80 750 woSoFreq; +#X obj 303 724 woSoFreq; +#X obj 537 352 woSoFreq; +#X obj 541 702 woSoFreq; +#X obj 772 476 woSoFreq; +#X obj 559 306 obsPosition; +#X obj 794 427 obsPosition; +#X obj 563 655 obsPosition; +#X obj 325 679 obsPosition; +#X obj 102 688 obsPosition; +#X obj -138 681 obsPosition; +#X obj -133 428 obsPosition; +#X obj -137 194 obsPosition; +#X obj 99 328 obsPosition; +#X obj 335 315 obsPosition; #X connect 0 0 1 0; #X connect 0 0 12 0; #X connect 1 0 2 0; #X connect 2 0 3 0; #X connect 3 0 4 0; -#X connect 5 0 135 0; +#X connect 5 0 124 0; #X connect 6 0 11 1; #X connect 7 0 6 1; #X connect 8 0 9 0; #X connect 9 0 6 0; -#X connect 9 0 120 0; +#X connect 9 0 159 0; #X connect 10 0 11 0; -#X connect 11 0 145 1; +#X connect 11 0 144 1; #X connect 12 0 13 0; #X connect 12 0 14 0; #X connect 12 0 15 0; @@ -883,137 +195,137 @@ #X connect 21 0 31 0; #X connect 22 0 32 0; #X connect 33 0 9 1; -#X connect 34 0 135 1; -#X connect 35 0 136 0; +#X connect 34 0 124 1; +#X connect 35 0 125 0; #X connect 36 0 41 1; #X connect 37 0 36 1; #X connect 38 0 39 0; #X connect 39 0 36 0; -#X connect 39 0 123 0; +#X connect 39 0 158 0; #X connect 40 0 41 0; -#X connect 41 0 144 1; -#X connect 42 0 136 1; +#X connect 41 0 133 1; +#X connect 42 0 125 1; #X connect 43 0 39 1; -#X connect 44 0 137 0; +#X connect 44 0 126 0; #X connect 45 0 50 1; #X connect 46 0 45 1; #X connect 47 0 48 0; #X connect 48 0 45 0; -#X connect 48 0 122 0; +#X connect 48 0 157 0; #X connect 49 0 50 0; -#X connect 50 0 146 1; -#X connect 51 0 137 1; +#X connect 50 0 145 1; +#X connect 51 0 126 1; #X connect 52 0 48 1; -#X connect 53 0 138 0; +#X connect 53 0 127 0; #X connect 54 0 59 1; #X connect 55 0 54 1; #X connect 56 0 57 0; #X connect 57 0 54 0; -#X connect 57 0 124 0; +#X connect 57 0 160 0; #X connect 58 0 59 0; -#X connect 59 0 147 1; -#X connect 60 0 138 1; +#X connect 59 0 146 1; +#X connect 60 0 127 1; #X connect 61 0 57 1; -#X connect 62 0 139 0; +#X connect 62 0 128 0; #X connect 63 0 68 1; #X connect 64 0 63 1; #X connect 65 0 66 0; #X connect 66 0 63 0; -#X connect 66 0 125 0; +#X connect 66 0 156 0; #X connect 67 0 68 0; -#X connect 68 0 148 1; +#X connect 68 0 147 1; #X connect 69 0 66 1; -#X connect 70 0 139 1; -#X connect 71 0 121 0; +#X connect 70 0 128 1; +#X connect 71 0 120 0; #X connect 72 0 77 1; #X connect 73 0 72 1; #X connect 74 0 75 0; #X connect 75 0 72 0; -#X connect 75 0 126 0; +#X connect 75 0 161 0; #X connect 76 0 77 0; -#X connect 77 0 131 1; -#X connect 78 0 121 1; +#X connect 77 0 143 1; +#X connect 78 0 120 1; #X connect 79 0 75 1; -#X connect 80 0 140 0; +#X connect 80 0 129 0; #X connect 81 0 86 1; #X connect 82 0 81 1; #X connect 83 0 84 0; #X connect 84 0 81 0; -#X connect 84 0 127 0; +#X connect 84 0 155 0; #X connect 85 0 86 0; -#X connect 86 0 149 1; -#X connect 87 0 140 1; +#X connect 86 0 148 1; +#X connect 87 0 129 1; #X connect 88 0 84 1; -#X connect 89 0 141 0; +#X connect 89 0 130 0; #X connect 90 0 95 1; #X connect 91 0 90 1; #X connect 92 0 93 0; #X connect 93 0 90 0; -#X connect 93 0 128 0; +#X connect 93 0 152 0; #X connect 94 0 95 0; -#X connect 95 0 150 1; -#X connect 96 0 141 1; +#X connect 95 0 149 1; +#X connect 96 0 130 1; #X connect 97 0 93 1; -#X connect 98 0 142 0; +#X connect 98 0 131 0; #X connect 99 0 104 1; #X connect 100 0 99 1; #X connect 101 0 102 0; #X connect 102 0 99 0; -#X connect 102 0 129 0; +#X connect 102 0 154 0; #X connect 103 0 104 0; -#X connect 104 0 151 1; -#X connect 105 0 142 1; +#X connect 104 0 150 1; +#X connect 105 0 131 1; #X connect 106 0 102 1; -#X connect 107 0 143 0; +#X connect 107 0 132 0; #X connect 108 0 113 1; #X connect 109 0 108 1; #X connect 110 0 111 0; #X connect 111 0 108 0; -#X connect 111 0 130 0; +#X connect 111 0 153 0; #X connect 112 0 113 0; -#X connect 113 0 152 1; -#X connect 114 0 143 1; +#X connect 113 0 151 1; +#X connect 114 0 132 1; #X connect 115 0 111 1; #X connect 116 0 119 0; #X connect 117 0 118 0; -#X connect 120 0 145 2; -#X connect 120 1 145 3; -#X connect 121 0 131 0; -#X connect 122 0 146 2; -#X connect 122 1 146 3; -#X connect 123 0 144 2; -#X connect 123 1 144 3; -#X connect 124 0 147 2; -#X connect 124 1 147 3; -#X connect 125 0 148 2; -#X connect 125 1 148 3; -#X connect 126 0 131 2; -#X connect 126 1 131 3; -#X connect 127 0 149 2; -#X connect 127 1 149 3; -#X connect 128 0 150 2; -#X connect 128 1 150 3; -#X connect 129 0 151 2; -#X connect 129 1 151 3; -#X connect 130 0 152 2; -#X connect 130 1 152 3; -#X connect 132 0 133 0; -#X connect 134 0 131 4; -#X connect 135 0 145 0; -#X connect 136 0 144 0; -#X connect 137 0 146 0; -#X connect 138 0 147 0; -#X connect 139 0 148 0; -#X connect 140 0 149 0; -#X connect 141 0 150 0; -#X connect 142 0 151 0; -#X connect 143 0 152 0; -#X connect 153 0 147 4; -#X connect 154 0 145 4; -#X connect 155 0 144 4; -#X connect 156 0 146 4; -#X connect 157 0 148 4; -#X connect 158 0 149 4; -#X connect 159 0 151 4; -#X connect 160 0 152 4; -#X connect 161 0 150 4; +#X connect 120 0 143 0; +#X connect 121 0 122 0; +#X connect 123 0 143 4; +#X connect 124 0 144 0; +#X connect 125 0 133 0; +#X connect 126 0 145 0; +#X connect 127 0 146 0; +#X connect 128 0 147 0; +#X connect 129 0 148 0; +#X connect 130 0 149 0; +#X connect 131 0 150 0; +#X connect 132 0 151 0; +#X connect 134 0 146 4; +#X connect 135 0 144 4; +#X connect 136 0 133 4; +#X connect 137 0 145 4; +#X connect 138 0 147 4; +#X connect 139 0 148 4; +#X connect 140 0 150 4; +#X connect 141 0 151 4; +#X connect 142 0 149 4; +#X connect 152 0 149 2; +#X connect 152 1 149 3; +#X connect 153 0 151 2; +#X connect 153 1 151 3; +#X connect 154 0 150 2; +#X connect 154 1 150 3; +#X connect 155 0 148 2; +#X connect 155 1 148 3; +#X connect 156 0 147 2; +#X connect 156 1 147 3; +#X connect 157 0 145 2; +#X connect 157 1 145 3; +#X connect 158 0 133 2; +#X connect 158 1 133 3; +#X connect 159 0 144 2; +#X connect 159 1 144 3; +#X connect 160 0 146 2; +#X connect 160 1 146 3; +#X connect 161 0 143 2; +#X connect 161 1 143 3;
--- a/June/woosh_D2.pd Mon Jun 29 18:55:30 2015 +0100 +++ b/June/woosh_D2.pd Mon Jun 29 22:13:55 2015 +0100 @@ -37,7 +37,7 @@ #X connect 14 0 13 1; #X restore 530 -156 pd opLevels; #X msg 530 -207 5; -#N canvas 601 144 807 545 speedCalc 0; +#N canvas 474 116 807 545 speedCalc 0; #X obj 59 -12 inlet; #X obj 135 -11 inlet; #X obj 217 -12 inlet; @@ -129,14 +129,14 @@ #X obj 3 -81 s NoOfSources; #X obj 68 79 s topSpeed; #X obj 16 53 hsl 100 20 0 100 0 0 empty empty empty -2 -8 0 10 -262144 --1 -1 4257 1; +-1 -1 2970 1; #X floatatom 13 79 8 0 0 0 - - -; #X text 37 -236 Blade Length; #X text 36 -170 Arm Length; #X text 31 -104 Number of Sources; #X text 124 57 Top Speed; #X obj 13 137 hsl 100 20 0 360 0 0 empty empty empty -2 -8 0 10 -262144 --1 -1 5912 1; +-1 -1 7700 1; #X floatatom 10 169 8 0 0 0 - - -; #X obj 65 168 s sweepAngle; #X text 124 138 Sweep Angle; @@ -181,9 +181,9 @@ #X obj 362 -110 s deltaThick; #X floatatom 307 -109 8 0 0 0 - - -; #X obj 10 228 hsl 100 20 0 0.03 0 0 empty empty empty -2 -8 0 10 -262144 --1 -1 2805 1; +-1 -1 3135 1; #X obj 9 313 hsl 100 20 0 0.01 0 0 empty empty empty -2 -8 0 10 -262144 --1 -1 2475 1; +-1 -1 3168 1; #X floatatom 7 258 8 0 0 0 - - -; #X obj 61 257 s hiltThick; #X floatatom 6 341 8 0 0 0 - - -; @@ -197,9 +197,9 @@ #X obj 204 -137 s GO; #X obj 765 -103 tenSource; #X obj 9 395 hsl 100 20 100 1 1 0 empty empty empty -2 -8 0 10 -262144 --1 -1 6920 1; +-1 -1 8410 1; #X obj 5 480 hsl 100 20 -180 180 0 0 empty empty empty -2 -8 0 10 -262144 --1 -1 7425 1; +-1 -1 6600 1; #X floatatom 6 421 8 0 0 0 - - -; #X text 119 399 Distance to Observer; #X floatatom 2 508 8 0 0 0 - - -; @@ -212,7 +212,7 @@ 0 1; #X obj 204 -217 metro 200; #X obj 258 -241 hsl 100 20 300 50 0 0 empty empty empty -2 -8 0 10 --262144 -1 -1 2300 1; +-262144 -1 -1 2000 1; #X obj 144 -190 bng 50 250 50 0 empty empty empty 17 7 0 10 -257985 -1 -1; #X obj 144 -137 s setUp; @@ -331,7 +331,7 @@ #X obj -157 352 *; #X obj -128 297 r sweepAngle; #X obj -154 405 hsl 100 25 0 360 0 0 empty empty empty -2 -8 0 10 -262144 --1 -1 4434 1; +-1 -1 5775 1; #X obj -128 319 * -0.75; #X obj -157 376 +; #X obj -128 343 * -1; @@ -340,7 +340,7 @@ #X obj 169 372 *; #X obj 219 332 r sweepAngle; #X obj 172 396 hsl 100 25 -360 360 0 0 empty empty empty -2 -8 0 10 --262144 -1 -1 4211 1; +-262144 -1 -1 3987 1; #X obj 214 283 r GO; #X obj -142 78 r maxCirc; #X obj 231 165 r maxCirc; @@ -440,7 +440,7 @@ #X connect 50 0 27 1; #X restore 421 -230 pd angleCalc; #X obj 533 -185 hsl 100 25 0 127 0 0 empty empty empty -2 -8 0 10 -262144 --1 -1 3118 1; +-1 -1 9354 1; #X msg 765 -182 10; #X obj 4 -259 loadbang; #X obj 2 -190 loadbang; @@ -449,7 +449,6 @@ #X msg 5 -32 0; #X obj 5 -10 s elev; #X text 124 486 (Azimuth); -#X obj 900 -91 tenSource; #X obj 934 -127 r distance; #X obj 917 -148 r angle; #X obj 900 -189 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 @@ -481,21 +480,18 @@ #X text 269 45 Circumference calculations; #X text 530 175 Speed calculations; #X text 364 382 Presets; -#X obj 764 62 tenSource; #X obj 798 26 r distance; #X obj 781 5 r angle; #X obj 764 -36 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1 -1; #X obj 764 -64 r setUp; #X obj 815 42 r elev; -#X obj 893 71 tenSource; #X obj 927 35 r distance; #X obj 910 14 r angle; #X obj 893 -27 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1 -1; #X obj 893 -55 r setUp; #X obj 944 51 r elev; -#X obj 761 213 tenSource; #X obj 795 177 r distance; #X obj 778 156 r angle; #X obj 761 115 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 @@ -505,7 +501,6 @@ #X msg 761 134 6; #X msg 893 -8 7; #X msg 764 -17 8; -#X obj 895 220 tenSource; #X obj 929 184 r distance; #X obj 912 163 r angle; #X obj 895 122 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 @@ -519,6 +514,11 @@ #X text 696 263 Currently the noise sources are not connected but still getting a zipping type sound. It seems to get worse with sources lower down the blade - this needs looked into; +#X obj 900 -91 tenSource; +#X obj 764 62 tenSource; +#X obj 893 71 tenSource; +#X obj 761 213 tenSource; +#X obj 895 220 tenSource; #X connect 3 0 5 0; #X connect 4 0 0 0; #X connect 4 1 1 0; @@ -579,55 +579,55 @@ #X connect 84 0 10 0; #X connect 85 0 52 3; #X connect 86 0 87 0; -#X connect 90 0 89 2; -#X connect 91 0 89 1; -#X connect 92 0 95 0; -#X connect 93 0 92 0; -#X connect 94 0 89 3; -#X connect 95 0 89 0; -#X connect 96 0 86 0; -#X connect 104 0 20 0; -#X connect 105 0 26 0; -#X connect 106 0 40 0; -#X connect 107 0 41 0; -#X connect 108 0 53 0; -#X connect 109 0 54 0; -#X connect 110 0 80 0; -#X connect 111 0 97 0; -#X connect 111 1 98 0; -#X connect 111 2 99 0; -#X connect 111 3 100 0; -#X connect 111 4 101 0; -#X connect 111 5 102 0; -#X connect 111 6 103 0; -#X connect 112 0 86 0; -#X connect 113 0 10 0; -#X connect 114 0 11 0; -#X connect 115 0 9 0; -#X connect 121 0 120 2; -#X connect 122 0 120 1; -#X connect 123 0 140 0; -#X connect 124 0 123 0; -#X connect 125 0 120 3; -#X connect 127 0 126 2; -#X connect 128 0 126 1; -#X connect 129 0 139 0; -#X connect 130 0 129 0; -#X connect 131 0 126 3; -#X connect 133 0 132 2; -#X connect 134 0 132 1; -#X connect 135 0 138 0; -#X connect 136 0 135 0; -#X connect 137 0 132 3; -#X connect 138 0 132 0; -#X connect 139 0 126 0; -#X connect 140 0 120 0; -#X connect 142 0 141 2; -#X connect 143 0 141 1; -#X connect 144 0 147 0; -#X connect 145 0 144 0; -#X connect 146 0 141 3; -#X connect 147 0 141 0; -#X connect 148 0 111 0; -#X connect 149 0 111 0; -#X connect 150 0 111 0; +#X connect 89 0 147 2; +#X connect 90 0 147 1; +#X connect 91 0 94 0; +#X connect 92 0 91 0; +#X connect 93 0 147 3; +#X connect 94 0 147 0; +#X connect 95 0 86 0; +#X connect 103 0 20 0; +#X connect 104 0 26 0; +#X connect 105 0 40 0; +#X connect 106 0 41 0; +#X connect 107 0 53 0; +#X connect 108 0 54 0; +#X connect 109 0 80 0; +#X connect 110 0 96 0; +#X connect 110 1 97 0; +#X connect 110 2 98 0; +#X connect 110 3 99 0; +#X connect 110 4 100 0; +#X connect 110 5 101 0; +#X connect 110 6 102 0; +#X connect 111 0 86 0; +#X connect 112 0 10 0; +#X connect 113 0 11 0; +#X connect 114 0 9 0; +#X connect 119 0 148 2; +#X connect 120 0 148 1; +#X connect 121 0 136 0; +#X connect 122 0 121 0; +#X connect 123 0 148 3; +#X connect 124 0 149 2; +#X connect 125 0 149 1; +#X connect 126 0 135 0; +#X connect 127 0 126 0; +#X connect 128 0 149 3; +#X connect 129 0 150 2; +#X connect 130 0 150 1; +#X connect 131 0 134 0; +#X connect 132 0 131 0; +#X connect 133 0 150 3; +#X connect 134 0 150 0; +#X connect 135 0 149 0; +#X connect 136 0 148 0; +#X connect 137 0 151 2; +#X connect 138 0 151 1; +#X connect 139 0 142 0; +#X connect 140 0 139 0; +#X connect 141 0 151 3; +#X connect 142 0 151 0; +#X connect 143 0 110 0; +#X connect 144 0 110 0; +#X connect 145 0 110 0;
--- a/June/woosh_D3.pd Mon Jun 29 18:55:30 2015 +0100 +++ b/June/woosh_D3.pd Mon Jun 29 22:13:55 2015 +0100 @@ -1,4 +1,4 @@ -#N canvas 0 22 1171 835 10; +#N canvas 111 28 1171 835 10; #X obj 541 -103 vu 15 120 empty empty -1 -8 0 10 -66577 -1 1 0; #X obj 604 -103 vu 15 120 empty empty -1 -8 0 10 -66577 -1 1 0; #X text 601 -194 Gain; @@ -438,7 +438,7 @@ #X connect 50 0 27 1; #X restore 431 -220 pd angleCalc; #X obj 543 -175 hsl 100 25 0 127 0 0 empty empty empty -2 -8 0 10 -262144 --1 -1 0 1; +-1 -1 390 1; #X msg 775 -172 10; #X obj 14 -249 loadbang; #X obj 12 -180 loadbang;