changeset 98:84a9624cbe77

SwordSounds: Create version with only 10 sources, equally space over the length of the sword. Calculate elevation change as well as azimuth change over the swing time.
author Rod Selfridge <r.selfridge@qmul.ac.uk>
date Fri, 24 Jul 2015 16:16:18 +0100
parents 1bd137cd8149
children 6f2ab99a4420
files .DS_Store SwordSounds/Sword10_D1.pd SwordSounds/Sword10_D2.pd SwordSounds/centreAngles.pd SwordSounds/sourceSpeed.pd SwordSounds/tenSource.pd SwordSounds/woSoFreqD2.pd SwordSounds/woosh_D5.pd
diffstat 8 files changed, 1627 insertions(+), 365 deletions(-) [+]
line wrap: on
line diff
Binary file .DS_Store has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/SwordSounds/Sword10_D1.pd	Fri Jul 24 16:16:18 2015 +0100
@@ -0,0 +1,526 @@
+#N canvas 34 32 1433 837 10;
+#X obj 561 -83 vu 15 120 empty empty -1 -8 0 10 -66577 -1 1 0;
+#X obj 624 -83 vu 15 120 empty empty -1 -8 0 10 -66577 -1 1 0;
+#X text 621 -174 Gain;
+#X obj 560 -200 loadbang;
+#N canvas 865 368 284 318 opLevels 0;
+#X obj 85 188 dac~;
+#X obj 30 70 catch~ l;
+#X obj 155 76 catch~ r;
+#X obj 155 106 *~ 0.45;
+#X obj 30 104 *~ 0.45;
+#X obj 30 210 prvu~;
+#X obj 155 213 prvu~;
+#X obj 100 69 / 127;
+#X obj 100 34 inlet;
+#X obj 30 239 outlet;
+#X obj 155 241 outlet;
+#X obj 155 132 /~ 1;
+#X obj 30 131 /~ 1;
+#X obj 204 29 inlet;
+#X connect 1 0 4 0;
+#X connect 2 0 3 0;
+#X connect 3 0 11 0;
+#X connect 4 0 12 0;
+#X connect 5 0 9 0;
+#X connect 6 0 10 0;
+#X connect 7 0 3 1;
+#X connect 7 0 4 1;
+#X connect 8 0 7 0;
+#X connect 11 0 0 1;
+#X connect 11 0 6 0;
+#X connect 12 0 0 0;
+#X connect 12 0 5 0;
+#X connect 13 0 12 1;
+#X connect 13 0 11 1;
+#X restore 560 -126 pd opLevels;
+#X msg 560 -177 5;
+#X msg 34 -205 1;
+#X obj 34 -182 s bladeLen;
+#X obj -168 -173 s NoOfSources;
+#X obj 95 151 s topSpeed;
+#X obj 43 125 hsl 100 20 0 100 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 3070 1;
+#X floatatom 40 151 8 0 0 0 - - -;
+#X text 67 -206 Blade Length;
+#X text 66 -140 Arm Length;
+#X text -140 -196 Number of Sources;
+#X text 151 129 Top Speed;
+#X obj 830 -131 hsl 100 20 0 180 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 8000 1;
+#X floatatom 827 -99 8 0 0 0 - - -;
+#N canvas 528 427 426 335 thickCalc 0;
+#X obj 173 139 r NoOfSources;
+#X obj 158 115 -;
+#X obj 158 164 /;
+#X floatatom 126 147 5 0 0 0 - - -;
+#X floatatom 94 189 8 0 0 0 - - -;
+#X obj 173 72 t f b;
+#X obj 200 95 delay 9;
+#X text 58 237 Calculates the difference in thickness between sources
+;
+#X text 59 254 based on the blade tapering in a straight line;
+#X obj 158 19 r hiltThick;
+#X obj 173 44 r tipThick;
+#X obj 158 187 s deltaThick;
+#X connect 0 0 2 1;
+#X connect 1 0 2 0;
+#X connect 1 0 3 0;
+#X connect 2 0 4 0;
+#X connect 2 0 11 0;
+#X connect 5 0 1 1;
+#X connect 5 1 6 0;
+#X connect 6 0 1 0;
+#X connect 9 0 1 0;
+#X connect 10 0 5 0;
+#X restore 392 -103 pd thickCalc;
+#X obj 37 212 hsl 100 20 0 0.03 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 3500 1;
+#X obj 36 297 hsl 100 20 0 0.01 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 1368 1;
+#X floatatom 34 242 8 0 0 0 - - -;
+#X obj 88 241 s hiltThick;
+#X floatatom 33 325 8 0 0 0 - - -;
+#X obj 91 324 s tipThick;
+#X text 151 214 Hilt Thickness;
+#X text 143 298 Tip Thickness;
+#X obj 234 -160 bng 50 250 50 0 empty empty empty 17 7 0 10 -4034 -1
+-1;
+#X obj 234 -107 s GO;
+#X obj -249 138 hsl 100 20 100 1 1 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 8410 1;
+#X obj -253 223 hsl 100 20 -180 180 0 0 empty empty empty -2 -8 0 10
+-262144 -1 -1 6600 1;
+#X floatatom -252 164 8 0 0 0 - - -;
+#X text -139 142 Distance to Observer;
+#X floatatom -256 251 8 0 0 0 - - -;
+#X text -131 217 Angle to Observer;
+#X obj 234 -206 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1
+0 1;
+#X obj 234 -187 metro 200;
+#X obj 288 -211 hsl 100 20 300 50 0 0 empty empty empty -2 -8 0 10
+-262144 -1 -1 900 1;
+#X obj 174 -160 bng 50 250 50 0 empty empty empty 17 7 0 10 -257985
+-1 -1;
+#X obj 174 -107 s setUp;
+#X obj -13 99 r setUp;
+#X obj 769 -151 r setUp;
+#X obj -17 189 r setUp;
+#X obj -18 277 r setUp;
+#X obj -304 117 r setUp;
+#X obj -307 201 r setUp;
+#X obj -193 165 s obsDistance;
+#X obj -197 252 s obsAngle;
+#N canvas 215 79 911 675 circumferCalc 0;
+#X obj 440 104 +;
+#X obj 440 127 s length;
+#X obj 168 153 r start_armLength;
+#X obj 153 86 r presweepAzim;
+#X obj 644 76 bng 50 250 50 0 empty empty empty 17 7 0 10 -4034 -1
+-1;
+#X obj 644 129 s GO;
+#X obj 584 76 bng 50 250 50 0 empty empty empty 17 7 0 10 -257985 -1
+-1;
+#X obj 584 129 s setUp;
+#X obj 153 132 * 6.28312;
+#X obj 153 110 / 360;
+#X obj 153 174 *;
+#X floatatom 91 198 5 0 0 0 - - -;
+#X text 194 175 Circumference of the nearest source on blade;
+#X text 307 191 up to 0 azimuth;
+#X obj 153 200 s minPreCirc;
+#X obj 452 300 r start_armLength;
+#X obj 437 279 * 6.28312;
+#X obj 437 257 / 360;
+#X obj 437 321 *;
+#X floatatom 375 345 5 0 0 0 - - -;
+#X text 478 322 Circumference of the nearest source on blade;
+#X text 914 158 up to 0 azimuth;
+#X obj 437 233 r postsweepAzim;
+#X obj 437 347 s minPostCirc;
+#X obj 149 252 r presweepAzim;
+#X obj 149 298 * 6.28312;
+#X obj 149 276 / 360;
+#X obj 149 342 *;
+#X obj 164 320 r length;
+#X floatatom 111 364 5 0 0 0 - - -;
+#X obj 440 57 r bladeLen;
+#X obj 455 81 r start_armLength;
+#X obj 437 434 * 6.28312;
+#X obj 437 412 / 360;
+#X obj 437 478 *;
+#X obj 452 456 r length;
+#X floatatom 399 501 5 0 0 0 - - -;
+#X obj 437 388 r postsweepAzim;
+#X obj 164 362 r minPreCirc;
+#X obj 149 383 -;
+#X obj 149 426 /;
+#X floatatom 111 454 5 0 0 0 - - -;
+#X obj 164 403 r NoOfSources;
+#X obj 149 454 s deltaPreCirc;
+#X obj 437 519 -;
+#X obj 437 562 /;
+#X obj 452 539 r NoOfSources;
+#X obj 452 498 r minPostCirc;
+#X obj 437 590 s deltaPostCirc;
+#X floatatom 397 591 5 0 0 0 - - -;
+#X text 33 334 Max Circumference;
+#X text 323 472 Max Circumference;
+#X connect 0 0 1 0;
+#X connect 2 0 10 1;
+#X connect 3 0 9 0;
+#X connect 4 0 5 0;
+#X connect 6 0 7 0;
+#X connect 8 0 10 0;
+#X connect 9 0 8 0;
+#X connect 10 0 11 0;
+#X connect 10 0 14 0;
+#X connect 15 0 18 1;
+#X connect 16 0 18 0;
+#X connect 17 0 16 0;
+#X connect 18 0 19 0;
+#X connect 18 0 23 0;
+#X connect 22 0 17 0;
+#X connect 24 0 26 0;
+#X connect 25 0 27 0;
+#X connect 26 0 25 0;
+#X connect 27 0 29 0;
+#X connect 27 0 39 0;
+#X connect 28 0 27 1;
+#X connect 30 0 0 0;
+#X connect 31 0 0 1;
+#X connect 32 0 34 0;
+#X connect 33 0 32 0;
+#X connect 34 0 36 0;
+#X connect 34 0 44 0;
+#X connect 35 0 34 1;
+#X connect 37 0 33 0;
+#X connect 38 0 39 1;
+#X connect 39 0 40 0;
+#X connect 40 0 41 0;
+#X connect 40 0 43 0;
+#X connect 42 0 40 1;
+#X connect 44 0 45 0;
+#X connect 45 0 48 0;
+#X connect 45 0 49 0;
+#X connect 46 0 45 1;
+#X connect 47 0 44 1;
+#X restore 367 -26 pd circumferCalc;
+#N canvas 303 28 1094 768 angleCalc 0;
+#X obj -129 105 * 0.75;
+#X obj 325 234 * 0.25;
+#X obj -129 145 /;
+#X obj -144 199 * 1000;
+#X obj 263 254 delay \$1;
+#X obj 236 202 f;
+#X obj 236 159 r GO;
+#X obj 236 228 t f b;
+#X msg 227 367 0;
+#X obj 325 276 /;
+#X obj 325 298 * 1000;
+#X obj -127 225 s \$0_thisDe;
+#X obj 251 181 r \$0_thisDe;
+#X obj 145 237 r sweepAngle;
+#X obj -129 81 r maxCirc;
+#X obj 325 212 r maxCirc;
+#X obj -114 124 r topSpeed;
+#X obj 340 255 r topSpeed;
+#X obj 644 360 delay \$1;
+#X obj 646 302 f;
+#X obj 639 248 r GO;
+#X obj 646 328 t f b;
+#X obj 682 208 r maxCirc;
+#X obj 697 230 r topSpeed;
+#X obj 682 254 /;
+#X obj 682 276 * 1000;
+#X obj 644 407 s end;
+#X obj -77 312 r end;
+#X obj 145 260 * -0.25;
+#X text -193 45 0.75 represents the ratio of swing that;
+#X text 200 118 0.25 represents the ratio of swing that;
+#X text 200 132 the sword is decelerating;
+#X text -102 149 Time taken for acceleration;
+#X text -54 221 Send as a delay;
+#X text 280 160 Recieve as a delay;
+#X text -36 312 Reset angle;
+#X text -38 325 once swing complete;
+#X text 622 426 Send bang message at the;
+#X text 623 438 end of the swing to reset;
+#X text 379 296 Time for last;
+#X text 381 307 1/4 of swing;
+#X text -193 59 the sword is before 0 degrees;
+#X text -121 700 Output of complete swing \, split into 75% before
+0 degrees and 25% past 0 degrees;
+#X text 568 517 Once delay from start to 0 degrees complete;
+#X text 564 535 count down from 0 to finish the total swing angle;
+#X text 98 9 Patch that calculates the angle between 0 degrees for
+the full length of the swing;
+#X obj -144 482 line~;
+#X obj 86 601 metro 10;
+#X obj 86 632 snapshot~;
+#X floatatom 85 656 8 0 0 0 - - -;
+#X obj 172 397 line~;
+#X msg 172 350 \$1 \$2;
+#X obj 151 319 pack;
+#X obj 86 570 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+1;
+#X floatatom -108 266 5 0 0 0 - - -;
+#X msg -90 438 \$1;
+#X obj -48 365 r sweepAngle;
+#X obj -48 387 * 0.75;
+#X msg -144 427 0 \$1;
+#X obj -62 341 r setUp;
+#X obj 151 294 f;
+#X obj -4 549 +~;
+#X obj 227 342 r setUp;
+#X floatatom -63 474 5 0 0 0 - - -;
+#X text 11 464 comment;
+#X obj -63 409 f;
+#X floatatom -26 434 5 0 0 0 - - -;
+#X obj 286 343 r end;
+#X obj 632 276 delay 9;
+#X obj 644 383 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
+-1 -1;
+#X obj -144 174 f;
+#X obj -163 143 r GO;
+#X obj -4 633 s~ swordAngle;
+#X text 241 325 Set to 0 at end;
+#X obj 86 545 loadbang;
+#X obj 68 509 r obsAngle;
+#X obj -4 576 +~ 1;
+#X text 141 470 Adding in the observer angle here offsets the swing
+angle by the angle the observer is at. This makes all the future calculations
+as if the observer is positioned at 0 degrees to the swordSwing.;
+#X connect 0 0 2 0;
+#X connect 1 0 9 0;
+#X connect 2 0 70 1;
+#X connect 3 0 11 0;
+#X connect 3 0 54 0;
+#X connect 3 0 58 0;
+#X connect 4 0 60 0;
+#X connect 5 0 7 0;
+#X connect 6 0 5 0;
+#X connect 7 0 4 1;
+#X connect 7 1 4 0;
+#X connect 8 0 50 0;
+#X connect 9 0 10 0;
+#X connect 10 0 52 1;
+#X connect 12 0 5 1;
+#X connect 13 0 28 0;
+#X connect 14 0 0 0;
+#X connect 15 0 1 0;
+#X connect 16 0 2 1;
+#X connect 17 0 9 1;
+#X connect 18 0 69 0;
+#X connect 19 0 21 0;
+#X connect 20 0 68 0;
+#X connect 21 0 18 1;
+#X connect 21 1 18 0;
+#X connect 22 0 24 0;
+#X connect 23 0 24 1;
+#X connect 24 0 25 0;
+#X connect 25 0 19 1;
+#X connect 27 0 65 0;
+#X connect 28 0 60 1;
+#X connect 46 0 61 0;
+#X connect 47 0 48 0;
+#X connect 48 0 49 0;
+#X connect 50 0 61 1;
+#X connect 51 0 50 0;
+#X connect 52 0 51 0;
+#X connect 53 0 47 0;
+#X connect 55 0 46 0;
+#X connect 55 0 63 0;
+#X connect 56 0 57 0;
+#X connect 57 0 65 1;
+#X connect 57 0 66 0;
+#X connect 58 0 46 0;
+#X connect 59 0 65 0;
+#X connect 60 0 52 0;
+#X connect 61 0 76 0;
+#X connect 62 0 8 0;
+#X connect 65 0 55 0;
+#X connect 67 0 8 0;
+#X connect 68 0 19 0;
+#X connect 69 0 26 0;
+#X connect 70 0 3 0;
+#X connect 71 0 70 0;
+#X connect 74 0 53 0;
+#X connect 75 0 76 1;
+#X connect 76 0 72 0;
+#X connect 76 0 48 0;
+#X restore 391 -136 pd angleCalc;
+#X obj 563 -155 hsl 100 25 0 127 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 5354 1;
+#X obj 34 -229 loadbang;
+#X obj 32 -160 loadbang;
+#X obj -168 -218 loadbang;
+#X msg -166 -124 0;
+#X obj -166 -102 s elev;
+#X text -134 229 (Azimuth);
+#X obj -166 -147 loadbang;
+#X obj 457 565 s thisTS;
+#X obj 476 544 s thisSA;
+#X obj 496 522 s thisHT;
+#X obj 515 499 s thisTT;
+#X obj 535 478 s thisOD;
+#X obj 554 458 s thisOA;
+#X obj 574 436 s thisG;
+#X obj 40 99 r thisTS;
+#X obj 827 -152 r thisSA;
+#X obj 34 189 r thisHT;
+#X obj 33 277 r thisTT;
+#X obj -252 117 r thisOD;
+#X obj -255 202 r thisOA;
+#X obj 508 -175 r thisG;
+#X obj 457 412 unpack f f f f f f f;
+#X obj -218 -147 r setUp;
+#X obj -221 -216 r setUp;
+#X obj -17 -162 r setUp;
+#X obj -18 -227 r setUp;
+#X text 394 412 Presets;
+#X msg 466 307 20 160 0.01 0.004 2 0 127;
+#X msg 457 284 43 215 0.0085 0.0025 4 90 40;
+#X msg 476 330 30 280 0.0095 0.0032 2 60 120;
+#X text 726 293 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 457 255 loadbang;
+#X obj 174 -212 loadbang;
+#X obj 174 -188 delay 13;
+#X obj 409 337 t b;
+#X obj 389 360 s setUp;
+#X obj -257 297 hsl 100 20 -180 180 0 0 empty empty empty -2 -8 0 10
+-262144 -1 -1 0 1;
+#X floatatom -260 325 8 0 0 0 - - -;
+#X text -135 291 Angle to Observer;
+#X obj -311 275 r setUp;
+#X obj -259 276 r thisOE;
+#X obj -201 326 s obsElev;
+#X text -138 303 (Elevation);
+#X obj 828 -53 hsl 100 20 0 180 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 3300 1;
+#X floatatom 825 -21 8 0 0 0 - - -;
+#X obj 767 -73 r setUp;
+#X obj 825 -74 r thisSA;
+#X obj 823 60 hsl 100 20 0 90 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 5600 1;
+#X floatatom 820 92 8 0 0 0 - - -;
+#X obj 762 40 r setUp;
+#X obj 820 39 r thisSA;
+#X obj 821 138 hsl 100 20 0 90 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 2400 1;
+#X floatatom 818 170 8 0 0 0 - - -;
+#X obj 760 118 r setUp;
+#X obj 818 117 r thisSA;
+#N canvas 419 64 689 650 allSource 1;
+#X obj 187 127 r distance;
+#X obj 170 106 r angle;
+#X obj 153 65 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
+-1;
+#X obj 153 37 r setUp;
+#X obj 204 147 r elev;
+#X msg 153 84 10;
+#X obj 153 170 tenSource;
+#X connect 0 0 6 2;
+#X connect 1 0 6 1;
+#X connect 2 0 5 0;
+#X connect 3 0 2 0;
+#X connect 4 0 6 3;
+#X connect 5 0 6 0;
+#X restore 391 -75 pd allSource;
+#X obj 875 91 s presweepElev;
+#X obj 873 169 s postsweepElev;
+#X text 934 61 pre-sweep elevation;
+#X text 932 138 post-sweep elevation;
+#X text 941 -130 pre-sweep azimuth;
+#X text 939 -52 post-sweep azimuth;
+#X obj 882 -100 s presweepAzim;
+#X obj 880 -22 s postsweepAzim;
+#X obj 32 -118 s start_armLength;
+#X msg 32 -139 0.35;
+#X obj 410 -50 sweepTime;
+#X obj 672 -195 hsl 100 25 1 100 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 900 1;
+#X floatatom 688 -155 5 0 0 0 - - -;
+#X msg -168 -196 10;
+#X connect 3 0 5 0;
+#X connect 4 0 0 0;
+#X connect 4 1 1 0;
+#X connect 5 0 50 0;
+#X connect 6 0 7 0;
+#X connect 10 0 9 0;
+#X connect 10 0 11 0;
+#X connect 16 0 17 0;
+#X connect 16 0 113 0;
+#X connect 19 0 21 0;
+#X connect 19 0 22 0;
+#X connect 20 0 23 0;
+#X connect 20 0 24 0;
+#X connect 27 0 28 0;
+#X connect 29 0 31 0;
+#X connect 29 0 46 0;
+#X connect 30 0 33 0;
+#X connect 30 0 47 0;
+#X connect 35 0 36 0;
+#X connect 36 0 27 0;
+#X connect 37 0 36 1;
+#X connect 38 0 39 0;
+#X connect 40 0 10 0;
+#X connect 41 0 16 0;
+#X connect 42 0 19 0;
+#X connect 43 0 20 0;
+#X connect 44 0 29 0;
+#X connect 45 0 30 0;
+#X connect 50 0 4 0;
+#X connect 51 0 6 0;
+#X connect 52 0 116 0;
+#X connect 53 0 120 0;
+#X connect 54 0 55 0;
+#X connect 57 0 54 0;
+#X connect 65 0 10 0;
+#X connect 67 0 19 0;
+#X connect 68 0 20 0;
+#X connect 69 0 29 0;
+#X connect 70 0 30 0;
+#X connect 71 0 50 0;
+#X connect 72 0 58 0;
+#X connect 72 1 59 0;
+#X connect 72 2 60 0;
+#X connect 72 3 61 0;
+#X connect 72 4 62 0;
+#X connect 72 5 63 0;
+#X connect 72 6 64 0;
+#X connect 73 0 54 0;
+#X connect 74 0 120 0;
+#X connect 75 0 116 0;
+#X connect 76 0 6 0;
+#X connect 78 0 72 0;
+#X connect 78 0 85 0;
+#X connect 79 0 72 0;
+#X connect 79 0 85 0;
+#X connect 80 0 72 0;
+#X connect 80 0 85 0;
+#X connect 82 0 79 0;
+#X connect 83 0 84 0;
+#X connect 84 0 38 0;
+#X connect 85 0 86 0;
+#X connect 87 0 88 0;
+#X connect 87 0 92 0;
+#X connect 90 0 87 0;
+#X connect 91 0 87 0;
+#X connect 94 0 95 0;
+#X connect 94 0 114 0;
+#X connect 96 0 94 0;
+#X connect 98 0 99 0;
+#X connect 98 0 107 0;
+#X connect 100 0 98 0;
+#X connect 101 0 98 0;
+#X connect 102 0 103 0;
+#X connect 102 0 108 0;
+#X connect 104 0 102 0;
+#X connect 105 0 102 0;
+#X connect 116 0 115 0;
+#X connect 118 0 4 1;
+#X connect 118 0 119 0;
+#X connect 120 0 8 0;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/SwordSounds/Sword10_D2.pd	Fri Jul 24 16:16:18 2015 +0100
@@ -0,0 +1,526 @@
+#N canvas 0 22 450 300 10;
+#X obj 571 -73 vu 15 120 empty empty -1 -8 0 10 -66577 -1 1 0;
+#X obj 634 -73 vu 15 120 empty empty -1 -8 0 10 -66577 -1 1 0;
+#X text 631 -164 Gain;
+#X obj 570 -190 loadbang;
+#N canvas 865 368 284 318 opLevels 0;
+#X obj 85 188 dac~;
+#X obj 30 70 catch~ l;
+#X obj 155 76 catch~ r;
+#X obj 155 106 *~ 0.45;
+#X obj 30 104 *~ 0.45;
+#X obj 30 210 prvu~;
+#X obj 155 213 prvu~;
+#X obj 100 69 / 127;
+#X obj 100 34 inlet;
+#X obj 30 239 outlet;
+#X obj 155 241 outlet;
+#X obj 155 132 /~ 1;
+#X obj 30 131 /~ 1;
+#X obj 204 29 inlet;
+#X connect 1 0 4 0;
+#X connect 2 0 3 0;
+#X connect 3 0 11 0;
+#X connect 4 0 12 0;
+#X connect 5 0 9 0;
+#X connect 6 0 10 0;
+#X connect 7 0 3 1;
+#X connect 7 0 4 1;
+#X connect 8 0 7 0;
+#X connect 11 0 0 1;
+#X connect 11 0 6 0;
+#X connect 12 0 0 0;
+#X connect 12 0 5 0;
+#X connect 13 0 12 1;
+#X connect 13 0 11 1;
+#X restore 570 -116 pd opLevels;
+#X msg 570 -167 5;
+#X msg 44 -195 1;
+#X obj 44 -172 s bladeLen;
+#X obj -158 -163 s NoOfSources;
+#X obj 105 161 s topSpeed;
+#X obj 53 135 hsl 100 20 0 100 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 0 1;
+#X floatatom 50 161 8 0 0 0 - - -;
+#X text 77 -196 Blade Length;
+#X text 76 -130 Arm Length;
+#X text -130 -186 Number of Sources;
+#X text 161 139 Top Speed;
+#X obj 840 -121 hsl 100 20 0 180 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 0 1;
+#X floatatom 837 -89 8 0 0 0 - - -;
+#N canvas 528 427 426 335 thickCalc 0;
+#X obj 173 139 r NoOfSources;
+#X obj 158 115 -;
+#X obj 158 164 /;
+#X floatatom 126 147 5 0 0 0 - - -;
+#X floatatom 94 189 8 0 0 0 - - -;
+#X obj 173 72 t f b;
+#X obj 200 95 delay 9;
+#X text 58 237 Calculates the difference in thickness between sources
+;
+#X text 59 254 based on the blade tapering in a straight line;
+#X obj 158 19 r hiltThick;
+#X obj 173 44 r tipThick;
+#X obj 158 187 s deltaThick;
+#X connect 0 0 2 1;
+#X connect 1 0 2 0;
+#X connect 1 0 3 0;
+#X connect 2 0 4 0;
+#X connect 2 0 11 0;
+#X connect 5 0 1 1;
+#X connect 5 1 6 0;
+#X connect 6 0 1 0;
+#X connect 9 0 1 0;
+#X connect 10 0 5 0;
+#X restore 402 -93 pd thickCalc;
+#X obj 47 222 hsl 100 20 0 0.03 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 0 1;
+#X obj 46 307 hsl 100 20 0 0.01 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 0 1;
+#X floatatom 44 252 8 0 0 0 - - -;
+#X obj 98 251 s hiltThick;
+#X floatatom 43 335 8 0 0 0 - - -;
+#X obj 101 334 s tipThick;
+#X text 161 224 Hilt Thickness;
+#X text 153 308 Tip Thickness;
+#X obj 244 -150 bng 50 250 50 0 empty empty empty 17 7 0 10 -4034 -1
+-1;
+#X obj 244 -97 s GO;
+#X obj -239 148 hsl 100 20 100 1 1 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 0 1;
+#X obj -243 233 hsl 100 20 -180 180 0 0 empty empty empty -2 -8 0 10
+-262144 -1 -1 0 1;
+#X floatatom -242 174 8 0 0 0 - - -;
+#X text -129 152 Distance to Observer;
+#X floatatom -246 261 8 0 0 0 - - -;
+#X text -121 227 Angle to Observer;
+#X obj 244 -196 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1
+0 1;
+#X obj 244 -177 metro 200;
+#X obj 298 -201 hsl 100 20 300 50 0 0 empty empty empty -2 -8 0 10
+-262144 -1 -1 0 1;
+#X obj 184 -150 bng 50 250 50 0 empty empty empty 17 7 0 10 -257985
+-1 -1;
+#X obj 184 -97 s setUp;
+#X obj -3 109 r setUp;
+#X obj 779 -141 r setUp;
+#X obj -7 199 r setUp;
+#X obj -8 287 r setUp;
+#X obj -294 127 r setUp;
+#X obj -297 211 r setUp;
+#X obj -183 175 s obsDistance;
+#X obj -187 262 s obsAngle;
+#N canvas 215 79 911 675 circumferCalc 0;
+#X obj 440 104 +;
+#X obj 440 127 s length;
+#X obj 168 153 r start_armLength;
+#X obj 153 86 r presweepAzim;
+#X obj 644 76 bng 50 250 50 0 empty empty empty 17 7 0 10 -4034 -1
+-1;
+#X obj 644 129 s GO;
+#X obj 584 76 bng 50 250 50 0 empty empty empty 17 7 0 10 -257985 -1
+-1;
+#X obj 584 129 s setUp;
+#X obj 153 132 * 6.28312;
+#X obj 153 110 / 360;
+#X obj 153 174 *;
+#X floatatom 91 198 5 0 0 0 - - -;
+#X text 194 175 Circumference of the nearest source on blade;
+#X text 307 191 up to 0 azimuth;
+#X obj 153 200 s minPreCirc;
+#X obj 452 300 r start_armLength;
+#X obj 437 279 * 6.28312;
+#X obj 437 257 / 360;
+#X obj 437 321 *;
+#X floatatom 375 345 5 0 0 0 - - -;
+#X text 478 322 Circumference of the nearest source on blade;
+#X text 914 158 up to 0 azimuth;
+#X obj 437 233 r postsweepAzim;
+#X obj 437 347 s minPostCirc;
+#X obj 149 252 r presweepAzim;
+#X obj 149 298 * 6.28312;
+#X obj 149 276 / 360;
+#X obj 149 342 *;
+#X obj 164 320 r length;
+#X floatatom 111 364 5 0 0 0 - - -;
+#X obj 440 57 r bladeLen;
+#X obj 455 81 r start_armLength;
+#X obj 437 434 * 6.28312;
+#X obj 437 412 / 360;
+#X obj 437 478 *;
+#X obj 452 456 r length;
+#X floatatom 399 501 5 0 0 0 - - -;
+#X obj 437 388 r postsweepAzim;
+#X obj 164 362 r minPreCirc;
+#X obj 149 383 -;
+#X obj 149 426 /;
+#X floatatom 111 454 5 0 0 0 - - -;
+#X obj 164 403 r NoOfSources;
+#X obj 149 454 s deltaPreCirc;
+#X obj 437 519 -;
+#X obj 437 562 /;
+#X obj 452 539 r NoOfSources;
+#X obj 452 498 r minPostCirc;
+#X obj 437 590 s deltaPostCirc;
+#X floatatom 397 591 5 0 0 0 - - -;
+#X text 33 334 Max Circumference;
+#X text 323 472 Max Circumference;
+#X connect 0 0 1 0;
+#X connect 2 0 10 1;
+#X connect 3 0 9 0;
+#X connect 4 0 5 0;
+#X connect 6 0 7 0;
+#X connect 8 0 10 0;
+#X connect 9 0 8 0;
+#X connect 10 0 11 0;
+#X connect 10 0 14 0;
+#X connect 15 0 18 1;
+#X connect 16 0 18 0;
+#X connect 17 0 16 0;
+#X connect 18 0 19 0;
+#X connect 18 0 23 0;
+#X connect 22 0 17 0;
+#X connect 24 0 26 0;
+#X connect 25 0 27 0;
+#X connect 26 0 25 0;
+#X connect 27 0 29 0;
+#X connect 27 0 39 0;
+#X connect 28 0 27 1;
+#X connect 30 0 0 0;
+#X connect 31 0 0 1;
+#X connect 32 0 34 0;
+#X connect 33 0 32 0;
+#X connect 34 0 36 0;
+#X connect 34 0 44 0;
+#X connect 35 0 34 1;
+#X connect 37 0 33 0;
+#X connect 38 0 39 1;
+#X connect 39 0 40 0;
+#X connect 40 0 41 0;
+#X connect 40 0 43 0;
+#X connect 42 0 40 1;
+#X connect 44 0 45 0;
+#X connect 45 0 48 0;
+#X connect 45 0 49 0;
+#X connect 46 0 45 1;
+#X connect 47 0 44 1;
+#X restore 377 -16 pd circumferCalc;
+#N canvas 303 28 1094 768 angleCalc 0;
+#X obj -129 105 * 0.75;
+#X obj 325 234 * 0.25;
+#X obj -129 145 /;
+#X obj -144 199 * 1000;
+#X obj 263 254 delay \$1;
+#X obj 236 202 f;
+#X obj 236 159 r GO;
+#X obj 236 228 t f b;
+#X msg 227 367 0;
+#X obj 325 276 /;
+#X obj 325 298 * 1000;
+#X obj -127 225 s \$0_thisDe;
+#X obj 251 181 r \$0_thisDe;
+#X obj 145 237 r sweepAngle;
+#X obj -129 81 r maxCirc;
+#X obj 325 212 r maxCirc;
+#X obj -114 124 r topSpeed;
+#X obj 340 255 r topSpeed;
+#X obj 644 360 delay \$1;
+#X obj 646 302 f;
+#X obj 639 248 r GO;
+#X obj 646 328 t f b;
+#X obj 682 208 r maxCirc;
+#X obj 697 230 r topSpeed;
+#X obj 682 254 /;
+#X obj 682 276 * 1000;
+#X obj 644 407 s end;
+#X obj -77 312 r end;
+#X obj 145 260 * -0.25;
+#X text -193 45 0.75 represents the ratio of swing that;
+#X text 200 118 0.25 represents the ratio of swing that;
+#X text 200 132 the sword is decelerating;
+#X text -102 149 Time taken for acceleration;
+#X text -54 221 Send as a delay;
+#X text 280 160 Recieve as a delay;
+#X text -36 312 Reset angle;
+#X text -38 325 once swing complete;
+#X text 622 426 Send bang message at the;
+#X text 623 438 end of the swing to reset;
+#X text 379 296 Time for last;
+#X text 381 307 1/4 of swing;
+#X text -193 59 the sword is before 0 degrees;
+#X text -121 700 Output of complete swing \, split into 75% before
+0 degrees and 25% past 0 degrees;
+#X text 568 517 Once delay from start to 0 degrees complete;
+#X text 564 535 count down from 0 to finish the total swing angle;
+#X text 98 9 Patch that calculates the angle between 0 degrees for
+the full length of the swing;
+#X obj -144 482 line~;
+#X obj 86 601 metro 10;
+#X obj 86 632 snapshot~;
+#X floatatom 85 656 8 0 0 0 - - -;
+#X obj 172 397 line~;
+#X msg 172 350 \$1 \$2;
+#X obj 151 319 pack;
+#X obj 86 570 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+1;
+#X floatatom -108 266 5 0 0 0 - - -;
+#X msg -90 438 \$1;
+#X obj -48 365 r sweepAngle;
+#X obj -48 387 * 0.75;
+#X msg -144 427 0 \$1;
+#X obj -62 341 r setUp;
+#X obj 151 294 f;
+#X obj -4 549 +~;
+#X obj 227 342 r setUp;
+#X floatatom -63 474 5 0 0 0 - - -;
+#X text 11 464 comment;
+#X obj -63 409 f;
+#X floatatom -26 434 5 0 0 0 - - -;
+#X obj 286 343 r end;
+#X obj 632 276 delay 9;
+#X obj 644 383 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
+-1 -1;
+#X obj -144 174 f;
+#X obj -163 143 r GO;
+#X obj -4 633 s~ swordAngle;
+#X text 241 325 Set to 0 at end;
+#X obj 86 545 loadbang;
+#X obj 68 509 r obsAngle;
+#X obj -4 576 +~ 1;
+#X text 141 470 Adding in the observer angle here offsets the swing
+angle by the angle the observer is at. This makes all the future calculations
+as if the observer is positioned at 0 degrees to the swordSwing.;
+#X connect 0 0 2 0;
+#X connect 1 0 9 0;
+#X connect 2 0 70 1;
+#X connect 3 0 11 0;
+#X connect 3 0 54 0;
+#X connect 3 0 58 0;
+#X connect 4 0 60 0;
+#X connect 5 0 7 0;
+#X connect 6 0 5 0;
+#X connect 7 0 4 1;
+#X connect 7 1 4 0;
+#X connect 8 0 50 0;
+#X connect 9 0 10 0;
+#X connect 10 0 52 1;
+#X connect 12 0 5 1;
+#X connect 13 0 28 0;
+#X connect 14 0 0 0;
+#X connect 15 0 1 0;
+#X connect 16 0 2 1;
+#X connect 17 0 9 1;
+#X connect 18 0 69 0;
+#X connect 19 0 21 0;
+#X connect 20 0 68 0;
+#X connect 21 0 18 1;
+#X connect 21 1 18 0;
+#X connect 22 0 24 0;
+#X connect 23 0 24 1;
+#X connect 24 0 25 0;
+#X connect 25 0 19 1;
+#X connect 27 0 65 0;
+#X connect 28 0 60 1;
+#X connect 46 0 61 0;
+#X connect 47 0 48 0;
+#X connect 48 0 49 0;
+#X connect 50 0 61 1;
+#X connect 51 0 50 0;
+#X connect 52 0 51 0;
+#X connect 53 0 47 0;
+#X connect 55 0 46 0;
+#X connect 55 0 63 0;
+#X connect 56 0 57 0;
+#X connect 57 0 65 1;
+#X connect 57 0 66 0;
+#X connect 58 0 46 0;
+#X connect 59 0 65 0;
+#X connect 60 0 52 0;
+#X connect 61 0 76 0;
+#X connect 62 0 8 0;
+#X connect 65 0 55 0;
+#X connect 67 0 8 0;
+#X connect 68 0 19 0;
+#X connect 69 0 26 0;
+#X connect 70 0 3 0;
+#X connect 71 0 70 0;
+#X connect 74 0 53 0;
+#X connect 75 0 76 1;
+#X connect 76 0 72 0;
+#X connect 76 0 48 0;
+#X restore 401 -126 pd angleCalc;
+#X obj 573 -145 hsl 100 25 0 127 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 0 1;
+#X obj 44 -219 loadbang;
+#X obj 42 -150 loadbang;
+#X obj -158 -208 loadbang;
+#X msg -156 -114 0;
+#X obj -156 -92 s elev;
+#X text -124 239 (Azimuth);
+#X obj -156 -137 loadbang;
+#X obj 467 575 s thisTS;
+#X obj 486 554 s thisSA;
+#X obj 506 532 s thisHT;
+#X obj 525 509 s thisTT;
+#X obj 545 488 s thisOD;
+#X obj 564 468 s thisOA;
+#X obj 584 446 s thisG;
+#X obj 50 109 r thisTS;
+#X obj 837 -142 r thisSA;
+#X obj 44 199 r thisHT;
+#X obj 43 287 r thisTT;
+#X obj -242 127 r thisOD;
+#X obj -245 212 r thisOA;
+#X obj 518 -165 r thisG;
+#X obj 467 422 unpack f f f f f f f;
+#X obj -208 -137 r setUp;
+#X obj -211 -206 r setUp;
+#X obj -7 -152 r setUp;
+#X obj -8 -217 r setUp;
+#X text 404 422 Presets;
+#X msg 476 317 20 160 0.01 0.004 2 0 127;
+#X msg 467 294 43 215 0.0085 0.0025 4 90 40;
+#X msg 486 340 30 280 0.0095 0.0032 2 60 120;
+#X text 736 303 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 467 265 loadbang;
+#X obj 184 -202 loadbang;
+#X obj 184 -178 delay 13;
+#X obj 419 347 t b;
+#X obj 399 370 s setUp;
+#X obj -247 307 hsl 100 20 -180 180 0 0 empty empty empty -2 -8 0 10
+-262144 -1 -1 0 1;
+#X floatatom -250 335 8 0 0 0 - - -;
+#X text -125 301 Angle to Observer;
+#X obj -301 285 r setUp;
+#X obj -249 286 r thisOE;
+#X obj -191 336 s obsElev;
+#X text -128 313 (Elevation);
+#X obj 838 -43 hsl 100 20 0 180 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 0 1;
+#X floatatom 835 -11 8 0 0 0 - - -;
+#X obj 777 -63 r setUp;
+#X obj 835 -64 r thisSA;
+#X obj 833 70 hsl 100 20 0 90 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 0 1;
+#X floatatom 830 102 8 0 0 0 - - -;
+#X obj 772 50 r setUp;
+#X obj 830 49 r thisSA;
+#X obj 831 148 hsl 100 20 0 90 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 0 1;
+#X floatatom 828 180 8 0 0 0 - - -;
+#X obj 770 128 r setUp;
+#X obj 828 127 r thisSA;
+#N canvas 419 64 689 650 allSource 0;
+#X obj 187 127 r distance;
+#X obj 170 106 r angle;
+#X obj 153 65 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
+-1;
+#X obj 153 37 r setUp;
+#X obj 204 147 r elev;
+#X msg 153 84 10;
+#X obj 153 170 tenSource;
+#X connect 0 0 6 2;
+#X connect 1 0 6 1;
+#X connect 2 0 5 0;
+#X connect 3 0 2 0;
+#X connect 4 0 6 3;
+#X connect 5 0 6 0;
+#X restore 401 -65 pd allSource;
+#X obj 885 101 s presweepElev;
+#X obj 883 179 s postsweepElev;
+#X text 944 71 pre-sweep elevation;
+#X text 942 148 post-sweep elevation;
+#X text 951 -120 pre-sweep azimuth;
+#X text 949 -42 post-sweep azimuth;
+#X obj 892 -90 s presweepAzim;
+#X obj 890 -12 s postsweepAzim;
+#X obj 42 -108 s start_armLength;
+#X msg 42 -129 0.35;
+#X obj 420 -40 sweepTime;
+#X obj 682 -185 hsl 100 25 1 100 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 0 1;
+#X floatatom 698 -145 5 0 0 0 - - -;
+#X msg -158 -186 10;
+#X connect 3 0 5 0;
+#X connect 4 0 0 0;
+#X connect 4 1 1 0;
+#X connect 5 0 50 0;
+#X connect 6 0 7 0;
+#X connect 10 0 9 0;
+#X connect 10 0 11 0;
+#X connect 16 0 17 0;
+#X connect 16 0 113 0;
+#X connect 19 0 21 0;
+#X connect 19 0 22 0;
+#X connect 20 0 23 0;
+#X connect 20 0 24 0;
+#X connect 27 0 28 0;
+#X connect 29 0 31 0;
+#X connect 29 0 46 0;
+#X connect 30 0 33 0;
+#X connect 30 0 47 0;
+#X connect 35 0 36 0;
+#X connect 36 0 27 0;
+#X connect 37 0 36 1;
+#X connect 38 0 39 0;
+#X connect 40 0 10 0;
+#X connect 41 0 16 0;
+#X connect 42 0 19 0;
+#X connect 43 0 20 0;
+#X connect 44 0 29 0;
+#X connect 45 0 30 0;
+#X connect 50 0 4 0;
+#X connect 51 0 6 0;
+#X connect 52 0 116 0;
+#X connect 53 0 120 0;
+#X connect 54 0 55 0;
+#X connect 57 0 54 0;
+#X connect 65 0 10 0;
+#X connect 67 0 19 0;
+#X connect 68 0 20 0;
+#X connect 69 0 29 0;
+#X connect 70 0 30 0;
+#X connect 71 0 50 0;
+#X connect 72 0 58 0;
+#X connect 72 1 59 0;
+#X connect 72 2 60 0;
+#X connect 72 3 61 0;
+#X connect 72 4 62 0;
+#X connect 72 5 63 0;
+#X connect 72 6 64 0;
+#X connect 73 0 54 0;
+#X connect 74 0 120 0;
+#X connect 75 0 116 0;
+#X connect 76 0 6 0;
+#X connect 78 0 72 0;
+#X connect 78 0 85 0;
+#X connect 79 0 72 0;
+#X connect 79 0 85 0;
+#X connect 80 0 72 0;
+#X connect 80 0 85 0;
+#X connect 82 0 79 0;
+#X connect 83 0 84 0;
+#X connect 84 0 38 0;
+#X connect 85 0 86 0;
+#X connect 87 0 88 0;
+#X connect 87 0 92 0;
+#X connect 90 0 87 0;
+#X connect 91 0 87 0;
+#X connect 94 0 95 0;
+#X connect 94 0 114 0;
+#X connect 96 0 94 0;
+#X connect 98 0 99 0;
+#X connect 98 0 107 0;
+#X connect 100 0 98 0;
+#X connect 101 0 98 0;
+#X connect 102 0 103 0;
+#X connect 102 0 108 0;
+#X connect 104 0 102 0;
+#X connect 105 0 102 0;
+#X connect 116 0 115 0;
+#X connect 118 0 4 1;
+#X connect 118 0 119 0;
+#X connect 120 0 8 0;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/SwordSounds/centreAngles.pd	Fri Jul 24 16:16:18 2015 +0100
@@ -0,0 +1,149 @@
+#N canvas 0 22 1376 625 10;
+#X obj 69 174 f;
+#X obj 69 131 r GO;
+#X obj 84 152 r preswingTime;
+#X obj 231 232 line~;
+#X obj 96 296 loadbang;
+#X obj 96 317 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+1;
+#X obj 96 335 metro 10;
+#X obj 96 357 snapshot~;
+#X floatatom 96 377 5 0 0 0 - - -;
+#X obj 177 393 hsl 128 15 -90 270 0 0 empty empty empty -2 -8 0 10
+-262144 -1 -1 3175 1;
+#X obj 231 131 r setUp;
+#X text 214 112 Start at 0 speed;
+#X obj 231 259 outlet~;
+#X obj 246 152 r presweepAzim;
+#X obj 231 175 f;
+#X msg 231 198 \$1;
+#X msg 69 197 0 \$1;
+#X obj 355 76 t f b;
+#X obj 356 104 delay;
+#X obj 370 31 r preswingTime;
+#X obj 377 153 r postswingTime;
+#X obj 355 11 r GO;
+#X obj 355 53 f;
+#X obj 356 131 f;
+#X obj 356 176 pack;
+#X obj 398 79 r postsweepAzim;
+#X msg 356 202 \$1 \$2;
+#X obj 398 102 * -1;
+#X obj 179 131 r myEnd;
+#X text 294 251 Current source Azimuth angle;
+#X obj 858 143 f;
+#X obj 858 100 r GO;
+#X obj 879 166 r preswingTime;
+#X obj 1029 266 line~;
+#X obj 882 329 loadbang;
+#X obj 882 350 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+1;
+#X obj 882 368 metro 10;
+#X obj 882 390 snapshot~;
+#X floatatom 882 410 5 0 0 0 - - -;
+#X obj 963 426 hsl 128 15 -90 90 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 6350 1;
+#X obj 1029 165 r setUp;
+#X text 1012 146 Start at 0 speed;
+#X obj 1029 293 outlet~;
+#X obj 1029 209 f;
+#X msg 1029 232 \$1;
+#X obj 1141 109 t f b;
+#X obj 1142 137 delay;
+#X obj 1156 64 r preswingTime;
+#X obj 1163 186 r postswingTime;
+#X obj 1141 44 r GO;
+#X obj 1141 86 f;
+#X obj 1142 164 f;
+#X obj 1142 209 pack;
+#X msg 1142 235 \$1 \$2;
+#X obj 977 165 r myEnd;
+#X text 1092 285 Current source Azimuth angle;
+#X obj 1044 186 r presweepElev;
+#X obj 1184 112 r postsweepElev;
+#X obj 858 190 pack;
+#X obj 873 122 r midElev;
+#X msg 858 224 \$1 \$2;
+#X obj 658 108 +;
+#X obj 643 135 /;
+#X obj 616 87 t f f;
+#X floatatom 589 166 5 0 0 0 - - -;
+#X obj 658 158 r presweepElev;
+#X obj 673 180 r postsweepElev;
+#X obj 658 64 r postswingTime;
+#X obj 673 86 r preswingTime;
+#X obj 658 209 +;
+#X obj 643 232 *;
+#X floatatom 606 259 5 0 0 0 - - -;
+#X obj 643 255 s midElev;
+#X text 536 -66 Calculate the angles with respect to the centre of
+the swing circle;
+#X connect 0 0 16 0;
+#X connect 1 0 0 0;
+#X connect 2 0 0 1;
+#X connect 3 0 7 0;
+#X connect 3 0 12 0;
+#X connect 4 0 5 0;
+#X connect 5 0 6 0;
+#X connect 6 0 7 0;
+#X connect 7 0 8 0;
+#X connect 7 0 9 0;
+#X connect 10 0 14 0;
+#X connect 13 0 14 1;
+#X connect 14 0 15 0;
+#X connect 15 0 3 0;
+#X connect 16 0 3 0;
+#X connect 17 0 18 1;
+#X connect 17 1 18 0;
+#X connect 18 0 23 0;
+#X connect 19 0 22 1;
+#X connect 20 0 24 1;
+#X connect 21 0 22 0;
+#X connect 22 0 17 0;
+#X connect 23 0 24 0;
+#X connect 24 0 26 0;
+#X connect 25 0 27 0;
+#X connect 26 0 3 0;
+#X connect 27 0 23 1;
+#X connect 28 0 14 0;
+#X connect 30 0 58 0;
+#X connect 31 0 30 0;
+#X connect 32 0 58 1;
+#X connect 33 0 37 0;
+#X connect 33 0 42 0;
+#X connect 34 0 35 0;
+#X connect 35 0 36 0;
+#X connect 36 0 37 0;
+#X connect 37 0 38 0;
+#X connect 37 0 39 0;
+#X connect 40 0 43 0;
+#X connect 43 0 44 0;
+#X connect 44 0 33 0;
+#X connect 45 0 46 1;
+#X connect 45 1 46 0;
+#X connect 46 0 51 0;
+#X connect 47 0 50 1;
+#X connect 48 0 52 1;
+#X connect 49 0 50 0;
+#X connect 50 0 45 0;
+#X connect 51 0 52 0;
+#X connect 52 0 53 0;
+#X connect 53 0 33 0;
+#X connect 54 0 43 0;
+#X connect 56 0 43 1;
+#X connect 57 0 51 1;
+#X connect 58 0 60 0;
+#X connect 59 0 30 1;
+#X connect 60 0 33 0;
+#X connect 61 0 62 1;
+#X connect 62 0 64 0;
+#X connect 62 0 70 0;
+#X connect 63 0 61 0;
+#X connect 63 1 62 0;
+#X connect 65 0 69 0;
+#X connect 66 0 69 1;
+#X connect 67 0 63 0;
+#X connect 68 0 61 1;
+#X connect 69 0 70 1;
+#X connect 70 0 71 0;
+#X connect 70 0 72 0;
--- a/SwordSounds/sourceSpeed.pd	Thu Jul 23 14:59:04 2015 +0100
+++ b/SwordSounds/sourceSpeed.pd	Fri Jul 24 16:16:18 2015 +0100
@@ -55,22 +55,8 @@
 #X text 156 84 Average Speed;
 #X text 153 108 Top Speed for this source;
 #X floatatom 60 130 5 0 0 0 - - -;
