summaryrefslogtreecommitdiffstats
path: root/src/gui/math3d
diff options
context:
space:
mode:
authorRhys Weatherley <rhys.weatherley@nokia.com>2009-04-15 22:02:54 (GMT)
committerRhys Weatherley <rhys.weatherley@nokia.com>2009-04-15 22:02:54 (GMT)
commit10688c0168fc010671abc59f367c19357bb6776c (patch)
tree8f90f348c7b9bffd29e113a450e82c4d06e0f2ea /src/gui/math3d
parentc51b0e8389f52f895a9d69e9e96c1fd768d78bf4 (diff)
downloadQt-10688c0168fc010671abc59f367c19357bb6776c.zip
Qt-10688c0168fc010671abc59f367c19357bb6776c.tar.gz
Qt-10688c0168fc010671abc59f367c19357bb6776c.tar.bz2
Rename QQuaternion::interpolate() to slerp()
slerp() is the more common-place name in the 3D community. Reviewed-by: trustme
Diffstat (limited to 'src/gui/math3d')
-rw-r--r--src/gui/math3d/qquaternion.cpp2
-rw-r--r--src/gui/math3d/qquaternion.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/math3d/qquaternion.cpp b/src/gui/math3d/qquaternion.cpp
index 4c6230a..1348fed 100644
--- a/src/gui/math3d/qquaternion.cpp
+++ b/src/gui/math3d/qquaternion.cpp
@@ -485,7 +485,7 @@ QQuaternion QQuaternion::fromAxisAndAngle
If \a t is less than or equal to 0, then \a q1 will be returned.
If \a t is greater than or equal to 1, then \a q2 will be returned.
*/
-QQuaternion QQuaternion::interpolate
+QQuaternion QQuaternion::slerp
(const QQuaternion& q1, const QQuaternion& q2, qreal t)
{
// Handle the easy cases first.
diff --git a/src/gui/math3d/qquaternion.h b/src/gui/math3d/qquaternion.h
index a03b53b..ad6fddf 100644
--- a/src/gui/math3d/qquaternion.h
+++ b/src/gui/math3d/qquaternion.h
@@ -124,7 +124,7 @@ public:
static QQuaternion fromAxisAndAngle
(qreal x, qreal y, qreal z, qreal angle);
- static QQuaternion interpolate
+ static QQuaternion slerp
(const QQuaternion& q1, const QQuaternion& q2, qreal t);
private: