Merge pull request #2269 from kiwigrc/5926

Fixed #5926: Applying canvas scaling to particles in html5 canvas rendering mode

Author: dingpinglv

cocos2d/particle/CCParticleSystem.js

@@ -2414,6 +2414,8 @@ cc.ParticleSystem = cc.Node.extend(/** @lends cc.ParticleSystem# */{
             context.globalCompositeOperation = 'source-over';
 
         var element = this._texture.getHtmlElementObj();
+        var locScaleX = cc.view.getScaleX(), locScaleY = cc.view.getScaleY();
+
         for (var i = 0; i < this.particleCount; i++) {
             var particle = this._particles[i];
             var lpx = (0 | (particle.size * 0.5));
@@ -2432,8 +2434,8 @@ cc.ParticleSystem = cc.Node.extend(/** @lends cc.ParticleSystem# */{
                 var h = this._pointRect.height;
 
                 context.scale(
-                    Math.max((1 / w) * size, 0.000001),
-                    Math.max((1 / h) * size, 0.000001)
+                    Math.max(size * locScaleX / w, 0.000001),
+                    Math.max(size * locScaleY / h, 0.000001)
                 );
 
                 if (particle.rotation)