#include <simgear/compiler.h>
-#ifdef SG_HAVE_STD_INCLUDES
-# include <cmath>
-#else
-# ifdef SG_MATH_EXCEPTION_CLASH
-# define exception C_exception
-# endif
-# include <math.h>
-#endif
-
-#include <plib/sg.h>
+#include <cmath>
// Make sure PI is defined in its various forms
-// SG_PI and SGD_PI (float and double) come from plib/sg.h
+#ifndef SGD_PI // remove me once FlightGear no longer uses PLIB
+
+#ifdef M_PI
+const double SGD_PI = M_PI;
+const float SG_PI = M_PI;
+#else
+const float SG_PI = 3.1415926535f;
+const double SGD_PI = 3.1415926535;
+#endif
+
+#endif // of PLIB-SG guard
/** 2 * PI */
-#define SGD_2PI 6.28318530717958647692
+const double SGD_2PI = SGD_PI * 2.0;
/** PI / 2 */
#ifdef M_PI_2
#endif
/** PI / 4 */
-#define SGD_PI_4 0.78539816339744830961
+const double SGD_PI_4 = 0.78539816339744830961;
+
+#ifndef SGD_DEGREES_TO_RADIANS // // remove me once FlightGear no longer uses PLIB
+
+const double SGD_DEGREES_TO_RADIANS = SGD_PI / 180.0;
+const double SGD_RADIANS_TO_DEGREES = 180.0 / SGD_PI;
+
+const float SG_DEGREES_TO_RADIANS = SG_PI / 180.0f;
+const float SG_RADIANS_TO_DEGREES = 180.0f / SG_PI;
+
+#endif // of PLIB-SG guard
/** \def SG_E "e" */
#ifdef M_E
/** Nautical Miles to Radians */
#define SG_RAD_TO_NM 3437.7467707849392526
-/** Miles per second to Knots */
+/** meters per second to Knots */
#define SG_MPS_TO_KT 1.9438444924406046432
-/** Knots to Miles per second */
+/** Knots to meters per second */
#define SG_KT_TO_MPS 0.5144444444444444444
/** Feet per second to Knots */
/** Knots to Feet per second */
#define SG_KT_TO_FPS 1.6878098571011956874
-/** Miles per second to Miles per hour */
+/** meters per second to Miles per hour */
#define SG_MPS_TO_MPH 2.2369362920544020312
-/** Miles per hour to Miles per second */
+/** meetrs per hour to Miles per second */
#define SG_MPH_TO_MPS 0.44704
/** Meters per second to Kilometers per hour */
#define SG_MPS_TO_KMH 3.6
-/** Kilometers per hour to Miles per second */
+/** Kilometers per hour to meters per second */
#define SG_KMH_TO_MPS 0.2777777777777777778
/** Pascal to Inch Mercury */