diff scene demo/oneTone.pd @ 214:18d9eb604d30

Propellor model: Added second blad, angle calcs and doppler effect

Scene: Back up running, WIRES ONLY

--- a/scene demo/oneTone.pd	Tue Apr 05 15:34:35 2016 +0100
+++ b/scene demo/oneTone.pd	Thu Apr 07 12:59:11 2016 +0100
@@ -1,82 +1,61 @@
 #N canvas 393 99 1088 715 10;
 #X obj 276 -4 loadbang;
-#X obj 323 86 hsl 128 15 0.001 0.3 1 0 empty empty empty -2 -8 0 10
+#X obj 343 84 hsl 128 15 0.001 0.3 1 0 empty empty empty -2 -8 0 10
 -262144 -1 -1 3584 1;
-#X floatatom 330 112 8 0 0 0 - - -;
-#X obj 391 362 hsl 128 15 0.01 0.99 0 0 empty empty empty -2 -8 0 10
+#X floatatom 353 107 8 0 0 0 - - -;
+#X obj 447 366 hsl 128 15 0.01 0.99 0 0 empty empty empty -2 -8 0 10
 -262144 -1 -1 6350 1;
-#X floatatom 421 391 5 0 0 0 - - -;
-#X text 461 89 Diameter;
-#X obj 364 244 hsl 128 15 -90 90 0 0 empty empty empty -2 -8 0 10 -262144
+#X floatatom 477 395 5 0 0 0 - - -;
+#X text 481 87 Diameter;
+#X obj 405 245 hsl 128 15 -90 90 0 0 empty empty empty -2 -8 0 10 -262144
 -1 -1 6350 1;
-#X floatatom 392 273 5 0 0 0 - - -;
-#X obj 377 299 hsl 128 15 -180 180 0 0 empty empty empty -2 -8 0 10
+#X floatatom 433 274 5 0 0 0 - - -;
+#X obj 425 296 hsl 128 15 -180 180 0 0 empty empty empty -2 -8 0 10
 -262144 -1 -1 7937 1;
-#X floatatom 407 328 5 0 0 0 - - -;
-#X obj 350 187 hsl 128 15 100 1 1 0 empty empty empty -2 -8 0 10 -262144
+#X floatatom 438 324 5 0 0 0 - - -;
+#X obj 384 187 hsl 128 15 100 1 1 0 empty empty empty -2 -8 0 10 -262144
 -1 -1 8877 1;
-#X floatatom 366 216 5 0 0 0 - - -;
-#X text 539 363 Pan Value;
+#X floatatom 390 215 5 0 0 0 - - -;
+#X text 578 363 Pan Value;
 #X msg 205 227 0;
 #X msg 162 345 0.5;
 #X obj 276 20 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
 -1;
-#X obj 336 144 hsl 128 15 1 20 0 0 empty empty empty -2 -8 0 10 -262144
+#X obj 364 142 hsl 128 15 1 20 0 0 empty empty empty -2 -8 0 10 -262144
 -1 -1 2005 1;
-#X floatatom 358 163 8 0 0 0 - - -;
+#X floatatom 374 163 8 0 0 0 - - -;
 #X msg 242 127 4;
-#X text 468 128 Length;
-#X obj 321 67 r SET_UP;
-#X obj 391 122 r SET_UP;
-#X obj 425 164 r SET_UP;
-#X obj 449 213 r SET_UP;
-#X obj 459 273 r SET_UP;
-#X obj 465 331 r SET_UP;
-#X text 488 188 Obs Distance;
-#X obj 405 420 hsl 128 15 -180 180 0 0 empty empty empty -2 -8 0 10
--262144 -1 -1 6350 1;
-#X floatatom 442 449 5 0 0 0 - - -;
-#X obj 487 394 r SET_UP;
-#X obj 418 480 hsl 128 15 -180 180 0 0 empty empty empty -2 -8 0 10
--262144 -1 -1 6350 1;
-#X floatatom 437 507 5 0 0 0 - - -;
-#X obj 511 448 r SET_UP;
-#X obj 432 532 hsl 128 15 -180 180 0 0 empty empty empty -2 -8 0 10
--262144 -1 -1 6350 1;
-#X floatatom 443 554 5 0 0 0 - - -;
-#X obj 527 501 r SET_UP;
+#X text 496 126 Length;
+#X obj 341 65 r SET_UP;
+#X obj 419 120 r SET_UP;
+#X obj 459 164 r SET_UP;
+#X obj 490 214 r SET_UP;
+#X obj 507 270 r SET_UP;
+#X obj 504 331 r SET_UP;
+#X text 522 188 Obs Distance;
 #X msg 140 403 0;
 #X msg 120 457 0;
 #X msg 101 510 0;