-#X obj 375 -63 r \$0_mySourceNo;
-#X obj 375 -22 *;
-#X obj 375 19 +;
-#X floatatom 312 40 5 0 0 0 - - -;
-#X obj 375 83 /;
-#X obj 390 61 * 0.001;
-#X obj 375 110 * 2;
-#X text 418 90 Average Speed;
-#X text 415 114 Top Speed for this source;
-#X floatatom 322 136 5 0 0 0 - - -;
-#X obj 390 -43 r deltaPostCirc;
-#X obj 390 -2 r minPostCirc;
-#X obj 390 40 r postswingTime;
 #X obj 113 131 s \$0_myPreSourceSpeed;
 #X obj 98 252 r \$0_myPreSourceSpeed;
-#X obj 375 137 s \$0_myPostSourceSpeed;
 #X obj 450 298 r postswingTime;
 #X floatatom 482 321 5 0 0 0 - - -;
 #X obj 392 214 r GO;
@@ -87,35 +73,35 @@
 #X obj 773 107 +;
 #X obj 788 85 r start_armLength;
 #X text 828 133 Distance from centre of arc;
-#X obj 779 297 f;
-#X obj 779 254 r GO;
-#X obj 794 275 r preswingTime;
-#X obj 941 355 line~;
-#X obj 806 419 loadbang;
-#X obj 806 440 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+#X obj 700 374 f;
+#X obj 700 331 r GO;
+#X obj 715 352 r preswingTime;
+#X obj 862 432 line~;
+#X obj 727 496 loadbang;
+#X obj 727 517 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
 1;
