summaryrefslogtreecommitdiffstats
path: root/tests/auto/cpptest/q3dcustom-volume/tst_custom.cpp
diff options
context:
space:
mode:
authorVolker Hilsheimer <volker.hilsheimer@qt.io>2021-04-12 14:56:26 +0200
committerVolker Hilsheimer <volker.hilsheimer@qt.io>2021-04-13 06:32:26 +0200
commit430110e9a157a42ab78c2b6fcb8e2a05b9152393 (patch)
treeeed9869c49844078bd110fe19e8ec09d63e4ba8f /tests/auto/cpptest/q3dcustom-volume/tst_custom.cpp
parent437b1341530fb8546cf45a59128ef7f8e24fd71a (diff)
Fix double to float truncation warnings
QVectorND and QQuarternion operates on floats, so pass in float literals rather than doubles. Pick-to: 6.1 Change-Id: I6ddb6a4f0caa6e8687e718e10957b6c939a091bd Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Diffstat (limited to 'tests/auto/cpptest/q3dcustom-volume/tst_custom.cpp')
-rw-r--r--tests/auto/cpptest/q3dcustom-volume/tst_custom.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/tests/auto/cpptest/q3dcustom-volume/tst_custom.cpp b/tests/auto/cpptest/q3dcustom-volume/tst_custom.cpp
index 65505b23..495b8ba8 100644
--- a/tests/auto/cpptest/q3dcustom-volume/tst_custom.cpp
+++ b/tests/auto/cpptest/q3dcustom-volume/tst_custom.cpp
@@ -80,8 +80,8 @@ void tst_custom::construct()
QList<QRgb> table;
table << QRgb(0xff00ff) << QRgb(0x00ff00);
- custom = new QCustom3DVolume(QVector3D(1.0, 1.0, 1.0), QVector3D(1.0, 1.0, 1.0),
- QQuaternion(1.0, 1.0, 10.0, 100.0), 10, 10, 10,
+ custom = new QCustom3DVolume(QVector3D(1.0f, 1.0f, 1.0f), QVector3D(1.0f, 1.0f, 1.0f),
+ QQuaternion(1.0f, 1.0f, 10.0f, 100.0f), 10, 10, 10,
tdata, QImage::Format_ARGB32, table);
QVERIFY(custom);
QCOMPARE(custom->alphaMultiplier(), 1.0f);
@@ -103,10 +103,10 @@ void tst_custom::construct()
QCOMPARE(custom->textureWidth(), 10);
QCOMPARE(custom->textureDepth(), 10);
QCOMPARE(custom->meshFile(), QString(":/defaultMeshes/barFull"));
- QCOMPARE(custom->position(), QVector3D(1.0, 1.0, 1.0));
+ QCOMPARE(custom->position(), QVector3D(1.0f, 1.0f, 1.0f));
QCOMPARE(custom->isPositionAbsolute(), false);
- QCOMPARE(custom->rotation(), QQuaternion(1.0, 1.0, 10.0, 100.0));
- QCOMPARE(custom->scaling(), QVector3D(1.0, 1.0, 1.0));
+ QCOMPARE(custom->rotation(), QQuaternion(1.0f, 1.0f, 10.0f, 100.0f));
+ QCOMPARE(custom->scaling(), QVector3D(1.0f, 1.0f, 1.0f));
QCOMPARE(custom->isScalingAbsolute(), true);
QCOMPARE(custom->isShadowCasting(), false);
QCOMPARE(custom->textureFile(), QString());
@@ -174,18 +174,18 @@ void tst_custom::initializeProperties()
QCOMPARE(m_custom->useHighDefShader(), false);
// Common (from QCustom3DVolume)
- m_custom->setPosition(QVector3D(1.0, 1.0, 1.0));
+ m_custom->setPosition(QVector3D(1.0f, 1.0f, 1.0f));
m_custom->setPositionAbsolute(true);
- m_custom->setRotation(QQuaternion(1.0, 1.0, 10.0, 100.0));
- m_custom->setScaling(QVector3D(1.0, 1.0, 1.0));
+ m_custom->setRotation(QQuaternion(1.0f, 1.0f, 10.0f, 100.0f));
+ m_custom->setScaling(QVector3D(1.0f, 1.0f, 1.0f));
m_custom->setScalingAbsolute(false);
m_custom->setShadowCasting(false);
m_custom->setVisible(false);
- QCOMPARE(m_custom->position(), QVector3D(1.0, 1.0, 1.0));
+ QCOMPARE(m_custom->position(), QVector3D(1.0f, 1.0f, 1.0f));
QCOMPARE(m_custom->isPositionAbsolute(), true);
- QCOMPARE(m_custom->rotation(), QQuaternion(1.0, 1.0, 10.0, 100.0));
- QCOMPARE(m_custom->scaling(), QVector3D(1.0, 1.0, 1.0));
+ QCOMPARE(m_custom->rotation(), QQuaternion(1.0f, 1.0f, 10.0f, 100.0f));
+ QCOMPARE(m_custom->scaling(), QVector3D(1.0f, 1.0f, 1.0f));
QCOMPARE(m_custom->isScalingAbsolute(), false);
QCOMPARE(m_custom->isShadowCasting(), false);
QCOMPARE(m_custom->isVisible(), false);