diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2015-07-20 10:00:50 +0200 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2015-07-25 15:24:54 +0000 |
| commit | a5c784f5fd86ebb588bec7e134d89e14c7167885 (patch) | |
| tree | a7002f8e8e49d96ec74dec4bb4b18c8bef96e3da | |
| parent | d76de5c1c5e8d92629614fa6b17a004f20f9213d (diff) | |
QRotateTransform: fix radian/degree conversions
Task-number: QTBUG-47288
Change-Id: Id2103440a07c99e9ef91f193be8e1b0039aa05e7
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| -rw-r--r-- | src/core/transforms/qrotatetransform.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/core/transforms/qrotatetransform.cpp b/src/core/transforms/qrotatetransform.cpp index 264b0b5bc..01b53fcee 100644 --- a/src/core/transforms/qrotatetransform.cpp +++ b/src/core/transforms/qrotatetransform.cpp @@ -42,7 +42,7 @@ #include "qrotatetransform.h" #include "qrotatetransform_p.h" -#include <cmath> +#include <qmath.h> QT_BEGIN_NAMESPACE @@ -88,7 +88,7 @@ float QRotateTransform::angleDeg() const float Qt3D::QRotateTransform::angleRad() const { Q_D(const QRotateTransform); - return (d->m_angleDeg / 180.0) * M_PI; + return qDegreesToRadians(d->m_angleDeg); } QVector3D QRotateTransform::axis() const @@ -116,8 +116,7 @@ void QRotateTransform::setAngleDeg(float arg) void QRotateTransform::setAngleRad(float arg) { - float angleDeg = (arg * M_PI) / 180.0f; - setAngleDeg(angleDeg); + setAngleDeg(qRadiansToDegrees(arg)); } void QRotateTransform::setAxis(const QVector3D& arg) |