diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2016-04-19 17:16:52 +0100 |
---|---|---|
committer | Paul Lemire <paul.lemire@kdab.com> | 2016-04-29 16:22:24 +0000 |
commit | 948d0357850918596b56f38a6dc6e25cd186f5a0 (patch) | |
tree | 2a522442757660b6eadecd3a6decde1f34ab5740 /src/render/geometry/qgeometryrenderer.cpp | |
parent | ae5ac1128bc61176f797f6e248d18b9ced051ad9 (diff) |
Strip out cloning subsystem
Change-Id: I4def54a11de0f9c676ef6b2d7bd8e723ded25ab9
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/geometry/qgeometryrenderer.cpp')
-rw-r--r-- | src/render/geometry/qgeometryrenderer.cpp | 40 |
1 files changed, 11 insertions, 29 deletions
diff --git a/src/render/geometry/qgeometryrenderer.cpp b/src/render/geometry/qgeometryrenderer.cpp index aa6d96043..6aad35710 100644 --- a/src/render/geometry/qgeometryrenderer.cpp +++ b/src/render/geometry/qgeometryrenderer.cpp @@ -404,37 +404,19 @@ void QGeometryRenderer::setGeometryFactory(const QGeometryFactoryPtr &factory) /*! * \internal */ -void QGeometryRenderer::copy(const QNode *ref) -{ - QComponent::copy(ref); - const QGeometryRenderer *other = static_cast<const QGeometryRenderer *>(ref); - d_func()->m_instanceCount = other->d_func()->m_instanceCount; - d_func()->m_vertexCount = other->d_func()->m_vertexCount; - d_func()->m_indexOffset = other->d_func()->m_indexOffset; - d_func()->m_firstInstance = other->d_func()->m_firstInstance; - d_func()->m_restartIndexValue = other->d_func()->m_restartIndexValue; - d_func()->m_primitiveRestart = other->d_func()->m_primitiveRestart; - d_func()->m_primitiveType = other->d_func()->m_primitiveType; - d_func()->m_verticesPerPatch = other->d_func()->m_verticesPerPatch; - d_func()->m_geometry = static_cast<QGeometry *>(QNode::clone(other->d_func()->m_geometry)); - d_func()->m_geometryFactory = other->d_func()->m_geometryFactory; -} - -/*! - * \internal - */ void QGeometryRenderer::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { - Q_D(QGeometryRenderer); - QNodePropertyChangePtr change = qSharedPointerCast<QNodePropertyChange>(e); - if (change->type() == NodeUpdated && change->propertyName() == QByteArrayLiteral("geometry")) { - QNodePtr nodePtr = change->value().value<QNodePtr>(); - QGeometry *backendGeometry = static_cast<QGeometry *>(nodePtr.data()); - QGeometry *frontendGeometry = static_cast<QGeometry *>(QNode::clone(backendGeometry)); - if (frontendGeometry != Q_NULLPTR) - d->insertTree(frontendGeometry); - setGeometry(frontendGeometry); - } + // TODO: Avoid cloning here +// Q_D(QGeometryRenderer); +// QScenePropertyChangePtr change = qSharedPointerCast<QScenePropertyChange>(e); +// if (change->type() == NodeUpdated && change->propertyName() == QByteArrayLiteral("geometry")) { +// QNodePtr nodePtr = change->value().value<QNodePtr>(); +// QGeometry *backendGeometry = static_cast<QGeometry *>(nodePtr.data()); +// QGeometry *frontendGeometry = static_cast<QGeometry *>(QNode::clone(backendGeometry)); +// if (frontendGeometry != Q_NULLPTR) +// d->insertTree(frontendGeometry); +// setGeometry(frontendGeometry); +// } } Qt3DCore::QNodeCreatedChangeBasePtr QGeometryRenderer::createNodeCreationChange() const |