diff options
Diffstat (limited to 'src/core/aspects/qaspectengine.cpp')
-rw-r--r-- | src/core/aspects/qaspectengine.cpp | 41 |
1 files changed, 21 insertions, 20 deletions
diff --git a/src/core/aspects/qaspectengine.cpp b/src/core/aspects/qaspectengine.cpp index 15f975332..b9c9d2283 100644 --- a/src/core/aspects/qaspectengine.cpp +++ b/src/core/aspects/qaspectengine.cpp @@ -38,27 +38,30 @@ ****************************************************************************/ #include "qaspectengine.h" +#include "qaspectengine_p.h" + +#include <Qt3DCore/qabstractaspect.h> +#include <Qt3DCore/qcomponent.h> +#include <Qt3DCore/qentity.h> +#include <Qt3DCore/qnode.h> +#include <QtCore/QMetaObject> -#include "qabstractaspect.h" -#include "qaspectthread_p.h" -#include "qaspectmanager_p.h" -#include "qchangearbiter_p.h" -#include "qabstractaspect.h" -#include "qnode.h" #include <Qt3DCore/private/corelogging_p.h> -#include <QMetaObject> -#include <private/qpostman_p.h> -#include <private/qscene_p.h> -#include <private/qaspectengine_p.h> -#include <private/qnode_p.h> -#include <private/qnodevisitor_p.h> -#include <private/qscene_p.h> -#include "qentity.h" -#include "qcomponent.h" +#include <Qt3DCore/private/qaspectthread_p.h> +#include <Qt3DCore/private/qaspectmanager_p.h> +#include <Qt3DCore/private/qchangearbiter_p.h> #include <Qt3DCore/private/qeventfilterservice_p.h> +#include <Qt3DCore/private/qnode_p.h> +#include <Qt3DCore/private/qnodevisitor_p.h> #include <Qt3DCore/private/qnodecreatedchangegenerator_p.h> +#include <Qt3DCore/private/qpostman_p.h> +#include <Qt3DCore/private/qscene_p.h> #include <Qt3DCore/private/qservicelocator_p.h> +#include <Qt3DCore/qt3dcore-config.h> + +#if defined(QT3D_JOBS_RUN_STATS) #include <Qt3DCore/private/aspectcommanddebugger_p.h> +#endif QT_BEGIN_NAMESPACE @@ -100,8 +103,8 @@ QAspectEnginePrivate::~QAspectEnginePrivate() */ void QAspectEnginePrivate::initNode(QNode *node) { - QNodePrivate::get(node)->setScene(m_scene); m_scene->addObservable(node); + QNodePrivate::get(node)->setScene(m_scene); } void QAspectEnginePrivate::initEntity(QEntity *entity) @@ -177,10 +180,6 @@ void QAspectEnginePrivate::generateCreationChanges(QNode *root) QAspectEngine::QAspectEngine(QObject *parent) : QObject(*new QAspectEnginePrivate, parent) { - // Don't show any debug output from Qt3D. If you need to enable additional logging - // for debugging use a rules file as explained in the QLoggingCategory documentation. - QLoggingCategory::setFilterRules(QString::fromUtf8("Qt3D.*.debug=false\n")); - qCDebug(Aspects) << Q_FUNC_INFO; Q_D(QAspectEngine); d->m_scene = new QScene(this); @@ -218,6 +217,8 @@ QAspectEngine::~QAspectEngine() void QAspectEnginePrivate::initNodeTree(QNode *node) { + // Set the root entity on the scene + m_scene->setRootNode(node); QNodeVisitor visitor; visitor.traverse(node, this, &QAspectEnginePrivate::initNode, &QAspectEnginePrivate::initEntity); } |