updated [load( and [unload( messages

svn path=/trunk/externals/ff/; revision=1767

3 files changed, 63 insertions, 52 deletions

diff --git a/ff/ff-constant-help.pd b/ff/ff-constant-help.pd
index 3a06f2b..411ebb5 100644
--- a/ff/ff-constant-help.pd
+++ b/ff/ff-constant-help.pd
@@ -12,12 +12,12 @@
 #X text 122 75 minimum time between triggers;
 #X msg 232 329 envelope 0 100 0 100;
 #X obj 218 555 ff-constant 0 0 500 0.5;
-#X obj 476 502 hsl 190 17 -1 1 0 0 empty empty level 5 9 1 9 -261689
--1 -1 0 0;
-#X obj 367 418 hsl 175 17 0 360 0 1 empty empty direction 5 9 1 9 -262131
--1 -1 1900 0;
-#X obj 418 458 hsl 235 17 0 5000 0 0 empty empty duration 5 9 1 9 -261681
--1 -1 0 0;
+#X obj 476 502 hsl 190 17 -1 1 0 0 empty empty level 25 9 1 12 -261689
+-1 -1 18900 0;
+#X obj 367 418 hsl 175 17 0 360 0 1 empty empty direction 25 9 1 12
+-262131 -1 -1 17400 0;
+#X obj 418 458 hsl 235 17 0 5000 0 0 empty empty duration 25 9 1 12
+-261681 -1 -1 17800 0;
 #X text 385 336 levels are in the range [-1 \, 1];
 #X obj 35 49 hsl 290 17 1 5000 0 1 empty empty interval 25 9 1 12 -225271
 -1 -1 2890 0;
@@ -30,11 +30,11 @@
 #X obj 68 487 bng 25 250 50 0 empty empty empty 0 -6 0 8 -258699 -1
 -1;
 #X obj 364 438 nbx 5 14 -1e+37 1e+37 0 0 empty empty empty 0 -6 1 10
--233017 -1 -1 39.3103 256;
+-233017 -1 -1 360 256;
 #X obj 415 480 nbx 5 14 -1e+37 1e+37 0 0 empty empty empty 0 -6 1 10
--233017 -1 -1 0 256;
+-233017 -1 -1 3803.42 256;
 #X obj 473 524 nbx 5 14 -1e+37 1e+37 0 0 empty empty empty 0 -6 1 10
--233017 -1 -1 0 256;
+-233017 -1 -1 1 256;
 #X obj 143 138 nbx 5 14 -1e+37 1e+37 0 0 empty empty empty 0 -6 1 10
 -233017 -1 -1 250 256;
 #X obj 32 69 nbx 5 14 -1e+37 1e+37 0 0 empty empty empty 0 -6 1 10
@@ -49,17 +49,17 @@
 -233017 -1 -1 0.562814 256;
 #X obj 218 286 pack float float float float;
 #X obj 345 269 nbx 3 14 -1e+37 1e+37 0 0 pack_bang_env empty empty
-0 -6 129 10 -233017 -1 -1 0 256;
+0 -6 1 10 -233017 -1 -1 0 256;
 #X obj 281 269 nbx 6 14 -1e+37 1e+37 0 0 pack_bang_env empty empty
-0 -6 129 10 -233017 -1 -1 0 256;
+0 -6 1 10 -233017 -1 -1 0 256;
 #X obj 409 269 nbx 6 14 -1e+37 1e+37 0 0 pack_bang_env empty empty
-0 -6 129 10 -233017 -1 -1 0 256;
+0 -6 1 10 -233017 -1 -1 0 256;
 #X obj 284 207 hsl 235 17 5 5000 1 0 empty empty attack_duration 25
 9 1 12 -261681 -1 -1 0 0;
 #X obj 412 249 hsl 235 17 5 5000 1 0 empty empty decay_duration 25
 9 1 12 -261681 -1 -1 0 0;
-#X obj 198 269 bng 15 250 50 0 empty pack_bang_env empty 0 -6 64 8
--262144 -1 -1;
+#X obj 198 269 bng 15 250 50 0 empty pack_bang_env empty 0 -6 0 8 -262144
+-1 -1;
 #X obj 3 3 cnv 15 850 30 empty empty [ff-constant] 15 15 1 18 -262131
 -1 0;
 #X obj 642 111 all_about_haptics;
diff --git a/ff/ff-periodic-help.pd b/ff/ff-periodic-help.pd
index afda2de..a518aea 100644
--- a/ff/ff-periodic-help.pd
+++ b/ff/ff-periodic-help.pd
@@ -1,9 +1,9 @@
-#N canvas 289 81 857 641 10;
+#N canvas 360 67 857 641 10;
 #X msg 65 474 bang;
 #X msg 66 556 stop;
-#X msg 459 386 envelope 0 100 0 100;
+#X msg 453 340 envelope 0 100 0 100;
 #X text 85 71 period time in ms (defaults 1000 ms);
-#X text 477 407 startlevel attack-duration endlevel decay-duration
+#X text 471 361 startlevel attack-duration endlevel decay-duration
 ;
 #X text 188 204 waveform phase in degrees;
 #X text 10 458 start the effect;
@@ -64,26 +64,26 @@
 #X obj 85 375 symbol;
 #X text 8 244 waveform shape;
 #X symbolatom 85 408 9 0 0 0 current: - -;
-#X msg 459 354 envelope \$1 \$2 \$3 \$4;
-#X obj 589 275 hsl 150 17 0 1 0 0 empty empty end_level 25 8 1 12 -261689
+#X msg 453 308 envelope \$1 \$2 \$3 \$4;
+#X obj 583 229 hsl 150 17 0 1 0 0 empty empty end_level 25 8 1 12 -261689
 -1 -1 0 0;
-#X obj 462 233 hsl 150 17 0 1 0 0 empty empty start_level 25 8 1 12
+#X obj 456 187 hsl 150 17 0 1 0 0 empty empty start_level 25 8 1 12
 -261689 -1 -1 0 0;
-#X obj 459 316 nbx 3 14 -1e+37 1e+37 0 0 empty empty empty 0 -6 1 10
+#X obj 453 270 nbx 3 14 -1e+37 1e+37 0 0 empty empty empty 0 -6 1 10
 -233017 -1 -1 0 256;
-#X obj 459 333 pack float float float float;
-#X obj 586 316 nbx 3 14 -1e+37 1e+37 0 0 pack_bang_env empty empty
-0 -6 129 10 -233017 -1 -1 0 256;
-#X obj 522 316 nbx 6 14 -1e+37 1e+37 0 0 pack_bang_env empty empty
-0 -6 129 10 -233017 -1 -1 1027.59 256;
-#X obj 650 316 nbx 6 14 -1e+37 1e+37 0 0 pack_bang_env empty empty
-0 -6 129 10 -233017 -1 -1 101.445 256;
-#X obj 525 254 hsl 180 17 5 5000 1 1 empty empty attack_duration 25
+#X obj 453 287 pack float float float float;
+#X obj 580 270 nbx 3 14 -1e+37 1e+37 0 0 pack_bang_env empty empty
+0 -6 1 10 -233017 -1 -1 0 256;
+#X obj 516 270 nbx 6 14 -1e+37 1e+37 0 0 pack_bang_env empty empty
+0 -6 1 10 -233017 -1 -1 1027.59 256;
+#X obj 644 270 nbx 6 14 -1e+37 1e+37 0 0 pack_bang_env empty empty
+0 -6 1 10 -233017 -1 -1 101.445 256;
+#X obj 519 208 hsl 180 17 5 5000 1 1 empty empty attack_duration 25
 9 1 12 -261681 -1 -1 13800 0;
-#X obj 653 296 hsl 180 17 5 5000 1 1 empty empty decay_duration 25
+#X obj 647 250 hsl 180 17 5 5000 1 1 empty empty decay_duration 25
 9 1 12 -261681 -1 -1 7800 0;
-#X obj 440 316 bng 15 250 50 0 empty pack_bang_env empty 0 -6 64 8
--262144 -1 -1;
+#X obj 434 270 bng 15 250 50 0 empty pack_bang_env empty 0 -6 0 8 -262144
+-1 -1;
 #X obj 3 2 cnv 15 850 30 empty empty [ff-periodic] 15 15 1 18 -261681
 -1 0;
 #X text 480 573 <-- arguments are: device# direction duration level
@@ -100,6 +100,10 @@ a waveform that can be a pulsing or a vibration depending on the "period".
 ;
 #X text 145 139 waveform offset from center [-1 \, 1];
 #X text 199 155 (defaults 0=centered);
+#X msg 441 392 load;
+#X msg 441 416 unload;
+#X text 492 391 a load message \, uploads an effect to the stick;
+#X text 491 416 an unload message \, removes it;
 #X connect 0 0 8 0;
 #X connect 1 0 8 0;
 #X connect 2 0 8 0;
@@ -146,3 +150,5 @@ a waveform that can be a pulsing or a vibration depending on the "period".
 #X connect 54 0 52 0;
 #X connect 55 0 53 0;
 #X connect 56 0 50 0;
+#X connect 68 0 8 0;
+#X connect 69 0 8 0;
diff --git a/ff/ff-spring-help.pd b/ff/ff-spring-help.pd
index 462cf4c..c5eaa9a 100644
--- a/ff/ff-spring-help.pd
+++ b/ff/ff-spring-help.pd
@@ -2,14 +2,14 @@
 #X text 334 195 coefficients that determine how fast;
 #X text 334 207 the effect increases in that direction;
 #X text 334 218 range = [-1 \, 1];
-#X text 349 301 width of the dead-zone \, where there is no effect
+#X text 386 301 width of the dead-zone \, where there is no effect
 ;
-#X text 349 326 range is (like the joystick output) [-32768 \, 32767]
+#X text 386 326 range is (like the joystick output) [-32768 \, 32767]
 ;
-#X text 350 312 one for each axis;
-#X text 356 424 position of the dead-zone in the joystick range;
-#X text 356 436 one for each axis;
-#X text 356 448 range is also [-32768 \, 32767];
+#X text 387 312 one for each axis;
+#X text 393 424 position of the dead-zone in the joystick range;
+#X text 393 436 one for each axis;
+#X text 393 448 range is also [-32768 \, 32767];
 #X text 366 526 duration in ms \, 0 is infinite;
 #X text 531 555 levels \, range = [0 \, 1];
 #X text 398 74 these effects set up 2 axis (x and y) and you specify
@@ -22,17 +22,17 @@ the parameters for each direction.;
 -1 -1 0 0;
 #X obj 313 556 hsl 40 15 0 1 0 0 empty empty right 5 8 1 11 -261689
 -1 -1 0 0;
-#X msg 260 483 center-y \$1;
-#X msg 255 429 center-x \$1;
-#X obj 263 450 hsl 75 15 -32767 32767 0 1 empty empty center-x 5 8
+#X msg 297 483 center-y \$1;
+#X msg 292 429 center-x \$1;
+#X obj 300 450 hsl 75 15 -32767 32767 0 1 empty empty center-x 5 8
 1 11 -228992 -1 -1 5958 0;
-#X obj 258 396 hsl 75 15 -32767 32767 0 1 empty empty center-x 5 8
+#X obj 295 396 hsl 75 15 -32767 32767 0 1 empty empty center-x 5 8
 1 11 -228992 -1 -1 3700 0;
-#X obj 248 340 hsl 75 15 -32767 32767 0 1 empty empty deadband-y 5
+#X obj 285 340 hsl 75 15 -32767 32767 0 1 empty empty deadband-y 5
 8 1 11 -225280 -1 -1 3734 0;
-#X msg 245 373 deadband-y \$1;
-#X msg 242 317 deadband-x \$1;
-#X obj 245 284 hsl 75 15 -32767 32767 0 1 empty empty deadband-x 5
+#X msg 282 373 deadband-y \$1;
+#X msg 279 317 deadband-x \$1;
+#X obj 282 284 hsl 75 15 -32767 32767 0 1 empty empty deadband-x 5
 8 1 11 -225280 -1 -1 3836 0;
 #X msg 226 258 down-coeff \$1;
 #X obj 229 225 hsl 90 15 -1 1 0 1 empty empty down-coeff 5 8 1 11 -257472
@@ -40,7 +40,7 @@ the parameters for each direction.;
 #X obj 223 170 hsl 90 15 -1 1 0 1 empty empty up-coeff 5 7 1 11 -257472
 -1 -1 1335 0;
 #X obj 120 225 hsl 90 15 -1 1 0 0 empty empty left-coeff 5 7 1 11 -257472
--1 -1 8900 0;
+-1 -1 0 0;
 #X obj 103 170 hsl 90 15 -1 1 0 1 empty empty right-coeff 5 7 1 10
 -257472 -1 -1 8900 0;
 #X msg 220 203 up-coeff \$1;
@@ -83,18 +83,18 @@ the parameters for each direction.;
 #X obj 100 187 nbx 5 14 -1e+37 1e+37 0 0 empty empty empty 0 -6 1 10
 -233017 -1 -1 1 256;
 #X obj 117 242 nbx 5 14 -1e+37 1e+37 0 0 empty empty empty 0 -6 1 10
--233017 -1 -1 1 256;
+-233017 -1 -1 0 256;
 #X obj 226 242 nbx 5 14 -1e+37 1e+37 0 0 empty empty empty 0 -6 1 10
 -233017 -1 -1 -1 256;
 #X obj 220 187 nbx 5 14 -1e+37 1e+37 0 0 empty empty empty 0 -6 1 10
 -233017 -1 -1 -0.7 256;
-#X obj 242 301 nbx 6 14 -1e+37 1e+37 0 0 empty empty empty 0 -6 1 10
+#X obj 279 301 nbx 6 14 -1e+37 1e+37 0 0 empty empty empty 0 -6 1 10
 -233017 -1 -1 1204.41 256;
-#X obj 245 357 nbx 6 14 -1e+37 1e+37 0 0 empty empty empty 0 -6 1 10
+#X obj 282 357 nbx 6 14 -1e+37 1e+37 0 0 empty empty empty 0 -6 1 10
 -233017 -1 -1 301.102 256;
-#X obj 255 413 nbx 6 14 -1e+37 1e+37 0 0 empty empty empty 0 -6 1 10
+#X obj 292 413 nbx 6 14 -1e+37 1e+37 0 0 empty empty empty 0 -6 1 10
 -233017 -1 -1 0 256;
-#X obj 260 467 nbx 6 14 -1e+37 1e+37 0 0 empty empty empty 0 -6 1 10
+#X obj 297 467 nbx 6 14 -1e+37 1e+37 0 0 empty empty empty 0 -6 1 10
 -233017 -1 -1 19996.7 256;
 #X obj 3 3 cnv 15 850 30 empty empty [ff-spring] 15 15 1 18 -257472
 -1 0;
@@ -107,6 +107,9 @@ the parameters for each direction.;
 #X floatatom 195 624 5 0 0 0 - - -;
 #X text 397 58 [ff-spring] is a "conditional effect".;
 #X text 396 110 [ff-friction] has the same methods;
+#X msg 36 387 load;
+#X msg 73 387 unload;
+#X text 9 369 load/unload effect;
 #X connect 12 0 32 0;
 #X connect 13 0 33 0;
 #X connect 14 0 34 0;
@@ -152,3 +155,5 @@ the parameters for each direction.;
 #X connect 59 0 21 0;
 #X connect 60 0 17 0;
 #X connect 61 0 16 0;
+#X connect 70 0 39 0;
+#X connect 71 0 39 0;