impove help and add a shape inlet

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

4 files changed, 117 insertions, 63 deletions

diff --git a/puremapping/wave-help.pd b/puremapping/wave-help.pd
index 1d96ecb..5aaaec6 100644
--- a/puremapping/wave-help.pd
+++ b/puremapping/wave-help.pd
@@ -1,19 +1,31 @@
-#N canvas 441 85 302 360 10;
-#X floatatom 29 40 5 0 0 0 - - -;
-#X floatatom 60 79 5 0 0 0 - - -;
-#X floatatom 103 97 5 0 0 0 - - -;
-#X obj 23 118 wave 25 0.4;
-#X obj 26 23 hsl 200 15 -1 5 0 0 empty empty center_position -2 -6
-0 8 -262144 -1 -1 5500 1;
-#X obj 106 79 hsl 128 15 0.01 10 1 0 empty empty empty -2 -6 0 8 -262144
--1 -1 5900 1;
-#X obj 23 156 multi_slider 50;
-#X obj 63 61 hsl 128 15 0 50 0 0 empty empty number_of_points -2 -6
-0 8 -262144 -1 -1 12700 1;
-#X connect 1 0 3 1;
-#X connect 2 0 3 2;
-#X connect 3 0 6 0;
-#X connect 4 0 3 0;
-#X connect 4 0 0 0;
-#X connect 5 0 2 0;
-#X connect 7 0 1 0;
+#N canvas 1972 613 672 454 10;
+#X floatatom 29 90 5 0 0 0 - - -;
+#X floatatom 52 131 5 0 0 0 - - -;
+#X floatatom 81 173 5 0 0 0 - - -;
+#X obj 26 73 hsl 200 15 -1 5 0 0 empty empty center_position -2 -6
+0 8 -262144 -1 -1 0 1;
+#X obj 84 155 hsl 128 15 0.01 10 1 0 empty empty empty -2 -6 0 8 -262144
+-1 -1 0 1;
+#X obj 23 251 multi_slider 50;
+#X obj 55 113 hsl 128 15 0 50 0 0 empty empty empty -2 -6 0 8 -262144
+-1 -1 0 1;
+#X floatatom 110 199 5 0 0 0 - - -;
+#X text 223 156 size of the wave (proportion of the total point number)
+;
+#X obj 23 228 wave 50 0.4 0.1;
+#X text 149 197 shape of the wave (thanks to a curve_pow inside the
+object);
+#X text 190 110 total nubmer of points in the list;
+#X text 240 74 position of the center of the wave (0 ... 1);
+#X text 142 3 the wave object generate a list of float. This list is
+composed of value creating a triangular shape. This object is mainly
+use to generate data aiming at the control of lighting \, spacialisation
+or else.;
+#X connect 1 0 9 1;
+#X connect 2 0 9 2;
+#X connect 3 0 0 0;
+#X connect 3 0 9 0;
+#X connect 4 0 2 0;
+#X connect 6 0 1 0;
+#X connect 7 0 9 3;
+#X connect 9 0 5 0;
diff --git a/puremapping/wave.pd b/puremapping/wave.pd
index a7e8350..12513b4 100644
--- a/puremapping/wave.pd
+++ b/puremapping/wave.pd
@@ -1,4 +1,4 @@
-#N canvas 360 127 613 540 10;
+#N canvas 356 86 694 591 10;
 #X obj 25 -15 inlet;
 #X obj 133 -13 inlet;
 #X obj 400 -7 inlet;
@@ -12,10 +12,10 @@
 #X obj 164 376 min 1;
 #X obj 164 395 - 1;
 #X obj 164 415 abs;
-#X obj 164 436 list prepend;
-#X obj 199 472 list;
-#X obj 174 494 list;
-#X obj 174 516 outlet;
+#X obj 164 456 list prepend;
+#X obj 199 492 list;
+#X obj 174 514 list;
+#X obj 174 536 outlet;
 #X msg 178 135 0;
 #X obj 261 204 - 1;
 #X obj 133 160 max 1;
