diff options
author | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2015-08-10 10:17:53 +0200 |
---|---|---|
committer | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2015-08-20 11:59:11 +0000 |
commit | 14bb6fb6d8e1fbde317111b57e42e3a380927d8b (patch) | |
tree | a7d85dd83aa8b72528c053733245df4a5fd5a723 /src/quick3d/quick3d | |
parent | 9bf2094621e3fba71710f47d7121f1182c3f3337 (diff) |
Create proper Quick extended classes in scene loaders
This allows exploring the loaded subtrees from QML/Javascript code. The
C++ classes are not suitable for this as they lack properties that involve
QML specifics.
The assimp (QML) example is updated to show how to do this (with the help
of some C++ code). Say hello to the pulsating torus and the rotating monkey!
Change-Id: I60401272105df5d72f4b7afebe26a3271e92f19e
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/quick3d/quick3d')
-rw-r--r-- | src/quick3d/quick3d/qt3dquick_global.cpp | 9 | ||||
-rw-r--r-- | src/quick3d/quick3d/qt3dquick_global_p.h | 11 | ||||
-rw-r--r-- | src/quick3d/quick3d/qt3dquicknodefactory.cpp | 73 | ||||
-rw-r--r-- | src/quick3d/quick3d/qt3dquicknodefactory_p.h | 75 | ||||
-rw-r--r-- | src/quick3d/quick3d/quick3d.pro | 2 |
5 files changed, 168 insertions, 2 deletions
diff --git a/src/quick3d/quick3d/qt3dquick_global.cpp b/src/quick3d/quick3d/qt3dquick_global.cpp index 5fec9a42b..0c90bc169 100644 --- a/src/quick3d/quick3d/qt3dquick_global.cpp +++ b/src/quick3d/quick3d/qt3dquick_global.cpp @@ -35,6 +35,7 @@ ****************************************************************************/ #include "qt3dquick_global_p.h" +#include "qt3dquicknodefactory_p.h" #include <private/qqmlglobal_p.h> #include <private/qt3dquickvaluetypes_p.h> #include <private/qv8engine_p.h> @@ -662,11 +663,17 @@ static Quick3DColorProvider *getColorProvider() return &colorProvider; } -void Quick3D_initializeProviders() +void Quick3D_initialize() { Qt3D::Quick::Quick3DValueTypes::registerValueTypes(); QQml_addValueTypeProvider(getValueTypeProvider()); QQml_setColorProvider(getColorProvider()); + QAbstractNodeFactory::registerNodeFactory(QuickNodeFactory::instance()); +} + +void Quick3D_registerType(const char *className, const char *quickName, int major, int minor) +{ + QuickNodeFactory::instance()->registerType(className, quickName, major, minor); } } // Quick diff --git a/src/quick3d/quick3d/qt3dquick_global_p.h b/src/quick3d/quick3d/qt3dquick_global_p.h index dee85dbb2..6e4446082 100644 --- a/src/quick3d/quick3d/qt3dquick_global_p.h +++ b/src/quick3d/quick3d/qt3dquick_global_p.h @@ -38,6 +38,7 @@ #define QT3DQUICK_GLOBAL_P_H #include <Qt3DQuick/qt3dquick_global.h> +#include <QtQml/qqml.h> #define QT3DQUICKSHARED_PRIVATE_EXPORT QT3DQUICKSHARED_EXPORT @@ -47,7 +48,15 @@ namespace Qt3D { namespace Quick { -QT3DQUICKSHARED_PRIVATE_EXPORT void Quick3D_initializeProviders(); +QT3DQUICKSHARED_PRIVATE_EXPORT void Quick3D_initialize(); +QT3DQUICKSHARED_PRIVATE_EXPORT void Quick3D_registerType(const char *className, const char *quickName, int major, int minor); + +template<class T, class E> void registerExtendedType(const char *className, const char *quickName, + const char *uri, int major, int minor, const char *name) +{ + qmlRegisterExtendedType<T, E>(uri, major, minor, name); + Quick3D_registerType(className, quickName, major, minor); +} } // Quick diff --git a/src/quick3d/quick3d/qt3dquicknodefactory.cpp b/src/quick3d/quick3d/qt3dquicknodefactory.cpp new file mode 100644 index 000000000..062e97bb7 --- /dev/null +++ b/src/quick3d/quick3d/qt3dquicknodefactory.cpp @@ -0,0 +1,73 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd and/or its subsidiary(-ies). +** 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 "qt3dquicknodefactory_p.h" +#include <QtQml/private/qqmlmetatype_p.h> + +QT_BEGIN_NAMESPACE + +namespace Qt3D { + +Q_GLOBAL_STATIC(QuickNodeFactory, quick_node_factory) + +QuickNodeFactory *QuickNodeFactory::instance() +{ + return quick_node_factory(); +} + +void QuickNodeFactory::registerType(const char *className, const char *quickName, int major, int minor) +{ + m_types.insert(className, Type(quickName, major, minor)); +} + +QNode *QuickNodeFactory::createNode(const char *type) +{ + if (!m_types.contains(type)) + return Q_NULLPTR; + + Type &typeInfo(m_types[type]); + + if (!typeInfo.resolved) { + typeInfo.resolved = true; + typeInfo.t = QQmlMetaType::qmlType(QString::fromLatin1(typeInfo.quickName), typeInfo.version.first, typeInfo.version.second); + } + + return typeInfo.t ? qobject_cast<QNode *>(typeInfo.t->create()) : Q_NULLPTR; +} + +} // namespace Qt3D + +QT_END_NAMESPACE diff --git a/src/quick3d/quick3d/qt3dquicknodefactory_p.h b/src/quick3d/quick3d/qt3dquicknodefactory_p.h new file mode 100644 index 000000000..0a7f8a1ee --- /dev/null +++ b/src/quick3d/quick3d/qt3dquicknodefactory_p.h @@ -0,0 +1,75 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd and/or its subsidiary(-ies). +** 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 QUICKNODEFACTORY_H +#define QUICKNODEFACTORY_H + +#include <Qt3DCore/qabstractnodefactory.h> +#include <QtCore/qhash.h> + +QT_BEGIN_NAMESPACE + +class QQmlType; + +namespace Qt3D { + +class QuickNodeFactory : public QAbstractNodeFactory +{ +public: + QNode *createNode(const char *type) Q_DECL_OVERRIDE; + + void registerType(const char *className, const char *quickName, int major, int minor); + + static QuickNodeFactory *instance(); + +private: + struct Type { + Type() : t(Q_NULLPTR), resolved(false) { } + Type(const char *quickName, int major, int minor) + : quickName(quickName), version(major, minor), t(Q_NULLPTR), resolved(false) { } + QByteArray quickName; + QPair<int, int> version; + QQmlType *t; + bool resolved; + }; + QHash<QByteArray, Type> m_types; +}; + +} // namespace Qt3D + +QT_END_NAMESPACE + +#endif // QUICKNODEFACTORY_H diff --git a/src/quick3d/quick3d/quick3d.pro b/src/quick3d/quick3d/quick3d.pro index 9db761e66..4726b749a 100644 --- a/src/quick3d/quick3d/quick3d.pro +++ b/src/quick3d/quick3d/quick3d.pro @@ -18,12 +18,14 @@ HEADERS += \ qt3dquick_global.h \ qt3dquick_global_p.h \ qt3dquickvaluetypes_p.h \ + qt3dquicknodefactory_p.h \ qqmlaspectengine.h \ qqmlaspectengine_p.h SOURCES += \ qt3dquick_global.cpp \ qt3dquickvaluetypes.cpp \ + qt3dquicknodefactory.cpp \ qqmlaspectengine.cpp !contains(QT_CONFIG, egl):DEFINES += QT_NO_EGL |