Mercurial > hg > weather-synthesis-prototyping

--- a/SwordSounds/Sword10_D2.pd	Fri Jul 24 19:31:22 2015 +0100
+++ b/SwordSounds/Sword10_D2.pd	Fri Jul 24 22:21:07 2015 +0100
@@ -1,4 +1,4 @@
-#N canvas 0 22 1418 816 10;
+#N canvas 5 78 1418 816 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;
@@ -38,16 +38,16 @@
 #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 4257 1;
-#X floatatom 50 161 8 0 0 0 - - -;
+#X obj 148 339 s topSpeed;
+#X obj 96 313 hsl 100 20 0 100 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 157 1;
+#X floatatom 93 339 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 text 204 317 Top Speed;
 #X obj 840 -121 hsl 100 20 -180 180 0 0 empty empty empty -2 -8 0 10
--262144 -1 -1 7150 1;
+-262144 -1 -1 7425 1;
 #X floatatom 837 -89 8 0 0 0 - - -;
 #N canvas 528 427 426 335 thickCalc 0;
 #X obj 173 139 r NoOfSources;
@@ -74,27 +74,27 @@
 #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
+#X obj 90 400 hsl 100 20 0 0.03 0 0 empty empty empty -2 -8 0 10 -262144
 -1 -1 2805 1;
-#X obj 46 307 hsl 100 20 0 0.01 0 0 empty empty empty -2 -8 0 10 -262144
+#X obj 89 485 hsl 100 20 0 0.01 0 0 empty empty empty -2 -8 0 10 -262144
 -1 -1 2475 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 floatatom 87 430 8 0 0 0 - - -;
+#X obj 141 429 s hiltThick;
+#X floatatom 86 513 8 0 0 0 - - -;
+#X obj 144 512 s tipThick;
+#X text 204 402 Hilt Thickness;
+#X text 196 486 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
+#X obj -196 326 hsl 100 20 100 1 1 0 empty empty empty -2 -8 0 10 -262144
 -1 -1 6920 1;
-#X obj -243 233 hsl 100 20 -180 180 0 0 empty empty empty -2 -8 0 10
+#X obj -200 411 hsl 100 20 -180 180 0 0 empty empty empty -2 -8 0 10
 -262144 -1 -1 7425 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 floatatom -199 352 8 0 0 0 - - -;
+#X text -86 330 Distance to Observer;
+#X floatatom -203 439 8 0 0 0 - - -;
+#X text -78 405 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;
@@ -103,14 +103,14 @@
 #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 40 287 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;
+#X obj 36 377 r setUp;
+#X obj 35 465 r setUp;
+#X obj -251 305 r setUp;
+#X obj -254 389 r setUp;
+#X obj -140 353 s obsDistance;
+#X obj -144 440 s obsAngle;
 #N canvas 303 28 1094 768 angleCalc 0;
 #X obj -129 105 * 0.75;
 #X obj 325 234 * 0.25;
@@ -262,7 +262,7 @@
 #X obj -158 -208 loadbang;
 #X msg -156 -114 0;
 #X obj -156 -92 s elev;
-#X text -124 239 (Azimuth);
+#X text -81 417 (Azimuth);
 #X obj -156 -137 loadbang;
 #X obj 467 575 s thisTS;
 #X obj 486 554 s thisSA;
@@ -271,12 +271,12 @@
 #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 93 287 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 87 377 r thisHT;
+#X obj 86 465 r thisTT;
+#X obj -199 305 r thisOD;
+#X obj -202 390 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;
@@ -295,21 +295,21 @@
 #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
+#X obj -204 485 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 floatatom -207 513 8 0 0 0 - - -;
+#X text -82 479 Angle to Observer;
+#X obj -258 463 r setUp;
+#X obj -206 464 r thisOE;
+#X obj -148 514 s obsElev;
+#X text -85 491 (Elevation);
 #X obj 838 -43 hsl 100 20 -180 180 0 0 empty empty empty -2 -8 0 10
 -262144 -1 -1 3300 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 -90 90 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 7700 1;