@@ -34,6 +34,9 @@
 #X msg 148 77 25;
 #X obj 156 12 loadbang;
 #X obj 148 34 \$1;
+#X obj 164 435 curve_pow \$3;
+#X obj 593 -6 inlet;
+#X text 602 16 shape;
 #X connect 0 0 23 0;
 #X connect 1 0 27 0;
 #X connect 2 0 20 0;
@@ -45,7 +48,7 @@
 #X connect 9 0 22 0;
 #X connect 10 0 11 0;
 #X connect 11 0 12 0;
-#X connect 12 0 13 0;
+#X connect 12 0 35 0;
 #X connect 13 0 14 0;
 #X connect 14 0 13 1;
 #X connect 14 0 15 1;
@@ -74,3 +77,5 @@
 #X connect 32 0 27 0;
 #X connect 33 0 34 0;
 #X connect 34 0 31 0;
+#X connect 35 0 13 0;
+#X connect 36 0 35 1;
diff --git a/puremapping/wave_loop-help.pd b/puremapping/wave_loop-help.pd
index 6ad541c..d4b93d9 100644
--- a/puremapping/wave_loop-help.pd
+++ b/puremapping/wave_loop-help.pd
@@ -1,15 +1,35 @@
-#N canvas 221 410 481 386 10;
-#X floatatom 23 11 5 0 0 0 - - -;
-#X floatatom 71 46 5 0 0 0 - - -;
-#X floatatom 106 72 5 0 0 0 - - -;
-#X text 107 50 size of the output vector;
-#X text 152 71 largeur de la loop;
-#X floatatom 150 89 5 0 0 0 - - -;
-#X obj 23 107 wave_loop 25 0.4;
-#X obj 23 156 multi_slider 25;
-#X text 195 87 largeur de la répétition;
-#X connect 0 0 6 0;
-#X connect 1 0 6 1;
-#X connect 2 0 6 2;
-#X connect 5 0 6 3;
-#X connect 6 0 7 0;
+#N canvas 2743 342 700 541 10;
+#X floatatom 32 156 5 0 0 0 - - -;
+#X floatatom 61 197 5 0 0 0 - - -;
+#X floatatom 96 239 5 0 0 0 - - -;
+#X obj 29 139 hsl 200 15 -1 5 0 0 empty empty center_position -2 -6
+0 8 -262144 -1 -1 7200 1;
+#X obj 99 221 hsl 128 15 0.01 10 1 0 empty empty empty -2 -6 0 8 -262144
+-1 -1 0 1;
+#X obj 26 327 multi_slider 50;
+#X obj 64 179 hsl 128 15 0 50 0 0 empty empty empty -2 -6 0 8 -262144
+-1 -1 0 1;
+#X floatatom 167 283 5 0 0 0 - - -;
+#X text 238 222 size of the wave (proportion of the total point number)
+;
+#X text 204 280 shape of the wave (thanks to a curve_pow inside the
+object);
+#X text 199 176 total nubmer of points in the list;
+#X text 243 140 position of the center of the wave (0 ... 1);
+#X floatatom 131 263 5 0 0 0 - - -;
+#X obj 26 304 wave_loop 50 0.4 0.6 0.1;
+#X text 173 261 loop size (proportion of total point number);
+#X text 142 3 the wave object generate a list of float. This list is
+composed of value creating a triangular shape. This object is mainly
+use to generate data aiming at the control of lighting \, spacialisation
+or else.;
+#X text 142 71 similar to "wave" but provide a loop possibility;
+#X connect 1 0 13 1;
+#X connect 2 0 13 2;
+#X connect 3 0 0 0;
+#X connect 3 0 13 0;
+#X connect 4 0 2 0;
+#X connect 6 0 1 0;
+#X connect 7 0 13 4;
+#X connect 12 0 13 3;
+#X connect 13 0 5 0;
diff --git a/puremapping/wave_loop.pd b/puremapping/wave_loop.pd
index 134ab67..03cb5f9 100644
--- a/puremapping/wave_loop.pd
+++ b/puremapping/wave_loop.pd
@@ -1,4 +1,4 @@
-#N canvas 427 93 861 667 10;
+#N canvas 432 152 898 802 10;
 #X obj 68 41 inlet;
 #X obj 271 47 inlet;
 #X obj 446 46 inlet;
