diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2015-01-26 10:21:56 +0400 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2015-01-28 12:37:47 +0000 |
| commit | a14559bc781b9ac7c61386bf563e62f6fde27d56 (patch) | |
| tree | 40a90962e641bc2437f5ac609278929c8725fd9e /src/gui/math3d/qvector3d.h | |
| parent | 6462744b6bc94f5298881f34d8894a644e21c716 (diff) | |
[QVectorND] Add missing operator/=(const QVectorND &)
Change-Id: Ic1d2912808b95e02ba5d9cb2972c81c6374bbca9
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/gui/math3d/qvector3d.h')
| -rw-r--r-- | src/gui/math3d/qvector3d.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/src/gui/math3d/qvector3d.h b/src/gui/math3d/qvector3d.h index 4c25451bab..e24b38444a 100644 --- a/src/gui/math3d/qvector3d.h +++ b/src/gui/math3d/qvector3d.h @@ -87,6 +87,7 @@ public: QVector3D &operator*=(float factor); QVector3D &operator*=(const QVector3D& vector); QVector3D &operator/=(float divisor); + inline QVector3D &operator/=(const QVector3D &vector); static float dotProduct(const QVector3D& v1, const QVector3D& v2); //In Qt 6 convert to inline and constexpr static QVector3D crossProduct(const QVector3D& v1, const QVector3D& v2); //in Qt 6 convert to inline and constexpr @@ -112,6 +113,7 @@ public: Q_DECL_CONSTEXPR friend const QVector3D operator*(const QVector3D &v1, const QVector3D& v2); Q_DECL_CONSTEXPR friend inline const QVector3D operator-(const QVector3D &vector); Q_DECL_CONSTEXPR friend inline const QVector3D operator/(const QVector3D &vector, float divisor); + Q_DECL_CONSTEXPR friend inline const QVector3D operator/(const QVector3D &vector, const QVector3D &divisor); Q_DECL_CONSTEXPR friend inline bool qFuzzyCompare(const QVector3D& v1, const QVector3D& v2); @@ -211,6 +213,14 @@ inline QVector3D &QVector3D::operator/=(float divisor) return *this; } +inline QVector3D &QVector3D::operator/=(const QVector3D &vector) +{ + xp /= vector.xp; + yp /= vector.yp; + zp /= vector.zp; + return *this; +} + Q_DECL_CONSTEXPR inline bool operator==(const QVector3D &v1, const QVector3D &v2) { return v1.xp == v2.xp && v1.yp == v2.yp && v1.zp == v2.zp; @@ -256,6 +266,11 @@ Q_DECL_CONSTEXPR inline const QVector3D operator/(const QVector3D &vector, float return QVector3D(vector.xp / divisor, vector.yp / divisor, vector.zp / divisor); } +Q_DECL_CONSTEXPR inline const QVector3D operator/(const QVector3D &vector, const QVector3D &divisor) +{ + return QVector3D(vector.xp / divisor.xp, vector.yp / divisor.yp, vector.zp / divisor.zp); +} + Q_DECL_CONSTEXPR inline bool qFuzzyCompare(const QVector3D& v1, const QVector3D& v2) { return qFuzzyCompare(v1.xp, v2.xp) && |