-#X obj 806 458 metro 10;
-#X obj 806 480 snapshot~;
-#X floatatom 806 500 5 0 0 0 - - -;
-#X obj 887 516 hsl 128 15 -90 270 0 0 empty empty empty -2 -8 0 10
--262144 -1 -1 5884 1;
-#X obj 941 254 r setUp;
-#X text 924 235 Start at 0 speed;
-#X obj 941 382 outlet~;
-#X obj 956 275 r presweepAzim;
-#X obj 941 298 f;
-#X msg 941 321 \$1;
-#X msg 779 320 0 \$1;
-#X obj 1065 199 t f b;
-#X obj 1066 227 delay;
-#X obj 1080 152 r preswingTime;
-#X obj 1087 276 r postswingTime;
-#X obj 1065 132 r GO;
-#X obj 1065 174 f;
-#X obj 1066 254 f;
-#X obj 1066 299 pack;
-#X obj 1108 202 r postsweepAzim;
-#X msg 1066 325 \$1 \$2;
+#X obj 727 535 metro 10;
+#X obj 727 557 snapshot~;
+#X floatatom 727 577 5 0 0 0 - - -;
+#X obj 808 593 hsl 128 15 -90 270 0 0 empty empty empty -2 -8 0 10
+-262144 -1 -1 6318 1;
+#X obj 862 331 r setUp;
+#X text 845 312 Start at 0 speed;
+#X obj 862 459 outlet~;
+#X obj 877 352 r presweepAzim;
+#X obj 862 375 f;
+#X msg 862 398 \$1;
+#X msg 700 397 0 \$1;
+#X obj 986 276 t f b;
+#X obj 987 304 delay;
+#X obj 1001 231 r preswingTime;
+#X obj 1008 353 r postswingTime;
+#X obj 986 211 r GO;
+#X obj 986 253 f;
+#X obj 987 331 f;
+#X obj 987 376 pack;
+#X obj 1029 279 r postsweepAzim;
+#X msg 987 402 \$1 \$2;
 #X obj 1064 -89 r preswingTime;
 #X obj 1049 -67 +;
 #X obj 1036 34 delay;
