diff options
Diffstat (limited to 'src/render')
264 files changed, 1062 insertions, 1062 deletions
diff --git a/src/render/backend/attachmentpack_p.h b/src/render/backend/attachmentpack_p.h index f08c12f1c..cbf96cc99 100644 --- a/src/render/backend/attachmentpack_p.h +++ b/src/render/backend/attachmentpack_p.h @@ -62,7 +62,7 @@ struct Attachment QString m_name; int m_mipLevel; int m_layer; - Qt3D::QNodeId m_textureUuid; + Qt3DCore::QNodeId m_textureUuid; QRenderAttachment::RenderAttachmentType m_type; QRenderAttachment::CubeMapFace m_face; }; diff --git a/src/render/backend/cameralens.cpp b/src/render/backend/cameralens.cpp index faf4fee06..72a392277 100644 --- a/src/render/backend/cameralens.cpp +++ b/src/render/backend/cameralens.cpp @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { namespace Render { @@ -67,7 +67,7 @@ void CameraLens::cleanup() } -void CameraLens::updateFromPeer(Qt3D::QNode *peer) +void CameraLens::updateFromPeer(Qt3DCore::QNode *peer) { QCameraLens *lens = static_cast<QCameraLens *>(peer); setProjection(lens->projectionMatrix()); @@ -79,7 +79,7 @@ void CameraLens::setProjection(const QMatrix4x4 &projection) m_projection = projection; } -void CameraLens::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) +void CameraLens::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { switch (e->type()) { case NodeUpdated: { diff --git a/src/render/backend/cameralens_p.h b/src/render/backend/cameralens_p.h index 0fcea9826..b997db679 100644 --- a/src/render/backend/cameralens_p.h +++ b/src/render/backend/cameralens_p.h @@ -60,14 +60,14 @@ namespace Render { class CameraManager; -class CameraLens : public Qt3D::QBackendNode +class CameraLens : public Qt3DCore::QBackendNode { public: CameraLens(); ~CameraLens(); void cleanup(); - void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE; + void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE; void setClearColor(); QVector4D clearColor() const { return m_clearColor; } @@ -77,7 +77,7 @@ public: inline bool isEnabled() const { return m_enabled; } - void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; private: QVector4D m_clearColor; diff --git a/src/render/backend/entity.cpp b/src/render/backend/entity.cpp index 9aa0da946..e76eb2102 100644 --- a/src/render/backend/entity.cpp +++ b/src/render/backend/entity.cpp @@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { namespace Render { @@ -93,10 +93,10 @@ void Entity::cleanup() qCDebug(Render::RenderNodes) << Q_FUNC_INFO; // Clear components - m_transformComponent = Qt3D::QNodeId(); - m_cameraComponent = Qt3D::QNodeId(); - m_materialComponent = Qt3D::QNodeId(); - m_geometryRendererComponent = Qt3D::QNodeId(); + m_transformComponent = Qt3DCore::QNodeId(); + m_cameraComponent = Qt3DCore::QNodeId(); + m_materialComponent = Qt3DCore::QNodeId(); + m_geometryRendererComponent = Qt3DCore::QNodeId(); m_layerComponents.clear(); m_shaderDataComponents.clear(); } @@ -131,7 +131,7 @@ void Entity::setHandle(HEntity handle) m_handle = handle; } -void Entity::updateFromPeer(Qt3D::QNode *peer) +void Entity::updateFromPeer(Qt3DCore::QNode *peer) { QEntity *entity = static_cast<QEntity *>(peer); const QNodeId parentEntityId = entity->parentEntityId(); @@ -157,7 +157,7 @@ void Entity::updateFromPeer(Qt3D::QNode *peer) } } -void Entity::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) +void Entity::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); switch (e->type()) { @@ -237,12 +237,12 @@ const QMatrix4x4 *Entity::worldTransform() const return m_renderer->worldMatrixManager()->data(m_worldTransform); } -void Entity::addComponent(Qt3D::QComponent *component) +void Entity::addComponent(Qt3DCore::QComponent *component) { // The backend element is always created when this method is called // If that's not the case something has gone wrong - if (qobject_cast<Qt3D::QTransform*>(component) != Q_NULLPTR) + if (qobject_cast<Qt3DCore::QTransform*>(component) != Q_NULLPTR) m_transformComponent = component->id(); else if (qobject_cast<QCameraLens *>(component) != Q_NULLPTR) m_cameraComponent = component->id(); @@ -256,7 +256,7 @@ void Entity::addComponent(Qt3D::QComponent *component) m_geometryRendererComponent = component->id(); } -void Entity::removeComponent(const Qt3D::QNodeId &nodeId) +void Entity::removeComponent(const Qt3DCore::QNodeId &nodeId) { if (m_transformComponent == nodeId) m_transformComponent = QNodeId(); @@ -321,13 +321,13 @@ GeometryRenderer *Entity::renderComponent<GeometryRenderer>() const } template<> -Qt3D::QNodeId Entity::componentUuid<Transform>() const { return m_transformComponent; } +Qt3DCore::QNodeId Entity::componentUuid<Transform>() const { return m_transformComponent; } template<> -Qt3D::QNodeId Entity::componentUuid<CameraLens>() const { return m_cameraComponent; } +Qt3DCore::QNodeId Entity::componentUuid<CameraLens>() const { return m_cameraComponent; } template<> -Qt3D::QNodeId Entity::componentUuid<Material>() const { return m_materialComponent; } +Qt3DCore::QNodeId Entity::componentUuid<Material>() const { return m_materialComponent; } template<> QList<HLayer> Entity::componentsHandle<Layer>() const @@ -348,7 +348,7 @@ QList<Layer *> Entity::renderComponents<Layer>() const } template<> -QList<Qt3D::QNodeId> Entity::componentsUuid<Layer>() const { return m_layerComponents; } +QList<Qt3DCore::QNodeId> Entity::componentsUuid<Layer>() const { return m_layerComponents; } template<> QList<HShaderData> Entity::componentsHandle<ShaderData>() const @@ -369,10 +369,10 @@ QList<ShaderData *> Entity::renderComponents<ShaderData>() const } template<> -QList<Qt3D::QNodeId> Entity::componentsUuid<ShaderData>() const { return m_shaderDataComponents; } +QList<Qt3DCore::QNodeId> Entity::componentsUuid<ShaderData>() const { return m_shaderDataComponents; } template<> -Qt3D::QNodeId Entity::componentUuid<GeometryRenderer>() const { return m_geometryRendererComponent; } +Qt3DCore::QNodeId Entity::componentUuid<GeometryRenderer>() const { return m_geometryRendererComponent; } RenderEntityFunctor::RenderEntityFunctor(Renderer *renderer) @@ -380,7 +380,7 @@ RenderEntityFunctor::RenderEntityFunctor(Renderer *renderer) { } -Qt3D::QBackendNode *RenderEntityFunctor::create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const +Qt3DCore::QBackendNode *RenderEntityFunctor::create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const { HEntity renderNodeHandle = m_renderer->renderNodesManager()->getOrAcquireHandle(frontend->id()); Entity *entity = m_renderer->renderNodesManager()->data(renderNodeHandle); @@ -391,12 +391,12 @@ Qt3D::QBackendNode *RenderEntityFunctor::create(Qt3D::QNode *frontend, const Qt3 return entity; } -Qt3D::QBackendNode *RenderEntityFunctor::get(const Qt3D::QNodeId &id) const +Qt3DCore::QBackendNode *RenderEntityFunctor::get(const Qt3DCore::QNodeId &id) const { return m_renderer->renderNodesManager()->lookupResource(id); } -void RenderEntityFunctor::destroy(const Qt3D::QNodeId &id) const +void RenderEntityFunctor::destroy(const Qt3DCore::QNodeId &id) const { m_renderer->renderNodesManager()->releaseResource(id); } diff --git a/src/render/backend/entity_p.h b/src/render/backend/entity_p.h index 1091d3751..947dccef1 100644 --- a/src/render/backend/entity_p.h +++ b/src/render/backend/entity_p.h @@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE class QMatrix4x4; -namespace Qt3D { +namespace Qt3DCore { class QNode; class QEntity; class QComponent; @@ -75,7 +75,7 @@ namespace Render { class Renderer; -class Q_AUTOTEST_EXPORT Entity : public Qt3D::QBackendNode +class Q_AUTOTEST_EXPORT Entity : public Qt3DCore::QBackendNode { public: Entity(); @@ -84,8 +84,8 @@ public: void setParentHandle(HEntity parentHandle); void setRenderer(Renderer *renderer); - void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; - void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; + void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE; void dump() const; @@ -104,19 +104,19 @@ public: Sphere *localBoundingVolume() { return m_localBoundingVolume; } Sphere *worldBoundingVolume() { return m_worldBoundingVolume; } - void addComponent(Qt3D::QComponent *component); - void removeComponent(const Qt3D::QNodeId &nodeId); + void addComponent(Qt3DCore::QComponent *component); + void removeComponent(const Qt3DCore::QNodeId &nodeId); template<class Backend, uint INDEXBITS> - Qt3D::QHandle<Backend, INDEXBITS> componentHandle() const + Qt3DCore::QHandle<Backend, INDEXBITS> componentHandle() const { - return Qt3D::QHandle<Backend, INDEXBITS>(); + return Qt3DCore::QHandle<Backend, INDEXBITS>(); } template<class Backend, uint INDEXBITS> - QList<Qt3D::QHandle<Backend, INDEXBITS> > componentsHandle() const + QList<Qt3DCore::QHandle<Backend, INDEXBITS> > componentsHandle() const { - return QList<Qt3D::QHandle<Backend, INDEXBITS> >(); + return QList<Qt3DCore::QHandle<Backend, INDEXBITS> >(); } template<class Backend> @@ -132,15 +132,15 @@ public: } template<class Backend> - Qt3D::QNodeId componentUuid() const + Qt3DCore::QNodeId componentUuid() const { - return Qt3D::QNodeId(); + return Qt3DCore::QNodeId(); } template<class Backend> - QList<Qt3D::QNodeId> componentsUuid() const + QList<Qt3DCore::QNodeId> componentsUuid() const { - return QList<Qt3D::QNodeId>(); + return QList<Qt3DCore::QNodeId>(); } private: @@ -166,12 +166,12 @@ private: Sphere *m_worldBoundingVolume; // Handles to Components - Qt3D::QNodeId m_transformComponent; - Qt3D::QNodeId m_materialComponent; - Qt3D::QNodeId m_cameraComponent; - QList<Qt3D::QNodeId> m_layerComponents; - QList<Qt3D::QNodeId> m_shaderDataComponents; - Qt3D::QNodeId m_geometryRendererComponent; + Qt3DCore::QNodeId m_transformComponent; + Qt3DCore::QNodeId m_materialComponent; + Qt3DCore::QNodeId m_cameraComponent; + QList<Qt3DCore::QNodeId> m_layerComponents; + QList<Qt3DCore::QNodeId> m_shaderDataComponents; + Qt3DCore::QNodeId m_geometryRendererComponent; QString m_objectName; }; @@ -201,13 +201,13 @@ template<> Q_AUTOTEST_EXPORT GeometryRenderer *Entity::renderComponent<GeometryRenderer>() const; template<> -Q_AUTOTEST_EXPORT Qt3D::QNodeId Entity::componentUuid<Transform>() const; +Q_AUTOTEST_EXPORT Qt3DCore::QNodeId Entity::componentUuid<Transform>() const; template<> -Q_AUTOTEST_EXPORT Qt3D::QNodeId Entity::componentUuid<CameraLens>() const; +Q_AUTOTEST_EXPORT Qt3DCore::QNodeId Entity::componentUuid<CameraLens>() const; template<> -Q_AUTOTEST_EXPORT Qt3D::QNodeId Entity::componentUuid<Material>() const; +Q_AUTOTEST_EXPORT Qt3DCore::QNodeId Entity::componentUuid<Material>() const; template<> QList<HLayer> Entity::componentsHandle<Layer>() const; @@ -216,7 +216,7 @@ template<> QList<Layer *> Entity::renderComponents<Layer>() const; template<> -Q_AUTOTEST_EXPORT QList<Qt3D::QNodeId> Entity::componentsUuid<Layer>() const; +Q_AUTOTEST_EXPORT QList<Qt3DCore::QNodeId> Entity::componentsUuid<Layer>() const; template<> QList<HShaderData> Entity::componentsHandle<ShaderData>() const; @@ -225,18 +225,18 @@ template<> QList<ShaderData *> Entity::renderComponents<ShaderData>() const; template<> -Q_AUTOTEST_EXPORT QList<Qt3D::QNodeId> Entity::componentsUuid<ShaderData>() const; +Q_AUTOTEST_EXPORT QList<Qt3DCore::QNodeId> Entity::componentsUuid<ShaderData>() const; template<> -Q_AUTOTEST_EXPORT Qt3D::QNodeId Entity::componentUuid<GeometryRenderer>() const; +Q_AUTOTEST_EXPORT Qt3DCore::QNodeId Entity::componentUuid<GeometryRenderer>() const; -class RenderEntityFunctor : public Qt3D::QBackendNodeFunctor +class RenderEntityFunctor : public Qt3DCore::QBackendNodeFunctor { public: explicit RenderEntityFunctor(Renderer *renderer); - 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: Renderer *m_renderer; diff --git a/src/render/backend/handle_types_p.h b/src/render/backend/handle_types_p.h index 4761ba4f7..27f8dafc4 100644 --- a/src/render/backend/handle_types_p.h +++ b/src/render/backend/handle_types_p.h @@ -85,32 +85,32 @@ class Attribute; class Geometry; class GeometryRenderer; -typedef Qt3D::QHandle<RenderAttachment, 16> HAttachment; -typedef Qt3D::QHandle<CameraLens, 8> HCamera; -typedef Qt3D::QHandle<Annotation, 16> HCriterion; -typedef Qt3D::QHandle<Effect, 16> HEffect; -typedef Qt3D::QHandle<Entity, 16> HEntity; -typedef Qt3D::QHandle<FrameGraphNode *, 8> HFrameGraphNode; -typedef Qt3D::QHandle<Layer, 16> HLayer; -typedef Qt3D::QHandle<Material, 16> HMaterial; -typedef Qt3D::QHandle<QMatrix4x4, 16> HMatrix; -typedef Qt3D::QHandle<Shader, 16> HShader; -typedef Qt3D::QHandle<QOpenGLVertexArrayObject*, 16> HVao; -typedef Qt3D::QHandle<Shader, 16> HShader; -typedef Qt3D::QHandle<SortCriterion, 8> HSortCriterion; -typedef Qt3D::QHandle<Technique, 16> HTechnique; -typedef Qt3D::QHandle<Texture, 16> HTexture; -typedef Qt3D::QHandle<Transform, 16> HTransform; -typedef Qt3D::QHandle<RenderTarget, 8> HTarget; -typedef Qt3D::QHandle<RenderPass, 16> HRenderPass; -typedef Qt3D::QHandle<TexImageData, 16> HTextureData; -typedef Qt3D::QHandle<Parameter, 16> HParameter; -typedef Qt3D::QHandle<ShaderData, 16> HShaderData; -typedef Qt3D::QHandle<TextureImage, 16> HTextureImage; -typedef Qt3D::QHandle<Buffer, 16> HBuffer; -typedef Qt3D::QHandle<Attribute, 16> HAttribute; -typedef Qt3D::QHandle<Geometry, 16> HGeometry; -typedef Qt3D::QHandle<GeometryRenderer, 16> HGeometryRenderer; +typedef Qt3DCore::QHandle<RenderAttachment, 16> HAttachment; +typedef Qt3DCore::QHandle<CameraLens, 8> HCamera; +typedef Qt3DCore::QHandle<Annotation, 16> HCriterion; +typedef Qt3DCore::QHandle<Effect, 16> HEffect; +typedef Qt3DCore::QHandle<Entity, 16> HEntity; +typedef Qt3DCore::QHandle<FrameGraphNode *, 8> HFrameGraphNode; +typedef Qt3DCore::QHandle<Layer, 16> HLayer; +typedef Qt3DCore::QHandle<Material, 16> HMaterial; +typedef Qt3DCore::QHandle<QMatrix4x4, 16> HMatrix; +typedef Qt3DCore::QHandle<Shader, 16> HShader; +typedef Qt3DCore::QHandle<QOpenGLVertexArrayObject*, 16> HVao; +typedef Qt3DCore::QHandle<Shader, 16> HShader; +typedef Qt3DCore::QHandle<SortCriterion, 8> HSortCriterion; +typedef Qt3DCore::QHandle<Technique, 16> HTechnique; +typedef Qt3DCore::QHandle<Texture, 16> HTexture; +typedef Qt3DCore::QHandle<Transform, 16> HTransform; +typedef Qt3DCore::QHandle<RenderTarget, 8> HTarget; +typedef Qt3DCore::QHandle<RenderPass, 16> HRenderPass; +typedef Qt3DCore::QHandle<TexImageData, 16> HTextureData; +typedef Qt3DCore::QHandle<Parameter, 16> HParameter; +typedef Qt3DCore::QHandle<ShaderData, 16> HShaderData; +typedef Qt3DCore::QHandle<TextureImage, 16> HTextureImage; +typedef Qt3DCore::QHandle<Buffer, 16> HBuffer; +typedef Qt3DCore::QHandle<Attribute, 16> HAttribute; +typedef Qt3DCore::QHandle<Geometry, 16> HGeometry; +typedef Qt3DCore::QHandle<GeometryRenderer, 16> HGeometryRenderer; } // namespace Render diff --git a/src/render/backend/layer.cpp b/src/render/backend/layer.cpp index fdd180d26..332882802 100644 --- a/src/render/backend/layer.cpp +++ b/src/render/backend/layer.cpp @@ -41,7 +41,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { namespace Render { @@ -60,7 +60,7 @@ void Layer::cleanup() { } -void Layer::updateFromPeer(Qt3D::QNode *peer) +void Layer::updateFromPeer(Qt3DCore::QNode *peer) { QLayer *layer = static_cast<QLayer *>(peer); m_layers = layer->names(); @@ -72,7 +72,7 @@ QStringList Layer::layers() const return m_layers; } -void Layer::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) +void Layer::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); if (e->type() == NodeUpdated && propertyChange->propertyName() == QByteArrayLiteral("names")) diff --git a/src/render/backend/layer_p.h b/src/render/backend/layer_p.h index 05ac73711..d75e7164c 100644 --- a/src/render/backend/layer_p.h +++ b/src/render/backend/layer_p.h @@ -62,17 +62,17 @@ namespace Render { class LayerManager; -class Layer : public Qt3D::QBackendNode +class Layer : public Qt3DCore::QBackendNode { public: Layer(); ~Layer(); void cleanup(); - void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE; + void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE; QStringList layers() const; - void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; inline bool isEnabled() const { return m_enabled; } private: diff --git a/src/render/backend/managers_p.h b/src/render/backend/managers_p.h index e59228e4b..1c4e9d86e 100644 --- a/src/render/backend/managers_p.h +++ b/src/render/backend/managers_p.h @@ -77,150 +77,150 @@ namespace Qt3DRender { namespace Render { -class AttachmentManager : public Qt3D::QResourceManager< +class AttachmentManager : public Qt3DCore::QResourceManager< RenderAttachment, - Qt3D::QNodeId, + Qt3DCore::QNodeId, 16, - Qt3D::ArrayAllocatingPolicy, - Qt3D::ObjectLevelLockingPolicy> + Qt3DCore::ArrayAllocatingPolicy, + Qt3DCore::ObjectLevelLockingPolicy> { public: AttachmentManager() {} }; -class CameraManager : public Qt3D::QResourceManager< +class CameraManager : public Qt3DCore::QResourceManager< CameraLens, - Qt3D::QNodeId, + Qt3DCore::QNodeId, 8, - Qt3D::ArrayAllocatingPolicy> + Qt3DCore::ArrayAllocatingPolicy> { public: CameraManager() {} }; -class CriterionManager : public Qt3D::QResourceManager< +class CriterionManager : public Qt3DCore::QResourceManager< Annotation, - Qt3D::QNodeId, + Qt3DCore::QNodeId, 16, - Qt3D::ArrayAllocatingPolicy, - Qt3D::ObjectLevelLockingPolicy> + Qt3DCore::ArrayAllocatingPolicy, + Qt3DCore::ObjectLevelLockingPolicy> { public: CriterionManager() {} }; -class EffectManager : public Qt3D::QResourceManager< +class EffectManager : public Qt3DCore::QResourceManager< Effect, - Qt3D::QNodeId, + Qt3DCore::QNodeId, 16, - Qt3D::ArrayAllocatingPolicy, - Qt3D::ObjectLevelLockingPolicy> + Qt3DCore::ArrayAllocatingPolicy, + Qt3DCore::ObjectLevelLockingPolicy> { public: EffectManager() {} }; -class EntityManager : public Qt3D::QResourceManager<Entity, Qt3D::QNodeId, 16> +class EntityManager : public Qt3DCore::QResourceManager<Entity, Qt3DCore::QNodeId, 16> { public: EntityManager() {} }; -class FrameGraphManager : public Qt3D::QResourceManager< +class FrameGraphManager : public Qt3DCore::QResourceManager< FrameGraphNode *, - Qt3D::QNodeId, + Qt3DCore::QNodeId, 8, - Qt3D::ArrayAllocatingPolicy> + Qt3DCore::ArrayAllocatingPolicy> { public: FrameGraphManager() {} }; -class LayerManager : public Qt3D::QResourceManager< +class LayerManager : public Qt3DCore::QResourceManager< Layer, - Qt3D::QNodeId, + Qt3DCore::QNodeId, 16, - Qt3D::ArrayAllocatingPolicy, - Qt3D::ObjectLevelLockingPolicy> + Qt3DCore::ArrayAllocatingPolicy, + Qt3DCore::ObjectLevelLockingPolicy> { public: LayerManager() {} }; -class MaterialManager : public Qt3D::QResourceManager< +class MaterialManager : public Qt3DCore::QResourceManager< Material, - Qt3D::QNodeId, + Qt3DCore::QNodeId, 16, - Qt3D::ArrayAllocatingPolicy, - Qt3D::ObjectLevelLockingPolicy> + Qt3DCore::ArrayAllocatingPolicy, + Qt3DCore::ObjectLevelLockingPolicy> { public: MaterialManager() {} }; -class MatrixManager : public Qt3D::QResourceManager<QMatrix4x4, Qt3D::QNodeId, 16> +class MatrixManager : public Qt3DCore::QResourceManager<QMatrix4x4, Qt3DCore::QNodeId, 16> { public: MatrixManager() {} }; -class ShaderManager : public Qt3D::QResourceManager< +class ShaderManager : public Qt3DCore::QResourceManager< Shader, - Qt3D::QNodeId, + Qt3DCore::QNodeId, 16, - Qt3D::ArrayAllocatingPolicy, - Qt3D::ObjectLevelLockingPolicy> + Qt3DCore::ArrayAllocatingPolicy, + Qt3DCore::ObjectLevelLockingPolicy> { public: ShaderManager() {} }; -class SortCriterionManager : public Qt3D::QResourceManager< +class SortCriterionManager : public Qt3DCore::QResourceManager< SortCriterion, - Qt3D::QNodeId, + Qt3DCore::QNodeId, 8, - Qt3D::ArrayAllocatingPolicy, - Qt3D::ObjectLevelLockingPolicy> + Qt3DCore::ArrayAllocatingPolicy, + Qt3DCore::ObjectLevelLockingPolicy> { public: SortCriterionManager() {} }; -class TechniqueManager : public Qt3D::QResourceManager< +class TechniqueManager : public Qt3DCore::QResourceManager< Technique, - Qt3D::QNodeId, + Qt3DCore::QNodeId, 16, - Qt3D::ArrayAllocatingPolicy, - Qt3D::ObjectLevelLockingPolicy> + Qt3DCore::ArrayAllocatingPolicy, + Qt3DCore::ObjectLevelLockingPolicy> { public: TechniqueManager() {} }; -class TextureManager : public Qt3D::QResourceManager< +class TextureManager : public Qt3DCore::QResourceManager< Texture, - Qt3D::QNodeId, + Qt3DCore::QNodeId, 16, - Qt3D::ArrayAllocatingPolicy, - Qt3D::ObjectLevelLockingPolicy> + Qt3DCore::ArrayAllocatingPolicy, + Qt3DCore::ObjectLevelLockingPolicy> { public: TextureManager() {} }; -class TransformManager : public Qt3D::QResourceManager< +class TransformManager : public Qt3DCore::QResourceManager< Transform, - Qt3D::QNodeId, + Qt3DCore::QNodeId, 16, - Qt3D::ArrayAllocatingPolicy, - Qt3D::ObjectLevelLockingPolicy> + Qt3DCore::ArrayAllocatingPolicy, + Qt3DCore::ObjectLevelLockingPolicy> { public: TransformManager() {} }; -class VAOManager : public Qt3D::QResourceManager< +class VAOManager : public Qt3DCore::QResourceManager< QOpenGLVertexArrayObject *, QPair<HGeometry, HShader>, 16> @@ -229,84 +229,84 @@ public: VAOManager() {} }; -class RenderTargetManager : public Qt3D::QResourceManager< +class RenderTargetManager : public Qt3DCore::QResourceManager< RenderTarget, - Qt3D::QNodeId, + Qt3DCore::QNodeId, 8, - Qt3D::ArrayAllocatingPolicy, - Qt3D::ObjectLevelLockingPolicy> + Qt3DCore::ArrayAllocatingPolicy, + Qt3DCore::ObjectLevelLockingPolicy> { public: RenderTargetManager() {} }; -class RenderPassManager : public Qt3D::QResourceManager< +class RenderPassManager : public Qt3DCore::QResourceManager< RenderPass, - Qt3D::QNodeId, + Qt3DCore::QNodeId, 16, - Qt3D::ArrayAllocatingPolicy, - Qt3D::ObjectLevelLockingPolicy> + Qt3DCore::ArrayAllocatingPolicy, + Qt3DCore::ObjectLevelLockingPolicy> { public: RenderPassManager() {} }; -class ParameterManager : public Qt3D::QResourceManager< +class ParameterManager : public Qt3DCore::QResourceManager< Parameter, - Qt3D::QNodeId, + Qt3DCore::QNodeId, 16, - Qt3D::ArrayAllocatingPolicy, - Qt3D::ObjectLevelLockingPolicy> + Qt3DCore::ArrayAllocatingPolicy, + Qt3DCore::ObjectLevelLockingPolicy> { public: ParameterManager() {} }; -class ShaderDataManager : public Qt3D::QResourceManager< +class ShaderDataManager : public Qt3DCore::QResourceManager< ShaderData, - Qt3D::QNodeId, + Qt3DCore::QNodeId, 16, - Qt3D::ArrayAllocatingPolicy, - Qt3D::ObjectLevelLockingPolicy> + Qt3DCore::ArrayAllocatingPolicy, + Qt3DCore::ObjectLevelLockingPolicy> { public: ShaderDataManager() {} }; -class UBOManager : public Qt3D::QResourceManager< +class UBOManager : public Qt3DCore::QResourceManager< UniformBuffer, ShaderDataShaderUboKey, 16, - Qt3D::ArrayAllocatingPolicy, - Qt3D::ObjectLevelLockingPolicy> + Qt3DCore::ArrayAllocatingPolicy, + Qt3DCore::ObjectLevelLockingPolicy> { }; -class TextureImageManager : public Qt3D::QResourceManager< +class TextureImageManager : public Qt3DCore::QResourceManager< TextureImage, - Qt3D::QNodeId, + Qt3DCore::QNodeId, 16, - Qt3D::ArrayAllocatingPolicy, - Qt3D::ObjectLevelLockingPolicy> + Qt3DCore::ArrayAllocatingPolicy, + Qt3DCore::ObjectLevelLockingPolicy> { }; -class AttributeManager : public Qt3D::QResourceManager< +class AttributeManager : public Qt3DCore::QResourceManager< Attribute, - Qt3D::QNodeId, + Qt3DCore::QNodeId, 16, - Qt3D::ArrayAllocatingPolicy, - Qt3D::ObjectLevelLockingPolicy> + Qt3DCore::ArrayAllocatingPolicy, + Qt3DCore::ObjectLevelLockingPolicy> { }; -class GeometryManager : public Qt3D::QResourceManager< +class GeometryManager : public Qt3DCore::QResourceManager< Geometry, - Qt3D::QNodeId, + Qt3DCore::QNodeId, 16, - Qt3D::ArrayAllocatingPolicy, - Qt3D::ObjectLevelLockingPolicy> + Qt3DCore::ArrayAllocatingPolicy, + Qt3DCore::ObjectLevelLockingPolicy> { }; diff --git a/src/render/backend/nodefunctor_p.h b/src/render/backend/nodefunctor_p.h index 0067cba81..6a2a902b8 100644 --- a/src/render/backend/nodefunctor_p.h +++ b/src/render/backend/nodefunctor_p.h @@ -58,7 +58,7 @@ namespace Qt3DRender { namespace Render { template<class Backend, class Manager> -class NodeFunctor : public Qt3D::QBackendNodeFunctor +class NodeFunctor : public Qt3DCore::QBackendNodeFunctor { public: explicit NodeFunctor(Manager *manager) @@ -66,7 +66,7 @@ public: { } - Qt3D::QBackendNode *create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const Q_DECL_FINAL + Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const Q_DECL_FINAL { Backend *backend = m_manager->getOrCreateResource(frontend->id()); backend->setFactory(factory); @@ -74,12 +74,12 @@ public: return backend; } - Qt3D::QBackendNode *get(const Qt3D::QNodeId &id) const Q_DECL_FINAL + Qt3DCore::QBackendNode *get(const Qt3DCore::QNodeId &id) const Q_DECL_FINAL { return m_manager->lookupResource(id); } - void destroy(const Qt3D::QNodeId &id) const Q_DECL_FINAL + void destroy(const Qt3DCore::QNodeId &id) const Q_DECL_FINAL { m_manager->releaseResource(id); } diff --git a/src/render/backend/parameterpack.cpp b/src/render/backend/parameterpack.cpp index 3d6553363..17b1c3eef 100644 --- a/src/render/backend/parameterpack.cpp +++ b/src/render/backend/parameterpack.cpp @@ -55,19 +55,19 @@ void ParameterPack::clear() m_peers.clear(); } -void ParameterPack::appendParameter(const Qt3D::QNodeId ¶meterId) +void ParameterPack::appendParameter(const Qt3DCore::QNodeId ¶meterId) { if (!m_peers.contains(parameterId)) { m_peers.append(parameterId); } } -void ParameterPack::removeParameter(const Qt3D::QNodeId ¶meterId) +void ParameterPack::removeParameter(const Qt3DCore::QNodeId ¶meterId) { m_peers.removeOne(parameterId); } -QList<Qt3D::QNodeId> ParameterPack::parameters() const +QList<Qt3DCore::QNodeId> ParameterPack::parameters() const { return m_peers; } diff --git a/src/render/backend/parameterpack_p.h b/src/render/backend/parameterpack_p.h index 74413548e..274797f0d 100644 --- a/src/render/backend/parameterpack_p.h +++ b/src/render/backend/parameterpack_p.h @@ -63,12 +63,12 @@ public: ParameterPack(); ~ParameterPack(); void clear(); - void appendParameter(const Qt3D::QNodeId ¶meterId); - void removeParameter(const Qt3D::QNodeId ¶meterId); - QList<Qt3D::QNodeId> parameters() const; + void appendParameter(const Qt3DCore::QNodeId ¶meterId); + void removeParameter(const Qt3DCore::QNodeId ¶meterId); + QList<Qt3DCore::QNodeId> parameters() const; private: - QList<Qt3D::QNodeId> m_peers; + QList<Qt3DCore::QNodeId> m_peers; }; } // namespace Render diff --git a/src/render/backend/quniformvalue.cpp b/src/render/backend/quniformvalue.cpp index 140035d80..df25fb466 100644 --- a/src/render/backend/quniformvalue.cpp +++ b/src/render/backend/quniformvalue.cpp @@ -56,7 +56,7 @@ QUniformValue::QUniformValue() { } -QUniformValue *QUniformValue::fromVariant(const QVariant &v, Qt3D::QFrameAllocator *allocator) +QUniformValue *QUniformValue::fromVariant(const QVariant &v, Qt3DCore::QFrameAllocator *allocator) { QUniformValue *u = allocator->allocate<QUniformValue>(); u->m_var = v; @@ -88,7 +88,7 @@ void QUniformPack::setUniform(const QString &glslName, const QUniformValue *val) m_uniforms.insert(glslName, val); } -void QUniformPack::setTexture(const QString &glslName, const Qt3D::QNodeId &texId) +void QUniformPack::setTexture(const QString &glslName, const Qt3DCore::QNodeId &texId) { for (int t=0; t<m_textures.size(); ++t) { if (m_textures[t].glslName != glslName) { diff --git a/src/render/backend/quniformvalue_p.h b/src/render/backend/quniformvalue_p.h index 9a57b9027..51bb2fc29 100644 --- a/src/render/backend/quniformvalue_p.h +++ b/src/render/backend/quniformvalue_p.h @@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE class QOpenGLShaderProgram; -namespace Qt3D { +namespace Qt3DCore { class QFrameAllocator; } @@ -79,7 +79,7 @@ public: QUniformValue(); virtual ~QUniformValue() {} - static QUniformValue *fromVariant(const QVariant &v, Qt3D::QFrameAllocator *allocator); + static QUniformValue *fromVariant(const QVariant &v, Qt3DCore::QFrameAllocator *allocator); virtual bool operator ==(const QUniformValue &other); bool operator !=(const QUniformValue &other); @@ -109,12 +109,12 @@ public : return true; } - void setTextureId(const Qt3D::QNodeId &id) + void setTextureId(const Qt3DCore::QNodeId &id) { m_textureId = id; } - Qt3D::QNodeId textureId() const { return m_textureId; } + Qt3DCore::QNodeId textureId() const { return m_textureId; } bool operator ==(const QUniformValue &other) Q_DECL_OVERRIDE { @@ -131,13 +131,13 @@ public : void apply(GraphicsContext *ctx, const ShaderUniform &description) const Q_DECL_OVERRIDE; private: - Qt3D::QNodeId m_textureId; + Qt3DCore::QNodeId m_textureId; int m_textureUnit; }; struct BlockToUBO { int m_blockIndex; - Qt3D::QNodeId m_shaderDataID; + Qt3DCore::QNodeId m_shaderDataID; bool m_needsUpdate; QHash<QString, QVariant> m_updatedProperties; }; @@ -148,7 +148,7 @@ public: ~QUniformPack(); void setUniform(const QString &glslName, const QUniformValue *val); - void setTexture(const QString &glslName, const Qt3D::QNodeId &id); + void setTexture(const QString &glslName, const Qt3DCore::QNodeId &id); void setUniformBuffer(const BlockToUBO &blockToUBO); inline const QHash<QString, const QUniformValue* > &uniforms() const { return m_uniforms; } @@ -157,13 +157,13 @@ public: struct NamedTexture { NamedTexture() {} - NamedTexture(const QString &nm, const Qt3D::QNodeId &t) + NamedTexture(const QString &nm, const Qt3DCore::QNodeId &t) : glslName(nm) , texId(t) { } QString glslName; - Qt3D::QNodeId texId; + Qt3DCore::QNodeId texId; }; inline QVector<NamedTexture> textures() const { return m_textures; } diff --git a/src/render/backend/renderattachment.cpp b/src/render/backend/renderattachment.cpp index a62ae76a5..92436a217 100644 --- a/src/render/backend/renderattachment.cpp +++ b/src/render/backend/renderattachment.cpp @@ -41,7 +41,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { namespace Render { @@ -51,7 +51,7 @@ RenderAttachment::RenderAttachment() { } -void RenderAttachment::updateFromPeer(Qt3D::QNode *peer) +void RenderAttachment::updateFromPeer(Qt3DCore::QNode *peer) { QRenderAttachment *attachment = static_cast<QRenderAttachment *>(peer); @@ -64,7 +64,7 @@ void RenderAttachment::updateFromPeer(Qt3D::QNode *peer) m_attachmentData.m_textureUuid = attachment->texture()->id(); } -Qt3D::QNodeId RenderAttachment::textureUuid() const +Qt3DCore::QNodeId RenderAttachment::textureUuid() const { return m_attachmentData.m_textureUuid; } @@ -94,7 +94,7 @@ QRenderAttachment::RenderAttachmentType RenderAttachment::type() const return m_attachmentData.m_type; } -void RenderAttachment::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) +void RenderAttachment::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); if (e->type() == NodeUpdated) { diff --git a/src/render/backend/renderattachment_p.h b/src/render/backend/renderattachment_p.h index e20ded8ef..d2c4487c0 100644 --- a/src/render/backend/renderattachment_p.h +++ b/src/render/backend/renderattachment_p.h @@ -63,24 +63,24 @@ namespace Render { class AttachmentManager; -class RenderAttachment : public Qt3D::QBackendNode +class RenderAttachment : public Qt3DCore::QBackendNode { public: RenderAttachment(); - void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE; + void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE; - Qt3D::QNodeId textureUuid() const; + Qt3DCore::QNodeId textureUuid() const; int mipLevel() const; int layer() const; QString name() const; QRenderAttachment::CubeMapFace face() const; QRenderAttachment::RenderAttachmentType type() const; - void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; Attachment attachment() const; private: - Qt3D::QNodeId m_attachmentUuid; + Qt3DCore::QNodeId m_attachmentUuid; Attachment m_attachmentData; }; diff --git a/src/render/backend/renderer.cpp b/src/render/backend/renderer.cpp index 5d42e7c6a..a68ee1cc4 100644 --- a/src/render/backend/renderer.cpp +++ b/src/render/backend/renderer.cpp @@ -97,7 +97,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { namespace Render { @@ -326,7 +326,7 @@ void Renderer::createThreadLocalAllocator(void *renderer) /*! * Returns the a FrameAllocator for the caller thread. */ -Qt3D::QFrameAllocator *Renderer::currentFrameAllocator() +Qt3DCore::QFrameAllocator *Renderer::currentFrameAllocator() { // return the QFrameAllocator for the current thread // It is never cleared as each renderview when it is destroyed @@ -429,7 +429,7 @@ void Renderer::shutdown() } } -void Renderer::setFrameGraphRoot(const Qt3D::QNodeId &frameGraphRootUuid) +void Renderer::setFrameGraphRoot(const Qt3DCore::QNodeId &frameGraphRootUuid) { m_frameGraphRootUuid = frameGraphRootUuid; qCDebug(Backend) << Q_FUNC_INFO << m_frameGraphRootUuid; @@ -550,7 +550,7 @@ void Renderer::render() // Matrice update, bounding volumes computation ... // Should be jobs - // namespace Qt3D has 2 distincts node trees + // namespace Qt3DCore has 2 distincts node trees // One scene description // One framegraph description @@ -758,7 +758,7 @@ bool Renderer::submitRenderViews() // Waits to be told to create jobs for the next frame // Called by QRenderAspect jobsToExecute context of QAspectThread -QVector<Qt3D::QAspectJobPtr> Renderer::createRenderBinJobs() +QVector<Qt3DCore::QAspectJobPtr> Renderer::createRenderBinJobs() { // Traverse the current framegraph. For each leaf node create a // RenderView and set its configuration then create a job to @@ -781,7 +781,7 @@ QVector<Qt3D::QAspectJobPtr> Renderer::createRenderBinJobs() // Returns a vector of jobs to be performed for dirty buffers // 1 dirty buffer == 1 job, all job can be performed in parallel -QVector<Qt3D::QAspectJobPtr> Renderer::createRenderBufferJobs() +QVector<Qt3DCore::QAspectJobPtr> Renderer::createRenderBufferJobs() { const QVector<QNodeId> dirtyBuffers = m_bufferManager->dirtyBuffers(); QVector<QAspectJobPtr> dirtyBuffersJobs; @@ -799,7 +799,7 @@ QVector<Qt3D::QAspectJobPtr> Renderer::createRenderBufferJobs() return dirtyBuffersJobs; } -QVector<Qt3D::QAspectJobPtr> Renderer::createGeometryRendererJobs() +QVector<Qt3DCore::QAspectJobPtr> Renderer::createGeometryRendererJobs() { const QVector<QNodeId> dirtyGeometryRenderers = m_geometryRendererManager->dirtyGeometryRenderers(); QVector<QAspectJobPtr> dirtyGeometryRendererJobs; @@ -817,7 +817,7 @@ QVector<Qt3D::QAspectJobPtr> Renderer::createGeometryRendererJobs() } // Called during while traversing the FrameGraph for each leaf node context of QAspectThread -Qt3D::QAspectJobPtr Renderer::createRenderViewJob(FrameGraphNode *node, int submitOrderIndex) +Qt3DCore::QAspectJobPtr Renderer::createRenderViewJob(FrameGraphNode *node, int submitOrderIndex) { RenderViewJobPtr job(new RenderViewJob); job->setRenderer(this); @@ -1053,7 +1053,7 @@ Attribute *Renderer::updateBuffersAndAttributes(Geometry *geometry, RenderComman return indexAttribute; } -void Renderer::addAllocator(Qt3D::QFrameAllocator *allocator) +void Renderer::addAllocator(Qt3DCore::QFrameAllocator *allocator) { QMutexLocker lock(&m_mutex); m_allocators.append(allocator); diff --git a/src/render/backend/renderer_p.h b/src/render/backend/renderer_p.h index a1eb09ce6..f272de2ed 100644 --- a/src/render/backend/renderer_p.h +++ b/src/render/backend/renderer_p.h @@ -74,7 +74,7 @@ QT_BEGIN_NAMESPACE class QSurface; class QOpenGLDebugLogger; -namespace Qt3D { +namespace Qt3DCore { class QEntity; class QFrameAllocator; } @@ -148,11 +148,11 @@ public: void createAllocators(); void destroyAllocators(); - Qt3D::QFrameAllocator *currentFrameAllocator(); + Qt3DCore::QFrameAllocator *currentFrameAllocator(); - QThreadStorage<Qt3D::QFrameAllocator *> *tlsAllocators(); + QThreadStorage<Qt3DCore::QFrameAllocator *> *tlsAllocators(); - void setFrameGraphRoot(const Qt3D::QNodeId &fgRoot); + void setFrameGraphRoot(const Qt3DCore::QNodeId &fgRoot); Render::FrameGraphNode *frameGraphRoot() const; void setSceneGraphRoot(Entity *sgRoot); @@ -161,13 +161,13 @@ public: void render(); void doRender(); - QVector<Qt3D::QAspectJobPtr> createRenderBinJobs(); - QVector<Qt3D::QAspectJobPtr> createRenderBufferJobs(); - QVector<Qt3D::QAspectJobPtr> createGeometryRendererJobs(); - Qt3D::QAspectJobPtr createRenderViewJob(FrameGraphNode *node, int submitOrderIndex); + QVector<Qt3DCore::QAspectJobPtr> createRenderBinJobs(); + QVector<Qt3DCore::QAspectJobPtr> createRenderBufferJobs(); + QVector<Qt3DCore::QAspectJobPtr> createGeometryRendererJobs(); + Qt3DCore::QAspectJobPtr createRenderViewJob(FrameGraphNode *node, int submitOrderIndex); void executeCommands(const QVector<RenderCommand *> &commands); Attribute *updateBuffersAndAttributes(Geometry *geometry, RenderCommand *command, GLsizei &count, bool forceUpdate); - void addAllocator(Qt3D::QFrameAllocator *allocator); + void addAllocator(Qt3DCore::QFrameAllocator *allocator); inline CameraManager *cameraManager() const { return m_cameraManager; } inline EntityManager *renderNodesManager() const { return m_renderNodesManager; } @@ -225,7 +225,7 @@ private: QRenderAspect *m_rendererAspect; // Frame graph root - Qt3D::QNodeId m_frameGraphRootUuid; + Qt3DCore::QNodeId m_frameGraphRootUuid; Entity *m_renderSceneRoot; @@ -293,13 +293,13 @@ private: static void createThreadLocalAllocator(void *renderer); static void destroyThreadLocalAllocator(void *renderer); - QThreadStorage<Qt3D::QFrameAllocator *> m_tlsAllocators; + QThreadStorage<Qt3DCore::QFrameAllocator *> m_tlsAllocators; QAtomicInt m_running; QScopedPointer<QOpenGLDebugLogger> m_debugLogger; QList<AbstractSceneParser *> m_sceneParsers; - QVector<Qt3D::QFrameAllocator *> m_allocators; + QVector<Qt3DCore::QFrameAllocator *> m_allocators; QVector<Attribute *> m_dirtyAttributes; QVector<Geometry *> m_dirtyGeometry; diff --git a/src/render/backend/rendertarget.cpp b/src/render/backend/rendertarget.cpp index e55284377..dc528349c 100644 --- a/src/render/backend/rendertarget.cpp +++ b/src/render/backend/rendertarget.cpp @@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { namespace Render { @@ -52,7 +52,7 @@ RenderTarget::RenderTarget() { } -void RenderTarget::updateFromPeer(Qt3D::QNode *peer) +void RenderTarget::updateFromPeer(Qt3DCore::QNode *peer) { QRenderTarget *target = static_cast<QRenderTarget *>(peer); m_renderAttachments.clear(); @@ -75,12 +75,12 @@ void RenderTarget::removeRenderAttachment(const QNodeId &attachmentId) m_renderAttachments.removeOne(attachmentId); } -QList<Qt3D::QNodeId> RenderTarget::renderAttachments() const +QList<Qt3DCore::QNodeId> RenderTarget::renderAttachments() const { return m_renderAttachments; } -void RenderTarget::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) +void RenderTarget::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); if (e->type() == NodeAdded && propertyChange->propertyName() == QByteArrayLiteral("attachment")) diff --git a/src/render/backend/rendertarget_p.h b/src/render/backend/rendertarget_p.h index 4692a014e..e369ba320 100644 --- a/src/render/backend/rendertarget_p.h +++ b/src/render/backend/rendertarget_p.h @@ -63,23 +63,23 @@ namespace Render { class RenderTargetManager; -class RenderTarget : public Qt3D::QBackendNode +class RenderTarget : public Qt3DCore::QBackendNode { public: RenderTarget(); - void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE; + void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE; void cleanup(); - void appendRenderAttachment(const Qt3D::QNodeId &attachmentId); - void removeRenderAttachment(const Qt3D::QNodeId &attachmentId); + void appendRenderAttachment(const Qt3DCore::QNodeId &attachmentId); + void removeRenderAttachment(const Qt3DCore::QNodeId &attachmentId); - QList<Qt3D::QNodeId> renderAttachments() const; + QList<Qt3DCore::QNodeId> renderAttachments() const; - void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; private: - QList<Qt3D::QNodeId> m_renderAttachments; + QList<Qt3DCore::QNodeId> m_renderAttachments; }; } // namespace Render diff --git a/src/render/backend/renderview.cpp b/src/render/backend/renderview.cpp index c730b7ce2..4e5a1d890 100644 --- a/src/render/backend/renderview.cpp +++ b/src/render/backend/renderview.cpp @@ -94,7 +94,7 @@ bool isEntityInLayers(const Entity *entity, const QStringList &layers) return false; } -void destroyUniformValue(const QUniformValue *value, Qt3D::QFrameAllocator *allocator) +void destroyUniformValue(const QUniformValue *value, Qt3DCore::QFrameAllocator *allocator) { QUniformValue *v = const_cast<QUniformValue *>(value); if (v->isTexture()) diff --git a/src/render/backend/renderview_p.h b/src/render/backend/renderview_p.h index ef7cc77ed..6cf7a308c 100644 --- a/src/render/backend/renderview_p.h +++ b/src/render/backend/renderview_p.h @@ -104,7 +104,7 @@ public: inline void setSurfaceSize(const QSize &size) { m_surfaceSize = size; } inline Renderer *renderer() const { return m_renderer; } - inline void setAllocator(Qt3D::QFrameAllocator *allocator) + inline void setAllocator(Qt3DCore::QFrameAllocator *allocator) { m_allocator = allocator; m_data = m_allocator->allocate<InnerData>(); @@ -116,7 +116,7 @@ public: // help cache performance during iteration m_data->m_viewMatrix = m_allocator->allocate<QMatrix4x4>(); } - inline Qt3D::QFrameAllocator *allocator() const { return m_allocator; } + inline Qt3DCore::QFrameAllocator *allocator() const { return m_allocator; } inline void setRenderCamera(CameraLens *renderCamera) { m_data->m_renderCamera = renderCamera; } inline CameraLens *renderCamera() const { return m_data->m_renderCamera; } @@ -196,7 +196,7 @@ public: void setRenderTargetHandle(HTarget renderTargetHandle) { m_renderTarget = renderTargetHandle; } HTarget renderTargetHandle() const { return m_renderTarget; } - void addSortCriteria(const QList<Qt3D::QNodeId> &sortMethodUid) { m_data->m_sortingCriteria.append(sortMethodUid); } + void addSortCriteria(const QList<Qt3DCore::QNodeId> &sortMethodUid) { m_data->m_sortingCriteria.append(sortMethodUid); } // Helps making the size of RenderView smaller // Contains all the data needed for the actual building of the RenderView @@ -214,7 +214,7 @@ public: const RenderPassFilter *m_passFilter; QMatrix4x4 *m_viewMatrix; QStringList m_layers; - QList<Qt3D::QNodeId> m_sortingCriteria; + QList<Qt3DCore::QNodeId> m_sortingCriteria; QVector3D m_eyePos; UniformBlockValueBuilder m_uniformBlockBuilder; }; @@ -224,7 +224,7 @@ private: Renderer *m_renderer; QSize m_surfaceSize; - Qt3D::QFrameAllocator *m_allocator; + Qt3DCore::QFrameAllocator *m_allocator; InnerData *m_data; diff --git a/src/render/backend/transform.cpp b/src/render/backend/transform.cpp index 91d9ee60e..cb633ace4 100644 --- a/src/render/backend/transform.cpp +++ b/src/render/backend/transform.cpp @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { namespace Render { @@ -53,9 +53,9 @@ Transform::Transform() { } -void Transform::updateFromPeer(Qt3D::QNode *peer) +void Transform::updateFromPeer(Qt3DCore::QNode *peer) { - Qt3D::QTransform *transform = static_cast<Qt3D::QTransform *>(peer); + Qt3DCore::QTransform *transform = static_cast<Qt3DCore::QTransform *>(peer); m_transformMatrix = transform->matrix(); m_enabled = transform->isEnabled(); @@ -66,7 +66,7 @@ QMatrix4x4 Transform::transformMatrix() const return m_transformMatrix; } -void Transform::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) +void Transform::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { if (e->type() == NodeUpdated) { const QScenePropertyChangePtr &propertyChange = qSharedPointerCast<QScenePropertyChange>(e); diff --git a/src/render/backend/transform_p.h b/src/render/backend/transform_p.h index 195274e51..49d876424 100644 --- a/src/render/backend/transform_p.h +++ b/src/render/backend/transform_p.h @@ -60,14 +60,14 @@ namespace Render { class Renderer; class TransformManager; -class Transform : public Qt3D::QBackendNode +class Transform : public Qt3DCore::QBackendNode { public: Transform(); - void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE; + void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE; QMatrix4x4 transformMatrix() const; - void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; inline bool isEnabled() const { return m_enabled; } private: diff --git a/src/render/defaults/qdiffusemapmaterial.h b/src/render/defaults/qdiffusemapmaterial.h index dbbdb21f1..b1a6471aa 100644 --- a/src/render/defaults/qdiffusemapmaterial.h +++ b/src/render/defaults/qdiffusemapmaterial.h @@ -57,7 +57,7 @@ class QT3DRENDERERSHARED_EXPORT QDiffuseMapMaterial : public QMaterial Q_PROPERTY(float textureScale READ textureScale WRITE setTextureScale NOTIFY textureScaleChanged) public: - explicit QDiffuseMapMaterial(Qt3D::QNode *parent = 0); + explicit QDiffuseMapMaterial(Qt3DCore::QNode *parent = 0); ~QDiffuseMapMaterial(); QColor ambient() const; diff --git a/src/render/defaults/qdiffusespecularmapmaterial.h b/src/render/defaults/qdiffusespecularmapmaterial.h index d4568c4a0..f49341e9f 100644 --- a/src/render/defaults/qdiffusespecularmapmaterial.h +++ b/src/render/defaults/qdiffusespecularmapmaterial.h @@ -57,7 +57,7 @@ class QT3DRENDERERSHARED_EXPORT QDiffuseSpecularMapMaterial : public QMaterial Q_PROPERTY(float textureScale READ textureScale WRITE setTextureScale NOTIFY textureScaleChanged) public: - explicit QDiffuseSpecularMapMaterial(Qt3D::QNode *parent = 0); + explicit QDiffuseSpecularMapMaterial(Qt3DCore::QNode *parent = 0); ~QDiffuseSpecularMapMaterial(); QColor ambient() const; diff --git a/src/render/defaults/qforwardrenderer.cpp b/src/render/defaults/qforwardrenderer.cpp index cd6307ec4..2ff2d6784 100644 --- a/src/render/defaults/qforwardrenderer.cpp +++ b/src/render/defaults/qforwardrenderer.cpp @@ -131,7 +131,7 @@ void QForwardRenderer::setClearColor(const QColor &clearColor) \note A camera is a QEntity having a QCameraLens as one of its components. */ -void QForwardRenderer::setCamera(Qt3D::QEntity *camera) +void QForwardRenderer::setCamera(Qt3DCore::QEntity *camera) { Q_D(QForwardRenderer); d->m_cameraSelector->setCamera(camera); @@ -166,7 +166,7 @@ QColor QForwardRenderer::clearColor() const \note A camera is a QEntity that has a QCameraLens as one of its components. */ -Qt3D::QEntity *QForwardRenderer::camera() const +Qt3DCore::QEntity *QForwardRenderer::camera() const { Q_D(const QForwardRenderer); return d->m_cameraSelector->camera(); diff --git a/src/render/defaults/qforwardrenderer.h b/src/render/defaults/qforwardrenderer.h index ff485f55f..44249c767 100644 --- a/src/render/defaults/qforwardrenderer.h +++ b/src/render/defaults/qforwardrenderer.h @@ -52,18 +52,18 @@ class QT3DRENDERERSHARED_EXPORT QForwardRenderer : public QTechniqueFilter Q_OBJECT Q_PROPERTY(QRectF viewportRect READ viewportRect WRITE setViewportRect NOTIFY viewportRectChanged) Q_PROPERTY(QColor clearColor READ clearColor WRITE setClearColor NOTIFY clearColorChanged) - Q_PROPERTY(Qt3D::QEntity *camera READ camera WRITE setCamera NOTIFY cameraChanged) + Q_PROPERTY(Qt3DCore::QEntity *camera READ camera WRITE setCamera NOTIFY cameraChanged) public: - explicit QForwardRenderer(Qt3D::QNode *parent = 0); + explicit QForwardRenderer(Qt3DCore::QNode *parent = 0); ~QForwardRenderer(); void setViewportRect(const QRectF &viewportRect); void setClearColor(const QColor &clearColor); - void setCamera(Qt3D::QEntity *camera); + void setCamera(Qt3DCore::QEntity *camera); QRectF viewportRect() const; QColor clearColor() const; - Qt3D::QEntity *camera() const; + Qt3DCore::QEntity *camera() const; Q_SIGNALS: void viewportRectChanged(); diff --git a/src/render/defaults/qgoochmaterial.cpp b/src/render/defaults/qgoochmaterial.cpp index e8363d6b1..c969df70b 100644 --- a/src/render/defaults/qgoochmaterial.cpp +++ b/src/render/defaults/qgoochmaterial.cpp @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { /*! - \class Qt3D::QGoochMaterialPrivate + \class Qt3DCore::QGoochMaterialPrivate \internal */ QGoochMaterialPrivate::QGoochMaterialPrivate() @@ -129,7 +129,7 @@ void QGoochMaterialPrivate::init() } /*! - \class Qt3D::QGoochMaterial + \class Qt3DCore::QGoochMaterial \brief The QGoochMaterial provides a material that implements the Gooch shading model, popular in CAD and CAM applications. \inmodule Qt3DRenderer @@ -157,7 +157,7 @@ void QGoochMaterialPrivate::init() */ /*! - Constructs a new Qt3D::QGoochMaterial instance with parent object \a parent. + Constructs a new Qt3DCore::QGoochMaterial instance with parent object \a parent. */ QGoochMaterial::QGoochMaterial(QNode *parent) : QMaterial(*new QGoochMaterialPrivate, parent) @@ -174,7 +174,7 @@ QGoochMaterial::QGoochMaterial(QGoochMaterialPrivate &dd, QNode *parent) } /*! - \property Qt3D::QGoochMaterial::diffuse + \property Qt3DCore::QGoochMaterial::diffuse Holds the current diffuse color. */ @@ -185,7 +185,7 @@ QColor QGoochMaterial::diffuse() const } /*! - \property Qt3D::QGoochMaterial::specular + \property Qt3DCore::QGoochMaterial::specular Holds the current specular color. */ @@ -196,7 +196,7 @@ QColor QGoochMaterial::specular() const } /*! - \property Qt3D::QGoochMaterial::cool + \property Qt3DCore::QGoochMaterial::cool Holds the current cool color. */ @@ -207,7 +207,7 @@ QColor QGoochMaterial::cool() const } /*! - \property Qt3D::QGoochMaterial::warm + \property Qt3DCore::QGoochMaterial::warm Holds the current warm color. */ @@ -218,7 +218,7 @@ QColor QGoochMaterial::warm() const } /*! - \property Qt3D::QGoochMaterial::alpha + \property Qt3DCore::QGoochMaterial::alpha Holds the current alpha value. The start point of the color ramp used by the Gooch shader is calculated as {c = cool + alpha * diffuse}. @@ -230,7 +230,7 @@ float QGoochMaterial::alpha() const } /*! - \property Qt3D::QGoochMaterial::beta + \property Qt3DCore::QGoochMaterial::beta Holds the current beta value. The start point of the color ramp used by the Gooch shader is calculated as {c = warm + beta * diffuse}. @@ -242,7 +242,7 @@ float QGoochMaterial::beta() const } /*! - \property Qt3D::QGoochMaterial::shininess + \property Qt3DCore::QGoochMaterial::shininess Holds the current shininess value. Higher values of shininess result in a smaller and brighter highlight. diff --git a/src/render/defaults/qgoochmaterial.h b/src/render/defaults/qgoochmaterial.h index 88f868a8a..6135b9eb3 100644 --- a/src/render/defaults/qgoochmaterial.h +++ b/src/render/defaults/qgoochmaterial.h @@ -58,7 +58,7 @@ class QGoochMaterial : public QMaterial Q_PROPERTY(float shininess READ shininess WRITE setShininess NOTIFY shininessChanged) public: - explicit QGoochMaterial(Qt3D::QNode *parent = 0); + explicit QGoochMaterial(Qt3DCore::QNode *parent = 0); QColor diffuse() const; QColor specular() const; QColor cool() const; @@ -86,7 +86,7 @@ Q_SIGNALS: void shininessChanged(); protected: - QGoochMaterial(QGoochMaterialPrivate &dd, Qt3D::QNode *parent = 0); + QGoochMaterial(QGoochMaterialPrivate &dd, Qt3DCore::QNode *parent = 0); private: Q_DECLARE_PRIVATE(QGoochMaterial) diff --git a/src/render/defaults/qnormaldiffusemapalphamaterial.h b/src/render/defaults/qnormaldiffusemapalphamaterial.h index ae7c28b71..38188e04c 100644 --- a/src/render/defaults/qnormaldiffusemapalphamaterial.h +++ b/src/render/defaults/qnormaldiffusemapalphamaterial.h @@ -49,7 +49,7 @@ class QT3DRENDERERSHARED_EXPORT QNormalDiffuseMapAlphaMaterial : public QNormalD { Q_OBJECT public: - explicit QNormalDiffuseMapAlphaMaterial(Qt3D::QNode *parent = 0); + explicit QNormalDiffuseMapAlphaMaterial(Qt3DCore::QNode *parent = 0); ~QNormalDiffuseMapAlphaMaterial(); private: diff --git a/src/render/defaults/qnormaldiffusemapmaterial.h b/src/render/defaults/qnormaldiffusemapmaterial.h index 4eb6d662c..158cfca45 100644 --- a/src/render/defaults/qnormaldiffusemapmaterial.h +++ b/src/render/defaults/qnormaldiffusemapmaterial.h @@ -58,7 +58,7 @@ class QT3DRENDERERSHARED_EXPORT QNormalDiffuseMapMaterial : public QMaterial Q_PROPERTY(float textureScale READ textureScale WRITE setTextureScale NOTIFY textureScaleChanged) public: - explicit QNormalDiffuseMapMaterial(Qt3D::QNode *parent = 0); + explicit QNormalDiffuseMapMaterial(Qt3DCore::QNode *parent = 0); ~QNormalDiffuseMapMaterial(); QColor ambient() const; @@ -84,7 +84,7 @@ Q_SIGNALS: void textureScaleChanged(); protected: - QNormalDiffuseMapMaterial(QNormalDiffuseMapMaterialPrivate &dd, Qt3D::QNode *parent = 0); + QNormalDiffuseMapMaterial(QNormalDiffuseMapMaterialPrivate &dd, Qt3DCore::QNode *parent = 0); private: Q_DECLARE_PRIVATE(QNormalDiffuseMapMaterial) diff --git a/src/render/defaults/qnormaldiffusespecularmapmaterial.h b/src/render/defaults/qnormaldiffusespecularmapmaterial.h index 5d92ebbc2..668fed0f3 100644 --- a/src/render/defaults/qnormaldiffusespecularmapmaterial.h +++ b/src/render/defaults/qnormaldiffusespecularmapmaterial.h @@ -57,7 +57,7 @@ class QT3DRENDERERSHARED_EXPORT QNormalDiffuseSpecularMapMaterial : public QMate Q_PROPERTY(float textureScale READ textureScale WRITE setTextureScale NOTIFY textureScaleChanged) public: - explicit QNormalDiffuseSpecularMapMaterial(Qt3D::QNode *parent = 0); + explicit QNormalDiffuseSpecularMapMaterial(Qt3DCore::QNode *parent = 0); ~QNormalDiffuseSpecularMapMaterial(); QColor ambient() const; @@ -83,7 +83,7 @@ Q_SIGNALS: void textureScaleChanged(); protected: - QNormalDiffuseSpecularMapMaterial(QNormalDiffuseSpecularMapMaterialPrivate &dd, Qt3D::QNode *parent = 0); + QNormalDiffuseSpecularMapMaterial(QNormalDiffuseSpecularMapMaterialPrivate &dd, Qt3DCore::QNode *parent = 0); private: Q_DECLARE_PRIVATE(QNormalDiffuseSpecularMapMaterial) diff --git a/src/render/defaults/qpervertexcolormaterial.h b/src/render/defaults/qpervertexcolormaterial.h index a21649858..7ce8ece79 100644 --- a/src/render/defaults/qpervertexcolormaterial.h +++ b/src/render/defaults/qpervertexcolormaterial.h @@ -51,7 +51,7 @@ class QT3DRENDERERSHARED_EXPORT QPerVertexColorMaterial : public QMaterial Q_OBJECT public: - explicit QPerVertexColorMaterial(Qt3D::QNode *parent = 0); + explicit QPerVertexColorMaterial(Qt3DCore::QNode *parent = 0); ~QPerVertexColorMaterial(); private: diff --git a/src/render/defaults/qphongmaterial.h b/src/render/defaults/qphongmaterial.h index a37f0f75c..f9576058c 100644 --- a/src/render/defaults/qphongmaterial.h +++ b/src/render/defaults/qphongmaterial.h @@ -55,7 +55,7 @@ class QT3DRENDERERSHARED_EXPORT QPhongMaterial : public QMaterial Q_PROPERTY(float shininess READ shininess WRITE setShininess NOTIFY shininessChanged) public: - explicit QPhongMaterial(Qt3D::QNode *parent = 0); + explicit QPhongMaterial(Qt3DCore::QNode *parent = 0); ~QPhongMaterial(); QColor ambient() const; diff --git a/src/render/defaults/qskyboxentity.cpp b/src/render/defaults/qskyboxentity.cpp index c9a271d9e..1e9b9641e 100644 --- a/src/render/defaults/qskyboxentity.cpp +++ b/src/render/defaults/qskyboxentity.cpp @@ -53,12 +53,12 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { /*! - * \class Qt3D::QSkyboxEntityPrivate + * \class Qt3DCore::QSkyboxEntityPrivate * \internal */ QSkyboxEntityPrivate::QSkyboxEntityPrivate() @@ -75,7 +75,7 @@ QSkyboxEntityPrivate::QSkyboxEntityPrivate() , m_es2RenderPass(new QRenderPass()) , m_gl3RenderPass(new QRenderPass()) , m_mesh(new QCuboidMesh()) - , m_transform(new Qt3D::QTransform()) + , m_transform(new Qt3DCore::QTransform()) , m_translate(new QTranslateTransform()) , m_textureParameter(new QParameter(QStringLiteral("skyboxTexture"), m_skyboxTexture)) , m_posXImage(new QTextureImage()) @@ -184,13 +184,13 @@ void QSkyboxEntityPrivate::reloadTexture() } /*! - * \class Qt3D::QSkyboxEntity + * \class Qt3DCore::QSkyboxEntity * \inmodule Qt3DRenderer * - * \brief Qt3D::QSkyboxEntity is a convenience Qt3D::QEntity subclass that can + * \brief Qt3DCore::QSkyboxEntity is a convenience Qt3DCore::QEntity subclass that can * be used to insert a skybox in a 3D scene. * - * By specifying a base name and an extension, Qt3D::QSkyboxEntity + * By specifying a base name and an extension, Qt3DCore::QSkyboxEntity * will take care of building a TextureCubeMap to be rendered at runtime. The * images in the source directory should match the pattern: * \b base name + * "_posx|_posy|_posz|_negx|_negy|_negz" + extension @@ -204,7 +204,7 @@ void QSkyboxEntityPrivate::reloadTexture() */ /*! - * Constructs a new Qt3D::QSkyboxEntity object with \a parent as parent. + * Constructs a new Qt3DCore::QSkyboxEntity object with \a parent as parent. */ QSkyboxEntity::QSkyboxEntity(QNode *parent) : QEntity(*new QSkyboxEntityPrivate, parent) diff --git a/src/render/defaults/qskyboxentity.h b/src/render/defaults/qskyboxentity.h index 103f8004a..a3708a9f5 100644 --- a/src/render/defaults/qskyboxentity.h +++ b/src/render/defaults/qskyboxentity.h @@ -46,11 +46,11 @@ namespace Qt3DRender { class QSkyboxEntityPrivate; -class QT3DRENDERERSHARED_EXPORT QSkyboxEntity : public Qt3D::QEntity +class QT3DRENDERERSHARED_EXPORT QSkyboxEntity : public Qt3DCore::QEntity { Q_OBJECT public: - explicit QSkyboxEntity(Qt3D::QNode *parent = 0); + explicit QSkyboxEntity(Qt3DCore::QNode *parent = 0); ~QSkyboxEntity(); void setBaseName(const QString &path); diff --git a/src/render/defaults/qskyboxentity_p.h b/src/render/defaults/qskyboxentity_p.h index 0ccc1d3ef..f81bdc21d 100644 --- a/src/render/defaults/qskyboxentity_p.h +++ b/src/render/defaults/qskyboxentity_p.h @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QTransform; class QTranslateTransform; } @@ -71,7 +71,7 @@ class QParameter; class QMaterial; class QEffect; -class QSkyboxEntityPrivate : public Qt3D::QEntityPrivate +class QSkyboxEntityPrivate : public Qt3DCore::QEntityPrivate { QSkyboxEntityPrivate(); @@ -92,8 +92,8 @@ class QSkyboxEntityPrivate : public Qt3D::QEntityPrivate QRenderPass *m_es2RenderPass; QRenderPass *m_gl3RenderPass; QCuboidMesh *m_mesh; - Qt3D::QTransform *m_transform; - Qt3D::QTranslateTransform *m_translate; + Qt3DCore::QTransform *m_transform; + Qt3DCore::QTranslateTransform *m_translate; QParameter *m_textureParameter; QTextureImage *m_posXImage; QTextureImage *m_posYImage; diff --git a/src/render/framegraph/cameraselectornode.cpp b/src/render/framegraph/cameraselectornode.cpp index 527147842..96377e9e7 100644 --- a/src/render/framegraph/cameraselectornode.cpp +++ b/src/render/framegraph/cameraselectornode.cpp @@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { namespace Render { @@ -55,7 +55,7 @@ CameraSelector::CameraSelector() { } -void CameraSelector::updateFromPeer(Qt3D::QNode *peer) +void CameraSelector::updateFromPeer(Qt3DCore::QNode *peer) { QCameraSelector *selector = static_cast<QCameraSelector *>(peer); m_cameraUuid = QNodeId(); @@ -64,7 +64,7 @@ void CameraSelector::updateFromPeer(Qt3D::QNode *peer) setEnabled(selector->isEnabled()); } -void CameraSelector::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) +void CameraSelector::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { qCDebug(Render::Framegraph) << Q_FUNC_INFO; if (e->type() == NodeUpdated) { diff --git a/src/render/framegraph/cameraselectornode_p.h b/src/render/framegraph/cameraselectornode_p.h index 283c81be1..e7075334a 100644 --- a/src/render/framegraph/cameraselectornode_p.h +++ b/src/render/framegraph/cameraselectornode_p.h @@ -67,13 +67,13 @@ class CameraSelector : public FrameGraphNode public: CameraSelector(); - void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE; + void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE; - void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; - Qt3D::QNodeId cameraUuid() const; + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; + Qt3DCore::QNodeId cameraUuid() const; private: - Qt3D::QNodeId m_cameraUuid; + Qt3DCore::QNodeId m_cameraUuid; }; } // namespace Render diff --git a/src/render/framegraph/clearbuffer.cpp b/src/render/framegraph/clearbuffer.cpp index 47982d5f0..c04da0fd0 100644 --- a/src/render/framegraph/clearbuffer.cpp +++ b/src/render/framegraph/clearbuffer.cpp @@ -39,7 +39,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { namespace Render { @@ -50,14 +50,14 @@ ClearBuffer::ClearBuffer() { } -void ClearBuffer::updateFromPeer(Qt3D::QNode *peer) +void ClearBuffer::updateFromPeer(Qt3DCore::QNode *peer) { QClearBuffer *clearBuffer = static_cast<QClearBuffer *>(peer); m_type = clearBuffer->buffers(); setEnabled(clearBuffer->isEnabled()); } -void ClearBuffer::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) +void ClearBuffer::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { if (e->type() == NodeUpdated) { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); diff --git a/src/render/framegraph/clearbuffer_p.h b/src/render/framegraph/clearbuffer_p.h index c7a33e0ac..67c4542a2 100644 --- a/src/render/framegraph/clearbuffer_p.h +++ b/src/render/framegraph/clearbuffer_p.h @@ -64,8 +64,8 @@ class ClearBuffer : public FrameGraphNode public: ClearBuffer(); - 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; QClearBuffer::BufferType type() const; private: diff --git a/src/render/framegraph/framegraphnode.cpp b/src/render/framegraph/framegraphnode.cpp index b001fd675..30859e34b 100644 --- a/src/render/framegraph/framegraphnode.cpp +++ b/src/render/framegraph/framegraphnode.cpp @@ -139,7 +139,7 @@ FrameGraphComponentFunctor::FrameGraphComponentFunctor(Renderer *renderer) { } -Qt3D::QBackendNode *FrameGraphComponentFunctor::create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *) const +Qt3DCore::QBackendNode *FrameGraphComponentFunctor::create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *) const { // TO DO: Ideally we should have a RenderFrameGraph component and use its setPeer method // to do that @@ -149,13 +149,13 @@ Qt3D::QBackendNode *FrameGraphComponentFunctor::create(Qt3D::QNode *frontend, co return Q_NULLPTR; } -Qt3D::QBackendNode *FrameGraphComponentFunctor::get(const Qt3D::QNodeId &id) const +Qt3DCore::QBackendNode *FrameGraphComponentFunctor::get(const Qt3DCore::QNodeId &id) const { Q_UNUSED(id); return Q_NULLPTR; } -void FrameGraphComponentFunctor::destroy(const Qt3D::QNodeId &id) const +void FrameGraphComponentFunctor::destroy(const Qt3DCore::QNodeId &id) const { Q_UNUSED(id); } diff --git a/src/render/framegraph/framegraphnode_p.h b/src/render/framegraph/framegraphnode_p.h index 35875bcab..b58cfdbff 100644 --- a/src/render/framegraph/framegraphnode_p.h +++ b/src/render/framegraph/framegraphnode_p.h @@ -62,7 +62,7 @@ namespace Qt3DRender { namespace Render { -class FrameGraphNode : public Qt3D::QBackendNode +class FrameGraphNode : public Qt3DCore::QBackendNode { public: FrameGraphNode(); @@ -116,7 +116,7 @@ private: }; template<typename Backend, typename Frontend> -class FrameGraphNodeFunctor : public Qt3D::QBackendNodeFunctor +class FrameGraphNodeFunctor : public Qt3DCore::QBackendNodeFunctor { public: explicit FrameGraphNodeFunctor(FrameGraphManager *manager) @@ -124,12 +124,12 @@ public: { } - Qt3D::QBackendNode *create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const Q_DECL_OVERRIDE + Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const Q_DECL_OVERRIDE { return createBackendFrameGraphNode(frontend, factory); } - Qt3D::QBackendNode *get(const Qt3D::QNodeId &id) const Q_DECL_OVERRIDE + Qt3DCore::QBackendNode *get(const Qt3DCore::QNodeId &id) const Q_DECL_OVERRIDE { FrameGraphNode **node = m_manager->lookupResource(id); if (node != Q_NULLPTR) @@ -137,13 +137,13 @@ public: return Q_NULLPTR; } - void destroy(const Qt3D::QNodeId &id) const Q_DECL_OVERRIDE + void destroy(const Qt3DCore::QNodeId &id) const Q_DECL_OVERRIDE { m_manager->releaseResource(id); } protected: - Backend *createBackendFrameGraphNode(Qt3D::QNode *n, const Qt3D::QBackendNodeFactory *factory) const + Backend *createBackendFrameGraphNode(Qt3DCore::QNode *n, const Qt3DCore::QBackendNodeFactory *factory) const { Frontend *f = qobject_cast<Frontend *>(n); if (f != Q_NULLPTR) { @@ -170,13 +170,13 @@ private: FrameGraphManager *m_manager; }; -class FrameGraphComponentFunctor : public Qt3D::QBackendNodeFunctor +class FrameGraphComponentFunctor : public Qt3DCore::QBackendNodeFunctor { public: explicit FrameGraphComponentFunctor(Renderer *renderer); - 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: Renderer *m_renderer; diff --git a/src/render/framegraph/framegraphsubtreeselector.cpp b/src/render/framegraph/framegraphsubtreeselector.cpp index 5fa060d37..4ff874118 100644 --- a/src/render/framegraph/framegraphsubtreeselector.cpp +++ b/src/render/framegraph/framegraphsubtreeselector.cpp @@ -53,13 +53,13 @@ FrameGraphSubtreeSelector::~FrameGraphSubtreeSelector() { } -void FrameGraphSubtreeSelector::updateFromPeer(Qt3D::QNode *peer) +void FrameGraphSubtreeSelector::updateFromPeer(Qt3DCore::QNode *peer) { QFrameGraphSelector *selector = static_cast<QFrameGraphSelector *>(peer); setEnabled(selector->isEnabled()); } -void FrameGraphSubtreeSelector::sceneChangeEvent(const Qt3D::QSceneChangePtr &) +void FrameGraphSubtreeSelector::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &) { } diff --git a/src/render/framegraph/framegraphsubtreeselector_p.h b/src/render/framegraph/framegraphsubtreeselector_p.h index f6b8aeb32..72e4ac4a4 100644 --- a/src/render/framegraph/framegraphsubtreeselector_p.h +++ b/src/render/framegraph/framegraphsubtreeselector_p.h @@ -63,8 +63,8 @@ public: FrameGraphSubtreeSelector(); ~FrameGraphSubtreeSelector(); - void updateFromPeer(Qt3D::QNode *peer) Q_DECL_FINAL; - void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_FINAL; + void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_FINAL; + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_FINAL; }; } // namespace Render diff --git a/src/render/framegraph/framegraphvisitor.cpp b/src/render/framegraph/framegraphvisitor.cpp index e9b825815..29de86e98 100644 --- a/src/render/framegraph/framegraphvisitor.cpp +++ b/src/render/framegraph/framegraphvisitor.cpp @@ -41,7 +41,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { namespace Render { @@ -56,7 +56,7 @@ FrameGraphVisitor::FrameGraphVisitor() void FrameGraphVisitor::traverse(FrameGraphNode *root, Renderer *renderer, - QVector<Qt3D::QAspectJobPtr> *jobs) + QVector<Qt3DCore::QAspectJobPtr> *jobs) { m_renderer = renderer; m_jobs = jobs; diff --git a/src/render/framegraph/framegraphvisitor_p.h b/src/render/framegraph/framegraphvisitor_p.h index 3e3273b0f..66d3292b9 100644 --- a/src/render/framegraph/framegraphvisitor_p.h +++ b/src/render/framegraph/framegraphvisitor_p.h @@ -69,13 +69,13 @@ public: void traverse(FrameGraphNode *root, Renderer *renderer, - QVector<Qt3D::QAspectJobPtr> *jobs); + QVector<Qt3DCore::QAspectJobPtr> *jobs); private: void visit(Render::FrameGraphNode *node); Renderer *m_renderer; - QVector<Qt3D::QAspectJobPtr> *m_jobs; + QVector<Qt3DCore::QAspectJobPtr> *m_jobs; int m_renderviewIndex; }; diff --git a/src/render/framegraph/layerfilternode.cpp b/src/render/framegraph/layerfilternode.cpp index 4c9ee50ad..247d795b2 100644 --- a/src/render/framegraph/layerfilternode.cpp +++ b/src/render/framegraph/layerfilternode.cpp @@ -40,7 +40,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { namespace Render { @@ -50,14 +50,14 @@ LayerFilterNode::LayerFilterNode() { } -void LayerFilterNode::updateFromPeer(Qt3D::QNode *peer) +void LayerFilterNode::updateFromPeer(Qt3DCore::QNode *peer) { QLayerFilter *layerFilter = static_cast<QLayerFilter *>(peer); m_layers = layerFilter->layers(); setEnabled(layerFilter->isEnabled()); } -void LayerFilterNode::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) +void LayerFilterNode::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { if (e->type() == NodeUpdated) { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); diff --git a/src/render/framegraph/layerfilternode_p.h b/src/render/framegraph/layerfilternode_p.h index 1e6649b1d..7d5ba58b0 100644 --- a/src/render/framegraph/layerfilternode_p.h +++ b/src/render/framegraph/layerfilternode_p.h @@ -66,8 +66,8 @@ class LayerFilterNode : public FrameGraphNode public: LayerFilterNode(); - 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; QStringList layers() const; void setLayers(const QStringList &list); diff --git a/src/render/framegraph/nodraw.cpp b/src/render/framegraph/nodraw.cpp index 0822779f8..55b0359c1 100644 --- a/src/render/framegraph/nodraw.cpp +++ b/src/render/framegraph/nodraw.cpp @@ -40,7 +40,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { namespace Render { @@ -54,13 +54,13 @@ NoDraw::~NoDraw() { } -void NoDraw::updateFromPeer(Qt3D::QNode *peer) +void NoDraw::updateFromPeer(Qt3DCore::QNode *peer) { QNoDraw *noDraw = static_cast<QNoDraw *>(peer); setEnabled(noDraw->isEnabled()); } -void NoDraw::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) +void NoDraw::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); diff --git a/src/render/framegraph/nodraw_p.h b/src/render/framegraph/nodraw_p.h index 510327ff9..2289f79bd 100644 --- a/src/render/framegraph/nodraw_p.h +++ b/src/render/framegraph/nodraw_p.h @@ -62,10 +62,10 @@ public: NoDraw(); ~NoDraw(); - void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE; + void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE; protected: - void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; }; } // namespace Render diff --git a/src/render/framegraph/qcameraselector.cpp b/src/render/framegraph/qcameraselector.cpp index d77c493e9..37df26beb 100644 --- a/src/render/framegraph/qcameraselector.cpp +++ b/src/render/framegraph/qcameraselector.cpp @@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { /*! - \class Qt3D::CameraSelector + \class Qt3DCore::CameraSelector */ /*! \internal */ @@ -69,10 +69,10 @@ void QCameraSelector::copy(const QNode *ref) const QCameraSelector *other = static_cast<const QCameraSelector*>(ref); if (other->d_func()->m_camera) - setCamera(qobject_cast<Qt3D::QEntity *>(QNode::clone(other->d_func()->m_camera))); + setCamera(qobject_cast<Qt3DCore::QEntity *>(QNode::clone(other->d_func()->m_camera))); } -QCameraSelector::QCameraSelector(Qt3D::QNode *parent) +QCameraSelector::QCameraSelector(Qt3DCore::QNode *parent) : QFrameGraphNode(*new QCameraSelectorPrivate, parent) {} @@ -81,7 +81,7 @@ QCameraSelector::~QCameraSelector() QNode::cleanup(); } -void QCameraSelector::setCamera(Qt3D::QEntity *camera) +void QCameraSelector::setCamera(Qt3DCore::QEntity *camera) { Q_D(QCameraSelector); if (d->m_camera != camera) { @@ -97,7 +97,7 @@ void QCameraSelector::setCamera(Qt3D::QEntity *camera) } } -Qt3D::QEntity *QCameraSelector::camera() const +Qt3DCore::QEntity *QCameraSelector::camera() const { Q_D(const QCameraSelector); return d->m_camera; diff --git a/src/render/framegraph/qcameraselector.h b/src/render/framegraph/qcameraselector.h index 546d77a61..4088f6e8b 100644 --- a/src/render/framegraph/qcameraselector.h +++ b/src/render/framegraph/qcameraselector.h @@ -49,21 +49,21 @@ class QCameraSelectorPrivate; class QT3DRENDERERSHARED_EXPORT QCameraSelector : public QFrameGraphNode { Q_OBJECT - Q_PROPERTY(Qt3D::QEntity *camera READ camera WRITE setCamera NOTIFY cameraChanged) + Q_PROPERTY(Qt3DCore::QEntity *camera READ camera WRITE setCamera NOTIFY cameraChanged) public: - explicit QCameraSelector(Qt3D::QNode *parent = 0); + explicit QCameraSelector(Qt3DCore::QNode *parent = 0); ~QCameraSelector(); - void setCamera(Qt3D::QEntity *camera); - Qt3D::QEntity *camera() const; + void setCamera(Qt3DCore::QEntity *camera); + Qt3DCore::QEntity *camera() const; Q_SIGNALS: void cameraChanged(); protected: - QCameraSelector(QCameraSelectorPrivate &dd, Qt3D::QNode *parent = 0); - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + QCameraSelector(QCameraSelectorPrivate &dd, Qt3DCore::QNode *parent = 0); + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: QT3D_CLONEABLE(QCameraSelector) diff --git a/src/render/framegraph/qcameraselector_p.h b/src/render/framegraph/qcameraselector_p.h index d387b9d86..aec10ae94 100644 --- a/src/render/framegraph/qcameraselector_p.h +++ b/src/render/framegraph/qcameraselector_p.h @@ -63,7 +63,7 @@ public: QCameraSelectorPrivate(); Q_DECLARE_PUBLIC(QCameraSelector) - Qt3D::QEntity *m_camera; + Qt3DCore::QEntity *m_camera; }; diff --git a/src/render/framegraph/qclearbuffer.h b/src/render/framegraph/qclearbuffer.h index 9b42cb46c..62b645a06 100644 --- a/src/render/framegraph/qclearbuffer.h +++ b/src/render/framegraph/qclearbuffer.h @@ -50,7 +50,7 @@ class QT3DRENDERERSHARED_EXPORT QClearBuffer : public QFrameGraphNode Q_OBJECT Q_PROPERTY(BufferType buffers READ buffers WRITE setBuffers NOTIFY buffersChanged) public: - explicit QClearBuffer(Qt3D::QNode *parent = 0); + explicit QClearBuffer(Qt3DCore::QNode *parent = 0); ~QClearBuffer(); enum BufferType { @@ -72,8 +72,8 @@ Q_SIGNALS: void buffersChanged(); protected: - QClearBuffer(QClearBufferPrivate &dd, Qt3D::QNode *parent = 0); - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + QClearBuffer(QClearBufferPrivate &dd, Qt3DCore::QNode *parent = 0); + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QClearBuffer) diff --git a/src/render/framegraph/qframegraph.h b/src/render/framegraph/qframegraph.h index 2a32a95f6..0b720ea72 100644 --- a/src/render/framegraph/qframegraph.h +++ b/src/render/framegraph/qframegraph.h @@ -47,7 +47,7 @@ namespace Qt3DRender { class QFrameGraphPrivate; class QFrameGraphNode; -class QT3DRENDERERSHARED_EXPORT QFrameGraph : public Qt3D::QComponent +class QT3DRENDERERSHARED_EXPORT QFrameGraph : public Qt3DCore::QComponent { Q_OBJECT // Note : The full namespace has to be used to define the property @@ -56,7 +56,7 @@ class QT3DRENDERERSHARED_EXPORT QFrameGraph : public Qt3D::QComponent Q_CLASSINFO("DefaultProperty", "activeFrameGraph") public: - explicit QFrameGraph(Qt3D::QNode *parent = 0); + explicit QFrameGraph(Qt3DCore::QNode *parent = 0); ~QFrameGraph(); QFrameGraphNode *activeFrameGraph() const; @@ -66,8 +66,8 @@ Q_SIGNALS: void activeFrameGraphChanged(); protected: - QFrameGraph(QFrameGraphPrivate &dd, Qt3D::QNode *parent = 0); - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + QFrameGraph(QFrameGraphPrivate &dd, Qt3DCore::QNode *parent = 0); + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QFrameGraph) diff --git a/src/render/framegraph/qframegraph_p.h b/src/render/framegraph/qframegraph_p.h index ea502c11f..d340c04f7 100644 --- a/src/render/framegraph/qframegraph_p.h +++ b/src/render/framegraph/qframegraph_p.h @@ -58,7 +58,7 @@ namespace Qt3DRender { class QFrameGraph; class QFrameGraphNode; -class QFrameGraphPrivate : public Qt3D::QComponentPrivate +class QFrameGraphPrivate : public Qt3DCore::QComponentPrivate { public: QFrameGraphPrivate(); diff --git a/src/render/framegraph/qframegraphnode.cpp b/src/render/framegraph/qframegraphnode.cpp index 1c28d72a0..519843fa7 100644 --- a/src/render/framegraph/qframegraphnode.cpp +++ b/src/render/framegraph/qframegraphnode.cpp @@ -82,7 +82,7 @@ QFrameGraphNode::QFrameGraphNode(QNode *parent) QFrameGraphNode::~QFrameGraphNode() { - Q_ASSERT_X(Qt3D::QNodePrivate::get(this)->m_wasCleanedUp, Q_FUNC_INFO, "QNode::cleanup should have been called by now. A Qt3DRender::QFrameGraphNode subclass didn't call QNode::cleanup in its destructor"); + Q_ASSERT_X(Qt3DCore::QNodePrivate::get(this)->m_wasCleanedUp, Q_FUNC_INFO, "QNode::cleanup should have been called by now. A Qt3DRender::QFrameGraphNode subclass didn't call QNode::cleanup in its destructor"); } /*! diff --git a/src/render/framegraph/qframegraphnode.h b/src/render/framegraph/qframegraphnode.h index ce14b9bed..826edd36f 100644 --- a/src/render/framegraph/qframegraphnode.h +++ b/src/render/framegraph/qframegraphnode.h @@ -47,12 +47,12 @@ namespace Qt3DRender { class QFrameGraphNodePrivate; -class QT3DRENDERERSHARED_EXPORT QFrameGraphNode : public Qt3D::QNode +class QT3DRENDERERSHARED_EXPORT QFrameGraphNode : public Qt3DCore::QNode { Q_OBJECT Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled NOTIFY enabledChanged) public: - explicit QFrameGraphNode(Qt3D::QNode *parent = 0); + explicit QFrameGraphNode(Qt3DCore::QNode *parent = 0); ~QFrameGraphNode(); QFrameGraphNode *parentFrameGraphNode() const; @@ -61,7 +61,7 @@ public: void setEnabled(bool enabled); protected: - QFrameGraphNode(QFrameGraphNodePrivate &dd, Qt3D::QNode *parent = 0); + QFrameGraphNode(QFrameGraphNodePrivate &dd, Qt3DCore::QNode *parent = 0); Q_SIGNALS: void enabledChanged(); diff --git a/src/render/framegraph/qframegraphnode_p.h b/src/render/framegraph/qframegraphnode_p.h index 3d1c99a7c..1bcab0c29 100644 --- a/src/render/framegraph/qframegraphnode_p.h +++ b/src/render/framegraph/qframegraphnode_p.h @@ -58,7 +58,7 @@ namespace Qt3DRender { class QFrameGraphNode; -class QFrameGraphNodePrivate : public Qt3D::QNodePrivate +class QFrameGraphNodePrivate : public Qt3DCore::QNodePrivate { public: QFrameGraphNodePrivate(); diff --git a/src/render/framegraph/qframegraphselector.h b/src/render/framegraph/qframegraphselector.h index 8300be080..64f8bf9fb 100644 --- a/src/render/framegraph/qframegraphselector.h +++ b/src/render/framegraph/qframegraphselector.h @@ -59,14 +59,14 @@ class QT3DRENDERERSHARED_EXPORT QFrameGraphSelector : public QFrameGraphNode { Q_OBJECT public: - explicit QFrameGraphSelector(Qt3D::QNode *parent = 0); + explicit QFrameGraphSelector(Qt3DCore::QNode *parent = 0); ~QFrameGraphSelector(); QFrameGraphSelectorFunctorPtr selectionFunctor() const; void setSelectionFunctor(QFrameGraphSelectorFunctorPtr functor); protected: - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: QT3D_CLONEABLE(QFrameGraphSelector) diff --git a/src/render/framegraph/qlayerfilter.h b/src/render/framegraph/qlayerfilter.h index 7e177e322..5d20ca30e 100644 --- a/src/render/framegraph/qlayerfilter.h +++ b/src/render/framegraph/qlayerfilter.h @@ -51,7 +51,7 @@ class QT3DRENDERERSHARED_EXPORT QLayerFilter : public QFrameGraphNode Q_OBJECT Q_PROPERTY(QStringList layers READ layers WRITE setLayers NOTIFY layersChanged) public: - explicit QLayerFilter(Qt3D::QNode *parent = 0); + explicit QLayerFilter(Qt3DCore::QNode *parent = 0); ~QLayerFilter(); void setLayers(const QStringList &layers); @@ -61,8 +61,8 @@ Q_SIGNALS: void layersChanged(); protected: - QLayerFilter(QLayerFilterPrivate &dd, Qt3D::QNode *parent = 0); - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + QLayerFilter(QLayerFilterPrivate &dd, Qt3DCore::QNode *parent = 0); + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QLayerFilter) diff --git a/src/render/framegraph/qnodraw.cpp b/src/render/framegraph/qnodraw.cpp index 294bdba5f..e24b2ca83 100644 --- a/src/render/framegraph/qnodraw.cpp +++ b/src/render/framegraph/qnodraw.cpp @@ -41,12 +41,12 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { /*! - * \class Qt3D::QNoDraw::QNoDraw + * \class Qt3DCore::QNoDraw::QNoDraw * - * \brief When a Qt3D::QNoDraw node is present in a FrameGraph branch, this + * \brief When a Qt3DCore::QNoDraw node is present in a FrameGraph branch, this * prevents the renderer from rendering any primitive. * - * Qt3D::QNoDraw should be used when the FrameGraph needs to set up some render + * Qt3DCore::QNoDraw should be used when the FrameGraph needs to set up some render * states or clear some buffers without requiring any mesh to be drawn. It has * the same effect as having a Qt3DRender::QRenderPassFilter that matches none of * available Qt3DRender::QRenderPass instances of the scene without the overhead cost diff --git a/src/render/framegraph/qnodraw.h b/src/render/framegraph/qnodraw.h index 361bbfdc4..3daee3212 100644 --- a/src/render/framegraph/qnodraw.h +++ b/src/render/framegraph/qnodraw.h @@ -47,7 +47,7 @@ class QT3DRENDERERSHARED_EXPORT QNoDraw : public QFrameGraphNode { Q_OBJECT public: - explicit QNoDraw(Qt3D::QNode *parent = 0); + explicit QNoDraw(Qt3DCore::QNode *parent = 0); ~QNoDraw(); private: diff --git a/src/render/framegraph/qrenderpassfilter.cpp b/src/render/framegraph/qrenderpassfilter.cpp index bc72ed652..eb3fec7a1 100644 --- a/src/render/framegraph/qrenderpassfilter.cpp +++ b/src/render/framegraph/qrenderpassfilter.cpp @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { diff --git a/src/render/framegraph/qrenderpassfilter.h b/src/render/framegraph/qrenderpassfilter.h index edab54406..15ff9738b 100644 --- a/src/render/framegraph/qrenderpassfilter.h +++ b/src/render/framegraph/qrenderpassfilter.h @@ -55,7 +55,7 @@ class QT3DRENDERERSHARED_EXPORT QRenderPassFilter : public QFrameGraphNode Q_OBJECT public: - explicit QRenderPassFilter(Qt3D::QNode *parent = 0); + explicit QRenderPassFilter(Qt3DCore::QNode *parent = 0); ~QRenderPassFilter(); QList<QAnnotation *> includes() const; @@ -67,8 +67,8 @@ public: QList<QParameter *> parameters() const; protected: - QRenderPassFilter(QRenderPassFilterPrivate &dd, Qt3D::QNode *parent = 0); - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + QRenderPassFilter(QRenderPassFilterPrivate &dd, Qt3DCore::QNode *parent = 0); + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QRenderPassFilter) diff --git a/src/render/framegraph/qrendertargetselector.cpp b/src/render/framegraph/qrendertargetselector.cpp index fc87cadc9..58529ae09 100644 --- a/src/render/framegraph/qrendertargetselector.cpp +++ b/src/render/framegraph/qrendertargetselector.cpp @@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { diff --git a/src/render/framegraph/qrendertargetselector.h b/src/render/framegraph/qrendertargetselector.h index c05f4584f..a83029f3b 100644 --- a/src/render/framegraph/qrendertargetselector.h +++ b/src/render/framegraph/qrendertargetselector.h @@ -54,7 +54,7 @@ class QT3DRENDERERSHARED_EXPORT QRenderTargetSelector : public QFrameGraphNode Q_OBJECT Q_PROPERTY(Qt3DRender::QRenderTarget *target READ target WRITE setTarget NOTIFY targetChanged) public: - explicit QRenderTargetSelector(Qt3D::QNode *parent = 0); + explicit QRenderTargetSelector(Qt3DCore::QNode *parent = 0); ~QRenderTargetSelector(); void setTarget(QRenderTarget *target); @@ -67,8 +67,8 @@ Q_SIGNALS: void targetChanged(); protected: - QRenderTargetSelector(QRenderTargetSelectorPrivate &dd, Qt3D::QNode *parent = 0); - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + QRenderTargetSelector(QRenderTargetSelectorPrivate &dd, Qt3DCore::QNode *parent = 0); + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QRenderTargetSelector) diff --git a/src/render/framegraph/qsortcriterion.cpp b/src/render/framegraph/qsortcriterion.cpp index 2c09a552c..f4a5fdf9d 100644 --- a/src/render/framegraph/qsortcriterion.cpp +++ b/src/render/framegraph/qsortcriterion.cpp @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { /*! - \class Qt3D::QSortCriterionPrivate + \class Qt3DCore::QSortCriterionPrivate \internal */ QSortCriterionPrivate::QSortCriterionPrivate() diff --git a/src/render/framegraph/qsortcriterion.h b/src/render/framegraph/qsortcriterion.h index d4e12a7a8..41ec43393 100644 --- a/src/render/framegraph/qsortcriterion.h +++ b/src/render/framegraph/qsortcriterion.h @@ -46,12 +46,12 @@ namespace Qt3DRender { class QSortCriterionPrivate; -class QT3DRENDERERSHARED_EXPORT QSortCriterion : public Qt3D::QNode +class QT3DRENDERERSHARED_EXPORT QSortCriterion : public Qt3DCore::QNode { Q_OBJECT Q_PROPERTY(Qt3DRender::QSortCriterion::SortType sort READ sort WRITE setSort NOTIFY sortChanged) public: - explicit QSortCriterion(Qt3D::QNode *parent = 0); + explicit QSortCriterion(Qt3DCore::QNode *parent = 0); ~QSortCriterion(); enum SortType { @@ -68,8 +68,8 @@ Q_SIGNALS: void sortChanged(); protected: - QSortCriterion(QSortCriterionPrivate &dd, Qt3D::QNode *parent = 0); - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + QSortCriterion(QSortCriterionPrivate &dd, Qt3DCore::QNode *parent = 0); + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: QT3D_CLONEABLE(QSortCriterion) diff --git a/src/render/framegraph/qsortcriterion_p.h b/src/render/framegraph/qsortcriterion_p.h index 34d51238d..f9f39f747 100644 --- a/src/render/framegraph/qsortcriterion_p.h +++ b/src/render/framegraph/qsortcriterion_p.h @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QSortCriterionPrivate : public Qt3D::QNodePrivate +class QSortCriterionPrivate : public Qt3DCore::QNodePrivate { public: QSortCriterionPrivate(); diff --git a/src/render/framegraph/qsortmethod.cpp b/src/render/framegraph/qsortmethod.cpp index c103fbe47..9253326f2 100644 --- a/src/render/framegraph/qsortmethod.cpp +++ b/src/render/framegraph/qsortmethod.cpp @@ -42,12 +42,12 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { /*! - \class Qt3D::QSortMethodPrivate + \class Qt3DCore::QSortMethodPrivate \internal */ QSortMethodPrivate::QSortMethodPrivate() diff --git a/src/render/framegraph/qsortmethod.h b/src/render/framegraph/qsortmethod.h index 5eb5ee85e..337eaebf6 100644 --- a/src/render/framegraph/qsortmethod.h +++ b/src/render/framegraph/qsortmethod.h @@ -51,7 +51,7 @@ class QT3DRENDERERSHARED_EXPORT QSortMethod : public QFrameGraphNode Q_OBJECT public: - explicit QSortMethod(Qt3D::QNode *parent = 0); + explicit QSortMethod(Qt3DCore::QNode *parent = 0); ~QSortMethod(); void addCriterion(QSortCriterion *criterion); @@ -59,8 +59,8 @@ public: QList<QSortCriterion *> criteria() const; protected: - QSortMethod(QSortMethodPrivate &dd, Qt3D::QNode *parent = 0); - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + QSortMethod(QSortMethodPrivate &dd, Qt3DCore::QNode *parent = 0); + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QSortMethod) diff --git a/src/render/framegraph/qstateset.cpp b/src/render/framegraph/qstateset.cpp index cd7646d7b..f67f15b8e 100644 --- a/src/render/framegraph/qstateset.cpp +++ b/src/render/framegraph/qstateset.cpp @@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { @@ -52,22 +52,22 @@ QStateSetPrivate::QStateSetPrivate() } /*! - * \class Qt3D::QStateSet + * \class Qt3DCore::QStateSet * \inmodule Qt3DRender * - * \brief The Qt3D::QStateSet FrameGraph node offers a way of specifying a set - * of Qt3D::QRenderState to be applied during the execution of a FrameGraph + * \brief The Qt3DCore::QStateSet FrameGraph node offers a way of specifying a set + * of Qt3DCore::QRenderState to be applied during the execution of a FrameGraph * branch. * - * States set on a Qt3D::QStateSet are set globally, contrary to the per + * States set on a Qt3DCore::QStateSet are set globally, contrary to the per * Material states that can be set on a Qt3DRender::QRenderPass. By default an empty - * Qt3D::QStateSet will result in all render states being disabled when - * executed. Adding a Qt3D::QRenderState state explicitly enables that render + * Qt3DCore::QStateSet will result in all render states being disabled when + * executed. Adding a Qt3DCore::QRenderState state explicitly enables that render * state at runtime. * * \since 5.5 * - * \sa Qt3D::QRenderState, Qt3DRender::QRenderPass + * \sa Qt3DCore::QRenderState, Qt3DRender::QRenderPass */ QStateSet::QStateSet(QNode *parent) @@ -95,9 +95,9 @@ void QStateSet::copy(const QNode *ref) } /*! - * Adds a new Qt3D::QRenderState \a state to the Qt3D::QStateSet instance. + * Adds a new Qt3DCore::QRenderState \a state to the Qt3DCore::QStateSet instance. * - * \note Not setting any Qt3D::QRenderState state on a Qt3D::QStateSet instance + * \note Not setting any Qt3DCore::QRenderState state on a Qt3DCore::QStateSet instance * implies all the render states will be disabled at render time. */ void QStateSet::addRenderState(QRenderState *state) @@ -120,7 +120,7 @@ void QStateSet::addRenderState(QRenderState *state) } /*! - * Removes the Qt3D::QRenderState \a state from the Qt3D::QStateSet instance. + * Removes the Qt3DCore::QRenderState \a state from the Qt3DCore::QStateSet instance. */ void QStateSet::removeRenderState(QRenderState *state) { @@ -135,7 +135,7 @@ void QStateSet::removeRenderState(QRenderState *state) } /*! - * Returns the list of Qt3D::QRenderState that compose the Qt3D::QStateSet instance. + * Returns the list of Qt3DCore::QRenderState that compose the Qt3DCore::QStateSet instance. */ QList<QRenderState *> QStateSet::renderStates() const { diff --git a/src/render/framegraph/qstateset.h b/src/render/framegraph/qstateset.h index c9d6eb68d..7e4ff1257 100644 --- a/src/render/framegraph/qstateset.h +++ b/src/render/framegraph/qstateset.h @@ -51,7 +51,7 @@ class QT3DRENDERERSHARED_EXPORT QStateSet : public QFrameGraphNode Q_OBJECT public: - explicit QStateSet(Qt3D::QNode *parent = 0); + explicit QStateSet(Qt3DCore::QNode *parent = 0); ~QStateSet(); void addRenderState(QRenderState *state); @@ -59,8 +59,8 @@ public: QList<QRenderState *> renderStates() const; protected: - QStateSet(QStateSetPrivate &dd, Qt3D::QNode *parent = 0); - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + QStateSet(QStateSetPrivate &dd, Qt3DCore::QNode *parent = 0); + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QStateSet) diff --git a/src/render/framegraph/qtechniquefilter.cpp b/src/render/framegraph/qtechniquefilter.cpp index 6092fb870..e2dd7c081 100644 --- a/src/render/framegraph/qtechniquefilter.cpp +++ b/src/render/framegraph/qtechniquefilter.cpp @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { diff --git a/src/render/framegraph/qtechniquefilter.h b/src/render/framegraph/qtechniquefilter.h index 8b8a115f8..b0798a04a 100644 --- a/src/render/framegraph/qtechniquefilter.h +++ b/src/render/framegraph/qtechniquefilter.h @@ -52,7 +52,7 @@ class QT3DRENDERERSHARED_EXPORT QTechniqueFilter : public QFrameGraphNode { Q_OBJECT public: - explicit QTechniqueFilter(Qt3D::QNode *parent = 0); + explicit QTechniqueFilter(Qt3DCore::QNode *parent = 0); ~QTechniqueFilter(); QList<QAnnotation *> criteria() const; @@ -64,8 +64,8 @@ public: QList<QParameter *> parameters() const; protected: - QTechniqueFilter(QTechniqueFilterPrivate &dd, Qt3D::QNode *parent = 0); - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + QTechniqueFilter(QTechniqueFilterPrivate &dd, Qt3DCore::QNode *parent = 0); + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QTechniqueFilter) diff --git a/src/render/framegraph/qviewport.h b/src/render/framegraph/qviewport.h index 3f427d044..baa6aeb1a 100644 --- a/src/render/framegraph/qviewport.h +++ b/src/render/framegraph/qviewport.h @@ -54,7 +54,7 @@ class QT3DRENDERERSHARED_EXPORT QViewport : public QFrameGraphNode Q_PROPERTY(QColor clearColor READ clearColor WRITE setClearColor NOTIFY clearColorChanged) public: - explicit QViewport(Qt3D::QNode *parent = 0); + explicit QViewport(Qt3DCore::QNode *parent = 0); ~QViewport(); QRectF rect() const; @@ -68,8 +68,8 @@ Q_SIGNALS: void clearColorChanged(); protected: - QViewport(QViewportPrivate &dd, Qt3D::QNode *parent = 0); - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + QViewport(QViewportPrivate &dd, Qt3DCore::QNode *parent = 0); + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QViewport) diff --git a/src/render/framegraph/renderpassfilternode.cpp b/src/render/framegraph/renderpassfilternode.cpp index 10c0352d8..920460121 100644 --- a/src/render/framegraph/renderpassfilternode.cpp +++ b/src/render/framegraph/renderpassfilternode.cpp @@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { namespace Render { @@ -52,7 +52,7 @@ RenderPassFilter::RenderPassFilter() { } -void RenderPassFilter::updateFromPeer(Qt3D::QNode *peer) +void RenderPassFilter::updateFromPeer(Qt3DCore::QNode *peer) { QRenderPassFilter *filter = static_cast<QRenderPassFilter *>(peer); m_filters.clear(); @@ -64,7 +64,7 @@ void RenderPassFilter::updateFromPeer(Qt3D::QNode *peer) m_parameterPack.appendParameter(p->id()); } -QList<Qt3D::QNodeId> RenderPassFilter::filters() const +QList<Qt3DCore::QNodeId> RenderPassFilter::filters() const { return m_filters; } @@ -75,17 +75,17 @@ void RenderPassFilter::appendFilter(QAnnotation *criterion) m_filters.append(criterion->id()); } -void RenderPassFilter::removeFilter(const Qt3D::QNodeId &criterionId) +void RenderPassFilter::removeFilter(const Qt3DCore::QNodeId &criterionId) { m_filters.removeOne(criterionId); } -QList<Qt3D::QNodeId> RenderPassFilter::parameters() const +QList<Qt3DCore::QNodeId> RenderPassFilter::parameters() const { return m_parameterPack.parameters(); } -void RenderPassFilter::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) +void RenderPassFilter::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); diff --git a/src/render/framegraph/renderpassfilternode_p.h b/src/render/framegraph/renderpassfilternode_p.h index 849631394..a413f10bc 100644 --- a/src/render/framegraph/renderpassfilternode_p.h +++ b/src/render/framegraph/renderpassfilternode_p.h @@ -70,15 +70,15 @@ class RenderPassFilter public: RenderPassFilter(); - void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE; - QList<Qt3D::QNodeId> filters() const; - QList<Qt3D::QNodeId> parameters() const; + void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE; + QList<Qt3DCore::QNodeId> filters() const; + QList<Qt3DCore::QNodeId> parameters() const; void appendFilter(QAnnotation *criterion); - void removeFilter(const Qt3D::QNodeId &criterionId); - void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; + void removeFilter(const Qt3DCore::QNodeId &criterionId); + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; private: - QList<Qt3D::QNodeId> m_filters; + QList<Qt3DCore::QNodeId> m_filters; ParameterPack m_parameterPack; }; diff --git a/src/render/framegraph/rendertargetselectornode.cpp b/src/render/framegraph/rendertargetselectornode.cpp index ddd565d57..50171e700 100644 --- a/src/render/framegraph/rendertargetselectornode.cpp +++ b/src/render/framegraph/rendertargetselectornode.cpp @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { namespace Render { @@ -56,7 +56,7 @@ RenderTargetSelector::RenderTargetSelector() : { } -void RenderTargetSelector::updateFromPeer(Qt3D::QNode *peer) +void RenderTargetSelector::updateFromPeer(Qt3DCore::QNode *peer) { QRenderTargetSelector *selector = static_cast<QRenderTargetSelector *>(peer); m_renderTargetUuid = QNodeId(); @@ -66,7 +66,7 @@ void RenderTargetSelector::updateFromPeer(Qt3D::QNode *peer) m_drawBuffers = selector->drawBuffers(); } -void RenderTargetSelector::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) +void RenderTargetSelector::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { qCDebug(Render::Framegraph) << Q_FUNC_INFO; if (e->type() == NodeUpdated) { @@ -80,7 +80,7 @@ void RenderTargetSelector::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) } } -Qt3D::QNodeId RenderTargetSelector::renderTargetUuid() const +Qt3DCore::QNodeId RenderTargetSelector::renderTargetUuid() const { return m_renderTargetUuid; } diff --git a/src/render/framegraph/rendertargetselectornode_p.h b/src/render/framegraph/rendertargetselectornode_p.h index 33d21d0f5..f6e1605a2 100644 --- a/src/render/framegraph/rendertargetselectornode_p.h +++ b/src/render/framegraph/rendertargetselectornode_p.h @@ -63,13 +63,13 @@ class RenderTargetSelector : public FrameGraphNode public: RenderTargetSelector(); - void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE; - void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; - Qt3D::QNodeId renderTargetUuid() const; + void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; + Qt3DCore::QNodeId renderTargetUuid() const; QList<QRenderAttachment::RenderAttachmentType> drawBuffers() const; private: - Qt3D::QNodeId m_renderTargetUuid; + Qt3DCore::QNodeId m_renderTargetUuid; QList<QRenderAttachment::RenderAttachmentType> m_drawBuffers; }; diff --git a/src/render/framegraph/sortcriterion.cpp b/src/render/framegraph/sortcriterion.cpp index 97db75c9f..650d6f80a 100644 --- a/src/render/framegraph/sortcriterion.cpp +++ b/src/render/framegraph/sortcriterion.cpp @@ -40,7 +40,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { namespace Render { @@ -55,7 +55,7 @@ void SortCriterion::cleanup() { } -void SortCriterion::updateFromPeer(Qt3D::QNode *peer) +void SortCriterion::updateFromPeer(Qt3DCore::QNode *peer) { QSortCriterion *criterion = static_cast<QSortCriterion *>(peer); m_type = criterion->sort(); @@ -66,7 +66,7 @@ QSortCriterion::SortType SortCriterion::sortType() const return m_type; } -void SortCriterion::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) +void SortCriterion::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); if (e->type() == NodeUpdated && propertyChange->propertyName() == QByteArrayLiteral("sort")) { diff --git a/src/render/framegraph/sortcriterion_p.h b/src/render/framegraph/sortcriterion_p.h index 14d749bd2..d0e20b603 100644 --- a/src/render/framegraph/sortcriterion_p.h +++ b/src/render/framegraph/sortcriterion_p.h @@ -59,17 +59,17 @@ namespace Render { class SortCriterionManager; -class SortCriterion : public Qt3D::QBackendNode +class SortCriterion : public Qt3DCore::QBackendNode { public: SortCriterion(); void cleanup(); - void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE; + void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE; QSortCriterion::SortType sortType() const; - void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; private: QSortCriterion::SortType m_type; diff --git a/src/render/framegraph/sortmethod.cpp b/src/render/framegraph/sortmethod.cpp index 4f67eb08f..d7bcb177b 100644 --- a/src/render/framegraph/sortmethod.cpp +++ b/src/render/framegraph/sortmethod.cpp @@ -40,7 +40,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { namespace Render { @@ -50,7 +50,7 @@ SortMethod::SortMethod() { } -void SortMethod::updateFromPeer(Qt3D::QNode *peer) +void SortMethod::updateFromPeer(Qt3DCore::QNode *peer) { QSortMethod *sortMethod = static_cast<QSortMethod *>(peer); m_criteria.clear(); @@ -59,7 +59,7 @@ void SortMethod::updateFromPeer(Qt3D::QNode *peer) setEnabled(sortMethod->isEnabled()); } -void SortMethod::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) +void SortMethod::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); if (propertyChange->propertyName() == QByteArrayLiteral("sortCriterion")) { diff --git a/src/render/framegraph/sortmethod_p.h b/src/render/framegraph/sortmethod_p.h index 69f73cf17..2222a76ea 100644 --- a/src/render/framegraph/sortmethod_p.h +++ b/src/render/framegraph/sortmethod_p.h @@ -62,13 +62,13 @@ class SortMethod : public FrameGraphNode public: SortMethod(); - 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; - QList<Qt3D::QNodeId> criteria() const; + QList<Qt3DCore::QNodeId> criteria() const; private: - QList<Qt3D::QNodeId> m_criteria; + QList<Qt3DCore::QNodeId> m_criteria; }; } // namespace Render diff --git a/src/render/framegraph/statesetnode.cpp b/src/render/framegraph/statesetnode.cpp index cd0d82371..d7832c256 100644 --- a/src/render/framegraph/statesetnode.cpp +++ b/src/render/framegraph/statesetnode.cpp @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { namespace Render { @@ -57,7 +57,7 @@ StateSetNode::~StateSetNode() { } -void StateSetNode::updateFromPeer(Qt3D::QNode *peer) +void StateSetNode::updateFromPeer(Qt3DCore::QNode *peer) { QStateSet *stateSet = static_cast<QStateSet*>(peer); @@ -71,7 +71,7 @@ QList<RenderState *> StateSetNode::renderStates() const return m_renderStates.values(); } -void StateSetNode::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) +void StateSetNode::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); switch (e->type()) { @@ -95,13 +95,13 @@ void StateSetNode::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) } } -void StateSetNode::appendRenderState(const Qt3D::QNodeId &id, RenderState *renderState) +void StateSetNode::appendRenderState(const Qt3DCore::QNodeId &id, RenderState *renderState) { if (!m_renderStates.contains(id)) m_renderStates[id] = renderState; } -void StateSetNode::removeRenderState(const Qt3D::QNodeId &renderStateId) +void StateSetNode::removeRenderState(const Qt3DCore::QNodeId &renderStateId) { m_renderStates.remove(renderStateId); } diff --git a/src/render/framegraph/statesetnode_p.h b/src/render/framegraph/statesetnode_p.h index 859d67c21..7a9563cc0 100644 --- a/src/render/framegraph/statesetnode_p.h +++ b/src/render/framegraph/statesetnode_p.h @@ -62,17 +62,17 @@ public: StateSetNode(); ~StateSetNode(); - void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE; + void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE; QList<RenderState *> renderStates() const; protected: - void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; - void appendRenderState(const Qt3D::QNodeId &id, RenderState *renderState); - void removeRenderState(const Qt3D::QNodeId &renderStateId); + void appendRenderState(const Qt3DCore::QNodeId &id, RenderState *renderState); + void removeRenderState(const Qt3DCore::QNodeId &renderStateId); - QHash<Qt3D::QNodeId, RenderState *> m_renderStates; + QHash<Qt3DCore::QNodeId, RenderState *> m_renderStates; }; } // namespace Render diff --git a/src/render/framegraph/techniquefilternode.cpp b/src/render/framegraph/techniquefilternode.cpp index 547ed077b..9ec764415 100644 --- a/src/render/framegraph/techniquefilternode.cpp +++ b/src/render/framegraph/techniquefilternode.cpp @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { namespace Render { @@ -53,7 +53,7 @@ TechniqueFilter::TechniqueFilter() { } -void TechniqueFilter::updateFromPeer(Qt3D::QNode *peer) +void TechniqueFilter::updateFromPeer(Qt3DCore::QNode *peer) { QTechniqueFilter *filter = static_cast<QTechniqueFilter *>(peer); m_filters.clear(); @@ -65,12 +65,12 @@ void TechniqueFilter::updateFromPeer(Qt3D::QNode *peer) setEnabled(filter->isEnabled()); } -QList<Qt3D::QNodeId> TechniqueFilter::parameters() const +QList<Qt3DCore::QNodeId> TechniqueFilter::parameters() const { return m_parameterPack.parameters(); } -QList<Qt3D::QNodeId> TechniqueFilter::filters() const +QList<Qt3DCore::QNodeId> TechniqueFilter::filters() const { return m_filters; } @@ -81,12 +81,12 @@ void TechniqueFilter::appendFilter(QAnnotation *criterion) m_filters.append(criterion->id()); } -void TechniqueFilter::removeFilter(const Qt3D::QNodeId &criterionId) +void TechniqueFilter::removeFilter(const Qt3DCore::QNodeId &criterionId) { m_filters.removeOne(criterionId); } -void TechniqueFilter::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) +void TechniqueFilter::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); diff --git a/src/render/framegraph/techniquefilternode_p.h b/src/render/framegraph/techniquefilternode_p.h index 4dd8fc0b3..59ffb9572 100644 --- a/src/render/framegraph/techniquefilternode_p.h +++ b/src/render/framegraph/techniquefilternode_p.h @@ -72,18 +72,18 @@ class TechniqueFilter { public: TechniqueFilter(); - void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE; + void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE; - QList<Qt3D::QNodeId> parameters() const; + QList<Qt3DCore::QNodeId> parameters() const; - QList<Qt3D::QNodeId> filters() const; - void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; + QList<Qt3DCore::QNodeId> filters() const; + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; private: void appendFilter(QAnnotation *criterion); - void removeFilter(const Qt3D::QNodeId &criterionId); + void removeFilter(const Qt3DCore::QNodeId &criterionId); - QList<Qt3D::QNodeId> m_filters; + QList<Qt3DCore::QNodeId> m_filters; ParameterPack m_parameterPack; }; diff --git a/src/render/framegraph/viewportnode.cpp b/src/render/framegraph/viewportnode.cpp index 29751068c..a016d9686 100644 --- a/src/render/framegraph/viewportnode.cpp +++ b/src/render/framegraph/viewportnode.cpp @@ -40,7 +40,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { namespace Render { @@ -54,7 +54,7 @@ ViewportNode::ViewportNode() { } -void ViewportNode::updateFromPeer(Qt3D::QNode *peer) +void ViewportNode::updateFromPeer(Qt3DCore::QNode *peer) { QViewport *viewport = static_cast<QViewport *>(peer); setXMin(viewport->rect().x()); @@ -107,7 +107,7 @@ QColor ViewportNode::clearColor() const return m_clearColor; } -void ViewportNode::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) +void ViewportNode::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { if (e->type() == NodeUpdated) { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); diff --git a/src/render/framegraph/viewportnode_p.h b/src/render/framegraph/viewportnode_p.h index e7af0604e..50ac79efa 100644 --- a/src/render/framegraph/viewportnode_p.h +++ b/src/render/framegraph/viewportnode_p.h @@ -66,7 +66,7 @@ class ViewportNode : public FrameGraphNode public: ViewportNode(); - void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE; + void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE; float xMin() const; void setXMin(float xMin); @@ -82,7 +82,7 @@ public: QColor clearColor() const; - void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; private: float m_xMin; diff --git a/src/render/frontend/qitemmodelbuffer.cpp b/src/render/frontend/qitemmodelbuffer.cpp index c8e5cfc69..8de31a818 100644 --- a/src/render/frontend/qitemmodelbuffer.cpp +++ b/src/render/frontend/qitemmodelbuffer.cpp @@ -41,7 +41,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { @@ -111,7 +111,7 @@ void variantToBytes(void* dest, const QVariant& v, GLint type) namespace { -Qt3D::QAbstractAttribute::DataType typeFromGLType(GLint dataType, uint &dataCount) +Qt3DCore::QAbstractAttribute::DataType typeFromGLType(GLint dataType, uint &dataCount) { switch (dataType) { diff --git a/src/render/frontend/qlayer.h b/src/render/frontend/qlayer.h index 10499d7ba..e877aa108 100644 --- a/src/render/frontend/qlayer.h +++ b/src/render/frontend/qlayer.h @@ -47,12 +47,12 @@ namespace Qt3DRender { class QLayerPrivate; -class QT3DRENDERERSHARED_EXPORT QLayer : public Qt3D::QComponent +class QT3DRENDERERSHARED_EXPORT QLayer : public Qt3DCore::QComponent { Q_OBJECT Q_PROPERTY(QStringList names READ names WRITE setNames NOTIFY namesChanged) public: - explicit QLayer(Qt3D::QNode *parent = 0); + explicit QLayer(Qt3DCore::QNode *parent = 0); ~QLayer(); QStringList names() const; @@ -62,8 +62,8 @@ Q_SIGNALS: void namesChanged(); protected: - QLayer(QLayerPrivate &dd, Qt3D::QNode *parent = 0); - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + QLayer(QLayerPrivate &dd, Qt3DCore::QNode *parent = 0); + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QLayer) diff --git a/src/render/frontend/qlayer_p.h b/src/render/frontend/qlayer_p.h index 8efa4b4ce..1efed58ba 100644 --- a/src/render/frontend/qlayer_p.h +++ b/src/render/frontend/qlayer_p.h @@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QT3DRENDERERSHARED_EXPORT QLayerPrivate : public Qt3D::QComponentPrivate +class QT3DRENDERERSHARED_EXPORT QLayerPrivate : public Qt3DCore::QComponentPrivate { public: QLayerPrivate(); diff --git a/src/render/frontend/qrenderaspect.cpp b/src/render/frontend/qrenderaspect.cpp index 444b54839..3e9dffdcd 100644 --- a/src/render/frontend/qrenderaspect.cpp +++ b/src/render/frontend/qrenderaspect.cpp @@ -121,12 +121,12 @@ static void initResources() QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { /*! - \class Qt3D::QRenderAspectPrivate + \class Qt3DCore::QRenderAspectPrivate \internal */ QRenderAspectPrivate::QRenderAspectPrivate(QRenderAspect::RenderType type) @@ -138,7 +138,7 @@ QRenderAspectPrivate::QRenderAspectPrivate(QRenderAspect::RenderType type) , m_initialized(false) { initResources(); - m_aspectType = Qt3D::QAbstractAspect::AspectRenderer; + m_aspectType = Qt3DCore::QAbstractAspect::AspectRenderer; } void QRenderAspectPrivate::setSurface(QSurface *surface) @@ -201,15 +201,15 @@ QRenderAspect::QRenderAspect(QRenderAspectPrivate &dd, QObject *parent) void QRenderAspect::registerBackendTypes() { Q_D(QRenderAspect); - registerBackendType<Qt3D::QEntity>(QBackendNodeFunctorPtr(new Render::RenderEntityFunctor(d->m_renderer))); - registerBackendType<Qt3D::QTransform>(QBackendNodeFunctorPtr(new Render::NodeFunctor<Render::Transform, Render::TransformManager>(d->m_renderer->transformManager()))); + registerBackendType<Qt3DCore::QEntity>(QBackendNodeFunctorPtr(new Render::RenderEntityFunctor(d->m_renderer))); + registerBackendType<Qt3DCore::QTransform>(QBackendNodeFunctorPtr(new Render::NodeFunctor<Render::Transform, Render::TransformManager>(d->m_renderer->transformManager()))); registerBackendType<QMaterial>(QBackendNodeFunctorPtr(new Render::NodeFunctor<Render::Material, Render::MaterialManager>(d->m_renderer->materialManager()))); registerBackendType<QTechnique>(QBackendNodeFunctorPtr(new Render::NodeFunctor<Render::Technique, Render::TechniqueManager>(d->m_renderer->techniqueManager()))); registerBackendType<QAbstractTextureProvider>(QBackendNodeFunctorPtr(new Render::TextureFunctor(d->m_renderer->textureManager(), d->m_renderer->textureImageManager(), d->m_renderer->textureDataManager()))); registerBackendType<QShaderProgram>(QBackendNodeFunctorPtr(new Render::NodeFunctor<Render::Shader, Render::ShaderManager>(d->m_renderer->shaderManager()))); registerBackendType<QEffect>(QBackendNodeFunctorPtr(new Render::NodeFunctor<Render::Effect, Render::EffectManager>(d->m_renderer->effectManager()))); registerBackendType<QAnnotation>(QBackendNodeFunctorPtr(new Render::NodeFunctor<Render::Annotation, Render::CriterionManager>(d->m_renderer->criterionManager()))); - registerBackendType<Qt3D::QCameraLens>(QBackendNodeFunctorPtr(new Render::NodeFunctor<Render::CameraLens, Render::CameraManager>(d->m_renderer->cameraManager()))); + registerBackendType<Qt3DCore::QCameraLens>(QBackendNodeFunctorPtr(new Render::NodeFunctor<Render::CameraLens, Render::CameraManager>(d->m_renderer->cameraManager()))); registerBackendType<QLayer>(QBackendNodeFunctorPtr(new Render::NodeFunctor<Render::Layer, Render::LayerManager>(d->m_renderer->layerManager()))); registerBackendType<QRenderPass>(QBackendNodeFunctorPtr(new Render::NodeFunctor<Render::RenderPass, Render::RenderPassManager>(d->m_renderer->renderPassManager()))); registerBackendType<QAbstractSceneLoader>(QBackendNodeFunctorPtr(new Render::RenderSceneFunctor(d->m_renderer->sceneManager()))); @@ -258,7 +258,7 @@ void QRenderAspect::renderShutdown() d->m_renderer->shutdown(); } -QVector<Qt3D::QAspectJobPtr> QRenderAspect::jobsToExecute(qint64 time) +QVector<Qt3DCore::QAspectJobPtr> QRenderAspect::jobsToExecute(qint64 time) { Q_D(QRenderAspect); d->m_time = time; @@ -321,7 +321,7 @@ QVector<Qt3D::QAspectJobPtr> QRenderAspect::jobsToExecute(qint64 time) return jobs; } -void QRenderAspect::sceneNodeAdded(Qt3D::QSceneChangePtr &e) +void QRenderAspect::sceneNodeAdded(Qt3DCore::QSceneChangePtr &e) { QScenePropertyChangePtr propertyChange = e.staticCast<QScenePropertyChange>(); QNodePtr nodePtr = propertyChange->value().value<QNodePtr>(); @@ -330,7 +330,7 @@ void QRenderAspect::sceneNodeAdded(Qt3D::QSceneChangePtr &e) visitor.traverse(n, this, &QRenderAspect::visitNode); } -void QRenderAspect::sceneNodeRemoved(Qt3D::QSceneChangePtr &e) +void QRenderAspect::sceneNodeRemoved(Qt3DCore::QSceneChangePtr &e) { QScenePropertyChangePtr propertyChange = e.staticCast<QScenePropertyChange>(); QNodePtr nodePtr = propertyChange->value().value<QNodePtr>(); @@ -344,7 +344,7 @@ qint64 QRenderAspect::time() const return d->m_time; } -void QRenderAspect::setRootEntity(Qt3D::QEntity *rootObject) +void QRenderAspect::setRootEntity(Qt3DCore::QEntity *rootObject) { // setSceneGraphRoot is synchronized using the Renderer's mutex Q_D(QRenderAspect); @@ -362,7 +362,7 @@ void QRenderAspect::onInitialize(const QVariantMap &data) // Register the VSyncFrameAdvanceService to drive the aspect manager loop // depending on the vsync - services()->registerServiceProvider(Qt3D::QServiceLocator::FrameAdvanceService, + services()->registerServiceProvider(Qt3DCore::QServiceLocator::FrameAdvanceService, d->m_renderer->vsyncFrameAdvanceService()); d->m_renderer->setQRenderAspect(this); @@ -394,7 +394,7 @@ void QRenderAspect::onCleanup() d->m_renderer = Q_NULLPTR; } -void QRenderAspect::visitNode(Qt3D::QNode *node) +void QRenderAspect::visitNode(Qt3DCore::QNode *node) { QAbstractAspect::createBackendNode(node); } diff --git a/src/render/frontend/qrenderaspect.h b/src/render/frontend/qrenderaspect.h index 180424565..43242fb13 100644 --- a/src/render/frontend/qrenderaspect.h +++ b/src/render/frontend/qrenderaspect.h @@ -52,7 +52,7 @@ class Renderer; class QRenderAspectPrivate; -class QT3DRENDERERSHARED_EXPORT QRenderAspect : public Qt3D::QAbstractAspect +class QT3DRENDERERSHARED_EXPORT QRenderAspect : public Qt3DCore::QAbstractAspect { Q_OBJECT public: @@ -68,10 +68,10 @@ public: void renderSynchronous(); void renderShutdown(); - QVector<Qt3D::QAspectJobPtr> jobsToExecute(qint64 time) Q_DECL_OVERRIDE; + QVector<Qt3DCore::QAspectJobPtr> jobsToExecute(qint64 time) Q_DECL_OVERRIDE; - void sceneNodeAdded(Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; - void sceneNodeRemoved(Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; + void sceneNodeAdded(Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; + void sceneNodeRemoved(Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; qint64 time() const; @@ -79,13 +79,13 @@ protected: void registerBackendTypes(); private: - void setRootEntity(Qt3D::QEntity *rootObject) Q_DECL_OVERRIDE; + void setRootEntity(Qt3DCore::QEntity *rootObject) Q_DECL_OVERRIDE; void onInitialize(const QVariantMap &data) Q_DECL_OVERRIDE; void onStartup() Q_DECL_OVERRIDE; void onShutdown() Q_DECL_OVERRIDE; void onCleanup() Q_DECL_OVERRIDE; - void visitNode(Qt3D::QNode *node); + void visitNode(Qt3DCore::QNode *node); Q_DECLARE_PRIVATE(QRenderAspect) QRenderAspect(QRenderAspectPrivate &dd, QObject *parent); diff --git a/src/render/frontend/qrenderaspect_p.h b/src/render/frontend/qrenderaspect_p.h index e51e14117..18b1ce91a 100644 --- a/src/render/frontend/qrenderaspect_p.h +++ b/src/render/frontend/qrenderaspect_p.h @@ -66,7 +66,7 @@ namespace Render { class Renderer; } -class QRenderAspectPrivate : public Qt3D::QAbstractAspectPrivate +class QRenderAspectPrivate : public Qt3DCore::QAbstractAspectPrivate { QRenderAspectPrivate(QRenderAspect::RenderType type); diff --git a/src/render/frontend/qrenderattachment.h b/src/render/frontend/qrenderattachment.h index 49c14b146..b19979c5c 100644 --- a/src/render/frontend/qrenderattachment.h +++ b/src/render/frontend/qrenderattachment.h @@ -47,7 +47,7 @@ namespace Qt3DRender { class QAbstractTextureProvider; class QRenderAttachmentPrivate; -class QT3DRENDERERSHARED_EXPORT QRenderAttachment : public Qt3D::QNode +class QT3DRENDERERSHARED_EXPORT QRenderAttachment : public Qt3DCore::QNode { Q_OBJECT Q_PROPERTY(RenderAttachmentType type READ type WRITE setType NOTIFY typeChanged) @@ -91,7 +91,7 @@ public: }; Q_ENUM(CubeMapFace) - explicit QRenderAttachment(Qt3D::QNode *parent = 0); + explicit QRenderAttachment(Qt3DCore::QNode *parent = 0); ~QRenderAttachment(); void setType(RenderAttachmentType type); @@ -121,8 +121,8 @@ Q_SIGNALS: void nameChanged(); protected: - QRenderAttachment(QRenderAttachmentPrivate &dd, Qt3D::QNode *parent = 0); - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + QRenderAttachment(QRenderAttachmentPrivate &dd, Qt3DCore::QNode *parent = 0); + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QRenderAttachment) diff --git a/src/render/frontend/qrenderattachment_p.h b/src/render/frontend/qrenderattachment_p.h index 3b0d82b55..6624b4694 100644 --- a/src/render/frontend/qrenderattachment_p.h +++ b/src/render/frontend/qrenderattachment_p.h @@ -57,7 +57,7 @@ namespace Qt3DRender { class QAbstractTextureProvider; -class QRenderAttachmentPrivate : public Qt3D::QNodePrivate +class QRenderAttachmentPrivate : public Qt3DCore::QNodePrivate { public: QRenderAttachmentPrivate(); diff --git a/src/render/frontend/qrendertarget.cpp b/src/render/frontend/qrendertarget.cpp index ed7354871..2cf2115f3 100644 --- a/src/render/frontend/qrendertarget.cpp +++ b/src/render/frontend/qrendertarget.cpp @@ -41,7 +41,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { diff --git a/src/render/frontend/qrendertarget.h b/src/render/frontend/qrendertarget.h index a7b192b85..9c0fd9858 100644 --- a/src/render/frontend/qrendertarget.h +++ b/src/render/frontend/qrendertarget.h @@ -47,11 +47,11 @@ namespace Qt3DRender { class QRenderTargetPrivate; class QRenderAttachment; -class QT3DRENDERERSHARED_EXPORT QRenderTarget : public Qt3D::QComponent +class QT3DRENDERERSHARED_EXPORT QRenderTarget : public Qt3DCore::QComponent { Q_OBJECT public: - explicit QRenderTarget(Qt3D::QNode *parent = 0); + explicit QRenderTarget(Qt3DCore::QNode *parent = 0); ~QRenderTarget(); void addAttachment(QRenderAttachment *attachment); @@ -59,8 +59,8 @@ public: QList<QRenderAttachment *> attachments() const; protected: - QRenderTarget(QRenderTargetPrivate &dd, Qt3D::QNode *parent = 0); - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + QRenderTarget(QRenderTargetPrivate &dd, Qt3DCore::QNode *parent = 0); + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QRenderTarget) diff --git a/src/render/frontend/qrendertarget_p.h b/src/render/frontend/qrendertarget_p.h index 85d7991f7..8b300faed 100644 --- a/src/render/frontend/qrendertarget_p.h +++ b/src/render/frontend/qrendertarget_p.h @@ -57,7 +57,7 @@ namespace Qt3DRender { class QRenderAttachment; class QRenderTarget; -class QRenderTargetPrivate : public Qt3D::QComponentPrivate +class QRenderTargetPrivate : public Qt3DCore::QComponentPrivate { public: QRenderTargetPrivate(); diff --git a/src/render/frontend/qwindow.cpp b/src/render/frontend/qwindow.cpp index 3b6c3786e..da7ee8f8c 100644 --- a/src/render/frontend/qwindow.cpp +++ b/src/render/frontend/qwindow.cpp @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { @@ -127,13 +127,13 @@ QFrameGraph *QWindow::frameGraph() const return d->m_frameGraph; } -Qt3D::QCamera *QWindow::defaultCamera() +Qt3DCore::QCamera *QWindow::defaultCamera() { Q_D(const QWindow); return d->m_defaultCamera; } -void QWindow::registerAspect(Qt3D::QAbstractAspect *aspect) +void QWindow::registerAspect(Qt3DCore::QAbstractAspect *aspect) { Q_ASSERT(!isVisible()); Q_D(QWindow); @@ -147,7 +147,7 @@ void QWindow::registerAspect(const QString &name) d->m_engine->registerAspect(name); } -void QWindow::setRootEntity(Qt3D::QEntity *root) +void QWindow::setRootEntity(Qt3DCore::QEntity *root) { Q_ASSERT(!isVisible()); Q_D(QWindow); diff --git a/src/render/frontend/qwindow.h b/src/render/frontend/qwindow.h index b1acb2ba1..5ca4686f2 100644 --- a/src/render/frontend/qwindow.h +++ b/src/render/frontend/qwindow.h @@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QAbstractAspect; class QCamera; class QEntity; @@ -61,12 +61,12 @@ public: void setFrameGraph(QFrameGraph *frameGraph); QFrameGraph *frameGraph() const; - Qt3D::QCamera *defaultCamera(); + Qt3DCore::QCamera *defaultCamera(); - void registerAspect(Qt3D::QAbstractAspect *aspect); + void registerAspect(Qt3DCore::QAbstractAspect *aspect); void registerAspect(const QString &name); - void setRootEntity(Qt3D::QEntity *root); + void setRootEntity(Qt3DCore::QEntity *root); void show(); protected: diff --git a/src/render/frontend/qwindow_p.h b/src/render/frontend/qwindow_p.h index 40356eb8f..25f4376a7 100644 --- a/src/render/frontend/qwindow_p.h +++ b/src/render/frontend/qwindow_p.h @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QAspectEngine; class QCamera; class QEntity; @@ -70,11 +70,11 @@ public: QWindowPrivate(); Q_DECLARE_PUBLIC(QWindow) - Qt3D::QEntity *m_root; - Qt3D::QEntity * m_userRoot; - Qt3D::QCamera *m_defaultCamera; + Qt3DCore::QEntity *m_root; + Qt3DCore::QEntity * m_userRoot; + Qt3DCore::QCamera *m_defaultCamera; QFrameGraph *m_frameGraph; - QScopedPointer<Qt3D::QAspectEngine> m_engine; + QScopedPointer<Qt3DCore::QAspectEngine> m_engine; QRenderAspect *m_renderAspect; }; diff --git a/src/render/frontend/sphere.cpp b/src/render/frontend/sphere.cpp index a8b9cd6de..7cdfafeec 100644 --- a/src/render/frontend/sphere.cpp +++ b/src/render/frontend/sphere.cpp @@ -50,7 +50,7 @@ namespace { // Intersects ray r = p + td, |d| = 1, with sphere s and, if intersecting, // returns true and intersection point q; false otherwise -bool intersectRaySphere(const Qt3D::QRay3D &ray, const Qt3DRender::Sphere &s, QVector3D *q = Q_NULLPTR) +bool intersectRaySphere(const Qt3DCore::QRay3D &ray, const Qt3DRender::Sphere &s, QVector3D *q = Q_NULLPTR) { const QVector3D p = ray.origin(); const QVector3D d = ray.direction(); @@ -211,17 +211,17 @@ Sphere Sphere::transformed(const QMatrix4x4 &mat) return Sphere(c, sqrt(rSquared)); } -Qt3D::QNodeId Sphere::id() const +Qt3DCore::QNodeId Sphere::id() const { return m_id; } -bool Sphere::intersects(const Qt3D::QRay3D &ray, QVector3D *q) const +bool Sphere::intersects(const Qt3DCore::QRay3D &ray, QVector3D *q) const { return intersectRaySphere(ray, *this, q); } -Qt3D::QBoundingVolume::Type Sphere::type() const +Qt3DCore::QBoundingVolume::Type Sphere::type() const { return QBoundingVolume::Sphere; } diff --git a/src/render/frontend/sphere.h b/src/render/frontend/sphere.h index e14ecc38b..faa07c433 100644 --- a/src/render/frontend/sphere.h +++ b/src/render/frontend/sphere.h @@ -48,16 +48,16 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QT3DRENDERERSHARED_EXPORT Sphere : public Qt3D::QBoundingSphere +class QT3DRENDERERSHARED_EXPORT Sphere : public Qt3DCore::QBoundingSphere { public: - inline Sphere(const Qt3D::QNodeId &i = Qt3D::QNodeId()) + inline Sphere(const Qt3DCore::QNodeId &i = Qt3DCore::QNodeId()) : m_center() , m_radius(0.0f) , m_id(i) {} - inline Sphere(const QVector3D &c, float r, const Qt3D::QNodeId &i = Qt3D::QNodeId()) + inline Sphere(const QVector3D &c, float r, const Qt3DCore::QNodeId &i = Qt3DCore::QNodeId()) : m_center(c) , m_radius(r) , m_id(i) @@ -89,8 +89,8 @@ public: return *this; } - Qt3D::QNodeId id() const Q_DECL_FINAL; - bool intersects(const Qt3D::QRay3D &ray, QVector3D *q) const Q_DECL_FINAL; + Qt3DCore::QNodeId id() const Q_DECL_FINAL; + bool intersects(const Qt3DCore::QRay3D &ray, QVector3D *q) const Q_DECL_FINAL; Type type() const Q_DECL_FINAL; static Sphere fromPoints(const QVector<QVector3D> &points); @@ -98,7 +98,7 @@ public: private: QVector3D m_center; float m_radius; - Qt3D::QNodeId m_id; + Qt3DCore::QNodeId m_id; static const float ms_epsilon; }; 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); diff --git a/src/render/graphicshelpers/graphicscontext_p.h b/src/render/graphicshelpers/graphicscontext_p.h index b8ac3e00e..065032172 100644 --- a/src/render/graphicshelpers/graphicscontext_p.h +++ b/src/render/graphicshelpers/graphicscontext_p.h @@ -227,7 +227,7 @@ private: Shader *m_activeShader; QHash<ProgramDNA, Shader *> m_renderShaderHash; QHash<Buffer *, QOpenGLBuffer> m_renderBufferHash; - QHash<Qt3D::QNodeId, GLuint> m_renderTargets; + QHash<Qt3DCore::QNodeId, GLuint> m_renderTargets; QHash<GLuint, QSize> m_renderTargetsSize; // active textures, indexed by texture unit diff --git a/src/render/graphicshelpers/graphicshelperes2.cpp b/src/render/graphicshelpers/graphicshelperes2.cpp index 7f5530624..4e6d36c10 100644 --- a/src/render/graphicshelpers/graphicshelperes2.cpp +++ b/src/render/graphicshelpers/graphicshelperes2.cpp @@ -555,6 +555,6 @@ QSize GraphicsHelperES2::getTextureDimensions(GLuint textureId, GLenum target, u } } // namespace Render -} // namespace Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/io/abstractsceneparser_p.h b/src/render/io/abstractsceneparser_p.h index f3cb5fd5a..a4b5ab92d 100644 --- a/src/render/io/abstractsceneparser_p.h +++ b/src/render/io/abstractsceneparser_p.h @@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QEntity; } @@ -84,8 +84,8 @@ public: virtual void setSource(const QUrl &source) = 0; virtual bool isExtensionSupported(const QUrl &source) const = 0; - virtual Qt3D::QEntity *scene(const QString &id = QString()) = 0; - virtual Qt3D::QEntity *node(const QString &id) = 0; + virtual Qt3DCore::QEntity *scene(const QString &id = QString()) = 0; + virtual Qt3DCore::QEntity *node(const QString &id) = 0; ParserStatus parserStatus() const; QStringList errors() const; diff --git a/src/render/io/objloader.cpp b/src/render/io/objloader.cpp index 89c5ee672..09ab6985c 100644 --- a/src/render/io/objloader.cpp +++ b/src/render/io/objloader.cpp @@ -429,7 +429,7 @@ void ObjLoader::center( QVector<QVector3D>& points ) if ( points.isEmpty() ) return; - Qt3D::QAxisAlignedBoundingBox bb(points); + Qt3DCore::QAxisAlignedBoundingBox bb(points); QVector3D center = bb.center(); // Translate center of the AABB to the origin diff --git a/src/render/io/qabstractsceneloader.cpp b/src/render/io/qabstractsceneloader.cpp index d0e9a8838..110da9fa9 100644 --- a/src/render/io/qabstractsceneloader.cpp +++ b/src/render/io/qabstractsceneloader.cpp @@ -68,7 +68,7 @@ QAbstractSceneLoader::QAbstractSceneLoader(QNode *parent) QAbstractSceneLoader::~QAbstractSceneLoader() { - Q_ASSERT_X(Qt3D::QNodePrivate::get(this)->m_wasCleanedUp, Q_FUNC_INFO, "QNode::cleanup should have been called by now. A Qt3DRender::QAbstractSceneLoader subclass didn't call QNode::cleanup in its destructor"); + Q_ASSERT_X(Qt3DCore::QNodePrivate::get(this)->m_wasCleanedUp, Q_FUNC_INFO, "QNode::cleanup should have been called by now. A Qt3DRender::QAbstractSceneLoader subclass didn't call QNode::cleanup in its destructor"); } void QAbstractSceneLoader::copy(const QNode *ref) diff --git a/src/render/io/qabstractsceneloader.h b/src/render/io/qabstractsceneloader.h index 88af95577..66b41d265 100644 --- a/src/render/io/qabstractsceneloader.h +++ b/src/render/io/qabstractsceneloader.h @@ -49,13 +49,13 @@ namespace Qt3DRender { class QAbstractSceneLoader; class QAbstractSceneLoaderPrivate; -class QT3DRENDERERSHARED_EXPORT QAbstractSceneLoader : public Qt3D::QComponent +class QT3DRENDERERSHARED_EXPORT QAbstractSceneLoader : public Qt3DCore::QComponent { Q_OBJECT Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged) Q_PROPERTY(Status status READ status NOTIFY statusChanged) public: - explicit QAbstractSceneLoader(Qt3D::QNode *parent = 0); + explicit QAbstractSceneLoader(Qt3DCore::QNode *parent = 0); ~QAbstractSceneLoader(); enum Status { @@ -76,8 +76,8 @@ Q_SIGNALS: void statusChanged(); protected: - QAbstractSceneLoader(QAbstractSceneLoaderPrivate &dd, Qt3D::QNode *parent = 0); - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + QAbstractSceneLoader(QAbstractSceneLoaderPrivate &dd, Qt3DCore::QNode *parent = 0); + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QAbstractSceneLoader) diff --git a/src/render/io/qabstractsceneloader_p.h b/src/render/io/qabstractsceneloader_p.h index cc7dbd61b..e62a588fb 100644 --- a/src/render/io/qabstractsceneloader_p.h +++ b/src/render/io/qabstractsceneloader_p.h @@ -58,7 +58,7 @@ namespace Qt3DRender { class AbstractSceneParser; -class QT3DRENDERERSHARED_EXPORT QAbstractSceneLoaderPrivate : public Qt3D::QComponentPrivate +class QT3DRENDERERSHARED_EXPORT QAbstractSceneLoaderPrivate : public Qt3DCore::QComponentPrivate { public: QAbstractSceneLoaderPrivate(); diff --git a/src/render/io/qsceneloader.cpp b/src/render/io/qsceneloader.cpp index b5b4975e7..70eb15533 100644 --- a/src/render/io/qsceneloader.cpp +++ b/src/render/io/qsceneloader.cpp @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { @@ -59,7 +59,7 @@ QSceneLoader::~QSceneLoader() } // Called in main thread -void QSceneLoader::sceneChangeEvent(const Qt3D::QSceneChangePtr &change) +void QSceneLoader::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) { QAbstractSceneLoaderPrivate *d = static_cast<QAbstractSceneLoaderPrivate*>(QNodePrivate::get(this)); QScenePropertyChangePtr e = qSharedPointerCast<QScenePropertyChange>(change); diff --git a/src/render/io/qsceneloader.h b/src/render/io/qsceneloader.h index adbed1dda..5ca560fdd 100644 --- a/src/render/io/qsceneloader.h +++ b/src/render/io/qsceneloader.h @@ -47,9 +47,9 @@ class QT3DRENDERERSHARED_EXPORT QSceneLoader : public QAbstractSceneLoader { Q_OBJECT public: - explicit QSceneLoader(Qt3D::QNode *parent = 0); + explicit QSceneLoader(Qt3DCore::QNode *parent = 0); ~QSceneLoader(); - void sceneChangeEvent(const Qt3D::QSceneChangePtr &change) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) Q_DECL_OVERRIDE; protected: QT3D_CLONEABLE(QSceneLoader) diff --git a/src/render/io/scene.cpp b/src/render/io/scene.cpp index a92dc1fd8..8874db279 100644 --- a/src/render/io/scene.cpp +++ b/src/render/io/scene.cpp @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { namespace Render { @@ -55,7 +55,7 @@ Scene::Scene() { } -void Scene::updateFromPeer(Qt3D::QNode *peer) +void Scene::updateFromPeer(Qt3DCore::QNode *peer) { QAbstractSceneLoader *loader = static_cast<QAbstractSceneLoader *>(peer); @@ -63,7 +63,7 @@ void Scene::updateFromPeer(Qt3D::QNode *peer) m_sceneManager->addSceneData(m_source, peerUuid()); } -void Scene::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) +void Scene::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); if (propertyChange->propertyName() == QByteArrayLiteral("source")) { @@ -77,7 +77,7 @@ QUrl Scene::source() const return m_source; } -void Scene::setSceneSubtree(Qt3D::QEntity *subTree) +void Scene::setSceneSubtree(Qt3DCore::QEntity *subTree) { QBackendScenePropertyChangePtr e(new QBackendScenePropertyChange(NodeUpdated, peerUuid())); e->setPropertyName("scene"); @@ -104,7 +104,7 @@ RenderSceneFunctor::RenderSceneFunctor(SceneManager *sceneManager) { } -Qt3D::QBackendNode *RenderSceneFunctor::create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const +Qt3DCore::QBackendNode *RenderSceneFunctor::create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const { Scene *scene = m_sceneManager->getOrCreateResource(frontend->id()); scene->setFactory(factory); @@ -113,12 +113,12 @@ Qt3D::QBackendNode *RenderSceneFunctor::create(Qt3D::QNode *frontend, const Qt3D return scene; } -Qt3D::QBackendNode *RenderSceneFunctor::get(const Qt3D::QNodeId &id) const +Qt3DCore::QBackendNode *RenderSceneFunctor::get(const Qt3DCore::QNodeId &id) const { return m_sceneManager->lookupResource(id); } -void RenderSceneFunctor::destroy(const Qt3D::QNodeId &id) const +void RenderSceneFunctor::destroy(const Qt3DCore::QNodeId &id) const { m_sceneManager->releaseResource(id); } diff --git a/src/render/io/scene_p.h b/src/render/io/scene_p.h index 090bc64d4..cd9e5d50e 100644 --- a/src/render/io/scene_p.h +++ b/src/render/io/scene_p.h @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QEntity; } @@ -63,17 +63,17 @@ namespace Render { class SceneManager; -class Scene : public Qt3D::QBackendNode +class Scene : public Qt3DCore::QBackendNode { public: Scene(); - void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE; + void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE; // QObserverInterface interface - void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; QUrl source() const; - void setSceneSubtree(Qt3D::QEntity *subTree); + void setSceneSubtree(Qt3DCore::QEntity *subTree); void setSceneManager(SceneManager *manager); private: @@ -81,13 +81,13 @@ private: QUrl m_source; }; -class RenderSceneFunctor : public Qt3D::QBackendNodeFunctor +class RenderSceneFunctor : public Qt3DCore::QBackendNodeFunctor { public: explicit RenderSceneFunctor(SceneManager *sceneManager); - 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: SceneManager *m_sceneManager; diff --git a/src/render/io/scenemanager.cpp b/src/render/io/scenemanager.cpp index 52fd2a627..f7223cd46 100644 --- a/src/render/io/scenemanager.cpp +++ b/src/render/io/scenemanager.cpp @@ -42,14 +42,14 @@ namespace Qt3DRender { namespace Render { SceneManager::SceneManager() : QResourceManager<Scene, - Qt3D::QNodeId, + Qt3DCore::QNodeId, 8, - Qt3D::ArrayAllocatingPolicy, - Qt3D::ObjectLevelLockingPolicy>() + Qt3DCore::ArrayAllocatingPolicy, + Qt3DCore::ObjectLevelLockingPolicy>() { } -void SceneManager::addSceneData(const QUrl &source, const Qt3D::QNodeId &sceneUuid) +void SceneManager::addSceneData(const QUrl &source, const Qt3DCore::QNodeId &sceneUuid) { LoadSceneJobPtr newJob(new LoadSceneJob(source, sceneUuid)); @@ -68,13 +68,13 @@ QVector<LoadSceneJobPtr> SceneManager::pendingSceneLoaderJobs() return copy; } -void SceneManager::addLoadedSceneTree(const QUrl &source, Qt3D::QEntity *tree) +void SceneManager::addLoadedSceneTree(const QUrl &source, Qt3DCore::QEntity *tree) { SceneManager::Locker lock(this); m_loadedSceneTrees.insert(source, tree); } -Qt3D::QEntity *SceneManager::sceneTreeFromSource(const QUrl &source) +Qt3DCore::QEntity *SceneManager::sceneTreeFromSource(const QUrl &source) { SceneManager::Locker lock(this); return m_loadedSceneTrees.value(source); diff --git a/src/render/io/scenemanager_p.h b/src/render/io/scenemanager_p.h index 7bb845998..7baccd006 100644 --- a/src/render/io/scenemanager_p.h +++ b/src/render/io/scenemanager_p.h @@ -55,30 +55,30 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QEntity; } namespace Qt3DRender { namespace Render { -class SceneManager : public Qt3D::QResourceManager<Scene, - Qt3D::QNodeId, +class SceneManager : public Qt3DCore::QResourceManager<Scene, + Qt3DCore::QNodeId, 8, - Qt3D::ArrayAllocatingPolicy, - Qt3D::ObjectLevelLockingPolicy> + Qt3DCore::ArrayAllocatingPolicy, + Qt3DCore::ObjectLevelLockingPolicy> { public: SceneManager(); - void addSceneData(const QUrl &source, const Qt3D::QNodeId &sceneUuid); + void addSceneData(const QUrl &source, const Qt3DCore::QNodeId &sceneUuid); QVector<LoadSceneJobPtr> pendingSceneLoaderJobs(); - void addLoadedSceneTree(const QUrl &source, Qt3D::QEntity *tree); - Qt3D::QEntity *sceneTreeFromSource(const QUrl &source); + void addLoadedSceneTree(const QUrl &source, Qt3DCore::QEntity *tree); + Qt3DCore::QEntity *sceneTreeFromSource(const QUrl &source); private: - QHash<QUrl, Qt3D::QEntity *> m_loadedSceneTrees; + QHash<QUrl, Qt3DCore::QEntity *> m_loadedSceneTrees; QVector<LoadSceneJobPtr> m_pendingJobs; }; diff --git a/src/render/io/uniformbuffer_p.h b/src/render/io/uniformbuffer_p.h index 5859a9078..49db79f51 100644 --- a/src/render/io/uniformbuffer_p.h +++ b/src/render/io/uniformbuffer_p.h @@ -59,7 +59,7 @@ namespace Render { class GraphicsContext; -typedef QPair<Qt3D::QNodeId, Qt3D::QNodeId> ShaderDataShaderUboKey; +typedef QPair<Qt3DCore::QNodeId, Qt3DCore::QNodeId> ShaderDataShaderUboKey; class UniformBuffer { diff --git a/src/render/jobs/framecleanupjob.cpp b/src/render/jobs/framecleanupjob.cpp index 7d6df11b4..7fdbb1290 100644 --- a/src/render/jobs/framecleanupjob.cpp +++ b/src/render/jobs/framecleanupjob.cpp @@ -58,7 +58,7 @@ FrameCleanupJob::~FrameCleanupJob() void FrameCleanupJob::run() { // set each ShaderData to not need an update - Q_FOREACH (const Qt3D::QNodeId &id, ShaderData::updatedShaderDataList()) { + Q_FOREACH (const Qt3DCore::QNodeId &id, ShaderData::updatedShaderDataList()) { ShaderData *shaderData = m_renderer->shaderDataManager()->lookupResource(id); if (shaderData != Q_NULLPTR) shaderData->clearUpdate(); diff --git a/src/render/jobs/framecleanupjob_p.h b/src/render/jobs/framecleanupjob_p.h index 9af01b6bd..9dddc925e 100644 --- a/src/render/jobs/framecleanupjob_p.h +++ b/src/render/jobs/framecleanupjob_p.h @@ -60,7 +60,7 @@ namespace Render { class Renderer; class Entity; -class FrameCleanupJob : public Qt3D::QAspectJob +class FrameCleanupJob : public Qt3DCore::QAspectJob { public: explicit FrameCleanupJob(Renderer *renderer); diff --git a/src/render/jobs/framepreparationjob_p.h b/src/render/jobs/framepreparationjob_p.h index 3609c223f..d23969cd0 100644 --- a/src/render/jobs/framepreparationjob_p.h +++ b/src/render/jobs/framepreparationjob_p.h @@ -59,7 +59,7 @@ namespace Render { class Renderer; class Entity; -class FramePreparationJob : public Qt3D::QAspectJob +class FramePreparationJob : public Qt3DCore::QAspectJob { public: FramePreparationJob(Entity *root); diff --git a/src/render/jobs/loadbufferjob_p.h b/src/render/jobs/loadbufferjob_p.h index 89d2a8d18..d6b0d2ca6 100644 --- a/src/render/jobs/loadbufferjob_p.h +++ b/src/render/jobs/loadbufferjob_p.h @@ -60,7 +60,7 @@ namespace Render { class Renderer; -class LoadBufferJob : public Qt3D::QAspectJob +class LoadBufferJob : public Qt3DCore::QAspectJob { public: explicit LoadBufferJob(const HBuffer &handle); diff --git a/src/render/jobs/loadgeometryjob_p.h b/src/render/jobs/loadgeometryjob_p.h index 58fb419ca..9ed4a8269 100644 --- a/src/render/jobs/loadgeometryjob_p.h +++ b/src/render/jobs/loadgeometryjob_p.h @@ -60,7 +60,7 @@ namespace Render { class Renderer; -class LoadGeometryJob : public Qt3D::QAspectJob +class LoadGeometryJob : public Qt3DCore::QAspectJob { public: explicit LoadGeometryJob(const HGeometryRenderer &handle); diff --git a/src/render/jobs/loadscenejob.cpp b/src/render/jobs/loadscenejob.cpp index 6ceda73da..a7dbc3dae 100644 --- a/src/render/jobs/loadscenejob.cpp +++ b/src/render/jobs/loadscenejob.cpp @@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { namespace Render { -LoadSceneJob::LoadSceneJob(const QUrl &source, const Qt3D::QNodeId &m_sceneComponent) +LoadSceneJob::LoadSceneJob(const QUrl &source, const Qt3DCore::QNodeId &m_sceneComponent) : QAspectJob() , m_renderer(Q_NULLPTR) , m_source(source) @@ -55,7 +55,7 @@ LoadSceneJob::LoadSceneJob(const QUrl &source, const Qt3D::QNodeId &m_sceneCompo void LoadSceneJob::run() { - Qt3D::QEntity *sceneTree = m_renderer->sceneManager()->sceneTreeFromSource(m_source); + Qt3DCore::QEntity *sceneTree = m_renderer->sceneManager()->sceneTreeFromSource(m_source); if (sceneTree == Q_NULLPTR) { Q_FOREACH (AbstractSceneParser *parser, m_renderer->sceneParsers()) { if (parser->isExtensionSupported(m_source)) { diff --git a/src/render/jobs/loadscenejob_p.h b/src/render/jobs/loadscenejob_p.h index 5385b9cfc..b8c4b18ed 100644 --- a/src/render/jobs/loadscenejob_p.h +++ b/src/render/jobs/loadscenejob_p.h @@ -61,10 +61,10 @@ namespace Render { class Renderer; -class LoadSceneJob : public Qt3D::QAspectJob +class LoadSceneJob : public Qt3DCore::QAspectJob { public: - explicit LoadSceneJob(const QUrl &source, const Qt3D::QNodeId &sceneComponent); + explicit LoadSceneJob(const QUrl &source, const Qt3DCore::QNodeId &sceneComponent); void setRenderer(Renderer *renderer) { m_renderer = renderer; } protected: @@ -73,7 +73,7 @@ protected: private: Renderer *m_renderer; QUrl m_source; - Qt3D::QNodeId m_sceneComponent; + Qt3DCore::QNodeId m_sceneComponent; }; typedef QSharedPointer<LoadSceneJob> LoadSceneJobPtr; diff --git a/src/render/jobs/loadtexturedatajob.cpp b/src/render/jobs/loadtexturedatajob.cpp index 2dadcd69e..35ddf6cc5 100644 --- a/src/render/jobs/loadtexturedatajob.cpp +++ b/src/render/jobs/loadtexturedatajob.cpp @@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { namespace Render { -LoadTextureDataJob::LoadTextureDataJob(const Qt3D::QNodeId &textureId) +LoadTextureDataJob::LoadTextureDataJob(const Qt3DCore::QNodeId &textureId) : m_textureId(textureId) { } diff --git a/src/render/jobs/loadtexturedatajob_p.h b/src/render/jobs/loadtexturedatajob_p.h index abe476000..09d5e3b5d 100644 --- a/src/render/jobs/loadtexturedatajob_p.h +++ b/src/render/jobs/loadtexturedatajob_p.h @@ -60,10 +60,10 @@ namespace Render { class Renderer; -class LoadTextureDataJob : public Qt3D::QAspectJob +class LoadTextureDataJob : public Qt3DCore::QAspectJob { public: - LoadTextureDataJob(const Qt3D::QNodeId &textureId); + LoadTextureDataJob(const Qt3DCore::QNodeId &textureId); ~LoadTextureDataJob(); inline void setRenderer(Renderer *renderer) { m_renderer = renderer; } @@ -71,7 +71,7 @@ protected: void run() Q_DECL_FINAL; private: - Qt3D::QNodeId m_textureId; + Qt3DCore::QNodeId m_textureId; Renderer *m_renderer; }; diff --git a/src/render/jobs/renderviewjob.cpp b/src/render/jobs/renderviewjob.cpp index 962bcaaa7..750a2e8b7 100644 --- a/src/render/jobs/renderviewjob.cpp +++ b/src/render/jobs/renderviewjob.cpp @@ -53,7 +53,7 @@ void RenderViewJob::run() // Create a RenderView object // The RenderView are created from a QFrameAllocator stored in the current Thread local storage - Qt3D::QFrameAllocator *currentFrameAllocator = m_renderer->currentFrameAllocator(); + Qt3DCore::QFrameAllocator *currentFrameAllocator = m_renderer->currentFrameAllocator(); RenderView *renderView = currentFrameAllocator->allocate<RenderView>(); // RenderView should allocate heap resources using only the currentFrameAllocator diff --git a/src/render/jobs/renderviewjob_p.h b/src/render/jobs/renderviewjob_p.h index 670edb371..c5fecb3d8 100644 --- a/src/render/jobs/renderviewjob_p.h +++ b/src/render/jobs/renderviewjob_p.h @@ -62,7 +62,7 @@ namespace Render { class Renderer; class FrameGraphNode; -class RenderViewJob : public Qt3D::QAspectJob +class RenderViewJob : public Qt3DCore::QAspectJob { public: RenderViewJob() diff --git a/src/render/jobs/renderviewjobutils.cpp b/src/render/jobs/renderviewjobutils.cpp index 9cf472549..7de8e4726 100644 --- a/src/render/jobs/renderviewjobutils.cpp +++ b/src/render/jobs/renderviewjobutils.cpp @@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { namespace Render { @@ -324,7 +324,7 @@ ParameterInfoList::iterator findParamInfo(ParameterInfoList *params, const QStri } void addParametersForIds(ParameterInfoList *params, ParameterManager *manager, - const QList<Qt3D::QNodeId> ¶meterIds) + const QList<Qt3DCore::QNodeId> ¶meterIds) { Q_FOREACH (const QNodeId ¶mId, parameterIds) { Parameter *param = manager->lookupResource(paramId); diff --git a/src/render/jobs/renderviewjobutils_p.h b/src/render/jobs/renderviewjobutils_p.h index ff6baab33..76b37a1bf 100644 --- a/src/render/jobs/renderviewjobutils_p.h +++ b/src/render/jobs/renderviewjobutils_p.h @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QFrameAllocator; } @@ -114,7 +114,7 @@ Q_AUTOTEST_EXPORT void parametersFromMaterialEffectTechnique(ParameterInfoList * Technique *technique); Q_AUTOTEST_EXPORT void addParametersForIds(ParameterInfoList *params, ParameterManager *manager, - const QList<Qt3D::QNodeId> ¶meterIds); + const QList<Qt3DCore::QNodeId> ¶meterIds); template<class T> void parametersFromParametersProvider(ParameterInfoList *infoList, @@ -129,7 +129,7 @@ Q_AUTOTEST_EXPORT ParameterInfoList::iterator findParamInfo(ParameterInfoList *i const QString &name); Q_AUTOTEST_EXPORT RenderStateSet *buildRenderStateSet(const QList<RenderState*> &states, - Qt3D::QFrameAllocator *allocator); + Qt3DCore::QFrameAllocator *allocator); struct Q_AUTOTEST_EXPORT UniformBlockValueBuilder diff --git a/src/render/jobs/updateboundingvolumejob_p.h b/src/render/jobs/updateboundingvolumejob_p.h index e14f71e36..27dc82486 100644 --- a/src/render/jobs/updateboundingvolumejob_p.h +++ b/src/render/jobs/updateboundingvolumejob_p.h @@ -59,7 +59,7 @@ namespace Render { class Entity; -class UpdateBoundingVolumeJob : public Qt3D::QAspectJob +class UpdateBoundingVolumeJob : public Qt3DCore::QAspectJob { public: explicit UpdateBoundingVolumeJob(Entity *m_node); diff --git a/src/render/jobs/updateworldtransformjob.cpp b/src/render/jobs/updateworldtransformjob.cpp index 20c58511c..736325560 100644 --- a/src/render/jobs/updateworldtransformjob.cpp +++ b/src/render/jobs/updateworldtransformjob.cpp @@ -67,7 +67,7 @@ void updateWorldTransformAndBounds(Qt3DRender::Render::Entity *node, const QMatr } UpdateWorldTransformJob::UpdateWorldTransformJob(Entity *node) - : Qt3D::QAspectJob() + : Qt3DCore::QAspectJob() , m_node(node) { } diff --git a/src/render/jobs/updateworldtransformjob_p.h b/src/render/jobs/updateworldtransformjob_p.h index d379cf5a3..896a02c05 100644 --- a/src/render/jobs/updateworldtransformjob_p.h +++ b/src/render/jobs/updateworldtransformjob_p.h @@ -59,7 +59,7 @@ namespace Render { class Entity; -class UpdateWorldTransformJob : public Qt3D::QAspectJob +class UpdateWorldTransformJob : public Qt3DCore::QAspectJob { public: explicit UpdateWorldTransformJob(Entity *node); diff --git a/src/render/lights/qabstractlight.cpp b/src/render/lights/qabstractlight.cpp index 82e1826be..a4272bcba 100644 --- a/src/render/lights/qabstractlight.cpp +++ b/src/render/lights/qabstractlight.cpp @@ -51,7 +51,7 @@ namespace Qt3DRender /*! - \class Qt3D::QAbstractLightPrivate + \class Qt3DCore::QAbstractLightPrivate \internal */ QAbstractLightPrivate::QAbstractLightPrivate() @@ -71,14 +71,14 @@ void QAbstractLight::copy(const QNode *ref) } /*! - \class Qt3D::QAbstractLight + \class Qt3DCore::QAbstractLight \inmodule Qt3DRender */ /*! * Constructs a new QAbstractLight with the given \a parent. */ -QAbstractLight::QAbstractLight(Qt3D::QNode *parent) : +QAbstractLight::QAbstractLight(Qt3DCore::QNode *parent) : QShaderData(*new QAbstractLightPrivate, parent) { } @@ -91,7 +91,7 @@ QAbstractLight::QAbstractLight(QAbstractLightPrivate &dd, QNode *parent) /*! - * \property Qt3D::QAbstractLight::color + * \property Qt3DCore::QAbstractLight::color * * Holds the current QAbstractLight color. */ @@ -111,7 +111,7 @@ void QAbstractLight::setColor(const QColor &color) } /*! - \property Qt3D::QAbstractLight::intensity + \property Qt3DCore::QAbstractLight::intensity Holds the current QAbstractLight intensity. */ @@ -131,7 +131,7 @@ void QAbstractLight::setIntensity(float intensity) } /*! - \property Qt3D::QAbstractLight::position + \property Qt3DCore::QAbstractLight::position Holds the current QAbstractLight position. */ diff --git a/src/render/lights/qabstractlight.h b/src/render/lights/qabstractlight.h index 6f30fe955..15eac8b04 100644 --- a/src/render/lights/qabstractlight.h +++ b/src/render/lights/qabstractlight.h @@ -58,7 +58,7 @@ class QT3DRENDERERSHARED_EXPORT QAbstractLight : public QShaderData Q_PROPERTY(TransformType positionTransformed READ positionTransformed CONSTANT) public : - explicit QAbstractLight(Qt3D::QNode *parent = 0); + explicit QAbstractLight(Qt3DCore::QNode *parent = 0); QColor color() const; void setColor(const QColor &color); @@ -72,8 +72,8 @@ public : TransformType positionTransformed() const; protected : - QAbstractLight(QAbstractLightPrivate &dd, Qt3D::QNode *parent = 0); - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + QAbstractLight(QAbstractLightPrivate &dd, Qt3DCore::QNode *parent = 0); + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; Q_SIGNALS: void colorChanged(); diff --git a/src/render/lights/qdirectionallight.cpp b/src/render/lights/qdirectionallight.cpp index ebdc1e170..e6bbb7541 100644 --- a/src/render/lights/qdirectionallight.cpp +++ b/src/render/lights/qdirectionallight.cpp @@ -62,7 +62,7 @@ namespace Qt3DRender { */ /*! - \class Qt3D::QDirectionalLightPrivate + \class Qt3DCore::QDirectionalLightPrivate \internal */ QDirectionalLightPrivate::QDirectionalLightPrivate() diff --git a/src/render/lights/qdirectionallight.h b/src/render/lights/qdirectionallight.h index f626d4f6a..c0fe1dfe7 100644 --- a/src/render/lights/qdirectionallight.h +++ b/src/render/lights/qdirectionallight.h @@ -51,7 +51,7 @@ class QT3DRENDERERSHARED_EXPORT QDirectionalLight : public QAbstractLight Q_PROPERTY(QVector3D direction READ direction WRITE setDirection NOTIFY directionChanged) public: - explicit QDirectionalLight(Qt3D::QNode *parent = 0); + explicit QDirectionalLight(Qt3DCore::QNode *parent = 0); void setDirection(const QVector3D &direction); QVector3D direction() const; @@ -60,8 +60,8 @@ Q_SIGNALS: void directionChanged(); protected: - QDirectionalLight(QDirectionalLightPrivate &dd, Qt3D::QNode *parent = 0); - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + QDirectionalLight(QDirectionalLightPrivate &dd, Qt3DCore::QNode *parent = 0); + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QDirectionalLight) diff --git a/src/render/lights/qpointlight.h b/src/render/lights/qpointlight.h index 076f8b3cd..881c85f3e 100644 --- a/src/render/lights/qpointlight.h +++ b/src/render/lights/qpointlight.h @@ -50,11 +50,11 @@ class QT3DRENDERERSHARED_EXPORT QPointLight : public QAbstractLight Q_OBJECT public: - explicit QPointLight(Qt3D::QNode *parent = 0); + explicit QPointLight(Qt3DCore::QNode *parent = 0); protected: Q_DECLARE_PRIVATE(QPointLight) - QPointLight(QPointLightPrivate &dd, Qt3D::QNode *parent); + QPointLight(QPointLightPrivate &dd, Qt3DCore::QNode *parent); QT3D_CLONEABLE(QPointLight) }; diff --git a/src/render/lights/qspotlight.cpp b/src/render/lights/qspotlight.cpp index 191be0e62..1e9244c91 100644 --- a/src/render/lights/qspotlight.cpp +++ b/src/render/lights/qspotlight.cpp @@ -63,7 +63,7 @@ namespace Qt3DRender { */ /*! - \class Qt3D::QSpotLightPrivate + \class Qt3DCore::QSpotLightPrivate \internal */ QSpotLightPrivate::QSpotLightPrivate() @@ -81,14 +81,14 @@ QSpotLightPrivate::QSpotLightPrivate() /*! \qmltype SpotLight - \instantiates Qt3D::QSpotLight + \instantiates Qt3DCore::QSpotLight \inherits AbstractLight \inqmlmodule Qt3D.Renderer \since 5.5 \brief For OpenGL ... */ -/*! \fn void Qt3D::QSpotLight::copy(const QNode *ref) +/*! \fn void Qt3DCore::QSpotLight::copy(const QNode *ref) Copies the \a ref instance into this one. */ @@ -104,7 +104,7 @@ void QSpotLight::copy(const QNode *ref) /*! - \fn Qt3D::QSpotLight::QSpotLight(QNode *parent) + \fn Qt3DCore::QSpotLight::QSpotLight(QNode *parent) Constructs a new QSpotLight with the specified \a parent. */ QSpotLight::QSpotLight(QNode *parent) @@ -124,7 +124,7 @@ QSpotLight::QSpotLight(QSpotLightPrivate &dd, QNode *parent) */ /*! - \property Qt3D::QSpotLight::direction + \property Qt3DCore::QSpotLight::direction */ @@ -141,7 +141,7 @@ QSpotLight::QSpotLight(QSpotLightPrivate &dd, QNode *parent) */ /*! - \property Qt3D::QSpotLight::cutOffAngle + \property Qt3DCore::QSpotLight::cutOffAngle */ float QSpotLight::cutOffAngle() const diff --git a/src/render/lights/qspotlight.h b/src/render/lights/qspotlight.h index c22ef62e5..d262b3d97 100644 --- a/src/render/lights/qspotlight.h +++ b/src/render/lights/qspotlight.h @@ -52,7 +52,7 @@ class QT3DRENDERERSHARED_EXPORT QSpotLight : public QAbstractLight Q_PROPERTY(float cutOffAngle READ cutOffAngle WRITE setCutOffAngle NOTIFY cutOffAngleChanged) public: - explicit QSpotLight(Qt3D::QNode *parent = 0); + explicit QSpotLight(Qt3DCore::QNode *parent = 0); QVector3D direction() const; float cutOffAngle() const; @@ -65,8 +65,8 @@ Q_SIGNALS: void cutOffAngleChanged(); protected: - QSpotLight(QSpotLightPrivate &dd, Qt3D::QNode *parent = 0); - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + QSpotLight(QSpotLightPrivate &dd, Qt3DCore::QNode *parent = 0); + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QSpotLight) diff --git a/src/render/materialsystem/annotation.cpp b/src/render/materialsystem/annotation.cpp index 2d725316a..ed0c6cea2 100644 --- a/src/render/materialsystem/annotation.cpp +++ b/src/render/materialsystem/annotation.cpp @@ -39,7 +39,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { namespace Render { @@ -58,7 +58,7 @@ void Annotation::cleanup() { } -void Annotation::updateFromPeer(Qt3D::QNode *peer) +void Annotation::updateFromPeer(Qt3DCore::QNode *peer) { QAnnotation *criterion = static_cast<QAnnotation *>(peer); @@ -76,7 +76,7 @@ QString Annotation::criterionName() const return m_name; } -void Annotation::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) +void Annotation::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); if (propertyChange->propertyName() == QByteArrayLiteral("value")) diff --git a/src/render/materialsystem/annotation_p.h b/src/render/materialsystem/annotation_p.h index b864d02d5..564fe1671 100644 --- a/src/render/materialsystem/annotation_p.h +++ b/src/render/materialsystem/annotation_p.h @@ -61,17 +61,17 @@ namespace Render { class CriterionManager; -class Annotation : public Qt3D::QBackendNode +class Annotation : public Qt3DCore::QBackendNode { public: Annotation(); ~Annotation(); void cleanup(); - void updateFromPeer(Qt3D::QNode *criterion) Q_DECL_OVERRIDE; + void updateFromPeer(Qt3DCore::QNode *criterion) Q_DECL_OVERRIDE; QVariant criterionValue() const; QString criterionName() const; - void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; bool operator ==(const Annotation &other); bool operator !=(const Annotation &other); diff --git a/src/render/materialsystem/effect.cpp b/src/render/materialsystem/effect.cpp index 37b73ffa6..bf0e64a58 100644 --- a/src/render/materialsystem/effect.cpp +++ b/src/render/materialsystem/effect.cpp @@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { namespace Render { @@ -64,7 +64,7 @@ void Effect::cleanup() { } -void Effect::updateFromPeer(Qt3D::QNode *peer) +void Effect::updateFromPeer(Qt3DCore::QNode *peer) { QEffect *effect = static_cast<QEffect *>(peer); @@ -78,7 +78,7 @@ void Effect::updateFromPeer(Qt3D::QNode *peer) m_parameterPack.appendParameter(p->id()); } -void Effect::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) +void Effect::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); QVariant propertyValue = propertyChange->value(); @@ -103,18 +103,18 @@ void Effect::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) } } -void Effect::appendRenderTechnique(const Qt3D::QNodeId &technique) +void Effect::appendRenderTechnique(const Qt3DCore::QNodeId &technique) { if (!m_techniques.contains(technique)) m_techniques.append(technique); } -QList<Qt3D::QNodeId> Effect::techniques() const +QList<Qt3DCore::QNodeId> Effect::techniques() const { return m_techniques; } -QList<Qt3D::QNodeId> Effect::parameters() const +QList<Qt3DCore::QNodeId> Effect::parameters() const { return m_parameterPack.parameters(); } diff --git a/src/render/materialsystem/effect_p.h b/src/render/materialsystem/effect_p.h index 841f2996a..0d307d0c5 100644 --- a/src/render/materialsystem/effect_p.h +++ b/src/render/materialsystem/effect_p.h @@ -62,22 +62,22 @@ class QTechnique; namespace Render { -class Effect : public Qt3D::QBackendNode +class Effect : public Qt3DCore::QBackendNode { public: Effect(); ~Effect(); void cleanup(); - void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE; - void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; - void appendRenderTechnique(const Qt3D::QNodeId &t); + void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; + void appendRenderTechnique(const Qt3DCore::QNodeId &t); - QList<Qt3D::QNodeId> techniques() const; - QList<Qt3D::QNodeId> parameters() const; + QList<Qt3DCore::QNodeId> techniques() const; + QList<Qt3DCore::QNodeId> parameters() const; private: - QList<Qt3D::QNodeId> m_techniques; + QList<Qt3DCore::QNodeId> m_techniques; ParameterPack m_parameterPack; }; diff --git a/src/render/materialsystem/material.cpp b/src/render/materialsystem/material.cpp index c096c1a98..faf934d3e 100644 --- a/src/render/materialsystem/material.cpp +++ b/src/render/materialsystem/material.cpp @@ -46,7 +46,7 @@ #include <Qt3DCore/qscenepropertychange.h> #include <QOpenGLShaderProgram> -using namespace Qt3D; +using namespace Qt3DCore; QT_BEGIN_NAMESPACE @@ -69,7 +69,7 @@ void Material::cleanup() m_parameterPack.clear(); } -void Material::updateFromPeer(Qt3D::QNode *node) +void Material::updateFromPeer(Qt3DCore::QNode *node) { QMaterial *mat = static_cast<QMaterial *>(node); m_parameterPack.clear(); @@ -80,7 +80,7 @@ void Material::updateFromPeer(Qt3D::QNode *node) m_parameterPack.appendParameter(p->id()); } -void Material::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) +void Material::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); @@ -111,12 +111,12 @@ void Material::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) } } -QList<Qt3D::QNodeId> Material::parameters() const +QList<Qt3DCore::QNodeId> Material::parameters() const { return m_parameterPack.parameters(); } -Qt3D::QNodeId Material::effect() const +Qt3DCore::QNodeId Material::effect() const { return m_effectUuid; } diff --git a/src/render/materialsystem/material_p.h b/src/render/materialsystem/material_p.h index 06cd4f285..f45912ab6 100644 --- a/src/render/materialsystem/material_p.h +++ b/src/render/materialsystem/material_p.h @@ -69,23 +69,23 @@ class Technique; class Effect; class MaterialManager; -class Q_AUTOTEST_EXPORT Material : public Qt3D::QBackendNode +class Q_AUTOTEST_EXPORT Material : public Qt3DCore::QBackendNode { public: Material(); ~Material(); void cleanup(); - void updateFromPeer(Qt3D::QNode* mat) Q_DECL_OVERRIDE; - void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; + void updateFromPeer(Qt3DCore::QNode* mat) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; inline bool isEnabled() const { return m_enabled; } - QList<Qt3D::QNodeId> parameters() const; - Qt3D::QNodeId effect() const; + QList<Qt3DCore::QNodeId> parameters() const; + Qt3DCore::QNodeId effect() const; private: ParameterPack m_parameterPack; - Qt3D::QNodeId m_effectUuid; + Qt3DCore::QNodeId m_effectUuid; bool m_enabled; }; diff --git a/src/render/materialsystem/parameter.cpp b/src/render/materialsystem/parameter.cpp index afc44ed58..34eb395f7 100644 --- a/src/render/materialsystem/parameter.cpp +++ b/src/render/materialsystem/parameter.cpp @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { namespace Render { @@ -56,14 +56,14 @@ Parameter::Parameter() { } -void Parameter::updateFromPeer(Qt3D::QNode *mat) +void Parameter::updateFromPeer(Qt3DCore::QNode *mat) { QParameter *param = static_cast<QParameter *>(mat); m_name = param->name(); m_value = toBackendValue(param->value()); } -void Parameter::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) +void Parameter::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); diff --git a/src/render/materialsystem/parameter_p.h b/src/render/materialsystem/parameter_p.h index f8728c04b..a40af65ee 100644 --- a/src/render/materialsystem/parameter_p.h +++ b/src/render/materialsystem/parameter_p.h @@ -61,13 +61,13 @@ class ParameterManager; class ShaderDataManager; class TextureManager; -class Parameter : public Qt3D::QBackendNode +class Parameter : public Qt3DCore::QBackendNode { public: Parameter(); - void updateFromPeer(Qt3D::QNode* mat) Q_DECL_OVERRIDE; - void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; + void updateFromPeer(Qt3DCore::QNode* mat) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; QString name() const; QVariant value() const; diff --git a/src/render/materialsystem/parametermapping.cpp b/src/render/materialsystem/parametermapping.cpp index a05d11b66..bc6ea8baf 100644 --- a/src/render/materialsystem/parametermapping.cpp +++ b/src/render/materialsystem/parametermapping.cpp @@ -47,7 +47,7 @@ ParameterMapping::ParameterMapping() } ParameterMapping::ParameterMapping(QParameterMapping *mapping) - : m_id(mapping ? mapping->id() : Qt3D::QNodeId()) + : m_id(mapping ? mapping->id() : Qt3DCore::QNodeId()) , m_parameterName(mapping ? mapping->parameterName() : QString()) , m_shaderVariableName(mapping ? mapping->shaderVariableName() : QString()) , m_bindingType(mapping ? mapping->bindingType() : QParameterMapping::Uniform) @@ -59,7 +59,7 @@ bool ParameterMapping::isValid() const return !m_id.isNull(); } -Qt3D::QNodeId ParameterMapping::id() const +Qt3DCore::QNodeId ParameterMapping::id() const { return m_id; } diff --git a/src/render/materialsystem/parametermapping_p.h b/src/render/materialsystem/parametermapping_p.h index 21e9fb7ec..7c5df3c31 100644 --- a/src/render/materialsystem/parametermapping_p.h +++ b/src/render/materialsystem/parametermapping_p.h @@ -64,13 +64,13 @@ public: bool isValid() const; - Qt3D::QNodeId id() const; + Qt3DCore::QNodeId id() const; QString parameterName() const; QString shaderVariableName() const; QParameterMapping::Binding bindingType() const; private: - Qt3D::QNodeId m_id; + Qt3DCore::QNodeId m_id; QString m_parameterName; QString m_shaderVariableName; QParameterMapping::Binding m_bindingType; diff --git a/src/render/materialsystem/qannotation.h b/src/render/materialsystem/qannotation.h index 158ebdc77..e36bfe46e 100644 --- a/src/render/materialsystem/qannotation.h +++ b/src/render/materialsystem/qannotation.h @@ -47,13 +47,13 @@ namespace Qt3DRender { class QAnnotationPrivate; -class QT3DRENDERERSHARED_EXPORT QAnnotation : public Qt3D::QNode +class QT3DRENDERERSHARED_EXPORT QAnnotation : public Qt3DCore::QNode { Q_OBJECT Q_PROPERTY(QVariant value READ value WRITE setValue NOTIFY valueChanged) Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged) public: - explicit QAnnotation(Qt3D::QNode *parent = 0); + explicit QAnnotation(Qt3DCore::QNode *parent = 0); ~QAnnotation(); void setValue(const QVariant &value); @@ -67,7 +67,7 @@ Q_SIGNALS: void valueChanged(); protected: - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QAnnotation) diff --git a/src/render/materialsystem/qannotation_p.h b/src/render/materialsystem/qannotation_p.h index 0763e59a4..f37004b0c 100644 --- a/src/render/materialsystem/qannotation_p.h +++ b/src/render/materialsystem/qannotation_p.h @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QAnnotationPrivate : public Qt3D::QNodePrivate +class QAnnotationPrivate : public Qt3DCore::QNodePrivate { public: QAnnotationPrivate(); diff --git a/src/render/materialsystem/qeffect.cpp b/src/render/materialsystem/qeffect.cpp index 443571872..d50e71f82 100644 --- a/src/render/materialsystem/qeffect.cpp +++ b/src/render/materialsystem/qeffect.cpp @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { diff --git a/src/render/materialsystem/qeffect.h b/src/render/materialsystem/qeffect.h index 164a6392a..be1d4a21b 100644 --- a/src/render/materialsystem/qeffect.h +++ b/src/render/materialsystem/qeffect.h @@ -49,11 +49,11 @@ class QTechnique; class QEffectPrivate; class QT3DRENDERERSHARED_EXPORT QEffect - : public Qt3D::QNode + : public Qt3DCore::QNode { Q_OBJECT public: - explicit QEffect(Qt3D::QNode *parent = 0); + explicit QEffect(Qt3DCore::QNode *parent = 0); ~QEffect(); void addParameter(QParameter *parameter); @@ -65,8 +65,8 @@ public: QList<QTechnique *> techniques() const; protected: - QEffect(QEffectPrivate &dd, Qt3D::QNode *parent = 0); - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + QEffect(QEffectPrivate &dd, Qt3DCore::QNode *parent = 0); + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QEffect) diff --git a/src/render/materialsystem/qeffect_p.h b/src/render/materialsystem/qeffect_p.h index abb81994c..844016022 100644 --- a/src/render/materialsystem/qeffect_p.h +++ b/src/render/materialsystem/qeffect_p.h @@ -59,7 +59,7 @@ class QEffect; class QParameter; class QTechnique; -class QT3DRENDERERSHARED_EXPORT QEffectPrivate : public Qt3D::QNodePrivate +class QT3DRENDERERSHARED_EXPORT QEffectPrivate : public Qt3DCore::QNodePrivate { public : QEffectPrivate(); diff --git a/src/render/materialsystem/qmaterial.cpp b/src/render/materialsystem/qmaterial.cpp index b3c833556..c220b1841 100644 --- a/src/render/materialsystem/qmaterial.cpp +++ b/src/render/materialsystem/qmaterial.cpp @@ -57,12 +57,12 @@ * sound should reflect off an element, the temperature of a surface, * and so on. * - * \sa QEffect, QMesh, {Qt3D::}{QComponent} + * \sa QEffect, QMesh, {Qt3DCore::}{QComponent} */ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { diff --git a/src/render/materialsystem/qmaterial.h b/src/render/materialsystem/qmaterial.h index ca44901c1..cfc3c0d99 100644 --- a/src/render/materialsystem/qmaterial.h +++ b/src/render/materialsystem/qmaterial.h @@ -52,13 +52,13 @@ class QMaterialPrivate; class QEffect; typedef QMap<QString, QAbstractTextureProvider*> TextureDict; -class QT3DRENDERERSHARED_EXPORT QMaterial : public Qt3D::QComponent +class QT3DRENDERERSHARED_EXPORT QMaterial : public Qt3DCore::QComponent { Q_OBJECT Q_PROPERTY(Qt3DRender::QEffect *effect READ effect WRITE setEffect NOTIFY effectChanged) public: - explicit QMaterial(Qt3D::QNode *parent = 0); + explicit QMaterial(Qt3DCore::QNode *parent = 0); ~QMaterial(); void setEffect(QEffect *effect); @@ -76,8 +76,8 @@ Q_SIGNALS: void effectChanged(); protected: - QMaterial(QMaterialPrivate &dd, Qt3D::QNode *parent = 0); - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + QMaterial(QMaterialPrivate &dd, Qt3DCore::QNode *parent = 0); + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QMaterial) diff --git a/src/render/materialsystem/qmaterial_p.h b/src/render/materialsystem/qmaterial_p.h index 9be59c488..c84aeb6c1 100644 --- a/src/render/materialsystem/qmaterial_p.h +++ b/src/render/materialsystem/qmaterial_p.h @@ -58,7 +58,7 @@ namespace Qt3DRender { class QParameter; class QEffect; -class QT3DRENDERERSHARED_EXPORT QMaterialPrivate : public Qt3D::QComponentPrivate +class QT3DRENDERERSHARED_EXPORT QMaterialPrivate : public Qt3DCore::QComponentPrivate { public: QMaterialPrivate(); diff --git a/src/render/materialsystem/qopenglfilter.cpp b/src/render/materialsystem/qopenglfilter.cpp index 3bc20a84d..fa9437e4a 100644 --- a/src/render/materialsystem/qopenglfilter.cpp +++ b/src/render/materialsystem/qopenglfilter.cpp @@ -280,7 +280,7 @@ void QOpenGLFilter::setVendor(const QString &vendor) } } -/*! \fn bool Qt3D::operator ==(const QOpenGLFilter &reference, const QOpenGLFilter &sample) +/*! \fn bool Qt3DCore::operator ==(const QOpenGLFilter &reference, const QOpenGLFilter &sample) \relates Qt3DRender::QOpenGLFilter Returns true if \a reference and \a sample are equivalent. */ @@ -302,7 +302,7 @@ bool operator ==(const QOpenGLFilter &reference, const QOpenGLFilter &sample) return false; } -/*! \fn bool Qt3D::operator !=(const QOpenGLFilter &reference, const QOpenGLFilter &sample) +/*! \fn bool Qt3DCore::operator !=(const QOpenGLFilter &reference, const QOpenGLFilter &sample) \relates Qt3DRender::QOpenGLFilter Returns true if \a reference and \a sample are different. */ diff --git a/src/render/materialsystem/qparameter.cpp b/src/render/materialsystem/qparameter.cpp index 96d1205df..fd14603a8 100644 --- a/src/render/materialsystem/qparameter.cpp +++ b/src/render/materialsystem/qparameter.cpp @@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { diff --git a/src/render/materialsystem/qparameter.h b/src/render/materialsystem/qparameter.h index 03883f5f1..b0a9c9b2e 100644 --- a/src/render/materialsystem/qparameter.h +++ b/src/render/materialsystem/qparameter.h @@ -48,17 +48,17 @@ namespace Qt3DRender { class QParameterPrivate; class QAbstractTextureProvider; -class QT3DRENDERERSHARED_EXPORT QParameter : public Qt3D::QNode +class QT3DRENDERERSHARED_EXPORT QParameter : public Qt3DCore::QNode { Q_OBJECT Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged) Q_PROPERTY(QVariant value READ value WRITE setValue NOTIFY valueChanged) public: - explicit QParameter(Qt3D::QNode *parent = 0); + explicit QParameter(Qt3DCore::QNode *parent = 0); ~QParameter(); - QParameter(const QString& name, const QVariant& value, Qt3D::QNode* parent = 0); - QParameter(const QString &name, QAbstractTextureProvider *texture, Qt3D::QNode *parent = 0); + QParameter(const QString& name, const QVariant& value, Qt3DCore::QNode* parent = 0); + QParameter(const QString &name, QAbstractTextureProvider *texture, Qt3DCore::QNode *parent = 0); void setName(const QString &name); QString name() const; @@ -75,8 +75,8 @@ Q_SIGNALS: void nameChanged(); protected: - QParameter(QParameterPrivate &dd, Qt3D::QNode *parent = 0); - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + QParameter(QParameterPrivate &dd, Qt3DCore::QNode *parent = 0); + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QParameter) diff --git a/src/render/materialsystem/qparameter_p.h b/src/render/materialsystem/qparameter_p.h index 40143edc8..01bdf63c2 100644 --- a/src/render/materialsystem/qparameter_p.h +++ b/src/render/materialsystem/qparameter_p.h @@ -57,7 +57,7 @@ namespace Qt3DRender { class QParameter; -class QT3DRENDERERSHARED_PRIVATE_EXPORT QParameterPrivate : public Qt3D::QNodePrivate +class QT3DRENDERERSHARED_PRIVATE_EXPORT QParameterPrivate : public Qt3DCore::QNodePrivate { public: QParameterPrivate(); diff --git a/src/render/materialsystem/qparametermapping.h b/src/render/materialsystem/qparametermapping.h index f4e209abd..e104f4001 100644 --- a/src/render/materialsystem/qparametermapping.h +++ b/src/render/materialsystem/qparametermapping.h @@ -46,7 +46,7 @@ namespace Qt3DRender { class QParameterMappingPrivate; -class QT3DRENDERERSHARED_EXPORT QParameterMapping : public Qt3D::QNode +class QT3DRENDERERSHARED_EXPORT QParameterMapping : public Qt3DCore::QNode { Q_OBJECT Q_PROPERTY(QString parameterName READ parameterName WRITE setParameterName NOTIFY parameterNameChanged) @@ -62,8 +62,8 @@ public: }; Q_ENUM(Binding) - explicit QParameterMapping(Qt3D::QNode *parent = 0); - QParameterMapping(const QString ¶meterName, const QString &shaderParameterName, QParameterMapping::Binding bindingType, Qt3D::QNode *parent = 0); + explicit QParameterMapping(Qt3DCore::QNode *parent = 0); + QParameterMapping(const QString ¶meterName, const QString &shaderParameterName, QParameterMapping::Binding bindingType, Qt3DCore::QNode *parent = 0); ~QParameterMapping(); void setParameterName(const QString &name); @@ -80,8 +80,8 @@ Q_SIGNALS: void bindingTypeChanged(); protected: - QParameterMapping(QParameterMappingPrivate &dd, Qt3D::QNode *parent = 0); - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + QParameterMapping(QParameterMappingPrivate &dd, Qt3DCore::QNode *parent = 0); + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QParameterMapping) diff --git a/src/render/materialsystem/qparametermapping_p.h b/src/render/materialsystem/qparametermapping_p.h index 9539ba0fc..940f3983e 100644 --- a/src/render/materialsystem/qparametermapping_p.h +++ b/src/render/materialsystem/qparametermapping_p.h @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QParameterMappingPrivate : public Qt3D::QNodePrivate +class QParameterMappingPrivate : public Qt3DCore::QNodePrivate { public: QParameterMappingPrivate(); diff --git a/src/render/materialsystem/qrenderpass.cpp b/src/render/materialsystem/qrenderpass.cpp index efb315177..13cee24d0 100644 --- a/src/render/materialsystem/qrenderpass.cpp +++ b/src/render/materialsystem/qrenderpass.cpp @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { @@ -221,11 +221,11 @@ QList<QParameterMapping *> QRenderPass::bindings() const } /*! - * Adds a Qt3D::QRenderState \a state to the rendering pass. That implies that + * Adds a Qt3DCore::QRenderState \a state to the rendering pass. That implies that * when the pass is executed at render time, the globally set render state will * be modifed by the states defined locally by the Qt3DRender::QRenderPass. * - * \note not defining any Qt3D::QRenderState in a pass will result in the pass using + * \note not defining any Qt3DCore::QRenderState in a pass will result in the pass using * the globally set render state for a given FrameGraph branch execution path. */ void QRenderPass::addRenderState(QRenderState *state) @@ -263,7 +263,7 @@ void QRenderPass::removeRenderState(QRenderState *state) } /*! - * Returns the list of Qt3D::QRenderState state objects making up the render + * Returns the list of Qt3DCore::QRenderState state objects making up the render * state of the Qt3DRender::QRenderPass. */ QList<QRenderState *> QRenderPass::renderStates() const diff --git a/src/render/materialsystem/qrenderpass.h b/src/render/materialsystem/qrenderpass.h index ed733ba12..b7018e7a1 100644 --- a/src/render/materialsystem/qrenderpass.h +++ b/src/render/materialsystem/qrenderpass.h @@ -58,13 +58,13 @@ typedef QList<QParameter*> ParameterList; class QRenderPassPrivate; -class QT3DRENDERERSHARED_EXPORT QRenderPass : public Qt3D::QNode +class QT3DRENDERERSHARED_EXPORT QRenderPass : public Qt3DCore::QNode { Q_OBJECT Q_PROPERTY(Qt3DRender::QShaderProgram *shaderProgram READ shaderProgram WRITE setShaderProgram NOTIFY shaderProgramChanged) public: - explicit QRenderPass(Qt3D::QNode *parent = 0); + explicit QRenderPass(Qt3DCore::QNode *parent = 0); ~QRenderPass(); QString glslNameForParameter(QString paramName) const; @@ -95,8 +95,8 @@ Q_SIGNALS: void shaderProgramChanged(); protected: - QRenderPass(QRenderPassPrivate &dd, Qt3D::QNode *parent = 0); - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + QRenderPass(QRenderPassPrivate &dd, Qt3DCore::QNode *parent = 0); + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QRenderPass) diff --git a/src/render/materialsystem/qrenderpass_p.h b/src/render/materialsystem/qrenderpass_p.h index 9be787a62..b587b7708 100644 --- a/src/render/materialsystem/qrenderpass_p.h +++ b/src/render/materialsystem/qrenderpass_p.h @@ -68,7 +68,7 @@ namespace Render class RenderStateSet; } -class QT3DRENDERERSHARED_EXPORT QRenderPassPrivate : public Qt3D::QNodePrivate +class QT3DRENDERERSHARED_EXPORT QRenderPassPrivate : public Qt3DCore::QNodePrivate { public: QRenderPassPrivate(); diff --git a/src/render/materialsystem/qshaderdata.h b/src/render/materialsystem/qshaderdata.h index 4353581af..35f195f88 100644 --- a/src/render/materialsystem/qshaderdata.h +++ b/src/render/materialsystem/qshaderdata.h @@ -55,11 +55,11 @@ public: typedef QSharedPointer<PropertyReaderInterface> PropertyReaderInterfacePtr; -class QT3DRENDERERSHARED_EXPORT QShaderData : public Qt3D::QComponent +class QT3DRENDERERSHARED_EXPORT QShaderData : public Qt3DCore::QComponent { Q_OBJECT public: - explicit QShaderData(Qt3D::QNode *parent = 0); + explicit QShaderData(Qt3DCore::QNode *parent = 0); ~QShaderData(); enum TransformType { @@ -71,8 +71,8 @@ public: PropertyReaderInterfacePtr propertyReader() const; protected: - QShaderData(QShaderDataPrivate &dd, Qt3D::QNode *parent = 0); - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + QShaderData(QShaderDataPrivate &dd, Qt3DCore::QNode *parent = 0); + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: diff --git a/src/render/materialsystem/qshaderdata_p.h b/src/render/materialsystem/qshaderdata_p.h index bb7c677d1..8a0c78e05 100644 --- a/src/render/materialsystem/qshaderdata_p.h +++ b/src/render/materialsystem/qshaderdata_p.h @@ -83,7 +83,7 @@ class QShaderDataPropertyReader: public PropertyReaderInterface } }; -class QT3DRENDERERSHARED_PRIVATE_EXPORT QShaderDataPrivate : public Qt3D::QComponentPrivate +class QT3DRENDERERSHARED_PRIVATE_EXPORT QShaderDataPrivate : public Qt3DCore::QComponentPrivate { public: QShaderDataPrivate(); diff --git a/src/render/materialsystem/qshaderprogram.cpp b/src/render/materialsystem/qshaderprogram.cpp index 6c44ee0ce..e92a77d90 100644 --- a/src/render/materialsystem/qshaderprogram.cpp +++ b/src/render/materialsystem/qshaderprogram.cpp @@ -230,7 +230,7 @@ QByteArray QShaderProgram::shaderCode(ShaderType type) const QByteArray QShaderProgram::loadSource(const QUrl &sourceUrl) { // TO DO: Handle remote path - QString filePath = Qt3D::QUrlHelper::urlToLocalFileOrQrc(sourceUrl); + QString filePath = Qt3DCore::QUrlHelper::urlToLocalFileOrQrc(sourceUrl); QFile f(filePath); if (!f.exists()) diff --git a/src/render/materialsystem/qshaderprogram.h b/src/render/materialsystem/qshaderprogram.h index 6695316ee..c229ad704 100644 --- a/src/render/materialsystem/qshaderprogram.h +++ b/src/render/materialsystem/qshaderprogram.h @@ -46,7 +46,7 @@ namespace Qt3DRender { class QShaderProgramPrivate; -class QT3DRENDERERSHARED_EXPORT QShaderProgram : public Qt3D::QNode +class QT3DRENDERERSHARED_EXPORT QShaderProgram : public Qt3DCore::QNode { Q_OBJECT Q_PROPERTY(QByteArray vertexShaderCode READ vertexShaderCode WRITE setVertexShaderCode NOTIFY vertexShaderCodeChanged) @@ -57,7 +57,7 @@ class QT3DRENDERERSHARED_EXPORT QShaderProgram : public Qt3D::QNode Q_PROPERTY(QByteArray computeShaderCode READ computeShaderCode WRITE setComputeShaderCode NOTIFY computeShaderCodeChanged) public: - explicit QShaderProgram(Qt3D::QNode *parent = 0); + explicit QShaderProgram(Qt3DCore::QNode *parent = 0); ~QShaderProgram(); enum ShaderType { @@ -103,8 +103,8 @@ Q_SIGNALS: void computeShaderCodeChanged(); protected: - QShaderProgram(QShaderProgramPrivate &dd, Qt3D::QNode *parent = 0); - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + QShaderProgram(QShaderProgramPrivate &dd, Qt3DCore::QNode *parent = 0); + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QShaderProgram) diff --git a/src/render/materialsystem/qshaderprogram_p.h b/src/render/materialsystem/qshaderprogram_p.h index 00936f0f2..078091b35 100644 --- a/src/render/materialsystem/qshaderprogram_p.h +++ b/src/render/materialsystem/qshaderprogram_p.h @@ -56,7 +56,7 @@ namespace Qt3DRender { class QShaderProgram; -class QShaderProgramPrivate : public Qt3D::QNodePrivate +class QShaderProgramPrivate : public Qt3DCore::QNodePrivate { public: QShaderProgramPrivate(); diff --git a/src/render/materialsystem/qtechnique.cpp b/src/render/materialsystem/qtechnique.cpp index 52578e267..e80811603 100644 --- a/src/render/materialsystem/qtechnique.cpp +++ b/src/render/materialsystem/qtechnique.cpp @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { diff --git a/src/render/materialsystem/qtechnique.h b/src/render/materialsystem/qtechnique.h index d45892991..4a8863d73 100644 --- a/src/render/materialsystem/qtechnique.h +++ b/src/render/materialsystem/qtechnique.h @@ -52,13 +52,13 @@ class QParameter; class QTechniquePrivate; class QOpenGLFilter; -class QT3DRENDERERSHARED_EXPORT QTechnique : public Qt3D::QNode +class QT3DRENDERERSHARED_EXPORT QTechnique : public Qt3DCore::QNode { Q_OBJECT Q_PROPERTY(Qt3DRender::QOpenGLFilter *openGLFilter READ openGLFilter) public: - explicit QTechnique(Qt3D::QNode *parent = 0); + explicit QTechnique(Qt3DCore::QNode *parent = 0); ~QTechnique(); void addAnnotation(QAnnotation *criterion); @@ -76,8 +76,8 @@ public: QOpenGLFilter *openGLFilter(); protected: - QTechnique(QTechniquePrivate &dd, Qt3D::QNode *parent = 0); - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + QTechnique(QTechniquePrivate &dd, Qt3DCore::QNode *parent = 0); + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QTechnique) diff --git a/src/render/materialsystem/qtechnique_p.h b/src/render/materialsystem/qtechnique_p.h index 794ce76df..669a75a56 100644 --- a/src/render/materialsystem/qtechnique_p.h +++ b/src/render/materialsystem/qtechnique_p.h @@ -61,7 +61,7 @@ class QAnnotation; class QParameter; class QRenderPass; -class QT3DRENDERERSHARED_EXPORT QTechniquePrivate : public Qt3D::QNodePrivate +class QT3DRENDERERSHARED_EXPORT QTechniquePrivate : public Qt3DCore::QNodePrivate { public: QTechniquePrivate(); diff --git a/src/render/materialsystem/renderpass.cpp b/src/render/materialsystem/renderpass.cpp index b64b8682d..cdbf92126 100644 --- a/src/render/materialsystem/renderpass.cpp +++ b/src/render/materialsystem/renderpass.cpp @@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { namespace Render { @@ -68,7 +68,7 @@ void RenderPass::cleanup() { } -void RenderPass::updateFromPeer(Qt3D::QNode *peer) +void RenderPass::updateFromPeer(Qt3DCore::QNode *peer) { QRenderPass *pass = static_cast<QRenderPass *>(peer); @@ -88,7 +88,7 @@ void RenderPass::updateFromPeer(Qt3D::QNode *peer) m_parameterPack.appendParameter(p->id()); } -void RenderPass::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) +void RenderPass::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); switch (e->type()) { @@ -130,7 +130,7 @@ void RenderPass::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) } } -Qt3D::QNodeId RenderPass::shaderProgram() const +Qt3DCore::QNodeId RenderPass::shaderProgram() const { return m_shaderUuid; } @@ -140,7 +140,7 @@ QList<ParameterMapping> RenderPass::bindings() const return m_bindings.values(); } -QList<Qt3D::QNodeId> RenderPass::annotations() const +QList<Qt3DCore::QNodeId> RenderPass::annotations() const { return m_annotationList; } @@ -150,18 +150,18 @@ QList<RenderState *> RenderPass::renderStates() const return m_renderStates.values(); } -QList<Qt3D::QNodeId> RenderPass::parameters() const +QList<Qt3DCore::QNodeId> RenderPass::parameters() const { return m_parameterPack.parameters(); } -void RenderPass::appendAnnotation(const Qt3D::QNodeId &annotationId) +void RenderPass::appendAnnotation(const Qt3DCore::QNodeId &annotationId) { if (!m_annotationList.contains(annotationId)) m_annotationList.append(annotationId); } -void RenderPass::removeAnnotation(const Qt3D::QNodeId &annotationId) +void RenderPass::removeAnnotation(const Qt3DCore::QNodeId &annotationId) { m_annotationList.removeOne(annotationId); } @@ -172,18 +172,18 @@ void RenderPass::appendBinding(const ParameterMapping &binding) m_bindings[binding.id()] = binding; } -void RenderPass::removeBinding(const Qt3D::QNodeId &bindingId) +void RenderPass::removeBinding(const Qt3DCore::QNodeId &bindingId) { m_bindings.remove(bindingId); } -void RenderPass::appendRenderState(const Qt3D::QNodeId &id, RenderState *renderState) +void RenderPass::appendRenderState(const Qt3DCore::QNodeId &id, RenderState *renderState) { if (!m_renderStates.contains(id)) m_renderStates[id] = renderState; } -void RenderPass::removeRenderState(const Qt3D::QNodeId &renderStateId) +void RenderPass::removeRenderState(const Qt3DCore::QNodeId &renderStateId) { m_renderStates.remove(renderStateId); } diff --git a/src/render/materialsystem/renderpass_p.h b/src/render/materialsystem/renderpass_p.h index 70f3fdf25..2d5a2a6d8 100644 --- a/src/render/materialsystem/renderpass_p.h +++ b/src/render/materialsystem/renderpass_p.h @@ -71,7 +71,7 @@ namespace Render { class RenderPassManager; class RenderState; -class Q_AUTOTEST_EXPORT RenderPass : public Qt3D::QBackendNode +class Q_AUTOTEST_EXPORT RenderPass : public Qt3DCore::QBackendNode { public: RenderPass(); @@ -79,29 +79,29 @@ 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; - Qt3D::QNodeId shaderProgram() const; + Qt3DCore::QNodeId shaderProgram() const; QList<ParameterMapping> bindings() const; - QList<Qt3D::QNodeId> annotations() const; + QList<Qt3DCore::QNodeId> annotations() const; QList<RenderState *> renderStates() const; - QList<Qt3D::QNodeId> parameters() const; + QList<Qt3DCore::QNodeId> parameters() const; private: - void appendAnnotation(const Qt3D::QNodeId &criterionId); - void removeAnnotation(const Qt3D::QNodeId &criterionId); + void appendAnnotation(const Qt3DCore::QNodeId &criterionId); + void removeAnnotation(const Qt3DCore::QNodeId &criterionId); void appendBinding(const ParameterMapping &binding); - void removeBinding(const Qt3D::QNodeId &bindingId); + void removeBinding(const Qt3DCore::QNodeId &bindingId); - void appendRenderState(const Qt3D::QNodeId &id, RenderState *renderState); - void removeRenderState(const Qt3D::QNodeId &renderStateId); + void appendRenderState(const Qt3DCore::QNodeId &id, RenderState *renderState); + void removeRenderState(const Qt3DCore::QNodeId &renderStateId); - Qt3D::QNodeId m_shaderUuid; - QHash<Qt3D::QNodeId, ParameterMapping> m_bindings; - QHash<Qt3D::QNodeId, RenderState *> m_renderStates; - QList<Qt3D::QNodeId> m_annotationList; + Qt3DCore::QNodeId m_shaderUuid; + QHash<Qt3DCore::QNodeId, ParameterMapping> m_bindings; + QHash<Qt3DCore::QNodeId, RenderState *> m_renderStates; + QList<Qt3DCore::QNodeId> m_annotationList; ParameterPack m_parameterPack; }; diff --git a/src/render/materialsystem/shader.cpp b/src/render/materialsystem/shader.cpp index 1a600bfbe..f52d01543 100644 --- a/src/render/materialsystem/shader.cpp +++ b/src/render/materialsystem/shader.cpp @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { namespace Render { @@ -85,7 +85,7 @@ void Shader::cleanup() m_uniformBlocks.clear(); } -void Shader::updateFromPeer(Qt3D::QNode *peer) +void Shader::updateFromPeer(Qt3DCore::QNode *peer) { QShaderProgram *shader = static_cast<QShaderProgram *>(peer); @@ -122,7 +122,7 @@ QVector<QByteArray> Shader::shaderCode() const return m_shaderCode; } -void Shader::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) +void Shader::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { if (e->type() == NodeUpdated) { QScenePropertyChangePtr propertyChange = e.staticCast<QScenePropertyChange>(); diff --git a/src/render/materialsystem/shader_p.h b/src/render/materialsystem/shader_p.h index fccef6ccd..3dd9570ac 100644 --- a/src/render/materialsystem/shader_p.h +++ b/src/render/materialsystem/shader_p.h @@ -69,7 +69,7 @@ class AttachmentPack; typedef uint ProgramDNA; -class Q_AUTOTEST_EXPORT Shader : public Qt3D::QBackendNode +class Q_AUTOTEST_EXPORT Shader : public Qt3DCore::QBackendNode { public: Shader(); @@ -77,7 +77,7 @@ public: void cleanup(); - void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE; + void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE; void updateUniforms(GraphicsContext *ctx, const QUniformPack &pack); void setFragOutputs(const QHash<QString, int> &fragOutputs); @@ -86,7 +86,7 @@ public: QVector<QString> uniformBlockNames() const; QVector<QByteArray> shaderCode() const; - void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; bool isLoaded() const; ProgramDNA dna() const; diff --git a/src/render/materialsystem/shaderdata.cpp b/src/render/materialsystem/shaderdata.cpp index 743ea1c60..6338df96b 100644 --- a/src/render/materialsystem/shaderdata.cpp +++ b/src/render/materialsystem/shaderdata.cpp @@ -47,12 +47,12 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { namespace Render { -QList<Qt3D::QNodeId> ShaderData::m_updatedShaderData; +QList<Qt3DCore::QNodeId> ShaderData::m_updatedShaderData; ShaderData::ShaderData() : QBackendNode() @@ -66,7 +66,7 @@ ShaderData::~ShaderData() delete m_mutex; } -void ShaderData::updateFromPeer(Qt3D::QNode *peer) +void ShaderData::updateFromPeer(Qt3DCore::QNode *peer) { m_properties.clear(); const QShaderData *shaderData = static_cast<const QShaderData *>(peer); @@ -190,7 +190,7 @@ void ShaderData::addToClearUpdateList() ShaderData::m_updatedShaderData.append(peerUuid()); } -const int qNodeIdTypeId = qMetaTypeId<Qt3D::QNodeId>(); +const int qNodeIdTypeId = qMetaTypeId<Qt3DCore::QNodeId>(); void ShaderData::readPeerProperties(QShaderData *shaderData) { @@ -240,7 +240,7 @@ void ShaderData::setManager(ShaderDataManager *manager) m_manager = manager; } -void ShaderData::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) +void ShaderData::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { if (!m_propertyReader.isNull()) { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); @@ -290,7 +290,7 @@ RenderShaderDataFunctor::RenderShaderDataFunctor(ShaderDataManager *manager) { } -Qt3D::QBackendNode *RenderShaderDataFunctor::create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const +Qt3DCore::QBackendNode *RenderShaderDataFunctor::create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const { ShaderData *backend = m_manager->getOrCreateResource(frontend->id()); backend->setFactory(factory); @@ -299,12 +299,12 @@ Qt3D::QBackendNode *RenderShaderDataFunctor::create(Qt3D::QNode *frontend, const return backend; } -Qt3D::QBackendNode *RenderShaderDataFunctor::get(const Qt3D::QNodeId &id) const +Qt3DCore::QBackendNode *RenderShaderDataFunctor::get(const Qt3DCore::QNodeId &id) const { return m_manager->lookupResource(id); } -void RenderShaderDataFunctor::destroy(const Qt3D::QNodeId &id) const +void RenderShaderDataFunctor::destroy(const Qt3DCore::QNodeId &id) const { m_manager->releaseResource(id); } diff --git a/src/render/materialsystem/shaderdata_p.h b/src/render/materialsystem/shaderdata_p.h index ebc6cec4b..c87196776 100644 --- a/src/render/materialsystem/shaderdata_p.h +++ b/src/render/materialsystem/shaderdata_p.h @@ -64,18 +64,18 @@ class GraphicsContext; class UniformBuffer; class ShaderDataManager; -class Q_AUTOTEST_EXPORT ShaderData : public Qt3D::QBackendNode +class Q_AUTOTEST_EXPORT ShaderData : public Qt3DCore::QBackendNode { public: ShaderData(); ~ShaderData(); - void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE; + void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE; inline QHash<QString, QVariant> properties() const { return m_properties; } inline QHash<QString, QVariant> updatedProperties() const { return m_updatedProperties; } // Called by cleanup job - inline static QList<Qt3D::QNodeId> updatedShaderDataList() { return m_updatedShaderData; } + inline static QList<Qt3DCore::QNodeId> updatedShaderDataList() { return m_updatedShaderData; } inline static void clearShaderDataList() { return m_updatedShaderData.clear(); } void clearUpdate(); @@ -86,7 +86,7 @@ public: void updateTransformedProperties(const QMatrix4x4 &nodeWordlTransform); protected: - void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; private: // 1 to 1 match with frontend properties, modified only by sceneChangeEvent @@ -102,7 +102,7 @@ private: QHash<QString, QShaderData::TransformType> m_transformedProperties; ShaderDataManager *m_manager; QMutex *m_mutex; - static QList<Qt3D::QNodeId> m_updatedShaderData; + static QList<Qt3DCore::QNodeId> m_updatedShaderData; QMatrix4x4 m_worldMatrix; QMatrix4x4 m_viewMatrix; @@ -112,14 +112,14 @@ private: friend class RenderShaderDataFunctor; }; -class RenderShaderDataFunctor : public Qt3D::QBackendNodeFunctor +class RenderShaderDataFunctor : public Qt3DCore::QBackendNodeFunctor { public: explicit RenderShaderDataFunctor(ShaderDataManager *manager); - Qt3D::QBackendNode *create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const Q_DECL_FINAL; - Qt3D::QBackendNode *get(const Qt3D::QNodeId &id) const Q_DECL_FINAL; - void destroy(const Qt3D::QNodeId &id) const Q_DECL_FINAL; + Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const Q_DECL_FINAL; + Qt3DCore::QBackendNode *get(const Qt3DCore::QNodeId &id) const Q_DECL_FINAL; + void destroy(const Qt3DCore::QNodeId &id) const Q_DECL_FINAL; private: ShaderDataManager *m_manager; diff --git a/src/render/materialsystem/technique.cpp b/src/render/materialsystem/technique.cpp index a3315f30e..ac2e4554c 100644 --- a/src/render/materialsystem/technique.cpp +++ b/src/render/materialsystem/technique.cpp @@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { namespace Render { @@ -72,7 +72,7 @@ void Technique::cleanup() { } -void Technique::updateFromPeer(Qt3D::QNode *peer) +void Technique::updateFromPeer(Qt3DCore::QNode *peer) { m_parameterPack.clear(); m_renderPasses.clear(); @@ -94,7 +94,7 @@ void Technique::updateFromPeer(Qt3D::QNode *peer) } } -void Technique::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) +void Technique::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); switch (e->type()) { @@ -141,28 +141,28 @@ void Technique::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) } } -QList<Qt3D::QNodeId> Technique::parameters() const +QList<Qt3DCore::QNodeId> Technique::parameters() const { return m_parameterPack.parameters(); } -void Technique::appendRenderPass(const Qt3D::QNodeId &renderPassId) +void Technique::appendRenderPass(const Qt3DCore::QNodeId &renderPassId) { if (!m_renderPasses.contains(renderPassId)) m_renderPasses.append(renderPassId); } -void Technique::removeRenderPass(const Qt3D::QNodeId &renderPassId) +void Technique::removeRenderPass(const Qt3DCore::QNodeId &renderPassId) { m_renderPasses.removeOne(renderPassId); } -QList<Qt3D::QNodeId> Technique::annotations() const +QList<Qt3DCore::QNodeId> Technique::annotations() const { return m_annotationList; } -QList<Qt3D::QNodeId> Technique::renderPasses() const +QList<Qt3DCore::QNodeId> Technique::renderPasses() const { return m_renderPasses; } @@ -172,13 +172,13 @@ QOpenGLFilter *Technique::openGLFilter() const return m_openglFilter; } -void Technique::appendAnnotation(const Qt3D::QNodeId &criterionId) +void Technique::appendAnnotation(const Qt3DCore::QNodeId &criterionId) { if (!m_annotationList.contains(criterionId)) m_annotationList.append(criterionId); } -void Technique::removeAnnotation(const Qt3D::QNodeId &criterionId) +void Technique::removeAnnotation(const Qt3DCore::QNodeId &criterionId) { m_annotationList.removeOne(criterionId); } diff --git a/src/render/materialsystem/technique_p.h b/src/render/materialsystem/technique_p.h index d4c8303ab..77c96d4f0 100644 --- a/src/render/materialsystem/technique_p.h +++ b/src/render/materialsystem/technique_p.h @@ -69,34 +69,34 @@ namespace Render { class TechniqueManager; -class Technique : public Qt3D::QBackendNode +class Technique : public Qt3DCore::QBackendNode { public: Technique(); ~Technique(); void cleanup(); - void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE; + void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE; - void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; - QList<Qt3D::QNodeId> parameters() const; + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; + QList<Qt3DCore::QNodeId> parameters() const; - void appendRenderPass(const Qt3D::QNodeId &renderPassId); - void removeRenderPass(const Qt3D::QNodeId &renderPassId); + void appendRenderPass(const Qt3DCore::QNodeId &renderPassId); + void removeRenderPass(const Qt3DCore::QNodeId &renderPassId); - void appendAnnotation(const Qt3D::QNodeId &criterionId); - void removeAnnotation(const Qt3D::QNodeId &criterionId); + void appendAnnotation(const Qt3DCore::QNodeId &criterionId); + void removeAnnotation(const Qt3DCore::QNodeId &criterionId); - QList<Qt3D::QNodeId> annotations() const; - QList<Qt3D::QNodeId> renderPasses() const; + QList<Qt3DCore::QNodeId> annotations() const; + QList<Qt3DCore::QNodeId> renderPasses() const; QOpenGLFilter *openGLFilter() const; private: QOpenGLFilter *m_openglFilter; ParameterPack m_parameterPack; - QList<Qt3D::QNodeId> m_annotationList; - QList<Qt3D::QNodeId> m_renderPasses; + QList<Qt3DCore::QNodeId> m_annotationList; + QList<Qt3DCore::QNodeId> m_renderPasses; }; } // namespace Render diff --git a/src/render/renderstates/qalphacoverage.h b/src/render/renderstates/qalphacoverage.h index 753b28919..5ba0a5506 100644 --- a/src/render/renderstates/qalphacoverage.h +++ b/src/render/renderstates/qalphacoverage.h @@ -50,7 +50,7 @@ class QT3DRENDERERSHARED_EXPORT QAlphaCoverage : public QRenderState { Q_OBJECT public: - explicit QAlphaCoverage(Qt3D::QNode *parent = 0); + explicit QAlphaCoverage(Qt3DCore::QNode *parent = 0); ~QAlphaCoverage(); private: diff --git a/src/render/renderstates/qalphatest.h b/src/render/renderstates/qalphatest.h index d59340ec7..44d107529 100644 --- a/src/render/renderstates/qalphatest.h +++ b/src/render/renderstates/qalphatest.h @@ -65,7 +65,7 @@ public: }; Q_ENUM(AlphaFunc) - explicit QAlphaTest(Qt3D::QNode *parent = 0); + explicit QAlphaTest(Qt3DCore::QNode *parent = 0); ~QAlphaTest(); AlphaFunc func() const; @@ -79,7 +79,7 @@ Q_SIGNALS: void clampChanged(); protected: - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QAlphaTest) diff --git a/src/render/renderstates/qblendequation.h b/src/render/renderstates/qblendequation.h index 94735fdb6..e6ca15fb7 100644 --- a/src/render/renderstates/qblendequation.h +++ b/src/render/renderstates/qblendequation.h @@ -62,7 +62,7 @@ public: }; Q_ENUM(BlendMode) - explicit QBlendEquation(Qt3D::QNode *parent = 0); + explicit QBlendEquation(Qt3DCore::QNode *parent = 0); ~QBlendEquation(); BlendMode mode() const; @@ -72,7 +72,7 @@ Q_SIGNALS: void modeChanged(); protected: - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QBlendEquation) diff --git a/src/render/renderstates/qblendstate.cpp b/src/render/renderstates/qblendstate.cpp index 7f7a8d680..76e945372 100644 --- a/src/render/renderstates/qblendstate.cpp +++ b/src/render/renderstates/qblendstate.cpp @@ -65,7 +65,7 @@ public: }; /*! - \class Qt3D::QBlendState + \class Qt3DCore::QBlendState \inmodule Qt3DRenderer \since 5.5 \brief Encapsulates blending information. @@ -73,7 +73,7 @@ public: /*! \qmltype BlendState - \instantiates Qt3D::QBlendState + \instantiates Qt3DCore::QBlendState \inherits RenderState \inqmlmodule Qt3D.Renderer \since 5.5 @@ -116,7 +116,7 @@ QBlendState::QBlendState(QRenderState::Type type, QNode *parent) } /*! - \enum Qt3D::QBlendState::Blending + \enum Qt3DCore::QBlendState::Blending \value Zero 0 \value One 1 @@ -145,7 +145,7 @@ QBlendState::QBlendState(QRenderState::Type type, QNode *parent) */ /*! - \property Qt3D::QBlendState::srcRGB + \property Qt3DCore::QBlendState::srcRGB */ QBlendState::Blending QBlendState::srcRGB() const @@ -169,7 +169,7 @@ void QBlendState::setSrcRGB(QBlendState::Blending srcRGB) */ /*! - \property Qt3D::QBlendState::dstRGB + \property Qt3DCore::QBlendState::dstRGB */ QBlendState::Blending QBlendState::dstRGB() const @@ -193,7 +193,7 @@ void QBlendState::setDstRGB(QBlendState::Blending dstRGB) */ /*! - \property Qt3D::QBlendState::srcAlpha + \property Qt3DCore::QBlendState::srcAlpha */ QBlendState::Blending QBlendState::srcAlpha() const @@ -217,7 +217,7 @@ void QBlendState::setSrcAlpha(QBlendState::Blending srcAlpha) */ /*! - \property Qt3D::QBlendState::dstAlpha + \property Qt3DCore::QBlendState::dstAlpha */ QBlendState::Blending QBlendState::dstAlpha() const @@ -244,7 +244,7 @@ void QBlendState::setDstAlpha(QBlendState::Blending dstAlpha) /*! \qmltype BlendStateSeparate - \instantiates Qt3D::QBlendStateSeparate + \instantiates Qt3DCore::QBlendStateSeparate \inherits RenderState \inqmlmodule Qt3D.Renderer \since 5.5 diff --git a/src/render/renderstates/qblendstate.h b/src/render/renderstates/qblendstate.h index 25072f449..2ae8b06bc 100644 --- a/src/render/renderstates/qblendstate.h +++ b/src/render/renderstates/qblendstate.h @@ -80,7 +80,7 @@ public: }; Q_ENUM(Blending) - explicit QBlendState(Qt3D::QNode *parent = 0); + explicit QBlendState(Qt3DCore::QNode *parent = 0); ~QBlendState(); Blending srcRGB() const; @@ -102,8 +102,8 @@ Q_SIGNALS: void dstAlphaChanged(); protected: - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; - QBlendState(QRenderState::Type type, Qt3D::QNode *parent = 0); + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; + QBlendState(QRenderState::Type type, Qt3DCore::QNode *parent = 0); private: Q_DECLARE_PRIVATE(QBlendState) @@ -114,7 +114,7 @@ class QT3DRENDERERSHARED_EXPORT QBlendStateSeparate : public QBlendState { Q_OBJECT public: - explicit QBlendStateSeparate(Qt3D::QNode *parent = 0); + explicit QBlendStateSeparate(Qt3DCore::QNode *parent = 0); }; } // namespace Qt3DRender diff --git a/src/render/renderstates/qclipplane.cpp b/src/render/renderstates/qclipplane.cpp index d3f2fadb3..eb327c0e4 100644 --- a/src/render/renderstates/qclipplane.cpp +++ b/src/render/renderstates/qclipplane.cpp @@ -53,21 +53,21 @@ public: }; /*! - \class Qt3D::QClipPlane + \class Qt3DCore::QClipPlane \inmodule Qt3DRenderer \since 5.5 \brief Enables an additional OpenGL clipping plane that can be in shaders using gl_ClipDistance By default, OpenGL supports up to 8 additional clipping planes. - Qt3D::QClipPlane allows to enable one of these additional planes. These + Qt3DCore::QClipPlane allows to enable one of these additional planes. These planes can then be manipulated in the shaders using gl_ClipDistance[i] where i varies between 0 and 8. */ /*! \qmltype ClipPlane - \instantiates Qt3D::QClipPlane + \instantiates Qt3DCore::QClipPlane \inherits RenderState \inqmlmodule Qt3D.Renderer \since 5.5 diff --git a/src/render/renderstates/qclipplane.h b/src/render/renderstates/qclipplane.h index 7afa6c5e7..40ebfd9a5 100644 --- a/src/render/renderstates/qclipplane.h +++ b/src/render/renderstates/qclipplane.h @@ -50,14 +50,14 @@ class QT3DRENDERERSHARED_EXPORT QClipPlane : public QRenderState Q_OBJECT Q_PROPERTY(int plane READ plane WRITE setPlane NOTIFY planeChanged) public: - explicit QClipPlane(Qt3D::QNode *parent = 0); + explicit QClipPlane(Qt3DCore::QNode *parent = 0); ~QClipPlane(); int plane() const; void setPlane(int); protected: - void copy(const Qt3D::QNode *ref) Q_DECL_FINAL; + void copy(const Qt3DCore::QNode *ref) Q_DECL_FINAL; Q_SIGNALS: void planeChanged(); diff --git a/src/render/renderstates/qcolormask.cpp b/src/render/renderstates/qcolormask.cpp index 9f61825ea..e52a5d067 100644 --- a/src/render/renderstates/qcolormask.cpp +++ b/src/render/renderstates/qcolormask.cpp @@ -61,7 +61,7 @@ public: }; /*! - \class Qt3D::QColorMask + \class Qt3DCore::QColorMask \inmodule Qt3DRenderer \brief Allows specifying which color components should be written to the @@ -75,7 +75,7 @@ public: /*! - Constructs a new Qt3D::QColorMask instance with \a parent as parent. + Constructs a new Qt3DCore::QColorMask instance with \a parent as parent. */ QColorMask::QColorMask(QNode *parent) : QRenderState(*new QColorMaskPrivate, parent) @@ -112,7 +112,7 @@ bool QColorMask::isAlpha() const } /*! - \property Qt3D::QColorMask::red + \property Qt3DCore::QColorMask::red Holds whether the red color component should be written to the frame buffer. */ void QColorMask::setRed(bool red) @@ -125,7 +125,7 @@ void QColorMask::setRed(bool red) } /*! - \property Qt3D::QColorMask::green + \property Qt3DCore::QColorMask::green Holds whether the green color component should be written to the frame buffer. */ void QColorMask::setGreen(bool green) @@ -138,7 +138,7 @@ void QColorMask::setGreen(bool green) } /*! - \property Qt3D::QColorMask::blue + \property Qt3DCore::QColorMask::blue Holds whether the blue color component should be written to the frame buffer. */ void QColorMask::setBlue(bool blue) @@ -151,7 +151,7 @@ void QColorMask::setBlue(bool blue) } /*! - \property Qt3D::QColorMask::alpha + \property Qt3DCore::QColorMask::alpha Holds whether the alpha component should be written to the frame buffer. */ void QColorMask::setAlpha(bool alpha) diff --git a/src/render/renderstates/qcolormask.h b/src/render/renderstates/qcolormask.h index 886feebbb..fcbfac88b 100644 --- a/src/render/renderstates/qcolormask.h +++ b/src/render/renderstates/qcolormask.h @@ -54,7 +54,7 @@ class QT3DRENDERERSHARED_EXPORT QColorMask : public QRenderState Q_PROPERTY(bool alpha READ isAlpha WRITE setAlpha NOTIFY alphaChanged) public: - explicit QColorMask(Qt3D::QNode *parent = Q_NULLPTR); + explicit QColorMask(Qt3DCore::QNode *parent = Q_NULLPTR); ~QColorMask(); bool isRed() const; @@ -74,7 +74,7 @@ Q_SIGNALS: void alphaChanged(); protected: - void copy(const Qt3D::QNode *ref) Q_DECL_FINAL; + void copy(const Qt3DCore::QNode *ref) Q_DECL_FINAL; private: Q_DECLARE_PRIVATE(QColorMask) diff --git a/src/render/renderstates/qcullface.h b/src/render/renderstates/qcullface.h index d8832bcd6..d6329d205 100644 --- a/src/render/renderstates/qcullface.h +++ b/src/render/renderstates/qcullface.h @@ -62,7 +62,7 @@ public: }; Q_ENUM(CullingMode) - explicit QCullFace(Qt3D::QNode *parent = 0); + explicit QCullFace(Qt3DCore::QNode *parent = 0); ~QCullFace(); CullingMode mode() const; @@ -72,7 +72,7 @@ Q_SIGNALS: void modeChanged(); protected: - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QCullFace) diff --git a/src/render/renderstates/qdepthmask.h b/src/render/renderstates/qdepthmask.h index fdd02b4d3..8d0ea920a 100644 --- a/src/render/renderstates/qdepthmask.h +++ b/src/render/renderstates/qdepthmask.h @@ -51,7 +51,7 @@ class QT3DRENDERERSHARED_EXPORT QDepthMask : public QRenderState Q_OBJECT Q_PROPERTY (bool mask READ mask WRITE setMask NOTIFY maskChanged) public: - explicit QDepthMask(Qt3D::QNode *parent = 0); + explicit QDepthMask(Qt3DCore::QNode *parent = 0); ~QDepthMask(); bool mask() const; @@ -61,7 +61,7 @@ Q_SIGNALS: void maskChanged(); protected: - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QDepthMask) diff --git a/src/render/renderstates/qdepthtest.h b/src/render/renderstates/qdepthtest.h index e9b4275b6..bedec55e3 100644 --- a/src/render/renderstates/qdepthtest.h +++ b/src/render/renderstates/qdepthtest.h @@ -64,7 +64,7 @@ public: }; Q_ENUM(DepthFunc) - explicit QDepthTest(Qt3D::QNode *parent = 0); + explicit QDepthTest(Qt3DCore::QNode *parent = 0); ~QDepthTest(); DepthFunc func() const; @@ -74,7 +74,7 @@ Q_SIGNALS: void funcChanged(); protected: - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QDepthTest) diff --git a/src/render/renderstates/qdithering.h b/src/render/renderstates/qdithering.h index 37794e372..6fcf83786 100644 --- a/src/render/renderstates/qdithering.h +++ b/src/render/renderstates/qdithering.h @@ -50,7 +50,7 @@ class QT3DRENDERERSHARED_EXPORT QDithering : public QRenderState { Q_OBJECT public: - explicit QDithering(Qt3D::QNode *parent = 0); + explicit QDithering(Qt3DCore::QNode *parent = 0); ~QDithering(); private: diff --git a/src/render/renderstates/qfrontface.h b/src/render/renderstates/qfrontface.h index 0a2c8cac9..95fe3f0c5 100644 --- a/src/render/renderstates/qfrontface.h +++ b/src/render/renderstates/qfrontface.h @@ -59,7 +59,7 @@ public: }; Q_ENUM(FaceDir) - explicit QFrontFace(Qt3D::QNode *parent = 0); + explicit QFrontFace(Qt3DCore::QNode *parent = 0); ~QFrontFace(); FaceDir direction() const; @@ -69,7 +69,7 @@ Q_SIGNALS: void directionChanged(); protected: - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QFrontFace) diff --git a/src/render/renderstates/qpolygonoffset.h b/src/render/renderstates/qpolygonoffset.h index 9aff94a1f..dde7dca43 100644 --- a/src/render/renderstates/qpolygonoffset.h +++ b/src/render/renderstates/qpolygonoffset.h @@ -52,7 +52,7 @@ class QT3DRENDERERSHARED_EXPORT QPolygonOffset : public QRenderState Q_PROPERTY(float factor READ factor WRITE setFactor NOTIFY factorChanged) Q_PROPERTY(float units READ units WRITE setUnits NOTIFY unitsChanged) public: - explicit QPolygonOffset(Qt3D::QNode *parent = Q_NULLPTR); + explicit QPolygonOffset(Qt3DCore::QNode *parent = Q_NULLPTR); ~QPolygonOffset(); float factor() const; @@ -66,7 +66,7 @@ Q_SIGNALS: void unitsChanged(float newUnits); protected: - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QPolygonOffset) diff --git a/src/render/renderstates/qrenderstate.cpp b/src/render/renderstates/qrenderstate.cpp index 831962ca4..821ec7e9e 100644 --- a/src/render/renderstates/qrenderstate.cpp +++ b/src/render/renderstates/qrenderstate.cpp @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { /*! - \class Qt3D::QRenderStatePrivate + \class Qt3DCore::QRenderStatePrivate \internal */ QRenderStatePrivate::QRenderStatePrivate(QRenderState::Type type) @@ -54,7 +54,7 @@ QRenderStatePrivate::QRenderStatePrivate(QRenderState::Type type) QRenderState::~QRenderState() { - Q_ASSERT_X(Qt3D::QNodePrivate::get(this)->m_wasCleanedUp, Q_FUNC_INFO, "QNode::cleanup should have been called by now. A Qt3DRender::QRenderState subclass didn't call QNode::cleanup in its destructor"); + Q_ASSERT_X(Qt3DCore::QNodePrivate::get(this)->m_wasCleanedUp, Q_FUNC_INFO, "QNode::cleanup should have been called by now. A Qt3DRender::QRenderState subclass didn't call QNode::cleanup in its destructor"); } QRenderState::Type QRenderState::type() const diff --git a/src/render/renderstates/qrenderstate.h b/src/render/renderstates/qrenderstate.h index 6f730a432..790c89e83 100644 --- a/src/render/renderstates/qrenderstate.h +++ b/src/render/renderstates/qrenderstate.h @@ -47,7 +47,7 @@ namespace Qt3DRender { class QRenderStatePrivate; -class QT3DRENDERERSHARED_EXPORT QRenderState : public Qt3D::QNode +class QT3DRENDERERSHARED_EXPORT QRenderState : public Qt3DCore::QNode { Q_OBJECT @@ -78,7 +78,7 @@ public: Type type() const; protected: - QRenderState(QRenderStatePrivate &dd, Qt3D::QNode *parent = Q_NULLPTR); + QRenderState(QRenderStatePrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR); private: Q_DECLARE_PRIVATE(QRenderState) diff --git a/src/render/renderstates/qrenderstate_p.h b/src/render/renderstates/qrenderstate_p.h index 261629e8b..ed22d5d92 100644 --- a/src/render/renderstates/qrenderstate_p.h +++ b/src/render/renderstates/qrenderstate_p.h @@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QRenderStatePrivate : public Qt3D::QNodePrivate +class QRenderStatePrivate : public Qt3DCore::QNodePrivate { public: QRenderStatePrivate(QRenderState::Type type); diff --git a/src/render/renderstates/qscissortest.h b/src/render/renderstates/qscissortest.h index a607bcd72..2e09fff64 100644 --- a/src/render/renderstates/qscissortest.h +++ b/src/render/renderstates/qscissortest.h @@ -55,7 +55,7 @@ class QT3DRENDERERSHARED_EXPORT QScissorTest : public QRenderState Q_PROPERTY(int height READ height WRITE setHeight NOTIFY heightChanged) public: - explicit QScissorTest(Qt3D::QNode *parent = 0); + explicit QScissorTest(Qt3DCore::QNode *parent = 0); ~QScissorTest(); int left() const; @@ -77,7 +77,7 @@ Q_SIGNALS: void heightChanged(); protected: - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QScissorTest) diff --git a/src/render/renderstates/qstencilmask.h b/src/render/renderstates/qstencilmask.h index 6e11cff68..b4414e148 100644 --- a/src/render/renderstates/qstencilmask.h +++ b/src/render/renderstates/qstencilmask.h @@ -51,7 +51,7 @@ class QT3DRENDERERSHARED_EXPORT QStencilMask : public QRenderState Q_PROPERTY(uint frontMask READ frontMask WRITE setFrontMask NOTIFY frontMaskChanged) Q_PROPERTY(uint backMask READ backMask WRITE setBackMask NOTIFY backMaskChanged) public: - explicit QStencilMask(Qt3D::QNode *parent = 0); + explicit QStencilMask(Qt3DCore::QNode *parent = 0); ~QStencilMask(); void setFrontMask(uint mask); @@ -64,7 +64,7 @@ Q_SIGNALS: void backMaskChanged(); protected: - void copy(const Qt3D::QNode *ref) Q_DECL_FINAL; + void copy(const Qt3DCore::QNode *ref) Q_DECL_FINAL; private: Q_DECLARE_PRIVATE(QStencilMask) diff --git a/src/render/renderstates/qstencilop.h b/src/render/renderstates/qstencilop.h index bc212af48..881ea1354 100644 --- a/src/render/renderstates/qstencilop.h +++ b/src/render/renderstates/qstencilop.h @@ -53,14 +53,14 @@ class QT3DRENDERERSHARED_EXPORT QStencilOp : public QRenderState Q_PROPERTY(Qt3DRender::QStencilOpSeparate *back READ back CONSTANT) public: - explicit QStencilOp(Qt3D::QNode *parent = 0); + explicit QStencilOp(Qt3DCore::QNode *parent = 0); ~QStencilOp(); QStencilOpSeparate *front() const; QStencilOpSeparate *back() const; protected: - void copy(const Qt3D::QNode *ref) Q_DECL_FINAL; + void copy(const Qt3DCore::QNode *ref) Q_DECL_FINAL; private: Q_DECLARE_PRIVATE(QStencilOp) diff --git a/src/render/renderstates/qstenciltest.h b/src/render/renderstates/qstenciltest.h index 51469f69c..2c538d186 100644 --- a/src/render/renderstates/qstenciltest.h +++ b/src/render/renderstates/qstenciltest.h @@ -54,14 +54,14 @@ class QT3DRENDERERSHARED_EXPORT QStencilTest : public QRenderState Q_PROPERTY(Qt3DRender::QStencilTestSeparate *back READ back CONSTANT) public: - explicit QStencilTest(Qt3D::QNode *parent = 0); + explicit QStencilTest(Qt3DCore::QNode *parent = 0); ~QStencilTest(); QStencilTestSeparate *front() const; QStencilTestSeparate *back() const; protected: - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QStencilTest) diff --git a/src/render/services/qraycastingservice.cpp b/src/render/services/qraycastingservice.cpp index ccfbb34a6..68907b8b5 100644 --- a/src/render/services/qraycastingservice.cpp +++ b/src/render/services/qraycastingservice.cpp @@ -48,12 +48,12 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { -QCollisionQueryResult QRayCastingServicePrivate::collides(const Qt3D::QRay3D &ray, Qt3D::QBoundingVolumeProvider *provider, - Qt3D::QAbstractCollisionQueryService::QueryMode mode, const Qt3D::QQueryHandle &handle) +QCollisionQueryResult QRayCastingServicePrivate::collides(const Qt3DCore::QRay3D &ray, Qt3DCore::QBoundingVolumeProvider *provider, + Qt3DCore::QAbstractCollisionQueryService::QueryMode mode, const Qt3DCore::QQueryHandle &handle) { Q_Q(QRayCastingService); @@ -97,13 +97,13 @@ QRayCastingServicePrivate::QRayCastingServicePrivate(const QString &description, { } -QRayCastingService::QRayCastingService(Qt3D::QBoundingVolumeProvider *provider) +QRayCastingService::QRayCastingService(Qt3DCore::QBoundingVolumeProvider *provider) : QAbstractCollisionQueryService(*new QRayCastingServicePrivate(QStringLiteral("Collision detection service using Ray Casting"), provider)) { } -Qt3D::QQueryHandle QRayCastingService::query(const Qt3D::QRay3D &ray, QAbstractCollisionQueryService::QueryMode mode) +Qt3DCore::QQueryHandle QRayCastingService::query(const Qt3DCore::QRay3D &ray, QAbstractCollisionQueryService::QueryMode mode) { Q_D(QRayCastingService); @@ -117,14 +117,14 @@ Qt3D::QQueryHandle QRayCastingService::query(const Qt3D::QRay3D &ray, QAbstractC return handle; } -Qt3D::QCollisionQueryResult QRayCastingService::fetchResult(const Qt3D::QQueryHandle &handle) +Qt3DCore::QCollisionQueryResult QRayCastingService::fetchResult(const Qt3DCore::QQueryHandle &handle) { Q_D(QRayCastingService); return d->m_results.value(handle).result(); } -QVector<Qt3D::QCollisionQueryResult> QRayCastingService::fetchAllResults() const +QVector<Qt3DCore::QCollisionQueryResult> QRayCastingService::fetchAllResults() const { Q_D(const QRayCastingService); diff --git a/src/render/services/qraycastingservice.h b/src/render/services/qraycastingservice.h index 0dbb93863..387b77592 100644 --- a/src/render/services/qraycastingservice.h +++ b/src/render/services/qraycastingservice.h @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QBoundingVolumeProvider; } @@ -51,15 +51,15 @@ namespace Qt3DRender { class QRayCastingServicePrivate; -class QT3DRENDERERSHARED_EXPORT QRayCastingService : public Qt3D::QAbstractCollisionQueryService +class QT3DRENDERERSHARED_EXPORT QRayCastingService : public Qt3DCore::QAbstractCollisionQueryService { public: - explicit QRayCastingService(Qt3D::QBoundingVolumeProvider *provider); + explicit QRayCastingService(Qt3DCore::QBoundingVolumeProvider *provider); - Qt3D::QQueryHandle query(const Qt3D::QRay3D &ray, QueryMode mode) Q_DECL_OVERRIDE; + Qt3DCore::QQueryHandle query(const Qt3DCore::QRay3D &ray, QueryMode mode) Q_DECL_OVERRIDE; - Qt3D::QCollisionQueryResult fetchResult(const Qt3D::QQueryHandle &handle) Q_DECL_OVERRIDE; - QVector<Qt3D::QCollisionQueryResult> fetchAllResults() const Q_DECL_OVERRIDE; + Qt3DCore::QCollisionQueryResult fetchResult(const Qt3DCore::QQueryHandle &handle) Q_DECL_OVERRIDE; + QVector<Qt3DCore::QCollisionQueryResult> fetchAllResults() const Q_DECL_OVERRIDE; protected: QRayCastingService(QRayCastingServicePrivate &dd); diff --git a/src/render/services/qraycastingservice_p.h b/src/render/services/qraycastingservice_p.h index 1de070b72..95b455ee1 100644 --- a/src/render/services/qraycastingservice_p.h +++ b/src/render/services/qraycastingservice_p.h @@ -59,38 +59,38 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QBoundingVolume; class QBoundingVolumeProvider; } namespace Qt3DRender { -typedef QFuture<Qt3D::QCollisionQueryResult> FutureQueryResult; +typedef QFuture<Qt3DCore::QCollisionQueryResult> FutureQueryResult; -class QRayCastingServicePrivate : public Qt3D::QAbstractCollisionQueryServicePrivate +class QRayCastingServicePrivate : public Qt3DCore::QAbstractCollisionQueryServicePrivate { public: - QRayCastingServicePrivate(const QString &description, Qt3D::QBoundingVolumeProvider *provider); + QRayCastingServicePrivate(const QString &description, Qt3DCore::QBoundingVolumeProvider *provider); - Qt3D::QCollisionQueryResult collides(const Qt3D::QRay3D &ray, - Qt3D::QBoundingVolumeProvider *provider, - Qt3D::QAbstractCollisionQueryService::QueryMode mode, - const Qt3D::QQueryHandle &handle); + Qt3DCore::QCollisionQueryResult collides(const Qt3DCore::QRay3D &ray, + Qt3DCore::QBoundingVolumeProvider *provider, + Qt3DCore::QAbstractCollisionQueryService::QueryMode mode, + const Qt3DCore::QQueryHandle &handle); Q_DECLARE_PUBLIC(QRayCastingService) struct Query { - Qt3D::QQueryHandle handle; - Qt3D::QRay3D ray; + Qt3DCore::QQueryHandle handle; + Qt3DCore::QRay3D ray; QRayCastingService::QueryMode mode; }; - QHash<Qt3D::QQueryHandle, FutureQueryResult> m_results; + QHash<Qt3DCore::QQueryHandle, FutureQueryResult> m_results; QAtomicInt m_handlesCount; - Qt3D::QBoundingVolumeProvider *m_boundingProvider; + Qt3DCore::QBoundingVolumeProvider *m_boundingProvider; }; } // namespace Qt3DRender diff --git a/src/render/services/vsyncframeadvanceservice.cpp b/src/render/services/vsyncframeadvanceservice.cpp index 5c937e6ed..19d7e70d1 100644 --- a/src/render/services/vsyncframeadvanceservice.cpp +++ b/src/render/services/vsyncframeadvanceservice.cpp @@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { namespace Render { -class VSyncFrameAdvanceServicePrivate Q_DECL_FINAL : public Qt3D::QAbstractFrameAdvanceServicePrivate +class VSyncFrameAdvanceServicePrivate Q_DECL_FINAL : public Qt3DCore::QAbstractFrameAdvanceServicePrivate { public: VSyncFrameAdvanceServicePrivate() diff --git a/src/render/services/vsyncframeadvanceservice_p.h b/src/render/services/vsyncframeadvanceservice_p.h index fa0d308ec..d09f74efd 100644 --- a/src/render/services/vsyncframeadvanceservice_p.h +++ b/src/render/services/vsyncframeadvanceservice_p.h @@ -58,7 +58,7 @@ namespace Render { class VSyncFrameAdvanceServicePrivate; -class Q_AUTOTEST_EXPORT VSyncFrameAdvanceService Q_DECL_FINAL : public Qt3D::QAbstractFrameAdvanceService +class Q_AUTOTEST_EXPORT VSyncFrameAdvanceService Q_DECL_FINAL : public Qt3DCore::QAbstractFrameAdvanceService { public: VSyncFrameAdvanceService(); diff --git a/src/render/texture/qabstracttextureimage.cpp b/src/render/texture/qabstracttextureimage.cpp index 5f44090d4..e19c2fe8d 100644 --- a/src/render/texture/qabstracttextureimage.cpp +++ b/src/render/texture/qabstracttextureimage.cpp @@ -40,18 +40,18 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { /*! - \class Qt3D::QAbstractTextureImagePrivate + \class Qt3DCore::QAbstractTextureImagePrivate \internal */ /*! \qmltype AbstractTextureImage - \instantiates Qt3D::QAbstractTextureImage + \instantiates Qt3DCore::QAbstractTextureImage \inherits Node \inqmlmodule Qt3D.Renderer \qmlabstract @@ -79,7 +79,7 @@ namespace Qt3DRender { */ /*! - Constructs a new Qt3D::QAbstractTextureImage instance with \a parent as parent. + Constructs a new Qt3DCore::QAbstractTextureImage instance with \a parent as parent. */ QAbstractTextureImage::QAbstractTextureImage(QNode *parent) : QNode(*new QAbstractTextureImagePrivate, parent) @@ -91,7 +91,7 @@ QAbstractTextureImage::QAbstractTextureImage(QNode *parent) */ QAbstractTextureImage::~QAbstractTextureImage() { - Q_ASSERT_X(Qt3D::QNodePrivate::get(this)->m_wasCleanedUp, Q_FUNC_INFO, "QNode::cleanup should have been called by now. A Qt3DRender::QAbstractTextureImage subclass didn't call QNode::cleanup in its destructor"); + Q_ASSERT_X(Qt3DCore::QNodePrivate::get(this)->m_wasCleanedUp, Q_FUNC_INFO, "QNode::cleanup should have been called by now. A Qt3DRender::QAbstractTextureImage subclass didn't call QNode::cleanup in its destructor"); } @@ -102,7 +102,7 @@ QAbstractTextureImage::~QAbstractTextureImage() */ /*! - \property Qt3D::QAbstractTextureImage::mipmapLevel + \property Qt3DCore::QAbstractTextureImage::mipmapLevel Holds the mipmap level of the texture image. */ @@ -119,7 +119,7 @@ int QAbstractTextureImage::mipmapLevel() const */ /*! - \property Qt3D::QAbstractTextureImage::layer + \property Qt3DCore::QAbstractTextureImage::layer Holds the layer of the texture image. */ @@ -147,7 +147,7 @@ int QAbstractTextureImage::layer() const */ /*! - \property Qt3D::QAbstractTextureImage::cubeMapFace + \property Qt3DCore::QAbstractTextureImage::cubeMapFace Holds the cube map face of the texture image. diff --git a/src/render/texture/qabstracttextureimage.h b/src/render/texture/qabstracttextureimage.h index 24efd2508..a7eed7d91 100644 --- a/src/render/texture/qabstracttextureimage.h +++ b/src/render/texture/qabstracttextureimage.h @@ -48,7 +48,7 @@ namespace Qt3DRender { // We might also get rid of the layer, face, mipmap level from // TexImageDataPtr and store that in the functor directly // or use the QTextureImage instead -class QT3DRENDERERSHARED_EXPORT QTextureDataFunctor : public Qt3D::QAbstractFunctor +class QT3DRENDERERSHARED_EXPORT QTextureDataFunctor : public Qt3DCore::QAbstractFunctor { public: virtual ~QTextureDataFunctor() {} @@ -60,14 +60,14 @@ typedef QSharedPointer<QTextureDataFunctor> QTextureDataFunctorPtr; class QAbstractTextureImagePrivate; -class QT3DRENDERERSHARED_EXPORT QAbstractTextureImage : public Qt3D::QNode +class QT3DRENDERERSHARED_EXPORT QAbstractTextureImage : public Qt3DCore::QNode { Q_OBJECT Q_PROPERTY(int mipmapLevel READ mipmapLevel WRITE setMipmapLevel NOTIFY mipmapLevelChanged) Q_PROPERTY(int layer READ layer WRITE setLayer NOTIFY layerChanged) Q_PROPERTY(Qt3DRender::QAbstractTextureProvider::CubeMapFace cubeMapFace READ cubeMapFace WRITE setCubeMapFace NOTIFY cubeMapFaceChanged) public: - explicit QAbstractTextureImage(Qt3D::QNode *parent = 0); + explicit QAbstractTextureImage(Qt3DCore::QNode *parent = 0); virtual ~QAbstractTextureImage(); int mipmapLevel() const; @@ -87,8 +87,8 @@ Q_SIGNALS: void cubeMapFaceChanged(); protected: - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; - QAbstractTextureImage(QAbstractTextureImagePrivate &dd, Qt3D::QNode *parent = 0); + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; + QAbstractTextureImage(QAbstractTextureImagePrivate &dd, Qt3DCore::QNode *parent = 0); private: Q_DECLARE_PRIVATE(QAbstractTextureImage) diff --git a/src/render/texture/qabstracttextureimage_p.h b/src/render/texture/qabstracttextureimage_p.h index 02c762e9e..abd95e302 100644 --- a/src/render/texture/qabstracttextureimage_p.h +++ b/src/render/texture/qabstracttextureimage_p.h @@ -58,7 +58,7 @@ namespace Qt3DRender { class QAbstractTextureImage; -class QT3DRENDERERSHARED_PRIVATE_EXPORT QAbstractTextureImagePrivate : public Qt3D::QNodePrivate +class QT3DRENDERERSHARED_PRIVATE_EXPORT QAbstractTextureImagePrivate : public Qt3DCore::QNodePrivate { public: QAbstractTextureImagePrivate() diff --git a/src/render/texture/qabstracttextureprovider.cpp b/src/render/texture/qabstracttextureprovider.cpp index 34259b511..bed56a14b 100644 --- a/src/render/texture/qabstracttextureprovider.cpp +++ b/src/render/texture/qabstracttextureprovider.cpp @@ -41,7 +41,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { @@ -237,7 +237,7 @@ int QAbstractTextureProvider::maximumLayers() const By default the renderer based on the attributes of texture providers is able to compare them and detect duplicates (same size, format and image sources) and smartly avoid unnecessary computations. In some cases however - (texture providers used as Qt3D::RenderTarget attachments) you don't want + (texture providers used as Qt3DCore::RenderTarget attachments) you don't want the renderer to perform these comparison, in which case you can set is unique to true. */ @@ -318,9 +318,9 @@ QAbstractTextureProvider::Target QAbstractTextureProvider::target() const } /*! - Adds a new Qt3D::QAbstractTextureImage \a textureImage to the texture provider. + Adds a new Qt3DCore::QAbstractTextureImage \a textureImage to the texture provider. - \note Qt3D::QAbstractTextureImage should never be shared between multiple + \note Qt3DCore::QAbstractTextureImage should never be shared between multiple Qt3DRender::QAbstractTextureProvider instances. */ void QAbstractTextureProvider::addTextureImage(QAbstractTextureImage *textureImage) @@ -349,7 +349,7 @@ void QAbstractTextureProvider::addTextureImage(QAbstractTextureImage *textureIma } /*! - Removes a Qt3D::QAbstractTextureImage \a textureImage from the texture provider. + Removes a Qt3DCore::QAbstractTextureImage \a textureImage from the texture provider. */ void QAbstractTextureProvider::removeTextureImage(QAbstractTextureImage *textureImage) { diff --git a/src/render/texture/qabstracttextureprovider.h b/src/render/texture/qabstracttextureprovider.h index 4a8e3adde..96d4f403c 100644 --- a/src/render/texture/qabstracttextureprovider.h +++ b/src/render/texture/qabstracttextureprovider.h @@ -49,7 +49,7 @@ class QAbstractTextureProviderPrivate; class QTextureWrapMode; class QAbstractTextureImage; -class QT3DRENDERERSHARED_EXPORT QAbstractTextureProvider : public Qt3D::QNode +class QT3DRENDERERSHARED_EXPORT QAbstractTextureProvider : public Qt3DCore::QNode { Q_OBJECT Q_PROPERTY(Target target READ target CONSTANT) @@ -326,10 +326,10 @@ Q_SIGNALS: void uniqueChanged(); protected: - explicit QAbstractTextureProvider(Qt3D::QNode *parent = 0); - explicit QAbstractTextureProvider(Target target, Qt3D::QNode *parent = 0); - QAbstractTextureProvider(QAbstractTextureProviderPrivate &dd, Qt3D::QNode *parent = 0); - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + explicit QAbstractTextureProvider(Qt3DCore::QNode *parent = 0); + explicit QAbstractTextureProvider(Target target, Qt3DCore::QNode *parent = 0); + QAbstractTextureProvider(QAbstractTextureProviderPrivate &dd, Qt3DCore::QNode *parent = 0); + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; void setStatus(Status status); private: diff --git a/src/render/texture/qabstracttextureprovider_p.h b/src/render/texture/qabstracttextureprovider_p.h index c7bfe078c..c1df87de9 100644 --- a/src/render/texture/qabstracttextureprovider_p.h +++ b/src/render/texture/qabstracttextureprovider_p.h @@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QAbstractTextureProviderPrivate : public Qt3D::QNodePrivate +class QAbstractTextureProviderPrivate : public Qt3DCore::QNodePrivate { public : QAbstractTextureProviderPrivate(); diff --git a/src/render/texture/qtextureimage.cpp b/src/render/texture/qtextureimage.cpp index 3d8a58b3e..fd2f6524c 100644 --- a/src/render/texture/qtextureimage.cpp +++ b/src/render/texture/qtextureimage.cpp @@ -67,7 +67,7 @@ public: { TexImageDataPtr dataPtr; if (m_url.isLocalFile() || m_url.scheme() == QStringLiteral("qrc")) { - QString source = Qt3D::QUrlHelper::urlToLocalFileOrQrc(m_url); + QString source = Qt3DCore::QUrlHelper::urlToLocalFileOrQrc(m_url); dataPtr.reset(new TexImageData()); if (dataPtr->setCompressedFile(source)) return dataPtr; diff --git a/src/render/texture/qtextureimage.h b/src/render/texture/qtextureimage.h index f77c2d47e..51a612f37 100644 --- a/src/render/texture/qtextureimage.h +++ b/src/render/texture/qtextureimage.h @@ -52,7 +52,7 @@ class QT3DRENDERERSHARED_EXPORT QTextureImage : public QAbstractTextureImage Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged) public: - explicit QTextureImage(Qt3D::QNode *parent = 0); + explicit QTextureImage(Qt3DCore::QNode *parent = 0); ~QTextureImage(); QUrl source() const; @@ -64,7 +64,7 @@ Q_SIGNALS: void sourceChanged(); protected: - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QTextureImage) diff --git a/src/render/texture/qtextureproviders.h b/src/render/texture/qtextureproviders.h index dc54b7999..4cf2f7289 100644 --- a/src/render/texture/qtextureproviders.h +++ b/src/render/texture/qtextureproviders.h @@ -47,7 +47,7 @@ class QT3DRENDERERSHARED_EXPORT QTexture1D : public QAbstractTextureProvider { Q_OBJECT public: - explicit QTexture1D(Qt3D::QNode *parent = 0); + explicit QTexture1D(Qt3DCore::QNode *parent = 0); ~QTexture1D(); }; @@ -55,7 +55,7 @@ class QT3DRENDERERSHARED_EXPORT QTexture1DArray : public QAbstractTextureProvide { Q_OBJECT public: - explicit QTexture1DArray(Qt3D::QNode *parent = 0); + explicit QTexture1DArray(Qt3DCore::QNode *parent = 0); ~QTexture1DArray(); }; @@ -63,7 +63,7 @@ class QT3DRENDERERSHARED_EXPORT QTexture2D : public QAbstractTextureProvider { Q_OBJECT public: - explicit QTexture2D(Qt3D::QNode *parent = 0); + explicit QTexture2D(Qt3DCore::QNode *parent = 0); ~QTexture2D(); }; @@ -71,7 +71,7 @@ class QT3DRENDERERSHARED_EXPORT QTexture2DArray : public QAbstractTextureProvide { Q_OBJECT public: - explicit QTexture2DArray(Qt3D::QNode *parent = 0); + explicit QTexture2DArray(Qt3DCore::QNode *parent = 0); ~QTexture2DArray(); }; @@ -79,7 +79,7 @@ class QT3DRENDERERSHARED_EXPORT QTexture3D : public QAbstractTextureProvider { Q_OBJECT public: - explicit QTexture3D(Qt3D::QNode *parent = 0); + explicit QTexture3D(Qt3DCore::QNode *parent = 0); ~QTexture3D(); }; @@ -87,7 +87,7 @@ class QT3DRENDERERSHARED_EXPORT QTextureCubeMap : public QAbstractTextureProvide { Q_OBJECT public: - explicit QTextureCubeMap(Qt3D::QNode *parent = 0); + explicit QTextureCubeMap(Qt3DCore::QNode *parent = 0); ~QTextureCubeMap(); }; @@ -95,7 +95,7 @@ class QT3DRENDERERSHARED_EXPORT QTextureCubeMapArray : public QAbstractTexturePr { Q_OBJECT public: - explicit QTextureCubeMapArray(Qt3D::QNode *parent = 0); + explicit QTextureCubeMapArray(Qt3DCore::QNode *parent = 0); ~QTextureCubeMapArray(); }; @@ -103,7 +103,7 @@ class QT3DRENDERERSHARED_EXPORT QTexture2DMultisample : public QAbstractTextureP { Q_OBJECT public: - explicit QTexture2DMultisample(Qt3D::QNode *parent = 0); + explicit QTexture2DMultisample(Qt3DCore::QNode *parent = 0); ~QTexture2DMultisample(); }; @@ -111,7 +111,7 @@ class QT3DRENDERERSHARED_EXPORT QTexture2DMultisampleArray : public QAbstractTex { Q_OBJECT public: - explicit QTexture2DMultisampleArray(Qt3D::QNode *parent = 0); + explicit QTexture2DMultisampleArray(Qt3DCore::QNode *parent = 0); ~QTexture2DMultisampleArray(); }; @@ -119,7 +119,7 @@ class QT3DRENDERERSHARED_EXPORT QTextureRectangle : public QAbstractTextureProvi { Q_OBJECT public: - explicit QTextureRectangle(Qt3D::QNode *parent = 0); + explicit QTextureRectangle(Qt3DCore::QNode *parent = 0); ~QTextureRectangle(); }; @@ -127,7 +127,7 @@ class QT3DRENDERERSHARED_EXPORT QTextureBuffer : public QAbstractTextureProvider { Q_OBJECT public: - explicit QTextureBuffer(Qt3D::QNode *parent = 0); + explicit QTextureBuffer(Qt3DCore::QNode *parent = 0); ~QTextureBuffer(); }; diff --git a/src/render/texture/texture.cpp b/src/render/texture/texture.cpp index 9ac0966ce..edbf26b68 100644 --- a/src/render/texture/texture.cpp +++ b/src/render/texture/texture.cpp @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { namespace Render { @@ -123,7 +123,7 @@ void Texture::cleanup() } // AspectThread -void Texture::updateFromPeer(Qt3D::QNode *peer) +void Texture::updateFromPeer(Qt3DCore::QNode *peer) { QAbstractTextureProvider *texture = static_cast<QAbstractTextureProvider *>(peer); @@ -412,7 +412,7 @@ void Texture::setFormat(QAbstractTextureProvider::TextureFormat format) } // ChangeArbiter/Aspect Thread -void Texture::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) +void Texture::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { // The QOpenGLTexture has to be manipulated from the RenderThread only QMutexLocker lock(m_lock); @@ -579,7 +579,7 @@ TextureFunctor::TextureFunctor(TextureManager *textureManager, { } -Qt3D::QBackendNode *TextureFunctor::create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const +Qt3DCore::QBackendNode *TextureFunctor::create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const { Texture *backend = m_textureManager->getOrCreateResource(frontend->id()); backend->setFactory(factory); @@ -590,12 +590,12 @@ Qt3D::QBackendNode *TextureFunctor::create(Qt3D::QNode *frontend, const Qt3D::QB return backend; } -Qt3D::QBackendNode *TextureFunctor::get(const Qt3D::QNodeId &id) const +Qt3DCore::QBackendNode *TextureFunctor::get(const Qt3DCore::QNodeId &id) const { return m_textureManager->lookupResource(id); } -void TextureFunctor::destroy(const Qt3D::QNodeId &id) const +void TextureFunctor::destroy(const Qt3DCore::QNodeId &id) const { m_textureManager->releaseResource(id); } diff --git a/src/render/texture/texture_p.h b/src/render/texture/texture_p.h index d520afae7..313dc40b0 100644 --- a/src/render/texture/texture_p.h +++ b/src/render/texture/texture_p.h @@ -71,14 +71,14 @@ class TextureDataManager; typedef uint TextureDNA; -class Texture : public Qt3D::QBackendNode +class Texture : public Qt3DCore::QBackendNode { public: Texture(); ~Texture(); void cleanup(); - void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE; + void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE; QOpenGLTexture* getOrCreateGLTexture() ; @@ -86,7 +86,7 @@ public: bool isTextureReset() const; - void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; TextureDNA dna() const; void setTextureManager(TextureManager *manager); @@ -145,16 +145,16 @@ private: void updateDNA(); }; -class TextureFunctor : public Qt3D::QBackendNodeFunctor +class TextureFunctor : public Qt3DCore::QBackendNodeFunctor { public: explicit TextureFunctor(TextureManager *textureManager, TextureImageManager *textureImageManager, TextureDataManager *textureDataManager); - Qt3D::QBackendNode *create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const Q_DECL_FINAL; - Qt3D::QBackendNode *get(const Qt3D::QNodeId &id) const Q_DECL_FINAL; - void destroy(const Qt3D::QNodeId &id) const Q_DECL_FINAL; + Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const Q_DECL_FINAL; + Qt3DCore::QBackendNode *get(const Qt3DCore::QNodeId &id) const Q_DECL_FINAL; + void destroy(const Qt3DCore::QNodeId &id) const Q_DECL_FINAL; private: TextureManager *m_textureManager; diff --git a/src/render/texture/texturedatamanager.cpp b/src/render/texture/texturedatamanager.cpp index 3e77179f6..313a2fe0a 100644 --- a/src/render/texture/texturedatamanager.cpp +++ b/src/render/texture/texturedatamanager.cpp @@ -48,7 +48,7 @@ TextureDataManager::TextureDataManager() {} // Called from AspectThread sync -void TextureDataManager::addToPendingTextures(const Qt3D::QNodeId &textureId) +void TextureDataManager::addToPendingTextures(const Qt3DCore::QNodeId &textureId) { // This simple check ensures that we won't be having n jobs // for one mesh, in case n Materials are referencing the said @@ -58,9 +58,9 @@ void TextureDataManager::addToPendingTextures(const Qt3D::QNodeId &textureId) } // Called from AspectThread prepare jobs -QVector<Qt3D::QNodeId> TextureDataManager::texturesPending() +QVector<Qt3DCore::QNodeId> TextureDataManager::texturesPending() { - QVector<Qt3D::QNodeId> textureIds = m_texturesPending; + QVector<Qt3DCore::QNodeId> textureIds = m_texturesPending; m_texturesPending.clear(); return textureIds; } diff --git a/src/render/texture/texturedatamanager_p.h b/src/render/texture/texturedatamanager_p.h index f15c5be98..fcdabebce 100644 --- a/src/render/texture/texturedatamanager_p.h +++ b/src/render/texture/texturedatamanager_p.h @@ -65,17 +65,17 @@ namespace Render { typedef QPair<QTextureDataFunctorPtr, QVector<HTextureImage> > FunctorImageHandlesPair; typedef QPair<QTextureDataFunctorPtr, HTextureData> FunctorTextureDataPair; -class TextureDataManager : public Qt3D::QResourceManager<TexImageData, - Qt3D::QNodeId, +class TextureDataManager : public Qt3DCore::QResourceManager<TexImageData, + Qt3DCore::QNodeId, 16, - Qt3D::ArrayAllocatingPolicy, - Qt3D::ObjectLevelLockingPolicy> + Qt3DCore::ArrayAllocatingPolicy, + Qt3DCore::ObjectLevelLockingPolicy> { public: TextureDataManager(); - void addToPendingTextures(const Qt3D::QNodeId &textureId); + void addToPendingTextures(const Qt3DCore::QNodeId &textureId); - QVector<Qt3D::QNodeId> texturesPending(); + QVector<Qt3DCore::QNodeId> texturesPending(); HTextureData textureDataFromFunctor(const QTextureDataFunctorPtr &functor) const; void addTextureDataForFunctor(HTextureData textureDataHandle, const QTextureDataFunctorPtr &functor); @@ -87,7 +87,7 @@ public: void cleanup(); private: - QVector<Qt3D::QNodeId> m_texturesPending; + QVector<Qt3DCore::QNodeId> m_texturesPending; QVector<FunctorTextureDataPair > m_textureDataFunctors; QVector<FunctorImageHandlesPair > m_texturesImagesPerFunctor; mutable QMutex m_mutex; diff --git a/src/render/texture/textureimage.cpp b/src/render/texture/textureimage.cpp index 4625586bf..96c6cbd3e 100644 --- a/src/render/texture/textureimage.cpp +++ b/src/render/texture/textureimage.cpp @@ -41,7 +41,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { namespace Render { @@ -73,7 +73,7 @@ void TextureImage::cleanup() m_dna = 0; } -void TextureImage::updateFromPeer(Qt3D::QNode *peer) +void TextureImage::updateFromPeer(Qt3DCore::QNode *peer) { QAbstractTextureImage *textureImage = static_cast<QAbstractTextureImage *>(peer); m_layer = textureImage->layer(); @@ -94,7 +94,7 @@ void TextureImage::updateFromPeer(Qt3D::QNode *peer) } } -void TextureImage::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) +void TextureImage::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); @@ -161,7 +161,7 @@ TextureImageFunctor::TextureImageFunctor(TextureManager *textureManager, { } -Qt3D::QBackendNode *TextureImageFunctor::create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const +Qt3DCore::QBackendNode *TextureImageFunctor::create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const { TextureImage *backend = m_textureImageManager->getOrCreateResource(frontend->id()); backend->setFactory(factory); @@ -172,12 +172,12 @@ Qt3D::QBackendNode *TextureImageFunctor::create(Qt3D::QNode *frontend, const Qt3 return backend; } -Qt3D::QBackendNode *TextureImageFunctor::get(const Qt3D::QNodeId &id) const +Qt3DCore::QBackendNode *TextureImageFunctor::get(const Qt3DCore::QNodeId &id) const { return m_textureImageManager->lookupResource(id); } -void TextureImageFunctor::destroy(const Qt3D::QNodeId &id) const +void TextureImageFunctor::destroy(const Qt3DCore::QNodeId &id) const { m_textureImageManager->releaseResource(id); } diff --git a/src/render/texture/textureimage_p.h b/src/render/texture/textureimage_p.h index 8b81a6756..bde1e58ca 100644 --- a/src/render/texture/textureimage_p.h +++ b/src/render/texture/textureimage_p.h @@ -66,13 +66,13 @@ class TextureDataManager; typedef uint TextureImageDNA; -class TextureImage : public Qt3D::QBackendNode +class TextureImage : public Qt3DCore::QBackendNode { public: TextureImage(); 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; int m_layer; int m_mipmapLevel; @@ -105,22 +105,22 @@ private: TextureManager *m_textureManager; TextureImageManager *m_textureImageManager; TextureDataManager *m_textureDataManager; - QList<Qt3D::QNodeId> m_referencedTextures; + QList<Qt3DCore::QNodeId> m_referencedTextures; HTexture m_textureProvider; - Qt3D::QNodeId m_textureProviderId; + Qt3DCore::QNodeId m_textureProviderId; TextureImageDNA m_dna; }; -class TextureImageFunctor : public Qt3D::QBackendNodeFunctor +class TextureImageFunctor : public Qt3DCore::QBackendNodeFunctor { public: explicit TextureImageFunctor(TextureManager *textureManager, TextureImageManager *textureImageManager, TextureDataManager *textureDataManager); - Qt3D::QBackendNode *create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const Q_DECL_FINAL; - Qt3D::QBackendNode *get(const Qt3D::QNodeId &id) const Q_DECL_FINAL; - void destroy(const Qt3D::QNodeId &id) const Q_DECL_FINAL; + Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const Q_DECL_FINAL; + Qt3DCore::QBackendNode *get(const Qt3DCore::QNodeId &id) const Q_DECL_FINAL; + void destroy(const Qt3DCore::QNodeId &id) const Q_DECL_FINAL; private: TextureManager *m_textureManager; |