summaryrefslogtreecommitdiffstats
path: root/src/core/qscene.cpp
diff options
context:
space:
mode:
authorKevin Ottens <kevin.ottens@kdab.com>2015-01-20 15:17:34 +0100
committerKevin Ottens <kevin.ottens@kdab.com>2015-01-23 07:51:14 +0100
commit1b845f70ce9894339a066005a76b497f340d91e0 (patch)
treeb74019018a2804e9da3709ab3c8fc6b39f5cf45c /src/core/qscene.cpp
parent01e4da7233461880ea491624ad1e0fd81512bebe (diff)
Allow the scene to know its engine
Change-Id: I26fb8e98b92a59acf78607f66136f0d0d2f4f2fb Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/core/qscene.cpp')
-rw-r--r--src/core/qscene.cpp14
1 files changed, 11 insertions, 3 deletions
diff --git a/src/core/qscene.cpp b/src/core/qscene.cpp
index 607d08c82..3a0ef481d 100644
--- a/src/core/qscene.cpp
+++ b/src/core/qscene.cpp
@@ -54,14 +54,16 @@ namespace Qt3D {
class QScenePrivate
{
public:
- QScenePrivate(QScene *qq)
+ QScenePrivate(QAspectEngine *engine, QScene *qq)
: q_ptr(qq)
+ , m_engine(engine)
, m_arbiter(Q_NULLPTR)
{
}
Q_DECLARE_PUBLIC(QScene)
QScene *q_ptr;
+ QAspectEngine *m_engine;
QHash<QNodeId, QNode *> m_nodeLookupTable;
QMultiHash<QNodeId, QNodeId> m_componentToEntities;
QMultiHash<QNodeId, QObservableInterface *> m_observablesLookupTable;
@@ -72,8 +74,8 @@ public:
};
-QScene::QScene()
- : d_ptr(new QScenePrivate(this))
+QScene::QScene(QAspectEngine *engine)
+ : d_ptr(new QScenePrivate(engine, this))
{
}
@@ -81,6 +83,12 @@ QScene::~QScene()
{
}
+QAspectEngine *QScene::engine() const
+{
+ Q_D(const QScene);
+ return d->m_engine;
+}
+
// Called by any thread
void QScene::addObservable(QObservableInterface *observable, const QNodeId &id)
{