# HG changeset patch
# User Rod Selfridge <r.selfridge@qmul.ac.uk>
# Date 1437839375 -3600
# Node ID c64c81777e76ea05290148af01e647cd9005fc2d
# Parent  7f67b04e6c5df99ee8125bf3bcc903164ff06149
Brain melt over calculating the angle between source and observer. Looked at source having own axis with lift and drag normal to the axis of the sword.

diff -r 7f67b04e6c5d -r c64c81777e76 SwordSounds/Sword10_D2.pd
--- a/SwordSounds/Sword10_D2.pd	Sat Jul 25 09:37:39 2015 +0100
+++ b/SwordSounds/Sword10_D2.pd	Sat Jul 25 16:49:35 2015 +0100
@@ -1,4 +1,4 @@
-#N canvas 5 78 1418 816 10;
+#N canvas -28 23 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;
@@ -40,7 +40,7 @@
 #X obj -158 -163 s NoOfSources;
 #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;
+-1 -1 49 1;
 #X floatatom 93 339 8 0 0 0 - - -;
 #X text 77 -196 Blade Length;
 #X text 76 -130 Arm Length;
@@ -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 0;
+#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
@@ -510,6 +510,8 @@
 #X msg 898 125 -30;
 #X msg 15 99 1.034;
 #X msg 58 99 2.034;
+#X msg 126 108 3;
+#X msg 161 284 0.5;
 #X connect 3 0 5 0;
 #X connect 4 0 0 0;
 #X connect 4 1 1 0;
@@ -615,3 +617,5 @@
 #X connect 147 0 101 0;
 #X connect 148 0 126 0;
 #X connect 149 0 126 0;
+#X connect 150 0 126 0;
+#X connect 151 0 10 0;
diff -r 7f67b04e6c5d -r c64c81777e76 SwordSounds/thisAngle.pd
--- a/SwordSounds/thisAngle.pd	Sat Jul 25 09:37:39 2015 +0100
+++ b/SwordSounds/thisAngle.pd	Sat Jul 25 16:49:35 2015 +0100
@@ -1,32 +1,130 @@
-#N canvas 340 157 944 652 10;
+#N canvas 282 232 1158 672 10;
 #X obj -19 -52 inlet~;
 #X obj 58 -52 inlet~;
 #X obj 134 -53 inlet~;
 #X obj -19 -31 s~ \$0_Ydiff;
 #X obj 58 -31 s~ \$0_Xdiff;
 #X obj 134 -32 s~ \$0_Zdiff;
-#X obj 85 63 r Yobs;
-#X obj 85 86 sig~;
-#X obj 85 127 -~;
-#X obj 100 106 r~ \$0_Ydiff;
-#X obj -26 119 loadbang;
-#X obj -26 140 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+#X obj -73 60 r Yobs;
+#X obj -73 83 sig~;
+#X obj -73 124 -~;
+#X obj -58 103 r~ \$0_Ydiff;
+#X obj -172 71 loadbang;
+#X obj -172 92 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
 1;
-#X obj -26 158 metro 10;
-#X obj -26 180 snapshot~;
-#X floatatom -26 200 5 0 0 0 - - -;
+#X obj -172 110 metro 10;
+#X obj -172 132 snapshot~;
+#X floatatom -172 152 5 0 0 0 - - -;
 #X obj -130 -58 bng 50 250 50 0 empty empty empty 17 7 0 10 -4034 -1
 -1;
 #X obj -130 -5 s GO;
 #X obj -190 -58 bng 50 250 50 0 empty empty empty 17 7 0 10 -257985
 -1 -1;
 #X obj -190 -5 s setUp;
