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/barrel.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/barrel.cpp')
| -rw-r--r-- | examples/qt3d/materials-cpp/barrel.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/examples/qt3d/materials-cpp/barrel.cpp b/examples/qt3d/materials-cpp/barrel.cpp index 069732254..c89b58d52 100644 --- a/examples/qt3d/materials-cpp/barrel.cpp +++ b/examples/qt3d/materials-cpp/barrel.cpp @@ -62,13 +62,13 @@ Barrel::Barrel(Qt3D::QNode *parent) , m_bumps(NoBumps) , m_diffuseColor(Red) , m_specularColor(None) - , m_material(new Qt3D::QNormalDiffuseSpecularMapMaterial()) + , m_material(new Qt3DRender::QNormalDiffuseSpecularMapMaterial()) , m_diffuseTexture(m_material->diffuse()) , m_normalTexture(m_material->normal()) , m_specularTexture(m_material->specular()) - , m_diffuseTextureImage(new Qt3D::QTextureImage()) - , m_normalTextureImage(new Qt3D::QTextureImage()) - , m_specularTextureImage(new Qt3D::QTextureImage()) + , m_diffuseTextureImage(new Qt3DRender::QTextureImage()) + , m_normalTextureImage(new Qt3DRender::QTextureImage()) + , m_specularTextureImage(new Qt3DRender::QTextureImage()) { mesh()->setSource(QUrl(QStringLiteral("qrc:/assets/metalbarrel/metal_barrel.obj"))); scaleTransform()->setScale(0.03f); |