I am not quite sure yet what the default input and output range of this object should be. Let's try it out to see...

svn path=/trunk/externals/mapping/; revision=4629

3 files changed, 59 insertions, 59 deletions

diff --git a/help/sinusoid-help.pd b/help/sinusoid-help.pd
index 4195b42..62d89b0 100644
--- a/help/sinusoid-help.pd
+++ b/help/sinusoid-help.pd
@@ -1,4 +1,4 @@
-#N canvas 528 218 488 369 10;
+#N canvas 528 218 492 373 10;
 #X obj 5 2 cnv 15 450 20 empty empty [curve] 2 11 1 18 -233017 -66577
 0;
 #X msg 422 3 pddp;
@@ -8,15 +8,15 @@
 #X text 158 291 For more info:;
 #X floatatom 25 163 8 0 0 0 - - -;
 #X floatatom 25 224 8 0 0 0 - - -;
-#X obj 28 241 hsl 200 15 0 1 0 0 empty empty empty 22 8 1 12 -262144
--1 -1 19878 1;
-#X obj 28 143 hsl 200 15 0 1 0 0 empty empty empty 22 8 1 12 -261681
--1 -1 300 1;
+#X obj 28 241 hsl 200 15 -1 1 0 0 empty empty empty 22 8 1 12 -262144
+-1 -1 0 1;
+#X obj 28 143 hsl 200 15 -1 1 0 0 empty empty empty 22 8 1 12 -261681
+-1 -1 0 1;
 #N canvas 0 22 450 300 graph1 0;
 #X array \$0-curve 100 float 0;
 #X coords 0 1 99 -1 100 100 1;
 #X restore 321 111 graph;
-#N canvas 266 69 387 377 draw_array 0;
+#N canvas 266 69 407 397 draw_array 0;
 #X msg 54 82 bang;
 #X obj 54 103 until;
 #X text 85 82 start;
@@ -24,34 +24,34 @@
 #X obj 83 125 + 1;
 #X obj 83 147 mod 100;
 #X obj 54 43 loadbang;
-#X text 96 257 mapping output range: -1 to 1;
-#X obj 54 257 / 50;
-#X obj 53 229 - 50;
 #X obj 139 53 t b s;
 #X obj 139 32 symbol;
 #X obj 138 9 receive \$0-type;
 #X obj 54 180 trigger float float;
 #X obj 127 127 select 0;
 #X obj 53 313 tabwrite \$0-curve;
-#X obj 53 283 curve sin;
+#X text 96 257 mapping output range: 0 to 1;
+#X obj 53 229 - 50;
+#X obj 54 257 / 50;
+#X obj 53 283 sinusoid sin;
 #X connect 0 0 1 0;
 #X connect 1 0 3 0;
 #X connect 3 0 4 0;
-#X connect 3 0 13 0;
+#X connect 3 0 10 0;
 #X connect 4 0 5 0;
 #X connect 5 0 3 1;
-#X connect 5 0 14 0;
+#X connect 5 0 11 0;
 #X connect 6 0 0 0;
-#X connect 8 0 16 0;
+#X connect 7 0 0 0;
+#X connect 7 1 16 1;
+#X connect 8 0 7 0;
 #X connect 9 0 8 0;
-#X connect 10 0 0 0;
-#X connect 10 1 16 1;
-#X connect 11 0 10 0;
-#X connect 12 0 11 0;
-#X connect 13 0 9 0;
-#X connect 13 1 15 1;
-#X connect 14 0 1 1;
-#X connect 16 0 15 0;
+#X connect 10 0 14 0;
+#X connect 10 1 12 1;
+#X connect 11 0 1 1;
+#X connect 14 0 15 0;
+#X connect 15 0 16 0;
+#X connect 16 0 12 0;
 #X restore 321 89 pd draw_array;
 #X text 17 39 This object maps the input range to a exponential curve
 \, the inverse of a logarithmic curve.;
diff --git a/pd/sinusoid.pd b/pd/sinusoid.pd
index e8f1259..0c9957e 100644
--- a/pd/sinusoid.pd
+++ b/pd/sinusoid.pd
@@ -1,14 +1,11 @@
-#N canvas 12 269 612 496 10;
+#N canvas 12 269 616 500 10;
 #X obj 50 36 inlet;
 #X obj 329 52 inlet;
 #X obj 47 411 outlet;
 #X obj 50 150 pack float symbol;
 #X msg 50 175 \$2 \$1;
 #X obj 39 256 atan;
