Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'src/math/axis.h')
-rw-r--r--src/math/axis.h12
1 files changed, 11 insertions, 1 deletions
diff --git a/src/math/axis.h b/src/math/axis.h
index c22568c..d3a5ec6 100644
--- a/src/math/axis.h
+++ b/src/math/axis.h
@@ -10,7 +10,7 @@
#include <iostream>
#include "math/vector3f.h"
-
+#include "LinearMath/btMatrix3x3.h"
namespace math
{
@@ -24,6 +24,8 @@ public:
void clear();
void assign(const Axis & other);
+
+ void assign(const btMatrix3x3 & other);
/// global coordinates of the X-axis in the local coordinates system
inline const Vector3f & forward() const {
@@ -86,6 +88,14 @@ private:
Vector3f axis_vector[3];
};
+/// helper function to conver math::Axis to btMatrix3x3
+inline btMatrix3x3 to_btMatrix3x3(const math::Axis &a)
+{
+ return btMatrix3x3(a[0][0], a[0][1], a[0][2],
+ a[1][0], a[1][1], a[1][2],
+ a[2][0], a[2][1], a[2][2]);
+}
+
/// write an axis to a std::ostream
std::ostream &operator<<(std::ostream & os, const Axis & axis);