updated makefile with filenames examples with declare ..

svn path=/trunk/externals/pmpd/; revision=17263

5 files changed, 118 insertions, 113 deletions

diff --git a/Makefile b/Makefile
index 372c0d2..4bab152 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ SOURCES = iAmbient2D.c iAmbient3D.c iCircle2D.c iCircle3D.c iCylinder3D.c iLine2
 PDOBJECTS = 
 
 # example patches and related files, in the 'examples' subfolder
-EXAMPLES = 00_pmpd.pd 01_basics.pd 02_string.pd 03_chaos2D.pd 04_3D_exemple.pd 05_corde2D.pd 06_pyramide3D.pd 07_corde3D.pd 08_ball2D.pd 09_tutorial2D.pd 10_game.pd 11_comportement.pd 12_exitation.pd 13_plane3D.pd 14_MP_curve3d.pd 15_constant_force_field.pd 16_name_and_interactors.pd 17_rnd_mouvmnt_and_obstacles.pd 18_flipper.pd 19_vertex.pd 20_moving_vertex.pd 21_fluid_circulation_cylinder.pd 22_gaz_molecules.pd 23_test.pd 24_sand.pd 25_sand2.pd 26_sand3.pd 27_tLia.pd 28_Lia.pd 29_aglom.pd 30_falling_aglom.pd 31_paste.pd 32_Kelvin_Helmoltz_instability.pd 33_vorticity_ellipse.pd 34_cigarette_smoke.pd 35_gravitation.pd 36_3D_interactors.pd 37_hollywood_planette_explosion.pd 38_elastique_membrane_on_a_sphere.pd 39_blob.pd 40_i3D.pd 41_morfing.pd 42_tentacule.pd 43_game.pd 44_flag.pd 45_newWave.pd 46_non_linear.pd 47_scann_synth.pd 48_pmpd~.pd 49_simple_oscilator~.pd 50_string~.pd 51_pmpd_test.pd 52_pmpd_string.pd 53_pmpd_wave.pd 54_pmpd2d_test.pd 55_pmpd2d_additive.pd 56_pmpd2d_ball.pd 57_pmpd2d_gravitation.pd 58_pmpd2d_sand.pd 59_pmpd3d_test.pd 60_draw_link_force.pd 61_draw_link_force_2d.pd 62_NL.pd aglom.pd aglom2.pd aglom3.pd aglom4.pd blob.pd ch_gemwin.pd ch_uzi.pd constructor.pd explose1.pd explose2.pd fluide_mass.pd fluide_mass2.pd fluide_mass3.pd fluide_mass4.pd fluide_mass5.pd fluide_mass6.pd fluide_masse.pd fluide_masse2.pd fluide_masse3.pd fluide_masse4.pd fluide_masse5.pd fluide_masse6.pd game_line.pd gemLia.pd gemLia2.pd gemMasse.pd gemMasse2.pd gemMasse3.pd i3D.pd i3D2.pd mass_link.pd mass_link2.pd mass_link3.pd mountain.pd pd_lia.pd pd_lia2.pd pd_link.pd pd_link2.pd pd_mass.pd pd_mass2.pd pd_masse.pd pd_masse2.pd rain.pd rain1.pd sand.pd smoke.pd smoke1.pd smoke_vortex.pd tut_link.pd tut_mass.pd tut_masse.pd vortex.pd vortex2.pd sound_sable.pd
+EXAMPLES = 00_pmpd.pd 01_basics.pd 02_string.pd 03_chaos2D.pd 04_3D_exemple.pd 05_corde2D.pd 06_pyramide3D.pd 07_corde3D.pd 08_ball2D.pd 09_tutorial2D.pd 10_game.pd 11_comportement.pd 12_exitation.pd 13_plane3D.pd 14_MP_curve3d.pd 15_constant_force_field.pd 16_name_and_interactors.pd 17_rnd_mouvmnt_and_obstacles.pd 18_flipper.pd 19_vertex.pd 20_moving_vertex.pd 21_fluid_circulation_cylinder.pd 22_gaz_molecules.pd 23_test.pd 24_sand.pd 25_sand2.pd 26_sand3.pd 27_tLia.pd 28_Lia.pd 29_aglom.pd 30_falling_aglom.pd 31_paste.pd 32_Kelvin_Helmoltz_instability.pd 33_vorticity_ellipse.pd 34_cigarette_smoke.pd 35_gravitation.pd 36_3D_interactors.pd 37_hollywood_planette_explosion.pd 38_elastique_membrane_on_a_sphere.pd 39_blob.pd 40_i3D.pd 41_morfing.pd 42_tentacule.pd 43_game.pd 44_flag.pd 45_newWave.pd 46_non_linear.pd 47_scann_synth.pd 48_pmpd~.pd 49_simple_oscilator~.pd 50_string~.pd 51_pmpd_test.pd 52_pmpd_string.pd 53_pmpd_wave.pd 54_pmpd2d_test.pd 55_pmpd2d_additive.pd 56_pmpd2d_ball.pd 57_pmpd2d_gravitation.pd 58_pmpd2d_sand.pd 59_pmpd3d_test.pd 60_draw_link_force.pd 61_draw_link_force_2d.pd 62_NL.pd 63_random_network.pd 64_distordable_object.pd 65_2d_interactors.pd 66_setK_table.pd aglom.pd aglom2.pd aglom3.pd aglom4.pd blob.pd ch_gemwin.pd ch_uzi.pd constructor.pd explose1.pd explose2.pd fluide_mass.pd fluide_mass2.pd fluide_mass3.pd fluide_mass4.pd fluide_mass5.pd fluide_mass6.pd fluide_masse.pd fluide_masse2.pd fluide_masse3.pd fluide_masse4.pd fluide_masse5.pd fluide_masse6.pd game_line.pd gemLia.pd gemLia2.pd gemMasse.pd gemMasse2.pd gemMasse3.pd i3D.pd i3D2.pd mass_link.pd mass_link2.pd mass_link3.pd mountain.pd pd_lia.pd pd_lia2.pd pd_link.pd pd_link2.pd pd_mass.pd pd_mass2.pd pd_masse.pd pd_masse2.pd rain.pd rain1.pd sand.pd smoke.pd smoke1.pd smoke_vortex.pd tut_link.pd tut_mass.pd tut_masse.pd vortex.pd vortex2.pd sound_sable.pd
 
 # manuals and related files, in the 'manual' subfolder
 MANUAL = pmpd.pdf pmpd.sxw
