diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2016-04-13 09:40:47 +0200 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2016-04-15 09:22:11 +0000 |
| commit | 325cd990024ebcdb2a5e179bca9c138d13c35b91 (patch) | |
| tree | 9f1b80d7ca923909e0946f46989f045cff6a2ab8 /src/render/geometry/geometryrenderer.cpp | |
| parent | 478da800a91c2d407f23d7044043ce66e1df0878 (diff) | |
GeometryRenderer: use m_enabled member from base class
Unit test updated accordingly
Change-Id: I3a0e01250f0b4d56f13f0a5038b5699ee369cce0
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/geometry/geometryrenderer.cpp')
| -rw-r--r-- | src/render/geometry/geometryrenderer.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/render/geometry/geometryrenderer.cpp b/src/render/geometry/geometryrenderer.cpp index 0c0bb1cc8..a9af8fd41 100644 --- a/src/render/geometry/geometryrenderer.cpp +++ b/src/render/geometry/geometryrenderer.cpp @@ -63,7 +63,6 @@ GeometryRenderer::GeometryRenderer() , m_primitiveRestartEnabled(false) , m_primitiveType(QGeometryRenderer::Triangles) , m_dirty(false) - , m_enabled(true) , m_manager(Q_NULLPTR) { } @@ -84,7 +83,6 @@ void GeometryRenderer::cleanup() m_primitiveType = QGeometryRenderer::Triangles; m_geometryId = Qt3DCore::QNodeId(); m_dirty = false; - m_enabled = true; m_geometryFactory.reset(); qDeleteAll(m_triangleVolumes); m_triangleVolumes.clear(); @@ -107,7 +105,6 @@ void GeometryRenderer::updateFromPeer(Qt3DCore::QNode *peer) m_verticesPerPatch = geometryRenderer->verticesPerPatch(); m_primitiveRestartEnabled = geometryRenderer->primitiveRestartEnabled(); m_primitiveType = geometryRenderer->primitiveType(); - m_enabled = geometryRenderer->isEnabled(); if (geometryRenderer->geometry() != Q_NULLPTR) m_geometryId = geometryRenderer->geometry()->id(); m_geometryFactory = geometryRenderer->geometryFactory(); @@ -130,7 +127,6 @@ void GeometryRenderer::initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBase m_verticesPerPatch = data.verticesPerPatch; m_primitiveRestartEnabled = data.primitiveRestart; m_primitiveType = data.primitiveType; - m_enabled = change->isNodeEnabled(); Q_ASSERT(m_manager); m_geometryFactory = data.geometryFactory; @@ -168,8 +164,6 @@ void GeometryRenderer::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) } else if (propertyName == QByteArrayLiteral("primitiveRestartEnabled")) { m_primitiveRestartEnabled = propertyChange->value().value<bool>(); m_dirty = true; - } else if (propertyName == QByteArrayLiteral("enabled")) { - m_enabled = propertyChange->value().value<bool>(); } else if (propertyName == QByteArrayLiteral("primitiveType")) { m_primitiveType = static_cast<QGeometryRenderer::PrimitiveType>(propertyChange->value().value<int>()); m_dirty = true; @@ -211,6 +205,8 @@ void GeometryRenderer::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) markDirty(AbstractRenderer::AllDirty); + BackendNode::sceneChangeEvent(e); + // Add to dirty list in manager } |