51d40d7e9b
This corrects the mismatch between using floats for internal storage and qreal in the API of QVector*D which leads to lots of implicit casts between double and float. This change also stops users from being surprised by the loss of precision when using these classes on desktop platforms and removes the need for the private constructors taking a dummy int as the final argument. The QMatrix4x4 and QQuaternion classes have been changed to use float for their internal storage since these are meant to be used in conjunction with the QVector*D classes. This is to prevent unexpected loss of precision and to improve performance. The on-disk format has also been changed from double to float thereby reducing the storage required when streaming vectors and matrices. This is potentially a large saving when working with complex 3D meshes etc. This also has a significant performance improvement when passing matrices to QOpenGLShaderProgram (and QGLShaderProgram) as we no longer have to iterate and convert the data to floats. This is an operation that could easily be needed many times per frame. This change also opens the door for further optimisations of these classes to be implemented by using SIMD intrinsics. This needs to be applied in conjunction with https://codereview.qt-project.org/#change,33548 Task-number: QTBUG-21035 Task-number: QTBUG-20661 Change-Id: I9321b06040ffb93ae1cbd72fd2013267ac901b2e Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
123 lines
3.1 KiB
C++
123 lines
3.1 KiB
C++
/****************************************************************************
|
|
**
|
|
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
|
|
** Contact: http://www.qt-project.org/
|
|
**
|
|
** This file is part of the test suite of the Qt Toolkit.
|
|
**
|
|
** $QT_BEGIN_LICENSE:LGPL$
|
|
** GNU Lesser General Public License Usage
|
|
** This file may be used under the terms of the GNU Lesser General Public
|
|
** License version 2.1 as published by the Free Software Foundation and
|
|
** appearing in the file LICENSE.LGPL included in the packaging of this
|
|
** file. Please review the following information to ensure the GNU Lesser
|
|
** General Public License version 2.1 requirements will be met:
|
|
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
|
**
|
|
** In addition, as a special exception, Nokia gives you certain additional
|
|
** rights. These rights are described in the Nokia Qt LGPL Exception
|
|
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
|
**
|
|
** GNU General Public License Usage
|
|
** Alternatively, this file may be used under the terms of the GNU General
|
|
** Public License version 3.0 as published by the Free Software Foundation
|
|
** and appearing in the file LICENSE.GPL included in the packaging of this
|
|
** file. Please review the following information to ensure the GNU General
|
|
** Public License version 3.0 requirements will be met:
|
|
** http://www.gnu.org/copyleft/gpl.html.
|
|
**
|
|
** Other Usage
|
|
** Alternatively, this file may be used in accordance with the terms and
|
|
** conditions contained in a signed written agreement between you and Nokia.
|
|
**
|
|
**
|
|
**
|
|
**
|
|
**
|
|
**
|
|
** $QT_END_LICENSE$
|
|
**
|
|
****************************************************************************/
|
|
|
|
#include <qtest.h>
|
|
#include <QQuaternion>
|
|
|
|
class tst_QQuaternion : public QObject
|
|
{
|
|
Q_OBJECT
|
|
|
|
public:
|
|
tst_QQuaternion();
|
|
virtual ~tst_QQuaternion();
|
|
|
|
public slots:
|
|
void init();
|
|
void cleanup();
|
|
|
|
private slots:
|
|
void multiply_data();
|
|
void multiply();
|
|
};
|
|
|
|
tst_QQuaternion::tst_QQuaternion()
|
|
{
|
|
}
|
|
|
|
tst_QQuaternion::~tst_QQuaternion()
|
|
{
|
|
}
|
|
|
|
void tst_QQuaternion::init()
|
|
{
|
|
}
|
|
|
|
void tst_QQuaternion::cleanup()
|
|
{
|
|
}
|
|
|
|
void tst_QQuaternion::multiply_data()
|
|
{
|
|
QTest::addColumn<float>("x1");
|
|
QTest::addColumn<float>("y1");
|
|
QTest::addColumn<float>("z1");
|
|
QTest::addColumn<float>("w1");
|
|
QTest::addColumn<float>("x2");
|
|
QTest::addColumn<float>("y2");
|
|
QTest::addColumn<float>("z2");
|
|
QTest::addColumn<float>("w2");
|
|
|
|
QTest::newRow("null")
|
|
<< 0.0f << 0.0f << 0.0f << 0.0f
|
|
<< 0.0f << 0.0f << 0.0f << 0.0f;
|
|
|
|
QTest::newRow("unitvec")
|
|
<< 1.0f << 0.0f << 0.0f << 1.0f
|
|
<< 0.0f << 1.0f << 0.0f << 1.0f;
|
|
|
|
QTest::newRow("complex")
|
|
<< 1.0f << 2.0f << 3.0f << 7.0f
|
|
<< 4.0f << 5.0f << 6.0f << 8.0f;
|
|
}
|
|
|
|
void tst_QQuaternion::multiply()
|
|
{
|
|
QFETCH(float, x1);
|
|
QFETCH(float, y1);
|
|
QFETCH(float, z1);
|
|
QFETCH(float, w1);
|
|
QFETCH(float, x2);
|
|
QFETCH(float, y2);
|
|
QFETCH(float, z2);
|
|
QFETCH(float, w2);
|
|
|
|
QQuaternion q1(w1, x1, y1, z1);
|
|
QQuaternion q2(w2, x2, y2, z2);
|
|
|
|
QBENCHMARK {
|
|
QQuaternion q3 = q1 * q2;
|
|
}
|
|
}
|
|
|
|
QTEST_MAIN(tst_QQuaternion)
|
|
#include "tst_qquaternion.moc"
|