diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2017-05-24 12:09:44 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2017-05-24 12:10:02 +0100 |
| commit | 77d294db076dac19e8b549b445ffede9f7260c84 (patch) | |
| tree | 828ee7a6862ec5c0bd24f97cb540625a2c647376 /src/animation/backend/managers_p.h | |
| parent | 59f8fec8a41606b3185fe3a4e276978e3e1ed5ef (diff) | |
| parent | 939b9b4b7591e8a421cf048a0a84ed3e75d81d21 (diff) | |
Merge branch 'dev' into wip/animationwip/animation
Change-Id: I6e770609c90a7745d08fa4e2f424e865678c5d6f
Diffstat (limited to 'src/animation/backend/managers_p.h')
| -rw-r--r-- | src/animation/backend/managers_p.h | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/src/animation/backend/managers_p.h b/src/animation/backend/managers_p.h index 42484921f..f99ed0698 100644 --- a/src/animation/backend/managers_p.h +++ b/src/animation/backend/managers_p.h @@ -56,7 +56,6 @@ #include <Qt3DAnimation/private/animationclip_p.h> #include <Qt3DAnimation/private/blendedclipanimator_p.h> #include <Qt3DAnimation/private/clipanimator_p.h> -#include <Qt3DAnimation/private/conductedclipanimator_p.h> #include <Qt3DAnimation/private/channelmapping_p.h> #include <Qt3DAnimation/private/channelmapper_p.h> #include <Qt3DCore/private/qresourcemanager_p.h> @@ -68,14 +67,14 @@ namespace Animation { class ClipBlendNode; -class AnimationClipManager : public Qt3DCore::QResourceManager< +class AnimationClipLoaderManager : public Qt3DCore::QResourceManager< AnimationClip, Qt3DCore::QNodeId, 16, Qt3DCore::ArrayAllocatingPolicy> { public: - AnimationClipManager() {} + AnimationClipLoaderManager() {} }; class ClipAnimatorManager : public Qt3DCore::QResourceManager< @@ -98,16 +97,6 @@ public: BlendedClipAnimatorManager() {} }; -class ConductedClipAnimatorManager : public Qt3DCore::QResourceManager< - ConductedClipAnimator, - Qt3DCore::QNodeId, - 8, - Qt3DCore::ArrayAllocatingPolicy> -{ -public: - ConductedClipAnimatorManager() {} -}; - class ChannelMappingManager : public Qt3DCore::QResourceManager< ChannelMapping, Qt3DCore::QNodeId, @@ -149,7 +138,6 @@ private: Q_DECLARE_RESOURCE_INFO(Qt3DAnimation::Animation::AnimationClip, Q_REQUIRES_CLEANUP) Q_DECLARE_RESOURCE_INFO(Qt3DAnimation::Animation::ClipAnimator, Q_REQUIRES_CLEANUP) Q_DECLARE_RESOURCE_INFO(Qt3DAnimation::Animation::BlendedClipAnimator, Q_REQUIRES_CLEANUP) -Q_DECLARE_RESOURCE_INFO(Qt3DAnimation::Animation::ConductedClipAnimator, Q_REQUIRES_CLEANUP) Q_DECLARE_RESOURCE_INFO(Qt3DAnimation::Animation::ChannelMapping, Q_REQUIRES_CLEANUP) Q_DECLARE_RESOURCE_INFO(Qt3DAnimation::Animation::ChannelMapper, Q_REQUIRES_CLEANUP) |