[Gridflow-cvs] [svn] commit: r6524 - in /trunk: abstractions/#moment_polar.pd abstractions/#polygon_radial_map.pd src/numop2.cxx

svn-gridflow at artengine.ca svn-gridflow at artengine.ca
Thu Feb 3 21:06:05 EST 2011


Author: matju
Date: Thu Feb  3 21:06:04 2011
New Revision: 6524

Log:
rename [# atan] to [# atan2cd]

Modified:
    trunk/abstractions/#moment_polar.pd
    trunk/abstractions/#polygon_radial_map.pd
    trunk/src/numop2.cxx

Modified: trunk/abstractions/#moment_polar.pd
==============================================================================
--- trunk/abstractions/#moment_polar.pd (original)
+++ trunk/abstractions/#moment_polar.pd Thu Feb  3 21:06:04 2011
@@ -8,9 +8,8 @@
 #X text 76 211 sort eigenvectors;
 #X text 76 223 by eigenvalues downwards;
 #X obj 21 266 #redim (1);
-#X obj 21 342 # atan;
 #X obj 21 304 #unpack;
-#X obj 74 304 #pack 1 f;
+#X obj 81 343 #pack 1 f;
 #X obj 21 323 #pack 1 f;
 #X text 29 358 angle of (one of the two) longest radius;
 #X text 113 247 but pick only biggest;
@@ -29,26 +28,27 @@
 #X obj 134 420 outlet radiuses_sorted;
 #X obj 21 69 cv/#SVD;
 #X obj 21 112 #extract_diagonal;
-#X connect 0 0 22 0;
-#X connect 2 0 24 0;
+#X obj 21 342 # atan2cd;
+#X connect 0 0 21 0;
+#X connect 2 0 23 0;
 #X connect 3 0 4 1;
-#X connect 4 0 10 0;
+#X connect 4 0 9 0;
 #X connect 5 0 2 0;
 #X connect 8 0 4 0;
-#X connect 9 0 23 0;
-#X connect 10 0 12 0;
-#X connect 10 1 11 0;
-#X connect 11 0 9 1;
-#X connect 12 0 9 0;
-#X connect 18 0 5 0;
-#X connect 18 1 19 1;
-#X connect 19 0 26 0;
-#X connect 21 0 18 0;
-#X connect 22 0 27 0;
-#X connect 23 0 1 0;
-#X connect 24 0 8 0;
-#X connect 24 1 25 0;
-#X connect 25 0 19 0;
-#X connect 27 0 28 0;
-#X connect 27 1 3 0;
-#X connect 28 0 21 0;
+#X connect 9 0 11 0;
+#X connect 9 1 10 0;
+#X connect 10 0 28 1;
+#X connect 11 0 28 0;
+#X connect 17 0 5 0;
+#X connect 17 1 18 1;
+#X connect 18 0 25 0;
+#X connect 20 0 17 0;
+#X connect 21 0 26 0;
+#X connect 22 0 1 0;
+#X connect 23 0 8 0;
+#X connect 23 1 24 0;
+#X connect 24 0 18 0;
+#X connect 26 0 27 0;
+#X connect 26 1 3 0;
+#X connect 27 0 20 0;
+#X connect 28 0 22 0;

Modified: trunk/abstractions/#polygon_radial_map.pd
==============================================================================
--- trunk/abstractions/#polygon_radial_map.pd (original)
+++ trunk/abstractions/#polygon_radial_map.pd Thu Feb  3 21:06:04 2011
@@ -17,13 +17,12 @@
 #X obj 306 366 +;
 #X msg 281 328 666;
 #X obj 2 331 outlet radial_map;
-#X obj 260 437 tabread \$0-table;
-#X obj 221 493 pack;
-#X obj 221 512 s \$0-table;
-#X obj 253 493 +;
+#X obj 259 423 tabread \$0-table;
+#X obj 220 463 pack;
+#X obj 220 482 s \$0-table;
+#X obj 252 463 +;
 #N canvas 0 0 450 238 directions-of-points 0;
 #X obj 20 25 inlet;
-#X obj 20 96 # atan;
 #X obj 20 115 # *;
 #X obj 45 115 r \$0-precision;
 #X obj 20 134 # / 36000;
@@ -44,15 +43,16 @@
 #X connect 6 0 1 0;
 #X restore 20 44 pd #split 2;
 #X obj 20 172 outlet;
-#X connect 0 0 7 0;
-#X connect 1 0 2 0;
-#X connect 2 0 4 0;
-#X connect 3 0 2 1;
-#X connect 4 0 6 0;
-#X connect 5 0 6 1;
+#X obj 20 96 # atan2cd;
+#X connect 0 0 6 0;
+#X connect 1 0 3 0;
+#X connect 2 0 1 1;
+#X connect 3 0 5 0;
+#X connect 4 0 5 1;
+#X connect 5 0 7 0;
 #X connect 6 0 8 0;
-#X connect 7 0 1 0;
-#X connect 7 1 1 1;
+#X connect 6 1 8 1;
+#X connect 8 0 1 0;
 #X restore 281 223 pd directions-of-points;
 #N canvas 642 350 344 210 closest-turn 0;
 #X obj 27 23 inlet;
@@ -76,9 +76,9 @@
 #X connect 7 0 8 0;
 #X connect 8 0 2 0;
 #X connect 9 0 7 0;
-#X restore 326 268 pd closest-turn;
-#X obj 260 414 /;
-#X obj 285 414 r \$0-precision;
+#X restore 313 283 pd closest-turn;
+#X obj 259 404 /;
+#X obj 284 404 r \$0-precision;
 #N canvas 637 343 450 300 find-intersection 0;
 #X obj 21 20 inlet edge;
 #X obj 110 21 inlet direction;
@@ -100,30 +100,30 @@
 #X connect 7 3 9 3;
 #X connect 8 0 5 1;
 #X connect 9 0 2 0;
-#X restore 77 457 pd find-intersection;
-#X obj 77 438 #store;
-#X obj 260 395 * 36000;
+#X restore 77 407 pd find-intersection;
+#X obj 77 388 #store;
+#X obj 259 385 * 36000;
 #X obj 22 130 s \$0-table;
 #X msg 22 111 resize \$1;
-#X obj 77 409 t b f;
-#X obj 221 395 t f f;
-#X obj 221 437 t f f;
+#X obj 77 359 t b f;
+#X obj 220 385 t f f;
+#X obj 220 423 t f f;
 #X obj 2 255 for 0 0 1;
 #X obj 31 236 r \$0-precision;
 #X obj 83 293 r \$0-precision;
 #X obj 2 312 #import (1);
 #X msg 83 312 list \$1;
-#X obj 260 160 s \$0-table;
-#X msg 260 141 const 0;
+#X obj 258 181 s \$0-table;
+#X msg 258 162 const 0;
 #X obj 2 274 tabread \$0-table;
-#X obj 207 141 t a a b;
-#X obj 13 181 #finished;
+#X obj 210 162 t a a b;
+#X obj 2 217 #finished;
 #X msg 22 73 256;
-#N canvas 0 0 450 300 graph4 0;
+#N canvas 0 0 450 300 (subpatch) 0;
 #X array \$0-table 256 float 2;
 #X coords 0 100 256 0 200 140 1;
 #X restore 475 29 graph;
-#X obj 75 509 *;
+#X obj 77 426 *;
 #X obj 10 34 route precision;
 #X connect 0 0 47 0;
 #X connect 1 0 30 0;

Modified: trunk/src/numop2.cxx
==============================================================================
--- trunk/src/numop2.cxx (original)
+++ trunk/src/numop2.cxx Thu Feb  3 21:06:04 2011
@@ -217,7 +217,7 @@
 #ifdef PASS3
 DEF_OP(sinmul, (float64)b * sin((float64)a * (M_PI / 18000)), 0, false, false) // "LN=9000+36000n RA=0 LA=..."
 DEF_OP(cosmul, (float64)b * cos((float64)a * (M_PI / 18000)), 0, false, false) // "LN=36000n RA=0 LA=..."
-DEF_OP(atan, atan2(a,b) * (18000 / M_PI), 0, false, false) // "LA=0"
+DEF_OP(atan2cd, atan2(a,b) * (18000 / M_PI), 0, false, false) // "LA=0"
 DEF_OP(tanhmul, (float64)b * tanh((float64)a * (M_PI / 18000)), 0, false, x==0)
 DEF_OP(gamma, b<=0 ? (T)0 : (T)(0+floor(pow((float64)a/256.0,256.0/(float64)b)*256.0)), 0, false, false) // "RN=256"
 DEF_OPF(pow, ipow(a,b), pow(a,b), 0, false, false) // "RN=1"
@@ -343,7 +343,7 @@
 Numop2 op_table3[] = {
 	DECL_OP_NOFOLD(sinmul, "sin*", 0),
 	DECL_OP_NOFOLD(cosmul, "cos*", 0),
-	DECL_OP_NOFOLD(atan,   "atan", 0),
+	DECL_OP_NOFOLD(atan2cd,"atan2cd", 0),
 	DECL_OP_NOFOLD(tanhmul,"tanh*", 0),
 	DECL_OP_NOFOLD(gamma,  "gamma", 0),
 	DECL_OP_NOFOLD(pow,    "**", 0),



More information about the Gridflow-cvs mailing list