+-1 -1 4950 1;
 #X floatatom 830 102 8 0 0 0 - - -;
 #X obj 772 50 r setUp;
 #X obj 830 49 r thisSA;
@@ -318,7 +318,7 @@
 #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 1;
+#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
@@ -482,6 +482,29 @@
 #X restore 392 -16 pd maxCircCalc;
 #X msg 906 -144 80;
 #X obj 398 27 centreAngles;
+#X obj -89 55 hsl 128 15 -50 50 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 7758 1;
+#X obj -90 125 hsl 128 15 -50 50 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 6439 1;
+#X obj -90 192 hsl 128 15 -50 50 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 7458 1;
+#X obj -92 78 s Xobs;
+#X obj -93 145 s Yobs;
+#X obj -93 214 s Zobs;
+#X floatatom -132 78 5 0 0 0 - - -;
+#X floatatom -132 146 5 0 0 0 - - -;
+#X floatatom -133 214 5 0 0 0 - - -;
+#X msg -84 31 0;
+#X msg -90 166 0;
+#X msg -86 101 0.7;
+#X obj -137 29 r setUp;
+#X obj -142 102 r setUp;
+#X obj -146 169 r setUp;
+#X msg -34 100 0;
+#X msg 955 -148 90;
+#X msg -48 166 4;
+#X msg -42 27 4;
+#X msg 898 47 0;
 #X connect 3 0 5 0;
 #X connect 4 0 0 0;
 #X connect 4 1 1 0;
@@ -565,3 +588,20 @@
 #X connect 120 0 121 0;
 #X connect 121 0 117 0;
 #X connect 123 0 16 0;
+#X connect 125 0 128 0;
+#X connect 125 0 131 0;
+#X connect 126 0 129 0;
+#X connect 126 0 132 0;
+#X connect 127 0 130 0;
+#X connect 127 0 133 0;
+#X connect 134 0 125 0;
+#X connect 135 0 127 0;
+#X connect 136 0 126 0;
+#X connect 137 0 125 0;
+#X connect 138 0 126 0;
+#X connect 139 0 127 0;
+#X connect 140 0 126 0;
+#X connect 141 0 16 0;
+#X connect 142 0 127 0;
+#X connect 143 0 125 0;
+#X connect 144 0 97 0;
--- a/SwordSounds/centreAngles.pd	Fri Jul 24 19:31:22 2015 +0100
+++ b/SwordSounds/centreAngles.pd	Fri Jul 24 22:21:07 2015 +0100
@@ -1,96 +1,104 @@
 #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
