Issue cocos2d#2698: refactor cc.pointApplyAffineTransform

Author: dingpinglv

cocos2d/core/CCScheduler.js

@@ -285,7 +285,7 @@ cc.TimerTargetCallback = cc.Timer.extend({
  *
  * @example
  * //register a schedule to scheduler
- * cc.director.getScheduler().scheduleSelector(callback, this, interval, !this._isRunning);
+ * cc.director.getScheduler().schedule(callback, this, interval, !this._isRunning);
  */
 cc.Scheduler = cc.Class.extend(/** @lends cc.Scheduler# */{
     _timeScale:1.0,

cocos2d/core/cocoa/CCAffineTransform.js

@@ -66,17 +66,26 @@ cc.affineTransformMake = function (a, b, c, d, tx, ty) {
  * Apply the affine transformation on a point.
  * @function
  * 
- * @param {cc.Point} point
- * @param {cc.AffineTransform} t
+ * @param {cc.Point|Number} point or x
+ * @param {cc.AffineTransform|Number} transOrY transform matrix or y
+ * @param {cc.AffineTransform} t transform matrix or y
  * @return {cc.Point}
  */
-cc.pointApplyAffineTransform = function (point, t) {
-    return {x: t.a * point.x + t.c * point.y + t.tx, y: t.b * point.x + t.d * point.y + t.ty};
+cc.pointApplyAffineTransform = function (point, transOrY, t) {
+    var x, y;
+    if (t === undefined) {
+        t = transOrY;
+        x = point.x;
+        y = point.y;
+    } else {
+        x = point;
+        y = transOrY;
+    }
+    return {x: t.a * x + t.c * y + t.tx, y: t.b * x + t.d * y + t.ty};
 };
 
-cc._pointApplyAffineTransform = function (x, y, t) {
-    return {x: t.a * x + t.c * y + t.tx,
-        y: t.b * x + t.d * y + t.ty};
+cc._pointApplyAffineTransform = function (x, y, t) {   //it will remove.
+    return cc.pointApplyAffineTransform(x, y, t);
 };
 
 /**
@@ -131,10 +140,10 @@ cc.rectApplyAffineTransform = function (rect, anAffineTransform) {
     var right = cc.rectGetMaxX(rect);
     var bottom = cc.rectGetMaxY(rect);
 
-    var topLeft = cc._pointApplyAffineTransform(left, top, anAffineTransform);
-    var topRight = cc._pointApplyAffineTransform(right, top, anAffineTransform);
-    var bottomLeft = cc._pointApplyAffineTransform(left, bottom, anAffineTransform);
-    var bottomRight = cc._pointApplyAffineTransform(right, bottom, anAffineTransform);
+    var topLeft = cc.pointApplyAffineTransform(left, top, anAffineTransform);
+    var topRight = cc.pointApplyAffineTransform(right, top, anAffineTransform);
+    var bottomLeft = cc.pointApplyAffineTransform(left, bottom, anAffineTransform);
+    var bottomRight = cc.pointApplyAffineTransform(right, bottom, anAffineTransform);
 
     var minX = Math.min(topLeft.x, topRight.x, bottomLeft.x, bottomRight.x);
     var maxX = Math.max(topLeft.x, topRight.x, bottomLeft.x, bottomRight.x);
@@ -150,10 +159,10 @@ cc._rectApplyAffineTransformIn = function(rect, anAffineTransform){
     var right = cc.rectGetMaxX(rect);
     var bottom = cc.rectGetMaxY(rect);
 
-    var topLeft = cc._pointApplyAffineTransform(left, top, anAffineTransform);
-    var topRight = cc._pointApplyAffineTransform(right, top, anAffineTransform);
-    var bottomLeft = cc._pointApplyAffineTransform(left, bottom, anAffineTransform);
-    var bottomRight = cc._pointApplyAffineTransform(right, bottom, anAffineTransform);
+    var topLeft = cc.pointApplyAffineTransform(left, top, anAffineTransform);
+    var topRight = cc.pointApplyAffineTransform(right, top, anAffineTransform);
+    var bottomLeft = cc.pointApplyAffineTransform(left, bottom, anAffineTransform);
+    var bottomRight = cc.pointApplyAffineTransform(right, bottom, anAffineTransform);
 
     var minX = Math.min(topLeft.x, topRight.x, bottomLeft.x, bottomRight.x);
     var maxX = Math.max(topLeft.x, topRight.x, bottomLeft.x, bottomRight.x);

cocos2d/core/layers/CCLayer.js

@@ -313,7 +313,7 @@ cc.LayerColor.create = function (color, width, height) {
  * @property {Number}   startOpacity            - Start opacity of the color gradient
  * @property {Number}   endOpacity              - End opacity of the color gradient
  * @property {Number}   vector                  - Direction vector of the color gradient
- * @property {Number}   compresseInterpolation  - Indicate whether or not the interpolation will be compressed
+ * @property {Number}   compressedInterpolation  - Indicate whether or not the interpolation will be compressed
  */
 cc.LayerGradient = cc.LayerColor.extend(/** @lends cc.LayerGradient# */{
     _endColor: null,

cocos2d/core/layers/CCLayerWebGLRenderCmd.js

@@ -247,10 +247,10 @@
         transMat = cc.affineTransformScale(transMat, tx, ty);
         for (i = 0; i < stopsLen; i++) {
             var stop = stops[i], y = stop.p * contentSize.height ;
-            var p0 = cc._pointApplyAffineTransform(- locAnchor.x , y - locAnchor.y, transMat);
+            var p0 = cc.pointApplyAffineTransform(- locAnchor.x , y - locAnchor.y, transMat);
             locVertices[i * 2].x = p0.x;
             locVertices[i * 2].y = p0.y;
-            var p1 = cc._pointApplyAffineTransform(contentSize.width - locAnchor.x, y - locAnchor.y, transMat);
+            var p1 = cc.pointApplyAffineTransform(contentSize.width - locAnchor.x, y - locAnchor.y, transMat);
             locVertices[i * 2 + 1].x = p1.x;
             locVertices[i * 2 + 1].y = p1.y;
         }