diff options
author | Paul Lemire <paul.lemire@kdab.com> | 2015-03-31 11:26:36 +0200 |
---|---|---|
committer | Paul Lemire <paul.lemire@kdab.com> | 2015-05-10 12:25:31 +0000 |
commit | 90ba9328495574f8fbd745fb9825bf02e8c2f28d (patch) | |
tree | e09d595f381781a85674f9494af71eba70f42623 /src/quick3d/quick3drenderer | |
parent | b43e70b9dde614a91d6c9f993c3b444cd113e4e2 (diff) |
FrameGraph: allow the FrameGraph tree to contain any kind of Nodes
Change-Id: Ib5a6ea27610dfad3352adacd57c8f0f02c97f31f
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/quick3d/quick3drenderer')
-rw-r--r-- | src/quick3d/quick3drenderer/items/items.pri | 2 | ||||
-rw-r--r-- | src/quick3d/quick3drenderer/items/quick3dframegraphitem.cpp | 100 | ||||
-rw-r--r-- | src/quick3d/quick3drenderer/items/quick3dframegraphitem.h | 79 |
3 files changed, 0 insertions, 181 deletions
diff --git a/src/quick3d/quick3drenderer/items/items.pri b/src/quick3d/quick3drenderer/items/items.pri index 014ab0b38..35fa140d3 100644 --- a/src/quick3d/quick3drenderer/items/items.pri +++ b/src/quick3d/quick3drenderer/items/items.pri @@ -10,7 +10,6 @@ HEADERS += \ $$PWD/shaderpropertyparser_p.h \ $$PWD/quick3dtexture.h \ $$PWD/quick3drenderpass.h \ - $$PWD/quick3dframegraphitem.h \ $$PWD/quick3dsortmethod.h \ $$PWD/quick3dparameter_p.h \ $$PWD/quick3dparameter.h \ @@ -31,7 +30,6 @@ SOURCES += \ $$PWD/shaderpropertyparser.cpp \ $$PWD/quick3dtexture.cpp \ $$PWD/quick3drenderpass.cpp \ - $$PWD/quick3dframegraphitem.cpp \ $$PWD/quick3dsortmethod.cpp \ $$PWD/quick3dparameter.cpp \ $$PWD/quick3dshaderdata.cpp \ diff --git a/src/quick3d/quick3drenderer/items/quick3dframegraphitem.cpp b/src/quick3d/quick3drenderer/items/quick3dframegraphitem.cpp deleted file mode 100644 index c2c53b83b..000000000 --- a/src/quick3d/quick3drenderer/items/quick3dframegraphitem.cpp +++ /dev/null @@ -1,100 +0,0 @@ -/**************************************************************************** -** -** 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: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 "quick3dframegraphitem.h" - -QT_BEGIN_NAMESPACE - -namespace Qt3D { - -namespace Render { - -namespace Quick { - -Quick3DFrameGraphItem::Quick3DFrameGraphItem(QObject *parent) - : QObject(parent) -{ -} - -QQmlListProperty<QFrameGraphNode> Quick3DFrameGraphItem::frameGraphChildrenList() -{ - return QQmlListProperty<QFrameGraphNode>(this, 0, - &Quick3DFrameGraphItem::apprendFrameGraphItem, - &Quick3DFrameGraphItem::frameGraphItemsCount, - &Quick3DFrameGraphItem::frameGraphItemAt, - &Quick3DFrameGraphItem::clearFrameGraphItemList); -} - -void Quick3DFrameGraphItem::apprendFrameGraphItem(QQmlListProperty<QFrameGraphNode> *list, QFrameGraphNode *item) -{ - Quick3DFrameGraphItem *fg = qobject_cast<Quick3DFrameGraphItem *>(list->object); - if (fg) - return fg->parentFrameGraphItem()->appendFrameGraphNode(item); -} - -QFrameGraphNode *Quick3DFrameGraphItem::frameGraphItemAt(QQmlListProperty<QFrameGraphNode> *list, int index) -{ - Quick3DFrameGraphItem *fg = qobject_cast<Quick3DFrameGraphItem *>(list->object); - if (fg) - return fg->parentFrameGraphItem()->frameGraphChildren().at(index); - return Q_NULLPTR; -} - -int Quick3DFrameGraphItem::frameGraphItemsCount(QQmlListProperty<QFrameGraphNode> *list) -{ - Quick3DFrameGraphItem *fg = qobject_cast<Quick3DFrameGraphItem *>(list->object); - if (fg) - return fg->parentFrameGraphItem()->frameGraphChildren().count(); - return -1; -} - -void Quick3DFrameGraphItem::clearFrameGraphItemList(QQmlListProperty<QFrameGraphNode> *list) -{ - Quick3DFrameGraphItem *fg = qobject_cast<Quick3DFrameGraphItem *>(list->object); - if (fg) { - Q_FOREACH (QFrameGraphNode *item, fg->parentFrameGraphItem()->frameGraphChildren()) - fg->parentFrameGraphItem()->removeFrameGraphNode(item); - } -} - -} // Quick - -} // Render - -} // Qt3D - -QT_END_NAMESPACE - diff --git a/src/quick3d/quick3drenderer/items/quick3dframegraphitem.h b/src/quick3d/quick3drenderer/items/quick3dframegraphitem.h deleted file mode 100644 index 56cdf4afb..000000000 --- a/src/quick3d/quick3drenderer/items/quick3dframegraphitem.h +++ /dev/null @@ -1,79 +0,0 @@ -/**************************************************************************** -** -** 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: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_QUICK_QUICK3DFRAMEGRAPHITEM_H -#define QT3D_RENDER_QUICK_QUICK3DFRAMEGRAPHITEM_H - -#include <Qt3DQuickRenderer/qt3dquickrenderer_global.h> -#include <Qt3DRenderer/qframegraphnode.h> -#include <QQmlListProperty> - -QT_BEGIN_NAMESPACE - -namespace Qt3D { - -namespace Render { - -namespace Quick { - -class QT3DQUICKRENDERERSHARED_EXPORT Quick3DFrameGraphItem : public QObject -{ - Q_OBJECT - Q_PROPERTY(QQmlListProperty<Qt3D::QFrameGraphNode> frameGraphChildren READ frameGraphChildrenList) - Q_CLASSINFO("DefaultProperty", "frameGraphChildren") - -public: - explicit Quick3DFrameGraphItem(QObject *parent = 0); - - inline QFrameGraphNode *parentFrameGraphItem() const { return qobject_cast<QFrameGraphNode *>(parent()); } - QQmlListProperty<QFrameGraphNode> frameGraphChildrenList(); - -private: - static void apprendFrameGraphItem(QQmlListProperty<QFrameGraphNode> *list, QFrameGraphNode *item); - static QFrameGraphNode *frameGraphItemAt(QQmlListProperty<QFrameGraphNode> *list, int index); - static int frameGraphItemsCount(QQmlListProperty<QFrameGraphNode> *list); - static void clearFrameGraphItemList(QQmlListProperty<QFrameGraphNode> *list); -}; - -} // Quick - -} // Render - -} // Qt3D - -QT_END_NAMESPACE - -#endif // QT3D_RENDER_QUICK_QUICK3DFRAMEGRAPHITEM_H |