diff options
Diffstat (limited to 'src/particles/qquickcustomaffector_p.h')
| -rw-r--r-- | src/particles/qquickcustomaffector_p.h | 51 |
1 files changed, 9 insertions, 42 deletions
diff --git a/src/particles/qquickcustomaffector_p.h b/src/particles/qquickcustomaffector_p.h index c1745798c3..1280e2b4dd 100644 --- a/src/particles/qquickcustomaffector_p.h +++ b/src/particles/qquickcustomaffector_p.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtQuick module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** 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 https://www.qt.io/terms-conditions. For further -** information use the contact form at https://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.LGPL3 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-3.0.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 (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef CUSTOMAFFECTOR_H #define CUSTOMAFFECTOR_H @@ -52,6 +16,7 @@ // #include <QObject> +#include <QtQml/qqml.h> #include "qquickparticlesystem_p.h" #include "qquickparticleextruder_p.h" #include "qquickparticleaffector_p.h" @@ -59,16 +24,18 @@ QT_BEGIN_NAMESPACE -class QQuickCustomAffector : public QQuickParticleAffector +class Q_QUICKPARTICLES_EXPORT QQuickCustomAffector : public QQuickParticleAffector { Q_OBJECT Q_PROPERTY(bool relative READ relative WRITE setRelative NOTIFY relativeChanged) Q_PROPERTY(QQuickDirection *position READ position WRITE setPosition NOTIFY positionChanged RESET positionReset) Q_PROPERTY(QQuickDirection *velocity READ velocity WRITE setVelocity NOTIFY velocityChanged RESET velocityReset) Q_PROPERTY(QQuickDirection *acceleration READ acceleration WRITE setAcceleration NOTIFY accelerationChanged RESET accelerationReset) + QML_NAMED_ELEMENT(Affector) + QML_ADDED_IN_VERSION(2, 0) public: - explicit QQuickCustomAffector(QQuickItem *parent = 0); + explicit QQuickCustomAffector(QQuickItem *parent = nullptr); void affectSystem(qreal dt) override; QQuickDirection * position() const @@ -108,7 +75,7 @@ public: Q_SIGNALS: - void affectParticles(QQmlV4Handle particles, qreal dt); + void affectParticles(const QList<QQuickV4ParticleData> &particles, qreal dt); void positionChanged(QQuickDirection * arg); @@ -156,7 +123,7 @@ protected: bool affectParticle(QQuickParticleData *d, qreal dt) override; private: - void affectProperties(const QList<QQuickParticleData*> particles, qreal dt); + void affectProperties(const QList<QQuickParticleData*> &particles, qreal dt); QQuickDirection * m_position; QQuickDirection * m_velocity; QQuickDirection * m_acceleration; |