+#X obj -72 360 atan~;
+#X obj -72 338 /~;
+#X obj -160 423 loadbang;
+#X obj -160 444 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1
+1 1;
+#X obj -160 462 metro 10;
+#X obj -160 484 snapshot~;
+#X floatatom -160 504 5 0 0 0 - - -;
+#X obj -72 383 /~ 6.28319;
+#X obj -72 405 *~ 360;
+#X obj -72 472 s~ \$0_srcObsElev;
+#X text -115 510 Elevation angle between source and observer;
+#X text -39 121 Length between observer and source on the Y plane;
+#X obj 213 -54 inlet~;
+#X obj 213 -33 s~ \$0_scrObsDist;
+#X obj 318 -54 inlet~;
+#X obj 318 -33 s~ \$0_scrObsXZDist;
+#X obj 74 5 loadbang;
+#X obj 74 26 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1 1
+;
+#X obj 74 44 metro 10;
+#X obj 74 66 snapshot~;
+#X floatatom 74 86 5 0 0 0 - - -;
+#X obj 139 5 loadbang;
+#X obj 139 26 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+1;
+#X obj 139 44 metro 10;
+#X obj 139 66 snapshot~;
+#X floatatom 139 86 5 0 0 0 - - -;
+#X obj 205 6 loadbang;
+#X obj 205 27 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+1;
+#X obj 205 45 metro 10;
+#X obj 205 67 snapshot~;
+#X floatatom 205 87 5 0 0 0 - - -;
+#X obj 342 63 r~ \$0_Xdiff;
+#X obj 357 107 r~ \$0_Zdiff;
+#X obj 357 131 *~;
+#X obj 342 87 *~;
+#X obj 342 156 +~;
+#X obj 495 134 r~ \$0_scrObsXZDist;
+#X obj 495 160 *~;
+#X obj 526 208 *~;
+#X obj 342 202 *~ 2;
+#X obj 342 179 sqrt~;
+#X obj 480 319 -~;
+#X obj 480 185 +~;
+#X obj 480 348 /~;
+#X obj 357 223 r~ \$0_scrObsXZDist;
+#X obj 342 248 *~;
+#X obj 480 369 arccos~;
+#X obj 350 328 loadbang;
+#X obj 350 349 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+1;
+#X obj 350 367 metro 10;
+#X obj 350 389 snapshot~;
+#X floatatom 350 409 8 0 0 0 - - -;
+#X obj 541 275 *~;
+#X obj 526 298 +~;
+#X obj 526 185 sig~;
+#X obj 526 165 r Zobs;
+#X obj 541 229 r Xobs;
+#X obj 541 250 sig~;
+#X text 357 499 Azimuth angle between source and observer;
+#X obj 480 453 s~ \$0_srcObsAzim;
+#X obj 659 134 r~ \$0_srcObsAzim;
+#X obj 659 158 /~ 360;
+#X obj 659 182 cos~;
+#X obj 674 227 /~ 360;
+#X obj 674 251 cos~;
+#X obj 659 275 *~;
+#X obj 659 297 arccos~;
+#X obj 753 262 loadbang;
+#X obj 753 283 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+1;
+#X obj 753 301 metro 10;
+#X obj 753 323 snapshot~;
+#X floatatom 753 343 8 0 0 0 - - -;
+#X obj 674 203 r~ \$0_srcObsElev;
+#X obj -23 255 r~ \$0_Xdiff;
+#X obj 470 -12 loadbang;
+#X obj 470 9 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1 1
+;
+#X obj 470 27 metro 10;
+#X obj 470 49 snapshot~;
+#X floatatom 470 71 5 0 0 0 - - -;
+#X obj 565 -9 loadbang;
+#X obj 565 12 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+1;
+#X obj 565 30 metro 10;
+#X obj 565 52 snapshot~;
+#X floatatom 565 72 5 0 0 0 - - -;
+#X obj -120 385 sig~ 90;
+#X obj -74 440 -~;
 #X connect 0 0 3 0;
+#X connect 0 0 38 0;
 #X connect 1 0 4 0;
+#X connect 1 0 43 0;
 #X connect 2 0 5 0;
+#X connect 2 0 48 0;
 #X connect 6 0 7 0;
 #X connect 7 0 8 0;
 #X connect 8 0 13 0;
+#X connect 8 0 20 0;
 #X connect 9 0 8 1;
 #X connect 10 0 11 0;
 #X connect 11 0 12 0;
@@ -34,3 +132,84 @@
 #X connect 13 0 14 0;
 #X connect 15 0 16 0;
 #X connect 17 0 18 0;
