diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-08-25 22:57:29 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-08-25 22:57:29 (GMT) |
| commit | 314c6ec54e4cb4e2ec936ada7e0a112a60b87832 (patch) | |
| tree | a5444e7cae8d40eb549b70dd4473057f6b3cda09 /src/gui | |
| parent | 8e580cebef7128666017ba39d41aa620a1d2eddf (diff) | |
| parent | 0094735947164aef8f8e6539c535199b29ed6f4e (diff) | |
| download | Qt-314c6ec54e4cb4e2ec936ada7e0a112a60b87832.zip Qt-314c6ec54e4cb4e2ec936ada7e0a112a60b87832.tar.gz Qt-314c6ec54e4cb4e2ec936ada7e0a112a60b87832.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/math3d/qvector3d.cpp | 9 | ||||
| -rw-r--r-- | src/gui/math3d/qvector3d.h | 2 |
2 files changed, 11 insertions, 0 deletions
diff --git a/src/gui/math3d/qvector3d.cpp b/src/gui/math3d/qvector3d.cpp index 0e3f4e1..15d7e76 100644 --- a/src/gui/math3d/qvector3d.cpp +++ b/src/gui/math3d/qvector3d.cpp @@ -44,6 +44,7 @@ #include "qvector4d.h" #include <QtCore/qmath.h> #include <QtCore/qdebug.h> +#include <QtCore/qvariant.h> QT_BEGIN_NAMESPACE @@ -282,6 +283,14 @@ void QVector3D::normalize() */ /*! + Returns the vector as a QVariant +*/ +QVector3D::operator QVariant () const +{ + return QVariant(QVariant::Vector3D, this); +} + +/*! Returns the dot product of \a v1 and \a v2. */ qreal QVector3D::dotProduct(const QVector3D& v1, const QVector3D& v2) diff --git a/src/gui/math3d/qvector3d.h b/src/gui/math3d/qvector3d.h index 36292d2..b625946 100644 --- a/src/gui/math3d/qvector3d.h +++ b/src/gui/math3d/qvector3d.h @@ -95,6 +95,8 @@ public: QVector3D &operator*=(const QVector3D& vector); QVector3D &operator/=(qreal divisor); + operator QVariant() const; + static qreal dotProduct(const QVector3D& v1, const QVector3D& v2); static QVector3D crossProduct(const QVector3D& v1, const QVector3D& v2); static QVector3D normal(const QVector3D& v1, const QVector3D& v2); |