From 3dbbcc09e98d768a5b7b6c0a498f8aefd9e25b9e Mon Sep 17 00:00:00 2001 From: Alan Alpert Date: Mon, 1 Apr 2013 13:45:21 -0700 Subject: [PATCH] Embed some default particles. Most prototype level particle effects, at least in our example code, uses basic and generic particles. Embedding these images into the particles plugin will facilitate prototyping with the particles API. Currently finding an image and copying it between projects is a relatively large development cost for quick particle system prototypes. Change-Id: I077104915353ab298e2aabd36e2a0a2070030914 Reviewed-by: Gunnar Sletta --- .../particles/affectors/content/attractor.qml | 6 +++--- .../particles/affectors/content/groupgoal.qml | 4 ++-- .../quick/particles/affectors/content/move.qml | 6 +++--- .../particles/affectors/content/spritegoal.qml | 4 ++-- .../particles/affectors/content/turbulence.qml | 4 ++-- .../customparticle/content/imagecolors.qml | 2 +- .../particles/emitters/content/burstandpulse.qml | 2 +- .../particles/emitters/content/customemitter.qml | 2 +- .../quick/particles/emitters/content/emitmask.qml | 2 +- .../particles/emitters/content/maximumemitted.qml | 2 +- .../emitters/content/shapeanddirection.qml | 2 +- .../particles/emitters/content/trailemitter.qml | 4 ++-- .../emitters/content/velocityfrommotion.qml | 8 ++++---- .../particles/imageparticle/content/colored.qml | 4 ++-- .../particles/imageparticle/content/colortable.qml | 2 +- examples/quick/particles/images.qrc | 3 --- examples/quick/particles/images/particle.png | Bin 861 -> 0 bytes examples/quick/particles/images/particle4.png | Bin 1799 -> 0 bytes examples/quick/particles/images/star.png | Bin 1550 -> 0 bytes .../particles/system/content/dynamiccomparison.qml | 4 ++-- .../particles/system/content/dynamicemitters.qml | 2 +- .../particles/system/content/multiplepainters.qml | 2 +- .../quick/particles/system/content/startstop.qml | 2 +- .../particles/system/content/timedgroupchanges.qml | 2 +- src/particles/particleresources/fuzzydot.png | Bin 0 -> 1799 bytes src/particles/particleresources/glowdot.png | Bin 0 -> 861 bytes src/particles/particleresources/star.png | Bin 0 -> 1550 bytes src/particles/particles.qrc | 3 +++ src/particles/qquickimageparticle.cpp | 16 ++++++++++++++++ src/quick/doc/images/particles/fuzzydot.png | Bin 0 -> 1799 bytes src/quick/doc/images/particles/glowdot.png | Bin 0 -> 861 bytes src/quick/doc/images/particles/star.png | Bin 0 -> 1550 bytes 32 files changed, 52 insertions(+), 36 deletions(-) delete mode 100644 examples/quick/particles/images/particle.png delete mode 100644 examples/quick/particles/images/particle4.png delete mode 100644 examples/quick/particles/images/star.png create mode 100644 src/particles/particleresources/fuzzydot.png create mode 100644 src/particles/particleresources/glowdot.png create mode 100644 src/particles/particleresources/star.png create mode 100644 src/quick/doc/images/particles/fuzzydot.png create mode 100644 src/quick/doc/images/particles/glowdot.png create mode 100644 src/quick/doc/images/particles/star.png diff --git a/examples/quick/particles/affectors/content/attractor.qml b/examples/quick/particles/affectors/content/attractor.qml index fd7fd65..349132e 100644 --- a/examples/quick/particles/affectors/content/attractor.qml +++ b/examples/quick/particles/affectors/content/attractor.qml @@ -77,7 +77,7 @@ Rectangle { ImageParticle { id: stars groups: ["stars"] - source: "../../images/star.png" + source: "qrc:///particleresources/star.png" color: "white" colorVariation: 0.1 alpha: 0 @@ -96,7 +96,7 @@ Rectangle { ImageParticle { id: shot groups: ["shot"] - source: "../../images/star.png" + source: "qrc:///particleresources/star.png" color: "#0FF06600" colorVariation: 0.3 @@ -104,7 +104,7 @@ Rectangle { ImageParticle { id: engine groups: ["engine"] - source: "../../images/particle4.png" + source: "qrc:///particleresources/fuzzydot.png" color: "orange" SequentialAnimation on color { diff --git a/examples/quick/particles/affectors/content/groupgoal.qml b/examples/quick/particles/affectors/content/groupgoal.qml index 19fa041..cf4361e 100644 --- a/examples/quick/particles/affectors/content/groupgoal.qml +++ b/examples/quick/particles/affectors/content/groupgoal.qml @@ -124,7 +124,7 @@ Rectangle { id: smoke anchors.fill: parent groups: ["smoke"] - source: "../../images/particle.png" + source: "qrc:///particleresources/glowdot.png" colorVariation: 0 color: "#00111111" } @@ -132,7 +132,7 @@ Rectangle { id: pilot anchors.fill: parent groups: ["pilot"] - source: "../../images/particle.png" + source: "qrc:///particleresources/glowdot.png" redVariation: 0.01 blueVariation: 0.4 color: "#0010004f" diff --git a/examples/quick/particles/affectors/content/move.qml b/examples/quick/particles/affectors/content/move.qml index b4d8331..e90f8c6 100644 --- a/examples/quick/particles/affectors/content/move.qml +++ b/examples/quick/particles/affectors/content/move.qml @@ -50,7 +50,7 @@ Rectangle { ImageParticle { groups: ["A"] anchors.fill: parent - source: "../../images/star.png" + source: "qrc:///particleresources/star.png" color:"#FF1010" redVariation: 0.8 } @@ -80,7 +80,7 @@ Rectangle { ImageParticle { groups: ["B"] anchors.fill: parent - source: "../../images/star.png" + source: "qrc:///particleresources/star.png" color:"#10FF10" greenVariation: 0.8 } @@ -112,7 +112,7 @@ Rectangle { ImageParticle { groups: ["C"] anchors.fill: parent - source: "../../images/star.png" + source: "qrc:///particleresources/star.png" color:"#1010FF" blueVariation: 0.8 } diff --git a/examples/quick/particles/affectors/content/spritegoal.qml b/examples/quick/particles/affectors/content/spritegoal.qml index 78b161f..ab108bb 100644 --- a/examples/quick/particles/affectors/content/spritegoal.qml +++ b/examples/quick/particles/affectors/content/spritegoal.qml @@ -66,7 +66,7 @@ Item { ImageParticle { system: sys groups: ["starfield"] - source: "../../images/star.png" + source: "qrc:///particleresources/star.png" colorVariation: 0.3 color: "white" } @@ -170,7 +170,7 @@ Item { z:0 system: sys groups: ["exhaust"] - source: "../../images/particle4.png" + source: "qrc:///particleresources/fuzzydot.png" color: "orange" SequentialAnimation on color { diff --git a/examples/quick/particles/affectors/content/turbulence.qml b/examples/quick/particles/affectors/content/turbulence.qml index d7a8603..eacedbe 100644 --- a/examples/quick/particles/affectors/content/turbulence.qml +++ b/examples/quick/particles/affectors/content/turbulence.qml @@ -75,13 +75,13 @@ Rectangle { ImageParticle { groups: ["smoke"] - source: "../../images/particle.png" + source: "qrc:///particleresources/glowdot.png" color: "#11111111" colorVariation: 0 } ImageParticle { groups: ["flame"] - source: "../../images/particle.png" + source: "qrc:///particleresources/glowdot.png" color: "#11ff400f" colorVariation: 0.1 } diff --git a/examples/quick/particles/customparticle/content/imagecolors.qml b/examples/quick/particles/customparticle/content/imagecolors.qml index 130518a..3fb4c9f 100644 --- a/examples/quick/particles/customparticle/content/imagecolors.qml +++ b/examples/quick/particles/customparticle/content/imagecolors.qml @@ -71,7 +71,7 @@ Rectangle { } Image { id: particle - source: "../../images/particle4.png" + source: "qrc:///particleresources/fuzzydot.png" } //! [vertex] vertexShader:" diff --git a/examples/quick/particles/emitters/content/burstandpulse.qml b/examples/quick/particles/emitters/content/burstandpulse.qml index 18d1c43..28c56b3 100644 --- a/examples/quick/particles/emitters/content/burstandpulse.qml +++ b/examples/quick/particles/emitters/content/burstandpulse.qml @@ -67,7 +67,7 @@ Rectangle { id: particles anchors.fill: parent ImageParticle { - source: "../../images/star.png" + source: "qrc:///particleresources/star.png" alpha: 0 colorVariation: 0.6 } diff --git a/examples/quick/particles/emitters/content/customemitter.qml b/examples/quick/particles/emitters/content/customemitter.qml index 966c78e..9ad504e 100644 --- a/examples/quick/particles/emitters/content/customemitter.qml +++ b/examples/quick/particles/emitters/content/customemitter.qml @@ -90,7 +90,7 @@ ParticleSystem { } ImageParticle { - source: "../../images/particle4.png" + source: "qrc:///particleresources/fuzzydot.png" alpha: 0.0 } } diff --git a/examples/quick/particles/emitters/content/emitmask.qml b/examples/quick/particles/emitters/content/emitmask.qml index 08c04f6..1c2e7b4 100644 --- a/examples/quick/particles/emitters/content/emitmask.qml +++ b/examples/quick/particles/emitters/content/emitmask.qml @@ -51,7 +51,7 @@ Rectangle { anchors.centerIn: parent ImageParticle { - source: "../../images/particle.png" + source: "qrc:///particleresources/glowdot.png" z: 2 anchors.fill: parent color: "#336666CC" diff --git a/examples/quick/particles/emitters/content/maximumemitted.qml b/examples/quick/particles/emitters/content/maximumemitted.qml index df92f05..4bd9079 100644 --- a/examples/quick/particles/emitters/content/maximumemitted.qml +++ b/examples/quick/particles/emitters/content/maximumemitted.qml @@ -53,7 +53,7 @@ Rectangle { ImageParticle { system: sys id: cp - source: "../../images/particle.png" + source: "qrc:///particleresources/glowdot.png" colorVariation: 0.4 color: "#000000FF" } diff --git a/examples/quick/particles/emitters/content/shapeanddirection.qml b/examples/quick/particles/emitters/content/shapeanddirection.qml index 1dec5b2..0ca433c 100644 --- a/examples/quick/particles/emitters/content/shapeanddirection.qml +++ b/examples/quick/particles/emitters/content/shapeanddirection.qml @@ -58,7 +58,7 @@ Rectangle { ImageParticle { groups: ["center","edge"] anchors.fill: parent - source: "../../images/particle.png" + source: "qrc:///particleresources/glowdot.png" colorVariation: 0.1 color: "#009999FF" } diff --git a/examples/quick/particles/emitters/content/trailemitter.qml b/examples/quick/particles/emitters/content/trailemitter.qml index a4972b7..3186b51 100644 --- a/examples/quick/particles/emitters/content/trailemitter.qml +++ b/examples/quick/particles/emitters/content/trailemitter.qml @@ -56,7 +56,7 @@ Rectangle { system: particles anchors.fill: parent groups: ["A", "B"] - source: "../../images/particle.png" + source: "qrc:///particleresources/glowdot.png" colorVariation: 0 color: "#00111111" } @@ -65,7 +65,7 @@ Rectangle { anchors.fill: parent system: particles groups: ["C", "D"] - source: "../../images/particle.png" + source: "qrc:///particleresources/glowdot.png" colorVariation: 0.1 color: "#00ff400f" } diff --git a/examples/quick/particles/emitters/content/velocityfrommotion.qml b/examples/quick/particles/emitters/content/velocityfrommotion.qml index 1f1d660..d325f9b 100644 --- a/examples/quick/particles/emitters/content/velocityfrommotion.qml +++ b/examples/quick/particles/emitters/content/velocityfrommotion.qml @@ -61,7 +61,7 @@ Rectangle { ParticleSystem { id: sys1 } ImageParticle { system: sys1 - source: "../../images/particle.png" + source: "qrc:///particleresources/glowdot.png" color: "cyan" alpha: 0 SequentialAnimation on color { @@ -127,7 +127,7 @@ Rectangle { } } colorVariation: 0.5 - source: "../../images/star.png" + source: "qrc:///particleresources/star.png" } Emitter { id: trailsStars @@ -149,7 +149,7 @@ Rectangle { } ParticleSystem { id: sys3; } ImageParticle { - source: "../../images/particle.png" + source: "qrc:///particleresources/glowdot.png" system: sys3 color: "orange" alpha: 0 @@ -191,7 +191,7 @@ Rectangle { ParticleSystem { id: sys4; } ImageParticle { system: sys4 - source: "../../images/star.png" + source: "qrc:///particleresources/star.png" color: "green" alpha: 0 SequentialAnimation on color { diff --git a/examples/quick/particles/imageparticle/content/colored.qml b/examples/quick/particles/imageparticle/content/colored.qml index 939ec7e..236cc0f 100644 --- a/examples/quick/particles/imageparticle/content/colored.qml +++ b/examples/quick/particles/imageparticle/content/colored.qml @@ -50,7 +50,7 @@ Rectangle { ImageParticle { groups: ["stars"] anchors.fill: parent - source: "../../images/star.png" + source: "qrc:///particleresources/star.png" } Emitter { group: "stars" @@ -64,7 +64,7 @@ Rectangle { // ![0] ImageParticle { anchors.fill: parent - source: "../../images/star.png" + source: "qrc:///particleresources/star.png" alpha: 0 alphaVariation: 0.2 colorVariation: 1.0 diff --git a/examples/quick/particles/imageparticle/content/colortable.qml b/examples/quick/particles/imageparticle/content/colortable.qml index 4090163..87b5ae2 100644 --- a/examples/quick/particles/imageparticle/content/colortable.qml +++ b/examples/quick/particles/imageparticle/content/colortable.qml @@ -55,7 +55,7 @@ Rectangle { alpha: 0 //! [0] - source: "../../images/particle.png" + source: "qrc:///particleresources/glowdot.png" colorTable: "../../images/colortable.png" sizeTable: "../../images/colortable.png" //! [0] diff --git a/examples/quick/particles/images.qrc b/examples/quick/particles/images.qrc index 9f284a0..1f75483 100644 --- a/examples/quick/particles/images.qrc +++ b/examples/quick/particles/images.qrc @@ -12,10 +12,8 @@ images/meteor.png images/meteors.png images/nullRock.png - images/particle.png images/particle2.png images/particle3.png - images/particle4.png images/particleA.png images/portal_bg.png images/realLeaf1.png @@ -27,7 +25,6 @@ images/sizeInOut.png images/snowflake.png images/sparkleSize.png - images/star.png images/starfish_0.png images/starfish_1.png images/starfish_2.png diff --git a/examples/quick/particles/images/particle.png b/examples/quick/particles/images/particle.png deleted file mode 100644 index 5c83896d22cdc3c352ff8db97b0b1f2cd2b27125..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 861 zcmV-j1ETziP)+uAJ)4!|9fhtYq5Mes-Q6Cx`#|iAbtLlW1enS0*|y zF-AG6Gn?YQHEL+EwV9p=GaO)E)yZ7P#iXw|#tVf#fLG>e0M8MG5RhWevjLdwSw8|D zuhsAfhEd!df^ArA-nL0W%try}N6#(n2}a&~HjZ3K1|mYlq5;_jfW`*`(KwJuF^0aF zr|o?q9tcN*0bGIM4C4r3BJqHu(7x$~T@X|zFe7+8*#8m!?`2AGwkkTtGl1Oy=)z}^ za?OjA&6)WL6h>fq1P)}{8Ug2Y{)hlFC`Rwu^8|a|n->6P9tZ))^CJcdb95FnFqIco-dA~TBvoZEtK3xiQ00Nnht$!z>dj77iw^4%*jqDp zZD1CAt~vjv$|vGRaP<8{tX^>mj-pqPqBoYlt$tiP2UO4awgu8L>g9a^HftXLG|wl< z_dubRj^6csCNE_t0!@Bc=vDb2Gx}h141K;yv1t6N z@~vY~yv9W(!@+w;iAO4L4;GiR<^30@7ZB=z zn!ZBk!aAnfmthA}fMheB+Tv7T@{3nr@9t&K{~=@$rCk7(@3;zVH! zvloHbj!dUC%TCG`;L#&_FJ$XtpU+m~XD1CuI zc@2l1<)Sa-o^Ue7qb+KR6O3Nz=1lO&iqE=DX=|0Rn@J7;KJ%G;oE1#M-Frdf!wD`X z?0tf5l1|YPARrR`(9I|SiAL&X!V~vHCYyK{k|O{Dgl?cqi8vhSmEQ8??O1QAM}TM# nN5v_UffYd2w;a8m{}o^W-^qmk*A=;y00000NkvXXu0mjf5*>;S diff --git a/examples/quick/particles/images/particle4.png b/examples/quick/particles/images/particle4.png deleted file mode 100644 index bc95b703c1da0dffae27cd4a2a35d26ef73decdd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1799 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 literal 0 HcmV?d00001 diff --git a/src/particles/particleresources/star.png b/src/particles/particleresources/star.png new file mode 100644 index 0000000000000000000000000000000000000000..0d592cfa8752ac8a75f92614369011812be88639 GIT binary patch literal 1550 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWuD@%u1Od5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|80+w{G(j&jGsViu#lY3g$;Hsn#lXza(AB`g+{MiW80;?2=H^aD zE=DlDF8Rr&xv6<2Fuf@Vy+%0of|5dR0nlcb)S}F?)D*X({9FaFm#s2!y2aTIr+HAl zDY)HYfK#tN&@uX;h((HMm=G}afSB-P3*^8Perg^twHE=CH6P#S^9&43O`a}}Ar-f_ zgy;5MHV`p<(R*9 ztIE23WZv_c-;e1T78`z0dT;&s--DB{7!M|$H(fbdV1aO|M#WTq5u0i`ZD!Gk;i zF6OQ5waWeYQ$jM+c6FfAU%QE&32G6^fwS(^GcDwlz3o=O=xf3$wCkU6%0^a3xunCo zO!kbOp$@_e-Ar2hq*&Cw=cFDnvyFK*t;t(Jv1j#$207JvJ45Y{?odlTYjt_QpMyPX zxWH9ejvv!EUyt~}^WKbe?F`8cYn}#GYF98Su?VHlIL`Ual<9u@m!3CaF{_I1aNJv< za^E3|C+T_<>#;YQc3W;(9rDxOyMA}@*YtzY=Wn0Wl%M#^?uVb?0%tD)9H$+}KdyP)&zjyh`u4QXV=qa6 zE$~O^p#8#UdpY8pPK56{y>aStqX3DuWnA2Kf`2|7yMM4Myx`Q@jdR~mRG7ngQXuAK zW-8n2yUqnuzt0I({>2(J*S*F0=}Kc3=Nl2vJbng6cH1yT-zehC)d>yQ=5=7A@g0`f zyvDN~SC%Yc+H&C(tH+uoC!f>=p8oZFdYAg#n0#@YbU particleresources/noise.png + particleresources/fuzzydot.png + particleresources/glowdot.png + particleresources/star.png diff --git a/src/particles/qquickimageparticle.cpp b/src/particles/qquickimageparticle.cpp index e0572ef..9a0601b 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 QtQuick.Particles2::ImageParticle::sprites diff --git a/src/quick/doc/images/particles/fuzzydot.png b/src/quick/doc/images/particles/fuzzydot.png new file mode 100644 index 0000000000000000000000000000000000000000..bc95b703c1da0dffae27cd4a2a35d26ef73decdd GIT binary patch literal 1799 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 literal 0 HcmV?d00001 diff --git a/src/quick/doc/images/particles/star.png b/src/quick/doc/images/particles/star.png new file mode 100644 index 0000000000000000000000000000000000000000..0d592cfa8752ac8a75f92614369011812be88639 GIT binary patch literal 1550 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWuD@%u1Od5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|80+w{G(j&jGsViu#lY3g$;Hsn#lXza(AB`g+{MiW80;?2=H^aD zE=DlDF8Rr&xv6<2Fuf@Vy+%0of|5dR0nlcb)S}F?)D*X({9FaFm#s2!y2aTIr+HAl zDY)HYfK#tN&@uX;h((HMm=G}afSB-P3*^8Perg^twHE=CH6P#S^9&43O`a}}Ar-f_ zgy;5MHV`p<(R*9 ztIE23WZv_c-;e1T78`z0dT;&s--DB{7!M|$H(fbdV1aO|M#WTq5u0i`ZD!Gk;i zF6OQ5waWeYQ$jM+c6FfAU%QE&32G6^fwS(^GcDwlz3o=O=xf3$wCkU6%0^a3xunCo zO!kbOp$@_e-Ar2hq*&Cw=cFDnvyFK*t;t(Jv1j#$207JvJ45Y{?odlTYjt_QpMyPX zxWH9ejvv!EUyt~}^WKbe?F`8cYn}#GYF98Su?VHlIL`Ual<9u@m!3CaF{_I1aNJv< za^E3|C+T_<>#;YQc3W;(9rDxOyMA}@*YtzY=Wn0Wl%M#^?uVb?0%tD)9H$+}KdyP)&zjyh`u4QXV=qa6 zE$~O^p#8#UdpY8pPK56{y>aStqX3DuWnA2Kf`2|7yMM4Myx`Q@jdR~mRG7ngQXuAK zW-8n2yUqnuzt0I({>2(J*S*F0=}Kc3=Nl2vJbng6cH1yT-zehC)d>yQ=5=7A@g0`f zyvDN~SC%Yc+H&C(tH+uoC!f>=p8oZFdYAg#n0#@YbU