diff options
author | Alan Alpert <alan.alpert@nokia.com> | 2012-01-25 19:18:25 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-09 07:32:07 +0100 |
commit | 298b86b95bd42d12e15e8d8a137cd9bee21d6094 (patch) | |
tree | 6ac8ee1d463f419966d64756452849d36913a885 /src/quick/particles/qquickmaskextruder_p.h | |
parent | 3233e8052d2d25fd36567f67f9cd314cf0eaef92 (diff) |
Use QDeclarativePixmap in the Particle System
This allows for source URLs to come from network sources.
Change-Id: I416edca010e77e507598eaf4eead4291f044f379
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src/quick/particles/qquickmaskextruder_p.h')
-rw-r--r-- | src/quick/particles/qquickmaskextruder_p.h | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/quick/particles/qquickmaskextruder_p.h b/src/quick/particles/qquickmaskextruder_p.h index 08821406ff..0c9f10b1b2 100644 --- a/src/quick/particles/qquickmaskextruder_p.h +++ b/src/quick/particles/qquickmaskextruder_p.h @@ -42,6 +42,7 @@ #ifndef MASKEXTRUDER_H #define MASKEXTRUDER_H #include "qquickparticleextruder_p.h" +#include <private/qdeclarativepixmapcache_p.h> #include <QUrl> #include <QImage> @@ -68,24 +69,22 @@ signals: void sourceChanged(QUrl arg); public slots: + void setSource(QUrl arg); + +private slots: + void startMaskLoading(); + void finishMaskLoading(); - void setSource(QUrl arg) - { - if (m_source != arg) { - m_source = arg; - m_lastHeight = -1;//Trigger reset - m_lastWidth = -1; - emit sourceChanged(arg); - } - } private: QUrl m_source; void ensureInitialized(const QRectF &r); int m_lastWidth; int m_lastHeight; + QDeclarativePixmap m_pix; QImage m_img; QList<QPointF> m_mask;//TODO: More memory efficient datastructures + //Perhaps just the mask for the largest bounds is stored, and interpolate up }; QT_END_NAMESPACE |