Mercurial > hg > weather-synthesis-prototyping

diff scene demo/testBed.pd @ 115:61d267c71a18

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
freqCalcCyl2_D4Mach added. This includes the effect of mach number on the angle of sound radiated from the dipole. This is limited up to 0.3M. angleCalc converted to an object for both control and audio.
author Rod Selfridge <r.selfridge@qmul.ac.uk>
date Fri, 31 Jul 2015 07:15:40 +0100
parents 4628d8c3731f
children 622e6692b214
line wrap: on
line diff
--- a/scene demo/testBed.pd	Thu Jul 30 12:28:59 2015 +0100
+++ b/scene demo/testBed.pd	Fri Jul 31 07:15:40 2015 +0100
@@ -1,4 +1,4 @@
-#N canvas 473 31 842 605 10;
+#N canvas 106 91 842 605 10;
 #X msg 88 -43 300;
 #X obj 59 -86 loadbang;
 #N canvas 236 158 426 423 windspeed 0;
@@ -71,8 +71,8 @@
 #X connect 8 0 0 0;
 #X restore -376 -133 pd windspeed;
 #X obj -376 61 delwrite~ varwind 3000;
-#X obj -293 -131 hsl 128 15 0 50 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 1270 1;
+#X obj -293 -131 hsl 128 15 0 150 0 0 empty empty empty -2 -8 0 10
+-262144 -1 -1 4000 1;
 #X obj -333 -28 snapshot~;
 #X obj -333 -53 metro 100;
 #X obj -333 -75 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1
@@ -82,7 +82,6 @@
 #X obj -376 -73 +~ 1;
 #X obj -333 -100 loadbang;
 #X text -336 17 Wind Speed;
-#X obj -254 -2 s wSpeed;
 #X obj -157 -130 loadbang;
 #X msg -157 -102 5;
 #X obj 103 6 hsl 128 15 0.001 0.01 1 0 empty empty empty -2 -8 0 10
@@ -98,8 +97,8 @@
 #X obj 153 217 hsl 128 15 -180 180 0 0 empty empty empty -2 -8 0 10
 -262144 -1 -1 9525 1;
 #X floatatom 177 246 5 0 0 0 - - -;
-#X obj 128 105 hsl 128 15 100 1 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 11289 1;
+#X obj 128 105 hsl 128 15 100 1 1 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 5847 1;
 #X floatatom 139 134 5 0 0 0 - - -;
 #X text 307 281 Pan Value;
 #X text 280 162 Elevation;
@@ -142,7 +141,7 @@
 #X restore -385 184 pd opLevels;
 #X msg -385 133 5;
 #X obj -382 155 hsl 100 25 0 127 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 390 1;
+-1 -1 490 1;
 #X obj -115 -25 snapshot~;
 #X obj -115 -50 metro 100;
 #X floatatom -115 2 10 0 0 0 - - -;
@@ -154,17 +153,10 @@
 #X obj 26 9 /~ 343.59;
 #X text 107 15 Speed of Sound (dry air 20 Degs C);
 #X obj 26 -14 vd~ varwind;
-#X obj 26 33 s~ myMach;
+#X obj 26 33 s~ MY_MACH;
 #X connect 0 0 3 0;
 #X connect 2 0 0 0;
 #X restore -50 -149 pd machCalc;
-#X obj -200 -64 r~ myMach;
-#X obj 243 249 r setUp;
-#X obj 102 -15 r setUp;
-#X obj 229 131 r setUp;
-#X obj 235 191 r setUp;
-#X obj 242 79 r setUp;
-#X obj 232 -102 s setUp;
 #X obj 232 -143 bng 35 250 50 0 empty empty empty 17 7 0 10 -4032 -1
 -1;
 #X floatatom 88 330 8 0 0 0 - - -;
@@ -178,75 +170,83 @@
 #X obj 116 62 hsl 128 15 1 10 0 0 empty empty empty -2 -8 0 10 -262144
 -1 -1 4233 1;
 #X floatatom 137 81 8 0 0 0 - - -;
-#X obj 175 40 r setUp;
 #X msg 25 47 4;
 #X obj -265 158 hsl 100 25 0 127 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 390 1;
+-1 -1 6690 1;
 #X obj -264 111 loadbang;
 #X msg -264 134 5;
 #X text -203 137 No Of Sources;
-#X obj -173 1 s sigMac;
 #X text 248 46 Length;