diff --git a/examples/63_random_network.pd b/examples/63_random_network.pd
index 0e29304..3f2cf79 100644
--- a/examples/63_random_network.pd
+++ b/examples/63_random_network.pd
@@ -1,5 +1,5 @@
-#N canvas 173 648 543 322 10;
-#X declare -lib Gem;
+#N canvas 454 264 543 322 10;
+#X declare -lib Gem -path ../;
 #X obj 52 193 pmpd2d;
 #X obj 52 78 loadbang;
 #X obj 64 101 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
@@ -55,7 +55,7 @@ lenght of the link connected to this mass to curent length;
 #X msg 27 228 delLink inactive;
 #X msg 95 438 testLink remove_long_link lengthSup 0.15;
 #X obj 388 58 route remove_long_link fixing_corner mouse_move adapt_length
-, f 61;
+;
 #X connect 0 0 2 0;
 #X connect 1 0 2 0;
 #X connect 2 0 44 0;
@@ -121,10 +121,9 @@ lenght of the link connected to this mass to curent length;
 #X connect 46 2 33 0;
 #X connect 46 3 42 0;
 #X restore 52 126 pd creation;
-#X obj 56 21 declare -lib Gem;
 #X obj 186 77 gemhead;
 #X obj 186 100 t b;
-#X obj 54 45 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1 1
+#X obj 54 45 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0 1
 ;
 #N canvas 1157 484 591 562 linkrender 0;
 #X obj 150 9 inlet;
