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 /examples/qt3d/materials-cpp/houseplant.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 'examples/qt3d/materials-cpp/houseplant.cpp')
| -rw-r--r-- | examples/qt3d/materials-cpp/houseplant.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/examples/qt3d/materials-cpp/houseplant.cpp b/examples/qt3d/materials-cpp/houseplant.cpp index b9b42f5a2..638f8c4d1 100644 --- a/examples/qt3d/materials-cpp/houseplant.cpp +++ b/examples/qt3d/materials-cpp/houseplant.cpp @@ -72,9 +72,9 @@ HousePlant::HousePlant(Qt3DCore::QNode *parent) , m_pot(new RenderableEntity(this)) , m_plant(new RenderableEntity(m_pot)) , m_cover(new RenderableEntity(m_pot)) - , m_potMaterial(new Qt3DRender::QNormalDiffuseMapMaterial()) - , m_plantMaterial(new Qt3DRender::QNormalDiffuseMapAlphaMaterial()) - , m_coverMaterial(new Qt3DRender::QNormalDiffuseMapMaterial()) + , m_potMaterial(new Qt3DExtras::QNormalDiffuseMapMaterial()) + , m_plantMaterial(new Qt3DExtras::QNormalDiffuseMapAlphaMaterial()) + , m_coverMaterial(new Qt3DExtras::QNormalDiffuseMapMaterial()) , m_potImage(new Qt3DRender::QTextureImage()) , m_potNormalImage(new Qt3DRender::QTextureImage()) , m_plantImage(new Qt3DRender::QTextureImage()) |