Fix entryEffect for Sprite performance level

Change-Id: Icca2e6662a640242b4e676cd07b084a38dab5fb7
Reviewed-on: http://codereview.qt.nokia.com/3570
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>

diff --git a/src/declarative/particles/defaultshaders/imagevertex.shader b/src/declarative/particles/defaultshaders/imagevertex.shader
index e1033c9..9967ef8 100644 (file)
--- a/src/declarative/particles/defaultshaders/imagevertex.shader
+++ b/src/declarative/particles/defaultshaders/imagevertex.shader
@@ -75,8 +75,9 @@ void main() {
     currentSize = currentSize * sizetable[int(floor(t*64.))];
     fade = fade * opacitytable[int(floor(t*64.))];
 #endif
+
     if (entry == 1.)
-        fade = fadeIn * fadeOut;
+        fade = fade * fadeIn * fadeOut;
     else if(entry == 2.)
         currentSize = currentSize * fadeIn * fadeOut;
 

diff --git a/src/declarative/particles/qsgimageparticle.cpp b/src/declarative/particles/qsgimageparticle.cpp
index 57461a4..a12d1c2 100644 (file)
--- a/src/declarative/particles/qsgimageparticle.cpp
+++ b/src/declarative/particles/qsgimageparticle.cpp
@@ -258,7 +258,7 @@ public:
         m_animcount_id = program()->uniformLocation("animcount");
         m_entry_id = program()->uniformLocation("entry");
         m_sizetable_id = program()->uniformLocation("sizetable");
-        m_opacitytable_id = program()->uniformLocation("sizetable");
+        m_opacitytable_id = program()->uniformLocation("opacitytable");
     }
 
     void updateState(const SpriteMaterialData* d, const SpriteMaterialData*) {
@@ -432,7 +432,7 @@ void fillUniformArrayFromImage(float* array, const QImage& img, int size)
 {
     if (img.isNull()){
         for (int i=0; i<size; i++)
-            array[i] = 1;
+            array[i] = 1.0;
         return;
     }
     QImage scaled = img.scaled(size,1);