Mercurial > hg > weather-synthesis-prototyping

changeset 89:65306ede8d41

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Swoosh presets improved and comments on code as to where it needs improving.
author Rod Selfridge <r.selfridge@qmul.ac.uk>
date Wed, 01 Jul 2015 12:54:18 +0100
parents 6acd332d0ae8
children 3ab0b1939d2e
files June/freqCalcWoo.pd June/obsPosition.pd June/tenSource.pd June/woosh_D2.pd
diffstat 4 files changed, 138 insertions(+), 127 deletions(-) [+]
line wrap: on
line diff
--- a/June/freqCalcWoo.pd	Wed Jul 01 12:40:54 2015 +0100
+++ b/June/freqCalcWoo.pd	Wed Jul 01 12:54:18 2015 +0100
@@ -67,6 +67,9 @@
 time and ramp down to 0 in the remaining 1/4;
 #X text 219 14 Patch that calculates the speed of an individual source
 in the blade through out the arc of the swing.;
+#X text 229 442 Need to change this patch to audio control rather than
+signal. This isa possible cause of the zipping type sound and will
+hopefully improve if implemented.;
 #X connect 0 0 4 0;
 #X connect 0 0 22 1;
 #X connect 0 0 33 1;
--- a/June/obsPosition.pd	Wed Jul 01 12:40:54 2015 +0100
+++ b/June/obsPosition.pd	Wed Jul 01 12:54:18 2015 +0100
@@ -24,7 +24,7 @@
 #X obj 10 376 +;
 #X obj 25 257 cos;
 #X obj -80 150 hsl 75 25 -360 360 0 0 empty empty empty -2 -8 0 10
--262144 -1 -1 0 1;
+-262144 -1 -1 5357 1;
 #X floatatom -83 182 5 0 0 0 - - -;
 #X obj 10 418 outlet;
 #X floatatom -19 211 5 0 0 0 - - -;
@@ -37,6 +37,8 @@
 line between centre and observer;
 #X text 54 427 Total distance between observer and the specific source
 in line from centre;
+#X text 91 24 This also needs to change to Audio control signal as
+the angle is constantly changing throughout the swing.;
 #X connect 0 0 21 0;
 #X connect 1 0 20 1;
 #X connect 2 0 5 0;
--- a/June/tenSource.pd	Wed Jul 01 12:40:54 2015 +0100
+++ b/June/tenSource.pd	Wed Jul 01 12:54:18 2015 +0100
@@ -119,19 +119,10 @@
 #X obj 872 15 inlet;
 #X obj 872 39 s \$0_obAngle;
 #X obj 780 40 s \$0_obDist;
-#X obj 313 223 freqCalcWoo;
 #X obj 973 15 inlet;
 #X obj 973 39 s \$0_elev;
 #X obj 373 353 r \$0_elev;
 #X obj -159 109 freqCalcWoo;
-#X obj -158 336 freqCalcWoo;
-#X obj -155 598 freqCalcWoo;
-#X obj 77 239 freqCalcWoo;
-#X obj 80 596 freqCalcWoo;
-#X obj 303 595 freqCalcWoo;
-#X obj 537 223 freqCalcWoo;
-#X obj 541 573 freqCalcWoo;
-#X obj 772 347 freqCalcWoo;
 #X obj -158 490 woSoFreq;
 #X obj 150 368 r \$0_elev;
 #X obj -39 195 r \$0_elev;
@@ -151,6 +142,16 @@
 #X obj 537 352 woSoFreq;
 #X obj 541 702 woSoFreq;
 #X obj 772 476 woSoFreq;
+#X obj 99 328 obsPosition;
+#X obj 313 223 freqCalcWoo;
+#X obj -158 336 freqCalcWoo;
+#X obj -155 598 freqCalcWoo;
+#X obj 77 239 freqCalcWoo;
+#X obj 80 596 freqCalcWoo;
+#X obj 303 595 freqCalcWoo;
+#X obj 537 223 freqCalcWoo;
+#X obj 541 573 freqCalcWoo;
+#X obj 772 347 freqCalcWoo;
 #X obj 559 306 obsPosition;
 #X obj 794 427 obsPosition;
 #X obj 563 655 obsPosition;
