diff options
| author | Paul Lemire <paul.lemire350@gmail.com> | 2016-05-15 09:39:01 +0200 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2016-05-27 21:50:32 +0000 |
| commit | 322d88e0b6ae3aadc0e14d43fd6e28247488b82f (patch) | |
| tree | 61e2f49f6ab6b6a010f970bfce0af7fedb00664d | |
| parent | 57e1fdbd3f8eadfaeac606cb066d42dc779fc200 (diff) | |
Scene3DItem: allow to instantiate Logic aspect
Change-Id: I55334c9169cb157387896819b6bcffe9a381f603
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| -rw-r--r-- | src/quick3d/imports/scene3d/importsscene3d.pro | 2 | ||||
| -rw-r--r-- | src/quick3d/imports/scene3d/scene3ditem.cpp | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/quick3d/imports/scene3d/importsscene3d.pro b/src/quick3d/imports/scene3d/importsscene3d.pro index 078d5e2a1..7aa3317c9 100644 --- a/src/quick3d/imports/scene3d/importsscene3d.pro +++ b/src/quick3d/imports/scene3d/importsscene3d.pro @@ -3,7 +3,7 @@ TARGET = qtquickscene3dplugin TARGETPATH = QtQuick/Scene3D IMPORT_VERSION = 2.0 -QT += qml quick 3dcore 3drender 3drender-private 3dinput +QT += qml quick 3dcore 3drender 3drender-private 3dinput 3dlogic # Qt3D is free of Q_FOREACH - make sure it stays that way: DEFINES += QT_NO_FOREACH diff --git a/src/quick3d/imports/scene3d/scene3ditem.cpp b/src/quick3d/imports/scene3d/scene3ditem.cpp index 23a3a977d..aa21fde48 100644 --- a/src/quick3d/imports/scene3d/scene3ditem.cpp +++ b/src/quick3d/imports/scene3d/scene3ditem.cpp @@ -51,6 +51,7 @@ #include <Qt3DRender/qrendersettings.h> #include <Qt3DInput/QInputAspect> #include <Qt3DInput/qinputsettings.h> +#include <Qt3DLogic/qlogicaspect.h> #include <QtQuick/qquickwindow.h> @@ -120,7 +121,10 @@ void Scene3DItem::setAspects(const QStringList &aspects) m_aspectEngine->registerAspect(new Qt3DInput::QInputAspect); continue; } - + if (aspect == QLatin1String("logic")) { + m_aspectEngine->registerAspect(new Qt3DLogic::QLogicAspect); + continue; + } m_aspectEngine->registerAspect(aspect); } |