updated opencv_lk with delaunay

svn path=/trunk/externals/pix_opencv/; revision=12139

1 files changed, 58 insertions, 35 deletions

diff --git a/pix_opencv_lk-help.pd b/pix_opencv_lk-help.pd
index 4b67d7c..f77ff9b 100755
--- a/pix_opencv_lk-help.pd
+++ b/pix_opencv_lk-help.pd
@@ -1,4 +1,4 @@
-#N canvas 288 90 1192 685 10;
+#N canvas 3 105 1192 685 10;
 #X obj 396 -37 gemhead;
 #X obj 212 501 pix_texture;
 #X obj 212 529 square 2;
@@ -37,7 +37,7 @@
 #X obj 213 432 square 2;
 #X obj 325 71 translateXYZ -2 0 0;
 #X obj 326 100 separator;
-#X obj 340 179 cnv 15 600 400 empty empty empty 20 12 0 14 -24198 -66577
+#X obj 340 180 cnv 15 600 450 empty empty empty 20 12 0 14 -24198 -66577
 0;
 #X obj 511 -66 bng 25 250 50 0 empty empty empty 0 -6 0 8 -262144 -1
 -1;
@@ -57,8 +57,8 @@
 #X obj 326 126 translateXYZ 4 0 0;
 #X obj 580 26 loadbang;
 #X msg 528 50 colorspace RGBA;
-#X floatatom 488 416 5 0 0 0 - - -;
-#X text 523 415 window size;
+#X floatatom 488 520 5 0 0 0 - - -;
+#X text 523 519 window size;
 #X obj 553 262 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0
 1;
 #X msg 468 260 nightmode \$1;
@@ -72,38 +72,54 @@
 #X text 511 181 init point detections;
 #X floatatom 631 235 5 0 0 0 - - -;
 #X obj 576 233 / 1000;
-#X msg 481 285 mark \$1 \$2;
-#X msg 492 311 delete \$1;
-#X text 563 311 delete a marker;
-#X msg 503 337 clear;
-#X text 551 338 delete all markers;
-#X msg 510 364 maxmove \$1;
-#X text 624 364 max movement of a marker ( default 5 pisels );
-#X floatatom 586 366 5 0 0 0 - - -;
+#X msg 494 328 mark \$1 \$2;
+#X msg 508 349 delete \$1;
+#X text 579 349 delete a marker;
+#X msg 516 369 clear;
+#X text 564 370 delete all markers;
+#X msg 522 389 maxmove \$1;
+#X text 636 389 max movement of a marker ( default 5 pisels );
+#X floatatom 598 391 5 0 0 0 - - -;
 #X text 763 234 set quality ( default 100 );
 #X msg 671 233 100;
 #X obj 704 233 loadbang;
-#X obj 480 504 unpack f f;
-#X floatatom 481 529 5 0 0 0 - - -;
-#X floatatom 539 530 5 0 0 0 - - -;
-#X text 482 545 X;
-#X text 537 546 Y;
-#X obj 479 478 route 1 2 3 4 5 6 7 8 9 10;
-#X text 651 479 position of each marked point;
-#X obj 377 428 pix_opencv_lk;
-#X text 23 21 written by Lluis Gomez i Bigorda ( lluisgomez@hangar.org
-) and Yves Degoyon ( ydegoyon@gmail.com );
-#X text 23 9 pix_opencv_lk : contour most significant points detection
-;
+#X obj 485 575 unpack f f;
+#X floatatom 486 600 5 0 0 0 - - -;
+#X floatatom 544 601 5 0 0 0 - - -;
+#X text 487 616 X;
+#X text 542 617 Y;
+#X obj 484 549 route 1 2 3 4 5 6 7 8 9 10;
+#X text 650 498 position of each marked point;
+#X obj 378 538 pix_opencv_lk;
 #X obj 952 123 gemmouse;
 #X obj 1008 230 f;
 #X obj 978 229 f;
 #X obj 1022 201 t b b;
 #X obj 978 257 pack f f;
-#X text 560 286 mark x y : mark a point to track ( max points : 10
+#X text 573 329 mark x y : mark a point to track ( max points : 10
 );
 #X obj 998 151 route 1;
 #X msg 1019 176 bang;
+#X msg 477 283 mark all;
+#X msg 487 304 mark none;
+#X text 540 284 mark all points;
+#X text 557 305 reset all markers;
+#X text 622 433 make a delaunay with all points;
+#X msg 542 433 delaunay on;
+#X msg 550 453 delaunay off;
+#X text 651 466 make a delaunay with point 1 and a tolerance of 50
+( all points which color is in that range will be included in the delaunay)
+;
+#X msg 552 478 pdelaunay 1 50;
+#X msg 533 409 ftolerance \$1;
+#X floatatom 625 409 5 0 0 0 - - -;
+#X text 665 409 frame tolerance for point identification ( default
+: 5 );
+#X text 44 11 written by Lluis Gomez i Bigorda ( lluisgomez@hangar.org
+) and Yves Degoyon ( ydegoyon@gmail.com );
+#X text 43 -1 Corner points detection based on Shi and Tomasi;
+#X text 43 -13 pix_opencv_lk : Lukas-Kanade corner points tracking
+;
 #X connect 0 0 21 0;
 #X connect 1 0 2 0;
 #X connect 4 0 5 0;
@@ -150,13 +166,20 @@
 #X connect 57 0 52 0;
 #X connect 59 0 1 0;
 #X connect 59 1 57 0;
-#X connect 62 0 64 1;
-#X connect 62 1 63 1;
-#X connect 62 2 68 0;
-#X connect 63 0 66 1;
-#X connect 64 0 66 0;
-#X connect 65 0 64 0;
-#X connect 65 1 63 0;
-#X connect 66 0 41 0;
-#X connect 68 0 69 0;
-#X connect 69 0 65 0;
+#X connect 60 0 62 1;
+#X connect 60 1 61 1;
+#X connect 60 2 66 0;
+#X connect 61 0 64 1;
+#X connect 62 0 64 0;
+#X connect 63 0 62 0;
+#X connect 63 1 61 0;
+#X connect 64 0 41 0;
+#X connect 66 0 67 0;
+#X connect 67 0 63 0;
+#X connect 68 0 59 0;
+#X connect 69 0 59 0;
+#X connect 73 0 59 0;
+#X connect 74 0 59 0;
+#X connect 76 0 59 0;
+#X connect 77 0 59 0;
+#X connect 78 0 77 0;