From 27c272adef12519a8c90f19fbdbc4efc4949696e Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Thu, 15 Jun 2006 02:20:38 +0000 Subject: fixed up to use only floats; help displays 0-1 now instead of -1-1 svn path=/trunk/externals/mapping/; revision=5241 --- curve.pd | 20 +++++++++----------- help/curve-help.pd | 42 ++++++++++++++++++++---------------------- 2 files changed, 29 insertions(+), 33 deletions(-) diff --git a/curve.pd b/curve.pd index 5c61970..ae43090 100644 --- a/curve.pd +++ b/curve.pd @@ -1,4 +1,4 @@ -#N canvas 458 228 512 490 10; +#N canvas 458 228 472 434 10; #X obj 106 325 pow 1; #X obj 62 10 inlet; #X obj 257 9 inlet; @@ -12,13 +12,12 @@ #X obj 62 325 pow 1; #X obj 62 352 * -1; #X obj 299 10 loadbang; -#X obj 257 50 any_argument \$1; -#X obj 257 70 route float; #X obj 257 155 t f b; -#X obj 257 117 * 10; +#X obj 257 50 purepd/float_argument \$1; +#X obj 257 119 * 10; #X connect 0 0 3 0; #X connect 1 0 8 0; -#X connect 2 0 13 0; +#X connect 2 0 14 0; #X connect 4 0 0 1; #X connect 4 0 10 1; #X connect 5 0 6 0; @@ -29,9 +28,8 @@ #X connect 9 0 10 0; #X connect 10 0 11 0; #X connect 11 0 3 0; -#X connect 12 0 13 0; -#X connect 13 0 14 0; -#X connect 14 0 16 0; -#X connect 15 0 7 0; -#X connect 15 1 5 0; -#X connect 16 0 15 0; +#X connect 12 0 14 0; +#X connect 13 0 7 0; +#X connect 13 1 5 0; +#X connect 14 0 15 0; +#X connect 15 0 13 0; diff --git a/help/curve-help.pd b/help/curve-help.pd index 8c935ce..307d1d9 100644 --- a/help/curve-help.pd +++ b/help/curve-help.pd @@ -1,4 +1,4 @@ -#N canvas 177 113 494 443 10; +#N canvas 177 113 498 447 10; #X obj 5 2 cnv 15 450 20 empty empty [curve] 2 11 1 18 -233017 -66577 0; #X msg 422 3 pddp; @@ -14,44 +14,42 @@ -1 -1 0 1; #N canvas 0 22 450 300 graph1 0; #X array \$0-curve 200 float 0; -#X coords 0 1 199 -1 200 200 1; +#X coords 0 1 199 0 200 200 1; #X restore 254 92 graph; -#N canvas 721 196 407 397 draw_array 0; +#N canvas 786 75 423 413 draw_array 0; #X msg 54 82 bang; #X obj 54 103 until; #X text 85 82 start; #X obj 54 125 f; #X obj 83 125 + 1; #X obj 54 43 loadbang; -#X text 96 257 mapping output range: -1 to 1; #X obj 54 180 trigger float float; #X obj 127 127 select 0; #X obj 53 313 tabwrite \$0-curve; #X obj 138 9 inlet; #X obj 153 32 send \$0-to-numbox; #X obj 139 53 trigger bang float; -#X obj 53 283 curve; #X obj 83 147 mod 200; -#X obj 53 229 - 100; -#X obj 54 257 / 100; +#X obj 54 257 / 200; +#X text 96 257 mapping output range: 0 to 1; +#X obj 53 283 mapping/curve; #X connect 0 0 1 0; #X connect 1 0 3 0; #X connect 3 0 4 0; -#X connect 3 0 7 0; -#X connect 4 0 14 0; +#X connect 3 0 6 0; +#X connect 4 0 12 0; #X connect 5 0 0 0; -#X connect 7 0 15 0; -#X connect 7 1 9 1; -#X connect 8 0 1 1; -#X connect 10 0 11 0; -#X connect 10 0 12 0; -#X connect 12 0 0 0; -#X connect 12 1 13 1; -#X connect 13 0 9 0; -#X connect 14 0 3 1; -#X connect 14 0 8 0; -#X connect 15 0 16 0; -#X connect 16 0 13 0; +#X connect 6 0 13 0; +#X connect 6 1 8 1; +#X connect 7 0 1 1; +#X connect 9 0 10 0; +#X connect 9 0 11 0; +#X connect 11 0 0 0; +#X connect 11 1 15 1; +#X connect 12 0 3 1; +#X connect 12 0 7 0; +#X connect 13 0 15 0; +#X connect 15 0 8 0; #X restore 127 207 pd draw_array; #X text 17 39 This object maps the input range to a exponential curve \, the inverse of a logarithmic curve.; @@ -60,7 +58,7 @@ #X obj 259 338 curve_exp; #X obj 342 338 curve_log; #X obj 117 166 hsl 128 15 -1 1 0 0 empty empty empty -2 -6 0 8 -262144 --1 -1 0 0; +-1 -1 12700 0; #X floatatom 192 184 7 0 0 0 - #0-to-numbox -; #X obj 259 319 sinusoid; #X obj 25 207 mapping/curve; -- cgit v1.2.1