aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/particles/qquickwander.cpp
diff options
context:
space:
mode:
authorMatthew Vogt <matthew.vogt@nokia.com>2012-04-11 16:54:33 +1000
committerQt by Nokia <qt-info@nokia.com>2012-04-16 01:25:54 +0200
commitf189b8934dc405cbd45258abc5aba2713428b1cc (patch)
treedd3d4f61c7337343705faf7a603585c287b8ae50 /src/quick/particles/qquickwander.cpp
parente00c40a89a1172add896e86e805a7cd42a4ea0c5 (diff)
Extract Particles code to an independent library
QtQuick clients that do not use particles features should not have to load these classes. Task-number: QTBUG-25178 Change-Id: Ib15f7655dc4d821595e06f9160d2770375279027 Reviewed-by: Glenn Watson <glenn.watson@nokia.com>
Diffstat (limited to 'src/quick/particles/qquickwander.cpp')
-rw-r--r--src/quick/particles/qquickwander.cpp181
1 files changed, 0 insertions, 181 deletions
diff --git a/src/quick/particles/qquickwander.cpp b/src/quick/particles/qquickwander.cpp
deleted file mode 100644
index 0f9a5f069b..0000000000
--- a/src/quick/particles/qquickwander.cpp
+++ /dev/null
@@ -1,181 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the QtQuick module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** 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
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** 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.
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qquickwander_p.h"
-#include "qquickparticlesystem_p.h"//for ParticlesVertices
-QT_BEGIN_NAMESPACE
-/*!
- \qmlclass Wander QQuickWanderAffector
- \inqmlmodule QtQuick.Particles 2
- \inherits Affector
- \brief The Wander affector allows particles to randomly vary their trajectory.
-
-*/
-/*!
- \qmlproperty real QtQuick.Particles2::Wander::pace
-
- Maximum attribute change per second.
-*/
-/*!
- \qmlproperty real QtQuick.Particles2::Wander::xVariance
-
- Maximum attribute x value (as a result of Wander).
-
- If unset, Wander will not affect x values.
-*/
-/*!
- \qmlproperty real QtQuick.Particles2::Wander::yVariance
-
- Maximum attribute y value (as a result of Wander).
-
- If unset, Wander will not affect y values.
-*/
-/*!
- \qmlproperty AffectableParameter QtQuick.Particles2::Wander::affectedParameter
-
- What attribute of particles is directly affected.
- \list
- \li PointAttractor.Position
- \li PointAttractor.Velocity
- \li PointAttractor.Acceleration
- \endlist
-*/
-
-QQuickWanderAffector::QQuickWanderAffector(QQuickItem *parent) :
- QQuickParticleAffector(parent), m_xVariance(0), m_yVariance(0), m_pace(0)
- , m_affectedParameter(Velocity)
-{
- m_needsReset = true;
-}
-
-QQuickWanderAffector::~QQuickWanderAffector()
-{
- for (QHash<int, WanderData*>::const_iterator iter=m_wanderData.constBegin();
- iter != m_wanderData.constEnd(); iter++)
- delete (*iter);
-}
-
-WanderData* QQuickWanderAffector::getData(int idx)
-{
- if (m_wanderData.contains(idx))
- return m_wanderData[idx];
- WanderData* d = new WanderData;
- d->x_vel = 0;
- d->y_vel = 0;
- d->x_peak = m_xVariance;
- d->y_peak = m_yVariance;
- d->x_var = m_pace * qreal(qrand()) / RAND_MAX;
- d->y_var = m_pace * qreal(qrand()) / RAND_MAX;
-
- m_wanderData.insert(idx, d);
- return d;
-}
-
-// TODO: see below
-//void QQuickWanderAffector::reset(int systemIdx)
-//{
-// if (m_wanderData.contains(systemIdx))
-// delete m_wanderData[systemIdx];
-// m_wanderData.remove(systemIdx);
-//}
-
-bool QQuickWanderAffector::affectParticle(QQuickParticleData* data, qreal dt)
-{
- /*TODO: Add a mode which does basically this - picking a direction, going in it (random speed) and then going back
- WanderData* d = getData(data->systemIndex);
- if (m_xVariance != 0.) {
- if ((d->x_vel > d->x_peak && d->x_var > 0.0) || (d->x_vel < -d->x_peak && d->x_var < 0.0)) {
- d->x_var = -d->x_var;
- d->x_peak = m_xVariance + m_xVariance * qreal(qrand()) / RAND_MAX;
- }
- d->x_vel += d->x_var * dt;
- }
- qreal dx = dt * d->x_vel;
-
- if (m_yVariance != 0.) {
- if ((d->y_vel > d->y_peak && d->y_var > 0.0) || (d->y_vel < -d->y_peak && d->y_var < 0.0)) {
- d->y_var = -d->y_var;
- d->y_peak = m_yVariance + m_yVariance * qreal(qrand()) / RAND_MAX;
- }
- d->y_vel += d->y_var * dt;
- }
- qreal dy = dt * d->x_vel;
-
- //### Should we be amending vel instead?
- ParticleVertex* p = &(data->pv);
- p->x += dx;
-
- p->y += dy;
- return true;
- */
- qreal dx = dt * m_pace * (2 * qreal(qrand())/RAND_MAX - 1);
- qreal dy = dt * m_pace * (2 * qreal(qrand())/RAND_MAX - 1);
- qreal newX, newY;
- switch (m_affectedParameter){
- case Position:
- newX = data->curX() + dx;
- if (m_xVariance > qAbs(newX) )
- data->x += dx;
- newY = data->curY() + dy;
- if (m_yVariance > qAbs(newY) )
- data->y += dy;
- break;
- default:
- case Velocity:
- newX = data->curVX() + dx;
- if (m_xVariance > qAbs(newX) )
- data->setInstantaneousVX(newX);
- newY = data->curVY() + dy;
- if (m_yVariance > qAbs(newY) )
- data->setInstantaneousVY(newY);
- break;
- case Acceleration:
- newX = data->ax + dx;
- if (m_xVariance > qAbs(newX) )
- data->setInstantaneousAX(newX);
- newY = data->ay + dy;
- if (m_yVariance > qAbs(newY) )
- data->setInstantaneousAY(newY);
- break;
- }
- return true;
-}
-QT_END_NAMESPACE