Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
path: root/src/math
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2013-11-10 21:29:58 +0000
committerStijn Buys <ingar@osirion.org>2013-11-10 21:29:58 +0000
commit3b75b41676bd2851b6d2b61d3e3213ee50078870 (patch)
treeb6088cd86911c9300d60459f5285c1342285357e /src/math
parent2ae807c202489e0126733c29095947662ad527b1 (diff)
Workaround for the bullet 2.82 compile warning.
Diffstat (limited to 'src/math')
-rw-r--r--src/math/vector3f.h12
1 files changed, 11 insertions, 1 deletions
diff --git a/src/math/vector3f.h b/src/math/vector3f.h
index 24a7610..88393e7 100644
--- a/src/math/vector3f.h
+++ b/src/math/vector3f.h
@@ -240,12 +240,22 @@ inline btVector3 to_btVector3(const math::Vector3f & v)
}
/// calculate the normal of a plane defined by three vertices
-inline const Vector3f normal(const Vector3f & center, const Vector3f & u, const Vector3f & v) {
+inline const Vector3f normal(const Vector3f & center, const Vector3f & u, const Vector3f & v)
+{
Vector3f r = crossproduct(u - center, v - center);
r.normalize();
return r;
}
+#if (BT_BULLET_VERSION == 282)
+// workaround for a compiler warning caused by bullet 2.82
+// see http://bulletphysics.org/Bullet/phpBB3/viewtopic.php?f=9&t=9412
+inline int bullet_btInfinityMask()
+{
+ return btInfinityMask;
+}
+#endif
+
} // namespace math
#endif // __INCLUDED_MATH_VECTOR3F_H__