diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-05-28 15:24:18 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-05-28 15:35:03 +0200 |
| commit | ba0899542cf03a685335bf4e02edfb377bade224 (patch) | |
| tree | 554213486fd3420745da3821c3e4502e4c15830f /src/particles | |
| parent | 6f411ef9d460d6a4f73a455b6eec9afc2f52d305 (diff) | |
| parent | 43484528552cb2ba3dc1dabfcce22ed40bf4f8db (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/quick/doc/src/appdevguide/porting.qdoc
sync.profile
Change-Id: Iec5516c596c3eca60a3e6ceb1d45f2a7a1595c12
Diffstat (limited to 'src/particles')
| -rw-r--r-- | src/particles/qquickmaskextruder.cpp | 2 | ||||
| -rw-r--r-- | src/particles/qquickparticleemitter.cpp | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/particles/qquickmaskextruder.cpp b/src/particles/qquickmaskextruder.cpp index f8ed042a9b..d59902bf3a 100644 --- a/src/particles/qquickmaskextruder.cpp +++ b/src/particles/qquickmaskextruder.cpp @@ -118,7 +118,7 @@ bool QQuickMaskExtruder::contains(const QRectF &bounds, const QPointF &point) QPointF pt = point - bounds.topLeft(); QPoint p(pt.x() * m_img.width() / bounds.width(), pt.y() * m_img.height() / bounds.height()); - return m_img.rect().contains(p) && (bool)m_img.pixelIndex(p); + return m_img.rect().contains(p) && (m_img.pixel(p) & 0xff000000); } void QQuickMaskExtruder::ensureInitialized(const QRectF &rf) diff --git a/src/particles/qquickparticleemitter.cpp b/src/particles/qquickparticleemitter.cpp index b4e3a82cb2..6d9b945def 100644 --- a/src/particles/qquickparticleemitter.cpp +++ b/src/particles/qquickparticleemitter.cpp @@ -203,7 +203,7 @@ QT_BEGIN_NAMESPACE Emits count particles from this emitter immediately. */ -/*! \qmlmethod QtQuick.Particles2::Emitter::burst(int x, int y, int count) +/*! \qmlmethod QtQuick.Particles2::Emitter::burst(int count, int x, int y) Emits count particles from this emitter immediately. The particles are emitted as if the Emitter was positioned at x,y but all other properties are the same. @@ -357,7 +357,7 @@ void QQuickParticleEmitter::emitWindow(int timeStamp) m_last_timestamp = timeStamp/1000.; m_last_emission = m_last_timestamp; m_reset_last = false; - m_emitCap = particleCount(); + m_emitCap = -1; } if (m_pulseLeft){ @@ -424,6 +424,8 @@ void QQuickParticleEmitter::emitWindow(int timeStamp) if (datum->lifeSpan >= m_system->maxLife){ datum->lifeSpan = m_system->maxLife; + if (m_emitCap == -1) + m_emitCap = particleCount(); m_emitCap--;//emitCap keeps us from reemitting 'infinite' particles after their life. Unless you reset the emitter. } |