FCL/sf/mw/qt: comparison src/imports/particles/qdeclarativeparticles.cpp

equal deleted inserted replaced

-:5dc02b23752f
+:3e2da88830cd
 {
 Q_UNUSED(particle);
 }
 /*!
-\qmlclass ParticleMotionLinear
+\qmlclass ParticleMotionLinear QDeclarativeParticleMotionLinear
 \since 4.7
 \brief The ParticleMotionLinear object moves particles linearly.
 \sa Particles
+This is the default motion, and moves the particles according to the
+properties specified in the Particles element.
+It has no further properties.
 */
 /*!
 \internal
 \class QDeclarativeParticleMotionLinear
 p.x += interval * p.x_velocity;
 p.y += interval * p.y_velocity;
 }
 /*!
-\qmlclass ParticleMotionGravity
+\qmlclass ParticleMotionGravity QDeclarativeParticleMotionGravity
 \since 4.7
 \brief The ParticleMotionGravity object moves particles towards a point.
+This motion attracts the particles to the specified point with the specified acceleration.
+To mimic earth gravity, set yattractor to -6360000 and acceleration to 9.8.
+The defaults are all 0, not earth gravity, and so no motion will occur without setting
+at least the acceleration property.
 \sa Particles
 */
 /*!
 \internal
 \class QDeclarativeParticleMotionGravity
 \ingroup group_effects
 \brief The QDeclarativeParticleMotionGravity class moves the particles towards a point.
 */
 /*!
 \qmlproperty real ParticleMotionGravity::xattractor
 \qmlproperty real ParticleMotionGravity::yattractor
 emit accelerationChanged();
 }
 void QDeclarativeParticleMotionGravity::advance(QDeclarativeParticle &p, int interval)
 {
-qreal xdiff = p.x - _xAttr;
+qreal xdiff = _xAttr - p.x;
-qreal ydiff = p.y - _yAttr;
+qreal ydiff = _yAttr - p.y;
+qreal absXdiff = qAbs(xdiff);
-qreal xcomp = xdiff / (xdiff + ydiff);
+qreal absYdiff = qAbs(ydiff);
-qreal ycomp = ydiff / (xdiff + ydiff);
+qreal xcomp = xdiff / (absXdiff + absYdiff);
+qreal ycomp = ydiff / (absXdiff + absYdiff);
 p.x_velocity += xcomp * _accel * interval;
 p.y_velocity += ycomp * _accel * interval;
 p.x += interval * p.x_velocity;
 p.y += interval * p.y_velocity;
 }
 /*!
-\qmlclass ParticleMotionWander
+\qmlclass ParticleMotionWander QDeclarativeParticleMotionWander
 \since 4.7
 \brief The ParticleMotionWander object moves particles in a somewhat random fashion.
 The particles will continue roughly in the original direction, however will randomly
 drift to each side.
 The particles will continue roughly in the original direction, however will randomly
 drift to each side.
 */
 /*!
-\qmlproperty real QDeclarativeParticleMotionWander::xvariance
+\qmlproperty real ParticleMotionWander::xvariance
-\qmlproperty real QDeclarativeParticleMotionWander::yvariance
+\qmlproperty real ParticleMotionWander::yvariance
 These properties set the amount to wander in the x and y directions.
 */
 /*!
-\qmlproperty real QDeclarativeParticleMotionWander::pace
+\qmlproperty real ParticleMotionWander::pace
 This property holds how quickly the paricles will move from side to side.
 */
 void QDeclarativeParticleMotionWander::advance(QDeclarativeParticle &p, int interval)
 {
 QDeclarativeParticlesPrivate()
 : count(1), emissionRate(-1), emissionVariance(0.5), lifeSpan(1000)
 , lifeSpanDev(1000), fadeInDur(200), fadeOutDur(300)
 , angle(0), angleDev(0), velocity(0), velocityDev(0), emissionCarry(0.)
 , addParticleTime(0), addParticleCount(0), lastAdvTime(0)
-, motion(0), pendingPixmapCache(false), clock(this)
+, motion(0), clock(this)
 {
 }
 ~QDeclarativeParticlesPrivate()
 {
 void tick(int time);
 void createParticle(int time);
 void updateOpacity(QDeclarativeParticle &p, int age);
 QUrl url;
-QPixmap image;
+QDeclarativePixmap image;
 int count;
 int emissionRate;
 qreal emissionVariance;
 int lifeSpan;
 int lifeSpanDev;
 int addParticleCount;
 int lastAdvTime;
 QDeclarativeParticleMotion *motion;
 QDeclarativeParticlesPainter *paintItem;
-bool pendingPixmapCache;
 QList<QPair<int, int> > bursts;//countLeft, emissionRate pairs
 QList<QDeclarativeParticle> particles;
 TickAnimationProxy<QDeclarativeParticlesPrivate, &QDeclarativeParticlesPrivate::tick> clock;
 break;
 }
 }
 /*!
-\qmlclass Particles
+\qmlclass Particles QDeclarativeParticles
 \since 4.7
 \brief The Particles object generates and moves particles.
 \inherits Item
 Particles are available in the \bold{Qt.labs.particles 1.0} module.
 d->init();
 }
 QDeclarativeParticles::~QDeclarativeParticles()
 {
-Q_D(QDeclarativeParticles);
-if (d->pendingPixmapCache)
-QDeclarativePixmapCache::cancel(d->url, this);
 }
 /*!
 \qmlproperty string Particles::source
 This property holds the URL of the particle image.
 }
 void QDeclarativeParticles::imageLoaded()
 {
 Q_D(QDeclarativeParticles);
-d->pendingPixmapCache = false;
+if (d->image.isError())
-QString errorString;
+qmlInfo(this) << d->image.error();
-if (QDeclarativePixmapCache::get(d->url, &d->image, &errorString)==QDeclarativePixmapReply::Error)
-qmlInfo(this) << errorString;
 d->paintItem->updateSize();
 d->paintItem->update();
 }
 void QDeclarativeParticles::setSource(const QUrl &name)
 Q_D(QDeclarativeParticles);
 if ((d->url.isEmpty() == name.isEmpty()) && name == d->url)
 return;
-if (d->pendingPixmapCache) {
-QDeclarativePixmapCache::cancel(d->url, this);
-d->pendingPixmapCache = false;
-}
 if (name.isEmpty()) {
 d->url = name;
-d->image = QPixmap();
+d->image.clear(this);
 d->paintItem->updateSize();
 d->paintItem->update();
 } else {
 d->url = name;
 Q_ASSERT(!name.isRelative());
-QString errorString;
+d->image.load(qmlEngine(this), d->url);
-QDeclarativePixmapReply::Status status = QDeclarativePixmapCache::get(d->url, &d->image, &errorString);
+if (d->image.isLoading()) {
-if (status != QDeclarativePixmapReply::Ready && status != QDeclarativePixmapReply::Error) {
+d->image.connectFinished(this, SLOT(imageLoaded()));
-QDeclarativePixmapReply *reply = QDeclarativePixmapCache::request(qmlEngine(this), d->url);
-connect(reply, SIGNAL(finished()), this, SLOT(imageLoaded()));
-d->pendingPixmapCache = true;
 } else {
-if (status == QDeclarativePixmapReply::Error)
+if (d->image.isError())
-qmlInfo(this) << errorString;
+qmlInfo(this) << d->image.error();
 //### unify with imageLoaded
 d->paintItem->updateSize();
 d->paintItem->update();
 }
 }
 d->clock.start();
 }
 void QDeclarativeParticlesPainter::updateSize()
 {
-if (!d->_componentComplete)
+if (!d->componentComplete)
 return;
 const int parentX = parentItem()->x();
 const int parentY = parentItem()->y();
 for (int i = 0; i < d->particles.count(); ++i) {
 return;
 const int myX = x() + parentItem()->x();
 const int myY = y() + parentItem()->y();
-#if (QT_VERSION >= QT_VERSION_CHECK(4,7,0))
 QVarLengthArray<QPainter::PixmapFragment, 256> pixmapData;
-#else
-QVarLengthArray<QDrawPixmaps::Data, 256> pixmapData;
-#endif
 pixmapData.resize(d->particles.count());
 const QRectF sourceRect = d->image.rect();
 qreal halfPWidth = sourceRect.width()/2.;
 qreal halfPHeight = sourceRect.height()/2.;
 for (int i = 0; i < d->particles.count(); ++i) {
 const QDeclarativeParticle &particle = d->particles.at(i);
-#if (QT_VERSION >= QT_VERSION_CHECK(4,7,0))
 pixmapData[i].x = particle.x - myX + halfPWidth;
 pixmapData[i].y = particle.y - myY + halfPHeight;
-#else
-pixmapData[i].point = QPointF(particle.x - myX + halfPWidth, particle.y - myY + halfPHeight);
-#endif
 pixmapData[i].opacity = particle.opacity;
 //these never change
 pixmapData[i].rotation = 0;
 pixmapData[i].scaleX = 1;
 pixmapData[i].scaleY = 1;
-#if (QT_VERSION >= QT_VERSION_CHECK(4,7,0))
 pixmapData[i].sourceLeft = sourceRect.left();
 pixmapData[i].sourceTop = sourceRect.top();
 pixmapData[i].width = sourceRect.width();
 pixmapData[i].height = sourceRect.height();
-#else
+}
-pixmapData[i].source = sourceRect;
-#endif
-}
-#if (QT_VERSION >= QT_VERSION_CHECK(4,7,0))
 p->drawPixmapFragments(pixmapData.data(), d->particles.count(), d->image);
-#else
-qDrawPixmaps(p, pixmapData.data(), d->particles.count(), d->image);
-#endif
 }
 void QDeclarativeParticles::componentComplete()
 {
 Q_D(QDeclarativeParticles);

changeset 33	3e2da88830cd
parent 30	5dc02b23752f
child 37	758a864f9613