diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-11 18:47:39 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-11 18:47:39 +0200 |
commit | 96c714e3794f992c26632664d5b028e0ca2a919e (patch) | |
tree | d0eb4373cb1be4a0c35025f19346087fcaa811dd /src/animation | |
parent | a79c34fe6ef7e47582de9188e284644e9665f31b (diff) | |
parent | a5b02c4f78b0bc7d0c48143e83d8d222f153be52 (diff) |
Merge remote-tracking branch 'origin/5.13' into 5.14
Change-Id: I4e73060c1941773efcc568f010f5b073ebb10d4a
Diffstat (limited to 'src/animation')
-rw-r--r-- | src/animation/frontend/qclipblendvalue.cpp | 11 | ||||
-rw-r--r-- | src/animation/frontend/qlerpclipblend.cpp | 6 |
2 files changed, 14 insertions, 3 deletions
diff --git a/src/animation/frontend/qclipblendvalue.cpp b/src/animation/frontend/qclipblendvalue.cpp index c20609050..72a7dd796 100644 --- a/src/animation/frontend/qclipblendvalue.cpp +++ b/src/animation/frontend/qclipblendvalue.cpp @@ -59,10 +59,21 @@ QClipBlendValuePrivate::QClipBlendValuePrivate() \brief Class used for including a clip in a blend tree. */ /*! + \qmltype ClipBlendValue + \instantiates QClipBlendValue + \inqmlmodule Qt3D.Animation + \brief Type used for including a clip in a blend tree. +*/ +/*! \property Qt3DAnimation::QClipBlendValue::clip The animation clip that needs to be included in the blend tree. */ +/*! + \qmlproperty AbstractAnimationClip ClipBlendValue::clip + + The animation clip that needs to be included in the blend tree. +*/ QClipBlendValue::QClipBlendValue(Qt3DCore::QNode *parent) : QAbstractClipBlendNode(*new QClipBlendValuePrivate(), parent) { diff --git a/src/animation/frontend/qlerpclipblend.cpp b/src/animation/frontend/qlerpclipblend.cpp index fd9dd248c..89ce3ca6f 100644 --- a/src/animation/frontend/qlerpclipblend.cpp +++ b/src/animation/frontend/qlerpclipblend.cpp @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DAnimation { /*! - \qmltype LerpBlend + \qmltype LerpClipBlend \instantiates Qt3DAnimation::QLerpClipBlend \inqmlmodule Qt3D.Animation @@ -52,7 +52,7 @@ namespace Qt3DAnimation { \since 5.9 - LerpBlend can be useful to create advanced animation effects based on + LerpClipBlend can be useful to create advanced animation effects based on individual animation clips. For instance, given a player character,, lerp blending could be used to combine a walking animation clip with an injured animation clip based on a blend factor that increases the more the player @@ -118,7 +118,7 @@ Qt3DCore::QNodeCreatedChangeBasePtr QLerpClipBlend::createNodeCreationChange() c } /*! - \qmlproperty real LerpBlend::blendFactor + \qmlproperty real LerpClipBlend::blendFactor Specifies the blending factor between 0 and 1 to control the blending of two animation clips. |