diff options
| author | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-04-07 06:16:22 (GMT) |
|---|---|---|
| committer | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-04-08 00:19:12 (GMT) |
| commit | a83faaf1bedfd321c4fc759156369d2f86fbbbed (patch) | |
| tree | 9fefa2840ae8a784fcd323551de6a74835e5b267 /src/gui/math3d/qvector3d.cpp | |
| parent | 939623b2bc8e441618ee1a1886cc656880bee62b (diff) | |
| download | Qt-a83faaf1bedfd321c4fc759156369d2f86fbbbed.zip Qt-a83faaf1bedfd321c4fc759156369d2f86fbbbed.tar.gz Qt-a83faaf1bedfd321c4fc759156369d2f86fbbbed.tar.bz2 | |
Remove fixed-point support from math3d
The main use case for fixed-point support is to build large
arrays of vertices. This can be handled using qvertextype or
something similar at higher levels. So it isn't worth risking
numerical instability in the core classes.
Reviewed-by: trustme
Diffstat (limited to 'src/gui/math3d/qvector3d.cpp')
| -rw-r--r-- | src/gui/math3d/qvector3d.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/math3d/qvector3d.cpp b/src/gui/math3d/qvector3d.cpp index 32068ee..814753d 100644 --- a/src/gui/math3d/qvector3d.cpp +++ b/src/gui/math3d/qvector3d.cpp @@ -42,8 +42,8 @@ #include "qvector3d.h" #include "qvector2d.h" #include "qvector4d.h" -#include "qmath3dutil_p.h" #include <QtCore/qmath.h> +#include <QtCore/qdebug.h> QT_BEGIN_NAMESPACE @@ -287,7 +287,7 @@ void QVector3D::normalize() */ qreal QVector3D::dotProduct(const QVector3D& v1, const QVector3D& v2) { - return qvtdot64(qvtmul64(v1.xp, v2.xp) + qvtmul64(v1.yp, v2.yp) + qvtmul64(v1.zp, v2.zp)); + return v1.xp * v2.xp + v1.yp * v2.yp + v1.zp * v2.zp; } /*! @@ -535,7 +535,7 @@ QVector4D QVector3D::toVector4D() const */ qreal QVector3D::length() const { - return qvtsqrt64(qvtmul64(xp, xp) + qvtmul64(yp, yp) + qvtmul64(zp, zp)); + return qSqrt(xp * xp + yp * yp + zp * zp); } /*! @@ -546,7 +546,7 @@ qreal QVector3D::length() const */ qreal QVector3D::lengthSquared() const { - return qvtdot64(qvtmul64(xp, xp) + qvtmul64(yp, yp) + qvtmul64(zp, zp)); + return xp * xp + yp * yp + zp * zp; } #ifndef QT_NO_DEBUG_STREAM |