FGFS-4.1/OpenSceneGraph
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed the M_PI defines from include/osg/Math and have use a const double osg::PI etc

Browse Source 
in its place.
This commit is contained in:
Robert Osfield
2002-01-30 15:27:45 +00:00
parent 9471714ba4
commit 4d43f83295
6 changed files with 18 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
include/osg/Math
View File

@@ -9,23 +9,9 @@
#if defined(WIN32) || defined (macintosh)
#include <float.h>
#if !defined(__CYGWIN__)
#define M_E 2.7182818284590452354
#define M_LOG2E 1.4426950408889634074
#define M_LOG10E 0.43429448190325182765
#define M_LN2 0.69314718055994530942
#define M_LN10 2.30258509299404568402
#define M_PI 3.14159265358979323846
#define M_PI_2 1.57079632679489661923
#define M_PI_4 0.78539816339744830962
#define M_1_PI 0.31830988618379067154
#define M_2_PI 0.63661977236758134308
#define M_2_SQRTPI 1.12837916709551257390
#define M_SQRT2 1.41421356237309504880
#define M_SQRT1_2 0.70710678118654752440
#endif // __CYGWIN__
#endif
// PJA MAC OSX
// This appears to be the simplest way to get these defined under MACOSX
// where they arent in math.h
@@ -66,18 +52,21 @@
namespace osg {
inline double inDegrees(double angle) { return angle*M_PI/180.0; }
// define the stand trig values
const double PI = 3.14159265358979323846;
const double PI_2 = 1.57079632679489661923;
const double PI_4 = 0.78539816339744830962;
inline double inDegrees(double angle) { return angle*PI/180.0; }
inline double inRadians(double angle) { return angle; }
inline double DegreesToRadians(double angle) { return angle*M_PI/180.0; }
inline double RadiansToDegrees(double angle) { return angle*180.0/M_PI; }
inline double DegreesToRadians(double angle) { return angle*PI/180.0; }
inline double RadiansToDegrees(double angle) { return angle*180.0/PI; }
#if defined(WIN32) && !defined(__CYGWIN__)
inline bool isNaN(float v) { return _isnan(v)!=0; }
inline bool isNaN(double v) { return _isnan(v)!=0; }
#elif __sgi
inline bool isNaN(float v) { return isnan(v); }
inline bool isNaN(double v) { return isnan(v); }
#else
inline bool isNaN(float v) { return isnan(v); }
inline bool isNaN(double v) { return isnan(v); }