-#X obj 88 305 freqCalcCyl2D2;
-#X connect 0 0 70 0;
-#X connect 1 0 59 0;
+#X obj 52 302 freqCalcCyl2_D4Mach;
+#X obj -254 -2 s WSPEED;
+#X obj -200 -64 r~ MY_MACH;
+#X obj -182 4 s SIG_MACH;
+#X obj 232 -102 s SET_UP;
+#X obj 102 -15 r SET_UP;
+#X obj 175 40 r SET_UP;
+#X obj 242 79 r SET_UP;
+#X obj 229 131 r SET_UP;
+#X obj 235 191 r SET_UP;
+#X obj 243 249 r SET_UP;
+#X connect 0 0 60 0;
+#X connect 1 0 51 0;
 #X connect 2 0 9 0;
 #X connect 4 0 9 1;
 #X connect 4 0 10 1;
 #X connect 5 0 8 0;
-#X connect 5 0 13 0;
+#X connect 5 0 61 0;
 #X connect 6 0 5 0;
 #X connect 7 0 6 0;
 #X connect 9 0 10 0;
 #X connect 10 0 3 0;
 #X connect 10 0 5 0;
 #X connect 11 0 7 0;
-#X connect 14 0 15 0;
-#X connect 15 0 4 0;
-#X connect 16 0 17 0;
-#X connect 16 0 70 1;
-#X connect 18 0 19 0;
-#X connect 18 0 70 6;
-#X connect 21 0 22 0;
-#X connect 21 0 70 4;
-#X connect 23 0 24 0;
-#X connect 23 0 70 5;
-#X connect 25 0 26 0;
-#X connect 25 0 70 3;
-#X connect 34 0 36 0;
-#X connect 35 0 31 0;
-#X connect 35 1 32 0;
-#X connect 36 0 37 0;
-#X connect 37 0 35 0;
-#X connect 38 0 40 0;
-#X connect 38 0 68 0;
-#X connect 39 0 38 0;
-#X connect 41 0 42 0;
-#X connect 42 0 39 0;
-#X connect 45 0 38 0;
-#X connect 46 0 18 0;
-#X connect 47 0 16 0;
-#X connect 48 0 21 0;
-#X connect 49 0 23 0;
-#X connect 50 0 25 0;
-#X connect 52 0 51 0;
-#X connect 54 0 16 0;
-#X connect 55 0 25 0;
-#X connect 56 0 21 0;
-#X connect 57 0 23 0;
-#X connect 58 0 18 0;
-#X connect 59 0 0 0;
-#X connect 59 0 54 0;
-#X connect 59 0 55 0;
-#X connect 59 0 56 0;
-#X connect 59 0 57 0;
-#X connect 59 0 58 0;
-#X connect 59 0 63 0;
-#X connect 60 0 61 0;
-#X connect 60 0 70 2;
-#X connect 62 0 60 0;
-#X connect 63 0 60 0;
-#X connect 64 0 35 1;
-#X connect 65 0 66 0;
-#X connect 66 0 64 0;
-#X connect 70 0 53 0;
+#X connect 13 0 14 0;
+#X connect 14 0 4 0;
+#X connect 15 0 16 0;
+#X connect 15 0 60 1;
+#X connect 17 0 18 0;
+#X connect 17 0 60 6;
+#X connect 20 0 21 0;
+#X connect 20 0 60 4;
+#X connect 22 0 23 0;
+#X connect 22 0 60 5;
+#X connect 24 0 25 0;
+#X connect 24 0 60 3;
+#X connect 33 0 35 0;
+#X connect 34 0 30 0;
+#X connect 34 1 31 0;
+#X connect 35 0 36 0;
+#X connect 36 0 34 0;
+#X connect 37 0 39 0;
+#X connect 37 0 63 0;
+#X connect 38 0 37 0;
+#X connect 40 0 41 0;
+#X connect 41 0 38 0;
+#X connect 44 0 64 0;
+#X connect 46 0 15 0;
+#X connect 47 0 24 0;
+#X connect 48 0 20 0;
+#X connect 49 0 22 0;
+#X connect 50 0 17 0;
+#X connect 51 0 0 0;
+#X connect 51 0 46 0;
+#X connect 51 0 47 0;
+#X connect 51 0 48 0;
+#X connect 51 0 49 0;
+#X connect 51 0 50 0;
+#X connect 51 0 54 0;
+#X connect 52 0 53 0;
+#X connect 52 0 60 2;
+#X connect 54 0 52 0;
+#X connect 55 0 34 1;
+#X connect 56 0 57 0;
+#X connect 57 0 55 0;
+#X connect 60 0 45 0;
+#X connect 62 0 37 0;
+#X connect 65 0 15 0;
+#X connect 66 0 52 0;
+#X connect 67 0 24 0;
+#X connect 68 0 20 0;
+#X connect 69 0 22 0;
+#X connect 70 0 17 0;