diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2017-02-16 17:38:52 +0000 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2017-02-24 20:41:28 +0000 |
commit | 7a3648ef4e884429dbe4bb60ab5a0a838bc5abfc (patch) | |
tree | fe617ede422a28854daeddff9f8d9a7874415750 /src/animation/frontend/qanimationclip.h | |
parent | 2a485273c1da1f56412bfd19795ac5a29331b770 (diff) |
Introduce QAbstractAnimationClip and rename QAnimationClip
Introduced an abstract base class for types of animation clip. Also
renamed QAnimationClip to QAnimationClipLoader since it loads data
from files.
Also renamed corresponding backend type and fixed up unit tests
accordingly.
Task-number: QTBUG-58898
Change-Id: I01a96e108cbbcd12e01913693e96610598965018
Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
Diffstat (limited to 'src/animation/frontend/qanimationclip.h')
-rw-r--r-- | src/animation/frontend/qanimationclip.h | 83 |
1 files changed, 0 insertions, 83 deletions
diff --git a/src/animation/frontend/qanimationclip.h b/src/animation/frontend/qanimationclip.h deleted file mode 100644 index 55b1910fa..000000000 --- a/src/animation/frontend/qanimationclip.h +++ /dev/null @@ -1,83 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 Klaralvdalens Datakonsult AB (KDAB). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt3D module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QT3DANIMATION_QANIMATIONCLIP_H -#define QT3DANIMATION_QANIMATIONCLIP_H - -#include <Qt3DAnimation/qt3danimation_global.h> -#include <Qt3DCore/qnode.h> -#include <QtCore/qurl.h> - -QT_BEGIN_NAMESPACE - -namespace Qt3DAnimation { - -class QAnimationClipPrivate; - -class QT3DANIMATIONSHARED_EXPORT QAnimationClip : public Qt3DCore::QNode -{ - Q_OBJECT - Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged) - Q_PROPERTY(float duration READ duration NOTIFY durationChanged) - -public: - explicit QAnimationClip(Qt3DCore::QNode *parent = nullptr); - ~QAnimationClip(); - - QUrl source() const; - float duration() const; - -public Q_SLOTS: - void setSource(QUrl source); - -Q_SIGNALS: - void sourceChanged(QUrl source); - void durationChanged(float duration); - -protected: - QAnimationClip(QAnimationClipPrivate &dd, Qt3DCore::QNode *parent = nullptr); - void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) Q_DECL_OVERRIDE; - -private: - Q_DECLARE_PRIVATE(QAnimationClip) - Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE; -}; - -} // namespace Qt3DAnimation - -QT_END_NAMESPACE - -#endif // QT3DANIMATION_QANIMATIONCLIP_H |