diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2016-01-15 10:58:32 +0000 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2016-01-17 17:20:39 +0000 |
commit | 022e920cac539cdb94a7c9002737f4ecf3e0d3a2 (patch) | |
tree | 628eb539dec3f2825edcf7e20fb42449314e9fea | |
parent | 451fb9873a37e15d43e34cc714ddfc5bb917ea2e (diff) |
Add backend for renderer settings
Change-Id: I7e87cb106681c384a1b431a362fa904afafb877a
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
-rw-r--r-- | src/render/backend/render-backend.pri | 6 | ||||
-rw-r--r-- | src/render/backend/renderersettings.cpp | 80 | ||||
-rw-r--r-- | src/render/backend/renderersettings_p.h | 78 |
3 files changed, 162 insertions, 2 deletions
diff --git a/src/render/backend/render-backend.pri b/src/render/backend/render-backend.pri index 9f90ad7b8..b6c4a77a5 100644 --- a/src/render/backend/render-backend.pri +++ b/src/render/backend/render-backend.pri @@ -28,7 +28,8 @@ HEADERS += \ $$PWD/openglvertexarrayobject_p.h \ $$PWD/trianglesextractor_p.h \ $$PWD/abstractrenderer_p.h \ - $$PWD/computejob_p.h + $$PWD/computejob_p.h \ + $$PWD/renderersettings_p.h SOURCES += \ $$PWD/renderthread.cpp \ @@ -51,4 +52,5 @@ SOURCES += \ $$PWD/nodemanagers.cpp \ $$PWD/triangleboundingvolume.cpp \ $$PWD/trianglesextractor.cpp \ - $$PWD/computejob.cpp + $$PWD/computejob.cpp \ + $$PWD/renderersettings.cpp diff --git a/src/render/backend/renderersettings.cpp b/src/render/backend/renderersettings.cpp new file mode 100644 index 000000000..04d22ee67 --- /dev/null +++ b/src/render/backend/renderersettings.cpp @@ -0,0 +1,80 @@ +/**************************************************************************** +** +** Copyright (C) 2016 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 "renderersettings_p.h" + +#include <Qt3DCore/qscenepropertychange.h> + +QT_BEGIN_NAMESPACE + +using namespace Qt3DCore; + +namespace Qt3DRender { +namespace Render { + +RendererSettings::RendererSettings() + : QBackendNode() +{ +} + +void RendererSettings::updateFromPeer(Qt3DCore::QNode *peer) +{ + QRendererSettings *settings = static_cast<QRendererSettings *>(peer); + m_pickMethod = settings->pickMethod(); + m_pickResultMode = settings->pickResultMode(); +} + +void RendererSettings::cleanup() +{ + m_pickMethod = QRendererSettings::BoundingVolumePicking; + m_pickResultMode = QRendererSettings::NearestPick; +} + +void RendererSettings::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) +{ + if (e->type() == NodeUpdated) { + QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); + if (propertyChange->propertyName() == QByteArrayLiteral("pickMethod")) + m_pickMethod = propertyChange->value().value<QRendererSettings::PickMethod>(); + else if (propertyChange->propertyName() == QByteArrayLiteral("pickResult")) + m_pickResultMode = propertyChange->value().value<QRendererSettings::PickResultMode>(); + } +} + +} // namespace Render +} // namespace Qt3DRender + +QT_END_NAMESPACE diff --git a/src/render/backend/renderersettings_p.h b/src/render/backend/renderersettings_p.h new file mode 100644 index 000000000..32e997840 --- /dev/null +++ b/src/render/backend/renderersettings_p.h @@ -0,0 +1,78 @@ +/**************************************************************************** +** +** Copyright (C) 2016 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_RENDERERSETTINGS_H +#define QT3DRENDER_RENDER_RENDERERSETTINGS_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/qbackendnode.h> +#include <Qt3DRender/qrenderersettings.h> + +QT_BEGIN_NAMESPACE + +namespace Qt3DRender { +namespace Render { + +class RendererSettings : public Qt3DCore::QBackendNode +{ +public: + RendererSettings(); + + void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE; + void cleanup(); + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; + +private: + QRendererSettings::PickMethod m_pickMethod; + QRendererSettings::PickResultMode m_pickResultMode; +}; + +} // namespace Render +} // namespace Qt3DRender + +QT_END_NAMESPACE + +#endif // QT3DRENDER_RENDER_RENDERERSETTINGS_H |