diff options
author | Paul Lemire <paul.lemire@kdab.com> | 2015-12-09 10:41:24 +0100 |
---|---|---|
committer | Paul Lemire <paul.lemire@kdab.com> | 2016-01-13 14:02:58 +0000 |
commit | 66718d16888a62196d0d235ea3891bc76fe517bd (patch) | |
tree | 68c715055a52b019caa96c1ac2d604fa56ec3fae | |
parent | 84ca67b504b6d8a4825988681dd4d49031805c96 (diff) |
QComputeJob component added
Change-Id: Iac662f21ca399c6998cff37eeac1f165b34a9c28
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
-rw-r--r-- | src/render/frontend/qcomputejob.cpp | 73 | ||||
-rw-r--r-- | src/render/frontend/qcomputejob.h | 74 | ||||
-rw-r--r-- | src/render/frontend/qcomputejob_p.h | 68 | ||||
-rw-r--r-- | src/render/frontend/render-frontend.pri | 7 |
4 files changed, 220 insertions, 2 deletions
diff --git a/src/render/frontend/qcomputejob.cpp b/src/render/frontend/qcomputejob.cpp new file mode 100644 index 000000000..1bc436c3e --- /dev/null +++ b/src/render/frontend/qcomputejob.cpp @@ -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$ +** +****************************************************************************/ + +#include "qcomputejob.h" +#include "qcomputejob_p.h" + +QT_BEGIN_NAMESPACE + +namespace Qt3DRender { + +QComputeJobPrivate::QComputeJobPrivate() + : Qt3DCore::QComponentPrivate() +{ +} + +QComputeJob::QComputeJob(Qt3DCore::QNode *parent) + : Qt3DCore::QComponent(*new QComputeJobPrivate, parent) +{ +} + +QComputeJob::QComputeJob(QComputeJobPrivate &dd, Qt3DCore::QNode *parent) + : Qt3DCore::QComponent(dd, parent) +{ +} + +QComputeJob::~QComputeJob() +{ + QNode::cleanup(); +} + +void QComputeJob::copy(const QNode *ref) +{ + QComponent::copy(ref); + const QComputeJob *object = static_cast<const QComputeJob *>(ref); + Q_UNUSED(object); +} + +} // Render + +QT_END_NAMESPACE diff --git a/src/render/frontend/qcomputejob.h b/src/render/frontend/qcomputejob.h new file mode 100644 index 000000000..e4362e449 --- /dev/null +++ b/src/render/frontend/qcomputejob.h @@ -0,0 +1,74 @@ +/**************************************************************************** +** +** 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_QCOMPUTEJOB_H +#define QT3DRENDER_QCOMPUTEJOB_H + +#include <Qt3DCore/qcomponent.h> +#include <Qt3DRender/qt3drender_global.h> + +QT_BEGIN_NAMESPACE + +namespace Qt3DRender { + +class QComputeJobPrivate; + +class QT3DRENDERSHARED_EXPORT QComputeJob : public Qt3DCore::QComponent +{ + Q_OBJECT + +public: + explicit QComputeJob(Qt3DCore::QNode *parent = 0); + ~QComputeJob(); + +public Q_SLOTS: + +Q_SIGNALS: + +protected: + Q_DECLARE_PRIVATE(QComputeJob) + QComputeJob(QComputeJobPrivate &dd, Qt3DCore::QNode *parent = 0); + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; + +private: + QT3D_CLONEABLE(QComputeJob) +}; + +} // Qt3DRender + +QT_END_NAMESPACE + +#endif // QT3DRENDER_QCOMPUTEJOB_H diff --git a/src/render/frontend/qcomputejob_p.h b/src/render/frontend/qcomputejob_p.h new file mode 100644 index 000000000..e907fa820 --- /dev/null +++ b/src/render/frontend/qcomputejob_p.h @@ -0,0 +1,68 @@ +/**************************************************************************** +** +** 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_QCOMPUTEJOB_P_H +#define QT3DRENDER_QCOMPUTEJOB_P_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/private/qcomponent_p.h> + +QT_BEGIN_NAMESPACE + +namespace Qt3DRender { + +class QComputeJobPrivate : public Qt3DCore::QComponentPrivate +{ +public: + QComputeJobPrivate(); + +}; + +} // Qt3DRender + +QT_END_NAMESPACE + +#endif // QT3DRENDER_QCOMPUTEJOB_P_H diff --git a/src/render/frontend/render-frontend.pri b/src/render/frontend/render-frontend.pri index d20f89a56..06dd7e3f5 100644 --- a/src/render/frontend/render-frontend.pri +++ b/src/render/frontend/render-frontend.pri @@ -14,7 +14,9 @@ HEADERS += \ $$PWD/qwindow.h \ $$PWD/qwindow_p.h \ $$PWD/sphere_p.h \ - $$PWD/qboundingvolumedebug.h + $$PWD/qboundingvolumedebug.h \ + $$PWD/qcomputejob.h \ + $$PWD/qcomputejob_p.h SOURCES += \ $$PWD/qabstractfunctor.cpp \ @@ -25,4 +27,5 @@ SOURCES += \ $$PWD/qrenderattachment.cpp \ $$PWD/qrendertarget.cpp \ $$PWD/qwindow.cpp \ - $$PWD/qboundingvolumedebug.cpp + $$PWD/qboundingvolumedebug.cpp \ + $$PWD/qcomputejob.cpp |