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.h | |
| 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.h')
| -rw-r--r-- | examples/qt3d/materials-cpp/houseplant.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/examples/qt3d/materials-cpp/houseplant.h b/examples/qt3d/materials-cpp/houseplant.h index 232608843..d2081b3d1 100644 --- a/examples/qt3d/materials-cpp/houseplant.h +++ b/examples/qt3d/materials-cpp/houseplant.h @@ -53,8 +53,8 @@ #include "renderableentity.h" #include <QEntity> -#include <QNormalDiffuseMapAlphaMaterial> -#include <QNormalDiffuseMapMaterial> +#include <Qt3DExtras/QNormalDiffuseMapAlphaMaterial> +#include <Qt3DExtras/QNormalDiffuseMapMaterial> #include <QTextureImage> class HousePlant : public Qt3DCore::QEntity @@ -96,9 +96,9 @@ private: RenderableEntity *m_plant; RenderableEntity *m_cover; - Qt3DRender::QNormalDiffuseMapMaterial *m_potMaterial; - Qt3DRender::QNormalDiffuseMapAlphaMaterial *m_plantMaterial; - Qt3DRender::QNormalDiffuseMapMaterial *m_coverMaterial; + Qt3DExtras::QNormalDiffuseMapMaterial *m_potMaterial; + Qt3DExtras::QNormalDiffuseMapAlphaMaterial *m_plantMaterial; + Qt3DExtras::QNormalDiffuseMapMaterial *m_coverMaterial; Qt3DRender::QTextureImage *m_potImage; Qt3DRender::QTextureImage *m_potNormalImage; |