diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2016-04-30 09:25:39 +0100 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2016-05-01 23:42:06 +0000 |
commit | 7f0793ba6cb9f16aafa62df528af773370bf174d (patch) | |
tree | bfb2e4236de71d5be7af6349827e94abf3e930ed /src | |
parent | 0a662f9a2d8656e112e33172ab4f43c5ec5b1178 (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')
38 files changed, 0 insertions, 206 deletions
diff --git a/src/core/nodes/qbackendnode.h b/src/core/nodes/qbackendnode.h index ad7f8930c..90337c140 100644 --- a/src/core/nodes/qbackendnode.h +++ b/src/core/nodes/qbackendnode.h @@ -57,7 +57,6 @@ class QT3DCORESHARED_EXPORT QBackendNodeMapper { public: virtual ~QBackendNodeMapper() {} - virtual QBackendNode *create(QNode *frontend) const = 0; virtual QBackendNode *create(const QNodeCreatedChangeBasePtr &change) const = 0; virtual QBackendNode *get(QNodeId id) const = 0; virtual void destroy(QNodeId id) const = 0; diff --git a/src/input/backend/genericdevicebackendnode.cpp b/src/input/backend/genericdevicebackendnode.cpp index 04892b7d2..8e41def77 100644 --- a/src/input/backend/genericdevicebackendnode.cpp +++ b/src/input/backend/genericdevicebackendnode.cpp @@ -101,15 +101,6 @@ GenericDeviceBackendFunctor::GenericDeviceBackendFunctor(QInputAspect *inputaspe { } -Qt3DCore::QBackendNode *GenericDeviceBackendFunctor::create(Qt3DCore::QNode *frontend) const -{ - GenericDeviceBackendNode *backendNode = m_handler->genericDeviceBackendNodeManager()->getOrCreateResource(frontend->id()); - backendNode->setInputAspect(m_inputAspect); - backendNode->setPeer(frontend); - m_handler->appendGenericDevice(m_handler->genericDeviceBackendNodeManager()->lookupHandle(frontend->id())); - return backendNode; -} - Qt3DCore::QBackendNode *GenericDeviceBackendFunctor::create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const { GenericDeviceBackendNode *backendNode = m_handler->genericDeviceBackendNodeManager()->getOrCreateResource(change->subjectId()); diff --git a/src/input/backend/genericdevicebackendnode_p.h b/src/input/backend/genericdevicebackendnode_p.h index 8230ca360..5d17860a4 100644 --- a/src/input/backend/genericdevicebackendnode_p.h +++ b/src/input/backend/genericdevicebackendnode_p.h @@ -88,7 +88,6 @@ class GenericDeviceBackendFunctor : public Qt3DCore::QBackendNodeMapper public: explicit GenericDeviceBackendFunctor(QInputAspect *inputaspect, InputHandler *handler); - 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/input/backend/inputbackendnodefunctor_p.h b/src/input/backend/inputbackendnodefunctor_p.h index 184a4cc58..f72ad4d94 100644 --- a/src/input/backend/inputbackendnodefunctor_p.h +++ b/src/input/backend/inputbackendnodefunctor_p.h @@ -69,13 +69,6 @@ public: { } - Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend) const Q_DECL_FINAL - { - Backend *backend = m_manager->getOrCreateResource(frontend->id()); - backend->setPeer(frontend); - return backend; - } - Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const Q_DECL_FINAL { Backend *backend = m_manager->getOrCreateResource(change->subjectId()); diff --git a/src/input/backend/inputsettings.cpp b/src/input/backend/inputsettings.cpp index 7931d238e..301947abb 100644 --- a/src/input/backend/inputsettings.cpp +++ b/src/input/backend/inputsettings.cpp @@ -84,19 +84,6 @@ InputSettingsFunctor::InputSettingsFunctor(InputHandler *handler) { } -Qt3DCore::QBackendNode *InputSettingsFunctor::create(Qt3DCore::QNode *frontend) const -{ - if (m_handler->inputSettings() != nullptr) { - qWarning() << "Input settings already specified"; - return nullptr; - } - - InputSettings *settings = new InputSettings(); - settings->setPeer(frontend); - m_handler->setInputSettings(settings); - return settings; -} - Qt3DCore::QBackendNode *InputSettingsFunctor::create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const { Q_UNUSED(change); diff --git a/src/input/backend/inputsettings_p.h b/src/input/backend/inputsettings_p.h index c1c48c64b..46558229d 100644 --- a/src/input/backend/inputsettings_p.h +++ b/src/input/backend/inputsettings_p.h @@ -83,7 +83,6 @@ class InputSettingsFunctor : public Qt3DCore::QBackendNodeMapper public: explicit InputSettingsFunctor(InputHandler *handler); - 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/input/backend/keyboarddevice.cpp b/src/input/backend/keyboarddevice.cpp index 04832e6ea..c44cb3d60 100644 --- a/src/input/backend/keyboarddevice.cpp +++ b/src/input/backend/keyboarddevice.cpp @@ -455,16 +455,6 @@ KeyboardDeviceFunctor::KeyboardDeviceFunctor(QInputAspect *inputaspect, InputHan { } -Qt3DCore::QBackendNode *KeyboardDeviceFunctor::create(Qt3DCore::QNode *frontend) const -{ - KeyboardDevice *keyboardDevice = m_handler->keyboardDeviceManager()->getOrCreateResource(frontend->id()); - keyboardDevice->setInputAspect(m_inputAspect); - keyboardDevice->setInputHandler(m_handler); - keyboardDevice->setPeer(frontend); - m_handler->appendKeyboardDevice(m_handler->keyboardDeviceManager()->lookupHandle(frontend->id())); - return keyboardDevice; -} - Qt3DCore::QBackendNode *KeyboardDeviceFunctor::create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const { KeyboardDevice *keyboardDevice = m_handler->keyboardDeviceManager()->getOrCreateResource(change->subjectId()); diff --git a/src/input/backend/keyboarddevice_p.h b/src/input/backend/keyboarddevice_p.h index 1122a73d6..75437fdbb 100644 --- a/src/input/backend/keyboarddevice_p.h +++ b/src/input/backend/keyboarddevice_p.h @@ -275,7 +275,6 @@ class KeyboardDeviceFunctor : public Qt3DCore::QBackendNodeMapper public: explicit KeyboardDeviceFunctor(QInputAspect *inputaspect, InputHandler *handler); - 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/input/backend/keyboardhandler.cpp b/src/input/backend/keyboardhandler.cpp index f085e87d6..7731f42c2 100644 --- a/src/input/backend/keyboardhandler.cpp +++ b/src/input/backend/keyboardhandler.cpp @@ -160,14 +160,6 @@ KeyboardHandlerFunctor::KeyboardHandlerFunctor(InputHandler *handler) { } -QBackendNode *KeyboardHandlerFunctor::create(QNode *frontend) const -{ - KeyboardHandler *input = m_handler->keyboardInputManager()->getOrCreateResource(frontend->id()); - input->setInputHandler(m_handler); - input->setPeer(frontend); - return input; -} - Qt3DCore::QBackendNode *KeyboardHandlerFunctor::create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const { KeyboardHandler *input = m_handler->keyboardInputManager()->getOrCreateResource(change->subjectId()); diff --git a/src/input/backend/keyboardhandler_p.h b/src/input/backend/keyboardhandler_p.h index 5eaeae71e..495808a23 100644 --- a/src/input/backend/keyboardhandler_p.h +++ b/src/input/backend/keyboardhandler_p.h @@ -91,7 +91,6 @@ class KeyboardHandlerFunctor : public Qt3DCore::QBackendNodeMapper public: explicit KeyboardHandlerFunctor(InputHandler *handler); - 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/input/backend/logicaldevice.cpp b/src/input/backend/logicaldevice.cpp index b7b603fae..ccb6b5f37 100644 --- a/src/input/backend/logicaldevice.cpp +++ b/src/input/backend/logicaldevice.cpp @@ -116,15 +116,6 @@ LogicalDeviceNodeFunctor::LogicalDeviceNodeFunctor(LogicalDeviceManager *manager { } -Qt3DCore::QBackendNode *LogicalDeviceNodeFunctor::create(Qt3DCore::QNode *frontend) const -{ - HLogicalDevice handle = m_manager->getOrAcquireHandle(frontend->id()); - LogicalDevice *backend = m_manager->data(handle); - m_manager->addActiveDevice(handle); - backend->setPeer(frontend); - return backend; -} - Qt3DCore::QBackendNode *LogicalDeviceNodeFunctor::create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const { HLogicalDevice handle = m_manager->getOrAcquireHandle(change->subjectId()); diff --git a/src/input/backend/logicaldevice_p.h b/src/input/backend/logicaldevice_p.h index 1c26361ba..dec5a78ef 100644 --- a/src/input/backend/logicaldevice_p.h +++ b/src/input/backend/logicaldevice_p.h @@ -87,7 +87,6 @@ class LogicalDeviceNodeFunctor : public Qt3DCore::QBackendNodeMapper public: explicit LogicalDeviceNodeFunctor(LogicalDeviceManager *manager); - 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/input/backend/mousedevice.cpp b/src/input/backend/mousedevice.cpp index 4b37c9854..07f7c1017 100644 --- a/src/input/backend/mousedevice.cpp +++ b/src/input/backend/mousedevice.cpp @@ -149,16 +149,6 @@ MouseDeviceFunctor::MouseDeviceFunctor(QInputAspect *inputAspect, InputHandler * { } -Qt3DCore::QBackendNode *MouseDeviceFunctor::create(Qt3DCore::QNode *frontend) const -{ - MouseDevice *controller = m_handler->mouseDeviceManager()->getOrCreateResource(frontend->id()); - controller->setInputAspect(m_inputAspect); - controller->setInputHandler(m_handler); - controller->setPeer(frontend); - m_handler->appendMouseDevice(m_handler->mouseDeviceManager()->lookupHandle(frontend->id())); - return controller; -} - Qt3DCore::QBackendNode *MouseDeviceFunctor::create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const { MouseDevice *controller = m_handler->mouseDeviceManager()->getOrCreateResource(change->subjectId()); diff --git a/src/input/backend/mousedevice_p.h b/src/input/backend/mousedevice_p.h index c4cd7f4d4..fdb6b157e 100644 --- a/src/input/backend/mousedevice_p.h +++ b/src/input/backend/mousedevice_p.h @@ -117,7 +117,6 @@ class MouseDeviceFunctor : public Qt3DCore::QBackendNodeMapper public: explicit MouseDeviceFunctor(Qt3DInput::QInputAspect *inputAspect, InputHandler *handler); - 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/input/backend/mousehandler.cpp b/src/input/backend/mousehandler.cpp index dceca731d..12da2be8c 100644 --- a/src/input/backend/mousehandler.cpp +++ b/src/input/backend/mousehandler.cpp @@ -141,14 +141,6 @@ MouseHandlerFunctor::MouseHandlerFunctor(InputHandler *handler) { } -Qt3DCore::QBackendNode *MouseHandlerFunctor::create(Qt3DCore::QNode *frontend) const -{ - MouseHandler *input = m_handler->mouseInputManager()->getOrCreateResource(frontend->id()); - input->setInputHandler(m_handler); - input->setPeer(frontend); - return input; -} - Qt3DCore::QBackendNode *MouseHandlerFunctor::create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const { MouseHandler *input = m_handler->mouseInputManager()->getOrCreateResource(change->subjectId()); diff --git a/src/input/backend/mousehandler_p.h b/src/input/backend/mousehandler_p.h index b56969e0a..7faca5da7 100644 --- a/src/input/backend/mousehandler_p.h +++ b/src/input/backend/mousehandler_p.h @@ -89,7 +89,6 @@ class MouseHandlerFunctor : public Qt3DCore::QBackendNodeMapper public: explicit MouseHandlerFunctor(InputHandler *handler); - 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/logic/handler.cpp b/src/logic/handler.cpp index a4f727efc..e1a8a6b34 100644 --- a/src/logic/handler.cpp +++ b/src/logic/handler.cpp @@ -73,15 +73,6 @@ HandlerFunctor::HandlerFunctor(Manager *manager) { } -Qt3DCore::QBackendNode *HandlerFunctor::create(Qt3DCore::QNode *frontend) const -{ - Handler *handler = m_manager->logicHandlerManager()->getOrCreateResource(frontend->id()); - handler->setManager(m_manager); - handler->setPeer(frontend); - m_manager->appendHandler(handler); - return handler; -} - Qt3DCore::QBackendNode *HandlerFunctor::create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const { Handler *handler = m_manager->logicHandlerManager()->getOrCreateResource(change->subjectId()); diff --git a/src/logic/handler_p.h b/src/logic/handler_p.h index 96ce17f5d..b3eaff7db 100644 --- a/src/logic/handler_p.h +++ b/src/logic/handler_p.h @@ -87,7 +87,6 @@ class HandlerFunctor : public Qt3DCore::QBackendNodeMapper public: explicit HandlerFunctor(Manager *handler); - 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/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; |