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/main.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/main.cpp')
-rw-r--r-- | examples/qt3d/materials-cpp/main.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/examples/qt3d/materials-cpp/main.cpp b/examples/qt3d/materials-cpp/main.cpp index 0ea77c728..f18f1f32a 100644 --- a/examples/qt3d/materials-cpp/main.cpp +++ b/examples/qt3d/materials-cpp/main.cpp @@ -61,7 +61,7 @@ int main(int argc, char* argv[]) Window view; Qt3D::QAspectEngine engine; - engine.registerAspect(new Qt3D::QRenderAspect()); + engine.registerAspect(new Qt3DRender::QRenderAspect()); Qt3DInput::QInputAspect *input = new Qt3DInput::QInputAspect; engine.registerAspect(input); engine.initialize(); @@ -84,8 +84,8 @@ int main(int argc, char* argv[]) input->setCamera(basicCamera); // Forward Renderer FrameGraph - Qt3D::QFrameGraph *frameGraphComponent = new Qt3D::QFrameGraph(sceneRoot); - Qt3D::QForwardRenderer *forwardRenderer = new Qt3D::QForwardRenderer(); + Qt3DRender::QFrameGraph *frameGraphComponent = new Qt3DRender::QFrameGraph(sceneRoot); + Qt3DRender::QForwardRenderer *forwardRenderer = new Qt3DRender::QForwardRenderer(); forwardRenderer->setCamera(basicCamera); frameGraphComponent->setActiveFrameGraph(forwardRenderer); sceneRoot->addComponent(frameGraphComponent); @@ -96,20 +96,20 @@ int main(int argc, char* argv[]) planeEntity->mesh()->setWidth(100.0f); planeEntity->mesh()->setMeshResolution(QSize(20, 20)); - Qt3D::QNormalDiffuseSpecularMapMaterial *normalDiffuseSpecularMapMaterial = new Qt3D::QNormalDiffuseSpecularMapMaterial(); + Qt3DRender::QNormalDiffuseSpecularMapMaterial *normalDiffuseSpecularMapMaterial = new Qt3DRender::QNormalDiffuseSpecularMapMaterial(); normalDiffuseSpecularMapMaterial->setTextureScale(10.0f); normalDiffuseSpecularMapMaterial->setShininess(80.0f); normalDiffuseSpecularMapMaterial->setAmbient(QColor::fromRgbF(0.2f, 0.2f, 0.2f, 1.0f)); - Qt3D::QTextureImage *diffuseImage = new Qt3D::QTextureImage(); + Qt3DRender::QTextureImage *diffuseImage = new Qt3DRender::QTextureImage(); diffuseImage->setSource(QUrl(QStringLiteral("qrc:/assets/textures/pattern_09/diffuse.webp"))); normalDiffuseSpecularMapMaterial->diffuse()->addTextureImage(diffuseImage); - Qt3D::QTextureImage *specularImage = new Qt3D::QTextureImage(); + Qt3DRender::QTextureImage *specularImage = new Qt3DRender::QTextureImage(); specularImage->setSource(QUrl(QStringLiteral("qrc:/assets/textures/pattern_09/specular.webp"))); normalDiffuseSpecularMapMaterial->specular()->addTextureImage(specularImage); - Qt3D::QTextureImage *normalImage = new Qt3D::QTextureImage(); + Qt3DRender::QTextureImage *normalImage = new Qt3DRender::QTextureImage(); normalImage->setSource(QUrl((QStringLiteral("qrc:/assets/textures/pattern_09/normal.webp")))); normalDiffuseSpecularMapMaterial->normal()->addTextureImage(normalImage); @@ -119,11 +119,11 @@ int main(int argc, char* argv[]) RenderableEntity *chest = new RenderableEntity(sceneRoot); chest->scaleTransform()->setScale(0.03f); chest->mesh()->setSource(QUrl(QStringLiteral("qrc:/assets/chest/Chest.obj"))); - Qt3D::QDiffuseMapMaterial *diffuseMapMaterial = new Qt3D::QDiffuseMapMaterial(); + Qt3DRender::QDiffuseMapMaterial *diffuseMapMaterial = new Qt3DRender::QDiffuseMapMaterial(); diffuseMapMaterial->setSpecular(QColor::fromRgbF(0.2f, 0.2f, 0.2f, 1.0f)); diffuseMapMaterial->setShininess(2.0f); - Qt3D::QTextureImage *chestDiffuseImage = new Qt3D::QTextureImage(); + Qt3DRender::QTextureImage *chestDiffuseImage = new Qt3DRender::QTextureImage(); chestDiffuseImage->setSource(QUrl(QStringLiteral("qrc:/assets/chest/diffuse.webp"))); diffuseMapMaterial->diffuse()->addTextureImage(chestDiffuseImage); @@ -134,7 +134,7 @@ int main(int argc, char* argv[]) RotatingTrefoilKnot *trefoil = new RotatingTrefoilKnot(sceneRoot); trefoil->translateTransform()->setDy(3.5); trefoil->scaleTransform()->setScale(0.5f); - Qt3D::QPhongMaterial *phongMaterial = new Qt3D::QPhongMaterial(); + Qt3DRender::QPhongMaterial *phongMaterial = new Qt3DRender::QPhongMaterial(); phongMaterial->setDiffuse(QColor(204, 205, 75)); // Safari Yellow #cccd4b phongMaterial->setSpecular(Qt::white); trefoil->addComponent(phongMaterial); |