From 1fa25f48b040f4e08a04f92f9b3a534d6e0fd106 Mon Sep 17 00:00:00 2001 From: Alan Alpert Date: Tue, 22 May 2012 17:27:23 +1000 Subject: Organize data members in QQuickParticleData Change-Id: Ibf14dc0f9ef9e17225f07f31276085c9ca83d4f1 Reviewed-by: Yunqiao Yin --- src/particles/qquickparticlesystem_p.h | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) (limited to 'src/particles') 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. -- cgit v1.2.3