aboutsummaryrefslogtreecommitdiffstats
path: root/src/particles
diff options
context:
space:
mode:
authorAlan Alpert <alan.alpert@nokia.com>2012-05-22 17:27:23 +1000
committerQt by Nokia <qt-info@nokia.com>2012-05-24 00:20:27 +0200
commit1fa25f48b040f4e08a04f92f9b3a534d6e0fd106 (patch)
treed202b6b06e2c8305965e3122a1781e17414417bd /src/particles
parent14c8b9e260f2f525d0b4ac3bd87620efe11af621 (diff)
Organize data members in QQuickParticleData
Change-Id: Ibf14dc0f9ef9e17225f07f31276085c9ca83d4f1 Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
Diffstat (limited to 'src/particles')
-rw-r--r--src/particles/qquickparticlesystem_p.h20
1 files changed, 13 insertions, 7 deletions
diff --git a/src/particles/qquickparticlesystem_p.h b/src/particles/qquickparticlesystem_p.h
index f70cc5af94..2058db6b51 100644
--- a/src/particles/qquickparticlesystem_p.h
+++ b/src/particles/qquickparticlesystem_p.h
@@ -189,8 +189,10 @@ public:
float ax;
float ay;
- //Other stuff, now universally shared
+ //Painter-specific stuff, now universally shared
+ //Used by ImageParticle color mode
Color4ub color;
+ //Used by ImageParticle deform mode
float xx;
float xy;
float yx;
@@ -198,6 +200,7 @@ public:
float rotation;
float rotationSpeed;
float autoRotate;//Assume that GPUs prefer floats to bools
+ //Used by ImageParticle Sprite mode
float animIdx;
float frameDuration;
float frameAt;//Used for duration -1
@@ -207,16 +210,19 @@ public:
float animY;
float animWidth;
float animHeight;
- float r;
- QQuickItem* delegate;
- int modelIndex;
- float update;//Used by custom affectors
-
- //Used by image particle
+ //Used by ImageParticle data shadowing
QQuickImageParticle* colorOwner;
QQuickImageParticle* rotationOwner;
QQuickImageParticle* deformationOwner;
QQuickImageParticle* animationOwner;
+ //Used by CustomParticle
+ float r;
+ //Used by ItemParticle
+ QQuickItem* delegate;
+ int modelIndex;
+ //Used by custom affectors
+ float update;
+
void debugDump();
bool stillAlive();//Only checks end, because usually that's all you need and it's a little faster.