@@ -159,21 +160,20 @@
 #X obj -138 681 obsPosition;
 #X obj -133 428 obsPosition;
 #X obj -137 194 obsPosition;
-#X obj 99 328 obsPosition;
 #X obj 335 315 obsPosition;
 #X connect 0 0 1 0;
 #X connect 0 0 12 0;
 #X connect 1 0 2 0;
 #X connect 2 0 3 0;
 #X connect 3 0 4 0;
-#X connect 5 0 124 0;
+#X connect 5 0 123 0;
 #X connect 6 0 11 1;
 #X connect 7 0 6 1;
 #X connect 8 0 9 0;
 #X connect 9 0 6 0;
-#X connect 9 0 159 0;
+#X connect 9 0 160 0;
 #X connect 10 0 11 0;
-#X connect 11 0 144 1;
+#X connect 11 0 135 1;
 #X connect 12 0 13 0;
 #X connect 12 0 14 0;
 #X connect 12 0 15 0;
@@ -195,137 +195,137 @@
 #X connect 21 0 31 0;
 #X connect 22 0 32 0;
 #X connect 33 0 9 1;
-#X connect 34 0 124 1;
-#X connect 35 0 125 0;
+#X connect 34 0 123 1;
+#X connect 35 0 145 0;
 #X connect 36 0 41 1;
 #X connect 37 0 36 1;
 #X connect 38 0 39 0;
 #X connect 39 0 36 0;
-#X connect 39 0 158 0;
+#X connect 39 0 159 0;
 #X connect 40 0 41 0;
-#X connect 41 0 133 1;
-#X connect 42 0 125 1;
+#X connect 41 0 124 1;
+#X connect 42 0 145 1;
 #X connect 43 0 39 1;
-#X connect 44 0 126 0;
+#X connect 44 0 146 0;
 #X connect 45 0 50 1;
 #X connect 46 0 45 1;
 #X connect 47 0 48 0;
 #X connect 48 0 45 0;
-#X connect 48 0 157 0;
+#X connect 48 0 158 0;
 #X connect 49 0 50 0;
-#X connect 50 0 145 1;
-#X connect 51 0 126 1;
+#X connect 50 0 136 1;
+#X connect 51 0 146 1;
 #X connect 52 0 48 1;
-#X connect 53 0 127 0;
+#X connect 53 0 147 0;
 #X connect 54 0 59 1;
 #X connect 55 0 54 1;
 #X connect 56 0 57 0;
 #X connect 57 0 54 0;
-#X connect 57 0 160 0;
+#X connect 57 0 143 0;
 #X connect 58 0 59 0;
-#X connect 59 0 146 1;
-#X connect 60 0 127 1;
+#X connect 59 0 137 1;
+#X connect 60 0 147 1;
 #X connect 61 0 57 1;
-#X connect 62 0 128 0;
+#X connect 62 0 148 0;
 #X connect 63 0 68 1;
 #X connect 64 0 63 1;
 #X connect 65 0 66 0;
 #X connect 66 0 63 0;
-#X connect 66 0 156 0;
+#X connect 66 0 157 0;
 #X connect 67 0 68 0;
-#X connect 68 0 147 1;
+#X connect 68 0 138 1;
 #X connect 69 0 66 1;
-#X connect 70 0 128 1;
-#X connect 71 0 120 0;
+#X connect 70 0 148 1;
+#X connect 71 0 144 0;
 #X connect 72 0 77 1;
 #X connect 73 0 72 1;
 #X connect 74 0 75 0;
 #X connect 75 0 72 0;
 #X connect 75 0 161 0;
 #X connect 76 0 77 0;
-#X connect 77 0 143 1;
-#X connect 78 0 120 1;
+#X connect 77 0 134 1;
+#X connect 78 0 144 1;
 #X connect 79 0 75 1;
-#X connect 80 0 129 0;
+#X connect 80 0 149 0;
 #X connect 81 0 86 1;
 #X connect 82 0 81 1;
 #X connect 83 0 84 0;
 #X connect 84 0 81 0;
