diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2017-08-26 11:50:15 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2017-09-02 18:10:28 +0000 |
| commit | 9a14388cd5f3e509658e8ec1a1c582f9215f53ca (patch) | |
| tree | 694750144e497e6474b78391cb5afffaad027bbd | |
| parent | 1f67c7a92a0080e4f2cbd0d387d3447521571b77 (diff) | |
Export QSkeletonMapping to QML
Change-Id: I5fe5f7e41b49354075f410993bfa51897fde9bce
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| -rw-r--r-- | src/quick3d/imports/animation/qt3dquick3danimationplugin.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/quick3d/imports/animation/qt3dquick3danimationplugin.cpp b/src/quick3d/imports/animation/qt3dquick3danimationplugin.cpp index eb9a32109..017e2a453 100644 --- a/src/quick3d/imports/animation/qt3dquick3danimationplugin.cpp +++ b/src/quick3d/imports/animation/qt3dquick3danimationplugin.cpp @@ -45,11 +45,11 @@ #include <Qt3DAnimation/qblendedclipanimator.h> #include <Qt3DAnimation/qclipanimator.h> #include <Qt3DAnimation/qchannelmapping.h> +#include <Qt3DAnimation/qskeletonmapping.h> #include <Qt3DAnimation/qlerpclipblend.h> #include <Qt3DAnimation/qadditiveclipblend.h> #include <Qt3DAnimation/qclipblendvalue.h> #include <Qt3DAnimation/qclock.h> - #include <Qt3DAnimation/qkeyframeanimation.h> #include <Qt3DAnimation/qanimationcontroller.h> #include <Qt3DAnimation/qabstractanimation.h> @@ -97,6 +97,9 @@ void Qt3DQuick3DAnimationPlugin::registerTypes(const char *uri) qmlRegisterExtendedType<Qt3DAnimation::QMorphingAnimation, Qt3DAnimation::Quick::QQuick3DMorphingAnimation>(uri, 2, 9, "MorphingAnimation"); qmlRegisterExtendedType<Qt3DAnimation::QMorphTarget, Qt3DAnimation::Quick::QQuick3DMorphTarget>(uri, 2, 9, "MorphTarget"); qmlRegisterExtendedType<Qt3DAnimation::QVertexBlendAnimation, Qt3DAnimation::Quick::QQuick3DVertexBlendAnimation>(uri, 2, 9, "VertexBlendAnimation"); + + qmlRegisterUncreatableType<Qt3DAnimation::QAbstractChannelMapping>(uri, 2, 10, "AbstractChannelMapping", QStringLiteral("QAbstractChannelMapping is abstract")); + qmlRegisterType<Qt3DAnimation::QSkeletonMapping>(uri, 2, 10, "SkeletonMapping"); } QT_END_NAMESPACE |