aboutsummaryrefslogtreecommitdiffstats
path: root/src/declarative/particles/qsgparticleextruder_p.h
diff options
context:
space:
mode:
authorAlan Alpert <alan.alpert@nokia.com>2011-09-06 10:40:21 +1000
committerQt by Nokia <qt-info@nokia.com>2011-09-08 08:16:48 +0200
commit1aa012a1c83ce8905e5440d3e7ae11192dc73878 (patch)
tree813b36a8637c21e9f33c858daed24b57e2b2115e /src/declarative/particles/qsgparticleextruder_p.h
parent63982ebb2cd0aa28c456e25cc9edb400b5b881d9 (diff)
Particles module refactoring en masse
All the little changes in one commit. StochasticDirection -> Direction AngledDirection -> AngleDirection TargetedDirection -> TargetDirection QSGCustomParticle is now Affector's implementation (C++ only refactor) FollowEmitter -> TrailEmitter Kill -> Age and gained lifeLeft property ModelParticle is removed, use ItemParticle instead. Added RectangleShape to replace Shape for the case of Rectangles Abstract Types are no longer createable, despite sensible defaults. GLSL variables in CustomParticle now begin with qt_ JS variables are now such that x,vx,ax are current (old ones are now initialX, initialVX, initialAX). Same for y. A few more were extended. Emitter::emitCap -> Emitter::maximumEmitted. Set to -1 for noCap: false Emitter::noCap is gone. Emitter::emitting -> Emitter::enabled Affector::active -> Affector::enabled Affector::collisionParticles -> Affector::whenCollidingWith Affector::signal is gone. PointAttractor -> Attractor Attractor/Wander::physics -> ::affectedParameter ParticleSystem::fastForward is gone ParticleSystem::startTime is gone (use Emitter::startTime) ParticleSystem::clear -> ParticleSystem::empty And various Doc fixes. Change-Id: Ia3b02b987f692e6f1bd14c42e575381bdfb7bbb5 Reviewed-on: http://codereview.qt-project.org/4231 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Diffstat (limited to 'src/declarative/particles/qsgparticleextruder_p.h')
-rw-r--r--src/declarative/particles/qsgparticleextruder_p.h19
1 files changed, 1 insertions, 18 deletions
diff --git a/src/declarative/particles/qsgparticleextruder_p.h b/src/declarative/particles/qsgparticleextruder_p.h
index bb2cc24ac2..b31b80231d 100644
--- a/src/declarative/particles/qsgparticleextruder_p.h
+++ b/src/declarative/particles/qsgparticleextruder_p.h
@@ -55,32 +55,15 @@ QT_MODULE(Declarative)
class QSGParticleExtruder : public QObject
{
Q_OBJECT
- Q_PROPERTY(bool fill READ fill WRITE setFill NOTIFY fillChanged)//###Should this be base class, or a BoxExtruder?
public:
explicit QSGParticleExtruder(QObject *parent = 0);
virtual QPointF extrude(const QRectF &);
- virtual bool contains(const QRectF &bounds, const QPointF &point);//###Needed for follow emitter, but does it belong? Only marginally conceptually valid, and that's from user's perspective
- bool fill() const
- {
- return m_fill;
- }
+ virtual bool contains(const QRectF &bounds, const QPointF &point);
signals:
-
- void fillChanged(bool arg);
-
public slots:
-
- void setFill(bool arg)
- {
- if (m_fill != arg) {
- m_fill = arg;
- emit fillChanged(arg);
- }
- }
protected:
- bool m_fill;
};
QT_END_NAMESPACE