diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/math3d/qmatrix4x4.cpp | 25 | ||||
| -rw-r--r-- | src/gui/math3d/qmatrix4x4.h | 15 |
2 files changed, 37 insertions, 3 deletions
diff --git a/src/gui/math3d/qmatrix4x4.cpp b/src/gui/math3d/qmatrix4x4.cpp index 34f8a7d892..591809df31 100644 --- a/src/gui/math3d/qmatrix4x4.cpp +++ b/src/gui/math3d/qmatrix4x4.cpp @@ -635,16 +635,23 @@ QMatrix4x4& QMatrix4x4::operator/=(float divisor) with the matrix applied post-vector. */ +#if QT_DEPRECATED_SINCE(6, 1) + /*! \fn QVector3D operator*(const QMatrix4x4& matrix, const QVector3D& vector) \relates QMatrix4x4 + \obsolete Use QMatrix4x4::map() or QMatrix4x4::mapVector() instead. + Returns the result of transforming \a vector according to \a matrix, - with the matrix applied pre-vector. + with the matrix applied pre-vector. The vector is transformed as a + projective point. */ #endif +#endif + #ifndef QT_NO_VECTOR4D /*! @@ -681,10 +688,14 @@ QMatrix4x4& QMatrix4x4::operator/=(float divisor) with the matrix applied post-point. */ +#if QT_DEPRECATED_SINCE(6, 1) + /*! \fn QPoint operator*(const QMatrix4x4& matrix, const QPoint& point) \relates QMatrix4x4 + \obsolete Use QMatrix4x4::map() instead. + Returns the result of transforming \a point according to \a matrix, with the matrix applied pre-point. */ @@ -693,10 +704,14 @@ QMatrix4x4& QMatrix4x4::operator/=(float divisor) \fn QPointF operator*(const QMatrix4x4& matrix, const QPointF& point) \relates QMatrix4x4 + \obsolete Use QMatrix4x4::map() instead. + Returns the result of transforming \a point according to \a matrix, with the matrix applied pre-point. */ +#endif + /*! \fn QMatrix4x4 operator-(const QMatrix4x4& matrix) \overload @@ -1701,6 +1716,7 @@ QTransform QMatrix4x4::toTransform(float distanceToPlane) const \fn QPoint QMatrix4x4::map(const QPoint& point) const Maps \a point by multiplying this matrix by \a point. + The matrix is applied pre-point. \sa mapRect() */ @@ -1708,7 +1724,8 @@ QTransform QMatrix4x4::toTransform(float distanceToPlane) const /*! \fn QPointF QMatrix4x4::map(const QPointF& point) const - Maps \a point by multiplying this matrix by \a point. + Maps \a point by post-multiplying this matrix by \a point. + The matrix is applied pre-point. \sa mapRect() */ @@ -1719,6 +1736,7 @@ QTransform QMatrix4x4::toTransform(float distanceToPlane) const \fn QVector3D QMatrix4x4::map(const QVector3D& point) const Maps \a point by multiplying this matrix by \a point. + The matrix is applied pre-point. \sa mapRect(), mapVector() */ @@ -1728,7 +1746,7 @@ QTransform QMatrix4x4::toTransform(float distanceToPlane) const Maps \a vector by multiplying the top 3x3 portion of this matrix by \a vector. The translation and projection components of - this matrix are ignored. + this matrix are ignored. The matrix is applied pre-vector. \sa map() */ @@ -1741,6 +1759,7 @@ QTransform QMatrix4x4::toTransform(float distanceToPlane) const \fn QVector4D QMatrix4x4::map(const QVector4D& point) const; Maps \a point by multiplying this matrix by \a point. + The matrix is applied pre-point. \sa mapRect() */ diff --git a/src/gui/math3d/qmatrix4x4.h b/src/gui/math3d/qmatrix4x4.h index 4433f47af4..05e882d7c4 100644 --- a/src/gui/math3d/qmatrix4x4.h +++ b/src/gui/math3d/qmatrix4x4.h @@ -107,7 +107,9 @@ public: friend QMatrix4x4 operator-(const QMatrix4x4& m1, const QMatrix4x4& m2); friend QMatrix4x4 operator*(const QMatrix4x4& m1, const QMatrix4x4& m2); #ifndef QT_NO_VECTOR3D +#if QT_DEPRECATED_SINCE(6, 1) friend QVector3D operator*(const QMatrix4x4& matrix, const QVector3D& vector); +#endif friend QVector3D operator*(const QVector3D& vector, const QMatrix4x4& matrix); #endif #ifndef QT_NO_VECTOR4D @@ -117,8 +119,10 @@ public: friend QPoint operator*(const QPoint& point, const QMatrix4x4& matrix); friend QPointF operator*(const QPointF& point, const QMatrix4x4& matrix); friend QMatrix4x4 operator-(const QMatrix4x4& matrix); +#if QT_DEPRECATED_SINCE(6, 1) friend QPoint operator*(const QMatrix4x4& matrix, const QPoint& point); friend QPointF operator*(const QMatrix4x4& matrix, const QPointF& point); +#endif friend QMatrix4x4 operator*(float factor, const QMatrix4x4& matrix); friend QMatrix4x4 operator*(const QMatrix4x4& matrix, float factor); friend Q_GUI_EXPORT QMatrix4x4 operator/(const QMatrix4x4& matrix, float divisor); @@ -741,6 +745,9 @@ inline QVector3D operator*(const QVector3D& vector, const QMatrix4x4& matrix) return QVector3D(x / w, y / w, z / w); } +#if QT_DEPRECATED_SINCE(6, 1) + +QT_DEPRECATED_VERSION_X_6_1("Use matrix.map(vector) or matrix.mapVector(vector) instead") inline QVector3D operator*(const QMatrix4x4& matrix, const QVector3D& vector) { return matrix.map(vector); @@ -748,6 +755,8 @@ inline QVector3D operator*(const QMatrix4x4& matrix, const QVector3D& vector) #endif +#endif + #ifndef QT_NO_VECTOR4D inline QVector4D operator*(const QVector4D& vector, const QMatrix4x4& matrix) @@ -839,16 +848,22 @@ inline QPointF operator*(const QPointF& point, const QMatrix4x4& matrix) } } +#if QT_DEPRECATED_SINCE(6, 1) + +QT_DEPRECATED_VERSION_X_6_1("Use matrix.map(point) instead") inline QPoint operator*(const QMatrix4x4& matrix, const QPoint& point) { return matrix.map(point); } +QT_DEPRECATED_VERSION_X_6_1("Use matrix.map(point) instead") inline QPointF operator*(const QMatrix4x4& matrix, const QPointF& point) { return matrix.map(point); } +#endif + inline QMatrix4x4 operator-(const QMatrix4x4& matrix) { QMatrix4x4 m(Qt::Uninitialized); |