summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2015-12-09 10:56:49 +0100
committerPaul Lemire <paul.lemire@kdab.com>2016-01-13 14:03:33 +0000
commitd62bc4245ee49d5a77c61376d851766b45e2097e (patch)
treef6af0c493c0a5b3baae38985a962ca457d564dec
parent66718d16888a62196d0d235ea3891bc76fe517bd (diff)
ComputeJob: backend for QComputeJob
Change-Id: I13fb35d0e6d31275463034c3e4bdd92c3f528a4e Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
-rw-r--r--src/render/backend/computejob.cpp80
-rw-r--r--src/render/backend/computejob_p.h73
-rw-r--r--src/render/backend/render-backend.pri6
3 files changed, 157 insertions, 2 deletions
diff --git a/src/render/backend/computejob.cpp b/src/render/backend/computejob.cpp
new file mode 100644
index 000000000..40de42666
--- /dev/null
+++ b/src/render/backend/computejob.cpp
@@ -0,0 +1,80 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 Klaralvdalens Datakonsult AB (KDAB).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the Qt3D module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** 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 http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://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.LGPLv3 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.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 later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "computejob_p.h"
+#include <Qt3DCore/qnode.h>
+#include <Qt3DCore/qscenepropertychange.h>
+
+QT_BEGIN_NAMESPACE
+
+namespace Qt3DRender {
+
+namespace Render {
+
+ComputeJob::ComputeJob()
+ : QBackendNode(ReadOnly)
+ , m_enabled(false)
+{
+}
+
+ComputeJob::~ComputeJob()
+{
+}
+
+void ComputeJob::cleanup()
+{
+ m_enabled = false;
+}
+
+void ComputeJob::updateFromPeer(Qt3DCore::QNode *peer)
+{
+ m_enabled = peer->isEnabled();
+}
+
+void ComputeJob::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
+{
+ Qt3DCore::QScenePropertyChangePtr propertyChange = qSharedPointerCast<Qt3DCore::QScenePropertyChange>(e);
+ if (e->type() == Qt3DCore::NodeUpdated) {
+ if (propertyChange->propertyName() == QByteArrayLiteral("enabled"))
+ m_enabled = propertyChange->value().toBool();
+ }
+}
+
+} // Render
+
+} // Qt3DRender
+
+QT_END_NAMESPACE
diff --git a/src/render/backend/computejob_p.h b/src/render/backend/computejob_p.h
new file mode 100644
index 000000000..0347e6088
--- /dev/null
+++ b/src/render/backend/computejob_p.h
@@ -0,0 +1,73 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 Klaralvdalens Datakonsult AB (KDAB).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the Qt3D module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** 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 http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://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.LGPLv3 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.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 later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QT3DRENDER_RENDER_COMPUTEJOB_P_H
+#define QT3DRENDER_RENDER_COMPUTEJOB_P_H
+
+#include <Qt3DCore/qbackendnode.h>
+
+QT_BEGIN_NAMESPACE
+
+namespace Qt3DRender {
+
+namespace Render {
+
+class ComputeJobPrivate;
+
+class Q_AUTOTEST_EXPORT ComputeJob : public Qt3DCore::QBackendNode
+{
+public:
+ ComputeJob();
+ ~ComputeJob();
+
+ void cleanup();
+
+ void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE;
+ void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+
+ inline bool isEnabled() const { return m_enabled; }
+
+private:
+ bool m_enabled;
+};
+
+} // Render
+
+} // Qt3DRender
+
+QT_END_NAMESPACE
+
+#endif // QT3DRENDER_RENDER_COMPUTEJOB_P_H
diff --git a/src/render/backend/render-backend.pri b/src/render/backend/render-backend.pri
index e77feaa48..9f90ad7b8 100644
--- a/src/render/backend/render-backend.pri
+++ b/src/render/backend/render-backend.pri
@@ -27,7 +27,8 @@ HEADERS += \
$$PWD/triangleboundingvolume_p.h \
$$PWD/openglvertexarrayobject_p.h \
$$PWD/trianglesextractor_p.h \
- $$PWD/abstractrenderer_p.h
+ $$PWD/abstractrenderer_p.h \
+ $$PWD/computejob_p.h
SOURCES += \
$$PWD/renderthread.cpp \
@@ -49,4 +50,5 @@ SOURCES += \
$$PWD/boundingvolumedebug.cpp \
$$PWD/nodemanagers.cpp \
$$PWD/triangleboundingvolume.cpp \
- $$PWD/trianglesextractor.cpp
+ $$PWD/trianglesextractor.cpp \
+ $$PWD/computejob.cpp