Mercurial > hg > weather-synthesis-prototyping
changeset 109:4dc8819f890e
Panning calculated for turning view of player in demo
| author | Rod Selfridge <r.selfridge@qmul.ac.uk> |
|---|---|
| date | Tue, 28 Jul 2015 21:34:14 +0100 |
| parents | 4628d8c3731f |
| children | 572caafc3904 |
| files | scene demo/Gen3_D1.pd scene demo/wirePosition.pd |
| diffstat | 2 files changed, 226 insertions(+), 206 deletions(-) [+] |
line wrap: on
line diff
--- a/scene demo/Gen3_D1.pd Tue Jul 28 12:34:25 2015 +0100 +++ b/scene demo/Gen3_D1.pd Tue Jul 28 21:34:14 2015 +0100 @@ -90,7 +90,7 @@ #X obj 218 421 loadbang; #X obj 270 88 delwrite~ varwind 3000; #X obj 353 -104 hsl 128 15 0 120 0 0 empty empty empty -2 -8 0 10 -262144 --1 -1 1529 1; +-1 -1 1029 1; #X obj 313 -1 snapshot~; #X obj 313 -26 metro 100; #X obj 313 -48 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1 @@ -642,6 +642,15 @@ #X obj -166 455 r Wir7LY; #X obj 30 465 r Wir8LY; #X floatatom -484 331 5 0 0 0 - - -; +#X obj -583 324 freqCalcCyl2D2; +#X obj -420 326 freqCalcCyl2D2; +#X obj -239 328 freqCalcCyl2D2; +#X obj -53 342 freqCalcCyl2D2; +#X obj 139 343 freqCalcCyl2D2; +#X obj 6 708 freqCalcCyl2D2; +#X obj -191 698 freqCalcCyl2D2; +#X obj -378 700 freqCalcCyl2D2; +#X obj -556 700 freqCalcCyl2D2; #X obj -381 294 wirePosition; #X obj -194 298 wirePosition; #X obj -10 311 wirePosition; @@ -650,177 +659,168 @@ #X obj -336 669 wirePosition; #X obj -146 664 wirePosition; #X obj 51 675 wirePosition; -#X obj 139 343 freqCalcCylD4; -#X obj 6 708 freqCalcCylD4; -#X obj -191 698 freqCalcCylD4; -#X obj -420 326 freqCalcCylD4; -#X obj -53 342 freqCalcCylD4; -#X obj -556 700 freqCalcCylD4; -#X obj -378 700 freqCalcCylD4; -#X obj -583 324 freqCalcCylD5; -#X obj -239 328 freqCalcCylD6; -#X connect 1 0 143 0; +#X connect 1 0 128 0; #X connect 2 0 1 0; -#X connect 3 0 143 1; +#X connect 3 0 128 1; #X connect 4 0 8 0; #X connect 5 0 8 2; #X connect 6 0 8 1; #X connect 7 0 8 3; -#X connect 8 0 143 5; -#X connect 8 1 143 6; -#X connect 8 2 143 4; -#X connect 8 3 143 3; +#X connect 8 0 128 5; +#X connect 8 1 128 6; +#X connect 8 2 128 3; +#X connect 8 3 128 4; #X connect 9 0 8 5; #X connect 10 0 8 4; #X connect 11 0 8 8; #X connect 12 0 8 7; #X connect 13 0 8 6; -#X connect 15 0 139 0; +#X connect 15 0 129 0; #X connect 16 0 15 0; -#X connect 17 0 139 1; -#X connect 18 0 128 0; -#X connect 19 0 128 1; -#X connect 20 0 128 2; -#X connect 21 0 128 3; -#X connect 22 0 128 4; -#X connect 23 0 128 5; -#X connect 24 0 128 6; -#X connect 25 0 128 7; -#X connect 26 0 128 8; -#X connect 28 0 144 0; +#X connect 17 0 129 1; +#X connect 18 0 137 0; +#X connect 19 0 137 1; +#X connect 20 0 137 2; +#X connect 21 0 137 3; +#X connect 22 0 137 4; +#X connect 23 0 137 5; +#X connect 24 0 137 6; +#X connect 25 0 137 7; +#X connect 26 0 137 8; +#X connect 28 0 130 0; #X connect 29 0 28 0; -#X connect 30 0 144 1; -#X connect 31 0 129 0; -#X connect 32 0 129 1; -#X connect 33 0 129 2; -#X connect 34 0 129 3; -#X connect 35 0 129 4; -#X connect 36 0 129 5; -#X connect 37 0 129 6; -#X connect 38 0 129 7; -#X connect 39 0 129 8; -#X connect 41 0 140 0; +#X connect 30 0 130 1; +#X connect 31 0 138 0; +#X connect 32 0 138 1; +#X connect 33 0 138 2; +#X connect 34 0 138 3; +#X connect 35 0 138 4; +#X connect 36 0 138 5; +#X connect 37 0 138 6; +#X connect 38 0 138 7; +#X connect 39 0 138 8; +#X connect 41 0 131 0; #X connect 42 0 41 0; -#X connect 43 0 140 1; -#X connect 44 0 130 0; -#X connect 45 0 130 1; -#X connect 46 0 130 2; -#X connect 47 0 130 3; -#X connect 48 0 130 4; -#X connect 49 0 130 5; -#X connect 50 0 130 6; -#X connect 51 0 130 7; -#X connect 52 0 130 8; -#X connect 54 0 136 0; +#X connect 43 0 131 1; +#X connect 44 0 139 0; +#X connect 45 0 139 1; +#X connect 46 0 139 2; +#X connect 47 0 139 3; +#X connect 48 0 139 4; +#X connect 49 0 139 5; +#X connect 50 0 139 6; +#X connect 51 0 139 7; +#X connect 52 0 139 8; +#X connect 54 0 132 0; #X connect 55 0 54 0; -#X connect 56 0 136 1; -#X connect 57 0 131 0; -#X connect 58 0 131 1; -#X connect 59 0 131 2; -#X connect 60 0 131 3; -#X connect 61 0 131 4; -#X connect 62 0 131 5; -#X connect 63 0 131 6; -#X connect 64 0 131 7; -#X connect 65 0 131 8; -#X connect 67 0 141 0; +#X connect 56 0 132 1; +#X connect 57 0 140 0; +#X connect 58 0 140 1; +#X connect 59 0 140 2; +#X connect 60 0 140 3; +#X connect 61 0 140 4; +#X connect 62 0 140 5; +#X connect 63 0 140 6; +#X connect 64 0 140 7; +#X connect 65 0 140 8; +#X connect 67 0 136 0; #X connect 68 0 67 0; -#X connect 69 0 141 1; -#X connect 70 0 132 0; -#X connect 71 0 132 1; -#X connect 72 0 132 2; -#X connect 73 0 132 3; -#X connect 74 0 132 4; -#X connect 75 0 132 5; -#X connect 76 0 132 6; -#X connect 77 0 132 7; -#X connect 78 0 132 8; -#X connect 80 0 142 0; +#X connect 69 0 136 1; +#X connect 70 0 141 0; +#X connect 71 0 141 1; +#X connect 72 0 141 2; +#X connect 73 0 141 3; +#X connect 74 0 141 4; +#X connect 75 0 141 5; +#X connect 76 0 141 6; +#X connect 77 0 141 7; +#X connect 78 0 141 8; +#X connect 80 0 135 0; #X connect 81 0 80 0; -#X connect 82 0 142 1; -#X connect 83 0 133 0; -#X connect 84 0 133 1; -#X connect 85 0 133 2; -#X connect 86 0 133 3; -#X connect 87 0 133 4; -#X connect 88 0 133 5; -#X connect 89 0 133 6; -#X connect 90 0 133 7; -#X connect 91 0 133 8; -#X connect 93 0 138 0; +#X connect 82 0 135 1; +#X connect 83 0 142 0; +#X connect 84 0 142 1; +#X connect 85 0 142 2; +#X connect 86 0 142 3; +#X connect 87 0 142 4; +#X connect 88 0 142 5; +#X connect 89 0 142 6; +#X connect 90 0 142 7; +#X connect 91 0 142 8; +#X connect 93 0 134 0; #X connect 94 0 93 0; -#X connect 95 0 138 1; -#X connect 96 0 134 0; -#X connect 97 0 134 1; -#X connect 98 0 134 2; -#X connect 99 0 134 3; -#X connect 100 0 134 4; -#X connect 101 0 134 5; -#X connect 102 0 134 6; -#X connect 103 0 134 7; -#X connect 104 0 134 8; -#X connect 106 0 137 0; +#X connect 95 0 134 1; +#X connect 96 0 143 0; +#X connect 97 0 143 1; +#X connect 98 0 143 2; +#X connect 99 0 143 3; +#X connect 100 0 143 4; +#X connect 101 0 143 5; +#X connect 102 0 143 6; +#X connect 103 0 143 7; +#X connect 104 0 143 8; +#X connect 106 0 133 0; #X connect 107 0 106 0; -#X connect 108 0 137 1; -#X connect 109 0 135 0; -#X connect 110 0 135 1; -#X connect 111 0 135 2; -#X connect 112 0 135 3; -#X connect 113 0 135 4; -#X connect 114 0 135 5; -#X connect 115 0 135 6; -#X connect 116 0 135 7; -#X connect 117 0 135 8; -#X connect 118 0 143 2; -#X connect 119 0 139 2; -#X connect 120 0 144 2; -#X connect 121 0 140 2; -#X connect 122 0 136 2; -#X connect 123 0 141 2; -#X connect 124 0 142 2; -#X connect 125 0 138 2; -#X connect 126 0 137 2; -#X connect 128 0 139 5; -#X connect 128 1 139 6; -#X connect 128 2 139 4; -#X connect 128 3 139 3; -#X connect 129 0 144 5; -#X connect 129 1 144 6; -#X connect 129 2 144 4; -#X connect 129 3 144 3; -#X connect 130 0 140 5; -#X connect 130 1 140 6; -#X connect 130 2 140 4; -#X connect 130 3 140 3; -#X connect 131 0 136 5; -#X connect 131 1 136 6; -#X connect 131 2 136 4; -#X connect 131 3 136 3; -#X connect 132 0 141 5; -#X connect 132 1 141 6; -#X connect 132 2 141 4; -#X connect 132 3 141 3; -#X connect 133 0 142 5; -#X connect 133 1 142 6; -#X connect 133 2 142 4; -#X connect 133 3 142 3; -#X connect 134 0 138 5; -#X connect 134 1 138 6; -#X connect 134 2 138 4; -#X connect 134 3 138 3; -#X connect 135 0 137 5; -#X connect 135 1 137 6; -#X connect 135 2 137 4; -#X connect 135 3 137 3; -#X connect 136 0 53 0; -#X connect 137 0 105 0; -#X connect 138 0 92 0; -#X connect 139 0 14 0; -#X connect 140 0 40 0; -#X connect 141 0 66 0; -#X connect 142 0 79 0; -#X connect 143 0 0 0; -#X connect 144 0 27 0; +#X connect 108 0 133 1; +#X connect 109 0 144 0; +#X connect 110 0 144 1; +#X connect 111 0 144 2; +#X connect 112 0 144 3; +#X connect 113 0 144 4; +#X connect 114 0 144 5; +#X connect 115 0 144 6; +#X connect 116 0 144 7; +#X connect 117 0 144 8; +#X connect 118 0 128 2; +#X connect 119 0 129 2; +#X connect 120 0 130 2; +#X connect 121 0 131 2; +#X connect 122 0 132 2; +#X connect 123 0 136 2; +#X connect 124 0 135 2; +#X connect 125 0 134 2; +#X connect 126 0 133 2; +#X connect 128 0 0 0; +#X connect 129 0 14 0; +#X connect 130 0 27 0; +#X connect 131 0 40 0; +#X connect 132 0 53 0; +#X connect 133 0 105 0; +#X connect 134 0 92 0; +#X connect 135 0 79 0; +#X connect 136 0 66 0; +#X connect 137 0 129 5; +#X connect 137 1 129 6; +#X connect 137 2 129 4; +#X connect 137 3 129 3; +#X connect 138 0 130 5; +#X connect 138 1 130 6; +#X connect 138 2 130 4; +#X connect 138 3 130 3; +#X connect 139 0 131 5; +#X connect 139 1 131 6; +#X connect 139 2 131 4; +#X connect 139 3 131 3; +#X connect 140 0 132 5; +#X connect 140 1 132 6; +#X connect 140 2 132 4; +#X connect 140 3 132 3; +#X connect 141 0 136 5; +#X connect 141 1 136 6; +#X connect 141 2 136 4; +#X connect 141 3 136 3; +#X connect 142 0 135 5; +#X connect 142 1 135 6; +#X connect 142 2 135 4; +#X connect 142 3 135 3; +#X connect 143 0 134 5; +#X connect 143 1 134 6; +#X connect 143 2 134 4; +#X connect 143 3 134 3; +#X connect 144 0 133 5; +#X connect 144 1 133 6; +#X connect 144 2 133 4; +#X connect 144 3 133 3; #X restore 110 36 pd Wires; #X restore 913 88 pd Fence; #N canvas 13 38 1440 790 OSC_FenceValues 0; @@ -1860,7 +1860,7 @@ #X connect 325 0 326 0; #X restore 740 -11 pd OSC_WireValues; #X obj 67 402 hsl 128 15 1 400 0 0 empty empty empty -2 -8 0 10 -262144 --1 -1 827 1; +-1 -1 127 1; #X floatatom 82 421 5 0 0 0 - - -; #N canvas 117 23 1269 841 OSC_TeleValues 0; #X obj 36 26 inlet;
--- a/scene demo/wirePosition.pd Tue Jul 28 12:34:25 2015 +0100 +++ b/scene demo/wirePosition.pd Tue Jul 28 21:34:14 2015 +0100 @@ -1,4 +1,4 @@ -#N canvas 213 227 1440 721 10; +#N canvas 44 86 1440 721 10; #X obj 197 -11 -; #X obj 197 16 *; #X obj 212 88 *; @@ -48,37 +48,24 @@ #X floatatom -170 119 5 0 0 0 - - -; #X obj -135 62 * 360; #X obj -135 86 / 6.28319; -#X obj 163 419 outlet; -#X obj 163 338 atan; -#X obj 163 316 /; -#X floatatom 128 419 5 0 0 0 - - -; -#X obj 163 362 * 360; -#X obj 163 386 / 6.28319; +#X obj 274 441 outlet; +#X obj 274 360 atan; +#X obj 274 338 /; +#X floatatom 239 441 5 0 0 0 - - -; +#X obj 274 384 * 360; +#X obj 274 408 / 6.28319; #X obj 136 13 s \$0_xRel; -#X obj 178 291 r \$0_xRel; +#X obj 289 313 r \$0_xRel; #X obj 299 17 s \$0_yRel; -#X obj 163 268 r \$0_yRel; +#X obj 274 290 r \$0_yRel; #X obj 212 65 r \$0_zRel; #X obj -120 -53 r \$0_xRel; #X text 128 -101 Calculates the distance between; #X text 146 -88 the wire and the ball; #X text -139 -95 Calculates the azimuth; -#X text 117 245 Calculates the elevation; -#X obj -110 255 r \$0_xRel; -#X obj -74 281 > 0; -#X obj -110 281 <= 0; -#X obj -78 310 spigot; -#X obj -144 314 spigot; -#X obj -83 120 abs; -#X obj -83 143 / 90; -#X obj -83 167 swap 1; -#X obj -83 193 -; -#X obj -83 217 / 2; -#X obj -155 259 + 0.5; -#X obj -42 255 - 0.5; -#X obj -42 277 * -1; -#X obj -101 352 outlet; -#X text -5 348 Calculates the pan value; +#X text 228 267 Calculates the elevation; +#X obj -68 440 outlet; +#X text -127 466 Calculates the pan value; #X obj -120 -30 t f b; #X obj -93 -4 delay 9; #X obj 664 -6 s \$0_myLY; @@ -165,6 +152,27 @@ #X obj 800 -102 inlet; #X obj 834 -58 inlet; #X obj 869 -16 inlet; +#X obj -12 89 r YRpos; +#X obj -12 138 +; +#X obj 3 113 t f b; +#X floatatom 41 141 5 0 0 0 - - -; +#X obj -12 220 mod 360; +#X obj -109 256 > 180; +#X obj -62 256 < 360; +#X obj -95 284 spigot; +#X obj -142 312 spigot; +#X obj -12 254 / 360; +#X obj 53 283 spigot; +#X obj 6 311 spigot; +#X obj 39 255 < 180; +#X obj 86 255 > 0; +#X floatatom -23 441 5 0 0 0 - - -; +#X obj -68 415 clip 0 1; +#X obj -12 166 swap 360; +#X obj -12 193 -; +#X obj -142 364 + 1; +#X obj -142 339 * -1; +#X obj -68 392 * 2; #X connect 0 0 1 0; #X connect 0 0 1 1; #X connect 0 0 55 0; @@ -181,7 +189,7 @@ #X connect 11 0 12 0; #X connect 11 0 13 0; #X connect 11 0 29 0; -#X connect 11 0 82 0; +#X connect 11 0 69 0; #X connect 12 0 16 1; #X connect 12 0 22 0; #X connect 12 0 27 1; @@ -217,7 +225,7 @@ #X connect 47 0 48 0; #X connect 48 0 46 0; #X connect 48 0 7 0; -#X connect 48 0 70 0; +#X connect 48 0 78 0; #X connect 50 0 53 0; #X connect 51 0 50 0; #X connect 53 0 54 0; @@ -227,28 +235,40 @@ #X connect 58 0 51 0; #X connect 59 0 2 0; #X connect 59 0 2 1; -#X connect 60 0 80 0; -#X connect 65 0 67 0; -#X connect 65 0 66 0; -#X connect 66 0 68 1; -#X connect 67 0 69 1; -#X connect 68 0 78 0; -#X connect 69 0 78 0; -#X connect 70 0 71 0; -#X connect 71 0 72 0; -#X connect 72 0 73 0; -#X connect 72 1 73 1; -#X connect 73 0 74 0; -#X connect 74 0 75 0; -#X connect 74 0 76 0; -#X connect 75 0 69 0; +#X connect 60 0 67 0; +#X connect 67 0 45 1; +#X connect 67 1 68 0; +#X connect 68 0 45 0; +#X connect 71 0 70 1; +#X connect 72 0 70 3; +#X connect 73 0 70 0; +#X connect 74 0 70 2; +#X connect 75 0 70 4; #X connect 76 0 77 0; -#X connect 77 0 68 0; -#X connect 80 0 45 1; -#X connect 80 1 81 0; -#X connect 81 0 45 0; -#X connect 84 0 83 1; -#X connect 85 0 83 3; -#X connect 86 0 83 0; -#X connect 87 0 83 2; -#X connect 88 0 83 4; +#X connect 76 0 79 0; +#X connect 77 0 92 0; +#X connect 78 0 77 1; +#X connect 78 1 77 0; +#X connect 80 0 81 0; +#X connect 80 0 82 0; +#X connect 80 0 85 0; +#X connect 80 0 88 0; +#X connect 80 0 89 0; +#X connect 81 0 84 1; +#X connect 82 0 83 1; +#X connect 83 0 84 0; +#X connect 84 0 95 0; +#X connect 85 0 83 0; +#X connect 85 0 86 0; +#X connect 86 0 87 0; +#X connect 87 0 96 0; +#X connect 88 0 87 1; +#X connect 89 0 86 1; +#X connect 91 0 90 0; +#X connect 91 0 65 0; +#X connect 92 0 93 0; +#X connect 92 1 93 1; +#X connect 93 0 80 0; +#X connect 94 0 96 0; +#X connect 95 0 94 0; +#X connect 96 0 91 0;