More JS API fixes:

replaces SizeMake() with size()
replaces RectMake() with rect()

The constant colors are not functions, but constants:
 cc.WHITE() -> cc.WHITE
 cc.BLACK() -> cc.BLACK.
 etc.

Author: ricardoquesada

HelloHTML5World/src/myApp.js

@@ -39,7 +39,7 @@ var CircleSprite = cc.Sprite.extend({
     },
     myUpdate:function (dt) {
         this._radians -= 6;
-        //this._addDirtyRegionToDirector(this.boundingBoxToWorld());
+        //this._addDirtyRegionToDirector(this.getBoundingBoxToWorld());
     }
 });
 

cocos2d/CCDirector.js

@@ -230,7 +230,7 @@ cc.Director = cc.Class.extend(/** @lends cc.Director# */{
 
         //purge?
         this._purgeDirecotorInNextLoop = false;
-        this._winSizeInPixels = this._winSizeInPoints = cc.SizeMake(cc.canvas.width, cc.canvas.height);
+        this._winSizeInPixels = this._winSizeInPoints = cc.size(cc.canvas.width, cc.canvas.height);
 
         this._openGLView = null;
         this._contentScaleFactor = 1.0;
@@ -657,7 +657,7 @@ cc.Director = cc.Class.extend(/** @lends cc.Director# */{
     reshapeProjection:function (newWindowSize) {
         if(this._openGLView){
             this._winSizeInPoints = this._openGLView.getSize();
-            this._winSizeInPixels = cc.SizeMake(this._winSizeInPoints.width * this._contentScaleFactor,
+            this._winSizeInPixels = cc.size(this._winSizeInPoints.width * this._contentScaleFactor,
                 this._winSizeInPoints.height * this._contentScaleFactor);
 
             this.setProjection(this._projection);
@@ -728,7 +728,7 @@ cc.Director = cc.Class.extend(/** @lends cc.Director# */{
     setContentScaleFactor:function (scaleFactor) {
         if (scaleFactor != this._contentScaleFactor) {
             this._contentScaleFactor = scaleFactor;
-            this._winSizeInPixels = cc.SizeMake(this._winSizeInPoints.width * scaleFactor, this._winSizeInPoints.height * scaleFactor);
+            this._winSizeInPixels = cc.size(this._winSizeInPoints.width * scaleFactor, this._winSizeInPoints.height * scaleFactor);
 
             if (this._openGLView) {
                 this.updateContentScaleFactor();
@@ -834,7 +834,7 @@ cc.Director = cc.Class.extend(/** @lends cc.Director# */{
 
             // set size
             this._winSizeInPoints = this._openGLView.getSize();
-            this._winSizeInPixels = cc.SizeMake(this._winSizeInPoints.width * this._contentScaleFactor, this._winSizeInPoints.height * this._contentScaleFactor);
+            this._winSizeInPixels = cc.size(this._winSizeInPoints.width * this._contentScaleFactor, this._winSizeInPoints.height * this._contentScaleFactor);
 
             this._createStatsLabel();
 
@@ -1132,9 +1132,9 @@ cc.Director = cc.Class.extend(/** @lends cc.Director# */{
     },
 
     _createStatsLabel:function(){
-        this._FPSLabel = cc.LabelTTF.create("00.0", "Arial", 18, cc.SizeMake(60,16), cc.TEXT_ALIGNMENT_RIGHT);
-        this._SPFLabel = cc.LabelTTF.create("0.000", "Arial", 18, cc.SizeMake(60,16), cc.TEXT_ALIGNMENT_RIGHT);
-        this._drawsLabel = cc.LabelTTF.create("000", "Arial", 18, cc.SizeMake(60,16), cc.TEXT_ALIGNMENT_RIGHT);
+        this._FPSLabel = cc.LabelTTF.create("00.0", "Arial", 18, cc.size(60,16), cc.TEXT_ALIGNMENT_RIGHT);
+        this._SPFLabel = cc.LabelTTF.create("0.000", "Arial", 18, cc.size(60,16), cc.TEXT_ALIGNMENT_RIGHT);
+        this._drawsLabel = cc.LabelTTF.create("000", "Arial", 18, cc.size(60,16), cc.TEXT_ALIGNMENT_RIGHT);
 
         this._drawsLabel.setPosition( cc.pAdd( cc.p(20,48), cc.DIRECTOR_STATS_POSITION ) );
         this._SPFLabel.setPosition( cc.pAdd( cc.p(20,30), cc.DIRECTOR_STATS_POSITION ) );

cocos2d/actions/CCAction.js

@@ -468,7 +468,7 @@ cc.Follow = cc.Action.extend(/** @lends cc.Follow# */{
  * // example
  * // creates the action with a set boundary
  * var sprite = cc.Sprite.create("spriteFileName");
- * var followAction = cc.Follow.create(sprite, cc.RectMake(0, 0, s.width * 2 - 100, s.height));
+ * var followAction = cc.Follow.create(sprite, cc.rect(0, 0, s.width * 2 - 100, s.height));
  * this.runAction(followAction);
  *
  * // creates the action with no boundary set

cocos2d/actions/CCActionGrid3D.js

@@ -778,7 +778,7 @@ cc.Twirl = cc.Grid3DAction.extend({
                 var amp = 0.1 * this._amplitude * this._amplitudeRate;
                 var a = r * Math.cos(Math.PI / 2.0 + time * Math.PI * this._twirls * 2) * amp;
 
-                var d = cc.p();
+                var d = cc.p(0,0);
 
                 d.x = Math.sin(a) * (v.y - c.y) + Math.cos(a) * (v.x - c.x);
                 d.y = Math.cos(a) * (v.y - c.y) - Math.sin(a) * (v.x - c.x);

cocos2d/actions/CCActionInterval.js

@@ -1241,7 +1241,7 @@ cc.BezierBy = cc.ActionInterval.extend(/** @lends cc.BezierBy# */{
      */
     ctor:function () {
         this._config = new cc.BezierConfig();
-        this._startPosition = cc.p();
+        this._startPosition = cc.p(0,0);
     }
 });
 

cocos2d/base_nodes/CCAtlasNode.js

@@ -71,7 +71,7 @@ cc.AtlasNode = cc.Node.extend(/** @lends cc.AtlasNode# */{
         this._itemHeight = tileHeight;
 
         this._opacity = 255;
-        this._color = this._colorUnmodified = cc.WHITE();
+        this._color = this._colorUnmodified = cc.WHITE;
         this._isOpacityModifyRGB = true;
 
         this._blendFunc.src = cc.BLEND_SRC;

cocos2d/base_nodes/CCNode.js

@@ -871,15 +871,15 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{
      * @return {Number}
      */
     getBoundingBox:function () {
-        var rect = cc.RectMake(0, 0, this._contentSize.width, this._contentSize.height);
+        var rect = cc.rect(0, 0, this._contentSize.width, this._contentSize.height);
         return cc.RectApplyAffineTransform(rect, this.nodeToParentTransform());
     },
 
     /**
      * @return {cc.Rect}
      */
     getBoundingBoxToWorld:function () {
-        var rect = cc.RectMake(0, 0, this._contentSize.width, this._contentSize.height);
+        var rect = cc.rect(0, 0, this._contentSize.width, this._contentSize.height);
         rect = cc.RectApplyAffineTransform(rect, this.nodeToWorldTransform());
         rect = new cc.Rect(0 | rect.origin.x - 4, 0 | rect.origin.y - 4, 0 | rect.size.width + 8, 0 | rect.size.height + 8);
         //query child's BoundingBox

cocos2d/base_nodes/CCdomNode.js

@@ -51,13 +51,13 @@ cc.DOM.methods = {
     },
     setScale:function (scale, scaleY) {
         //save dirty region when before change
-        //this._addDirtyRegionToDirector(this.boundingBoxToWorld());
+        //this._addDirtyRegionToDirector(this.getBoundingBoxToWorld());
 
         this._scaleX = scale;
         this._scaleY = scaleY || scale;
 
         //save dirty region when after changed
-        //this._addDirtyRegionToDirector(this.boundingBoxToWorld());
+        //this._addDirtyRegionToDirector(this.getBoundingBoxToWorld());
         this.dom.resize(this._scaleX, this._scaleY);
     },
     setScaleX:function (x) {
@@ -99,7 +99,7 @@ cc.DOM.methods = {
         if (this._rotation == newRotation)
             return;
         //save dirty region when before change
-        //this._addDirtyRegionToDirector(this.boundingBoxToWorld());
+        //this._addDirtyRegionToDirector(this.getBoundingBoxToWorld());
 
         this._rotation = newRotation;
         this._rotationRadians = this._rotation * (Math.PI / 180);

cocos2d/cocoa/CCAffineTransform.js

@@ -62,7 +62,7 @@ cc.AffineTransformMake = function (a, b, c, d, tx, ty) {
 };
 
 cc.__PointApplyAffineTransform = function (point, t) {
-    var p = cc.p();
+    var p = cc.p(0,0);
     p.x = t.a * point.x + t.c * point.y + t.tx;
     p.y = t.b * point.x + t.d * point.y + t.ty;
     return p;
@@ -138,7 +138,7 @@ cc.RectApplyAffineTransform = function (rect, anAffineTransform) {
     var minY = Math.min(Math.min(topLeft.y, topRight.y), Math.min(bottomLeft.y, bottomRight.y));
     var maxY = Math.max(Math.max(topLeft.y, topRight.y), Math.max(bottomLeft.y, bottomRight.y));
 
-    return cc.RectMake(minX, minY, (maxX - minX), (maxY - minY));
+    return cc.rect(minX, minY, (maxX - minX), (maxY - minY));
 };
 
 /**

cocos2d/cocoa/CCGeometry.js

@@ -35,6 +35,16 @@ cc.Point = function (_x, _y) {
     this.y = _y || 0;
 };
 
+/**
+ * Helper macro that creates a cc.Point.
+ * @param {Number} x
+ * @param {Number} y
+ * @return {}
+ */
+cc.p = function (x, y) {
+    return new cc.Point(x,y);
+};
+
 /**
  * @function
  * @param {cc.Point} point1
@@ -81,29 +91,29 @@ cc.Rect = function (x1, y1, width1, height1) {
     switch (arguments.length) {
         case 0:
             this.origin = cc.p(0, 0);
-            this.size = new cc.Size(0, 0);
+            this.size = cc.size(0, 0);
             break;
         case 1:
             var oldRect = x1;
             if (!oldRect) {
                 this.origin = cc.p(0, 0);
-                this.size = new cc.Size(0, 0);
+                this.size = cc.size(0, 0);
             } else {
                 if (oldRect instanceof cc.Rect) {
                     this.origin = cc.p(oldRect.origin.x, oldRect.origin.y);
-                    this.size = new cc.Size(oldRect.size.width, oldRect.size.height);
+                    this.size = cc.size(oldRect.size.width, oldRect.size.height);
                 } else {
                     throw "unknown argument type";
                 }
             }
             break;
         case 2:
             this.origin = x1 ? cc.p(x1.x, x1.y) : cc.p(0, 0);
-            this.size = y1 ? new cc.Size(y1.width, y1.height) : new cc.Size(0, 0);
+            this.size = y1 ? cc.size(y1.width, y1.height) : cc.size(0, 0);
             break;
         case 4:
             this.origin = cc.p(x1 || 0, y1 || 0);
-            this.size = new cc.Size(width1 || 0, height1 || 0);
+            this.size = cc.size(width1 || 0, height1 || 0);
             break;
         default:
             throw "unknown argument type";
@@ -250,7 +260,7 @@ cc.Rect.CCRectOverlapsRect = function (rectA, rectB) {
  * Constructor
  */
 cc.Rect.CCRectUnion = function (rectA, rectB) {
-    var rect = new cc.Rect(0, 0, 0, 0);
+    var rect = cc.rect(0, 0, 0, 0);
     rect.origin.x = Math.min(rectA.origin.x, rectB.origin.x);
     rect.origin.y = Math.min(rectA.origin.y, rectB.origin.y);
     rect.size.width = Math.max(rectA.origin.x + rectA.size.width, rectB.origin.x + rectB.size.width) - rect.origin.x;
@@ -267,7 +277,7 @@ cc.Rect.CCRectUnion = function (rectA, rectB) {
  * Constructor
  */
 cc.Rect.CCRectIntersection = function (rectA, rectB) {
-    var intersection = new cc.Rect(
+    var intersection = cc.rect(
         Math.max(cc.Rect.CCRectGetMinX(rectA), cc.Rect.CCRectGetMinX(rectB)),
         Math.max(cc.Rect.CCRectGetMinY(rectA), cc.Rect.CCRectGetMinY(rectB)),
         0, 0);
@@ -299,8 +309,16 @@ cc.SizeMake = function (width, height) {
     return new cc.Size(width, height);
 };
 
-// backward compatible
-cc.size = cc.SizeMake;
+/**
+ * @function
+ * @param {Number} width
+ * @param {Number} height
+ * @return {Number, Number}
+ * Constructor
+ */
+cc.size = function(w, h) {
+    return new cc.Size(w,h);
+}
 
 /**
  * @function
@@ -329,22 +347,22 @@ cc.PointZero = function () {
 };
 
 /**
- * The "zero" size -- equivalent to cc.SizeMake(0, 0).
+ * The "zero" size -- equivalent to cc.size(0, 0).
  * @function
  * @return {cc.Size}
  * Constructor
  */
 cc.SizeZero = function () {
-    return new cc.Size(0, 0)
+    return cc.size(0, 0)
 };
 
 /**
- * The "zero" rectangle -- equivalent to cc.RectMake(0, 0, 0, 0).
+ * The "zero" rectangle -- equivalent to cc.rect(0, 0, 0, 0).
  * @function
  * @return {cc.Rect}
  * Constructor
  */
 cc.RectZero = function () {
-    return new cc.Rect(0, 0, 0, 0)
+    return cc.rect(0, 0, 0, 0)
 };