@@ -202,17 +201,18 @@ lenght of the link connected to this mass to curent length;
 #X obj 52 216 route testLink testMass linkEnd;
 #X msg 188 170 testMass mouse_move distanceCircleInf \$1 \$2 0.05;
 #X text 50 283 click and drag connection point with mouse to destrod
-the net, f 62;
-#X connect 0 0 12 0;
+the net;
+#X obj 56 21 declare -lib Gem -path ../;
+#X connect 0 0 11 0;
 #X connect 1 0 3 0;
 #X connect 2 0 3 0;
 #X connect 3 0 0 0;
-#X connect 5 0 6 0;
+#X connect 4 0 5 0;
+#X connect 5 0 8 0;
 #X connect 6 0 9 0;
-#X connect 7 0 10 0;
-#X connect 9 0 0 0;
-#X connect 11 0 13 0;
-#X connect 12 0 3 1;
-#X connect 12 1 3 1;
-#X connect 12 2 8 0;
-#X connect 13 0 0 0;
+#X connect 8 0 0 0;
+#X connect 10 0 12 0;
+#X connect 11 0 3 1;
+#X connect 11 1 3 1;
+#X connect 11 2 7 0;
+#X connect 12 0 0 0;
diff --git a/examples/64_distordable_object.pd b/examples/64_distordable_object.pd
index 09a0395..707d1ad 100644
--- a/examples/64_distordable_object.pd
+++ b/examples/64_distordable_object.pd
@@ -1,10 +1,10 @@
-#N canvas 358 434 669 579 10;
-#X declare -lib Gem;
+#N canvas 385 163 669 579 10;
+#X declare -lib Gem -path ../;
 #X obj 52 300 pmpd2d;
 #X obj 52 78 loadbang;
 #X obj 64 101 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
 -1;
-#N canvas 293 344 1137 609 creation 0;
+#N canvas 163 153 1137 609 creation 0;
 #X obj 256 -12 inlet;
 #X obj 266 16 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
 -1;
@@ -26,7 +26,7 @@
 #X obj 448 371 f;
 #X obj 520 423 + 1;
 #X obj 448 418 t f f f f;
-#X obj 449 448 + 1, f 4;
+#X obj 449 448 + 1;
 #X obj 447 476 pack f f;
 #X msg 448 317 19;
 #X obj 463 179 until;
@@ -81,10 +81,10 @@
 #X obj 462 286 t b f f;
 #X obj 2 399 + 20;
 #X msg 846 276 min -9 -9 \, max 29 29;
-#X msg 1 455 link link \$1 \$2 0.03 0.1;
-#X msg 152 463 link link \$1 \$2 0.03 0.1;
-#X msg 316 462 link link \$1 \$2 0.03 0.1;
-#X msg 448 501 link link \$1 \$2 0.03 0.1;
+#X msg 1 455 link mesh \$1 \$2 0.03 0.1;
+#X msg 152 463 link mesh \$1 \$2 0.03 0.1;
+#X msg 316 462 link mesh \$1 \$2 0.03 0.1;
+#X msg 448 501 link mesh \$1 \$2 0.03 0.1;
 #X connect 0 0 2 0;
 #X connect 1 0 2 0;
 #X connect 2 2 74 0;
@@ -193,13 +193,12 @@
 #X connect 77 0 4 0;
 #X connect 78 0 4 0;
 #X restore 52 126 pd creation;
-#X obj 56 -19 declare -lib Gem;
 #X obj 69 224 gemhead;
 #X obj 69 247 t b;
 #X obj 54 45 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1 1
 ;
-#N canvas 1324 493 591 562 linkrender 0;
-#X obj 150 9 inlet;
+#N canvas 485 216 591 562 linkrender 0;
+#X obj 146 9 inlet;
 #X obj 67 285 separator;
 #X obj 150 148 t b f;
 #X obj 67 368 curve 2;
