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/deferred-renderer-cpp/finaleffect.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/deferred-renderer-cpp/finaleffect.cpp')
-rw-r--r-- | examples/qt3d/deferred-renderer-cpp/finaleffect.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/examples/qt3d/deferred-renderer-cpp/finaleffect.cpp b/examples/qt3d/deferred-renderer-cpp/finaleffect.cpp index 96134c297..d12cc1450 100644 --- a/examples/qt3d/deferred-renderer-cpp/finaleffect.cpp +++ b/examples/qt3d/deferred-renderer-cpp/finaleffect.cpp @@ -41,27 +41,27 @@ #include <QUrl> FinalEffect::FinalEffect(Qt3D::QNode *parent) - : Qt3D::QEffect(parent) - , m_gl3Technique(new Qt3D::QTechnique()) - , m_gl2Technique(new Qt3D::QTechnique()) - , m_gl2Pass(new Qt3D::QRenderPass()) - , m_gl3Pass(new Qt3D::QRenderPass()) - , m_passCriterion(new Qt3D::QAnnotation(this)) + : Qt3DRender::QEffect(parent) + , m_gl3Technique(new Qt3DRender::QTechnique()) + , m_gl2Technique(new Qt3DRender::QTechnique()) + , m_gl2Pass(new Qt3DRender::QRenderPass()) + , m_gl3Pass(new Qt3DRender::QRenderPass()) + , m_passCriterion(new Qt3DRender::QAnnotation(this)) { - m_gl3Technique->openGLFilter()->setApi(Qt3D::QOpenGLFilter::Desktop); + m_gl3Technique->openGLFilter()->setApi(Qt3DRender::QOpenGLFilter::Desktop); m_gl3Technique->openGLFilter()->setMajorVersion(3); m_gl3Technique->openGLFilter()->setMinorVersion(1); - m_gl3Technique->openGLFilter()->setProfile(Qt3D::QOpenGLFilter::Core); + m_gl3Technique->openGLFilter()->setProfile(Qt3DRender::QOpenGLFilter::Core); - m_gl2Technique->openGLFilter()->setApi(Qt3D::QOpenGLFilter::Desktop); + m_gl2Technique->openGLFilter()->setApi(Qt3DRender::QOpenGLFilter::Desktop); m_gl2Technique->openGLFilter()->setMajorVersion(2); m_gl2Technique->openGLFilter()->setMinorVersion(0); - m_gl2Technique->openGLFilter()->setProfile(Qt3D::QOpenGLFilter::None); + m_gl2Technique->openGLFilter()->setProfile(Qt3DRender::QOpenGLFilter::None); m_passCriterion->setName(QStringLiteral("pass")); m_passCriterion->setValue(QStringLiteral("final")); - Qt3D::QShaderProgram *gl3Shader = new Qt3D::QShaderProgram(); + Qt3DRender::QShaderProgram *gl3Shader = new Qt3DRender::QShaderProgram(); gl3Shader->setVertexShaderCode(gl3Shader->loadSource(QUrl(QStringLiteral("qrc:/final_gl3.vert")))); gl3Shader->setFragmentShaderCode(gl3Shader->loadSource(QUrl(QStringLiteral("qrc:/final_gl3.frag")))); @@ -69,7 +69,7 @@ FinalEffect::FinalEffect(Qt3D::QNode *parent) m_gl3Pass->setShaderProgram(gl3Shader); m_gl3Technique->addPass(m_gl3Pass); - Qt3D::QShaderProgram *gl2Shader = new Qt3D::QShaderProgram(); + Qt3DRender::QShaderProgram *gl2Shader = new Qt3DRender::QShaderProgram(); gl2Shader->setVertexShaderCode(gl2Shader->loadSource(QUrl(QStringLiteral("qrc:/final_gl2.vert")))); gl2Shader->setFragmentShaderCode(gl2Shader->loadSource(QUrl(QStringLiteral("qrc:/final_gl2.frag")))); @@ -81,7 +81,7 @@ FinalEffect::FinalEffect(Qt3D::QNode *parent) addTechnique(m_gl2Technique); } -QList<Qt3D::QAnnotation *> FinalEffect::passCriteria() const +QList<Qt3DRender::QAnnotation *> FinalEffect::passCriteria() const { - return QList<Qt3D::QAnnotation *>() << m_passCriterion; + return QList<Qt3DRender::QAnnotation *>() << m_passCriterion; } |