diff options
Diffstat (limited to 'src/particles/qquickgravity.cpp')
| -rw-r--r-- | src/particles/qquickgravity.cpp | 48 |
1 files changed, 6 insertions, 42 deletions
diff --git a/src/particles/qquickgravity.cpp b/src/particles/qquickgravity.cpp index 6def43896d..155f727327 100644 --- a/src/particles/qquickgravity.cpp +++ b/src/particles/qquickgravity.cpp @@ -1,47 +1,11 @@ -/**************************************************************************** -** -** 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) 2021 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 #include <QtQml/qqmlinfo.h> +#include <QtCore/QtMath> #include "qquickgravity_p.h" -#include <cmath> QT_BEGIN_NAMESPACE -const qreal CONV = 0.017453292520444443; + /*! \qmltype Gravity \instantiates QQuickGravityAffector @@ -122,8 +86,8 @@ bool QQuickGravityAffector::affectParticle(QQuickParticleData *d, qreal dt) return false; if (m_needRecalc) { m_needRecalc = false; - m_dx = m_magnitude * std::cos(m_angle * CONV); - m_dy = m_magnitude * std::sin(m_angle * CONV); + m_dx = m_magnitude * qCos(qDegreesToRadians(m_angle)); + m_dy = m_magnitude * qSin(qDegreesToRadians(m_angle)); } d->setInstantaneousVX(d->curVX(m_system) + m_dx*dt, m_system); |