** This file is part of the Declarative module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
+** rights. These rights are described in the Nokia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 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 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
**
**
**
bool QSGPointAttractorAffector::affectParticle(QSGParticleData *d, qreal dt)
{
- if(m_strength == 0.0)
+ if (m_strength == 0.0)
return false;
qreal dx = m_y - d->curX();
qreal dy = m_x - d->curY();
qreal r = sqrt((dx*dx) + (dy*dy));
qreal theta = atan2(dy,dx);
qreal ds = 0;
- switch(m_proportionalToDistance){
+ switch (m_proportionalToDistance){
case Quadratic:
- ds = (m_strength / qMax(1.,r*r)) * dt;
+ ds = (m_strength / qMax<qreal>(1.,r*r)) * dt;
break;
case Linear://also default
default:
- ds = (m_strength / qMax(1.,r)) * dt;
+ ds = (m_strength / qMax<qreal>(1.,r)) * dt;
}
dx = ds * cos(theta);
dy = ds * sin(theta);
- switch(m_physics){
+ switch (m_physics){
case Position:
- d->pv.x = (d->pv.x + dx);
- d->pv.y = (d->pv.y + dy);
+ d->x = (d->x + dx);
+ d->y = (d->y + dy);
break;
case Acceleration:
- d->setInstantaneousAX(d->pv.ax + dx);
- d->setInstantaneousAY(d->pv.ay + dy);
+ d->setInstantaneousAX(d->ax + dx);
+ d->setInstantaneousAY(d->ay + dy);
break;
case Velocity: //also default
default:
- d->setInstantaneousSX(d->pv.sx + dx);
- d->setInstantaneousSY(d->pv.sy + dy);
+ d->setInstantaneousSX(d->sx + dx);
+ d->setInstantaneousSY(d->sy + dy);
}
return true;