created Double-Circular Seat object and help file

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

5 files changed, 169 insertions, 21 deletions

diff --git a/TODO b/TODO
index 9ebd84d..775579d 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,12 @@
 ______________________________________________________________________________
+= curves
+
+review all curves in accordance with the paper
+
+- [curve_table] or [curve_graph]?
+
+
+______________________________________________________________________________
 = spread/segment/seglet
 
 Make [collect] and [distribute], which are like [segment] and [desegment].
diff --git a/circular_seat.pd b/circular_seat.pd
new file mode 100644
index 0000000..c2c5f76
--- /dev/null
+++ b/circular_seat.pd
@@ -0,0 +1,20 @@
+#N canvas 508 166 591 444 10;
+#X obj 62 10 inlet;
+#X obj 195 405 outlet;
+#X obj 240 10 loadbang;
+#X obj 167 9 inlet;
+#X obj 167 50 purepd/float_argument \$1;
+#X obj 131 114 moses;
+#X obj 14 208 expr sqrt(pow($f2 \, 2) - pow($f1 - $f2 \, 2));
+#X obj 273 208 expr 1 - sqrt(pow(1 - $f2 \, 2) - pow($f1 - $f2 \, 2))
+;
+#X connect 0 0 5 0;
+#X connect 2 0 4 0;
+#X connect 3 0 4 0;
+#X connect 4 0 5 1;
+#X connect 4 0 6 1;
+#X connect 4 0 7 1;
+#X connect 5 0 6 0;
+#X connect 5 1 7 0;
+#X connect 6 0 1 0;
+#X connect 7 0 1 0;
diff --git a/help/circular_seat-help.pd b/help/circular_seat-help.pd
new file mode 100644
index 0000000..f62e5fb
--- /dev/null
+++ b/help/circular_seat-help.pd
@@ -0,0 +1,120 @@
+#N canvas 107 47 482 425 10;
+#X obj 5 2 cnv 15 450 20 empty empty circular_seat 2 11 1 18 -233017
+-66577 0;
+#X msg 422 3 pddp;
+#X text 273 392 released under the GNU GPL;
+#X text 148 361 For more info:;
+#X floatatom 15 127 8 0 0 0 - - -;
+#X floatatom 15 288 8 0 0 0 - - -;
+#X obj 18 305 hsl 200 20 0 1 0 0 empty empty curved_output 22 11 1
+12 -262144 -1 -1 0 1;
+#X obj 18 101 hsl 200 20 0 1 0 0 empty empty raw_input 22 11 1 12 -261681
+-1 -1 0 1;
+#N canvas 273 69 470 403 draw_array 0;
+#X msg 54 82 bang;
+#X obj 54 133 until;
+#X text 85 82 start;
+#X obj 54 155 f;
+#X obj 83 155 + 1;
+#X obj 54 43 loadbang;
+#X obj 54 210 trigger float float;
+#X obj 127 157 select 0;
+#X obj 53 343 tabwrite \$0-curve;
+#X obj 139 53 trigger bang float;
+#X obj 83 177 mod 200;
+#X obj 54 287 / 200;
+#X text 96 287 mapping output range: 0 to 1;
+#N canvas 0 22 461 369 receive 0;
+#X obj 253 33 receive \$0-y;
+#X obj 253 57 moses;
+#X obj 280 78 moses 201;
+#X obj 331 99 bang;
+#X msg 331 120 200;
+#X obj 238 98 bang;
+#X msg 238 119 0;
+#X obj 91 56 moses;
+#X obj 118 77 moses 201;
+#X obj 169 98 bang;
+#X msg 169 119 200;
+#X obj 76 97 bang;
+#X msg 76 118 0;
+#X obj 91 32 receive \$0-x;
+#X obj 117 289 receive \$0-x-slider;
+#X floatatom 118 312 5 0 0 0 - - -;
+#X floatatom 279 313 5 0 0 0 - - -;
+#X obj 280 290 receive \$0-y-slider;
+#X obj 118 169 / 200;
+#X obj 280 170 / 200;
+#X obj 118 249 send \$0-x-slider-receive;
+#X obj 280 250 send \$0-y-slider-receive;
+#X msg 281 193 1 \$1;
+#X obj 280 221 -;
+#X connect 0 0 1 0;
+#X connect 1 0 5 0;
+#X connect 1 1 2 0;
+#X connect 2 0 19 0;
+#X connect 2 1 3 0;
+#X connect 3 0 4 0;
+#X connect 4 0 19 0;
+#X connect 5 0 6 0;
+#X connect 6 0 19 0;
+#X connect 7 0 11 0;
+#X connect 7 1 8 0;
+#X connect 8 0 18 0;
+#X connect 8 1 9 0;
+#X connect 9 0 10 0;
+#X connect 10 0 18 0;
+#X connect 11 0 12 0;
+#X connect 12 0 18 0;
+#X connect 13 0 7 0;
+#X connect 14 0 15 0;
+#X connect 17 0 16 0;
+#X connect 18 0 20 0;
+#X connect 19 0 22 0;
+#X connect 22 0 23 0;
+#X connect 23 0 21 0;
+#X restore 265 348 pd receive from gcanvas;
+#X obj 138 9 receive \$0-x-slider;
+#X obj 54 108 speedlim 100;
+#X obj 53 313 circular_seat;
+#X connect 0 0 15 0;
+#X connect 1 0 3 0;
+#X connect 3 0 4 0;
+#X connect 3 0 6 0;
+#X connect 4 0 10 0;
+#X connect 5 0 0 0;
+#X connect 6 0 11 0;
+#X connect 6 1 8 1;
+#X connect 7 0 1 1;
+#X connect 9 0 0 0;
+#X connect 9 1 16 1;
+#X connect 10 0 3 1;
+#X connect 10 0 7 0;
+#X connect 11 0 16 0;
+#X connect 14 0 9 0;
+#X connect 15 0 1 0;
+#X connect 16 0 8 0;
+#X restore 367 71 pd draw_array;
+#X obj 252 359 pddp/open mapping-about;
+#X text 6 391 (C) Copyright 2007 Free Software Foundation;
+#X obj 15 217 circular_seat;
+#X obj 262 103 gcanvas 200 200;
+#N canvas 0 22 450 300 graph1 0;
+#X array \$0-curve 200 float 0;
+#X coords 0 1 199 0 200 200 1;
+#X restore 262 103 graph;
+#X obj 262 308 send \$0-x;
+#X obj 404 307 send \$0-y;
+#X obj 111 167 hsl 50 15 0 1 0 0 \$0-x-slider \$0-x-slider-receive
+x 5 9 0 11 -232576 -1 -1 2450 0;
+#X floatatom 117 187 7 0 0 0 - - -;
+#X text 17 39 This object curves the input range using a double-circular
+seat controlled by one parameter.;
+#X connect 4 0 11 0;
+#X connect 5 0 6 0;
+#X connect 7 0 4 0;
+#X connect 11 0 5 0;
+#X connect 12 0 14 0;
+#X connect 12 1 15 0;
+#X connect 16 0 11 1;
+#X connect 16 0 17 0;
diff --git a/help/curve-help.pd b/help/curve-help.pd
index 307d1d9..602bc52 100644
--- a/help/curve-help.pd
+++ b/help/curve-help.pd
@@ -1,4 +1,4 @@
-#N canvas 177 113 498 447 10;
+#N canvas 87 98 472 431 10;
 #X obj 5 2 cnv 15 450 20 empty empty [curve] 2 11 1 18 -233017 -66577
 0;
 #X msg 422 3 pddp;
