diff options
author | Paul Lemire <paul.lemire@kdab.com> | 2015-03-13 15:41:43 +0100 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2015-04-25 08:05:08 +0000 |
commit | aa4442aa7138583c7d194796736038b3d62c56f1 (patch) | |
tree | 329eff6e7d4f57e676ed022f7795f3f4367a4fea | |
parent | c511989ad907b83fd44cdd8001e14e28dee9f4d3 (diff) |
StateSetNode: backend framegraph node for QStateSet
Change-Id: I9f7a08b1315d1c2ffce1823edb52a41c33bce656
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
-rw-r--r-- | src/render/backend/framegraph/framegraph.pri | 6 | ||||
-rw-r--r-- | src/render/backend/framegraph/framegraphnode_p.h | 3 | ||||
-rw-r--r-- | src/render/backend/framegraph/statesetnode.cpp | 111 | ||||
-rw-r--r-- | src/render/backend/framegraph/statesetnode_p.h | 73 |
4 files changed, 190 insertions, 3 deletions
diff --git a/src/render/backend/framegraph/framegraph.pri b/src/render/backend/framegraph/framegraph.pri index 129a73a61..649121c36 100644 --- a/src/render/backend/framegraph/framegraph.pri +++ b/src/render/backend/framegraph/framegraph.pri @@ -10,7 +10,8 @@ HEADERS += \ $$PWD/clearbuffer_p.h \ $$PWD/sortmethod_p.h \ $$PWD/sortcriterion_p.h \ - $$PWD/framegraphsubtreeselector_p.h + $$PWD/framegraphsubtreeselector_p.h \ + $$PWD/statesetnode_p.h SOURCES += \ $$PWD/cameraselectornode.cpp \ @@ -24,6 +25,7 @@ SOURCES += \ $$PWD/clearbuffer.cpp \ $$PWD/sortmethod.cpp \ $$PWD/sortcriterion.cpp \ - $$PWD/framegraphsubtreeselector.cpp + $$PWD/framegraphsubtreeselector.cpp \ + $$PWD/statesetnode.cpp INCLUDEPATH += $$PWD diff --git a/src/render/backend/framegraph/framegraphnode_p.h b/src/render/backend/framegraph/framegraphnode_p.h index a36857ce2..565469f42 100644 --- a/src/render/backend/framegraph/framegraphnode_p.h +++ b/src/render/backend/framegraph/framegraphnode_p.h @@ -67,7 +67,8 @@ public: Viewport, ClearBuffer, SortMethod, - SubtreeSelector + SubtreeSelector, + StateSet }; FrameGraphNodeType nodeType() const { return m_nodeType; } diff --git a/src/render/backend/framegraph/statesetnode.cpp b/src/render/backend/framegraph/statesetnode.cpp new file mode 100644 index 000000000..181e31fa4 --- /dev/null +++ b/src/render/backend/framegraph/statesetnode.cpp @@ -0,0 +1,111 @@ +/**************************************************************************** +** +** 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 "statesetnode_p.h" + +#include <Qt3DCore/qscenepropertychange.h> +#include <Qt3DRenderer/qstateset.h> +#include <Qt3DRenderer/private/renderstate_p.h> + +QT_BEGIN_NAMESPACE + +namespace Qt3D { + +namespace Render { + +StateSetNode::StateSetNode() + : FrameGraphNode(FrameGraphNode::StateSet) +{ +} + +StateSetNode::~StateSetNode() +{ +} + +void StateSetNode::updateFromPeer(QNode *peer) +{ + QStateSet *stateSet = static_cast<QStateSet*>(peer); + + setEnabled(stateSet->isEnabled()); + Q_FOREACH (QRenderState *renderState, stateSet->renderStates()) + appendRenderState(renderState->id(), RenderState::getOrCreateBackendState(renderState)); +} + +QList<RenderState *> StateSetNode::renderStates() const +{ + return m_renderStates.values(); +} + +void StateSetNode::sceneChangeEvent(const QSceneChangePtr &e) +{ + QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); + switch (e->type()) { + case NodeAdded: { + if (propertyChange->propertyName() == QByteArrayLiteral("renderState")) { + QNodePtr nodePtr = propertyChange->value().value<QNodePtr>(); + QRenderState *renderState = static_cast<QRenderState *>(nodePtr.data()); + appendRenderState(renderState->id(), RenderState::getOrCreateBackendState(renderState)); + } + } + break; + + case NodeRemoved: { + if (propertyChange->propertyName() == QByteArrayLiteral("renderState")) + removeRenderState(propertyChange->value().value<QNodeId>()); + } + break; + + default: + break; + } +} + +void StateSetNode::appendRenderState(const QNodeId &id, RenderState *renderState) +{ + if (!m_renderStates.contains(id)) + m_renderStates[id] = renderState; +} + +void StateSetNode::removeRenderState(const QNodeId &renderStateId) +{ + m_renderStates.remove(renderStateId); +} + +} // Render + +} // Qt3D + +QT_END_NAMESPACE diff --git a/src/render/backend/framegraph/statesetnode_p.h b/src/render/backend/framegraph/statesetnode_p.h new file mode 100644 index 000000000..af6de5e8c --- /dev/null +++ b/src/render/backend/framegraph/statesetnode_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 QT3D_RENDER_STATESETNODE_H +#define QT3D_RENDER_STATESETNODE_H + +#include <Qt3DRenderer/private/framegraphnode_p.h> + +QT_BEGIN_NAMESPACE + +namespace Qt3D { + +namespace Render { + +class StateSetNode : public FrameGraphNode +{ +public: + StateSetNode(); + ~StateSetNode(); + + void updateFromPeer(QNode *peer) Q_DECL_OVERRIDE; + + QList<RenderState *> renderStates() const; + +protected: + void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE; + + void appendRenderState(const QNodeId &id, RenderState *renderState); + void removeRenderState(const QNodeId &renderStateId); + + QHash<QNodeId, RenderState *> m_renderStates; +}; + +} // Render + +} // Qt3D + +QT_END_NAMESPACE + +#endif // QT3D_RENDER_STATESETNODE_H |