@@ -213,10 +212,10 @@
 #X msg 67 174 0;
 #X msg 77 337 res 2;
 #X obj 77 311 loadbang;
-#X obj 145 53 route link;
-#X obj 68 265 translateXYZ -10 -10 0;
-#X obj 69 246 scaleXYZ 0.2 0.2 0.2;
-#X connect 0 0 14 0;
+#X obj 67 265 translateXYZ -10 -10 0;
+#X obj 67 246 scaleXYZ 0.2 0.2 0.2;
+#X obj 146 53 route mesh;
+#X connect 0 0 16 0;
 #X connect 1 0 3 0;
 #X connect 2 0 9 0;
 #X connect 2 1 4 0;
@@ -228,21 +227,21 @@
 #X connect 8 2 4 1;
 #X connect 8 3 6 0;
 #X connect 8 4 6 1;
-#X connect 9 0 16 0;
+#X connect 9 0 15 0;
 #X connect 10 0 11 0;
 #X connect 11 0 9 0;
 #X connect 12 0 3 0;
 #X connect 13 0 12 0;
-#X connect 14 0 8 0;
-#X connect 15 0 1 0;
-#X connect 16 0 15 0;
+#X connect 14 0 1 0;
+#X connect 15 0 14 0;
+#X connect 16 0 8 0;
 #X restore 52 345 pd linkrender;
-#N canvas 714 698 763 327 create_gem 0;
+#N canvas 266 267 304 262 create_gem 0;
 #X msg 137 179 0 \, destroy;
 #X obj 118 104 inlet;
 #X obj 118 129 sel 1 0;
 #X msg 118 156 reset \, create \, 1;
-#X obj 118 200 gemwin 50;
+#X obj 118 200 gemwin;
 #X connect 0 0 4 0;
 #X connect 1 0 2 0;
 #X connect 2 0 3 0;
@@ -251,14 +250,13 @@
 #X restore 75 45 pd create_gem;
 #X obj 239 119 pack f f;
 #X obj 239 143 spigot 0;
-#X obj 255 31 gemmouse 40 -40;
+#X obj 255 47 gemmouse 40 -40;
 #X obj 239 97 - 10;
 #X obj 281 98 + 30;
 #X obj 240 73 f;
 #X obj 207 -13 gemhead;
 #X obj 207 10 t b;
 #X obj 207 53 until;
-#X msg 69 268 linkEnd link;
 #X obj 52 323 route linkEnd testLink;
 #X msg 151 366 setInactive \$1 \, setLinkId \$1 broken;
 #X obj 480 70 gemhead 45;
@@ -271,56 +269,63 @@
 #X obj 480 155 circle 2;
 #X obj 151 345 route break plastic;
 #X msg 207 197 bang \, forceY net -1e-05 \,;
-#X msg 450 38 0;
+#X msg 451 38 0;
 #X obj 451 14 loadbang;
 #X msg 239 169 iCircle net \$1 \$2 1 -0.1 1 0 0 0 1;
-#X text 62 452 click and drag the mouse cursor over the object : you
-can interact with it. if force in the links are to importantes \, the
-connection lenght will change (plastic deformation). if forces are
-to importante \, they will break.;
 #X msg 207 32 20;