+#X connect 19 0 26 0;
+#X connect 20 0 19 0;
+#X connect 21 0 22 0;
+#X connect 22 0 23 0;
+#X connect 23 0 24 0;
+#X connect 24 0 25 0;
+#X connect 26 0 27 0;
+#X connect 27 0 104 1;
+#X connect 31 0 32 0;
+#X connect 31 0 96 0;
+#X connect 33 0 34 0;
+#X connect 33 0 101 0;
+#X connect 35 0 36 0;
+#X connect 36 0 37 0;
+#X connect 37 0 38 0;
+#X connect 38 0 39 0;
+#X connect 40 0 41 0;
+#X connect 41 0 42 0;
+#X connect 42 0 43 0;
+#X connect 43 0 44 0;
+#X connect 45 0 46 0;
+#X connect 46 0 47 0;
+#X connect 47 0 48 0;
+#X connect 48 0 49 0;
+#X connect 50 0 53 0;
+#X connect 50 0 53 1;
+#X connect 51 0 52 1;
+#X connect 51 0 52 0;
+#X connect 52 0 54 1;
+#X connect 53 0 54 0;
+#X connect 54 0 59 0;
+#X connect 54 0 61 0;
+#X connect 55 0 56 0;
+#X connect 55 0 56 1;
+#X connect 56 0 61 1;
+#X connect 57 0 72 0;
+#X connect 58 0 64 0;
+#X connect 59 0 58 0;
+#X connect 60 0 62 0;
+#X connect 61 0 60 0;
+#X connect 62 0 65 0;
+#X connect 63 0 64 1;
+#X connect 64 0 62 1;
+#X connect 65 0 69 0;
+#X connect 65 0 78 0;
+#X connect 66 0 67 0;
+#X connect 67 0 68 0;
+#X connect 68 0 69 0;
+#X connect 69 0 70 0;
+#X connect 71 0 72 1;
+#X connect 72 0 60 1;
+#X connect 73 0 57 0;
+#X connect 73 0 57 1;
+#X connect 74 0 73 0;
+#X connect 75 0 76 0;
+#X connect 76 0 71 0;
+#X connect 76 0 71 1;
+#X connect 79 0 80 0;
+#X connect 80 0 81 0;
+#X connect 81 0 84 0;
+#X connect 82 0 83 0;
+#X connect 83 0 84 1;
+#X connect 84 0 85 0;
+#X connect 85 0 89 0;
+#X connect 86 0 87 0;
+#X connect 87 0 88 0;
+#X connect 88 0 89 0;
+#X connect 89 0 90 0;
+#X connect 91 0 82 0;
+#X connect 92 0 20 1;
+#X connect 93 0 94 0;
+#X connect 94 0 95 0;
+#X connect 95 0 96 0;
+#X connect 96 0 97 0;
+#X connect 98 0 99 0;
+#X connect 99 0 100 0;
+#X connect 100 0 101 0;
+#X connect 101 0 102 0;
+#X connect 103 0 104 0;
+#X connect 104 0 28 0;
+#X connect 104 0 24 0;
diff -r 7f67b04e6c5d -r c64c81777e76 SwordSounds/thisPosition.pd
--- a/SwordSounds/thisPosition.pd	Sat Jul 25 09:37:39 2015 +0100
+++ b/SwordSounds/thisPosition.pd	Sat Jul 25 16:49:35 2015 +0100
@@ -1,4 +1,4 @@
-#N canvas 165 76 917 541 10;
+#N canvas 574 52 917 541 10;
 #X obj -11951 -141 r~ currentElev;
 #X obj -11639 -26 r~ currentAzim;
 #X obj -11951 -117 /~ 360;
@@ -48,6 +48,9 @@
 #X obj -11632 72 outlet~;
 #X obj -11793 77 outlet~;
 #X obj -11919 -19 outlet~;
+#X obj -11435 192 +~;
+#X obj -11435 216 sqrt~;
+#X obj -11435 239 outlet~;
 #X connect 0 0 2 0;
 #X connect 1 0 10 0;
 #X connect 2 0 3 0;
@@ -83,7 +86,9 @@
 #X connect 27 0 25 0;
 #X connect 28 0 31 0;
 #X connect 29 0 31 1;
+#X connect 29 0 48 0;
 #X connect 30 0 32 1;
+#X connect 30 0 48 1;
 #X connect 31 0 32 0;
 #X connect 32 0 33 0;
 #X connect 33 0 39 0;
@@ -93,3 +98,5 @@
 #X connect 42 0 7 1;
 #X connect 43 0 15 1;
 #X connect 44 0 4 1;
+#X connect 48 0 49 0;
+#X connect 49 0 50 0;