From 32990472e32acb434722e311bebe7d363ef067c1 Mon Sep 17 00:00:00 2001
From: Guigui <heygui@gmail.com>
Date: Tue, 12 Apr 2011 11:15:01 +0200
Subject: [PATCH] Mobile spark: new parallax + disabled smoke

---
 media/js/desktop/myspark.js | 19 +++++++++++--------
 media/js/mobile/myspark.js  | 13 +++++++++----
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/media/js/desktop/myspark.js b/media/js/desktop/myspark.js
index 04e6041..b46175a 100644
--- a/media/js/desktop/myspark.js
+++ b/media/js/desktop/myspark.js
@@ -6,7 +6,8 @@ var initSpark = function (level) {
     	shapes = [],
     	smokeCircles = [],
     	colors = [],
-		NB_CIRCLES = 200;
+		NB_CIRCLES = 200,
+		smoke = false;
 
     canvas.height = h;
     canvas.width = w;
@@ -176,7 +177,9 @@ var initSpark = function (level) {
     };
     
     initShapes();
-    // initSmokeCircles();
+    if(level >= 4 && smoke) {
+         initSmokeCircles();
+    }
     
     // requestAnim shim layer by Paul Irish
         window.requestAnimFrame = (function(){
@@ -197,14 +200,14 @@ var initSpark = function (level) {
     var animate = function() {
         requestAnimFrame(animate);
         updateSpark();
-        // if(level >= 4) {
-        //      updateSmoke();
-        // }
+        if(level >= 4 && smoke) {
+             updateSmoke();
+        }
         ctx.clearRect(0, 0, w, h);
         drawShapes(shapes, level);
-        // if(level >= 4) {
-        //      drawSmoke(smokeCircles);   
-        // }
+        if(level >= 4 && smoke) {
+             drawSmoke(smokeCircles);   
+        }
     };
     
     animate();
diff --git a/media/js/mobile/myspark.js b/media/js/mobile/myspark.js
index ec38e0e..184e037 100644
--- a/media/js/mobile/myspark.js
+++ b/media/js/mobile/myspark.js
@@ -58,9 +58,10 @@ var initSpark = function (level) {
         var dice;
         for(var i = 0, nb = shapes[level - 1].length; i < nb; i += 1) {
             var s = shapes[level - 1][i],
-                dice = rand(1, 20);
+                dice = rand(1, 20),
+                nbShapes = shapes[level -1].length;
                 
-            s.moveFactor = 1-(i/6);
+            s.moveFactor = (nbShapes - i)/8;
             
             if(Math.abs(s.angle) > (s.maxAngle - s.arcAngle) || Math.abs(s.angle) < s.minAngle || dice === 6) {
                 s.angleStep *= -1;
@@ -141,17 +142,21 @@ var initSpark = function (level) {
 
 	function setPosition(o) {
 	    if(window.innerHeight > window.innerWidth) {
-	     	posx = o.x * 100;
+	     	posx = o.x * 150;
 			posy = (o.y - 0.6) * 100;
 	    } else {
 	        posy = (o.x - 0.6) * -100;
-			posx = o.y * -100;
+			posx = o.y * -150;
 	    }
 	}
 	
 	initShapes();
     initMove();
 
+    if(level > 4) {
+        level = 4;
+    }
+
     setInterval(function() {
         updateSpark();
         ctx.clearRect(0, 0, w, h);