From 5acb62f1f832d157d6412ab50a356102e64c0a5a Mon Sep 17 00:00:00 2001 From: Cyrille Henry Date: Mon, 16 Feb 2009 18:02:35 +0000 Subject: replace float_arguent with purepd/float_argument this allow using this objects without prior loading purepd. svn path=/trunk/externals/mapping/; revision=10781 --- curve_power.pd | 22 ++++++------ curve_root.pd | 20 +++++------ desegment24.pd | 112 ++++++++++++++++++++++++++++----------------------------- disjoin.pd | 34 +++++++++--------- join.pd | 24 ++++++------- polar.pd | 26 +++++++------- test_n.pd | 48 ++++++++++++------------- wave.pd | 46 ++++++++++++------------ 8 files changed, 166 insertions(+), 166 deletions(-) diff --git a/curve_power.pd b/curve_power.pd index 116f7b8..6bccaa2 100644 --- a/curve_power.pd +++ b/curve_power.pd @@ -7,7 +7,6 @@ #X obj 41 231 pow; #X text 96 298 output range: -1 to 1; #X obj 178 30 inlet; -#X obj 207 106 float_argument \$1 1; #X obj 207 85 loadbang; #X text 245 344 released under the GNU GPL; #X text 28 330 (C) Copyright 2006 Hans-Christoph Steiner @@ -17,17 +16,18 @@ #X obj 115 232 pow; #X obj 41 257 * -1; #X obj 177 156 float; +#X obj 207 106 purepd/float_argument \$1 1; #X connect 0 0 2 0; #X connect 2 0 4 0; -#X connect 4 0 12 0; -#X connect 5 0 15 0; -#X connect 7 0 16 0; +#X connect 4 0 11 0; +#X connect 5 0 14 0; +#X connect 7 0 15 0; #X connect 8 0 16 0; -#X connect 9 0 8 0; -#X connect 12 0 13 0; -#X connect 12 1 14 0; -#X connect 13 0 5 0; +#X connect 11 0 12 0; +#X connect 11 1 13 0; +#X connect 12 0 5 0; +#X connect 13 0 1 0; #X connect 14 0 1 0; -#X connect 15 0 1 0; -#X connect 16 0 14 1; -#X connect 16 0 5 1; +#X connect 15 0 13 1; +#X connect 15 0 5 1; +#X connect 16 0 15 0; diff --git a/curve_root.pd b/curve_root.pd index 81aa3a6..1c61d0e 100644 --- a/curve_root.pd +++ b/curve_root.pd @@ -9,7 +9,6 @@ #X obj 177 156 /; #X msg 177 136 1 \$1; #X obj 178 30 inlet; -#X obj 207 106 float_argument \$1 1; #X obj 207 85 loadbang; #X text 245 344 released under the GNU GPL; #X text 28 330 (C) Copyright 2006 Hans-Christoph Steiner @@ -18,18 +17,19 @@ #X obj 40 161 abs; #X obj 115 232 pow; #X obj 41 257 * -1; +#X obj 207 106 purepd/float_argument \$1 1; #X connect 0 0 2 0; #X connect 2 0 4 0; -#X connect 4 0 14 0; -#X connect 5 0 17 0; +#X connect 4 0 13 0; +#X connect 5 0 16 0; #X connect 7 0 5 1; -#X connect 7 0 16 1; +#X connect 7 0 15 1; #X connect 8 0 7 0; #X connect 9 0 8 0; -#X connect 10 0 8 0; -#X connect 11 0 10 0; -#X connect 14 0 15 0; -#X connect 14 1 16 0; -#X connect 15 0 5 0; +#X connect 10 0 17 0; +#X connect 13 0 14 0; +#X connect 13 1 15 0; +#X connect 14 0 5 0; +#X connect 15 0 1 0; #X connect 16 0 1 0; -#X connect 17 0 1 0; +#X connect 17 0 8 0; diff --git a/desegment24.pd b/desegment24.pd index 188f370..50b46a0 100644 --- a/desegment24.pd +++ b/desegment24.pd @@ -94,7 +94,6 @@ keep the above area clear for automatic editing; #X obj 484 250 /; #X obj 521 223 expr $f2 - $f1 + 1; #X obj 274 204 trigger float float float bang float; -#X obj 84 82 float_argument \$1; #X msg 299 45 bang; #X obj 274 124 trigger float bang float; #X obj 0 440 disjoin 0.0416667; @@ -145,7 +144,8 @@ keep the above area clear for automatic editing; #X obj 2750 460 outlet; #X obj 2875 440 disjoin 24; #X obj 2875 460 outlet; -#X connect 0 0 32 0; +#X obj 84 82 purepd/float_argument \$1; +#X connect 0 0 31 0; #X connect 2 0 5 0; #X connect 3 0 2 1; #X connect 4 0 26 0; @@ -160,7 +160,7 @@ keep the above area clear for automatic editing; #X connect 11 0 2 0; #X connect 12 0 11 0; #X connect 13 0 15 0; -#X connect 16 0 31 0; +#X connect 16 0 30 0; #X connect 16 1 13 0; #X connect 17 0 16 0; #X connect 22 0 6 1; @@ -174,56 +174,56 @@ keep the above area clear for automatic editing; #X connect 28 2 3 0; #X connect 28 3 4 0; #X connect 28 4 27 0; -#X connect 29 0 31 0; -#X connect 30 0 13 0; -#X connect 30 0 8 0; -#X connect 31 0 9 0; -#X connect 31 1 8 0; -#X connect 31 2 27 1; -#X connect 32 0 33 0; -#X connect 32 1 34 0; -#X connect 34 0 35 0; -#X connect 34 1 36 0; -#X connect 36 0 37 0; -#X connect 36 1 38 0; -#X connect 38 0 39 0; -#X connect 38 1 40 0; -#X connect 40 0 41 0; -#X connect 40 1 42 0; -#X connect 42 0 43 0; -#X connect 42 1 44 0; -#X connect 44 0 45 0; -#X connect 44 1 46 0; -#X connect 46 0 47 0; -#X connect 46 1 48 0; -#X connect 48 0 49 0; -#X connect 48 1 50 0; -#X connect 50 0 51 0; -#X connect 50 1 52 0; -#X connect 52 0 53 0; -#X connect 52 1 54 0; -#X connect 54 0 55 0; -#X connect 54 1 56 0; -#X connect 56 0 57 0; -#X connect 56 1 58 0; -#X connect 58 0 59 0; -#X connect 58 1 60 0; -#X connect 60 0 61 0; -#X connect 60 1 62 0; -#X connect 62 0 63 0; -#X connect 62 1 64 0; -#X connect 64 0 65 0; -#X connect 64 1 66 0; -#X connect 66 0 67 0; -#X connect 66 1 68 0; -#X connect 68 0 69 0; -#X connect 68 1 70 0; -#X connect 70 0 71 0; -#X connect 70 1 72 0; -#X connect 72 0 73 0; -#X connect 72 1 74 0; -#X connect 74 0 75 0; -#X connect 74 1 76 0; -#X connect 76 0 77 0; -#X connect 76 1 78 0; -#X connect 78 0 79 0; +#X connect 29 0 13 0; +#X connect 29 0 8 0; +#X connect 30 0 9 0; +#X connect 30 1 8 0; +#X connect 30 2 27 1; +#X connect 31 0 32 0; +#X connect 31 1 33 0; +#X connect 33 0 34 0; +#X connect 33 1 35 0; +#X connect 35 0 36 0; +#X connect 35 1 37 0; +#X connect 37 0 38 0; +#X connect 37 1 39 0; +#X connect 39 0 40 0; +#X connect 39 1 41 0; +#X connect 41 0 42 0; +#X connect 41 1 43 0; +#X connect 43 0 44 0; +#X connect 43 1 45 0; +#X connect 45 0 46 0; +#X connect 45 1 47 0; +#X connect 47 0 48 0; +#X connect 47 1 49 0; +#X connect 49 0 50 0; +#X connect 49 1 51 0; +#X connect 51 0 52 0; +#X connect 51 1 53 0; +#X connect 53 0 54 0; +#X connect 53 1 55 0; +#X connect 55 0 56 0; +#X connect 55 1 57 0; +#X connect 57 0 58 0; +#X connect 57 1 59 0; +#X connect 59 0 60 0; +#X connect 59 1 61 0; +#X connect 61 0 62 0; +#X connect 61 1 63 0; +#X connect 63 0 64 0; +#X connect 63 1 65 0; +#X connect 65 0 66 0; +#X connect 65 1 67 0; +#X connect 67 0 68 0; +#X connect 67 1 69 0; +#X connect 69 0 70 0; +#X connect 69 1 71 0; +#X connect 71 0 72 0; +#X connect 71 1 73 0; +#X connect 73 0 74 0; +#X connect 73 1 75 0; +#X connect 75 0 76 0; +#X connect 75 1 77 0; +#X connect 77 0 78 0; +#X connect 79 0 30 0; diff --git a/disjoin.pd b/disjoin.pd index f3a4883..cca13fa 100644 --- a/disjoin.pd +++ b/disjoin.pd @@ -11,35 +11,35 @@ #X obj 166 242 /; #X obj 176 80 moses; #X obj 391 160 trigger bang float; -#X obj 276 45 float_argument \$1 0.5; #X text 280 66 default to splitting down the middle (0.5); #X obj 276 159 purepd/once; #X obj 276 185 float; #X obj 76 159 purepd/once; #X obj 76 185 float; +#X obj 276 45 purepd/float_argument \$1 0.5; #X connect 0 0 10 0; #X connect 3 0 2 0; #X connect 4 0 7 0; -#X connect 5 0 12 0; -#X connect 6 0 12 0; +#X connect 5 0 17 0; +#X connect 6 0 17 0; #X connect 7 0 3 1; #X connect 8 0 3 0; #X connect 9 0 1 0; #X connect 10 0 9 0; -#X connect 10 0 14 0; -#X connect 10 0 16 1; +#X connect 10 0 13 0; +#X connect 10 0 15 1; #X connect 10 1 8 0; -#X connect 10 1 14 1; -#X connect 10 1 16 0; +#X connect 10 1 13 1; +#X connect 10 1 15 0; #X connect 11 0 4 0; #X connect 11 1 7 1; -#X connect 12 0 8 1; -#X connect 12 0 9 1; -#X connect 12 0 10 1; -#X connect 12 0 11 0; -#X connect 12 0 15 1; -#X connect 12 0 17 1; -#X connect 14 0 15 0; -#X connect 15 0 8 0; -#X connect 16 0 17 0; -#X connect 17 0 9 0; +#X connect 13 0 14 0; +#X connect 14 0 8 0; +#X connect 15 0 16 0; +#X connect 16 0 9 0; +#X connect 17 0 8 1; +#X connect 17 0 9 1; +#X connect 17 0 10 1; +#X connect 17 0 11 0; +#X connect 17 0 14 1; +#X connect 17 0 16 1; diff --git a/join.pd b/join.pd index 90ae890..eb28f1e 100644 --- a/join.pd +++ b/join.pd @@ -5,23 +5,23 @@ #X obj 145 91 t b f; #X msg 145 113 1; #X obj 78 169 *; -#X obj 135 55 float_argument \$1; #X obj 135 15 inlet; #X obj 177 15 loadbang; #X obj 32 149 *; #X obj 78 210 +; #X obj 145 137 -; -#X connect 0 0 9 0; +#X obj 135 55 purepd/float_argument \$1; +#X connect 0 0 8 0; #X connect 1 0 5 0; #X connect 3 0 4 0; -#X connect 3 1 11 1; -#X connect 4 0 11 0; -#X connect 5 0 10 0; -#X connect 6 0 3 0; -#X connect 6 0 9 1; -#X connect 6 0 10 1; -#X connect 7 0 6 0; -#X connect 8 0 6 0; +#X connect 3 1 10 1; +#X connect 4 0 10 0; +#X connect 5 0 9 0; +#X connect 6 0 11 0; +#X connect 7 0 11 0; +#X connect 8 0 2 0; #X connect 9 0 2 0; -#X connect 10 0 2 0; -#X connect 11 0 5 1; +#X connect 10 0 5 1; +#X connect 11 0 3 0; +#X connect 11 0 8 1; +#X connect 11 0 9 1; diff --git a/polar.pd b/polar.pd index 9fb14e8..dcb6fbe 100644 --- a/polar.pd +++ b/polar.pd @@ -15,7 +15,6 @@ #X text 28 357 (C) Copyright 2005 Hans-Christoph Steiner ; #X obj 88 218 vector; -#X obj 365 84 symbol_argument \$1; #X obj 385 29 loadbang; #X obj 30 58 inlet x; #X obj 224 56 inlet y; @@ -27,21 +26,22 @@ #X msg 365 124 2; #X obj 365 104 select clockwise; #X obj 384 59 trigger bang bang; +#X obj 365 84 purepd/symbol_argument \$1; #X connect 6 0 14 1; #X connect 7 0 6 0; #X connect 8 0 14 0; #X connect 9 0 8 0; -#X connect 14 0 19 0; -#X connect 14 1 21 1; +#X connect 14 0 18 0; +#X connect 14 1 20 1; #X connect 15 0 25 0; -#X connect 16 0 26 0; -#X connect 17 0 9 0; -#X connect 18 0 7 0; -#X connect 21 0 20 0; -#X connect 21 1 22 0; +#X connect 16 0 9 0; +#X connect 17 0 7 0; +#X connect 20 0 19 0; +#X connect 20 1 21 0; +#X connect 21 0 19 0; #X connect 22 0 20 0; -#X connect 23 0 21 0; -#X connect 24 0 21 0; -#X connect 25 0 24 0; -#X connect 26 0 15 0; -#X connect 26 1 23 0; +#X connect 23 0 20 0; +#X connect 24 0 23 0; +#X connect 25 0 26 0; +#X connect 25 1 22 0; +#X connect 26 0 24 0; diff --git a/test_n.pd b/test_n.pd index af10787..74e9acf 100644 --- a/test_n.pd +++ b/test_n.pd @@ -6,7 +6,6 @@ #X obj 172 297 + 1; #X msg 157 264 0; #X text 347 79 test for 5 by default; -#X obj 331 58 float_argument \$2 5; #X obj 168 14 inlet; #X obj 252 9 loadbang; #X obj 167 100 route float symbol; @@ -21,30 +20,31 @@ #X text 1 41 only use 1st element; #X obj 288 143 print test_n; #X msg 288 122 ERROR: argument type not implmented; -#X obj 167 59 any_argument \$1; -#X connect 0 0 16 0; -#X connect 1 0 7 0; +#X obj 167 59 purepd/any_argument \$1; +#X obj 331 58 purepd/float_argument \$2 5; +#X connect 0 0 15 0; +#X connect 1 0 22 0; #X connect 3 0 4 0; -#X connect 3 0 12 0; +#X connect 3 0 11 0; #X connect 4 0 3 1; #X connect 5 0 3 0; -#X connect 7 0 12 1; +#X connect 7 0 21 0; +#X connect 8 0 21 0; #X connect 8 0 22 0; -#X connect 9 0 22 0; -#X connect 9 0 7 0; -#X connect 10 0 15 0; -#X connect 10 0 17 1; -#X connect 10 1 11 1; -#X connect 10 2 21 0; -#X connect 11 0 3 0; -#X connect 11 1 5 0; -#X connect 12 0 2 0; -#X connect 13 0 17 0; -#X connect 13 1 14 0; -#X connect 14 0 11 0; -#X connect 16 0 13 0; -#X connect 17 0 18 0; -#X connect 18 0 3 0; -#X connect 18 1 5 0; -#X connect 21 0 20 0; -#X connect 22 0 10 0; +#X connect 9 0 14 0; +#X connect 9 0 16 1; +#X connect 9 1 10 1; +#X connect 9 2 20 0; +#X connect 10 0 3 0; +#X connect 10 1 5 0; +#X connect 11 0 2 0; +#X connect 12 0 16 0; +#X connect 12 1 13 0; +#X connect 13 0 10 0; +#X connect 15 0 12 0; +#X connect 16 0 17 0; +#X connect 17 0 3 0; +#X connect 17 1 5 0; +#X connect 20 0 19 0; +#X connect 21 0 9 0; +#X connect 22 0 11 1; diff --git a/wave.pd b/wave.pd index ad5fe5f..2c4b70f 100644 --- a/wave.pd +++ b/wave.pd @@ -21,7 +21,6 @@ #X obj 133 130 max 1; #X obj 400 118 max 0; #X text 173 -13 number of points; -#X obj 400 90 float_argument \$2 0.5; #X text 460 70 default: 0.5; #X obj 164 327 /; #X obj 26 74 trigger bang bang bang float bang; @@ -29,17 +28,18 @@ #X obj 133 153 trigger float float; #X obj 292 16 loadbang; #X obj 133 105 float; -#X obj 132 47 float_argument \$1 25; -#X text 281 46 default: 25 points; -#X connect 0 0 25 0; +#X text 331 48 default: 25 points; +#X obj 132 47 purepd/float_argument \$1 25; +#X obj 400 90 purepd/float_argument \$2 0.5; +#X connect 0 0 24 0; #X connect 1 0 30 0; -#X connect 2 0 22 0; +#X connect 2 0 31 0; #X connect 5 0 6 0; #X connect 6 0 7 0; #X connect 6 0 8 0; #X connect 7 0 6 1; -#X connect 8 0 26 0; -#X connect 9 0 24 0; +#X connect 8 0 25 0; +#X connect 9 0 23 0; #X connect 10 0 11 0; #X connect 11 0 12 0; #X connect 12 0 13 0; @@ -49,19 +49,19 @@ #X connect 15 0 16 0; #X connect 17 0 6 1; #X connect 18 0 8 1; -#X connect 19 0 27 0; -#X connect 20 0 24 1; -#X connect 22 0 20 0; -#X connect 24 0 10 0; -#X connect 25 0 15 0; -#X connect 25 1 29 0; -#X connect 25 2 17 0; -#X connect 25 3 26 1; -#X connect 25 4 13 1; -#X connect 26 0 9 0; -#X connect 27 0 5 0; -#X connect 27 1 18 0; -#X connect 28 0 30 0; -#X connect 28 0 22 0; -#X connect 29 0 19 0; -#X connect 30 0 29 0; +#X connect 19 0 26 0; +#X connect 20 0 23 1; +#X connect 23 0 10 0; +#X connect 24 0 15 0; +#X connect 24 1 28 0; +#X connect 24 2 17 0; +#X connect 24 3 25 1; +#X connect 24 4 13 1; +#X connect 25 0 9 0; +#X connect 26 0 5 0; +#X connect 26 1 18 0; +#X connect 27 0 30 0; +#X connect 27 0 31 0; +#X connect 28 0 19 0; +#X connect 30 0 28 0; +#X connect 31 0 20 0; -- cgit v1.2.1