diff options
author | Paul Lemire <paul.lemire@kdab.com> | 2015-07-13 17:08:16 +0200 |
---|---|---|
committer | Paul Lemire <paul.lemire@kdab.com> | 2015-07-23 20:38:29 +0000 |
commit | 9b8cc06c1d0998cf5418d8480d2995bd530da6b1 (patch) | |
tree | e313694f9d79b0e8fa67b041fcb13a0f5a7e3e23 /src/quick3d/imports/scene3d/scene3ditem_p.h | |
parent | 7b19af1c304d503b5c83905e7f5282a0fe39177a (diff) |
Scene3D: Properly handle shutdowns with QtQuick Loaders
Shutdown procedure reworked for regular Scene3D use cases.
Added a Qt3D.Sceme3D logging category in case there's ever
a need to troubleshoot similar issues.
Change-Id: I275a312c498a50aa1ceefc9a51e20351f268c698
Reviewed-by: Alexandr Akulich <akulichalexander@gmail.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/quick3d/imports/scene3d/scene3ditem_p.h')
-rw-r--r-- | src/quick3d/imports/scene3d/scene3ditem_p.h | 93 |
1 files changed, 93 insertions, 0 deletions
diff --git a/src/quick3d/imports/scene3d/scene3ditem_p.h b/src/quick3d/imports/scene3d/scene3ditem_p.h new file mode 100644 index 000000000..d1f5b3389 --- /dev/null +++ b/src/quick3d/imports/scene3d/scene3ditem_p.h @@ -0,0 +1,93 @@ +/**************************************************************************** +** +** 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 SCENE3DITEM_H +#define SCENE3DITEM_H + +#include <QQuickItem> + +QT_BEGIN_NAMESPACE + +namespace Qt3D +{ +class QAspectEngine; +class QEntity; +class QRenderAspect; + +class Scene3DRenderer; +class Scene3DCleaner; + +class Scene3DItem : public QQuickItem +{ + Q_OBJECT + Q_PROPERTY(Qt3D::QEntity* entity READ entity WRITE setEntity NOTIFY entityChanged) + Q_PROPERTY(QStringList aspects READ aspects WRITE setAspects NOTIFY aspectsChanged) + Q_CLASSINFO("DefaultProperty", "entity") +public: + explicit Scene3DItem(QQuickItem *parent = 0); + ~Scene3DItem(); + + QStringList aspects() const; + Qt3D::QEntity *entity() const; + +public Q_SLOTS: + void setAspects(const QStringList &aspects); + void setEntity(Qt3D::QEntity *entity); + +Q_SIGNALS: + void aspectsChanged(); + void entityChanged(); + +private Q_SLOTS: + void applyRootEntityChange(); + +private: + QSGNode *updatePaintNode(QSGNode *node, UpdatePaintNodeData *nodeData) Q_DECL_OVERRIDE; + + QStringList m_aspects; + Qt3D::QEntity *m_entity; + + Qt3D::QAspectEngine *m_aspectEngine; + Qt3D::QRenderAspect *m_renderAspect; + Scene3DRenderer *m_renderer; + Scene3DCleaner *m_rendererCleaner; +}; + +} // Qt3D + +QT_END_NAMESPACE + +#endif |