diff options
| author | Mike Krus <mike.krus@kdab.com> | 2020-01-30 08:31:42 +0000 |
|---|---|---|
| committer | Mike Krus <mike.krus@kdab.com> | 2020-01-31 06:18:53 +0000 |
| commit | 3e2b688817d615c1458e1144ad0f0f35555475e8 (patch) | |
| tree | 9e9543409580547e94737a586d3bd7b0c8dd138e /src/render/geometry | |
| parent | c5211b7026ebf26bc82889437329ae2cc11e9725 (diff) | |
Deprecate functor APIs
Deprecate functor based APIs for buffer generators, geometry factories,
texture data generators and mesh loaders
While these are useful for some of Qt3D's internal mechanisms, they
complicate some of the backend operations. Will delete some or make them
private in Qt6.
Change-Id: I64eaa338e0306647867d2084819ef8591e2c91c0
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/geometry')
| -rw-r--r-- | src/render/geometry/qbuffer.h | 4 | ||||
| -rw-r--r-- | src/render/geometry/qgeometryrenderer.h | 4 | ||||
| -rw-r--r-- | src/render/geometry/qmesh_p.h | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/src/render/geometry/qbuffer.h b/src/render/geometry/qbuffer.h index aa6ebca66..f1ce110f0 100644 --- a/src/render/geometry/qbuffer.h +++ b/src/render/geometry/qbuffer.h @@ -107,8 +107,8 @@ public: void setData(const QByteArray &bytes); QByteArray data() const; - void setDataGenerator(const QBufferDataGeneratorPtr &functor); - QBufferDataGeneratorPtr dataGenerator() const; + Q3D_DECL_DEPRECATED void setDataGenerator(const QBufferDataGeneratorPtr &functor); + Q3D_DECL_DEPRECATED QBufferDataGeneratorPtr dataGenerator() const; Q_INVOKABLE void updateData(int offset, const QByteArray &bytes); diff --git a/src/render/geometry/qgeometryrenderer.h b/src/render/geometry/qgeometryrenderer.h index 14de40d0b..3f0f9fab2 100644 --- a/src/render/geometry/qgeometryrenderer.h +++ b/src/render/geometry/qgeometryrenderer.h @@ -103,8 +103,8 @@ public: QGeometry *geometry() const; PrimitiveType primitiveType() const; - QGeometryFactoryPtr geometryFactory() const; - void setGeometryFactory(const QGeometryFactoryPtr &factory); + Q3D_DECL_DEPRECATED QGeometryFactoryPtr geometryFactory() const; + Q3D_DECL_DEPRECATED void setGeometryFactory(const QGeometryFactoryPtr &factory); public Q_SLOTS: void setInstanceCount(int instanceCount); diff --git a/src/render/geometry/qmesh_p.h b/src/render/geometry/qmesh_p.h index 4a4ff4979..c80c930c5 100644 --- a/src/render/geometry/qmesh_p.h +++ b/src/render/geometry/qmesh_p.h @@ -120,7 +120,10 @@ public : QGeometry *operator()() override; bool operator ==(const QGeometryFactory &other) const override; + QT_WARNING_PUSH + QT_WARNING_DISABLE_DEPRECATED QT3D_FUNCTOR(MeshLoaderFunctor) + QT_WARNING_POP private: Qt3DCore::QNodeId m_mesh; |