@@ -123,13 +109,58 @@
 #X obj 1034 -132 r GO;
 #X obj 1034 -44 f;
 #X obj 1063 11 + 5;
-#X obj 1108 225 * -1;
+#X obj 1029 302 * -1;
 #X obj 1049 -111 r postswingTime;
 #X obj 1036 57 s myEnd;
-#X obj 889 254 r myEnd;
+#X obj 810 331 r myEnd;
 #X obj 773 156 outlet~;
 #X obj 773 132 sig~;
-#X text 1004 374 Current source Azimuth angle;
+#X text 925 451 Current source Azimuth angle;
+#X obj 1135 259 f;
+#X obj 1135 216 r GO;
+#X obj 1186 278 r preswingTime;
+#X obj 1309 421 line~;
+#X obj 1174 485 loadbang;
+#X obj 1174 506 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1
+1 1;
+#X obj 1174 524 metro 10;
+#X obj 1174 546 snapshot~;
+#X floatatom 1174 566 5 0 0 0 - - -;
+#X obj 1255 582 hsl 128 15 -90 90 0 0 empty empty empty -2 -8 0 10
+-262144 -1 -1 12700 1;
+#X obj 1309 320 r setUp;
+#X text 1292 301 Start at 0 speed;
+#X obj 1309 448 outlet~;
+#X obj 1309 364 f;
+#X msg 1309 387 \$1;
+#X obj 1433 265 t f b;
+#X obj 1434 293 delay;
+#X obj 1448 220 r preswingTime;
+#X obj 1455 342 r postswingTime;
+#X obj 1433 200 r GO;
+#X obj 1433 242 f;
+#X obj 1434 320 f;
+#X obj 1434 365 pack;
+#X msg 1434 391 \$1 \$2;
+#X obj 1257 320 r myEnd;
+#X text 1372 440 Current source Azimuth angle;
+#X obj 1324 341 r presweepElev;
+#X obj 1476 268 r postsweepElev;
+#X obj 1258 -49 +;
+#X obj 1243 -22 /;
+#X obj 1216 -70 t f f;
+#X floatatom 1189 9 5 0 0 0 - - -;
+#X obj 1258 1 r presweepElev;
+#X obj 1273 23 r postsweepElev;
+#X obj 1258 -93 r postswingTime;
+#X obj 1273 -71 r preswingTime;
+#X obj 1258 52 +;
+#X obj 1243 75 *;
+#X floatatom 1206 102 5 0 0 0 - - -;
+#X obj 1150 346 pack;
+#X obj 1243 98 s midElev;
+#X obj 1150 238 r midElev;
+#X msg 1150 380 \$1 \$2;
 #X connect 0 0 1 0;
 #X connect 2 0 3 0;
 #X connect 4 0 9 0;
