diff options
author | Svenn-Arne Dragly <s@dragly.com> | 2019-02-19 10:22:59 +0100 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2019-03-21 12:57:55 +0000 |
commit | b35009fa7ac4c98f79cffaf5e538b4e525212343 (patch) | |
tree | 114e6effc4bdd3303c2085bdc50ebf09e9c853da /src/runtime/dragon/jobs | |
parent | 8d04fda51ae00cdb8f6aa1eb68ade24aea1750ac (diff) |
Dragon: Properly handle enabled state for backend nodes
Previously, different nodes handled their enabled property
independently. This change makes sure any BackendNode object
handles the enabled property in the same way
Change-Id: Id8b7485f1e9a72fe38f9d5095ba48ae27d5eb6e0
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/runtime/dragon/jobs')
-rw-r--r-- | src/runtime/dragon/jobs/dragonboundingvolumejobs.cpp | 2 | ||||
-rw-r--r-- | src/runtime/dragon/jobs/dragonrenderviewjobs.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/runtime/dragon/jobs/dragonboundingvolumejobs.cpp b/src/runtime/dragon/jobs/dragonboundingvolumejobs.cpp index 2e1b321..e996c7d 100644 --- a/src/runtime/dragon/jobs/dragonboundingvolumejobs.cpp +++ b/src/runtime/dragon/jobs/dragonboundingvolumejobs.cpp @@ -205,7 +205,7 @@ LocalBoundingVolumes calculateLocalBoundingVolumes(LocalBoundingVolumes localBou result.geometryRendererId = entity->m_geometryRendererComponent; } - if (!entity->m_enabled) + if (!entity->isEnabled()) return result; if (result.geometryRendererId.isNull()) diff --git a/src/runtime/dragon/jobs/dragonrenderviewjobs.cpp b/src/runtime/dragon/jobs/dragonrenderviewjobs.cpp index 6371cf9..3f67116 100644 --- a/src/runtime/dragon/jobs/dragonrenderviewjobs.cpp +++ b/src/runtime/dragon/jobs/dragonrenderviewjobs.cpp @@ -729,7 +729,7 @@ RenderCommands buildDrawRenderCommands(RenderCommands renderCommands, continue; // TODO consider if this is the correct behavior (to hide when disabled) - if (!entity->m_enabled) + if (!entity->isEnabled()) continue; bool accepted = true; @@ -1119,7 +1119,7 @@ GatheredParameters gatherMaterialParameters(GatheredParameters gatherResult, result = update(std::move(result), technique->parameters()); for (const auto &renderPass : passes) { - if (!renderPass->m_enabled) + if (!renderPass->isEnabled()) continue; RenderPassParameterIds renderPassParameterIds; renderPassParameterIds.renderPass = renderPass; |