From d6c38bf60a0c17cfc1ab854f73e707e6e2f8ff26 Mon Sep 17 00:00:00 2001 From: Sean Harmer Date: Mon, 26 Nov 2012 14:26:46 +0000 Subject: [PATCH] Remove last usages of qSin and friends from QQuaternion Change-Id: I93fe1d22313da4cfa671603ccdbe9ac8f02cd73b Reviewed-by: Lars Knoll --- src/gui/math3d/qquaternion.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/gui/math3d/qquaternion.cpp b/src/gui/math3d/qquaternion.cpp index 9d45b32..3f39fa4 100644 --- a/src/gui/math3d/qquaternion.cpp +++ b/src/gui/math3d/qquaternion.cpp @@ -382,8 +382,8 @@ QQuaternion QQuaternion::fromAxisAndAngle z /= length; } float a = (angle / 2.0f) * M_PI / 180.0f; - float s = qSin(a); - float c = qCos(a); + float s = sinf(a); + float c = cosf(a); return QQuaternion(c, x * s, y * s, z * s).normalized(); } @@ -519,11 +519,11 @@ QQuaternion QQuaternion::slerp float factor1 = 1.0f - t; float factor2 = t; if ((1.0f - dot) > 0.0000001) { - float angle = float(qAcos(dot)); - float sinOfAngle = float(qSin(angle)); + float angle = acosf(dot); + float sinOfAngle = sinf(angle); if (sinOfAngle > 0.0000001) { - factor1 = float(qSin((1.0f - t) * angle)) / sinOfAngle; - factor2 = float(qSin(t * angle)) / sinOfAngle; + factor1 = sinf((1.0f - t) * angle) / sinOfAngle; + factor2 = sinf(t * angle) / sinOfAngle; } } -- 2.7.4