Quartic adsr4~, whereas rrad.adsr~ will stay linear.

svn path=/trunk/abstractions/rradical/; revision=2150

1 files changed, 31 insertions, 21 deletions

diff --git a/effects/rrad.adsr4~.pd b/effects/rrad.adsr4~.pd
index 2aa32e1..fb7632a 100644
--- a/effects/rrad.adsr4~.pd
+++ b/effects/rrad.adsr4~.pd
@@ -81,13 +81,13 @@ standard functionality.;
 #X text 184 -4 look! ==>;
 #X obj 371 17 outlet OSC;
 #X obj 10 37 vsl 8 64 0 100 0 0 \$0-a \$0-ain a 0 -8 1 8 -355 -260818
--143491 0 1;
+-143491 500 1;
 #X obj 29 37 vsl 8 64 0 127 0 0 \$0-d \$0-din d 0 -8 1 8 -355 -260818
--143491 0 1;
+-143491 3400 1;
 #X obj 49 37 vsl 8 64 0 127 0 0 \$0-s \$0-sin s 0 -8 1 8 -355 -260818
--143491 0 1;
+-143491 1200 1;
 #X obj 69 37 vsl 8 64 0 127 0 0 \$0-r \$0-rin r 0 -8 1 8 -355 -260818
--143491 0 1;
+-143491 800 1;
 #X obj 189 21 inlet;
 #X obj 189 72 outlet~;
 #N canvas 0 0 600 400 envelope 0;
@@ -98,7 +98,7 @@ standard functionality.;
 #X obj 413 132 r \$0-r;
 #X obj 25 119 inlet;
 #X obj 174 346 outlet~;
-#N canvas 231 224 600 400 adsr 0;
+#N canvas 404 95 600 400 adsr 0;
 #X text 52 50 This patch is used as an abstraction in 25.envelope.pd
 ;
 #X obj 95 108 inlet;
@@ -106,11 +106,11 @@ standard functionality.;
 #X text 91 79 trigger;
 #X obj 95 138 sel 0;
 #X obj 144 138 t b;
-#X obj 104 359 pack 0 \$2;
+#X obj 104 399 pack 0 \$2;
 #X obj 362 112 inlet;
 #X obj 309 301 del \$2;
 #X obj 338 324 f \$4;
-#X obj 371 369 pack 0 \$3;
+#X obj 363 411 pack 0 \$3;
 #X obj 410 112 inlet;
 #X obj 459 111 inlet;
 #X obj 504 111 inlet;
@@ -119,7 +119,7 @@ standard functionality.;
 #X text 378 86 Traditional A \, D \, S \, R;
 #X text 296 88 level;
 #X text 32 302 ATTACK;
-#X obj 371 465 outlet~;
+#X obj 447 533 outlet~;
 #X text 7 325 recall level;
 #X text 7 345 and pack with;
 #X text 8 365 attack time;
@@ -137,17 +137,21 @@ standard functionality.;
 #X text 511 403 back to zero;
 #X text 63 12 adsr - arguments: level \, attack time \, decay time
 \, sustain level \, release time;
-#X text 17 487 When you send this patch a nonzero trigger it schedules
+#X text 9 479 When you send this patch a nonzero trigger it schedules
 a line~ to do an attack and decay \, and if zero \, it starts the release
 ramp.;
-#X text 18 533 Objects such as f and pack can be given dollar sign
+#X text 10 525 Objects such as f and pack can be given dollar sign
 arguments to initialize their contents from adsr's creation arguments.
 Inlets are supplied to update them on the fly.;
 #X obj 104 334 f;
 #X obj 364 346 * 1;
-#X obj 371 426 sqrt;
-#X obj 371 405 sqrt;
-#X obj 371 445 vline~;
+#X obj 363 386 sqrt;
+#X obj 363 365 sqrt;
+#X obj 447 461 vline~;
+#X obj 446 491 *~;
+#X obj 446 511 *~;
+#X obj 104 376 sqrt;
+#X obj 104 355 sqrt;
 #X connect 1 0 4 0;
 #X connect 2 0 38 0;
 #X connect 2 0 39 1;
@@ -155,22 +159,28 @@ Inlets are supplied to update them on the fly.;
 #X connect 4 0 15 0;
 #X connect 4 1 5 0;
 #X connect 5 0 8 0;
-#X connect 6 0 41 0;
+#X connect 6 0 42 0;
 #X connect 7 0 6 1;
 #X connect 7 0 8 1;
 #X connect 8 0 9 0;
 #X connect 9 0 39 0;
-#X connect 10 0 41 0;
+#X connect 10 0 42 0;
 #X connect 11 0 10 1;
 #X connect 12 0 9 1;
 #X connect 13 0 15 1;
 #X connect 14 0 8 0;
-#X connect 15 0 41 0;
-#X connect 38 0 6 0;
-#X connect 39 0 10 0;
-#X connect 40 0 42 0;
+#X connect 15 0 42 0;
+#X connect 38 0 46 0;
+#X connect 39 0 41 0;
+#X connect 40 0 10 0;
 #X connect 41 0 40 0;
-#X connect 42 0 19 0;
+#X connect 42 0 43 0;
+#X connect 42 0 43 1;
+#X connect 43 0 44 0;
+#X connect 43 0 44 1;
+#X connect 44 0 19 0;
+#X connect 45 0 6 0;
+#X connect 46 0 45 0;
 #X restore 174 292 pd adsr -----------;
 #X obj 100 181 s \$0-level;
 #X obj 253 62 rrad.scale 0 127 0 200;
@@ -196,7 +206,7 @@ Inlets are supplied to update them on the fly.;
 #X restore 189 47 pd envelope;
 #X text 23 -1 Graphical ADSR;
 #X obj 95 37 vsl 8 64 0 127 0 0 empty \$0-level lvl 0 -8 1 8 -62784
--262144 -258699 0 1;
+-262144 -258699 4200 1;
 #X obj 116 90 nbx 2 14 -1e+37 1e+37 0 0 \$0-substate \$0-parentstate
 preset 0 -6 0 8 -261681 -1 -1 0 256;
 #X connect 1 0 2 1;