-#X connect 84 0 155 0;
+#X connect 84 0 156 0;
 #X connect 85 0 86 0;
-#X connect 86 0 148 1;
-#X connect 87 0 129 1;
+#X connect 86 0 139 1;
+#X connect 87 0 149 1;
 #X connect 88 0 84 1;
-#X connect 89 0 130 0;
+#X connect 89 0 150 0;
 #X connect 90 0 95 1;
 #X connect 91 0 90 1;
 #X connect 92 0 93 0;
 #X connect 93 0 90 0;
-#X connect 93 0 152 0;
+#X connect 93 0 153 0;
 #X connect 94 0 95 0;
-#X connect 95 0 149 1;
-#X connect 96 0 130 1;
+#X connect 95 0 140 1;
+#X connect 96 0 150 1;
 #X connect 97 0 93 1;
-#X connect 98 0 131 0;
+#X connect 98 0 151 0;
 #X connect 99 0 104 1;
 #X connect 100 0 99 1;
 #X connect 101 0 102 0;
 #X connect 102 0 99 0;
-#X connect 102 0 154 0;
+#X connect 102 0 155 0;
 #X connect 103 0 104 0;
-#X connect 104 0 150 1;
-#X connect 105 0 131 1;
+#X connect 104 0 141 1;
+#X connect 105 0 151 1;
 #X connect 106 0 102 1;
-#X connect 107 0 132 0;
+#X connect 107 0 152 0;
 #X connect 108 0 113 1;
 #X connect 109 0 108 1;
 #X connect 110 0 111 0;
 #X connect 111 0 108 0;
-#X connect 111 0 153 0;
+#X connect 111 0 154 0;
 #X connect 112 0 113 0;
-#X connect 113 0 151 1;
-#X connect 114 0 132 1;
+#X connect 113 0 142 1;
+#X connect 114 0 152 1;
 #X connect 115 0 111 1;
 #X connect 116 0 119 0;
 #X connect 117 0 118 0;
-#X connect 120 0 143 0;
-#X connect 121 0 122 0;
-#X connect 123 0 143 4;
-#X connect 124 0 144 0;
-#X connect 125 0 133 0;
-#X connect 126 0 145 0;
-#X connect 127 0 146 0;
-#X connect 128 0 147 0;
-#X connect 129 0 148 0;
-#X connect 130 0 149 0;
-#X connect 131 0 150 0;
-#X connect 132 0 151 0;
-#X connect 134 0 146 4;
-#X connect 135 0 144 4;
-#X connect 136 0 133 4;
-#X connect 137 0 145 4;
-#X connect 138 0 147 4;
-#X connect 139 0 148 4;
-#X connect 140 0 150 4;
-#X connect 141 0 151 4;
-#X connect 142 0 149 4;
-#X connect 152 0 149 2;
-#X connect 152 1 149 3;
-#X connect 153 0 151 2;
-#X connect 153 1 151 3;
-#X connect 154 0 150 2;
-#X connect 154 1 150 3;
-#X connect 155 0 148 2;
-#X connect 155 1 148 3;
-#X connect 156 0 147 2;
-#X connect 156 1 147 3;
-#X connect 157 0 145 2;
-#X connect 157 1 145 3;
-#X connect 158 0 133 2;
-#X connect 158 1 133 3;
-#X connect 159 0 144 2;
-#X connect 159 1 144 3;
-#X connect 160 0 146 2;
-#X connect 160 1 146 3;
-#X connect 161 0 143 2;
-#X connect 161 1 143 3;
+#X connect 120 0 121 0;
+#X connect 122 0 134 4;
+#X connect 123 0 135 0;
+#X connect 125 0 137 4;
+#X connect 126 0 135 4;
+#X connect 127 0 124 4;
+#X connect 128 0 136 4;
+#X connect 129 0 138 4;
+#X connect 130 0 139 4;
+#X connect 131 0 141 4;
+#X connect 132 0 142 4;
+#X connect 133 0 140 4;
+#X connect 143 0 137 2;
+#X connect 143 1 137 3;
+#X connect 144 0 134 0;
+#X connect 145 0 124 0;
+#X connect 146 0 136 0;
+#X connect 147 0 137 0;
+#X connect 148 0 138 0;
+#X connect 149 0 139 0;
+#X connect 150 0 140 0;
+#X connect 151 0 141 0;
+#X connect 152 0 142 0;
+#X connect 153 0 140 2;
+#X connect 153 1 140 3;
+#X connect 154 0 142 2;
+#X connect 154 1 142 3;
+#X connect 155 0 141 2;
+#X connect 155 1 141 3;
+#X connect 156 0 139 2;
+#X connect 156 1 139 3;
+#X connect 157 0 138 2;
+#X connect 157 1 138 3;
+#X connect 158 0 136 2;
+#X connect 158 1 136 3;
+#X connect 159 0 124 2;
+#X connect 159 1 124 3;
+#X connect 160 0 135 2;
+#X connect 160 1 135 3;
+#X connect 161 0 134 2;
+#X connect 161 1 134 3;
--- a/June/woosh_D2.pd	Wed Jul 01 12:40:54 2015 +0100
+++ b/June/woosh_D2.pd	Wed Jul 01 12:54:18 2015 +0100
@@ -129,14 +129,14 @@
 #X obj 3 -81 s NoOfSources;
 #X obj 68 79 s topSpeed;
 #X obj 16 53 hsl 100 20 0 100 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 4257 1;
