Add the rest of the tiered shaders to QSGImageParticle
authorAlan Alpert <alan.alpert@nokia.com>
Thu, 18 Aug 2011 10:47:23 +0000 (20:47 +1000)
committerQt by Nokia <qt-info@nokia.com>
Tue, 23 Aug 2011 05:31:41 +0000 (07:31 +0200)
commit4ce1af458c67d824fd2412c1a2f847af39b04902
treef786222aa56ae69beb50544da991c8b6e4c10bf1
parente30f56ee23b62eb5cd33505b544e7d1fa2766211
Add the rest of the tiered shaders to QSGImageParticle

Also simplifies the use of multiple shaders.

Change-Id: Ib4e16406865407626e4e736e7daeba4855dc0574
Reviewed-on: http://codereview.qt.nokia.com/3174
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
19 files changed:
src/declarative/particles/defaultshaders/coloredfragment.shader [new file with mode: 0644]
src/declarative/particles/defaultshaders/coloredvertex.shader [moved from src/declarative/particles/defaultshaders/trailsvertex.shader with 71% similarity]
src/declarative/particles/defaultshaders/ctfragment.shader [deleted file]
src/declarative/particles/defaultshaders/ctvertex.shader [deleted file]
src/declarative/particles/defaultshaders/deformablefragment.shader
src/declarative/particles/defaultshaders/deformablevertex.shader
src/declarative/particles/defaultshaders/simplefragment.shader
src/declarative/particles/defaultshaders/simplevertex.shader
src/declarative/particles/defaultshaders/spritefragment.shader
src/declarative/particles/defaultshaders/spritevertex.shader
src/declarative/particles/defaultshaders/superfragment.shader [deleted file]
src/declarative/particles/defaultshaders/supervertex.shader [deleted file]
src/declarative/particles/defaultshaders/tabledvertex.shader
src/declarative/particles/defaultshaders/trailsfragment.shader [deleted file]
src/declarative/particles/defaultshaders/ultrafragment.shader [deleted file]
src/declarative/particles/defaultshaders/ultravertex.shader [deleted file]
src/declarative/particles/particles.qrc
src/declarative/particles/qsgimageparticle.cpp
src/declarative/particles/qsgimageparticle_p.h