summaryrefslogtreecommitdiffstats
path: root/src/quick3d/imports/core
diff options
context:
space:
mode:
authorKevin Ottens <kevin.ottens@kdab.com>2014-12-17 12:35:40 +0100
committerSean Harmer <sean.harmer@kdab.com>2014-12-17 17:44:23 +0100
commit8c8fe2cb0d1b0d26090b7c7689b2f28ffce6a642 (patch)
treecae9bb74e670c1aff971d97461e91849687bb81b /src/quick3d/imports/core
parent88ac3a98e6969ee70f5e3aa62835c69ff9d1d547 (diff)
Add a new EntityLoader element
It also come with an example where we swap between two entities loaded from QML files. Change-Id: I09d5c5852ad5ea1e85d2acfffd51413de437ce22 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/quick3d/imports/core')
-rw-r--r--src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp b/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp
index 2da408812..8db3d09f3 100644
--- a/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp
+++ b/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp
@@ -49,6 +49,7 @@
#include <Qt3DCore/qtranslatetransform.h>
#include <Qt3DCore/qrotatetransform.h>
#include <Qt3DQuick/quick3dentity.h>
+#include <Qt3DQuick/quick3dentityloader.h>
#include <Qt3DQuick/quick3dtransform.h>
#include <Qt3DQuick/quick3dconfiguration.h>
#include <private/qt3dquick_global_p.h>
@@ -64,6 +65,7 @@ void Qt3DQuick3DCorePlugin::registerTypes(const char *uri)
qmlRegisterType<Qt3D::Quick::Quick3DConfiguration>(uri, 2, 0, "Configuration");
qmlRegisterExtendedType<Qt3D::QEntity, Qt3D::Quick::Quick3DEntity>(uri, 2, 0, "Entity");
+ qmlRegisterType<Qt3D::Quick::Quick3DEntityLoader>(uri, 2, 0, "EntityLoader");
qmlRegisterExtendedType<Qt3D::QTransform, Qt3D::Quick::Quick3DTransform>(uri, 2, 0, "Transform");
// Ideally we want to make Node an uncreatable type
// We would need qmlRegisterUncreatableExtendedType for that