diff options
Diffstat (limited to 'src/render/frontend')
-rw-r--r-- | src/render/frontend/qitemmodelbuffer.cpp | 4 | ||||
-rw-r--r-- | src/render/frontend/qlayer.h | 8 | ||||
-rw-r--r-- | src/render/frontend/qlayer_p.h | 2 | ||||
-rw-r--r-- | src/render/frontend/qrenderaspect.cpp | 24 | ||||
-rw-r--r-- | src/render/frontend/qrenderaspect.h | 12 | ||||
-rw-r--r-- | src/render/frontend/qrenderaspect_p.h | 2 | ||||
-rw-r--r-- | src/render/frontend/qrenderattachment.h | 8 | ||||
-rw-r--r-- | src/render/frontend/qrenderattachment_p.h | 2 | ||||
-rw-r--r-- | src/render/frontend/qrendertarget.cpp | 2 | ||||
-rw-r--r-- | src/render/frontend/qrendertarget.h | 8 | ||||
-rw-r--r-- | src/render/frontend/qrendertarget_p.h | 2 | ||||
-rw-r--r-- | src/render/frontend/qwindow.cpp | 8 | ||||
-rw-r--r-- | src/render/frontend/qwindow.h | 8 | ||||
-rw-r--r-- | src/render/frontend/qwindow_p.h | 10 | ||||
-rw-r--r-- | src/render/frontend/sphere.cpp | 8 | ||||
-rw-r--r-- | src/render/frontend/sphere.h | 12 |
16 files changed, 60 insertions, 60 deletions
diff --git a/src/render/frontend/qitemmodelbuffer.cpp b/src/render/frontend/qitemmodelbuffer.cpp index c8e5cfc69..8de31a818 100644 --- a/src/render/frontend/qitemmodelbuffer.cpp +++ b/src/render/frontend/qitemmodelbuffer.cpp @@ -41,7 +41,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { @@ -111,7 +111,7 @@ void variantToBytes(void* dest, const QVariant& v, GLint type) namespace { -Qt3D::QAbstractAttribute::DataType typeFromGLType(GLint dataType, uint &dataCount) +Qt3DCore::QAbstractAttribute::DataType typeFromGLType(GLint dataType, uint &dataCount) { switch (dataType) { diff --git a/src/render/frontend/qlayer.h b/src/render/frontend/qlayer.h index 10499d7ba..e877aa108 100644 --- a/src/render/frontend/qlayer.h +++ b/src/render/frontend/qlayer.h @@ -47,12 +47,12 @@ namespace Qt3DRender { class QLayerPrivate; -class QT3DRENDERERSHARED_EXPORT QLayer : public Qt3D::QComponent +class QT3DRENDERERSHARED_EXPORT QLayer : public Qt3DCore::QComponent { Q_OBJECT Q_PROPERTY(QStringList names READ names WRITE setNames NOTIFY namesChanged) public: - explicit QLayer(Qt3D::QNode *parent = 0); + explicit QLayer(Qt3DCore::QNode *parent = 0); ~QLayer(); QStringList names() const; @@ -62,8 +62,8 @@ Q_SIGNALS: void namesChanged(); protected: - QLayer(QLayerPrivate &dd, Qt3D::QNode *parent = 0); - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + QLayer(QLayerPrivate &dd, Qt3DCore::QNode *parent = 0); + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QLayer) diff --git a/src/render/frontend/qlayer_p.h b/src/render/frontend/qlayer_p.h index 8efa4b4ce..1efed58ba 100644 --- a/src/render/frontend/qlayer_p.h +++ b/src/render/frontend/qlayer_p.h @@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QT3DRENDERERSHARED_EXPORT QLayerPrivate : public Qt3D::QComponentPrivate +class QT3DRENDERERSHARED_EXPORT QLayerPrivate : public Qt3DCore::QComponentPrivate { public: QLayerPrivate(); diff --git a/src/render/frontend/qrenderaspect.cpp b/src/render/frontend/qrenderaspect.cpp index 444b54839..3e9dffdcd 100644 --- a/src/render/frontend/qrenderaspect.cpp +++ b/src/render/frontend/qrenderaspect.cpp @@ -121,12 +121,12 @@ static void initResources() QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { /*! - \class Qt3D::QRenderAspectPrivate + \class Qt3DCore::QRenderAspectPrivate \internal */ QRenderAspectPrivate::QRenderAspectPrivate(QRenderAspect::RenderType type) @@ -138,7 +138,7 @@ QRenderAspectPrivate::QRenderAspectPrivate(QRenderAspect::RenderType type) , m_initialized(false) { initResources(); - m_aspectType = Qt3D::QAbstractAspect::AspectRenderer; + m_aspectType = Qt3DCore::QAbstractAspect::AspectRenderer; } void QRenderAspectPrivate::setSurface(QSurface *surface) @@ -201,15 +201,15 @@ QRenderAspect::QRenderAspect(QRenderAspectPrivate &dd, QObject *parent) void QRenderAspect::registerBackendTypes() { Q_D(QRenderAspect); - registerBackendType<Qt3D::QEntity>(QBackendNodeFunctorPtr(new Render::RenderEntityFunctor(d->m_renderer))); - registerBackendType<Qt3D::QTransform>(QBackendNodeFunctorPtr(new Render::NodeFunctor<Render::Transform, Render::TransformManager>(d->m_renderer->transformManager()))); + registerBackendType<Qt3DCore::QEntity>(QBackendNodeFunctorPtr(new Render::RenderEntityFunctor(d->m_renderer))); + registerBackendType<Qt3DCore::QTransform>(QBackendNodeFunctorPtr(new Render::NodeFunctor<Render::Transform, Render::TransformManager>(d->m_renderer->transformManager()))); registerBackendType<QMaterial>(QBackendNodeFunctorPtr(new Render::NodeFunctor<Render::Material, Render::MaterialManager>(d->m_renderer->materialManager()))); registerBackendType<QTechnique>(QBackendNodeFunctorPtr(new Render::NodeFunctor<Render::Technique, Render::TechniqueManager>(d->m_renderer->techniqueManager()))); registerBackendType<QAbstractTextureProvider>(QBackendNodeFunctorPtr(new Render::TextureFunctor(d->m_renderer->textureManager(), d->m_renderer->textureImageManager(), d->m_renderer->textureDataManager()))); registerBackendType<QShaderProgram>(QBackendNodeFunctorPtr(new Render::NodeFunctor<Render::Shader, Render::ShaderManager>(d->m_renderer->shaderManager()))); registerBackendType<QEffect>(QBackendNodeFunctorPtr(new Render::NodeFunctor<Render::Effect, Render::EffectManager>(d->m_renderer->effectManager()))); registerBackendType<QAnnotation>(QBackendNodeFunctorPtr(new Render::NodeFunctor<Render::Annotation, Render::CriterionManager>(d->m_renderer->criterionManager()))); - registerBackendType<Qt3D::QCameraLens>(QBackendNodeFunctorPtr(new Render::NodeFunctor<Render::CameraLens, Render::CameraManager>(d->m_renderer->cameraManager()))); + registerBackendType<Qt3DCore::QCameraLens>(QBackendNodeFunctorPtr(new Render::NodeFunctor<Render::CameraLens, Render::CameraManager>(d->m_renderer->cameraManager()))); registerBackendType<QLayer>(QBackendNodeFunctorPtr(new Render::NodeFunctor<Render::Layer, Render::LayerManager>(d->m_renderer->layerManager()))); registerBackendType<QRenderPass>(QBackendNodeFunctorPtr(new Render::NodeFunctor<Render::RenderPass, Render::RenderPassManager>(d->m_renderer->renderPassManager()))); registerBackendType<QAbstractSceneLoader>(QBackendNodeFunctorPtr(new Render::RenderSceneFunctor(d->m_renderer->sceneManager()))); @@ -258,7 +258,7 @@ void QRenderAspect::renderShutdown() d->m_renderer->shutdown(); } -QVector<Qt3D::QAspectJobPtr> QRenderAspect::jobsToExecute(qint64 time) +QVector<Qt3DCore::QAspectJobPtr> QRenderAspect::jobsToExecute(qint64 time) { Q_D(QRenderAspect); d->m_time = time; @@ -321,7 +321,7 @@ QVector<Qt3D::QAspectJobPtr> QRenderAspect::jobsToExecute(qint64 time) return jobs; } -void QRenderAspect::sceneNodeAdded(Qt3D::QSceneChangePtr &e) +void QRenderAspect::sceneNodeAdded(Qt3DCore::QSceneChangePtr &e) { QScenePropertyChangePtr propertyChange = e.staticCast<QScenePropertyChange>(); QNodePtr nodePtr = propertyChange->value().value<QNodePtr>(); @@ -330,7 +330,7 @@ void QRenderAspect::sceneNodeAdded(Qt3D::QSceneChangePtr &e) visitor.traverse(n, this, &QRenderAspect::visitNode); } -void QRenderAspect::sceneNodeRemoved(Qt3D::QSceneChangePtr &e) +void QRenderAspect::sceneNodeRemoved(Qt3DCore::QSceneChangePtr &e) { QScenePropertyChangePtr propertyChange = e.staticCast<QScenePropertyChange>(); QNodePtr nodePtr = propertyChange->value().value<QNodePtr>(); @@ -344,7 +344,7 @@ qint64 QRenderAspect::time() const return d->m_time; } -void QRenderAspect::setRootEntity(Qt3D::QEntity *rootObject) +void QRenderAspect::setRootEntity(Qt3DCore::QEntity *rootObject) { // setSceneGraphRoot is synchronized using the Renderer's mutex Q_D(QRenderAspect); @@ -362,7 +362,7 @@ void QRenderAspect::onInitialize(const QVariantMap &data) // Register the VSyncFrameAdvanceService to drive the aspect manager loop // depending on the vsync - services()->registerServiceProvider(Qt3D::QServiceLocator::FrameAdvanceService, + services()->registerServiceProvider(Qt3DCore::QServiceLocator::FrameAdvanceService, d->m_renderer->vsyncFrameAdvanceService()); d->m_renderer->setQRenderAspect(this); @@ -394,7 +394,7 @@ void QRenderAspect::onCleanup() d->m_renderer = Q_NULLPTR; } -void QRenderAspect::visitNode(Qt3D::QNode *node) +void QRenderAspect::visitNode(Qt3DCore::QNode *node) { QAbstractAspect::createBackendNode(node); } diff --git a/src/render/frontend/qrenderaspect.h b/src/render/frontend/qrenderaspect.h index 180424565..43242fb13 100644 --- a/src/render/frontend/qrenderaspect.h +++ b/src/render/frontend/qrenderaspect.h @@ -52,7 +52,7 @@ class Renderer; class QRenderAspectPrivate; -class QT3DRENDERERSHARED_EXPORT QRenderAspect : public Qt3D::QAbstractAspect +class QT3DRENDERERSHARED_EXPORT QRenderAspect : public Qt3DCore::QAbstractAspect { Q_OBJECT public: @@ -68,10 +68,10 @@ public: void renderSynchronous(); void renderShutdown(); - QVector<Qt3D::QAspectJobPtr> jobsToExecute(qint64 time) Q_DECL_OVERRIDE; + QVector<Qt3DCore::QAspectJobPtr> jobsToExecute(qint64 time) Q_DECL_OVERRIDE; - void sceneNodeAdded(Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; - void sceneNodeRemoved(Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; + void sceneNodeAdded(Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; + void sceneNodeRemoved(Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; qint64 time() const; @@ -79,13 +79,13 @@ protected: void registerBackendTypes(); private: - void setRootEntity(Qt3D::QEntity *rootObject) Q_DECL_OVERRIDE; + void setRootEntity(Qt3DCore::QEntity *rootObject) Q_DECL_OVERRIDE; void onInitialize(const QVariantMap &data) Q_DECL_OVERRIDE; void onStartup() Q_DECL_OVERRIDE; void onShutdown() Q_DECL_OVERRIDE; void onCleanup() Q_DECL_OVERRIDE; - void visitNode(Qt3D::QNode *node); + void visitNode(Qt3DCore::QNode *node); Q_DECLARE_PRIVATE(QRenderAspect) QRenderAspect(QRenderAspectPrivate &dd, QObject *parent); diff --git a/src/render/frontend/qrenderaspect_p.h b/src/render/frontend/qrenderaspect_p.h index e51e14117..18b1ce91a 100644 --- a/src/render/frontend/qrenderaspect_p.h +++ b/src/render/frontend/qrenderaspect_p.h @@ -66,7 +66,7 @@ namespace Render { class Renderer; } -class QRenderAspectPrivate : public Qt3D::QAbstractAspectPrivate +class QRenderAspectPrivate : public Qt3DCore::QAbstractAspectPrivate { QRenderAspectPrivate(QRenderAspect::RenderType type); diff --git a/src/render/frontend/qrenderattachment.h b/src/render/frontend/qrenderattachment.h index 49c14b146..b19979c5c 100644 --- a/src/render/frontend/qrenderattachment.h +++ b/src/render/frontend/qrenderattachment.h @@ -47,7 +47,7 @@ namespace Qt3DRender { class QAbstractTextureProvider; class QRenderAttachmentPrivate; -class QT3DRENDERERSHARED_EXPORT QRenderAttachment : public Qt3D::QNode +class QT3DRENDERERSHARED_EXPORT QRenderAttachment : public Qt3DCore::QNode { Q_OBJECT Q_PROPERTY(RenderAttachmentType type READ type WRITE setType NOTIFY typeChanged) @@ -91,7 +91,7 @@ public: }; Q_ENUM(CubeMapFace) - explicit QRenderAttachment(Qt3D::QNode *parent = 0); + explicit QRenderAttachment(Qt3DCore::QNode *parent = 0); ~QRenderAttachment(); void setType(RenderAttachmentType type); @@ -121,8 +121,8 @@ Q_SIGNALS: void nameChanged(); protected: - QRenderAttachment(QRenderAttachmentPrivate &dd, Qt3D::QNode *parent = 0); - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + QRenderAttachment(QRenderAttachmentPrivate &dd, Qt3DCore::QNode *parent = 0); + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QRenderAttachment) diff --git a/src/render/frontend/qrenderattachment_p.h b/src/render/frontend/qrenderattachment_p.h index 3b0d82b55..6624b4694 100644 --- a/src/render/frontend/qrenderattachment_p.h +++ b/src/render/frontend/qrenderattachment_p.h @@ -57,7 +57,7 @@ namespace Qt3DRender { class QAbstractTextureProvider; -class QRenderAttachmentPrivate : public Qt3D::QNodePrivate +class QRenderAttachmentPrivate : public Qt3DCore::QNodePrivate { public: QRenderAttachmentPrivate(); diff --git a/src/render/frontend/qrendertarget.cpp b/src/render/frontend/qrendertarget.cpp index ed7354871..2cf2115f3 100644 --- a/src/render/frontend/qrendertarget.cpp +++ b/src/render/frontend/qrendertarget.cpp @@ -41,7 +41,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { diff --git a/src/render/frontend/qrendertarget.h b/src/render/frontend/qrendertarget.h index a7b192b85..9c0fd9858 100644 --- a/src/render/frontend/qrendertarget.h +++ b/src/render/frontend/qrendertarget.h @@ -47,11 +47,11 @@ namespace Qt3DRender { class QRenderTargetPrivate; class QRenderAttachment; -class QT3DRENDERERSHARED_EXPORT QRenderTarget : public Qt3D::QComponent +class QT3DRENDERERSHARED_EXPORT QRenderTarget : public Qt3DCore::QComponent { Q_OBJECT public: - explicit QRenderTarget(Qt3D::QNode *parent = 0); + explicit QRenderTarget(Qt3DCore::QNode *parent = 0); ~QRenderTarget(); void addAttachment(QRenderAttachment *attachment); @@ -59,8 +59,8 @@ public: QList<QRenderAttachment *> attachments() const; protected: - QRenderTarget(QRenderTargetPrivate &dd, Qt3D::QNode *parent = 0); - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + QRenderTarget(QRenderTargetPrivate &dd, Qt3DCore::QNode *parent = 0); + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QRenderTarget) diff --git a/src/render/frontend/qrendertarget_p.h b/src/render/frontend/qrendertarget_p.h index 85d7991f7..8b300faed 100644 --- a/src/render/frontend/qrendertarget_p.h +++ b/src/render/frontend/qrendertarget_p.h @@ -57,7 +57,7 @@ namespace Qt3DRender { class QRenderAttachment; class QRenderTarget; -class QRenderTargetPrivate : public Qt3D::QComponentPrivate +class QRenderTargetPrivate : public Qt3DCore::QComponentPrivate { public: QRenderTargetPrivate(); diff --git a/src/render/frontend/qwindow.cpp b/src/render/frontend/qwindow.cpp index 3b6c3786e..da7ee8f8c 100644 --- a/src/render/frontend/qwindow.cpp +++ b/src/render/frontend/qwindow.cpp @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { @@ -127,13 +127,13 @@ QFrameGraph *QWindow::frameGraph() const return d->m_frameGraph; } -Qt3D::QCamera *QWindow::defaultCamera() +Qt3DCore::QCamera *QWindow::defaultCamera() { Q_D(const QWindow); return d->m_defaultCamera; } -void QWindow::registerAspect(Qt3D::QAbstractAspect *aspect) +void QWindow::registerAspect(Qt3DCore::QAbstractAspect *aspect) { Q_ASSERT(!isVisible()); Q_D(QWindow); @@ -147,7 +147,7 @@ void QWindow::registerAspect(const QString &name) d->m_engine->registerAspect(name); } -void QWindow::setRootEntity(Qt3D::QEntity *root) +void QWindow::setRootEntity(Qt3DCore::QEntity *root) { Q_ASSERT(!isVisible()); Q_D(QWindow); diff --git a/src/render/frontend/qwindow.h b/src/render/frontend/qwindow.h index b1acb2ba1..5ca4686f2 100644 --- a/src/render/frontend/qwindow.h +++ b/src/render/frontend/qwindow.h @@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QAbstractAspect; class QCamera; class QEntity; @@ -61,12 +61,12 @@ public: void setFrameGraph(QFrameGraph *frameGraph); QFrameGraph *frameGraph() const; - Qt3D::QCamera *defaultCamera(); + Qt3DCore::QCamera *defaultCamera(); - void registerAspect(Qt3D::QAbstractAspect *aspect); + void registerAspect(Qt3DCore::QAbstractAspect *aspect); void registerAspect(const QString &name); - void setRootEntity(Qt3D::QEntity *root); + void setRootEntity(Qt3DCore::QEntity *root); void show(); protected: diff --git a/src/render/frontend/qwindow_p.h b/src/render/frontend/qwindow_p.h index 40356eb8f..25f4376a7 100644 --- a/src/render/frontend/qwindow_p.h +++ b/src/render/frontend/qwindow_p.h @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QAspectEngine; class QCamera; class QEntity; @@ -70,11 +70,11 @@ public: QWindowPrivate(); Q_DECLARE_PUBLIC(QWindow) - Qt3D::QEntity *m_root; - Qt3D::QEntity * m_userRoot; - Qt3D::QCamera *m_defaultCamera; + Qt3DCore::QEntity *m_root; + Qt3DCore::QEntity * m_userRoot; + Qt3DCore::QCamera *m_defaultCamera; QFrameGraph *m_frameGraph; - QScopedPointer<Qt3D::QAspectEngine> m_engine; + QScopedPointer<Qt3DCore::QAspectEngine> m_engine; QRenderAspect *m_renderAspect; }; diff --git a/src/render/frontend/sphere.cpp b/src/render/frontend/sphere.cpp index a8b9cd6de..7cdfafeec 100644 --- a/src/render/frontend/sphere.cpp +++ b/src/render/frontend/sphere.cpp @@ -50,7 +50,7 @@ namespace { // Intersects ray r = p + td, |d| = 1, with sphere s and, if intersecting, // returns true and intersection point q; false otherwise -bool intersectRaySphere(const Qt3D::QRay3D &ray, const Qt3DRender::Sphere &s, QVector3D *q = Q_NULLPTR) +bool intersectRaySphere(const Qt3DCore::QRay3D &ray, const Qt3DRender::Sphere &s, QVector3D *q = Q_NULLPTR) { const QVector3D p = ray.origin(); const QVector3D d = ray.direction(); @@ -211,17 +211,17 @@ Sphere Sphere::transformed(const QMatrix4x4 &mat) return Sphere(c, sqrt(rSquared)); } -Qt3D::QNodeId Sphere::id() const +Qt3DCore::QNodeId Sphere::id() const { return m_id; } -bool Sphere::intersects(const Qt3D::QRay3D &ray, QVector3D *q) const +bool Sphere::intersects(const Qt3DCore::QRay3D &ray, QVector3D *q) const { return intersectRaySphere(ray, *this, q); } -Qt3D::QBoundingVolume::Type Sphere::type() const +Qt3DCore::QBoundingVolume::Type Sphere::type() const { return QBoundingVolume::Sphere; } diff --git a/src/render/frontend/sphere.h b/src/render/frontend/sphere.h index e14ecc38b..faa07c433 100644 --- a/src/render/frontend/sphere.h +++ b/src/render/frontend/sphere.h @@ -48,16 +48,16 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QT3DRENDERERSHARED_EXPORT Sphere : public Qt3D::QBoundingSphere +class QT3DRENDERERSHARED_EXPORT Sphere : public Qt3DCore::QBoundingSphere { public: - inline Sphere(const Qt3D::QNodeId &i = Qt3D::QNodeId()) + inline Sphere(const Qt3DCore::QNodeId &i = Qt3DCore::QNodeId()) : m_center() , m_radius(0.0f) , m_id(i) {} - inline Sphere(const QVector3D &c, float r, const Qt3D::QNodeId &i = Qt3D::QNodeId()) + inline Sphere(const QVector3D &c, float r, const Qt3DCore::QNodeId &i = Qt3DCore::QNodeId()) : m_center(c) , m_radius(r) , m_id(i) @@ -89,8 +89,8 @@ public: return *this; } - Qt3D::QNodeId id() const Q_DECL_FINAL; - bool intersects(const Qt3D::QRay3D &ray, QVector3D *q) const Q_DECL_FINAL; + Qt3DCore::QNodeId id() const Q_DECL_FINAL; + bool intersects(const Qt3DCore::QRay3D &ray, QVector3D *q) const Q_DECL_FINAL; Type type() const Q_DECL_FINAL; static Sphere fromPoints(const QVector<QVector3D> &points); @@ -98,7 +98,7 @@ public: private: QVector3D m_center; float m_radius; - Qt3D::QNodeId m_id; + Qt3DCore::QNodeId m_id; static const float ms_epsilon; }; |