diff options
Diffstat (limited to 'examples/qt3d/dynamicscene-cpp')
-rw-r--r-- | examples/qt3d/dynamicscene-cpp/boxentity.cpp | 4 | ||||
-rw-r--r-- | examples/qt3d/dynamicscene-cpp/boxentity.h | 4 | ||||
-rw-r--r-- | examples/qt3d/dynamicscene-cpp/forwardrenderer.cpp | 10 | ||||
-rw-r--r-- | examples/qt3d/dynamicscene-cpp/forwardrenderer.h | 8 | ||||
-rw-r--r-- | examples/qt3d/dynamicscene-cpp/main.cpp | 6 |
5 files changed, 16 insertions, 16 deletions
diff --git a/examples/qt3d/dynamicscene-cpp/boxentity.cpp b/examples/qt3d/dynamicscene-cpp/boxentity.cpp index a3f539564..9b35c2316 100644 --- a/examples/qt3d/dynamicscene-cpp/boxentity.cpp +++ b/examples/qt3d/dynamicscene-cpp/boxentity.cpp @@ -42,8 +42,8 @@ BoxEntity::BoxEntity(QNode *parent) : Qt3D::QEntity(parent) , m_transform(new Qt3D::QTransform()) , m_translate(new Qt3D::QTranslateTransform()) - , m_mesh(new Qt3D::QCuboidMesh()) - , m_material(new Qt3D::QPhongMaterial()) + , m_mesh(new Qt3DRender::QCuboidMesh()) + , m_material(new Qt3DRender::QPhongMaterial()) , m_angle(0.0f) , m_radius(1.0f) { diff --git a/examples/qt3d/dynamicscene-cpp/boxentity.h b/examples/qt3d/dynamicscene-cpp/boxentity.h index 6dcf81aff..ab5b15aac 100644 --- a/examples/qt3d/dynamicscene-cpp/boxentity.h +++ b/examples/qt3d/dynamicscene-cpp/boxentity.h @@ -75,8 +75,8 @@ private: Qt3D::QTransform *m_transform; Qt3D::QTranslateTransform *m_translate; Qt3D::QScaleTransform *m_scale; - Qt3D::QCuboidMesh *m_mesh; - Qt3D::QPhongMaterial *m_material; + Qt3DRender::QCuboidMesh *m_mesh; + Qt3DRender::QPhongMaterial *m_material; float m_angle; float m_radius; }; diff --git a/examples/qt3d/dynamicscene-cpp/forwardrenderer.cpp b/examples/qt3d/dynamicscene-cpp/forwardrenderer.cpp index 3c4fd0758..948252790 100644 --- a/examples/qt3d/dynamicscene-cpp/forwardrenderer.cpp +++ b/examples/qt3d/dynamicscene-cpp/forwardrenderer.cpp @@ -37,14 +37,14 @@ #include "forwardrenderer.h" ForwardRenderer::ForwardRenderer(Qt3D::QNode *parent) - : Qt3D::QFrameGraph(parent) - , m_viewport(new Qt3D::QViewport()) - , m_cameraSelector(new Qt3D::QCameraSelector()) - , m_clearBuffer(new Qt3D::QClearBuffer()) + : Qt3DRender::QFrameGraph(parent) + , m_viewport(new Qt3DRender::QViewport()) + , m_cameraSelector(new Qt3DRender::QCameraSelector()) + , m_clearBuffer(new Qt3DRender::QClearBuffer()) { m_viewport->setRect(QRectF(0.0f, 0.0f, 1.0f, 1.0f)); m_viewport->setClearColor(Qt::white); - m_clearBuffer->setBuffers(Qt3D::QClearBuffer::ColorDepthBuffer); + m_clearBuffer->setBuffers(Qt3DRender::QClearBuffer::ColorDepthBuffer); m_cameraSelector->setParent(m_viewport); m_clearBuffer->setParent(m_cameraSelector); setActiveFrameGraph(m_viewport); diff --git a/examples/qt3d/dynamicscene-cpp/forwardrenderer.h b/examples/qt3d/dynamicscene-cpp/forwardrenderer.h index faf6389f9..6df489e29 100644 --- a/examples/qt3d/dynamicscene-cpp/forwardrenderer.h +++ b/examples/qt3d/dynamicscene-cpp/forwardrenderer.h @@ -42,7 +42,7 @@ #include <Qt3DRenderer/QCameraSelector> #include <Qt3DRenderer/QClearBuffer> -class ForwardRenderer : public Qt3D::QFrameGraph +class ForwardRenderer : public Qt3DRender::QFrameGraph { public: ForwardRenderer(Qt3D::QNode *parent); @@ -50,9 +50,9 @@ public: void setCamera(Qt3D::QEntity *camera); private: - Qt3D::QViewport *m_viewport; - Qt3D::QCameraSelector *m_cameraSelector; - Qt3D::QClearBuffer *m_clearBuffer; + Qt3DRender::QViewport *m_viewport; + Qt3DRender::QCameraSelector *m_cameraSelector; + Qt3DRender::QClearBuffer *m_clearBuffer; }; #endif // FORWARDRENDERER_H diff --git a/examples/qt3d/dynamicscene-cpp/main.cpp b/examples/qt3d/dynamicscene-cpp/main.cpp index 27ca086bd..72c302ba1 100644 --- a/examples/qt3d/dynamicscene-cpp/main.cpp +++ b/examples/qt3d/dynamicscene-cpp/main.cpp @@ -55,7 +55,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(); @@ -77,8 +77,8 @@ int main(int argc, char* argv[]) input->setCamera(basicCamera); // Forward Renderer FrameGraph - Qt3D::QFrameGraph *frameGraph = new Qt3D::QFrameGraph(sceneRoot); - Qt3D::QForwardRenderer *forwardRenderer = new Qt3D::QForwardRenderer(); + Qt3DRender::QFrameGraph *frameGraph = new Qt3DRender::QFrameGraph(sceneRoot); + Qt3DRender::QForwardRenderer *forwardRenderer = new Qt3DRender::QForwardRenderer(); forwardRenderer->setCamera(basicCamera); frameGraph->setActiveFrameGraph(forwardRenderer); sceneRoot->addComponent(frameGraph); |