diff options
Diffstat (limited to 'src/gui/math3d')
| -rw-r--r-- | src/gui/math3d/qgenericmatrix.cpp | 49 | ||||
| -rw-r--r-- | src/gui/math3d/qgenericmatrix.h | 56 | ||||
| -rw-r--r-- | src/gui/math3d/qmatrix4x4.cpp | 93 | ||||
| -rw-r--r-- | src/gui/math3d/qmatrix4x4.h | 70 | ||||
| -rw-r--r-- | src/gui/math3d/qquaternion.cpp | 133 | ||||
| -rw-r--r-- | src/gui/math3d/qquaternion.h | 237 | ||||
| -rw-r--r-- | src/gui/math3d/qvector2d.h | 42 | ||||
| -rw-r--r-- | src/gui/math3d/qvector3d.h | 42 | ||||
| -rw-r--r-- | src/gui/math3d/qvector4d.h | 42 | ||||
| -rw-r--r-- | src/gui/math3d/qvectornd.cpp | 48 | ||||
| -rw-r--r-- | src/gui/math3d/qvectornd.h | 74 |
11 files changed, 261 insertions, 625 deletions
diff --git a/src/gui/math3d/qgenericmatrix.cpp b/src/gui/math3d/qgenericmatrix.cpp index cf79ed9786..7ffb53a88b 100644 --- a/src/gui/math3d/qgenericmatrix.cpp +++ b/src/gui/math3d/qgenericmatrix.cpp @@ -1,46 +1,19 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtGui module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qgenericmatrix.h" QT_BEGIN_NAMESPACE +QT_IMPL_METATYPE_EXTERN(QMatrix2x2) +QT_IMPL_METATYPE_EXTERN(QMatrix2x3) +QT_IMPL_METATYPE_EXTERN(QMatrix2x4) +QT_IMPL_METATYPE_EXTERN(QMatrix3x2) +QT_IMPL_METATYPE_EXTERN(QMatrix3x3) +QT_IMPL_METATYPE_EXTERN(QMatrix3x4) +QT_IMPL_METATYPE_EXTERN(QMatrix4x2) +QT_IMPL_METATYPE_EXTERN(QMatrix4x3) + /*! \class QGenericMatrix \brief The QGenericMatrix class is a template class that represents a NxM transformation matrix with N columns and M rows. diff --git a/src/gui/math3d/qgenericmatrix.h b/src/gui/math3d/qgenericmatrix.h index 47a77d1e52..1e20df5a6b 100644 --- a/src/gui/math3d/qgenericmatrix.h +++ b/src/gui/math3d/qgenericmatrix.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtGui module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QGENERICMATRIX_H #define QGENERICMATRIX_H @@ -381,13 +345,13 @@ QDataStream &operator>>(QDataStream &stream, QGenericMatrix<N, M, T> &matrix) QT_END_NAMESPACE -Q_DECLARE_METATYPE(QMatrix2x2) -Q_DECLARE_METATYPE(QMatrix2x3) -Q_DECLARE_METATYPE(QMatrix2x4) -Q_DECLARE_METATYPE(QMatrix3x2) -Q_DECLARE_METATYPE(QMatrix3x3) -Q_DECLARE_METATYPE(QMatrix3x4) -Q_DECLARE_METATYPE(QMatrix4x2) -Q_DECLARE_METATYPE(QMatrix4x3) +QT_DECL_METATYPE_EXTERN(QMatrix2x2, Q_GUI_EXPORT) +QT_DECL_METATYPE_EXTERN(QMatrix2x3, Q_GUI_EXPORT) +QT_DECL_METATYPE_EXTERN(QMatrix2x4, Q_GUI_EXPORT) +QT_DECL_METATYPE_EXTERN(QMatrix3x2, Q_GUI_EXPORT) +QT_DECL_METATYPE_EXTERN(QMatrix3x3, Q_GUI_EXPORT) +QT_DECL_METATYPE_EXTERN(QMatrix3x4, Q_GUI_EXPORT) +QT_DECL_METATYPE_EXTERN(QMatrix4x2, Q_GUI_EXPORT) +QT_DECL_METATYPE_EXTERN(QMatrix4x3, Q_GUI_EXPORT) #endif diff --git a/src/gui/math3d/qmatrix4x4.cpp b/src/gui/math3d/qmatrix4x4.cpp index 0e40966bef..d04a502519 100644 --- a/src/gui/math3d/qmatrix4x4.cpp +++ b/src/gui/math3d/qmatrix4x4.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtGui module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qmatrix4x4.h" #include <QtCore/qmath.h> @@ -136,7 +100,7 @@ QMatrix4x4::QMatrix4x4(const float *values) */ /*! - \fn QGenericMatrix<N, M, float> QMatrix4x4::toGenericMatrix() const + \fn template <int N, int M> QGenericMatrix<N, M, float> QMatrix4x4::toGenericMatrix() const Constructs a NxM generic matrix from the left-most N columns and top-most M rows of this 4x4 matrix. If N or M is greater than 4, @@ -633,7 +597,7 @@ QMatrix4x4& QMatrix4x4::operator/=(float divisor) \fn QVector3D operator*(const QVector3D& vector, const QMatrix4x4& matrix) \relates QMatrix4x4 - \deprecated [6.1] Convert the QVector3D to a QVector4D first, then multiply. + \deprecated [6.1] Convert the QVector3D to a QVector4D with 1.0 as the w coordinate, then multiply. Returns the result of transforming \a vector according to \a matrix, with the matrix applied post-vector. The vector is transformed as a point. @@ -643,7 +607,7 @@ QMatrix4x4& QMatrix4x4::operator/=(float divisor) \fn QVector3D operator*(const QMatrix4x4& matrix, const QVector3D& vector) \relates QMatrix4x4 - \deprecated [6.1] Use QMatrix4x4::map() or QMatrix4x4::mapVector() instead. + \deprecated [6.1] Use QMatrix4x4::map() instead. Returns the result of transforming \a vector according to \a matrix, with the matrix applied pre-vector. The vector is transformed as a @@ -1200,12 +1164,15 @@ void QMatrix4x4::rotate(float angle, float x, float y, float z) /*! \internal */ -void QMatrix4x4::projectedRotate(float angle, float x, float y, float z) +void QMatrix4x4::projectedRotate(float angle, float x, float y, float z, float distanceToPlane) { // Used by QGraphicsRotation::applyTo() to perform a rotation // and projection back to 2D in a single step. + if (qIsNull(distanceToPlane)) + return rotate(angle, x, y, z); if (angle == 0.0f) return; + float c, s; if (angle == 90.0f || angle == -270.0f) { s = 1.0f; @@ -1221,6 +1188,8 @@ void QMatrix4x4::projectedRotate(float angle, float x, float y, float z) c = std::cos(a); s = std::sin(a); } + + const qreal d = 1.0 / distanceToPlane; if (x == 0.0f) { if (y == 0.0f) { if (z != 0.0f) { @@ -1244,10 +1213,11 @@ void QMatrix4x4::projectedRotate(float angle, float x, float y, float z) // Rotate around the Y axis. if (y < 0) s = -s; - m[0][0] = m[0][0] * c + m[3][0] * s * inv_dist_to_plane; - m[0][1] = m[0][1] * c + m[3][1] * s * inv_dist_to_plane; - m[0][2] = m[0][2] * c + m[3][2] * s * inv_dist_to_plane; - m[0][3] = m[0][3] * c + m[3][3] * s * inv_dist_to_plane; + s *= d; + m[0][0] = m[0][0] * c + m[3][0] * s; + m[0][1] = m[0][1] * c + m[3][1] * s; + m[0][2] = m[0][2] * c + m[3][2] * s; + m[0][3] = m[0][3] * c + m[3][3] * s; flagBits = General; return; } @@ -1255,10 +1225,11 @@ void QMatrix4x4::projectedRotate(float angle, float x, float y, float z) // Rotate around the X axis. if (x < 0) s = -s; - m[1][0] = m[1][0] * c - m[3][0] * s * inv_dist_to_plane; - m[1][1] = m[1][1] * c - m[3][1] * s * inv_dist_to_plane; - m[1][2] = m[1][2] * c - m[3][2] * s * inv_dist_to_plane; - m[1][3] = m[1][3] * c - m[3][3] * s * inv_dist_to_plane; + s *= d; + m[1][0] = m[1][0] * c - m[3][0] * s; + m[1][1] = m[1][1] * c - m[3][1] * s; + m[1][2] = m[1][2] * c - m[3][2] * s; + m[1][3] = m[1][3] * c - m[3][3] * s; flagBits = General; return; } @@ -1285,14 +1256,24 @@ void QMatrix4x4::projectedRotate(float angle, float x, float y, float z) rot.m[1][2] = 0.0f; rot.m[2][2] = 1.0f; rot.m[3][2] = 0.0f; - rot.m[0][3] = (x * z * ic - y * s) * -inv_dist_to_plane; - rot.m[1][3] = (y * z * ic + x * s) * -inv_dist_to_plane; + rot.m[0][3] = (x * z * ic - y * s) * -d; + rot.m[1][3] = (y * z * ic + x * s) * -d; rot.m[2][3] = 0.0f; rot.m[3][3] = 1.0f; rot.flagBits = General; *this *= rot; } +#if QT_VERSION < QT_VERSION_CHECK(7, 0, 0) +/*! + \internal +*/ +void QMatrix4x4::projectedRotate(float angle, float x, float y, float z) +{ + projectedRotate(angle, x, y, z, 1024.0); +} +#endif + /*! \fn int QMatrix4x4::flags() const \internal @@ -1737,8 +1718,12 @@ 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. + Maps \a point by multiplying this matrix by \a point extended to a 4D + vector by assuming 1.0 for the w coordinate. The matrix is applied + pre-point. + + \note This function is not the same as mapVector(). For points, always use + map(). mapVector() is suitable for vectors (directions) only. \sa mapRect(), mapVector() */ diff --git a/src/gui/math3d/qmatrix4x4.h b/src/gui/math3d/qmatrix4x4.h index 15c5cabbf2..f8e5bc4314 100644 --- a/src/gui/math3d/qmatrix4x4.h +++ b/src/gui/math3d/qmatrix4x4.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtGui module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QMATRIX4X4_H #define QMATRIX4X4_H @@ -190,7 +154,13 @@ public: friend Q_GUI_EXPORT QDebug operator<<(QDebug dbg, const QMatrix4x4 &m); #endif +#if QT_VERSION < QT_VERSION_CHECK(7, 0, 0) + void projectedRotate(float angle, float x, float y, float z, float distanceToPlane); + // ### Qt7: Remove void projectedRotate(float angle, float x, float y, float z); +#else + void projectedRotate(float angle, float x, float y, float z, float distanceToPlane = 1024.0); +#endif // When matrices are multiplied, the flag bits are or-ed together. // Note that the ordering of the bit values matters. (ident < t < s < r2d < r < p) @@ -434,7 +404,7 @@ inline QMatrix4x4& QMatrix4x4::operator*=(const QMatrix4x4& o) const QMatrix4x4 other = o; // prevent aliasing when &o == this ### Qt 6: take o by value flagBits |= other.flagBits; - if (flagBits < Rotation2D) { + if (flagBits.toInt() < Rotation2D) { m[3][0] += m[0][0] * other.m[3][0]; m[3][1] += m[1][1] * other.m[3][1]; m[3][2] += m[2][2] * other.m[3][2]; @@ -637,7 +607,7 @@ inline QMatrix4x4 operator-(const QMatrix4x4& m1, const QMatrix4x4& m2) inline QMatrix4x4 operator*(const QMatrix4x4& m1, const QMatrix4x4& m2) { QMatrix4x4::Flags flagBits = m1.flagBits | m2.flagBits; - if (flagBits < QMatrix4x4::Rotation2D) { + if (flagBits.toInt() < QMatrix4x4::Rotation2D) { QMatrix4x4 m = m1; m.m[3][0] += m.m[0][0] * m2.m[3][0]; m.m[3][1] += m.m[1][1] * m2.m[3][1]; @@ -726,7 +696,7 @@ inline QMatrix4x4 operator*(const QMatrix4x4& m1, const QMatrix4x4& m2) #if QT_DEPRECATED_SINCE(6, 1) -QT_DEPRECATED_VERSION_X_6_1("Extend the QVector3D to a QVector4D before multiplying") +QT_DEPRECATED_VERSION_X_6_1("Extend the QVector3D to a QVector4D with 1.0 as the w coordinate before multiplying") inline QVector3D operator*(const QVector3D& vector, const QMatrix4x4& matrix) { float x, y, z, w; @@ -752,7 +722,7 @@ inline QVector3D operator*(const QVector3D& vector, const QMatrix4x4& matrix) return QVector3D(x / w, y / w, z / w); } -QT_DEPRECATED_VERSION_X_6_1("Use matrix.map(vector) or matrix.mapVector(vector) instead") +QT_DEPRECATED_VERSION_X_6_1("Use matrix.map(vector) instead") inline QVector3D operator*(const QMatrix4x4& matrix, const QVector3D& vector) { return matrix.map(vector); @@ -943,11 +913,11 @@ inline QPoint QMatrix4x4::map(const QPoint& point) const yin = point.y(); if (flagBits == QMatrix4x4::Identity) { return point; - } else if (flagBits < QMatrix4x4::Rotation2D) { + } else if (flagBits.toInt() < QMatrix4x4::Rotation2D) { // Translation | Scale return QPoint(qRound(xin * m[0][0] + m[3][0]), qRound(yin * m[1][1] + m[3][1])); - } else if (flagBits < QMatrix4x4::Perspective) { + } else if (flagBits.toInt() < QMatrix4x4::Perspective) { return QPoint(qRound(xin * m[0][0] + yin * m[1][0] + m[3][0]), qRound(xin * m[0][1] + yin * m[1][1] + m[3][1])); } else { @@ -975,11 +945,11 @@ inline QPointF QMatrix4x4::map(const QPointF& point) const yin = point.y(); if (flagBits == QMatrix4x4::Identity) { return point; - } else if (flagBits < QMatrix4x4::Rotation2D) { + } else if (flagBits.toInt() < QMatrix4x4::Rotation2D) { // Translation | Scale return QPointF(xin * qreal(m[0][0]) + qreal(m[3][0]), yin * qreal(m[1][1]) + qreal(m[3][1])); - } else if (flagBits < QMatrix4x4::Perspective) { + } else if (flagBits.toInt() < QMatrix4x4::Perspective) { return QPointF(xin * qreal(m[0][0]) + yin * qreal(m[1][0]) + qreal(m[3][0]), xin * qreal(m[0][1]) + yin * qreal(m[1][1]) + @@ -1009,12 +979,12 @@ inline QVector3D QMatrix4x4::map(const QVector3D& point) const float x, y, z, w; if (flagBits == QMatrix4x4::Identity) { return point; - } else if (flagBits < QMatrix4x4::Rotation2D) { + } else if (flagBits.toInt() < QMatrix4x4::Rotation2D) { // Translation | Scale return QVector3D(point.x() * m[0][0] + m[3][0], point.y() * m[1][1] + m[3][1], point.z() * m[2][2] + m[3][2]); - } else if (flagBits < QMatrix4x4::Rotation) { + } else if (flagBits.toInt() < QMatrix4x4::Rotation) { // Translation | Scale | Rotation2D return QVector3D(point.x() * m[0][0] + point.y() * m[1][0] + m[3][0], point.x() * m[0][1] + point.y() * m[1][1] + m[3][1], @@ -1045,10 +1015,10 @@ inline QVector3D QMatrix4x4::map(const QVector3D& point) const inline QVector3D QMatrix4x4::mapVector(const QVector3D& vector) const { - if (flagBits < Scale) { + if (flagBits.toInt() < Scale) { // Translation return vector; - } else if (flagBits < Rotation2D) { + } else if (flagBits.toInt() < Rotation2D) { // Translation | Scale return QVector3D(vector.x() * m[0][0], vector.y() * m[1][1], diff --git a/src/gui/math3d/qquaternion.cpp b/src/gui/math3d/qquaternion.cpp index 93e396c5a1..e7c5945208 100644 --- a/src/gui/math3d/qquaternion.cpp +++ b/src/gui/math3d/qquaternion.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2020 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtGui module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2020 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qquaternion.h" #include <QtCore/qdatastream.h> @@ -62,14 +26,14 @@ QT_BEGIN_NAMESPACE */ /*! - \fn QQuaternion::QQuaternion() + \fn QQuaternion::QQuaternion() noexcept Constructs an identity quaternion (1, 0, 0, 0), i.e. with the vector (0, 0, 0) and scalar 1. */ /*! - \fn QQuaternion::QQuaternion(Qt::Initialization) + \fn QQuaternion::QQuaternion(Qt::Initialization) noexcept \since 5.5 \internal @@ -77,7 +41,7 @@ QT_BEGIN_NAMESPACE */ /*! - \fn QQuaternion::QQuaternion(float scalar, float xpos, float ypos, float zpos) + \fn QQuaternion::QQuaternion(float scalar, float xpos, float ypos, float zpos) noexcept Constructs a quaternion with the vector (\a xpos, \a ypos, \a zpos) and \a scalar. @@ -86,7 +50,7 @@ QT_BEGIN_NAMESPACE #ifndef QT_NO_VECTOR3D /*! - \fn QQuaternion::QQuaternion(float scalar, const QVector3D& vector) + \fn QQuaternion::QQuaternion(float scalar, const QVector3D &vector) noexcept Constructs a quaternion vector from the specified \a vector and \a scalar. @@ -95,7 +59,7 @@ QT_BEGIN_NAMESPACE */ /*! - \fn QVector3D QQuaternion::vector() const + \fn QVector3D QQuaternion::vector() const noexcept Returns the vector component of this quaternion. @@ -103,7 +67,7 @@ QT_BEGIN_NAMESPACE */ /*! - \fn void QQuaternion::setVector(const QVector3D& vector) + \fn void QQuaternion::setVector(const QVector3D &vector) noexcept Sets the vector component of this quaternion to \a vector. @@ -113,7 +77,7 @@ QT_BEGIN_NAMESPACE #endif /*! - \fn void QQuaternion::setVector(float x, float y, float z) + \fn void QQuaternion::setVector(float x, float y, float z) noexcept Sets the vector component of this quaternion to (\a x, \a y, \a z). @@ -123,13 +87,13 @@ QT_BEGIN_NAMESPACE #ifndef QT_NO_VECTOR4D /*! - \fn QQuaternion::QQuaternion(const QVector4D& vector) + \fn QQuaternion::QQuaternion(const QVector4D &vector) noexcept Constructs a quaternion from the components of \a vector. */ /*! - \fn QVector4D QQuaternion::toVector4D() const + \fn QVector4D QQuaternion::toVector4D() const noexcept Returns this quaternion as a 4D vector. */ @@ -137,14 +101,14 @@ QT_BEGIN_NAMESPACE #endif /*! - \fn bool QQuaternion::isNull() const + \fn bool QQuaternion::isNull() const noexcept Returns \c true if the x, y, z, and scalar components of this quaternion are set to 0.0; otherwise returns \c false. */ /*! - \fn bool QQuaternion::isIdentity() const + \fn bool QQuaternion::isIdentity() const noexcept Returns \c true if the x, y, and z components of this quaternion are set to 0.0, and the scalar component is set @@ -152,7 +116,7 @@ QT_BEGIN_NAMESPACE */ /*! - \fn float QQuaternion::x() const + \fn float QQuaternion::x() const noexcept Returns the x coordinate of this quaternion's vector. @@ -160,7 +124,7 @@ QT_BEGIN_NAMESPACE */ /*! - \fn float QQuaternion::y() const + \fn float QQuaternion::y() const noexcept Returns the y coordinate of this quaternion's vector. @@ -168,7 +132,7 @@ QT_BEGIN_NAMESPACE */ /*! - \fn float QQuaternion::z() const + \fn float QQuaternion::z() const noexcept Returns the z coordinate of this quaternion's vector. @@ -176,7 +140,7 @@ QT_BEGIN_NAMESPACE */ /*! - \fn float QQuaternion::scalar() const + \fn float QQuaternion::scalar() const noexcept Returns the scalar component of this quaternion. @@ -184,7 +148,7 @@ QT_BEGIN_NAMESPACE */ /*! - \fn void QQuaternion::setX(float x) + \fn void QQuaternion::setX(float x) noexcept Sets the x coordinate of this quaternion's vector to the given \a x coordinate. @@ -193,7 +157,7 @@ QT_BEGIN_NAMESPACE */ /*! - \fn void QQuaternion::setY(float y) + \fn void QQuaternion::setY(float y) noexcept Sets the y coordinate of this quaternion's vector to the given \a y coordinate. @@ -202,7 +166,7 @@ QT_BEGIN_NAMESPACE */ /*! - \fn void QQuaternion::setZ(float z) + \fn void QQuaternion::setZ(float z) noexcept Sets the z coordinate of this quaternion's vector to the given \a z coordinate. @@ -211,7 +175,7 @@ QT_BEGIN_NAMESPACE */ /*! - \fn void QQuaternion::setScalar(float scalar) + \fn void QQuaternion::setScalar(float scalar) noexcept Sets the scalar component of this quaternion to \a scalar. @@ -219,7 +183,7 @@ QT_BEGIN_NAMESPACE */ /*! - \fn float QQuaternion::dotProduct(const QQuaternion &q1, const QQuaternion &q2) + \fn float QQuaternion::dotProduct(const QQuaternion &q1, const QQuaternion &q2) noexcept \since 5.5 Returns the dot product of \a q1 and \a q2. @@ -263,8 +227,6 @@ float QQuaternion::lengthSquared() const QQuaternion QQuaternion::normalized() const { const float scale = length(); - if (qFuzzyCompare(scale, 1.0f)) - return *this; if (qFuzzyIsNull(scale)) return QQuaternion(0.0f, 0.0f, 0.0f, 0.0f); return *this / scale; @@ -279,7 +241,7 @@ QQuaternion QQuaternion::normalized() const void QQuaternion::normalize() { const float len = length(); - if (qFuzzyCompare(len, 1.0f) || qFuzzyIsNull(len)) + if (qFuzzyIsNull(len)) return; xp /= len; @@ -289,7 +251,7 @@ void QQuaternion::normalize() } /*! - \fn QQuaternion QQuaternion::inverted() const + \fn QQuaternion QQuaternion::inverted() const noexcept \since 5.5 Returns the inverse of this quaternion. @@ -299,7 +261,7 @@ void QQuaternion::normalize() */ /*! - \fn QQuaternion QQuaternion::conjugated() const + \fn QQuaternion QQuaternion::conjugated() const noexcept \since 5.5 Returns the conjugate of this quaternion, which is @@ -316,13 +278,13 @@ void QQuaternion::normalize() \snippet code/src_gui_math3d_qquaternion.cpp 1 */ -QVector3D QQuaternion::rotatedVector(const QVector3D& vector) const +QVector3D QQuaternion::rotatedVector(const QVector3D &vector) const { return (*this * QQuaternion(0, vector) * conjugated()).vector(); } /*! - \fn QQuaternion &QQuaternion::operator+=(const QQuaternion &quaternion) + \fn QQuaternion &QQuaternion::operator+=(const QQuaternion &quaternion) noexcept Adds the given \a quaternion to this quaternion and returns a reference to this quaternion. @@ -331,7 +293,7 @@ QVector3D QQuaternion::rotatedVector(const QVector3D& vector) const */ /*! - \fn QQuaternion &QQuaternion::operator-=(const QQuaternion &quaternion) + \fn QQuaternion &QQuaternion::operator-=(const QQuaternion &quaternion) noexcept Subtracts the given \a quaternion from this quaternion and returns a reference to this quaternion. @@ -340,7 +302,7 @@ QVector3D QQuaternion::rotatedVector(const QVector3D& vector) const */ /*! - \fn QQuaternion &QQuaternion::operator*=(float factor) + \fn QQuaternion &QQuaternion::operator*=(float factor) noexcept Multiplies this quaternion's components by the given \a factor, and returns a reference to this quaternion. @@ -349,7 +311,7 @@ QVector3D QQuaternion::rotatedVector(const QVector3D& vector) const */ /*! - \fn QQuaternion &QQuaternion::operator*=(const QQuaternion &quaternion) + \fn QQuaternion &QQuaternion::operator*=(const QQuaternion &quaternion) noexcept Multiplies this quaternion by \a quaternion and returns a reference to this quaternion. @@ -367,7 +329,7 @@ QVector3D QQuaternion::rotatedVector(const QVector3D& vector) const #ifndef QT_NO_VECTOR3D /*! - \fn void QQuaternion::getAxisAndAngle(QVector3D *axis, float *angle) const + \fn void QQuaternion::getAxisAndAngle(QVector3D *axis, float *angle) const noexcept \since 5.5 \overload @@ -383,7 +345,7 @@ QVector3D QQuaternion::rotatedVector(const QVector3D& vector) const \sa getAxisAndAngle() */ -QQuaternion QQuaternion::fromAxisAndAngle(const QVector3D& axis, float angle) +QQuaternion QQuaternion::fromAxisAndAngle(const QVector3D &axis, float angle) { // Algorithm from: // http://www.j3d.org/matrix_faq/matrfaq_latest.html#Q56 @@ -424,7 +386,7 @@ void QQuaternion::getAxisAndAngle(float *x, float *y, float *z, float *angle) co *y = yp / length; *z = zp / length; } - *angle = qRadiansToDegrees(2.0f * std::acos(wp)); + *angle = qRadiansToDegrees(2.0f * std::atan2(length, wp)); } else { // angle is 0 (mod 2*pi), so any axis will fit *x = *y = *z = *angle = 0.0f; @@ -495,8 +457,9 @@ void QQuaternion::getEulerAngles(float *pitch, float *yaw, float *roll) const // https://ingmec.ual.es/~jlblanco/papers/jlblanco2010geometry3D_techrep.pdf // "A tutorial on SE(3) transformation parameterizations and on-manifold optimization". - // Normalize values even if the length is below the margin. Otherwise we might fail - // to detect Gimbal lock due to cumulative errors. + // We can only detect Gimbal lock when we normalize, which we can't do when + // length is nearly zero. Do so before multiplying coordinates, to avoid + // underflow. const float len = length(); const bool rescale = !qFuzzyIsNull(len); const float xps = rescale ? xp / len : xp; @@ -775,21 +738,21 @@ QQuaternion QQuaternion::rotationTo(const QVector3D &from, const QVector3D &to) #endif // QT_NO_VECTOR3D /*! - \fn bool QQuaternion::operator==(const QQuaternion &q1, const QQuaternion &q2) + \fn bool QQuaternion::operator==(const QQuaternion &q1, const QQuaternion &q2) noexcept Returns \c true if \a q1 is equal to \a q2; otherwise returns \c false. This operator uses an exact floating-point comparison. */ /*! - \fn bool QQuaternion::operator!=(const QQuaternion &q1, const QQuaternion &q2) + \fn bool QQuaternion::operator!=(const QQuaternion &q1, const QQuaternion &q2) noexcept Returns \c true if \a q1 is not equal to \a q2; otherwise returns \c false. This operator uses an exact floating-point comparison. */ /*! - \fn const QQuaternion operator+(const QQuaternion &q1, const QQuaternion &q2) + \fn const QQuaternion operator+(const QQuaternion &q1, const QQuaternion &q2) noexcept \relates QQuaternion Returns a QQuaternion object that is the sum of the given quaternions, @@ -799,7 +762,7 @@ QQuaternion QQuaternion::rotationTo(const QVector3D &from, const QVector3D &to) */ /*! - \fn const QQuaternion operator-(const QQuaternion &q1, const QQuaternion &q2) + \fn const QQuaternion operator-(const QQuaternion &q1, const QQuaternion &q2) noexcept \relates QQuaternion Returns a QQuaternion object that is formed by subtracting @@ -809,7 +772,7 @@ QQuaternion QQuaternion::rotationTo(const QVector3D &from, const QVector3D &to) */ /*! - \fn const QQuaternion operator*(float factor, const QQuaternion &quaternion) + \fn const QQuaternion operator*(float factor, const QQuaternion &quaternion) noexcept \relates QQuaternion Returns a copy of the given \a quaternion, multiplied by the @@ -819,7 +782,7 @@ QQuaternion QQuaternion::rotationTo(const QVector3D &from, const QVector3D &to) */ /*! - \fn const QQuaternion operator*(const QQuaternion &quaternion, float factor) + \fn const QQuaternion operator*(const QQuaternion &quaternion, float factor) noexcept \relates QQuaternion Returns a copy of the given \a quaternion, multiplied by the @@ -829,7 +792,7 @@ QQuaternion QQuaternion::rotationTo(const QVector3D &from, const QVector3D &to) */ /*! - \fn const QQuaternion operator*(const QQuaternion &q1, const QQuaternion& q2) + \fn const QQuaternion operator*(const QQuaternion &q1, const QQuaternion &q2) noexcept \relates QQuaternion Multiplies \a q1 and \a q2 using quaternion multiplication. @@ -840,7 +803,7 @@ QQuaternion QQuaternion::rotationTo(const QVector3D &from, const QVector3D &to) */ /*! - \fn const QQuaternion operator-(const QQuaternion &quaternion) + \fn const QQuaternion operator-(const QQuaternion &quaternion) noexcept \relates QQuaternion \overload @@ -863,7 +826,7 @@ QQuaternion QQuaternion::rotationTo(const QVector3D &from, const QVector3D &to) #ifndef QT_NO_VECTOR3D /*! - \fn QVector3D operator*(const QQuaternion &quaternion, const QVector3D &vec) + \fn QVector3D operator*(const QQuaternion &quaternion, const QVector3D &vec) noexcept \since 5.5 \relates QQuaternion @@ -873,7 +836,7 @@ QQuaternion QQuaternion::rotationTo(const QVector3D &from, const QVector3D &to) #endif /*! - \fn bool qFuzzyCompare(const QQuaternion& q1, const QQuaternion& q2) + \fn bool qFuzzyCompare(const QQuaternion &q1, const QQuaternion &q2) noexcept \relates QQuaternion Returns \c true if \a q1 and \a q2 are equal, allowing for a small @@ -892,7 +855,7 @@ QQuaternion QQuaternion::rotationTo(const QVector3D &from, const QVector3D &to) \sa nlerp() */ QQuaternion QQuaternion::slerp - (const QQuaternion& q1, const QQuaternion& q2, float t) + (const QQuaternion &q1, const QQuaternion &q2, float t) { // Handle the easy cases first. if (t <= 0.0f) @@ -941,7 +904,7 @@ QQuaternion QQuaternion::slerp \sa slerp() */ QQuaternion QQuaternion::nlerp - (const QQuaternion& q1, const QQuaternion& q2, float t) + (const QQuaternion &q1, const QQuaternion &q2, float t) { // Handle the easy cases first. if (t <= 0.0f) diff --git a/src/gui/math3d/qquaternion.h b/src/gui/math3d/qquaternion.h index 4d04ac6ad9..7cfbd9b818 100644 --- a/src/gui/math3d/qquaternion.h +++ b/src/gui/math3d/qquaternion.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtGui module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QQUATERNION_H #define QQUATERNION_H @@ -53,117 +17,123 @@ QT_BEGIN_NAMESPACE class QMatrix4x4; class QVariant; -class Q_GUI_EXPORT QQuaternion +class QT6_ONLY(Q_GUI_EXPORT) QQuaternion { public: - QQuaternion(); - explicit QQuaternion(Qt::Initialization) {} - QQuaternion(float scalar, float xpos, float ypos, float zpos); + constexpr QQuaternion() noexcept; + explicit QQuaternion(Qt::Initialization) noexcept {} + constexpr QQuaternion(float scalar, float xpos, float ypos, float zpos) noexcept; #ifndef QT_NO_VECTOR3D - QQuaternion(float scalar, const QVector3D& vector); + constexpr QQuaternion(float scalar, const QVector3D &vector) noexcept; #endif #ifndef QT_NO_VECTOR4D - explicit QQuaternion(const QVector4D& vector); + constexpr explicit QQuaternion(const QVector4D &vector) noexcept; #endif - bool isNull() const; - bool isIdentity() const; + constexpr bool isNull() const noexcept; + constexpr bool isIdentity() const noexcept; #ifndef QT_NO_VECTOR3D - QVector3D vector() const; - void setVector(const QVector3D& vector); + constexpr QVector3D vector() const noexcept; + constexpr void setVector(const QVector3D &vector) noexcept; #endif - void setVector(float x, float y, float z); + constexpr void setVector(float x, float y, float z) noexcept; - float x() const; - float y() const; - float z() const; - float scalar() const; + constexpr float x() const noexcept; + constexpr float y() const noexcept; + constexpr float z() const noexcept; + constexpr float scalar() const noexcept; - void setX(float x); - void setY(float y); - void setZ(float z); - void setScalar(float scalar); + constexpr void setX(float x) noexcept; + constexpr void setY(float y) noexcept; + constexpr void setZ(float z) noexcept; + constexpr void setScalar(float scalar) noexcept; - constexpr static inline float dotProduct(const QQuaternion &q1, const QQuaternion &q2); + constexpr static float dotProduct(const QQuaternion &q1, const QQuaternion &q2) noexcept; - float length() const; - float lengthSquared() const; + // ### Qt 7: make the next four constexpr + // (perhaps using std::hypot, constexpr in C++26, or constexpr qHypot) + QT7_ONLY(Q_GUI_EXPORT) float length() const; + QT7_ONLY(Q_GUI_EXPORT) float lengthSquared() const; - [[nodiscard]] QQuaternion normalized() const; - void normalize(); + [[nodiscard]] QT7_ONLY(Q_GUI_EXPORT) QQuaternion normalized() const; + QT7_ONLY(Q_GUI_EXPORT) void normalize(); - inline QQuaternion inverted() const; + constexpr QQuaternion inverted() const noexcept; - [[nodiscard]] QQuaternion conjugated() const; + [[nodiscard]] constexpr QQuaternion conjugated() const noexcept; - QVector3D rotatedVector(const QVector3D& vector) const; + QT7_ONLY(Q_GUI_EXPORT) QVector3D rotatedVector(const QVector3D &vector) const; - QQuaternion &operator+=(const QQuaternion &quaternion); - QQuaternion &operator-=(const QQuaternion &quaternion); - QQuaternion &operator*=(float factor); - QQuaternion &operator*=(const QQuaternion &quaternion); - QQuaternion &operator/=(float divisor); + constexpr QQuaternion &operator+=(const QQuaternion &quaternion) noexcept; + constexpr QQuaternion &operator-=(const QQuaternion &quaternion) noexcept; + constexpr QQuaternion &operator*=(float factor) noexcept; + constexpr QQuaternion &operator*=(const QQuaternion &quaternion) noexcept; + constexpr QQuaternion &operator/=(float divisor); QT_WARNING_PUSH QT_WARNING_DISABLE_FLOAT_COMPARE - friend inline bool operator==(const QQuaternion &q1, const QQuaternion &q2) noexcept + friend constexpr bool operator==(const QQuaternion &q1, const QQuaternion &q2) noexcept { return q1.wp == q2.wp && q1.xp == q2.xp && q1.yp == q2.yp && q1.zp == q2.zp; } - friend inline bool operator!=(const QQuaternion &q1, const QQuaternion &q2) noexcept + friend constexpr bool operator!=(const QQuaternion &q1, const QQuaternion &q2) noexcept { return !(q1 == q2); } QT_WARNING_POP - friend inline const QQuaternion operator+(const QQuaternion &q1, const QQuaternion &q2); - friend inline const QQuaternion operator-(const QQuaternion &q1, const QQuaternion &q2); - friend inline const QQuaternion operator*(float factor, const QQuaternion &quaternion); - friend inline const QQuaternion operator*(const QQuaternion &quaternion, float factor); - friend inline const QQuaternion operator*(const QQuaternion &q1, const QQuaternion& q2); - friend inline const QQuaternion operator-(const QQuaternion &quaternion); - friend inline const QQuaternion operator/(const QQuaternion &quaternion, float divisor); + friend constexpr QQuaternion operator+(const QQuaternion &q1, const QQuaternion &q2) noexcept; + friend constexpr QQuaternion operator-(const QQuaternion &q1, const QQuaternion &q2) noexcept; + friend constexpr QQuaternion operator*(float factor, const QQuaternion &quaternion) noexcept; + friend constexpr QQuaternion operator*(const QQuaternion &quaternion, float factor) noexcept; + friend constexpr QQuaternion operator*(const QQuaternion &q1, const QQuaternion &q2) noexcept; + friend constexpr QQuaternion operator-(const QQuaternion &quaternion) noexcept; + friend constexpr QQuaternion operator/(const QQuaternion &quaternion, float divisor); - friend inline bool qFuzzyCompare(const QQuaternion& q1, const QQuaternion& q2); + friend constexpr bool qFuzzyCompare(const QQuaternion &q1, const QQuaternion &q2) noexcept; #ifndef QT_NO_VECTOR4D - QVector4D toVector4D() const; + constexpr QVector4D toVector4D() const noexcept; #endif - operator QVariant() const; + QT7_ONLY(Q_GUI_EXPORT) operator QVariant() const; #ifndef QT_NO_VECTOR3D inline void getAxisAndAngle(QVector3D *axis, float *angle) const; - static QQuaternion fromAxisAndAngle(const QVector3D& axis, float angle); + QT7_ONLY(Q_GUI_EXPORT) static QQuaternion fromAxisAndAngle(const QVector3D &axis, float angle); #endif - void getAxisAndAngle(float *x, float *y, float *z, float *angle) const; - static QQuaternion fromAxisAndAngle - (float x, float y, float z, float angle); + QT7_ONLY(Q_GUI_EXPORT) void getAxisAndAngle(float *x, float *y, float *z, float *angle) const; + QT7_ONLY(Q_GUI_EXPORT) static QQuaternion fromAxisAndAngle(float x, float y, float z, + float angle); #ifndef QT_NO_VECTOR3D inline QVector3D toEulerAngles() const; - static inline QQuaternion fromEulerAngles(const QVector3D &eulerAngles); + QT7_ONLY(Q_GUI_EXPORT) static inline QQuaternion fromEulerAngles(const QVector3D &eulerAngles); #endif - void getEulerAngles(float *pitch, float *yaw, float *roll) const; - static QQuaternion fromEulerAngles(float pitch, float yaw, float roll); + QT7_ONLY(Q_GUI_EXPORT) void getEulerAngles(float *pitch, float *yaw, float *roll) const; + QT7_ONLY(Q_GUI_EXPORT) static QQuaternion fromEulerAngles(float pitch, float yaw, float roll); - QMatrix3x3 toRotationMatrix() const; - static QQuaternion fromRotationMatrix(const QMatrix3x3 &rot3x3); + QT7_ONLY(Q_GUI_EXPORT) QMatrix3x3 toRotationMatrix() const; + QT7_ONLY(Q_GUI_EXPORT) static QQuaternion fromRotationMatrix(const QMatrix3x3 &rot3x3); #ifndef QT_NO_VECTOR3D - void getAxes(QVector3D *xAxis, QVector3D *yAxis, QVector3D *zAxis) const; - static QQuaternion fromAxes(const QVector3D &xAxis, const QVector3D &yAxis, const QVector3D &zAxis); + QT7_ONLY(Q_GUI_EXPORT) void getAxes(QVector3D *xAxis, QVector3D *yAxis, QVector3D *zAxis) const; + QT7_ONLY(Q_GUI_EXPORT) static QQuaternion fromAxes(const QVector3D &xAxis, + const QVector3D &yAxis, + const QVector3D &zAxis); - static QQuaternion fromDirection(const QVector3D &direction, const QVector3D &up); + QT7_ONLY(Q_GUI_EXPORT) static QQuaternion fromDirection(const QVector3D &direction, + const QVector3D &up); - static QQuaternion rotationTo(const QVector3D &from, const QVector3D &to); + QT7_ONLY(Q_GUI_EXPORT) static QQuaternion rotationTo(const QVector3D &from, + const QVector3D &to); #endif - static QQuaternion slerp - (const QQuaternion& q1, const QQuaternion& q2, float t); - static QQuaternion nlerp - (const QQuaternion& q1, const QQuaternion& q2, float t); + QT7_ONLY(Q_GUI_EXPORT) static QQuaternion slerp(const QQuaternion &q1, const QQuaternion &q2, + float t); + QT7_ONLY(Q_GUI_EXPORT) static QQuaternion nlerp(const QQuaternion &q1, const QQuaternion &q2, + float t); private: float wp, xp, yp, zp; @@ -171,40 +141,41 @@ private: Q_DECLARE_TYPEINFO(QQuaternion, Q_PRIMITIVE_TYPE); -inline QQuaternion::QQuaternion() : wp(1.0f), xp(0.0f), yp(0.0f), zp(0.0f) {} +constexpr QQuaternion::QQuaternion() noexcept : wp(1.0f), xp(0.0f), yp(0.0f), zp(0.0f) {} -inline QQuaternion::QQuaternion(float aScalar, float xpos, float ypos, float zpos) : wp(aScalar), xp(xpos), yp(ypos), zp(zpos) {} +constexpr QQuaternion::QQuaternion(float aScalar, float xpos, float ypos, float zpos) noexcept + : wp(aScalar), xp(xpos), yp(ypos), zp(zpos) {} QT_WARNING_PUSH QT_WARNING_DISABLE_FLOAT_COMPARE -inline bool QQuaternion::isNull() const +constexpr bool QQuaternion::isNull() const noexcept { return wp == 0.0f && xp == 0.0f && yp == 0.0f && zp == 0.0f; } -inline bool QQuaternion::isIdentity() const +constexpr bool QQuaternion::isIdentity() const noexcept { return wp == 1.0f && xp == 0.0f && yp == 0.0f && zp == 0.0f; } QT_WARNING_POP -inline float QQuaternion::x() const { return xp; } -inline float QQuaternion::y() const { return yp; } -inline float QQuaternion::z() const { return zp; } -inline float QQuaternion::scalar() const { return wp; } +constexpr float QQuaternion::x() const noexcept { return xp; } +constexpr float QQuaternion::y() const noexcept { return yp; } +constexpr float QQuaternion::z() const noexcept { return zp; } +constexpr float QQuaternion::scalar() const noexcept { return wp; } -inline void QQuaternion::setX(float aX) { xp = aX; } -inline void QQuaternion::setY(float aY) { yp = aY; } -inline void QQuaternion::setZ(float aZ) { zp = aZ; } -inline void QQuaternion::setScalar(float aScalar) { wp = aScalar; } +constexpr void QQuaternion::setX(float aX) noexcept { xp = aX; } +constexpr void QQuaternion::setY(float aY) noexcept { yp = aY; } +constexpr void QQuaternion::setZ(float aZ) noexcept { zp = aZ; } +constexpr void QQuaternion::setScalar(float aScalar) noexcept { wp = aScalar; } -constexpr inline float QQuaternion::dotProduct(const QQuaternion &q1, const QQuaternion &q2) +constexpr float QQuaternion::dotProduct(const QQuaternion &q1, const QQuaternion &q2) noexcept { return q1.wp * q2.wp + q1.xp * q2.xp + q1.yp * q2.yp + q1.zp * q2.zp; } -inline QQuaternion QQuaternion::inverted() const +constexpr QQuaternion QQuaternion::inverted() const noexcept { // Need some extra precision if the length is very small. double len = double(wp) * double(wp) + @@ -217,12 +188,12 @@ inline QQuaternion QQuaternion::inverted() const return QQuaternion(0.0f, 0.0f, 0.0f, 0.0f); } -inline QQuaternion QQuaternion::conjugated() const +constexpr QQuaternion QQuaternion::conjugated() const noexcept { return QQuaternion(wp, -xp, -yp, -zp); } -inline QQuaternion &QQuaternion::operator+=(const QQuaternion &quaternion) +constexpr QQuaternion &QQuaternion::operator+=(const QQuaternion &quaternion) noexcept { wp += quaternion.wp; xp += quaternion.xp; @@ -231,7 +202,7 @@ inline QQuaternion &QQuaternion::operator+=(const QQuaternion &quaternion) return *this; } -inline QQuaternion &QQuaternion::operator-=(const QQuaternion &quaternion) +constexpr QQuaternion &QQuaternion::operator-=(const QQuaternion &quaternion) noexcept { wp -= quaternion.wp; xp -= quaternion.xp; @@ -240,7 +211,7 @@ inline QQuaternion &QQuaternion::operator-=(const QQuaternion &quaternion) return *this; } -inline QQuaternion &QQuaternion::operator*=(float factor) +constexpr QQuaternion &QQuaternion::operator*=(float factor) noexcept { wp *= factor; xp *= factor; @@ -249,7 +220,7 @@ inline QQuaternion &QQuaternion::operator*=(float factor) return *this; } -inline const QQuaternion operator*(const QQuaternion &q1, const QQuaternion& q2) +constexpr QQuaternion operator*(const QQuaternion &q1, const QQuaternion &q2) noexcept { float yy = (q1.wp - q1.yp) * (q2.wp + q2.zp); float zz = (q1.wp + q1.yp) * (q2.wp - q2.zp); @@ -265,13 +236,13 @@ inline const QQuaternion operator*(const QQuaternion &q1, const QQuaternion& q2) return QQuaternion(w, x, y, z); } -inline QQuaternion &QQuaternion::operator*=(const QQuaternion &quaternion) +constexpr QQuaternion &QQuaternion::operator*=(const QQuaternion &quaternion) noexcept { *this = *this * quaternion; return *this; } -inline QQuaternion &QQuaternion::operator/=(float divisor) +constexpr QQuaternion &QQuaternion::operator/=(float divisor) { wp /= divisor; xp /= divisor; @@ -280,37 +251,37 @@ inline QQuaternion &QQuaternion::operator/=(float divisor) return *this; } -inline const QQuaternion operator+(const QQuaternion &q1, const QQuaternion &q2) +constexpr QQuaternion operator+(const QQuaternion &q1, const QQuaternion &q2) noexcept { return QQuaternion(q1.wp + q2.wp, q1.xp + q2.xp, q1.yp + q2.yp, q1.zp + q2.zp); } -inline const QQuaternion operator-(const QQuaternion &q1, const QQuaternion &q2) +constexpr QQuaternion operator-(const QQuaternion &q1, const QQuaternion &q2) noexcept { return QQuaternion(q1.wp - q2.wp, q1.xp - q2.xp, q1.yp - q2.yp, q1.zp - q2.zp); } -inline const QQuaternion operator*(float factor, const QQuaternion &quaternion) +constexpr QQuaternion operator*(float factor, const QQuaternion &quaternion) noexcept { return QQuaternion(quaternion.wp * factor, quaternion.xp * factor, quaternion.yp * factor, quaternion.zp * factor); } -inline const QQuaternion operator*(const QQuaternion &quaternion, float factor) +constexpr QQuaternion operator*(const QQuaternion &quaternion, float factor) noexcept { return QQuaternion(quaternion.wp * factor, quaternion.xp * factor, quaternion.yp * factor, quaternion.zp * factor); } -inline const QQuaternion operator-(const QQuaternion &quaternion) +constexpr QQuaternion operator-(const QQuaternion &quaternion) noexcept { return QQuaternion(-quaternion.wp, -quaternion.xp, -quaternion.yp, -quaternion.zp); } -inline const QQuaternion operator/(const QQuaternion &quaternion, float divisor) +constexpr QQuaternion operator/(const QQuaternion &quaternion, float divisor) { return QQuaternion(quaternion.wp / divisor, quaternion.xp / divisor, quaternion.yp / divisor, quaternion.zp / divisor); } -inline bool qFuzzyCompare(const QQuaternion& q1, const QQuaternion& q2) +constexpr bool qFuzzyCompare(const QQuaternion &q1, const QQuaternion &q2) noexcept { return qFuzzyCompare(q1.wp, q2.wp) && qFuzzyCompare(q1.xp, q2.xp) && @@ -320,17 +291,17 @@ inline bool qFuzzyCompare(const QQuaternion& q1, const QQuaternion& q2) #ifndef QT_NO_VECTOR3D -inline QQuaternion::QQuaternion(float aScalar, const QVector3D& aVector) +constexpr QQuaternion::QQuaternion(float aScalar, const QVector3D &aVector) noexcept : wp(aScalar), xp(aVector.x()), yp(aVector.y()), zp(aVector.z()) {} -inline void QQuaternion::setVector(const QVector3D& aVector) +constexpr void QQuaternion::setVector(const QVector3D &aVector) noexcept { xp = aVector.x(); yp = aVector.y(); zp = aVector.z(); } -inline QVector3D QQuaternion::vector() const +constexpr QVector3D QQuaternion::vector() const noexcept { return QVector3D(xp, yp, zp); } @@ -361,7 +332,7 @@ inline QQuaternion QQuaternion::fromEulerAngles(const QVector3D &eulerAngles) #endif -inline void QQuaternion::setVector(float aX, float aY, float aZ) +constexpr void QQuaternion::setVector(float aX, float aY, float aZ) noexcept { xp = aX; yp = aY; @@ -370,10 +341,10 @@ inline void QQuaternion::setVector(float aX, float aY, float aZ) #ifndef QT_NO_VECTOR4D -inline QQuaternion::QQuaternion(const QVector4D& aVector) +constexpr QQuaternion::QQuaternion(const QVector4D &aVector) noexcept : wp(aVector.w()), xp(aVector.x()), yp(aVector.y()), zp(aVector.z()) {} -inline QVector4D QQuaternion::toVector4D() const +constexpr QVector4D QQuaternion::toVector4D() const noexcept { return QVector4D(xp, yp, zp, wp); } diff --git a/src/gui/math3d/qvector2d.h b/src/gui/math3d/qvector2d.h index fc42579918..a9e55a8ef8 100644 --- a/src/gui/math3d/qvector2d.h +++ b/src/gui/math3d/qvector2d.h @@ -1,42 +1,6 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Copyright (C) 2020 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtGui module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// Copyright (C) 2020 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include <QtGui/qvectornd.h> diff --git a/src/gui/math3d/qvector3d.h b/src/gui/math3d/qvector3d.h index fc42579918..a9e55a8ef8 100644 --- a/src/gui/math3d/qvector3d.h +++ b/src/gui/math3d/qvector3d.h @@ -1,42 +1,6 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Copyright (C) 2020 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtGui module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// Copyright (C) 2020 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include <QtGui/qvectornd.h> diff --git a/src/gui/math3d/qvector4d.h b/src/gui/math3d/qvector4d.h index fc42579918..a9e55a8ef8 100644 --- a/src/gui/math3d/qvector4d.h +++ b/src/gui/math3d/qvector4d.h @@ -1,42 +1,6 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Copyright (C) 2020 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtGui module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// Copyright (C) 2020 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include <QtGui/qvectornd.h> diff --git a/src/gui/math3d/qvectornd.cpp b/src/gui/math3d/qvectornd.cpp index 123f2b46e8..dcd7bdbcf8 100644 --- a/src/gui/math3d/qvectornd.cpp +++ b/src/gui/math3d/qvectornd.cpp @@ -1,42 +1,6 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Copyright (C) 2020 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtGui module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// Copyright (C) 2020 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qvectornd.h" #include <QtCore/qdatastream.h> @@ -215,7 +179,7 @@ QT_BEGIN_NAMESPACE /*! \fn void QVector2D::normalize() - Normalizes the currect vector in place. Nothing happens if this + Normalizes the current vector in place. Nothing happens if this vector is a null vector or the length of the vector is very close to 1. \sa length(), normalized() @@ -692,7 +656,7 @@ QDataStream &operator>>(QDataStream &stream, QVector2D &vector) /*! \fn void QVector3D::normalize() - Normalizes the currect vector in place. Nothing happens if this + Normalizes the current vector in place. Nothing happens if this vector is a null vector or the length of the vector is very close to 1. \sa length(), normalized() @@ -1368,7 +1332,7 @@ QDataStream &operator>>(QDataStream &stream, QVector3D &vector) /*! \fn void QVector4D::normalize() - Normalizes the currect vector in place. Nothing happens if this + Normalizes the current vector in place. Nothing happens if this vector is a null vector or the length of the vector is very close to 1. \sa length(), normalized() diff --git a/src/gui/math3d/qvectornd.h b/src/gui/math3d/qvectornd.h index dec98bd936..a8adf12801 100644 --- a/src/gui/math3d/qvectornd.h +++ b/src/gui/math3d/qvectornd.h @@ -1,42 +1,6 @@ -/**************************************************************************** -** -** Copyright (C) 2020 The Qt Company Ltd. -** Copyright (C) 2020 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtGui module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2020 The Qt Company Ltd. +// Copyright (C) 2020 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QVECTORND_H #define QVECTORND_H @@ -46,8 +10,13 @@ #include <QtCore/qrect.h> #include <QtCore/qmath.h> +#include <QtCore/q20type_traits.h> +#include <QtCore/q23utility.h> + QT_BEGIN_NAMESPACE +// QT_ENABLE_P0846_SEMANTICS_FOR(get) // from qpoint.h + class QVector2D; class QVector3D; class QVector4D; @@ -181,13 +150,10 @@ private: template <std::size_t I, typename V, std::enable_if_t<(I < 2), bool> = true, - std::enable_if_t<std::is_same_v<std::decay_t<V>, QVector2D>, bool> = true> + std::enable_if_t<std::is_same_v<q20::remove_cvref_t<V>, QVector2D>, bool> = true> friend constexpr decltype(auto) get(V &&vec) noexcept { - if constexpr (I == 0) - return (std::forward<V>(vec).v[0]); - else if constexpr (I == 1) - return (std::forward<V>(vec).v[1]); + return q23::forward_like<V>(vec.v[I]); } }; @@ -343,15 +309,10 @@ private: template <std::size_t I, typename V, std::enable_if_t<(I < 3), bool> = true, - std::enable_if_t<std::is_same_v<std::decay_t<V>, QVector3D>, bool> = true> + std::enable_if_t<std::is_same_v<q20::remove_cvref_t<V>, QVector3D>, bool> = true> friend constexpr decltype(auto) get(V &&vec) noexcept { - if constexpr (I == 0) - return (std::forward<V>(vec).v[0]); - else if constexpr (I == 1) - return (std::forward<V>(vec).v[1]); - else if constexpr (I == 2) - return (std::forward<V>(vec).v[2]); + return q23::forward_like<V>(vec.v[I]); } }; @@ -500,17 +461,10 @@ private: template <std::size_t I, typename V, std::enable_if_t<(I < 4), bool> = true, - std::enable_if_t<std::is_same_v<std::decay_t<V>, QVector4D>, bool> = true> + std::enable_if_t<std::is_same_v<q20::remove_cvref_t<V>, QVector4D>, bool> = true> friend constexpr decltype(auto) get(V &&vec) noexcept { - if constexpr (I == 0) - return (std::forward<V>(vec).v[0]); - else if constexpr (I == 1) - return (std::forward<V>(vec).v[1]); - else if constexpr (I == 2) - return (std::forward<V>(vec).v[2]); - else if constexpr (I == 3) - return (std::forward<V>(vec).v[3]); + return q23::forward_like<V>(vec.v[I]); } }; |