diff options
| author | Mike Krus <mike.krus@kdab.com> | 2020-01-22 21:35:32 +0000 |
|---|---|---|
| committer | Mike Krus <mike.krus@kdab.com> | 2020-02-27 06:29:57 +0000 |
| commit | 17706144e9dc6c2dfde580b7821f18c5f6924682 (patch) | |
| tree | 5f77929db358607fe63a1d438b7a746a6966cbfb /src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp | |
| parent | 7f625e93620b313466d0223e911c0c3a5b492617 (diff) | |
Geometry refactoring
Move QBuffer, QAttribute, QGeometry to Qt3DCore.
Change-Id: I59dfd091eefadcada93350b3aba955f40b304385
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp')
| -rw-r--r-- | src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp b/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp index 75fa7b2da..a15629b68 100644 --- a/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp +++ b/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp @@ -44,6 +44,9 @@ #include <Qt3DCore/qskeletonloader.h> #include <Qt3DCore/qtransform.h> #include <Qt3DCore/qjoint.h> +#include <Qt3DCore/qattribute.h> +#include <Qt3DCore/qbuffer.h> +#include <Qt3DCore/qgeometry.h> #include <QtCore/qvariantanimation.h> #include <Qt3DQuick/private/quick3dnodev9_p.h> @@ -53,6 +56,8 @@ #include <Qt3DQuick/private/quick3djoint_p.h> #include <Qt3DQuick/private/qquaternionanimation_p.h> #include <Qt3DQuick/private/qt3dquick_global_p.h> +#include <Qt3DQuick/private/quick3dbuffer_p.h> +#include <Qt3DQuick/private/quick3dgeometry_p.h> #include <QtQml/qqml.h> @@ -73,6 +78,13 @@ void Qt3DQuick3DCorePlugin::registerTypes(const char *uri) qmlRegisterType<Qt3DCore::QArmature>(uri, 2, 10, "Armature"); qmlRegisterUncreatableType<Qt3DCore::QAbstractSkeleton>(uri, 2, 10, "AbstractSkeleton", QStringLiteral("AbstractSkeleton is an abstract base class")); qmlRegisterType<Qt3DCore::QSkeletonLoader>(uri, 2, 10, "SkeletonLoader"); + qmlRegisterType<Qt3DCore::QAttribute>(uri, 2, 0, "Attribute"); + qmlRegisterType<Qt3DCore::QAttribute, 10>(uri, 2, 10, "Attribute"); + qmlRegisterType<Qt3DCore::QAttribute, 11>(uri, 2, 11, "Attribute"); + qmlRegisterUncreatableType<Qt3DCore::QBuffer>(uri, 2, 0, "BufferBase", QStringLiteral("Use Quick3DBuffer in QML")); + qmlRegisterUncreatableType<Qt3DCore::QBuffer, 9>(uri, 2, 9, "BufferBase", QStringLiteral("Use Quick3DBuffer in QML")); + qmlRegisterType<Qt3DCore::Quick::Quick3DBuffer>(uri, 2, 0, "Buffer"); + Qt3DCore::Quick::registerExtendedType<Qt3DCore::QGeometry, Qt3DCore::Quick::Quick3DGeometry>("QGeometry", "Qt3D.Core/Geometry", uri, 2, 0, "Geometry"); qmlRegisterType<Qt3DCore::Quick::QQuaternionAnimation>(uri, 2, 0, "QuaternionAnimation"); qRegisterAnimationInterpolator<QQuaternion>(Qt3DCore::Quick::q_quaternionInterpolator); |