diff options
Diffstat (limited to 'src/render/jobs/updateworldtransformjob.cpp')
| -rw-r--r-- | src/render/jobs/updateworldtransformjob.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/render/jobs/updateworldtransformjob.cpp b/src/render/jobs/updateworldtransformjob.cpp index 13e14442f..12582c297 100644 --- a/src/render/jobs/updateworldtransformjob.cpp +++ b/src/render/jobs/updateworldtransformjob.cpp @@ -42,7 +42,6 @@ #include <Qt3DCore/qtransform.h> #include <Qt3DCore/private/qtransform_p.h> #include <Qt3DCore/private/qaspectmanager_p.h> -#include <Qt3DRender/private/renderer_p.h> #include <Qt3DRender/private/entity_p.h> #include <Qt3DRender/private/transform_p.h> #include <Qt3DRender/private/renderlogging_p.h> @@ -65,11 +64,13 @@ struct TransformUpdate QMatrix4x4 worldTransformMatrix; }; -QVector<TransformUpdate> updateWorldTransformAndBounds(NodeManagers *manager, Entity *node, const Matrix4x4 &parentTransform) +void updateWorldTransformAndBounds(NodeManagers *manager, Entity *node, const Matrix4x4 &parentTransform, QVector<TransformUpdate> &updatedTransforms) { + if (!node->isEnabled()) + return; + Matrix4x4 worldTransform(parentTransform); Transform *nodeTransform = node->renderComponent<Transform>(); - QVector<TransformUpdate> updatedTransforms; const bool hasTransformComponent = nodeTransform != nullptr && nodeTransform->isEnabled(); if (hasTransformComponent) @@ -85,9 +86,8 @@ QVector<TransformUpdate> updateWorldTransformAndBounds(NodeManagers *manager, En for (const HEntity &handle : childrenHandles) { Entity *child = manager->renderNodesManager()->data(handle); if (child) - updatedTransforms += updateWorldTransformAndBounds(manager, child, worldTransform); + updateWorldTransformAndBounds(manager, child, worldTransform, updatedTransforms); } - return updatedTransforms; } } @@ -108,7 +108,7 @@ UpdateWorldTransformJob::UpdateWorldTransformJob() , m_node(nullptr) , m_manager(nullptr) { - SET_JOB_RUN_STAT_TYPE(this, JobTypes::UpdateTransform, 0); + SET_JOB_RUN_STAT_TYPE(this, JobTypes::UpdateTransform, 0) } void UpdateWorldTransformJob::setRoot(Entity *root) @@ -137,7 +137,7 @@ void UpdateWorldTransformJob::run() Entity *parent = m_node->parent(); if (parent != nullptr) parentTransform = *(parent->worldTransform()); - d->m_updatedTransforms = updateWorldTransformAndBounds(m_manager, m_node, parentTransform); + updateWorldTransformAndBounds(m_manager, m_node, parentTransform, d->m_updatedTransforms); qCDebug(Jobs) << "Exiting" << Q_FUNC_INFO << QThread::currentThread(); } |