aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Alpert <alan.alpert@nokia.com>2011-06-09 15:17:52 +1000
committerAlan Alpert <alan.alpert@nokia.com>2011-06-09 15:17:52 +1000
commit283a37447b8c400957c4da7dda35a84ea86ac4ad (patch)
treeefd00da37181fb65b4a7dc89b55d3730e76a781b
parente726fa507dd93224bbb8c36ff53f90f61be76061 (diff)
Automatically set system if parent is a ParticleSystem
-rw-r--r--src/declarative/particles/qsgparticleaffector.cpp2
-rw-r--r--src/declarative/particles/qsgparticleemitter.cpp2
-rw-r--r--src/declarative/particles/qsgparticlepainter.cpp4
-rw-r--r--src/declarative/particles/qsgparticlesystem.cpp10
-rw-r--r--src/declarative/particles/qsgparticlesystem_p.h1
5 files changed, 16 insertions, 3 deletions
diff --git a/src/declarative/particles/qsgparticleaffector.cpp b/src/declarative/particles/qsgparticleaffector.cpp
index d4b588a44f..96c5cfb25b 100644
--- a/src/declarative/particles/qsgparticleaffector.cpp
+++ b/src/declarative/particles/qsgparticleaffector.cpp
@@ -56,6 +56,8 @@ QSGParticleAffector::QSGParticleAffector(QSGItem *parent) :
void QSGParticleAffector::componentComplete()
{
+ if(!m_system && qobject_cast<QSGParticleSystem*>(parentItem()))
+ setSystem(qobject_cast<QSGParticleSystem*>(parentItem()));
if(!m_system)
qWarning() << "Affector created without a particle system specified";//TODO: useful QML warnings, like line number?
QSGItem::componentComplete();
diff --git a/src/declarative/particles/qsgparticleemitter.cpp b/src/declarative/particles/qsgparticleemitter.cpp
index c04c86cfe5..20f3c6bb4b 100644
--- a/src/declarative/particles/qsgparticleemitter.cpp
+++ b/src/declarative/particles/qsgparticleemitter.cpp
@@ -76,6 +76,8 @@ QSGParticleEmitter::~QSGParticleEmitter()
void QSGParticleEmitter::componentComplete()
{
+ if(!m_system && qobject_cast<QSGParticleSystem*>(parentItem()))
+ setSystem(qobject_cast<QSGParticleSystem*>(parentItem()));
if(!m_system)
qWarning() << "Emitter created without a particle system specified";//TODO: useful QML warnings, like line number?
QSGItem::componentComplete();
diff --git a/src/declarative/particles/qsgparticlepainter.cpp b/src/declarative/particles/qsgparticlepainter.cpp
index 8814c61b56..a5e8c0a3e6 100644
--- a/src/declarative/particles/qsgparticlepainter.cpp
+++ b/src/declarative/particles/qsgparticlepainter.cpp
@@ -54,8 +54,10 @@ QSGParticlePainter::QSGParticlePainter(QSGItem *parent) :
void QSGParticlePainter::componentComplete()
{
+ if(!m_system && qobject_cast<QSGParticleSystem*>(parentItem()))
+ setSystem(qobject_cast<QSGParticleSystem*>(parentItem()));
if(!m_system)
- qWarning() << "Particle created without a particle system specified";//TODO: useful QML warnings, like line number?
+ qWarning() << "ParticlePainter created without a particle system specified";//TODO: useful QML warnings, like line number?
QSGItem::componentComplete();
}
diff --git a/src/declarative/particles/qsgparticlesystem.cpp b/src/declarative/particles/qsgparticlesystem.cpp
index a2aa377c82..4a8f75bb04 100644
--- a/src/declarative/particles/qsgparticlesystem.cpp
+++ b/src/declarative/particles/qsgparticlesystem.cpp
@@ -67,7 +67,9 @@ QSGParticleData::QSGParticleData()
}
QSGParticleSystem::QSGParticleSystem(QSGItem *parent) :
- QSGItem(parent), m_particle_count(0), m_running(true) , m_startTime(0), m_overwrite(false)
+ QSGItem(parent), m_particle_count(0), m_running(true)
+ , m_startTime(0), m_overwrite(false)
+ , m_componentComplete(false)
{
m_groupIds = QHash<QString, int>();
}
@@ -111,7 +113,9 @@ void QSGParticleSystem::setRunning(bool arg)
void QSGParticleSystem::componentComplete()
{
QSGItem::componentComplete();
- reset();
+ m_componentComplete = true;
+ if(!m_emitters.isEmpty() && !m_particles.isEmpty())
+ reset();
}
void QSGParticleSystem::initializeSystem()
@@ -191,6 +195,8 @@ void QSGParticleSystem::initializeSystem()
void QSGParticleSystem::reset()
{
+ if(!m_componentComplete)
+ return;//Batch starting reset()s a little
//Clear guarded pointers which have been deleted
int cleared = 0;
cleared += m_emitters.removeAll(0);
diff --git a/src/declarative/particles/qsgparticlesystem_p.h b/src/declarative/particles/qsgparticlesystem_p.h
index aab3c5d50f..9730ff35e8 100644
--- a/src/declarative/particles/qsgparticlesystem_p.h
+++ b/src/declarative/particles/qsgparticlesystem_p.h
@@ -163,6 +163,7 @@ private:
qint64 m_startTime;
int m_nextGroupId;
bool m_overwrite;
+ bool m_componentComplete;
};
//TODO: Clean up all this into ParticleData