diff options
Diffstat (limited to 'src/particles/qquickimageparticle_p.h')
-rw-r--r-- | src/particles/qquickimageparticle_p.h | 29 |
1 files changed, 21 insertions, 8 deletions
diff --git a/src/particles/qquickimageparticle_p.h b/src/particles/qquickimageparticle_p.h index e9ac56d64e..45eb73b86c 100644 --- a/src/particles/qquickimageparticle_p.h +++ b/src/particles/qquickimageparticle_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtQuick module of the Qt Toolkit. @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#ifndef ULTRAPARTICLE_H -#define ULTRAPARTICLE_H +#ifndef QQUICKIMAGEPARTICLE_P_H +#define QQUICKIMAGEPARTICLE_P_H // // W A R N I N G @@ -50,21 +50,25 @@ // // We mean it. // + #include "qquickparticlepainter_p.h" #include "qquickdirection_p.h" #include <private/qquickpixmapcache_p.h> #include <QQmlListProperty> -#include <QtQuick/qsgsimplematerial.h> #include <QtGui/qcolor.h> +#include <QtQuick/qsgmaterial.h> QT_BEGIN_NAMESPACE class ImageMaterialData; class QSGGeometryNode; +class QSGMaterial; class QQuickSprite; class QQuickStochasticEngine; +class QRhi; + struct SimpleVertex { float x; float y; @@ -153,6 +157,12 @@ struct Vertices { Vertex v4; }; +class ImageMaterial : public QSGMaterial +{ +public: + virtual ImageMaterialData *state() = 0; +}; + class QQuickImageParticle : public QQuickParticlePainter { Q_OBJECT @@ -440,14 +450,17 @@ private: } } - template<class MaterialData> - static MaterialData* getState(QSGMaterial* m) { - return static_cast<QSGSimpleMaterial<MaterialData> *>(m)->state(); + ImageMaterialData *getState(QSGMaterial *m) { + return static_cast<ImageMaterial *>(m)->state(); } + EntryEffect m_entryEffect; Status m_status; int m_startedImageLoading; + QRhi *m_rhi; + bool m_apiChecked; }; QT_END_NAMESPACE -#endif // ULTRAPARTICLE_H + +#endif // QQUICKIMAGEPARTICLE_P_H |