diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-14 11:55:27 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-02-14 11:56:26 +0000 |
| commit | a400bbe50deb98f5d924cd4f6562e1b868e73248 (patch) | |
| tree | a636e2224d3677aca2406bac5d835100610500e3 /src/render/jobs/loadscenejob_p.h | |
| parent | d360e16fdcab2197924e2505695c412bcaadbbe0 (diff) | |
| parent | 1382b0cfb336cc04924d61b46f0b69dadb1c3d39 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.10.1' into 5.11" into refs/staging/5.11v5.11.0-alpha1
Diffstat (limited to 'src/render/jobs/loadscenejob_p.h')
| -rw-r--r-- | src/render/jobs/loadscenejob_p.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/render/jobs/loadscenejob_p.h b/src/render/jobs/loadscenejob_p.h index b33637985..0c77dc6e8 100644 --- a/src/render/jobs/loadscenejob_p.h +++ b/src/render/jobs/loadscenejob_p.h @@ -53,8 +53,10 @@ #include <Qt3DCore/qaspectjob.h> #include <Qt3DCore/qnodeid.h> +#include <Qt3DRender/qsceneloader.h> #include <QSharedPointer> #include <QUrl> +#include <functional> QT_BEGIN_NAMESPACE @@ -64,6 +66,7 @@ class QSceneImporter; namespace Render { +class Scene; class NodeManagers; class Q_AUTOTEST_EXPORT LoadSceneJob : public Qt3DCore::QAspectJob @@ -87,6 +90,11 @@ private: Qt3DCore::QNodeId m_sceneComponent; NodeManagers *m_managers; QList<QSceneImporter *> m_sceneImporters; + + Qt3DCore::QEntity *tryLoadScene(Scene *scene, + QSceneLoader::Status &finalStatus, + const QStringList &extensions, + const std::function<void (QSceneImporter *)> &importerSetupFunc); }; typedef QSharedPointer<LoadSceneJob> LoadSceneJobPtr; |