diff options
author | Paul Lemire <paul.lemire@kdab.com> | 2019-12-20 12:41:04 +0100 |
---|---|---|
committer | Mike Krus <mike.krus@kdab.com> | 2020-02-11 06:08:41 +0000 |
commit | b828609440a4771838c242b3ad9962ecd7a2fe99 (patch) | |
tree | 5da6bce0cda327c4cca96696bce512ec243cc1fd /src/render/lights | |
parent | b0eb152b82cdd9658154ff7d9ef9e764eccc1ebd (diff) |
Remove deprecated classes and functions
Mostly old messaging API
Change-Id: I17eb2206b2ede56d2f7d36375d5e711d6149019f
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/lights')
-rw-r--r-- | src/render/lights/light.cpp | 4 | ||||
-rw-r--r-- | src/render/lights/light_p.h | 2 | ||||
-rw-r--r-- | src/render/lights/qabstractlight.cpp | 8 | ||||
-rw-r--r-- | src/render/lights/qabstractlight.h | 1 | ||||
-rw-r--r-- | src/render/lights/qenvironmentlight.cpp | 9 | ||||
-rw-r--r-- | src/render/lights/qenvironmentlight.h | 1 |
6 files changed, 3 insertions, 22 deletions
diff --git a/src/render/lights/light.cpp b/src/render/lights/light.cpp index 3bdab0457..96eea0b44 100644 --- a/src/render/lights/light.cpp +++ b/src/render/lights/light.cpp @@ -77,9 +77,9 @@ RenderLightFunctor::RenderLightFunctor(AbstractRenderer *renderer, NodeManagers { } -Qt3DCore::QBackendNode *RenderLightFunctor::create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const +Qt3DCore::QBackendNode *RenderLightFunctor::create(Qt3DCore::QNodeId id) const { - Light *backend = m_managers->lightManager()->getOrCreateResource(change->subjectId()); + Light *backend = m_managers->lightManager()->getOrCreateResource(id); backend->setRenderer(m_renderer); return backend; } diff --git a/src/render/lights/light_p.h b/src/render/lights/light_p.h index d1497fddd..58d7f842d 100644 --- a/src/render/lights/light_p.h +++ b/src/render/lights/light_p.h @@ -77,7 +77,7 @@ class RenderLightFunctor : public Qt3DCore::QBackendNodeMapper public: explicit RenderLightFunctor(AbstractRenderer *renderer, NodeManagers *managers); - Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const override; + Qt3DCore::QBackendNode *create(Qt3DCore::QNodeId id) const override; Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const final; void destroy(Qt3DCore::QNodeId id) const final; diff --git a/src/render/lights/qabstractlight.cpp b/src/render/lights/qabstractlight.cpp index 5ad16d3b4..83ac9e28b 100644 --- a/src/render/lights/qabstractlight.cpp +++ b/src/render/lights/qabstractlight.cpp @@ -93,14 +93,6 @@ QAbstractLightPrivate::~QAbstractLightPrivate() \value DirectionalLight \value SpotLight */ -Qt3DCore::QNodeCreatedChangeBasePtr QAbstractLight::createNodeCreationChange() const -{ - auto creationChange = Qt3DCore::QNodeCreatedChangePtr<QAbstractLightData>::create(this); - auto &data = creationChange->data; - Q_D(const QAbstractLight); - data.shaderDataId = qIdForNode(d->m_shaderData); - return creationChange; -} /*! \class Qt3DRender::QAbstractLight diff --git a/src/render/lights/qabstractlight.h b/src/render/lights/qabstractlight.h index e92a5ee1d..30b0a8465 100644 --- a/src/render/lights/qabstractlight.h +++ b/src/render/lights/qabstractlight.h @@ -86,7 +86,6 @@ Q_SIGNALS: private: Q_DECLARE_PRIVATE(QAbstractLight) - Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override; }; } // namespace Qt3DRender diff --git a/src/render/lights/qenvironmentlight.cpp b/src/render/lights/qenvironmentlight.cpp index 977e117db..52ee30cb2 100644 --- a/src/render/lights/qenvironmentlight.cpp +++ b/src/render/lights/qenvironmentlight.cpp @@ -100,15 +100,6 @@ void QEnvironmentLightPrivate::_q_updateEnvMapsSize() m_shaderData->setProperty("specularSize", QVariant::fromValue(specularSize)); } -Qt3DCore::QNodeCreatedChangeBasePtr QEnvironmentLight::createNodeCreationChange() const -{ - auto creationChange = Qt3DCore::QNodeCreatedChangePtr<QEnvironmentLightData>::create(this); - auto &data = creationChange->data; - Q_D(const QEnvironmentLight); - data.shaderDataId = qIdForNode(d->m_shaderData); - return creationChange; -} - /*! \class Qt3DRender::QEnvironmentLight \inmodule Qt3DRender diff --git a/src/render/lights/qenvironmentlight.h b/src/render/lights/qenvironmentlight.h index 3afc44f28..6fd3aa282 100644 --- a/src/render/lights/qenvironmentlight.h +++ b/src/render/lights/qenvironmentlight.h @@ -76,7 +76,6 @@ Q_SIGNALS: private: Q_DECLARE_PRIVATE(QEnvironmentLight) - Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override; Q_PRIVATE_SLOT(d_func(), void _q_updateEnvMapsSize()) }; |