add a curvature argument

svn path=/trunk/externals/nusmuk/; revision=16507

2 files changed, 65 insertions, 39 deletions

diff --git a/puremapping/curve_exp-help.pd b/puremapping/curve_exp-help.pd
index c9c6820..97ab23d 100644
--- a/puremapping/curve_exp-help.pd
+++ b/puremapping/curve_exp-help.pd
@@ -1,23 +1,21 @@
-#N canvas 567 104 476 357 10;
+#N canvas 561 113 508 366 10;
 #X obj 5 2 cnv 15 450 20 empty empty curve_exp 2 11 1 18 -233017 -66577
 0;
 #X msg 422 3 pddp;
 #X text 27 300 (C) Copyright 2004 Hans-Christoph Steiner <hans@at.or.at>
 ;
 #X text 244 314 released under the GNU GPL;
-#X text 98 271 For more info:;
-#X obj 202 269 pddp/pddplink ../all_about_curve_mapping.pd -text all_about_curve_mapping;
 #X floatatom 25 123 8 0 0 0 - - -;
 #X floatatom 25 184 8 0 0 0 - - -;
 #X obj 28 201 hsl 200 15 0 1 0 0 empty empty empty 22 8 1 12 -262144
 -1 -1 0 1;
 #X obj 28 103 hsl 200 15 0 1 0 0 empty empty empty 22 8 1 12 -261681
 -1 -1 0 1;
-#N canvas 0 22 450 300 graph1 0;
+#N canvas 0 22 450 300 (subpatch) 0;
 #X array curve_exp 100 float 0;
 #X coords 0 1 99 0 100 100 1;
-#X restore 321 111 graph;
-#N canvas 266 69 331 321 draw_array 0;
+#X restore 321 131 graph;
+#N canvas 260 179 331 321 draw_array 0;
 #X msg 57 52 bang;
 #X obj 57 73 until;
 #X text 88 52 start;
@@ -32,6 +30,8 @@
 #X obj 57 207 / 100;
 #X text 99 207 mapping output range: 0 to 1;
 #X obj 56 283 tabwrite curve_exp;
+#X obj 211 54 t b f;
+#X obj 211 9 inlet;
 #X obj 56 233 curve_exp;
 #X connect 0 0 1 0;
 #X connect 1 0 3 0;
@@ -45,13 +45,23 @@
 #X connect 7 1 8 0;
 #X connect 9 0 13 1;
 #X connect 10 0 0 0;
-#X connect 11 0 14 0;
-#X connect 14 0 13 0;
-#X restore 321 78 pd draw_array;
-#X text 17 39 This object maps the input range to a exponential curve
+#X connect 11 0 16 0;
+#X connect 14 0 0 0;
+#X connect 14 1 16 1;
+#X connect 15 0 14 0;
+#X connect 16 0 13 0;
+#X restore 321 98 pd draw_array;
+#X text 17 49 This object maps the input range to a exponential curve
 \, the inverse of a logarithmic curve.;
-#X obj 25 153 curve_exp;
-#X connect 6 0 13 0;
-#X connect 7 0 8 0;
-#X connect 9 0 6 0;
-#X connect 13 0 7 0;
+#X floatatom 93 131 5 0 0 0 - - -;
+#X floatatom 321 80 5 0 0 0 - - -;
+#X text 360 79 curvature;
+#X text 139 128 default value : 11.5129;
+#X text 190 143 = log(100000);
+#X obj 25 156 curve_exp;
+#X connect 4 0 16 0;
+#X connect 5 0 6 0;
+#X connect 7 0 4 0;
+#X connect 11 0 16 1;
+#X connect 12 0 9 0;
+#X connect 16 0 5 0;
diff --git a/puremapping/curve_exp.pd b/puremapping/curve_exp.pd
index a15e6b5..94c1d44 100644
--- a/puremapping/curve_exp.pd
+++ b/puremapping/curve_exp.pd
@@ -1,24 +1,40 @@
-#N canvas 225 325 511 337 10;
-#X obj 37 25 inlet;
-#X obj 37 262 outlet;
-#X obj 38 63 moses 0;
-#X obj 22 189 * -1;
-#X obj 22 168 dbtorms;
-#X obj 22 142 * 100;
-#X obj 83 142 * 100;
-#X obj 83 169 dbtorms;
-#X text 85 25 input range: -1 to 1;
-#X text 93 262 output range: -1 to 1;
-#X text 248 296 released under the GNU GPL;
-#X text 31 282 (C) Copyright 2006 Hans-Christoph Steiner <hans@at.or.at>
-;
-#X obj 22 116 * -1;
-#X connect 0 0 2 0;
-#X connect 2 0 12 0;
-#X connect 2 1 6 0;
-#X connect 3 0 1 0;
-#X connect 4 0 3 0;
-#X connect 5 0 4 0;
-#X connect 6 0 7 0;
-#X connect 7 0 1 0;
-#X connect 12 0 5 0;
+#N canvas 977 377 457 458 10;
+#X obj 68 36 inlet;
+#X obj 68 300 outlet;
+#X obj 68 143 exp;
+#X obj 68 115 *;
+#X obj 144 32 inlet;
+#X obj 68 165 - 1;
+#X obj 68 196 /;
+#X obj 106 133 exp;
+#X obj 106 155 - 1;
+#X obj 195 17 loadbang;
+#X obj 195 55 log;
+#X msg 195 36 100000;
+#X obj 144 94 f 11.5129;
+#X obj 68 60 t f f;
+#X obj 68 82 abs;
+#X obj 104 216 * 2;
+#X obj 104 236 - 1;
+#X obj 104 196 > 0;
+#X obj 68 268 *;
+#X connect 0 0 13 0;
+#X connect 2 0 5 0;
+#X connect 3 0 2 0;
+#X connect 4 0 12 0;
+#X connect 5 0 6 0;
+#X connect 6 0 18 0;
+#X connect 7 0 8 0;
+#X connect 8 0 6 1;
+#X connect 9 0 11 0;
+#X connect 10 0 12 0;
+#X connect 11 0 10 0;
+#X connect 12 0 3 1;
+#X connect 12 0 7 0;
+#X connect 13 0 14 0;
+#X connect 13 1 17 0;
+#X connect 14 0 3 0;
+#X connect 15 0 16 0;
+#X connect 16 0 18 1;
+#X connect 17 0 15 0;
+#X connect 18 0 1 0;