diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2016-04-13 08:40:47 +0200 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2016-04-15 09:21:21 +0000 |
| commit | ef773c1cb728d2c1bf3a6b94c0fff64a7c8b6af4 (patch) | |
| tree | 7b64f097f419f8f9222d6bf0dfaaeb8882d6e90b /src/render/backend/entity.cpp | |
| parent | 02d6d2a6ef858efae2271f06826bf0f7992e0320 (diff) | |
Entity: use m_enabled member from QBackendNode
Also make sceneChangeEvent call BackendNode::sceneChangeEvent
Change-Id: Ic5be546dadc116af07f02cfe39c4bcfb76d2281a
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/backend/entity.cpp')
| -rw-r--r-- | src/render/backend/entity.cpp | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/src/render/backend/entity.cpp b/src/render/backend/entity.cpp index f973e6e8d..302186483 100644 --- a/src/render/backend/entity.cpp +++ b/src/render/backend/entity.cpp @@ -72,7 +72,6 @@ namespace Render { Entity::Entity() : BackendNode() , m_nodeManagers(Q_NULLPTR) - , m_enabled(true) , m_boundingDirty(false) { } @@ -114,8 +113,8 @@ void Entity::cleanup() m_localBoundingVolume.reset(); m_worldBoundingVolume.reset(); m_worldBoundingVolumeWithChildren.reset(); - m_enabled = true; m_boundingDirty = false; + QBackendNode::setEnabled(false); } void Entity::setParentHandle(HEntity parentHandle) @@ -172,8 +171,6 @@ void Entity::updateFromPeer(Qt3DCore::QNode *peer) } else { qCDebug(Render::RenderNodes) << Q_FUNC_INFO << "No parent entity found for Entity" << peerId(); } - - m_enabled = entity->isEnabled(); } void Entity::initializeFromPeer(const QNodeCreatedChangeBasePtr &change) @@ -211,8 +208,6 @@ void Entity::initializeFromPeer(const QNodeCreatedChangeBasePtr &change) setParentHandle(m_nodeManagers->renderNodesManager()->lookupHandle(parentEntityId)); else qCDebug(Render::RenderNodes) << Q_FUNC_INFO << "No parent entity found for Entity" << peerId(); - - m_enabled = change->isNodeEnabled(); } void Entity::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) @@ -235,16 +230,11 @@ void Entity::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) break; } - case NodeUpdated: { - if (propertyChange->propertyName() == QByteArrayLiteral("enabled")) - m_enabled = propertyChange->value().value<bool>(); - break; - } - default: break; } markDirty(AbstractRenderer::AllDirty); + BackendNode::sceneChangeEvent(e); } void Entity::dump() const @@ -388,16 +378,6 @@ void Entity::removeComponent(Qt3DCore::QNodeId nodeId) } } -bool Entity::isEnabled() const -{ - return m_enabled; -} - -void Entity::setEnabled(bool isEnabled) -{ - m_enabled = isEnabled; -} - bool Entity::isBoundingVolumeDirty() const { return m_boundingDirty; |