Add UpdateWorldBoundingVolumeJob

Change-Id: I3036d05afa36d311f77c517796db88c89f48c92f
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

4 files changed, 164 insertions, 3 deletions

diff --git a/src/render/jobs/job_common_p.h b/src/render/jobs/job_common_p.h
index 60f3153a0..0401d9abd 100644
--- a/src/render/jobs/job_common_p.h
+++ b/src/render/jobs/job_common_p.h
@@ -81,7 +81,8 @@ namespace JobTypes {
         RenderViewBuilder,
         GenericLambda,
         FrustumCulling,
-        LightGathering
+        LightGathering,
+        UpdateWorldBoundingVolume
     };
 
 } // JobTypes
diff --git a/src/render/jobs/jobs.pri b/src/render/jobs/jobs.pri
index 8241b8a97..a970f2efc 100644
--- a/src/render/jobs/jobs.pri
+++ b/src/render/jobs/jobs.pri
@@ -21,7 +21,8 @@ HEADERS += \
     $$PWD/renderviewinitializerjob_p.h \
     $$PWD/frustumcullingjob_p.h \
     $$PWD/lightgatherer_p.h \
-    $$PWD/expandboundingvolumejob_p.h
+    $$PWD/expandboundingvolumejob_p.h \
+    $$PWD/updateworldboundingvolumejob_p.h
 
 SOURCES += \
     $$PWD/updateworldtransformjob.cpp \
@@ -41,4 +42,5 @@ SOURCES += \
     $$PWD/renderviewinitializerjob.cpp \
     $$PWD/frustumcullingjob.cpp \
     $$PWD/lightgatherer.cpp \
-    $$PWD/expandboundingvolumejob.cpp
+    $$PWD/expandboundingvolumejob.cpp \
+    $$PWD/updateworldboundingvolumejob.cpp
diff --git a/src/render/jobs/updateworldboundingvolumejob.cpp b/src/render/jobs/updateworldboundingvolumejob.cpp
new file mode 100644
index 000000000..8696f4ca6
--- /dev/null
+++ b/src/render/jobs/updateworldboundingvolumejob.cpp
@@ -0,0 +1,72 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB).
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the Qt3D module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "updateworldboundingvolumejob_p.h"
+#include <Qt3DRender/private/job_common_p.h>
+#include <Qt3DRender/private/managers_p.h>
+#include <Qt3DRender/private/entity_p.h>
+#include <Qt3DRender/private/sphere_p.h>
+
+QT_BEGIN_NAMESPACE
+
+namespace Qt3DRender {
+namespace Render {
+
+UpdateWorldBoundingVolumeJob::UpdateWorldBoundingVolumeJob()
+    : Qt3DCore::QAspectJob()
+    , m_manager(nullptr)
+{
+    SET_JOB_RUN_STAT_TYPE(this, JobTypes::UpdateWorldBoundingVolume, 0);
+}
+
+void UpdateWorldBoundingVolumeJob::run()
+{
+    const QVector<HEntity> handles = m_manager->activeHandles();
+
+    for (const HEntity handle : handles) {
+        Entity *node = m_manager->data(handle);
+        *(node->worldBoundingVolume()) = node->localBoundingVolume()->transformed(*(node->worldTransform()));
+        *(node->worldBoundingVolumeWithChildren()) = *(node->worldBoundingVolume()); // expanded in UpdateBoundingVolumeJob
+    }
+}
+
+} // namespace Render
+} // namespace Qt3DRender
+
+QT_END_NAMESPACE
diff --git a/src/render/jobs/updateworldboundingvolumejob_p.h b/src/render/jobs/updateworldboundingvolumejob_p.h
new file mode 100644
index 000000000..06e8f1005
--- /dev/null
+++ b/src/render/jobs/updateworldboundingvolumejob_p.h
@@ -0,0 +1,86 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB).
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the Qt3D module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QT3DRENDER_RENDER_UPDATEWORLDBOUNDINGVOLUMEJOB_H
+#define QT3DRENDER_RENDER_UPDATEWORLDBOUNDINGVOLUMEJOB_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of other Qt classes.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <Qt3DCore/qaspectjob.h>
+#include <Qt3DRender/private/qt3drender_global_p.h>
+#include <QSharedPointer>
+
+QT_BEGIN_NAMESPACE
+
+namespace Qt3DRender {
+namespace Render {
+
+class EntityManager;
+
+class QT3DRENDERSHARED_PRIVATE_EXPORT UpdateWorldBoundingVolumeJob : public Qt3DCore::QAspectJob
+{
+public:
+    UpdateWorldBoundingVolumeJob();
+
+    inline void setManager(EntityManager *manager) Q_DECL_NOTHROW { m_manager = manager; }
+
+protected:
+    void run() Q_DECL_OVERRIDE;
+
+private:
+    EntityManager *m_manager;
+};
+
+typedef QSharedPointer<UpdateWorldBoundingVolumeJob> UpdateWorldBoundingVolumeJobPtr;
+
+} // namespace Render
+} // namespace Qt3DRender
+
+QT_END_NAMESPACE
+
+#endif // QT3DRENDER_RENDER_UPDATEWORLDBOUNDINGVOLUMEJOB_H