diff options
author | Stijn Buys <ingar@osirion.org> | 2010-10-17 17:19:03 +0000 |
---|---|---|
committer | Stijn Buys <ingar@osirion.org> | 2010-10-17 17:19:03 +0000 |
commit | d6e4c4e7c2b1e28961f1dfe2f25ef96ced60b21b (patch) | |
tree | 63744dff093a8b23f65d9c68b922b678805647d9 /src/math/vector3f.h | |
parent | ea6e6bb769d713ac55114c1940626f13e384ebed (diff) |
core bullet physics support,
initial vstrafe support
Diffstat (limited to 'src/math/vector3f.h')
-rw-r--r-- | src/math/vector3f.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/math/vector3f.h b/src/math/vector3f.h index 09e6e84..a7437aa 100644 --- a/src/math/vector3f.h +++ b/src/math/vector3f.h @@ -10,6 +10,8 @@ #include <iostream> #include "math/vector3f.h" +#include "LinearMath/btVector3.h" + namespace math { @@ -49,6 +51,9 @@ public: /// assignment void assign(const Vector3f & other); + + /// assign bullet btVector3 value + void assign(const btVector3 & other); /// assignment operator Vector3f& operator=(const Vector3f &other); @@ -214,6 +219,12 @@ float distance(const Vector3f& first, const Vector3f& second); /// distance between two vectors squared float distancesquared(const Vector3f& first, const Vector3f& second); +/// helper function to convert Vector3f to btVector3 +inline btVector3 to_btVector3(const math::Vector3f & v) +{ + return btVector3(v[0], v[1], v[2]); +} + } // namespace math #endif // __INCLUDED_MATH_VECTOR3F_H__ |