@@ -16,7 +16,7 @@
 #X array \$0-curve 200 float 0;
 #X coords 0 1 199 0 200 200 1;
 #X restore 254 92 graph;
-#N canvas 786 75 423 413 draw_array 0;
+#N canvas 786 75 427 417 draw_array 0;
 #X msg 54 82 bang;
 #X obj 54 103 until;
 #X text 85 82 start;
@@ -51,21 +51,21 @@
 #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.;
 #X text 286 301 related objects:;
 #X obj 342 320 curve_power;
 #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 12700 0;
+-1 -1 5300 0;
 #X floatatom 192 184 7 0 0 0 - #0-to-numbox -;
 #X obj 259 319 sinusoid;
 #X obj 25 207 mapping/curve;
 #X obj 262 359 pddp/open mapping-about;
-#X connect 5 0 19 0;
+#X text 17 39 This object generates a curve based on a -1 to 1 argument
+range.;
+#X connect 5 0 18 0;
 #X connect 6 0 7 0;
 #X connect 8 0 5 0;
-#X connect 16 0 10 0;
-#X connect 16 0 19 1;
-#X connect 19 0 6 0;
+#X connect 15 0 10 0;
+#X connect 15 0 18 1;
+#X connect 18 0 6 0;
diff --git a/help/timeroll-help.pd b/help/timeroll-help.pd
index 8339cfb..c481112 100644
--- a/help/timeroll-help.pd
+++ b/help/timeroll-help.pd
@@ -1,12 +1,12 @@
-#N canvas 0 0 306 391 10;
-#X obj 21 97 vsl 15 128 0 1 0 0 empty empty empty 0 -8 0 8 -262144
--1 -1 8700 1;
-#X floatatom 38 19 5 0 0 0 - - -;
-#X text 84 17 from 0 to 1;
-#X obj 38 37 resample 50;
-#X obj 38 60 _clip;
-#X obj 38 81 timeroll;
-#X connect 0 0 3 0;
-#X connect 1 0 3 0;
-#X connect 3 0 4 0;
-#X connect 4 0 5 0;
+#N canvas 93 45 472 358 10;
+#X obj 116 147 vsl 15 128 0 1 0 0 empty empty empty 0 -8 0 8 -262131
+-1 -1 5300 1;
+#X text 339 191 from 0 to 1;
+#X obj 21 188 resample 50;
+#X obj 133 133 timeroll;
+#X obj 21 211 clip 0 1;
+#X text 73 54 Display a changing value over time.;
+#X text 99 110 (move the slider to see it in action);
+#X connect 0 0 2 0;
+#X connect 2 0 4 0;
+#X connect 4 0 3 0;