Revision: 10137 http://pure-data.svn.sourceforge.net/pure-data/?rev=10137&view=rev Author: eighthave Date: 2008-07-03 05:24:35 -0700 (Thu, 03 Jul 2008)
Log Message: ----------- included pm mapping bugfixes from Hangar workshop that Cyrille checked into trunk
Modified Paths: -------------- branches/pd-extended/v0-40/externals/mapping/pmcloud_2d.pd branches/pd-extended/v0-40/externals/mapping/pmcloud_3d.pd branches/pd-extended/v0-40/externals/mapping/pmfilter_2d.pd branches/pd-extended/v0-40/externals/mapping/pmfilter_3d.pd branches/pd-extended/v0-40/externals/mapping/pmrepulsor_2d.pd branches/pd-extended/v0-40/externals/mapping/pmrepulsor_3d.pd
Property Changed: ---------------- branches/pd-extended/v0-40/externals/mapping/median_3.pd branches/pd-extended/v0-40/externals/mapping/median_5.pd branches/pd-extended/v0-40/externals/mapping/median_7.pd
Property changes on: branches/pd-extended/v0-40/externals/mapping/median_3.pd ___________________________________________________________________ Name: svn:executable - *
Property changes on: branches/pd-extended/v0-40/externals/mapping/median_5.pd ___________________________________________________________________ Name: svn:executable - *
Property changes on: branches/pd-extended/v0-40/externals/mapping/median_7.pd ___________________________________________________________________ Name: svn:executable - *
Modified: branches/pd-extended/v0-40/externals/mapping/pmcloud_2d.pd =================================================================== --- branches/pd-extended/v0-40/externals/mapping/pmcloud_2d.pd 2008-07-02 19:04:46 UTC (rev 10136) +++ branches/pd-extended/v0-40/externals/mapping/pmcloud_2d.pd 2008-07-03 12:24:35 UTC (rev 10137) @@ -6,7 +6,7 @@ #X obj 736 49 inlet; #X obj 554 44 inlet; #X obj 42 278 msd2D; -#N canvas 880 117 639 733 create_clouds 0; +#N canvas 801 117 639 733 create_clouds 0; #X obj 70 30 loadbang; #X obj 175 649 t a; #X obj 173 677 outlet; @@ -41,8 +41,6 @@ #X obj 145 283 pack f f; #X msg 126 419 link lnk cloud in $1 0; #X msg 175 94 reset , mass in 0 1 0 0 , mass fixe 0 0 0 0; -#X msg 48 504 nLink damp fixe cloud 0 $1 0 1 , nLink damp fixe cloud -0 $1 1 0; #X msg 89 471 link lnk cloud cloud $1 0; #X obj 126 391 $2; #X obj 85 446 $2; @@ -54,15 +52,17 @@ #X msg 274 202 seed $1; #X obj 145 145 $1; #X obj 39 12 inlet; +#X msg 48 504 tLink damp fixe cloud 0 $1 0 1 , tLink damp fixe cloud +0 $1 1 0; #X connect 0 0 3 0; #X connect 1 0 2 0; +#X connect 3 1 16 0; #X connect 3 1 17 0; -#X connect 3 1 18 0; -#X connect 3 2 16 0; +#X connect 3 2 15 0; #X connect 3 3 5 0; #X connect 3 4 13 0; -#X connect 3 5 24 0; -#X connect 4 0 21 0; +#X connect 3 5 23 0; +#X connect 4 0 20 0; #X connect 5 0 4 0; #X connect 6 0 7 0; #X connect 7 0 11 0; @@ -73,19 +73,19 @@ #X connect 12 0 1 0; #X connect 13 0 1 0; #X connect 14 0 1 0; -#X connect 15 0 1 0; -#X connect 16 0 12 0; -#X connect 17 0 15 0; -#X connect 18 0 14 0; -#X connect 19 0 23 0; -#X connect 20 0 22 0; +#X connect 15 0 12 0; +#X connect 16 0 14 0; +#X connect 17 0 25 0; +#X connect 18 0 22 0; +#X connect 19 0 21 0; +#X connect 20 0 6 0; +#X connect 20 0 9 0; #X connect 21 0 6 0; -#X connect 21 0 9 0; -#X connect 22 0 6 0; -#X connect 23 0 9 0; -#X connect 24 0 20 0; -#X connect 24 0 19 0; -#X connect 25 0 3 0; +#X connect 22 0 9 0; +#X connect 23 0 19 0; +#X connect 23 0 18 0; +#X connect 24 0 3 0; +#X connect 25 0 1 0; #X restore 46 169 pd create_clouds; #X obj 91 69 unpack f f; #X msg 346 141 posY in $1;
Modified: branches/pd-extended/v0-40/externals/mapping/pmcloud_3d.pd =================================================================== --- branches/pd-extended/v0-40/externals/mapping/pmcloud_3d.pd 2008-07-02 19:04:46 UTC (rev 10136) +++ branches/pd-extended/v0-40/externals/mapping/pmcloud_3d.pd 2008-07-03 12:24:35 UTC (rev 10137) @@ -5,7 +5,7 @@ #X msg 643 95 setK lnk $1; #X obj 736 49 inlet; #X obj 554 44 inlet; -#N canvas 880 117 639 733 create_clouds 0; +#N canvas 801 117 639 733 create_clouds 0; #X obj 70 30 loadbang; #X obj 175 649 t a; #X obj 173 677 outlet; @@ -55,8 +55,8 @@ #X connect 7 1 4 0; #X connect 8 0 0 0; #X restore 85 126 pd loop; -#X msg 48 504 nLink damp fixe cloud 0 $1 0 0 1 , nLink damp fixe -cloud 0 $1 0 1 0 , nLink damp fixe cloud 0 $1 1 0 0; +#X msg 48 504 tLink damp fixe cloud 0 $1 0 0 1 , tLink damp fixe +cloud 0 $1 0 1 0 , tLink damp fixe cloud 0 $1 1 0 0; #X connect 0 0 3 0; #X connect 1 0 2 0; #X connect 3 1 12 0;
Modified: branches/pd-extended/v0-40/externals/mapping/pmfilter_2d.pd =================================================================== --- branches/pd-extended/v0-40/externals/mapping/pmfilter_2d.pd 2008-07-02 19:04:46 UTC (rev 10136) +++ branches/pd-extended/v0-40/externals/mapping/pmfilter_2d.pd 2008-07-03 12:24:35 UTC (rev 10137) @@ -1,4 +1,4 @@ -#N canvas 934 11 702 349 10; +#N canvas 738 11 702 349 10; #X obj 31 34 inlet; #X obj 80 130 loadbang; #X obj 31 290 outlet; @@ -19,14 +19,14 @@ #X msg 453 81 setD damp $1; #X obj 156 128 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; +#X obj 552 35 inlet; +#X msg 552 81 setL lnk $1; #X msg 80 182 reset , mass in 0 1 0 0 , mass out 1 1 0 0 , link -lnk in out $1 0 , nLink damp in out 0 $2 0 1 , nLink damp in out +lnk in out $1 0 , tLink damp in out 0 $2 0 1 , tLink damp in out 0 $2 1 0; -#X obj 552 35 inlet; -#X msg 552 81 setL lnk $1; #X connect 0 0 15 0; #X connect 1 0 3 0; -#X connect 3 0 19 0; +#X connect 3 0 21 0; #X connect 4 0 16 0; #X connect 5 0 6 0; #X connect 6 0 13 0; @@ -43,6 +43,6 @@ #X connect 16 0 13 0; #X connect 17 0 13 0; #X connect 18 0 3 0; -#X connect 19 0 13 0; -#X connect 20 0 21 0; +#X connect 19 0 20 0; +#X connect 20 0 13 0; #X connect 21 0 13 0;
Modified: branches/pd-extended/v0-40/externals/mapping/pmfilter_3d.pd =================================================================== --- branches/pd-extended/v0-40/externals/mapping/pmfilter_3d.pd 2008-07-02 19:04:46 UTC (rev 10136) +++ branches/pd-extended/v0-40/externals/mapping/pmfilter_3d.pd 2008-07-03 12:24:35 UTC (rev 10137) @@ -1,4 +1,4 @@ -#N canvas 827 24 702 349 10; +#N canvas 738 24 702 349 10; #X obj 31 34 inlet; #X obj 80 130 loadbang; #X obj 31 314 outlet; @@ -17,17 +17,17 @@ #X obj 156 128 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; #X obj 31 240 msd3D; -#X msg 80 182 reset , mass in 0 1 0 0 0 , mass out 1 1 0 0 0 , link -lnk in out $1 0 , nLink damp in out 0 $2 0 0 1 , nLink damp in -out 0 $2 0 1 0 , nLink damp in out 0 $2 1 0 0; #X msg 259 130 forceX out $1 , forceY out $2 , forceZ out $3; #X msg 61 104 posX in $1 , posY in $2 , posZ in $3; #X obj 552 35 inlet; #X msg 552 81 setL lnk $1; +#X msg 80 182 reset , mass in 0 1 0 0 0 , mass out 1 1 0 0 0 , link +lnk in out $1 0 , tLink damp in out 0 $2 0 0 1 , tLink damp in +out 0 $2 0 1 0 , tLink damp in out 0 $2 1 0 0; #X connect 0 0 13 0; #X connect 1 0 3 0; -#X connect 3 0 17 0; -#X connect 4 0 18 0; +#X connect 3 0 21 0; +#X connect 4 0 17 0; #X connect 5 0 6 0; #X connect 6 0 16 0; #X connect 7 0 14 0; @@ -37,12 +37,12 @@ #X connect 12 0 9 0; #X connect 12 1 11 0; #X connect 13 0 8 0; -#X connect 13 1 19 0; +#X connect 13 1 18 0; #X connect 14 0 16 0; #X connect 15 0 3 0; #X connect 16 0 12 0; #X connect 17 0 16 0; #X connect 18 0 16 0; -#X connect 19 0 16 0; -#X connect 20 0 21 0; +#X connect 19 0 20 0; +#X connect 20 0 16 0; #X connect 21 0 16 0;
Modified: branches/pd-extended/v0-40/externals/mapping/pmrepulsor_2d.pd =================================================================== --- branches/pd-extended/v0-40/externals/mapping/pmrepulsor_2d.pd 2008-07-02 19:04:46 UTC (rev 10136) +++ branches/pd-extended/v0-40/externals/mapping/pmrepulsor_2d.pd 2008-07-03 12:24:35 UTC (rev 10137) @@ -1,4 +1,4 @@ -#N canvas 73 203 871 573 10; +#N canvas 316 249 871 573 10; #X obj 31 34 inlet; #X obj 76 214 loadbang; #X obj 31 428 outlet; @@ -16,18 +16,18 @@ #X msg 132 89 forceX out $1 , forceY out $2; #X obj 156 209 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1 -1; -#X msg 76 266 reset , mass center 0 1 0 0 , mass out 1 1 0.5 0 , -link lnk center out $1 0 , nLink damp center out 0 $2 0 1 , nLink -damp center out 0 $2 1 0 , mass grab 0 1 0 0 , link lgrab out grab -0 0; #X obj 29 88 unpack f f; #X msg 29 112 posX grab $1; #X msg 78 165 setK lgrab $1; #X msg 94 134 posY grab $1; #X obj 29 55 route grab grab_on force bang; -#X connect 0 0 21 0; +#X msg 76 266 reset , mass center 0 1 0 0 , mass out 1 1 0.5 0 , +link lnk center out $1 0 , tLink damp center out 0 $2 0 1 , tLink +damp center out 0 $2 1 0 , mass grab 0 1 0 0 , link lgrab out grab +0 0; +#X connect 0 0 20 0; #X connect 1 0 3 0; -#X connect 3 0 16 0; +#X connect 3 0 21 0; #X connect 4 0 5 0; #X connect 5 0 13 0; #X connect 6 0 7 0; @@ -40,13 +40,13 @@ #X connect 13 0 12 0; #X connect 14 0 13 0; #X connect 15 0 3 0; -#X connect 16 0 13 0; -#X connect 17 0 18 0; -#X connect 17 1 20 0; +#X connect 16 0 17 0; +#X connect 16 1 19 0; +#X connect 17 0 13 0; #X connect 18 0 13 0; #X connect 19 0 13 0; -#X connect 20 0 13 0; -#X connect 21 0 17 0; -#X connect 21 1 19 0; -#X connect 21 2 14 0; -#X connect 21 3 8 0; +#X connect 20 0 16 0; +#X connect 20 1 18 0; +#X connect 20 2 14 0; +#X connect 20 3 8 0; +#X connect 21 0 13 0;
Modified: branches/pd-extended/v0-40/externals/mapping/pmrepulsor_3d.pd =================================================================== --- branches/pd-extended/v0-40/externals/mapping/pmrepulsor_3d.pd 2008-07-02 19:04:46 UTC (rev 10136) +++ branches/pd-extended/v0-40/externals/mapping/pmrepulsor_3d.pd 2008-07-03 12:24:35 UTC (rev 10137) @@ -22,9 +22,9 @@ #X obj 31 55 route grab grab_on force bang; #X obj 31 88 unpack f f f; #X msg 111 159 posZ grab $1; -#X msg 59 378 reset , mass center 0 1 0 0 0 , mass out 1 1 0.5 0 -0 , link lnk center out $1 0 , nLink damp center out 0 $2 0 1 0 -, nLink damp center out 0 $2 1 0 0 , nLink damp center out 0 $2 +#X msg 60 378 reset , mass center 0 1 0 0 0 , mass out 1 1 0.5 0 +0 , link lnk center out $1 0 , tLink damp center out 0 $2 0 1 0 +, tLink damp center out 0 $2 1 0 0 , tLink damp center out 0 $2 0 0 1 , mass grab 0 1 0 0 0 , link lgrab out grab 0 0; #X connect 0 0 19 0; #X connect 1 0 3 0;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.