diff options
| author | cutealien <cutealien@dfc29bdd-3216-0410-991c-e03cc46cb475> | 2020-09-29 20:22:28 +0000 |
|---|---|---|
| committer | cutealien <cutealien@dfc29bdd-3216-0410-991c-e03cc46cb475> | 2020-09-29 20:22:28 +0000 |
| commit | 8b9947f9f6e5444eb34f42eecfa5b4cfdeed25d8 (patch) | |
| tree | db04fac888fc72f19fa375a3529f361f36f00dbd /include/irrMath.h | |
| parent | 048aa500b9a999d801ad8b2f7e771b2d8d5b8aad (diff) | |
| download | irrlicht-8b9947f9f6e5444eb34f42eecfa5b4cfdeed25d8.tar.xz | |
Merging r6128 through r6139 from trunk to ogl-es branch.
Note: I could not merge 2 OSX project files as I'm not sure how to correctly resolve their conflicts.
Maybe old version for those files are still OK, as ogl-es branch got updated once before (leaving trunk behind).
In case it causes problems I hope someone can send another patch for those 2 files:
source/Irrlicht/Irrlicht.xcodeproj/xcshareddata/xcschemes
source/Irrlicht/Irrlicht.xcodeproj/project.pbxproj
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6140 dfc29bdd-3216-0410-991c-e03cc46cb475
Diffstat (limited to 'include/irrMath.h')
| -rw-r--r-- | include/irrMath.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/irrMath.h b/include/irrMath.h index b97e270..94eda17 100644 --- a/include/irrMath.h +++ b/include/irrMath.h @@ -243,7 +243,7 @@ namespace core //! returns if a equals b, taking possible rounding errors into account
template <class T>
- inline bool equals(const T a, const T b, const T tolerance = roundingError<T>())
+ inline bool equals(const T a, const T b, const T tolerance = roundingError<T>())
{
return (a + tolerance >= b) && (a - tolerance <= b);
}
@@ -633,7 +633,7 @@ namespace core return rec;
*/
/*
- register u32 x = 0x7F000000 - IR ( p );
+ u32 x = 0x7F000000 - IR ( p );
const f32 r = FR ( x );
return r * (2.0f - p * r);
*/
|