diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2016-04-11 14:58:17 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-04-23 11:14:30 +0000 |
| commit | 0542f1614aa6d50c4c9809fb0ce5f1adb5666d67 (patch) | |
| tree | 77a1ed41c16262f5cc7aa9ddb2d66d3f9b61a719 /tests/auto/render/qmaterial/tst_qmaterial.cpp | |
| parent | 8677f62fa690efa29fbb6f870af1ea2b4e7111cf (diff) | |
Move defaults and geometries out of Qt3DRender and into Qt3DExtras
QBoundingVolumeDebug has been disabled for now. Will be re-enabled later on.
Change-Id: Id6b0abab2ec2aa697330bd20d782f9d104d25d50
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'tests/auto/render/qmaterial/tst_qmaterial.cpp')
| -rw-r--r-- | tests/auto/render/qmaterial/tst_qmaterial.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/tests/auto/render/qmaterial/tst_qmaterial.cpp b/tests/auto/render/qmaterial/tst_qmaterial.cpp index 104548b2f..acf03ea87 100644 --- a/tests/auto/render/qmaterial/tst_qmaterial.cpp +++ b/tests/auto/render/qmaterial/tst_qmaterial.cpp @@ -36,13 +36,13 @@ #include <Qt3DRender/QParameter> #include <Qt3DRender/QTechnique> #include <Qt3DRender/QRenderPass> -#include <Qt3DRender/QPhongMaterial> -#include <Qt3DRender/QDiffuseMapMaterial> -#include <Qt3DRender/QPerVertexColorMaterial> -#include <Qt3DRender/QNormalDiffuseMapMaterial> -#include <Qt3DRender/QDiffuseSpecularMapMaterial> -#include <Qt3DRender/QNormalDiffuseMapAlphaMaterial> -#include <Qt3DRender/QNormalDiffuseSpecularMapMaterial> +#include <Qt3DExtras/QPhongMaterial> +#include <Qt3DExtras/QDiffuseMapMaterial> +#include <Qt3DExtras/QPerVertexColorMaterial> +#include <Qt3DExtras/QNormalDiffuseMapMaterial> +#include <Qt3DExtras/QDiffuseSpecularMapMaterial> +#include <Qt3DExtras/QNormalDiffuseMapAlphaMaterial> +#include <Qt3DExtras/QNormalDiffuseSpecularMapMaterial> #include "testpostmanarbiter.h" @@ -201,19 +201,19 @@ private Q_SLOTS: QTest::newRow("empty material") << material; material = new TestMaterial(); QTest::newRow("test material") << material; - material = new Qt3DRender::QPhongMaterial(); + material = new Qt3DExtras::QPhongMaterial(); QTest::newRow("QPhongMaterial") << material; - material = new Qt3DRender::QDiffuseMapMaterial(); + material = new Qt3DExtras::QDiffuseMapMaterial(); QTest::newRow("QDiffuseMapMaterial") << material; - material = new Qt3DRender::QDiffuseSpecularMapMaterial(); + material = new Qt3DExtras::QDiffuseSpecularMapMaterial(); QTest::newRow("QDiffuseMapSpecularMaterial") << material; - material = new Qt3DRender::QPerVertexColorMaterial(); + material = new Qt3DExtras::QPerVertexColorMaterial(); QTest::newRow("QPerVertexColorMaterial") << material; - material = new Qt3DRender::QNormalDiffuseMapMaterial(); + material = new Qt3DExtras::QNormalDiffuseMapMaterial(); QTest::newRow("QNormalDiffuseMapMaterial") << material; - material = new Qt3DRender::QNormalDiffuseMapAlphaMaterial(); + material = new Qt3DExtras::QNormalDiffuseMapAlphaMaterial(); QTest::newRow("QNormalDiffuseMapAlphaMaterial") << material; - material = new Qt3DRender::QNormalDiffuseSpecularMapMaterial(); + material = new Qt3DExtras::QNormalDiffuseSpecularMapMaterial(); QTest::newRow("QNormalDiffuseSpecularMapMaterial") << material; } |