-#X text 568 475 Source Rotation Y;
-#X text 584 528 Source Rotation Z;
 #X msg 308 39 0;
-#X text 516 300 Obs Elevation;
-#X text 503 244 Obs Azimuth;
-#X text 546 411 Source Rotation X;
+#X text 564 297 Obs Elevation;
+#X text 541 240 Obs Azimuth;
 #X msg 226 170 4;
 #X msg 185 282 45;
 #X msg 263 71 0.005;
-#X obj 467 602 r blust;
-#X obj 459 620 * 100;
-#X floatatom 461 638 0 0 0 0 - - -;
-#X text 491 608 Free Stream Turbulence Intensity (%);
-#X obj 501 566 hsl 128 15 0 10 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 0 1;
 #X msg 226 557 200;
 #X obj 226 591 vd~ varwind;
 #X obj 752 5 inlet;
-#X obj 417 52 r \$0-sourceDia;
+#X obj 437 50 r \$0-sourceDia;
 #X obj 752 396 s \$0-sourceDia;
 #X obj 773 338 s \$0-sourceLen;
-#X obj 463 109 r \$0-sourceLen;
-#X obj 523 269 r \$0-sourecElev;
-#X obj 537 333 r \$0-sourecPan;
-#X obj 480 164 r \$0-sourceDis;
+#X obj 491 107 r \$0-sourceLen;
+#X obj 588 267 r \$0-sourecElev;
+#X obj 576 333 r \$0-sourecPan;
+#X obj 514 164 r \$0-sourceDis;
 #X obj 794 278 s \$0-sourceDis;
 #X obj 815 212 s \$0-sourceElev;
 #X obj 857 87 s \$0-sourecPan;
-#X obj 516 220 r \$0-sourecAzim;
+#X obj 547 214 r \$0-sourecAzim;
 #X obj 836 147 s \$0-sourecAzim;
 #X obj 129 557 r \$0-soureceDel;
 #X floatatom 129 591 0 0 0 0 - - -;
@@ -97,7 +76,6 @@
 #X obj 80 62 * 3.14159;
 #X floatatom 146 107 5 0 0 0 - - -;
 #X obj 155 67 * 180;
-#X obj 320 637 freqCalcCyl3No_D3Mach;
 #X obj 857 68 line;
 #X msg 857 48 \$1 100;
 #X obj 836 128 line;
@@ -110,32 +88,33 @@
 #X msg 773 297 \$1 100;
 #X obj 752 377 line;
 #X msg 752 357 \$1 100;
+#X obj 320 637 freqCalcCyl3No_D4Mach;
 #X connect 0 0 15 0;
 #X connect 1 0 2 0;
-#X connect 1 0 87 1;
+#X connect 1 0 82 1;
 #X connect 3 0 4 0;
-#X connect 3 0 87 6;
+#X connect 3 0 82 6;
 #X connect 6 0 7 0;
-#X connect 6 0 87 4;
+#X connect 6 0 82 4;
 #X connect 8 0 9 0;
-#X connect 8 0 87 5;
+#X connect 8 0 82 5;
 #X connect 10 0 11 0;
-#X connect 10 0 87 3;
+#X connect 10 0 82 3;
 #X connect 13 0 6 0;
 #X connect 14 0 3 0;
-#X connect 15 0 41 0;
-#X connect 15 0 47 0;
-#X connect 15 0 45 0;
+#X connect 15 0 30 0;
+#X connect 15 0 35 0;
+#X connect 15 0 33 0;
 #X connect 15 0 13 0;
-#X connect 15 0 46 0;
+#X connect 15 0 34 0;
 #X connect 15 0 14 0;
 #X connect 15 0 18 0;
+#X connect 15 0 27 0;
+#X connect 15 0 28 0;
+#X connect 15 0 29 0;
 #X connect 15 0 36 0;
-#X connect 15 0 37 0;
-#X connect 15 0 38 0;
-#X connect 15 0 53 0;
 #X connect 16 0 17 0;
-#X connect 16 0 87 2;
+#X connect 16 0 82 2;
 #X connect 18 0 16 0;
 #X connect 20 0 1 0;
 #X connect 21 0 16 0;