@@ -147,9 +178,9 @@
 #X connect 17 0 4 0;
 #X connect 18 0 19 1;
 #X connect 18 1 19 0;
-#X connect 19 0 71 0;
+#X connect 19 0 57 0;
 #X connect 20 0 14 0;
-#X connect 23 0 70 1;
+#X connect 23 0 56 1;
 #X connect 26 0 28 0;
 #X connect 27 0 29 0;
 #X connect 32 0 13 1;
@@ -167,69 +198,99 @@
 #X connect 45 0 47 0;
 #X connect 46 0 45 1;
 #X connect 47 0 50 0;
-#X connect 47 0 64 0;
-#X connect 51 0 52 0;
-#X connect 52 0 53 0;
+#X connect 47 0 51 0;
+#X connect 52 0 15 1;
 #X connect 53 0 54 0;
-#X connect 53 0 55 0;
-#X connect 55 0 57 0;
-#X connect 56 0 55 1;
-#X connect 57 0 60 0;
-#X connect 57 0 66 0;
-#X connect 61 0 52 1;
-#X connect 62 0 53 1;
-#X connect 63 0 56 0;
-#X connect 65 0 15 1;
-#X connect 67 0 68 0;
-#X connect 67 0 71 1;
-#X connect 69 0 70 0;
-#X connect 70 0 18 0;
-#X connect 71 0 17 0;
-#X connect 72 0 74 1;
+#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 108 0;
+#X connect 67 0 66 1;
+#X connect 69 0 85 0;
+#X connect 70 0 69 0;
+#X connect 71 0 69 1;
+#X connect 72 0 76 0;
+#X connect 72 0 81 0;
 #X connect 73 0 74 0;
