Mercurial > hg > weather-synthesis-prototyping
changeset 92:a797c7b38b73
Woosh angle calc updated
| author | Rod Selfridge <r.selfridge@qmul.ac.uk> |
|---|---|
| date | Tue, 21 Jul 2015 10:02:13 +0100 |
| parents | be1ab422d773 |
| children | 8125081c0f03 |
| files | June/Gen2_D7.pd June/freqCalcWooD2.pd June/woosh_D4.pd |
| diffstat | 3 files changed, 118 insertions(+), 71 deletions(-) [+] |
line wrap: on
line diff
--- a/June/Gen2_D7.pd Thu Jul 16 12:45:10 2015 +0100 +++ b/June/Gen2_D7.pd Tue Jul 21 10:02:13 2015 +0100 @@ -85,12 +85,12 @@ #X obj 54 475 vu 15 120 empty empty -1 -8 0 10 -66577 -1 1 0; #X obj 117 475 vu 15 120 empty empty -1 -8 0 10 -66577 -1 1 0; #X obj 208 475 vsl 15 128 0 127 0 0 empty empty empty 0 -9 0 10 -262144 --1 -1 5500 1; +-1 -1 500 1; #X text 237 494 Gain; #X obj 208 411 loadbang; #X obj 260 78 delwrite~ varwind 3000; #X obj 343 -114 hsl 128 15 0 120 0 0 empty empty empty -2 -8 0 10 -262144 --1 -1 741 1; +-1 -1 2429 1; #X obj 303 -11 snapshot~; #X obj 303 -36 metro 100; #X obj 303 -58 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1 @@ -513,7 +513,7 @@ #X connect 194 2 182 3; #X connect 194 3 182 4; #X restore 42 36 pd Posts; -#N canvas 303 23 1084 775 Wires 0; +#N canvas 303 23 1084 775 Wires 1; #X floatatom -583 349 8 0 0 0 - - -; #X msg -581 37 300; #X obj -581 12 loadbang;
--- a/June/freqCalcWooD2.pd Thu Jul 16 12:45:10 2015 +0100 +++ b/June/freqCalcWooD2.pd Tue Jul 21 10:02:13 2015 +0100 @@ -1,4 +1,4 @@ -#N canvas 214 23 1282 851 10; +#N canvas 493 23 1282 851 10; #X obj 197 272 +; #X floatatom 231 223 8 0 0 0 - - -; #X obj 197 223 *;
--- a/June/woosh_D4.pd Thu Jul 16 12:45:10 2015 +0100 +++ b/June/woosh_D4.pd Tue Jul 21 10:02:13 2015 +0100 @@ -1,4 +1,4 @@ -#N canvas -266 28 1440 791 10; +#N canvas 116 22 1422 826 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; @@ -134,7 +134,7 @@ #X obj 13 -71 s NoOfSources; #X obj 78 89 s topSpeed; #X obj 26 63 hsl 100 20 0 100 0 0 empty empty empty -2 -8 0 10 -262144 --1 -1 100 1; +-1 -1 4257 1; #X floatatom 23 89 8 0 0 0 - - -; #X text 47 -226 Blade Length; #X text 46 -160 Arm Length; @@ -313,11 +313,11 @@ #X restore 277 11 pd circumferCalc; #X obj 277 37 s circumMin; #X obj 370 36 s deltaCircum; -#N canvas 990 35 1358 776 angleCalc 0; +#N canvas 60 75 1358 776 angleCalc 1; #X obj -142 102 * 0.75; #X obj 630 157 * 0.25; #X obj -142 142 /; -#X obj -218 321 r GO; +#X obj 288 61 r GO; #X obj -142 166 * 1000; #X obj 568 177 delay \$1; #X obj 541 125 f; @@ -327,13 +327,12 @@ #X obj 630 199 /; #X obj 630 221 * 1000; #X obj 415 565 hsl 100 25 0 360 0 0 empty empty empty -2 -8 0 10 -262144 --1 -1 4434 1; +-1 -1 0 1; #X obj -125 192 s \$0_thisDe; #X obj 556 104 r \$0_thisDe; -#X obj 417 228 *; -#X obj 429 183 r sweepAngle; +#X obj 407 165 r sweepAngle; #X obj 621 596 hsl 100 25 -360 360 0 0 empty empty empty -2 -8 0 10 --262144 -1 -1 4211 1; +-262144 -1 -1 0 1; #X obj 613 253 r GO; #X obj -142 78 r maxCirc; #X obj 630 135 r maxCirc; @@ -345,16 +344,16 @@ #X obj 549 624 t f b; #X obj 873 172 delay \$1; #X obj 875 114 f; -#X obj 875 88 r GO; +#X obj 868 60 r GO; #X obj 875 140 t f b; #X obj 911 20 r maxCirc; #X obj 926 42 r topSpeed; #X obj 911 66 /; #X obj 911 88 * 1000; #X obj 873 194 s end; -#X obj -102 340 r end; +#X obj -100 266 r end; #X obj 549 591 r end; -#X obj 429 206 * -0.25; +#X obj 407 188 * -0.25; #X text -206 42 0.75 represents the ratio of swing that; #X text 505 41 0.25 represents the ratio of swing that; #X text 505 55 the sword is decelerating; @@ -362,8 +361,8 @@ #X text -52 188 Send as a delay; #X text 585 83 Recieve as a delay; #X text -262 346 Start swing; -#X text -61 340 Reset angle; -#X text -63 353 once swing complete; +#X text -59 266 Reset angle; +#X text -61 279 once swing complete; #X text 851 213 Send bang message at the; #X text 852 225 end of the swing to reset; #X text 684 219 Time for last; @@ -377,84 +376,132 @@ #X text 98 9 Patch that calculates the angle between 0 degrees for the full length of the swing; #X obj -156 438 line~; -#X obj -56 514 metro 10; -#X obj -56 545 snapshot~; -#X floatatom -57 569 8 0 0 0 - - -; +#X obj 177 533 metro 10; +#X obj 177 564 snapshot~; +#X floatatom 176 588 8 0 0 0 - - -; #X obj 568 304 line~; #X msg 486 285 \$1 \$2; #X obj 465 254 pack; -#X obj -60 471 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1 +#X obj 177 502 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1 1; #X obj -221 445 unpack; #X floatatom -255 484 8 0 0 0 - - -; #X floatatom -183 486 5 0 0 0 - - -; #X floatatom -106 233 5 0 0 0 - - -; #X msg -102 394 \$1; -#X obj -42 396 r sweepAngle; -#X obj -42 418 * 0.75; +#X obj -60 321 r sweepAngle; +#X obj -60 343 * 0.75; #X msg -156 383 0 \$1; -#X floatatom -11 462 5 0 0 0 - - -; #X msg -252 403 1 \$1; #X floatatom -250 377 5 0 0 0 - - -; -#X obj -82 370 r setUp; +#X obj -74 297 r setUp; +#X obj 286 97 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1 +-1; +#X obj 413 222 f; +#X obj 253 495 +~; +#X obj 630 413 metro 10; +#X obj 630 444 snapshot~; +#X floatatom 629 468 8 0 0 0 - - -; +#X obj 626 370 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1 +1; +#X obj -36 534 metro 10; +#X obj -36 565 snapshot~; +#X floatatom -37 589 8 0 0 0 - - -; +#X obj -40 491 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1 +1; +#X obj 562 253 r setUp; +#X floatatom -75 430 5 0 0 0 - - -; +#X text -1 420; +#X obj -75 365 f; +#X floatatom -38 390 5 0 0 0 - - -; +#X obj 24 345 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1 +-1; +#X obj 696 312 r end; +#X obj 23 299 r end; +#X obj 696 351 delay 9; +#X obj 24 321 delay 12; +#X obj 861 88 delay 9; #X connect 0 0 2 0; #X connect 1 0 10 0; #X connect 2 0 4 0; -#X connect 3 0 58 0; +#X connect 3 0 76 0; #X connect 4 0 13 0; -#X connect 4 0 69 0; -#X connect 4 0 73 0; -#X connect 5 0 64 0; +#X connect 4 0 68 0; +#X connect 4 0 72 0; +#X connect 5 0 77 0; #X connect 6 0 8 0; #X connect 7 0 6 0; #X connect 8 0 5 1; #X connect 8 1 5 0; -#X connect 9 0 62 0; +#X connect 9 0 61 0; #X connect 10 0 11 0; -#X connect 11 0 64 1; -#X connect 12 0 24 0; +#X connect 11 0 63 1; +#X connect 12 0 23 0; #X connect 14 0 6 1; -#X connect 15 0 64 0; -#X connect 16 0 38 0; -#X connect 17 0 26 0; -#X connect 18 0 9 0; -#X connect 19 0 0 0; -#X connect 20 0 1 0; -#X connect 21 0 2 1; -#X connect 22 0 10 1; -#X connect 24 0 25 0; -#X connect 25 0 23 0; -#X connect 26 0 24 1; -#X connect 26 1 24 0; -#X connect 27 0 35 0; -#X connect 28 0 30 0; -#X connect 29 0 28 0; -#X connect 30 0 27 1; -#X connect 30 1 27 0; -#X connect 31 0 33 0; -#X connect 32 0 33 1; -#X connect 33 0 34 0; -#X connect 34 0 28 1; -#X connect 36 0 70 0; -#X connect 37 0 26 0; -#X connect 38 0 15 1; -#X connect 58 0 60 0; +#X connect 15 0 37 0; +#X connect 16 0 25 0; +#X connect 17 0 9 0; +#X connect 18 0 0 0; +#X connect 19 0 1 0; +#X connect 20 0 2 1; +#X connect 21 0 10 1; +#X connect 23 0 24 0; +#X connect 24 0 22 0; +#X connect 25 0 23 1; +#X connect 25 1 23 0; +#X connect 26 0 34 0; +#X connect 27 0 29 0; +#X connect 28 0 97 0; +#X connect 29 0 26 1; +#X connect 29 1 26 0; +#X connect 30 0 32 0; +#X connect 31 0 32 1; +#X connect 32 0 33 0; +#X connect 33 0 27 1; +#X connect 35 0 90 0; +#X connect 36 0 25 0; +#X connect 37 0 77 1; +#X connect 57 0 78 0; +#X connect 57 0 84 0; +#X connect 58 0 59 0; #X connect 59 0 60 0; -#X connect 60 0 61 0; +#X connect 61 0 78 1; +#X connect 61 0 80 0; +#X connect 62 0 61 0; #X connect 63 0 62 0; -#X connect 64 0 63 0; -#X connect 65 0 59 0; -#X connect 66 0 67 0; -#X connect 66 1 68 0; -#X connect 70 0 58 0; -#X connect 71 0 72 0; -#X connect 72 0 70 0; -#X connect 72 0 74 0; -#X connect 73 0 58 0; -#X connect 73 0 66 0; -#X connect 75 0 66 0; -#X connect 76 0 75 0; -#X connect 77 0 70 0; +#X connect 64 0 58 0; +#X connect 65 0 66 0; +#X connect 65 1 67 0; +#X connect 69 0 57 0; +#X connect 69 0 88 0; +#X connect 70 0 71 0; +#X connect 71 0 90 1; +#X connect 71 0 91 0; +#X connect 72 0 57 0; +#X connect 72 0 65 0; +#X connect 73 0 65 0; +#X connect 73 0 57 0; +#X connect 74 0 73 0; +#X connect 74 0 57 0; +#X connect 75 0 90 0; +#X connect 76 0 2 0; +#X connect 76 0 6 0; +#X connect 77 0 63 0; +#X connect 78 0 59 0; +#X connect 79 0 80 0; +#X connect 80 0 81 0; +#X connect 82 0 79 0; +#X connect 83 0 84 0; +#X connect 84 0 85 0; +#X connect 86 0 83 0; +#X connect 87 0 9 0; +#X connect 90 0 69 0; +#X connect 92 0 90 0; +#X connect 93 0 95 0; +#X connect 94 0 96 0; +#X connect 95 0 9 0; +#X connect 96 0 92 0; +#X connect 97 0 27 0; #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 3118 1;