Revision: 41055
http://brlcad.svn.sourceforge.net/brlcad/?rev=41055&view=rev
Author: brlcad
Date: 2010-10-18 18:58:15 +0000 (Mon, 18 Oct 2010)
Log Message:
-----------
replace RTOD/DTOR with vmath's RAD2DEG/DEG2RAD accordingly
Modified Paths:
--------------
brlcad/trunk/include/anim.h
brlcad/trunk/src/anim/anim_cascade.c
brlcad/trunk/src/anim/anim_fly.c
brlcad/trunk/src/anim/anim_keyread.c
brlcad/trunk/src/anim/anim_lookat.c
brlcad/trunk/src/anim/anim_orient.c
brlcad/trunk/src/anim/anim_turn.c
Modified: brlcad/trunk/include/anim.h
===================================================================
--- brlcad/trunk/include/anim.h 2010-10-18 18:55:22 UTC (rev 41054)
+++ brlcad/trunk/include/anim.h 2010-10-18 18:58:15 UTC (rev 41055)
@@ -32,9 +32,6 @@
#define ANIM_STEER_NEW 0
#define ANIM_STEER_END 1
-#define DTOR M_PI/180.0
-#define RTOD 180.0/M_PI
-
#define VSUBUNIT(a, b, c) {VSUB2(a, b, c);\
VUNITIZE(a);}
#define FVSCAN(f, a) fscanf(f, "%lf %lf %lf", (a), (a)+1, (a)+2)
Modified: brlcad/trunk/src/anim/anim_cascade.c
===================================================================
--- brlcad/trunk/src/anim/anim_cascade.c 2010-10-18 18:55:22 UTC (rev
41054)
+++ brlcad/trunk/src/anim/anim_cascade.c 2010-10-18 18:58:15 UTC (rev
41055)
@@ -272,7 +272,7 @@
bn_mat_mul(m_ans, m_rot1, m_rot2);
}
anim_mat2ypr(rad_ang_ans, m_ans);
- VSCALE(ang_ans, rad_ang_ans, RTOD);
+ VSCALE(ang_ans, rad_ang_ans, RAD2DEG);
if (print_time) {
printf("%g", time);
Modified: brlcad/trunk/src/anim/anim_fly.c
===================================================================
--- brlcad/trunk/src/anim/anim_fly.c 2010-10-18 18:55:22 UTC (rev 41054)
+++ brlcad/trunk/src/anim/anim_fly.c 2010-10-18 18:58:15 UTC (rev 41055)
@@ -209,7 +209,7 @@
fastf_t xyz2yaw(fastf_t *d)
{
fastf_t yaw;
- yaw = RTOD*atan2(d[1], d[0]);
+ yaw = RAD2DEG*atan2(d[1], d[0]);
if (yaw < 0.0) yaw += 360.0;
return yaw;
}
@@ -219,7 +219,7 @@
{
fastf_t x;
x = sqrt(d[0]*d[0] + d[1]*d[1]);
- return (RTOD*atan2(d[2], x));
+ return (RAD2DEG*atan2(d[2], x));
}
Modified: brlcad/trunk/src/anim/anim_keyread.c
===================================================================
--- brlcad/trunk/src/anim/anim_keyread.c 2010-10-18 18:55:22 UTC (rev
41054)
+++ brlcad/trunk/src/anim/anim_keyread.c 2010-10-18 18:58:15 UTC (rev
41055)
@@ -132,7 +132,7 @@
else if (c==ERROR2)
fprintf(stderr, "Keyread: can't interpret matrix at time =
%f.\n", time);
if (units == DEGREES)
- VSCALE(angle, angle, RTOD);
+ VSCALE(angle, angle, RAD2DEG);
printf("%.10g\t%.10g\t%.10g\n", angle[0], angle[1], angle[2]);
}
else if (mode==XYZ) {
@@ -142,7 +142,7 @@
else if (c==ERROR2)
fprintf(stderr, "Keyread: can't interpret matrix at time =
%f\n.", time);
if (units == DEGREES)
- VSCALE(angle, angle, RTOD);
+ VSCALE(angle, angle, RAD2DEG);
printf("%.10g\t%.10g\t%.10g\n", angle[X], angle[Y], angle[Z]);
}
else if (mode==QUATERNION) {
Modified: brlcad/trunk/src/anim/anim_lookat.c
===================================================================
--- brlcad/trunk/src/anim/anim_lookat.c 2010-10-18 18:55:22 UTC (rev 41054)
+++ brlcad/trunk/src/anim/anim_lookat.c 2010-10-18 18:58:15 UTC (rev 41055)
@@ -122,9 +122,9 @@
break;
case LOOKAT_YPR:
anim_mat2ypr(angles, mat);
- angles[0] *= RTOD;
- angles[1] *= RTOD;
- angles[2] *= RTOD;
+ angles[0] *= RAD2DEG;
+ angles[1] *= RAD2DEG;
+ angles[2] *= RAD2DEG;
printf("%.10g", time);
if (print_viewsize)
printf("\t%.10g", vsize);
Modified: brlcad/trunk/src/anim/anim_orient.c
===================================================================
--- brlcad/trunk/src/anim/anim_orient.c 2010-10-18 18:55:22 UTC (rev 41054)
+++ brlcad/trunk/src/anim/anim_orient.c 2010-10-18 18:58:15 UTC (rev 41055)
@@ -186,7 +186,7 @@
num_read = scanf("%lf %lf %lf", angle, angle+1, angle+2);
/* convert to radians if in degrees */
if (input_units==DEGREES) {
- VSCALE(angle, angle, DTOR);
+ VSCALE(angle, angle, DEG2RAD);
}
break;
case QUAT:
@@ -246,7 +246,7 @@
case YPR:
anim_mat2ypr(angle, matrix);
if (output_units==DEGREES)
- VSCALE(angle, angle, RTOD);
+ VSCALE(angle, angle, RAD2DEG);
printf("%.12g\t%.12g\t%.12g\n", angle[0], angle[1], angle[2]);
break;
case AET:
@@ -259,13 +259,13 @@
angle[1] = -angle[1];
angle[2] = -angle[2];
if (output_units==DEGREES)
- VSCALE(angle, angle, RTOD);
+ VSCALE(angle, angle, RAD2DEG);
printf("%.12g\t%.12g\t%.12g\n", angle[0], angle[1], angle[2]);
break;
case XYZ:
anim_mat2zyx(angle, matrix);
if (output_units==DEGREES)
- VSCALE(angle, angle, RTOD);
+ VSCALE(angle, angle, RAD2DEG);
printf("%.12g\t%.12g\t%.12g\n", angle[0], angle[1], angle[2]);
break;
case QUAT:
Modified: brlcad/trunk/src/anim/anim_turn.c
===================================================================
--- brlcad/trunk/src/anim/anim_turn.c 2010-10-18 18:55:22 UTC (rev 41054)
+++ brlcad/trunk/src/anim/anim_turn.c 2010-10-18 18:58:15 UTC (rev 41055)
@@ -60,7 +60,7 @@
break;
case 'a':
sscanf(bu_optarg, "%lf", &angle);
- angle *= DTOR; /* degrees to radians */
+ angle *= DEG2RAD; /* degrees to radians */
angle_set = 1;
break;
case 'r':
@@ -170,12 +170,12 @@
roll_ang -= sign * MAGNITUDE(v) / radius;
if (!(count%print_int))
- printf("%.10g %.10g %.10g 0.0\n", time, factor*RTOD*yaw,
RTOD*roll_ang);
+ printf("%.10g %.10g %.10g 0.0\n", time, factor*RAD2DEG*yaw,
RAD2DEG*roll_ang);
}
else {
/* print position and orientation of vehicle */
if (!(count%print_int))
- printf("%.10g %.10g %.10g %.10g %.10g 0.0 0.0\n", time,
front[0], front[1], front[2], RTOD * angle);
+ printf("%.10g %.10g %.10g %.10g %.10g 0.0 0.0\n", time,
front[0], front[1], front[2], RAD2DEG * angle);
}
count++;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Download new Adobe(R) Flash(R) Builder(TM) 4
The new Adobe(R) Flex(R) 4 and Flash(R) Builder(TM) 4 (formerly
Flex(R) Builder(TM)) enable the development of rich applications that run
across multiple browsers and platforms. Download your free trials today!
http://p.sf.net/sfu/adobe-dev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
