diff options
author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-01-15 22:01:15 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-22 21:01:53 +0100 |
commit | e2ea0a83cc876fb54a2a8bf6f1350dbfa52f596b (patch) | |
tree | 36ec4b74aa50b9355e74e5d186039c3cdbd38acd /examples/quick/particles/customparticle | |
parent | 2ce7959eb9e69cd68013fc6a0f77a9556a84365b (diff) |
fix whitespace
remove trailing spaces and expand tabs
Change-Id: Ieacb9d096b612c45d1a64700044c114d1f7522bc
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'examples/quick/particles/customparticle')
3 files changed, 4 insertions, 4 deletions
diff --git a/examples/quick/particles/customparticle/content/blurparticles.qml b/examples/quick/particles/customparticle/content/blurparticles.qml index a5abb07ce6..583d5c251c 100644 --- a/examples/quick/particles/customparticle/content/blurparticles.qml +++ b/examples/quick/particles/customparticle/content/blurparticles.qml @@ -67,14 +67,14 @@ Rectangle { } CustomParticle { - system: sys + system: sys //! [vertex] vertexShader:" uniform lowp float qt_Opacity; varying lowp float fFade; varying lowp float fBlur; - void main() { + void main() { defaultMain(); highp float t = (qt_Timestamp - qt_ParticleData.x) / qt_ParticleData.y; highp float fadeIn = min(t * 10., 1.); diff --git a/examples/quick/particles/customparticle/content/fragmentshader.qml b/examples/quick/particles/customparticle/content/fragmentshader.qml index ed61720419..04646f811e 100644 --- a/examples/quick/particles/customparticle/content/fragmentshader.qml +++ b/examples/quick/particles/customparticle/content/fragmentshader.qml @@ -73,7 +73,7 @@ ParticleSystem { varying lowp float fFade; varying highp vec2 fPos; - void main() { + void main() { qt_TexCoord0 = qt_ParticleTex; highp float size = qt_ParticleData.z; highp float endSize = qt_ParticleData.w; diff --git a/examples/quick/particles/customparticle/content/imagecolors.qml b/examples/quick/particles/customparticle/content/imagecolors.qml index 3fb4c9f378..0702e33a2d 100644 --- a/examples/quick/particles/customparticle/content/imagecolors.qml +++ b/examples/quick/particles/customparticle/content/imagecolors.qml @@ -81,7 +81,7 @@ Rectangle { varying lowp float fFade; uniform lowp float qt_Opacity; - void main() { + void main() { fTex2 = vec2(qt_ParticlePos.x, qt_ParticlePos.y); //Uncomment this next line for each particle to use full texture, instead of the solid color at the center of the particle. |