+#X obj 69 140 f;
+#X obj 69 97 r GO;
+#X obj 84 118 r preswingTime;
+#X obj 231 198 line~;
+#X obj 96 262 loadbang;
+#X obj 96 283 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
+#X obj 96 301 metro 10;
+#X obj 96 323 snapshot~;
+#X floatatom 96 343 5 0 0 0 - - -;
+#X obj 177 359 hsl 128 15 -90 270 0 0 empty empty empty -2 -8 0 10
+-262144 -1 -1 5997 1;
+#X obj 231 97 r setUp;
+#X text 214 78 Start at 0 speed;
+#X obj 231 225 outlet~;
+#X obj 246 118 r presweepAzim;
+#X obj 231 141 f;
+#X msg 231 164 \$1;
+#X msg 69 163 0 \$1;
+#X obj 355 42 t f b;
+#X obj 356 70 delay;
+#X obj 370 -3 r preswingTime;
+#X obj 377 119 r postswingTime;
+#X obj 355 -23 r GO;
+#X obj 355 19 f;
+#X obj 356 97 f;
+#X obj 356 142 pack;
+#X obj 398 71 r postsweepAzim;
+#X msg 356 168 \$1 \$2;
+#X obj 179 97 r myEnd;
+#X text 294 217 Current source Azimuth angle;
+#X obj 858 109 f;
+#X obj 858 66 r GO;
+#X obj 879 132 r preswingTime;
+#X obj 1029 232 line~;
+#X obj 882 295 loadbang;
+#X obj 882 316 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 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
+#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 9878 1;
+#X obj 1029 131 r setUp;
+#X text 1012 112 Start at 0 speed;
+#X obj 1029 316 outlet~;
+#X obj 1029 175 f;
+#X msg 1029 198 \$1;
+#X obj 1141 75 t f b;
+#X obj 1142 103 delay;
+#X obj 1156 30 r preswingTime;
+#X obj 1163 152 r postswingTime;
+#X obj 1141 10 r GO;
+#X obj 1141 52 f;
+#X obj 1142 130 f;
+#X obj 1142 175 pack;
+#X msg 1142 201 \$1 \$2;
+#X obj 1044 152 r presweepElev;
+#X obj 1184 78 r postsweepElev;
+#X obj 858 156 pack;
+#X obj 873 88 r midElev;
+#X msg 858 190 \$1 \$2;
+#X obj 658 74 +;
+#X obj 643 101 /;
+#X obj 616 53 t f f;
+#X floatatom 589 132 5 0 0 0 - - -;
+#X obj 658 124 r presweepElev;
+#X obj 673 146 r postsweepElev;
+#X obj 658 30 r postswingTime;
+#X obj 673 52 r preswingTime;
+#X obj 658 175 +;
+#X obj 643 198 *;
+#X floatatom 606 225 5 0 0 0 - - -;
+#X obj 643 221 s midElev;
+#X text 536 -100 Calculate the angles with respect to the centre of
 the swing circle;
-#X text 1092 285 Current source Elevation angle;
-#X obj 49 379 outlet;
-#X obj 823 412 outlet;
+#X text 1092 251 Current source Elevation angle;
+#X obj 49 345 outlet;
+#X obj 823 378 outlet;
+#X obj 1085 304 s~ currentElev;
+#X obj 248 265 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;
+#X obj 891 -54 bng 50 250 50 0 empty empty empty 17 7 0 10 -257985
+-1 -1;
+#X obj 891 -1 s setUp;
+#X obj 980 130 r myEnd;
 #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 3 0 75 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 7 0 74 0;
+#X connect 7 0 72 0;
 #X connect 10 0 14 0;
 #X connect 13 0 14 1;
 #X connect 14 0 15 0;
@@ -105,49 +113,51 @@
 #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 25 0 23 1;
 #X connect 26 0 3 0;
-#X connect 27 0 23 1;
-#X connect 28 0 14 0;
-#X connect 30 0 57 0;
-#X connect 31 0 30 0;
-#X connect 32 0 57 1;
-#X connect 33 0 37 0;
-#X connect 33 0 42 0;
+#X connect 27 0 14 0;
+#X connect 29 0 55 0;
+#X connect 30 0 29 0;
+#X connect 31 0 55 1;
+#X connect 32 0 36 0;
+#X connect 32 0 41 0;
+#X connect 32 0 74 0;
+#X connect 33 0 34 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 37 0 75 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 36 0 38 0;
+#X connect 36 0 73 0;
+#X connect 39 0 42 0;
+#X connect 42 0 43 0;
+#X connect 43 0 32 0;
+#X connect 44 0 45 1;
+#X connect 44 1 45 0;
+#X connect 45 0 50 0;
+#X connect 46 0 49 1;
+#X connect 47 0 51 1;
+#X connect 48 0 49 0;
+#X connect 49 0 44 0;
+#X connect 50 0 51 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 55 0 43 1;
-#X connect 56 0 51 1;
-#X connect 57 0 59 0;
-#X connect 58 0 30 1;
-#X connect 59 0 33 0;
-#X connect 60 0 61 1;
-#X connect 61 0 63 0;
-#X connect 61 0 69 0;
-#X connect 62 0 60 0;
-#X connect 62 1 61 0;
-#X connect 64 0 68 0;
-#X connect 65 0 68 1;
-#X connect 66 0 62 0;
-#X connect 67 0 60 1;
-#X connect 68 0 69 1;
-#X connect 69 0 70 0;
-#X connect 69 0 71 0;
+#X connect 52 0 32 0;
+#X connect 53 0 42 1;
+#X connect 54 0 50 1;
+#X connect 55 0 57 0;
+#X connect 56 0 29 1;
+#X connect 57 0 32 0;
+#X connect 58 0 59 1;
+#X connect 59 0 61 0;
+#X connect 59 0 67 0;
+#X connect 60 0 58 0;
+#X connect 60 1 59 0;
+#X connect 62 0 66 0;
+#X connect 63 0 66 1;
+#X connect 64 0 60 0;
+#X connect 65 0 58 1;
+#X connect 66 0 67 1;
+#X connect 67 0 68 0;
+#X connect 67 0 69 0;
+#X connect 76 0 77 0;
+#X connect 78 0 79 0;
+#X connect 80 0 42 0;
--- a/SwordSounds/sourceSpeed.pd	Fri Jul 24 19:31:22 2015 +0100
+++ b/SwordSounds/sourceSpeed.pd	Fri Jul 24 22:21:07 2015 +0100
@@ -73,17 +73,58 @@
 #X obj 773 107 +;
 #X obj 788 85 r start_armLength;
 #X text 828 133 Distance from centre of arc;
