Update SpriteImage to modern standards
authorAlan Alpert <alan.alpert@nokia.com>
Mon, 10 Oct 2011 07:12:06 +0000 (17:12 +1000)
committerQt by Nokia <qt-info@nokia.com>
Mon, 10 Oct 2011 08:23:17 +0000 (10:23 +0200)
commit70d98314ce9ea60c77af83e2cf7de069e87a2e56
tree0288c9b65dc2a857a39e08da02daa1c76374050b
parent18c33423a54c24cf13b93115edfd22b6db0f1307
Update SpriteImage to modern standards

Includes updating shaders to contain the recent size flexibilities
added to QSGImageParticle, adding documentation, moving shaders
into the source file, and optional interpolation.

Small doc fixes, moving shaders into the source file, and moving the
resources (because there are no longer any shaders there) were applied
to ImageParticle and Turbulence (last user of particles resources).

Change-Id: I5e2f133dc4b96dd05d49e7e983ae630e379fa66f
Reviewed-on: http://codereview.qt-project.org/6303
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
23 files changed:
src/declarative/items/qsgsprite.cpp
src/declarative/items/qsgspriteimage.cpp
src/declarative/items/qsgspriteimage_p.h
src/declarative/particles/defaultshaders/coloredfragment.shader [deleted file]
src/declarative/particles/defaultshaders/coloredvertex.shader [deleted file]
src/declarative/particles/defaultshaders/defaultFadeInOut.png [deleted file]
src/declarative/particles/defaultshaders/deformablefragment.shader [deleted file]
src/declarative/particles/defaultshaders/deformablevertex.shader [deleted file]
src/declarative/particles/defaultshaders/identitytable.png [deleted file]
src/declarative/particles/defaultshaders/imagefragment.shader [deleted file]
src/declarative/particles/defaultshaders/imagevertex.shader [deleted file]
src/declarative/particles/defaultshaders/simplefragment.shader [deleted file]
src/declarative/particles/defaultshaders/simplevertex.shader [deleted file]
src/declarative/particles/defaultshaders/spritefragment.shader [deleted file]
src/declarative/particles/defaultshaders/spriteimagefragment.shader [deleted file]
src/declarative/particles/defaultshaders/spriteimagevertex.shader [deleted file]
src/declarative/particles/defaultshaders/spritevertex.shader [deleted file]
src/declarative/particles/defaultshaders/tabledfragment.shader [deleted file]
src/declarative/particles/defaultshaders/tabledvertex.shader [deleted file]
src/declarative/particles/particleresources/noise.png [moved from src/declarative/particles/defaultshaders/noise.png with 100% similarity]
src/declarative/particles/particles.qrc
src/declarative/particles/qsgimageparticle.cpp
src/declarative/particles/qsgturbulence.cpp