@@ -9,34 +9,42 @@
 #X obj 265 94 \$1;
 #X obj 268 191 f;
 #X obj 288 214 + 1;
-#X obj 269 244 /;
+#X obj 268 244 /;
 #X obj 268 142 t f f;
-#X obj 269 270 -;
-#X obj 269 291 abs;
-#X obj 271 630 min 1;
-#X obj 270 651 - 1;
-#X obj 270 678 abs;
-#X obj 270 706 list prepend;
-#X obj 342 740 list;
-#X obj 68 688 list;
-#X obj 68 725 outlet;
+#X obj 268 270 -;
+#X obj 268 291 abs;
+#X obj 269 630 min 1;
+#X obj 268 651 - 1;
+#X obj 268 698 abs;
+#X obj 268 726 list prepend;
+#X obj 340 760 list;
+#X obj 68 708 list;
+#X obj 68 745 outlet;
 #X obj 68 70 t b b b f b;
 #X msg 110 94 0;
 #X obj 298 195 - 1;
-#X obj 271 606 / \$2;
+#X obj 269 606 / \$2;
 #X obj 270 116 max 1;
-#X obj 448 101 max 0;
-#X obj 271 385 i;
-#X obj 271 410 -;
-#X obj 270 359 t f f;
-#X obj 271 473 moses 0.5;
-#X obj 271 433 abs;
-#X obj 271 576 f;
+#X obj 446 101 max 0;
+#X obj 269 385 i;
+#X obj 269 410 -;
+#X obj 268 359 t f f;
+#X obj 269 473 moses 0.5;
+#X obj 269 433 abs;
+#X obj 269 576 f;
 #X obj 642 52 inlet;
 #X text 686 54 taille de la loop;
-#X obj 328 501 - 1;
-#X obj 328 524 * -1;
-#X obj 272 322 / 1;
+#X obj 326 501 - 1;
+#X obj 326 524 * -1;
+#X obj 268 322 / 1;
+#X obj 811 55 inlet;
+#X text 816 80 shape;
+#X obj 268 675 curve_pow \$4;
+#X obj 646 125 \$3;
+#X obj 646 97 loadbang;
+#X msg 646 183 1;
+#X obj 645 207 f;
+#X obj 646 153 sel 0;
 #X connect 0 0 21 0;
 #X connect 1 0 7 0;
 #X connect 2 0 26 0;
@@ -51,7 +59,7 @@
 #X connect 12 0 13 0;
 #X connect 13 0 37 0;
 #X connect 14 0 15 0;
-#X connect 15 0 16 0;
+#X connect 15 0 40 0;
 #X connect 16 0 17 0;
 #X connect 17 0 18 0;
 #X connect 18 0 17 1;
@@ -76,6 +84,15 @@
 #X connect 31 0 30 0;
 #X connect 32 0 24 0;
 #X connect 33 0 37 1;
+#X connect 33 0 44 1;
 #X connect 35 0 36 0;
 #X connect 36 0 32 0;
 #X connect 37 0 29 0;
+#X connect 38 0 40 1;
+#X connect 40 0 16 0;
+#X connect 41 0 45 0;
+#X connect 42 0 41 0;
+#X connect 43 0 44 0;
+#X connect 44 0 37 1;
+#X connect 45 0 43 0;
+#X connect 45 1 44 0;