diff options
| author | Chris Kiefer <chrisk13fer@gmail.com> | 2011-11-03 14:56:43 +0000 |
|---|---|---|
| committer | Chris Kiefer <chrisk13fer@gmail.com> | 2011-11-03 14:56:43 +0000 |
| commit | 7e1d8e7ebbeba9f826d66bda064355cfadb4f167 (patch) | |
| tree | b833d4ee6cc20e22f9fad068681b23392c2c4860 /ofxMaxim | |
| parent | 086644237c0ed96383be68d4772623332d860473 (diff) | |
PI
Diffstat (limited to 'ofxMaxim')
| -rw-r--r-- | ofxMaxim/ofxMaxim/libs/maxiGrains.h | 2 | ||||
| -rwxr-xr-x | ofxMaxim/ofxMaxim/libs/maximilian.h | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/ofxMaxim/ofxMaxim/libs/maxiGrains.h b/ofxMaxim/ofxMaxim/libs/maxiGrains.h index d17ffc9..dab90b9 100644 --- a/ofxMaxim/ofxMaxim/libs/maxiGrains.h +++ b/ofxMaxim/ofxMaxim/libs/maxiGrains.h @@ -10,8 +10,6 @@ //#define MAXIGRAINFAST #endif -#define PI 3.1415926535897932384626433832795028841968 - #include <list> typedef unsigned long ulong; diff --git a/ofxMaxim/ofxMaxim/libs/maximilian.h b/ofxMaxim/ofxMaxim/libs/maximilian.h index 102d552..db1440e 100755 --- a/ofxMaxim/ofxMaxim/libs/maximilian.h +++ b/ofxMaxim/ofxMaxim/libs/maximilian.h @@ -47,7 +47,10 @@ #include "math.h" using namespace std; -#define TWOPI (3.14159*2) +#ifndef PI +#define PI 3.1415926535897932384626433832795 +#endif +#define TWOPI 6.283185307179586476925286766559 class maxiSettings { public: |