diff options
Diffstat (limited to 'src/quick3d')
37 files changed, 192 insertions, 224 deletions
diff --git a/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp b/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp index 685b09ea1..8e654f395 100644 --- a/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp +++ b/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp @@ -54,29 +54,29 @@ QT_BEGIN_NAMESPACE void Qt3DQuick3DCorePlugin::registerTypes(const char *uri) { - Qt3D::Quick::Quick3D_initialize(); + Qt3DCore::Quick::Quick3D_initialize(); - qmlRegisterUncreatableType<Qt3D::QComponent>(uri, 2, 0, "Component3D", QStringLiteral("")); - qmlRegisterUncreatableType<Qt3D::QAbstractTransform>(uri, 2, 0, "QAbstractTransform", QStringLiteral("QAbstractTransform is abstract")); + qmlRegisterUncreatableType<Qt3DCore::QComponent>(uri, 2, 0, "Component3D", QStringLiteral("")); + qmlRegisterUncreatableType<Qt3DCore::QAbstractTransform>(uri, 2, 0, "QAbstractTransform", QStringLiteral("QAbstractTransform is abstract")); - qmlRegisterType<Qt3D::Quick::Quick3DConfiguration>(uri, 2, 0, "Configuration"); - Qt3D::Quick::registerExtendedType<Qt3D::QEntity, Qt3D::Quick::Quick3DEntity>("QEntity", "Qt3D/Entity", uri, 2, 0, "Entity"); - qmlRegisterType<Qt3D::Quick::Quick3DEntityLoader>(uri, 2, 0, "EntityLoader"); - qmlRegisterType<Qt3D::Quick::Quick3DNodeInstantiator>(uri, 2, 0, "NodeInstantiator"); - Qt3D::Quick::registerExtendedType<Qt3D::QTransform, Qt3D::Quick::Quick3DTransform>("QTransform", "Qt3D/Transform", uri, 2, 0, "Transform"); + qmlRegisterType<Qt3DCore::Quick::Quick3DConfiguration>(uri, 2, 0, "Configuration"); + Qt3DCore::Quick::registerExtendedType<Qt3DCore::QEntity, Qt3DCore::Quick::Quick3DEntity>("QEntity", "Qt3D/Entity", uri, 2, 0, "Entity"); + qmlRegisterType<Qt3DCore::Quick::Quick3DEntityLoader>(uri, 2, 0, "EntityLoader"); + qmlRegisterType<Qt3DCore::Quick::Quick3DNodeInstantiator>(uri, 2, 0, "NodeInstantiator"); + Qt3DCore::Quick::registerExtendedType<Qt3DCore::QTransform, Qt3DCore::Quick::Quick3DTransform>("QTransform", "Qt3D/Transform", uri, 2, 0, "Transform"); // Ideally we want to make Node an uncreatable type // We would need qmlRegisterUncreatableExtendedType for that - qmlRegisterExtendedUncreatableType<Qt3D::QNode, Qt3D::Quick::Quick3DNode>(uri, 2, 0, "Node", QStringLiteral("Node is a base class")); - Qt3D::Quick::registerExtendedType<Qt3D::QCamera, Qt3D::Quick::Quick3DNode>("QCamera", "Qt3D/Camera", uri, 2, 0, "Camera"); - qmlRegisterType<Qt3D::QCameraLens>(uri, 2, 0, "CameraLens"); + qmlRegisterExtendedUncreatableType<Qt3DCore::QNode, Qt3DCore::Quick::Quick3DNode>(uri, 2, 0, "Node", QStringLiteral("Node is a base class")); + Qt3DCore::Quick::registerExtendedType<Qt3DCore::QCamera, Qt3DCore::Quick::Quick3DNode>("QCamera", "Qt3D/Camera", uri, 2, 0, "Camera"); + qmlRegisterType<Qt3DCore::QCameraLens>(uri, 2, 0, "CameraLens"); - qmlRegisterType<Qt3D::QMatrixTransform>(uri, 2, 0, "MatrixTransform"); - qmlRegisterType<Qt3D::QTranslateTransform>(uri, 2, 0, "Translate"); - qmlRegisterType<Qt3D::QRotateTransform>(uri, 2, 0, "Rotate"); - qmlRegisterType<Qt3D::QLookAtTransform>(uri, 2, 0, "LookAt"); - qmlRegisterType<Qt3D::QScaleTransform>(uri, 2, 0, "Scale"); + qmlRegisterType<Qt3DCore::QMatrixTransform>(uri, 2, 0, "MatrixTransform"); + qmlRegisterType<Qt3DCore::QTranslateTransform>(uri, 2, 0, "Translate"); + qmlRegisterType<Qt3DCore::QRotateTransform>(uri, 2, 0, "Rotate"); + qmlRegisterType<Qt3DCore::QLookAtTransform>(uri, 2, 0, "LookAt"); + qmlRegisterType<Qt3DCore::QScaleTransform>(uri, 2, 0, "Scale"); - qmlRegisterUncreatableType<Qt3D::QAbstractAttribute>(uri, 2, 0, "AbstractAttribute", QStringLiteral("QAbstractAttribute is abstract")); + qmlRegisterUncreatableType<Qt3DCore::QAbstractAttribute>(uri, 2, 0, "AbstractAttribute", QStringLiteral("QAbstractAttribute is abstract")); } QT_END_NAMESPACE diff --git a/src/quick3d/imports/render/qt3dquick3drendererplugin.cpp b/src/quick3d/imports/render/qt3dquick3drendererplugin.cpp index bef34eec0..690d4f9fb 100644 --- a/src/quick3d/imports/render/qt3dquick3drendererplugin.cpp +++ b/src/quick3d/imports/render/qt3dquick3drendererplugin.cpp @@ -197,8 +197,8 @@ void Qt3DQuick3DRendererPlugin::registerTypes(const char *uri) qmlRegisterType<Qt3DRender::QTextureImage>(uri, 2, 0, "TextureImage"); // Geometry - qmlRegisterUncreatableType<Qt3D::QAbstractAttribute>(uri, 2, 0, "QAbstractAttribute", QStringLiteral("QAbstractAttribute is abstract")); - qmlRegisterUncreatableType<Qt3D::QAbstractBuffer>(uri, 2, 0, "QAbstractBuffer", QStringLiteral("QAbstractBuffer is abstract")); + qmlRegisterUncreatableType<Qt3DCore::QAbstractAttribute>(uri, 2, 0, "QAbstractAttribute", QStringLiteral("QAbstractAttribute is abstract")); + qmlRegisterUncreatableType<Qt3DCore::QAbstractBuffer>(uri, 2, 0, "QAbstractBuffer", QStringLiteral("QAbstractBuffer is abstract")); qmlRegisterType<Qt3DRender::QAttribute>(uri, 2, 0, "Attribute"); qmlRegisterType<Qt3DRender::QBuffer>(uri, 2, 0, "Buffer"); Qt3DRender::Quick::registerExtendedType<Qt3DRender::QGeometry, Qt3DRender::Render::Quick::Quick3DGeometry>("QGeometry", "Qt3D.Renderer/Geometry", uri, 2, 0, "Geometry"); @@ -223,7 +223,7 @@ void Qt3DQuick3DRendererPlugin::registerTypes(const char *uri) qmlRegisterType<Qt3DRender::QSpotLight>(uri, 2, 0, "SpotLight"); // FrameGraph - Qt3DRender::Quick::registerExtendedType<Qt3DRender::QCameraSelector, Qt3D::Quick::Quick3DNode>("QCameraSelector", "Qt3D.Renderer/CameraSelector", uri, 2, 0, "CameraSelector"); + Qt3DRender::Quick::registerExtendedType<Qt3DRender::QCameraSelector, Qt3DCore::Quick::Quick3DNode>("QCameraSelector", "Qt3D.Renderer/CameraSelector", uri, 2, 0, "CameraSelector"); Qt3DRender::Quick::registerExtendedType<Qt3DRender::QRenderPassFilter, Qt3DRender::Render::Quick::Quick3DRenderPassFilter>("QRenderPassFilter", "Qt3D.Renderer/RenderPassFilter", uri, 2, 0, "RenderPassFilter"); Qt3DRender::Quick::registerExtendedType<Qt3DRender::QTechniqueFilter, Qt3DRender::Render::Quick::Quick3DTechniqueFilter>("QTechniqueFilter", "Qt3D.Renderer/TechniqueFilter", uri, 2, 0, "TechniqueFilter"); Qt3DRender::Quick::registerExtendedType<Qt3DRender::QViewport, Qt3DRender::Render::Quick::Quick3DViewport>("QViewport", "Qt3D.Renderer/Viewport", uri, 2, 0, "Viewport"); diff --git a/src/quick3d/imports/scene3d/scene3ditem.cpp b/src/quick3d/imports/scene3d/scene3ditem.cpp index 7daca94ad..840da7a0d 100644 --- a/src/quick3d/imports/scene3d/scene3ditem.cpp +++ b/src/quick3d/imports/scene3d/scene3ditem.cpp @@ -83,13 +83,13 @@ private: class Scene3DSGNode; /*! - \class Qt3D::Scene3DRenderer + \class Qt3DCore::Scene3DRenderer \internal - \brief The Qt3D::Scene3DRenderer class takes care of rendering a Qt3D scene + \brief The Qt3DCore::Scene3DRenderer class takes care of rendering a Qt3D scene within a Framebuffer object to be used by the QtQuick 2 renderer. - The Qt3D::Scene3DRenderer class renders a Qt3D scene as provided by a Qt3D::Scene3DItem. + The Qt3DCore::Scene3DRenderer class renders a Qt3D scene as provided by a Qt3DCore::Scene3DItem. It owns the aspectEngine even though it doesn't instantiate it. The shutdown procedure is a two steps process that goes as follow: @@ -147,7 +147,7 @@ class Scene3DRenderer : public QObject Q_OBJECT public: Scene3DRenderer(Scene3DItem *item, - Qt3D::QAspectEngine *aspectEngine, + Qt3DCore::QAspectEngine *aspectEngine, QRenderAspect *renderAspect) : QObject() , m_item(item) @@ -248,7 +248,7 @@ public Q_SLOTS: private: Scene3DItem *m_item; // Will be released by the QQuickWindow/QML Engine - Qt3D::QAspectEngine *m_aspectEngine; // Will be released by the Scene3DRendererCleaner + Qt3DCore::QAspectEngine *m_aspectEngine; // Will be released by the Scene3DRendererCleaner QRenderAspect *m_renderAspect; // Will be released by the aspectEngine QScopedPointer<QOpenGLFramebufferObject> m_multisampledFBO; QScopedPointer<QOpenGLFramebufferObject> m_finalFBO; @@ -263,13 +263,13 @@ private: }; /*! - \class Qt3D::SCene3DMaterialShader + \class Qt3DCore::SCene3DMaterialShader \internal - \brief The Qt3D::Scene3DSGMaterialShader class is a custom - QSGMaterialShader subclass instantiated by a Qt3D::Scene3DSGMateria1 + \brief The Qt3DCore::Scene3DSGMaterialShader class is a custom + QSGMaterialShader subclass instantiated by a Qt3DCore::Scene3DSGMateria1 - The Qt3D::Scene3DSGMaterialShader provides a shader that renders a texture + The Qt3DCore::Scene3DSGMaterialShader provides a shader that renders a texture using premultiplied alpha. */ class Scene3DSGMaterialShader : public QSGMaterialShader @@ -353,14 +353,14 @@ private: QSGMaterialType Scene3DSGMaterialShader::type; /*! - \class Qt3D::Scene3DSGMaterial + \class Qt3DCore::Scene3DSGMaterial \internal \inherit QSGMaterial - \brief The Qt3D::Scene3DSGMaterial class is a custom QSGMaterial subclass used to - render a Qt3D::Scene3DSGNode + \brief The Qt3DCore::Scene3DSGMaterial class is a custom QSGMaterial subclass used to + render a Qt3DCore::Scene3DSGNode - The Qt3D::Scene3DSGMaterial class renders a texture using premultiplied + The Qt3DCore::Scene3DSGMaterial class renders a texture using premultiplied alpha unlike the QSGSimpleTextureMaterial. This is needed to properly integrate alpha blending from a Qt3D scene @@ -389,13 +389,13 @@ private: }; /*! - \class Qt3D::Scene3DSGNode + \class Qt3DCore::Scene3DSGNode \internal - \brief The Qt3D::Scene3DSGNode class is a simple QSGeometryNode subclass that - uses a Qt3D::Scene3DMaterial + \brief The Qt3DCore::Scene3DSGNode class is a simple QSGeometryNode subclass that + uses a Qt3DCore::Scene3DMaterial - The Qt3D::Scene3DSGNode allows to render a simple rect texture with + The Qt3DCore::Scene3DSGNode allows to render a simple rect texture with premultiplied alpha. */ class Scene3DSGNode : public QSGGeometryNode @@ -448,22 +448,22 @@ private: }; /*! - \class Qt3D::Scene3DItem + \class Qt3DCore::Scene3DItem \internal - \brief The Qt3D::Scene3DItem class is a QQuickItem subclass used to integrate + \brief The Qt3DCore::Scene3DItem class is a QQuickItem subclass used to integrate a Qt3D scene into a QtQuick 2 scene. - The Qt3D::Scene3DItem class renders a Qt3D scene, provided by a Qt3D::QEntity + The Qt3DCore::Scene3DItem class renders a Qt3D scene, provided by a Qt3DCore::QEntity into a multisampled Framebuffer object that is later blitted into a non multisampled Framebuffer object to be then renderer through the use of a - Qt3D::Scene3DSGNode with premultiplied alpha. + Qt3DCore::Scene3DSGNode with premultiplied alpha. */ Scene3DItem::Scene3DItem(QQuickItem *parent) : QQuickItem(parent) , m_entity(Q_NULLPTR) - , m_aspectEngine(new Qt3D::QAspectEngine()) + , m_aspectEngine(new Qt3DCore::QAspectEngine()) , m_renderAspect(new QRenderAspect(QRenderAspect::Synchronous)) , m_renderer(Q_NULLPTR) , m_rendererCleaner(new Scene3DCleaner()) @@ -489,7 +489,7 @@ QStringList Scene3DItem::aspects() const return m_aspects; } -Qt3D::QEntity *Scene3DItem::entity() const +Qt3DCore::QEntity *Scene3DItem::entity() const { return m_entity; } @@ -518,7 +518,7 @@ void Scene3DItem::setAspects(const QStringList &aspects) emit aspectsChanged(); } -void Scene3DItem::setEntity(Qt3D::QEntity *entity) +void Scene3DItem::setEntity(Qt3DCore::QEntity *entity) { if (entity == m_entity) return; diff --git a/src/quick3d/imports/scene3d/scene3ditem_p.h b/src/quick3d/imports/scene3d/scene3ditem_p.h index 1f0eaafc1..301af9022 100644 --- a/src/quick3d/imports/scene3d/scene3ditem_p.h +++ b/src/quick3d/imports/scene3d/scene3ditem_p.h @@ -41,7 +41,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QAspectEngine; class QEntity; } @@ -55,7 +55,7 @@ class Scene3DCleaner; class Scene3DItem : public QQuickItem { Q_OBJECT - Q_PROPERTY(Qt3D::QEntity* entity READ entity WRITE setEntity NOTIFY entityChanged) + Q_PROPERTY(Qt3DCore::QEntity* entity READ entity WRITE setEntity NOTIFY entityChanged) Q_PROPERTY(QStringList aspects READ aspects WRITE setAspects NOTIFY aspectsChanged) Q_PROPERTY(bool multisample READ multisample WRITE setMultisample NOTIFY multisampleChanged) Q_CLASSINFO("DefaultProperty", "entity") @@ -64,14 +64,14 @@ public: ~Scene3DItem(); QStringList aspects() const; - Qt3D::QEntity *entity() const; + Qt3DCore::QEntity *entity() const; bool multisample() const; void setMultisample(bool enable); public Q_SLOTS: void setAspects(const QStringList &aspects); - void setEntity(Qt3D::QEntity *entity); + void setEntity(Qt3DCore::QEntity *entity); Q_SIGNALS: void aspectsChanged(); @@ -85,9 +85,9 @@ private: QSGNode *updatePaintNode(QSGNode *node, UpdatePaintNodeData *nodeData) Q_DECL_OVERRIDE; QStringList m_aspects; - Qt3D::QEntity *m_entity; + Qt3DCore::QEntity *m_entity; - Qt3D::QAspectEngine *m_aspectEngine; + Qt3DCore::QAspectEngine *m_aspectEngine; QRenderAspect *m_renderAspect; Scene3DRenderer *m_renderer; Scene3DCleaner *m_rendererCleaner; diff --git a/src/quick3d/quick3d/items/quick3dconfiguration.cpp b/src/quick3d/quick3d/items/quick3dconfiguration.cpp index 5efb7d0aa..433e5e0d2 100644 --- a/src/quick3d/quick3d/items/quick3dconfiguration.cpp +++ b/src/quick3d/quick3d/items/quick3dconfiguration.cpp @@ -46,8 +46,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { - +namespace Qt3DCore { namespace Quick { /*! @@ -71,7 +70,7 @@ void Quick3DConfiguration::setControlledCamera(QCamera *camera) } /*! - \qmlproperty Camera Qt3D::Configuration::controlledCamera + \qmlproperty Camera Qt3DCore::Configuration::controlledCamera */ QCamera *Quick3DConfiguration::controlledCamera() const { @@ -96,8 +95,7 @@ void Quick3DConfiguration::applyControlledCameraChange() } } -} // Quick - -} // Qt3D +} // namespace Quick +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/quick3d/quick3d/items/quick3dconfiguration.h b/src/quick3d/quick3d/items/quick3dconfiguration.h index f65076ab0..99606698b 100644 --- a/src/quick3d/quick3d/items/quick3dconfiguration.h +++ b/src/quick3d/quick3d/items/quick3dconfiguration.h @@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QCamera; @@ -51,7 +51,7 @@ namespace Quick { class QT3DQUICKSHARED_EXPORT Quick3DConfiguration : public QObject { Q_OBJECT - Q_PROPERTY(Qt3D::QCamera *controlledCamera READ controlledCamera WRITE setControlledCamera NOTIFY controlledCameraChanged) + Q_PROPERTY(Qt3DCore::QCamera *controlledCamera READ controlledCamera WRITE setControlledCamera NOTIFY controlledCameraChanged) public: explicit Quick3DConfiguration(QObject *parent = 0); @@ -68,9 +68,8 @@ private: QCamera *m_camera; }; -} // Quick - -} // Qt3D +} // namespace Quick +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/quick3d/quick3d/items/quick3dentity.cpp b/src/quick3d/quick3d/items/quick3dentity.cpp index c00eb0899..8b3b9ba4b 100644 --- a/src/quick3d/quick3d/items/quick3dentity.cpp +++ b/src/quick3d/quick3d/items/quick3dentity.cpp @@ -39,8 +39,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { - +namespace Qt3DCore { namespace Quick { /*! @@ -56,12 +55,12 @@ Quick3DEntity::Quick3DEntity(QObject *parent) } /*! - \qmlproperty list<Component3D> Qt3D::Entity::components + \qmlproperty list<Component3D> Qt3DCore::Entity::components \readonly */ QQmlListProperty<QComponent> Quick3DEntity::componentList() { - return QQmlListProperty<Qt3D::QComponent>(this, 0, + return QQmlListProperty<Qt3DCore::QComponent>(this, 0, Quick3DEntity::qmlAppendComponent, Quick3DEntity::qmlComponentsCount, Quick3DEntity::qmlComponentAt, @@ -97,8 +96,7 @@ void Quick3DEntity::qmlClearComponents(QQmlListProperty<QComponent> *list) } } -} // Quick - -} // Qt3D +} // namespace Quick +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/quick3d/quick3d/items/quick3dentity.h b/src/quick3d/quick3d/items/quick3dentity.h index 1db358037..3a9adca06 100644 --- a/src/quick3d/quick3d/items/quick3dentity.h +++ b/src/quick3d/quick3d/items/quick3dentity.h @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QEntity; class QComponent; @@ -54,25 +54,24 @@ namespace Quick { class QT3DQUICKSHARED_EXPORT Quick3DEntity : public QObject { Q_OBJECT - Q_PROPERTY(QQmlListProperty<Qt3D::QComponent> components READ componentList) + Q_PROPERTY(QQmlListProperty<Qt3DCore::QComponent> components READ componentList) public: explicit Quick3DEntity(QObject *parent = 0); - QQmlListProperty<Qt3D::QComponent> componentList(); + QQmlListProperty<Qt3DCore::QComponent> componentList(); inline QEntity *parentEntity() const { return qobject_cast<QEntity*>(parent()); } private: - static void qmlAppendComponent(QQmlListProperty<Qt3D::QComponent> *list, Qt3D::QComponent *comp); - static QComponent *qmlComponentAt(QQmlListProperty<Qt3D::QComponent> *list, int index); - static int qmlComponentsCount(QQmlListProperty<Qt3D::QComponent> *list); - static void qmlClearComponents(QQmlListProperty<Qt3D::QComponent> *list); + static void qmlAppendComponent(QQmlListProperty<Qt3DCore::QComponent> *list, Qt3DCore::QComponent *comp); + static QComponent *qmlComponentAt(QQmlListProperty<Qt3DCore::QComponent> *list, int index); + static int qmlComponentsCount(QQmlListProperty<Qt3DCore::QComponent> *list); + static void qmlClearComponents(QQmlListProperty<Qt3DCore::QComponent> *list); }; -} // Quick - -} // Qt3D +} // namespace Quick +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/quick3d/quick3d/items/quick3dentityloader.cpp b/src/quick3d/quick3d/items/quick3dentityloader.cpp index 1fe8945e1..0b4d3d9a1 100644 --- a/src/quick3d/quick3d/items/quick3dentityloader.cpp +++ b/src/quick3d/quick3d/items/quick3dentityloader.cpp @@ -45,8 +45,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { - +namespace Qt3DCore { namespace Quick { class Quick3DEntityLoaderIncubator : public QQmlIncubator @@ -105,7 +104,7 @@ Quick3DEntityLoader::~Quick3DEntityLoader() } /*! - \qmlproperty QtQml::QtObject Qt3D::EntityLoader::entity + \qmlproperty QtQml::QtObject Qt3DCore::EntityLoader::entity \readonly */ QObject *Quick3DEntityLoader::entity() const @@ -115,7 +114,7 @@ QObject *Quick3DEntityLoader::entity() const } /*! - \qmlproperty url Qt3D::EntityLoader::source + \qmlproperty url Qt3DCore::EntityLoader::source */ QUrl Quick3DEntityLoader::source() const { @@ -146,7 +145,7 @@ void Quick3DEntityLoader::copy(const QNode *ref) } /*! - \class Qt3D::Quick::Quick3DEntityLoaderPrivate + \class Qt3DCore::Quick::Quick3DEntityLoaderPrivate \internal */ Quick3DEntityLoaderPrivate::Quick3DEntityLoaderPrivate() @@ -236,9 +235,8 @@ void Quick3DEntityLoaderPrivate::_q_componentStatusChanged(QQmlComponent::Status m_component->create(*m_incubator, m_context); } -} // Quick - -} // Qt3D +} // namespace Quick +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/quick3d/quick3d/items/quick3dentityloader.h b/src/quick3d/quick3d/items/quick3dentityloader.h index 0280ca3aa..49d689e02 100644 --- a/src/quick3d/quick3d/items/quick3dentityloader.h +++ b/src/quick3d/quick3d/items/quick3dentityloader.h @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QEntity; @@ -82,9 +82,8 @@ private: QT3D_CLONEABLE(Quick3DEntityLoader) }; -} // Quick; - -} // Qt3D +} // namespace Quick +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/quick3d/quick3d/items/quick3dentityloader_p.h b/src/quick3d/quick3d/items/quick3dentityloader_p.h index 2cd0ffda4..21ec9ed55 100644 --- a/src/quick3d/quick3d/items/quick3dentityloader_p.h +++ b/src/quick3d/quick3d/items/quick3dentityloader_p.h @@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE class QQmlIncubator; class QQmlContext; -namespace Qt3D { +namespace Qt3DCore { class QEntity; @@ -89,9 +89,8 @@ public: QEntity *m_entity; }; -} // Quick - -} // Qt3D +} // namespace Quick +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/quick3d/quick3d/items/quick3dnode.cpp b/src/quick3d/quick3d/items/quick3dnode.cpp index c230df447..2c4128bed 100644 --- a/src/quick3d/quick3d/items/quick3dnode.cpp +++ b/src/quick3d/quick3d/items/quick3dnode.cpp @@ -39,8 +39,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { - +namespace Qt3DCore { namespace Quick { /*! @@ -58,7 +57,7 @@ Quick3DNode::Quick3DNode(QObject *parent) } /*! - \qmlproperty list<QtQml::QtObject> Qt3D::Node::data + \qmlproperty list<QtQml::QtObject> Qt3DCore::Node::data \default */ @@ -72,7 +71,7 @@ QQmlListProperty<QObject> Quick3DNode::data() } /*! - \qmlproperty list<Node> Qt3D::Node::childNodes + \qmlproperty list<Node> Qt3DCore::Node::childNodes \readonly */ @@ -113,7 +112,7 @@ void Quick3DNode::clearData(QQmlListProperty<QObject> *list) self->childRemoved(0, child); } -void Quick3DNode::appendChild(QQmlListProperty<Qt3D::QNode> *list, Qt3D::QNode *obj) +void Quick3DNode::appendChild(QQmlListProperty<Qt3DCore::QNode> *list, Qt3DCore::QNode *obj) { if (!obj) return; @@ -124,19 +123,19 @@ void Quick3DNode::appendChild(QQmlListProperty<Qt3D::QNode> *list, Qt3D::QNode * self->childAppended(0, obj); } -Qt3D::QNode *Quick3DNode::childAt(QQmlListProperty<Qt3D::QNode> *list, int index) +Qt3DCore::QNode *Quick3DNode::childAt(QQmlListProperty<Qt3DCore::QNode> *list, int index) { Quick3DNode *self = static_cast<Quick3DNode *>(list->object); return qobject_cast<QNode *>(self->parentNode()->children().at(index)); } -int Quick3DNode::childCount(QQmlListProperty<Qt3D::QNode> *list) +int Quick3DNode::childCount(QQmlListProperty<Qt3DCore::QNode> *list) { Quick3DNode *self = static_cast<Quick3DNode *>(list->object); return self->parentNode()->children().count(); } -void Quick3DNode::clearChildren(QQmlListProperty<Qt3D::QNode> *list) +void Quick3DNode::clearChildren(QQmlListProperty<Qt3DCore::QNode> *list) { Quick3DNode *self = static_cast<Quick3DNode *>(list->object); Q_FOREACH (QObject *const child, self->parentNode()->children()) @@ -163,8 +162,7 @@ void Quick3DNode::childRemoved(int, QObject *obj) obj->setParent(Q_NULLPTR); } -} // Quick - -} // Qt3D +} // namespace Quick +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/quick3d/quick3d/items/quick3dnode.h b/src/quick3d/quick3d/items/quick3dnode.h index 008583ecc..96fcd78e4 100644 --- a/src/quick3d/quick3d/items/quick3dnode.h +++ b/src/quick3d/quick3d/items/quick3dnode.h @@ -43,21 +43,20 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { - +namespace Qt3DCore { namespace Quick { class QT3DQUICKSHARED_EXPORT Quick3DNode : public QObject { Q_OBJECT Q_PROPERTY(QQmlListProperty<QObject> data READ data) - Q_PROPERTY(QQmlListProperty<Qt3D::QNode> childNodes READ childNodes) + Q_PROPERTY(QQmlListProperty<Qt3DCore::QNode> childNodes READ childNodes) Q_CLASSINFO("DefaultProperty", "data") public: explicit Quick3DNode(QObject *parent = 0); QQmlListProperty<QObject> data(); - QQmlListProperty<Qt3D::QNode> childNodes(); + QQmlListProperty<Qt3DCore::QNode> childNodes(); inline QNode *parentNode() const { return qobject_cast<QNode*>(parent()); } @@ -67,19 +66,18 @@ private: static int dataCount(QQmlListProperty<QObject> *list); static void clearData(QQmlListProperty<QObject> *list); - static void appendChild(QQmlListProperty<Qt3D::QNode> *list, Qt3D::QNode *obj); - static QNode *childAt(QQmlListProperty<Qt3D::QNode> *list, int index); - static int childCount(QQmlListProperty<Qt3D::QNode> *list); - static void clearChildren(QQmlListProperty<Qt3D::QNode> *list); + static void appendChild(QQmlListProperty<Qt3DCore::QNode> *list, Qt3DCore::QNode *obj); + static QNode *childAt(QQmlListProperty<Qt3DCore::QNode> *list, int index); + static int childCount(QQmlListProperty<Qt3DCore::QNode> *list); + static void clearChildren(QQmlListProperty<Qt3DCore::QNode> *list); private Q_SLOTS: void childAppended(int idx, QObject *child); void childRemoved(int idx, QObject *child); }; -} // Quick; - -} // Qt3D +} // namespace Quick +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/quick3d/quick3d/items/quick3dnodeinstantiator.cpp b/src/quick3d/quick3d/items/quick3dnodeinstantiator.cpp index c6257ec58..fb49eef89 100644 --- a/src/quick3d/quick3d/items/quick3dnodeinstantiator.cpp +++ b/src/quick3d/quick3d/items/quick3dnodeinstantiator.cpp @@ -47,11 +47,11 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { namespace Quick { /*! - \class Qt3D::Quick::Quick3DNodeInstantiatorPrivate + \class Qt3DCore::Quick::Quick3DNodeInstantiatorPrivate \internal */ Quick3DNodeInstantiatorPrivate::Quick3DNodeInstantiatorPrivate() @@ -222,7 +222,7 @@ Quick3DNodeInstantiator::~Quick3DNodeInstantiator() } /*! - \qmlsignal Qt3D::NodeInstantiator::objectAdded(int index, QtObject node) + \qmlsignal Qt3DCore::NodeInstantiator::objectAdded(int index, QtObject node) This signal is emitted when a node is added to the NodeInstantiator. The \a index parameter holds the index which the node has been given, and the \a node @@ -232,7 +232,7 @@ Quick3DNodeInstantiator::~Quick3DNodeInstantiator() */ /*! - \qmlsignal Qt3D::NodeInstantiator::objectRemoved(int index, QtObject object) + \qmlsignal Qt3DCore::NodeInstantiator::objectRemoved(int index, QtObject object) This signal is emitted when an object is removed from the Instantiator. The \a index parameter holds the index which the object had been given, and the \a object @@ -244,7 +244,7 @@ Quick3DNodeInstantiator::~Quick3DNodeInstantiator() The corresponding handler is \c onObjectRemoved. */ /*! - \qmlproperty bool Qt3D::NodeInstantiator::active + \qmlproperty bool Qt3DCore::NodeInstantiator::active When active is \c true, and the delegate component is ready, the Instantiator will create objects according to the model. When active is \c false, no objects @@ -269,7 +269,7 @@ void Quick3DNodeInstantiator::setActive(bool newVal) } /*! - \qmlproperty bool Qt3D::NodeInstantiator::asynchronous + \qmlproperty bool Qt3DCore::NodeInstantiator::asynchronous When asynchronous is true the Instantiator will attempt to create objects asynchronously. This means that objects may not be available immediately, @@ -296,7 +296,7 @@ void Quick3DNodeInstantiator::setAsync(bool newVal) /*! - \qmlproperty int Qt3D::NodeInstantiator::count + \qmlproperty int Qt3DCore::NodeInstantiator::count \readonly The number of objects the Instantiator is currently managing. @@ -309,7 +309,7 @@ int Quick3DNodeInstantiator::count() const } /*! - \qmlproperty QtQml::Component Qt3D::NodeInstantiator::delegate + \qmlproperty QtQml::Component Qt3DCore::NodeInstantiator::delegate \default The component used to create all objects. @@ -346,7 +346,7 @@ void Quick3DNodeInstantiator::setDelegate(QQmlComponent *c) } /*! - \qmlproperty variant Qt3D::NodeInstantiator::model + \qmlproperty variant Qt3DCore::NodeInstantiator::model This property can be set to any of the supported \l {qml-data-models}{data models}: @@ -421,7 +421,7 @@ void Quick3DNodeInstantiator::setModel(const QVariant &v) } /*! - \qmlproperty QtQml::QtObject Qt3D::NodeInstantiator::object + \qmlproperty QtQml::QtObject Qt3DCore::NodeInstantiator::object \readonly This is a reference to the first created object, intended as a convenience @@ -436,7 +436,7 @@ QObject *Quick3DNodeInstantiator::object() const } /*! - \qmlmethod QtQml::QtObject Qt3D::NodeInstantiator::objectAt(int index) + \qmlmethod QtQml::QtObject Qt3DCore::NodeInstantiator::objectAt(int index) Returns a reference to the object with the given \a index. */ @@ -492,7 +492,7 @@ void Quick3DNodeInstantiator::copy(const QNode *ref) } } // namespace Quick -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/quick3d/quick3d/items/quick3dnodeinstantiator_p.h b/src/quick3d/quick3d/items/quick3dnodeinstantiator_p.h index a3f9b3dda..38a4d5a6f 100644 --- a/src/quick3d/quick3d/items/quick3dnodeinstantiator_p.h +++ b/src/quick3d/quick3d/items/quick3dnodeinstantiator_p.h @@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { namespace Quick { class Quick3DNodeInstantiatorPrivate; @@ -122,7 +122,7 @@ private: }; } // namespace Quick -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/quick3d/quick3d/items/quick3dnodeinstantiator_p_p.h b/src/quick3d/quick3d/items/quick3dnodeinstantiator_p_p.h index 68a16b192..71bc44668 100644 --- a/src/quick3d/quick3d/items/quick3dnodeinstantiator_p_p.h +++ b/src/quick3d/quick3d/items/quick3dnodeinstantiator_p_p.h @@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE class QQmlComponent; -namespace Qt3D { +namespace Qt3DCore { namespace Quick { class Quick3DNodeInstantiatorPrivate : public QNodePrivate @@ -86,7 +86,7 @@ public: }; } // namespace Quick -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/quick3d/quick3d/items/quick3dtransform.cpp b/src/quick3d/quick3d/items/quick3dtransform.cpp index 3386a2c8a..3f313850a 100644 --- a/src/quick3d/quick3d/items/quick3dtransform.cpp +++ b/src/quick3d/quick3d/items/quick3dtransform.cpp @@ -39,8 +39,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { - +namespace Qt3DCore { namespace Quick { /*! @@ -51,16 +50,16 @@ namespace Quick { Quick3DTransform::Quick3DTransform(QObject *parent) : QObject(parent) { - Q_ASSERT(qobject_cast<Qt3D::QTransform *>(parent) != Q_NULLPTR); + Q_ASSERT(qobject_cast<Qt3DCore::QTransform *>(parent) != Q_NULLPTR); } /*! - \qmlproperty matrix4x4 Qt3D::Transform::matrix + \qmlproperty matrix4x4 Qt3DCore::Transform::matrix \readonly */ /*! - \qmlproperty list<QAbstractTransform> Qt3D::Transform::transforms + \qmlproperty list<QAbstractTransform> Qt3DCore::Transform::transforms \default */ QQmlListProperty<QAbstractTransform> Quick3DTransform::transformList() @@ -100,8 +99,7 @@ void Quick3DTransform::qmlClearTransforms(QQmlListProperty<QAbstractTransform> * self->parentTransform()->removeTransform(trans); } -} //Quick - -} //Qt3D +} // namespace Quick +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/quick3d/quick3d/items/quick3dtransform.h b/src/quick3d/quick3d/items/quick3dtransform.h index 2d7f9aa10..504b0fe61 100644 --- a/src/quick3d/quick3d/items/quick3dtransform.h +++ b/src/quick3d/quick3d/items/quick3dtransform.h @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QTransform; @@ -53,24 +53,23 @@ namespace Quick { class QT3DQUICKSHARED_EXPORT Quick3DTransform : public QObject { Q_OBJECT - Q_PROPERTY(QQmlListProperty<Qt3D::QAbstractTransform> transforms READ transformList) + Q_PROPERTY(QQmlListProperty<Qt3DCore::QAbstractTransform> transforms READ transformList) Q_CLASSINFO("DefaultProperty", "transforms") public: explicit Quick3DTransform(QObject *parent = 0); - QQmlListProperty<Qt3D::QAbstractTransform> transformList(); + QQmlListProperty<Qt3DCore::QAbstractTransform> transformList(); - inline QTransform *parentTransform() const { return qobject_cast<Qt3D::QTransform *>(parent()); } + inline QTransform *parentTransform() const { return qobject_cast<Qt3DCore::QTransform *>(parent()); } private: - static void qmlAppendTransform(QQmlListProperty<Qt3D::QAbstractTransform> *list, Qt3D::QAbstractTransform *bar); - static QAbstractTransform* transformAt(QQmlListProperty<Qt3D::QAbstractTransform> *list, int index); - static int transformCount(QQmlListProperty<Qt3D::QAbstractTransform> *list); - static void qmlClearTransforms(QQmlListProperty<Qt3D::QAbstractTransform> *list); + static void qmlAppendTransform(QQmlListProperty<Qt3DCore::QAbstractTransform> *list, Qt3DCore::QAbstractTransform *bar); + static QAbstractTransform* transformAt(QQmlListProperty<Qt3DCore::QAbstractTransform> *list, int index); + static int transformCount(QQmlListProperty<Qt3DCore::QAbstractTransform> *list); + static void qmlClearTransforms(QQmlListProperty<Qt3DCore::QAbstractTransform> *list); }; -} //Quick - -} // Qt3D +} // namespace Quick +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/quick3d/quick3d/qqmlaspectengine.cpp b/src/quick3d/quick3d/qqmlaspectengine.cpp index a05143f23..8cdee8674 100644 --- a/src/quick3d/quick3d/qqmlaspectengine.cpp +++ b/src/quick3d/quick3d/qqmlaspectengine.cpp @@ -43,12 +43,11 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { - +namespace Qt3DCore { namespace Quick { /*! - \class Qt3D::Quick::QQmlAspectEnginePrivate + \class Qt3DCore::Quick::QQmlAspectEnginePrivate \internal */ QQmlAspectEnginePrivate::QQmlAspectEnginePrivate() @@ -140,9 +139,8 @@ void QQmlAspectEnginePrivate::_q_continueExecute() emit q->statusChanged(q->status()); } -} // Quick - -} // Qt3D +} // namespace Quick +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/quick3d/quick3d/qqmlaspectengine.h b/src/quick3d/quick3d/qqmlaspectengine.h index 025908a97..7f742e83f 100644 --- a/src/quick3d/quick3d/qqmlaspectengine.h +++ b/src/quick3d/quick3d/qqmlaspectengine.h @@ -43,8 +43,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { - +namespace Qt3DCore { namespace Quick { class QQmlAspectEnginePrivate; @@ -71,9 +70,8 @@ private: Q_PRIVATE_SLOT(d_func(), void _q_continueExecute()) }; -} // Quick - -} // Qt3D +} // namespace Quick +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/quick3d/quick3d/qqmlaspectengine_p.h b/src/quick3d/quick3d/qqmlaspectengine_p.h index f864aadef..c53082a4a 100644 --- a/src/quick3d/quick3d/qqmlaspectengine_p.h +++ b/src/quick3d/quick3d/qqmlaspectengine_p.h @@ -55,8 +55,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { - +namespace Qt3DCore { namespace Quick { class QQmlAspectEnginePrivate : public QObjectPrivate @@ -74,9 +73,8 @@ private: void _q_continueExecute(); }; -} // Quick - -} // Qt3D +} // namespace Quick +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/quick3d/quick3d/qt3dquick_global.cpp b/src/quick3d/quick3d/qt3dquick_global.cpp index afd0a2a0a..ce40df540 100644 --- a/src/quick3d/quick3d/qt3dquick_global.cpp +++ b/src/quick3d/quick3d/qt3dquick_global.cpp @@ -44,8 +44,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { - +namespace Qt3DCore { namespace Quick { class Quick3DColorProvider : public QQmlColorProvider @@ -665,7 +664,7 @@ static Quick3DColorProvider *getColorProvider() void Quick3D_initialize() { - Qt3D::Quick::Quick3DValueTypes::registerValueTypes(); + Qt3DCore::Quick::Quick3DValueTypes::registerValueTypes(); QQml_addValueTypeProvider(getValueTypeProvider()); QQml_setColorProvider(getColorProvider()); QAbstractNodeFactory::registerNodeFactory(QuickNodeFactory::instance()); @@ -676,8 +675,7 @@ void Quick3D_registerType(const char *className, const char *quickName, int majo QuickNodeFactory::instance()->registerType(className, quickName, major, minor); } -} // Quick - -} // Qt3D +} // namespace Quick +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/quick3d/quick3d/qt3dquick_global_p.h b/src/quick3d/quick3d/qt3dquick_global_p.h index addb2d6cf..d15381dd6 100644 --- a/src/quick3d/quick3d/qt3dquick_global_p.h +++ b/src/quick3d/quick3d/qt3dquick_global_p.h @@ -55,8 +55,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { - +namespace Qt3DCore { namespace Quick { QT3DQUICKSHARED_PRIVATE_EXPORT void Quick3D_initialize(); @@ -69,9 +68,8 @@ template<class T, class E> void registerExtendedType(const char *className, cons Quick3D_registerType(className, quickName, major, minor); } -} // Quick - -} // Qt3D +} // namespace Quick +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/quick3d/quick3d/qt3dquicknodefactory.cpp b/src/quick3d/quick3d/qt3dquicknodefactory.cpp index 062e97bb7..4da5e9b25 100644 --- a/src/quick3d/quick3d/qt3dquicknodefactory.cpp +++ b/src/quick3d/quick3d/qt3dquicknodefactory.cpp @@ -39,7 +39,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { Q_GLOBAL_STATIC(QuickNodeFactory, quick_node_factory) @@ -68,6 +68,6 @@ QNode *QuickNodeFactory::createNode(const char *type) return typeInfo.t ? qobject_cast<QNode *>(typeInfo.t->create()) : Q_NULLPTR; } -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/quick3d/quick3d/qt3dquicknodefactory_p.h b/src/quick3d/quick3d/qt3dquicknodefactory_p.h index 8d475dc95..fda891ed8 100644 --- a/src/quick3d/quick3d/qt3dquicknodefactory_p.h +++ b/src/quick3d/quick3d/qt3dquicknodefactory_p.h @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE class QQmlType; -namespace Qt3D { +namespace Qt3DCore { class QuickNodeFactory : public QAbstractNodeFactory { @@ -79,7 +79,7 @@ private: QHash<QByteArray, Type> m_types; }; -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/quick3d/quick3d/qt3dquickvaluetypes.cpp b/src/quick3d/quick3d/qt3dquickvaluetypes.cpp index 1d3052fdb..2c19c67cc 100644 --- a/src/quick3d/quick3d/qt3dquickvaluetypes.cpp +++ b/src/quick3d/quick3d/qt3dquickvaluetypes.cpp @@ -39,8 +39,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { - +namespace Qt3DCore { namespace Quick { namespace Quick3DValueTypes { @@ -534,8 +533,7 @@ QString Quick3DMatrix4x4ValueType::toString() const .arg(v(3, 0)).arg(v(3, 1)).arg(v(3, 2)).arg(v(3, 3)); } -} // Quick - -} // Qt3D +} // namespace Quick +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/quick3d/quick3d/qt3dquickvaluetypes_p.h b/src/quick3d/quick3d/qt3dquickvaluetypes_p.h index c3013fbe7..1fec1f059 100644 --- a/src/quick3d/quick3d/qt3dquickvaluetypes_p.h +++ b/src/quick3d/quick3d/qt3dquickvaluetypes_p.h @@ -61,10 +61,8 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { - +namespace Qt3DCore { namespace Quick { - namespace Quick3DValueTypes { QT3DQUICKSHARED_PRIVATE_EXPORT void registerValueTypes(); @@ -281,9 +279,8 @@ public: Q_INVOKABLE bool fuzzyEquals(const QMatrix4x4 &m) const; }; -} // Quick - -} // Qt3D +} // namespace Quick +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/quick3d/quick3drenderer/items/quick3dgeometry.cpp b/src/quick3d/quick3drenderer/items/quick3dgeometry.cpp index c0961ab6c..b2af9763b 100644 --- a/src/quick3d/quick3drenderer/items/quick3dgeometry.cpp +++ b/src/quick3d/quick3drenderer/items/quick3dgeometry.cpp @@ -47,45 +47,45 @@ Quick3DGeometry::Quick3DGeometry(QObject *parent) { } -QQmlListProperty<Qt3D::QAbstractAttribute> Quick3DGeometry::attributeList() +QQmlListProperty<Qt3DCore::QAbstractAttribute> Quick3DGeometry::attributeList() { - return QQmlListProperty<Qt3D::QAbstractAttribute>(this, 0, + return QQmlListProperty<Qt3DCore::QAbstractAttribute>(this, 0, &Quick3DGeometry::appendAttribute, &Quick3DGeometry::attributesCount, &Quick3DGeometry::attributeAt, &Quick3DGeometry::clearAttributes); } -void Quick3DGeometry::appendAttribute(QQmlListProperty<Qt3D::QAbstractAttribute> *list, Qt3D::QAbstractAttribute *attribute) +void Quick3DGeometry::appendAttribute(QQmlListProperty<Qt3DCore::QAbstractAttribute> *list, Qt3DCore::QAbstractAttribute *attribute) { Quick3DGeometry *geometry = static_cast<Quick3DGeometry *>(list->object); geometry->m_managedAttributes.append(attribute); geometry->parentGeometry()->addAttribute(attribute); } -Qt3D::QAbstractAttribute *Quick3DGeometry::attributeAt(QQmlListProperty<Qt3D::QAbstractAttribute> *list, int index) +Qt3DCore::QAbstractAttribute *Quick3DGeometry::attributeAt(QQmlListProperty<Qt3DCore::QAbstractAttribute> *list, int index) { Quick3DGeometry *geometry = static_cast<Quick3DGeometry *>(list->object); return geometry->parentGeometry()->attributes().at(index); } -int Quick3DGeometry::attributesCount(QQmlListProperty<Qt3D::QAbstractAttribute> *list) +int Quick3DGeometry::attributesCount(QQmlListProperty<Qt3DCore::QAbstractAttribute> *list) { Quick3DGeometry *geometry = static_cast<Quick3DGeometry *>(list->object); return geometry->parentGeometry()->attributes().count(); } -void Quick3DGeometry::clearAttributes(QQmlListProperty<Qt3D::QAbstractAttribute> *list) +void Quick3DGeometry::clearAttributes(QQmlListProperty<Qt3DCore::QAbstractAttribute> *list) { Quick3DGeometry *geometry = static_cast<Quick3DGeometry *>(list->object); - QVector<Qt3D::QAbstractAttribute *> &managedAttributes = geometry->m_managedAttributes; - Q_FOREACH (Qt3D::QAbstractAttribute *attribute, managedAttributes) + QVector<Qt3DCore::QAbstractAttribute *> &managedAttributes = geometry->m_managedAttributes; + Q_FOREACH (Qt3DCore::QAbstractAttribute *attribute, managedAttributes) geometry->parentGeometry()->removeAttribute(attribute); managedAttributes.clear(); } } // namespace Quick } // namespace Render -} // namespace Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/quick3d/quick3drenderer/items/quick3dgeometry.h b/src/quick3d/quick3drenderer/items/quick3dgeometry.h index 85b01554e..d9e996b95 100644 --- a/src/quick3d/quick3drenderer/items/quick3dgeometry.h +++ b/src/quick3d/quick3drenderer/items/quick3dgeometry.h @@ -50,27 +50,27 @@ namespace Quick { class QT3DQUICKRENDERERSHARED_EXPORT Quick3DGeometry : public QObject { Q_OBJECT - Q_PROPERTY(QQmlListProperty<Qt3D::QAbstractAttribute> attributes READ attributeList) + Q_PROPERTY(QQmlListProperty<Qt3DCore::QAbstractAttribute> attributes READ attributeList) Q_CLASSINFO("DefaultProperty", "attributeProviders") public: explicit Quick3DGeometry(QObject *parent = 0); inline QGeometry *parentGeometry() const { return qobject_cast<QGeometry *>(parent()); } - QQmlListProperty<Qt3D::QAbstractAttribute> attributeList(); + QQmlListProperty<Qt3DCore::QAbstractAttribute> attributeList(); private: - static void appendAttribute(QQmlListProperty<Qt3D::QAbstractAttribute> *list, Qt3D::QAbstractAttribute *provider); - static Qt3D::QAbstractAttribute *attributeAt(QQmlListProperty<Qt3D::QAbstractAttribute> *list, int index); - static int attributesCount(QQmlListProperty<Qt3D::QAbstractAttribute> *list); - static void clearAttributes(QQmlListProperty<Qt3D::QAbstractAttribute> *list); + static void appendAttribute(QQmlListProperty<Qt3DCore::QAbstractAttribute> *list, Qt3DCore::QAbstractAttribute *provider); + static Qt3DCore::QAbstractAttribute *attributeAt(QQmlListProperty<Qt3DCore::QAbstractAttribute> *list, int index); + static int attributesCount(QQmlListProperty<Qt3DCore::QAbstractAttribute> *list); + static void clearAttributes(QQmlListProperty<Qt3DCore::QAbstractAttribute> *list); - QVector<Qt3D::QAbstractAttribute *> m_managedAttributes; + QVector<Qt3DCore::QAbstractAttribute *> m_managedAttributes; }; } // namespace Quick } // namespace Render -} // namespace Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/quick3d/quick3drenderer/items/quick3drenderpass.h b/src/quick3d/quick3drenderer/items/quick3drenderpass.h index a8354c27d..12f1e829c 100644 --- a/src/quick3d/quick3drenderer/items/quick3drenderpass.h +++ b/src/quick3d/quick3drenderer/items/quick3drenderpass.h @@ -89,7 +89,7 @@ private: } // namespace Quick } // namespace Render -} // namespace Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/quick3d/quick3drenderer/items/quick3dshaderdata.cpp b/src/quick3d/quick3drenderer/items/quick3dshaderdata.cpp index a84e71ac5..ebc99e93e 100644 --- a/src/quick3d/quick3drenderer/items/quick3dshaderdata.cpp +++ b/src/quick3d/quick3drenderer/items/quick3dshaderdata.cpp @@ -81,7 +81,7 @@ public: } return innerValues; } else if (v.userType() == quick3DShaderDataTypeId) { - Qt3D::QNodeId id; + Qt3DCore::QNodeId id; QShaderData *shaderData = v.value<Quick3DShaderData *>(); if (shaderData) id = shaderData->id(); @@ -99,6 +99,6 @@ Quick3DShaderData::Quick3DShaderData(QNode *parent) } // namespace Quick } // namespace Render -} // namespace Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/quick3d/quick3drenderer/items/quick3dshaderdata.h b/src/quick3d/quick3drenderer/items/quick3dshaderdata.h index 31beee39d..4bc40ad98 100644 --- a/src/quick3d/quick3drenderer/items/quick3dshaderdata.h +++ b/src/quick3d/quick3drenderer/items/quick3dshaderdata.h @@ -61,7 +61,7 @@ private: } // namespace Quick } // namespace Render -} // namespace Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/quick3d/quick3drenderer/items/quick3dshaderdataarray.cpp b/src/quick3d/quick3drenderer/items/quick3dshaderdataarray.cpp index c85f6d62e..3b863b35e 100644 --- a/src/quick3d/quick3drenderer/items/quick3dshaderdataarray.cpp +++ b/src/quick3d/quick3drenderer/items/quick3dshaderdataarray.cpp @@ -43,7 +43,7 @@ namespace Qt3DRender { namespace Render { namespace Quick { -class Quick3DShaderDataArrayPrivate : public Qt3D::QNodePrivate +class Quick3DShaderDataArrayPrivate : public Qt3DCore::QNodePrivate { public: Quick3DShaderDataArrayPrivate() diff --git a/src/quick3d/quick3drenderer/items/quick3dshaderdataarray.h b/src/quick3d/quick3drenderer/items/quick3dshaderdataarray.h index aa0a0da5c..dfe1a2cb0 100644 --- a/src/quick3d/quick3drenderer/items/quick3dshaderdataarray.h +++ b/src/quick3d/quick3drenderer/items/quick3dshaderdataarray.h @@ -54,20 +54,20 @@ namespace Quick { class Quick3DShaderDataArrayPrivate; class Quick3DShaderData; -class QT3DQUICKRENDERERSHARED_EXPORT Quick3DShaderDataArray : public Qt3D::QNode +class QT3DQUICKRENDERERSHARED_EXPORT Quick3DShaderDataArray : public Qt3DCore::QNode { Q_OBJECT Q_PROPERTY(QQmlListProperty<Qt3DRender::QShaderData> values READ valuesList) Q_CLASSINFO("DefaultProperty", "values") public: - explicit Quick3DShaderDataArray(Qt3D::QNode *parent = 0); + explicit Quick3DShaderDataArray(Qt3DCore::QNode *parent = 0); ~Quick3DShaderDataArray(); QQmlListProperty<QShaderData> valuesList(); QList<QShaderData *> values() const; protected: - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: static void appendValue(QQmlListProperty<QShaderData> *list, QShaderData *bar); diff --git a/src/quick3d/quick3drenderer/qt3dquickrenderer_global.cpp b/src/quick3d/quick3drenderer/qt3dquickrenderer_global.cpp index 6fdbf4ea4..bc46386e2 100644 --- a/src/quick3d/quick3drenderer/qt3dquickrenderer_global.cpp +++ b/src/quick3d/quick3drenderer/qt3dquickrenderer_global.cpp @@ -45,7 +45,7 @@ namespace Quick { void Quick3DRenderer_initialize() { - Qt3D::QAbstractNodeFactory::registerNodeFactory(QuickRendererNodeFactory::instance()); + Qt3DCore::QAbstractNodeFactory::registerNodeFactory(QuickRendererNodeFactory::instance()); } void Quick3DRenderer_registerType(const char *className, const char *quickName, int major, int minor) diff --git a/src/quick3d/quick3drenderer/qt3dquickrenderernodefactory.cpp b/src/quick3d/quick3drenderer/qt3dquickrenderernodefactory.cpp index 0694882e2..1123062cc 100644 --- a/src/quick3d/quick3drenderer/qt3dquickrenderernodefactory.cpp +++ b/src/quick3d/quick3drenderer/qt3dquickrenderernodefactory.cpp @@ -53,7 +53,7 @@ void QuickRendererNodeFactory::registerType(const char *className, const char *q m_types.insert(className, Type(quickName, major, minor)); } -Qt3D::QNode *QuickRendererNodeFactory::createNode(const char *type) +Qt3DCore::QNode *QuickRendererNodeFactory::createNode(const char *type) { if (!m_types.contains(type)) return Q_NULLPTR; @@ -65,7 +65,7 @@ Qt3D::QNode *QuickRendererNodeFactory::createNode(const char *type) typeInfo.t = QQmlMetaType::qmlType(QString::fromLatin1(typeInfo.quickName), typeInfo.version.first, typeInfo.version.second); } - return typeInfo.t ? qobject_cast<Qt3D::QNode *>(typeInfo.t->create()) : Q_NULLPTR; + return typeInfo.t ? qobject_cast<Qt3DCore::QNode *>(typeInfo.t->create()) : Q_NULLPTR; } } // namespace Qt3DRender diff --git a/src/quick3d/quick3drenderer/qt3dquickrenderernodefactory_p.h b/src/quick3d/quick3drenderer/qt3dquickrenderernodefactory_p.h index 243019174..7d9f49c7e 100644 --- a/src/quick3d/quick3drenderer/qt3dquickrenderernodefactory_p.h +++ b/src/quick3d/quick3drenderer/qt3dquickrenderernodefactory_p.h @@ -57,10 +57,10 @@ class QQmlType; namespace Qt3DRender { -class QuickRendererNodeFactory : public Qt3D::QAbstractNodeFactory +class QuickRendererNodeFactory : public Qt3DCore::QAbstractNodeFactory { public: - Qt3D::QNode *createNode(const char *type) Q_DECL_OVERRIDE; + Qt3DCore::QNode *createNode(const char *type) Q_DECL_OVERRIDE; void registerType(const char *className, const char *quickName, int major, int minor); @@ -79,7 +79,7 @@ private: QHash<QByteArray, Type> m_types; }; -} // namespace Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE |