aboutsummaryrefslogtreecommitdiffstats
path: root/src/particles/qquickparticleemitter_p.h
diff options
context:
space:
mode:
authorErik Verbruggen <erik.verbruggen@theqtcompany.com>2016-03-01 12:39:09 +0100
committerErik Verbruggen <erik.verbruggen@theqtcompany.com>2016-03-04 10:43:23 +0000
commit554566788f585caaef14d929cee6557ad929e06e (patch)
treea1d571e23933a9f66ed49a789a932a666dc0ed89 /src/particles/qquickparticleemitter_p.h
parent62ecfe55f414d0d04a4344bc6934b4b01408190f (diff)
Particles: inline 4 methods.
And when in the area, remove 3 unused functions. Benchmark: start samegame, click '1 player', quit. Valgrind result: removes/inlines ~90,000 calls. Change-Id: If911b19b46bf163f7fe678623c068f960296f17e Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com> Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
Diffstat (limited to 'src/particles/qquickparticleemitter_p.h')
-rw-r--r--src/particles/qquickparticleemitter_p.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/particles/qquickparticleemitter_p.h b/src/particles/qquickparticleemitter_p.h
index e0036c4007..bb77d132cc 100644
--- a/src/particles/qquickparticleemitter_p.h
+++ b/src/particles/qquickparticleemitter_p.h
@@ -266,7 +266,12 @@ public Q_SLOTS:
virtual void reset();
public:
- int particleCount() const;
+ int particleCount() const
+ {
+ if (m_maxParticleCount >= 0)
+ return m_maxParticleCount;
+ return m_particlesPerSecond*((m_particleDuration+m_particleDurationVariation)/1000.0);
+ }
QQuickParticleExtruder* extruder() const
{