Skip to content

Commit

Permalink
Some more fixes to ramp and sampling objects. Added help files.
Browse files Browse the repository at this point in the history
  • Loading branch information
grrrr committed May 14, 2016
1 parent 9d87ff6 commit aaee62f
Show file tree
Hide file tree
Showing 6 changed files with 157 additions and 91 deletions.
52 changes: 43 additions & 9 deletions upp.ramp_up_down~-help.pd
Original file line number Diff line number Diff line change
@@ -1,11 +1,45 @@
#N canvas 52 77 267 270 10;
#X obj 69 105 t b a;
#X obj 69 218 print~;
#N canvas 600 327 416 332 10;
#X msg 69 42 up 10 0 \, down 10 30;
#X msg 85 69 up 10 0 \, down 10 1;
#X obj 97 153 upp.ramp_up_down~;
#X connect 0 0 1 0;
#X connect 0 1 4 0;
#X connect 2 0 0 0;
#X connect 3 0 0 0;
#X obj 180 243 upp.ramp_up_down~;
#X msg 69 246 2;
#N canvas 0 22 239 213 print_dsp_blocks 0;
#X obj 143 168 print~;
#X obj 36 105 spigot;
#X obj 105 105 - 1;
#X obj 36 127 t a b;
#X obj 36 80 t a a;
#X obj 39 20 bang~;
#X obj 37 59 f;
#X obj 94 20 inlet;
#X obj 145 20 inlet~;
#X obj 94 42 t f b;
#X connect 1 0 3 0;
#X connect 2 0 6 1;
#X connect 3 0 2 0;
#X connect 3 1 0 0;
#X connect 4 0 1 0;
#X connect 4 1 1 1;
#X connect 5 0 6 0;
#X connect 6 0 4 0;
#X connect 7 0 9 0;
#X connect 8 0 0 0;
#X connect 9 0 6 1;
#X restore 69 272 pd print_dsp_blocks;
#X obj 70 180 t b a b;
#X msg 99 97 up 40 10 \, down 40 50;
#X text 232 99 across blocks;
#X text 202 41 inside block;
#X msg 85 69 up 10 10 \, down 10 15;
#X text 225 68 with delay;
#X msg 111 121 up 0 10 \, down 0 20;
#X text 238 120 no fade;
#X msg 122 145 up 100 10 \, down 0 120;
#X connect 0 0 4 0;
#X connect 1 0 3 1;
#X connect 2 0 3 0;
#X connect 4 0 2 0;
#X connect 4 1 1 0;
#X connect 5 0 4 0;
#X connect 8 0 4 0;
#X connect 10 0 4 0;
#X connect 12 0 4 0;
80 changes: 40 additions & 40 deletions upp.ramp_up_down~.pd
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
#N canvas -14 177 946 671 10;
#N canvas 0 177 995 610 10;
#X obj 177 24 inlet;
#X obj 585 192 bang~;
#X text 637 236 holds value at vector borders;
#X obj 672 255 + 64;
#X text 602 325 signal counting samples;
#X obj 652 57 bang~;
#X text 704 101 holds value at vector borders;
#X obj 739 120 + 64;
#X text 669 190 signal counting samples;
#X text 48 85 up (towards one);
#X text 282 89 down (towards zero);
#X obj 611 256 v \$0-pos;
#X obj 584 220 t b b;
#X obj 678 121 v \$0-pos;
#X obj 651 85 t b b;
#N canvas 0 22 500 300 start_end 0;
#X obj 79 26 inlet;
#X obj 79 86 unpack 0 0;
Expand Down Expand Up @@ -58,17 +58,17 @@
#X obj 101 185 v \$0-pos;
#X msg 101 163 0;
#X obj 142 274 s \$0-upstart;
#X obj 520 397 r \$0-upstart;
#X obj 587 262 r \$0-upstart;
#X obj 369 306 s \$0-dnstart;
#X obj 767 400 r \$0-dnstart;
#X obj 834 265 r \$0-dnstart;
#X text 78 497 clip((dnstart-upstart)/updur \, 0 \, 1);
#X obj 71 410 r \$0-dnstart;
#X obj 146 446 r \$0-upstart;
#X floatatom 146 577 5 0 0 0 - - -, f 5;
#X obj 549 624 outlet~;
#X obj 445 493 *~ 1;
#X obj 698 497 *~ 1;
#X obj 738 476 * -1;
#X floatatom 152 551 5 0 0 0 - - -, f 5;
#X obj 616 489 outlet~;
#X obj 512 358 *~ 1;
#X obj 765 362 *~ 1;
#X obj 805 341 * -1;
#X msg 180 164 3e+38;
#X obj 180 186 s \$0-dnstart;
#N canvas 0 22 184 197 1/ 0;
Expand All @@ -86,7 +86,7 @@
#X connect 5 0 1 0;
#X restore 51 278 pd 1/;
#X obj 51 305 s \$0-up1dur;
#X obj 466 470 r \$0-up1dur;
#X obj 533 335 r \$0-up1dur;
#N canvas 0 22 184 197 1/ 0;
#X obj 36 26 inlet;
#X obj 36 132 outlet;
Expand All @@ -102,9 +102,9 @@
#X connect 5 0 1 0;
#X restore 295 281 pd 1/;
#X obj 294 306 s \$0-dn1dur;
#X obj 738 456 r \$0-dn1dur;
#X obj 805 321 r \$0-dn1dur;
#X obj 232 446 r \$0-up1dur;
#X text 79 524 up-ramp final value;
#X text 89 525 up-ramp final value;
#X obj 312 141 spigot;
#X obj 495 58 loadbang;
#X msg 493 82 0;
Expand All @@ -114,36 +114,36 @@
#X msg 180 209 1;
#X obj 290 165 t b a;
#X msg 211 209 0;
#X obj 576 488 expr~ $v1 >= 0;
#X obj 65 579 s \$0-final;
#X text 405 538 up part;
#X text 722 559 down part;
#X obj 643 353 expr~ $v1 >= 0;
#X obj 71 553 s \$0-final;
#X text 472 403 up part;
#X text 789 424 down part;
#X obj 62 330 nbx 8 14 -1e+37 1e+37 0 0 empty empty empty 0 -8 0 10
-262144 -1 -1 10 256;
-262144 -1 -1 100 256;
#X obj 149 332 nbx 8 14 -1e+37 1e+37 0 0 empty empty empty 0 -8 0 10
-262144 -1 -1 0 256;
#X obj 285 332 nbx 8 14 -1e+37 1e+37 0 0 empty empty empty 0 -8 0 10
-262144 -1 -1 10 256;
#X obj 285 332 nbx 8 14 -1e+37 1e+37 0 0 empty empty empty 0 -8 0 10
-262144 -1 -1 0 256;
#X obj 372 334 nbx 8 14 -1e+37 1e+37 0 0 empty empty empty 0 -8 0 10
-262144 -1 -1 30 256;
#X obj 549 569 upp.xfade~;
#X obj 549 596 clip~ 0 1;
#X text 705 259 block size;
#X obj 698 529 +~ 0;
#X text 567 467 mask for up part;
#X obj 520 420 t b a;
#X obj 483 420 -;
#X obj 445 421 +~ 0;
#X obj 698 422 +~ 0;
#X obj 767 422 t b a;
#X obj 735 422 -;
-262144 -1 -1 120 256;
#X obj 616 434 upp.xfade~;
#X obj 616 461 clip~ 0 1;
#X text 772 124 block size;
#X obj 765 394 +~ 0;
#X text 634 332 mask for up part;
#X obj 587 285 t b a;
#X obj 550 285 -;
#X obj 512 286 +~ 0;
#X obj 765 287 +~ 0;
#X obj 834 287 t b a;
#X obj 802 287 -;
#X text 40 389 last value to be received;
#X obj 71 473 expr min(($f1-$f2)*$f3 \, 1);
#X obj 177 51 route up down;
#X obj 584 301 upp.endless_ramp_up~;
#X obj 821 456 r \$0-final;
#X obj 821 477 t b a;
#X obj 738 497 *;
#X obj 651 166 upp.endless_ramp_up~;
#X obj 888 321 r \$0-final;
#X obj 888 342 t b a;
#X obj 805 362 *;
#X connect 0 0 72 0;
#X connect 1 0 8 0;
#X connect 3 0 7 0;
Expand Down
20 changes: 20 additions & 0 deletions upp.tabread2~-help.pd
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
#N canvas 396 401 439 263 10;
#X obj 47 210 print~;
#X obj 47 42 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
-1;
#X obj 47 77 t b b;
#X obj 74 110 upp.endless_ramp_up~;
#X obj 74 163 upp.tabread2~ \$0-table;
#X obj 273 153 array set \$0-table;
#X msg 272 123 1 2 0;
#X obj 273 49 table \$0-table 3;
#X obj 74 135 /~ 10;
#X obj 272 98 loadbang;
#X connect 1 0 2 0;
#X connect 2 0 0 0;
#X connect 2 1 3 0;
#X connect 3 0 8 0;
#X connect 4 0 0 0;
#X connect 6 0 5 0;
#X connect 8 0 4 0;
#X connect 9 0 6 0;
19 changes: 8 additions & 11 deletions upp.tabread2~.pd
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#N canvas 0 23 435 489 10;
#N canvas 53 85 434 432 10;
#X obj 252 282 +~ 1;
#X obj 43 89 inlet~;
#X obj 159 420 outlet~;
#X obj 159 379 outlet~;
#X text 42 19 linear interpolation for tabread~;
#X obj 204 90 inlet;
#X obj 228 170 route symbol;
Expand Down Expand Up @@ -35,28 +35,25 @@
#X obj 143 218 -~;
#X text 36 180 fractional pos;
#X text 36 218 integer pos;
#X text 215 416 s1+f*(s2-s1);
#X obj 160 356 -~;
#X obj 172 385 *~;
#X text 215 375 s1+f*(s2-s1);
#X text 44 39 Thomas Grill \, 2016 - grrrr.org;
#X text 200 72 table name;
#X text 40 71 position signal;
#X obj 159 350 upp.xfade~;
#X connect 0 0 8 0;
#X connect 1 0 11 0;
#X connect 4 0 5 0;
#X connect 5 0 9 0;
#X connect 6 0 10 0;
#X connect 7 0 2 0;
#X connect 7 0 17 1;
#X connect 8 0 17 0;
#X connect 7 0 20 0;
#X connect 8 0 20 1;
#X connect 9 0 7 0;
#X connect 9 0 8 0;
#X connect 10 0 5 0;
#X connect 11 0 12 0;
#X connect 11 0 13 0;
#X connect 12 0 13 1;
#X connect 12 0 18 1;
#X connect 12 0 20 2;
#X connect 13 0 0 0;
#X connect 13 0 7 0;
#X connect 17 0 18 0;
#X connect 18 0 2 0;
#X connect 20 0 2 0;
20 changes: 20 additions & 0 deletions upp.tabread4~-help.pd
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
#N canvas 301 52 429 270 10;
#X obj 47 210 print~;
#X obj 47 42 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
-1;
#X obj 47 77 t b b;
#X obj 74 110 upp.endless_ramp_up~;
#X obj 273 153 array set \$0-table;
#X obj 74 135 /~ 10;
#X obj 272 98 loadbang;
#X obj 74 163 upp.tabread4~ \$0-table;
#X msg 272 123 1 2 0 1 3 0;
#X obj 273 49 table \$0-table 6;
#X connect 1 0 2 0;
#X connect 2 0 0 0;
#X connect 2 1 3 0;
#X connect 3 0 5 0;
#X connect 5 0 7 0;
#X connect 6 0 8 0;
#X connect 7 0 0 0;
#X connect 8 0 4 0;
57 changes: 26 additions & 31 deletions upp.tabread4~.pd
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
#N canvas 673 103 467 513 10;
#X obj 63 101 inlet~;
#X obj 248 98 inlet;
#X obj 99 470 outlet~;
#X obj 302 99 loadbang;
#X msg 81 297 set \$1;
#X obj 64 327 tabread4~;
#X obj 219 330 upp.tabread2~;
#X obj 247 243 array size;
#N canvas 0 22 260 227 first_or_last 1;
#N canvas 673 103 490 470 10;
#X obj 63 108 inlet~;
#X obj 248 105 inlet;
#X obj 128 423 outlet~;
#X obj 302 106 loadbang;
#X msg 81 304 set \$1;
#X obj 64 334 tabread4~;
#X obj 219 337 upp.tabread2~;
#X obj 247 250 array size;
#N canvas 162 271 260 227 first_or_last 0;
#X obj 37 44 inlet~;
#X obj 37 148 outlet~;
#X obj 189 43 inlet;
#X obj 190 46 inlet;
#X text 189 20 size;
#X text 26 172 first or last;
#X obj 190 87 - 2;
Expand All @@ -19,10 +19,10 @@
#X connect 2 0 5 0;
#X connect 5 0 6 1;
#X connect 6 0 1 0;
#X restore 154 277 pd first_or_last;
#X obj 248 155 route symbol;
#X text 62 18 Workaround for tabread4~;
#X text 62 35 Delivers linearly interpolated first and last samples
#X restore 154 284 pd first_or_last;
#X obj 248 162 route symbol;
#X text 62 25 Workaround for tabread4~;
#X text 62 42 Delivers linearly interpolated first and last samples
;
#N canvas 637 164 293 240 symbol_arg_\$1_not_0 0;
#X obj 35 73 symbol \$1;
Expand All @@ -44,32 +44,27 @@
#X connect 5 0 8 0;
#X connect 6 0 5 1;
#X connect 7 0 3 0;
#X restore 302 121 pd symbol_arg_\$1_not_0;
#X obj 247 179 t b a;
#X obj 118 385 -~;
#X obj 139 419 *~;
#X text 173 456 t4*(1-m)+t2*m;
#X text 217 352 only for first and last sample;
#X text 169 473 = t4+m*(t2-t4);
#X text 63 82 position signal;
#X text 251 80 table name;
#X text 62 54 Thomas Grill \, 2016 - grrrr.org;
#X restore 302 128 pd symbol_arg_\$1_not_0;
#X obj 247 186 t b a;
#X text 217 359 only for first and last sample;
#X text 63 89 position signal;
#X text 251 87 table name;
#X text 62 61 Thomas Grill \, 2016 - grrrr.org;
#X obj 128 399 upp.xfade~;
#X connect 0 0 5 0;
#X connect 0 0 8 0;
#X connect 0 0 6 0;
#X connect 1 0 9 0;
#X connect 3 0 12 0;
#X connect 4 0 5 0;
#X connect 5 0 14 1;
#X connect 5 0 2 0;
#X connect 6 0 14 0;
#X connect 5 0 18 0;
#X connect 6 0 18 1;
#X connect 7 0 8 1;
#X connect 8 0 15 1;
#X connect 8 0 18 2;
#X connect 9 0 13 0;
#X connect 12 0 9 0;
#X connect 13 0 7 0;
#X connect 13 1 7 1;
#X connect 13 1 6 1;
#X connect 13 1 4 0;
#X connect 14 0 15 0;
#X connect 15 0 2 0;
#X connect 18 0 2 0;

0 comments on commit aaee62f

Please sign in to comment.