summaryrefslogtreecommitdiffstats
path: root/src/quick3d/imports
diff options
context:
space:
mode:
Diffstat (limited to 'src/quick3d/imports')
-rw-r--r--src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp34
-rw-r--r--src/quick3d/imports/render/qt3dquick3drendererplugin.cpp6
-rw-r--r--src/quick3d/imports/scene3d/scene3ditem.cpp48
-rw-r--r--src/quick3d/imports/scene3d/scene3ditem_p.h12
4 files changed, 50 insertions, 50 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;
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-12 03:36:07 +0000