-#X msg 185 225 testLink break Id link forceSup 0.03 \, testLink plastic
-Id link forceSup 0.002;
-#X msg 206 396 setLCurrent link 0.0001;
-#X connect 0 0 20 0;
+#X obj 26 -19 declare -lib Gem -path ../;
+#X text 62 452 Click and drag the mouse cursor over the object : you
+can interact with it. If forces in the links are superior to 0.002
+\, the connection lenght will adapt a bit (plastic deformation). If
+forces are even bigger (> 0.03) \, the link will break.;
+#X text 239 7 simulation speed x20;
+#X text 378 367 link with forces > 0.03 breaks;
+#X text 350 398 link with forces > 0.002 adpats 1% of their length
+;
+#X text 186 280 ask pmpd to test the forces of each links;
+#X msg 69 268 linkEnd mesh;
+#X msg 185 245 testLink break Id mesh forceSup 0.03 \, testLink plastic
+Id mesh forceSup 0.002;
+#X msg 206 396 setLCurrent mesh 0.01;
+#X connect 0 0 18 0;
 #X connect 1 0 3 0;
 #X connect 2 0 3 0;
 #X connect 3 0 0 0;
-#X connect 5 0 6 0;
-#X connect 6 0 19 0;
-#X connect 7 0 9 0;
-#X connect 10 0 11 0;
-#X connect 11 0 34 0;
-#X connect 12 0 15 1;
-#X connect 12 1 14 0;
-#X connect 12 2 11 1;
-#X connect 13 0 10 0;
-#X connect 14 0 10 1;
-#X connect 15 0 13 0;
-#X connect 16 0 17 0;
-#X connect 17 0 36 0;
-#X connect 18 0 31 0;
-#X connect 18 0 15 0;
-#X connect 18 0 37 0;
+#X connect 4 0 5 0;
+#X connect 5 0 40 0;
+#X connect 6 0 8 0;
+#X connect 9 0 10 0;
+#X connect 10 0 32 0;
+#X connect 11 0 14 1;
+#X connect 11 1 13 0;
+#X connect 11 2 10 1;
+#X connect 12 0 9 0;
+#X connect 13 0 9 1;
+#X connect 14 0 12 0;
+#X connect 15 0 16 0;
+#X connect 16 0 33 0;
+#X connect 17 0 29 0;
+#X connect 17 0 14 0;
+#X connect 17 0 41 0;
+#X connect 18 0 7 0;
+#X connect 18 1 28 0;
 #X connect 19 0 0 0;
-#X connect 20 0 8 0;
-#X connect 20 1 30 0;
-#X connect 21 0 0 0;
-#X connect 22 0 24 0;
-#X connect 23 0 28 0;
-#X connect 24 0 23 0;
-#X connect 25 0 26 0;
-#X connect 25 1 27 0;
-#X connect 25 2 22 0;
-#X connect 26 0 28 1;
-#X connect 27 0 28 2;
-#X connect 28 0 29 0;
-#X connect 30 0 21 0;
-#X connect 30 1 38 0;
-#X connect 31 0 0 0;
-#X connect 32 0 22 0;
-#X connect 33 0 32 0;
-#X connect 34 0 0 0;
-#X connect 36 0 18 0;
-#X connect 37 0 0 0;
-#X connect 38 0 0 0;
+#X connect 20 0 22 0;
+#X connect 21 0 26 0;
+#X connect 22 0 21 0;
+#X connect 23 0 24 0;
+#X connect 23 1 25 0;
+#X connect 23 2 20 0;
+#X connect 24 0 26 1;
+#X connect 25 0 26 2;
+#X connect 26 0 27 0;
+#X connect 28 0 19 0;
+#X connect 28 1 42 0;
+#X connect 29 0 0 0;
+#X connect 30 0 20 0;
+#X connect 31 0 30 0;
+#X connect 32 0 0 0;
+#X connect 33 0 17 0;
+#X connect 40 0 0 0;
+#X connect 41 0 0 0;
+#X connect 42 0 0 0;
diff --git a/examples/65_2d_interactors.pd b/examples/65_2d_interactors.pd
index 4ddeeec..8ca2b11 100644
--- a/examples/65_2d_interactors.pd
+++ b/examples/65_2d_interactors.pd
@@ -1,5 +1,5 @@
 #N canvas 212 448 905 391 10;
-#X declare -lib Gem;
+#X declare -lib Gem -path ../;
 #X obj 52 253 pmpd2d;
 #X obj 52 78 loadbang;
 #X obj 64 101 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
