diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2016-09-05 09:03:05 +0200 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2016-09-07 14:18:10 +0000 |
| commit | 73a386d4f62dcf83576d8f3e8b7ee7bb688b661d (patch) | |
| tree | 1ac5c145c591eb3146f35a2c35238862eddc99b9 /tests | |
| parent | c8531f512eda3074aa66d8a5c7f9525b3be7f75d (diff) | |
ShaderData: add getter to retrieve transform type of properties
Replaces isPropertyToBeTransformed by propertyTransformType which returns the
TransformType (NoTransform) if the property isn't transformed.
Change-Id: Ib7d91bdcfe18409e6ad6d6f5bc119c46dd7fb143
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/render/renderviewutils/tst_renderviewutils.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/tests/auto/render/renderviewutils/tst_renderviewutils.cpp b/tests/auto/render/renderviewutils/tst_renderviewutils.cpp index b3ef1ba74..e4681a257 100644 --- a/tests/auto/render/renderviewutils/tst_renderviewutils.cpp +++ b/tests/auto/render/renderviewutils/tst_renderviewutils.cpp @@ -523,18 +523,20 @@ void tst_RenderViewUtils::transformedProperties() // THEN Qt3DRender::Render::ShaderData *backendShaderData = manager->lookupResource(shaderData->id()); QVERIFY(backendShaderData != nullptr); - QVERIFY(!backendShaderData->isPropertyToBeTransformed(QStringLiteral("position0"))); - QVERIFY(backendShaderData->isPropertyToBeTransformed(QStringLiteral("position1"))); - QVERIFY(backendShaderData->isPropertyToBeTransformed(QStringLiteral("position2"))); - QVERIFY(backendShaderData->isPropertyToBeTransformed(QStringLiteral("position3"))); + QCOMPARE(backendShaderData->propertyTransformType(QStringLiteral("position0")), Qt3DRender::Render::ShaderData::NoTransform); + QCOMPARE(backendShaderData->propertyTransformType(QStringLiteral("position1")), Qt3DRender::Render::ShaderData::ModelToEye); + QCOMPARE(backendShaderData->propertyTransformType(QStringLiteral("position2")), Qt3DRender::Render::ShaderData::ModelToWorld); + QCOMPARE(backendShaderData->propertyTransformType(QStringLiteral("position3")), Qt3DRender::Render::ShaderData::ModelToWorldDirection); // WHEN backendShaderData->updateWorldTransform(worldMatrix); const QVector3D position1Value = backendShaderData->getTransformedProperty(QStringLiteral("position1"), viewMatrix).value<QVector3D>(); const QVector3D position2Value = backendShaderData->getTransformedProperty(QStringLiteral("position2"), viewMatrix).value<QVector3D>(); const QVector3D position3Value = backendShaderData->getTransformedProperty(QStringLiteral("position3"), viewMatrix).value<QVector3D>(); + const QVariant position0Value = backendShaderData->getTransformedProperty(QStringLiteral("position0"), viewMatrix); // THEN + QCOMPARE(position0Value, QVariant()); QCOMPARE(position1Value, viewMatrix * worldMatrix * position); QCOMPARE(position2Value, worldMatrix * position); QCOMPARE(position3Value, (worldMatrix * QVector4D(position, 0.0f)).toVector3D()); |