diff options
Diffstat (limited to 'src/render/geometry')
33 files changed, 116 insertions, 116 deletions
diff --git a/src/render/geometry/attribute.cpp b/src/render/geometry/attribute.cpp index 00e1e577a..606df44a0 100644 --- a/src/render/geometry/attribute.cpp +++ b/src/render/geometry/attribute.cpp @@ -40,20 +40,20 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { namespace Render { Attribute::Attribute() : QBackendNode(ReadOnly) - , m_dataType(Qt3D::QAbstractAttribute::Float) + , m_dataType(Qt3DCore::QAbstractAttribute::Float) , m_dataSize(1) , m_count(0) , m_byteStride(0) , m_byteOffset(0) , m_divisor(0) - , m_attributeType(Qt3D::QAbstractAttribute::VertexAttribute) + , m_attributeType(Qt3DCore::QAbstractAttribute::VertexAttribute) , m_attributeDirty(false) { } @@ -64,19 +64,19 @@ Attribute::~Attribute() void Attribute::cleanup() { - m_dataType = Qt3D::QAbstractAttribute::Float; + m_dataType = Qt3DCore::QAbstractAttribute::Float; m_dataSize = 1; m_count = 0; m_byteStride = 0; m_byteOffset = 0; m_divisor = 0; - m_attributeType = Qt3D::QAbstractAttribute::VertexAttribute; - m_bufferId = Qt3D::QNodeId(); + m_attributeType = Qt3DCore::QAbstractAttribute::VertexAttribute; + m_bufferId = Qt3DCore::QNodeId(); m_name.clear(); m_attributeDirty = false; } -void Attribute::updateFromPeer(Qt3D::QNode *peer) +void Attribute::updateFromPeer(Qt3DCore::QNode *peer) { QAttribute *attribute = static_cast<QAttribute *>(peer); if (attribute) { @@ -94,7 +94,7 @@ void Attribute::updateFromPeer(Qt3D::QNode *peer) } } -void Attribute::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) +void Attribute::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); QByteArray propertyName = propertyChange->propertyName(); diff --git a/src/render/geometry/attribute_p.h b/src/render/geometry/attribute_p.h index cb952bcf7..83a5dfacf 100644 --- a/src/render/geometry/attribute_p.h +++ b/src/render/geometry/attribute_p.h @@ -57,7 +57,7 @@ namespace Qt3DRender { namespace Render { -class Q_AUTOTEST_EXPORT Attribute : public Qt3D::QBackendNode +class Q_AUTOTEST_EXPORT Attribute : public Qt3DCore::QBackendNode { public: Attribute(); @@ -65,31 +65,31 @@ public: void cleanup(); - void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE; - void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; + void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; - inline Qt3D::QNodeId bufferId() const { return m_bufferId; } + inline Qt3DCore::QNodeId bufferId() const { return m_bufferId; } inline QString name() const { return m_name; } - inline Qt3D::QAbstractAttribute::DataType dataType() const { return m_dataType; } + inline Qt3DCore::QAbstractAttribute::DataType dataType() const { return m_dataType; } inline uint dataSize() const { return m_dataSize; } inline uint count() const { return m_count; } inline uint byteStride() const { return m_byteStride; } inline uint byteOffset() const { return m_byteOffset; } inline uint divisor() const { return m_divisor; } - inline Qt3D::QAbstractAttribute::AttributeType attributeType() const { return m_attributeType; } + inline Qt3DCore::QAbstractAttribute::AttributeType attributeType() const { return m_attributeType; } inline bool isDirty() const { return m_attributeDirty; } void unsetDirty(); private: - Qt3D::QNodeId m_bufferId; + Qt3DCore::QNodeId m_bufferId; QString m_name; - Qt3D::QAbstractAttribute::DataType m_dataType; + Qt3DCore::QAbstractAttribute::DataType m_dataType; uint m_dataSize; uint m_count; uint m_byteStride; uint m_byteOffset; uint m_divisor; - Qt3D::QAbstractAttribute::AttributeType m_attributeType; + Qt3DCore::QAbstractAttribute::AttributeType m_attributeType; bool m_attributeDirty; }; diff --git a/src/render/geometry/buffer.cpp b/src/render/geometry/buffer.cpp index 16ba51602..762148182 100644 --- a/src/render/geometry/buffer.cpp +++ b/src/render/geometry/buffer.cpp @@ -40,7 +40,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { namespace Render { @@ -81,7 +81,7 @@ void Buffer::executeFunctor() m_data = (*m_functor)(); } -void Buffer::updateFromPeer(Qt3D::QNode *peer) +void Buffer::updateFromPeer(Qt3DCore::QNode *peer) { QBuffer *buffer = static_cast<QBuffer *>(peer); if (buffer != Q_NULLPTR) { @@ -96,7 +96,7 @@ void Buffer::updateFromPeer(Qt3D::QNode *peer) } } -void Buffer::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) +void Buffer::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { if (e->type() == NodeUpdated) { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); @@ -131,7 +131,7 @@ BufferFunctor::BufferFunctor(BufferManager *manager) { } -Qt3D::QBackendNode *BufferFunctor::create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const +Qt3DCore::QBackendNode *BufferFunctor::create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const { Buffer *buffer = m_manager->getOrCreateResource(frontend->id()); buffer->setFactory(factory); @@ -140,12 +140,12 @@ Qt3D::QBackendNode *BufferFunctor::create(Qt3D::QNode *frontend, const Qt3D::QBa return buffer; } -Qt3D::QBackendNode *BufferFunctor::get(const Qt3D::QNodeId &id) const +Qt3DCore::QBackendNode *BufferFunctor::get(const Qt3DCore::QNodeId &id) const { return m_manager->lookupResource(id); } -void BufferFunctor::destroy(const Qt3D::QNodeId &id) const +void BufferFunctor::destroy(const Qt3DCore::QNodeId &id) const { return m_manager->releaseResource(id); } diff --git a/src/render/geometry/buffer_p.h b/src/render/geometry/buffer_p.h index 141abc46d..1d5d02dae 100644 --- a/src/render/geometry/buffer_p.h +++ b/src/render/geometry/buffer_p.h @@ -60,15 +60,15 @@ namespace Render { class BufferManager; -class Q_AUTOTEST_EXPORT Buffer : public Qt3D::QBackendNode +class Q_AUTOTEST_EXPORT Buffer : public Qt3DCore::QBackendNode { public: Buffer(); ~Buffer(); void cleanup(); - void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE; - void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; + void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; void setManager(BufferManager *manager); void executeFunctor(); @@ -89,13 +89,13 @@ private: BufferManager *m_manager; }; -class BufferFunctor : public Qt3D::QBackendNodeFunctor +class BufferFunctor : public Qt3DCore::QBackendNodeFunctor { public: explicit BufferFunctor(BufferManager *manager); - Qt3D::QBackendNode *create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const Q_DECL_OVERRIDE; - Qt3D::QBackendNode *get(const Qt3D::QNodeId &id) const Q_DECL_OVERRIDE; - void destroy(const Qt3D::QNodeId &id) const Q_DECL_OVERRIDE; + Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const Q_DECL_OVERRIDE; + Qt3DCore::QBackendNode *get(const Qt3DCore::QNodeId &id) const Q_DECL_OVERRIDE; + void destroy(const Qt3DCore::QNodeId &id) const Q_DECL_OVERRIDE; private: BufferManager *m_manager; }; diff --git a/src/render/geometry/buffermanager.cpp b/src/render/geometry/buffermanager.cpp index e8411fe02..fbbee4b23 100644 --- a/src/render/geometry/buffermanager.cpp +++ b/src/render/geometry/buffermanager.cpp @@ -49,15 +49,15 @@ BufferManager::~BufferManager() { } -void BufferManager::addDirtyBuffer(const Qt3D::QNodeId &bufferId) +void BufferManager::addDirtyBuffer(const Qt3DCore::QNodeId &bufferId) { if (!m_dirtyBuffers.contains(bufferId)) m_dirtyBuffers.push_back(bufferId); } -QVector<Qt3D::QNodeId> BufferManager::dirtyBuffers() +QVector<Qt3DCore::QNodeId> BufferManager::dirtyBuffers() { - QVector<Qt3D::QNodeId> vector(m_dirtyBuffers); + QVector<Qt3DCore::QNodeId> vector(m_dirtyBuffers); m_dirtyBuffers.clear(); return vector; } diff --git a/src/render/geometry/buffermanager_p.h b/src/render/geometry/buffermanager_p.h index f93bff11b..50bfc2a94 100644 --- a/src/render/geometry/buffermanager_p.h +++ b/src/render/geometry/buffermanager_p.h @@ -57,23 +57,23 @@ namespace Qt3DRender { namespace Render { -class BufferManager : public Qt3D::QResourceManager< +class BufferManager : public Qt3DCore::QResourceManager< Buffer, - Qt3D::QNodeId, + Qt3DCore::QNodeId, 16, - Qt3D::ArrayAllocatingPolicy, - Qt3D::ObjectLevelLockingPolicy> + Qt3DCore::ArrayAllocatingPolicy, + Qt3DCore::ObjectLevelLockingPolicy> { public: BufferManager(); ~BufferManager(); // Aspect Thread - void addDirtyBuffer(const Qt3D::QNodeId &bufferId); - QVector<Qt3D::QNodeId> dirtyBuffers(); + void addDirtyBuffer(const Qt3DCore::QNodeId &bufferId); + QVector<Qt3DCore::QNodeId> dirtyBuffers(); private: - QVector<Qt3D::QNodeId> m_dirtyBuffers; + QVector<Qt3DCore::QNodeId> m_dirtyBuffers; }; } // namespace Render diff --git a/src/render/geometry/geometry.cpp b/src/render/geometry/geometry.cpp index 320d357e0..0be114fa7 100644 --- a/src/render/geometry/geometry.cpp +++ b/src/render/geometry/geometry.cpp @@ -41,7 +41,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { namespace Render { @@ -64,7 +64,7 @@ void Geometry::cleanup() m_geometryDirty = false; } -void Geometry::updateFromPeer(Qt3D::QNode *peer) +void Geometry::updateFromPeer(Qt3DCore::QNode *peer) { QGeometry *geometry = static_cast<QGeometry *>(peer); if (geometry != Q_NULLPTR) { @@ -76,7 +76,7 @@ void Geometry::updateFromPeer(Qt3D::QNode *peer) } } -void Geometry::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) +void Geometry::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); QByteArray propertyName = propertyChange->propertyName(); diff --git a/src/render/geometry/geometry_p.h b/src/render/geometry/geometry_p.h index e2469cf84..c43e7f5bd 100644 --- a/src/render/geometry/geometry_p.h +++ b/src/render/geometry/geometry_p.h @@ -57,7 +57,7 @@ namespace Qt3DRender { namespace Render { -class Q_AUTOTEST_EXPORT Geometry : public Qt3D::QBackendNode +class Q_AUTOTEST_EXPORT Geometry : public Qt3DCore::QBackendNode { public: Geometry(); @@ -65,16 +65,16 @@ public: void cleanup(); - void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE; - void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; + void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; - inline QVector<Qt3D::QNodeId> attributes() const { return m_attributes; } + inline QVector<Qt3DCore::QNodeId> attributes() const { return m_attributes; } inline bool isDirty() const { return m_geometryDirty; } inline int verticesPerPatch() const { return m_verticesPerPatch; } void unsetDirty(); private: - QVector<Qt3D::QNodeId> m_attributes; + QVector<Qt3DCore::QNodeId> m_attributes; int m_verticesPerPatch; bool m_geometryDirty; }; diff --git a/src/render/geometry/geometryrenderer.cpp b/src/render/geometry/geometryrenderer.cpp index 583a23d34..a70405ea8 100644 --- a/src/render/geometry/geometryrenderer.cpp +++ b/src/render/geometry/geometryrenderer.cpp @@ -41,7 +41,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { namespace Render { @@ -73,7 +73,7 @@ void GeometryRenderer::cleanup() m_restartIndex = -1; m_primitiveRestart = false; m_primitiveType = QGeometryRenderer::Triangles; - m_geometryId = Qt3D::QNodeId(); + m_geometryId = Qt3DCore::QNodeId(); m_dirty = false; m_functor.reset(); } @@ -83,7 +83,7 @@ void GeometryRenderer::setManager(GeometryRendererManager *manager) m_manager = manager; } -void GeometryRenderer::updateFromPeer(Qt3D::QNode *peer) +void GeometryRenderer::updateFromPeer(Qt3DCore::QNode *peer) { QGeometryRenderer *geometryRenderer = static_cast<QGeometryRenderer *>(peer); if (geometryRenderer) { @@ -103,7 +103,7 @@ void GeometryRenderer::updateFromPeer(Qt3D::QNode *peer) } } -void GeometryRenderer::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) +void GeometryRenderer::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); QByteArray propertyName = propertyChange->propertyName(); @@ -190,7 +190,7 @@ GeometryRendererFunctor::GeometryRendererFunctor(GeometryRendererManager *manage { } -Qt3D::QBackendNode *GeometryRendererFunctor::create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const +Qt3DCore::QBackendNode *GeometryRendererFunctor::create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const { GeometryRenderer *geometryRenderer = m_manager->getOrCreateResource(frontend->id()); geometryRenderer->setFactory(factory); @@ -199,12 +199,12 @@ Qt3D::QBackendNode *GeometryRendererFunctor::create(Qt3D::QNode *frontend, const return geometryRenderer; } -Qt3D::QBackendNode *GeometryRendererFunctor::get(const Qt3D::QNodeId &id) const +Qt3DCore::QBackendNode *GeometryRendererFunctor::get(const Qt3DCore::QNodeId &id) const { return m_manager->lookupResource(id); } -void GeometryRendererFunctor::destroy(const Qt3D::QNodeId &id) const +void GeometryRendererFunctor::destroy(const Qt3DCore::QNodeId &id) const { return m_manager->releaseResource(id); } diff --git a/src/render/geometry/geometryrenderer_p.h b/src/render/geometry/geometryrenderer_p.h index d32afb00b..f03b8daa4 100644 --- a/src/render/geometry/geometryrenderer_p.h +++ b/src/render/geometry/geometryrenderer_p.h @@ -60,7 +60,7 @@ namespace Render { class GeometryRendererManager; -class Q_AUTOTEST_EXPORT GeometryRenderer : public Qt3D::QBackendNode +class Q_AUTOTEST_EXPORT GeometryRenderer : public Qt3DCore::QBackendNode { public: GeometryRenderer(); @@ -68,11 +68,11 @@ public: void cleanup(); void setManager(GeometryRendererManager *manager); - void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE; - void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; + void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; void executeFunctor(); - inline Qt3D::QNodeId geometryId() const { return m_geometryId; } + inline Qt3DCore::QNodeId geometryId() const { return m_geometryId; } inline int instanceCount() const { return m_instanceCount; } inline int primitiveCount() const { return m_primitiveCount; } inline int baseVertex() const { return m_baseVertex; } @@ -85,7 +85,7 @@ public: void unsetDirty(); private: - Qt3D::QNodeId m_geometryId; + Qt3DCore::QNodeId m_geometryId; int m_instanceCount; int m_primitiveCount; int m_baseVertex; @@ -98,13 +98,13 @@ private: GeometryRendererManager *m_manager; }; -class GeometryRendererFunctor : public Qt3D::QBackendNodeFunctor +class GeometryRendererFunctor : public Qt3DCore::QBackendNodeFunctor { public: explicit GeometryRendererFunctor(GeometryRendererManager *manager); - Qt3D::QBackendNode *create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const Q_DECL_OVERRIDE; - Qt3D::QBackendNode *get(const Qt3D::QNodeId &id) const Q_DECL_OVERRIDE; - void destroy(const Qt3D::QNodeId &id) const Q_DECL_OVERRIDE; + Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const Q_DECL_OVERRIDE; + Qt3DCore::QBackendNode *get(const Qt3DCore::QNodeId &id) const Q_DECL_OVERRIDE; + void destroy(const Qt3DCore::QNodeId &id) const Q_DECL_OVERRIDE; private: GeometryRendererManager *m_manager; }; diff --git a/src/render/geometry/geometryrenderermanager.cpp b/src/render/geometry/geometryrenderermanager.cpp index 9acbfcd8f..8592ee75c 100644 --- a/src/render/geometry/geometryrenderermanager.cpp +++ b/src/render/geometry/geometryrenderermanager.cpp @@ -49,15 +49,15 @@ GeometryRendererManager::~GeometryRendererManager() { } -void GeometryRendererManager::addDirtyGeometryRenderer(const Qt3D::QNodeId &bufferId) +void GeometryRendererManager::addDirtyGeometryRenderer(const Qt3DCore::QNodeId &bufferId) { if (!m_dirtyGeometryRenderers.contains(bufferId)) m_dirtyGeometryRenderers.push_back(bufferId); } -QVector<Qt3D::QNodeId> GeometryRendererManager::dirtyGeometryRenderers() +QVector<Qt3DCore::QNodeId> GeometryRendererManager::dirtyGeometryRenderers() { - QVector<Qt3D::QNodeId> vector(m_dirtyGeometryRenderers); + QVector<Qt3DCore::QNodeId> vector(m_dirtyGeometryRenderers); m_dirtyGeometryRenderers.clear(); return vector; } diff --git a/src/render/geometry/geometryrenderermanager_p.h b/src/render/geometry/geometryrenderermanager_p.h index dc79755b0..69066b7a0 100644 --- a/src/render/geometry/geometryrenderermanager_p.h +++ b/src/render/geometry/geometryrenderermanager_p.h @@ -57,23 +57,23 @@ namespace Qt3DRender { namespace Render { -class GeometryRendererManager : public Qt3D::QResourceManager< +class GeometryRendererManager : public Qt3DCore::QResourceManager< GeometryRenderer, - Qt3D::QNodeId, + Qt3DCore::QNodeId, 16, - Qt3D::ArrayAllocatingPolicy, - Qt3D::ObjectLevelLockingPolicy> + Qt3DCore::ArrayAllocatingPolicy, + Qt3DCore::ObjectLevelLockingPolicy> { public: GeometryRendererManager(); ~GeometryRendererManager(); // Aspect Thread - void addDirtyGeometryRenderer(const Qt3D::QNodeId &bufferId); - QVector<Qt3D::QNodeId> dirtyGeometryRenderers(); + void addDirtyGeometryRenderer(const Qt3DCore::QNodeId &bufferId); + QVector<Qt3DCore::QNodeId> dirtyGeometryRenderers(); private: - QVector<Qt3D::QNodeId> m_dirtyGeometryRenderers; + QVector<Qt3DCore::QNodeId> m_dirtyGeometryRenderers; }; } // namespace Render diff --git a/src/render/geometry/qattribute.cpp b/src/render/geometry/qattribute.cpp index 09b858128..8c3bb2aad 100644 --- a/src/render/geometry/qattribute.cpp +++ b/src/render/geometry/qattribute.cpp @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { /*! - class Qt3D::AttributePrivate + class Qt3DCore::AttributePrivate \internal */ QAttributePrivate::QAttributePrivate() diff --git a/src/render/geometry/qattribute.h b/src/render/geometry/qattribute.h index 9106cbda9..772272e20 100644 --- a/src/render/geometry/qattribute.h +++ b/src/render/geometry/qattribute.h @@ -48,12 +48,12 @@ namespace Qt3DRender { class QAttributePrivate; class QBuffer; -class QT3DRENDERERSHARED_EXPORT QAttribute : public Qt3D::QAbstractAttribute +class QT3DRENDERERSHARED_EXPORT QAttribute : public Qt3DCore::QAbstractAttribute { Q_OBJECT public: - explicit QAttribute(Qt3D::QNode *parent = 0); + explicit QAttribute(Qt3DCore::QNode *parent = 0); QAttribute(QBuffer *buf, DataType type, uint dataSize, int count, int offset=0, int stride = 0); QAttribute(QBuffer *buf, const QString &name, DataType type, uint dataSize, int count, int offset=0, int stride = 0); ~QAttribute(); @@ -73,7 +73,7 @@ public: static QString defaultTangentAttributeName(); protected: - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: QT3D_CLONEABLE(QAttribute) diff --git a/src/render/geometry/qattribute_p.h b/src/render/geometry/qattribute_p.h index 806febabc..7968266e1 100644 --- a/src/render/geometry/qattribute_p.h +++ b/src/render/geometry/qattribute_p.h @@ -57,7 +57,7 @@ namespace Qt3DRender { class QAttribute; -class QT3DRENDERERSHARED_EXPORT QAttributePrivate : public Qt3D::QAbstractAttributePrivate +class QT3DRENDERERSHARED_EXPORT QAttributePrivate : public Qt3DCore::QAbstractAttributePrivate { public: QAttributePrivate(); diff --git a/src/render/geometry/qbuffer.cpp b/src/render/geometry/qbuffer.cpp index 6a86f74f7..f31badc2d 100644 --- a/src/render/geometry/qbuffer.cpp +++ b/src/render/geometry/qbuffer.cpp @@ -41,12 +41,12 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { /*! - \class Qt3D::BufferPrivate + \class Qt3DCore::BufferPrivate \internal */ QBufferPrivate::QBufferPrivate() diff --git a/src/render/geometry/qbuffer.h b/src/render/geometry/qbuffer.h index d1d9f9929..2bf6700ee 100644 --- a/src/render/geometry/qbuffer.h +++ b/src/render/geometry/qbuffer.h @@ -54,7 +54,7 @@ class QBufferPrivate; class QBufferFunctor; typedef QSharedPointer<QBufferFunctor> QBufferFunctorPtr; -class QT3DRENDERERSHARED_EXPORT QBuffer : public Qt3D::QAbstractBuffer +class QT3DRENDERERSHARED_EXPORT QBuffer : public Qt3DCore::QAbstractBuffer { Q_OBJECT Q_PROPERTY(BufferType type READ type WRITE setType NOTIFY typeChanged) @@ -84,7 +84,7 @@ public: }; Q_ENUM(UsageType) - QBuffer(BufferType ty = QBuffer::VertexBuffer, Qt3D::QNode *parent = 0); + QBuffer(BufferType ty = QBuffer::VertexBuffer, Qt3DCore::QNode *parent = 0); ~QBuffer(); void setUsage(UsageType usage); @@ -97,8 +97,8 @@ public: QBufferFunctorPtr bufferFunctor() const; protected: - QBuffer(QBufferPrivate &dd, QBuffer::BufferType ty, Qt3D::QNode *parent = 0); - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + QBuffer(QBufferPrivate &dd, QBuffer::BufferType ty, Qt3DCore::QNode *parent = 0); + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; Q_SIGNALS: void typeChanged(); diff --git a/src/render/geometry/qbuffer_p.h b/src/render/geometry/qbuffer_p.h index 8f35ad77f..50ddbc9f3 100644 --- a/src/render/geometry/qbuffer_p.h +++ b/src/render/geometry/qbuffer_p.h @@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QT3DRENDERERSHARED_EXPORT QBufferPrivate : public Qt3D::QAbstractBufferPrivate +class QT3DRENDERERSHARED_EXPORT QBufferPrivate : public Qt3DCore::QAbstractBufferPrivate { public: QBufferPrivate(); diff --git a/src/render/geometry/qbufferfunctor.h b/src/render/geometry/qbufferfunctor.h index 4a508b975..36c4b3a12 100644 --- a/src/render/geometry/qbufferfunctor.h +++ b/src/render/geometry/qbufferfunctor.h @@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QT3DRENDERERSHARED_EXPORT QBufferFunctor : public Qt3D::QAbstractFunctor +class QT3DRENDERERSHARED_EXPORT QBufferFunctor : public Qt3DCore::QAbstractFunctor { public: virtual ~QBufferFunctor() {} diff --git a/src/render/geometry/qcuboidmesh.h b/src/render/geometry/qcuboidmesh.h index 293c948d0..1bb9c6157 100644 --- a/src/render/geometry/qcuboidmesh.h +++ b/src/render/geometry/qcuboidmesh.h @@ -57,7 +57,7 @@ class QT3DRENDERERSHARED_EXPORT QCuboidMesh : public QGeometryRenderer Q_PROPERTY(QSize xyMeshResolution READ xyMeshResolution WRITE setXYMeshResolution NOTIFY xyMeshResolutionChanged) public: - explicit QCuboidMesh(Qt3D::QNode *parent = 0); + explicit QCuboidMesh(Qt3DCore::QNode *parent = 0); ~QCuboidMesh(); void setXExtent(float xExtent); diff --git a/src/render/geometry/qcylindermesh.h b/src/render/geometry/qcylindermesh.h index 648ebf2de..3c4294d07 100644 --- a/src/render/geometry/qcylindermesh.h +++ b/src/render/geometry/qcylindermesh.h @@ -53,7 +53,7 @@ class QT3DRENDERERSHARED_EXPORT QCylinderMesh : public QGeometryRenderer Q_PROPERTY(float radius READ radius WRITE setRadius NOTIFY radiusChanged) Q_PROPERTY(float length READ length WRITE setLength NOTIFY lengthChanged) public: - explicit QCylinderMesh(Qt3D::QNode *parent = 0); + explicit QCylinderMesh(Qt3DCore::QNode *parent = 0); ~QCylinderMesh(); void setRings(int rings); diff --git a/src/render/geometry/qgeometry.cpp b/src/render/geometry/qgeometry.cpp index e59e195a1..64df80990 100644 --- a/src/render/geometry/qgeometry.cpp +++ b/src/render/geometry/qgeometry.cpp @@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { @@ -61,7 +61,7 @@ QGeometry::~QGeometry() QNode::cleanup(); } -void QGeometry::addAttribute(Qt3D::QAbstractAttribute *attribute) +void QGeometry::addAttribute(Qt3DCore::QAbstractAttribute *attribute) { Q_D(QGeometry); if (!d->m_attributes.contains(attribute)) { @@ -83,7 +83,7 @@ void QGeometry::addAttribute(Qt3D::QAbstractAttribute *attribute) } } -void QGeometry::removeAttribute(Qt3D::QAbstractAttribute *attribute) +void QGeometry::removeAttribute(Qt3DCore::QAbstractAttribute *attribute) { Q_D(QGeometry); if (d->m_changeArbiter != Q_NULLPTR) { diff --git a/src/render/geometry/qgeometry.h b/src/render/geometry/qgeometry.h index f8774aba6..37e2dede0 100644 --- a/src/render/geometry/qgeometry.h +++ b/src/render/geometry/qgeometry.h @@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QAbstractAttribute; } @@ -50,20 +50,20 @@ namespace Qt3DRender { class QGeometryPrivate; -typedef QVector<Qt3D::QAbstractAttribute *> QAttributeList; +typedef QVector<Qt3DCore::QAbstractAttribute *> QAttributeList; -class QT3DRENDERERSHARED_EXPORT QGeometry : public Qt3D::QNode +class QT3DRENDERERSHARED_EXPORT QGeometry : public Qt3DCore::QNode { Q_OBJECT Q_PROPERTY(int verticesPerPatch READ verticesPerPatch WRITE setVerticesPerPatch NOTIFY verticesPerPatchChanged) public: - explicit QGeometry(Qt3D::QNode *parent = 0); + explicit QGeometry(Qt3DCore::QNode *parent = 0); ~QGeometry(); QAttributeList attributes() const; - void addAttribute(Qt3D::QAbstractAttribute *attribute); - void removeAttribute(Qt3D::QAbstractAttribute *attribute); + void addAttribute(Qt3DCore::QAbstractAttribute *attribute); + void removeAttribute(Qt3DCore::QAbstractAttribute *attribute); void setVerticesPerPatch(int verticesPerPatch); int verticesPerPatch() const; @@ -72,8 +72,8 @@ Q_SIGNALS: void verticesPerPatchChanged(); protected: - QGeometry(QGeometryPrivate &dd, Qt3D::QNode *parent = 0); - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + QGeometry(QGeometryPrivate &dd, Qt3DCore::QNode *parent = 0); + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QGeometry) diff --git a/src/render/geometry/qgeometry_p.h b/src/render/geometry/qgeometry_p.h index 8a9c6ded8..52d35ceaa 100644 --- a/src/render/geometry/qgeometry_p.h +++ b/src/render/geometry/qgeometry_p.h @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QGeometryPrivate : public Qt3D::QNodePrivate +class QGeometryPrivate : public Qt3DCore::QNodePrivate { public: Q_DECLARE_PUBLIC(QGeometry) diff --git a/src/render/geometry/qgeometryfunctor.h b/src/render/geometry/qgeometryfunctor.h index 4290fbe7b..e7075d614 100644 --- a/src/render/geometry/qgeometryfunctor.h +++ b/src/render/geometry/qgeometryfunctor.h @@ -47,7 +47,7 @@ namespace Qt3DRender { class QGeometry; -class QT3DRENDERERSHARED_EXPORT QGeometryFunctor : public Qt3D::QAbstractFunctor +class QT3DRENDERERSHARED_EXPORT QGeometryFunctor : public Qt3DCore::QAbstractFunctor { public: virtual ~QGeometryFunctor() {} diff --git a/src/render/geometry/qgeometryrenderer.cpp b/src/render/geometry/qgeometryrenderer.cpp index 8ba50b1b1..9688b26f1 100644 --- a/src/render/geometry/qgeometryrenderer.cpp +++ b/src/render/geometry/qgeometryrenderer.cpp @@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { @@ -256,7 +256,7 @@ void QGeometryRenderer::copy(const QNode *ref) d_func()->m_functor = other->d_func()->m_functor; } -void QGeometryRenderer::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) +void QGeometryRenderer::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { Q_D(QGeometryRenderer); QScenePropertyChangePtr change = qSharedPointerCast<QScenePropertyChange>(e); diff --git a/src/render/geometry/qgeometryrenderer.h b/src/render/geometry/qgeometryrenderer.h index 5bf581111..31e42e2db 100644 --- a/src/render/geometry/qgeometryrenderer.h +++ b/src/render/geometry/qgeometryrenderer.h @@ -50,7 +50,7 @@ class QGeometryFunctor; typedef QSharedPointer<QGeometryFunctor> QGeometryFunctorPtr; -class QT3DRENDERERSHARED_EXPORT QGeometryRenderer : public Qt3D::QComponent +class QT3DRENDERERSHARED_EXPORT QGeometryRenderer : public Qt3DCore::QComponent { Q_OBJECT Q_PROPERTY(int instanceCount READ instanceCount WRITE setInstanceCount NOTIFY instanceCountChanged) @@ -63,7 +63,7 @@ class QT3DRENDERERSHARED_EXPORT QGeometryRenderer : public Qt3D::QComponent Q_PROPERTY(PrimitiveType primitiveType READ primitiveType WRITE setPrimitiveType NOTIFY primitiveTypeChanged) public: - explicit QGeometryRenderer(Qt3D::QNode *parent = 0); + explicit QGeometryRenderer(Qt3DCore::QNode *parent = 0); ~QGeometryRenderer(); enum PrimitiveType { @@ -116,9 +116,9 @@ Q_SIGNALS: void primitiveTypeChanged(); protected: - QGeometryRenderer(QGeometryRendererPrivate &dd, Qt3D::QNode *parent = 0); - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; - void sceneChangeEvent(const Qt3D::QSceneChangePtr &change) Q_DECL_OVERRIDE; + QGeometryRenderer(QGeometryRendererPrivate &dd, Qt3DCore::QNode *parent = 0); + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QGeometryRenderer) diff --git a/src/render/geometry/qgeometryrenderer_p.h b/src/render/geometry/qgeometryrenderer_p.h index d56fc0456..b0b4f62ef 100644 --- a/src/render/geometry/qgeometryrenderer_p.h +++ b/src/render/geometry/qgeometryrenderer_p.h @@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QGeometryRendererPrivate : public Qt3D::QComponentPrivate +class QGeometryRendererPrivate : public Qt3DCore::QComponentPrivate { public: QGeometryRendererPrivate(); diff --git a/src/render/geometry/qmesh.cpp b/src/render/geometry/qmesh.cpp index e35ee1dd0..953dbe8c0 100644 --- a/src/render/geometry/qmesh.cpp +++ b/src/render/geometry/qmesh.cpp @@ -125,7 +125,7 @@ QGeometry *MeshFunctor::operator()() // TO DO: Handle file download if remote url - QString filePath = Qt3D::QUrlHelper::urlToLocalFileOrQrc(m_sourcePath); + QString filePath = Qt3DCore::QUrlHelper::urlToLocalFileOrQrc(m_sourcePath); if (loader.load(filePath)) return loader.geometry(); diff --git a/src/render/geometry/qmesh.h b/src/render/geometry/qmesh.h index fd5b686f6..ae4877b11 100644 --- a/src/render/geometry/qmesh.h +++ b/src/render/geometry/qmesh.h @@ -57,7 +57,7 @@ class QT3DRENDERERSHARED_EXPORT QMesh : public QGeometryRenderer Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged) public: - explicit QMesh(Qt3D::QNode *parent = 0); + explicit QMesh(Qt3DCore::QNode *parent = 0); ~QMesh(); void setSource(const QUrl &source); @@ -67,7 +67,7 @@ Q_SIGNALS: void sourceChanged(); protected: - QMesh(QMeshPrivate &dd, Qt3D::QNode *parent = 0); + QMesh(QMeshPrivate &dd, Qt3DCore::QNode *parent = 0); private: Q_DECLARE_PRIVATE(QMesh) diff --git a/src/render/geometry/qplanemesh.h b/src/render/geometry/qplanemesh.h index 70d9c8518..f9867b4de 100644 --- a/src/render/geometry/qplanemesh.h +++ b/src/render/geometry/qplanemesh.h @@ -53,7 +53,7 @@ class QT3DRENDERERSHARED_EXPORT QPlaneMesh : public QGeometryRenderer Q_PROPERTY(QSize meshResolution READ meshResolution WRITE setMeshResolution NOTIFY meshResolutionChanged) public: - explicit QPlaneMesh(Qt3D::QNode *parent = 0); + explicit QPlaneMesh(Qt3DCore::QNode *parent = 0); ~QPlaneMesh(); void setWidth(float width); diff --git a/src/render/geometry/qspheremesh.h b/src/render/geometry/qspheremesh.h index e96ad94e8..57f810092 100644 --- a/src/render/geometry/qspheremesh.h +++ b/src/render/geometry/qspheremesh.h @@ -55,7 +55,7 @@ class QT3DRENDERERSHARED_EXPORT QSphereMesh : public QGeometryRenderer Q_PROPERTY(bool generateTangents READ generateTangents WRITE setGenerateTangents NOTIFY generateTangentsChanged) public: - explicit QSphereMesh(Qt3D::QNode *parent = 0); + explicit QSphereMesh(Qt3DCore::QNode *parent = 0); ~QSphereMesh(); void setRings(int rings); diff --git a/src/render/geometry/qtorusmesh.h b/src/render/geometry/qtorusmesh.h index b1cca55f9..1f8778bbd 100644 --- a/src/render/geometry/qtorusmesh.h +++ b/src/render/geometry/qtorusmesh.h @@ -52,7 +52,7 @@ class QT3DRENDERERSHARED_EXPORT QTorusMesh : public QGeometryRenderer Q_PROPERTY(float radius READ radius WRITE setRadius NOTIFY radiusChanged) Q_PROPERTY(float minorRadius READ minorRadius WRITE setMinorRadius NOTIFY minorRadiusChanged) public: - explicit QTorusMesh(Qt3D::QNode *parent = 0); + explicit QTorusMesh(Qt3DCore::QNode *parent = 0); ~QTorusMesh(); void setRings(int rings); |