@@ -143,66 +122,52 @@
 #X connect 23 0 6 0;
 #X connect 24 0 8 0;
 #X connect 25 0 3 0;
-#X connect 27 0 28 0;
-#X connect 27 0 87 7;
-#X connect 29 0 27 0;
-#X connect 30 0 31 0;
-#X connect 30 0 87 8;
-#X connect 32 0 30 0;
-#X connect 33 0 34 0;
-#X connect 33 0 87 9;
-#X connect 35 0 33 0;
-#X connect 36 0 27 0;
-#X connect 37 0 30 0;
-#X connect 38 0 33 0;
+#X connect 33 0 10 0;
+#X connect 34 0 8 0;
+#X connect 35 0 1 0;
+#X connect 36 0 37 0;
+#X connect 37 0 82 0;
+#X connect 38 0 66 0;
+#X connect 39 0 1 0;
+#X connect 42 0 16 0;
+#X connect 43 0 8 0;
+#X connect 44 0 3 0;
 #X connect 45 0 10 0;
-#X connect 46 0 8 0;
-#X connect 47 0 1 0;
-#X connect 48 0 49 0;
-#X connect 49 0 50 0;
-#X connect 53 0 54 0;
-#X connect 54 0 87 0;
-#X connect 55 0 83 0;
-#X connect 56 0 1 0;
-#X connect 59 0 16 0;
-#X connect 60 0 8 0;
-#X connect 61 0 3 0;
-#X connect 62 0 10 0;
-#X connect 66 0 6 0;
-#X connect 68 0 54 0;
-#X connect 68 0 69 0;
-#X connect 70 0 84 0;
-#X connect 70 0 86 0;
-#X connect 71 0 73 0;
-#X connect 72 0 73 1;
-#X connect 73 0 78 0;
-#X connect 74 0 75 0;
-#X connect 75 0 77 0;
-#X connect 76 0 75 0;
-#X connect 77 0 78 1;
-#X connect 77 1 78 0;
-#X connect 78 0 81 0;
-#X connect 79 0 80 0;
-#X connect 79 1 80 1;
-#X connect 80 0 82 0;
-#X connect 81 0 79 0;
-#X connect 83 0 99 0;
-#X connect 83 1 97 0;
-#X connect 83 2 95 0;
-#X connect 83 3 93 0;
-#X connect 83 4 91 0;
-#X connect 83 5 89 0;
-#X connect 84 0 72 0;
-#X connect 86 0 85 0;
-#X connect 88 0 65 0;
-#X connect 89 0 88 0;
-#X connect 90 0 67 0;
-#X connect 91 0 90 0;
-#X connect 92 0 64 0;
-#X connect 93 0 92 0;
-#X connect 94 0 63 0;
-#X connect 95 0 94 0;
-#X connect 96 0 58 0;
-#X connect 97 0 96 0;
-#X connect 98 0 57 0;
-#X connect 99 0 98 0;
+#X connect 49 0 6 0;
+#X connect 51 0 37 0;
+#X connect 51 0 52 0;
+#X connect 53 0 67 0;
+#X connect 53 0 69 0;
+#X connect 54 0 56 0;
+#X connect 55 0 56 1;
+#X connect 56 0 61 0;
+#X connect 57 0 58 0;
+#X connect 58 0 60 0;
+#X connect 59 0 58 0;
+#X connect 60 0 61 1;
+#X connect 60 1 61 0;
+#X connect 61 0 64 0;
+#X connect 62 0 63 0;
+#X connect 62 1 63 1;
+#X connect 63 0 65 0;
+#X connect 64 0 62 0;
+#X connect 66 0 81 0;
+#X connect 66 1 79 0;
+#X connect 66 2 77 0;
+#X connect 66 3 75 0;
+#X connect 66 4 73 0;
+#X connect 66 5 71 0;
+#X connect 67 0 55 0;
+#X connect 69 0 68 0;
+#X connect 70 0 48 0;
+#X connect 71 0 70 0;
+#X connect 72 0 50 0;
+#X connect 73 0 72 0;
+#X connect 74 0 47 0;
+#X connect 75 0 74 0;
+#X connect 76 0 46 0;
+#X connect 77 0 76 0;
+#X connect 78 0 41 0;
+#X connect 79 0 78 0;
+#X connect 80 0 40 0;
+#X connect 81 0 80 0;