diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4Math.cpp b/src/Mod/Mesh/App/WildMagic4/Wm4Math.cpp index 683842033a..efa1a2f762 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4Math.cpp +++ b/src/Mod/Mesh/App/WildMagic4/Wm4Math.cpp @@ -19,35 +19,35 @@ namespace Wm4 { -template<> const float Math::EPSILON = FLT_EPSILON; -template<> const float Math::ZERO_TOLERANCE = 1e-06f; -template<> const float Math::MAX_REAL = FLT_MAX; -template<> const float Math::PI = (float)(4.0*atan(1.0)); -template<> const float Math::TWO_PI = 2.0f*Math::PI; -template<> const float Math::HALF_PI = 0.5f*Math::PI; -template<> const float Math::INV_PI = 1.0f/Math::PI; -template<> const float Math::INV_TWO_PI = 1.0f/Math::TWO_PI; -template<> const float Math::DEG_TO_RAD = Math::PI/180.0f; -template<> const float Math::RAD_TO_DEG = 180.0f/Math::PI; -template<> const float Math::LN_2 = Math::Log(2.0f); -template<> const float Math::LN_10 = Math::Log(10.0f); -template<> const float Math::INV_LN_2 = 1.0f/Math::LN_2; -template<> const float Math::INV_LN_10 = 1.0f/Math::LN_10; +template<> WM4_FOUNDATION_ITEM const float Math::EPSILON = FLT_EPSILON; +template<> WM4_FOUNDATION_ITEM const float Math::ZERO_TOLERANCE = 1e-06f; +template<> WM4_FOUNDATION_ITEM const float Math::MAX_REAL = FLT_MAX; +template<> WM4_FOUNDATION_ITEM const float Math::PI = (float)(4.0*atan(1.0)); +template<> WM4_FOUNDATION_ITEM const float Math::TWO_PI = 2.0f*Math::PI; +template<> WM4_FOUNDATION_ITEM const float Math::HALF_PI = 0.5f*Math::PI; +template<> WM4_FOUNDATION_ITEM const float Math::INV_PI = 1.0f/Math::PI; +template<> WM4_FOUNDATION_ITEM const float Math::INV_TWO_PI = 1.0f/Math::TWO_PI; +template<> WM4_FOUNDATION_ITEM const float Math::DEG_TO_RAD = Math::PI/180.0f; +template<> WM4_FOUNDATION_ITEM const float Math::RAD_TO_DEG = 180.0f/Math::PI; +template<> WM4_FOUNDATION_ITEM const float Math::LN_2 = Math::Log(2.0f); +template<> WM4_FOUNDATION_ITEM const float Math::LN_10 = Math::Log(10.0f); +template<> WM4_FOUNDATION_ITEM const float Math::INV_LN_2 = 1.0f/Math::LN_2; +template<> WM4_FOUNDATION_ITEM const float Math::INV_LN_10 = 1.0f/Math::LN_10; -template<> const double Math::EPSILON = DBL_EPSILON; -template<> const double Math::ZERO_TOLERANCE = 1e-08; -template<> const double Math::MAX_REAL = DBL_MAX; -template<> const double Math::PI = 4.0*atan(1.0); -template<> const double Math::TWO_PI = 2.0*Math::PI; -template<> const double Math::HALF_PI = 0.5*Math::PI; -template<> const double Math::INV_PI = 1.0/Math::PI; -template<> const double Math::INV_TWO_PI = 1.0/Math::TWO_PI; -template<> const double Math::DEG_TO_RAD = Math::PI/180.0; -template<> const double Math::RAD_TO_DEG = 180.0/Math::PI; -template<> const double Math::LN_2 = Math::Log(2.0); -template<> const double Math::LN_10 = Math::Log(10.0); -template<> const double Math::INV_LN_2 = 1.0/Math::LN_2; -template<> const double Math::INV_LN_10 = 1.0/Math::LN_10; +template<> WM4_FOUNDATION_ITEM const double Math::EPSILON = DBL_EPSILON; +template<> WM4_FOUNDATION_ITEM const double Math::ZERO_TOLERANCE = 1e-08; +template<> WM4_FOUNDATION_ITEM const double Math::MAX_REAL = DBL_MAX; +template<> WM4_FOUNDATION_ITEM const double Math::PI = 4.0*atan(1.0); +template<> WM4_FOUNDATION_ITEM const double Math::TWO_PI = 2.0*Math::PI; +template<> WM4_FOUNDATION_ITEM const double Math::HALF_PI = 0.5*Math::PI; +template<> WM4_FOUNDATION_ITEM const double Math::INV_PI = 1.0/Math::PI; +template<> WM4_FOUNDATION_ITEM const double Math::INV_TWO_PI = 1.0/Math::TWO_PI; +template<> WM4_FOUNDATION_ITEM const double Math::DEG_TO_RAD = Math::PI/180.0; +template<> WM4_FOUNDATION_ITEM const double Math::RAD_TO_DEG = 180.0/Math::PI; +template<> WM4_FOUNDATION_ITEM const double Math::LN_2 = Math::Log(2.0); +template<> WM4_FOUNDATION_ITEM const double Math::LN_10 = Math::Log(10.0); +template<> WM4_FOUNDATION_ITEM const double Math::INV_LN_2 = 1.0/Math::LN_2; +template<> WM4_FOUNDATION_ITEM const double Math::INV_LN_10 = 1.0/Math::LN_10; //---------------------------------------------------------------------------- //Does not compile with gcc 4.1.2