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

Updates to Math for OSX build.

Browse Source 
Added 3dmodelworld.com to the data source directory.

Fixed compile problem under VC6.0 in osgimpostor.
This commit is contained in:
Robert Osfield
2002-11-08 10:25:08 +00:00
parent 0cd0c575f0
commit 5db3229b5f
3 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/osg/Math
View File

@@ -69,7 +69,8 @@
#if (defined(WIN32) && !(defined(_MSC_VER) && (_MSC_VER >= 1300)) && !defined(__MINGW32__) ) || \
defined (sun) || \
defined (__hpux__)
defined (__hpux__) || \
defined (__DARWIN_OSX__)
#ifndef floorf
#define floorf (float)floor
@@ -123,13 +124,14 @@ inline double RadiansToDegrees(double angle) { return angle*180.0/PI; }
inline bool isNaN(float v) { return _isnan(v)!=0; }
inline bool isNaN(double v) { return _isnan(v)!=0; }
#else
# if defined(__DARWIN_OSX__)
inline bool isNaN(float v) { return __isnanf(v); }
inline bool isNaN(double v) { return __isnand(v); }
#else
// coment out this special handling for OSX, no longer seems valid.
// # if defined(__DARWIN_OSX__)
// inline bool isNaN(float v) { return __isnanf(v); }
// inline bool isNaN(double v) { return __isnand(v); }
// #else
inline bool isNaN(float v) { return isnan(v); }
inline bool isNaN(double v) { return isnan(v); }
#endif
// #endif
#endif