summaryrefslogtreecommitdiffstats
path: root/src/animation/backend/managers_p.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/animation/backend/managers_p.h')
-rw-r--r--src/animation/backend/managers_p.h16
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)