@@ -56,10 +56,9 @@ RaZ \$3 \$4 0.3 0;
 #X connect 19 0 4 0;
 #X connect 20 0 4 0;
 #X restore 52 126 pd creation;
-#X obj 56 21 declare -lib Gem;
 #X obj 186 77 gemhead;
 #X obj 186 100 t b;
-#X obj 54 45 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1 1
+#X obj 54 45 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0 1
 ;
 #N canvas 716 693 763 327 create_gem 0;
 #X msg 137 179 0 \, destroy;
@@ -145,21 +144,22 @@ gem windows to see the effect.;
 #X connect 6 0 1 0;
 #X connect 7 0 3 0;
 #X restore 188 211 pd iMatrix;
-#X connect 0 0 10 0;
+#X obj 56 21 declare -lib Gem -path ../;
+#X connect 0 0 9 0;
 #X connect 1 0 3 0;
 #X connect 2 0 3 0;
 #X connect 3 0 0 0;
-#X connect 5 0 6 0;
-#X connect 6 0 12 0;
-#X connect 7 0 8 0;
-#X connect 9 0 13 0;
-#X connect 10 0 11 0;
+#X connect 4 0 5 0;
+#X connect 5 0 11 0;
+#X connect 6 0 7 0;
+#X connect 8 0 12 0;
+#X connect 9 0 10 0;
+#X connect 11 0 0 0;
 #X connect 12 0 0 0;
-#X connect 13 0 0 0;
-#X connect 14 0 13 0;
-#X connect 15 0 13 0;
-#X connect 16 0 13 0;
-#X connect 17 0 13 0;
-#X connect 18 0 13 0;
-#X connect 19 0 13 0;
-#X connect 21 0 0 0;
+#X connect 13 0 12 0;
+#X connect 14 0 12 0;
+#X connect 15 0 12 0;
+#X connect 16 0 12 0;
+#X connect 17 0 12 0;
+#X connect 18 0 12 0;
+#X connect 20 0 0 0;
diff --git a/examples/66_setK_table.pd b/examples/66_setK_table.pd
index 6815e3b..55b7c39 100644
--- a/examples/66_setK_table.pd
+++ b/examples/66_setK_table.pd
@@ -1,5 +1,5 @@
 #N canvas 111 480 772 393 10;
-#X declare -lib Gem;
+#X declare -lib Gem -path ../;
 #X obj 52 8 loadbang;
 #X obj 64 31 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
 -1;
@@ -41,10 +41,9 @@
 #X connect 13 0 4 0;
 #X connect 14 0 5 0;
 #X restore 52 56 pd creation;
-#X obj 54 -49 declare -lib Gem;
 #X obj 146 7 gemhead;
 #X obj 146 30 t b;
-#X obj 54 -25 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+#X obj 54 -25 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0
 1;
 #N canvas 716 693 763 327 create_gem 0;
 #X msg 137 179 0 \, destroy;
@@ -110,13 +109,14 @@ of each link;
 #X restore 489 165 graph;
 #X msg 146 52 setK tab_force K \, bang \, massPos mobil;
 #X msg 163 81 force mobil force;
+#X obj 54 -49 declare -lib Gem -path ../;
 #X connect 0 0 2 0;
 #X connect 1 0 2 0;
-#X connect 2 0 10 0;
-#X connect 4 0 5 0;
-#X connect 5 0 14 0;
-#X connect 6 0 7 0;
-#X connect 8 0 9 0;
-#X connect 10 0 8 0;
-#X connect 14 0 10 0;
-#X connect 15 0 10 0;
+#X connect 2 0 9 0;
+#X connect 3 0 4 0;
+#X connect 4 0 13 0;
+#X connect 5 0 6 0;
+#X connect 7 0 8 0;
+#X connect 9 0 7 0;
+#X connect 13 0 9 0;
+#X connect 14 0 9 0;