-#X connect 74 0 78 0;
-#X connect 75 0 77 1;
+#X connect 74 0 75 0;
+#X connect 75 0 76 0;
 #X connect 76 0 77 0;
-#X connect 77 0 78 1;
-#X connect 78 0 80 0;
-#X connect 80 0 79 0;
-#X connect 80 0 122 0;
-#X connect 81 0 80 1;
-#X connect 83 0 99 0;
-#X connect 84 0 83 0;
-#X connect 85 0 83 1;
-#X connect 86 0 90 0;
-#X connect 86 0 95 0;
-#X connect 87 0 88 0;
-#X connect 88 0 89 0;
-#X connect 89 0 90 0;
+#X connect 76 0 78 0;
+#X connect 79 0 83 0;
+#X connect 82 0 83 1;
+#X connect 83 0 84 0;
+#X connect 84 0 72 0;
+#X connect 85 0 72 0;
+#X connect 86 0 87 1;
+#X connect 86 1 87 0;
+#X connect 87 0 92 0;
+#X connect 88 0 91 1;
+#X connect 89 0 93 1;
 #X connect 90 0 91 0;
-#X connect 90 0 92 0;
-#X connect 93 0 97 0;
+#X connect 91 0 86 0;
+#X connect 92 0 93 0;
+#X connect 93 0 95 0;
+#X connect 94 0 103 0;
+#X connect 95 0 72 0;
 #X connect 96 0 97 1;
-#X connect 97 0 98 0;
-#X connect 98 0 86 0;
-#X connect 99 0 86 0;
-#X connect 100 0 101 1;
-#X connect 100 1 101 0;
-#X connect 101 0 106 0;
-#X connect 102 0 105 1;
-#X connect 103 0 107 1;
-#X connect 104 0 105 0;
-#X connect 105 0 100 0;
-#X connect 106 0 107 0;
-#X connect 107 0 109 0;
-#X connect 108 0 117 0;
-#X connect 109 0 86 0;
-#X connect 110 0 111 1;
-#X connect 111 0 115 1;
-#X connect 112 0 119 0;
-#X connect 113 0 116 0;
-#X connect 113 1 112 0;
+#X connect 97 0 101 1;
+#X connect 98 0 105 0;
+#X connect 99 0 102 0;
+#X connect 99 1 98 0;
+#X connect 100 0 101 0;
+#X connect 101 0 99 0;
+#X connect 102 0 98 1;
+#X connect 103 0 92 1;
+#X connect 104 0 97 0;
+#X connect 106 0 83 0;
+#X connect 108 0 107 0;
+#X connect 110 0 149 0;
+#X connect 111 0 110 0;
+#X connect 112 0 149 1;
+#X connect 113 0 117 0;
+#X connect 113 0 122 0;
 #X connect 114 0 115 0;
-#X connect 115 0 113 0;
-#X connect 116 0 112 1;
-#X connect 117 0 106 1;
-#X connect 118 0 111 0;
-#X connect 120 0 97 0;
-#X connect 122 0 121 0;
+#X connect 115 0 116 0;
+#X connect 116 0 117 0;
+#X connect 117 0 118 0;
+#X connect 117 0 119 0;
+#X connect 120 0 123 0;
+#X connect 123 0 124 0;
+#X connect 124 0 113 0;
+#X connect 125 0 126 1;
+#X connect 125 1 126 0;
+#X connect 126 0 131 0;
+#X connect 127 0 130 1;
+#X connect 128 0 132 1;
+#X connect 129 0 130 0;
+#X connect 130 0 125 0;
+#X connect 131 0 132 0;
+#X connect 132 0 133 0;
+#X connect 133 0 113 0;
+#X connect 134 0 123 0;
+#X connect 136 0 123 1;
+#X connect 137 0 131 1;
+#X connect 138 0 139 1;
+#X connect 139 0 141 0;
+#X connect 139 0 147 0;
+#X connect 140 0 138 0;
+#X connect 140 1 139 0;
+#X connect 142 0 146 0;
+#X connect 143 0 146 1;
+#X connect 144 0 140 0;
+#X connect 145 0 138 1;
+#X connect 146 0 147 1;
+#X connect 147 0 148 0;
+#X connect 147 0 150 0;
+#X connect 149 0 152 0;
+#X connect 151 0 110 1;
+#X connect 152 0 113 0;
--- a/SwordSounds/tenSource.pd	Thu Jul 23 14:59:04 2015 +0100
+++ b/SwordSounds/tenSource.pd	Fri Jul 24 16:16:18 2015 +0100
@@ -1,8 +1,6 @@
-#N canvas 272 62 1259 813 10;
+#N canvas 198 54 1259 813 10;
 #X obj 670 10 inlet;
 #X obj 670 31 i;
-#X obj 670 53 - 1;
-#X obj 670 76 * 10;
 #X obj 670 100 s \$0_thisGroup;
 #X obj -159 58 r \$0_thisGroup;
 #X obj -33 136 *;
@@ -142,8 +140,8 @@
 #X obj 80 596 sourceSpeed;
 #X obj -155 598 sourceSpeed;
 #X obj -158 336 sourceSpeed;
+#X obj 77 385 woSoFreqD2;
 #X obj -159 239 woSoFreqD2;
-#X obj 77 385 woSoFreqD2;
 #X obj -158 490 woSoFreqD2;
 #X obj -155 727 woSoFreqD2;
 #X obj 80 750 woSoFreqD2;
@@ -152,162 +150,164 @@
 #X obj 772 475 woSoFreqD2;
 #X obj 537 352 woSoFreqD2;
 #X obj 313 375 woSoFreqD2;
+#X obj 670 76 * 1;
+#X obj 670 53 - 9;
 #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 132 0;
-#X connect 6 0 11 1;
-#X connect 7 0 6 1;
+#X connect 0 0 10 0;
+#X connect 1 0 152 0;
+#X connect 3 0 130 0;
+#X connect 4 0 9 1;
+#X connect 5 0 4 1;
+#X connect 6 0 7 0;
+#X connect 7 0 4 0;
 #X connect 8 0 9 0;
-#X connect 9 0 6 0;
+#X connect 9 0 131 0;
+#X connect 9 0 142 1;
 #X connect 10 0 11 0;
-#X connect 11 0 133 0;
-#X connect 11 0 143 1;
-#X connect 12 0 13 0;
-#X connect 12 0 14 0;
-#X connect 12 0 15 0;
-#X connect 12 0 16 0;
-#X connect 12 0 17 0;
-#X connect 12 0 18 0;
-#X connect 12 0 19 0;
-#X connect 12 0 20 0;
-#X connect 12 0 21 0;
-#X connect 12 0 22 0;
-#X connect 13 0 28 0;
-#X connect 14 0 27 0;
-#X connect 15 0 26 0;
-#X connect 16 0 25 0;
-#X connect 17 0 24 0;
-#X connect 18 0 23 0;
+#X connect 10 0 12 0;
+#X connect 10 0 13 0;
+#X connect 10 0 14 0;
+#X connect 10 0 15 0;
+#X connect 10 0 16 0;
+#X connect 10 0 17 0;
+#X connect 10 0 18 0;
+#X connect 10 0 19 0;
+#X connect 10 0 20 0;
+#X connect 11 0 26 0;
+#X connect 12 0 25 0;
+#X connect 13 0 24 0;
+#X connect 14 0 23 0;
+#X connect 15 0 22 0;
+#X connect 16 0 21 0;
+#X connect 17 0 27 0;
+#X connect 18 0 28 0;
 #X connect 19 0 29 0;
 #X connect 20 0 30 0;
-#X connect 21 0 31 0;
-#X connect 22 0 32 0;
-#X connect 33 0 9 1;
-#X connect 34 0 132 1;
-#X connect 35 0 142 0;
-#X connect 36 0 41 1;
-#X connect 37 0 36 1;
+#X connect 31 0 7 1;
+#X connect 32 0 130 1;
+#X connect 33 0 140 0;
+#X connect 34 0 39 1;
+#X connect 35 0 34 1;
+#X connect 36 0 37 0;
+#X connect 37 0 34 0;
 #X connect 38 0 39 0;
-#X connect 39 0 36 0;
-#X connect 40 0 41 0;
-#X connect 41 0 145 1;
-#X connect 42 0 142 1;
-#X connect 43 0 39 1;
-#X connect 44 0 141 0;
-#X connect 45 0 50 1;
-#X connect 46 0 45 1;
+#X connect 39 0 143 1;
+#X connect 40 0 140 1;
+#X connect 41 0 37 1;
+#X connect 42 0 139 0;
+#X connect 43 0 48 1;
+#X connect 44 0 43 1;
+#X connect 45 0 46 0;
+#X connect 46 0 43 0;
 #X connect 47 0 48 0;
-#X connect 48 0 45 0;
-#X connect 49 0 50 0;
-#X connect 50 0 146 1;
-#X connect 51 0 141 1;
-#X connect 52 0 48 1;
-#X connect 53 0 134 0;
-#X connect 54 0 59 1;
-#X connect 55 0 54 1;
+#X connect 48 0 144 1;
+#X connect 49 0 139 1;
+#X connect 50 0 46 1;
+#X connect 51 0 132 0;
+#X connect 52 0 57 1;
+#X connect 53 0 52 1;
+#X connect 54 0 55 0;
+#X connect 55 0 52 0;
 #X connect 56 0 57 0;
