summaryrefslogtreecommitdiffstats
path: root/src/render
diff options
context:
space:
mode:
authorSean Harmer <sean.harmer@kdab.com>2016-04-30 09:25:39 +0100
committerSean Harmer <sean.harmer@kdab.com>2016-05-01 23:42:06 +0000
commit7f0793ba6cb9f16aafa62df528af773370bf174d (patch)
treebfb2e4236de71d5be7af6349827e94abf3e930ed /src/render
parent0a662f9a2d8656e112e33172ab4f43c5ec5b1178 (diff)
Remove virtual QBackendNode *create(QNode *frontend) const
from QBackendNodeMapper and subclasses. No longer needed now we have disabled cloning. Change-Id: I261fa7bccfa9a4019d479079e2ff7c19154e5e72 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render')
-rw-r--r--src/render/backend/entity.cpp11
-rw-r--r--src/render/backend/entity_p.h1
-rw-r--r--src/render/backend/nodefunctor_p.h8
-rw-r--r--src/render/backend/rendersettings.cpp15
-rw-r--r--src/render/backend/rendersettings_p.h1
-rw-r--r--src/render/framegraph/framegraphnode_p.h5
-rw-r--r--src/render/geometry/buffer.cpp9
-rw-r--r--src/render/geometry/buffer_p.h1
-rw-r--r--src/render/geometry/geometryrenderer.cpp9
-rw-r--r--src/render/geometry/geometryrenderer_p.h1
-rw-r--r--src/render/io/scene.cpp9
-rw-r--r--src/render/io/scene_p.h1
-rw-r--r--src/render/lights/light.cpp8
-rw-r--r--src/render/lights/light_p.h1
-rw-r--r--src/render/materialsystem/shaderdata.cpp9
-rw-r--r--src/render/materialsystem/shaderdata_p.h1
-rw-r--r--src/render/texture/texture.cpp11
-rw-r--r--src/render/texture/texture_p.h1
-rw-r--r--src/render/texture/textureimage.cpp11
-rw-r--r--src/render/texture/textureimage_p.h1
20 files changed, 0 insertions, 114 deletions
diff --git a/src/render/backend/entity.cpp b/src/render/backend/entity.cpp
index 4b6d7b3f8..37dea8c8d 100644
--- a/src/render/backend/entity.cpp
+++ b/src/render/backend/entity.cpp
@@ -577,17 +577,6 @@ RenderEntityFunctor::RenderEntityFunctor(AbstractRenderer *renderer, NodeManager
{
}
-Qt3DCore::QBackendNode *RenderEntityFunctor::create(Qt3DCore::QNode *frontend) const
-{
- HEntity renderNodeHandle = m_nodeManagers->renderNodesManager()->getOrAcquireHandle(frontend->id());
- Entity *entity = m_nodeManagers->renderNodesManager()->data(renderNodeHandle);
- entity->setNodeManagers(m_nodeManagers);
- entity->setHandle(renderNodeHandle);
- entity->setPeer(frontend);
- entity->setRenderer(m_renderer);
- return entity;
-}
-
Qt3DCore::QBackendNode *RenderEntityFunctor::create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const
{
HEntity renderNodeHandle = m_nodeManagers->renderNodesManager()->getOrAcquireHandle(change->subjectId());
diff --git a/src/render/backend/entity_p.h b/src/render/backend/entity_p.h
index b35b31fb4..65389295c 100644
--- a/src/render/backend/entity_p.h
+++ b/src/render/backend/entity_p.h
@@ -280,7 +280,6 @@ class RenderEntityFunctor : public Qt3DCore::QBackendNodeMapper
{
public:
explicit RenderEntityFunctor(AbstractRenderer *renderer, NodeManagers *manager);
- Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend) const Q_DECL_OVERRIDE;
Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const Q_DECL_OVERRIDE;
Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE;
void destroy(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE;
diff --git a/src/render/backend/nodefunctor_p.h b/src/render/backend/nodefunctor_p.h
index 3ba8394d5..98dec968f 100644
--- a/src/render/backend/nodefunctor_p.h
+++ b/src/render/backend/nodefunctor_p.h
@@ -72,14 +72,6 @@ public:
{
}
- Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend) const Q_DECL_FINAL
- {
- Backend *backend = m_manager->getOrCreateResource(frontend->id());
- backend->setPeer(frontend);
- backend->setRenderer(m_renderer);
- return backend;
- }
-
Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const Q_DECL_FINAL
{
Backend *backend = m_manager->getOrCreateResource(change->subjectId());
diff --git a/src/render/backend/rendersettings.cpp b/src/render/backend/rendersettings.cpp
index c17a811cf..94cd165da 100644
--- a/src/render/backend/rendersettings.cpp
+++ b/src/render/backend/rendersettings.cpp
@@ -107,21 +107,6 @@ RenderSettingsFunctor::RenderSettingsFunctor(AbstractRenderer *renderer)
{
}
-Qt3DCore::QBackendNode *RenderSettingsFunctor::create(Qt3DCore::QNode *frontend) const
-{
- QRenderSettings *settingsFrontend = static_cast<QRenderSettings *>(frontend);
- if (m_renderer->settings() != nullptr) {
- qWarning() << "Renderer settings already exists";
- return nullptr;
- }
-
- RenderSettings *settings = new RenderSettings;
- settings->setPeer(settingsFrontend);
- settings->setRenderer(m_renderer);
- m_renderer->setSettings(settings);
- return settings;
-}
-
Qt3DCore::QBackendNode *RenderSettingsFunctor::create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const
{
Q_UNUSED(change);
diff --git a/src/render/backend/rendersettings_p.h b/src/render/backend/rendersettings_p.h
index 8da81b184..0b680f7fa 100644
--- a/src/render/backend/rendersettings_p.h
+++ b/src/render/backend/rendersettings_p.h
@@ -89,7 +89,6 @@ class RenderSettingsFunctor : public Qt3DCore::QBackendNodeMapper
{
public:
explicit RenderSettingsFunctor(AbstractRenderer *renderer);
- Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend) const Q_DECL_OVERRIDE;
Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const Q_DECL_OVERRIDE;
Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE;
void destroy(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE;
diff --git a/src/render/framegraph/framegraphnode_p.h b/src/render/framegraph/framegraphnode_p.h
index 8c8354250..7aeaa22be 100644
--- a/src/render/framegraph/framegraphnode_p.h
+++ b/src/render/framegraph/framegraphnode_p.h
@@ -129,11 +129,6 @@ public:
{
}
- Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend) const Q_DECL_OVERRIDE
- {
- return createBackendFrameGraphNode(frontend);
- }
-
Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const Q_DECL_OVERRIDE
{
return createBackendFrameGraphNode(change);
diff --git a/src/render/geometry/buffer.cpp b/src/render/geometry/buffer.cpp
index 81de24083..a53bec0fc 100644
--- a/src/render/geometry/buffer.cpp
+++ b/src/render/geometry/buffer.cpp
@@ -169,15 +169,6 @@ BufferFunctor::BufferFunctor(AbstractRenderer *renderer, BufferManager *manager)
{
}
-Qt3DCore::QBackendNode *BufferFunctor::create(Qt3DCore::QNode *frontend) const
-{
- Buffer *buffer = m_manager->getOrCreateResource(frontend->id());
- buffer->setManager(m_manager);
- buffer->setPeer(frontend);
- buffer->setRenderer(m_renderer);
- return buffer;
-}
-
Qt3DCore::QBackendNode *BufferFunctor::create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const
{
Buffer *buffer = m_manager->getOrCreateResource(change->subjectId());
diff --git a/src/render/geometry/buffer_p.h b/src/render/geometry/buffer_p.h
index 05a3dd15d..87938aba9 100644
--- a/src/render/geometry/buffer_p.h
+++ b/src/render/geometry/buffer_p.h
@@ -100,7 +100,6 @@ class BufferFunctor : public Qt3DCore::QBackendNodeMapper
{
public:
explicit BufferFunctor(AbstractRenderer *renderer, BufferManager *manager);
- Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend) const Q_DECL_OVERRIDE;
Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const Q_DECL_OVERRIDE;
Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE;
void destroy(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE;
diff --git a/src/render/geometry/geometryrenderer.cpp b/src/render/geometry/geometryrenderer.cpp
index 8e3d71567..08329c0d6 100644
--- a/src/render/geometry/geometryrenderer.cpp
+++ b/src/render/geometry/geometryrenderer.cpp
@@ -246,15 +246,6 @@ GeometryRendererFunctor::GeometryRendererFunctor(AbstractRenderer *renderer, Geo
{
}
-Qt3DCore::QBackendNode *GeometryRendererFunctor::create(Qt3DCore::QNode *frontend) const
-{
- GeometryRenderer *geometryRenderer = m_manager->getOrCreateResource(frontend->id());
- geometryRenderer->setManager(m_manager);
- geometryRenderer->setPeer(frontend);
- geometryRenderer->setRenderer(m_renderer);
- return geometryRenderer;
-}
-
Qt3DCore::QBackendNode *GeometryRendererFunctor::create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const
{
GeometryRenderer *geometryRenderer = m_manager->getOrCreateResource(change->subjectId());
diff --git a/src/render/geometry/geometryrenderer_p.h b/src/render/geometry/geometryrenderer_p.h
index 00e6ae273..66ac172b6 100644
--- a/src/render/geometry/geometryrenderer_p.h
+++ b/src/render/geometry/geometryrenderer_p.h
@@ -117,7 +117,6 @@ class GeometryRendererFunctor : public Qt3DCore::QBackendNodeMapper
{
public:
explicit GeometryRendererFunctor(AbstractRenderer *renderer, GeometryRendererManager *manager);
- Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend) const Q_DECL_OVERRIDE;
Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const Q_DECL_OVERRIDE;
Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE;
void destroy(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE;
diff --git a/src/render/io/scene.cpp b/src/render/io/scene.cpp
index f21d2e7ab..bd6cbee84 100644
--- a/src/render/io/scene.cpp
+++ b/src/render/io/scene.cpp
@@ -119,15 +119,6 @@ RenderSceneFunctor::RenderSceneFunctor(AbstractRenderer *renderer, SceneManager
{
}
-Qt3DCore::QBackendNode *RenderSceneFunctor::create(Qt3DCore::QNode *frontend) const
-{
- Scene *scene = m_sceneManager->getOrCreateResource(frontend->id());
- scene->setSceneManager(m_sceneManager);
- scene->setPeer(frontend);
- scene->setRenderer(m_renderer);
- return scene;
-}
-
Qt3DCore::QBackendNode *RenderSceneFunctor::create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const
{
Scene *scene = m_sceneManager->getOrCreateResource(change->subjectId());
diff --git a/src/render/io/scene_p.h b/src/render/io/scene_p.h
index bf7ce85e0..c340b5106 100644
--- a/src/render/io/scene_p.h
+++ b/src/render/io/scene_p.h
@@ -90,7 +90,6 @@ class RenderSceneFunctor : public Qt3DCore::QBackendNodeMapper
{
public:
explicit RenderSceneFunctor(AbstractRenderer *renderer, SceneManager *sceneManager);
- Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend) const Q_DECL_OVERRIDE;
Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const Q_DECL_OVERRIDE;
Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE;
void destroy(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE;
diff --git a/src/render/lights/light.cpp b/src/render/lights/light.cpp
index 1bf5e2f85..cd43c0f9c 100644
--- a/src/render/lights/light.cpp
+++ b/src/render/lights/light.cpp
@@ -79,14 +79,6 @@ RenderLightFunctor::RenderLightFunctor(AbstractRenderer *renderer, NodeManagers
{
}
-Qt3DCore::QBackendNode *RenderLightFunctor::create(Qt3DCore::QNode *frontend) const
-{
- Light *backend = m_managers->lightManager()->getOrCreateResource(frontend->id());
- backend->setPeer(frontend);
- backend->setRenderer(m_renderer);
- return backend;
-}
-
Qt3DCore::QBackendNode *RenderLightFunctor::create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const
{
Light *backend = m_managers->lightManager()->getOrCreateResource(change->subjectId());
diff --git a/src/render/lights/light_p.h b/src/render/lights/light_p.h
index 05c94c2dc..552b8fee6 100644
--- a/src/render/lights/light_p.h
+++ b/src/render/lights/light_p.h
@@ -79,7 +79,6 @@ class RenderLightFunctor : public Qt3DCore::QBackendNodeMapper
public:
explicit RenderLightFunctor(AbstractRenderer *renderer, NodeManagers *managers);
- Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend) const Q_DECL_FINAL;
Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const Q_DECL_OVERRIDE;
Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const Q_DECL_FINAL;
void destroy(Qt3DCore::QNodeId id) const Q_DECL_FINAL;
diff --git a/src/render/materialsystem/shaderdata.cpp b/src/render/materialsystem/shaderdata.cpp
index c0cc7992b..d78ccc6d2 100644
--- a/src/render/materialsystem/shaderdata.cpp
+++ b/src/render/materialsystem/shaderdata.cpp
@@ -374,15 +374,6 @@ RenderShaderDataFunctor::RenderShaderDataFunctor(AbstractRenderer *renderer, Nod
{
}
-Qt3DCore::QBackendNode *RenderShaderDataFunctor::create(Qt3DCore::QNode *frontend) const
-{
- ShaderData *backend = m_managers->shaderDataManager()->getOrCreateResource(frontend->id());
- backend->setManagers(m_managers);
- backend->setPeer(frontend);
- backend->setRenderer(m_renderer);
- return backend;
-}
-
Qt3DCore::QBackendNode *RenderShaderDataFunctor::create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const
{
ShaderData *backend = m_managers->shaderDataManager()->getOrCreateResource(change->subjectId());
diff --git a/src/render/materialsystem/shaderdata_p.h b/src/render/materialsystem/shaderdata_p.h
index b9e7525c8..fe2573ba4 100644
--- a/src/render/materialsystem/shaderdata_p.h
+++ b/src/render/materialsystem/shaderdata_p.h
@@ -123,7 +123,6 @@ class RenderShaderDataFunctor : public Qt3DCore::QBackendNodeMapper
public:
explicit RenderShaderDataFunctor(AbstractRenderer *renderer, NodeManagers *managers);
- Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend) const Q_DECL_FINAL;
Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const Q_DECL_FINAL;
Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const Q_DECL_FINAL;
void destroy(Qt3DCore::QNodeId id) const Q_DECL_FINAL;
diff --git a/src/render/texture/texture.cpp b/src/render/texture/texture.cpp
index 7e1c9d47b..2b61d11ef 100644
--- a/src/render/texture/texture.cpp
+++ b/src/render/texture/texture.cpp
@@ -723,17 +723,6 @@ TextureFunctor::TextureFunctor(AbstractRenderer *renderer,
{
}
-Qt3DCore::QBackendNode *TextureFunctor::create(Qt3DCore::QNode *frontend) const
-{
- Texture *backend = m_textureManager->getOrCreateResource(frontend->id());
- backend->setTextureManager(m_textureManager);
- backend->setTextureImageManager(m_textureImageManager);
- backend->setTextureDataManager(m_textureDataManager);
- backend->setPeer(frontend);
- backend->setRenderer(m_renderer);
- return backend;
-}
-
Qt3DCore::QBackendNode *TextureFunctor::create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const
{
Texture *backend = m_textureManager->getOrCreateResource(change->subjectId());
diff --git a/src/render/texture/texture_p.h b/src/render/texture/texture_p.h
index d26ac060c..3bd7d2a0f 100644
--- a/src/render/texture/texture_p.h
+++ b/src/render/texture/texture_p.h
@@ -170,7 +170,6 @@ public:
TextureManager *textureManager,
TextureImageManager *textureImageManager,
TextureDataManager *textureDataManager);
- Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend) const Q_DECL_FINAL;
Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const Q_DECL_FINAL;
Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const Q_DECL_FINAL;
void destroy(Qt3DCore::QNodeId id) const Q_DECL_FINAL;
diff --git a/src/render/texture/textureimage.cpp b/src/render/texture/textureimage.cpp
index 94e4b3811..0c5af7b00 100644
--- a/src/render/texture/textureimage.cpp
+++ b/src/render/texture/textureimage.cpp
@@ -205,17 +205,6 @@ TextureImageFunctor::TextureImageFunctor(AbstractRenderer *renderer, TextureMana
{
}
-Qt3DCore::QBackendNode *TextureImageFunctor::create(Qt3DCore::QNode *frontend) const
-{
- TextureImage *backend = m_textureImageManager->getOrCreateResource(frontend->id());
- backend->setTextureManager(m_textureManager);
- backend->setTextureImageManager(m_textureImageManager);
- backend->setTextureDataManager(m_textureDataManager);
- backend->setPeer(frontend);
- backend->setRenderer(m_renderer);
- return backend;
-}
-
Qt3DCore::QBackendNode *TextureImageFunctor::create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const
{
TextureImage *backend = m_textureImageManager->getOrCreateResource(change->subjectId());
diff --git a/src/render/texture/textureimage_p.h b/src/render/texture/textureimage_p.h
index 986d73729..900ee208f 100644
--- a/src/render/texture/textureimage_p.h
+++ b/src/render/texture/textureimage_p.h
@@ -126,7 +126,6 @@ public:
TextureImageManager *textureImageManager,
TextureDataManager *textureDataManager);
- Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend) const Q_DECL_FINAL;
Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const Q_DECL_FINAL;
Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const Q_DECL_FINAL;
void destroy(Qt3DCore::QNodeId id) const Q_DECL_FINAL;