-#X obj 1064 -89 r preswingTime;
-#X obj 1049 -67 +;
-#X obj 1036 34 delay;
-#X obj 1034 -19 t f b;
-#X obj 1034 -132 r GO;
-#X obj 1034 -44 f;
-#X obj 1063 11 + 5;
-#X obj 1049 -111 r postswingTime;
-#X obj 1036 57 s myEnd;
-#X obj 773 156 outlet~;
 #X obj 773 132 sig~;
+#X obj 761 268 r~ currentElev;
+#X obj 1073 383 r~ currentAzim;
+#X obj 773 180 s~ \$0_srcCnt;
+#X obj 761 292 /~ 360;
+#X obj 761 315 sin~;
+#X obj 761 358 *~;
+#X obj 776 335 r~ \$0_srcCnt;
+#X obj 1058 270 r~ currentElev;
+#X obj 1058 294 /~ 360;
+#X obj 1058 360 *~;
+#X obj 1073 337 r~ \$0_srcCnt;
+#X obj 1058 317 cos~;
+#X obj 1073 428 cos~;
+#X obj 1073 407 /~ 360;
+#X obj 1058 453 *~;
+#X obj 914 387 r~ currentAzim;
+#X obj 899 274 r~ currentElev;
+#X obj 899 298 /~ 360;
+#X obj 899 364 *~;
+#X obj 914 341 r~ \$0_srcCnt;
+#X obj 914 411 /~ 360;
+#X obj 899 457 *~;
+#X obj 899 321 cos~;
+#X obj 914 432 sin~;
+#X text 1029 246 Z position of source;
+#X obj 711 400 sig~;
+#X obj 761 426 -~;
+#X obj 856 502 sig~;
+#X obj 899 524 -~;
+#X obj 1014 497 sig~;
+#X obj 1058 521 -~;
+#X obj 1014 474 r Zobs;
+#X obj 761 455 *~;
+#X obj 899 549 *~;
+#X obj 1058 546 *~;
+#X obj 819 565 +~;
+#X obj 1043 593 +~;
+#X obj 1043 617 sqrt~;
+#X obj 1153 498 loadbang;
+#X obj 1153 519 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1
+1 1;
+#X obj 1153 537 metro 10;
+#X obj 1153 559 snapshot~;
+#X floatatom 1153 579 5 0 0 0 - - -;
+#X text 751 245 Y position of source;
+#X text 892 247 X position of source;
+#X obj 856 479 r Xobs;
+#X obj 711 377 r Yobs;
+#X text 671 610 Distance between the observer as a point in 3D space
+and the sound source.;
+#X obj 1043 640 outlet~;
 #X connect 0 0 1 0;
 #X connect 2 0 3 0;
 #X connect 4 0 9 0;
