aboutsummaryrefslogtreecommitdiffstats
path: root/src/particles/qquickparticleaffector_p.h
diff options
context:
space:
mode:
authorAlan Alpert <alan.alpert@nokia.com>2012-05-31 16:45:45 +1000
committerQt by Nokia <qt-info@nokia.com>2012-06-06 07:50:44 +0200
commit7b181d599f87f628f7e019aa451ff670fdb29d9f (patch)
tree50fbb8cc707217b3cbb8a8ee7485d2a1553f1d64 /src/particles/qquickparticleaffector_p.h
parent9fdf7be30568e2298cdc7a911cbbfbed0453d31f (diff)
Fix affected signal and docs
Signal wasn't being called in its primary usecase, which was to interact without altering the particles. Docs have been updated to clarify the usecase as well. This also updates the position properties of custom affector to more accurately specify if they caused changes. Change-Id: Ia411d9e81002443a56ed8bab9232f1aad49a4c5e Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
Diffstat (limited to 'src/particles/qquickparticleaffector_p.h')
-rw-r--r--src/particles/qquickparticleaffector_p.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/particles/qquickparticleaffector_p.h b/src/particles/qquickparticleaffector_p.h
index 4147488f87..3aec072b7d 100644
--- a/src/particles/qquickparticleaffector_p.h
+++ b/src/particles/qquickparticleaffector_p.h
@@ -178,13 +178,14 @@ protected:
bool shouldAffect(QQuickParticleData* datum);//Call to do the logic on whether it is affecting that datum
void postAffect(QQuickParticleData* datum);//Call to do the post-affect logic on particles which WERE affected(once off, needs reset, affected signal)
virtual void componentComplete();
- QPointF m_offset;
bool isAffectedConnected();
static const qreal simulationDelta;
static const qreal simulationCutoff;
+
+ QPointF m_offset;
+ QSet<QPair<int, int> > m_onceOffed;
private:
QSet<int> m_groupIds;
- QSet<QPair<int, int> > m_onceOffed;
bool m_updateIntSet;
QQuickParticleExtruder* m_shape;