-#X connect 57 0 54 0;
-#X connect 58 0 59 0;
-#X connect 59 0 144 1;
-#X connect 60 0 134 1;
-#X connect 61 0 57 1;
-#X connect 62 0 140 0;
-#X connect 63 0 68 1;
-#X connect 64 0 63 1;
+#X connect 57 0 141 1;
+#X connect 58 0 132 1;
+#X connect 59 0 55 1;
+#X connect 60 0 138 0;
+#X connect 61 0 66 1;
+#X connect 62 0 61 1;
+#X connect 63 0 64 0;
+#X connect 64 0 61 0;
 #X connect 65 0 66 0;
-#X connect 66 0 63 0;
-#X connect 67 0 68 0;
-#X connect 68 0 147 1;
-#X connect 69 0 66 1;
-#X connect 70 0 140 1;
-#X connect 71 0 135 0;
-#X connect 72 0 77 1;
-#X connect 73 0 72 1;
+#X connect 66 0 145 1;
+#X connect 67 0 64 1;
+#X connect 68 0 138 1;
+#X connect 69 0 133 0;
+#X connect 70 0 75 1;
+#X connect 71 0 70 1;
+#X connect 72 0 73 0;
+#X connect 73 0 70 0;
 #X connect 74 0 75 0;
-#X connect 75 0 72 0;
-#X connect 76 0 77 0;
-#X connect 77 0 152 1;
-#X connect 78 0 135 1;
-#X connect 79 0 75 1;
-#X connect 80 0 139 0;
-#X connect 81 0 86 1;
-#X connect 82 0 81 1;
+#X connect 75 0 150 1;
+#X connect 76 0 133 1;
+#X connect 77 0 73 1;
+#X connect 78 0 137 0;
+#X connect 79 0 84 1;
+#X connect 80 0 79 1;
+#X connect 81 0 82 0;
+#X connect 82 0 79 0;
 #X connect 83 0 84 0;
-#X connect 84 0 81 0;
-#X connect 85 0 86 0;
-#X connect 86 0 148 1;
-#X connect 87 0 139 1;
-#X connect 88 0 84 1;
-#X connect 89 0 136 0;
-#X connect 90 0 95 1;
-#X connect 91 0 90 1;
+#X connect 84 0 146 1;
+#X connect 85 0 137 1;
+#X connect 86 0 82 1;
+#X connect 87 0 134 0;
+#X connect 88 0 93 1;
+#X connect 89 0 88 1;
+#X connect 90 0 91 0;
+#X connect 91 0 88 0;
 #X connect 92 0 93 0;
-#X connect 93 0 90 0;
-#X connect 94 0 95 0;
-#X connect 95 0 151 1;
-#X connect 96 0 136 1;
-#X connect 97 0 93 1;
-#X connect 98 0 138 0;
-#X connect 99 0 104 1;
-#X connect 100 0 99 1;
+#X connect 93 0 149 1;
+#X connect 94 0 134 1;
+#X connect 95 0 91 1;
+#X connect 96 0 136 0;
+#X connect 97 0 102 1;
+#X connect 98 0 97 1;
+#X connect 99 0 100 0;
+#X connect 100 0 97 0;
 #X connect 101 0 102 0;
-#X connect 102 0 99 0;
-#X connect 103 0 104 0;
-#X connect 104 0 149 1;
-#X connect 105 0 138 1;
-#X connect 106 0 102 1;
-#X connect 107 0 137 0;
-#X connect 108 0 113 1;
-#X connect 109 0 108 1;
+#X connect 102 0 147 1;
+#X connect 103 0 136 1;
+#X connect 104 0 100 1;
+#X connect 105 0 135 0;
+#X connect 106 0 111 1;
+#X connect 107 0 106 1;
+#X connect 108 0 109 0;
+#X connect 109 0 106 0;
 #X connect 110 0 111 0;
-#X connect 111 0 108 0;
-#X connect 112 0 113 0;
-#X connect 113 0 150 1;
-#X connect 114 0 137 1;
-#X connect 115 0 111 1;
-#X connect 116 0 119 0;
-#X connect 117 0 118 0;
-#X connect 120 0 121 0;
-#X connect 122 0 152 4;
-#X connect 123 0 144 4;
-#X connect 124 0 143 4;
+#X connect 111 0 148 1;
+#X connect 112 0 135 1;
+#X connect 113 0 109 1;
+#X connect 114 0 117 0;
+#X connect 115 0 116 0;
+#X connect 118 0 119 0;
+#X connect 120 0 150 4;
+#X connect 121 0 141 4;
+#X connect 122 0 142 4;
+#X connect 123 0 143 4;
+#X connect 124 0 144 4;
 #X connect 125 0 145 4;
 #X connect 126 0 146 4;
 #X connect 127 0 147 4;
 #X connect 128 0 148 4;
 #X connect 129 0 149 4;
-#X connect 130 0 150 4;
-#X connect 131 0 151 4;
-#X connect 132 0 143 0;
-#X connect 132 1 143 2;
-#X connect 132 2 143 3;
-#X connect 134 0 144 0;
-#X connect 134 1 144 2;
-#X connect 134 2 144 3;
-#X connect 135 0 152 0;
-#X connect 135 1 152 2;
-#X connect 135 2 152 3;
-#X connect 136 0 151 0;
-#X connect 136 1 151 2;
-#X connect 136 2 151 3;
-#X connect 137 0 150 0;
-#X connect 137 1 150 2;
-#X connect 137 2 150 3;
-#X connect 138 0 149 0;
-#X connect 138 1 149 2;
-#X connect 138 2 149 3;
-#X connect 139 0 148 0;
-#X connect 139 1 148 2;
-#X connect 139 2 148 3;
-#X connect 140 0 147 0;
-#X connect 140 1 147 2;
-#X connect 140 2 147 3;
-#X connect 141 0 146 0;
-#X connect 141 1 146 2;
-#X connect 141 2 146 3;
-#X connect 142 0 145 0;
-#X connect 142 1 145 2;
-#X connect 142 2 145 3;
+#X connect 130 0 142 0;
+#X connect 130 1 142 2;
+#X connect 130 2 142 3;
+#X connect 132 0 141 0;
+#X connect 132 1 141 2;
+#X connect 132 2 141 3;
+#X connect 133 0 150 0;
+#X connect 133 1 150 2;
+#X connect 133 2 150 3;
+#X connect 134 0 149 0;
+#X connect 134 1 149 2;
+#X connect 134 2 149 3;
+#X connect 135 0 148 0;
+#X connect 135 1 148 2;
+#X connect 135 2 148 3;
+#X connect 136 0 147 0;
+#X connect 136 1 147 2;
+#X connect 136 2 147 3;
+#X connect 137 0 146 0;
+#X connect 137 1 146 2;
+#X connect 137 2 146 3;
+#X connect 138 0 145 0;
+#X connect 138 1 145 2;
+#X connect 138 2 145 3;
+#X connect 139 0 144 0;
+#X connect 139 1 144 2;
+#X connect 139 2 144 3;
+#X connect 140 0 143 0;
+#X connect 140 1 143 2;
+#X connect 140 2 143 3;
+#X connect 151 0 2 0;
+#X connect 152 0 151 0;
--- a/SwordSounds/woSoFreqD2.pd	Thu Jul 23 14:59:04 2015 +0100
+++ b/SwordSounds/woSoFreqD2.pd	Fri Jul 24 16:16:18 2015 +0100
@@ -61,7 +61,7 @@
 #X obj 556 -73 r~ \$0_str;
 #X obj 563 207 r~ \$0-windSpeed;
 #X obj 552 184 r~ \$0_str;
-#N canvas 790 279 622 660 noiseGain 0;
+#N canvas 790 279 622 660 noiseGain 1;
 #X text -21205 129 Mass Density of Air \, squared;
 #X text -20857 164 Speed of Sound to power 2;
 #X obj -21070 29 *~;
@@ -194,8 +194,6 @@
 #X text -20953 99 Length;
 #X text -20848 459 Need for scienctific reasoning here!;
 #X text -21239 441 Need for scienctific reasoning here!;
-#X obj -21021 444 *~ 0.02;
-#X obj -20911 460 *~ 0.002;
 #X obj -20859 92 inlet~;
 #X obj -20942 229 inlet~;
 #X obj -21000 282 +~ 90;
@@ -210,14 +208,16 @@
 #X obj -20859 118 *~;
 #X obj -20859 141 *~ 118033;
 #X obj -21022 193 /~;
+#X obj -21021 444 *~ 0.01;
+#X obj -20911 460 *~ 0.001;
 #X connect 2 0 3 1;
 #X connect 3 0 4 0;
 #X connect 4 0 5 0;
 #X connect 5 0 28 0;
-#X connect 6 0 32 0;
-#X connect 8 0 33 0;
+#X connect 6 0 46 0;
+#X connect 8 0 47 0;
 #X connect 12 0 3 0;
-#X connect 14 0 44 0;
+#X connect 14 0 42 0;
 #X connect 15 0 2 0;
 #X connect 15 0 2 1;
 #X connect 16 0 12 0;
@@ -226,34 +226,34 @@
 #X connect 26 0 27 0;
 #X connect 26 0 27 1;
 #X connect 27 0 28 1;
-#X connect 28 0 47 0;
-#X connect 32 0 19 0;
-#X connect 33 0 20 0;
-#X connect 34 0 45 0;
-#X connect 34 0 45 1;
+#X connect 28 0 45 0;
+#X connect 32 0 43 0;
+#X connect 32 0 43 1;
+#X connect 33 0 34 0;
+#X connect 33 0 39 0;
+#X connect 34 0 35 0;
 #X connect 35 0 36 0;
-#X connect 35 0 41 0;
 #X connect 36 0 37 0;
-#X connect 37 0 38 0;
-#X connect 38 0 39 0;
-#X connect 38 0 39 1;
-#X connect 39 0 40 1;
-#X connect 40 0 6 0;
-#X connect 41 0 42 0;
-#X connect 42 0 43 0;
-#X connect 42 0 43 1;
-#X connect 43 0 44 1;
-#X connect 44 0 8 0;
-#X connect 45 0 46 0;
-#X connect 46 0 47 1;
-#X connect 47 0 13 0;
-#X connect 47 0 40 0;
+#X connect 36 0 37 1;
+#X connect 37 0 38 1;
+#X connect 38 0 6 0;
+#X connect 39 0 40 0;
+#X connect 40 0 41 0;
+#X connect 40 0 41 1;
+#X connect 41 0 42 1;
+#X connect 42 0 8 0;
+#X connect 43 0 44 0;
+#X connect 44 0 45 1;
+#X connect 45 0 13 0;
+#X connect 45 0 38 0;
+#X connect 46 0 19 0;
+#X connect 47 0 20 0;
 #X restore 552 336 pd noiseGain;
 #X obj 575 228 r \$0-diameter;
 #X obj 609 291 r \$0_elev;
 #X obj 552 381 s~ \$0_liftNoiseGain;
 #X obj 621 359 s~ \$0_dragNoiseGain;
-#N canvas 242 208 702 650 freqGain 1;
+#N canvas 242 208 702 650 freqGain 0;
 #X text 36 127 Mass Density of Air \, squared;
 #X text 508 93 Speed of Sound to power 2;
 #N canvas 759 125 286 289 pow6 0;
@@ -459,10 +459,6 @@
 #X obj 906 465 *~ 1;
 #X obj 940 375 clip~ 2 400;
 #X obj 932 15 clip~ 2 400;
