diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2015-08-31 15:14:17 +0100 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2015-10-13 07:15:15 +0000 |
commit | af40840eedf35404ba4b39e890c158e2328ff6ec (patch) | |
tree | ce4ac1f925c34b56704c99bd332e0436e68dbecc /examples/qt3d/materials-cpp/houseplant.cpp | |
parent | 0269afd106da5d4d999585b3bdb1332a2c01af12 (diff) |
Move Render aspect into the Qt3DRender namespace
Updated examples and tests accordingly.
Change-Id: I8848a88472de2302aa072fa11f21ea934672b7e6
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'examples/qt3d/materials-cpp/houseplant.cpp')
-rw-r--r-- | examples/qt3d/materials-cpp/houseplant.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/examples/qt3d/materials-cpp/houseplant.cpp b/examples/qt3d/materials-cpp/houseplant.cpp index c1bea7ecd..df1384486 100644 --- a/examples/qt3d/materials-cpp/houseplant.cpp +++ b/examples/qt3d/materials-cpp/houseplant.cpp @@ -58,16 +58,16 @@ HousePlant::HousePlant(Qt3D::QNode *parent) , m_pot(new RenderableEntity(this)) , m_plant(new RenderableEntity(m_pot)) , m_cover(new RenderableEntity(m_pot)) - , m_potMaterial(new Qt3D::QNormalDiffuseMapMaterial()) - , m_plantMaterial(new Qt3D::QNormalDiffuseMapAlphaMaterial()) - , m_coverMaterial(new Qt3D::QNormalDiffuseMapMaterial()) - , m_potImage(new Qt3D::QTextureImage()) - - , m_potNormalImage(new Qt3D::QTextureImage()) - , m_plantImage(new Qt3D::QTextureImage()) - , m_plantNormalImage(new Qt3D::QTextureImage()) - , m_coverImage(new Qt3D::QTextureImage()) - , m_coverNormalImage(new Qt3D::QTextureImage()) + , m_potMaterial(new Qt3DRender::QNormalDiffuseMapMaterial()) + , m_plantMaterial(new Qt3DRender::QNormalDiffuseMapAlphaMaterial()) + , m_coverMaterial(new Qt3DRender::QNormalDiffuseMapMaterial()) + , m_potImage(new Qt3DRender::QTextureImage()) + + , m_potNormalImage(new Qt3DRender::QTextureImage()) + , m_plantImage(new Qt3DRender::QTextureImage()) + , m_plantNormalImage(new Qt3DRender::QTextureImage()) + , m_coverImage(new Qt3DRender::QTextureImage()) + , m_coverNormalImage(new Qt3DRender::QTextureImage()) , m_plantType(Bamboo) , m_potShape(Cross) { |