+-1 -1 2970 1;
 #X floatatom 13 79 8 0 0 0 - - -;
 #X text 37 -236 Blade Length;
 #X text 36 -170 Arm Length;
 #X text 31 -104 Number of Sources;
 #X text 124 57 Top Speed;
 #X obj 13 137 hsl 100 20 0 360 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 5912 1;
+-1 -1 7700 1;
 #X floatatom 10 169 8 0 0 0 - - -;
 #X obj 65 168 s sweepAngle;
 #X text 124 138 Sweep Angle;
@@ -181,9 +181,9 @@
 #X obj 362 -110 s deltaThick;
 #X floatatom 307 -109 8 0 0 0 - - -;
 #X obj 10 228 hsl 100 20 0 0.03 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 2805 1;
+-1 -1 3135 1;
 #X obj 9 313 hsl 100 20 0 0.01 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 2475 1;
+-1 -1 3168 1;
 #X floatatom 7 258 8 0 0 0 - - -;
 #X obj 61 257 s hiltThick;
 #X floatatom 6 341 8 0 0 0 - - -;
@@ -197,9 +197,9 @@
 #X obj 204 -137 s GO;
 #X obj 765 -103 tenSource;
 #X obj 9 395 hsl 100 20 100 1 1 0 empty empty empty -2 -8 0 10 -262144
--1 -1 6920 1;
+-1 -1 8410 1;
 #X obj 5 480 hsl 100 20 -180 180 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 7425 1;
+-1 -1 6600 1;
 #X floatatom 6 421 8 0 0 0 - - -;
 #X text 119 399 Distance to Observer;
 #X floatatom 2 508 8 0 0 0 - - -;
@@ -212,7 +212,7 @@
 0 1;
 #X obj 204 -217 metro 200;
 #X obj 258 -241 hsl 100 20 300 50 0 0 empty empty empty -2 -8 0 10
--262144 -1 -1 5600 1;
+-262144 -1 -1 2000 1;
 #X obj 144 -190 bng 50 250 50 0 empty empty empty 17 7 0 10 -257985
 -1 -1;
 #X obj 144 -137 s setUp;
@@ -331,7 +331,7 @@
 #X obj -157 352 *;
 #X obj -128 297 r sweepAngle;
 #X obj -154 405 hsl 100 25 0 360 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 4434 1;
+-1 -1 5775 1;
 #X obj -128 319 * -0.75;
 #X obj -157 376 +;
 #X obj -128 343 * -1;
@@ -340,7 +340,7 @@
 #X obj 169 372 *;
 #X obj 219 332 r sweepAngle;
 #X obj 172 396 hsl 100 25 -360 360 0 0 empty empty empty -2 -8 0 10