-#X obj 940 324 *~ -0.003;
-#X obj 932 -36 *~ -0.003;
-#X obj 932 -11 +~ 20;
-#X obj 940 349 +~ 20;
 #X obj 1021 17 metro 10;
 #X obj 1029 377 metro 10;
 #X text 942 478 Drag Dipole spectrum calculation;
@@ -498,12 +494,16 @@
 #X obj 883 181 fcpan~;
 #X obj 621 312 r~ \$0_dist;
 #X obj 598 270 r~ \$0_azim;
+#X obj 932 -11 +~ 40;
+#X obj 940 349 +~ 40;
+#X obj 932 -36 *~ -0.002;
+#X obj 940 324 *~ -0.002;
 #X connect 3 0 5 0;
 #X connect 3 0 7 0;
 #X connect 4 0 21 0;
 #X connect 6 0 10 0;
 #X connect 8 0 4 0;
-#X connect 9 0 135 0;
+#X connect 9 0 131 0;
 #X connect 12 0 3 0;
 #X connect 13 0 16 0;
 #X connect 14 0 13 0;
@@ -555,21 +555,21 @@
 #X connect 73 0 60 3;
 #X connect 74 0 75 0;
 #X connect 76 0 97 1;
-#X connect 77 0 113 0;
-#X connect 80 0 137 0;
+#X connect 77 0 109 0;
+#X connect 80 0 133 0;
 #X connect 81 0 82 0;
 #X connect 81 0 97 2;
 #X connect 83 0 84 0;
-#X connect 84 0 107 0;
-#X connect 85 0 104 0;
+#X connect 84 0 103 0;
+#X connect 85 0 138 0;
 #X connect 86 0 96 0;
-#X connect 87 0 114 0;
-#X connect 90 0 136 0;
+#X connect 87 0 110 0;
+#X connect 90 0 132 0;
 #X connect 91 0 92 0;
 #X connect 91 0 98 2;
 #X connect 93 0 94 0;
-#X connect 94 0 108 0;
-#X connect 95 0 103 0;
+#X connect 94 0 104 0;
+#X connect 95 0 139 0;
 #X connect 96 0 98 1;
 #X connect 97 0 80 0;
 #X connect 98 0 90 0;
@@ -577,36 +577,36 @@
 #X connect 100 0 90 1;
 #X connect 101 0 91 0;
 #X connect 102 0 81 0;
-#X connect 103 0 106 0;
-#X connect 104 0 105 0;
-#X connect 105 0 102 0;
-#X connect 106 0 101 0;
-#X connect 107 0 81 0;
-#X connect 108 0 91 0;
-#X connect 111 0 100 0;
-#X connect 112 0 99 0;
-#X connect 113 0 97 0;
-#X connect 114 0 98 0;
-#X connect 115 0 113 1;
+#X connect 103 0 81 0;
+#X connect 104 0 91 0;
+#X connect 107 0 100 0;
+#X connect 108 0 99 0;
+#X connect 109 0 97 0;
+#X connect 110 0 98 0;
+#X connect 111 0 109 1;
+#X connect 112 0 113 0;
+#X connect 113 0 110 1;
+#X connect 114 0 115 0;
 #X connect 116 0 117 0;
-#X connect 117 0 114 1;
-#X connect 118 0 119 0;
-#X connect 120 0 121 0;
-#X connect 122 0 124 0;
-#X connect 123 0 125 0;
-#X connect 126 0 133 0;
-#X connect 127 0 128 0;
-#X connect 129 0 136 1;
-#X connect 130 0 135 1;
-#X connect 131 0 65 6;
-#X connect 132 0 65 4;
-#X connect 133 0 127 0;
-#X connect 134 0 137 1;
-#X connect 135 0 1 0;
-#X connect 135 1 2 0;
-#X connect 136 0 88 0;
-#X connect 136 1 89 0;
-#X connect 137 0 78 0;
-#X connect 137 1 79 0;
-#X connect 138 0 60 6;
-#X connect 139 0 60 4;
+#X connect 118 0 120 0;
+#X connect 119 0 121 0;
+#X connect 122 0 129 0;
+#X connect 123 0 124 0;
+#X connect 125 0 132 1;
+#X connect 126 0 131 1;
+#X connect 127 0 65 6;
+#X connect 128 0 65 4;
+#X connect 129 0 123 0;
+#X connect 130 0 133 1;
+#X connect 131 0 1 0;
+#X connect 131 1 2 0;
+#X connect 132 0 88 0;
+#X connect 132 1 89 0;
+#X connect 133 0 78 0;
+#X connect 133 1 79 0;
+#X connect 134 0 60 6;
+#X connect 135 0 60 4;
+#X connect 136 0 102 0;
+#X connect 137 0 101 0;
+#X connect 138 0 136 0;
+#X connect 139 0 137 0;
--- a/SwordSounds/woosh_D5.pd	Thu Jul 23 14:59:04 2015 +0100
+++ b/SwordSounds/woosh_D5.pd	Fri Jul 24 16:16:18 2015 +0100
@@ -130,14 +130,14 @@
 #X obj -178 -183 s NoOfSources;
 #X obj 85 141 s topSpeed;
 #X obj 33 115 hsl 100 20 0 100 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 4357 1;
+-1 -1 3857 1;
 #X floatatom 30 141 8 0 0 0 - - -;
 #X text 57 -216 Blade Length;
 #X text 56 -150 Arm Length;
 #X text -150 -206 Number of Sources;
 #X text 141 119 Top Speed;
 #X obj 820 -141 hsl 100 20 0 360 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 3012 1;
+-1 -1 3000 1;
 #X floatatom 817 -109 8 0 0 0 - - -;
 #X obj 518 174 s firstSpeed;
 #X obj 613 173 s deltaSpeed;
@@ -167,9 +167,9 @@
 #X connect 10 0 5 0;
 #X restore 382 -113 pd thickCalc;
 #X obj 27 202 hsl 100 20 0 0.03 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 8605 1;
+-1 -1 6205 1;
 #X obj 26 287 hsl 100 20 0 0.01 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 6175 1;
+-1 -1 7475 1;
 #X floatatom 24 232 8 0 0 0 - - -;
 #X obj 78 231 s hiltThick;
 #X floatatom 23 315 8 0 0 0 - - -;
@@ -203,7 +203,7 @@
 #X obj -317 191 r setUp;
 #X obj -203 155 s obsDistance;
 #X obj -207 242 s obsAngle;
-#N canvas 250 113 911 675 circumferCalc 0;
+#N canvas 184 363 911 675 circumferCalc 1;
 #X obj 440 104 +;
 #X obj 440 127 s length;
 #X obj 168 153 r start_armLength;
@@ -443,7 +443,7 @@
 #X connect 76 0 48 0;
 #X restore 381 -146 pd angleCalc;
 #X obj 553 -165 hsl 100 25 0 127 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 5818 1;
+-1 -1 4018 1;
 #X obj 24 -239 loadbang;
 #X obj 22 -170 loadbang;
 #X obj -178 -228 loadbang;
@@ -492,7 +492,7 @@
 #X obj -211 316 s obsElev;
 #X text -148 293 (Elevation);
 #X obj 818 -63 hsl 100 20 0 360 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 512 1;
+-1 -1 1300 1;
 #X floatatom 815 -31 8 0 0 0 - - -;
 #X obj 757 -83 r setUp;
 #X obj 815 -84 r thisSA;
@@ -506,7 +506,7 @@
 #X floatatom 808 160 8 0 0 0 - - -;
 #X obj 750 108 r setUp;
 #X obj 808 107 r thisSA;
-#N canvas 419 64 689 650 allSource 1;
+#N canvas 419 64 689 650 allSource 0;
 #X obj 401 300 r distance;
 #X obj 384 279 r angle;
 #X obj 367 238 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
@@ -514,7 +514,6 @@
 #X obj 367 210 r setUp;
 #X obj 418 320 r elev;
 #X msg 367 257 6;
-#X obj 367 343 tenSource;
 #X obj 127 302 r distance;
 #X obj 110 281 r angle;
 #X obj 93 240 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
@@ -527,8 +526,6 @@
 -1 -1;
 #X obj 235 213 r setUp;
 #X obj 286 323 r elev;
-#X obj 93 345 tenSource;
-#X obj 235 346 tenSource;
 #X msg 93 259 8;
 #X msg 235 260 7;
 #X obj 187 127 r distance;
@@ -543,40 +540,43 @@
 -1;
 #X obj 295 38 r setUp;
 #X obj 346 148 r elev;
-#X obj 153 170 tenSource;
-#X obj 295 171 tenSource;
 #X msg 153 84 10;
 #X msg 295 85 9;
-#X connect 0 0 6 2;
-#X connect 1 0 6 1;
+#X obj 153 170 tenSource;
+#X obj 367 343 tenSource;
+#X obj 93 345 tenSource;
+#X obj 235 346 tenSource;
+#X obj 295 171 tenSource;
+#X connect 0 0 31 2;
+#X connect 1 0 31 1;
 #X connect 2 0 5 0;
 #X connect 3 0 2 0;
-#X connect 4 0 6 3;
-#X connect 5 0 6 0;
-#X connect 7 0 17 2;
-#X connect 8 0 17 1;
-#X connect 9 0 19 0;
-#X connect 10 0 9 0;
-#X connect 11 0 17 3;
-#X connect 12 0 18 2;
-#X connect 13 0 18 1;
-#X connect 14 0 20 0;
-#X connect 15 0 14 0;
-#X connect 16 0 18 3;
-#X connect 19 0 17 0;
-#X connect 20 0 18 0;
-#X connect 21 0 31 2;
-#X connect 22 0 31 1;
-#X connect 23 0 33 0;
-#X connect 24 0 23 0;
-#X connect 25 0 31 3;
-#X connect 26 0 32 2;
-#X connect 27 0 32 1;
-#X connect 28 0 34 0;
-#X connect 29 0 28 0;
-#X connect 30 0 32 3;
-#X connect 33 0 31 0;
-#X connect 34 0 32 0;
+#X connect 4 0 31 3;
+#X connect 5 0 31 0;
+#X connect 6 0 32 2;
+#X connect 7 0 32 1;
+#X connect 8 0 16 0;
+#X connect 9 0 8 0;
+#X connect 10 0 32 3;
+#X connect 11 0 33 2;
+#X connect 12 0 33 1;
+#X connect 13 0 17 0;
+#X connect 14 0 13 0;
+#X connect 15 0 33 3;
+#X connect 16 0 32 0;
+#X connect 17 0 33 0;
+#X connect 18 0 30 2;
+#X connect 19 0 30 1;
+#X connect 20 0 28 0;
+#X connect 21 0 20 0;
+#X connect 22 0 30 3;
+#X connect 23 0 34 2;
+#X connect 24 0 34 1;
+#X connect 25 0 29 0;
+#X connect 26 0 25 0;
+#X connect 27 0 34 3;
+#X connect 28 0 30 0;
+#X connect 29 0 34 0;
 #X restore 381 -85 pd allSource;
 #X obj 865 81 s presweepElev;
 #X obj 863 159 s postsweepElev;
@@ -590,7 +590,7 @@
 #X msg 22 -149 0.35;
 #X obj 400 -60 sweepTime;
 #X obj 662 -205 hsl 100 25 1 100 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 6200 1;
+-1 -1 6600 1;
 #X floatatom 678 -165 5 0 0 0 - - -;
 #X connect 3 0 5 0;
 #X connect 4 0 0 0;