AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove last usages of qSin and friends from QQuaternion

Browse Source 
Change-Id: I93fe1d22313da4cfa671603ccdbe9ac8f02cd73b
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
This commit is contained in:
Sean Harmer 2012-11-26 14:26:46 +00:00 committed by The Qt Project
parent 5a0fd7fb04
commit d6c38bf60a
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/math3d/qquaternion.cpp
View File

@ -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;
}
}