diff options
author | Paul Lemire <paul.lemire@kdab.com> | 2014-07-03 09:33:52 +0200 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2014-07-05 16:04:24 +0200 |
commit | bcf30bae157da779cebce422b98ca87379e42837 (patch) | |
tree | 521380520374f404063a4b11c9fca5bce7a2b284 /src/render | |
parent | 75af57369fe2d76f1da20b94b9bb78deca00da07 (diff) |
RenderLayer monitoring frontend QLayer
Change-Id: Id225f324486cd7e0b34fc00461a6907f152883e8
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render')
-rw-r--r-- | src/render/backend/render-backend.pri | 6 | ||||
-rw-r--r-- | src/render/backend/renderlayer.cpp | 105 | ||||
-rw-r--r-- | src/render/backend/renderlayer.h | 82 |
3 files changed, 191 insertions, 2 deletions
diff --git a/src/render/backend/render-backend.pri b/src/render/backend/render-backend.pri index 48e53ed6b..5182e2891 100644 --- a/src/render/backend/render-backend.pri +++ b/src/render/backend/render-backend.pri @@ -45,7 +45,8 @@ HEADERS += \ $$PWD/renderpassmanager.h \ $$PWD/parameterpack.h \ $$PWD/texturemanager.h \ - $$PWD/texturedatamanager.h + $$PWD/texturedatamanager.h \ + $$PWD/renderlayer.h SOURCES += \ $$PWD/rendereraspect.cpp \ @@ -87,4 +88,5 @@ SOURCES += \ $$PWD/renderpassmanager.cpp \ $$PWD/parameterpack.cpp \ $$PWD/texturemanager.cpp \ - $$PWD/texturedatamanager.cpp + $$PWD/texturedatamanager.cpp \ + $$PWD/renderlayer.cpp diff --git a/src/render/backend/renderlayer.cpp b/src/render/backend/renderlayer.cpp new file mode 100644 index 000000000..602f96bd1 --- /dev/null +++ b/src/render/backend/renderlayer.cpp @@ -0,0 +1,105 @@ +/**************************************************************************** +** +** Copyright (C) 2014 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: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 Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/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 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 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 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "renderlayer.h" +#include "renderer.h" +#include "rendereraspect.h" +#include "qlayer.h" +#include <Qt3DCore/qaspectmanager.h> +#include <Qt3DCore/qchangearbiter.h> +#include <Qt3DCore/qscenepropertychange.h> + +QT_BEGIN_NAMESPACE + +namespace Qt3D { + +namespace Render { + +RenderLayer::RenderLayer() + : m_peer(Q_NULLPTR) + , m_renderer(Q_NULLPTR) +{ +} + +RenderLayer::~RenderLayer() +{ + if (m_peer) { + QChangeArbiter *arbiter = m_renderer->rendererAspect()->aspectManager()->changeArbiter(); + arbiter->unregisterObserver(this, m_peer); + } +} + +void RenderLayer::setPeer(QLayer *peer) +{ + if (m_peer != peer) { + QChangeArbiter *arbiter = m_renderer->rendererAspect()->aspectManager()->changeArbiter(); + if (m_peer) + arbiter->unregisterObserver(this, m_peer); + m_peer = peer; + if (m_peer) { + arbiter->registerObserver(this, m_peer, ComponentUpdated); + m_layer = m_peer->name(); + } + } +} + +void RenderLayer::setRenderer(Renderer *renderer) +{ + m_renderer = renderer; +} + +QString RenderLayer::layer() const +{ + return m_layer; +} + +void RenderLayer::sceneChangeEvent(const QSceneChangePtr &e) +{ + QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); + if (e->m_type == ComponentUpdated && propertyChange->m_propertyName == QByteArrayLiteral("layer")) + m_layer = propertyChange->m_value.toString(); +} + +} // Render + +} // Qt3D + +QT_END_NAMESPACE diff --git a/src/render/backend/renderlayer.h b/src/render/backend/renderlayer.h new file mode 100644 index 000000000..0e6458434 --- /dev/null +++ b/src/render/backend/renderlayer.h @@ -0,0 +1,82 @@ +/**************************************************************************** +** +** Copyright (C) 2014 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: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 Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/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 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 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 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QT3D_RENDER_RENDERLAYER_H +#define QT3D_RENDER_RENDERLAYER_H + +#include <Qt3DRenderer/qt3drenderer_global.h> +#include <Qt3DCore/qobserverinterface.h> + +QT_BEGIN_NAMESPACE + +namespace Qt3D { + +class QLayer; + +namespace Render { + +class Renderer; + +class RenderLayer : public QObserverInterface +{ +public: + RenderLayer(); + ~RenderLayer(); + + void setPeer(QLayer *peer); + void setRenderer(Renderer *renderer); + + QString layer() const; + void sceneChangeEvent(const QSceneChangePtr &e); + +private: + QLayer *m_peer; + Renderer *m_renderer; + QString m_layer; +}; + +} // Render + +} // Qt3D + +QT_END_NAMESPACE + +#endif // QT3D_RENDER_RENDERLAYER_H |