Use plib rad/degrees conversion constants.

[simgear.git] / simgear / math / polar3d.hxx

diff --git a/simgear/math/polar3d.hxx b/simgear/math/polar3d.hxx
index acd24ae7a9d5c23e2411fca511981d922298e1ba..0c91bd4f8ff892b019f8009bf5f63d2c25642e79 100644 (file)
--- a/simgear/math/polar3d.hxx
+++ b/simgear/math/polar3d.hxx
@@ -59,7 +59,7 @@ inline Point3D sgPolarToCart3d(const Point3D& p) {
 // specified in radians.  Distances are specified in meters.
 inline Point3D sgCartToPolar3d(const Point3D& cp) {
     return Point3D( atan2( cp.y(), cp.x() ),
-                   FG_PI_2 - 
+                   SGD_PI_2 - 
                    atan2( sqrt(cp.x()*cp.x() + cp.y()*cp.y()), cp.z() ),
                    sqrt(cp.x()*cp.x() + cp.y()*cp.y() + cp.z()*cp.z()) );
 }
@@ -88,12 +88,13 @@ inline Point3D calc_gc_lon_lat( const Point3D& orig, double course,
     result.sety( asin( sin(orig.y()) * cos(dist) + 
                       cos(orig.y()) * sin(dist) * cos(course) ) );
 
-    if ( cos(result.y()) < FG_EPSILON ) {
+    if ( cos(result.y()) < SG_EPSILON ) {
         result.setx( orig.x() );      // endpoint a pole
     } else {
         result.setx( 
            fmod(orig.x() - asin( sin(course) * sin(dist) / 
-                                 cos(result.y()) ) + FG_PI, FG_2PI) - FG_PI );
+                                 cos(result.y()) )
+                 + SGD_PI, SGD_2PI) - SGD_PI );
     }
 
     return result;
@@ -132,10 +133,10 @@ inline void calc_gc_course_dist( const Point3D& start, const Point3D& dest,
 
     double tc1;
 
-    if ( cos(start.y()) < FG_EPSILON ) {
+    if ( cos(start.y()) < SG_EPSILON ) {
        // EPS a small number ~ machine precision
        if ( start.y() > 0 ) {
-           tc1 = FG_PI;        // starting from N pole
+           tc1 = SGD_PI;        // starting from N pole
        } else {
            tc1 = 0;            // starting from S pole
        }
@@ -149,7 +150,7 @@ inline void calc_gc_course_dist( const Point3D& start, const Point3D& dest,
     if ( sin( dest.x() - start.x() ) < 0 ) {
         tc1 = tmp5;
     } else {
-        tc1 = 2 * FG_PI - tmp5;
+        tc1 = 2 * SGD_PI - tmp5;
     }
 
     *course = tc1;