Allow to control the aspects used by a Scene3D

Change-Id: I5fb20950cb5f829ab6beb42c1f9d97b6ae94c884
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

5 files changed, 32 insertions, 4 deletions

diff --git a/examples/scene3d/main.qml b/examples/scene3d/main.qml
index 210136322..f987f1e26 100644
--- a/examples/scene3d/main.qml
+++ b/examples/scene3d/main.qml
@@ -75,6 +75,7 @@ Item {
             anchors.fill: parent
             anchors.margins: 10
             focus: true
+            aspects: "input"
 
             AnimatedEntity {}
         }
diff --git a/examples/scene3d/scene3d.pro b/examples/scene3d/scene3d.pro
index abae485eb..9df4a2bcf 100644
--- a/examples/scene3d/scene3d.pro
+++ b/examples/scene3d/scene3d.pro
@@ -1,5 +1,5 @@
 TEMPLATE = app
-QT += qml quick
+QT += qml quick 3dinput
 
 SOURCES += \
     main.cpp
diff --git a/src/quick3d/imports/scene3d/importsscene3d.pro b/src/quick3d/imports/scene3d/importsscene3d.pro
index 074f60810..cd8402320 100644
--- a/src/quick3d/imports/scene3d/importsscene3d.pro
+++ b/src/quick3d/imports/scene3d/importsscene3d.pro
@@ -2,7 +2,7 @@ CXX_MODULE = qml
 TARGET = qtquickscene3dplugin
 TARGETPATH = QtQuick/Scene3D
 
-QT += qml quick 3dcore 3drenderer 3dinput
+QT += qml quick 3dcore 3drenderer
 
 HEADERS += \
     qtquickscene3dplugin.h \
diff --git a/src/quick3d/imports/scene3d/scene3ditem.cpp b/src/quick3d/imports/scene3d/scene3ditem.cpp
index ce182414c..b03796fc9 100644
--- a/src/quick3d/imports/scene3d/scene3ditem.cpp
+++ b/src/quick3d/imports/scene3d/scene3ditem.cpp
@@ -42,7 +42,6 @@
 #include "scene3ditem.h"
 
 #include <Qt3DCore/QAspectEngine>
-#include <Qt3DInput/QInputAspect>
 #include <Qt3DRenderer/QRenderAspect>
 
 #include <QOpenGLContext>
@@ -140,15 +139,38 @@ Scene3DItem::Scene3DItem(QQuickItem *parent)
     setAcceptHoverEvents(true);
 
     m_aspectEngine->registerAspect(m_renderAspect);
-    m_aspectEngine->registerAspect(new Qt3D::QInputAspect);
     m_aspectEngine->initialize();
 }
 
+QStringList Scene3DItem::aspects() const
+{
+    return m_aspects;
+}
+
 Qt3D::QEntity *Scene3DItem::entity() const
 {
     return m_entity;
 }
 
+void Scene3DItem::setAspects(const QStringList &aspects)
+{
+    if (!m_aspects.isEmpty()) {
+        qWarning() << "Aspects already set on the Scene3D, ignoring";
+        return;
+    }
+
+    m_aspects = aspects;
+
+    Q_FOREACH (const QString &aspect, m_aspects) {
+        if (aspect == QStringLiteral("render")) // This one is hardwired anyway
+            continue;
+
+        m_aspectEngine->registerAspect(aspect);
+    }
+
+    emit aspectsChanged();
+}
+
 void Scene3DItem::setEntity(Qt3D::QEntity *entity)
 {
     if (entity == m_entity)
diff --git a/src/quick3d/imports/scene3d/scene3ditem.h b/src/quick3d/imports/scene3d/scene3ditem.h
index 7ebb23e27..7e0a666b9 100644
--- a/src/quick3d/imports/scene3d/scene3ditem.h
+++ b/src/quick3d/imports/scene3d/scene3ditem.h
@@ -57,16 +57,20 @@ class Scene3DItem : public QQuickFramebufferObject
 {
     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);
 
+    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:
@@ -76,6 +80,7 @@ private:
     Renderer *createRenderer() const Q_DECL_OVERRIDE;
     QSGNode *updatePaintNode(QSGNode *node, UpdatePaintNodeData *nodeData) Q_DECL_OVERRIDE;
 
+    QStringList m_aspects;
     Qt3D::QEntity *m_entity;
 
     Qt3D::QAspectEngine *m_aspectEngine;