diff --git a/HelloHTML5World/src/myApp.js b/HelloHTML5World/src/myApp.js
index 70dcc97662..9d195aeca8 100644
--- a/HelloHTML5World/src/myApp.js
+++ b/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());
}
});
diff --git a/cocos2d/CCDirector.js b/cocos2d/CCDirector.js
index db121f0f5a..0af7a79642 100644
--- a/cocos2d/CCDirector.js
+++ b/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;
@@ -322,7 +322,7 @@ cc.Director = cc.Class.extend(/** @lends cc.Director# */{
if (!this._paused) {
this._scheduler.update(this._deltaTime);
}
- //this._fullRect = new cc.Rect(0, 0, cc.canvas.width, cc.canvas.height);
+ //this._fullRect = cc.rect(0, 0, cc.canvas.width, cc.canvas.height);
//cc.renderContext.clearRect(this._fullRect.origin.x, this._fullRect.origin.y, this._fullRect.size.width, -this._fullRect.size.height);
cc.renderContext.clearRect(0, 0, cc.canvas.width, -cc.canvas.height);
@@ -333,7 +333,7 @@ cc.Director = cc.Class.extend(/** @lends cc.Director# */{
if (this._dirtyRegion) {
//cc.renderContext.clearRect(0, 0, cc.canvas.width, -cc.canvas.height);
- var fullRect = new cc.Rect(0, 0, cc.canvas.width, cc.canvas.height);
+ var fullRect = cc.rect(0, 0, cc.canvas.width, cc.canvas.height);
this._dirtyRegion = cc.Rect.CCRectIntersection(this._dirtyRegion, fullRect);
if(cc.Rect.CCRectEqualToRect(cc.RectZero(), this._dirtyRegion)){
@@ -412,11 +412,11 @@ cc.Director = cc.Class.extend(/** @lends cc.Director# */{
return;
if (!this._dirtyRegion) {
- this._dirtyRegion = new cc.Rect(rect.origin.x, rect.origin.y, rect.size.width, rect.size.height);
+ this._dirtyRegion = cc.rect(rect.origin.x, rect.origin.y, rect.size.width, rect.size.height);
return;
}
this._dirtyRegion = cc.Rect.CCRectUnion(this._dirtyRegion,
- new cc.Rect(rect.origin.x, rect.origin.y, rect.size.width, rect.size.height));
+ cc.rect(rect.origin.x, rect.origin.y, rect.size.width, rect.size.height));
},
rectIsInDirtyRegion:function (rect) {
@@ -547,7 +547,7 @@ cc.Director = cc.Class.extend(/** @lends cc.Director# */{
popScene:function () {
cc.Assert(this._runningScene != null, "running scene should not null");
- //this.addRegionToDirtyRegion(new cc.Rect(0, 0, cc.canvas.width, cc.canvas.height));
+ //this.addRegionToDirtyRegion(cc.rect(0, 0, cc.canvas.width, cc.canvas.height));
this._scenesStack.pop();
var c = this._scenesStack.length;
@@ -627,7 +627,7 @@ cc.Director = cc.Class.extend(/** @lends cc.Director# */{
pushScene:function (scene) {
cc.Assert(scene, "the scene should not null");
- //this.addRegionToDirtyRegion(new cc.Rect(0, 0, cc.canvas.width, cc.canvas.height));
+ //this.addRegionToDirtyRegion(cc.rect(0, 0, cc.canvas.width, cc.canvas.height));
this._sendCleanupToScene = false;
@@ -642,7 +642,7 @@ cc.Director = cc.Class.extend(/** @lends cc.Director# */{
replaceScene:function (scene) {
cc.Assert(scene != null, "the scene should not be null");
- //this.addRegionToDirtyRegion(new cc.Rect(0, 0, cc.canvas.width, cc.canvas.height));
+ //this.addRegionToDirtyRegion(cc.rect(0, 0, cc.canvas.width, cc.canvas.height));
var i = this._scenesStack.length;
this._sendCleanupToScene = true;
@@ -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);
@@ -671,7 +671,7 @@ cc.Director = cc.Class.extend(/** @lends cc.Director# */{
if (!this._paused) {
return;
}
- //this.addRegionToDirtyRegion(new cc.Rect(0, 0, cc.canvas.width, cc.canvas.height));
+ //this.addRegionToDirtyRegion(cc.rect(0, 0, cc.canvas.width, cc.canvas.height));
this.setAnimationInterval(this._oldAnimationInterval);
this._lastUpdate = cc.Time.gettimeofdayCocos2d();
@@ -695,7 +695,7 @@ cc.Director = cc.Class.extend(/** @lends cc.Director# */{
cc.Assert(scene != null, "running scene should not be null");
cc.Assert(this._runningScene == null, "_runningScene should be null");
- //this.addRegionToDirtyRegion(new cc.Rect(0, 0, cc.canvas.width, cc.canvas.height));
+ //this.addRegionToDirtyRegion(cc.rect(0, 0, cc.canvas.width, cc.canvas.height));
this.pushScene(scene);
this.startAnimation();
@@ -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 ) );
@@ -1244,7 +1244,7 @@ cc.defaultFPS = 60;
/*
window.onfocus = function () {
if (!cc.firstRun) {
- cc.Director.getInstance().addRegionToDirtyRegion(new cc.Rect(0, 0, cc.canvas.width, cc.canvas.height));
+ cc.Director.getInstance().addRegionToDirtyRegion(cc.rect(0, 0, cc.canvas.width, cc.canvas.height));
}
};
*/
diff --git a/cocos2d/actions/CCAction.js b/cocos2d/actions/CCAction.js
index aa68a70231..21724dc2e1 100644
--- a/cocos2d/actions/CCAction.js
+++ b/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
diff --git a/cocos2d/actions/CCActionGrid3D.js b/cocos2d/actions/CCActionGrid3D.js
index 4170188de1..33be25f336 100644
--- a/cocos2d/actions/CCActionGrid3D.js
+++ b/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);
diff --git a/cocos2d/actions/CCActionInterval.js b/cocos2d/actions/CCActionInterval.js
index 658f95df5e..acb0a2d531 100644
--- a/cocos2d/actions/CCActionInterval.js
+++ b/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);
}
});
diff --git a/cocos2d/base_nodes/CCAtlasNode.js b/cocos2d/base_nodes/CCAtlasNode.js
index 6c7e4d4dfd..ec00e0c91a 100644
--- a/cocos2d/base_nodes/CCAtlasNode.js
+++ b/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;
@@ -156,7 +156,7 @@ cc.AtlasNode = cc.Node.extend(/** @lends cc.AtlasNode# */{
var cacheTextureForColor = cc.TextureCache.getInstance().getTextureColors(this._originalTexture);
if (cacheTextureForColor) {
var tx = this._originalTexture;
- var textureRect = new cc.Rect(0, 0, tx.width, tx.height);
+ var textureRect = cc.rect(0, 0, tx.width, tx.height);
var colorTexture = cc.generateTintImage(tx, cacheTextureForColor, this._color, textureRect);
var img = new Image();
img.src = colorTexture.toDataURL();
@@ -272,7 +272,7 @@ cc.AtlasNode = cc.Node.extend(/** @lends cc.AtlasNode# */{
size = this._textureAtlas.getTexture().getContentSize();
}
else {
- size = new cc.Size(this._textureAtlas.getTexture().width, this._textureAtlas.getTexture().height);
+ size = cc.size(this._textureAtlas.getTexture().width, this._textureAtlas.getTexture().height);
}
this._itemsPerColumn = parseInt(size.height / this._itemHeight);
this._itemsPerRow = parseInt(size.width / this._itemWidth);
diff --git a/cocos2d/base_nodes/CCNode.js b/cocos2d/base_nodes/CCNode.js
index ad956e92a4..1f7d4db1e4 100644
--- a/cocos2d/base_nodes/CCNode.js
+++ b/cocos2d/base_nodes/CCNode.js
@@ -182,7 +182,7 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{
}
this._anchorPoint = cc.p(0, 0);
this._anchorPointInPoints = cc.p(0, 0);
- this._contentSize = new cc.Size(0, 0);
+ this._contentSize = cc.size(0, 0);
this._position = cc.p(0, 0);
var director = cc.Director.getInstance();
@@ -267,7 +267,7 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{
_isInDirtyRegion:function () {
//if (!cc.firstRun) {
- // return cc.Director.getInstance().rectIsInDirtyRegion(this.boundingBoxToWorld());
+ // return cc.Director.getInstance().rectIsInDirtyRegion(this.getBoundingBoxToWorld());
//}
},
@@ -303,12 +303,12 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{
*/
setSkewX:function (newSkewX) {
//save dirty region when before change
- //this._addDirtyRegionToDirector(this.boundingBoxToWorld());
+ //this._addDirtyRegionToDirector(this.getBoundingBoxToWorld());
this._skewX = newSkewX;
//save dirty region when after changed
- //this._addDirtyRegionToDirector(this.boundingBoxToWorld());
+ //this._addDirtyRegionToDirector(this.getBoundingBoxToWorld());
this.setNodeDirty();
},
@@ -325,11 +325,11 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{
*/
setSkewY:function (newSkewY) {
//save dirty region when before change
- //this._addDirtyRegionToDirector(this.boundingBoxToWorld());
+ //this._addDirtyRegionToDirector(this.getBoundingBoxToWorld());
this._skewY = newSkewY;
//save dirty region when after changed
- //this._addDirtyRegionToDirector(this.boundingBoxToWorld());
+ //this._addDirtyRegionToDirector(this.getBoundingBoxToWorld());
this.setNodeDirty();
},
@@ -390,12 +390,12 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{
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);
//save dirty region when after changed
- //this._addDirtyRegionToDirector(this.boundingBoxToWorld());
+ //this._addDirtyRegionToDirector(this.getBoundingBoxToWorld());
this.setNodeDirty();
},
@@ -415,13 +415,13 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{
*/
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.setNodeDirty();
},
@@ -439,12 +439,12 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{
*/
setScaleX:function (newScaleX) {
//save dirty region when before change
- //this._addDirtyRegionToDirector(this.boundingBoxToWorld());
+ //this._addDirtyRegionToDirector(this.getBoundingBoxToWorld());
this._scaleX = newScaleX;
//save dirty region when after changed
- //this._addDirtyRegionToDirector(this.boundingBoxToWorld());
+ //this._addDirtyRegionToDirector(this.getBoundingBoxToWorld());
this.setNodeDirty();
},
@@ -462,12 +462,12 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{
*/
setScaleY:function (newScaleY) {
//save dirty region when before change
- //this._addDirtyRegionToDirector(this.boundingBoxToWorld());
+ //this._addDirtyRegionToDirector(this.getBoundingBoxToWorld());
this._scaleY = newScaleY;
//save dirty region when after changed
- //this._addDirtyRegionToDirector(this.boundingBoxToWorld());
+ //this._addDirtyRegionToDirector(this.getBoundingBoxToWorld());
this.setNodeDirty();
},
@@ -478,7 +478,7 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{
*/
setPosition:function (newPosOrxValue, yValue) {
//save dirty region when before change
- //this._addDirtyRegionToDirector(this.boundingBoxToWorld());
+ //this._addDirtyRegionToDirector(this.getBoundingBoxToWorld());
if (yValue) {
this._position.x = newPosOrxValue;
this._position.y = yValue;
@@ -488,7 +488,7 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{
}
//save dirty region when after changed
- //this._addDirtyRegionToDirector(this.boundingBoxToWorld());
+ //this._addDirtyRegionToDirector(this.getBoundingBoxToWorld());
this.setNodeDirty();
},
@@ -600,7 +600,7 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{
*/
setVisible:function (Var) {
this._isVisible = Var;
- //this._addDirtyRegionToDirector(this.boundingBoxToWorld());
+ //this._addDirtyRegionToDirector(this.getBoundingBoxToWorld());
this.setNodeDirty();
},
@@ -620,14 +620,14 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{
setAnchorPoint:function (point) {
if (!cc.Point.CCPointEqualToPoint(point, this._anchorPoint)) {
//save dirty region when before change
- //this._addDirtyRegionToDirector(this.boundingBoxToWorld());
+ //this._addDirtyRegionToDirector(this.getBoundingBoxToWorld());
this._anchorPoint = point;
this._anchorPointInPoints = cc.p(this._contentSize.width * this._anchorPoint.x,
this._contentSize.height * this._anchorPoint.y);
//save dirty region when after changed
- //this._addDirtyRegionToDirector(this.boundingBoxToWorld());
+ //this._addDirtyRegionToDirector(this.getBoundingBoxToWorld());
this.setNodeDirty();
}
},
@@ -645,7 +645,7 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{
* @return {cc.Size}
*/
getContentSize:function () {
- return new cc.Size(this._contentSize.width, this._contentSize.height);
+ return cc.size(this._contentSize.width, this._contentSize.height);
},
/**
@@ -654,13 +654,13 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{
setContentSize:function (size) {
if (!cc.Size.CCSizeEqualToSize(size, this._contentSize)) {
//save dirty region when before change
- //this._addDirtyRegionToDirector(this.boundingBoxToWorld());
+ //this._addDirtyRegionToDirector(this.getBoundingBoxToWorld());
this._contentSize = size;
this._anchorPointInPoints = cc.p(this._contentSize.width * this._anchorPoint.x,
this._contentSize.height * this._anchorPoint.y);
//save dirty region when before change
- //this._addDirtyRegionToDirector(this.boundingBoxToWorld());
+ //this._addDirtyRegionToDirector(this.getBoundingBoxToWorld());
this.setNodeDirty();
}
},
@@ -700,12 +700,12 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{
ignoreAnchorPointForPosition:function (newValue) {
if (newValue != this._ignoreAnchorPointForPosition) {
//save dirty region when before change
- //this._addDirtyRegionToDirector(this.boundingBoxToWorld());
+ //this._addDirtyRegionToDirector(this.getBoundingBoxToWorld());
this._ignoreAnchorPointForPosition = newValue;
//save dirty region when before change
- //this._addDirtyRegionToDirector(this.boundingBoxToWorld());
+ //this._addDirtyRegionToDirector(this.getBoundingBoxToWorld());
this.setNodeDirty();
}
},
@@ -871,17 +871,17 @@ 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}
*/
- boundingBoxToWorld:function () {
- var rect = cc.RectMake(0, 0, this._contentSize.width, this._contentSize.height);
+ getBoundingBoxToWorld:function () {
+ 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);
+ rect = 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
if (!this._children)
return rect;
@@ -889,7 +889,7 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{
for (var i = 0; i < this._children.length; i++) {
var child = this._children[i];
if (child && child._isVisible) {
- var childRect = child.boundingBoxToWorld();
+ var childRect = child.getBoundingBoxToWorld();
if (childRect) {
rect = cc.Rect.CCRectUnion(rect, childRect);
}
@@ -1001,7 +1001,7 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{
this._detachChild(child, cleanup);
}
- //this._addDirtyRegionToDirector(this.boundingBoxToWorld());
+ //this._addDirtyRegionToDirector(this.getBoundingBoxToWorld());
this.setNodeDirty();
},
@@ -1108,13 +1108,13 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{
this._reorderChildDirty = true;
//save dirty region when before change
- //this._addDirtyRegionToDirector(this.boundingBoxToWorld());
+ //this._addDirtyRegionToDirector(this.getBoundingBoxToWorld());
child.setOrderOfArrival(cc.s_globalOrderOfArrival++);
child._setZOrder(zOrder);
//save dirty region when after changed
- //this._addDirtyRegionToDirector(this.boundingBoxToWorld());
+ //this._addDirtyRegionToDirector(this.getBoundingBoxToWorld());
this.setNodeDirty();
},
diff --git a/cocos2d/base_nodes/CCdomNode.js b/cocos2d/base_nodes/CCdomNode.js
index f3de9554ec..270cf88492 100644
--- a/cocos2d/base_nodes/CCdomNode.js
+++ b/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);
diff --git a/cocos2d/cocoa/CCAffineTransform.js b/cocos2d/cocoa/CCAffineTransform.js
index 5a7c0884f1..7eed9a87c2 100644
--- a/cocos2d/cocoa/CCAffineTransform.js
+++ b/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;
@@ -80,7 +80,7 @@ cc.PointApplyAffineTransform = function (point, t) {
};
cc.__SizeApplyAffineTransform = function (size, t) {
- var s = new cc.Size();
+ var s = cc.size(0,0);
s.width = t.a * size.width + t.c * size.height;
s.height = t.b * size.width + t.d * size.height;
return s;
@@ -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));
};
/**
diff --git a/cocos2d/cocoa/CCGeometry.js b/cocos2d/cocoa/CCGeometry.js
index e56b838b45..754d024d2b 100644
--- a/cocos2d/cocoa/CCGeometry.js
+++ b/cocos2d/cocoa/CCGeometry.js
@@ -35,6 +35,18 @@ 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) {
+ // optimization
+ return {x:x, y:y};
+// return new cc.Point(x,y);
+};
+
/**
* @function
* @param {cc.Point} point1
@@ -81,17 +93,17 @@ 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";
}
@@ -99,11 +111,11 @@ cc.Rect = function (x1, y1, width1, height1) {
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 +262,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 +279,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);
@@ -296,9 +308,23 @@ cc.PointMake = function (x, y) {
* Constructor
*/
cc.SizeMake = function (width, height) {
- return new cc.Size(width, height);
+ return cc.size(width, height);
};
+/**
+ * @function
+ * @param {Number} width
+ * @param {Number} height
+ * @return {Number, Number}
+ * Constructor
+ */
+cc.size = function(w, h) {
+ // optimization
+ return {width:w, height:h};
+
+// return cc.size(w,h);
+}
+
/**
* @function
* @param {Number} x
@@ -309,9 +335,16 @@ cc.SizeMake = function (width, height) {
* Constructor
*/
cc.RectMake = function (x, y, width, height) {
- return new cc.Rect(x, y, width, height);
+ return cc.rect(x, y, width, height);
};
+// backward compatible
+cc.rect = function(x,y,w,h) {
+ // optimization
+ return { origin:{x:x, y:y}, size:{width:w, height:h} };
+// return cc.rect(x, y, width, height);
+}
+
/**
* The "left bottom" point -- equivalent to cc.p(0, 0).
* @function
@@ -323,22 +356,39 @@ cc.PointZero = function () {
};
/**
- * The "zero" size -- equivalent to cc.SizeMake(0, 0).
+ * Point Zero Constant
+ * @return {cc.Point}
+ */
+cc.POINT_ZERO = cc.p(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).
+ * Size Zero constant
+ * @return {cc.Size}
+ */
+cc.SIZE_ZERO = cc.size(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)
};
+/**
+ * Rect Zero Constant
+ * @return {cc.Rect}
+ */
+cc.RECT_ZERO = cc.rect(0,0,0,0);
diff --git a/cocos2d/cocoa/CCNS.js b/cocos2d/cocoa/CCNS.js
index 71e7fd7fae..065453f0f6 100644
--- a/cocos2d/cocoa/CCNS.js
+++ b/cocos2d/cocoa/CCNS.js
@@ -113,7 +113,7 @@ cc.RectFromString = function (content) {
var width = parseFloat(sizeInfo[0]);
var height = parseFloat(sizeInfo[1]);
- result = cc.RectMake(x, y, width, height);
+ result = cc.rect(x, y, width, height);
} while (0);
return result;
}
@@ -169,7 +169,7 @@ cc.SizeFromString = function (content) {
var strs = cc.splitWithForm(content);
var width = parseFloat(strs[0]);
var height = parseFloat(strs[1]);
- ret = cc.SizeMake(width, height);
+ ret = cc.size(width, height);
} catch (e) {
}
return ret;
diff --git a/cocos2d/effects/CCGrid.js b/cocos2d/effects/CCGrid.js
index 8a590303e0..c7b7db753f 100644
--- a/cocos2d/effects/CCGrid.js
+++ b/cocos2d/effects/CCGrid.js
@@ -33,7 +33,7 @@ cc.GridBase = cc.Class.extend({
_reuseGrid:null,
_gridSize:null,
_texture:null,
- _step:cc.p(),
+ _step:cc.p(0,0),
_grabber:null,
_isTextureFlipped:null,
/** wheter or not the grid is active */
diff --git a/cocos2d/label_nodes/CCLabelAtlas.js b/cocos2d/label_nodes/CCLabelAtlas.js
index 2c96fd84d6..af16494a1e 100644
--- a/cocos2d/label_nodes/CCLabelAtlas.js
+++ b/cocos2d/label_nodes/CCLabelAtlas.js
@@ -77,14 +77,14 @@ cc.LabelAtlas = cc.AtlasNode.extend(/** @lends cc.LabelAtlas# */{
var row = parseInt(a % this._itemsPerRow) * cc.CONTENT_SCALE_FACTOR();
var col = parseInt(a / this._itemsPerRow) * cc.CONTENT_SCALE_FACTOR();
- var rect = cc.RectMake(row * this._itemWidth, col * this._itemHeight, this._itemWidth, this._itemHeight);
+ var rect = cc.rect(row * this._itemWidth, col * this._itemHeight, this._itemWidth, this._itemHeight);
var c = this._string.charCodeAt(i);
var fontChar = this.getChildByTag(i);
if (!fontChar) {
fontChar = new cc.Sprite();
if (c == 32) {
fontChar.init();
- fontChar.setTextureRect(cc.RectMake(0,0,10,10), false, cc.SizeZero());
+ fontChar.setTextureRect(cc.rect(0,0,10,10), false, cc.SizeZero());
}
else {
fontChar.initWithTexture(texture, rect);
@@ -94,7 +94,7 @@ cc.LabelAtlas = cc.AtlasNode.extend(/** @lends cc.LabelAtlas# */{
else {
if (c == 32) {
fontChar.init();
- fontChar.setTextureRect(cc.RectMake(0,0,10,10), false, cc.SizeZero());
+ fontChar.setTextureRect(cc.rect(0,0,10,10), false, cc.SizeZero());
}
else {
// reusing fonts
@@ -117,7 +117,7 @@ cc.LabelAtlas = cc.AtlasNode.extend(/** @lends cc.LabelAtlas# */{
var len = label.length;
this._textureAtlas.resizeCapacity(len);
- var s = new cc.SizeMake(len * this._itemWidth, this._itemHeight);
+ var s = new cc.size(len * this._itemWidth, this._itemHeight);
this.setContentSize(s);
if (this._children) {
diff --git a/cocos2d/label_nodes/CCLabelBMFont.js b/cocos2d/label_nodes/CCLabelBMFont.js
index da24f3a0d5..743c8cc5fc 100644
--- a/cocos2d/label_nodes/CCLabelBMFont.js
+++ b/cocos2d/label_nodes/CCLabelBMFont.js
@@ -49,7 +49,7 @@ cc._BMFontDef = function (charID, rect, xOffset, yOffset, xAdvance) {
//! ID of the character
this.charID = charID || 0;
//! origin and size of the font
- this.rect = rect || cc.RectMake(0, 0, 10, 10);
+ this.rect = rect || cc.rect(0, 0, 10, 10);
//! The X amount the image should be offset when drawing the image (in pixels)
this.xOffset = xOffset || 0;
//! The Y amount the image should be offset when drawing the image (in pixels)
@@ -507,7 +507,7 @@ cc.LabelBMFont = cc.SpriteBatchNode.extend(/** @lends cc.LabelBMFont# */{
if (cacheTextureForColor) {
//generate color texture cache
var tx = this.getTexture();
- var textureRect = new cc.Rect(0, 0, tx.width, tx.height);
+ var textureRect = cc.rect(0, 0, tx.width, tx.height);
var colorTexture = cc.generateTintImage(tx, cacheTextureForColor, this._color, textureRect);
var img = new Image();
img.src = colorTexture.toDataURL();
@@ -584,7 +584,7 @@ cc.LabelBMFont = cc.SpriteBatchNode.extend(/** @lends cc.LabelBMFont# */{
this._imageOffset = imageOffset || cc.PointZero();
this._width = width || cc.LabelAutomaticWidth;
this._opacity = 255;
- this._color = cc.WHITE();
+ this._color = cc.WHITE;
this._contentSize = cc.SizeZero();
this.setString(theString);
this.setAnchorPoint(cc.p(0.5, 0.5));
@@ -641,7 +641,7 @@ cc.LabelBMFont = cc.SpriteBatchNode.extend(/** @lends cc.LabelBMFont# */{
var fontDef = element.fontDef;
- var rect = cc.RectMake(fontDef.rect.origin.x, fontDef.rect.origin.y, fontDef.rect.size.width, fontDef.rect.size.height);
+ var rect = cc.rect(fontDef.rect.origin.x, fontDef.rect.origin.y, fontDef.rect.size.width, fontDef.rect.size.height);
rect = cc.RECT_PIXELS_TO_POINTS(rect);
rect.origin.x += this._imageOffset.x;
rect.origin.y += this._imageOffset.y;
diff --git a/cocos2d/label_nodes/CCLabelTTF.js b/cocos2d/label_nodes/CCLabelTTF.js
index 0d1468bd0f..7d5879ef71 100644
--- a/cocos2d/label_nodes/CCLabelTTF.js
+++ b/cocos2d/label_nodes/CCLabelTTF.js
@@ -45,7 +45,7 @@ cc.LabelTTF = cc.Sprite.extend(/** @lends cc.LabelTTF# */{
*/
ctor:function () {
this._super();
- this._color = cc.WHITE();
+ this._color = cc.WHITE;
this._opacityModifyRGB = false;
this._fontStyleStr = "";
},
@@ -190,12 +190,12 @@ cc.LabelTTF = cc.Sprite.extend(/** @lends cc.LabelTTF# */{
else {
fontName = arg[1];
fontSize = arg[2];
- dimensions = cc.SizeMake(0, arg[2]);
+ dimensions = cc.size(0, arg[2]);
hAlignment = cc.TEXT_ALIGNMENT_LEFT;
vAlignment = cc.VERTICAL_TEXT_ALIGNMENT_BOTTOM;
}
if (this.init(true)) {
- this._dimensions = cc.SizeMake(dimensions.width, dimensions.height);
+ this._dimensions = cc.size(dimensions.width, dimensions.height);
this._fontName = fontName;
this._hAlignment = hAlignment;
this._vAlignment = vAlignment;
@@ -367,7 +367,7 @@ cc.LabelTTF = cc.Sprite.extend(/** @lends cc.LabelTTF# */{
this._fontStyleStr = this._fontSize + "px '" + this._fontName + "'";
cc.renderContext.font = this._fontStyleStr;
var dim = cc.renderContext.measureText(this._string);
- this.setContentSize(new cc.Size(dim.width, this._fontSize));
+ this.setContentSize(cc.size(dim.width, this._fontSize));
cc.renderContext.restore();
this.setNodeDirty();
}
@@ -383,7 +383,7 @@ cc.LabelTTF = cc.Sprite.extend(/** @lends cc.LabelTTF# */{
* @return {cc.LabelTTF|Null}
* @example
* // Example
- * var myLabel = cc.LabelTTF.create('label text', 'Times New Roman', 32, cc.SizeMake(32,16), cc.TEXT_ALIGNMENT_LEFT);
+ * var myLabel = cc.LabelTTF.create('label text', 'Times New Roman', 32, cc.size(32,16), cc.TEXT_ALIGNMENT_LEFT);
*/
cc.LabelTTF.create = function (/* Multi arguments */) {
var ret = new cc.LabelTTF();
diff --git a/cocos2d/layers_scenes_transitions_nodes/CCLayer.js b/cocos2d/layers_scenes_transitions_nodes/CCLayer.js
index 945602d930..bce0aa865e 100644
--- a/cocos2d/layers_scenes_transitions_nodes/CCLayer.js
+++ b/cocos2d/layers_scenes_transitions_nodes/CCLayer.js
@@ -347,7 +347,7 @@ cc.LayerColor = cc.Layer.extend(/** @lends cc.LayerColor# */{
this._opacity = Var;
this._updateColor();
- //this._addDirtyRegionToDirector(this.boundingBoxToWorld());
+ //this._addDirtyRegionToDirector(this.getBoundingBoxToWorld());
this.setNodeDirty();
},
@@ -367,7 +367,7 @@ cc.LayerColor = cc.Layer.extend(/** @lends cc.LayerColor# */{
this._color = Var;
this._updateColor();
- //this._addDirtyRegionToDirector(this.boundingBoxToWorld());
+ //this._addDirtyRegionToDirector(this.getBoundingBoxToWorld());
this.setNodeDirty();
},
@@ -409,7 +409,7 @@ cc.LayerColor = cc.Layer.extend(/** @lends cc.LayerColor# */{
}
this._updateColor();
- this.setContentSize(new cc.Size(width, height));
+ this.setContentSize(cc.size(width, height));
//this.setShaderProgram(cc.ShaderCache.getInstance().programForKey(kCCShader_PositionColor));
return true;
@@ -433,7 +433,7 @@ cc.LayerColor = cc.Layer.extend(/** @lends cc.LayerColor# */{
* @param {Number} h height
*/
changeWidthAndHeight:function (w, h) {
- this.setContentSize(cc.SizeMake(w, h));
+ this.setContentSize(cc.size(w, h));
},
/**
@@ -441,7 +441,7 @@ cc.LayerColor = cc.Layer.extend(/** @lends cc.LayerColor# */{
* @param {Number} w width
*/
changeWidth:function (w) {
- this.setContentSize(cc.SizeMake(w, this._contentSize.height));
+ this.setContentSize(cc.size(w, this._contentSize.height));
},
/**
@@ -449,7 +449,7 @@ cc.LayerColor = cc.Layer.extend(/** @lends cc.LayerColor# */{
* @param {Number} h height
*/
changeHeight:function (h) {
- this.setContentSize(cc.SizeMake(this._contentSize.width, h));
+ this.setContentSize(cc.size(this._contentSize.width, h));
},
_updateColor:function () {
diff --git a/cocos2d/layers_scenes_transitions_nodes/CCTransition.js b/cocos2d/layers_scenes_transitions_nodes/CCTransition.js
index 11bdcff6ae..fb3df13949 100644
--- a/cocos2d/layers_scenes_transitions_nodes/CCTransition.js
+++ b/cocos2d/layers_scenes_transitions_nodes/CCTransition.js
@@ -1328,7 +1328,7 @@ cc.TransitionFade = cc.TransitionScene.extend(/** @lends cc.TransitionFade# */{
*/
initWithDuration:function (t, scene, color) {
if ((color == 'undefined') || (color == null)) {
- color = cc.BLACK();
+ color = cc.BLACK;
}
if (this._super(t, scene)) {
diff --git a/cocos2d/menu_nodes/CCMenuItem.js b/cocos2d/menu_nodes/CCMenuItem.js
index abfcf1b532..cff5924e06 100644
--- a/cocos2d/menu_nodes/CCMenuItem.js
+++ b/cocos2d/menu_nodes/CCMenuItem.js
@@ -120,7 +120,7 @@ cc.MenuItem = cc.Node.extend(/** @lends cc.MenuItem# */{
* @return {cc.Rect}
*/
rect:function () {
- return cc.RectMake(this._position.x - this._contentSize.width * this._anchorPoint.x,
+ return cc.rect(this._position.x - this._contentSize.width * this._anchorPoint.x,
this._position.y - this._contentSize.height * this._anchorPoint.y,
this._contentSize.width, this._contentSize.height);
},
@@ -292,7 +292,7 @@ cc.MenuItemLabel = cc.MenuItem.extend(/** @lends cc.MenuItemLabel# */{
initWithLabel:function (label, target, selector) {
this.initWithTarget(target, selector);
this._originalScale = 1.0;
- this._colorBackup = cc.WHITE();
+ this._colorBackup = cc.WHITE;
this._disabledColor = cc.c3b(126, 126, 126);
this.setLabel(label);
return true;
diff --git a/cocos2d/misc_nodes/CCProgressTimer.js b/cocos2d/misc_nodes/CCProgressTimer.js
index d987c13fb6..7242777edc 100644
--- a/cocos2d/misc_nodes/CCProgressTimer.js
+++ b/cocos2d/misc_nodes/CCProgressTimer.js
@@ -406,13 +406,13 @@ cc.ProgressTimer = cc.Node.extend(/** @lends cc.ProgressTimer# */{
var startPoint = cc.p(size.width * this._midPoint.x, size.height * this._midPoint.y);
var startPointTx = cc.p(textureSize.width * this._midPoint.x, textureSize.height * this._midPoint.y);
- var drawedSize = new cc.Size((size.width * (1 - this._barChangeRate.x)), (size.height * (1 - this._barChangeRate.y)));
- var drawingSize = new cc.Size((size.width - drawedSize.width) * percentageF, (size.height - drawedSize.height) * percentageF);
- this._drawSize = new cc.Size(drawedSize.width + drawingSize.width, drawedSize.height + drawingSize.height);
+ var drawedSize = cc.size((size.width * (1 - this._barChangeRate.x)), (size.height * (1 - this._barChangeRate.y)));
+ var drawingSize = cc.size((size.width - drawedSize.width) * percentageF, (size.height - drawedSize.height) * percentageF);
+ this._drawSize = cc.size(drawedSize.width + drawingSize.width, drawedSize.height + drawingSize.height);
- var txDrawedSize = new cc.Size((textureSize.width * (1 - this._barChangeRate.x)), (textureSize.height * (1 - this._barChangeRate.y)));
- var txDrawingSize = new cc.Size((textureSize.width - txDrawedSize.width) * percentageF, (textureSize.height - txDrawedSize.height) * percentageF);
- this._originSize = new cc.Size(txDrawedSize.width + txDrawingSize.width, txDrawedSize.height + txDrawingSize.height);
+ var txDrawedSize = cc.size((textureSize.width * (1 - this._barChangeRate.x)), (textureSize.height * (1 - this._barChangeRate.y)));
+ var txDrawingSize = cc.size((textureSize.width - txDrawedSize.width) * percentageF, (textureSize.height - txDrawedSize.height) * percentageF);
+ this._originSize = cc.size(txDrawedSize.width + txDrawingSize.width, txDrawedSize.height + txDrawingSize.height);
var needToLeft = startPoint.x * percentageF;
var needToLeftTx = startPointTx.x * percentageF;
diff --git a/cocos2d/misc_nodes/CCRenderTexture.js b/cocos2d/misc_nodes/CCRenderTexture.js
index d62ec49683..0840f14f41 100644
--- a/cocos2d/misc_nodes/CCRenderTexture.js
+++ b/cocos2d/misc_nodes/CCRenderTexture.js
@@ -195,7 +195,7 @@ cc.RenderTexture = cc.Node.extend(/** @lends cc.RenderTexture# */{
if (!this._texture)
return false;
- this._texture.initWithData(data, this._pixelFormat, powW, powH, cc.SizeMake(width, height));
+ this._texture.initWithData(data, this._pixelFormat, powW, powH, cc.size(width, height));
//free( data );
var oldRBO;
diff --git a/cocos2d/particle_nodes/CCParticleSystem.js b/cocos2d/particle_nodes/CCParticleSystem.js
index 3262767e1b..03b47aa8b3 100644
--- a/cocos2d/particle_nodes/CCParticleSystem.js
+++ b/cocos2d/particle_nodes/CCParticleSystem.js
@@ -1204,8 +1204,8 @@ cc.ParticleSystem = cc.Node.extend(/** @lends cc.ParticleSystem# */{
* return bounding box of particle system in world space
* @return {cc.Rect}
*/
- boundingBoxToWorld:function () {
- return new cc.Rect(0, 0, cc.canvas.width, cc.canvas.height);
+ getBoundingBoxToWorld:function () {
+ return cc.rect(0, 0, cc.canvas.width, cc.canvas.height);
},
/**
diff --git a/cocos2d/particle_nodes/CCParticleSystemQuad.js b/cocos2d/particle_nodes/CCParticleSystemQuad.js
index 34ea39e571..41a7b53328 100644
--- a/cocos2d/particle_nodes/CCParticleSystemQuad.js
+++ b/cocos2d/particle_nodes/CCParticleSystemQuad.js
@@ -90,7 +90,7 @@ cc.ParticleSystemQuad = cc.ParticleSystem.extend(/** @lends cc.ParticleSystemQua
*/
initTexCoordsWithRect:function (pointRect) {
// convert to pixels coords
- var rect = cc.RectMake(
+ var rect = cc.rect(
pointRect.origin.x * cc.CONTENT_SCALE_FACTOR(),
pointRect.origin.y * cc.CONTENT_SCALE_FACTOR(),
pointRect.size.width * cc.CONTENT_SCALE_FACTOR(),
@@ -247,12 +247,12 @@ cc.ParticleSystemQuad = cc.ParticleSystem.extend(/** @lends cc.ParticleSystemQua
}
var size = null;
if ((texture instanceof HTMLImageElement) || (texture instanceof HTMLCanvasElement)) {
- size = cc.SizeMake(texture.width, texture.height);
+ size = cc.size(texture.width, texture.height);
} else {
size = texture.getContentSize();
}
- this.setTextureWithRect(texture, cc.RectMake(0, 0, size.width, size.height));
+ this.setTextureWithRect(texture, cc.rect(0, 0, size.width, size.height));
},
/**
diff --git a/cocos2d/platform/CCApplication.js b/cocos2d/platform/CCApplication.js
index 2f87e2cf92..91413b314c 100644
--- a/cocos2d/platform/CCApplication.js
+++ b/cocos2d/platform/CCApplication.js
@@ -103,7 +103,7 @@ cc.renderContextType = cc.CANVAS;
* save original size of canvas, use for resize canvas
* @type cc.Size
*/
-cc.originalCanvasSize = new cc.Size(0, 0);
+cc.originalCanvasSize = cc.size(0, 0);
window.requestAnimFrame = (function () {
return window.requestAnimationFrame ||
@@ -176,7 +176,7 @@ cc.setup = function (el, width, height) {
cc.renderContext.translate(0, cc.canvas.height);
cc.drawingUtil = new cc.DrawingPrimitiveCanvas(cc.renderContext);
}
- cc.originalCanvasSize = new cc.Size(cc.canvas.width, cc.canvas.height);
+ cc.originalCanvasSize = cc.size(cc.canvas.width, cc.canvas.height);
cc.log(cc.ENGINE_VERSION);
@@ -184,7 +184,7 @@ cc.setup = function (el, width, height) {
/*
cc.canvas.addEventListener("resize", function () {
if (!cc.firstRun) {
- cc.Director.getInstance().addRegionToDirtyRegion(new cc.Rect(0, 0, cc.canvas.width, cc.canvas.height));
+ cc.Director.getInstance().addRegionToDirtyRegion(cc.rect(0, 0, cc.canvas.width, cc.canvas.height));
}
}, true);
*/
@@ -221,7 +221,7 @@ cc.Application = cc.Class.extend(/** @lends cc.Application# */{
statusBarFrame:function (rect) {
if (rect) {
// Windows doesn't have status bar.
- rect = cc.RectMake(0, 0, 0, 0);
+ rect = cc.rect(0, 0, 0, 0);
}
},
diff --git a/cocos2d/platform/CCConfig.js b/cocos2d/platform/CCConfig.js
index 1a2693e764..2297064fb8 100644
--- a/cocos2d/platform/CCConfig.js
+++ b/cocos2d/platform/CCConfig.js
@@ -65,7 +65,7 @@ cc.FIX_ARTIFACTS_BY_STRECHING_TEXEL = 0;
* @constant
* @type cc.Point
*/
-cc.DIRECTOR_STATS_POSITION = cc.PointMake(0, 0);
+cc.DIRECTOR_STATS_POSITION = cc.p(0, 0);
/**
*
diff --git a/cocos2d/platform/CCMacro.js b/cocos2d/platform/CCMacro.js
index 97f8677423..c0ca76c710 100644
--- a/cocos2d/platform/CCMacro.js
+++ b/cocos2d/platform/CCMacro.js
@@ -239,7 +239,7 @@ cc.POINT_POINTS_TO_PIXELS = function (points) {
* @function
*/
cc.SIZE_POINTS_TO_PIXELS = function (sizeInPoints) {
- return new cc.Size(sizeInPoints.width * cc.CONTENT_SCALE_FACTOR(), sizeInPoints.height * cc.CONTENT_SCALE_FACTOR());
+ return cc.size(sizeInPoints.width * cc.CONTENT_SCALE_FACTOR(), sizeInPoints.height * cc.CONTENT_SCALE_FACTOR());
};
/**
@@ -249,7 +249,7 @@ cc.SIZE_POINTS_TO_PIXELS = function (sizeInPoints) {
* @function
*/
cc.SIZE_PIXELS_TO_POINTS = function (sizeInPixels) {
- return new cc.Size(sizeInPixels.width / cc.CONTENT_SCALE_FACTOR(), sizeInPixels.height / cc.CONTENT_SCALE_FACTOR());
+ return cc.size(sizeInPixels.width / cc.CONTENT_SCALE_FACTOR(), sizeInPixels.height / cc.CONTENT_SCALE_FACTOR());
};
/**
@@ -268,7 +268,7 @@ cc.POINT_PIXELS_TO_POINTS = function (pixels) {
* @function
*/
cc.RECT_PIXELS_TO_POINTS = cc.IS_RETINA_DISPLAY_SUPPORTED ? function (pixel) {
- return cc.RectMake(pixel.origin.x / cc.CONTENT_SCALE_FACTOR(), pixel.origin.y / cc.CONTENT_SCALE_FACTOR(),
+ return cc.rect(pixel.origin.x / cc.CONTENT_SCALE_FACTOR(), pixel.origin.y / cc.CONTENT_SCALE_FACTOR(),
pixel.size.width / cc.CONTENT_SCALE_FACTOR(), pixel.size.height / cc.CONTENT_SCALE_FACTOR());
} : function (p) {
return p;
@@ -280,7 +280,7 @@ cc.RECT_PIXELS_TO_POINTS = cc.IS_RETINA_DISPLAY_SUPPORTED ? function (pixel) {
* @function
*/
cc.RECT_POINTS_TO_PIXELS = cc.IS_RETINA_DISPLAY_SUPPORTED ? function (point) {
- return cc.RectMake(point.origin.x * cc.CONTENT_SCALE_FACTOR(), point.origin.y * cc.CONTENT_SCALE_FACTOR(),
+ return cc.rect(point.origin.x * cc.CONTENT_SCALE_FACTOR(), point.origin.y * cc.CONTENT_SCALE_FACTOR(),
point.size.width * cc.CONTENT_SCALE_FACTOR(), point.size.height * cc.CONTENT_SCALE_FACTOR());
} : function (p) {
return p;
diff --git a/cocos2d/platform/CCTypes.js b/cocos2d/platform/CCTypes.js
index 7cde01f5b4..b584330c10 100644
--- a/cocos2d/platform/CCTypes.js
+++ b/cocos2d/platform/CCTypes.js
@@ -75,10 +75,10 @@ cc.Color3B = function (r1, g1, b1) {
* @param {Number} r red value (0 to 255)
* @param {Number} g green value (0 to 255)
* @param {Number} b blue value (0 to 255)
- * @return {cc.Color3B}
+ * @return {Number,Number,Number}
*/
cc.c3b = function (r, g, b) {
- return new cc.Color3B(r, g, b);
+ return new cc.Color3B(r,g,b);
};
// compatibility
@@ -88,84 +88,57 @@ cc.c3 = cc.c3b;
//ccColor3B predefined colors
/**
* White color (255,255,255)
- * @function
- * @return {cc.Color3B}
+ * @return {Number,Number,Number}
*/
-cc.WHITE = function () {
- return new cc.Color3B(255, 255, 255);
-};
+cc.WHITE = cc.c3b(255, 255, 255);
/**
* Yellow color (255,255,0)
- * @function
- * @return {cc.Color3B}
+ * @return {Number,Number,Number}
*/
-cc.YELLOW = function () {
- return new cc.Color3B(255, 255, 0);
-};
+cc.YELLOW = cc.c3b(255, 255, 0);
/**
* Blue color (0,0,255)
- * @function
- * @return {cc.Color3B}
+ * @return {Number,Number,Number}
*/
-cc.BLUE = function () {
- return new cc.Color3B(0, 0, 255);
-};
+cc.BLUE = cc.c3b(0, 0, 255);
/**
* Green Color (0,255,0)
- * @function
- * @return {cc.Color3B}
+ * @return {Number,Number,Number}
*/
-cc.GREEN = function () {
- return new cc.Color3B(0, 255, 0);
-};
+cc.GREEN = cc.c3b(0, 255, 0);
/**
* Red Color (255,0,0,)
- * @function
- * @return {cc.Color3B}
+ * @return {Number,Number,Number}
*/
-cc.RED = function () {
- return new cc.Color3B(255, 0, 0);
-};
+cc.RED = cc.c3b(255, 0, 0);
/**
* Magenta Color (255,0,255)
- * @function
- * @return {cc.Color3B}
+ * @return {Number,Number,Number}
*/
-cc.MAGENTA = function () {
- return new cc.Color3B(255, 0, 255);
-};
+cc.MAGENTA = cc.c3b(255, 0, 255);
/**
* Black Color (0,0,0)
- * @function
- * @return {cc.Color3B}
+ * @return {Number,Number,Number}
*/
-cc.BLACK = function () {
- return new cc.Color3B(0, 0, 0);
-};
+cc.BLACK = cc.c3b(0, 0, 0);
/**
* Orange Color (255,127,0)
- * @function
- * @return {cc.Color3B}
+ * @return {Number,Number,Number}
*/
-cc.ORANGE = function () {
- return new cc.Color3B(255, 127, 0);
-};
+cc.ORANGE = cc.c3b(255, 127, 0);
/**
* Gray Color (166,166,166)
- * @function
- * @return {cc.Color3B}
+ * @return {Number,Number,Number}
*/
-cc.GRAY = function () {
- return new cc.Color3B(166, 166, 166);
-};
+cc.GRAY = cc.c3b(166, 166, 166);
/**
* RGBA color composed of 4 bytes
@@ -192,11 +165,11 @@ cc.Color4B = function (r1, g1, b1, a1) {
* @param {Number} r red value (0 to 255)
* @param {Number} g green value (0 to 255)
* @param {Number} b blue value (0 to 255)
- * @param {Number} o Alpha value (0 to 255)
- * @return {cc.Color4B}
+ * @param {Number} a Alpha value (0 to 255)
+ * @return {Number,Number,Number,Number}
*/
-cc.c4b = function (r, g, b, o) {
- return new cc.Color4B(r, g, b, o);
+cc.c4b = function (r, g, b, a) {
+ return new cc.Color4B(r,g,b,a);
};
// backwards compatibility
@@ -226,16 +199,16 @@ cc.Color4F = function (r1, g1, b1, a1) {
* helper macro that creates an ccColor4F type
* @Class
* @Construct
- * @param {Number} r1 red value (0 to 1)
- * @param {Number} g1 green value (0 to 1)
- * @param {Number} b1 blue value (0 to 1)
- * @param {Number} a1 Alpha value (0 to 1)
+ * @param {Number} r red value (0 to 1)
+ * @param {Number} g green value (0 to 1)
+ * @param {Number} b blue value (0 to 1)
+ * @param {Number} a Alpha value (0 to 1)
* @example
* //create a red color
* var redColor = cc.c4f(1,0,0,1);
*/
-cc.c4f = function (r1, g1, b1, a1) {
- return new cc.Color4F(r1, g1, b1, a1);
+cc.c4f = function (r, g, b, a) {
+ return new cc.Color4F(r,g,b,a);
};
/**
diff --git a/cocos2d/sprite_nodes/CCAnimation.js b/cocos2d/sprite_nodes/CCAnimation.js
index 4fb3dd6af2..f795d9033e 100644
--- a/cocos2d/sprite_nodes/CCAnimation.js
+++ b/cocos2d/sprite_nodes/CCAnimation.js
@@ -194,7 +194,7 @@ cc.Animation = cc.Class.extend(/** @lends cc.Animation# */{
var texture = cc.TextureCache.getInstance().addImage(fileName);
var rect = cc.RectZero();
if ((texture instanceof HTMLImageElement) || (texture instanceof HTMLCanvasElement)) {
- rect.size = cc.SizeMake(texture.width, texture.height);
+ rect.size = cc.size(texture.width, texture.height);
} else {
rect.size = texture.getContentSize();
}
@@ -350,7 +350,7 @@ cc.Animation = cc.Class.extend(/** @lends cc.Animation# */{
*
* //Create an animation with sprite frames
* var animFrames = [];
- * var frame = cache.spriteFrameByName("grossini_dance_01.png");
+ * var frame = cache.getSpriteFrame("grossini_dance_01.png");
* animFrames.push(frame);
* var animation2 = cc.Animation.create(animFrames);
*
diff --git a/cocos2d/sprite_nodes/CCAnimationCache.js b/cocos2d/sprite_nodes/CCAnimationCache.js
index 2e8220b2aa..bf560884cc 100644
--- a/cocos2d/sprite_nodes/CCAnimationCache.js
+++ b/cocos2d/sprite_nodes/CCAnimationCache.js
@@ -142,7 +142,7 @@ cc.AnimationCache = cc.Class.extend(/** @lends cc.AnimationCache# */{
var frames = [];
for (var i = 0; i < frameNames.length; i++) {
- var spriteFrame = frameCache.spriteFrameByName(frameNames[i]);
+ var spriteFrame = frameCache.getSpriteFrame(frameNames[i]);
if (!spriteFrame) {
cc.log("cocos2d: cc.AnimationCache: Animation '" + key + "' refers to frame '" + frameNames[i]
+ "' which is not currently in the cc.SpriteFrameCache. This frame will not be added to the animation.");
@@ -185,7 +185,7 @@ cc.AnimationCache = cc.Class.extend(/** @lends cc.AnimationCache# */{
for(var i = 0; i= 0.0 && retP.x <= 1.0 && retP.y >= 0.0 && retP.y <= 1.0)
return true;
@@ -427,11 +417,11 @@ cc.pSegmentIntersect = function (A, B, C, D) {
* @return {cc.Point}
*/
cc.pIntersectPoint = function (A, B, C, D) {
- var retP = cc.p();
+ var retP = cc.p(0,0);
if (cc.pLineIntersect(A, B, C, D, retP)) {
// Point of intersection
- var P = cc.p();
+ var P = cc.p(0,0);
P.x = A.x + retP.x * (B.x - A.x);
P.y = A.y + retP.x * (B.y - A.y);
return P;
diff --git a/cocos2d/text_input_node/CCTextFieldTTF.js b/cocos2d/text_input_node/CCTextFieldTTF.js
index 47173b23ce..9e339c6bc6 100644
--- a/cocos2d/text_input_node/CCTextFieldTTF.js
+++ b/cocos2d/text_input_node/CCTextFieldTTF.js
@@ -142,7 +142,7 @@ cc.TextFieldTTF = cc.LabelTTF.extend(/** @lends cc.TextFieldTTF# */{
* //example
* var textField = new cc.TextFieldTTF();
* // When five parameters
- * textField.initWithPlaceHolder("", new cc.Size(100,50), cc.TEXT_ALIGNMENT_LEFT,"Arial", 32);
+ * textField.initWithPlaceHolder("", cc.size(100,50), cc.TEXT_ALIGNMENT_LEFT,"Arial", 32);
* // When three parameters
* textField.initWithPlaceHolder("", "Arial", 32);
*/
@@ -378,7 +378,7 @@ cc.TextFieldTTF = cc.LabelTTF.extend(/** @lends cc.TextFieldTTF# */{
* @example
* //example
* // When five parameters
- * var textField = cc.TextFieldTTF.create("", new cc.Size(100,50), cc.TEXT_ALIGNMENT_LEFT,"Arial", 32);
+ * var textField = cc.TextFieldTTF.create("", cc.size(100,50), cc.TEXT_ALIGNMENT_LEFT,"Arial", 32);
* // When three parameters
* var textField = cc.TextFieldTTF.create("", "Arial", 32);
*/
diff --git a/cocos2d/textures/CCTexture2D.js b/cocos2d/textures/CCTexture2D.js
index 7b63263adb..ec5c007f3c 100644
--- a/cocos2d/textures/CCTexture2D.js
+++ b/cocos2d/textures/CCTexture2D.js
@@ -150,7 +150,7 @@ cc.Texture2D = cc.Class.extend({
//TODO
// glCompressedTexImage2D(cc.GL_TEXTURE_2D, level, format, length, length, 0, size, data);
- this._contentSize = cc.SizeMake(length, length);
+ this._contentSize = cc.size(length, length);
this._pixelsWide = length;
this._pixelsHigh = length;
this._maxS = 1.0;
@@ -180,7 +180,7 @@ cc.Texture2D = cc.Class.extend({
},
//** content size *//
getContentSizeInPixels:function () {
- var ret = new cc.Size();
+ var ret = cc.size(0,0);
ret.width = this._contentSize.width / cc.CONTENT_SCALE_FACTOR();
ret.height = this._contentSize.height / cc.CONTENT_SCALE_FACTOR();
@@ -376,7 +376,7 @@ cc.Texture2D = cc.Class.extend({
if (arguments.length == 3) {
fontName = arguments[1];
fontSize = arguments[2];
- dimensions = cc.SizeMake(0, 0);
+ dimensions = cc.size(0, 0);
alignment = cc.TEXT_ALIGNMENT_CENTER;
}
if (cc.ENABLE_CACHE_TEXTTURE_DATA) {
@@ -409,7 +409,7 @@ cc.Texture2D = cc.Class.extend({
this._maxT = 1.0;
this._pixelsWide = pvr.getWidth();
this._pixelsHigh = pvr.getHeight();
- this._contentSize = cc.SizeMake(this._pixelsWide, this._pixelsHigh);
+ this._contentSize = cc.size(this._pixelsWide, this._pixelsHigh);
this._hasPremultipliedAlpha = cc.PVRHaveAlphaPremultiplied_;
this._pixelFormat = pvr.getFormat();
@@ -530,7 +530,7 @@ cc.Texture2D = cc.Class.extend({
var inPixel32 = null;
var outPixel16 = null;
var hasAlpha;
- var imageSize = new cc.Size();
+ var imageSize = cc.size(0,0);
var pixelFormat = new cc.Texture2DPixelFormat();
var bpp = new cc.size_t();
hasAlpha = image.hasAlpha();
@@ -551,7 +551,7 @@ cc.Texture2D = cc.Class.extend({
}
- imageSize = cc.SizeMake(image.getWidth(), image.getHeight());
+ imageSize = cc.size(image.getWidth(), image.getHeight());
switch (pixelFormat) {
case cc.TEXTURE_2D_PIXEL_FORMAT_RGBA8888:
diff --git a/cocos2d/tileMap_parallax_nodes/CCTMXLayer.js b/cocos2d/tileMap_parallax_nodes/CCTMXLayer.js
index 9b39c32b4b..46ca397e95 100644
--- a/cocos2d/tileMap_parallax_nodes/CCTMXLayer.js
+++ b/cocos2d/tileMap_parallax_nodes/CCTMXLayer.js
@@ -207,7 +207,7 @@ cc.TMXLayer = cc.SpriteBatchNode.extend(/** @lends cc.TMXLayer# */{
this.setPosition(cc.POINT_PIXELS_TO_POINTS(offset));
this._atlasIndexArray = [];
- this.setContentSize(cc.SIZE_PIXELS_TO_POINTS(cc.SizeMake(this._layerSize.width * this._mapTileSize.width,
+ this.setContentSize(cc.SIZE_PIXELS_TO_POINTS(cc.size(this._layerSize.width * this._mapTileSize.width,
this._layerSize.height * this._mapTileSize.height)));
this._useAutomaticVertexZ = false;
@@ -370,7 +370,7 @@ cc.TMXLayer = cc.SpriteBatchNode.extend(/** @lends cc.TMXLayer# */{
cc.Assert(this._tiles && this._atlasIndexArray, "TMXLayer: the tiles map has been released");
this._setNodeDirtyForCache();
- //this._addDirtyRegionToDirector(this.boundingBoxToWorld());
+ //this._addDirtyRegionToDirector(this.getBoundingBoxToWorld());
var gid = this.tileGIDAt(pos);
@@ -446,7 +446,7 @@ cc.TMXLayer = cc.SpriteBatchNode.extend(/** @lends cc.TMXLayer# */{
setupTiles:function () {
// Optimization: quick hack that sets the image size on the tileset
var textureCache = this._textureAtlas.getTexture();
- this._tileSet.imageSize = new cc.Size(textureCache.width, textureCache.height);
+ this._tileSet.imageSize = cc.size(textureCache.width, textureCache.height);
// By default all the tiles are aliased
// pros:
@@ -458,7 +458,7 @@ cc.TMXLayer = cc.SpriteBatchNode.extend(/** @lends cc.TMXLayer# */{
// Parse cocos2d properties
this._parseInternalProperties();
this._setNodeDirtyForCache();
- //this._addDirtyRegionToDirector(this.boundingBoxToWorld());
+ //this._addDirtyRegionToDirector(this.getBoundingBoxToWorld());
for (var y = 0; y < this._layerSize.height; y++) {
for (var x = 0; x < this._layerSize.width; x++) {
@@ -502,7 +502,7 @@ cc.TMXLayer = cc.SpriteBatchNode.extend(/** @lends cc.TMXLayer# */{
cc.Assert(cc.ArrayContainsObject(this._children, sprite), "Tile does not belong to TMXLayer");
this._setNodeDirtyForCache();
- //this._addDirtyRegionToDirector(this.boundingBoxToWorld());
+ //this._addDirtyRegionToDirector(this.getBoundingBoxToWorld());
var atlasIndex = cc.ArrayGetIndexOfObject(this._children, sprite);
var zz = this._atlasIndexArray[atlasIndex];
this._tiles[zz] = 0;
@@ -629,7 +629,7 @@ cc.TMXLayer = cc.SpriteBatchNode.extend(/** @lends cc.TMXLayer# */{
_updateTileForGID:function (gid, pos) {
var rect = this._tileSet.rectForGID(gid);
- rect = cc.RectMake(rect.origin.x / this._contentScaleFactor, rect.origin.y / this._contentScaleFactor,
+ rect = cc.rect(rect.origin.x / this._contentScaleFactor, rect.origin.y / this._contentScaleFactor,
rect.size.width / this._contentScaleFactor, rect.size.height / this._contentScaleFactor);
var z = pos.x + pos.y * this._layerSize.width;
diff --git a/cocos2d/tileMap_parallax_nodes/CCTMXXMLParser.js b/cocos2d/tileMap_parallax_nodes/CCTMXXMLParser.js
index 0bb442c472..0383aac583 100644
--- a/cocos2d/tileMap_parallax_nodes/CCTMXXMLParser.js
+++ b/cocos2d/tileMap_parallax_nodes/CCTMXXMLParser.js
@@ -456,12 +456,12 @@ cc.TMXMapInfo = cc.SAXParser.extend(/** @lends cc.TMXMapInfo# */{
else if (orientationStr !== null)
cc.log("cocos2d: TMXFomat: Unsupported orientation:" + this.getOrientation());
- var s = new cc.Size();
+ var s = cc.size(0,0);
s.width = parseFloat(map.getAttribute('width'));
s.height = parseFloat(map.getAttribute('height'));
this.setMapSize(s);
- s = new cc.Size();
+ s = cc.size(0,0);
s.width = parseFloat(map.getAttribute('tilewidth'));
s.height = parseFloat(map.getAttribute('tileheight'));
this.setTileSize(s)
@@ -501,7 +501,7 @@ cc.TMXMapInfo = cc.SAXParser.extend(/** @lends cc.TMXMapInfo# */{
tileset.spacing = parseInt(t.getAttribute('spacing')) || 0;
tileset.margin = parseInt(t.getAttribute('margin')) || 0;
- var s = new cc.Size();
+ var s = cc.size(0,0);
s.width = parseFloat(t.getAttribute('tilewidth'));
s.height = parseFloat(t.getAttribute('tileheight'));
tileset._tileSize = s;
@@ -550,7 +550,7 @@ cc.TMXMapInfo = cc.SAXParser.extend(/** @lends cc.TMXMapInfo# */{
var layer = new cc.TMXLayerInfo();
layer.name = l.getAttribute('name');
- var s = new cc.Size();
+ var s = cc.size(0,0);
s.width = parseFloat(l.getAttribute('width'));
s.height = parseFloat(l.getAttribute('height'));
layer._layerSize = s;
@@ -626,7 +626,7 @@ cc.TMXMapInfo = cc.SAXParser.extend(/** @lends cc.TMXMapInfo# */{
var g = objectgroups[i];
var objectGroup = new cc.TMXObjectGroup();
objectGroup.setGroupName(g.getAttribute('name'));
- var positionOffset = cc.p();
+ var positionOffset = cc.p(0,0);
positionOffset.x = parseFloat(g.getAttribute('x')) * this.getTileSize().width || 0;
positionOffset.y = parseFloat(g.getAttribute('y')) * this.getTileSize().height || 0;
objectGroup.setPositionOffset(positionOffset);
diff --git a/cocos2d/tileMap_parallax_nodes/CCTileMapAtlas.js b/cocos2d/tileMap_parallax_nodes/CCTileMapAtlas.js
index f7697cc215..7b829d6d5d 100644
--- a/cocos2d/tileMap_parallax_nodes/CCTileMapAtlas.js
+++ b/cocos2d/tileMap_parallax_nodes/CCTileMapAtlas.js
@@ -129,10 +129,10 @@ cc.TileMapAtlas = cc.AtlasNode.extend(/** @lends cc.TileMapAtlas# */{
this._loadTGAfile(mapFile);
this._calculateItemsToRender();
if (this.initWithTileFile(tile, tileWidth, tileHeight, this._itemsToRender)) {
- this._color = cc.WHITE();
+ this._color = cc.WHITE;
this._posToAtlasIndex = new Object();
this._updateAtlasValues();
- this.setContentSize(cc.SizeMake((this._GAInfo.width * this._itemWidth),
+ this.setContentSize(cc.size((this._GAInfo.width * this._itemWidth),
(this._GAInfo.height * this._itemHeight)));
return true;
}
diff --git a/tests/src/testbasic.js b/tests/src/testbasic.js
index 7182db9c42..b1b4c7adb4 100644
--- a/tests/src/testbasic.js
+++ b/tests/src/testbasic.js
@@ -82,7 +82,7 @@ var TestController = cc.Layer.extend({
menuItem.setPosition(cc.p(s.width / 2, (s.height - (i + 1) * LINE_SPACE)));
}
- this._itemMenu.setContentSize(cc.SizeMake(s.width, (testNames.length + 1) * LINE_SPACE));
+ this._itemMenu.setContentSize(cc.size(s.width, (testNames.length + 1) * LINE_SPACE));
this._itemMenu.setPosition(curPos);
this.setTouchEnabled(true);
this.addChild(this._itemMenu);
diff --git a/tests/src/tests/ActionsTest/ActionsTest.js b/tests/src/tests/ActionsTest/ActionsTest.js
index 33326f012b..8b4def431f 100644
--- a/tests/src/tests/ActionsTest/ActionsTest.js
+++ b/tests/src/tests/ActionsTest/ActionsTest.js
@@ -293,7 +293,7 @@ var ActionManual = ActionsDemo.extend({
this._grossini.setColor(cc.c3b(255, 0, 0));
this._kathia.setPosition(cc.p(s.width - 100, s.height / 2));
- this._kathia.setColor(cc.BLUE());
+ this._kathia.setColor(cc.BLUE);
},
subtitle:function () {
return "Manual Transformation";
@@ -385,7 +385,7 @@ var ActionSkewRotateScale = ActionsDemo.extend({
var winSize = cc.Director.getInstance().getWinSize();
- var boxSize = cc.SizeMake(100.0, 100.0);
+ var boxSize = cc.size(100.0, 100.0);
var box = cc.LayerColor.create(cc.c4b(255, 255, 0, 255));
box.setAnchorPoint(cc.p(0, 0));
box.setPosition(cc.p((winSize.width - boxSize.width) / 2, (winSize.height - boxSize.height) / 2));
@@ -394,13 +394,13 @@ var ActionSkewRotateScale = ActionsDemo.extend({
var markrside = 10.0;
var uL = cc.LayerColor.create(cc.c4b(255, 0, 0, 255));
box.addChild(uL);
- uL.setContentSize(cc.SizeMake(markrside, markrside));
+ uL.setContentSize(cc.size(markrside, markrside));
uL.setPosition(cc.p(0, boxSize.height - markrside));
uL.setAnchorPoint(cc.p(0, 0));
var uR = cc.LayerColor.create(cc.c4b(0, 0, 255, 255));
box.addChild(uR);
- uR.setContentSize(cc.SizeMake(markrside, markrside));
+ uR.setContentSize(cc.size(markrside, markrside));
uR.setPosition(cc.p(boxSize.width - markrside, boxSize.height - markrside));
uR.setAnchorPoint(cc.p(0, 0));
@@ -1080,7 +1080,7 @@ var ActionFollow = ActionsDemo.extend({
this._grossini.runAction(rep);
- this.runAction(cc.Follow.create(this._grossini, cc.RectMake(0, 0, s.width * 2 - 100, s.height)));
+ this.runAction(cc.Follow.create(this._grossini, cc.rect(0, 0, s.width * 2 - 100, s.height)));
},
subtitle:function () {
return "Follow action";
diff --git a/tests/src/tests/Box2dTest/Box2dTest.js b/tests/src/tests/Box2dTest/Box2dTest.js
index 5994ee2038..3b3b08b1ed 100644
--- a/tests/src/tests/Box2dTest/Box2dTest.js
+++ b/tests/src/tests/Box2dTest/Box2dTest.js
@@ -116,7 +116,7 @@ Box2DTestLayer = cc.Layer.extend({
//just randomly picking one of the images
var idx = (cc.RANDOM_0_1() > .5 ? 0 : 1);
var idy = (cc.RANDOM_0_1() > .5 ? 0 : 1);
- var sprite = cc.Sprite.createWithTexture(batch.getTexture(), cc.RectMake(32 * idx, 32 * idy, 32, 32));
+ var sprite = cc.Sprite.createWithTexture(batch.getTexture(), cc.rect(32 * idx, 32 * idy, 32, 32));
batch.addChild(sprite);
sprite.setPosition(cc.p(p.x, p.y));
diff --git a/tests/src/tests/CocosDenshionTest/CocosDenshionTest.js b/tests/src/tests/CocosDenshionTest/CocosDenshionTest.js
index 8e9c7b3035..31d1dfe638 100644
--- a/tests/src/tests/CocosDenshionTest/CocosDenshionTest.js
+++ b/tests/src/tests/CocosDenshionTest/CocosDenshionTest.js
@@ -168,7 +168,7 @@ CocosDenshionTest = cc.Layer.extend({
menuItem.setPosition(cc.p(s.width / 2, (s.height - (i + 1) * LINE_SPACE)));
}
this._testCount = i;
- this._itmeMenu.setContentSize(cc.SizeMake(s.width, (this._testCount + 1) * LINE_SPACE));
+ this._itmeMenu.setContentSize(cc.size(s.width, (this._testCount + 1) * LINE_SPACE));
this._itmeMenu.setPosition(cc.PointZero());
this.addChild(this._itmeMenu);
diff --git a/tests/src/tests/CocosNodeTest/CocosNodeTest.js b/tests/src/tests/CocosNodeTest/CocosNodeTest.js
index 052b9b51f2..66cbeb2718 100644
--- a/tests/src/tests/CocosNodeTest/CocosNodeTest.js
+++ b/tests/src/tests/CocosNodeTest/CocosNodeTest.js
@@ -532,8 +532,8 @@ var CameraCenterTest = TestCocosNodeDemo.extend({
sprite.init();
this.addChild(sprite, 0);
sprite.setPosition(cc.p(s.width / 5 * 1, s.height / 5 * 1));
- sprite.setColor(cc.RED());
- sprite.setTextureRect(cc.RectMake(0, 0, 120, 50));
+ sprite.setColor(cc.RED);
+ sprite.setTextureRect(cc.rect(0, 0, 120, 50));
var orbit = cc.OrbitCamera.create(10, 1, 0, 0, 360, 0, 0);
sprite.runAction(cc.RepeatForever.create(orbit));
@@ -542,8 +542,8 @@ var CameraCenterTest = TestCocosNodeDemo.extend({
sprite.init();
this.addChild(sprite, 0, 40);
sprite.setPosition(cc.p(s.width / 5 * 1, s.height / 5 * 4));
- sprite.setColor(cc.BLUE());
- sprite.setTextureRect(cc.RectMake(0, 0, 120, 50));
+ sprite.setColor(cc.BLUE);
+ sprite.setTextureRect(cc.rect(0, 0, 120, 50));
orbit = cc.OrbitCamera.create(10, 1, 0, 0, 360, 0, 0);
sprite.runAction(cc.RepeatForever.create(orbit));
@@ -552,8 +552,8 @@ var CameraCenterTest = TestCocosNodeDemo.extend({
sprite.init();
this.addChild(sprite, 0);
sprite.setPosition(cc.p(s.width / 5 * 4, s.height / 5 * 1));
- sprite.setColor(cc.YELLOW());
- sprite.setTextureRect(cc.RectMake(0, 0, 120, 50));
+ sprite.setColor(cc.YELLOW);
+ sprite.setTextureRect(cc.rect(0, 0, 120, 50));
orbit = cc.OrbitCamera.create(10, 1, 0, 0, 360, 0, 0);
sprite.runAction(cc.RepeatForever.create(orbit));
@@ -562,8 +562,8 @@ var CameraCenterTest = TestCocosNodeDemo.extend({
sprite.init();
this.addChild(sprite, 0, 40);
sprite.setPosition(cc.p(s.width / 5 * 4, s.height / 5 * 4));
- sprite.setColor(cc.GREEN());
- sprite.setTextureRect(cc.RectMake(0, 0, 120, 50));
+ sprite.setColor(cc.GREEN);
+ sprite.setTextureRect(cc.rect(0, 0, 120, 50));
orbit = cc.OrbitCamera.create(10, 1, 0, 0, 360, 0, 0);
sprite.runAction(cc.RepeatForever.create(orbit));
@@ -572,8 +572,8 @@ var CameraCenterTest = TestCocosNodeDemo.extend({
sprite.init();
this.addChild(sprite, 0, 40);
sprite.setPosition(cc.p(s.width / 2, s.height / 2));
- sprite.setColor(cc.WHITE());
- sprite.setTextureRect(cc.RectMake(0, 0, 120, 50));
+ sprite.setColor(cc.WHITE);
+ sprite.setTextureRect(cc.rect(0, 0, 120, 50));
orbit = cc.OrbitCamera.create(10, 1, 0, 0, 360, 0, 0);
sprite.runAction(cc.RepeatForever.create(orbit));
},
diff --git a/tests/src/tests/FontTest/FontTest.js b/tests/src/tests/FontTest/FontTest.js
index 737757451c..54a1228cff 100644
--- a/tests/src/tests/FontTest/FontTest.js
+++ b/tests/src/tests/FontTest/FontTest.js
@@ -98,9 +98,9 @@ FontTest = cc.Layer.extend({
var s = cc.Director.getInstance().getWinSize();
var top = cc.LabelTTF.create(pFont, pFont, 24);
- var left = cc.LabelTTF.create("alignment left", pFont, 32, cc.SizeMake(s.width, 50), cc.TEXT_ALIGNMENT_LEFT);
- var center = cc.LabelTTF.create("alignment center", pFont, 32, cc.SizeMake(s.width, 50), cc.TEXT_ALIGNMENT_CENTER);
- var right = cc.LabelTTF.create("alignment right", pFont, 32, cc.SizeMake(s.width, 50), cc.TEXT_ALIGNMENT_RIGHT);
+ var left = cc.LabelTTF.create("alignment left", pFont, 32, cc.size(s.width, 50), cc.TEXT_ALIGNMENT_LEFT);
+ var center = cc.LabelTTF.create("alignment center", pFont, 32, cc.size(s.width, 50), cc.TEXT_ALIGNMENT_CENTER);
+ var right = cc.LabelTTF.create("alignment right", pFont, 32, cc.size(s.width, 50), cc.TEXT_ALIGNMENT_RIGHT);
top.setPosition(cc.p(s.width / 2, s.height * 3 / 4));
left.setPosition(cc.p(s.width / 2, s.height / 2));
diff --git a/tests/src/tests/LabelTest/LabelTest.js b/tests/src/tests/LabelTest/LabelTest.js
index e7b68868aa..6cb2397b21 100644
--- a/tests/src/tests/LabelTest/LabelTest.js
+++ b/tests/src/tests/LabelTest/LabelTest.js
@@ -312,7 +312,7 @@ var LabelAtlasColorTest = AtlasDemo.extend({
var label2 = cc.LabelAtlas.create("0123456789", "res/fonts/tuffy_bold_italic-charmap.png", 48, 64, ' ');
this.addChild(label2, 0, TAG_LABEL_SPRITE12);
label2.setPosition(cc.p(10, 200));
- label2.setColor(cc.RED());
+ label2.setColor(cc.RED);
var fade = cc.FadeOut.create(1.0);
var fade_in = fade.reverse();
@@ -373,7 +373,7 @@ var Atlas3 = AtlasDemo.extend({
var label2 = cc.LabelBMFont.create("Test", "res/fonts/bitmapFontTest2.fnt");
// testing anchors
label2.setAnchorPoint(cc.p(0.5, 0.5));
- label2.setColor(cc.RED());
+ label2.setColor(cc.RED);
this.addChild(label2, 0, TAG_BITMAP_ATLAS2);
label2.runAction(repeat.copy());
@@ -477,7 +477,7 @@ var Atlas4 = AtlasDemo.extend({
},
draw:function () {
var s = cc.Director.getInstance().getWinSize();
- var c = cc.RED();
+ var c = cc.RED;
cc.renderContext.strokeStyle = "rgba(" + c.r + "," + c.g + "," + c.b + ",1)";
cc.drawingUtil.drawLine(cc.p(0, s.height / 2), cc.p(s.width, s.height / 2));
cc.drawingUtil.drawLine(cc.p(s.width / 2, 0), cc.p(s.width / 2, s.height));
@@ -564,7 +564,7 @@ var AtlasBitmapColor = AtlasDemo.extend({
var label = null;
label = cc.LabelBMFont.create("Blue", "res/fonts/bitmapFontTest5.fnt");
- label.setColor(cc.BLUE());
+ label.setColor(cc.BLUE);
this.addChild(label);
label.setPosition(cc.p(s.width / 2, s.height / 4));
label.setAnchorPoint(cc.p(0.5, 0.5));
@@ -573,13 +573,13 @@ var AtlasBitmapColor = AtlasDemo.extend({
this.addChild(label);
label.setPosition(cc.p(s.width / 2, 2 * s.height / 4));
label.setAnchorPoint(cc.p(0.5, 0.5));
- label.setColor(cc.RED());
+ label.setColor(cc.RED);
label = cc.LabelBMFont.create("G", "res/fonts/bitmapFontTest5.fnt");
this.addChild(label);
label.setPosition(cc.p(s.width / 2, 3 * s.height / 4));
label.setAnchorPoint(cc.p(0.5, 0.5));
- label.setColor(cc.GREEN());
+ label.setColor(cc.GREEN);
label.setString("Green");
},
title:function () {
@@ -806,7 +806,7 @@ var LabelTTFTest = AtlasDemo.extend({
_horizAlign:null,
_vertAlign:null,
ctor:function () {
- var blockSize = cc.SizeMake(200, 160);
+ var blockSize = cc.size(200, 160);
var s = cc.Director.getInstance().getWinSize();
var colorLayer = cc.LayerColor.create(cc.c4b(100, 100, 100, 255), blockSize.width, blockSize.height);
@@ -839,7 +839,7 @@ var LabelTTFTest = AtlasDemo.extend({
this.updateAlignment();
},
updateAlignment:function () {
- var blockSize = cc.SizeMake(200, 160);
+ var blockSize = cc.size(200, 160);
var s = cc.Director.getInstance().getWinSize();
if (this._label) {
@@ -919,7 +919,7 @@ var LabelTTFMultiline = AtlasDemo.extend({
// cc.LabelBMFont
var center = cc.LabelTTF.create("word wrap \"testing\" (bla0) bla1 'bla2' [bla3] (bla4) {bla5} {bla6} [bla7] (bla8) [bla9] 'bla0' \"bla1\"",
- "Arial", 32, cc.SizeMake(s.width / 2, 200), cc.TEXT_ALIGNMENT_CENTER, cc.VERTICAL_TEXT_ALIGNMENT_TOP);
+ "Arial", 32, cc.size(s.width / 2, 200), cc.TEXT_ALIGNMENT_CENTER, cc.VERTICAL_TEXT_ALIGNMENT_TOP);
center.setPosition(cc.p(s.width / 2, 150));
this.addChild(center);
@@ -999,7 +999,7 @@ var BitmapFontMultiLineAlignment = AtlasDemo.extend({
var stringMenu = cc.Menu.create(longSentences, lineBreaks, mixed);
stringMenu.alignItemsVertically();
- longSentences.setColor(cc.RED());
+ longSentences.setColor(cc.RED);
this.lastSentenceItem = longSentences;
longSentences.setTag(LongSentences);
lineBreaks.setTag(LineBreaks);
@@ -1013,7 +1013,7 @@ var BitmapFontMultiLineAlignment = AtlasDemo.extend({
var alignmentMenu = cc.Menu.create(left, center, right);
alignmentMenu.alignItemsHorizontallyWithPadding(alignmentItemPadding);
- center.setColor(cc.RED());
+ center.setColor(cc.RED);
this.lastAlignmentItem = center;
left.setTag(LeftAlign);
center.setTag(CenterAlign);
@@ -1046,8 +1046,8 @@ var BitmapFontMultiLineAlignment = AtlasDemo.extend({
return "";
},
stringChanged:function (sender) {
- sender.setColor(cc.RED());
- this.lastSentenceItem.setColor(cc.WHITE());
+ sender.setColor(cc.RED);
+ this.lastSentenceItem.setColor(cc.WHITE);
this.lastSentenceItem = sender;
switch (sender.getTag()) {
@@ -1069,8 +1069,8 @@ var BitmapFontMultiLineAlignment = AtlasDemo.extend({
},
alignmentChanged:function (sender) {
var item = sender;
- item.setColor(cc.RED());
- this.lastAlignmentItem.setColor(cc.WHITE());
+ item.setColor(cc.RED);
+ this.lastAlignmentItem.setColor(cc.WHITE);
this.lastAlignmentItem = item;
switch (item.getTag()) {
@@ -1138,7 +1138,7 @@ var LabelTTFA8Test = AtlasDemo.extend({
// cc.LabelBMFont
var label1 = cc.LabelTTF.create("Testing A8 Format", "Arial", 48);
this.addChild(label1);
- label1.setColor(cc.RED());
+ label1.setColor(cc.RED);
label1.setPosition(cc.p(s.width / 2, s.height / 2));
var fadeOut = cc.FadeOut.create(2);
@@ -1252,17 +1252,17 @@ var TTFFontInit = AtlasDemo.extend({
var LabelTTFAlignment = AtlasDemo.extend({
ctor:function () {
var s = cc.Director.getInstance().getWinSize();
- var ttf0 = cc.LabelTTF.create("Alignment 0\nnew line", "Arial", 12, cc.SizeMake(256, 32), cc.TEXT_ALIGNMENT_LEFT);
+ var ttf0 = cc.LabelTTF.create("Alignment 0\nnew line", "Arial", 12, cc.size(256, 32), cc.TEXT_ALIGNMENT_LEFT);
ttf0.setPosition(cc.p(s.width / 2, (s.height / 6) * 2));
ttf0.setAnchorPoint(cc.p(0.5, 0.5));
this.addChild(ttf0);
- var ttf1 = cc.LabelTTF.create("Alignment 1\nnew line", "Arial", 12, cc.SizeMake(256, 32), cc.TEXT_ALIGNMENT_CENTER);
+ var ttf1 = cc.LabelTTF.create("Alignment 1\nnew line", "Arial", 12, cc.size(256, 32), cc.TEXT_ALIGNMENT_CENTER);
ttf1.setPosition(cc.p(s.width / 2, (s.height / 6) * 3));
ttf1.setAnchorPoint(cc.p(0.5, 0.5));
this.addChild(ttf1);
- var ttf2 = cc.LabelTTF.create("Alignment 2\nnew line", "Arial", 12, cc.SizeMake(256, 32), cc.TEXT_ALIGNMENT_RIGHT);
+ var ttf2 = cc.LabelTTF.create("Alignment 2\nnew line", "Arial", 12, cc.size(256, 32), cc.TEXT_ALIGNMENT_RIGHT);
ttf2.setPosition(cc.p(s.width / 2, (s.height / 6) * 4));
ttf2.setAnchorPoint(cc.p(0.5, 0.5));
this.addChild(ttf2);
diff --git a/tests/src/tests/LayerTest/LayerTest.js b/tests/src/tests/LayerTest/LayerTest.js
index be3b5df576..adfc5ba5a7 100644
--- a/tests/src/tests/LayerTest/LayerTest.js
+++ b/tests/src/tests/LayerTest/LayerTest.js
@@ -99,7 +99,7 @@ var LayerTest = cc.Layer.extend({
var subtitle_ = this.subtitle();
if (subtitle_) {
- var l = cc.LabelTTF.create(subtitle_, "Thonburi", 16, cc.SizeMake(400, 16), cc.TEXT_ALIGNMENT_CENTER);
+ var l = cc.LabelTTF.create(subtitle_, "Thonburi", 16, cc.size(400, 16), cc.TEXT_ALIGNMENT_CENTER);
this.addChild(l, 1);
l.setPosition(cc.p(s.width / 2, s.height - 80));
}
@@ -169,7 +169,7 @@ var LayerTest1 = LayerTest.extend({
var s = cc.Director.getInstance().getWinSize();
- var newSize = cc.SizeMake(Math.abs(touchLocation.x - s.width / 2) * 2, Math.abs(touchLocation.y - s.height / 2) * 2);
+ var newSize = cc.size(Math.abs(touchLocation.x - s.width / 2) * 2, Math.abs(touchLocation.y - s.height / 2) * 2);
var l = this.getChildByTag(cc.TAG_LAYER);
diff --git a/tests/src/tests/MenuTest/MenuTest.js b/tests/src/tests/MenuTest/MenuTest.js
index dd043a5569..2f4c77d95b 100644
--- a/tests/src/tests/MenuTest/MenuTest.js
+++ b/tests/src/tests/MenuTest/MenuTest.js
@@ -42,9 +42,9 @@ var MenuLayer1 = cc.Layer.extend({
this.setTouchEnabled(true);
// Font Item
- var spriteNormal = cc.Sprite.create(s_menuItem, cc.RectMake(0, 23 * 2, 115, 23));
- var spriteSelected = cc.Sprite.create(s_menuItem, cc.RectMake(0, 23, 115, 23));
- var spriteDisabled = cc.Sprite.create(s_menuItem, cc.RectMake(0, 0, 115, 23));
+ var spriteNormal = cc.Sprite.create(s_menuItem, cc.rect(0, 23 * 2, 115, 23));
+ var spriteSelected = cc.Sprite.create(s_menuItem, cc.rect(0, 23, 115, 23));
+ var spriteDisabled = cc.Sprite.create(s_menuItem, cc.rect(0, 0, 115, 23));
var item1 = cc.MenuItemSprite.create(spriteNormal, spriteSelected, spriteDisabled, this, this.menuCallback);
@@ -229,9 +229,9 @@ var MenuLayer3 = cc.Layer.extend({
var item1 = cc.MenuItemLabel.create(label, this, this.menuCallback2);
var item2 = cc.MenuItemFont.create("--- Go Back ---", this, this.menuCallback);
- var spriteNormal = cc.Sprite.create(s_menuItem, cc.RectMake(0, 23 * 2, 115, 23));
- var spriteSelected = cc.Sprite.create(s_menuItem, cc.RectMake(0, 23, 115, 23));
- var spriteDisabled = cc.Sprite.create(s_menuItem, cc.RectMake(0, 0, 115, 23));
+ var spriteNormal = cc.Sprite.create(s_menuItem, cc.rect(0, 23 * 2, 115, 23));
+ var spriteSelected = cc.Sprite.create(s_menuItem, cc.rect(0, 23, 115, 23));
+ var spriteDisabled = cc.Sprite.create(s_menuItem, cc.rect(0, 0, 115, 23));
var item3 = cc.MenuItemSprite.create(spriteNormal, spriteSelected, spriteDisabled, this, this.menuCallback3);
diff --git a/tests/src/tests/MultiTouchTest/MultiTouchTest.js b/tests/src/tests/MultiTouchTest/MultiTouchTest.js
index ceddc9b61f..6689ec8cc2 100644
--- a/tests/src/tests/MultiTouchTest/MultiTouchTest.js
+++ b/tests/src/tests/MultiTouchTest/MultiTouchTest.js
@@ -25,11 +25,11 @@
****************************************************************************/
var touchColors = [
- cc.YELLOW(),
- cc.BLUE(),
- cc.GREEN(),
- cc.RED(),
- cc.MAGENTA()
+ cc.YELLOW,
+ cc.BLUE,
+ cc.GREEN,
+ cc.RED,
+ cc.MAGENTA
];
var TouchPoint = cc.Node.extend({
diff --git a/tests/src/tests/ParticleTest/ParticleTest.js b/tests/src/tests/ParticleTest/ParticleTest.js
index dd6e315421..3b36173f2e 100644
--- a/tests/src/tests/ParticleTest/ParticleTest.js
+++ b/tests/src/tests/ParticleTest/ParticleTest.js
@@ -121,17 +121,17 @@ var ParticleDemo = cc.LayerColor.extend({
});
var item3 = cc.MenuItemImage.create(s_pathF1, s_pathF2, this, this.nextCallback);
- var freeBtnNormal = cc.Sprite.create(s_MovementMenuItem, cc.RectMake(0, 23 * 2, 123, 23));
- var freeBtnSelected = cc.Sprite.create(s_MovementMenuItem, cc.RectMake(0, 23, 123, 23));
- var freeBtnDisabled = cc.Sprite.create(s_MovementMenuItem, cc.RectMake(0, 0, 123, 23));
+ var freeBtnNormal = cc.Sprite.create(s_MovementMenuItem, cc.rect(0, 23 * 2, 123, 23));
+ var freeBtnSelected = cc.Sprite.create(s_MovementMenuItem, cc.rect(0, 23, 123, 23));
+ var freeBtnDisabled = cc.Sprite.create(s_MovementMenuItem, cc.rect(0, 0, 123, 23));
- var relativeBtnNormal = cc.Sprite.create(s_MovementMenuItem, cc.RectMake(123, 23 * 2, 138, 23));
- var relativeBtnSelected = cc.Sprite.create(s_MovementMenuItem, cc.RectMake(123, 23, 138, 23));
- var relativeBtnDisabled = cc.Sprite.create(s_MovementMenuItem, cc.RectMake(123, 0, 138, 23));
+ var relativeBtnNormal = cc.Sprite.create(s_MovementMenuItem, cc.rect(123, 23 * 2, 138, 23));
+ var relativeBtnSelected = cc.Sprite.create(s_MovementMenuItem, cc.rect(123, 23, 138, 23));
+ var relativeBtnDisabled = cc.Sprite.create(s_MovementMenuItem, cc.rect(123, 0, 138, 23));
- var groupBtnNormal = cc.Sprite.create(s_MovementMenuItem, cc.RectMake(261, 23 * 2, 136, 23));
- var groupBtnSelected = cc.Sprite.create(s_MovementMenuItem, cc.RectMake(261, 23, 136, 23));
- var groupBtnDisabled = cc.Sprite.create(s_MovementMenuItem, cc.RectMake(261, 0, 136, 23));
+ var groupBtnNormal = cc.Sprite.create(s_MovementMenuItem, cc.rect(261, 23 * 2, 136, 23));
+ var groupBtnSelected = cc.Sprite.create(s_MovementMenuItem, cc.rect(261, 23, 136, 23));
+ var groupBtnDisabled = cc.Sprite.create(s_MovementMenuItem, cc.rect(261, 0, 136, 23));
this._freeMovementButton = cc.MenuItemSprite.create(freeBtnNormal, freeBtnSelected, freeBtnDisabled, this,
function () {
@@ -165,9 +165,9 @@ var ParticleDemo = cc.LayerColor.extend({
this._groupMovementButton.setPosition(cc.p(10, 150));
this._groupMovementButton.setAnchorPoint(cc.p(0, 0));
- var spriteNormal = cc.Sprite.create(s_shapeModeMenuItem, cc.RectMake(0, 23 * 2, 115, 23));
- var spriteSelected = cc.Sprite.create(s_shapeModeMenuItem, cc.RectMake(0, 23, 115, 23));
- var spriteDisabled = cc.Sprite.create(s_shapeModeMenuItem, cc.RectMake(0, 0, 115, 23));
+ var spriteNormal = cc.Sprite.create(s_shapeModeMenuItem, cc.rect(0, 23 * 2, 115, 23));
+ var spriteSelected = cc.Sprite.create(s_shapeModeMenuItem, cc.rect(0, 23, 115, 23));
+ var spriteDisabled = cc.Sprite.create(s_shapeModeMenuItem, cc.rect(0, 0, 115, 23));
this._shapeModeButton = cc.MenuItemSprite.create(spriteNormal, spriteSelected, spriteDisabled, this,
function () {
@@ -178,9 +178,9 @@ var ParticleDemo = cc.LayerColor.extend({
this._shapeModeButton.setPosition(cc.p(10, 100));
this._shapeModeButton.setAnchorPoint(cc.p(0, 0));
- var spriteNormal_t = cc.Sprite.create(s_textureModeMenuItem, cc.RectMake(0, 23 * 2, 115, 23));
- var spriteSelected_t = cc.Sprite.create(s_textureModeMenuItem, cc.RectMake(0, 23, 115, 23));
- var spriteDisabled_t = cc.Sprite.create(s_textureModeMenuItem, cc.RectMake(0, 0, 115, 23));
+ var spriteNormal_t = cc.Sprite.create(s_textureModeMenuItem, cc.rect(0, 23 * 2, 115, 23));
+ var spriteSelected_t = cc.Sprite.create(s_textureModeMenuItem, cc.rect(0, 23, 115, 23));
+ var spriteDisabled_t = cc.Sprite.create(s_textureModeMenuItem, cc.rect(0, 0, 115, 23));
this._textureModeButton = cc.MenuItemSprite.create(spriteNormal_t, spriteSelected_t, spriteDisabled_t, this,
function () {
@@ -803,7 +803,7 @@ var DemoParticleFromFile = ParticleDemo.extend({
onEnter:function () {
this._super();
- this.setColor(cc.BLACK());
+ this.setColor(cc.BLACK);
this.removeChild(this._background, true);
this._background = null;
@@ -823,7 +823,7 @@ var RadiusMode1 = ParticleDemo.extend({
onEnter:function () {
this._super();
- this.setColor(cc.BLACK());
+ this.setColor(cc.BLACK);
this.removeChild(this._background, true);
this._background = null;
@@ -902,7 +902,7 @@ var RadiusMode2 = ParticleDemo.extend({
onEnter:function () {
this._super();
- this.setColor(cc.BLACK());
+ this.setColor(cc.BLACK);
this.removeChild(this._background, true);
this._background = null;
@@ -981,7 +981,7 @@ var Issue704 = ParticleDemo.extend({
onEnter:function () {
this._super();
- this.setColor(cc.BLACK());
+ this.setColor(cc.BLACK);
this.removeChild(this._background, true);
this._background = null;
@@ -1066,13 +1066,13 @@ var Issue870 = ParticleDemo.extend({
onEnter:function () {
this._super();
- this.setColor(cc.BLACK());
+ this.setColor(cc.BLACK);
this.removeChild(this._background, true);
this._background = null;
var system = new cc.ParticleSystemQuad();
system.initWithFile("res/Particles/SpinningPeas.plist");
- system.setTextureWithRect(cc.TextureCache.getInstance().addImage(s_particles), cc.RectMake(0, 0, 32, 32));
+ system.setTextureWithRect(cc.TextureCache.getInstance().addImage(s_particles), cc.rect(0, 0, 32, 32));
this.addChild(system, 10);
this._emitter = system;
@@ -1087,7 +1087,7 @@ var Issue870 = ParticleDemo.extend({
},
updateQuads:function (dt) {
this._index = (this._index + 1) % 4;
- var rect = cc.RectMake(this._index * 32, 0, 32, 32);
+ var rect = cc.rect(this._index * 32, 0, 32, 32);
this._emitter.setTextureWithRect(this._emitter.getTexture(), rect);
}
});
diff --git a/tests/src/tests/PerformanceTest/PerformanceNodeChildrenTest.js b/tests/src/tests/PerformanceTest/PerformanceNodeChildrenTest.js
index 7d63ed709c..a3223d619c 100644
--- a/tests/src/tests/PerformanceTest/PerformanceNodeChildrenTest.js
+++ b/tests/src/tests/PerformanceTest/PerformanceNodeChildrenTest.js
@@ -176,7 +176,7 @@ var IterateSpriteSheet = NodeChildrenMainScene.extend({
// increase nodes
if (this._currentQuantityOfNodes < this._quantityOfNodes) {
for (var i = 0; i < (this._quantityOfNodes - this._currentQuantityOfNodes); i++) {
- var sprite = cc.Sprite.createWithTexture(this._batchNode.getTexture(), cc.RectMake(0, 0, 32, 32));
+ var sprite = cc.Sprite.createWithTexture(this._batchNode.getTexture(), cc.rect(0, 0, 32, 32));
this._batchNode.addChild(sprite);
sprite.setPosition(cc.p(cc.RANDOM_0_1() * s.width, cc.RANDOM_0_1() * s.height));
}
@@ -297,7 +297,7 @@ var AddRemoveSpriteSheet = NodeChildrenMainScene.extend({
// increase nodes
if (this._currentQuantityOfNodes < this._quantityOfNodes) {
for (var i = 0; i < (this._quantityOfNodes - this._currentQuantityOfNodes); i++) {
- var sprite = cc.Sprite.createWithTexture(this._batchNode.getTexture(), cc.RectMake(0, 0, 32, 32));
+ var sprite = cc.Sprite.createWithTexture(this._batchNode.getTexture(), cc.rect(0, 0, 32, 32));
this._batchNode.addChild(sprite);
sprite.setPosition(cc.p(cc.RANDOM_0_1() * s.width, cc.RANDOM_0_1() * s.height));
sprite.setVisible(false);
@@ -351,7 +351,7 @@ var AddSpriteSheet = AddRemoveSpriteSheet.extend({
// Don't include the sprite creation time and random as part of the profiling
for (var i = 0; i < totalToAdd; i++) {
- var sprite = cc.Sprite.createWithTexture(this._batchNode.getTexture(), cc.RectMake(0, 0, 32, 32));
+ var sprite = cc.Sprite.createWithTexture(this._batchNode.getTexture(), cc.rect(0, 0, 32, 32));
sprites.push(sprite);
zs[i] = cc.RANDOM_MINUS1_1() * 50;
}
@@ -406,7 +406,7 @@ var RemoveSpriteSheet = AddRemoveSpriteSheet.extend({
// Don't include the sprite creation time as part of the profiling
for (var i = 0; i < totalToAdd; i++) {
- var sprite = cc.Sprite.createWithTexture(this._batchNode.getTexture(), cc.RectMake(0, 0, 32, 32));
+ var sprite = cc.Sprite.createWithTexture(this._batchNode.getTexture(), cc.rect(0, 0, 32, 32));
sprites.push(sprite);
}
@@ -458,7 +458,7 @@ var ReorderSpriteSheet = AddRemoveSpriteSheet.extend({
// Don't include the sprite creation time as part of the profiling
for (var i = 0; i < totalToAdd; i++) {
- var sprite = cc.Sprite.createWithTexture(this._batchNode.getTexture(), cc.RectMake(0, 0, 32, 32));
+ var sprite = cc.Sprite.createWithTexture(this._batchNode.getTexture(), cc.rect(0, 0, 32, 32));
sprites.push(sprite);
}
diff --git a/tests/src/tests/PerformanceTest/PerformanceSpriteTest.js b/tests/src/tests/PerformanceTest/PerformanceSpriteTest.js
index bf5aee2a6e..ee457b6222 100644
--- a/tests/src/tests/PerformanceTest/PerformanceSpriteTest.js
+++ b/tests/src/tests/PerformanceTest/PerformanceSpriteTest.js
@@ -75,7 +75,7 @@ var SubTest = cc.Class.extend({
case 2:
case 3:
{
- sprite = cc.Sprite.createWithTexture(this._batchNode.getTexture(), cc.RectMake(0, 0, 52, 139));
+ sprite = cc.Sprite.createWithTexture(this._batchNode.getTexture(), cc.rect(0, 0, 52, 139));
this._batchNode.addChild(sprite, 0, tag + 100);
break;
}
@@ -94,7 +94,7 @@ var SubTest = cc.Class.extend({
var idx = 0 | (cc.RANDOM_0_1() * 14);
var x = (idx % 5) * 85;
var y = (0 | (idx / 5)) * 121;
- sprite = cc.Sprite.createWithTexture(this._batchNode.getTexture(), cc.RectMake(x, y, 85, 121));
+ sprite = cc.Sprite.createWithTexture(this._batchNode.getTexture(), cc.rect(x, y, 85, 121));
this._batchNode.addChild(sprite, 0, tag + 100);
break;
}
@@ -121,7 +121,7 @@ var SubTest = cc.Class.extend({
y = (0 | (r / 8)) * 32;
x = (r % 8) * 32;
- sprite = cc.Sprite.createWithTexture(this._batchNode.getTexture(), cc.RectMake(x, y, 32, 32));
+ sprite = cc.Sprite.createWithTexture(this._batchNode.getTexture(), cc.rect(x, y, 32, 32));
this._batchNode.addChild(sprite, 0, tag + 100);
break;
}
diff --git a/tests/src/tests/SpriteTest/SpriteTest.js b/tests/src/tests/SpriteTest/SpriteTest.js
index c2cc034fe3..2df89b0b15 100644
--- a/tests/src/tests/SpriteTest/SpriteTest.js
+++ b/tests/src/tests/SpriteTest/SpriteTest.js
@@ -316,7 +316,7 @@ var Sprite1 = SpriteTestDemo.extend({
var idx = 0 | (cc.RANDOM_0_1() * 14);
var x = (idx % 5) * 85;
var y = (0 | (idx / 5)) * 121;
- var sprite = cc.Sprite.create(s_grossini_dance_atlas, cc.RectMake(x, y, 85, 121));
+ var sprite = cc.Sprite.create(s_grossini_dance_atlas, cc.rect(x, y, 85, 121));
this.addChild(sprite);
sprite.setPosition(cc.p(p.x, p.y));
@@ -379,7 +379,7 @@ var SpriteBatchNode1 = SpriteTestDemo.extend({
var x = (idx % 5) * 85;
var y = (0 | (idx / 5)) * 121;
- var sprite = cc.Sprite.createWithTexture(BatchNode.getTexture(), cc.RectMake(x, y, 85, 121));
+ var sprite = cc.Sprite.createWithTexture(BatchNode.getTexture(), cc.rect(x, y, 85, 121));
BatchNode.addChild(sprite);
sprite.setPosition(cc.p(p.x, p.y));
@@ -424,15 +424,15 @@ var SpriteBatchNode1 = SpriteTestDemo.extend({
//------------------------------------------------------------------
var SpriteColorOpacity = SpriteTestDemo.extend({
ctor:function () {
- var sprite1 = cc.Sprite.create(s_grossini_dance_atlas, cc.RectMake(0, 121, 85, 121));
- var sprite2 = cc.Sprite.create(s_grossini_dance_atlas, cc.RectMake(85, 121, 85, 121));
- var sprite3 = cc.Sprite.create(s_grossini_dance_atlas, cc.RectMake(85 * 2, 121, 85, 121));
- var sprite4 = cc.Sprite.create(s_grossini_dance_atlas, cc.RectMake(85 * 3, 121, 85, 121));
+ var sprite1 = cc.Sprite.create(s_grossini_dance_atlas, cc.rect(0, 121, 85, 121));
+ var sprite2 = cc.Sprite.create(s_grossini_dance_atlas, cc.rect(85, 121, 85, 121));
+ var sprite3 = cc.Sprite.create(s_grossini_dance_atlas, cc.rect(85 * 2, 121, 85, 121));
+ var sprite4 = cc.Sprite.create(s_grossini_dance_atlas, cc.rect(85 * 3, 121, 85, 121));
- var sprite5 = cc.Sprite.create(s_grossini_dance_atlas, cc.RectMake(0, 121, 85, 121));
- var sprite6 = cc.Sprite.create(s_grossini_dance_atlas, cc.RectMake(85, 121, 85, 121));
- var sprite7 = cc.Sprite.create(s_grossini_dance_atlas, cc.RectMake(85 * 2, 121, 85, 121));
- var sprite8 = cc.Sprite.create(s_grossini_dance_atlas, cc.RectMake(85 * 3, 121, 85, 121));
+ var sprite5 = cc.Sprite.create(s_grossini_dance_atlas, cc.rect(0, 121, 85, 121));
+ var sprite6 = cc.Sprite.create(s_grossini_dance_atlas, cc.rect(85, 121, 85, 121));
+ var sprite7 = cc.Sprite.create(s_grossini_dance_atlas, cc.rect(85 * 2, 121, 85, 121));
+ var sprite8 = cc.Sprite.create(s_grossini_dance_atlas, cc.rect(85 * 3, 121, 85, 121));
var winSize = cc.Director.getInstance().getWinSize();
sprite1.setPosition(cc.p((winSize.width / 5), (winSize.height / 3)));
@@ -502,15 +502,15 @@ var SpriteBatchNodeColorOpacity = SpriteTestDemo.extend({
var batch = cc.SpriteBatchNode.create(s_grossini_dance_atlas, 1);
this.addChild(batch, 0, TAG_SPRITE_BATCH_NODE);
- var sprite1 = cc.Sprite.createWithTexture(batch.getTexture(), cc.RectMake(0, 121, 85, 121));
- var sprite2 = cc.Sprite.createWithTexture(batch.getTexture(), cc.RectMake(85, 121, 85, 121));
- var sprite3 = cc.Sprite.createWithTexture(batch.getTexture(), cc.RectMake(85 * 2, 121, 85, 121));
- var sprite4 = cc.Sprite.createWithTexture(batch.getTexture(), cc.RectMake(85 * 3, 121, 85, 121));
+ var sprite1 = cc.Sprite.createWithTexture(batch.getTexture(), cc.rect(0, 121, 85, 121));
+ var sprite2 = cc.Sprite.createWithTexture(batch.getTexture(), cc.rect(85, 121, 85, 121));
+ var sprite3 = cc.Sprite.createWithTexture(batch.getTexture(), cc.rect(85 * 2, 121, 85, 121));
+ var sprite4 = cc.Sprite.createWithTexture(batch.getTexture(), cc.rect(85 * 3, 121, 85, 121));
- var sprite5 = cc.Sprite.createWithTexture(batch.getTexture(), cc.RectMake(0, 121, 85, 121));
- var sprite6 = cc.Sprite.createWithTexture(batch.getTexture(), cc.RectMake(85, 121, 85, 121));
- var sprite7 = cc.Sprite.createWithTexture(batch.getTexture(), cc.RectMake(85 * 2, 121, 85, 121));
- var sprite8 = cc.Sprite.createWithTexture(batch.getTexture(), cc.RectMake(85 * 3, 121, 85, 121));
+ var sprite5 = cc.Sprite.createWithTexture(batch.getTexture(), cc.rect(0, 121, 85, 121));
+ var sprite6 = cc.Sprite.createWithTexture(batch.getTexture(), cc.rect(85, 121, 85, 121));
+ var sprite7 = cc.Sprite.createWithTexture(batch.getTexture(), cc.rect(85 * 2, 121, 85, 121));
+ var sprite8 = cc.Sprite.createWithTexture(batch.getTexture(), cc.rect(85 * 3, 121, 85, 121));
var winSize = cc.Director.getInstance().getWinSize();
@@ -583,22 +583,22 @@ var SpriteZOrder = SpriteTestDemo.extend({
var sprite;
var step = s.width / 11;
for (var i = 0; i < 5; i++) {
- sprite = cc.Sprite.create(s_grossini_dance_atlas, cc.RectMake(85 * 0, 121 * 1, 85, 121));
+ sprite = cc.Sprite.create(s_grossini_dance_atlas, cc.rect(85 * 0, 121 * 1, 85, 121));
sprite.setPosition(cc.p((i + 1) * step, s.height / 2));
this.addChild(sprite, i);
}
for (i = 5; i < 10; i++) {
- sprite = cc.Sprite.create(s_grossini_dance_atlas, cc.RectMake(85 * 1, 121 * 0, 85, 121));
+ sprite = cc.Sprite.create(s_grossini_dance_atlas, cc.rect(85 * 1, 121 * 0, 85, 121));
sprite.setPosition(cc.p((i + 1) * step, s.height / 2));
this.addChild(sprite, 14 - i);
}
- sprite = cc.Sprite.create(s_grossini_dance_atlas, cc.RectMake(85 * 3, 121 * 0, 85, 121));
+ sprite = cc.Sprite.create(s_grossini_dance_atlas, cc.rect(85 * 3, 121 * 0, 85, 121));
this.addChild(sprite, -1, TAG_SPRITE1);
sprite.setPosition(cc.p(s.width / 2, s.height / 2 - 20));
sprite.setScaleX(10);
- sprite.setColor(cc.RED());
+ sprite.setColor(cc.RED);
this.schedule(this.reorderSprite, 1);
},
@@ -640,22 +640,22 @@ var SpriteBatchNodeZOrder = SpriteTestDemo.extend({
var sprite;
var step = s.width / 11;
for (var i = 0; i < 5; i++) {
- sprite = cc.Sprite.createWithTexture(batch.getTexture(), cc.RectMake(85 * 0, 121 * 1, 85, 121));
+ sprite = cc.Sprite.createWithTexture(batch.getTexture(), cc.rect(85 * 0, 121 * 1, 85, 121));
sprite.setPosition(cc.p((i + 1) * step, s.height / 2));
batch.addChild(sprite, i);
}
for (i = 5; i < 10; i++) {
- sprite = cc.Sprite.createWithTexture(batch.getTexture(), cc.RectMake(85 * 1, 121 * 0, 85, 121));
+ sprite = cc.Sprite.createWithTexture(batch.getTexture(), cc.rect(85 * 1, 121 * 0, 85, 121));
sprite.setPosition(cc.p((i + 1) * step, s.height / 2));
batch.addChild(sprite, 14 - i);
}
- sprite = cc.Sprite.createWithTexture(batch.getTexture(), cc.RectMake(85 * 3, 121 * 0, 85, 121));
+ sprite = cc.Sprite.createWithTexture(batch.getTexture(), cc.rect(85 * 3, 121 * 0, 85, 121));
batch.addChild(sprite, -1, TAG_SPRITE1);
sprite.setPosition(cc.p(s.width / 2, s.height / 2 - 20));
sprite.setScaleX(10);
- sprite.setColor(cc.RED());
+ sprite.setColor(cc.RED);
this.schedule(this.reorderSprite, 1);
},
@@ -690,7 +690,7 @@ var SpriteBatchNodeReorder = SpriteTestDemo.extend({
var asmtest = cc.SpriteBatchNode.create(s_ghosts);
for (var i = 0; i < 10; i++) {
- var s1 = cc.Sprite.createWithTexture(asmtest.getTexture(), cc.RectMake(0, 0, 50, 50));
+ var s1 = cc.Sprite.createWithTexture(asmtest.getTexture(), cc.rect(0, 0, 50, 50));
a.push(s1);
asmtest.addChild(s1, 10);
}
@@ -750,7 +750,7 @@ var SpriteBatchNodeReorderIssue744 = SpriteTestDemo.extend({
var batch = cc.SpriteBatchNode.create(s_grossini_dance_atlas, 15);
this.addChild(batch, 0, TAG_SPRITE_BATCH_NODE);
- var sprite = cc.Sprite.createWithTexture(batch.getTexture(), cc.RectMake(0, 0, 85, 121));
+ var sprite = cc.Sprite.createWithTexture(batch.getTexture(), cc.rect(0, 0, 85, 121));
sprite.setPosition(cc.p(s.width / 2, s.height / 2));
batch.addChild(sprite, 3);
batch.reorderChild(sprite, 1);
@@ -800,15 +800,15 @@ var SpriteBatchNodeReorderIssue766 = SpriteTestDemo.extend({
this._batchNode.reorderChild(this._sprite1, 4);
},
makeSpriteZ:function (aZ) {
- var sprite = cc.Sprite.createWithTexture(this._batchNode.getTexture(), cc.RectMake(128, 0, 64, 64));
+ var sprite = cc.Sprite.createWithTexture(this._batchNode.getTexture(), cc.rect(128, 0, 64, 64));
this._batchNode.addChild(sprite, aZ + 1, 0);
//children
- var spriteShadow = cc.Sprite.createWithTexture(this._batchNode.getTexture(), cc.RectMake(0, 0, 64, 64));
+ var spriteShadow = cc.Sprite.createWithTexture(this._batchNode.getTexture(), cc.rect(0, 0, 64, 64));
spriteShadow.setOpacity(128);
sprite.addChild(spriteShadow, aZ, 3);
- var spriteTop = cc.Sprite.createWithTexture(this._batchNode.getTexture(), cc.RectMake(64, 0, 64, 64));
+ var spriteTop = cc.Sprite.createWithTexture(this._batchNode.getTexture(), cc.rect(64, 0, 64, 64));
sprite.addChild(spriteTop, aZ + 2, 3);
return sprite;
@@ -832,45 +832,45 @@ var SpriteBatchNodeReorderIssue767 = SpriteTestDemo.extend({
this.addChild(aParent, 0, TAG_SPRITE1);
// parent
- var l1 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("father.gif"));
+ var l1 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("father.gif"));
l1.setPosition(cc.p(winSize.width / 2, winSize.height / 2));
aParent.addChild(l1, 0, TAG_SPRITE2);
var l1Size = l1.getContentSize();
// child left
- var l2a = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("sister1.gif"));
+ var l2a = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("sister1.gif"));
l2a.setPosition(cc.p(-25 + l1Size.width / 2, 0 + l1Size.height / 2));
l1.addChild(l2a, -1, TAG_SPRITE_LEFT);
var l2aSize = l2a.getContentSize();
// child right
- var l2b = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("sister2.gif"));
+ var l2b = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("sister2.gif"));
l2b.setPosition(cc.p(+25 + l1Size.width / 2, 0 + l1Size.height / 2));
l1.addChild(l2b, 1, TAG_SPRITE_RIGHT);
var l2bSize = l2a.getContentSize();
// child left bottom
- var l3a1 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("child1.gif"));
+ var l3a1 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("child1.gif"));
l3a1.setScale(0.65);
l3a1.setPosition(cc.p(0 + l2aSize.width / 2, -50 + l2aSize.height / 2));
l2a.addChild(l3a1, -1);
// child left top
- var l3a2 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("child1.gif"));
+ var l3a2 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("child1.gif"));
l3a2.setScale(0.65);
l3a2.setPosition(cc.p(0 + l2aSize.width / 2, +50 + l2aSize.height / 2));
l2a.addChild(l3a2, 1);
// child right bottom
- var l3b1 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("child1.gif"));
+ var l3b1 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("child1.gif"));
l3b1.setScale(0.65);
l3b1.setPosition(cc.p(0 + l2bSize.width / 2, -50 + l2bSize.height / 2));
l2b.addChild(l3b1, -1);
// child right top
- var l3b2 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("child1.gif"));
+ var l3b2 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("child1.gif"));
l3b2.setScale(0.65);
l3b2.setPosition(cc.p(0 + l2bSize.width / 2, +50 + l2bSize.height / 2));
l2b.addChild(l3b2, 1);
@@ -937,14 +937,14 @@ var SpriteZVertex = SpriteTestDemo.extend({
var node = cc.Node.create();
// camera uses the center of the image as the pivoting point
- node.setContentSize(cc.SizeMake(winSize.width, winSize.height));
+ node.setContentSize(cc.size(winSize.width, winSize.height));
node.setAnchorPoint(cc.p(0.5, 0.5));
node.setPosition(cc.p(winSize.width / 2, winSize.height / 2));
this.addChild(node, 0);
var sprite;
for (var i = 0; i < 5; i++) {
- sprite = cc.Sprite.create(s_grossini_dance_atlas, cc.RectMake(0, 121, 85, 121));
+ sprite = cc.Sprite.create(s_grossini_dance_atlas, cc.rect(0, 121, 85, 121));
sprite.setPosition(cc.p((i + 1) * step, winSize.height / 2));
sprite.setVertexZ(10 + i * 40);
//sprite.setShaderProgram(alphaTestShader);
@@ -952,7 +952,7 @@ var SpriteZVertex = SpriteTestDemo.extend({
}
for (i = 5; i < 11; i++) {
- sprite = cc.Sprite.create(s_grossini_dance_atlas, cc.RectMake(85, 0, 85, 121));
+ sprite = cc.Sprite.create(s_grossini_dance_atlas, cc.rect(85, 0, 85, 121));
sprite.setPosition(cc.p((i + 1) * step, winSize.height / 2));
sprite.setVertexZ(10 + (10 - i) * 40);
//sprite.setShaderProgram(alphaTestShader);
@@ -1011,7 +1011,7 @@ var SpriteBatchNodeZVertex = SpriteTestDemo.extend({
// Don't use capacity=1 in your real game. It is expensive to resize the capacity
var batch = cc.SpriteBatchNode.create(s_grossini_dance_atlas, 1);
// camera uses the center of the image as the pivoting point
- batch.setContentSize(cc.SizeMake(winSize.width, winSize.height));
+ batch.setContentSize(cc.size(winSize.width, winSize.height));
batch.setAnchorPoint(cc.p(0.5, 0.5));
batch.setPosition(cc.p(winSize.width / 2, winSize.height / 2));
@@ -1019,7 +1019,7 @@ var SpriteBatchNodeZVertex = SpriteTestDemo.extend({
var sprite;
for (var i = 0; i < 5; i++) {
- sprite = cc.Sprite.createWithTexture(batch.getTexture(), cc.RectMake(0, 121, 85, 121));
+ sprite = cc.Sprite.createWithTexture(batch.getTexture(), cc.rect(0, 121, 85, 121));
sprite.setPosition(cc.p((i + 1) * step, winSize.height / 2));
sprite.setVertexZ(10 + i * 40);
batch.addChild(sprite, 0);
@@ -1027,7 +1027,7 @@ var SpriteBatchNodeZVertex = SpriteTestDemo.extend({
}
for (i = 5; i < 11; i++) {
- sprite = cc.Sprite.createWithTexture(batch.getTexture(), cc.RectMake(85, 0, 85, 121));
+ sprite = cc.Sprite.createWithTexture(batch.getTexture(), cc.rect(85, 0, 85, 121));
sprite.setPosition(cc.p((i + 1) * step, winSize.height / 2));
sprite.setVertexZ(10 + (10 - i) * 40);
batch.addChild(sprite, 0);
@@ -1060,7 +1060,7 @@ var SpriteAnchorPoint = SpriteTestDemo.extend({
for (var i = 0; i < 3; i++) {
var rotate = cc.RotateBy.create(10, 360);
var action = cc.RepeatForever.create(rotate);
- var sprite = cc.Sprite.create(s_grossini_dance_atlas, cc.RectMake(85 * i, 121, 85, 121));
+ var sprite = cc.Sprite.create(s_grossini_dance_atlas, cc.rect(85 * i, 121, 85, 121));
sprite.setPosition(cc.p(s.width / 4 * (i + 1), s.height / 2));
var point = cc.Sprite.create(s_pathR1);
@@ -1109,7 +1109,7 @@ var SpriteBatchNodeAnchorPoint = SpriteTestDemo.extend({
for (var i = 0; i < 3; i++) {
var rotate = cc.RotateBy.create(10, 360);
var action = cc.RepeatForever.create(rotate);
- var sprite = cc.Sprite.createWithTexture(batch.getTexture(), cc.RectMake(85 * i, 121, 85, 121));
+ var sprite = cc.Sprite.createWithTexture(batch.getTexture(), cc.rect(85 * i, 121, 85, 121));
sprite.setPosition(cc.p(s.width / 4 * (i + 1), s.height / 2));
var point = cc.Sprite.create(s_pathR1);
@@ -1155,7 +1155,7 @@ var Sprite6 = SpriteTestDemo.extend({
var s = cc.Director.getInstance().getWinSize();
batch.setAnchorPoint(cc.p(0.5, 0.5));
- batch.setContentSize(cc.SizeMake(s.width, s.height));
+ batch.setContentSize(cc.size(s.width, s.height));
// SpriteBatchNode actions
var rotate1 = cc.RotateBy.create(5, 360);
@@ -1171,7 +1171,7 @@ var Sprite6 = SpriteTestDemo.extend({
var step = s.width / 4;
for (var i = 0; i < 3; i++) {
- var sprite = cc.Sprite.createWithTexture(batch.getTexture(), cc.RectMake(85 * i, 121, 85, 121));
+ var sprite = cc.Sprite.createWithTexture(batch.getTexture(), cc.rect(85 * i, 121, 85, 121));
sprite.setPosition(cc.p((i + 1) * step, s.height / 2));
var rotate = cc.RotateBy.create(5, 360);
@@ -1192,11 +1192,11 @@ var SpriteFlip = SpriteTestDemo.extend({
ctor:function () {
var s = cc.Director.getInstance().getWinSize();
- var sprite1 = cc.Sprite.create(s_grossini_dance_atlas, cc.RectMake(85, 121, 85, 121));
+ var sprite1 = cc.Sprite.create(s_grossini_dance_atlas, cc.rect(85, 121, 85, 121));
sprite1.setPosition(cc.p(s.width / 2 - 100, s.height / 2));
this.addChild(sprite1, 0, TAG_SPRITE1);
- var sprite2 = cc.Sprite.create(s_grossini_dance_atlas, cc.RectMake(85, 121, 85, 121));
+ var sprite2 = cc.Sprite.create(s_grossini_dance_atlas, cc.rect(85, 121, 85, 121));
sprite2.setPosition(cc.p(s.width / 2 + 100, s.height / 2));
this.addChild(sprite2, 0, TAG_SPRITE2);
@@ -1226,11 +1226,11 @@ var SpriteBatchNodeFlip = SpriteTestDemo.extend({
var s = cc.Director.getInstance().getWinSize();
- var sprite1 = cc.Sprite.createWithTexture(batch.getTexture(), cc.RectMake(85, 121, 85, 121));
+ var sprite1 = cc.Sprite.createWithTexture(batch.getTexture(), cc.rect(85, 121, 85, 121));
sprite1.setPosition(cc.p(s.width / 2 - 100, s.height / 2));
batch.addChild(sprite1, 0, TAG_SPRITE1);
- var sprite2 = cc.Sprite.createWithTexture(batch.getTexture(), cc.RectMake(85, 121, 85, 121));
+ var sprite2 = cc.Sprite.createWithTexture(batch.getTexture(), cc.rect(85, 121, 85, 121));
sprite2.setPosition(cc.p(s.width / 2 + 100, s.height / 2));
batch.addChild(sprite2, 0, TAG_SPRITE2);
@@ -1258,11 +1258,11 @@ var SpriteAliased = SpriteTestDemo.extend({
ctor:function () {
var s = cc.Director.getInstance().getWinSize();
- var sprite1 = cc.Sprite.create(s_grossini_dance_atlas, cc.RectMake(85, 121, 85, 121));
+ var sprite1 = cc.Sprite.create(s_grossini_dance_atlas, cc.rect(85, 121, 85, 121));
sprite1.setPosition(cc.p(s.width / 2 - 100, s.height / 2));
this.addChild(sprite1, 0, TAG_SPRITE1);
- var sprite2 = cc.Sprite.create(s_grossini_dance_atlas, cc.RectMake(85, 121, 85, 121));
+ var sprite2 = cc.Sprite.create(s_grossini_dance_atlas, cc.rect(85, 121, 85, 121));
sprite2.setPosition(cc.p(s.width / 2 + 100, s.height / 2));
this.addChild(sprite2, 0, TAG_SPRITE2);
@@ -1311,11 +1311,11 @@ var SpriteBatchNodeAliased = SpriteTestDemo.extend({
var s = cc.Director.getInstance().getWinSize();
- var sprite1 = cc.Sprite.createWithTexture(batch.getTexture(), cc.RectMake(85, 121, 85, 121));
+ var sprite1 = cc.Sprite.createWithTexture(batch.getTexture(), cc.rect(85, 121, 85, 121));
sprite1.setPosition(cc.p(s.width / 2 - 100, s.height / 2));
batch.addChild(sprite1, 0, TAG_SPRITE1);
- var sprite2 = cc.Sprite.createWithTexture(batch.getTexture(), cc.RectMake(85, 121, 85, 121));
+ var sprite2 = cc.Sprite.createWithTexture(batch.getTexture(), cc.rect(85, 121, 85, 121));
sprite2.setPosition(cc.p(s.width / 2 + 100, s.height / 2));
batch.addChild(sprite2, 0, TAG_SPRITE2);
@@ -1387,7 +1387,7 @@ var SpriteNewTexture = SpriteTestDemo.extend({
var node = this.getChildByTag(TAG_SPRITE_BATCH_NODE);
- var sprite = cc.Sprite.createWithTexture(this._texture1, cc.RectMake(x, y, 85, 121));
+ var sprite = cc.Sprite.createWithTexture(this._texture1, cc.rect(x, y, 85, 121));
node.addChild(sprite);
sprite.setPosition(cc.p(p.x, p.y));
@@ -1472,7 +1472,7 @@ var SpriteBatchNodeNewTexture = SpriteTestDemo.extend({
var x = (idx % 5) * 85;
var y = (0 | (idx / 5)) * 121;
- var sprite = cc.Sprite.createWithTexture(batch.getTexture(), cc.RectMake(x, y, 85, 121));
+ var sprite = cc.Sprite.createWithTexture(batch.getTexture(), cc.rect(x, y, 85, 121));
batch.addChild(sprite);
sprite.setPosition(cc.p(p.x, p.y));
@@ -1540,7 +1540,7 @@ var SpriteFrameTest = SpriteTestDemo.extend({
var str = "";
for (var i = 1; i < 15; i++) {
str = "grossini_dance_" + (i < 10 ? ("0" + i) : i) + ".png";
- var frame = cache.spriteFrameByName(str);
+ var frame = cache.getSpriteFrame(str);
animFrames.push(frame);
}
@@ -1561,13 +1561,13 @@ var SpriteFrameTest = SpriteTestDemo.extend({
var moreFrames = [];
for (i = 1; i < 15; i++) {
str = "grossini_dance_gray_" + (i < 10 ? ("0" + i) : i) + ".png";
- frame = cache.spriteFrameByName(str);
+ frame = cache.getSpriteFrame(str);
moreFrames.push(frame);
}
for (i = 1; i < 5; i++) {
str = "grossini_blue_0" + i + ".png";
- frame = cache.spriteFrameByName(str);
+ frame = cache.getSpriteFrame(str);
moreFrames.push(frame);
}
@@ -1683,7 +1683,7 @@ var SpriteFrameAliasNameTest = SpriteTestDemo.extend({
for (var i = 1; i < 15; i++) {
// Obtain frames by alias name
str = "dance_" + (i < 10 ? ("0" + i) : i);
- var frame = cache.spriteFrameByName(str);
+ var frame = cache.getSpriteFrame(str);
animFrames.push(frame);
}
@@ -1713,7 +1713,7 @@ var SpriteOffsetAnchorRotation = SpriteTestDemo.extend({
//
// Animation using Sprite BatchNode
//
- var sprite = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("grossini_dance_01.png"));
+ var sprite = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("grossini_dance_01.png"));
sprite.setPosition(cc.p(s.width / 4 * (i + 1), s.height / 2));
var point = cc.Sprite.create(s_pathR1);
@@ -1739,7 +1739,7 @@ var SpriteOffsetAnchorRotation = SpriteTestDemo.extend({
var str = "";
for (var j = 1; j < 15; j++) {
str = "grossini_dance_" + (j < 10 ? ("0" + j) : j) + ".png";
- var frame = cache.spriteFrameByName(str);
+ var frame = cache.getSpriteFrame(str);
animFrames.push(frame);
}
@@ -1781,7 +1781,7 @@ var SpriteBatchNodeOffsetAnchorRotation = SpriteTestDemo.extend({
//
// Animation using Sprite BatchNode
//
- var sprite = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("grossini_dance_01.png"));
+ var sprite = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("grossini_dance_01.png"));
sprite.setPosition(cc.p(s.width / 4 * (i + 1), s.height / 2));
var point = cc.Sprite.create(s_pathR1);
@@ -1806,7 +1806,7 @@ var SpriteBatchNodeOffsetAnchorRotation = SpriteTestDemo.extend({
var str = "";
for (var k = 1; k < 15; k++) {
str = "grossini_dance_" + (k < 10 ? ("0" + k) : k) + ".png";
- var frame = cache.spriteFrameByName(str);
+ var frame = cache.getSpriteFrame(str);
animFrames.push(frame);
}
@@ -1845,7 +1845,7 @@ var SpriteOffsetAnchorScale = SpriteTestDemo.extend({
//
// Animation using Sprite BatchNode
//
- var sprite = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("grossini_dance_01.png"));
+ var sprite = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("grossini_dance_01.png"));
sprite.setPosition(cc.p(s.width / 4 * (i + 1), s.height / 2));
var point = cc.Sprite.create(s_pathR1);
@@ -1871,7 +1871,7 @@ var SpriteOffsetAnchorScale = SpriteTestDemo.extend({
var str = "";
for (var k = 1; k <= 14; k++) {
str = "grossini_dance_" + (k < 10 ? ("0" + k) : k) + ".png";
- var frame = cache.spriteFrameByName(str);
+ var frame = cache.getSpriteFrame(str);
animFrames.push(frame);
}
@@ -1918,7 +1918,7 @@ var SpriteBatchNodeOffsetAnchorScale = SpriteTestDemo.extend({
//
// Animation using Sprite BatchNode
//
- var sprite = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("grossini_dance_01.png"));
+ var sprite = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("grossini_dance_01.png"));
sprite.setPosition(cc.p(s.width / 4 * (i + 1), s.height / 2));
var point = cc.Sprite.create(s_pathR1);
@@ -1944,7 +1944,7 @@ var SpriteBatchNodeOffsetAnchorScale = SpriteTestDemo.extend({
var str = "";
for (var k = 1; k <= 14; k++) {
str = "grossini_dance_" + (k < 10 ? ("0" + k) : k) + ".png";
- var frame = cache.spriteFrameByName(str);
+ var frame = cache.getSpriteFrame(str);
animFrames.push(frame);
}
@@ -2011,7 +2011,7 @@ var SpriteOffsetAnchorSkew = SpriteTestDemo.extend({
var tmp = "";
for (var j = 1; j <= 14; j++) {
tmp = "grossini_dance_" + (j < 10 ? ("0" + j) : j) + ".png";
- var frame = cache.spriteFrameByName(tmp);
+ var frame = cache.getSpriteFrame(tmp);
animFrames.push(frame);
}
@@ -2078,7 +2078,7 @@ var SpriteBatchNodeOffsetAnchorSkew = SpriteTestDemo.extend({
var tmp = "";
for (var j = 1; j <= 14; j++) {
tmp = "grossini_dance_" + (j < 10 ? ("0" + j) : j) + ".png";
- var frame = cache.spriteFrameByName(tmp);
+ var frame = cache.getSpriteFrame(tmp);
animFrames.push(frame);
}
@@ -2118,7 +2118,7 @@ var SpriteOffsetAnchorSkewScale = SpriteTestDemo.extend({
//
// Animation using Sprite batch
//
- var sprite = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("grossini_dance_01.png"));
+ var sprite = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("grossini_dance_01.png"));
sprite.setPosition(cc.p(s.width / 4 * (i + 1), s.height / 2));
var point = cc.Sprite.create(s_pathR1);
@@ -2144,7 +2144,7 @@ var SpriteOffsetAnchorSkewScale = SpriteTestDemo.extend({
var tmp = "";
for (var j = 1; j <= 14; j++) {
tmp = "grossini_dance_" + (j < 10 ? ("0" + j) : j) + ".png";
- var frame = cache.spriteFrameByName(tmp);
+ var frame = cache.getSpriteFrame(tmp);
animFrames.push(frame);
}
@@ -2220,7 +2220,7 @@ var SpriteBatchNodeOffsetAnchorSkewScale = SpriteTestDemo.extend({
var tmp = "";
for (var j = 1; j <= 14; j++) {
tmp = "grossini_dance_" + (j < 10 ? ("0" + j) : j) + ".png";
- var frame = cache.spriteFrameByName(tmp);
+ var frame = cache.getSpriteFrame(tmp);
animFrames.push(frame);
}
@@ -2293,7 +2293,7 @@ var SpriteOffsetAnchorFlip = SpriteTestDemo.extend({
var tmp = "";
for (var j = 1; j <= 14; j++) {
tmp = "grossini_dance_" + (j < 10 ? ("0" + j) : j) + ".png";
- var frame = cache.spriteFrameByName(tmp);
+ var frame = cache.getSpriteFrame(tmp);
animFrames.push(frame);
}
@@ -2338,7 +2338,7 @@ var SpriteBatchNodeOffsetAnchorFlip = SpriteTestDemo.extend({
//
// Animation using Sprite batch
//
- var sprite = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("grossini_dance_01.png"));
+ var sprite = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("grossini_dance_01.png"));
sprite.setPosition(cc.p(s.width / 4 * (i + 1), s.height / 2));
var point = cc.Sprite.create(s_pathR1);
@@ -2364,7 +2364,7 @@ var SpriteBatchNodeOffsetAnchorFlip = SpriteTestDemo.extend({
var tmp = "";
for (var j = 1; j <= 14; j++) {
tmp = "grossini_dance_" + (j < 10 ? ("0" + j) : j) + ".png";
- var frame = cache.spriteFrameByName(tmp);
+ var frame = cache.getSpriteFrame(tmp);
animFrames.push(frame);
}
@@ -2401,12 +2401,12 @@ var SpriteAnimationSplit = SpriteTestDemo.extend({
var texture = cc.TextureCache.getInstance().addImage(s_dragon_animation);
// manually add frames to the frame cache
- var frame0 = cc.SpriteFrame.createWithTexture(texture, cc.RectMake(132 * 0, 132 * 0, 132, 132));
- var frame1 = cc.SpriteFrame.createWithTexture(texture, cc.RectMake(132 * 1, 132 * 0, 132, 132));
- var frame2 = cc.SpriteFrame.createWithTexture(texture, cc.RectMake(132 * 2, 132 * 0, 132, 132));
- var frame3 = cc.SpriteFrame.createWithTexture(texture, cc.RectMake(132 * 3, 132 * 0, 132, 132));
- var frame4 = cc.SpriteFrame.createWithTexture(texture, cc.RectMake(132 * 0, 132 * 1, 132, 132));
- var frame5 = cc.SpriteFrame.createWithTexture(texture, cc.RectMake(132 * 1, 132 * 1, 132, 132));
+ var frame0 = cc.SpriteFrame.createWithTexture(texture, cc.rect(132 * 0, 132 * 0, 132, 132));
+ var frame1 = cc.SpriteFrame.createWithTexture(texture, cc.rect(132 * 1, 132 * 0, 132, 132));
+ var frame2 = cc.SpriteFrame.createWithTexture(texture, cc.rect(132 * 2, 132 * 0, 132, 132));
+ var frame3 = cc.SpriteFrame.createWithTexture(texture, cc.rect(132 * 3, 132 * 0, 132, 132));
+ var frame4 = cc.SpriteFrame.createWithTexture(texture, cc.rect(132 * 0, 132 * 1, 132, 132));
+ var frame5 = cc.SpriteFrame.createWithTexture(texture, cc.rect(132 * 1, 132 * 1, 132, 132));
//
// Animation using Sprite BatchNode
@@ -2469,7 +2469,7 @@ var SpriteHybrid = SpriteTestDemo.extend({
spriteIdx = 1;
var str = "grossini_dance_" + (spriteIdx < 10 ? ("0" + spriteIdx) : spriteIdx) + ".png";
- var frame = cc.SpriteFrameCache.getInstance().spriteFrameByName(str);
+ var frame = cc.SpriteFrameCache.getInstance().getSpriteFrame(str);
var sprite = cc.Sprite.createWithSpriteFrameName(frame);
parent1.addChild(sprite, i, i);
@@ -2546,13 +2546,13 @@ var SpriteBatchNodeChildren = SpriteTestDemo.extend({
cc.SpriteFrameCache.getInstance().addSpriteFrames(s_grossiniPlist);
- var sprite1 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("grossini_dance_01.png"));
+ var sprite1 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("grossini_dance_01.png"));
sprite1.setPosition(cc.p(s.width / 3, s.height / 2));
- var sprite2 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("grossini_dance_02.png"));
+ var sprite2 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("grossini_dance_02.png"));
sprite2.setPosition(cc.p(50, 50));
- var sprite3 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("grossini_dance_03.png"));
+ var sprite3 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("grossini_dance_03.png"));
sprite3.setPosition(cc.p(-50, -50));
batch.addChild(sprite1);
@@ -2564,7 +2564,7 @@ var SpriteBatchNodeChildren = SpriteTestDemo.extend({
var str = "";
for (var i = 1; i < 15; i++) {
str = "grossini_dance_" + (i < 10 ? ("0" + i) : i) + ".png";
- var frame = cc.SpriteFrameCache.getInstance().spriteFrameByName(str);
+ var frame = cc.SpriteFrameCache.getInstance().getSpriteFrame(str);
animFrames.push(frame);
}
@@ -2611,13 +2611,13 @@ var SpriteBatchNodeChildrenZ = SpriteTestDemo.extend({
batch = cc.SpriteBatchNode.create(s_grossini, 50);
this.addChild(batch, 0, TAG_SPRITE_BATCH_NODE);
- sprite1 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("grossini_dance_01.png"));
+ sprite1 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("grossini_dance_01.png"));
sprite1.setPosition(cc.p(s.width / 3, s.height / 2));
- sprite2 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("grossini_dance_02.png"));
+ sprite2 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("grossini_dance_02.png"));
sprite2.setPosition(cc.p(20, 30));
- sprite3 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("grossini_dance_03.png"));
+ sprite3 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("grossini_dance_03.png"));
sprite3.setPosition(cc.p(-20, 30));
batch.addChild(sprite1);
@@ -2628,13 +2628,13 @@ var SpriteBatchNodeChildrenZ = SpriteTestDemo.extend({
batch = cc.SpriteBatchNode.create(s_grossini, 50);
this.addChild(batch, 0, TAG_SPRITE_BATCH_NODE);
- sprite1 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("grossini_dance_01.png"));
+ sprite1 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("grossini_dance_01.png"));
sprite1.setPosition(cc.p(2 * s.width / 3, s.height / 2));
- sprite2 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("grossini_dance_02.png"));
+ sprite2 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("grossini_dance_02.png"));
sprite2.setPosition(cc.p(20, 30));
- sprite3 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("grossini_dance_03.png"));
+ sprite3 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("grossini_dance_03.png"));
sprite3.setPosition(cc.p(-20, 30));
batch.addChild(sprite1);
@@ -2645,13 +2645,13 @@ var SpriteBatchNodeChildrenZ = SpriteTestDemo.extend({
batch = cc.SpriteBatchNode.create(s_grossini, 50);
this.addChild(batch, 0, TAG_SPRITE_BATCH_NODE);
- sprite1 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("grossini_dance_01.png"));
+ sprite1 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("grossini_dance_01.png"));
sprite1.setPosition(cc.p(s.width / 2 - 90, s.height / 4));
- sprite2 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("grossini_dance_02.png"));
+ sprite2 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("grossini_dance_02.png"));
sprite2.setPosition(cc.p(s.width / 2 - 60, s.height / 4));
- sprite3 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("grossini_dance_03.png"));
+ sprite3 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("grossini_dance_03.png"));
sprite3.setPosition(cc.p(s.width / 2 - 30, s.height / 4));
batch.addChild(sprite1, 10);
@@ -2662,13 +2662,13 @@ var SpriteBatchNodeChildrenZ = SpriteTestDemo.extend({
batch = cc.SpriteBatchNode.create(s_grossini, 50);
this.addChild(batch, 0, TAG_SPRITE_BATCH_NODE);
- sprite1 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("grossini_dance_01.png"));
+ sprite1 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("grossini_dance_01.png"));
sprite1.setPosition(cc.p(s.width / 2 + 30, s.height / 4));
- sprite2 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("grossini_dance_02.png"));
+ sprite2 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("grossini_dance_02.png"));
sprite2.setPosition(cc.p(s.width / 2 + 60, s.height / 4));
- sprite3 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("grossini_dance_03.png"));
+ sprite3 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("grossini_dance_03.png"));
sprite3.setPosition(cc.p(s.width / 2 + 90, s.height / 4));
batch.addChild(sprite1, -10);
@@ -2701,13 +2701,13 @@ var SpriteChildrenVisibility = SpriteTestDemo.extend({
aParent.setPosition(cc.p(s.width / 3, s.height / 2));
this.addChild(aParent, 0);
- var sprite1 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("grossini_dance_01.png"));
+ var sprite1 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("grossini_dance_01.png"));
sprite1.setPosition(cc.p(0, 0));
- var sprite2 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("grossini_dance_02.png"));
+ var sprite2 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("grossini_dance_02.png"));
sprite2.setPosition(cc.p(20, 30));
- var sprite3 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("grossini_dance_03.png"));
+ var sprite3 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("grossini_dance_03.png"));
sprite3.setPosition(cc.p(-20, 30));
aParent.addChild(sprite1);
@@ -2723,13 +2723,13 @@ var SpriteChildrenVisibility = SpriteTestDemo.extend({
aParent.setPosition(cc.p(2 * s.width / 3, s.height / 2));
this.addChild(aParent, 0);
- sprite1 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("grossini_dance_01.png"));
+ sprite1 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("grossini_dance_01.png"));
sprite1.setPosition(cc.p(0, 0));
- sprite2 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("grossini_dance_02.png"));
+ sprite2 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("grossini_dance_02.png"));
sprite2.setPosition(cc.p(20, 30));
- sprite3 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("grossini_dance_03.png"));
+ sprite3 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("grossini_dance_03.png"));
sprite3.setPosition(cc.p(-20, 30));
aParent.addChild(sprite1);
@@ -2764,13 +2764,13 @@ var SpriteChildrenVisibilityIssue665 = SpriteTestDemo.extend({
aParent.setPosition(cc.p(s.width / 3, s.height / 2));
this.addChild(aParent, 0);
- var sprite1 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("grossini_dance_01.png"));
+ var sprite1 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("grossini_dance_01.png"));
sprite1.setPosition(cc.p(0, 0));
- var sprite2 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("grossini_dance_02.png"));
+ var sprite2 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("grossini_dance_02.png"));
sprite2.setPosition(cc.p(20, 30));
- var sprite3 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("grossini_dance_03.png"));
+ var sprite3 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("grossini_dance_03.png"));
sprite3.setPosition(cc.p(-20, 30));
// test issue #665
@@ -2787,13 +2787,13 @@ var SpriteChildrenVisibilityIssue665 = SpriteTestDemo.extend({
aParent.setPosition(cc.p(2 * s.width / 3, s.height / 2));
this.addChild(aParent, 0);
- sprite1 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("grossini_dance_01.png"));
+ sprite1 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("grossini_dance_01.png"));
sprite1.setPosition(cc.p(0, 0));
- sprite2 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("grossini_dance_02.png"));
+ sprite2 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("grossini_dance_02.png"));
sprite2.setPosition(cc.p(20, 30));
- sprite3 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("grossini_dance_03.png"));
+ sprite3 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("grossini_dance_03.png"));
sprite3.setPosition(cc.p(-20, 30));
// test issue #665
@@ -2825,17 +2825,17 @@ var SpriteChildrenAnchorPoint = SpriteTestDemo.extend({
this.addChild(aParent, 0);
// anchor (0,0)
- var sprite1 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("grossini_dance_08.png"));
+ var sprite1 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("grossini_dance_08.png"));
sprite1.setPosition(cc.p(s.width / 4, s.height / 2));
sprite1.setAnchorPoint(cc.p(0, 0));
- var sprite2 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("grossini_dance_02.png"));
+ var sprite2 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("grossini_dance_02.png"));
sprite2.setPosition(cc.p(20, 30));
- var sprite3 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("grossini_dance_03.png"));
+ var sprite3 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("grossini_dance_03.png"));
sprite3.setPosition(cc.p(-20, 30));
- var sprite4 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("grossini_dance_04.png"));
+ var sprite4 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("grossini_dance_04.png"));
sprite4.setPosition(cc.p(0, 0));
sprite4.setScale(0.5);
@@ -2850,17 +2850,17 @@ var SpriteChildrenAnchorPoint = SpriteTestDemo.extend({
this.addChild(point, 10);
// anchor (0.5, 0.5)
- sprite1 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("grossini_dance_08.png"));
+ sprite1 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("grossini_dance_08.png"));
sprite1.setPosition(cc.p(s.width / 2, s.height / 2));
sprite1.setAnchorPoint(cc.p(0.5, 0.5));
- sprite2 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("grossini_dance_02.png"));
+ sprite2 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("grossini_dance_02.png"));
sprite2.setPosition(cc.p(20, 30));
- sprite3 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("grossini_dance_03.png"));
+ sprite3 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("grossini_dance_03.png"));
sprite3.setPosition(cc.p(-20, 30));
- sprite4 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("grossini_dance_04.png"));
+ sprite4 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("grossini_dance_04.png"));
sprite4.setPosition(cc.p(0, 0));
sprite4.setScale(0.5);
@@ -2875,17 +2875,17 @@ var SpriteChildrenAnchorPoint = SpriteTestDemo.extend({
this.addChild(point, 10);
// anchor (1,1)
- sprite1 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("grossini_dance_08.png"));
+ sprite1 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("grossini_dance_08.png"));
sprite1.setPosition(cc.p(s.width / 2 + s.width / 4, s.height / 2));
sprite1.setAnchorPoint(cc.p(1, 1));
- sprite2 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("grossini_dance_02.png"));
+ sprite2 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("grossini_dance_02.png"));
sprite2.setPosition(cc.p(20, 30));
- sprite3 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("grossini_dance_03.png"));
+ sprite3 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("grossini_dance_03.png"));
sprite3.setPosition(cc.p(-20, 30));
- sprite4 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("grossini_dance_04.png"));
+ sprite4 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("grossini_dance_04.png"));
sprite4.setPosition(cc.p(0, 0));
sprite4.setScale(0.5);
@@ -2925,17 +2925,17 @@ var SpriteBatchNodeChildrenAnchorPoint = SpriteTestDemo.extend({
this.addChild(aParent, 0);
// anchor (0,0)
- var sprite1 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("grossini_dance_08.png"));
+ var sprite1 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("grossini_dance_08.png"));
sprite1.setPosition(cc.p(s.width / 4, s.height / 2));
sprite1.setAnchorPoint(cc.p(0, 0));
- var sprite2 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("grossini_dance_02.png"));
+ var sprite2 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("grossini_dance_02.png"));
sprite2.setPosition(cc.p(20, 30));
- var sprite3 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("grossini_dance_03.png"));
+ var sprite3 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("grossini_dance_03.png"));
sprite3.setPosition(cc.p(-20, 30));
- var sprite4 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("grossini_dance_04.png"));
+ var sprite4 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("grossini_dance_04.png"));
sprite4.setPosition(cc.p(0, 0));
sprite4.setScale(0.5);
@@ -2950,17 +2950,17 @@ var SpriteBatchNodeChildrenAnchorPoint = SpriteTestDemo.extend({
this.addChild(point, 10);
// anchor (0.5, 0.5)
- sprite1 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("grossini_dance_08.png"));
+ sprite1 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("grossini_dance_08.png"));
sprite1.setPosition(cc.p(s.width / 2, s.height / 2));
sprite1.setAnchorPoint(cc.p(0.5, 0.5));
- sprite2 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("grossini_dance_02.png"));
+ sprite2 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("grossini_dance_02.png"));
sprite2.setPosition(cc.p(20, 30));
- sprite3 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("grossini_dance_03.png"));
+ sprite3 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("grossini_dance_03.png"));
sprite3.setPosition(cc.p(-20, 30));
- sprite4 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("grossini_dance_04.png"));
+ sprite4 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("grossini_dance_04.png"));
sprite4.setPosition(cc.p(0, 0));
sprite4.setScale(0.5);
@@ -2976,17 +2976,17 @@ var SpriteBatchNodeChildrenAnchorPoint = SpriteTestDemo.extend({
// anchor (1,1)
- sprite1 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("grossini_dance_08.png"));
+ sprite1 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("grossini_dance_08.png"));
sprite1.setPosition(cc.p(s.width / 2 + s.width / 4, s.height / 2));
sprite1.setAnchorPoint(cc.p(1, 1));
- sprite2 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("grossini_dance_02.png"));
+ sprite2 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("grossini_dance_02.png"));
sprite2.setPosition(cc.p(20, 30));
- sprite3 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("grossini_dance_03.png"));
+ sprite3 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("grossini_dance_03.png"));
sprite3.setPosition(cc.p(-20, 30));
- sprite4 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("grossini_dance_04.png"));
+ sprite4 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("grossini_dance_04.png"));
sprite4.setPosition(cc.p(0, 0));
sprite4.setScale(0.5);
@@ -3026,14 +3026,14 @@ var SpriteBatchNodeChildrenScale = SpriteTestDemo.extend({
// Test 1
//
var aParent = cc.Node.create();
- var sprite1 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("grossinis_sister1.png"));
+ var sprite1 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("grossinis_sister1.png"));
sprite1.setPosition(cc.p(s.width / 4, s.height / 4));
sprite1.setScaleX(0.5);
sprite1.setScaleY(2.0);
sprite1.runAction(seq);
- var sprite2 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("grossinis_sister2.png"));
+ var sprite2 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("grossinis_sister2.png"));
sprite2.setPosition(cc.p(50, 0));
this.addChild(aParent);
@@ -3047,13 +3047,13 @@ var SpriteBatchNodeChildrenScale = SpriteTestDemo.extend({
// Test 2
//
aParent = cc.SpriteBatchNode.create(s_grossini_family);
- sprite1 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("grossinis_sister1.png"));
+ sprite1 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("grossinis_sister1.png"));
sprite1.setPosition(cc.p(3 * s.width / 4, s.height / 4));
sprite1.setScaleX(0.5);
sprite1.setScaleY(2.0);
sprite1.runAction(seq);
- sprite2 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("grossinis_sister2.png"));
+ sprite2 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("grossinis_sister2.png"));
sprite2.setPosition(cc.p(50, 0));
this.addChild(aParent);
@@ -3067,13 +3067,13 @@ var SpriteBatchNodeChildrenScale = SpriteTestDemo.extend({
// Test 3
//
aParent = cc.Node.create();
- sprite1 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("grossinis_sister1.png"));
+ sprite1 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("grossinis_sister1.png"));
sprite1.setPosition(cc.p(s.width / 4, 2 * s.height / 3));
sprite1.setScaleX(1.5);
sprite1.setScaleY(0.5);
sprite1.runAction(seq);
- sprite2 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("grossinis_sister2.png"));
+ sprite2 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("grossinis_sister2.png"));
sprite2.setPosition(cc.p(50, 0));
this.addChild(aParent);
@@ -3087,13 +3087,13 @@ var SpriteBatchNodeChildrenScale = SpriteTestDemo.extend({
// Test 4
//
aParent = cc.SpriteBatchNode.create(s_grossini_family);
- sprite1 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("grossinis_sister1.png"));
+ sprite1 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("grossinis_sister1.png"));
sprite1.setPosition(cc.p(3 * s.width / 4, 2 * s.height / 3));
sprite1.setScaleX(1.5);
sprite1.setScaleY(0.5);
sprite1.runAction(seq);
- sprite2 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("grossinis_sister2.png"));
+ sprite2 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("grossinis_sister2.png"));
sprite2.setPosition(cc.p(50, 0));
this.addChild(aParent);
@@ -3129,14 +3129,14 @@ var SpriteChildrenChildren = SpriteTestDemo.extend({
this.addChild(aParent);
// parent
- var l1 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("father.gif"));
+ var l1 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("father.gif"));
l1.setPosition(cc.p(s.width / 2, s.height / 2));
l1.runAction(seq.copy());
aParent.addChild(l1);
var l1Size = l1.getContentSize();
// child left
- var l2a = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("sister1.gif"));
+ var l2a = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("sister1.gif"));
l2a.setPosition(cc.p(-50 + l1Size.width / 2, 0 + l1Size.height / 2));
l2a.runAction(rot_back_fe.copy());
l1.addChild(l2a);
@@ -3144,7 +3144,7 @@ var SpriteChildrenChildren = SpriteTestDemo.extend({
// child right
- var l2b = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("sister2.gif"));
+ var l2b = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("sister2.gif"));
l2b.setPosition(cc.p(+50 + l1Size.width / 2, 0 + l1Size.height / 2));
l2b.runAction(rot_back_fe.copy());
l1.addChild(l2b);
@@ -3152,26 +3152,26 @@ var SpriteChildrenChildren = SpriteTestDemo.extend({
// child left bottom
- var l3a1 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("child1.gif"));
+ var l3a1 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("child1.gif"));
l3a1.setScale(0.45);
l3a1.setPosition(cc.p(0 + l2aSize.width / 2, -100 + l2aSize.height / 2));
l2a.addChild(l3a1);
// child left top
- var l3a2 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("child1.gif"));
+ var l3a2 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("child1.gif"));
l3a2.setScale(0.45);
l3a1.setPosition(cc.p(0 + l2aSize.width / 2, +100 + l2aSize.height / 2));
l2a.addChild(l3a2);
// child right bottom
- var l3b1 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("child1.gif"));
+ var l3b1 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("child1.gif"));
l3b1.setScale(0.45);
l3b1.setFlipY(true);
l3b1.setPosition(cc.p(0 + l2bSize.width / 2, -100 + l2bSize.height / 2));
l2b.addChild(l3b1);
// child right top
- var l3b2 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("child1.gif"));
+ var l3b2 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("child1.gif"));
l3b2.setScale(0.45);
l3b2.setFlipY(true);
l3b1.setPosition(cc.p(0 + l2bSize.width / 2, +100 + l2bSize.height / 2));
@@ -3208,14 +3208,14 @@ var SpriteBatchNodeChildrenChildren = SpriteTestDemo.extend({
this.addChild(aParent);
// parent
- var l1 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("father.gif"));
+ var l1 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("father.gif"));
l1.setPosition(cc.p(s.width / 2, s.height / 2));
l1.runAction(seq.copy());
aParent.addChild(l1);
var l1Size = l1.getContentSize();
// child left
- var l2a = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("sister1.gif"));
+ var l2a = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("sister1.gif"));
l2a.setPosition(cc.p(-50 + l1Size.width / 2, 0 + l1Size.height / 2));
l2a.runAction(rot_back_fe.copy());
l1.addChild(l2a);
@@ -3223,7 +3223,7 @@ var SpriteBatchNodeChildrenChildren = SpriteTestDemo.extend({
// child right
- var l2b = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("sister2.gif"));
+ var l2b = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("sister2.gif"));
l2b.setPosition(cc.p(50 + l1Size.width / 2, 0 + l1Size.height / 2));
l2b.runAction(rot_back_fe.copy());
l1.addChild(l2b);
@@ -3231,26 +3231,26 @@ var SpriteBatchNodeChildrenChildren = SpriteTestDemo.extend({
// child left bottom
- var l3a1 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("child1.gif"));
+ var l3a1 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("child1.gif"));
l3a1.setScale(0.45);
l3a1.setPosition(cc.p(0 + l2aSize.width / 2, -100 + l2aSize.height / 2));
l2a.addChild(l3a1);
// child left top
- var l3a2 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("child1.gif"));
+ var l3a2 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("child1.gif"));
l3a2.setScale(0.45);
l3a1.setPosition(cc.p(0 + l2aSize.width / 2, +100 + l2aSize.height / 2));
l2a.addChild(l3a2);
// child right bottom
- var l3b1 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("child1.gif"));
+ var l3b1 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("child1.gif"));
l3b1.setScale(0.45);
l3b1.setFlipY(true);
l3b1.setPosition(cc.p(0 + l2bSize.width / 2, -100 + l2bSize.height / 2));
l2b.addChild(l3b1);
// child right top
- var l3b2 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().spriteFrameByName("child1.gif"));
+ var l3b2 = cc.Sprite.createWithSpriteFrameName(cc.SpriteFrameCache.getInstance().getSpriteFrame("child1.gif"));
l3b2.setScale(0.45);
l3b2.setFlipY(true);
l3b1.setPosition(cc.p(0 + l2bSize.width / 2, +100 + l2bSize.height / 2));
@@ -3273,16 +3273,16 @@ var SpriteNilTexture = SpriteTestDemo.extend({
// TEST: If no texture is given, then Opacity + Color should work.
var sprite = new cc.Sprite();
sprite.init();
- sprite.setTextureRect(cc.RectMake(0, 0, 300, 300));
- sprite.setColor(cc.RED());
+ sprite.setTextureRect(cc.rect(0, 0, 300, 300));
+ sprite.setColor(cc.RED);
sprite.setOpacity(128);
sprite.setPosition(cc.p(3 * s.width / 4, s.height / 2));
this.addChild(sprite, 100);
sprite = new cc.Sprite();
sprite.init();
- sprite.setTextureRect(cc.RectMake(0, 0, 300, 300));
- sprite.setColor(cc.BLUE());
+ sprite.setTextureRect(cc.rect(0, 0, 300, 300));
+ sprite.setColor(cc.BLUE);
sprite.setOpacity(128);
sprite.setPosition(cc.p(s.width / 4, s.height / 2));
this.addChild(sprite, 100);
@@ -3301,7 +3301,7 @@ var MySprite1 = cc.Sprite.extend({
}
});
MySprite1.spriteWithSpriteFrameName = function (spriteFrameName) {
- var pFrame = cc.SpriteFrameCache.getInstance().spriteFrameByName(spriteFrameName);
+ var pFrame = cc.SpriteFrameCache.getInstance().getSpriteFrame(spriteFrameName);
var sprite = new MySprite1();
sprite.initWithSpriteFrame(pFrame);
@@ -3366,7 +3366,7 @@ var AnimationCache = SpriteTestDemo.extend({
var str = "";
for (var i = 1; i < 15; i++) {
str = "grossini_dance_" + (i < 10 ? ("0" + i) : i) + ".png";
- frame = frameCache.spriteFrameByName(str);
+ frame = frameCache.getSpriteFrame(str);
animFrames.push(frame);
}
@@ -3381,7 +3381,7 @@ var AnimationCache = SpriteTestDemo.extend({
animFrames = [];
for (i = 1; i < 15; i++) {
str = "grossini_dance_gray_" + (i < 10 ? ("0" + i) : i) + ".png";
- frame = frameCache.spriteFrameByName(str);
+ frame = frameCache.getSpriteFrame(str);
animFrames.push(frame);
}
@@ -3396,7 +3396,7 @@ var AnimationCache = SpriteTestDemo.extend({
animFrames = [];
for (i = 1; i < 4; i++) {
str = "grossini_blue_0" + i + ".png";
- frame = frameCache.spriteFrameByName(str);
+ frame = frameCache.getSpriteFrame(str);
animFrames.push(frame);
}
@@ -3422,7 +3422,7 @@ var AnimationCache = SpriteTestDemo.extend({
// create an sprite without texture
var grossini = new cc.Sprite();
- frame = frameCache.spriteFrameByName("grossini_dance_01.png");
+ frame = frameCache.getSpriteFrame("grossini_dance_01.png");
grossini.setDisplayFrame(frame);
var winSize = cc.Director.getInstance().getWinSize();
@@ -3452,23 +3452,23 @@ var NodeSort = SpriteTestDemo.extend({
this._node = cc.Node.create();
this.addChild(this._node, 0, 0);
- this._sprite1 = cc.Sprite.create(s_piece, cc.RectMake(128, 0, 64, 64));
+ this._sprite1 = cc.Sprite.create(s_piece, cc.rect(128, 0, 64, 64));
this._sprite1.setPosition(cc.p(100, 160));
this._node.addChild(this._sprite1, -6, 1);
- this._sprite2 = cc.Sprite.create(s_piece, cc.RectMake(128, 0, 64, 64));
+ this._sprite2 = cc.Sprite.create(s_piece, cc.rect(128, 0, 64, 64));
this._sprite2.setPosition(cc.p(164, 160));
this._node.addChild(this._sprite2, -6, 2);
- this._sprite4 = cc.Sprite.create(s_piece, cc.RectMake(128, 0, 64, 64));
+ this._sprite4 = cc.Sprite.create(s_piece, cc.rect(128, 0, 64, 64));
this._sprite4.setPosition(cc.p(292, 160));
this._node.addChild(this._sprite4, -3, 4);
- this._sprite3 = cc.Sprite.create(s_piece, cc.RectMake(128, 0, 64, 64));
+ this._sprite3 = cc.Sprite.create(s_piece, cc.rect(128, 0, 64, 64));
this._sprite3.setPosition(cc.p(228, 160));
this._node.addChild(this._sprite3, -4, 3);
- this._sprite5 = cc.Sprite.create(s_piece, cc.RectMake(128, 0, 64, 64));
+ this._sprite5 = cc.Sprite.create(s_piece, cc.rect(128, 0, 64, 64));
this._sprite5.setPosition(cc.p(356, 160));
this._node.addChild(this._sprite5, -3, 5);
@@ -3522,23 +3522,23 @@ var SpriteBatchNodeReorderSameIndex = SpriteTestDemo.extend({
this._batchNode = cc.SpriteBatchNode.create(s_piece, 15);
this.addChild(this._batchNode, 1, 0);
- this._sprite1 = cc.Sprite.createWithTexture(this._batchNode.getTexture(), cc.RectMake(128, 0, 64, 64));
+ this._sprite1 = cc.Sprite.createWithTexture(this._batchNode.getTexture(), cc.rect(128, 0, 64, 64));
this._sprite1.setPosition(cc.p(100, 160));
this._batchNode.addChild(this._sprite1, 3, 1);
- this._sprite2 = cc.Sprite.createWithTexture(this._batchNode.getTexture(), cc.RectMake(128, 0, 64, 64));
+ this._sprite2 = cc.Sprite.createWithTexture(this._batchNode.getTexture(), cc.rect(128, 0, 64, 64));
this._sprite2.setPosition(cc.p(164, 160));
this._batchNode.addChild(this._sprite2, 4, 2);
- this._sprite3 = cc.Sprite.createWithTexture(this._batchNode.getTexture(), cc.RectMake(128, 0, 64, 64));
+ this._sprite3 = cc.Sprite.createWithTexture(this._batchNode.getTexture(), cc.rect(128, 0, 64, 64));
this._sprite3.setPosition(cc.p(228, 160));
this._batchNode.addChild(this._sprite3, 4, 3);
- this._sprite4 = cc.Sprite.createWithTexture(this._batchNode.getTexture(), cc.RectMake(128, 0, 64, 64));
+ this._sprite4 = cc.Sprite.createWithTexture(this._batchNode.getTexture(), cc.rect(128, 0, 64, 64));
this._sprite4.setPosition(cc.p(292, 160));
this._batchNode.addChild(this._sprite4, 5, 4);
- this._sprite5 = cc.Sprite.createWithTexture(this._batchNode.getTexture(), cc.RectMake(128, 0, 64, 64));
+ this._sprite5 = cc.Sprite.createWithTexture(this._batchNode.getTexture(), cc.rect(128, 0, 64, 64));
this._sprite5.setPosition(cc.p(356, 160));
this._batchNode.addChild(this._sprite5, 6, 5);
@@ -3752,7 +3752,7 @@ var DoubleSprite = cc.Sprite.extend({
},
setContentSize:function (size) {
- var newSize = new cc.Size(size.width, size.height);
+ var newSize = cc.size(size.width, size.height);
// If Retina Display and Texture is in HD then scale the vertex rect
if (cc.CONTENT_SCALE_FACTOR() == 2 && !this.HD) {
newSize.width *= 2;
@@ -3863,7 +3863,7 @@ var AnimationCacheFile = SpriteTestDemo.extend({
// create an sprite without texture
var grossini = new cc.Sprite();
- var frame = frameCache.spriteFrameByName("grossini_dance_01.png");
+ var frame = frameCache.getSpriteFrame("grossini_dance_01.png");
grossini.setDisplayFrame(frame);
var winSize = cc.Director.getInstance().getWinSize();
@@ -3886,9 +3886,9 @@ var SpriteBatchBug1217 = SpriteTestDemo.extend({
ctor:function () {
var bn = cc.SpriteBatchNode.create(s_grossini_dance_atlas, 15);
- var s1 = cc.Sprite.createWithTexture(bn.getTexture(), cc.RectMake(0, 0, 57, 57));
- var s2 = cc.Sprite.createWithTexture(bn.getTexture(), cc.RectMake(0, 0, 57, 57));
- var s3 = cc.Sprite.createWithTexture(bn.getTexture(), cc.RectMake(0, 0, 57, 57));
+ var s1 = cc.Sprite.createWithTexture(bn.getTexture(), cc.rect(0, 0, 57, 57));
+ var s2 = cc.Sprite.createWithTexture(bn.getTexture(), cc.rect(0, 0, 57, 57));
+ var s3 = cc.Sprite.createWithTexture(bn.getTexture(), cc.rect(0, 0, 57, 57));
s1.setColor(cc.c3b(255, 0, 0));
s2.setColor(cc.c3b(0, 255, 0));
diff --git a/tests/src/tests/TextInputTest/TextInputTest.js b/tests/src/tests/TextInputTest/TextInputTest.js
index dece250472..cf14f8a695 100644
--- a/tests/src/tests/TextInputTest/TextInputTest.js
+++ b/tests/src/tests/TextInputTest/TextInputTest.js
@@ -69,7 +69,7 @@ var backTextInputTest = function () {
};
var textInputGetRect = function (node) {
- var rc = new cc.Rect(node.getPosition().x, node.getPosition().y, node.getContentSize().width, node.getContentSize().height);
+ var rc = cc.rect(node.getPosition().x, node.getPosition().y, node.getContentSize().width, node.getContentSize().height);
rc.origin.x -= rc.size.width / 2;
rc.origin.y -= rc.size.height / 2;
return rc;
diff --git a/tests/src/tests/TouchesTest/Paddle.js b/tests/src/tests/TouchesTest/Paddle.js
index 7c4f25b8b1..571387204e 100644
--- a/tests/src/tests/TouchesTest/Paddle.js
+++ b/tests/src/tests/TouchesTest/Paddle.js
@@ -31,7 +31,7 @@ var Paddle = cc.Sprite.extend({
_rect:null,
rect:function () {
- return cc.RectMake(-this._rect.size.width / 2, -this._rect.size.height / 2, this._rect.size.width, this._rect.size.height);
+ return cc.rect(-this._rect.size.width / 2, -this._rect.size.height / 2, this._rect.size.width, this._rect.size.height);
},
initWithTexture:function (aTexture) {
if (this._super(aTexture)) {
@@ -39,9 +39,9 @@ var Paddle = cc.Sprite.extend({
}
if (aTexture instanceof cc.Texture2D) {
var s = aTexture.getContentSize();
- this._rect = cc.RectMake(0, 0, s.width, s.height);
+ this._rect = cc.rect(0, 0, s.width, s.height);
} else if ((aTexture instanceof HTMLImageElement) || (aTexture instanceof HTMLCanvasElement)) {
- this._rect = cc.RectMake(0, 0, aTexture.width, aTexture.height);
+ this._rect = cc.rect(0, 0, aTexture.width, aTexture.height);
}
return true;
},
diff --git a/tests/src/tests/TransitionsTest/TransitionsTest.js b/tests/src/tests/TransitionsTest/TransitionsTest.js
index 0d590d537c..19a431108d 100644
--- a/tests/src/tests/TransitionsTest/TransitionsTest.js
+++ b/tests/src/tests/TransitionsTest/TransitionsTest.js
@@ -349,7 +349,7 @@ var FadeTransition = function (t, s) {
};
var FadeWhiteTransition = function (t, s) {
- return cc.TransitionFade.create(t, s, cc.WHITE());
+ return cc.TransitionFade.create(t, s, cc.WHITE);
};
var FlipXLeftOver = function (t, s) {