diff options
Diffstat (limited to 'src/particles/qquickimageparticle.cpp')
-rw-r--r-- | src/particles/qquickimageparticle.cpp | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/src/particles/qquickimageparticle.cpp b/src/particles/qquickimageparticle.cpp index e0572ef424..0145ce4edb 100644 --- a/src/particles/qquickimageparticle.cpp +++ b/src/particles/qquickimageparticle.cpp @@ -623,6 +623,22 @@ void fillUniformArrayFromImage(float* array, const QImage& img, int size) The source image to be used. If the image is a sprite animation, use the sprite property instead. + + Since Qt 5.2, some default images are provided as resources to aid prototyping: + \table + \row + \li qrc:///particleresources/star.png + \li \inlineimage particles/star.png + \row + \li qrc:///particleresources/glowdot.png + \li \inlineimage particles/glowdot.png + \row + \li qrc:///particleresources/fuzzydot.png + \li \inlineimage particles/fuzzydot.png + \endtable + + Note that the images are white and semi-transparent, to allow colorization + and alpha levels to have maximum effect. */ /*! \qmlproperty list<Sprite> QtQuick.Particles2::ImageParticle::sprites @@ -1363,6 +1379,15 @@ void QQuickImageParticle::finishBuildParticleNodes() perfLevel = Deformable; #endif +#ifdef Q_OS_MAC + // Mac OS X 10.8.3 introduced a bug in the AMD drivers, for at least the 2011 macbook pros, + // causing point sprites who read gl_PointCoord in the frag shader to come out as + // green-red blobs. + if (perfLevel < Deformable && strstr((char *) glGetString(GL_VENDOR), "ATI")) { + perfLevel = Deformable; + } +#endif + if (perfLevel >= Colored && !m_color.isValid()) m_color = QColor(Qt::white);//Hidden default, but different from unset |