From: Alan Alpert <alan.alpert@nokia.com>
Date: Tue, 1 May 2012 06:57:05 +0000 (+1000)
Subject: Do not try to apply autoRotation when the particle has no velocity
X-Git-Tag: 071012131707~485
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=51b3e8e7ef5af9ff6c40027daa3a04c58b6a4bd2;p=profile%2Fivi%2Fqtdeclarative.git

Do not try to apply autoRotation when the particle has no velocity

Task-number: QTBUG-25025

Change-Id: Ibc1340d6ea0e36a8bf412f4da704ef8cd3447294
Reviewed-by: Glenn Watson <glenn.watson@nokia.com>
---

diff --git a/src/particles/qquickimageparticle.cpp b/src/particles/qquickimageparticle.cpp
index 268dfeb..d20862a 100644
--- a/src/particles/qquickimageparticle.cpp
+++ b/src/particles/qquickimageparticle.cpp
@@ -158,7 +158,8 @@ static const char vertexShaderCode[] =
     "            highp float rotation = vRotation.x + vRotation.y * t * vData.y;\n"
     "            if (vRotation.z == 1.0){\n"
     "                highp vec2 curVel = vVec.zw * t * vData.y + vVec.xy;\n"
-    "                rotation += atan(curVel.y, curVel.x);\n"
+    "                if (length(curVel) > 0.)\n"
+    "                    rotation += atan(curVel.y, curVel.x);\n"
     "            }\n"
     "            highp vec2 trigCalcs = vec2(cos(rotation), sin(rotation));\n"
     "            highp vec4 deform = vDeformVec * currentSize * (vPosTex.zzww - 0.5);\n"