diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2015-02-04 23:09:41 +0400 |
|---|---|---|
| committer | Konstantin Ritt <ritt.ks@gmail.com> | 2015-02-06 16:14:38 +0000 |
| commit | ba640a75a5cc9fec63a5204ccf143dbb7f398842 (patch) | |
| tree | 42bedc7ab505e39b4f023a3cbf8e3b0fd44eb18a /src/gui/math3d/qquaternion.h | |
| parent | 5666740d882a29686ae64d7889a0c643757bbd58 (diff) | |
[QQuaternion] Introduce to/from rotation matrix conversion routines
Change-Id: Ic19824e7e135f53a9ce3f2ea7ecd078a589e7425
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/gui/math3d/qquaternion.h')
| -rw-r--r-- | src/gui/math3d/qquaternion.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/math3d/qquaternion.h b/src/gui/math3d/qquaternion.h index 1f53970c9d..5ca82f1d74 100644 --- a/src/gui/math3d/qquaternion.h +++ b/src/gui/math3d/qquaternion.h @@ -34,6 +34,7 @@ #ifndef QQUATERNION_H #define QQUATERNION_H +#include <QtGui/qgenericmatrix.h> #include <QtGui/qvector3d.h> #include <QtGui/qvector4d.h> @@ -119,6 +120,9 @@ public: static QQuaternion fromAxisAndAngle (float x, float y, float z, float angle); + QMatrix3x3 toRotationMatrix() const; + static QQuaternion fromRotationMatrix(const QMatrix3x3 &rot3x3); + static QQuaternion slerp (const QQuaternion& q1, const QQuaternion& q2, float t); static QQuaternion nlerp |