1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QQuaterion: fix formatting

Browse Source 
Fix indentation, split too long lines.

Amends f9f1272e7c438b79591032877f2b386af8085c3f

Found in 6.7 API Review

Change-Id: I3e9e3647afbe1a49fe78258177aff5cb878ce030
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit 5e49fa2739bd43e919863b343821c22b3d583afb)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Ivan Solovev 2024-01-15 13:03:49 +01:00 committed by Qt Cherry-pick Bot
parent ca705abe06
commit bdf6f7f4d3
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/gui/math3d/qquaternion.h
View File

@ -57,7 +57,7 @@ public:
QT7_ONLY(Q_GUI_EXPORT) float lengthSquared() const;
[[nodiscard]] QT7_ONLY(Q_GUI_EXPORT) QQuaternion normalized() const;
QT7_ONLY(Q_GUI_EXPORT) void normalize();
QT7_ONLY(Q_GUI_EXPORT) void normalize();
constexpr QQuaternion inverted() const noexcept;
@ -104,7 +104,8 @@ QT_WARNING_POP
QT7_ONLY(Q_GUI_EXPORT) static QQuaternion fromAxisAndAngle(const QVector3D &axis, float angle);
#endif
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);
QT7_ONLY(Q_GUI_EXPORT) static QQuaternion fromAxisAndAngle(float x, float y, float z,
float angle);
#ifndef QT_NO_VECTOR3D
inline QVector3D toEulerAngles() const;
@ -118,16 +119,21 @@ QT_WARNING_POP
#ifndef QT_NO_VECTOR3D
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,
QT7_ONLY(Q_GUI_EXPORT) static QQuaternion fromAxes(const QVector3D &xAxis,
const QVector3D &yAxis,
const QVector3D &zAxis);
QT7_ONLY(Q_GUI_EXPORT) static QQuaternion fromDirection(const QVector3D &direction, const QVector3D &up);
QT7_ONLY(Q_GUI_EXPORT) static QQuaternion fromDirection(const QVector3D &direction,
const QVector3D &up);
QT7_ONLY(Q_GUI_EXPORT) static QQuaternion rotationTo(const QVector3D &from, const QVector3D &to);
QT7_ONLY(Q_GUI_EXPORT) static QQuaternion rotationTo(const QVector3D &from,
const QVector3D &to);
#endif
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);
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;