diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2011-08-11 19:59:05 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-08-15 06:48:20 +0200 |
| commit | 5781598747ac8342a05e9a8f48ea09a7e0444467 (patch) | |
| tree | c89381fbae68174a95be7d69bcd291c8148f66d5 /src/declarative/particles/qsgfollowemitter.cpp | |
| parent | f5db9800a9d074fbb70b8ea7465b6c45a6f11ff4 (diff) | |
Add noCap and startTime properties to Emitter
Change-Id: I8498b2e574a32bfbab9f139e718424572b1258a0
Reviewed-on: http://codereview.qt.nokia.com/2855
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Diffstat (limited to 'src/declarative/particles/qsgfollowemitter.cpp')
| -rw-r--r-- | src/declarative/particles/qsgfollowemitter.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/declarative/particles/qsgfollowemitter.cpp b/src/declarative/particles/qsgfollowemitter.cpp index 54daec7729..0ee4a00f00 100644 --- a/src/declarative/particles/qsgfollowemitter.cpp +++ b/src/declarative/particles/qsgfollowemitter.cpp @@ -134,6 +134,7 @@ void QSGFollowEmitter::emitWindow(int timeStamp) } } + //TODO: Implement startTime and speedFromMovement qreal time = timeStamp / 1000.; qreal particleRatio = 1. / m_particlesPerParticlePerSecond; qreal pt; @@ -158,7 +159,7 @@ void QSGFollowEmitter::emitWindow(int timeStamp) continue; } while (pt < time || !m_burstQueue.isEmpty()){ - QSGParticleData* datum = m_system->newDatum(gId2); + QSGParticleData* datum = m_system->newDatum(gId2, !m_overwrite); if (datum){//else, skip this emission datum->e = this;//###useful? |