Mercurial > hg > weather-synthesis-prototyping
changeset 167:e2b1b7fda168
Sword - Trying to resove zipper sound when swinging. No joy yet but distance now an audio signal
| author | Rod Selfridge <r.selfridge@qmul.ac.uk> |
|---|---|
| date | Thu, 04 Feb 2016 15:48:58 +0000 |
| parents | 8798e1b549e3 |
| children | 0bc4914ff907 |
| files | newSwordAuto/centreAngles.pd newSwordAuto/freqCalcCyl3No_D2Mach.pd newSwordAuto/newSwordAuto.pd newSwordAuto/sourceSpeed.pd |
| diffstat | 4 files changed, 507 insertions(+), 628 deletions(-) [+] |
line wrap: on
line diff
--- a/newSwordAuto/centreAngles.pd Wed Feb 03 15:36:20 2016 +0000 +++ b/newSwordAuto/centreAngles.pd Thu Feb 04 15:48:58 2016 +0000 @@ -38,8 +38,8 @@ #X obj 882 334 metro 10; #X obj 882 356 snapshot~; #X floatatom 882 376 5 0 0 0 - - -; -#X obj 963 392 hsl 128 15 -90 90 0 0 empty empty empty -2 -8 0 10 -262144 --1 -1 6350 1; +#X obj 963 392 hsl 128 15 0 180 0 0 empty empty empty -2 -8 0 10 -262144 +-1 -1 4233 1; #X obj 1029 131 r setUp; #X text 1012 112 Start at 0 speed; #X obj 1029 175 f; @@ -72,8 +72,8 @@ #X text 536 -100 Calculate the angles with respect to the centre of the swing circle; #X text 1092 251 Current source Elevation angle; -#X obj 1085 304 s~ currentElev; -#X obj 176 281 s~ currentAzim; +#X obj 1029 271 s~ currentElev; +#X obj 231 241 s~ currentAzim; #X obj 951 -54 bng 50 250 50 0 empty empty empty 17 7 0 10 -4034 -1 -1; #X obj 951 -1 s GO; @@ -84,22 +84,13 @@ #X obj 658 175 -; #X obj 643 242 +; #X obj 658 219 r postsweepElev; -#X obj 443 303 line; -#X obj 505 340 hsl 128 15 0 360 0 0 empty empty empty -2 -8 0 10 -262144 --1 -1 3175 1; -#X obj 1042 316 line; -#X obj 1104 353 hsl 128 15 -180 180 0 0 empty empty empty -2 -8 0 10 --262144 -1 -1 9525 1; -#X floatatom 1121 384 0 0 0 0 - - -; -#X floatatom 508 372 0 0 0 0 - - -; -#X obj 406 361 s currentAzim; -#X obj 999 349 s currentElev; #X floatatom 405 21 0 0 0 0 - - -; #X msg 69 163 180 \$1; -#X connect 0 0 87 0; +#X connect 0 0 79 0; #X connect 1 0 0 0; #X connect 2 0 0 1; #X connect 3 0 7 0; +#X connect 3 0 69 0; #X connect 4 0 5 0; #X connect 5 0 6 0; #X connect 6 0 7 0; @@ -109,12 +100,11 @@ #X connect 12 0 13 1; #X connect 13 0 14 0; #X connect 14 0 3 0; -#X connect 14 0 78 0; #X connect 15 0 16 1; #X connect 15 1 16 0; #X connect 16 0 21 0; #X connect 17 0 20 1; -#X connect 17 0 86 0; +#X connect 17 0 78 0; #X connect 18 0 22 1; #X connect 19 0 20 0; #X connect 20 0 15 0; @@ -122,12 +112,12 @@ #X connect 22 0 24 0; #X connect 23 0 21 1; #X connect 24 0 3 0; -#X connect 24 0 78 0; #X connect 25 0 13 0; #X connect 27 0 52 0; #X connect 28 0 27 0; #X connect 29 0 52 1; #X connect 30 0 68 0; +#X connect 30 0 34 0; #X connect 31 0 32 0; #X connect 32 0 33 0; #X connect 33 0 34 0; @@ -136,7 +126,6 @@ #X connect 37 0 39 0; #X connect 39 0 40 0; #X connect 40 0 30 0; -#X connect 40 0 80 0; #X connect 41 0 42 1; #X connect 41 1 42 0; #X connect 42 0 47 0; @@ -147,13 +136,11 @@ #X connect 47 0 48 0; #X connect 48 0 49 0; #X connect 49 0 30 0; -#X connect 49 0 80 0; #X connect 50 0 39 1; #X connect 51 0 47 1; #X connect 52 0 54 0; #X connect 53 0 27 1; #X connect 54 0 30 0; -#X connect 54 0 80 0; #X connect 55 0 56 1; #X connect 56 0 58 0; #X connect 56 0 63 0; @@ -171,11 +158,4 @@ #X connect 76 0 65 0; #X connect 76 0 64 0; #X connect 77 0 76 1; -#X connect 78 0 79 0; -#X connect 78 0 84 0; -#X connect 79 0 83 0; -#X connect 80 0 81 0; -#X connect 80 0 85 0; -#X connect 81 0 82 0; -#X connect 87 0 3 0; -#X connect 87 0 78 0; +#X connect 79 0 3 0;
--- a/newSwordAuto/freqCalcCyl3No_D2Mach.pd Wed Feb 03 15:36:20 2016 +0000 +++ b/newSwordAuto/freqCalcCyl3No_D2Mach.pd Thu Feb 04 15:48:58 2016 +0000 @@ -9,7 +9,6 @@ #X obj 213 53 inlet; #X text 732 288 Reynolds Number; #X text 579 355 Strouhal Number; -#X obj 378 51 inlet; #X text 729 224 Viscosity; #X obj 220 76 s \$0-diameter; #X obj 760 168 r \$0-diameter; @@ -38,7 +37,6 @@ #X obj 337 456 r \$0-diameter; #X obj 450 50 inlet; #X obj 524 49 inlet; -#X floatatom 378 98 5 0 0 0 - - -; #X floatatom 450 96 5 0 0 0 - - -; #X floatatom 525 93 5 0 0 0 - - -; #X obj 73 406 outlet; @@ -60,7 +58,6 @@ #X obj 1077 395 throw~ r; #X obj 1050 373 fcpan; #X obj 315 73 s \$0-leng; -#X obj 383 74 s \$0-dist; #X obj 390 321 s~ \$0-dragDiGain; #X obj 303 342 s~ \$0-liftDiGain; #X obj 284 375 r~ \$0-str; @@ -97,7 +94,6 @@ #X obj 329 192 r \$0-diameter; #X obj 303 132 r~ \$0-str; #X obj 321 173 r \$0-leng; -#X obj 346 231 r \$0-dist; #N canvas 203 82 1238 721 GoldfreqGain 0; #N canvas 759 125 286 294 pow6 0; #X obj 47 67 *~; @@ -165,16 +161,13 @@ #X restore 219 42 pd pow6; #X obj 173 32 *~; #X obj 219 68 *~; -#X obj 404 137 *; #X text 533 2 Distance; -#X floatatom 513 62 5 0 0 0 - - -; #X text 724 595 Calculates Drag Dipole gain; #X text 48 647 Calculates Lift Dipole gain; #X obj 173 -8 inlet~; #X obj 219 -35 inlet~; #X text 328 62 Diameter; #X obj 291 61 inlet; -#X obj 513 18 inlet; #X obj 219 667 outlet~; #X obj 758 570 outlet~; #X obj 240 159 inlet; @@ -208,9 +201,7 @@ #X obj 322 512 *~; #X obj 322 488 cos~; #X obj 219 579 *~; -#X obj 404 167 * 4.05513e+07; #X text 355 186 Speed of Sound to power 3; -#X obj 404 220 * 32; #X obj 553 189 r SIG_MACH; #X obj 518 189 cos~; #X obj 518 212 *~; @@ -243,7 +234,6 @@ #X connect 10 0 3 0; #X connect 10 0 4 0; #X restore 503 266 pd pow4; -#X obj 404 248 sig~; #X obj 404 298 *~; #X obj 219 346 /~; #X obj 133 287 s~ \$0-aGainG; @@ -275,9 +265,7 @@ #X obj 616 44 s \$0-this_elev; #X obj 720 44 s \$0-this_azim; #X obj 518 117 r \$0-this_elev; -#X obj 520 40 s \$0-thisDist; #X obj 887 268 r \$0-thisDist; -#X obj 404 111 r \$0-thisDist; #X obj 887 292 *; #X obj 887 317 * 4.05513e+07; #X text 892 335 Speed of Sound to power 3; @@ -298,95 +286,99 @@ #X obj 219 -11 average~ 512; #X obj 234 494 sin~; #X floatatom 351 12 5 0 0 0 - - -; +#X obj 520 40 s~ \$0-thisDist; +#X obj 404 111 r~ \$0-thisDist; +#X obj 404 137 *~; +#X obj 404 167 *~ 4.05513e+07; +#X obj 404 220 *~ 32; +#X obj 513 18 inlet~; #X connect 0 0 2 0; #X connect 1 0 2 1; -#X connect 2 0 103 0; -#X connect 3 0 46 0; -#X connect 3 0 97 0; -#X connect 8 0 1 0; -#X connect 8 0 1 1; -#X connect 9 0 107 0; -#X connect 11 0 102 1; -#X connect 12 0 5 0; -#X connect 12 0 87 0; -#X connect 15 0 17 1; -#X connect 17 0 38 0; -#X connect 18 0 20 0; +#X connect 2 0 95 0; +#X connect 6 0 1 0; +#X connect 6 0 1 1; +#X connect 7 0 99 0; +#X connect 9 0 94 1; +#X connect 12 0 14 1; +#X connect 14 0 35 0; +#X connect 15 0 17 0; +#X connect 16 0 39 0; +#X connect 17 0 100 0; +#X connect 18 0 19 1; #X connect 19 0 42 0; -#X connect 20 0 108 0; -#X connect 21 0 22 1; -#X connect 22 0 45 0; -#X connect 23 0 26 0; -#X connect 23 0 32 0; -#X connect 24 0 27 0; -#X connect 24 0 33 0; -#X connect 25 0 28 0; -#X connect 25 0 34 0; -#X connect 38 0 57 0; -#X connect 38 0 58 0; -#X connect 39 0 17 0; -#X connect 42 0 44 0; -#X connect 43 0 45 1; -#X connect 44 0 43 0; -#X connect 44 0 43 1; -#X connect 45 0 82 0; -#X connect 45 0 13 0; -#X connect 46 0 48 0; -#X connect 48 0 55 0; -#X connect 49 0 51 1; -#X connect 50 0 51 0; -#X connect 51 0 53 1; -#X connect 52 0 53 0; -#X connect 53 0 54 0; -#X connect 54 0 56 1; +#X connect 20 0 23 0; +#X connect 20 0 29 0; +#X connect 21 0 24 0; +#X connect 21 0 30 0; +#X connect 22 0 25 0; +#X connect 22 0 31 0; +#X connect 35 0 51 0; +#X connect 35 0 52 0; +#X connect 36 0 14 0; +#X connect 39 0 41 0; +#X connect 40 0 42 1; +#X connect 41 0 40 0; +#X connect 41 0 40 1; +#X connect 42 0 76 0; +#X connect 42 0 10 0; +#X connect 44 0 46 1; +#X connect 45 0 46 0; +#X connect 46 0 48 1; +#X connect 47 0 48 0; +#X connect 48 0 49 0; +#X connect 49 0 50 1; +#X connect 50 0 51 1; +#X connect 51 0 19 0; +#X connect 53 0 87 0; +#X connect 54 0 77 0; +#X connect 54 0 11 0; #X connect 55 0 56 0; -#X connect 56 0 57 1; -#X connect 57 0 22 0; -#X connect 59 0 95 0; -#X connect 60 0 83 0; -#X connect 60 0 14 0; -#X connect 61 0 62 0; -#X connect 62 0 64 0; -#X connect 63 0 68 0; -#X connect 64 0 63 0; -#X connect 64 0 63 1; +#X connect 56 0 58 0; +#X connect 57 0 62 0; +#X connect 58 0 57 0; +#X connect 58 0 57 1; +#X connect 59 0 61 0; +#X connect 60 0 62 1; +#X connect 61 0 60 0; +#X connect 61 0 60 1; +#X connect 62 0 91 0; #X connect 65 0 67 0; -#X connect 66 0 68 1; -#X connect 67 0 66 0; -#X connect 67 0 66 1; -#X connect 68 0 99 0; -#X connect 71 0 73 0; -#X connect 71 0 84 0; -#X connect 72 0 74 0; -#X connect 72 0 85 0; -#X connect 75 0 19 0; -#X connect 76 0 18 0; -#X connect 77 0 80 0; -#X connect 78 0 79 0; -#X connect 79 0 61 0; -#X connect 80 0 65 0; -#X connect 81 0 98 0; -#X connect 86 0 81 0; -#X connect 88 0 90 0; -#X connect 88 0 90 1; -#X connect 89 0 3 0; -#X connect 89 0 3 1; -#X connect 90 0 91 0; -#X connect 91 0 93 0; +#X connect 65 0 78 0; +#X connect 66 0 68 0; +#X connect 66 0 79 0; +#X connect 69 0 16 0; +#X connect 70 0 15 0; +#X connect 71 0 74 0; +#X connect 72 0 73 0; +#X connect 73 0 55 0; +#X connect 74 0 59 0; +#X connect 75 0 90 0; +#X connect 80 0 75 0; +#X connect 81 0 82 0; +#X connect 81 0 82 1; +#X connect 82 0 83 0; +#X connect 83 0 85 0; +#X connect 85 0 86 0; +#X connect 86 0 87 1; +#X connect 87 0 91 1; +#X connect 90 0 45 0; +#X connect 91 0 54 0; #X connect 93 0 94 0; #X connect 94 0 95 1; -#X connect 95 0 99 1; -#X connect 98 0 50 0; -#X connect 99 0 60 0; -#X connect 101 0 102 0; -#X connect 102 0 103 1; -#X connect 103 0 39 0; -#X connect 104 0 100 0; -#X connect 105 0 0 0; -#X connect 107 0 105 0; -#X connect 107 0 106 0; -#X connect 108 0 21 0; -#X connect 108 0 21 1; +#X connect 95 0 36 0; +#X connect 96 0 92 0; +#X connect 97 0 0 0; +#X connect 99 0 97 0; +#X connect 99 0 98 0; +#X connect 100 0 18 0; +#X connect 100 0 18 1; +#X connect 103 0 104 0; +#X connect 103 0 104 1; +#X connect 104 0 89 0; +#X connect 104 0 105 0; +#X connect 105 0 106 0; +#X connect 106 0 50 0; +#X connect 107 0 102 0; #X restore 303 297 pd GoldfreqGain; #X obj 964 504 r \$0-thisPan; #X obj 918 461 r~ \$0-myFreq; @@ -1080,133 +1072,137 @@ #X obj 0 -2 bng 50 250 50 0 empty empty empty 17 7 0 10 -257985 -1 -1; #X obj 0 51 s setUp; +#X obj 378 51 inlet~; +#X obj 383 74 s~ \$0-dist; +#X obj 301 659 snapshot~; +#X floatatom 301 685 0 0 0 0 - - -; +#X obj 259 687 outlet; +#X obj 301 634 r myMet; +#X obj 204 634 r~ \$0-dist; +#X text 272 712 Distance; +#X obj 346 231 r~ \$0-dist; #X connect 1 0 3 0; -#X connect 2 0 24 0; -#X connect 2 0 178 0; +#X connect 2 0 23 0; +#X connect 2 0 174 0; #X connect 3 0 2 0; -#X connect 4 0 18 0; +#X connect 4 0 17 0; #X connect 6 0 4 0; -#X connect 7 0 12 0; -#X connect 7 0 56 0; -#X connect 10 0 39 0; -#X connect 10 0 61 0; -#X connect 13 0 3 1; -#X connect 14 0 4 1; -#X connect 16 0 6 1; -#X connect 17 0 1 0; -#X connect 19 0 114 1; -#X connect 21 0 22 0; -#X connect 21 0 93 0; -#X connect 23 0 21 0; -#X connect 26 0 28 0; -#X connect 28 0 29 0; -#X connect 29 0 27 0; -#X connect 29 0 70 0; -#X connect 33 0 103 1; -#X connect 34 0 35 0; -#X connect 34 0 161 0; -#X connect 36 0 103 4; -#X connect 37 0 40 0; -#X connect 37 0 148 0; -#X connect 38 0 41 0; -#X connect 38 0 149 0; -#X connect 43 0 42 0; -#X connect 43 0 5 0; -#X connect 43 0 72 0; -#X connect 44 0 43 0; -#X connect 53 0 54 0; -#X connect 53 0 60 0; -#X connect 59 0 57 0; -#X connect 59 1 58 0; -#X connect 64 0 103 0; -#X connect 65 0 103 3; -#X connect 66 0 103 5; -#X connect 68 0 114 0; -#X connect 71 0 89 1; -#X connect 73 0 34 0; -#X connect 74 0 20 0; -#X connect 75 0 59 1; -#X connect 76 0 79 0; -#X connect 76 0 82 0; -#X connect 77 0 80 0; -#X connect 77 0 83 0; -#X connect 78 0 81 0; -#X connect 78 0 84 0; -#X connect 89 0 159 0; -#X connect 90 0 114 2; -#X connect 91 0 89 0; -#X connect 92 0 91 0; -#X connect 94 0 99 1; -#X connect 95 0 99 3; -#X connect 96 0 99 0; -#X connect 97 0 99 2; -#X connect 98 0 99 5; -#X connect 99 0 63 0; -#X connect 99 1 62 0; -#X connect 100 0 115 2; -#X connect 101 0 115 0; -#X connect 102 0 115 1; -#X connect 103 0 67 0; -#X connect 105 0 106 0; -#X connect 105 0 107 0; -#X connect 108 0 110 0; -#X connect 108 0 112 0; -#X connect 109 0 108 0; -#X connect 111 0 115 3; -#X connect 113 0 114 3; -#X connect 116 0 120 1; +#X connect 7 0 11 0; +#X connect 7 0 54 0; +#X connect 12 0 3 1; +#X connect 13 0 4 1; +#X connect 15 0 6 1; +#X connect 16 0 1 0; +#X connect 20 0 21 0; +#X connect 20 0 90 0; +#X connect 22 0 20 0; +#X connect 25 0 27 0; +#X connect 27 0 28 0; +#X connect 28 0 26 0; +#X connect 28 0 67 0; +#X connect 32 0 99 1; +#X connect 33 0 34 0; +#X connect 33 0 157 0; +#X connect 35 0 99 4; +#X connect 36 0 38 0; +#X connect 36 0 144 0; +#X connect 37 0 39 0; +#X connect 37 0 145 0; +#X connect 41 0 40 0; +#X connect 41 0 5 0; +#X connect 41 0 69 0; +#X connect 42 0 41 0; +#X connect 51 0 52 0; +#X connect 51 0 58 0; +#X connect 57 0 55 0; +#X connect 57 1 56 0; +#X connect 61 0 99 0; +#X connect 62 0 99 3; +#X connect 63 0 99 5; +#X connect 65 0 110 0; +#X connect 68 0 86 1; +#X connect 70 0 33 0; +#X connect 71 0 19 0; +#X connect 72 0 57 1; +#X connect 73 0 76 0; +#X connect 73 0 79 0; +#X connect 74 0 77 0; +#X connect 74 0 80 0; +#X connect 75 0 78 0; +#X connect 75 0 81 0; +#X connect 86 0 155 0; +#X connect 87 0 110 2; +#X connect 88 0 86 0; +#X connect 89 0 88 0; +#X connect 91 0 95 1; +#X connect 92 0 95 3; +#X connect 93 0 95 0; +#X connect 94 0 95 2; +#X connect 95 0 60 0; +#X connect 95 1 59 0; +#X connect 96 0 111 2; +#X connect 97 0 111 0; +#X connect 98 0 111 1; +#X connect 99 0 64 0; +#X connect 101 0 102 0; +#X connect 101 0 103 0; +#X connect 104 0 106 0; +#X connect 104 0 108 0; +#X connect 105 0 104 0; +#X connect 107 0 111 3; +#X connect 109 0 110 3; +#X connect 113 0 116 2; +#X connect 114 0 116 3; +#X connect 115 0 116 0; #X connect 117 0 120 2; -#X connect 118 0 120 3; -#X connect 119 0 120 0; -#X connect 121 0 124 2; -#X connect 122 0 124 0; -#X connect 123 0 124 3; -#X connect 125 0 124 1; -#X connect 126 0 130 2; -#X connect 127 0 130 0; -#X connect 128 0 130 3; -#X connect 129 0 130 1; -#X connect 131 0 135 1; -#X connect 132 0 135 2; -#X connect 133 0 135 3; -#X connect 134 0 135 0; -#X connect 136 0 140 2; -#X connect 137 0 140 0; -#X connect 138 0 140 3; -#X connect 139 0 140 1; -#X connect 141 0 145 1; -#X connect 142 0 145 2; -#X connect 143 0 145 3; -#X connect 144 0 145 0; -#X connect 150 0 99 6; -#X connect 151 0 99 7; -#X connect 152 0 103 6; -#X connect 153 0 103 7; -#X connect 154 0 156 0; -#X connect 155 0 154 0; -#X connect 157 0 99 4; -#X connect 158 0 159 1; -#X connect 159 0 20 1; -#X connect 160 0 103 2; -#X connect 162 0 21 0; -#X connect 163 0 43 0; -#X connect 164 0 34 0; -#X connect 165 0 174 1; -#X connect 166 0 174 0; -#X connect 167 0 174 2; -#X connect 168 0 173 2; -#X connect 169 0 173 0; -#X connect 170 0 173 1; -#X connect 171 0 173 3; -#X connect 172 0 174 3; +#X connect 118 0 120 0; +#X connect 119 0 120 3; +#X connect 122 0 126 2; +#X connect 123 0 126 0; +#X connect 124 0 126 3; +#X connect 128 0 131 2; +#X connect 129 0 131 3; +#X connect 130 0 131 0; +#X connect 132 0 136 2; +#X connect 133 0 136 0; +#X connect 134 0 136 3; +#X connect 135 0 136 1; +#X connect 138 0 141 2; +#X connect 139 0 141 3; +#X connect 140 0 141 0; +#X connect 146 0 95 6; +#X connect 147 0 95 7; +#X connect 148 0 99 6; +#X connect 149 0 99 7; +#X connect 150 0 152 0; +#X connect 151 0 150 0; +#X connect 153 0 95 4; +#X connect 154 0 155 1; +#X connect 155 0 19 1; +#X connect 156 0 99 2; +#X connect 158 0 20 0; +#X connect 159 0 41 0; +#X connect 160 0 33 0; +#X connect 162 0 170 0; +#X connect 163 0 170 2; +#X connect 164 0 169 2; +#X connect 165 0 169 0; +#X connect 167 0 169 3; +#X connect 168 0 170 3; +#X connect 171 0 173 0; +#X connect 172 0 171 0; +#X connect 174 0 66 0; +#X connect 174 0 6 0; +#X connect 175 0 176 0; #X connect 175 0 177 0; -#X connect 176 0 175 0; -#X connect 178 0 69 0; -#X connect 178 0 6 0; -#X connect 179 0 180 0; -#X connect 179 0 181 0; -#X connect 182 0 179 0; -#X connect 183 0 179 0; -#X connect 185 0 15 0; +#X connect 178 0 175 0; +#X connect 179 0 175 0; +#X connect 181 0 14 0; +#X connect 182 0 183 0; +#X connect 184 0 185 0; #X connect 186 0 187 0; #X connect 188 0 189 0; +#X connect 188 0 190 0; +#X connect 191 0 188 0; +#X connect 192 0 188 0; +#X connect 194 0 95 5;
--- a/newSwordAuto/newSwordAuto.pd Wed Feb 03 15:36:20 2016 +0000 +++ b/newSwordAuto/newSwordAuto.pd Thu Feb 04 15:48:58 2016 +0000 @@ -1,4 +1,4 @@ -#N canvas 868 200 654 431 10; +#N canvas 44 23 1360 805 10; #X obj 587 237 freqCalcCyl3No_D2Mach; #X obj 315 22 loadbang; #X obj 315 44 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1 @@ -8,19 +8,19 @@ #X obj -259 60 s NoOfSources; #X obj -221 455 s topSpeed; #X obj -273 429 hsl 100 20 0 100 0 0 empty empty empty -2 -8 0 10 -262144 --1 -1 49 1; +-1 -1 3465 1; #X floatatom -276 455 8 0 0 0 - - -; #X text -24 27 Blade Length; #X text -25 93 Arm Length; #X text -231 37 Number of Sources; #X text -165 433 Top Speed; -#X obj 21 251 hsl 100 20 85 95 0 0 empty empty empty -2 -8 0 10 -262144 --1 -1 4600 1; +#X obj 21 251 hsl 100 20 0 360 0 0 empty empty empty -2 -8 0 10 -262144 +-1 -1 2475 1; #X floatatom 18 280 8 0 0 0 - - -; #X obj -279 516 hsl 100 20 0 0.03 0 0 empty empty empty -2 -8 0 10 --262144 -1 -1 7500 1; +-262144 -1 -1 6600 1; #X obj -280 601 hsl 100 20 0.0001 0.01 0 0 empty empty empty -2 -8 -0 10 -262144 -1 -1 4200 1; +0 10 -262144 -1 -1 7900 1; #X floatatom -282 546 8 0 0 0 - - -; #X floatatom -283 629 8 0 0 0 - - -; #X obj -225 628 s tipThick; @@ -61,7 +61,7 @@ #X floatatom 11 471 8 0 0 0 - - -; #X obj -47 419 r setUp; #X obj 12 517 hsl 100 20 0 180 0 0 empty empty empty -2 -8 0 10 -262144 --1 -1 9900 1; +-1 -1 4950 1; #X floatatom 9 549 8 0 0 0 - - -; #X obj -49 497 r setUp; #X obj 66 470 s presweepElev; @@ -191,7 +191,6 @@ #X text 323 472 Max Circumference; #X obj 1076 361 r presweepElev; #X obj 1091 384 r postsweepElev; -#X obj 1076 419 +; #X obj 1076 441 * 0.5; #X obj 1075 488 * 6.28312; #X obj 1075 466 / 360; @@ -212,9 +211,10 @@ #X obj 425 153 s compRadius; #X obj 164 320 r compRadius; #X obj 452 456 r compRadius; +#X obj 1076 419 -; #X connect 0 0 1 0; -#X connect 0 0 56 0; -#X connect 0 0 63 1; +#X connect 0 0 55 0; +#X connect 0 0 62 1; #X connect 2 0 8 0; #X connect 3 0 4 0; #X connect 5 0 6 0; @@ -228,7 +228,7 @@ #X connect 16 0 20 0; #X connect 19 0 15 0; #X connect 21 0 22 0; -#X connect 22 0 58 0; +#X connect 22 0 57 0; #X connect 23 0 24 0; #X connect 23 0 33 0; #X connect 25 0 0 0; @@ -248,26 +248,26 @@ #X connect 39 0 43 0; #X connect 40 0 39 1; #X connect 41 0 38 1; -#X connect 46 0 48 0; -#X connect 47 0 48 1; -#X connect 48 0 49 0; -#X connect 48 0 54 0; +#X connect 46 0 68 0; +#X connect 47 0 68 1; +#X connect 48 0 50 0; #X connect 49 0 51 0; -#X connect 50 0 52 0; -#X connect 51 0 50 0; -#X connect 52 0 55 0; -#X connect 52 0 65 0; -#X connect 55 0 53 0; -#X connect 55 0 59 0; -#X connect 57 0 55 1; -#X connect 58 0 23 0; -#X connect 60 0 16 1; -#X connect 61 0 9 1; +#X connect 50 0 49 0; +#X connect 51 0 54 0; +#X connect 51 0 64 0; +#X connect 54 0 52 0; +#X connect 54 0 58 0; +#X connect 56 0 54 1; +#X connect 57 0 23 0; +#X connect 59 0 16 1; +#X connect 60 0 9 1; +#X connect 61 0 62 0; #X connect 62 0 63 0; -#X connect 63 0 64 0; -#X connect 63 0 66 0; -#X connect 67 0 23 1; -#X connect 68 0 29 1; +#X connect 62 0 65 0; +#X connect 66 0 23 1; +#X connect 67 0 29 1; +#X connect 68 0 48 0; +#X connect 68 0 53 0; #X restore 403 212 pd maxCircCalc; #X obj 421 97 sourceSpeed; #X text 837 5 Diameter; @@ -484,7 +484,7 @@ #X restore 325 498 pd opLevels; #X msg 334 444 5; #X obj 328 469 hsl 100 25 0.1 1e+06 1 0 empty empty empty -2 -8 0 10 --262144 -1 -1 2403 1; +-262144 -1 -1 6503 1; #X obj 445 472 hsl 100 25 1 127 0 0 empty empty empty -2 -8 0 10 -262144 -1 -1 0 1; #X obj 442 426 loadbang; @@ -721,175 +721,112 @@ #X obj 716 179 r setUp; #X text 834 -12 Speed; #X msg 206 221 100; -#N canvas 151 141 1288 727 positions 0; -#X text 374 215 z coordinate of tip; -#X text 33 243 x coordinate of tip; -#X text 261 55 y coordinate of tip; -#X obj 347 317 r Zobs; -#X obj 261 316 r Yobs; -#X obj 177 314 r Xobs; -#X floatatom 168 267 0 0 0 0 - - -; -#X floatatom 204 213 5 0 0 0 - - -; -#X floatatom 262 268 0 0 0 0 - - -; -#X floatatom 350 270 0 0 0 0 - - -; -#X floatatom 280 102 0 0 0 0 - - -; -#X floatatom 119 115 0 0 0 0 - - -; -#X floatatom 287 505 0 0 0 0 - - -; -#X obj 162 86 r currentAzim; -#X obj 162 121 * 0.01745; -#X obj 162 145 cos; -#X obj 177 167 sin; -#X obj 177 212 *; -#X obj 162 240 *; -#X obj 332 121 * -1; -#X obj 332 100 - 90; -#X obj 332 76 r currentElev; -#X obj 332 169 cos; -#X obj 332 216 *; -#X obj 261 212 *; -#X obj 246 243 *; -#X obj 246 143 sin; -#X obj 332 361 -; -#X obj 332 385 *; -#X obj 162 359 -; -#X obj 246 361 -; -#X obj 246 390 *; -#X obj 231 424 +; -#X obj 231 456 +; -#X obj 231 483 sqrt; -#X obj 231 508 outlet; -#X obj 261 167 sin; -#X obj 192 189 r length; -#X obj 276 188 r length; -#X obj 162 383 *; -#X floatatom 401 141 0 0 0 0 - - -; -#X obj 94 21 bng 50 250 50 0 empty empty empty 17 7 0 10 -4034 -1 -1 -; -#X obj 94 74 s GO; -#X obj 34 21 bng 50 250 50 0 empty empty empty 17 7 0 10 -257985 -1 +#N canvas 75 30 734 658 positions 0; +#X obj -9101 54 bng 50 250 50 0 empty empty empty 17 7 0 10 -4034 -1 -1; -#X obj 34 74 s setUp; -#X obj 246 119 * 0.01745; -#X obj 347 338 t f b; -#X obj 177 336 t f b; -#X obj 261 337 t f b; -#X floatatom 130 336 0 0 0 0 - - -; -#X floatatom 275 361 0 0 0 0 - - -; -#X floatatom 362 360 0 0 0 0 - - -; -#X floatatom 98 382 0 0 0 0 - - -; -#X floatatom 194 391 0 0 0 0 - - -; -#X floatatom 363 385 0 0 0 0 - - -; -#X obj 332 142 * 0.01745; -#X obj 347 193 r length; -#X obj 524 86 r currentElev; -#X obj 524 132 cos; -#X obj 524 110 * 0.01745; -#X floatatom 560 176 0 0 0 0 - - -; -#X obj 524 154 *; -#X obj 550 132 r length; -#X obj 418 477 asin; -#X obj 418 455 /; -#X floatatom 478 522 0 0 0 0 - - -; -#X obj 418 499 * 57.3066; -#X obj 433 430 t f b; -#X obj 418 522 outlet; -#X obj 561 438 sqrt; -#X obj 614 452 /; -#X floatatom 674 519 0 0 0 0 - - -; -#X obj 614 496 * 57.3066; -#X obj 629 427 t f b; -#X obj 614 519 outlet; -#X obj 614 474 acos; -#X connect 3 0 46 0; -#X connect 4 0 48 0; -#X connect 5 0 47 0; -#X connect 5 0 49 0; -#X connect 13 0 14 0; -#X connect 13 0 45 0; -#X connect 13 0 11 0; -#X connect 14 0 15 0; -#X connect 15 0 18 0; -#X connect 16 0 17 0; -#X connect 17 0 18 1; -#X connect 18 0 6 0; -#X connect 18 0 29 0; -#X connect 19 0 40 0; -#X connect 19 0 55 0; -#X connect 20 0 19 0; -#X connect 21 0 10 0; -#X connect 21 0 20 0; -#X connect 22 0 23 0; -#X connect 23 0 9 0; -#X connect 23 0 27 0; -#X connect 24 0 25 1; -#X connect 25 0 8 0; -#X connect 25 0 30 0; -#X connect 26 0 25 0; -#X connect 27 0 28 0; -#X connect 27 0 28 1; -#X connect 27 0 54 0; -#X connect 27 0 64 0; -#X connect 28 0 33 1; +#X obj -9101 107 s GO; +#X obj -9161 54 bng 50 250 50 0 empty empty empty 17 7 0 10 -257985 +-1 -1; +#X obj -9161 107 s setUp; +#X text -8802 238 z coordinate of tip; +#X text -9143 266 x coordinate of tip; +#X text -8915 78 y coordinate of tip; +#X obj -8829 340 r Zobs; +#X obj -8915 339 r Yobs; +#X obj -8999 337 r Xobs; +#X floatatom -8968 235 5 0 0 0 - - -; +#X obj -8979 212 r length; +#X obj -8894 212 r length; +#X floatatom -8967 359 0 0 0 0 - - -; +#X obj -8823 216 r length; +#X obj -8999 100 r~ currentAzim; +#X obj -8844 99 r~ currentElev; +#X obj -9014 80 sig~ 180; +#X obj -9014 124 -~; +#X obj -9014 144 *~ 0.002778; +#X obj -8930 142 *~ 0.002778; +#X obj -8844 165 *~ 0.002778; +#X obj -9014 168 cos~; +#X obj -8930 166 sin~; +#X obj -8999 190 sin~; +#X obj -8915 190 sin~; +#X obj -8844 192 cos~; +#X obj -8999 235 *~ 1; +#X obj -8915 235 *~ 1; +#X obj -8844 239 *~ 1; +#X obj -9014 263 *~; +#X obj -8930 266 *~; +#X obj -8999 360 sig~; +#X obj -9014 382 -~; +#X obj -9014 406 *~; +#X obj -8915 360 sig~; +#X obj -8930 384 -~; +#X obj -8930 413 *~; +#X obj -8829 361 sig~; +#X obj -8844 384 -~; +#X obj -8844 408 *~; +#X obj -8945 447 +~; +#X obj -8945 479 +~; +#X obj -8945 506 sqrt~; +#X obj -8945 531 outlet~; +#X obj -8884 505 r myMet; +#X obj -8884 524 snapshot~; +#X floatatom -8885 544 0 0 0 0 - - -; +#X obj -9044 485 sig~ 4; +#X connect 0 0 1 0; +#X connect 2 0 3 0; +#X connect 7 0 38 0; +#X connect 8 0 35 0; +#X connect 9 0 13 0; +#X connect 9 0 32 0; +#X connect 11 0 10 0; +#X connect 11 0 27 1; +#X connect 12 0 28 1; +#X connect 14 0 29 1; +#X connect 15 0 18 1; +#X connect 16 0 21 0; +#X connect 17 0 18 0; +#X connect 18 0 19 0; +#X connect 18 0 20 0; +#X connect 19 0 22 0; +#X connect 20 0 23 0; +#X connect 21 0 24 0; +#X connect 21 0 25 0; +#X connect 21 0 26 0; +#X connect 22 0 30 0; +#X connect 23 0 31 0; +#X connect 24 0 27 0; +#X connect 25 0 28 0; +#X connect 26 0 29 0; +#X connect 27 0 30 1; +#X connect 28 0 31 1; #X connect 29 0 39 0; -#X connect 29 0 39 1; -#X connect 29 0 52 0; -#X connect 30 0 31 0; -#X connect 30 0 31 1; -#X connect 30 0 53 0; -#X connect 31 0 32 1; -#X connect 32 0 33 0; -#X connect 32 0 69 0; +#X connect 30 0 33 0; +#X connect 31 0 36 0; +#X connect 32 0 33 1; #X connect 33 0 34 0; -#X connect 34 0 35 0; -#X connect 34 0 12 0; -#X connect 34 0 67 0; -#X connect 34 0 73 0; -#X connect 36 0 24 0; -#X connect 37 0 7 0; -#X connect 37 0 17 1; -#X connect 38 0 24 1; -#X connect 39 0 32 0; +#X connect 33 0 34 1; +#X connect 34 0 41 0; +#X connect 35 0 36 1; +#X connect 36 0 37 0; +#X connect 36 0 37 1; +#X connect 37 0 41 1; +#X connect 38 0 39 1; +#X connect 39 0 40 0; +#X connect 39 0 40 1; +#X connect 40 0 42 1; #X connect 41 0 42 0; -#X connect 43 0 44 0; -#X connect 45 0 26 0; -#X connect 46 0 27 1; -#X connect 46 0 51 0; -#X connect 46 1 27 0; -#X connect 47 0 29 1; -#X connect 47 1 29 0; -#X connect 48 0 30 1; -#X connect 48 0 50 0; -#X connect 48 1 30 0; -#X connect 55 0 16 0; -#X connect 55 0 22 0; -#X connect 55 0 36 0; -#X connect 56 0 23 1; -#X connect 57 0 59 0; -#X connect 58 0 61 0; -#X connect 59 0 58 0; -#X connect 61 0 60 0; -#X connect 62 0 61 1; -#X connect 63 0 66 0; -#X connect 64 0 63 0; -#X connect 66 0 65 0; -#X connect 66 0 68 0; -#X connect 67 0 64 1; -#X connect 67 1 64 0; -#X connect 69 0 70 0; -#X connect 70 0 75 0; -#X connect 72 0 71 0; -#X connect 72 0 74 0; -#X connect 73 0 70 1; -#X connect 73 1 70 0; -#X connect 75 0 72 0; +#X connect 42 0 43 0; +#X connect 43 0 46 0; +#X connect 45 0 46 0; +#X connect 46 0 47 0; +#X connect 48 0 44 0; #X restore 623 124 pd positions; -#X obj 611 102 r bladelen; -#X msg 432 55 0; #X msg 461 55 1; #X obj 432 33 r setUp; #X obj 599 79 +; #X obj 614 56 r tipThick; -#N canvas 111 93 1376 765 arcDist 1; +#N canvas 39 73 1376 765 arcDist 0; #X obj 109 118 bng 50 250 50 0 empty empty empty 17 7 0 10 -4034 -1 -1; #X obj 109 171 s GO; @@ -928,12 +865,9 @@ #X obj 506 543 acos; #X obj 506 566 *; #X obj 540 540 r length; -#X obj 921 200 r postsweepElev; #X obj 506 56 r presweepElev; #X obj 521 127 r postsweepElev; -#X obj 936 221 r presweepElev; #X obj 370 304 -; -#X obj 921 243 -; #X obj 370 349 select 1; #X msg 370 373 4.24115; #X obj 491 614 +; @@ -993,58 +927,64 @@ #X connect 32 0 31 1; #X connect 32 1 31 0; #X connect 33 0 34 0; -#X connect 34 0 45 0; -#X connect 34 0 55 0; -#X connect 34 0 56 0; +#X connect 34 0 42 0; +#X connect 34 0 52 0; +#X connect 34 0 53 0; #X connect 35 0 34 1; -#X connect 36 0 41 0; -#X connect 37 0 5 0; -#X connect 37 0 4 0; -#X connect 38 0 7 0; -#X connect 38 0 6 0; -#X connect 39 0 41 1; -#X connect 40 0 64 0; -#X connect 42 0 43 0; -#X connect 43 0 48 0; -#X connect 44 0 54 0; -#X connect 44 0 61 0; -#X connect 45 0 44 1; -#X connect 45 0 57 0; -#X connect 45 1 44 0; -#X connect 46 0 47 0; -#X connect 47 0 48 0; -#X connect 48 0 49 0; -#X connect 49 0 44 0; -#X connect 51 0 40 0; -#X connect 52 0 53 0; -#X connect 53 0 40 1; -#X connect 53 1 40 0; -#X connect 56 0 65 0; -#X connect 56 0 67 0; -#X connect 57 0 48 1; -#X connect 57 2 48 0; -#X connect 59 0 60 0; -#X connect 60 0 56 1; -#X connect 61 0 65 0; -#X connect 61 0 67 0; -#X connect 62 0 22 0; -#X connect 62 0 25 0; -#X connect 63 0 24 0; -#X connect 63 0 23 0; -#X connect 64 0 42 0; -#X connect 64 0 46 0; -#X connect 64 0 50 0; -#X connect 64 0 59 0; -#X connect 64 0 61 1; -#X connect 65 0 58 0; -#X connect 65 0 66 0; -#X restore 425 255 pd arcDist; +#X connect 36 0 5 0; +#X connect 36 0 4 0; +#X connect 37 0 7 0; +#X connect 37 0 6 0; +#X connect 38 0 61 0; +#X connect 39 0 40 0; +#X connect 40 0 45 0; +#X connect 41 0 51 0; +#X connect 41 0 58 0; +#X connect 42 0 41 1; +#X connect 42 0 54 0; +#X connect 42 1 41 0; +#X connect 43 0 44 0; +#X connect 44 0 45 0; +#X connect 45 0 46 0; +#X connect 46 0 41 0; +#X connect 48 0 38 0; +#X connect 49 0 50 0; +#X connect 50 0 38 1; +#X connect 50 1 38 0; +#X connect 53 0 62 0; +#X connect 53 0 64 0; +#X connect 54 0 45 1; +#X connect 54 2 45 0; +#X connect 56 0 57 0; +#X connect 57 0 53 1; +#X connect 58 0 62 0; +#X connect 58 0 64 0; +#X connect 59 0 22 0; +#X connect 59 0 25 0; +#X connect 60 0 24 0; +#X connect 60 0 23 0; +#X connect 61 0 39 0; +#X connect 61 0 43 0; +#X connect 61 0 47 0; +#X connect 61 0 56 0; +#X connect 61 0 58 1; +#X connect 62 0 55 0; +#X connect 62 0 63 0; +#X restore 403 124 pd arcDist; #X msg 238 222 0; #X msg 87 225 45; #X msg 79 494 120; #X msg 126 416 60; #X msg 89 307 270; #X msg 170 416 90; +#X msg 661 208 0.5; +#X msg 432 55 0; +#X obj 611 102 r bladeLen; +#X msg 648 182 90; +#X msg 633 166 0; +#X obj 521 277 sig~; +#X obj 589 318 hsl 128 15 0 40 0 0 empty empty empty -2 -8 0 10 -262144 +-1 -1 2600 1; #X connect 1 0 2 0; #X connect 2 0 138 0; #X connect 4 0 136 0; @@ -1135,23 +1075,30 @@ #X connect 132 0 0 9; #X connect 132 0 0 8; #X connect 132 0 0 7; -#X connect 133 0 147 0; +#X connect 133 0 145 0; #X connect 137 0 5 0; #X connect 138 0 3 0; #X connect 139 0 132 0; +#X connect 139 0 154 0; #X connect 141 0 13 0; #X connect 142 0 0 3; -#X connect 143 0 0 2; -#X connect 144 0 105 0; -#X connect 145 0 105 1; -#X connect 146 0 144 0; -#X connect 146 0 145 0; -#X connect 147 0 0 1; -#X connect 148 0 147 1; -#X connect 150 0 13 0; -#X connect 151 0 13 0; -#X connect 152 0 50 0; +#X connect 143 0 105 1; +#X connect 144 0 155 0; +#X connect 144 0 143 0; +#X connect 145 0 0 1; +#X connect 146 0 145 1; +#X connect 147 0 101 0; +#X connect 148 0 13 0; +#X connect 149 0 13 0; +#X connect 150 0 50 0; +#X connect 151 0 47 0; +#X connect 152 0 44 0; #X connect 153 0 47 0; -#X connect 154 0 44 0; -#X connect 155 0 47 0; -#X connect 155 0 50 0; +#X connect 153 0 50 0; +#X connect 154 0 0 6; +#X connect 155 0 105 0; +#X connect 156 0 0 2; +#X connect 157 0 0 5; +#X connect 158 0 0 4; +#X connect 159 0 0 0; +#X connect 160 0 159 0;
--- a/newSwordAuto/sourceSpeed.pd Wed Feb 03 15:36:20 2016 +0000 +++ b/newSwordAuto/sourceSpeed.pd Thu Feb 04 15:48:58 2016 +0000 @@ -5,148 +5,104 @@ #X obj -279 -121 bng 50 250 50 0 empty empty empty 17 7 0 10 -257985 -1 -1; #X obj -279 -68 s setUp; -#X obj -98 420 line~; #X text -89 -100 Start calculation with elevation = 0 \, arm length is constant \, acceleration/deceleration is constant.; -#X obj -211 469 loadbang; -#X obj -211 490 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 +#X obj -202 498 loadbang; +#X obj -202 519 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1 1; -#X obj -211 508 metro 10; -#X obj -211 530 snapshot~; -#X floatatom -211 550 5 0 0 0 - - -; -#X obj -130 566 hsl 128 15 0 80 0 0 empty empty empty -2 -8 0 10 -262144 +#X obj -202 537 metro 10; +#X obj -202 559 snapshot~; +#X floatatom -202 579 5 0 0 0 - - -; +#X obj -121 595 hsl 128 15 0 80 0 0 empty empty empty -2 -8 0 10 -262144 -1 -1 0 1; -#X msg -268 354 \$1 \$2; -#X obj -268 329 pack; -#X msg -98 386 0; -#X obj -269 306 f; -#X obj -269 261 r GO; -#X msg 41 388 0 \$1; -#X obj 40 311 t f b; -#X obj 41 339 delay; -#X obj -98 365 r setUp; -#X text -115 346 Start at 0 speed; -#X text 83 399 \$1 = time to reach speed of 0; -#X obj 55 264 r preswingTime; -#X text -7 224 Trigger once full speed; -#X obj -98 453 outlet~; +#X msg -259 383 \$1 \$2; +#X obj -259 358 pack; +#X msg -89 415 0; +#X obj -260 335 f; +#X obj -281 291 r GO; +#X msg 50 417 0 \$1; +#X obj 49 340 t f b; +#X obj 50 368 delay; +#X obj -89 394 r setUp; +#X text -106 375 Start at 0 speed; +#X text 92 428 \$1 = time to reach speed of 0; +#X obj 64 293 r preswingTime; +#X text 2 253 Trigger once full speed; +#X obj -89 482 outlet~; #X obj 233 -103 inlet; #X obj 327 -105 inlet; #X obj 233 -80 s \$0_thisGroup; #X obj 327 -81 s \$0_thisSource; -#X text -331 385 \$1 = source speed; -#X text -331 401 \$2 = time to reach source speed; -#X obj -243 305 r preswingTime; -#X obj 236 16 r \$0_thisGroup; -#X obj 251 36 r \$0_thisSource; -#X obj 236 58 +; -#X floatatom 190 85 5 0 0 0 - - -; -#X obj 236 84 s \$0_mySourceNo; -#X obj -239 -39 r \$0_mySourceNo; -#X obj -224 -19 r deltaPreCirc; -#X obj -239 2 *; -#X obj -239 43 +; -#X obj -224 22 r minPreCirc; -#X floatatom -302 64 5 0 0 0 - - -; -#X obj -224 64 r preswingTime; -#X obj -239 107 /; -#X obj -224 85 * 0.001; -#X obj -239 134 * 2; -#X text -196 114 Average Speed; -#X text -199 138 Top Speed for this source; -#X floatatom -292 160 5 0 0 0 - - -; -#X obj -239 161 s \$0_myPreSourceSpeed; -#X obj -254 282 r \$0_myPreSourceSpeed; -#X obj 98 328 r postswingTime; -#X floatatom 130 351 5 0 0 0 - - -; -#X obj 40 244 r GO; -#X obj 40 286 f; -#X obj 41 366 f; -#X obj 436 7 r start_armLength; -#X obj 421 -15 r length; -#X obj 421 69 -; -#X obj 469 50 r NoOfSources; -#X obj 454 29 r \$0_mySourceNo; -#X obj 454 72 /; -#X obj 421 94 *; -#X floatatom 376 162 5 0 0 0 - - -; -#X obj 421 137 +; -#X obj 436 115 r start_armLength; -#X text 476 163 Distance from centre of arc; -#X obj 421 162 sig~; -#X obj 421 210 s~ \$0_srcCnt; -#X obj 457 331 r~ \$0_srcCnt; -#X text 453 373 Y; -#X text 465 374 X; -#X text 477 374 Z; -#X obj 457 360 thisPosition; -#X obj 419 529 outlet~; -#X obj 493 523 outlet~; -#X obj 468 402 thisAngle; -#X obj 586 532 outlet~; +#X text -322 414 \$1 = source speed; +#X text -322 430 \$2 = time to reach source speed; +#X obj -234 334 r preswingTime; +#X obj -215 73 r deltaPreCirc; +#X obj -230 94 *; +#X obj -230 135 +; +#X obj -215 114 r minPreCirc; +#X floatatom -293 156 5 0 0 0 - - -; +#X obj -215 156 r preswingTime; +#X obj -230 199 /; +#X obj -215 177 * 0.001; +#X obj -230 226 * 2; +#X text -187 206 Average Speed; +#X text -190 230 Top Speed for this source; +#X floatatom -283 252 5 0 0 0 - - -; +#X obj 107 357 r postswingTime; +#X floatatom 139 380 5 0 0 0 - - -; +#X obj 49 273 r GO; +#X obj 49 315 f; +#X obj 50 395 f; +#X floatatom -74 98 0 0 0 0 - - -; +#X floatatom -118 137 0 0 0 0 - - -; +#X floatatom -302 114 0 0 0 0 - - -; +#X floatatom -266 68 0 0 0 0 - - -; +#X obj -230 12 r \$0_thisGroup; +#X obj -215 31 r \$0_thisSource; +#X obj -230 52 +; +#X obj 272 482 vline~; +#X obj -89 449 vline~; #X connect 0 0 1 0; #X connect 2 0 3 0; -#X connect 4 0 9 0; -#X connect 4 0 25 0; +#X connect 5 0 6 0; #X connect 6 0 7 0; #X connect 7 0 8 0; #X connect 8 0 9 0; -#X connect 9 0 10 0; -#X connect 9 0 11 0; -#X connect 12 0 4 0; -#X connect 13 0 12 0; -#X connect 14 0 4 0; -#X connect 15 0 13 0; -#X connect 16 0 15 0; -#X connect 17 0 4 0; -#X connect 18 0 19 1; -#X connect 18 1 19 0; -#X connect 19 0 57 0; -#X connect 20 0 14 0; -#X connect 23 0 56 1; +#X connect 8 0 10 0; +#X connect 11 0 57 0; +#X connect 12 0 11 0; +#X connect 13 0 57 0; +#X connect 14 0 12 0; +#X connect 15 0 14 0; +#X connect 16 0 57 0; +#X connect 17 0 18 1; +#X connect 17 1 18 0; +#X connect 18 0 48 0; +#X connect 19 0 13 0; +#X connect 22 0 47 1; +#X connect 25 0 27 0; #X connect 26 0 28 0; -#X connect 27 0 29 0; -#X connect 32 0 13 1; -#X connect 33 0 35 0; -#X connect 34 0 35 1; -#X connect 35 0 36 0; -#X connect 35 0 37 0; +#X connect 31 0 12 1; +#X connect 32 0 33 1; +#X connect 32 0 49 0; +#X connect 33 0 34 0; +#X connect 33 0 51 0; +#X connect 34 0 36 0; +#X connect 34 0 38 0; +#X connect 35 0 34 1; +#X connect 35 0 50 0; +#X connect 37 0 39 0; #X connect 38 0 40 0; -#X connect 39 0 40 1; -#X connect 40 0 41 0; -#X connect 41 0 43 0; -#X connect 41 0 45 0; -#X connect 42 0 41 1; -#X connect 44 0 46 0; -#X connect 45 0 47 0; -#X connect 46 0 45 1; -#X connect 47 0 50 0; -#X connect 47 0 51 0; -#X connect 52 0 15 1; -#X connect 53 0 54 0; -#X connect 53 0 57 1; -#X connect 55 0 56 0; -#X connect 56 0 18 0; -#X connect 57 0 17 0; -#X connect 58 0 60 1; -#X connect 59 0 60 0; -#X connect 60 0 64 0; -#X connect 61 0 63 1; -#X connect 62 0 63 0; -#X connect 63 0 64 1; -#X connect 64 0 66 0; -#X connect 66 0 65 0; -#X connect 66 0 69 0; -#X connect 67 0 66 1; -#X connect 69 0 70 0; -#X connect 71 0 75 0; -#X connect 75 0 78 0; -#X connect 75 1 78 1; -#X connect 75 2 78 2; -#X connect 75 3 76 0; -#X connect 75 3 78 3; -#X connect 75 4 78 4; -#X connect 75 5 78 5; -#X connect 75 6 78 6; -#X connect 78 0 77 0; -#X connect 78 1 79 0; +#X connect 39 0 38 1; +#X connect 40 0 43 0; +#X connect 40 0 14 1; +#X connect 44 0 45 0; +#X connect 44 0 48 1; +#X connect 46 0 47 0; +#X connect 47 0 17 0; +#X connect 48 0 16 0; +#X connect 53 0 55 0; +#X connect 54 0 55 1; +#X connect 55 0 33 0; +#X connect 57 0 8 0; +#X connect 57 0 24 0;