From af40840eedf35404ba4b39e890c158e2328ff6ec Mon Sep 17 00:00:00 2001 From: Sean Harmer Date: Mon, 31 Aug 2015 15:14:17 +0100 Subject: Move Render aspect into the Qt3DRender namespace Updated examples and tests accordingly. Change-Id: I8848a88472de2302aa072fa11f21ea934672b7e6 Reviewed-by: Paul Lemire --- examples/qt3d/materials-cpp/houseplant.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'examples/qt3d/materials-cpp/houseplant.cpp') 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) { -- cgit v1.2.3