--262144 -1 -1 4211 1;
+-262144 -1 -1 3987 1;
 #X obj 214 283 r GO;
 #X obj -142 78 r maxCirc;
 #X obj 231 165 r maxCirc;
@@ -440,7 +440,7 @@
 #X connect 50 0 27 1;
 #X restore 421 -230 pd angleCalc;
 #X obj 533 -185 hsl 100 25 0 127 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 3118 1;
+-1 -1 9354 1;
 #X msg 765 -182 10;
 #X obj 4 -259 loadbang;
 #X obj 2 -190 loadbang;
@@ -514,14 +514,16 @@
 #X text 696 263 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 427 225 loadbang;
+#X obj 144 -242 loadbang;
+#X obj 144 -218 delay 13;
 #X obj 900 -91 tenSource;
 #X obj 764 62 tenSource;
 #X obj 893 71 tenSource;
 #X obj 761 213 tenSource;
 #X obj 895 220 tenSource;
-#X obj 427 225 loadbang;
-#X obj 144 -242 loadbang;
-#X obj 144 -218 delay 13;
+#X obj 379 307 t b;
+#X obj 359 330 s setUp;
 #X connect 3 0 5 0;
 #X connect 4 0 0 0;
 #X connect 4 1 1 0;
@@ -582,12 +584,12 @@
 #X connect 84 0 10 0;
 #X connect 85 0 52 3;
 #X connect 86 0 87 0;
-#X connect 89 0 147 2;
-#X connect 90 0 147 1;
+#X connect 89 0 150 2;
+#X connect 90 0 150 1;
 #X connect 91 0 94 0;
 #X connect 92 0 91 0;
-#X connect 93 0 147 3;
-#X connect 94 0 147 0;
+#X connect 93 0 150 3;
+#X connect 94 0 150 0;
 #X connect 95 0 86 0;
 #X connect 103 0 20 0;
 #X connect 104 0 26 0;
@@ -607,33 +609,37 @@
 #X connect 112 0 10 0;
 #X connect 113 0 11 0;
 #X connect 114 0 9 0;
-#X connect 119 0 148 2;
-#X connect 120 0 148 1;
+#X connect 119 0 151 2;
+#X connect 120 0 151 1;
 #X connect 121 0 136 0;
 #X connect 122 0 121 0;
-#X connect 123 0 148 3;
-#X connect 124 0 149 2;
-#X connect 125 0 149 1;
+#X connect 123 0 151 3;
+#X connect 124 0 152 2;
+#X connect 125 0 152 1;
 #X connect 126 0 135 0;
 #X connect 127 0 126 0;
-#X connect 128 0 149 3;
-#X connect 129 0 150 2;
-#X connect 130 0 150 1;
+#X connect 128 0 152 3;
+#X connect 129 0 153 2;
+#X connect 130 0 153 1;
 #X connect 131 0 134 0;
 #X connect 132 0 131 0;
-#X connect 133 0 150 3;
-#X connect 134 0 150 0;
-#X connect 135 0 149 0;
-#X connect 136 0 148 0;
-#X connect 137 0 151 2;
-#X connect 138 0 151 1;
+#X connect 133 0 153 3;
+#X connect 134 0 153 0;
+#X connect 135 0 152 0;
+#X connect 136 0 151 0;
+#X connect 137 0 154 2;
+#X connect 138 0 154 1;
 #X connect 139 0 142 0;
 #X connect 140 0 139 0;
-#X connect 141 0 151 3;
-#X connect 142 0 151 0;
+#X connect 141 0 154 3;
+#X connect 142 0 154 0;
 #X connect 143 0 110 0;
+#X connect 143 0 155 0;
 #X connect 144 0 110 0;
+#X connect 144 0 155 0;
 #X connect 145 0 110 0;
-#X connect 152 0 144 0;
-#X connect 153 0 154 0;
-#X connect 154 0 65 0;
+#X connect 145 0 155 0;
+#X connect 147 0 144 0;
+#X connect 148 0 149 0;
+#X connect 149 0 65 0;
+#X connect 155 0 156 0;