Mercurial > hg > weather-synthesis-prototyping
changeset 126:11f39050c282
Swordsounds updated to produce a sound. The angles need sorting
| author | Rod Selfridge <r.selfridge@qmul.ac.uk> |
|---|---|
| date | Mon, 10 Aug 2015 20:18:34 +0100 |
| parents | 44dac57ebad0 |
| children | b3ebe65683bc |
| files | .DS_Store June/.DS_Store SwordSounds/Sword10_D2.pd SwordSounds/centreAngles.pd SwordSounds/sourceSpeed.pd SwordSounds/tenSource.pd SwordSounds/thisAngle.pd SwordSounds/thisPosition.pd scene demo/wire10_D1.pd scene demo/wireSourceD2.pd scene demo/wireSrcPosD2.pd |
| diffstat | 11 files changed, 520 insertions(+), 577 deletions(-) [+] |
line wrap: on
line diff
--- a/SwordSounds/Sword10_D2.pd Fri Aug 07 14:03:21 2015 +0100 +++ b/SwordSounds/Sword10_D2.pd Mon Aug 10 20:18:34 2015 +0100 @@ -1,4 +1,4 @@ -#N canvas 63 198 1418 816 10; +#N canvas 84 31 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,17 +38,17 @@ #X msg 44 -195 1; #X obj 44 -172 s bladeLen; #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 +#X obj -120 232 s topSpeed; +#X obj -172 206 hsl 100 20 0 100 0 0 empty empty empty -2 -8 0 10 -262144 -1 -1 49 1; -#X floatatom 93 339 8 0 0 0 - - -; +#X floatatom -175 232 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 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; -#X floatatom 837 -89 8 0 0 0 - - -; +#X text -64 210 Top Speed; +#X obj 122 25 hsl 100 20 -180 180 0 0 empty empty empty -2 -8 0 10 +-262144 -1 -1 7425 1; +#X floatatom 119 57 8 0 0 0 - - -; #N canvas 528 427 426 335 thickCalc 0; #X obj 173 139 r NoOfSources; #X obj 158 115 -; @@ -74,27 +74,19 @@ #X connect 9 0 1 0; #X connect 10 0 5 0; #X restore 402 -93 pd thickCalc; -#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 89 485 hsl 100 20 0 0.01 0 0 empty empty empty -2 -8 0 10 -262144 --1 -1 2475 1; -#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 -178 293 hsl 100 20 0 0.03 0 0 empty empty empty -2 -8 0 10 +-262144 -1 -1 2405 1; +#X obj -179 378 hsl 100 20 0 0.01 0 0 empty empty empty -2 -8 0 10 +-262144 -1 -1 7275 1; +#X floatatom -181 323 8 0 0 0 - - -; +#X obj -127 322 s hiltThick; +#X floatatom -182 406 8 0 0 0 - - -; +#X obj -124 405 s tipThick; +#X text -64 295 Hilt Thickness; +#X text -72 379 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 -196 326 hsl 100 20 100 1 1 0 empty empty empty -2 -8 0 10 -262144 --1 -1 6920 1; -#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 -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 +95,10 @@ #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 40 287 r setUp; -#X obj 779 -141 r setUp; -#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; +#X obj -228 180 r setUp; +#X obj 61 5 r setUp; +#X obj -232 270 r setUp; +#X obj -233 358 r setUp; #N canvas 303 28 1094 768 angleCalc 0; #X obj -129 105 * 0.75; #X obj 325 234 * 0.25; @@ -260,64 +248,49 @@ #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 -81 417 (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 93 287 r thisTS; -#X obj 837 -142 r thisSA; -#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 872 110 s thisTS; +#X obj 891 89 s thisSA; +#X obj 911 67 s thisHT; +#X obj 930 44 s thisTT; +#X obj 950 23 s thisOD; +#X obj 969 3 s thisOA; +#X obj 989 -19 s thisG; +#X obj -175 180 r thisTS; +#X obj 119 4 r thisSA; +#X obj -181 270 r thisHT; +#X obj -182 358 r thisTT; #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 872 -43 unpack f f f f f f f; #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 809 -43 Presets; +#X msg 881 -148 20 160 0.01 0.004 2 0 127; +#X msg 872 -171 43 215 0.0085 0.0025 4 90 40; +#X msg 891 -125 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 872 -200 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 -204 485 hsl 100 20 -180 180 0 0 empty empty empty -2 -8 0 10 --262144 -1 -1 0 1; -#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; -#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 -90 90 0 0 empty empty empty -2 -8 0 10 -262144 --1 -1 3300 1; -#X floatatom 828 180 8 0 0 0 - - -; -#X obj 770 128 r setUp; -#X obj 828 127 r thisSA; +#X obj 824 -118 t b; +#X obj 804 -95 s setUp; +#X obj 120 103 hsl 100 20 -180 180 0 0 empty empty empty -2 -8 0 10 +-262144 -1 -1 5000 1; +#X floatatom 117 135 8 0 0 0 - - -; +#X obj 59 83 r setUp; +#X obj 117 82 r thisSA; +#X obj 115 216 hsl 100 20 -90 90 0 0 empty empty empty -2 -8 0 10 -262144 +-1 -1 9900 1; +#X floatatom 112 248 8 0 0 0 - - -; +#X obj 54 196 r setUp; +#X obj 112 195 r thisSA; +#X obj 113 294 hsl 100 20 -90 90 0 0 empty empty empty -2 -8 0 10 -262144 +-1 -1 5000 1; +#X floatatom 110 326 8 0 0 0 - - -; +#X obj 52 274 r setUp; +#X obj 110 273 r thisSA; #N canvas 419 64 689 650 allSource 0; #X obj 187 127 r distance; #X obj 170 106 r angle; @@ -334,19 +307,19 @@ #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 167 247 s presweepElev; +#X obj 165 325 s postsweepElev; +#X text 226 217 pre-sweep elevation; +#X text 224 294 post-sweep elevation; +#X text 233 26 pre-sweep azimuth; +#X text 231 104 post-sweep azimuth; +#X obj 174 56 s presweepAzim; +#X obj 172 134 s postsweepAzim; #X obj 42 -108 s start_armLength; #X msg 42 -129 0.35; #X obj 420 -40 sweepTime; #X obj 682 -173 hsl 100 25 1 100 0 0 empty empty empty -2 -8 0 10 -262144 --1 -1 900 1; +-1 -1 400 1; #X floatatom 698 -133 5 0 0 0 - - -; #X msg -158 -186 10; #X obj 679 -217 loadbang; @@ -480,142 +453,131 @@ #X connect 67 0 23 1; #X connect 68 0 29 1; #X restore 392 -16 pd maxCircCalc; -#X msg 906 -144 80; +#X msg 188 2 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 6350 1; -#X obj -90 125 hsl 128 15 -50 50 0 0 empty empty empty -2 -8 0 10 -262144 --1 -1 6481 1; -#X obj -90 192 hsl 128 15 -50 50 0 0 empty empty empty -2 -8 0 10 -262144 --1 -1 6858 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 msg 908 -62 -60; -#X msg 945 47 50; -#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 obj -173 -84 hsl 100 20 -50 50 0 0 empty empty empty -2 -8 0 10 +-262144 -1 -1 4950 1; +#X obj -174 -7 hsl 100 20 -50 50 0 0 empty empty empty -2 -8 0 10 -262144 +-1 -1 5052 1; +#X obj -174 71 hsl 100 20 -50 50 0 0 empty empty empty -2 -8 0 10 -262144 +-1 -1 5346 1; +#X obj -176 -61 s Xobs; +#X obj -177 13 s Yobs; +#X obj -177 93 s Zobs; +#X floatatom -216 -61 5 0 0 0 - - -; +#X floatatom -216 14 5 0 0 0 - - -; +#X floatatom -217 93 5 0 0 0 - - -; +#X msg -168 -108 0; +#X msg -174 45 0; +#X msg -170 -31 0.7; +#X obj -221 -110 r setUp; +#X obj -226 -30 r setUp; +#X obj -230 48 r setUp; +#X msg -118 -32 0; +#X msg 237 -2 90; +#X msg -132 45 4; +#X msg -126 -112 4; +#X msg 180 193 0; +#X msg 190 84 -60; +#X msg 227 193 50; +#X msg 180 271 -30; +#X msg -69 -33 1.034; +#X msg -26 -33 2.034; +#X msg 42 -31 3; +#X msg -107 177 0.5; +#X msg -87 -112 0.2; +#X msg -100 44 0.2; #X connect 3 0 5 0; #X connect 4 0 0 0; #X connect 4 1 1 0; -#X connect 5 0 49 0; +#X connect 5 0 39 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 112 0; +#X connect 16 0 88 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 49 0 4 0; -#X connect 50 0 6 0; -#X connect 51 0 115 0; -#X connect 52 0 119 0; -#X connect 53 0 54 0; -#X connect 56 0 53 0; -#X connect 64 0 10 0; -#X connect 66 0 19 0; -#X connect 67 0 20 0; -#X connect 68 0 29 0; -#X connect 69 0 30 0; -#X connect 70 0 49 0; -#X connect 71 0 57 0; -#X connect 71 1 58 0; -#X connect 71 2 59 0; -#X connect 71 3 60 0; -#X connect 71 4 61 0; -#X connect 71 5 62 0; -#X connect 71 6 63 0; -#X connect 72 0 53 0; -#X connect 73 0 119 0; -#X connect 74 0 115 0; -#X connect 75 0 6 0; -#X connect 77 0 71 0; -#X connect 77 0 84 0; -#X connect 78 0 71 0; -#X connect 78 0 84 0; -#X connect 79 0 71 0; -#X connect 79 0 84 0; -#X connect 81 0 78 0; -#X connect 82 0 83 0; -#X connect 83 0 38 0; -#X connect 84 0 85 0; -#X connect 86 0 87 0; -#X connect 86 0 91 0; -#X connect 89 0 86 0; -#X connect 90 0 86 0; +#X connect 29 0 30 0; +#X connect 30 0 27 0; +#X connect 31 0 30 1; +#X connect 32 0 33 0; +#X connect 34 0 10 0; +#X connect 35 0 16 0; +#X connect 36 0 19 0; +#X connect 37 0 20 0; +#X connect 39 0 4 0; +#X connect 40 0 6 0; +#X connect 41 0 91 0; +#X connect 42 0 95 0; +#X connect 50 0 10 0; +#X connect 52 0 19 0; +#X connect 53 0 20 0; +#X connect 54 0 39 0; +#X connect 55 0 43 0; +#X connect 55 1 44 0; +#X connect 55 2 45 0; +#X connect 55 3 46 0; +#X connect 55 4 47 0; +#X connect 55 5 48 0; +#X connect 55 6 49 0; +#X connect 56 0 95 0; +#X connect 57 0 91 0; +#X connect 58 0 6 0; +#X connect 60 0 55 0; +#X connect 60 0 67 0; +#X connect 61 0 55 0; +#X connect 61 0 67 0; +#X connect 62 0 55 0; +#X connect 62 0 67 0; +#X connect 64 0 61 0; +#X connect 65 0 66 0; +#X connect 66 0 32 0; +#X connect 67 0 68 0; +#X connect 69 0 70 0; +#X connect 69 0 89 0; +#X connect 71 0 69 0; +#X connect 73 0 74 0; +#X connect 73 0 82 0; +#X connect 75 0 73 0; +#X connect 76 0 73 0; +#X connect 77 0 78 0; +#X connect 77 0 83 0; +#X connect 79 0 77 0; +#X connect 80 0 77 0; +#X connect 91 0 90 0; +#X connect 93 0 4 1; #X connect 93 0 94 0; -#X connect 93 0 113 0; -#X connect 95 0 93 0; -#X connect 97 0 98 0; -#X connect 97 0 106 0; -#X connect 99 0 97 0; -#X connect 100 0 97 0; -#X connect 101 0 102 0; +#X connect 95 0 8 0; +#X connect 96 0 97 0; +#X connect 97 0 93 0; +#X connect 99 0 16 0; +#X connect 101 0 104 0; #X connect 101 0 107 0; -#X connect 103 0 101 0; -#X connect 104 0 101 0; -#X connect 115 0 114 0; -#X connect 117 0 4 1; -#X connect 117 0 118 0; -#X connect 119 0 8 0; -#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; -#X connect 145 0 93 0; -#X connect 146 0 97 0; -#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; +#X connect 102 0 105 0; +#X connect 102 0 108 0; +#X connect 103 0 106 0; +#X connect 103 0 109 0; +#X connect 110 0 101 0; +#X connect 111 0 103 0; +#X connect 112 0 102 0; +#X connect 113 0 101 0; +#X connect 114 0 102 0; +#X connect 115 0 103 0; +#X connect 116 0 102 0; +#X connect 117 0 16 0; +#X connect 118 0 103 0; +#X connect 119 0 101 0; +#X connect 120 0 73 0; +#X connect 121 0 69 0; +#X connect 122 0 73 0; +#X connect 123 0 77 0; +#X connect 124 0 102 0; +#X connect 125 0 102 0; +#X connect 126 0 102 0; +#X connect 127 0 10 0; +#X connect 128 0 101 0; +#X connect 129 0 103 0;
--- a/SwordSounds/centreAngles.pd Fri Aug 07 14:03:21 2015 +0100 +++ b/SwordSounds/centreAngles.pd Mon Aug 10 20:18:34 2015 +0100 @@ -9,8 +9,8 @@ #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 6350 1; +#X obj 177 359 hsl 128 15 -180 180 0 0 empty empty empty -2 -8 0 10 +-262144 -1 -1 9172 1; #X obj 231 97 r setUp; #X text 214 78 Start at 0 speed; #X obj 246 118 r presweepAzim; @@ -40,7 +40,7 @@ #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 10936 1; +-1 -1 6350 1; #X obj 1029 131 r setUp; #X text 1012 112 Start at 0 speed; #X obj 1029 175 f;
--- a/SwordSounds/sourceSpeed.pd Fri Aug 07 14:03:21 2015 +0100 +++ b/SwordSounds/sourceSpeed.pd Mon Aug 10 20:18:34 2015 +0100 @@ -1,4 +1,4 @@ -#N canvas 73 53 1408 813 10; +#N canvas 230 24 1408 813 10; #X obj -219 -121 bng 50 250 50 0 empty empty empty 17 7 0 10 -4034 -1 -1; #X obj -219 -68 s GO; @@ -76,11 +76,13 @@ #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 text 446 376 Y; -#X text 472 376 X; -#X text 494 376 Z; -#X obj 467 402 thisAngle; +#X obj 468 402 thisAngle; +#X obj 419 529 outlet~; +#X obj 493 523 outlet~; #X connect 0 0 1 0; #X connect 2 0 3 0; #X connect 4 0 9 0; @@ -136,9 +138,13 @@ #X connect 66 0 69 0; #X connect 67 0 66 1; #X connect 69 0 70 0; -#X connect 71 0 72 0; -#X connect 72 0 76 0; -#X connect 72 1 76 1; -#X connect 72 2 76 2; -#X connect 72 3 76 3; -#X connect 72 4 76 4; +#X connect 71 0 75 0; +#X connect 75 0 76 0; +#X connect 75 1 76 1; +#X connect 75 2 76 2; +#X connect 75 3 76 3; +#X connect 75 3 77 0; +#X connect 75 4 76 4; +#X connect 75 5 76 5; +#X connect 75 6 76 6; +#X connect 76 0 78 0;
--- a/SwordSounds/tenSource.pd Fri Aug 07 14:03:21 2015 +0100 +++ b/SwordSounds/tenSource.pd Mon Aug 10 20:18:34 2015 +0100 @@ -282,12 +282,32 @@ #X connect 141 0 2 0; #X connect 142 0 141 0; #X connect 143 0 138 0; +#X connect 143 1 138 2; +#X connect 143 2 138 3; #X connect 144 0 132 0; +#X connect 144 1 132 2; +#X connect 144 2 132 3; #X connect 145 0 131 0; +#X connect 145 1 131 2; +#X connect 145 2 131 3; #X connect 146 0 140 0; +#X connect 146 1 140 2; +#X connect 146 2 140 3; #X connect 147 0 139 0; +#X connect 147 1 139 2; +#X connect 147 2 139 3; #X connect 148 0 137 0; +#X connect 148 1 137 2; +#X connect 148 2 137 3; #X connect 149 0 136 0; +#X connect 149 1 136 2; +#X connect 149 2 136 3; #X connect 150 0 135 0; +#X connect 150 1 135 2; +#X connect 150 2 135 3; #X connect 151 0 134 0; +#X connect 151 1 134 2; +#X connect 151 2 134 3; #X connect 152 0 133 0; +#X connect 152 1 133 2; +#X connect 152 2 133 3;
--- a/SwordSounds/thisAngle.pd Fri Aug 07 14:03:21 2015 +0100 +++ b/SwordSounds/thisAngle.pd Mon Aug 10 20:18:34 2015 +0100 @@ -1,4 +1,4 @@ -#N canvas 282 232 1158 672 10; +#N canvas 217 124 1158 672 10; #X obj -19 -52 inlet~; #X obj 58 -52 inlet~; #X obj 134 -53 inlet~; @@ -9,59 +9,57 @@ #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 -172 110 metro 10; -#X obj -172 132 snapshot~; -#X floatatom -172 152 5 0 0 0 - - -; +#X obj -147 85 loadbang; +#X obj -147 106 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 +1 1; +#X obj -147 124 metro 10; +#X obj -147 146 snapshot~; +#X floatatom -147 166 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 +#X obj -73 360 atan~; +#X obj -73 338 /~; +#X obj -174 415 loadbang; +#X obj -174 436 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 -174 454 metro 10; +#X obj -174 476 snapshot~; +#X floatatom -174 496 5 0 0 0 - - -; +#X obj -73 383 /~ 6.28319; +#X obj -73 405 *~ 360; +#X obj -88 464 s~ \$0_srcObsElev; +#X text -129 502 Elevation angle between source and observer; +#X text -54 157 Length between observer and source on the Y plane; +#X obj 230 -58 inlet~; +#X obj 230 -37 s~ \$0_scrObsDist; +#X obj 451 -74 inlet~; #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 floatatom 74 86 8 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 floatatom 139 86 8 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 floatatom 205 87 8 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; @@ -69,7 +67,6 @@ #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; @@ -100,27 +97,90 @@ #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 +#X obj -43 283 r~ \$0_Xdiff; +#X obj 338 -72 loadbang; +#X obj 338 -51 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 obj 338 -33 metro 10; +#X obj 338 -11 snapshot~; +#X floatatom 338 11 8 0 0 0 - - -; +#X obj 477 -30 loadbang; +#X obj 477 -9 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1 +1; +#X obj 477 9 metro 10; +#X obj 477 31 snapshot~; +#X floatatom 477 51 8 0 0 0 - - -; +#X obj -121 385 sig~ 90; +#X obj -88 432 -~; +#X text 45 106 Y \, X \, Z dist between source and centre; +#X text 61 119 Based on length \, azim and elev; +#X msg -65 -93 0.2; +#X obj 676 405 r~ \$0_scrObsDist; +#X obj 661 426 /~; +#X obj 661 451 arccos~; +#X obj 722 444 loadbang; +#X obj 722 465 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1 +1; +#X obj 722 483 metro 10; +#X obj 722 505 snapshot~; +#X floatatom 722 525 8 0 0 0 - - -; +#X obj 116 341 r~ currentElev; +#X obj 225 336 loadbang; +#X obj 225 357 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1 +1; +#X obj 225 375 metro 10; +#X obj 225 397 snapshot~; +#X floatatom 225 417 5 0 0 0 - - -; +#X obj -58 259 sig~; +#X obj -58 312 -~; +#X obj -58 236 r Xobs; +#X obj 76 194 loadbang; +#X obj 76 215 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1 +1; +#X obj 76 233 metro 10; +#X obj 76 255 snapshot~; +#X floatatom 76 275 5 0 0 0 - - -; +#X obj 101 402 -~; +#X obj 575 -75 inlet~; +#X obj 601 -31 loadbang; +#X obj 601 -10 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1 +1; +#X obj 601 8 metro 10; +#X obj 601 30 snapshot~; +#X floatatom 601 50 8 0 0 0 - - -; +#X text 318 30 Distance src to obs; +#X obj 691 -77 inlet~; +#X obj 717 -33 loadbang; +#X obj 717 -12 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1 +1; +#X obj 717 6 metro 10; +#X obj 717 28 snapshot~; +#X floatatom 717 48 8 0 0 0 - - -; +#X obj 451 -53 s~ \$0_scrObsYDist; +#X obj 575 -54 s~ \$0_scrObsXDist; +#X obj 691 -56 s~ \$0_scrObsZDist; +#X obj 855 92 atan~; +#X obj 854 68 /~; +#X obj 849 15 r~ \$0_scrObsXDist; +#X obj 868 42 r~ \$0_scrObsZDist; +#X obj 856 121 /~ 6.28319; +#X obj 858 140 *~ 360; +#X obj 877 184 loadbang; +#X obj 877 205 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1 +1; +#X obj 877 223 metro 10; +#X obj 877 245 snapshot~; +#X floatatom 877 265 5 0 0 0 - - -; +#X obj 357 223 r~ \$0_scrObsYDist; +#X obj 495 134 r~ \$0_scrObsYDist; +#X obj 661 382 r~ \$0_scrObsYDist; +#X obj 816 184 outlet~; #X connect 0 0 3 0; -#X connect 0 0 38 0; +#X connect 0 0 37 0; #X connect 1 0 4 0; -#X connect 1 0 43 0; +#X connect 1 0 42 0; #X connect 2 0 5 0; -#X connect 2 0 48 0; +#X connect 2 0 47 0; #X connect 6 0 7 0; #X connect 7 0 8 0; #X connect 8 0 13 0; @@ -139,77 +199,123 @@ #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 27 0 101 1; +#X connect 27 0 127 0; #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 31 0 93 0; +#X connect 33 0 98 0; +#X connect 33 0 141 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 38 0 39 0; +#X connect 39 0 40 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 44 0 45 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 49 0 52 0; +#X connect 49 0 52 1; +#X connect 50 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 57 0; +#X connect 53 0 59 0; +#X connect 54 0 59 1; +#X connect 55 0 69 0; +#X connect 56 0 61 0; +#X connect 57 0 56 0; +#X connect 58 0 60 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 61 0 60 1; +#X connect 62 0 66 0; +#X connect 62 0 75 0; +#X connect 63 0 64 0; +#X connect 64 0 65 0; +#X connect 65 0 66 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 68 0 69 1; +#X connect 69 0 58 1; +#X connect 70 0 55 0; +#X connect 70 0 55 1; +#X connect 71 0 70 0; +#X connect 72 0 73 0; +#X connect 73 0 68 0; +#X connect 73 0 68 1; +#X connect 76 0 77 0; +#X connect 77 0 78 0; +#X connect 78 0 81 0; #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 80 0 81 1; +#X connect 81 0 82 0; +#X connect 82 0 86 0; +#X connect 83 0 84 0; #X connect 84 0 85 0; -#X connect 85 0 89 0; +#X connect 85 0 86 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 88 0 79 0; +#X connect 89 0 120 1; +#X connect 90 0 91 0; +#X connect 91 0 92 0; +#X connect 92 0 93 0; #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 97 0 98 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; +#X connect 101 0 28 0; +#X connect 101 0 24 0; +#X connect 105 0 106 1; +#X connect 106 0 107 0; +#X connect 107 0 111 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 113 0 127 1; +#X connect 113 0 117 0; +#X connect 114 0 115 0; +#X connect 115 0 116 0; +#X connect 116 0 117 0; +#X connect 117 0 118 0; +#X connect 119 0 120 0; +#X connect 120 0 20 1; +#X connect 120 0 125 0; +#X connect 121 0 119 0; +#X connect 122 0 123 0; +#X connect 123 0 124 0; +#X connect 124 0 125 0; +#X connect 125 0 126 0; +#X connect 128 0 132 0; +#X connect 128 0 142 0; +#X connect 129 0 130 0; +#X connect 130 0 131 0; +#X connect 131 0 132 0; +#X connect 132 0 133 0; +#X connect 135 0 139 0; +#X connect 135 0 143 0; +#X connect 136 0 137 0; +#X connect 137 0 138 0; +#X connect 138 0 139 0; +#X connect 139 0 140 0; +#X connect 144 0 148 0; +#X connect 145 0 144 0; +#X connect 146 0 145 0; +#X connect 147 0 145 1; +#X connect 148 0 149 0; +#X connect 149 0 153 0; +#X connect 149 0 158 0; +#X connect 150 0 151 0; +#X connect 151 0 152 0; +#X connect 152 0 153 0; +#X connect 153 0 154 0; +#X connect 155 0 61 1; +#X connect 156 0 54 0; +#X connect 156 0 54 1; +#X connect 157 0 106 0;
--- a/SwordSounds/thisPosition.pd Fri Aug 07 14:03:21 2015 +0100 +++ b/SwordSounds/thisPosition.pd Mon Aug 10 20:18:34 2015 +0100 @@ -1,4 +1,4 @@ -#N canvas 574 52 917 541 10; +#N canvas 30 23 917 541 10; #X obj -11951 -141 r~ currentElev; #X obj -11639 -26 r~ currentAzim; #X obj -11951 -117 /~ 360; @@ -20,37 +20,46 @@ #X obj -11813 -88 cos~; #X obj -11798 23 sin~; #X text -11683 -163 Z position of source; -#X obj -12001 -9 sig~; -#X obj -11951 17 -~; -#X obj -11856 93 sig~; -#X obj -11813 115 -~; -#X obj -11698 88 sig~; -#X obj -11654 112 -~; -#X obj -11698 65 r Zobs; -#X obj -11951 46 *~; -#X obj -11813 140 *~; -#X obj -11654 137 *~; -#X obj -11893 156 +~; -#X obj -11547 196 +~; -#X obj -11547 220 sqrt~; +#X obj -11999 75 sig~; +#X obj -11966 105 -~; +#X obj -11862 85 sig~; +#X obj -11828 115 -~; +#X obj -11702 82 sig~; +#X obj -11669 112 -~; +#X obj -11702 59 r Zobs; +#X obj -11966 134 *~; +#X obj -11828 140 *~; +#X obj -11669 137 *~; +#X obj -11843 166 +~; +#X obj -11546 214 +~; +#X obj -11546 238 sqrt~; #X text -11961 -164 Y position of source; #X text -11820 -162 X position of source; -#X obj -11856 70 r Xobs; -#X obj -12001 -32 r Yobs; -#X text -12041 201 Distance between the observer as a point in 3D space +#X obj -11862 62 r Xobs; +#X obj -11999 52 r Yobs; +#X text -11514 -93 Distance between the observer as a point in 3D space and the sound source.; -#X obj -11547 243 outlet~; +#X obj -11546 261 outlet~; #X obj -11508 -190 inlet~; #X obj -11508 -166 s~ \$0_myScrCnt; #X obj -11639 -72 r~ \$0_myScrCnt; #X obj -11798 -68 r~ \$0_myScrCnt; #X obj -11936 -74 r~ \$0_myScrCnt; -#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 obj -11634 72 outlet~; +#X obj -11796 75 outlet~; +#X obj -11934 -24 outlet~; +#X obj -11450 198 +~; +#X obj -11450 222 sqrt~; +#X obj -11450 245 outlet~; +#X obj -11365 127 +~; +#X obj -11365 151 sqrt~; +#X obj -11365 174 outlet~; +#X obj -11295 48 +~; +#X obj -11295 72 sqrt~; +#X obj -11295 95 outlet~; +#X text -11447 266 Y; +#X text -11362 192 X; +#X text -11293 114 Z; #X connect 0 0 2 0; #X connect 1 0 10 0; #X connect 2 0 3 0; @@ -77,18 +86,19 @@ #X connect 21 0 22 0; #X connect 22 0 28 0; #X connect 22 0 28 1; +#X connect 22 0 50 0; #X connect 23 0 24 0; #X connect 24 0 29 0; #X connect 24 0 29 1; +#X connect 24 0 53 0; #X connect 25 0 26 0; #X connect 26 0 30 0; #X connect 26 0 30 1; +#X connect 26 0 56 0; #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; @@ -99,4 +109,5 @@ #X connect 43 0 15 1; #X connect 44 0 4 1; #X connect 48 0 49 0; -#X connect 49 0 50 0; +#X connect 51 0 52 0; +#X connect 54 0 55 0;
--- a/scene demo/wire10_D1.pd Fri Aug 07 14:03:21 2015 +0100 +++ b/scene demo/wire10_D1.pd Mon Aug 10 20:18:34 2015 +0100 @@ -12,94 +12,22 @@ #X msg 316 86 7; #X msg 366 87 8; #X msg 415 87 9; -#X obj 678 505 +; -#X floatatom 693 526 5 0 0 0 - - -; #X obj 520 60 - 1; #X obj 520 83 * 10; #X msg 465 85 10; -#X obj 497 506 +; -#X floatatom 508 528 5 0 0 0 - - -; -#X obj 315 509 +; -#X floatatom 326 529 5 0 0 0 - - -; -#X obj 138 506 +; -#X floatatom 149 528 5 0 0 0 - - -; -#X obj -40 503 +; -#X floatatom -29 524 5 0 0 0 - - -; -#X obj 680 278 +; -#X floatatom 691 299 5 0 0 0 - - -; -#X obj 499 280 +; -#X floatatom 510 301 5 0 0 0 - - -; -#X obj 318 282 +; -#X floatatom 329 302 5 0 0 0 - - -; -#X obj 136 282 +; -#X floatatom 147 303 5 0 0 0 - - -; #X obj -43 278 +; #X floatatom -31 302 5 0 0 0 - - -; #X floatatom -112 323 5 0 0 0 - - -; -#X floatatom 67 325 5 0 0 0 - - -; -#X floatatom 249 325 5 0 0 0 - - -; -#X floatatom 431 323 5 0 0 0 - - -; -#X floatatom 611 320 5 0 0 0 - - -; -#X floatatom -109 546 5 0 0 0 - - -; -#X floatatom 69 549 5 0 0 0 - - -; -#X floatatom 246 551 5 0 0 0 - - -; -#X floatatom 428 550 5 0 0 0 - - -; -#X floatatom 609 548 5 0 0 0 - - -; -#X obj 695 240 t f b; -#X obj 722 260 delay 9; -#X obj 514 238 t f b; -#X obj 541 258 delay 9; -#X obj 333 240 t f b; -#X obj 360 260 delay 9; -#X obj 151 240 t f b; -#X obj 178 260 delay 9; #X obj -28 237 t f b; #X obj -1 257 delay 9; -#X obj 693 461 t f b; -#X obj 720 481 delay 9; -#X obj 512 462 t f b; -#X obj 539 482 delay 9; -#X obj 330 465 t f b; -#X obj 357 485 delay 9; -#X obj 153 462 t f b; -#X obj 180 482 delay 9; -#X obj -25 459 t f b; -#X obj 2 479 delay 9; #X msg -210 113 300; #X obj -210 88 loadbang; #X obj -152 86 r setUp; #X obj -112 301 wireSourceD2; -#X obj 67 303 wireSourceD2; -#X obj 249 303 wireSourceD2; -#X obj 431 301 wireSourceD2; -#X obj 611 298 wireSourceD2; -#X obj -109 524 wireSourceD2; -#X obj 69 527 wireSourceD2; -#X obj 246 529 wireSourceD2; -#X obj 428 528 wireSourceD2; -#X obj 609 526 wireSourceD2; #X obj -210 132 s \$0-wirDel; #X obj -112 153 r \$0-wirDel; -#X obj 67 159 r \$0-wirDel; -#X obj 249 159 r \$0-wirDel; -#X obj 431 152 r \$0-wirDel; -#X obj 611 153 r \$0-wirDel; -#X obj 609 380 r \$0-wirDel; -#X obj 428 378 r \$0-wirDel; -#X obj 246 382 r \$0-wirDel; -#X obj 69 380 r \$0-wirDel; -#X obj -109 377 r \$0-wirDel; #X obj -95 70 s \$0-wirDat; #X obj -78 175 r \$0-wirDat; -#X obj 101 180 r \$0-wirDat; -#X obj 283 180 r \$0-wirDat; -#X obj 465 175 r \$0-wirDat; -#X obj 645 175 r \$0-wirDat; -#X obj 643 400 r \$0-wirDat; -#X obj 462 400 r \$0-wirDat; -#X obj 280 403 r \$0-wirDat; -#X obj 103 401 r \$0-wirDat; -#X obj -75 398 r \$0-wirDat; #X obj 15 108 s \$0-s1; #X obj 65 108 s \$0-s2; #X obj 115 108 s \$0-s3; @@ -112,30 +40,12 @@ #X obj 465 107 s \$0-s10; #X obj 520 107 s \$0-thisGroup; #X obj -28 217 r \$0-thisGroup; -#X obj 151 221 r \$0-thisGroup; -#X obj 333 221 r \$0-thisGroup; -#X obj 514 219 r \$0-thisGroup; -#X obj 695 217 r \$0-thisGroup; -#X obj 693 441 r \$0-thisGroup; -#X obj 512 442 r \$0-thisGroup; -#X obj 330 445 r \$0-thisGroup; -#X obj 153 442 r \$0-thisGroup; -#X obj -25 439 r \$0-thisGroup; #X obj -43 197 r \$0-s1; -#X obj 136 201 r \$0-s2; -#X obj 318 201 r \$0-s3; -#X obj 499 199 r \$0-s4; -#X obj 680 197 r \$0-s5; -#X obj 678 421 r \$0-s10; -#X obj 497 422 r \$0-s9; -#X obj 315 425 r \$0-s8; -#X obj 138 422 r \$0-s7; -#X obj -40 419 r \$0-s6; -#X connect 0 0 90 0; +#X connect 0 0 27 0; #X connect 1 0 2 0; #X connect 1 0 3 0; -#X connect 2 0 15 0; -#X connect 3 0 17 0; +#X connect 2 0 13 0; +#X connect 3 0 15 0; #X connect 3 0 4 0; #X connect 3 0 5 0; #X connect 3 0 6 0; @@ -145,118 +55,28 @@ #X connect 3 0 10 0; #X connect 3 0 11 0; #X connect 3 0 12 0; -#X connect 4 0 101 0; -#X connect 5 0 102 0; -#X connect 6 0 103 0; -#X connect 7 0 104 0; -#X connect 8 0 105 0; -#X connect 9 0 106 0; -#X connect 10 0 107 0; -#X connect 11 0 108 0; -#X connect 12 0 109 0; +#X connect 4 0 29 0; +#X connect 5 0 30 0; +#X connect 6 0 31 0; +#X connect 7 0 32 0; +#X connect 8 0 33 0; +#X connect 9 0 34 0; +#X connect 10 0 35 0; +#X connect 11 0 36 0; +#X connect 12 0 37 0; #X connect 13 0 14 0; -#X connect 13 0 78 2; -#X connect 15 0 16 0; -#X connect 16 0 111 0; -#X connect 17 0 110 0; -#X connect 18 0 19 0; -#X connect 18 0 77 2; -#X connect 20 0 21 0; -#X connect 20 0 76 2; -#X connect 22 0 23 0; -#X connect 22 0 75 2; -#X connect 24 0 25 0; -#X connect 24 0 74 2; -#X connect 26 0 27 0; -#X connect 26 0 73 2; -#X connect 28 0 29 0; -#X connect 28 0 72 2; -#X connect 30 0 31 0; -#X connect 30 0 71 2; -#X connect 32 0 33 0; -#X connect 32 0 70 2; -#X connect 34 0 35 0; -#X connect 34 0 69 2; -#X connect 46 0 26 1; -#X connect 46 1 47 0; -#X connect 47 0 26 0; -#X connect 48 0 28 1; -#X connect 48 1 49 0; -#X connect 49 0 28 0; -#X connect 50 0 30 1; -#X connect 50 1 51 0; -#X connect 51 0 30 0; -#X connect 52 0 32 1; -#X connect 52 1 53 0; -#X connect 53 0 32 0; -#X connect 54 0 34 1; -#X connect 54 1 55 0; -#X connect 55 0 34 0; -#X connect 56 0 13 1; -#X connect 56 1 57 0; -#X connect 57 0 13 0; -#X connect 58 0 18 1; -#X connect 58 1 59 0; -#X connect 59 0 18 0; -#X connect 60 0 20 1; -#X connect 60 1 61 0; -#X connect 61 0 20 0; -#X connect 62 0 22 1; -#X connect 62 1 63 0; -#X connect 63 0 22 0; -#X connect 64 0 24 1; -#X connect 64 1 65 0; -#X connect 65 0 24 0; -#X connect 66 0 79 0; -#X connect 67 0 66 0; -#X connect 68 0 66 0; -#X connect 69 0 36 0; -#X connect 70 0 37 0; -#X connect 71 0 38 0; -#X connect 72 0 39 0; -#X connect 73 0 40 0; -#X connect 74 0 41 0; -#X connect 75 0 42 0; -#X connect 76 0 43 0; -#X connect 77 0 44 0; -#X connect 78 0 45 0; -#X connect 80 0 69 0; -#X connect 81 0 70 0; -#X connect 82 0 71 0; -#X connect 83 0 72 0; -#X connect 84 0 73 0; -#X connect 85 0 78 0; -#X connect 86 0 77 0; -#X connect 87 0 76 0; -#X connect 88 0 75 0; -#X connect 89 0 74 0; -#X connect 91 0 69 1; -#X connect 92 0 70 1; -#X connect 93 0 71 1; -#X connect 94 0 72 1; -#X connect 95 0 73 1; -#X connect 96 0 78 1; -#X connect 97 0 77 1; -#X connect 98 0 76 1; -#X connect 99 0 75 1; -#X connect 100 0 74 1; -#X connect 112 0 54 0; -#X connect 113 0 52 0; -#X connect 114 0 50 0; -#X connect 115 0 48 0; -#X connect 116 0 46 0; -#X connect 117 0 56 0; -#X connect 118 0 58 0; -#X connect 119 0 60 0; -#X connect 120 0 62 0; -#X connect 121 0 64 0; -#X connect 122 0 34 0; -#X connect 123 0 32 0; -#X connect 124 0 30 0; -#X connect 125 0 28 0; -#X connect 126 0 26 0; -#X connect 127 0 13 0; -#X connect 128 0 18 0; -#X connect 129 0 20 0; -#X connect 130 0 22 0; -#X connect 131 0 24 0; +#X connect 14 0 39 0; +#X connect 15 0 38 0; +#X connect 16 0 17 0; +#X connect 16 0 24 2; +#X connect 19 0 16 1; +#X connect 19 1 20 0; +#X connect 20 0 16 0; +#X connect 21 0 25 0; +#X connect 22 0 21 0; +#X connect 23 0 21 0; +#X connect 24 0 18 0; +#X connect 26 0 24 0; +#X connect 28 0 24 1; +#X connect 40 0 19 0; +#X connect 41 0 16 0;
--- a/scene demo/wireSourceD2.pd Fri Aug 07 14:03:21 2015 +0100 +++ b/scene demo/wireSourceD2.pd Mon Aug 10 20:18:34 2015 +0100 @@ -1,4 +1,4 @@ -#N canvas 628 240 455 288 10; +#N canvas 197 449 455 288 10; #X obj -38 94 inlet; #X obj 67 169 outlet; #X text -20 200 A single source on the horizontal wire; @@ -6,17 +6,17 @@ #X obj 150 38 inlet; #X floatatom 170 59 5 0 0 0 - - -; #X obj 31 98 tolerence; -#X obj 67 146 freqCalcCyl2D3; #X obj 81 60 wireSrcPosD2; -#X connect 0 0 7 0; -#X connect 3 0 8 0; +#X obj 67 146 freqCalcCyl2_D7Mach; +#X connect 0 0 8 0; +#X connect 3 0 7 0; #X connect 4 0 5 0; -#X connect 4 0 8 1; -#X connect 6 0 7 1; -#X connect 7 0 1 0; -#X connect 8 0 6 0; -#X connect 8 1 7 2; -#X connect 8 2 7 3; -#X connect 8 3 7 5; -#X connect 8 4 7 6; -#X connect 8 5 7 4; +#X connect 4 0 7 1; +#X connect 6 0 8 1; +#X connect 7 0 6 0; +#X connect 7 1 8 2; +#X connect 7 2 8 3; +#X connect 7 3 8 5; +#X connect 7 4 8 6; +#X connect 7 5 8 4; +#X connect 8 0 1 0;
--- a/scene demo/wireSrcPosD2.pd Fri Aug 07 14:03:21 2015 +0100 +++ b/scene demo/wireSrcPosD2.pd Mon Aug 10 20:18:34 2015 +0100 @@ -1,6 +1,6 @@ -#N canvas 99 52 1291 748 10; +#N canvas 150 73 1291 748 10; #X obj -188 17 inlet; -#X obj -188 38 unpack f f f f f f f f f; +#X obj -145 13 unpack f f f f f f f f f; #X obj -15 251 inlet; #X floatatom -50 274 5 0 0 0 - - -; #X obj -149 174 +; @@ -108,16 +108,34 @@ #X obj 639 145 r \$0-ad; #X obj 864 116 r \$0-cd; #X obj 879 143 r \$0-ad; +#X floatatom -184 94 5 0 0 0 - - -; +#X floatatom -116 96 5 0 0 0 - - -; +#X floatatom -45 93 5 0 0 0 - - -; +#X floatatom 18 93 5 0 0 0 - - -; +#X floatatom 93 90 5 0 0 0 - - -; +#X floatatom 161 92 5 0 0 0 - - -; +#X floatatom 234 90 5 0 0 0 - - -; +#X floatatom 306 92 5 0 0 0 - - -; +#X floatatom 379 94 5 0 0 0 - - -; #X connect 0 0 1 0; #X connect 1 0 80 0; +#X connect 1 0 109 0; #X connect 1 1 81 0; +#X connect 1 1 110 0; #X connect 1 2 82 0; +#X connect 1 2 111 0; #X connect 1 3 83 0; +#X connect 1 3 112 0; #X connect 1 4 84 0; +#X connect 1 4 113 0; #X connect 1 5 85 0; +#X connect 1 5 114 0; #X connect 1 6 86 0; +#X connect 1 6 115 0; #X connect 1 7 87 0; +#X connect 1 7 116 0; #X connect 1 8 88 0; +#X connect 1 8 117 0; #X connect 2 0 3 0; #X connect 2 0 12 0; #X connect 4 0 5 0;