@@ -136,15 +177,52 @@
 #X connect 63 0 64 1;
 #X connect 64 0 66 0;
 #X connect 66 0 65 0;
-#X connect 66 0 79 0;
+#X connect 66 0 69 0;
 #X connect 67 0 66 1;
-#X connect 69 0 70 1;
-#X connect 70 0 74 1;
-#X connect 71 0 77 0;
-#X connect 72 0 75 0;
-#X connect 72 1 71 0;
+#X connect 69 0 72 0;
+#X connect 70 0 73 0;
+#X connect 71 0 83 0;
 #X connect 73 0 74 0;
-#X connect 74 0 72 0;
-#X connect 75 0 71 1;
-#X connect 76 0 70 0;
-#X connect 79 0 78 0;
+#X connect 74 0 75 0;
+#X connect 75 0 96 1;
+#X connect 76 0 75 1;
+#X connect 77 0 78 0;
+#X connect 78 0 81 0;
+#X connect 79 0 84 0;
+#X connect 80 0 79 1;
+#X connect 81 0 79 0;
+#X connect 82 0 84 1;
+#X connect 83 0 82 0;
+#X connect 84 0 100 1;
+#X connect 85 0 90 0;
+#X connect 86 0 87 0;
+#X connect 87 0 92 0;
+#X connect 88 0 91 0;
+#X connect 89 0 88 1;
+#X connect 90 0 93 0;
+#X connect 91 0 98 1;
+#X connect 92 0 88 0;
+#X connect 93 0 91 1;
+#X connect 95 0 96 0;
+#X connect 96 0 102 0;
+#X connect 96 0 102 1;
+#X connect 97 0 98 0;
+#X connect 98 0 103 0;
+#X connect 98 0 103 1;
+#X connect 99 0 100 0;
+#X connect 100 0 104 0;
+#X connect 100 0 104 1;
+#X connect 101 0 99 0;
+#X connect 102 0 105 0;
+#X connect 103 0 105 1;
+#X connect 104 0 106 1;
+#X connect 105 0 106 0;
+#X connect 106 0 107 0;
+#X connect 107 0 111 0;
+#X connect 107 0 118 0;
+#X connect 108 0 109 0;
+#X connect 109 0 110 0;
+#X connect 110 0 111 0;
+#X connect 111 0 112 0;
+#X connect 115 0 97 0;
+#X connect 116 0 95 0;
--- a/SwordSounds/sweepTime.pd	Fri Jul 24 19:31:22 2015 +0100
+++ b/SwordSounds/sweepTime.pd	Fri Jul 24 22:21:07 2015 +0100
@@ -61,6 +61,17 @@
 #X text 692 307 Decceleration time;
 #X text 246 130 Full radius;
 #X text 648 119 Full radius;
+#X obj 1037 70 r preswingTime;
+#X obj 1022 152 +;
+#X obj 1009 253 delay;
+#X obj 1007 200 t f b;
+#X obj 1007 27 r GO;
+#X obj 1007 175 f;
+#X obj 1036 230 + 5;
+#X obj 1022 48 r postswingTime;
+#X obj 1009 276 s myEnd;
+#X obj 1037 122 t f b;
+#X floatatom 955 252 5 0 0 0 - - -;
 #X connect 0 0 4 0;
 #X connect 1 0 5 0;
 #X connect 2 0 3 0;
@@ -99,3 +110,15 @@
 #X connect 42 0 49 0;
 #X connect 43 0 29 0;
 #X connect 43 0 35 0;
+#X connect 59 0 68 0;
+#X connect 60 0 64 1;
+#X connect 61 0 67 0;
+#X connect 62 0 65 0;
+#X connect 62 1 61 0;
+#X connect 63 0 64 0;
+#X connect 64 0 62 0;
+#X connect 65 0 61 1;
+#X connect 65 0 69 0;
+#X connect 66 0 60 0;
+#X connect 68 0 60 1;
+#X connect 68 1 60 0;