-#X obj 123 260 cos;
-#X obj 152 260 sin;
 #X obj 39 277 / 1.26263;
-#X obj 50 198 route atan cos sin;
 #X obj 190 225 symbol;
 #X msg 189 251 ERROR: argument not supported \$1 \, try atan cos or
 sin;
@@ -16,20 +13,23 @@ sin;
 #X obj 208 50 loadbang;
 #X obj 50 98 * 3.14159;
 #X obj 188 273 print [sinusoid];
-#X connect 0 0 14 0;
-#X connect 1 0 12 1;
+#X obj 50 198 route atan sin cos;
+#X obj 123 260 sin;
+#X obj 152 260 cos;
+#X connect 0 0 11 0;
+#X connect 1 0 9 1;
 #X connect 3 0 4 0;
-#X connect 4 0 9 0;
-#X connect 5 0 8 0;
+#X connect 4 0 13 0;
+#X connect 5 0 6 0;
 #X connect 6 0 2 0;
-#X connect 7 0 2 0;
-#X connect 8 0 2 0;
-#X connect 9 0 5 0;
-#X connect 9 1 6 0;
-#X connect 9 2 7 0;
-#X connect 9 3 10 0;
-#X connect 10 0 11 0;
-#X connect 11 0 15 0;
-#X connect 12 0 3 1;
-#X connect 13 0 12 0;
-#X connect 14 0 3 0;
+#X connect 7 0 8 0;
+#X connect 8 0 12 0;
+#X connect 9 0 3 1;
+#X connect 10 0 9 0;
+#X connect 11 0 3 0;
+#X connect 13 0 5 0;
+#X connect 13 1 14 0;
+#X connect 13 2 15 0;
+#X connect 13 3 7 0;
+#X connect 14 0 2 0;
+#X connect 15 0 2 0;
diff --git a/sinusoid.pd b/sinusoid.pd
index e8f1259..0c9957e 100644
--- a/sinusoid.pd
+++ b/sinusoid.pd
@@ -1,14 +1,11 @@
-#N canvas 12 269 612 496 10;
+#N canvas 12 269 616 500 10;
 #X obj 50 36 inlet;
 #X obj 329 52 inlet;
 #X obj 47 411 outlet;
 #X obj 50 150 pack float symbol;
 #X msg 50 175 \$2 \$1;
 #X obj 39 256 atan;
-#X obj 123 260 cos;
-#X obj 152 260 sin;
 #X obj 39 277 / 1.26263;
-#X obj 50 198 route atan cos sin;
 #X obj 190 225 symbol;
 #X msg 189 251 ERROR: argument not supported \$1 \, try atan cos or
 sin;
@@ -16,20 +13,23 @@ sin;
 #X obj 208 50 loadbang;
 #X obj 50 98 * 3.14159;
 #X obj 188 273 print [sinusoid];
-#X connect 0 0 14 0;
-#X connect 1 0 12 1;
+#X obj 50 198 route atan sin cos;
+#X obj 123 260 sin;
+#X obj 152 260 cos;
+#X connect 0 0 11 0;
+#X connect 1 0 9 1;
 #X connect 3 0 4 0;
-#X connect 4 0 9 0;
-#X connect 5 0 8 0;
+#X connect 4 0 13 0;
+#X connect 5 0 6 0;
 #X connect 6 0 2 0;
-#X connect 7 0 2 0;
-#X connect 8 0 2 0;
-#X connect 9 0 5 0;
-#X connect 9 1 6 0;
-#X connect 9 2 7 0;
-#X connect 9 3 10 0;
-#X connect 10 0 11 0;
-#X connect 11 0 15 0;
-#X connect 12 0 3 1;
-#X connect 13 0 12 0;
-#X connect 14 0 3 0;
+#X connect 7 0 8 0;
+#X connect 8 0 12 0;
+#X connect 9 0 3 1;
+#X connect 10 0 9 0;
+#X connect 11 0 3 0;
+#X connect 13 0 5 0;
+#X connect 13 1 14 0;
+#X connect 13 2 15 0;
+#X connect 13 3 7 0;
+#X connect 14 0 2 0;
+#X connect 15 0 2 0;