fixed cocos2d#1354 modify code for ParticleSystem

dingpinglv · dingpinglv · commit f57cc5beeebb · 2012-09-20T15:39:07.000+08:00
diff --git a/cocos2d/CCDrawingPrimitives.js b/cocos2d/CCDrawingPrimitives.js
@@ -427,24 +427,15 @@ cc.DrawingPrimitiveCanvas = cc.DrawingPrimitive.extend(/** @lends cc.DrawingPrim
     /**
      * draw a star
      * @param {CanvasContext} ctx canvas context
-     * @param {cc.Point} center
      * @param {Number} radius
      * @param {cc.Color3B|cc.Color4B|cc.Color4F} color
      */
-    drawStar:function (ctx, center, radius, color) {
+    drawStar:function (ctx, radius, color) {
         var context = ctx || this._renderContext;
-        context.save();
-        context.translate(center.x, -center.y);
-
-        //context.rotate(cc.DEGREES_TO_RADIANS(45));
-        context.rotate(0.7853981633974483);
-
-        if (color instanceof cc.Color4F) {
+        if (color instanceof cc.Color4F)
             color = new cc.Color3B(0 | (color.r * 255), 0 | (color.g * 255), 0 | (color.b * 255));
-        }
         var colorStr = "rgba(" + color.r + "," + color.g + "," + color.b;
         context.fillStyle = colorStr + ",1)";
-
         var subRadius = radius / 10;
 
         context.beginPath();
@@ -465,44 +456,39 @@ cc.DrawingPrimitiveCanvas = cc.DrawingPrimitive.extend(/** @lends cc.DrawingPrim
         var g1 = context.createRadialGradient(0, 0, subRadius, 0, 0, radius);
         g1.addColorStop(0, colorStr + ", 1)");
         g1.addColorStop(0.3, colorStr + ", 0.8)");
-        //g1.addColorStop(0.6, colorStr + ", 0.4)");
         g1.addColorStop(1.0, colorStr + ", 0.0)");
         context.fillStyle = g1;
         context.beginPath();
         var startAngle_1 = 0;
-        var endAngle_1 = Math.PI * 2;
+        var endAngle_1 = cc.PI2;
         context.arc(0, 0, radius - subRadius, startAngle_1, endAngle_1, false);
         context.closePath();
         context.fill();
-
-        context.restore();
     },
 
     /**
      * draw a color ball
      * @param {CanvasContext} ctx canvas context
-     * @param {cc.Point} center
      * @param {Number} radius
      * @param {cc.Color3B|cc.Color4B|cc.Color4F} color
      */
-    drawColorBall:function (ctx, center, radius, color) {
+    drawColorBall:function (ctx, radius, color) {
         var context = ctx || this._renderContext;
-        if (color instanceof cc.Color4F) {
+        if (color instanceof cc.Color4F)
             color = new cc.Color3B(0 | (color.r * 255), 0 | (color.g * 255), 0 | (color.b * 255));
-        }
         var colorStr = "rgba(" + color.r + "," + color.g + "," + color.b;
         var subRadius = radius / 10;
 
-        var g1 = context.createRadialGradient(center.x, -center.y, subRadius, center.x, -center.y, radius);
+        var g1 = context.createRadialGradient(0, 0, subRadius, 0, 0, radius);
         g1.addColorStop(0, colorStr + ", 1)");
         g1.addColorStop(0.3, colorStr + ", 0.8)");
         g1.addColorStop(0.6, colorStr + ", 0.4)");
         g1.addColorStop(1.0, colorStr + ", 0.0)");
         context.fillStyle = g1;
         context.beginPath();
         var startAngle_1 = 0;
-        var endAngle_1 = Math.PI * 2;
-        context.arc(center.x, -center.y, radius, startAngle_1, endAngle_1, false);
+        var endAngle_1 = cc.PI2;
+        context.arc(0, 0, radius, startAngle_1, endAngle_1, false);
         context.closePath();
         context.fill();
     },
@@ -517,3 +503,5 @@ cc.DrawingPrimitiveCanvas = cc.DrawingPrimitive.extend(/** @lends cc.DrawingPrim
         this._renderContext.fillText(strText, x, -y);
     }
 });
+
+cc.PI2 = Math.PI * 2;
diff --git a/cocos2d/base_nodes/CCNode.js b/cocos2d/base_nodes/CCNode.js
@@ -1169,13 +1169,10 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{
      */
     visit:function (ctx) {
         // quick return if not visible
-        if (!this._isVisible) {
+        if (!this._isVisible)
             return;
-        }
-
-        var context = ctx || cc.renderContext;
-        var i;
 
+        var context = ctx || cc.renderContext, i;
         if (cc.renderContextType == cc.CANVAS) {
             context.save();
             this.transform(context);
@@ -1184,30 +1181,21 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{
                 this.sortAllChildren();
                 // draw children zOrder < 0
                 for (i = 0; i < this._children.length; i++) {
-                    if (this._children[i] && this._children[i]._zOrder < 0) {
+                    if (this._children[i] && this._children[i]._zOrder < 0)
                         this._children[i].visit(context);
-                    } else {
+                    else
                         break;
-                    }
                 }
-                //if (this._isInDirtyRegion()) {
-                // self draw
                 this.draw(context);
-                //}
-                // draw children zOrder >= 0
                 if (this._children) {
                     for (; i < this._children.length; i++) {
-                        if (this._children[i] && this._children[i]._zOrder >= 0) {
+                        if (this._children[i] && this._children[i]._zOrder >= 0)
                             this._children[i].visit(context);
-                        }
                     }
                 }
-            } else {
-                //if (this._isInDirtyRegion()) {
-                // self draw
+            } else
                 this.draw(context);
-                //}
-            }
+
             this._orderOfArrival = 0;
             context.restore();
         } else {
@@ -1291,14 +1279,11 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{
                 }
             }
 
-            if (this._rotation != 0) {
-                //context.rotate(cc.DEGREES_TO_RADIANS(this._rotation));
+            if (this._rotation != 0)
                 context.rotate(this._rotationRadians);
-            }
 
-            if ((this._scaleX != 1) || (this._scaleY != 1)) {
+            if ((this._scaleX != 1) || (this._scaleY != 1))
                 context.scale(this._scaleX, this._scaleY);
-            }
 
             if ((this._skewX != 0) || (this._skewY != 0)) {
                 context.transform(1,
diff --git a/cocos2d/particle_nodes/CCParticleSystemQuad.js b/cocos2d/particle_nodes/CCParticleSystemQuad.js
@@ -476,11 +476,10 @@ cc.ParticleSystemQuad = cc.ParticleSystem.extend(/** @lends cc.ParticleSystemQua
         if (cc.renderContextType == cc.CANVAS) {
             var context = ctx || cc.renderContext;
             context.save();
-            if (this.isBlendAdditive()) {
+            if (this.isBlendAdditive())
                 context.globalCompositeOperation = 'lighter';
-            } else {
+            else
                 context.globalCompositeOperation = 'source-over';
-            }
 
             for (var i = 0; i < this._particleCount; i++) {
                 var particle = this._particles[i];
@@ -491,11 +490,9 @@ cc.ParticleSystemQuad = cc.ParticleSystem.extend(/** @lends cc.ParticleSystemQua
                     var drawTexture = this.getTexture();
                     if (particle.isChangeColor) {
                         var cacheTextureForColor = cc.TextureCache.getInstance().getTextureColors(this.getTexture());
-                        if (cacheTextureForColor) {
+                        if (cacheTextureForColor)
                             drawTexture = cc.generateTintImage(this.getTexture(), cacheTextureForColor, particle.color, this._pointRect);
-                        }
                     }
-
                     context.save();
                     context.globalAlpha = particle.color.a;
                     context.translate(0 | particle.drawPos.x, -(0 | particle.drawPos.y));
@@ -507,11 +504,13 @@ cc.ParticleSystemQuad = cc.ParticleSystem.extend(/** @lends cc.ParticleSystemQua
                     context.save();
                     context.globalAlpha = particle.color.a;
                     context.translate(0 | particle.drawPos.x, -(0 | particle.drawPos.y));
+
                     if (this._shapeType == cc.PARTICLE_STAR_SHAPE) {
-                        cc.drawingUtil.drawStar(context, cc.p(0, 0), lpx, particle.color);
-                    } else {
-                        cc.drawingUtil.drawColorBall(context, cc.p(0, 0), lpx, particle.color);
-                    }
+                        if(particle.rotation)
+                            context.rotate(cc.DEGREES_TO_RADIANS(particle.rotation));
+                        cc.drawingUtil.drawStar(context, lpx, particle.color);
+                    } else
+                        cc.drawingUtil.drawColorBall(context, lpx, particle.color);
                     context.restore()
                 }
             }
diff --git a/cocos2d/sprite_nodes/CCSprite.js b/cocos2d/sprite_nodes/CCSprite.js
@@ -357,8 +357,7 @@ cc.Sprite = cc.Node.extend(/** @lends cc.Sprite# */{
      * @return {cc.Rect}
      */
     getTextureRect:function () {
-        r = this._rect;
-        return cc.rect(r.origin.x, r.origin.y, r.size.width, r.size.height);
+        return cc.rect(this._rect.origin.x, this._rect.origin.y, this._rect.size.width, this._rect.size.height);
     },
 
     /**
@@ -866,14 +865,11 @@ cc.Sprite = cc.Node.extend(/** @lends cc.Sprite# */{
      * @param {CanvasContext} ctx 2d context of canvas
      */
     draw:function (ctx) {
-        //this._super();
-
         //cc.PROFILER_START_CATEGORY(kCCProfilerCategorySprite, "cc.Sprite - draw");
         var context = ctx || cc.renderContext;
         if (cc.renderContextType == cc.CANVAS) {
-            if (this._isLighterMode) {
+            if (this._isLighterMode)
                 context.globalCompositeOperation = 'lighter';
-            }
 
             context.globalAlpha = this._opacity / 255;
             var mpX = 0, mpY = 0;
