* IMPORTANT: You should never call "action stop" manually. Instead, use: "target.stopAction(action);" */ stop:function () { this.target = null; }, - /** called every frame with it's delta time. DON'T override unless you know what you are doing. + + /** + * called every frame with it's delta time.
+ * DON'T override unless you know what you are doing. * * @param {Number} dt */ - step:function (dt) { cc.log("[Action step]. override me"); }, /** -
called once per frame. time a value between 0 and 1
- -For example:
- - 0 means that the action just started
- - 0.5 means that the action is in the middle
- - 1 means that the action is over
+ /** + * Set the original target, since target can be nil.
* Is the target that were used to run the action.
* Unless you are doing something complex, like cc.ActionManager, you should NOT call this method.
* The target is 'assigned', it is not 'retained'.
@@ -154,7 +169,7 @@ cc.Action = cc.Class.extend(/** @lends cc.Action# */{ }, /** - * + * get tag number. * @return {Number} */ getTag:function () { @@ -162,39 +177,62 @@ cc.Action = cc.Class.extend(/** @lends cc.Action# */{ }, /** - * + * set tag number. * @param {Number} tag */ setTag:function (tag) { this.tag = tag; }, + /** - * Currently JavaScript Bindigns (JSB), in some cases, needs to use retain and release. This is a bug in JSB, - * and the ugly workaround is to use retain/release. So, these 2 methods were added to be compatible with JSB. - * This is a hack, and should be removed once JSB fixes the retain/release bug + * Currently JavaScript Bindigns (JSB), in some cases, needs to use retain and release. This is a bug in JSB,
+ * and the ugly workaround is to use retain/release. So, these 2 methods were added to be compatible with JSB.
+ * This is a hack, and should be removed once JSB fixes the retain/release bug. */ retain:function () { }, + + /** + * Currently JavaScript Bindigns (JSB), in some cases, needs to use retain and release. This is a bug in JSB,
+ * and the ugly workaround is to use retain/release. So, these 2 methods were added to be compatible with JSB.
+ * This is a hack, and should be removed once JSB fixes the retain/release bug. + */ release:function () { } }); -/** Allocates and initializes the action - * @returns {cc.Action} + +/** + * Allocates and initializes the action. + * + * @function cc.action + * @static + * @return {cc.Action} + * * @example - * // example - * var action = cc.Action.create(); + * // return {cc.Action} + * var action = cc.action(); */ -cc.Action.create = function () { +cc.action = function () { return new cc.Action(); }; +/** + * Please use cc.action instead.
+ * Allocates and initializes the action. + * + * @deprecated since v3.0 please use cc.action() instead. + * @static + * @returns {cc.Action} + */ +cc.Action.create = cc.action; + /** - *
Base class actions that do have a finite time duration.
+ * Base class actions that do have a finite time duration.
* Possible actions:
- * - An action with a duration of 0 seconds
- * - An action with a duration of 35.5 seconds
+ * - An action with a duration of 35.5 seconds. + * * Infinite time actions are valid * @class * @extends cc.Action @@ -203,20 +241,25 @@ cc.FiniteTimeAction = cc.Action.extend(/** @lends cc.FiniteTimeAction# */{ //! duration in seconds _duration:0, + /** + * Constructor function, override it to extend the construction behavior, remember to call "this._super()" in the extended "ctor" function. + */ ctor:function () { cc.Action.prototype.ctor.call(this); this._duration = 0; }, - /** get duration in seconds of the action + /** + * get duration of the action. (seconds) * * @return {Number} */ getDuration:function () { - return this._duration; + return this._duration * (this._timesForRepeat || 1); }, - /** set duration in seconds of the action + /** + * set duration of the action. (seconds) * * @param {Number} duration */ @@ -224,7 +267,12 @@ cc.FiniteTimeAction = cc.Action.extend(/** @lends cc.FiniteTimeAction# */{ this._duration = duration; }, - /** returns a reversed action + /** + * Returns a reversed action.
+ * For example:
+ * - The action will be x coordinates of 0 move to 100.
+ * - The reversed action will be x of 100 move to 0. + * - Will be rewritten * * @return {Null} */ @@ -234,7 +282,10 @@ cc.FiniteTimeAction = cc.Action.extend(/** @lends cc.FiniteTimeAction# */{ }, /** + * to copy object with deep copy. + * returns a clone of action. * + * @return {cc.FiniteTimeAction} */ clone:function () { return new cc.FiniteTimeAction(); @@ -242,19 +293,22 @@ cc.FiniteTimeAction = cc.Action.extend(/** @lends cc.FiniteTimeAction# */{ }); /** - * Changes the speed of an action, making it take longer (speed>1) - * or less (speed<1) time.
+ * Changes the speed of an action, making it take longer (speed > 1) + * or less (speed < 1) time.
* Useful to simulate 'slow motion' or 'fast forward' effect. + * * @warning This action can't be Sequenceable because it is not an cc.IntervalAction * @class * @extends cc.Action + * @param {cc.ActionInterval} action + * @param {Number} speed */ cc.Speed = cc.Action.extend(/** @lends cc.Speed# */{ _speed:0.0, _innerAction:null, /** - * @constructor + * Constructor function, override it to extend the construction behavior, remember to call "this._super()" in the extended "ctor" function. * @param {cc.ActionInterval} action * @param {Number} speed */ @@ -267,20 +321,27 @@ cc.Speed = cc.Action.extend(/** @lends cc.Speed# */{ }, /** + * Gets the current running speed.
+ * Will get a percentage number, compared to the original speed. + * * @return {Number} */ getSpeed:function () { return this._speed; }, - /** alter the speed of the inner function in runtime + /** + * alter the speed of the inner function in runtime. + * * @param {Number} speed */ setSpeed:function (speed) { this._speed = speed; }, - /** initializes the action + /** + * initializes the action. + * * @param {cc.ActionInterval} action * @param {Number} speed * @return {Boolean} @@ -295,7 +356,9 @@ cc.Speed = cc.Action.extend(/** @lends cc.Speed# */{ }, /** - * returns a clone of action + * to copy object with deep copy. + * returns a clone of action. + * * @returns {cc.Speed} */ clone:function () { @@ -305,6 +368,8 @@ cc.Speed = cc.Action.extend(/** @lends cc.Speed# */{ }, /** + * called before the action start. It will also set the target. + * * @param {cc.Node} target */ startWithTarget:function (target) { @@ -313,7 +378,7 @@ cc.Speed = cc.Action.extend(/** @lends cc.Speed# */{ }, /** - * Stop the action + * Stop the action. */ stop:function () { this._innerAction.stop(); @@ -321,6 +386,9 @@ cc.Speed = cc.Action.extend(/** @lends cc.Speed# */{ }, /** + * called every frame with it's delta time.
+ * DON'T override unless you know what you are doing. + * * @param {Number} dt */ step:function (dt) { @@ -328,6 +396,8 @@ cc.Speed = cc.Action.extend(/** @lends cc.Speed# */{ }, /** + * return true if the action has finished. + * * @return {Boolean} */ isDone:function () { @@ -335,23 +405,30 @@ cc.Speed = cc.Action.extend(/** @lends cc.Speed# */{ }, /** - * @return {cc.ActionInterval} + * returns a reversed action.
+ * For example:
+ * - The action will be x coordinates of 0 move to 100.
+ * - The reversed action will be x of 100 move to 0. + * - Will be rewritten + * + * @return {cc.Speed} */ reverse:function () { - return (cc.Speed.create(this._innerAction.reverse(), this._speed)); + return new cc.Speed(this._innerAction.reverse(), this._speed); }, /** - * + * Set inner Action. * @param {cc.ActionInterval} action */ setInnerAction:function (action) { - if (this._innerAction != action) { + if (this._innerAction !== action) { this._innerAction = action; } }, /** + * Get inner Action. * * @return {cc.ActionInterval} */ @@ -359,24 +436,57 @@ cc.Speed = cc.Action.extend(/** @lends cc.Speed# */{ return this._innerAction; } }); -/** creates the action + +/** + * creates the speed action. * + * @function cc.speed * @param {cc.ActionInterval} action * @param {Number} speed * @return {cc.Speed} */ -cc.Speed.create = function (action, speed) { +cc.speed = function (action, speed) { return new cc.Speed(action, speed); }; /** - * cc.Follow is an action that "follows" a node. + * Please use cc.speed instead. + * creates the action. + * + * @param {cc.ActionInterval} action + * @param {Number} speed + * @return {cc.Speed} + * @static + * @deprecated since v3.0 please use cc.speed() instead. + */ +cc.Speed.create = cc.speed; +/** + * cc.Follow is an action that "follows" a node. + * * @example * //example * //Instead of using cc.Camera as a "follower", use this action instead. - * layer.runAction(cc.Follow.actionWithTarget(hero)); - + * layer.runAction(cc.follow(hero)); + * + * @property {Number} leftBoundary - world leftBoundary. + * @property {Number} rightBoundary - world rightBoundary. + * @property {Number} topBoundary - world topBoundary. + * @property {Number} bottomBoundary - world bottomBoundary. + * + * @param {cc.Node} followedNode + * @param {cc.Rect} rect + * @example + * // creates the action with a set boundary + * var sprite = new cc.Sprite("spriteFileName"); + * var followAction = new cc.Follow(sprite, cc.rect(0, 0, s.width * 2 - 100, s.height)); + * this.runAction(followAction); + * + * // creates the action with no boundary set + * var sprite = new cc.Sprite("spriteFileName"); + * var followAction = new cc.Follow(sprite); + * this.runAction(followAction); + * * @class * @extends cc.Action */ @@ -390,43 +500,19 @@ cc.Follow = cc.Action.extend(/** @lends cc.Follow# */{ // fast access to the screen dimensions _halfScreenSize:null, _fullScreenSize:null, + _worldRect:null, - /** world leftBoundary - * @Type {Number} - */ leftBoundary:0.0, - /** world rightBoundary - * @Type Number - */ rightBoundary:0.0, - /** world topBoundary - * @Type Number - */ topBoundary:0.0, - /** world bottomBoundary - * @Type {Number} - */ bottomBoundary:0.0, - _worldRect:null, /** - * creates the action with a set boundary
- * creates the action with no boundary set - * - * @constructor - * @param {cc.Node} followedNode - * @param {cc.Rect} rect - * @example - * // example - * // creates the action with a set boundary - * var sprite = new cc.Sprite("spriteFileName"); - * var followAction = new cc.Follow(sprite, cc.rect(0, 0, s.width * 2 - 100, s.height)); - * this.runAction(followAction); - * - * // creates the action with no boundary set - * var sprite = new cc.Sprite("spriteFileName"); - * var followAction = new cc.Follow(sprite); - * this.runAction(followAction); + * Constructor function, override it to extend the construction behavior, remember to call "this._super()" in the extended "ctor" function.
+ * creates the action with a set boundary.
+ * creates the action with no boundary set. + * @param {cc.Node} followedNode + * @param {cc.Rect} rect */ ctor:function (followedNode, rect) { cc.Action.prototype.ctor.call(this); @@ -448,6 +534,12 @@ cc.Follow = cc.Action.extend(/** @lends cc.Follow# */{ : this.initWithTarget(followedNode); }, + /** + * to copy object with deep copy. + * returns a clone of action. + * + * @return {cc.Follow} + */ clone:function () { var action = new cc.Follow(); var locRect = this._worldRect; @@ -457,21 +549,26 @@ cc.Follow = cc.Action.extend(/** @lends cc.Follow# */{ }, /** + * Get whether camera should be limited to certain area. + * * @return {Boolean} */ isBoundarySet:function () { return this._boundarySet; }, - /** alter behavior - turn on/off boundary + /** + * alter behavior - turn on/off boundary. + * * @param {Boolean} value */ setBoudarySet:function (value) { this._boundarySet = value; }, - /** initializes the action - * initializes the action with a set boundary + /** + * initializes the action with a set boundary. + * * @param {cc.Node} followedNode * @param {cc.Rect} [rect=] * @return {Boolean} @@ -480,42 +577,46 @@ cc.Follow = cc.Action.extend(/** @lends cc.Follow# */{ if(!followedNode) throw "cc.Follow.initWithAction(): followedNode must be non nil"; + var _this = this; rect = rect || cc.rect(0, 0, 0, 0); - this._followedNode = followedNode; - this._worldRect = rect; + _this._followedNode = followedNode; + _this._worldRect = rect; - this._boundarySet = !cc._rectEqualToZero(rect); + _this._boundarySet = !cc._rectEqualToZero(rect); - this._boundaryFullyCovered = false; + _this._boundaryFullyCovered = false; var winSize = cc.director.getWinSize(); - this._fullScreenSize = cc.p(winSize.width, winSize.height); - this._halfScreenSize = cc.pMult(this._fullScreenSize, 0.5); + _this._fullScreenSize = cc.p(winSize.width, winSize.height); + _this._halfScreenSize = cc.pMult(_this._fullScreenSize, 0.5); - if (this._boundarySet) { - this.leftBoundary = -((rect.x + rect.width) - this._fullScreenSize.x); - this.rightBoundary = -rect.x; - this.topBoundary = -rect.y; - this.bottomBoundary = -((rect.y + rect.height) - this._fullScreenSize.y); + if (_this._boundarySet) { + _this.leftBoundary = -((rect.x + rect.width) - _this._fullScreenSize.x); + _this.rightBoundary = -rect.x; + _this.topBoundary = -rect.y; + _this.bottomBoundary = -((rect.y + rect.height) - _this._fullScreenSize.y); - if (this.rightBoundary < this.leftBoundary) { + if (_this.rightBoundary < _this.leftBoundary) { // screen width is larger than world's boundary width //set both in the middle of the world - this.rightBoundary = this.leftBoundary = (this.leftBoundary + this.rightBoundary) / 2; + _this.rightBoundary = _this.leftBoundary = (_this.leftBoundary + _this.rightBoundary) / 2; } - if (this.topBoundary < this.bottomBoundary) { + if (_this.topBoundary < _this.bottomBoundary) { // screen width is larger than world's boundary width //set both in the middle of the world - this.topBoundary = this.bottomBoundary = (this.topBoundary + this.bottomBoundary) / 2; + _this.topBoundary = _this.bottomBoundary = (_this.topBoundary + _this.bottomBoundary) / 2; } - if ((this.topBoundary == this.bottomBoundary) && (this.leftBoundary == this.rightBoundary)) - this._boundaryFullyCovered = true; + if ((_this.topBoundary === _this.bottomBoundary) && (_this.leftBoundary === _this.rightBoundary)) + _this._boundaryFullyCovered = true; } return true; }, /** + * called every frame with it's delta time.
+ * DON'T override unless you know what you are doing. + * * @param {Number} dt */ step:function (dt) { @@ -524,6 +625,9 @@ cc.Follow = cc.Action.extend(/** @lends cc.Follow# */{ tempPosX = this._halfScreenSize.x - tempPosX; tempPosY = this._halfScreenSize.y - tempPosY; + //TODO Temporary treatment - The dirtyFlag symbol error + this.target._renderCmd._dirtyFlag = 0; + if (this._boundarySet) { // whole map fits inside a single screen, no need to modify the position - unless map boundaries are increased if (this._boundaryFullyCovered) @@ -536,6 +640,8 @@ cc.Follow = cc.Action.extend(/** @lends cc.Follow# */{ }, /** + * Return true if the action has finished. + * * @return {Boolean} */ isDone:function () { @@ -550,23 +656,39 @@ cc.Follow = cc.Action.extend(/** @lends cc.Follow# */{ cc.Action.prototype.stop.call(this); } }); -/** creates the action with a set boundary
- * creates the action with no boundary set + +/** + * creates the action with a set boundary.
+ * creates the action with no boundary set. + * + * @function * @param {cc.Node} followedNode * @param {cc.Rect} rect * @return {cc.Follow|Null} returns the cc.Follow object on success * @example * // example * // creates the action with a set boundary - * var sprite = cc.Sprite.create("spriteFileName"); - * var followAction = cc.Follow.create(sprite, cc.rect(0, 0, s.width * 2 - 100, s.height)); + * var sprite = new cc.Sprite("spriteFileName"); + * var followAction = cc.follow(sprite, cc.rect(0, 0, s.width * 2 - 100, s.height)); * this.runAction(followAction); * * // creates the action with no boundary set - * var sprite = cc.Sprite.create("spriteFileName"); - * var followAction = cc.Follow.create(sprite); + * var sprite = new cc.Sprite("spriteFileName"); + * var followAction = cc.follow(sprite); * this.runAction(followAction); */ -cc.Follow.create = function (followedNode, rect) { +cc.follow = function (followedNode, rect) { return new cc.Follow(followedNode, rect); }; + +/** + * Please use cc.follow instead. + * creates the action with a set boundary.
+ * creates the action with no boundary set. + * @param {cc.Node} followedNode + * @param {cc.Rect} rect + * @return {cc.Follow|Null} returns the cc.Follow object on success + * @static + * @deprecated since v3.0 please cc.follow() instead. + */ +cc.Follow.create = cc.follow; diff --git a/cocos2d/actions/CCActionCamera.js b/cocos2d/actions/CCActionCamera.js index f055f6ca8e..0ff5786b71 100644 --- a/cocos2d/actions/CCActionCamera.js +++ b/cocos2d/actions/CCActionCamera.js @@ -1,7 +1,7 @@ /**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2008-2010 Ricardo Quesada - Copyright (c) 2011 Zynga Inc. + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -40,6 +40,9 @@ cc.ActionCamera = cc.ActionInterval.extend(/** @lends cc.ActionCamera# */{ _upYOrig:0, _upZOrig:0, + /** + * Constructor function, override it to extend the construction behavior, remember to call "this._super()" in the extended "ctor" function. + */ ctor:function(){ var _t = this; cc.ActionInterval.prototype.ctor.call(_t); @@ -55,7 +58,11 @@ cc.ActionCamera = cc.ActionInterval.extend(/** @lends cc.ActionCamera# */{ _t._upZOrig=0; }, - + /** + * called before the action start. It will also set the target. + * + * @param {cc.Node} target + */ startWithTarget:function (target) { var _t = this; cc.ActionInterval.prototype.startWithTarget.call(_t, target); @@ -78,20 +85,39 @@ cc.ActionCamera = cc.ActionInterval.extend(/** @lends cc.ActionCamera# */{ }, /** + * to copy object with deep copy. * returns a new clone of the action + * * @returns {cc.ActionCamera} */ clone:function(){ return new cc.ActionCamera(); }, + /** + * returns a reversed action.
+ * For example:
+ * - The action will be x coordinates of 0 move to 100.
+ * - The reversed action will be x of 100 move to 0. + * - Will be rewritten + * + */ reverse:function () { - return cc.ReverseTime.create(this); + return new cc.ReverseTime(this); } }); /** - * Orbits the camera around the center of the screen using spherical coordinates + * Orbits the camera around the center of the screen using spherical coordinates. + * + * @param {Number} t time + * @param {Number} radius + * @param {Number} deltaRadius + * @param {Number} angleZ + * @param {Number} deltaAngleZ + * @param {Number} angleX + * @param {Number} deltaAngleX + * * @class * @extends cc.ActionCamera */ @@ -108,8 +134,8 @@ cc.OrbitCamera = cc.ActionCamera.extend(/** @lends cc.OrbitCamera# */{ _radDeltaX: 0.0, /** - * creates a cc.OrbitCamera action with radius, delta-radius, z, deltaZ, x, deltaX - * @constructor + * Constructor function, override it to extend the construction behavior, remember to call "this._super()" in the extended "ctor" function.
+ * creates a cc.OrbitCamera action with radius, delta-radius, z, deltaZ, x, deltaX. * @param {Number} t time * @param {Number} radius * @param {Number} deltaRadius @@ -180,6 +206,11 @@ cc.OrbitCamera = cc.ActionCamera.extend(/** @lends cc.OrbitCamera# */{ return {newRadius:newRadius, zenith:zenith, azimuth:azimuth}; }, + /** + * called before the action start. It will also set the target. + * + * @param {cc.Node} target + */ startWithTarget:function (target) { var _t = this; cc.ActionInterval.prototype.startWithTarget.call(_t, target); @@ -188,22 +219,34 @@ cc.OrbitCamera = cc.ActionCamera.extend(/** @lends cc.OrbitCamera# */{ _t._radius = retValue.newRadius; if (isNaN(_t._angleZ)) - _t._angleZ = cc.radiansToDegress(retValue.zenith); + _t._angleZ = cc.radiansToDegrees(retValue.zenith); if (isNaN(_t._angleX)) - _t._angleX = cc.radiansToDegress(retValue.azimuth); + _t._angleX = cc.radiansToDegrees(retValue.azimuth); _t._radZ = cc.degreesToRadians(_t._angleZ); _t._radX = cc.degreesToRadians(_t._angleX); }, + /** + * to copy object with deep copy. + * returns a new clone of the action + * + * @returns {cc.ActionCamera} + */ clone:function(){ var a = new cc.OrbitCamera(), _t = this; a.initWithDuration(_t._duration, _t._radius, _t._deltaRadius, _t._angleZ, _t._deltaAngleZ, _t._angleX, _t._deltaAngleX); return a; }, + /** + * Called once per frame. Time is the number of seconds of a frame interval. + * + * @param {Number} dt + */ update:function (dt) { + dt = this._computeEaseTime(dt); var r = (this._radius + this._deltaRadius * dt) * cc.Camera.getZEye(); var za = this._radZ + this._radDeltaZ * dt; var xa = this._radX + this._radDeltaX * dt; @@ -213,11 +256,13 @@ cc.OrbitCamera = cc.ActionCamera.extend(/** @lends cc.OrbitCamera# */{ var k = Math.cos(za) * r + this._centerZOrig; this.target.getCamera().setEye(i, j, k); + this.target.setNodeDirty(); } }); /** * creates a cc.OrbitCamera action with radius, delta-radius, z, deltaZ, x, deltaX + * @function * @param {Number} t time * @param {Number} radius * @param {Number} deltaRadius @@ -227,6 +272,22 @@ cc.OrbitCamera = cc.ActionCamera.extend(/** @lends cc.OrbitCamera# */{ * @param {Number} deltaAngleX * @return {cc.OrbitCamera} */ -cc.OrbitCamera.create = function (t, radius, deltaRadius, angleZ, deltaAngleZ, angleX, deltaAngleX) { +cc.orbitCamera = function (t, radius, deltaRadius, angleZ, deltaAngleZ, angleX, deltaAngleX) { return new cc.OrbitCamera(t, radius, deltaRadius, angleZ, deltaAngleZ, angleX, deltaAngleX); }; + +/** + * Please use cc.orbitCamera instead + * creates a cc.OrbitCamera action with radius, delta-radius, z, deltaZ, x, deltaX + * @param {Number} t time + * @param {Number} radius + * @param {Number} deltaRadius + * @param {Number} angleZ + * @param {Number} deltaAngleZ + * @param {Number} angleX + * @param {Number} deltaAngleX + * @return {cc.OrbitCamera} + * @static + * @deprecated since v3.0 please use cc.orbitCamera() instead. + */ +cc.OrbitCamera.create = cc.orbitCamera; diff --git a/cocos2d/actions/CCActionCatmullRom.js b/cocos2d/actions/CCActionCatmullRom.js index b1fd07e501..4ab0dfd7fc 100644 --- a/cocos2d/actions/CCActionCatmullRom.js +++ b/cocos2d/actions/CCActionCatmullRom.js @@ -1,7 +1,7 @@ /**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2008-2010 Ricardo Quesada - Copyright (c) 2011 Zynga Inc. + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. Copyright (c) 2008 Radu Gruian Copyright (c) 2011 Vit Valentin @@ -33,9 +33,10 @@ ****************************************************************************/ /** - *
Returns the Cardinal Spline position for a given set of control points, tension and time CatmullRom Spline formula:
- * s(-ttt + 2tt - t)P1 + s(-ttt + tt)P2 + (2ttt - 3tt + 1)P2 + s(ttt - 2tt + t)P3 + (-2ttt + 3tt)P3 + s(ttt - tt)P4
- *
+ * CatmullRom Spline formula.
+ * s(-ttt + 2tt - t)P1 + s(-ttt + tt)P2 + (2ttt - 3tt + 1)P2 + s(ttt - 2tt + t)P3 + (-2ttt + 3tt)P3 + s(ttt - tt)P4 + * * @function * @param {cc.Point} p0 * @param {cc.Point} p1 @@ -64,9 +65,9 @@ cc.cardinalSplineAt = function (p0, p1, p2, p3, tension, t) { return cc.p(x, y); }; - /** * returns a new copy of the array reversed. + * * @return {Array} */ cc.reverseControlPoints = function (controlPoints) { @@ -77,15 +78,31 @@ cc.reverseControlPoints = function (controlPoints) { return newArray; }; -cc.copyControlPoints = function (controlPoints) { + +/** + * returns a new clone of the controlPoints + * + * @param controlPoints + * @returns {Array} + */ +cc.cloneControlPoints = function (controlPoints) { var newArray = []; for (var i = 0; i < controlPoints.length; i++) newArray.push(cc.p(controlPoints[i].x, controlPoints[i].y)); return newArray; }; +/** + * returns a new clone of the controlPoints + * @deprecated since v3.0 please use cc.cloneControlPoints() instead. + * @param controlPoints + * @returns {Array} + */ +cc.copyControlPoints = cc.cloneControlPoints; + /** * returns a point from the array + * * @param {Array} controlPoints * @param {Number} pos * @return {Array} @@ -96,7 +113,9 @@ cc.getControlPointAt = function (controlPoints, pos) { }; /** - * reverse the current control point array inline, without generating a new one + * reverse the current control point array inline, without generating a new one
+ * + * @param controlPoints */ cc.reverseControlPointsInline = function (controlPoints) { var len = controlPoints.length; @@ -110,13 +129,18 @@ cc.reverseControlPointsInline = function (controlPoints) { /** - * Cardinal Spline path. http://en.wikipedia.org/wiki/Cubic_Hermite_spline#Cardinal_spline + * Cardinal Spline path. {@link http://en.wikipedia.org/wiki/Cubic_Hermite_spline#Cardinal_spline} + * Absolute coordinates. + * * @class * @extends cc.ActionInterval + * @param {Number} duration + * @param {Array} points array of control points + * @param {Number} tension * * @example * //create a cc.CardinalSplineTo - * var action1 = cc.CardinalSplineTo.create(3, array, 0); + * var action1 = cc.cardinalSplineTo(3, array, 0); */ cc.CardinalSplineTo = cc.ActionInterval.extend(/** @lends cc.CardinalSplineTo# */{ /** Array of control points */ @@ -127,16 +151,11 @@ cc.CardinalSplineTo = cc.ActionInterval.extend(/** @lends cc.CardinalSplineTo# * _accumulatedDiff:null, /** - * Creates an action with a Cardinal Spline array of points and tension - * - * @constructor + * Constructor function, override it to extend the construction behavior, remember to call "this._super()" in the extended "ctor" function.
+ * Creates an action with a Cardinal Spline array of points and tension. * @param {Number} duration * @param {Array} points array of control points * @param {Number} tension - * - * @example - * //create a cc.CardinalSplineTo - * var action1 = new cc.CardinalSplineTo(3, array, 0); */ ctor: function (duration, points, tension) { cc.ActionInterval.prototype.ctor.call(this); @@ -147,13 +166,15 @@ cc.CardinalSplineTo = cc.ActionInterval.extend(/** @lends cc.CardinalSplineTo# * /** * initializes the action with a duration and an array of points + * * @param {Number} duration * @param {Array} points array of control points * @param {Number} tension + * * @return {Boolean} */ initWithDuration:function (duration, points, tension) { - if(!points || points.length == 0) + if(!points || points.length === 0) throw "Invalid configuration. It must at least have one control point"; if (cc.ActionInterval.prototype.initWithDuration.call(this, duration)) { @@ -166,6 +187,7 @@ cc.CardinalSplineTo = cc.ActionInterval.extend(/** @lends cc.CardinalSplineTo# * /** * returns a new clone of the action + * * @returns {cc.CardinalSplineTo} */ clone:function () { @@ -175,6 +197,8 @@ cc.CardinalSplineTo = cc.ActionInterval.extend(/** @lends cc.CardinalSplineTo# * }, /** + * called before the action start. It will also set the target. + * * @param {cc.Node} target */ startWithTarget:function (target) { @@ -186,22 +210,25 @@ cc.CardinalSplineTo = cc.ActionInterval.extend(/** @lends cc.CardinalSplineTo# * }, /** - * @param {Number} time + * Called once per frame. Time is the number of seconds of a frame interval. + * + * @param {Number} dt */ - update:function (time) { + update:function (dt) { + dt = this._computeEaseTime(dt); var p, lt; var ps = this._points; // eg. // p..p..p..p..p..p..p // 1..2..3..4..5..6..7 // want p to be 1, 2, 3, 4, 5, 6 - if (time == 1) { + if (dt === 1) { p = ps.length - 1; lt = 1; } else { var locDT = this._deltaT; - p = 0 | (time / locDT); - lt = (time - locDT * p) / locDT; + p = 0 | (dt / locDT); + lt = (dt - locDT * p) / locDT; } var newPos = cc.cardinalSplineAt( @@ -215,7 +242,7 @@ cc.CardinalSplineTo = cc.ActionInterval.extend(/** @lends cc.CardinalSplineTo# * var tempX, tempY; tempX = this.target.getPositionX() - this._previousPosition.x; tempY = this.target.getPositionY() - this._previousPosition.y; - if (tempX != 0 || tempY != 0) { + if (tempX !== 0 || tempY !== 0) { var locAccDiff = this._accumulatedDiff; tempX = locAccDiff.x + tempX; tempY = locAccDiff.y + tempY; @@ -229,16 +256,19 @@ cc.CardinalSplineTo = cc.ActionInterval.extend(/** @lends cc.CardinalSplineTo# * }, /** - * reverse a new cc.CardinalSplineTo + * reverse a new cc.CardinalSplineTo.
+ * Along the track of movement in the opposite. + * * @return {cc.CardinalSplineTo} */ reverse:function () { var reversePoints = cc.reverseControlPoints(this._points); - return cc.CardinalSplineTo.create(this._duration, reversePoints, this._tension); + return cc.cardinalSplineTo(this._duration, reversePoints, this._tension); }, /** * update position of target + * * @param {cc.Point} newPos */ updatePosition:function (newPos) { @@ -248,6 +278,7 @@ cc.CardinalSplineTo = cc.ActionInterval.extend(/** @lends cc.CardinalSplineTo# * /** * Points getter + * * @return {Array} */ getPoints:function () { @@ -256,6 +287,7 @@ cc.CardinalSplineTo = cc.ActionInterval.extend(/** @lends cc.CardinalSplineTo# * /** * Points setter + * * @param {Array} points */ setPoints:function (points) { @@ -264,7 +296,8 @@ cc.CardinalSplineTo = cc.ActionInterval.extend(/** @lends cc.CardinalSplineTo# * }); /** - * creates an action with a Cardinal Spline array of points and tension + * creates an action with a Cardinal Spline array of points and tension. + * * @function * @param {Number} duration * @param {Array} points array of control points @@ -273,28 +306,46 @@ cc.CardinalSplineTo = cc.ActionInterval.extend(/** @lends cc.CardinalSplineTo# * * * @example * //create a cc.CardinalSplineTo - * var action1 = cc.CardinalSplineTo.create(3, array, 0); + * var action1 = cc.cardinalSplineTo(3, array, 0); */ -cc.CardinalSplineTo.create = function (duration, points, tension) { +cc.cardinalSplineTo = function (duration, points, tension) { return new cc.CardinalSplineTo(duration, points, tension); }; /** - * Cardinal Spline path. http://en.wikipedia.org/wiki/Cubic_Hermite_spline#Cardinal_spline + * Please use cc.cardinalSplineTo instead.
+ * creates an action with a Cardinal Spline array of points and tension + * + * @function + * @param {Number} duration + * @param {Array} points array of control points + * @param {Number} tension + * @return {cc.CardinalSplineTo} + * @static + * @deprecated since v3.0 please use cc.cardinalSplineTo(duration, points, tension) instead. + */ +cc.CardinalSplineTo.create = cc.cardinalSplineTo; + +/** + * Cardinal Spline path. {@link http://en.wikipedia.org/wiki/Cubic_Hermite_spline#Cardinal_spline} + * Relative coordinates. + * * @class * @extends cc.CardinalSplineTo + * @param {Number} duration + * @param {Array} points + * @param {Number} tension * * @example * //create a cc.CardinalSplineBy - * var action1 = cc.CardinalSplineBy.create(3, array, 0); + * var action1 = cc.cardinalSplineBy(3, array, 0); */ cc.CardinalSplineBy = cc.CardinalSplineTo.extend(/** @lends cc.CardinalSplineBy# */{ _startPosition:null, /** - * creates an action with a Cardinal Spline array of points and tension - * - * @constructor + * Constructor function, override it to extend the construction behavior, remember to call "this._super()" in the extended "ctor" function.
+ * creates an action with a Cardinal Spline array of points and tension. * @param {Number} duration * @param {Array} points * @param {Number} tension @@ -307,6 +358,8 @@ cc.CardinalSplineBy = cc.CardinalSplineTo.extend(/** @lends cc.CardinalSplineBy# }, /** + * called before the action start. It will also set the target. + * * @param {cc.Node} target */ startWithTarget:function (target) { @@ -317,6 +370,7 @@ cc.CardinalSplineBy = cc.CardinalSplineTo.extend(/** @lends cc.CardinalSplineBy# /** * reverse a new cc.CardinalSplineBy + * * @return {cc.CardinalSplineBy} */ reverse:function () { @@ -352,11 +406,12 @@ cc.CardinalSplineBy = cc.CardinalSplineTo.extend(/** @lends cc.CardinalSplineBy# reverseArray[i] = current; p = current; } - return cc.CardinalSplineBy.create(this._duration, reverseArray, this._tension); + return cc.cardinalSplineBy(this._duration, reverseArray, this._tension); }, /** * update position of target + * * @param {cc.Point} newPos */ updatePosition:function (newPos) { @@ -370,6 +425,7 @@ cc.CardinalSplineBy = cc.CardinalSplineTo.extend(/** @lends cc.CardinalSplineBy# /** * returns a new clone of the action + * * @returns {cc.CardinalSplineBy} */ clone:function () { @@ -380,40 +436,53 @@ cc.CardinalSplineBy = cc.CardinalSplineTo.extend(/** @lends cc.CardinalSplineBy# }); /** - * creates an action with a Cardinal Spline array of points and tension + * creates an action with a Cardinal Spline array of points and tension. + * * @function * @param {Number} duration * @param {Array} points * @param {Number} tension + * * @return {cc.CardinalSplineBy} */ -cc.CardinalSplineBy.create = function (duration, points, tension) { +cc.cardinalSplineBy = function (duration, points, tension) { return new cc.CardinalSplineBy(duration, points, tension); }; /** - *
- * An action that moves the target with a CatmullRom curve to a destination point.
- * A Catmull Rom is a Cardinal Spline with a tension of 0.5.
- * http://en.wikipedia.org/wiki/Cubic_Hermite_spline#Catmull.E2.80.93Rom_spline
- *
+ * A Catmull Rom is a Cardinal Spline with a tension of 0.5.
+ * {@link http://en.wikipedia.org/wiki/Cubic_Hermite_spline#Catmull.E2.80.93Rom_spline} + * Absolute coordinates. + * * @class * @extends cc.CardinalSplineTo + * @param {Number} dt + * @param {Array} points * * @example - * var action1 = cc.CatmullRomTo.create(3, array); + * var action1 = cc.catmullRomTo(3, array); */ cc.CatmullRomTo = cc.CardinalSplineTo.extend(/** @lends cc.CatmullRomTo# */{ /** - * creates an action with a Cardinal Spline array of points and tension - * - * @constructor + * Constructor function, override it to extend the construction behavior, remember to call "this._super()" in the extended "ctor" function.
+ * creates an action with a Cardinal Spline array of points and tension. * @param {Number} dt * @param {Array} points - * - * @example - * var action1 = new cc.CatmullRomTo(3, array); */ ctor: function(dt, points) { points && this.initWithDuration(dt, points); @@ -422,7 +491,6 @@ cc.CatmullRomTo = cc.CardinalSplineTo.extend(/** @lends cc.CatmullRomTo# */{ /** * Initializes the action with a duration and an array of points * - * @function * @param {Number} dt * @param {Array} points */ @@ -442,41 +510,52 @@ cc.CatmullRomTo = cc.CardinalSplineTo.extend(/** @lends cc.CatmullRomTo# */{ }); /** - * creates an action with a Cardinal Spline array of points and tension + * creates an action with a Cardinal Spline array of points and tension. + * + * @function * @param {Number} dt * @param {Array} points * @return {cc.CatmullRomTo} * * @example - * var action1 = cc.CatmullRomTo.create(3, array); + * var action1 = cc.catmullRomTo(3, array); */ -cc.CatmullRomTo.create = function (dt, points) { +cc.catmullRomTo = function (dt, points) { return new cc.CatmullRomTo(dt, points); }; +/** + * Please use cc.catmullRomTo instead. + * creates an action with a Cardinal Spline array of points and tension. + * + * @param {Number} dt + * @param {Array} points + * @return {cc.CatmullRomTo} + * @static + * @deprecated since v3.0 please use cc.catmullRomTo(dt, points) instead. + */ +cc.CatmullRomTo.create = cc.catmullRomTo; /** - *
- * An action that moves the target with a CatmullRom curve by a certain distance.
- * A Catmull Rom is a Cardinal Spline with a tension of 0.5.
- * http://en.wikipedia.org/wiki/Cubic_Hermite_spline#Catmull.E2.80.93Rom_spline
- *
+ * A Catmull Rom is a Cardinal Spline with a tension of 0.5.
+ * http://en.wikipedia.org/wiki/Cubic_Hermite_spline#Catmull.E2.80.93Rom_spline + * Relative coordinates. + * * @class * @extends cc.CardinalSplineBy + * @param {Number} dt + * @param {Array} points * * @example - * var action1 = cc.CatmullRomBy.create(3, array); + * var action1 = cc.catmullRomBy(3, array); */ cc.CatmullRomBy = cc.CardinalSplineBy.extend({ /** - * Creates an action with a Cardinal Spline array of points and tension - * - * @constructor + * Constructor function, override it to extend the construction behavior, remember to call "this._super()" in the extended "ctor" function.
+ * Creates an action with a Cardinal Spline array of points and tension. * @param {Number} dt * @param {Array} points - * - * @example - * var action1 = new cc.CatmullRomBy(3, array); */ ctor: function(dt, points) { cc.CardinalSplineBy.prototype.ctor.call(this); @@ -507,10 +586,20 @@ cc.CatmullRomBy = cc.CardinalSplineBy.extend({ /** * Creates an action with a Cardinal Spline array of points and tension - * + * @function + * @param {Number} dt + * @param {Array} points + * @return {cc.CatmullRomBy} * @example - * var action1 = cc.CatmullRomBy.create(3, array); + * var action1 = cc.catmullRomBy(3, array); */ -cc.CatmullRomBy.create = function (dt, points) { +cc.catmullRomBy = function (dt, points) { return new cc.CatmullRomBy(dt, points); }; +/** + * Please use cc.catmullRomBy instead + * Creates an action with a Cardinal Spline array of points and tension + * @static + * @deprecated since v3.0 please cc.catmullRomBy(dt, points) instead. + */ +cc.CatmullRomBy.create = cc.catmullRomBy; diff --git a/cocos2d/actions/CCActionEase.js b/cocos2d/actions/CCActionEase.js index 295136f94f..ca8b0a6cb0 100644 --- a/cocos2d/actions/CCActionEase.js +++ b/cocos2d/actions/CCActionEase.js @@ -1,7 +1,7 @@ /**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2008-2010 Ricardo Quesada - Copyright (c) 2011 Zynga Inc. + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -28,26 +28,29 @@ * Base class for Easing actions * @class * @extends cc.ActionInterval + * @param {cc.ActionInterval} action + * + * @deprecated since v3.0 Does not recommend the use of the base object. + * + * @example + * var moveEase = new cc.ActionEase(action); */ - cc.ActionEase = cc.ActionInterval.extend(/** @lends cc.ActionEase# */{ _inner:null, /** - * creates the action of ActionEase - * - * @constructor + * Constructor function, override it to extend the construction behavior, remember to call "this._super()" in the extended "ctor" function.
+ * creates the action of ActionEase. * @param {cc.ActionInterval} action - * - * @example - * var moveEase = new cc.ActionEase(action); */ ctor: function (action) { cc.ActionInterval.prototype.ctor.call(this); action && this.initWithAction(action); }, - /** initializes the action + /** + * initializes the action + * * @param {cc.ActionInterval} action * @return {Boolean} */ @@ -62,6 +65,12 @@ cc.ActionEase = cc.ActionInterval.extend(/** @lends cc.ActionEase# */{ return false; }, + /** + * to copy object with deep copy. + * returns a clone of action. + * + * @returns {cc.ActionEase} + */ clone:function(){ var action = new cc.ActionEase(); action.initWithAction(this._inner.clone()); @@ -69,6 +78,8 @@ cc.ActionEase = cc.ActionInterval.extend(/** @lends cc.ActionEase# */{ }, /** + * called before the action start. It will also set the target. + * * @param {cc.Node} target */ startWithTarget:function (target) { @@ -85,53 +96,84 @@ cc.ActionEase = cc.ActionInterval.extend(/** @lends cc.ActionEase# */{ }, /** - * @param {Number} time1 + * Called once per frame. Time is the number of seconds of a frame interval. + * + * @param {Number} dt */ - update:function (time1) { - this._inner.update(time1); + update:function (dt) { + this._inner.update(dt); }, /** - * @return {cc.ActionInterval} + * Create new action to original operation effect opposite.
+ * For example:
+ * - The action will be x coordinates of 0 move to 100.
+ * - The reversed action will be x of 100 move to 0. + * - Will be rewritten + * @return {cc.ActionEase} */ reverse:function () { - return cc.ActionEase.create(this._inner.reverse()); + return new cc.ActionEase(this._inner.reverse()); }, + /** + * Get inner Action. + * + * @return {cc.ActionInterval} + */ getInnerAction:function(){ return this._inner; } }); -/** creates the action of ActionEase +/** + * creates the action of ActionEase + * * @param {cc.ActionInterval} action * @return {cc.ActionEase} * @example * // example - * var moveEase = cc.ActionEase.create(action); + * var moveEase = cc.actionEase(action); */ -cc.ActionEase.create = function (action) { +cc.actionEase = function (action) { return new cc.ActionEase(action); }; +/** + * Please use cc.actionEase instead + * creates the action of ActionEase + * + * @param {cc.ActionInterval} action + * @return {cc.ActionEase} + * @static + * @deprecated since v3.0 please use cc.actionEase(action) instead. + */ +cc.ActionEase.create = cc.actionEase; + /** * Base class for Easing actions with rate parameters + * * @class * @extends cc.ActionEase + * @param {cc.ActionInterval} action + * @param {Number} rate + * + * @deprecated since v3.0 please cc.easeRateAction(action, 3.0); + * + * @example + * //The old usage + * cc.EaseRateAction.create(action, 3.0); + * //The new usage + * var moveEaseRateAction = cc.easeRateAction(action, 3.0); */ cc.EaseRateAction = cc.ActionEase.extend(/** @lends cc.EaseRateAction# */{ _rate:0, /** - * Creates the action with the inner action and the rate parameter - * - * @constructor + * Constructor function, override it to extend the construction behavior, remember to call "this._super()" in the extended "ctor" function.
+ * Creates the action with the inner action and the rate parameter. * @param {cc.ActionInterval} action * @param {Number} rate - * - * @example - * // example - * var moveEaseRateAction = new cc.EaseRateAction(action, 3.0); */ ctor: function(action, rate){ cc.ActionEase.prototype.ctor.call(this); @@ -139,7 +181,8 @@ cc.EaseRateAction = cc.ActionEase.extend(/** @lends cc.EaseRateAction# */{ rate !== undefined && this.initWithAction(action, rate); }, - /** set rate value for the actions + /** + * set rate value for the actions * @param {Number} rate */ setRate:function (rate) { @@ -167,6 +210,12 @@ cc.EaseRateAction = cc.ActionEase.extend(/** @lends cc.EaseRateAction# */{ return false; }, + /** + * to copy object with deep copy. + * returns a clone of action. + * + * @returns {cc.EaseRateAction} + */ clone:function(){ var action = new cc.EaseRateAction(); action.initWithAction(this._inner.clone(), this._rate); @@ -174,45 +223,88 @@ cc.EaseRateAction = cc.ActionEase.extend(/** @lends cc.EaseRateAction# */{ }, /** - * @return {cc.ActionInterval} + * Create new action to original operation effect opposite.
+ * For example:
+ * - The action will be x coordinates of 0 move to 100.
+ * - The reversed action will be x of 100 move to 0. + * - Will be rewritten + * @return {cc.EaseRateAction} */ reverse:function () { - return cc.EaseRateAction.create(this._inner.reverse(), 1 / this._rate); + return new cc.EaseRateAction(this._inner.reverse(), 1 / this._rate); } }); -/** Creates the action with the inner action and the rate parameter +/** + * Creates the action with the inner action and the rate parameter. + * * @param {cc.ActionInterval} action * @param {Number} rate * @return {cc.EaseRateAction} * @example * // example - * var moveEaseRateAction = cc.EaseRateAction.create(action, 3.0); + * var moveEaseRateAction = cc.easeRateAction(action, 3.0); */ -cc.EaseRateAction.create = function (action, rate) { +cc.easeRateAction = function (action, rate) { return new cc.EaseRateAction(action, rate); }; /** - * cc.EaseIn action with a rate + * Please use cc.easeRateAction instead.
+ * Creates the action with the inner action and the rate parameter. + * + * @param {cc.ActionInterval} action + * @param {Number} rate + * @return {cc.EaseRateAction} + * @static + * @deprecated since v3.0 please use cc.easeRateAction(action, rate) + * @example + * //The old usage + * cc.EaseRateAction.create(action, 3.0); + * //The new usage + * var moveEaseRateAction = cc.easeRateAction(action, 3.0); + */ +cc.EaseRateAction.create = cc.easeRateAction; + +/** + * cc.EaseIn action with a rate. From slow to fast. + * * @class * @extends cc.EaseRateAction + * + * @deprecated since v3.0 please use action.easing(cc.easeIn(3)); + * + * @example + * //The old usage + * cc.EaseIn.create(action, 3); + * //The new usage + * action.easing(cc.easeIn(3.0)); */ cc.EaseIn = cc.EaseRateAction.extend(/** @lends cc.EaseIn# */{ + /** - * @param {Number} time1 + * Called once per frame. Time is the number of seconds of a frame interval. + * + * @param {Number} dt */ - update:function (time1) { - this._inner.update(Math.pow(time1, this._rate)); + update:function (dt) { + this._inner.update(Math.pow(dt, this._rate)); }, /** - * @return {cc.ActionInterval} + * Create a cc.easeIn action. Opposite with the original motion trajectory. + * @return {cc.EaseIn} */ reverse:function () { - return cc.EaseIn.create(this._inner.reverse(), 1 / this._rate); + return new cc.EaseIn(this._inner.reverse(), 1 / this._rate); }, + /** + * to copy object with deep copy. + * returns a clone of action. + * + * @returns {cc.EaseIn} + */ clone:function(){ var action = new cc.EaseIn(); action.initWithAction(this._inner.clone(), this._rate); @@ -220,37 +312,88 @@ cc.EaseIn = cc.EaseRateAction.extend(/** @lends cc.EaseIn# */{ } }); -/** Creates the action with the inner action and the rate parameter +/** + * Creates the action with the inner action and the rate parameter.
+ * From slow to fast. + * + * @static + * @deprecated since v3.0
Please use action.easing(cc.easeIn(3)) + * + * @example + * //The old usage + * cc.EaseIn.create(action, 3); + * //The new usage + * action.easing(cc.easeIn(3.0)); + * * @param {cc.ActionInterval} action * @param {Number} rate * @return {cc.EaseIn} - * @example - * // example - * var moveEaseIn = cc.EaseIn.create(action, 3.0); */ cc.EaseIn.create = function (action, rate) { return new cc.EaseIn(action, rate); }; + +/** + * Creates the action easing object with the rate parameter.
+ * From slow to fast. + * + * @function + * @param {Number} rate + * @return {Object} + * @example + * // example + * action.easing(cc.easeIn(3.0)); + */ +cc.easeIn = function (rate) { + return { + _rate: rate, + easing: function (dt) { + return Math.pow(dt, this._rate); + }, + reverse: function(){ + return cc.easeIn(1 / this._rate); + } + }; +}; + /** - * cc.EaseOut action with a rate + * cc.EaseOut action with a rate. From fast to slow. + * * @class * @extends cc.EaseRateAction + * + * @deprecated since v3.0 please use action.easing(cc.easeOut(3)) + * + * @example + * //The old usage + * cc.EaseOut.create(action, 3); + * //The new usage + * action.easing(cc.easeOut(3.0)); */ cc.EaseOut = cc.EaseRateAction.extend(/** @lends cc.EaseOut# */{ /** - * @param {Number} time1 + * Called once per frame. Time is the number of seconds of a frame interval. + * + * @param {Number} dt */ - update:function (time1) { - this._inner.update(Math.pow(time1, 1 / this._rate)); + update:function (dt) { + this._inner.update(Math.pow(dt, 1 / this._rate)); }, /** - * @return {cc.ActionInterval} + * Create a cc.easeIn action. Opposite with the original motion trajectory. + * @return {cc.EaseOut} */ reverse:function () { - return cc.EaseOut.create(this._inner.reverse(), 1 / this._rate); + return new cc.EaseOut(this._inner.reverse(), 1 / this._rate); }, + /** + * to copy object with deep copy. + * returns a clone of action. + * + * @returns {cc.EaseOut} + */ clone:function(){ var action = new cc.EaseOut(); action.initWithAction(this._inner.clone(),this._rate); @@ -258,35 +401,84 @@ cc.EaseOut = cc.EaseRateAction.extend(/** @lends cc.EaseOut# */{ } }); -/** Creates the action with the inner action and the rate parameter +/** + * Creates the action with the inner action and the rate parameter.
+ * From fast to slow. + * + * @static + * @deprecated since v3.0
Please use cc.easeOut instead. + * + * @example + * //The old usage + * cc.EaseOut.create(action, 3); + * //The new usage + * action.easing(cc.easeOut(3.0)); + * * @param {cc.ActionInterval} action * @param {Number} rate * @return {cc.EaseOut} - * @example - * // example - * var moveEaseOut = cc.EaseOut.create(action, 3.0); */ cc.EaseOut.create = function (action, rate) { return new cc.EaseOut(action, rate); }; /** - * cc.EaseInOut action with a rate + * Creates the action easing object with the rate parameter.
+ * From fast to slow. + * + * @function + * @param {Number} rate + * @return {Object} + * @example + * // example + * action.easing(cc.easeOut(3.0)); + */ +cc.easeOut = function (rate) { + return { + _rate: rate, + easing: function (dt) { + return Math.pow(dt, 1 / this._rate); + }, + reverse: function(){ + return cc.easeOut(1 / this._rate) + } + }; +}; + +/** + * cc.EaseInOut action with a rate.
+ * Slow to fast then to slow. * @class * @extends cc.EaseRateAction + * + * @deprecated since v3.0 please use action.easing(cc.easeInOut(3.0)) + * + * @example + * //The old usage + * cc.EaseInOut.create(action, 3); + * //The new usage + * action.easing(cc.easeInOut(3.0)); */ cc.EaseInOut = cc.EaseRateAction.extend(/** @lends cc.EaseInOut# */{ /** - * @param {Number} time1 + * Called once per frame. Time is the number of seconds of a frame interval. + * + * @param {Number} dt */ - update:function (time1) { - time1 *= 2; - if (time1 < 1) - this._inner.update(0.5 * Math.pow(time1, this._rate)); + update:function (dt) { + dt *= 2; + if (dt < 1) + this._inner.update(0.5 * Math.pow(dt, this._rate)); else - this._inner.update(1.0 - 0.5 * Math.pow(2 - time1, this._rate)); + this._inner.update(1.0 - 0.5 * Math.pow(2 - dt, this._rate)); }, + /** + * to copy object with deep copy. + * returns a clone of action. + * + * @returns {cc.EaseInOut} + */ clone:function(){ var action = new cc.EaseInOut(); action.initWithAction(this._inner.clone(), this._rate); @@ -294,44 +486,100 @@ cc.EaseInOut = cc.EaseRateAction.extend(/** @lends cc.EaseInOut# */{ }, /** - * @return {cc.ActionInterval} + * Create a cc.EaseInOut action. Opposite with the original motion trajectory. + * @return {cc.EaseInOut} */ reverse:function () { - return cc.EaseInOut.create(this._inner.reverse(), this._rate); + return new cc.EaseInOut(this._inner.reverse(), this._rate); } }); -/** Creates the action with the inner action and the rate parameter +/** + * Creates the action with the inner action and the rate parameter. + * Slow to fast then to slow. + * @static + * @deprecated since v3.0
Please use action.easing(cc.easeInOut(3.0)) + * + * @example + * //The old usage + * cc.EaseInOut.create(action, 3); + * //The new usage + * action.easing(cc.easeInOut(3.0)); + * * @param {cc.ActionInterval} action * @param {Number} rate * @return {cc.EaseInOut} - * @example - * // example - * var moveEaseInOut = cc.EaseInOut.create(action, 3.0); */ cc.EaseInOut.create = function (action, rate) { return new cc.EaseInOut(action, rate); }; + +/** + * Creates the action easing object with the rate parameter.
+ * Slow to fast then to slow. + * @function + * @param {Number} rate + * @return {Object} + * + * @example + * //The new usage + * action.easing(cc.easeInOut(3.0)); + */ +cc.easeInOut = function (rate) { + return { + _rate: rate, + easing: function (dt) { + dt *= 2; + if (dt < 1) + return 0.5 * Math.pow(dt, this._rate); + else + return 1.0 - 0.5 * Math.pow(2 - dt, this._rate); + }, + reverse: function(){ + return cc.easeInOut(this._rate); + } + }; +}; + /** - * cc.Ease Exponential In + * cc.Ease Exponential In. Slow to Fast.
+ * Reference easeInExpo:
+ * {@link http://www.zhihu.com/question/21981571/answer/19925418} * @class * @extends cc.ActionEase + * + * @deprecated since v3.0 please action.easing(cc.easeExponentialIn()) + * + * @example + * //The old usage + * cc.EaseExponentialIn.create(action); + * //The new usage + * action.easing(cc.easeExponentialIn()); */ cc.EaseExponentialIn = cc.ActionEase.extend(/** @lends cc.EaseExponentialIn# */{ /** - * @param {Number} time1 + * Called once per frame. Time is the number of seconds of a frame interval. + * + * @param {Number} dt */ - update:function (time1) { - this._inner.update(time1 === 0 ? 0 : Math.pow(2, 10 * (time1 - 1))); + update:function (dt) { + this._inner.update(dt === 0 ? 0 : Math.pow(2, 10 * (dt - 1))); }, /** - * @return {cc.ActionInterval} + * Create a cc.EaseExponentialOut action. Opposite with the original motion trajectory. + * @return {cc.EaseExponentialOut} */ reverse:function () { - return cc.EaseExponentialOut.create(this._inner.reverse()); + return new cc.EaseExponentialOut(this._inner.reverse()); }, + /** + * to copy object with deep copy. + * returns a clone of action. + * + * @returns {cc.EaseExponentialIn} + */ clone:function(){ var action = new cc.EaseExponentialIn(); action.initWithAction(this._inner.clone()); @@ -339,37 +587,87 @@ cc.EaseExponentialIn = cc.ActionEase.extend(/** @lends cc.EaseExponentialIn# */{ } }); -/** creates the action +/** + * Creates the action easing object with the rate parameter.
+ * Reference easeInExpo:
+ * {@link http://www.zhihu.com/question/21981571/answer/19925418} + * @static + * @deprecated since v3.0
Please use action.easing(cc.easeExponentialIn()) * @param {cc.ActionInterval} action * @return {cc.EaseExponentialIn} + * * @example - * // example - * var moveEaseExponentialIn = cc.EaseExponentialIn.create(action); + * //The old usage + * cc.EaseExponentialIn.create(action); + * //The new usage + * action.easing(cc.easeExponentialIn()); */ cc.EaseExponentialIn.create = function (action) { return new cc.EaseExponentialIn(action); }; + +cc._easeExponentialInObj = { + easing: function(dt){ + return dt === 0 ? 0 : Math.pow(2, 10 * (dt - 1)); + }, + reverse: function(){ + return cc._easeExponentialOutObj; + } +}; + +/** + * Creates the action easing object with the rate parameter.
+ * Reference easeInExpo:
+ * {@link http://www.zhihu.com/question/21981571/answer/19925418} + * @function + * @return {Object} + * @example + * // example + * action.easing(cc.easeExponentialIn()); + */ +cc.easeExponentialIn = function(){ + return cc._easeExponentialInObj; +}; + /** - * Ease Exponential Out + * Ease Exponential Out.
+ * Reference easeOutExpo:
+ * {@link http://www.zhihu.com/question/21981571/answer/19925418} * @class * @extends cc.ActionEase + * + * @deprecated since v3.0 please use action.easing(cc.easeExponentialOut()) + * + * @example + * //The old usage + * cc.EaseExponentialOut.create(action); + * //The new usage + * action.easing(cc.easeExponentialOut()); */ cc.EaseExponentialOut = cc.ActionEase.extend(/** @lends cc.EaseExponentialOut# */{ - /** - * @param {Number} time1 + * Called once per frame. Time is the number of seconds of a frame interval. + * + * @param {Number} dt */ - update:function (time1) { - this._inner.update(time1 == 1 ? 1 : (-(Math.pow(2, -10 * time1)) + 1)); + update:function (dt) { + this._inner.update(dt === 1 ? 1 : (-(Math.pow(2, -10 * dt)) + 1)); }, /** - * @return {cc.ActionInterval} + * Create a cc.EaseExponentialIn action. Opposite with the original motion trajectory. + * @return {cc.EaseExponentialIn} */ reverse:function () { - return cc.EaseExponentialIn.create(this._inner.reverse()); + return new cc.EaseExponentialIn(this._inner.reverse()); }, + /** + * to copy object with deep copy. + * returns a clone of action. + * + * @returns {cc.EaseExponentialOut} + */ clone:function(){ var action = new cc.EaseExponentialOut(); action.initWithAction(this._inner.clone()); @@ -377,44 +675,95 @@ cc.EaseExponentialOut = cc.ActionEase.extend(/** @lends cc.EaseExponentialOut# * } }); -/** creates the action +/** + * Creates the action easing object with the rate parameter.
+ * Reference easeOutExpo:
+ * {@link http://www.zhihu.com/question/21981571/answer/19925418} + * @static + * @deprecated since v3.0
Please use action.easing(cc.easeExponentialOut()) * @param {cc.ActionInterval} action - * @return {cc.EaseExponentialOut} + * @return {Object} + * * @example - * // example - * var moveEaseExponentialOut = cc.EaseExponentialOut.create(action); + * //The old usage + * cc.EaseExponentialOut.create(action); + * //The new usage + * action.easing(cc.easeExponentialOut()); */ cc.EaseExponentialOut.create = function (action) { return new cc.EaseExponentialOut(action); }; +cc._easeExponentialOutObj = { + easing: function(dt){ + return dt === 1 ? 1 : (-(Math.pow(2, -10 * dt)) + 1); + }, + reverse: function(){ + return cc._easeExponentialInObj; + } +}; + +/** + * creates the action easing object.
+ * Reference easeOutExpo:
+ * {@link http://www.zhihu.com/question/21981571/answer/19925418} + * + * @return {Object} + * @example + * // example + * action.easing(cc.easeExponentialOut()); + */ +cc.easeExponentialOut = function(){ + return cc._easeExponentialOutObj; +}; + /** - * Ease Exponential InOut + * Ease Exponential InOut.
+ * Reference easeInOutExpo:
+ * {@link http://www.zhihu.com/question/21981571/answer/19925418} + * * @class * @extends cc.ActionEase + * + * @deprecated since v3.0 please use action.easing(cc.easeExponentialInOut) + * + * @example + * //The old usage + * cc.EaseExponentialInOut.create(action); + * //The new usage + * action.easing(cc.easeExponentialInOut()); */ cc.EaseExponentialInOut = cc.ActionEase.extend(/** @lends cc.EaseExponentialInOut# */{ /** - * @param {Number} time + * Called once per frame. Time is the number of seconds of a frame interval. + * + * @param {Number} dt */ - update:function (time) { - if( time != 1 && time !== 0) { - time *= 2; - if (time < 1) - time = 0.5 * Math.pow(2, 10 * (time - 1)); + update:function (dt) { + if( dt !== 1 && dt !== 0) { + dt *= 2; + if (dt < 1) + dt = 0.5 * Math.pow(2, 10 * (dt - 1)); else - time = 0.5 * (-Math.pow(2, -10 * (time - 1)) + 2); + dt = 0.5 * (-Math.pow(2, -10 * (dt - 1)) + 2); } - this._inner.update(time); + this._inner.update(dt); }, /** + * Create a cc.EaseExponentialInOut action. Opposite with the original motion trajectory. * @return {cc.EaseExponentialInOut} */ reverse:function () { - return cc.EaseExponentialInOut.create(this._inner.reverse()); + return new cc.EaseExponentialInOut(this._inner.reverse()); }, + /** + * to copy object with deep copy. + * returns a clone of action. + * + * @returns {cc.EaseExponentialInOut} + */ clone:function(){ var action = new cc.EaseExponentialInOut(); action.initWithAction(this._inner.clone()); @@ -422,39 +771,95 @@ cc.EaseExponentialInOut = cc.ActionEase.extend(/** @lends cc.EaseExponentialInOu } }); -/** creates the action +/** + * creates an EaseExponentialInOut action.
+ * Reference easeInOutExpo:
+ * {@link http://www.zhihu.com/question/21981571/answer/19925418} + * @static + * @deprecated since v3.0
Please use action.easing(cc.easeExponentialInOut) * @param {cc.ActionInterval} action * @return {cc.EaseExponentialInOut} + * * @example - * // example - * var moveEaseExponentialInOut = cc.EaseExponentialInOut.create(action); + * //The old usage + * cc.EaseExponentialInOut.create(action); + * //The new usage + * action.easing(cc.easeExponentialInOut()); */ cc.EaseExponentialInOut.create = function (action) { return new cc.EaseExponentialInOut(action); }; +cc._easeExponentialInOutObj = { + easing: function(dt){ + if( dt !== 1 && dt !== 0) { + dt *= 2; + if (dt < 1) + return 0.5 * Math.pow(2, 10 * (dt - 1)); + else + return 0.5 * (-Math.pow(2, -10 * (dt - 1)) + 2); + } + return dt; + }, + reverse: function(){ + return cc._easeExponentialInOutObj; + } +}; + +/** + * creates an EaseExponentialInOut action easing object.
+ * Reference easeInOutExpo:
+ * {@link http://www.zhihu.com/question/21981571/answer/19925418} + * @function + * @return {Object} + * @example + * // example + * action.easing(cc.easeExponentialInOut()); + */ +cc.easeExponentialInOut = function(){ + return cc._easeExponentialInOutObj; +}; /** - * Ease Sine In + * Ease Sine In.
+ * Reference easeInSine:
+ * {@link http://www.zhihu.com/question/21981571/answer/19925418} * @class * @extends cc.ActionEase + * + * @deprecated since v3.0 please use action.easing(cc.easeSineIn()) + * + * @example + * //The old usage + * cc.EaseSineIn.create(action); + * //The new usage + * action.easing(cc.easeSineIn()); */ cc.EaseSineIn = cc.ActionEase.extend(/** @lends cc.EaseSineIn# */{ /** - * @param {Number} time1 + * Called once per frame. Time is the number of seconds of a frame interval. + * + * @param {Number} dt */ - update:function (time1) { - time1 = time1===0 || time1==1 ? time1 : -1 * Math.cos(time1 * Math.PI / 2) + 1; - this._inner.update(time1); + update:function (dt) { + dt = dt===0 || dt===1 ? dt : -1 * Math.cos(dt * Math.PI / 2) + 1; + this._inner.update(dt); }, /** - * @return {cc.ActionInterval} + * Create a cc.EaseSineOut action. Opposite with the original motion trajectory. + * @return {cc.EaseSineOut} */ reverse:function () { - return cc.EaseSineOut.create(this._inner.reverse()); + return new cc.EaseSineOut(this._inner.reverse()); }, + /** + * to copy object with deep copy. + * returns a clone of action. + * + * @returns {cc.EaseSineIn} + */ clone:function(){ var action = new cc.EaseSineIn(); action.initWithAction(this._inner.clone()); @@ -462,37 +867,87 @@ cc.EaseSineIn = cc.ActionEase.extend(/** @lends cc.EaseSineIn# */{ } }); -/** creates the action +/** + * creates an EaseSineIn action.
+ * Reference easeInSine:
+ * {@link http://www.zhihu.com/question/21981571/answer/19925418} + * @static + * @deprecated since v3.0
Please use action.easing(cc.easeSineIn()) * @param {cc.ActionInterval} action * @return {cc.EaseSineIn} + * * @example - * // example - * var moveSineIn = cc.EaseSineIn.create(action); + * //The old usage + * cc.EaseSineIn.create(action); + * //The new usage + * action.easing(cc.easeSineIn()); */ cc.EaseSineIn.create = function (action) { return new cc.EaseSineIn(action); }; + +cc._easeSineInObj = { + easing: function(dt){ + return (dt===0 || dt===1) ? dt : -1 * Math.cos(dt * Math.PI / 2) + 1; + }, + reverse: function(){ + return cc._easeSineOutObj; + } +}; +/** + * creates an EaseSineIn action.
+ * Reference easeInSine:
+ * {@link http://www.zhihu.com/question/21981571/answer/19925418} + * @function + * @return {Object} + * @example + * // example + * action.easing(cc.easeSineIn()); + */ +cc.easeSineIn = function(){ + return cc._easeSineInObj; +}; + /** - * Ease Sine Out + * Ease Sine Out.
+ * Reference easeOutSine:
+ * {@link http://www.zhihu.com/question/21981571/answer/19925418} * @class * @extends cc.ActionEase + * + * @deprecated since v3.0 please use action.easing(cc.easeSineOut()) + * + * @example + * //The old usage + * cc.EaseSineOut.create(action); + * //The new usage + * action.easing(cc.easeSineOut()); */ cc.EaseSineOut = cc.ActionEase.extend(/** @lends cc.EaseSineOut# */{ /** - * @param {Number} time1 + * Called once per frame. Time is the number of seconds of a frame interval. + * + * @param {Number} dt */ - update:function (time1) { - time1 = time1===0 || time1==1 ? time1 : Math.sin(time1 * Math.PI / 2); - this._inner.update(time1); + update:function (dt) { + dt = dt===0 || dt===1 ? dt : Math.sin(dt * Math.PI / 2); + this._inner.update(dt); }, /** - * @return {cc.ActionInterval} + * Create a cc.EaseSineIn action. Opposite with the original motion trajectory. + * @return {cc.EaseSineIn} */ reverse:function () { - return cc.EaseSineIn.create(this._inner.reverse()); + return new cc.EaseSineIn(this._inner.reverse()); }, + /** + * to copy object with deep copy. + * returns a clone of action. + * + * @returns {cc.EaseSineOut} + */ clone:function(){ var action = new cc.EaseSineOut(); action.initWithAction(this._inner.clone()); @@ -500,34 +955,80 @@ cc.EaseSineOut = cc.ActionEase.extend(/** @lends cc.EaseSineOut# */{ } }); - -/** creates the action +/** + * Creates an EaseSineOut action.
+ * Reference easeOutSine:
+ * {@link http://www.zhihu.com/question/21981571/answer/19925418} + * @static + * @deprecated since v3.0
Please use action.easing(cc.easeSineOut()) * @param {cc.ActionInterval} action * @return {cc.EaseSineOut} + * * @example - * // example - * var moveEaseOut = cc.EaseSineOut.create(action); + * //The old usage + * cc.EaseSineOut.create(action); + * //The new usage + * action.easing(cc.easeSineOut()); */ cc.EaseSineOut.create = function (action) { return new cc.EaseSineOut(action); }; +cc._easeSineOutObj = { + easing: function(dt){ + return (dt===0 || dt===1) ? dt : Math.sin(dt * Math.PI / 2); + }, + reverse: function(){ + return cc._easeSineInObj; + } +}; + +/** + * Creates an EaseSineOut action easing object.
+ * Reference easeOutSine:
+ * {@link http://www.zhihu.com/question/21981571/answer/19925418} + * @function + * @return {Object} + * @example + * // example + * action.easing(cc.easeSineOut()); + */ +cc.easeSineOut = function(){ + return cc._easeSineOutObj; +}; /** - * Ease Sine InOut + * Ease Sine InOut.
+ * Reference easeInOutSine:
+ * {@link http://www.zhihu.com/question/21981571/answer/19925418} * @class * @extends cc.ActionEase + * + * @deprecated since v3.0 please use action.easing(cc.easeSineInOut()) + * + * @example + * //The old usage + * cc.EaseSineInOut.create(action); + * //The new usage + * action.easing(cc.easeSineInOut()); */ cc.EaseSineInOut = cc.ActionEase.extend(/** @lends cc.EaseSineInOut# */{ /** - * @param {Number} time1 + * Called once per frame. Time is the number of seconds of a frame interval. + * + * @param {Number} dt */ - update:function (time1) { - time1 = time1===0 || time1==1 ? time1 : -0.5 * (Math.cos(Math.PI * time1) - 1); - this._inner.update(time1); - + update:function (dt) { + dt = dt===0 || dt===1 ? dt : -0.5 * (Math.cos(Math.PI * dt) - 1); + this._inner.update(dt); }, + /** + * to copy object with deep copy. + * returns a clone of action. + * + * @returns {cc.EaseSineInOut} + */ clone:function(){ var action = new cc.EaseSineInOut(); action.initWithAction(this._inner.clone()); @@ -535,41 +1036,72 @@ cc.EaseSineInOut = cc.ActionEase.extend(/** @lends cc.EaseSineInOut# */{ }, /** - * @return {cc.ActionInterval} + * Create a cc.EaseSineInOut action. Opposite with the original motion trajectory. + * @return {cc.EaseSineInOut} */ reverse:function () { - return cc.EaseSineInOut.create(this._inner.reverse()); + return new cc.EaseSineInOut(this._inner.reverse()); } }); -/** creates the action +/** + * Creates the action.
+ * Reference easeInOutSine:
+ * {@link http://www.zhihu.com/question/21981571/answer/19925418} + * @static * @param {cc.ActionInterval} action * @return {cc.EaseSineInOut} + * @deprecated since v3.0
Please use action.easing(cc.easeSineInOut()) + * * @example - * // example - * var moveEaseSineInOut = cc.EaseSineInOut.create(action); + * //The old usage + * cc.EaseSineInOut.create(action); + * //The new usage + * action.easing(cc.easeSineInOut()); */ cc.EaseSineInOut.create = function (action) { return new cc.EaseSineInOut(action); }; +cc._easeSineInOutObj = { + easing: function(dt){ + return (dt === 0 || dt === 1) ? dt : -0.5 * (Math.cos(Math.PI * dt) - 1); + }, + reverse: function(){ + return cc._easeSineInOutObj; + } +}; + /** - * Ease Elastic abstract class + * creates the action easing object.
+ * Reference easeInOutSine:
+ * {@link http://www.zhihu.com/question/21981571/answer/19925418} + * @return {Object} + * @example + * // example + * action.easing(cc.easeSineInOut()); + */ +cc.easeSineInOut = function(){ + return cc._easeSineInOutObj; +}; + +/** + * Ease Elastic abstract class. * @class * @extends cc.ActionEase + * @param {cc.ActionInterval} action + * @param {Number} [period=0.3] + * + * @deprecated since v3.0 Does not recommend the use of the base object. */ cc.EaseElastic = cc.ActionEase.extend(/** @lends cc.EaseElastic# */{ _period: 0.3, - /** Creates the action with the inner action and the period in radians (default is 0.3) - * - * @constructor + /** + * Constructor function, override it to extend the construction behavior, remember to call "this._super()" in the extended "ctor" function.
+ * Creates the action with the inner action and the period in radians (default is 0.3). * @param {cc.ActionInterval} action * @param {Number} [period=0.3] - * - * @example - * // example - * var moveEaseElastic = new cc.EaseElastic(action, 3.0); */ ctor:function(action, period){ cc.ActionEase.prototype.ctor.call(this); @@ -577,21 +1109,24 @@ cc.EaseElastic = cc.ActionEase.extend(/** @lends cc.EaseElastic# */{ action && this.initWithAction(action, period); }, - /** get period of the wave in radians. default is 0.3 + /** + * get period of the wave in radians. default is 0.3 * @return {Number} */ getPeriod:function () { return this._period; }, - /** set period of the wave in radians. + /** + * set period of the wave in radians. * @param {Number} period */ setPeriod:function (period) { this._period = period; }, - /** Initializes the action with the inner action and the period in radians (default is 0.3) + /** + * Initializes the action with the inner action and the period in radians (default is 0.3) * @param {cc.ActionInterval} action * @param {Number} [period=0.3] * @return {Boolean} @@ -603,12 +1138,21 @@ cc.EaseElastic = cc.ActionEase.extend(/** @lends cc.EaseElastic# */{ }, /** - * @return {Null} + * Create a action. Opposite with the original motion trajectory.
+ * Will be overwrite. + * @return {null} */ reverse:function () { cc.log("cc.EaseElastic.reverse(): it should be overridden in subclass."); + return null; }, + /** + * to copy object with deep copy. + * returns a clone of action. + * + * @returns {cc.EaseElastic} + */ clone:function(){ var action = new cc.EaseElastic(); action.initWithAction(this._inner.clone(), this._period); @@ -616,47 +1160,66 @@ cc.EaseElastic = cc.ActionEase.extend(/** @lends cc.EaseElastic# */{ } }); -/** Creates the action with the inner action and the period in radians (default is 0.3) +/** + * Creates the action with the inner action and the period in radians (default is 0.3). + * @static + * @deprecated since v3.0 Does not recommend the use of the base object. * @param {cc.ActionInterval} action * @param {Number} [period=0.3] * @return {cc.EaseElastic} - * @example - * // example - * var moveEaseElastic = cc.EaseElastic.create(action, 3.0); */ cc.EaseElastic.create = function (action, period) { return new cc.EaseElastic(action, period); }; /** - * Ease Elastic In action. - * @warning This action doesn't use a bijective fucntion. Actions like Sequence might have an unexpected result when used with this action. + * Ease Elastic In action.
+ * Reference easeInElastic:
+ * {@link http://www.zhihu.com/question/21981571/answer/19925418} + * @warning This action doesn't use a bijective function. Actions like Sequence might have an unexpected result when used with this action. * @class * @extends cc.EaseElastic + * + * @deprecated since v3.0 please use action.easing(cc.easeElasticIn()) + * + * @example + * //The old usage + * cc.EaseElasticIn.create(action, period); + * //The new usage + * action.easing(cc.easeElasticIn(period)); */ cc.EaseElasticIn = cc.EaseElastic.extend(/** @lends cc.EaseElasticIn# */{ /** - * @param {Number} time1 + * Called once per frame. Time is the number of seconds of a frame interval. + * + * @param {Number} dt */ - update:function (time1) { + update:function (dt) { var newT = 0; - if (time1 === 0 || time1 === 1) { - newT = time1; + if (dt === 0 || dt === 1) { + newT = dt; } else { var s = this._period / 4; - time1 = time1 - 1; - newT = -Math.pow(2, 10 * time1) * Math.sin((time1 - s) * Math.PI * 2 / this._period); + dt = dt - 1; + newT = -Math.pow(2, 10 * dt) * Math.sin((dt - s) * Math.PI * 2 / this._period); } this._inner.update(newT); }, /** - * @return {cc.ActionInterval} + * Create a action. Opposite with the original motion trajectory. + * @return {cc.EaseElasticOut} */ reverse:function () { - return cc.EaseElasticOut.create(this._inner.reverse(), this._period); + return new cc.EaseElasticOut(this._inner.reverse(), this._period); }, + /** + * to copy object with deep copy. + * returns a clone of action. + * + * @returns {cc.EaseElasticIn} + */ clone:function(){ var action = new cc.EaseElasticIn(); action.initWithAction(this._inner.clone(), this._period); @@ -664,48 +1227,116 @@ cc.EaseElasticIn = cc.EaseElastic.extend(/** @lends cc.EaseElasticIn# */{ } }); - -/** Creates the action with the inner action and the period in radians (default is 0.3) +/** + * Creates the action with the inner action and the period in radians (default is 0.3).
+ * Reference easeInElastic:
+ * {@link http://www.zhihu.com/question/21981571/answer/19925418} + * @deprecated since v3.0
Please use action.easing(cc.easeElasticIn(period)) + * + * @example + * //The old usage + * cc.EaseElasticIn.create(action, period); + * //The new usage + * action.easing(cc.easeElasticIn(period)); + * * @param {cc.ActionInterval} action - * @param {Number} [period=] + * @param {Number} [period=0.3] * @return {cc.EaseElasticIn} - * @example - * // example - * var moveEaseElasticIn = cc.EaseElasticIn.create(action, 3.0); */ cc.EaseElasticIn.create = function (action, period) { return new cc.EaseElasticIn(action, period); }; +//default ease elastic in object (period = 0.3) +cc._easeElasticInObj = { + easing:function(dt){ + if (dt === 0 || dt === 1) + return dt; + dt = dt - 1; + return -Math.pow(2, 10 * dt) * Math.sin((dt - (0.3 / 4)) * Math.PI * 2 / 0.3); + }, + reverse:function(){ + return cc._easeElasticOutObj; + } +}; + +/** + * Creates the action easing obejct with the period in radians (default is 0.3).
+ * Reference easeInElastic:
+ * {@link http://www.zhihu.com/question/21981571/answer/19925418} + * @function + * @param {Number} [period=0.3] + * @return {Object} + * @example + * // example + * action.easing(cc.easeElasticIn(3.0)); + */ +cc.easeElasticIn = function (period) { + if(period && period !== 0.3){ + return { + _period: period, + easing: function (dt) { + if (dt === 0 || dt === 1) + return dt; + dt = dt - 1; + return -Math.pow(2, 10 * dt) * Math.sin((dt - (this._period / 4)) * Math.PI * 2 / this._period); + }, + reverse:function () { + return cc.easeElasticOut(this._period); + } + }; + } + return cc._easeElasticInObj; +}; + /** - * Ease Elastic Out action. + * Ease Elastic Out action.
+ * Reference easeOutElastic:
+ * {@link http://www.zhihu.com/question/21981571/answer/19925418} * @warning This action doesn't use a bijective function. Actions like Sequence might have an unexpected result when used with this action. * @class * @extends cc.EaseElastic + * + * @deprecated since v3.0
Please use action.easing(cc.easeElasticOut(period)) + * + * @example + * //The old usage + * cc.EaseElasticOut.create(action, period); + * //The new usage + * action.easing(cc.easeElasticOut(period)); */ cc.EaseElasticOut = cc.EaseElastic.extend(/** @lends cc.EaseElasticOut# */{ /** - * @param {Number} time1 + * Called once per frame. Time is the number of seconds of a frame interval. + * + * @param {Number} dt */ - update:function (time1) { + update:function (dt) { var newT = 0; - if (time1 === 0 || time1 == 1) { - newT = time1; + if (dt === 0 || dt === 1) { + newT = dt; } else { var s = this._period / 4; - newT = Math.pow(2, -10 * time1) * Math.sin((time1 - s) * Math.PI * 2 / this._period) + 1; + newT = Math.pow(2, -10 * dt) * Math.sin((dt - s) * Math.PI * 2 / this._period) + 1; } this._inner.update(newT); }, /** - * @return {cc.ActionInterval} + * Create a action. Opposite with the original motion trajectory. + * @return {cc.EaseElasticIn} */ reverse:function () { - return cc.EaseElasticIn.create(this._inner.reverse(), this._period); + return new cc.EaseElasticIn(this._inner.reverse(), this._period); }, + /** + * to copy object with deep copy. + * returns a clone of action. + * + * @returns {cc.EaseElasticOut} + */ clone:function(){ var action = new cc.EaseElasticOut(); action.initWithAction(this._inner.clone(), this._period); @@ -713,56 +1344,116 @@ cc.EaseElasticOut = cc.EaseElastic.extend(/** @lends cc.EaseElasticOut# */{ } }); - -/** Creates the action with the inner action and the period in radians (default is 0.3) +/** + * Creates the action with the inner action and the period in radians (default is 0.3).
+ * Reference easeOutElastic:
+ * {@link http://www.zhihu.com/question/21981571/answer/19925418} + * @deprecated since v3.0
Please use action.easing(cc.easeElasticOut(period)) * @param {cc.ActionInterval} action * @param {Number} [period=0.3] * @return {cc.EaseElasticOut} + * * @example - * // example - * var moveEaseElasticOut = cc.EaseElasticOut.create(action, 3.0); + * //The old usage + * cc.EaseElasticOut.create(action, period); + * //The new usage + * action.easing(cc.easeElasticOut(period)); */ cc.EaseElasticOut.create = function (action, period) { return new cc.EaseElasticOut(action, period); }; +//default ease elastic out object (period = 0.3) +cc._easeElasticOutObj = { + easing: function (dt) { + return (dt === 0 || dt === 1) ? dt : Math.pow(2, -10 * dt) * Math.sin((dt - (0.3 / 4)) * Math.PI * 2 / 0.3) + 1; + }, + reverse:function(){ + return cc._easeElasticInObj; + } +}; +/** + * Creates the action easing object with the period in radians (default is 0.3).
+ * Reference easeOutElastic:
+ * {@link http://www.zhihu.com/question/21981571/answer/19925418} + * @function + * @param {Number} [period=0.3] + * @return {Object} + * @example + * // example + * action.easing(cc.easeElasticOut(3.0)); + */ +cc.easeElasticOut = function (period) { + if(period && period !== 0.3){ + return { + _period: period, + easing: function (dt) { + return (dt === 0 || dt === 1) ? dt : Math.pow(2, -10 * dt) * Math.sin((dt - (this._period / 4)) * Math.PI * 2 / this._period) + 1; + }, + reverse:function(){ + return cc.easeElasticIn(this._period); + } + }; + } + return cc._easeElasticOutObj; +}; + /** - * Ease Elastic InOut action. + * Ease Elastic InOut action.
+ * Reference easeInOutElastic:
+ * {@link http://www.zhihu.com/question/21981571/answer/19925418} * @warning This action doesn't use a bijective function. Actions like Sequence might have an unexpected result when used with this action. * @class * @extends cc.EaseElastic + * + * @deprecated since v3.0 please use action.easing(cc.easeElasticInOut()) + * + * @example + * //The old usage + * cc.EaseElasticInOut.create(action, period); + * //The new usage + * action.easing(cc.easeElasticInOut(period)); */ cc.EaseElasticInOut = cc.EaseElastic.extend(/** @lends cc.EaseElasticInOut# */{ /** - * @param {Number} time1 + * Called once per frame. Time is the number of seconds of a frame interval. + * + * @param {Number} dt */ - update:function (time1) { + update:function (dt) { var newT = 0; - var locPeriod = this._period - if (time1 === 0 || time1 == 1) { - newT = time1; + var locPeriod = this._period; + if (dt === 0 || dt === 1) { + newT = dt; } else { - time1 = time1 * 2; + dt = dt * 2; if (!locPeriod) locPeriod = this._period = 0.3 * 1.5; var s = locPeriod / 4; - time1 = time1 - 1; - if (time1 < 0) - newT = -0.5 * Math.pow(2, 10 * time1) * Math.sin((time1 - s) * Math.PI * 2 / locPeriod); + dt = dt - 1; + if (dt < 0) + newT = -0.5 * Math.pow(2, 10 * dt) * Math.sin((dt - s) * Math.PI * 2 / locPeriod); else - newT = Math.pow(2, -10 * time1) * Math.sin((time1 - s) * Math.PI * 2 / locPeriod) * 0.5 + 1; + newT = Math.pow(2, -10 * dt) * Math.sin((dt - s) * Math.PI * 2 / locPeriod) * 0.5 + 1; } this._inner.update(newT); }, /** - * @return {cc.ActionInterval} + * Create a action. Opposite with the original motion trajectory. + * @return {cc.EaseElasticInOut} */ reverse:function () { - return cc.EaseElasticInOut.create(this._inner.reverse(), this._period); + return new cc.EaseElasticInOut(this._inner.reverse(), this._period); }, + /** + * to copy object with deep copy. + * returns a clone of action. + * + * @returns {cc.EaseElasticInOut} + */ clone:function(){ var action = new cc.EaseElasticInOut(); action.initWithAction(this._inner.clone(), this._period); @@ -770,24 +1461,73 @@ cc.EaseElasticInOut = cc.EaseElastic.extend(/** @lends cc.EaseElasticInOut# */{ } }); -/** Creates the action with the inner action and the period in radians (default is 0.3) +/** + * Creates the action with the inner action and the period in radians (default is 0.3).
+ * Reference easeInOutElastic:
+ * {@link http://www.zhihu.com/question/21981571/answer/19925418} + * @deprecated since v3.0
Please use action.easing(cc.easeElasticInOut(period)) * @param {cc.ActionInterval} action * @param {Number} [period=0.3] * @return {cc.EaseElasticInOut} + * * @example - * // example - * var moveEaseElasticInOut = cc.EaseElasticInOut.create(action, 3.0); + * //The old usage + * cc.EaseElasticInOut.create(action, period); + * //The new usage + * action.easing(cc.easeElasticInOut(period)); */ cc.EaseElasticInOut.create = function (action, period) { return new cc.EaseElasticInOut(action, period); }; /** - * cc.EaseBounce abstract class. - * @class - * @extends cc.ActionEase - */ -cc.EaseBounce = cc.ActionEase.extend(/** @lends cc.EaseBounce# */{ + * Creates the action easing object with the period in radians (default is 0.3).
+ * Reference easeInOutElastic:
+ * {@link http://www.zhihu.com/question/21981571/answer/19925418} + * @function + * @param {Number} [period=0.3] + * @return {Object} + * @example + * // example + * action.easing(cc.easeElasticInOut(3.0)); + */ +cc.easeElasticInOut = function (period) { + period = period || 0.3; + return { + _period: period, + easing: function (dt) { + var newT = 0; + var locPeriod = this._period; + if (dt === 0 || dt === 1) { + newT = dt; + } else { + dt = dt * 2; + if (!locPeriod) + locPeriod = this._period = 0.3 * 1.5; + var s = locPeriod / 4; + dt = dt - 1; + if (dt < 0) + newT = -0.5 * Math.pow(2, 10 * dt) * Math.sin((dt - s) * Math.PI * 2 / locPeriod); + else + newT = Math.pow(2, -10 * dt) * Math.sin((dt - s) * Math.PI * 2 / locPeriod) * 0.5 + 1; + } + return newT; + }, + reverse: function(){ + return cc.easeElasticInOut(this._period); + } + }; +}; + +/** + * cc.EaseBounce abstract class. + * + * @deprecated since v3.0 Does not recommend the use of the base object. + * + * @class + * @extends cc.ActionEase + */ +cc.EaseBounce = cc.ActionEase.extend(/** @lends cc.EaseBounce# */{ /** * @param {Number} time1 * @return {Number} @@ -807,6 +1547,12 @@ cc.EaseBounce = cc.ActionEase.extend(/** @lends cc.EaseBounce# */{ return 7.5625 * time1 * time1 + 0.984375; }, + /** + * to copy object with deep copy. + * returns a clone of action. + * + * @returns {cc.EaseBounce} + */ clone:function(){ var action = new cc.EaseBounce(); action.initWithAction(this._inner.clone()); @@ -814,46 +1560,65 @@ cc.EaseBounce = cc.ActionEase.extend(/** @lends cc.EaseBounce# */{ }, /** - * @return {cc.ActionInterval} + * Create a action. Opposite with the original motion trajectory. + * @return {cc.EaseBounce} */ reverse:function () { - return cc.EaseBounce.create(this._inner.reverse()); + return new cc.EaseBounce(this._inner.reverse()); } }); -/** creates the action +/** + * Creates an ease bounce action. + * @static + * @deprecated since v3.0 Does not recommend the use of the base object. * @param {cc.ActionInterval} action * @return {cc.EaseBounce} - * @example - * // example - * var moveEaseBounce = cc.EaseBounce.create(action); */ cc.EaseBounce.create = function (action) { return new cc.EaseBounce(action); }; /** - * cc.EaseBounceIn action. + * cc.EaseBounceIn action.
+ * Eased bounce effect at the beginning. * @warning This action doesn't use a bijective function. Actions like Sequence might have an unexpected result when used with this action. * @class * @extends cc.EaseBounce + * + * @deprecated since v3.0 please use action.easing(cc.easeBounceIn()) + * + * @example + * //The old usage + * cc.EaseBounceIn.create(action); + * //The new usage + * action.easing(cc.easeBounceIn()); */ cc.EaseBounceIn = cc.EaseBounce.extend(/** @lends cc.EaseBounceIn# */{ /** - * @param {Number} time1 + * Called once per frame. Time is the number of seconds of a frame interval. + * + * @param {Number} dt */ - update:function (time1) { - var newT = 1 - this.bounceTime(1 - time1); + update:function (dt) { + var newT = 1 - this.bounceTime(1 - dt); this._inner.update(newT); }, /** - * @return {cc.ActionInterval} + * Create a action. Opposite with the original motion trajectory. + * @return {cc.EaseBounceOut} */ reverse:function () { - return cc.EaseBounceOut.create(this._inner.reverse()); + return new cc.EaseBounceOut(this._inner.reverse()); }, + /** + * to copy object with deep copy. + * returns a clone of action. + * + * @returns {cc.EaseBounceIn} + */ clone:function(){ var action = new cc.EaseBounceIn(); action.initWithAction(this._inner.clone()); @@ -861,38 +1626,101 @@ cc.EaseBounceIn = cc.EaseBounce.extend(/** @lends cc.EaseBounceIn# */{ } }); -/** creates the action +/** + * Creates the action.
+ * Eased bounce effect at the beginning. + * @static + * @deprecated since v3.0
Please use action.easing(cc.easeBounceIn()) * @param {cc.ActionInterval} action * @return {cc.EaseBounceIn} + * * @example - * // example - * var moveEaseBounceIn = cc.EaseBounceIn.create(action); + * //The old usage + * cc.EaseBounceIn.create(action); + * //The new usage + * action.easing(cc.easeBounceIn()); */ cc.EaseBounceIn.create = function (action) { return new cc.EaseBounceIn(action); }; + +cc._bounceTime = function (time1) { + if (time1 < 1 / 2.75) { + return 7.5625 * time1 * time1; + } else if (time1 < 2 / 2.75) { + time1 -= 1.5 / 2.75; + return 7.5625 * time1 * time1 + 0.75; + } else if (time1 < 2.5 / 2.75) { + time1 -= 2.25 / 2.75; + return 7.5625 * time1 * time1 + 0.9375; + } + + time1 -= 2.625 / 2.75; + return 7.5625 * time1 * time1 + 0.984375; +}; + +cc._easeBounceInObj = { + easing: function(dt){ + return 1 - cc._bounceTime(1 - dt); + }, + reverse: function(){ + return cc._easeBounceOutObj; + } +}; + +/** + * Creates the action easing object.
+ * Eased bounce effect at the beginning. + * @function + * @return {Object} + * @example + * // example + * action.easing(cc.easeBounceIn()); + */ +cc.easeBounceIn = function(){ + return cc._easeBounceInObj; +}; + /** - * cc.EaseBounceOut action. - * @warning This action doesn't use a bijective fucntion. Actions like Sequence might have an unexpected result when used with this action. + * cc.EaseBounceOut action.
+ * Eased bounce effect at the ending. + * @warning This action doesn't use a bijective function. Actions like Sequence might have an unexpected result when used with this action. * @class * @extends cc.EaseBounce + * + * @deprecated since v3.0 please use action.easing(cc.easeBounceOut()) + * + * @example + * //The old usage + * cc.EaseBounceOut.create(action); + * //The new usage + * action.easing(cc.easeBounceOut()); */ cc.EaseBounceOut = cc.EaseBounce.extend(/** @lends cc.EaseBounceOut# */{ /** - * @param {Number} time1 + * Called once per frame. Time is the number of seconds of a frame interval. + * + * @param {Number} dt */ - update:function (time1) { - var newT = this.bounceTime(time1); + update:function (dt) { + var newT = this.bounceTime(dt); this._inner.update(newT); }, /** - * @return {cc.ActionInterval} + * Create a action. Opposite with the original motion trajectory. + * @return {cc.EaseBounceIn} */ reverse:function () { - return cc.EaseBounceIn.create(this._inner.reverse()); + return new cc.EaseBounceIn(this._inner.reverse()); }, + /** + * to copy object with deep copy. + * returns a clone of action. + * + * @returns {cc.EaseBounceOut} + */ clone:function(){ var action = new cc.EaseBounceOut(); action.initWithAction(this._inner.clone()); @@ -900,38 +1728,84 @@ cc.EaseBounceOut = cc.EaseBounce.extend(/** @lends cc.EaseBounceOut# */{ } }); -/** creates the action +/** + * Creates the action.
+ * Eased bounce effect at the ending. + * @static + * @deprecated since v3.0 please use action.easing(cc.easeBounceOut()) * @param {cc.ActionInterval} action * @return {cc.EaseBounceOut} + * * @example - * // example - * var moveEaseBounceOut = cc.EaseBounceOut.create(action); + * //The old usage + * cc.EaseBounceOut.create(action); + * //The new usage + * action.easing(cc.easeBounceOut()); */ cc.EaseBounceOut.create = function (action) { return new cc.EaseBounceOut(action); }; +cc._easeBounceOutObj = { + easing: function(dt){ + return cc._bounceTime(dt); + }, + reverse:function () { + return cc._easeBounceInObj; + } +}; + +/** + * Creates the action easing object.
+ * Eased bounce effect at the ending. + * @function + * @return {Object} + * @example + * // example + * action.easing(cc.easeBounceOut()); + */ +cc.easeBounceOut = function(){ + return cc._easeBounceOutObj; +}; + /** - * cc.EaseBounceInOut action. - * @warning This action doesn't use a bijective fucntion. Actions like Sequence might have an unexpected result when used with this action. + * cc.EaseBounceInOut action.
+ * Eased bounce effect at the begining and ending. + * @warning This action doesn't use a bijective function. Actions like Sequence might have an unexpected result when used with this action. * @class * @extends cc.EaseBounce + * + * @deprecated since v3.0
Please use acton.easing(cc.easeBounceInOut()) + * + * @example + * //The old usage + * cc.EaseBounceInOut.create(action); + * //The new usage + * action.easing(cc.easeBounceInOut()); */ cc.EaseBounceInOut = cc.EaseBounce.extend(/** @lends cc.EaseBounceInOut# */{ /** - * @param {Number} time1 + * Called once per frame. Time is the number of seconds of a frame interval. + * + * @param {Number} dt */ - update:function (time1) { + update:function (dt) { var newT = 0; - if (time1 < 0.5) { - time1 = time1 * 2; - newT = (1 - this.bounceTime(1 - time1)) * 0.5; + if (dt < 0.5) { + dt = dt * 2; + newT = (1 - this.bounceTime(1 - dt)) * 0.5; } else { - newT = this.bounceTime(time1 * 2 - 1) * 0.5 + 0.5; + newT = this.bounceTime(dt * 2 - 1) * 0.5 + 0.5; } this._inner.update(newT); }, + /** + * to copy object with deep copy. + * returns a clone of action. + * + * @returns {cc.EaseBounceInOut} + */ clone:function(){ var action = new cc.EaseBounceInOut(); action.initWithAction(this._inner.clone()); @@ -939,47 +1813,102 @@ cc.EaseBounceInOut = cc.EaseBounce.extend(/** @lends cc.EaseBounceInOut# */{ }, /** - * @return {cc.ActionInterval} + * Create a action. Opposite with the original motion trajectory. + * @return {cc.EaseBounceInOut} */ reverse:function () { - return cc.EaseBounceInOut.create(this._inner.reverse()); + return new cc.EaseBounceInOut(this._inner.reverse()); } }); -/** creates the action +/** + * Creates the action.
+ * Eased bounce effect at the begining and ending. + * @static + * @deprecated since v3.0
Please use action.easing(cc.easeBounceInOut()) * @param {cc.ActionInterval} action * @return {cc.EaseBounceInOut} + * * @example - * // example - * var moveEaseBounceInOut = cc.EaseBounceInOut.create(action); + * //The old usage + * cc.EaseBounceInOut.create(action); + * //The new usage + * action.easing(cc.easeBounceInOut()); */ cc.EaseBounceInOut.create = function (action) { return new cc.EaseBounceInOut(action); }; +cc._easeBounceInOutObj = { + easing: function (time1) { + var newT; + if (time1 < 0.5) { + time1 = time1 * 2; + newT = (1 - cc._bounceTime(1 - time1)) * 0.5; + } else { + newT = cc._bounceTime(time1 * 2 - 1) * 0.5 + 0.5; + } + return newT; + }, + reverse: function(){ + return cc._easeBounceInOutObj; + } +}; + +/** + * Creates the action easing object.
+ * Eased bounce effect at the begining and ending. + * @function + * @return {Object} + * @example + * // example + * action.easing(cc.easeBounceInOut()); + */ +cc.easeBounceInOut = function(){ + return cc._easeBounceInOutObj; +}; + /** - * cc.EaseBackIn action. - * @warning This action doesn't use a bijective fucntion. Actions like Sequence might have an unexpected result when used with this action. + * cc.EaseBackIn action.
+ * In the opposite direction to move slowly, and then accelerated to the right direction. + * @warning This action doesn't use a bijective function. Actions like Sequence might have an unexpected result when used with this action. * @class * @extends cc.ActionEase + * + * @deprecated since v3.0 please use action.easing(cc.easeBackIn()) + * + * @example + * //The old usage + * cc.EaseBackIn.create(action); + * //The new usage + * action.easing(cc.easeBackIn()); */ cc.EaseBackIn = cc.ActionEase.extend(/** @lends cc.EaseBackIn# */{ /** - * @param {Number} time1 + * Called once per frame. Time is the number of seconds of a frame interval. + * + * @param {Number} dt */ - update:function (time1) { + update:function (dt) { var overshoot = 1.70158; - time1 = time1===0 || time1==1 ? time1 : time1 * time1 * ((overshoot + 1) * time1 - overshoot); - this._inner.update(time1); + dt = dt===0 || dt===1 ? dt : dt * dt * ((overshoot + 1) * dt - overshoot); + this._inner.update(dt); }, /** - * @return {cc.ActionInterval} + * Create a action. Opposite with the original motion trajectory. + * @return {cc.EaseBackOut} */ reverse:function () { - return cc.EaseBackOut.create(this._inner.reverse()); + return new cc.EaseBackOut(this._inner.reverse()); }, + /** + * to copy object with deep copy. + * returns a clone of action. + * + * @returns {cc.EaseBackIn} + */ clone:function(){ var action = new cc.EaseBackIn(); action.initWithAction(this._inner.clone()); @@ -988,41 +1917,88 @@ cc.EaseBackIn = cc.ActionEase.extend(/** @lends cc.EaseBackIn# */{ }); -/** creates the action +/** + * Creates the cc.EaseBackIn.
+ * In the opposite direction to move slowly, and then accelerated to the right direction. + * @static + * @deprecated since v3.0
Please use action.easing(cc.easeBackIn()) * @param {cc.ActionInterval} action * @return {cc.EaseBackIn} + * * @example - * // example - * var moveEaseBackIn = cc.EaseBackIn.create(action); + * //The old usage + * cc.EaseBackIn.create(action); + * //The new usage + * action.easing(cc.easeBackIn()); */ cc.EaseBackIn.create = function (action) { return new cc.EaseBackIn(action); }; +cc._easeBackInObj = { + easing: function (time1) { + var overshoot = 1.70158; + return (time1===0 || time1===1) ? time1 : time1 * time1 * ((overshoot + 1) * time1 - overshoot); + }, + reverse: function(){ + return cc._easeBackOutObj; + } +}; + +/** + * Creates the action easing object.
+ * In the opposite direction to move slowly, and then accelerated to the right direction. + * @function + * @return {Object} + * @example + * // example + * action.easing(cc.easeBackIn()); + */ +cc.easeBackIn = function(){ + return cc._easeBackInObj; +}; + /** - * cc.EaseBackOut action. - * @warning This action doesn't use a bijective fucntion. Actions like Sequence might have an unexpected result when used with this action. + * cc.EaseBackOut action.
+ * Fast moving more than the finish, and then slowly back to the finish. + * @warning This action doesn't use a bijective function. Actions like Sequence might have an unexpected result when used with this action. * @class * @extends cc.ActionEase + * + * @deprecated since v3.0 please use action.easing(cc.easeBackOut()); + * + * @example + * //The old usage + * cc.EaseBackOut.create(action); + * //The new usage + * action.easing(cc.easeBackOut()); */ cc.EaseBackOut = cc.ActionEase.extend(/** @lends cc.EaseBackOut# */{ /** - * @param {Number} time1 + * Called once per frame. Time is the number of seconds of a frame interval. + * + * @param {Number} dt */ - update:function (time1) { + update:function (dt) { var overshoot = 1.70158; - - time1 = time1 - 1; - this._inner.update(time1 * time1 * ((overshoot + 1) * time1 + overshoot) + 1); + dt = dt - 1; + this._inner.update(dt * dt * ((overshoot + 1) * dt + overshoot) + 1); }, /** - * @return {cc.ActionInterval} + * Create a action. Opposite with the original motion trajectory. + * @return {cc.EaseBackIn} */ reverse:function () { - return cc.EaseBackIn.create(this._inner.reverse()); + return new cc.EaseBackIn(this._inner.reverse()); }, + /** + * to copy object with deep copy. + * returns a clone of action. + * + * @returns {cc.EaseBackOut} + */ clone:function(){ var action = new cc.EaseBackOut(); action.initWithAction(this._inner.clone()); @@ -1030,39 +2006,86 @@ cc.EaseBackOut = cc.ActionEase.extend(/** @lends cc.EaseBackOut# */{ } }); -/** creates the action +/** + * Creates the action.
+ * Fast moving more than the finish, and then slowly back to the finish. + * @static + * @deprecated since v3.0
Please use action.easing(cc.easeBackOut()); * @param {cc.ActionInterval} action * @return {cc.EaseBackOut} + * * @example - * // example - * var moveEaseBackOut = cc.EaseBackOut.create(action); + * //The old usage + * cc.EaseBackOut.create(action); + * //The new usage + * action.easing(cc.easeBackOut()); */ cc.EaseBackOut.create = function (action) { return new cc.EaseBackOut(action); }; +cc._easeBackOutObj = { + easing: function (time1) { + var overshoot = 1.70158; + time1 = time1 - 1; + return time1 * time1 * ((overshoot + 1) * time1 + overshoot) + 1; + }, + reverse: function(){ + return cc._easeBackInObj; + } +}; + +/** + * Creates the action easing object.
+ * Fast moving more than the finish, and then slowly back to the finish. + * @function + * @return {Object} + * @example + * // example + * action.easing(cc.easeBackOut()); + */ +cc.easeBackOut = function(){ + return cc._easeBackOutObj; +}; + /** - * cc.EaseBackInOut action. - * @warning This action doesn't use a bijective fucntion. Actions like Sequence might have an unexpected result when used with this action. + * cc.EaseBackInOut action.
+ * Begining of cc.EaseBackIn. Ending of cc.EaseBackOut. + * @warning This action doesn't use a bijective function. Actions like Sequence might have an unexpected result when used with this action. * @class * @extends cc.ActionEase + * + * @deprecated since v3.0
Please use action.easing(cc.easeBackInOut()) + * + * @example + * //The old usage + * cc.EaseBackInOut.create(action); + * //The new usage + * action.easing(cc.easeBackInOut()); */ cc.EaseBackInOut = cc.ActionEase.extend(/** @lends cc.EaseBackInOut# */{ /** - * @param {Number} time1 + * Called once per frame. Time is the number of seconds of a frame interval. + * + * @param {Number} dt */ - update:function (time1) { + update:function (dt) { var overshoot = 1.70158 * 1.525; - - time1 = time1 * 2; - if (time1 < 1) { - this._inner.update((time1 * time1 * ((overshoot + 1) * time1 - overshoot)) / 2); + dt = dt * 2; + if (dt < 1) { + this._inner.update((dt * dt * ((overshoot + 1) * dt - overshoot)) / 2); } else { - time1 = time1 - 2; - this._inner.update((time1 * time1 * ((overshoot + 1) * time1 + overshoot)) / 2 + 1); + dt = dt - 2; + this._inner.update((dt * dt * ((overshoot + 1) * dt + overshoot)) / 2 + 1); } }, + /** + * to copy object with deep copy. + * returns a clone of action. + * + * @returns {cc.EaseBackInOut} + */ clone:function(){ var action = new cc.EaseBackInOut(); action.initWithAction(this._inner.clone()); @@ -1070,22 +2093,1589 @@ cc.EaseBackInOut = cc.ActionEase.extend(/** @lends cc.EaseBackInOut# */{ }, /** - * @return {cc.ActionInterval} + * Create a action. Opposite with the original motion trajectory. + * @return {cc.EaseBackInOut} */ reverse:function () { - return cc.EaseBackInOut.create(this._inner.reverse()); + return new cc.EaseBackInOut(this._inner.reverse()); } }); -/** creates the action +/** + * Creates the action.
+ * Begining of cc.EaseBackIn. Ending of cc.EaseBackOut. + * @static * @param {cc.ActionInterval} action * @return {cc.EaseBackInOut} + * + * @deprecated since v3.0
Please use action.easing(cc.easeBackInOut()) + * * @example - * // example - * var moveEaseBackInOut = cc.EaseBackInOut.create(action); + * //The old usage + * cc.EaseBackInOut.create(action); + * //The new usage + * action.easing(cc.easeBackInOut()); */ cc.EaseBackInOut.create = function (action) { return new cc.EaseBackInOut(action); }; +cc._easeBackInOutObj = { + easing: function (time1) { + var overshoot = 1.70158 * 1.525; + time1 = time1 * 2; + if (time1 < 1) { + return (time1 * time1 * ((overshoot + 1) * time1 - overshoot)) / 2; + } else { + time1 = time1 - 2; + return (time1 * time1 * ((overshoot + 1) * time1 + overshoot)) / 2 + 1; + } + }, + reverse: function(){ + return cc._easeBackInOutObj; + } +}; + +/** + * Creates the action easing object.
+ * Begining of cc.EaseBackIn. Ending of cc.EaseBackOut. + * @function + * @return {Object} + * @example + * // example + * action.easing(cc.easeBackInOut()); + */ +cc.easeBackInOut = function(){ + return cc._easeBackInOutObj; +}; + +/** + * cc.EaseBezierAction action.
+ * Manually set a 4 order Bessel curve.
+ * According to the set point, calculate the trajectory. + * @class + * @extends cc.ActionEase + * @param {cc.Action} action + * + * @deprecated since v3.0
Please use action.easing(cc.easeBezierAction()) + * + * @example + * //The old usage + * var action = cc.EaseBezierAction.create(action); + * action.setBezierParamer(0.5, 0.5, 1.0, 1.0); + * //The new usage + * action.easing(cc.easeBezierAction(0.5, 0.5, 1.0, 1.0)); + */ +cc.EaseBezierAction = cc.ActionEase.extend(/** @lends cc.EaseBezierAction# */{ + + _p0: null, + _p1: null, + _p2: null, + _p3: null, + + /** + * Constructor function, override it to extend the construction behavior, remember to call "this._super()" in the extended "ctor" function.
+ * Initialization requires the application of Bessel curve of action. + * @param {cc.Action} action + */ + ctor: function(action){ + cc.ActionEase.prototype.ctor.call(this, action); + }, + + _updateTime: function(a, b, c, d, t){ + return (Math.pow(1-t,3) * a + 3*t*(Math.pow(1-t,2))*b + 3*Math.pow(t,2)*(1-t)*c + Math.pow(t,3)*d ); + }, + + /** + * Called once per frame. Time is the number of seconds of a frame interval. + * + * @param {Number} dt + */ + update: function(dt){ + var t = this._updateTime(this._p0, this._p1, this._p2, this._p3, dt); + this._inner.update(t); + }, + + /** + * to copy object with deep copy. + * returns a clone of action. + * + * @returns {cc.EaseBezierAction} + */ + clone: function(){ + var action = new cc.EaseBezierAction(); + action.initWithAction(this._inner.clone()); + action.setBezierParamer(this._p0, this._p1, this._p2, this._p3); + return action; + }, + + /** + * Create a action. Opposite with the original motion trajectory. + * @return {cc.EaseBezierAction} + */ + reverse: function(){ + var action = new cc.EaseBezierAction(this._inner.reverse()); + action.setBezierParamer(this._p3, this._p2, this._p1, this._p0); + return action; + }, + + /** + * Set of 4 reference point + * @param p0 + * @param p1 + * @param p2 + * @param p3 + */ + setBezierParamer: function(p0, p1, p2, p3){ + this._p0 = p0 || 0; + this._p1 = p1 || 0; + this._p2 = p2 || 0; + this._p3 = p3 || 0; + } +}); + +/** + * Creates the action.
+ * After creating the cc.EaseBezierAction, also need to manually call setBezierParamer.
+ * According to the set point, calculate the trajectory. + * @static + * @param action + * @returns {cc.EaseBezierAction} + * + * @deprecated since v3.0
Please use action.easing(cc.easeBezierAction()) + * + * @example + * //The old usage + * var action = cc.EaseBezierAction.create(action); + * action.setBezierParamer(0.5, 0.5, 1.0, 1.0); + * //The new usage + * action.easing(cc.easeBezierAction(0.5, 0.5, 1.0, 1.0)); + */ +cc.EaseBezierAction.create = function(action){ + return new cc.EaseBezierAction(action); +}; + +/** + * Creates the action easing object.
+ * Into the 4 reference point.
+ * To calculate the motion curve. + * @param {Number} p0 The first bezier parameter + * @param {Number} p1 The second bezier parameter + * @param {Number} p2 The third bezier parameter + * @param {Number} p3 The fourth bezier parameter + * @returns {Object} + * @example + * // example + * action.easing(cc.easeBezierAction(0.5, 0.5, 1.0, 1.0)); + */ +cc.easeBezierAction = function(p0, p1, p2, p3){ + return { + easing: function(time){ + return cc.EaseBezierAction.prototype._updateTime(p0, p1, p2, p3, time); + }, + reverse: function(){ + return cc.easeBezierAction(p3, p2, p1, p0); + } + }; +}; + +/** + * cc.EaseQuadraticActionIn action.
+ * Reference easeInQuad:
+ * {@link http://www.zhihu.com/question/21981571/answer/19925418} + * @class + * @extends cc.ActionEase + * + * @deprecated since v3.0
Please use action.easing(cc.easeQuadraticAction()) + * + * @example + * //The old usage + * cc.EaseQuadraticActionIn.create(action); + * //The new usage + * action.easing(cc.easeQuadraticActionIn()); + */ +cc.EaseQuadraticActionIn = cc.ActionEase.extend(/** @lends cc.EaseQuadraticActionIn# */{ + + _updateTime: function(time){ + return Math.pow(time, 2); + }, + + /** + * Called once per frame. Time is the number of seconds of a frame interval. + * + * @param {Number} dt + */ + update: function(dt){ + this._inner.update(this._updateTime(dt)); + }, + + /** + * to copy object with deep copy. + * returns a clone of action. + * + * @returns {cc.EaseQuadraticActionIn} + */ + clone: function(){ + var action = new cc.EaseQuadraticActionIn(); + action.initWithAction(this._inner.clone()); + return action; + }, + + /** + * Create a action. Opposite with the original motion trajectory. + * @return {cc.EaseQuadraticActionIn} + */ + reverse: function(){ + return new cc.EaseQuadraticActionIn(this._inner.reverse()); + } + +}); + +/** + * Creates the cc.EaseQuadRaticActionIn.
+ * Reference easeInQuad:
+ * {@link http://www.zhihu.com/question/21981571/answer/19925418} + * @static + * @param action + * @returns {cc.EaseQuadraticActionIn} + * + * @deprecated since v3.0
Please use action.easing(cc.easeQuadraticAction()) + * + * @example + * //The old usage + * cc.EaseQuadraticActionIn.create(action); + * //The new usage + * action.easing(cc.easeQuadraticActionIn()); + */ +cc.EaseQuadraticActionIn.create = function(action){ + return new cc.EaseQuadraticActionIn(action); +}; + +cc._easeQuadraticActionIn = { + easing: cc.EaseQuadraticActionIn.prototype._updateTime, + reverse: function(){ + return cc._easeQuadraticActionIn; + } +}; + +/** + * Creates the action easing object.
+ * Reference easeInQuad:
+ * {@link http://www.zhihu.com/question/21981571/answer/19925418} + * @returns {Object} + * @example + * //example + * action.easing(cc.easeQuadraticActionIn()); + */ +cc.easeQuadraticActionIn = function(){ + return cc._easeQuadraticActionIn; +}; + +/** + * cc.EaseQuadraticActionIn action.
+ * Reference easeOutQuad:
+ * {@link http://www.zhihu.com/question/21981571/answer/19925418} + * @class + * @extends cc.ActionEase + * + * @deprecated since v3.0
Please use action.easing(cc.easeQuadraticActionOut()) + * + * @example + * //The old usage + * cc.EaseQuadraticActionOut.create(action); + * //The new usage + * action.easing(cc.easeQuadraticActionOut()); + */ +cc.EaseQuadraticActionOut = cc.ActionEase.extend(/** @lends cc.EaseQuadraticActionOut# */{ + + _updateTime: function(time){ + return -time*(time-2); + }, + + /** + * Called once per frame. Time is the number of seconds of a frame interval. + * + * @param {Number} dt + */ + update: function(dt){ + this._inner.update(this._updateTime(dt)); + }, + + /** + * to copy object with deep copy. + * returns a clone of action. + * + * @returns {cc.EaseQuadraticActionOut} + */ + clone: function(){ + var action = new cc.EaseQuadraticActionOut(); + action.initWithAction(); + return action; + }, + + /** + * Create a action. Opposite with the original motion trajectory. + * @return {cc.EaseQuadraticActionOut} + */ + reverse: function(){ + return new cc.EaseQuadraticActionOut(this._inner.reverse()); + } +}); + +/** + * Creates the action.
+ * Reference easeOutQuad:
+ * {@link http://www.zhihu.com/question/21981571/answer/19925418} + * @static + * @param action + * @returns {cc.EaseQuadraticActionOut} + * + * @deprecated since v3.0
Please use action.easing(cc.easeQuadraticActionOut()) + * + * @example + * //The old usage + * cc.EaseQuadraticActionOut.create(action); + * //The new usage + * action.easing(cc.easeQuadraticActionOut()); + */ +cc.EaseQuadraticActionOut.create = function(action){ + return new cc.EaseQuadraticActionOut(action); +}; + +cc._easeQuadraticActionOut = { + easing: cc.EaseQuadraticActionOut.prototype._updateTime, + reverse: function(){ + return cc._easeQuadraticActionOut; + } +}; +/** + * Creates the action easing object.
+ * Reference easeOutQuad:
+ * {@link http://www.zhihu.com/question/21981571/answer/19925418} + * @function + * @returns {Object} + * @example + * //example + * action.easing(cc.easeQuadraticActionOut()); + */ +cc.easeQuadraticActionOut = function(){ + return cc._easeQuadraticActionOut; +}; + +/** + * cc.EaseQuadraticActionInOut action.
+ * Reference easeInOutQuad:
+ * {@link http://www.zhihu.com/question/21981571/answer/19925418} + * @class + * @extends cc.ActionEase + * + * @deprecated since v3.0
Please use action.easing(cc.easeQuadraticActionInOut()) + * + * @example + * //The old usage + * cc.EaseQuadraticActionInOut.create(action); + * //The new usage + * action.easing(cc.easeQuadraticActionInOut()); + */ +cc.EaseQuadraticActionInOut = cc.ActionEase.extend(/** @lends cc.EaseQuadraticActionInOut# */{ + _updateTime: function(time){ + var resultTime = time; + time *= 2; + if(time < 1){ + resultTime = time * time * 0.5; + }else{ + --time; + resultTime = -0.5 * ( time * ( time - 2 ) - 1) + } + return resultTime; + }, + + /** + * Called once per frame. Time is the number of seconds of a frame interval. + * + * @param {Number} dt + */ + update: function(dt){ + this._inner.update(this._updateTime(dt)); + }, + + /** + * to copy object with deep copy. + * returns a clone of action. + * + * @returns {cc.EaseQuadraticActionInOut} + */ + clone: function(){ + var action = new cc.EaseQuadraticActionInOut(); + action.initWithAction(this._inner.clone()); + return action; + }, + + /** + * Create a action. Opposite with the original motion trajectory. + * @return {cc.EaseQuadraticActionInOut} + */ + reverse: function(){ + return new cc.EaseQuadraticActionInOut(this._inner.reverse()); + } +}); + +/** + * Creates the action.
+ * Reference easeInOutQuad:
+ * {@link http://www.zhihu.com/question/21981571/answer/19925418} + * @static + * + * @deprecated since v3.0
Please use action.easing(cc.easeQuadraticActionInOut()) + * + * @example + * //The old usage + * cc.EaseQuadraticActionInOut.create(action); + * //The new usage + * action.easing(cc.easeQuadraticActionInOut()); + * + * @param action + * @returns {cc.EaseQuadraticActionInOut} + */ +cc.EaseQuadraticActionInOut.create = function(action){ + return new cc.EaseQuadraticActionInOut(action); +}; + +cc._easeQuadraticActionInOut = { + easing: cc.EaseQuadraticActionInOut.prototype._updateTime, + reverse: function(){ + return cc._easeQuadraticActionInOut; + } +}; + +/** + * Creates the action easing object.
+ * Reference easeInOutQuad:
+ * {@link http://www.zhihu.com/question/21981571/answer/19925418} + * @function + * @returns {Object} + * @example + * //example + * action.easing(cc.easeQuadraticActionInOut()); + */ +cc.easeQuadraticActionInOut = function(){ + return cc._easeQuadraticActionInOut; +}; + +/** + * cc.EaseQuarticActionIn action.
+ * Reference easeInQuart:
+ * {@link http://www.zhihu.com/question/21981571/answer/19925418} + * @class + * @extends cc.ActionEase + * + * @deprecated since v3.0
Please use action.easing(cc.easeQuarticActionIn()); + * + * @example + * //The old usage + * cc.EaseQuarticActionIn.create(action); + * //The new usage + * action.easing(cc.easeQuarticActionIn()); + */ +cc.EaseQuarticActionIn = cc.ActionEase.extend(/** @lends cc.EaseQuarticActionIn# */{ + _updateTime: function(time){ + return time * time * time * time; + }, + + /** + * Called once per frame. Time is the number of seconds of a frame interval. + * + * @param {Number} dt + */ + update: function(dt){ + this._inner.update(this._updateTime(dt)); + }, + + /** + * to copy object with deep copy. + * returns a clone of action. + * + * @returns {cc.EaseQuarticActionIn} + */ + clone: function(){ + var action = new cc.EaseQuarticActionIn(); + action.initWithAction(this._inner.clone()); + return action; + }, + + /** + * Create a action. Opposite with the original motion trajectory. + * @return {cc.EaseQuarticActionIn} + */ + reverse: function(){ + return new cc.EaseQuarticActionIn(this._inner.reverse()); + } +}); + +/** + * Creates the action.
+ * Reference easeInQuart:
+ * {@link http://www.zhihu.com/question/21981571/answer/19925418} + * @static + * + * @deprecated since v3.0
Please use action.easing(cc.easeQuarticActionIn()); + * + * @example + * //The old usage + * cc.EaseQuarticActionIn.create(action); + * //The new usage + * action.easing(cc.easeQuarticActionIn()); + * + * @param action + * @returns {cc.EaseQuarticActionIn} + */ +cc.EaseQuarticActionIn.create = function(action){ + return new cc.EaseQuarticActionIn(action); +}; + +cc._easeQuarticActionIn = { + easing: cc.EaseQuarticActionIn.prototype._updateTime, + reverse: function(){ + return cc._easeQuarticActionIn; + } +}; +/** + * Creates the action easing object.
+ * Reference easeIntQuart:
+ * {@link http://www.zhihu.com/question/21981571/answer/19925418} + * @function + * @returns {Object} + * @example + * //example + * action.easing(cc.easeQuarticActionIn()); + */ +cc.easeQuarticActionIn = function(){ + return cc._easeQuarticActionIn; +}; + +/** + * cc.EaseQuarticActionOut action.
+ * Reference easeOutQuart:
+ * {@link http://www.zhihu.com/question/21981571/answer/19925418} + * @class + * @extends cc.ActionEase + * + * @deprecated since v3.0
Please use action.easing(cc.QuarticActionOut()); + * + * @example + * //The old usage + * cc.EaseQuarticActionOut.create(action); + * //The new usage + * action.easing(cc.EaseQuarticActionOut()); + */ +cc.EaseQuarticActionOut = cc.ActionEase.extend(/** @lends cc.EaseQuarticActionOut# */{ + _updateTime: function(time){ + time -= 1; + return -(time * time * time * time - 1); + }, + + /** + * Called once per frame. Time is the number of seconds of a frame interval. + * + * @param {Number} dt + */ + update: function(dt){ + this._inner.update(this._updateTime(dt)); + }, + + /** + * to copy object with deep copy. + * returns a clone of action. + * + * @returns {cc.EaseQuarticActionOut} + */ + clone: function(){ + var action = new cc.EaseQuarticActionOut(); + action.initWithAction(this._inner.clone()); + return action; + }, + + /** + * Create a action. Opposite with the original motion trajectory. + * @return {cc.EaseQuarticActionOut} + */ + reverse: function(){ + return new cc.EaseQuarticActionOut(this._inner.reverse()); + } +}); + +/** + * Creates the action.
+ * Reference easeOutQuart:
+ * {@link http://www.zhihu.com/question/21981571/answer/19925418} + * @static + * + * @deprecated since v3.0
Please use action.easing(cc.QuarticActionOut()); + * + * @example + * //The old usage + * cc.EaseQuarticActionOut.create(action); + * //The new usage + * action.easing(cc.EaseQuarticActionOut()); + * + * @param action + * @returns {cc.EaseQuarticActionOut} + */ +cc.EaseQuarticActionOut.create = function(action){ + return new cc.EaseQuarticActionOut(action); +}; + +cc._easeQuarticActionOut = { + easing: cc.EaseQuarticActionOut.prototype._updateTime, + reverse: function(){ + return cc._easeQuarticActionOut; + } +}; + +/** + * Creates the action easing object.
+ * Reference easeOutQuart:
+ * {@link http://www.zhihu.com/question/21981571/answer/19925418} + * @function + * @returns {Object} + * @example + * //example + * action.easing(cc.QuarticActionOut()); + */ +cc.easeQuarticActionOut = function(){ + return cc._easeQuarticActionOut; +}; + +/** + * cc.EaseQuarticActionInOut action.
+ * Reference easeInOutQuart:
+ * {@link http://www.zhihu.com/question/21981571/answer/19925418} + * @class + * @extends cc.ActionEase + * + * @deprecated since v3.0
Please use action.easing(cc.easeQuarticActionInOut()); + * + * @example + * //The old usage + * cc.EaseQuarticActionInOut.create(action); + * //The new usage + * action.easing(cc.easeQuarticActionInOut()); + */ +cc.EaseQuarticActionInOut = cc.ActionEase.extend(/** @lends cc.EaseQuarticActionInOut# */{ + _updateTime: function(time){ + time = time*2; + if (time < 1) + return 0.5 * time * time * time * time; + time -= 2; + return -0.5 * (time * time * time * time - 2); + }, + + /** + * Called once per frame. Time is the number of seconds of a frame interval. + * + * @param {Number} dt + */ + update: function(dt){ + this._inner.update(this._updateTime(dt)); + }, + + /** + * to copy object with deep copy. + * returns a clone of action. + * + * @returns {cc.EaseQuarticActionInOut} + */ + clone: function(){ + var action = new cc.EaseQuarticActionInOut(); + action.initWithAction(this._inner.clone()); + return action; + }, + + /** + * Create a action. Opposite with the original motion trajectory. + * @return {cc.EaseQuarticActionInOut} + */ + reverse: function(){ + return new cc.EaseQuarticActionInOut(this._inner.reverse()); + } +}); + +/** + * Creates the action.
+ * Reference easeInOutQuart:
+ * {@link http://www.zhihu.com/question/21981571/answer/19925418} + * @static + * + * @deprecated since v3.0
Please use action.easing(cc.easeQuarticActionInOut()); + * + * @example + * //The old usage + * cc.EaseQuarticActionInOut.create(action); + * //The new usage + * action.easing(cc.easeQuarticActionInOut()); + * + * @param action + * @returns {cc.EaseQuarticActionInOut} + */ +cc.EaseQuarticActionInOut.create = function(action){ + return new cc.EaseQuarticActionInOut(action); +}; + +cc._easeQuarticActionInOut = { + easing: cc.EaseQuarticActionInOut.prototype._updateTime, + reverse: function(){ + return cc._easeQuarticActionInOut; + } +}; +/** + * Creates the action easing object.
+ * Reference easeInOutQuart:
+ * {@link http://www.zhihu.com/question/21981571/answer/19925418} + * @function + * @returns {Object} + */ +cc.easeQuarticActionInOut = function(){ + return cc._easeQuarticActionInOut; +}; + +/** + * cc.EaseQuinticActionIn action.
+ * Reference easeInQuint:
+ * {@link http://www.zhihu.com/question/21981571/answer/19925418} + * @class + * @extends cc.ActionEase + * + * @deprecated since v3.0
Please use action.easing(cc.easeQuinticActionIn()); + * + * @example + * //The old usage + * cc.EaseQuinticActionIn.create(action); + * //The new usage + * action.easing(cc.easeQuinticActionIn()); + */ +cc.EaseQuinticActionIn = cc.ActionEase.extend(/** @lends cc.EaseQuinticActionIn# */{ + _updateTime: function(time){ + return time * time * time * time * time; + }, + + /** + * Called once per frame. Time is the number of seconds of a frame interval. + * + * @param {Number} dt + */ + update: function(dt){ + this._inner.update(this._updateTime(dt)); + }, + + /** + * to copy object with deep copy. + * returns a clone of action. + * + * @returns {cc.EaseQuinticActionIn} + */ + clone: function(){ + var action = new cc.EaseQuinticActionIn(); + action.initWithAction(this._inner.clone()); + return action; + }, + + /** + * Create a action. Opposite with the original motion trajectory. + * @return {cc.EaseQuinticActionIn} + */ + reverse: function(){ + return new cc.EaseQuinticActionIn(this._inner.reverse()); + } +}); + +/** + * Creates the action.
+ * Reference easeInQuint:
+ * {@link http://www.zhihu.com/question/21981571/answer/19925418} + * @static + * + * @deprecated since v3.0
Please use action.easing(cc.easeQuinticActionIn()); + * + * @example + * //The old usage + * cc.EaseQuinticActionIn.create(action); + * //The new usage + * action.easing(cc.easeQuinticActionIn()); + * + * @param action + * @returns {cc.EaseQuinticActionIn} + */ +cc.EaseQuinticActionIn.create = function(action){ + return new cc.EaseQuinticActionIn(action); +}; + +cc._easeQuinticActionIn = { + easing: cc.EaseQuinticActionIn.prototype._updateTime, + reverse: function(){ + return cc._easeQuinticActionIn; + } +}; + +/** + * Creates the action easing object.
+ * Reference easeInQuint:
+ * {@link http://www.zhihu.com/question/21981571/answer/19925418} + * @function + * @returns {Object} + * @example + * //example + * action.easing(cc.easeQuinticActionIn()); + */ +cc.easeQuinticActionIn = function(){ + return cc._easeQuinticActionIn; +}; + +/** + * cc.EaseQuinticActionOut action.
+ * Reference easeQuint:
+ * {@link http://www.zhihu.com/question/21981571/answer/19925418} + * @class + * @extends cc.ActionEase + * + * @deprecated since v3.0
Please use action.easing(cc.easeQuadraticActionOut()); + * + * @example + * //The old usage + * cc.EaseQuinticActionOut.create(action); + * //The new usage + * action.easing(cc.easeQuadraticActionOut()); + */ +cc.EaseQuinticActionOut = cc.ActionEase.extend(/** @lends cc.EaseQuinticActionOut# */{ + _updateTime: function(time){ + time -=1; + return (time * time * time * time * time + 1); + }, + + /** + * Called once per frame. Time is the number of seconds of a frame interval. + * + * @param {Number} dt + */ + update: function(dt){ + this._inner.update(this._updateTime(dt)); + }, + + /** + * to copy object with deep copy. + * returns a clone of action. + * + * @returns {cc.EaseQuinticActionOut} + */ + clone: function(){ + var action = new cc.EaseQuinticActionOut(); + action.initWithAction(this._inner.clone()); + return action; + }, + + /** + * Create a action. Opposite with the original motion trajectory. + * @return {cc.EaseQuinticActionOut} + */ + reverse: function(){ + return new cc.EaseQuinticActionOut(this._inner.reverse()); + } +}); + +/** + * Creates the action.
+ * Reference easeOutQuint:
+ * {@link http://www.zhihu.com/question/21981571/answer/19925418} + * @static + * + * @deprecated since v3.0
Please use action.easing(cc.easeQuadraticActionOut()); + * + * @example + * //The old usage + * cc.EaseQuinticActionOut.create(action); + * //The new usage + * action.easing(cc.easeQuadraticActionOut()); + * + * @param action + * @returns {cc.EaseQuinticActionOut} + */ +cc.EaseQuinticActionOut.create = function(action){ + return new cc.EaseQuinticActionOut(action); +}; + +cc._easeQuinticActionOut = { + easing: cc.EaseQuinticActionOut.prototype._updateTime, + reverse: function(){ + return cc._easeQuinticActionOut; + } +}; + +/** + * Creates the action easing object.
+ * Reference easeOutQuint:
+ * {@link http://www.zhihu.com/question/21981571/answer/19925418} + * @function + * @returns {Object} + * @example + * //example + * action.easing(cc.easeQuadraticActionOut()); + */ +cc.easeQuinticActionOut = function(){ + return cc._easeQuinticActionOut; +}; + +/** + * cc.EaseQuinticActionInOut action.
+ * Reference easeInOutQuint:
+ * {@link http://www.zhihu.com/question/21981571/answer/19925418} + * @class + * @extends cc.ActionEase + * + * @deprecated since v3.0
Please use action.easing(cc.easeQuinticActionInOut()); + * + * @example + * //The old usage + * cc.EaseQuinticActionInOut.create(action); + * //The new usage + * action.easing(cc.easeQuinticActionInOut()); + */ +cc.EaseQuinticActionInOut = cc.ActionEase.extend(/** @lends cc.EaseQuinticActionInOut# */{ + _updateTime: function(time){ + time = time*2; + if (time < 1) + return 0.5 * time * time * time * time * time; + time -= 2; + return 0.5 * (time * time * time * time * time + 2); + }, + + /** + * Called once per frame. Time is the number of seconds of a frame interval. + * + * @param {Number} dt + */ + update: function(dt){ + this._inner.update(this._updateTime(dt)); + }, + + /** + * to copy object with deep copy. + * returns a clone of action. + * + * @returns {cc.EaseQuinticActionInOut} + */ + clone: function(){ + var action = new cc.EaseQuinticActionInOut(); + action.initWithAction(this._inner.clone()); + return action; + }, + + /** + * Create a action. Opposite with the original motion trajectory. + * @return {cc.EaseQuinticActionInOut} + */ + reverse: function(){ + return new cc.EaseQuinticActionInOut(this._inner.reverse()); + } +}); + +/** + * Creates the action.
+ * Reference easeInOutQuint:
+ * {@link http://www.zhihu.com/question/21981571/answer/19925418} + * @static + * + * @deprecated since v3.0
Please use action.easing(cc.easeQuinticActionInOut()); + * + * @example + * //The old usage + * cc.EaseQuinticActionInOut.create(action); + * //The new usage + * action.easing(cc.easeQuinticActionInOut()); + * + * @param action + * @returns {cc.EaseQuinticActionInOut} + */ +cc.EaseQuinticActionInOut.create = function(action){ + return new cc.EaseQuinticActionInOut(action); +}; + +cc._easeQuinticActionInOut = { + easing: cc.EaseQuinticActionInOut.prototype._updateTime, + reverse: function(){ + return cc._easeQuinticActionInOut; + } +}; + +/** + * Creates the action easing object.
+ * Reference easeInOutQuint:
+ * {@link http://www.zhihu.com/question/21981571/answer/19925418} + * @function + * @returns {Object} + * @example + * //example + * action.easing(cc.easeQuinticActionInOut()); + */ +cc.easeQuinticActionInOut = function(){ + return cc._easeQuinticActionInOut; +}; + +/** + * cc.EaseCircleActionIn action.
+ * Reference easeInCirc:
+ * {@link http://www.zhihu.com/question/21981571/answer/19925418} + * @class + * @extends cc.ActionEase + * + * @deprecated since v3.0
Please use action.easing(cc.easeCircleActionIn()); + * + * @example + * //The old usage + * cc.EaseCircleActionIn.create(action); + * //The new usage + * action.easing(cc.easeCircleActionIn()); + */ +cc.EaseCircleActionIn = cc.ActionEase.extend(/** @lends cc.EaseCircleActionIn# */{ + _updateTime: function(time){ + return -1 * (Math.sqrt(1 - time * time) - 1); + }, + + /** + * Called once per frame. Time is the number of seconds of a frame interval. + * + * @param {Number} dt + */ + update: function(dt){ + this._inner.update(this._updateTime(dt)); + }, + + /** + * to copy object with deep copy. + * returns a clone of action. + * + * @returns {cc.EaseCircleActionIn} + */ + clone: function(){ + var action = new cc.EaseCircleActionIn(); + action.initWithAction(this._inner.clone()); + return action; + }, + + /** + * Create a action. Opposite with the original motion trajectory. + * @return {cc.EaseCircleActionIn} + */ + reverse: function(){ + return new cc.EaseCircleActionIn(this._inner.reverse()); + } +}); + +/** + * Creates the action.
+ * Reference easeInCirc:
+ * {@link http://www.zhihu.com/question/21981571/answer/19925418} + * @static + * + * @deprecated since v3.0
Please use action.easing(cc.easeCircleActionIn()); + * + * @example + * //The old usage + * cc.EaseCircleActionIn.create(action); + * //The new usage + * action.easing(cc.easeCircleActionIn()); + * + * @param action + * @returns {cc.EaseCircleActionIn} + */ +cc.EaseCircleActionIn.create = function(action){ + return new cc.EaseCircleActionIn(action); +}; + +cc._easeCircleActionIn = { + easing: cc.EaseCircleActionIn.prototype._updateTime, + reverse: function(){ + return cc._easeCircleActionIn; + } +}; + +/** + * Creates the action easing object.
+ * Reference easeInCirc:
+ * {@link http://www.zhihu.com/question/21981571/answer/19925418} + * @function + * @returns {Object} + * @example + * //example + * action.easing(cc.easeCircleActionIn()); + */ +cc.easeCircleActionIn = function(){ + return cc._easeCircleActionIn; +}; + +/** + * cc.EaseCircleActionOut action.
+ * Reference easeOutCirc:
+ * {@link http://www.zhihu.com/question/21981571/answer/19925418} + * @class + * @extends cc.ActionEase + * + * @deprecated since v3.0
Please use action.easing(cc.easeCircleActionOut()); + * + * @example + * //The old usage + * cc.EaseCircleActionOut.create(action); + * //The new usage + * action.easing(cc.easeCircleActionOut()); + */ +cc.EaseCircleActionOut = cc.ActionEase.extend(/** @lends cc.EaseCircleActionOut# */{ + _updateTime: function(time){ + time = time - 1; + return Math.sqrt(1 - time * time); + }, + + /** + * Called once per frame. Time is the number of seconds of a frame interval. + * + * @param {Number} dt + */ + update: function(dt){ + this._inner.update(this._updateTime(dt)); + }, + + /** + * to copy object with deep copy. + * returns a clone of action. + * + * @returns {cc.EaseCircleActionOut} + */ + clone: function(){ + var action = new cc.EaseCircleActionOut(); + action.initWithAction(this._inner.clone()); + return action; + }, + + /** + * Create a action. Opposite with the original motion trajectory. + * @return {cc.EaseCircleActionOut} + */ + reverse: function(){ + return new cc.EaseCircleActionOut(this._inner.reverse()); + } +}); + +/** + * Creates the action.
+ * Reference easeOutCirc:
+ * {@link http://www.zhihu.com/question/21981571/answer/19925418} + * @static + * + * @deprecated since v3.0
Please use action.easing(cc.easeCircleActionOut()); + * + * @example + * //The old usage + * cc.EaseCircleActionOut.create(action); + * //The new usage + * action.easing(cc.easeCircleActionOut()); + * + * @param action + * @returns {cc.EaseCircleActionOut} + */ +cc.EaseCircleActionOut.create = function(action){ + return new cc.EaseCircleActionOut(action); +}; + +cc._easeCircleActionOut = { + easing: cc.EaseCircleActionOut.prototype._updateTime, + reverse: function(){ + return cc._easeCircleActionOut; + } +}; + +/** + * Creates the action easing object.
+ * Reference easeOutCirc:
+ * {@link http://www.zhihu.com/question/21981571/answer/19925418} + * @function + * @returns {Object} + * @exampple + * //example + * actioneasing(cc.easeCircleActionOut()); + */ +cc.easeCircleActionOut = function(){ + return cc._easeCircleActionOut; +}; + +/** + * cc.EaseCircleActionInOut action.
+ * Reference easeInOutCirc:
+ * {@link http://www.zhihu.com/question/21981571/answer/19925418} + * @class + * @extends cc.ActionEase + * + * @deprecated since v3.0
Please use action.easing(cc.easeCircleActionInOut()); + * + * @example + * //The old usage + * cc.EaseCircleActionInOut.create(action); + * //The new usage + * action.easing(cc.easeCircleActionInOut()); + */ +cc.EaseCircleActionInOut = cc.ActionEase.extend(/** @lends cc.EaseCircleActionInOut# */{ + _updateTime: function(time){ + time = time * 2; + if (time < 1) + return -0.5 * (Math.sqrt(1 - time * time) - 1); + time -= 2; + return 0.5 * (Math.sqrt(1 - time * time) + 1); + }, + + /** + * Called once per frame. Time is the number of seconds of a frame interval. + * + * @param {Number} dt + */ + update: function(dt){ + this._inner.update(this._updateTime(dt)); + }, + + /** + * to copy object with deep copy. + * returns a clone of action. + * + * @returns {cc.EaseCircleActionInOut} + */ + clone: function(){ + var action = new cc.EaseCircleActionInOut(); + action.initWithAction(this._inner.clone()); + return action; + }, + + /** + * Create a action. Opposite with the original motion trajectory. + * @return {cc.EaseCircleActionInOut} + */ + reverse: function(){ + return new cc.EaseCircleActionInOut(this._inner.reverse()); + } +}); + +/** + * Creates the action.
+ * Reference easeInOutCirc:
+ * {@link http://www.zhihu.com/question/21981571/answer/19925418} + * @static + * + * @deprecated since v3.0
Please use action.easing(cc.easeCircleActionInOut()); + * + * @example + * //The old usage + * cc.EaseCircleActionInOut.create(action); + * //The new usage + * action.easing(cc.easeCircleActionInOut()); + * + * @param action + * @returns {cc.EaseCircleActionInOut} + */ +cc.EaseCircleActionInOut.create = function(action){ + return new cc.EaseCircleActionInOut(action); +}; + +cc._easeCircleActionInOut = { + easing: cc.EaseCircleActionInOut.prototype._updateTime, + reverse: function(){ + return cc._easeCircleActionInOut; + } +}; + +/** + * Creates the action easing object.
+ * Reference easeInOutCirc:
+ * {@link http://www.zhihu.com/question/21981571/answer/19925418} + * @function + * @returns {Object} + * @example + * //example + * action.easing(cc.easeCircleActionInOut()); + */ +cc.easeCircleActionInOut = function(){ + return cc._easeCircleActionInOut; +}; + +/** + * cc.EaseCubicActionIn action.
+ * Reference easeInCubic:
+ * {@link http://www.zhihu.com/question/21981571/answer/19925418} + * @class + * @extends cc.ActionEase + * + * @deprecated since v3.0
action.easing(cc.easeCubicActionIn()); + * + * @example + * //The old usage + * cc.EaseCubicActionIn.create(action); + * //The new usage + * action.easing(cc.easeCubicActionIn()); + */ +cc.EaseCubicActionIn = cc.ActionEase.extend(/** @lends cc.EaseCubicActionIn# */{ + _updateTime: function(time){ + return time * time * time; + }, + + /** + * Called once per frame. Time is the number of seconds of a frame interval. + * + * @param {Number} dt + */ + update: function(dt){ + this._inner.update(this._updateTime(dt)); + }, + + /** + * to copy object with deep copy. + * returns a clone of action. + * + * @returns {cc.EaseCubicActionIn} + */ + clone: function(){ + var action = new cc.EaseCubicActionIn(); + action.initWithAction(this._inner.clone()); + return action; + }, + + /** + * Create a action. Opposite with the original motion trajectory. + * @return {cc.EaseCubicActionIn} + */ + reverse: function(){ + return new cc.EaseCubicActionIn(this._inner.reverse()); + } +}); + +/** + * Creates the action.
+ * Reference easeInCubic:
+ * {@link http://www.zhihu.com/question/21981571/answer/19925418} + * @static + * + * @deprecated since v3.0
action.easing(cc.easeCubicActionIn()); + * + * @example + * //The old usage + * cc.EaseCubicActionIn.create(action); + * //The new usage + * action.easing(cc.easeCubicActionIn()); + * + * @param action + * @returns {cc.EaseCubicActionIn} + */ +cc.EaseCubicActionIn.create = function(action){ + return new cc.EaseCubicActionIn(action); +}; + +cc._easeCubicActionIn = { + easing: cc.EaseCubicActionIn.prototype._updateTime, + reverse: function(){ + return cc._easeCubicActionIn; + } +}; + +/** + * Creates the action easing object.
+ * Reference easeInCubic:
+ * {@link http://www.zhihu.com/question/21981571/answer/19925418} + * @function + * @returns {Object} + * @example + * //example + * action.easing(cc.easeCubicActionIn()); + */ +cc.easeCubicActionIn = function(){ + return cc._easeCubicActionIn; +}; + +/** + * cc.EaseCubicActionOut action.
+ * Reference easeOutCubic:
+ * {@link http://www.zhihu.com/question/21981571/answer/19925418} + * @class + * @extends cc.ActionEase + * + * @deprecated since v3.0
Please use action.easing(cc.easeCubicActionOut()); + * + * @example + * //The old usage + * cc.EaseCubicActionOut.create(action); + * //The new usage + * action.easing(cc.easeCubicActionOut()); + */ +cc.EaseCubicActionOut = cc.ActionEase.extend(/** @lends cc.EaseCubicActionOut# */{ + _updateTime: function(time){ + time -= 1; + return (time * time * time + 1); + }, + + /** + * Called once per frame. Time is the number of seconds of a frame interval. + * + * @param {Number} dt + */ + update: function(dt){ + this._inner.update(this._updateTime(dt)); + }, + + /** + * to copy object with deep copy. + * returns a clone of action. + * + * @returns {cc.EaseCubicActionOut} + */ + clone: function(){ + var action = new cc.EaseCubicActionOut(); + action.initWithAction(this._inner.clone()); + return action; + }, + + /** + * Create a action. Opposite with the original motion trajectory. + * @return {cc.EaseCubicActionOut} + */ + reverse: function(){ + return new cc.EaseCubicActionOut(this._inner.reverse()); + } +}); + +/** + * Creates the action.
+ * Reference easeOutCubic:
+ * {@link http://www.zhihu.com/question/21981571/answer/19925418} + * @static + * + * @deprecated since v3.0
Please use action.easing(cc.easeCubicActionOut()); + * + * @example + * //The old usage + * cc.EaseCubicActionOut.create(action); + * //The new usage + * action.easing(cc.easeCubicActionOut()); + * + * @param action + * @returns {cc.EaseCubicActionOut} + */ +cc.EaseCubicActionOut.create = function(action){ + return new cc.EaseCubicActionOut(action); +}; + +cc._easeCubicActionOut = { + easing: cc.EaseCubicActionOut.prototype._updateTime, + reverse: function(){ + return cc._easeCubicActionOut; + } +}; + +/** + * Creates the action easing object.
+ * Reference easeOutCubic:
+ * {@link http://www.zhihu.com/question/21981571/answer/19925418} + * @function + * @returns {Object} + * @example + * //example + * action.easing(cc.easeCubicActionOut()); + */ +cc.easeCubicActionOut = function(){ + return cc._easeCubicActionOut; +}; + +/** + * cc.EaseCubicActionInOut action.
+ * Reference easeInOutCubic:
+ * {@link http://www.zhihu.com/question/21981571/answer/19925418} + * @class + * @extends cc.ActionEase + * + * @deprecated since v3.0
Please use action.easing(cc.easeCubicActionInOut()); + * + * @example + * //The old usage + * cc.EaseCubicActionInOut.create(action); + * //The new usage + * action.easing(cc.easeCubicActionInOut()); + */ +cc.EaseCubicActionInOut = cc.ActionEase.extend(/** @lends cc.EaseCubicActionInOut# */{ + _updateTime: function(time){ + time = time*2; + if (time < 1) + return 0.5 * time * time * time; + time -= 2; + return 0.5 * (time * time * time + 2); + }, + + /** + * Called once per frame. Time is the number of seconds of a frame interval. + * + * @param {Number} dt + */ + update: function(dt){ + this._inner.update(this._updateTime(dt)); + }, + + /** + * to copy object with deep copy. + * returns a clone of action. + * + * @returns {cc.EaseCubicActionInOut} + */ + clone: function(){ + var action = new cc.EaseCubicActionInOut(); + action.initWithAction(this._inner.clone()); + return action; + }, + + /** + * Create a action. Opposite with the original motion trajectory. + * @return {cc.EaseCubicActionInOut} + */ + reverse: function(){ + return new cc.EaseCubicActionInOut(this._inner.reverse()); + } +}); + +/** + * Creates the action.
+ * Reference easeInOutCubic:
+ * {@link http://www.zhihu.com/question/21981571/answer/19925418} + * @static + * + * @deprecated since v3.0
Please use action.easing(cc.easeCubicActionInOut()); + * + * @example + * //The old usage + * cc.EaseCubicActionInOut.create(action); + * //The new usage + * action.easing(cc.easeCubicActionInOut()); + * + * @param action + * @returns {cc.EaseCubicActionInOut} + */ +cc.EaseCubicActionInOut.create = function(action){ + return new cc.EaseCubicActionInOut(action); +}; + +cc._easeCubicActionInOut = { + easing: cc.EaseCubicActionInOut.prototype._updateTime, + reverse: function(){ + return cc._easeCubicActionInOut; + } +}; + +/** + * Creates the action easing object.
+ * Reference easeInOutCubic:
+ * {@link http://www.zhihu.com/question/21981571/answer/19925418} + * @function + * @returns {Object} + */ +cc.easeCubicActionInOut = function(){ + return cc._easeCubicActionInOut; +}; + diff --git a/cocos2d/actions/CCActionInstant.js b/cocos2d/actions/CCActionInstant.js index b2313e64a6..55f3c09be0 100644 --- a/cocos2d/actions/CCActionInstant.js +++ b/cocos2d/actions/CCActionInstant.js @@ -1,7 +1,7 @@ /**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2008-2010 Ricardo Quesada - Copyright (c) 2011 Zynga Inc. + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,13 +25,14 @@ ****************************************************************************/ /** - * Instant actions are immediate actions. They don't have a duration like + * Instant actions are immediate actions. They don't have a duration like. * the CCIntervalAction actions. * @class * @extends cc.FiniteTimeAction */ cc.ActionInstant = cc.FiniteTimeAction.extend(/** @lends cc.ActionInstant# */{ /** + * return true if the action has finished. * @return {Boolean} */ isDone:function () { @@ -39,6 +40,8 @@ cc.ActionInstant = cc.FiniteTimeAction.extend(/** @lends cc.ActionInstant# */{ }, /** + * called every frame with it's delta time.
+ * DON'T override unless you know what you are doing. * @param {Number} dt */ step:function (dt) { @@ -46,135 +49,230 @@ cc.ActionInstant = cc.FiniteTimeAction.extend(/** @lends cc.ActionInstant# */{ }, /** - * @param {Number} time + * Called once per frame. Time is the number of seconds of a frame interval. + * + * @param {Number} dt */ - update:function (time) { + update:function (dt) { //nothing }, + /** + * returns a reversed action.
+ * For example:
+ * - The action will be x coordinates of 0 move to 100.
+ * - The reversed action will be x of 100 move to 0. + * - Will be rewritten + * @returns {cc.Action} + */ reverse:function(){ return this.clone(); }, + /** + * to copy object with deep copy. + * returns a clone of action. + * + * @return {cc.FiniteTimeAction} + */ clone:function(){ return new cc.ActionInstant(); } }); -/** Show the node +/** + * Show the node. * @class * @extends cc.ActionInstant */ cc.Show = cc.ActionInstant.extend(/** @lends cc.Show# */{ + /** - * @param {Number} time + * Called once per frame. Time is the number of seconds of a frame interval. + * + * @param {Number} dt */ - update:function (time) { + update:function (dt) { this.target.visible = true; }, /** - * @return {cc.FiniteTimeAction} + * returns a reversed action.
+ * For example:
+ * - The action will be x coordinates of 0 move to 100.
+ * - The reversed action will be x of 100 move to 0. + * - Will be rewritten + * @returns {cc.Hide} */ reverse:function () { - return cc.Hide.create(); + return new cc.Hide(); }, + /** + * to copy object with deep copy. + * returns a clone of action. + * + * @return {cc.FiniteTimeAction} + */ clone:function(){ return new cc.Show(); } }); + /** + * Show the Node. + * @function * @return {cc.Show} * @example * // example - * var showAction = cc.Show.create(); + * var showAction = cc.show(); */ -cc.Show.create = function () { +cc.show = function () { return new cc.Show(); }; /** - * Hide the node + * Show the Node. Please use cc.show instead. + * @static + * @deprecated since v3.0
Please use cc.show instead. + * @return {cc.Show} + */ +cc.Show.create = cc.show; + +/** + * Hide the node. * @class * @extends cc.ActionInstant */ cc.Hide = cc.ActionInstant.extend(/** @lends cc.Hide# */{ + /** - * @param {Number} time + * Called once per frame. Time is the number of seconds of a frame interval. + * + * @param {Number} dt */ - update:function (time) { + update:function (dt) { this.target.visible = false; }, /** - * @return {cc.FiniteTimeAction} + * returns a reversed action.
+ * For example:
+ * - The action will be x coordinates of 0 move to 100.
+ * - The reversed action will be x of 100 move to 0. + * - Will be rewritten + * @returns {cc.Show} */ reverse:function () { - return cc.Show.create(); + return new cc.Show(); }, + /** + * to copy object with deep copy. + * returns a clone of action. + * + * @return {cc.Hide} + */ clone:function(){ return new cc.Hide(); } }); + /** + * Hide the node. + * @function * @return {cc.Hide} * @example * // example - * var hideAction = cc.Hide.create(); + * var hideAction = cc.hide(); */ -cc.Hide.create = function () { +cc.hide = function () { return new cc.Hide(); }; +/** + * Hide the node. Please use cc.hide instead. + * @static + * @deprecated since v3.0
Please use cc.hide instead. + * @return {cc.Hide} + * @example + * // example + * var hideAction = cc.hide(); + */ +cc.Hide.create = cc.hide; -/** Toggles the visibility of a node +/** + * Toggles the visibility of a node. * @class * @extends cc.ActionInstant */ cc.ToggleVisibility = cc.ActionInstant.extend(/** @lends cc.ToggleVisibility# */{ + /** - * @param {Number} time + * Called once per frame. Time is the number of seconds of a frame interval. + * + * @param {Number} dt */ - update:function (time) { + update:function (dt) { this.target.visible = !this.target.visible; }, /** - * @return {cc.ToggleVisibility} + * returns a reversed action. + * @returns {cc.ToggleVisibility} */ reverse:function () { return new cc.ToggleVisibility(); }, + /** + * to copy object with deep copy. + * returns a clone of action. + * + * @return {cc.ToggleVisibility} + */ clone:function(){ return new cc.ToggleVisibility(); } }); /** + * Toggles the visibility of a node. + * @function * @return {cc.ToggleVisibility} * @example * // example - * var toggleVisibilityAction = cc.ToggleVisibility.create(); + * var toggleVisibilityAction = cc.toggleVisibility(); */ -cc.ToggleVisibility.create = function () { +cc.toggleVisibility = function () { return new cc.ToggleVisibility(); }; +/** + * Toggles the visibility of a node. Please use cc.toggleVisibility instead. + * @static + * @deprecated since v3.0
Please use cc.toggleVisibility instead. + * @return {cc.ToggleVisibility} + */ +cc.ToggleVisibility.create = cc.toggleVisibility; + +/** + * Delete self in the next frame. + * @class + * @extends cc.ActionInstant + * @param {Boolean} [isNeedCleanUp=true] + * + * @example + * // example + * var removeSelfAction = new cc.RemoveSelf(false); + */ cc.RemoveSelf = cc.ActionInstant.extend({ _isNeedCleanUp: true, /** + * Constructor function, override it to extend the construction behavior, remember to call "this._super()" in the extended "ctor" function.
* Create a RemoveSelf object with a flag indicate whether the target should be cleaned up while removing. - * - * @constructor * @param {Boolean} [isNeedCleanUp=true] - * - * @example - * // example - * var removeSelfAction = new cc.RemoveSelf(false); */ ctor:function(isNeedCleanUp){ cc.FiniteTimeAction.prototype.ctor.call(this); @@ -182,19 +280,38 @@ cc.RemoveSelf = cc.ActionInstant.extend({ isNeedCleanUp !== undefined && this.init(isNeedCleanUp); }, - update:function(time){ + /** + * Called once per frame. Time is the number of seconds of a frame interval. + * + * @param {Number} dt + */ + update:function(dt){ this.target.removeFromParent(this._isNeedCleanUp); }, + /** + * Initialization of the node, please do not call this function by yourself, you should pass the parameters to constructor to initialize it . + * @param isNeedCleanUp + * @returns {boolean} + */ init:function(isNeedCleanUp){ this._isNeedCleanUp = isNeedCleanUp; return true; }, + /** + * returns a reversed action. + */ reverse:function(){ return new cc.RemoveSelf(this._isNeedCleanUp); }, + /** + * to copy object with deep copy. + * returns a clone of action. + * + * @return {cc.RemoveSelf} + */ clone:function(){ return new cc.RemoveSelf(this._isNeedCleanUp); } @@ -203,33 +320,45 @@ cc.RemoveSelf = cc.ActionInstant.extend({ /** * Create a RemoveSelf object with a flag indicate whether the target should be cleaned up while removing. * + * @function * @param {Boolean} [isNeedCleanUp=true] * @return {cc.RemoveSelf} * * @example * // example - * var removeSelfAction = cc.RemoveSelf.create(); + * var removeSelfAction = cc.removeSelf(); */ -cc.RemoveSelf.create = function(isNeedCleanUp){ +cc.removeSelf = function(isNeedCleanUp){ return new cc.RemoveSelf(isNeedCleanUp); }; /** - * Flips the sprite horizontally + * Please use cc.removeSelf instead. + * Create a RemoveSelf object with a flag indicate whether the target should be cleaned up while removing. + * + * @static + * @deprecated since v3.0
Please use cc.removeSelf instead. + * @param {Boolean} [isNeedCleanUp=true] + * @return {cc.RemoveSelf} + */ +cc.RemoveSelf.create = cc.removeSelf; + +/** + * Flips the sprite horizontally. * @class * @extends cc.ActionInstant + * @param {Boolean} flip Indicate whether the target should be flipped or not + * + * @example + * var flipXAction = new cc.FlipX(true); */ cc.FlipX = cc.ActionInstant.extend(/** @lends cc.FlipX# */{ _flippedX:false, /** - * Create a FlipX action to flip or unflip the target - * - * @constructor + * Constructor function, override it to extend the construction behavior, remember to call "this._super()" in the extended "ctor" function.
+ * Create a FlipX action to flip or unflip the target. * @param {Boolean} flip Indicate whether the target should be flipped or not - * - * @example - * var flipXAction = new cc.FlipX(true); */ ctor:function(flip){ cc.FiniteTimeAction.prototype.ctor.call(this); @@ -238,6 +367,7 @@ cc.FlipX = cc.ActionInstant.extend(/** @lends cc.FlipX# */{ }, /** + * initializes the action with a set flipX. * @param {Boolean} flip * @return {Boolean} */ @@ -247,19 +377,28 @@ cc.FlipX = cc.ActionInstant.extend(/** @lends cc.FlipX# */{ }, /** - * @param {Number} time + * Called once per frame. Time is the number of seconds of a frame interval. + * + * @param {Number} dt */ - update:function (time) { + update:function (dt) { this.target.flippedX = this._flippedX; }, /** - * @return {cc.FiniteTimeAction} + * returns a reversed action. + * @return {cc.FlipX} */ reverse:function () { - return cc.FlipX.create(!this._flippedX); + return new cc.FlipX(!this._flippedX); }, + /** + * to copy object with deep copy. + * returns a clone of action. + * + * @return {cc.FiniteTimeAction} + */ clone:function(){ var action = new cc.FlipX(); action.initWithFlipX(this._flippedX); @@ -268,32 +407,45 @@ cc.FlipX = cc.ActionInstant.extend(/** @lends cc.FlipX# */{ }); /** - * Create a FlipX action to flip or unflip the target + * Create a FlipX action to flip or unflip the target. * + * @function * @param {Boolean} flip Indicate whether the target should be flipped or not * @return {cc.FlipX} * @example - * var flipXAction = cc.FlipX.create(true); + * var flipXAction = cc.flipX(true); */ -cc.FlipX.create = function (flip) { +cc.flipX = function (flip) { return new cc.FlipX(flip); }; +/** + * Plese use cc.flipX instead. + * Create a FlipX action to flip or unflip the target + * + * @static + * @deprecated since v3.0
Plese use cc.flipX instead. + * @param {Boolean} flip Indicate whether the target should be flipped or not + * @return {cc.FlipX} + */ +cc.FlipX.create = cc.flipX; + /** * Flips the sprite vertically * @class * @extends cc.ActionInstant + * @param {Boolean} flip + * @example + * var flipYAction = new cc.FlipY(true); */ cc.FlipY = cc.ActionInstant.extend(/** @lends cc.FlipY# */{ _flippedY:false, /** - * Create a FlipY action to flip or unflip the target + * Constructor function, override it to extend the construction behavior, remember to call "this._super()" in the extended "ctor" function.
+ * Create a FlipY action to flip or unflip the target. * - * @constructor * @param {Boolean} flip - * @example - * var flipYAction = new cc.FlipY(true); */ ctor: function(flip){ cc.FiniteTimeAction.prototype.ctor.call(this); @@ -301,7 +453,9 @@ cc.FlipY = cc.ActionInstant.extend(/** @lends cc.FlipY# */{ flip !== undefined && this.initWithFlipY(flip); }, + /** + * initializes the action with a set flipY. * @param {Boolean} flip * @return {Boolean} */ @@ -311,56 +465,78 @@ cc.FlipY = cc.ActionInstant.extend(/** @lends cc.FlipY# */{ }, /** - * @param {Number} time + * Called once per frame. Time is the number of seconds of a frame interval. + * + * @param {Number} dt */ - update:function (time) { - //this._super(); + update:function (dt) { this.target.flippedY = this._flippedY; }, /** - * @return {cc.FiniteTimeAction} + * returns a reversed action. + * @return {cc.FlipY} */ reverse:function () { - return cc.FlipY.create(!this._flippedY); + return new cc.FlipY(!this._flippedY); }, + /** + * to copy object with deep copy. + * returns a clone of action. + * + * @return {cc.FlipY} + */ clone:function(){ var action = new cc.FlipY(); action.initWithFlipY(this._flippedY); return action; } }); + /** - * Create a FlipY action to flip or unflip the target + * Create a FlipY action to flip or unflip the target. * + * @function * @param {Boolean} flip * @return {cc.FlipY} * @example - * var flipYAction = cc.FlipY.create(true); + * var flipYAction = cc.flipY(true); */ -cc.FlipY.create = function (flip) { +cc.flipY = function (flip) { return new cc.FlipY(flip); }; +/** + * Please use cc.flipY instead + * Create a FlipY action to flip or unflip the target + * + * @static + * @deprecated since v3.0
Please use cc.flipY instead. + * @param {Boolean} flip + * @return {cc.FlipY} + */ +cc.FlipY.create = cc.flipY; -/** Places the node in a certain position +/** + * Places the node in a certain position * @class * @extends cc.ActionInstant + * @param {cc.Point|Number} pos + * @param {Number} [y] + * @example + * var placeAction = new cc.Place(cc.p(200, 200)); + * var placeAction = new cc.Place(200, 200); */ cc.Place = cc.ActionInstant.extend(/** @lends cc.Place# */{ _x: 0, _y: 0, /** - * Creates a Place action with a position - * - * @constructor + * Constructor function, override it to extend the construction behavior, remember to call "this._super()" in the extended "ctor" function.
+ * Creates a Place action with a position. * @param {cc.Point|Number} pos * @param {Number} [y] - * @example - * var placeAction = new cc.Place.create(cc.p(200, 200)); - * var placeAction = new cc.Place.create(200, 200); */ ctor:function(pos, y){ cc.FiniteTimeAction.prototype.ctor.call(this); @@ -376,8 +552,10 @@ cc.Place = cc.ActionInstant.extend(/** @lends cc.Place# */{ } }, - /** Initializes a Place action with a position - * @param {cc.Point} pos + /** + * Initializes a Place action with a position + * @param {number} x + * @param {number} y * @return {Boolean} */ initWithPosition: function (x, y) { @@ -387,36 +565,68 @@ cc.Place = cc.ActionInstant.extend(/** @lends cc.Place# */{ }, /** - * @param {Number} time + * Called once per frame. Time is the number of seconds of a frame interval. + * + * @param {Number} dt */ - update:function (time) { + update:function (dt) { this.target.setPosition(this._x, this._y); }, + /** + * to copy object with deep copy. + * returns a clone of action. + * + * @return {cc.Place} + */ clone:function(){ var action = new cc.Place(); action.initWithPosition(this._x, this._y); return action; } }); + /** - * Creates a Place action with a position + * Creates a Place action with a position. + * @function * @param {cc.Point|Number} pos * @param {Number} [y] * @return {cc.Place} * @example * // example - * var placeAction = cc.Place.create(cc.p(200, 200)); - * var placeAction = cc.Place.create(200, 200); + * var placeAction = cc.place(cc.p(200, 200)); + * var placeAction = cc.place(200, 200); */ -cc.Place.create = function (pos, y) { +cc.place = function (pos, y) { return new cc.Place(pos, y); }; +/** + * Please use cc.place instead. + * Creates a Place action with a position. + * @static + * @deprecated since v3.0
Please use cc.place instead. + * @param {cc.Point|Number} pos + * @param {Number} [y] + * @return {cc.Place} + */ +cc.Place.create = cc.place; + -/** Calls a 'callback' +/** + * Calls a 'callback'. * @class * @extends cc.ActionInstant + * @param {function} selector + * @param {object|null} [selectorTarget] + * @param {*|null} [data] data for function, it accepts all data types. + * @example + * // example + * // CallFunc without data + * var finish = new cc.CallFunc(this.removeSprite, this); + * + * // CallFunc with data + * var finish = new cc.CallFunc(this.removeFromParentAndCleanup, this, true); */ cc.CallFunc = cc.ActionInstant.extend(/** @lends cc.CallFunc# */{ _selectorTarget:null, @@ -425,19 +635,11 @@ cc.CallFunc = cc.ActionInstant.extend(/** @lends cc.CallFunc# */{ _data:null, /** - * Creates a CallFunc action with the callback - * - * @constructor + * Constructor function, override it to extend the construction behavior, remember to call "this._super()" in the extended "ctor" function.
+ * Creates a CallFunc action with the callback. * @param {function} selector * @param {object|null} [selectorTarget] * @param {*|null} [data] data for function, it accepts all data types. - * @example - * // example - * // CallFunc without data - * var finish = new cc.CallFunc(this.removeSprite, this); - * - * // CallFunc with data - * var finish = new cc.CallFunc(this.removeFromParentAndCleanup, this, true); */ ctor:function(selector, selectorTarget, data){ cc.FiniteTimeAction.prototype.ctor.call(this); @@ -478,14 +680,16 @@ cc.CallFunc = cc.ActionInstant.extend(/** @lends cc.CallFunc# */{ }, /** - * @param {Number} time + * Called once per frame. Time is the number of seconds of a frame interval. + * + * @param {Number} dt */ - update:function (time) { - //this._super(target); + update:function (dt) { this.execute(); }, /** + * Get selectorTarget. * @return {object} */ getTargetCallback:function () { @@ -493,26 +697,23 @@ cc.CallFunc = cc.ActionInstant.extend(/** @lends cc.CallFunc# */{ }, /** + * Set selectorTarget. * @param {object} sel */ setTargetCallback:function (sel) { - if (sel != this._selectorTarget) { + if (sel !== this._selectorTarget) { if (this._selectorTarget) this._selectorTarget = null; this._selectorTarget = sel; } }, - copy:function() { - var n = new cc.CallFunc(); - if(this._selectorTarget){ - n.initWithFunction(this._callFunc, this._selectorTarget, this._data) - }else if(this._function){ - n.initWithFunction(this._function); - } - return n; - }, - + /** + * to copy object with deep copy. + * returns a clone of action. + * + * @return {cc.CallFunc} + */ clone:function(){ var action = new cc.CallFunc(); if(this._selectorTarget){ @@ -523,8 +724,10 @@ cc.CallFunc = cc.ActionInstant.extend(/** @lends cc.CallFunc# */{ return action; } }); + /** * Creates the action with the callback + * @function * @param {function} selector * @param {object|null} [selectorTarget] * @param {*|null} [data] data for function, it accepts all data types. @@ -532,11 +735,23 @@ cc.CallFunc = cc.ActionInstant.extend(/** @lends cc.CallFunc# */{ * @example * // example * // CallFunc without data - * var finish = cc.CallFunc.create(this.removeSprite, this); + * var finish = cc.callFunc(this.removeSprite, this); * * // CallFunc with data - * var finish = cc.CallFunc.create(this.removeFromParentAndCleanup, this._grossini, true); + * var finish = cc.callFunc(this.removeFromParentAndCleanup, this._grossini, true); */ -cc.CallFunc.create = function (selector, selectorTarget, data) { +cc.callFunc = function (selector, selectorTarget, data) { return new cc.CallFunc(selector, selectorTarget, data); }; + +/** + * Please use cc.callFunc instead. + * Creates the action with the callback. + * @static + * @deprecated since v3.0
Please use cc.callFunc instead. + * @param {function} selector + * @param {object|null} [selectorTarget] + * @param {*|null} [data] data for function, it accepts all data types. + * @return {cc.CallFunc} + */ +cc.CallFunc.create = cc.callFunc; diff --git a/cocos2d/actions/CCActionInterval.js b/cocos2d/actions/CCActionInterval.js index 9eece2b601..67e1b853e1 100644 --- a/cocos2d/actions/CCActionInterval.js +++ b/cocos2d/actions/CCActionInterval.js @@ -1,7 +1,7 @@ /**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2008-2010 Ricardo Quesada - Copyright (c) 2011 Zynga Inc. + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -39,34 +39,45 @@ * * @class * @extends cc.FiniteTimeAction - * @Example - * // example - * var pingPongAction = cc.Sequence.create(action, action.reverse()); + * @param {Number} d duration in seconds + * @example + * var actionInterval = new cc.ActionInterval(3); */ cc.ActionInterval = cc.FiniteTimeAction.extend(/** @lends cc.ActionInterval# */{ _elapsed:0, _firstTick:false, + _easeList: null, + _timesForRepeat:1, + _repeatForever: false, + _repeatMethod: false,//Compatible with repeat class, Discard after can be deleted + _speed: 1, + _speedMethod: false,//Compatible with speed class, Discard after can be deleted /** - * @constructor + * Constructor function, override it to extend the construction behavior, remember to call "this._super()" in the extended "ctor" function. * @param {Number} d duration in seconds - * @example - * var actionInterval = new cc.ActionInterval(3); */ ctor:function (d) { + this._speed = 1; + this._timesForRepeat = 1; + this._repeatForever = false; + this.MAX_VALUE = 2; + this._repeatMethod = false;//Compatible with repeat class, Discard after can be deleted + this._speedMethod = false;//Compatible with repeat class, Discard after can be deleted cc.FiniteTimeAction.prototype.ctor.call(this); - d !== undefined && this.initWithDuration(d); }, - /** how many seconds had elapsed since the actions started to run. + /** + * How many seconds had elapsed since the actions started to run. * @return {Number} */ getElapsed:function () { return this._elapsed; }, - /** initializes the action + /** + * Initializes the action. * @param {Number} d duration in seconds * @return {Boolean} */ @@ -80,7 +91,8 @@ cc.ActionInterval = cc.FiniteTimeAction.extend(/** @lends cc.ActionInterval# */{ return true; }, - /** returns true if the action has finished + /** + * Returns true if the action has finished. * @return {Boolean} */ isDone:function () { @@ -88,15 +100,71 @@ cc.ActionInterval = cc.FiniteTimeAction.extend(/** @lends cc.ActionInterval# */{ }, /** - * returns a new clone of the action + * Some additional parameters of cloning. + * @param {cc.Action} action + * @private + */ + _cloneDecoration: function(action){ + action._repeatForever = this._repeatForever; + action._speed = this._speed; + action._timesForRepeat = this._timesForRepeat; + action._easeList = this._easeList; + action._speedMethod = this._speedMethod; + action._repeatMethod = this._repeatMethod; + }, + + _reverseEaseList: function(action){ + if(this._easeList){ + action._easeList = []; + for(var i=0; i
+ * Will be overwrite. + * + * @return {null} */ reverse:function () { cc.log("cc.IntervalAction: reverse not implemented."); @@ -130,6 +216,8 @@ cc.ActionInterval = cc.FiniteTimeAction.extend(/** @lends cc.ActionInterval# */{ }, /** + * Set amplitude rate. + * @warning It should be overridden in subclass. * @param {Number} amp */ setAmplitudeRate:function (amp) { @@ -138,45 +226,127 @@ cc.ActionInterval = cc.FiniteTimeAction.extend(/** @lends cc.ActionInterval# */{ }, /** - * @return {Number} + * Get amplitude rate. + * @warning It should be overridden in subclass. + * @return {Number} 0 */ getAmplitudeRate:function () { // Abstract class needs implementation cc.log("cc.ActionInterval.getAmplitudeRate(): it should be overridden in subclass."); + return 0; + }, + + /** + * Changes the speed of an action, making it take longer (speed>1) + * or less (speed<1) time.
+ * Useful to simulate 'slow motion' or 'fast forward' effect. + * + * @param speed + * @returns {cc.Action} + */ + speed: function(speed){ + if(speed <= 0){ + cc.log("The speed parameter error"); + return this; + } + + this._speedMethod = true;//Compatible with repeat class, Discard after can be deleted + this._speed *= speed; + return this; + }, + + /** + * Get this action speed. + * @return {Number} + */ + getSpeed: function(){ + return this._speed; + }, + + /** + * Set this action speed. + * @param {Number} speed + * @returns {cc.ActionInterval} + */ + setSpeed: function(speed){ + this._speed = speed; + return this; + }, + + /** + * Repeats an action a number of times. + * To repeat an action forever use the CCRepeatForever action. + * @param times + * @returns {cc.ActionInterval} + */ + repeat: function(times){ + times = Math.round(times); + if(isNaN(times) || times < 1){ + cc.log("The repeat parameter error"); + return this; + } + this._repeatMethod = true;//Compatible with repeat class, Discard after can be deleted + this._timesForRepeat *= times; + return this; + }, + + /** + * Repeats an action for ever.
+ * To repeat the an action for a limited number of times use the Repeat action.
+ * @returns {cc.ActionInterval} + */ + repeatForever: function(){ + this._repeatMethod = true;//Compatible with repeat class, Discard after can be deleted + this._timesForRepeat = this.MAX_VALUE; + this._repeatForever = true; + return this; } }); /** + * An interval action is an action that takes place within a certain period of time. + * @function * @param {Number} d duration in seconds * @return {cc.ActionInterval} * @example * // example - * var actionInterval = cc.ActionInterval.create(3); + * var actionInterval = cc.actionInterval(3); */ -cc.ActionInterval.create = function (d) { +cc.actionInterval = function (d) { return new cc.ActionInterval(d); }; +/** + * Please use cc.actionInterval instead. + * An interval action is an action that takes place within a certain period of time. + * @static + * @deprecated since v3.0
Please use cc.actionInterval instead. + * @param {Number} d duration in seconds + * @return {cc.ActionInterval} + */ +cc.ActionInterval.create = cc.actionInterval; -/** Runs actions sequentially, one after another +/** + * Runs actions sequentially, one after another. * @class * @extends cc.ActionInterval + * @param {Array|cc.FiniteTimeAction} tempArray + * @example + * // create sequence with actions + * var seq = new cc.Sequence(act1, act2); + * + * // create sequence with array + * var seq = new cc.Sequence(actArray); */ cc.Sequence = cc.ActionInterval.extend(/** @lends cc.Sequence# */{ _actions:null, _split:null, _last:0, - /** Create an array of sequenceable actions - * @constructor + /** + * Constructor function, override it to extend the construction behavior, remember to call "this._super()" in the extended "ctor" function.
+ * Create an array of sequenceable actions. * @param {Array|cc.FiniteTimeAction} tempArray - * @return {cc.Sequence} - * @example - * // create sequence with actions - * var seq = new cc.Sequence(act1, act2); - * - * // create sequence with array - * var seq = new cc.Sequence(actArray); */ ctor:function (tempArray) { cc.ActionInterval.prototype.ctor.call(this); @@ -187,20 +357,20 @@ cc.Sequence = cc.ActionInterval.extend(/** @lends cc.Sequence# */{ if ((last >= 0) && (paramArray[last] == null)) cc.log("parameters should not be ending with null in Javascript"); - if (last >= 0) { - var prev = paramArray[0], action1; - for (var i = 1; i < last; i++) { - if (paramArray[i]) { - action1 = prev; - prev = cc.Sequence.create(); - prev.initWithTwoActions(action1, paramArray[i]); - } - } - this.initWithTwoActions(prev, paramArray[last]); - } + if (last >= 0) { + var prev = paramArray[0], action1; + for (var i = 1; i < last; i++) { + if (paramArray[i]) { + action1 = prev; + prev = cc.Sequence._actionOneTwo(action1, paramArray[i]); + } + } + this.initWithTwoActions(prev, paramArray[last]); + } }, - /** initializes the action
+ /** + * Initializes the action
* @param {cc.FiniteTimeAction} actionOne * @param {cc.FiniteTimeAction} actionTwo * @return {Boolean} @@ -209,7 +379,7 @@ cc.Sequence = cc.ActionInterval.extend(/** @lends cc.Sequence# */{ if(!actionOne || !actionTwo) throw "cc.Sequence.initWithTwoActions(): arguments must all be non nil"; - var d = actionOne.getDuration() + actionTwo.getDuration(); + var d = actionOne._duration + actionTwo._duration; this.initWithDuration(d); this._actions[0] = actionOne; @@ -223,21 +393,23 @@ cc.Sequence = cc.ActionInterval.extend(/** @lends cc.Sequence# */{ */ clone:function () { var action = new cc.Sequence(); + this._cloneDecoration(action); action.initWithTwoActions(this._actions[0].clone(), this._actions[1].clone()); return action; }, /** + * Start the action with target. * @param {cc.Node} target */ startWithTarget:function (target) { cc.ActionInterval.prototype.startWithTarget.call(this, target); - this._split = this._actions[0].getDuration() / this._duration; + this._split = this._actions[0]._duration / this._duration; this._last = -1; }, /** - * stop the action + * stop the action. */ stop:function () { // Issue #1305 @@ -247,14 +419,17 @@ cc.Sequence = cc.ActionInterval.extend(/** @lends cc.Sequence# */{ }, /** - * @param {Number} time time in seconds + * Called once per frame. Time is the number of seconds of a frame interval. + * @param {Number} dt */ - update:function (time) { + update:function (dt) { var new_t, found = 0; - var locSplit = this._split, locActions = this._actions, locLast = this._last; - if (time < locSplit) { + var locSplit = this._split, locActions = this._actions, locLast = this._last, actionFound; + + dt = this._computeEaseTime(dt); + if (dt < locSplit) { // action[0] - new_t = (locSplit !== 0) ? time / locSplit : 1; + new_t = (locSplit !== 0) ? dt / locSplit : 1; if (found === 0 && locLast === 1) { // Reverse mode ? @@ -267,7 +442,7 @@ cc.Sequence = cc.ActionInterval.extend(/** @lends cc.Sequence# */{ } else { // action[1] found = 1; - new_t = (locSplit === 1) ? 1 : (time - locSplit) / (1 - locSplit); + new_t = (locSplit === 1) ? 1 : (dt - locSplit) / (1 - locSplit); if (locLast === -1) { // action[0] was skipped, execute it. @@ -282,57 +457,81 @@ cc.Sequence = cc.ActionInterval.extend(/** @lends cc.Sequence# */{ } } + actionFound = locActions[found]; // Last action found and it is done. - if (locLast === found && locActions[found].isDone()) + if (locLast === found && actionFound.isDone()) return; // Last action found and it is done if (locLast !== found) - locActions[found].startWithTarget(this.target); + actionFound.startWithTarget(this.target); - locActions[found].update(new_t); + new_t = new_t * actionFound._timesForRepeat; + actionFound.update(new_t > 1 ? new_t % 1 : new_t); this._last = found; }, /** - * @return {cc.ActionInterval} + * Returns a reversed action. + * @return {cc.Sequence} */ reverse:function () { - return cc.Sequence._actionOneTwo(this._actions[1].reverse(), this._actions[0].reverse()); - }, - - /** - * to copy object with deep copy. - * @return {object} - */ - copy:function () { - return this.clone(); + var action = cc.Sequence._actionOneTwo(this._actions[1].reverse(), this._actions[0].reverse()); + this._cloneDecoration(action); + this._reverseEaseList(action); + return action; } }); + /** helper constructor to create an array of sequenceable actions + * @function * @param {Array|cc.FiniteTimeAction} tempArray * @return {cc.Sequence} * @example * // example * // create sequence with actions - * var seq = cc.Sequence.create(act1, act2); + * var seq = cc.sequence(act1, act2); * * // create sequence with array - * var seq = cc.Sequence.create(actArray); + * var seq = cc.sequence(actArray); + * todo: It should be use new */ -cc.Sequence.create = function (/*Multiple Arguments*/tempArray) { +cc.sequence = function (/*Multiple Arguments*/tempArray) { var paramArray = (tempArray instanceof Array) ? tempArray : arguments; if ((paramArray.length > 0) && (paramArray[paramArray.length - 1] == null)) cc.log("parameters should not be ending with null in Javascript"); - var prev = paramArray[0]; - for (var i = 1; i < paramArray.length; i++) { - if (paramArray[i]) - prev = cc.Sequence._actionOneTwo(prev, paramArray[i]); + var result, current, i, repeat; + while(paramArray && paramArray.length > 0){ + current = Array.prototype.shift.call(paramArray); + repeat = current._timesForRepeat || 1; + current._repeatMethod = false; + current._timesForRepeat = 1; + + i = 0; + if(!result){ + result = current; + i = 1; + } + + for(i; i
+ * Creates a Repeat action. Times is an unsigned integer between 1 and pow(2,30). * @param {cc.FiniteTimeAction} action * @param {Number} times - * @example - * var rep = new cc.Repeat(cc.Sequence.create(jump2, jump1), 5); */ ctor: function (action, times) { cc.ActionInterval.prototype.ctor.call(this); @@ -379,13 +579,15 @@ cc.Repeat = cc.ActionInterval.extend(/** @lends cc.Repeat# */{ * @return {Boolean} */ initWithAction:function (action, times) { - var duration = action.getDuration() * times; + var duration = action._duration * times; if (this.initWithDuration(duration)) { this._times = times; this._innerAction = action; - if (action instanceof cc.ActionInstant) + if (action instanceof cc.ActionInstant){ + this._actionInstant = true; this._times -= 1; + } this._total = 0; return true; } @@ -398,16 +600,18 @@ cc.Repeat = cc.ActionInterval.extend(/** @lends cc.Repeat# */{ */ clone:function () { var action = new cc.Repeat(); + this._cloneDecoration(action); action.initWithAction(this._innerAction.clone(), this._times); return action; }, /** + * Start the action with target. * @param {cc.Node} target */ startWithTarget:function (target) { this._total = 0; - this._nextDt = this._innerAction.getDuration() / this._duration; + this._nextDt = this._innerAction._duration / this._duration; cc.ActionInterval.prototype.startWithTarget.call(this, target); this._innerAction.startWithTarget(target); }, @@ -421,102 +625,125 @@ cc.Repeat = cc.ActionInterval.extend(/** @lends cc.Repeat# */{ }, /** - * @param {Number} time time in seconds + * Called once per frame. Time is the number of seconds of a frame interval. + * @param {Number} dt */ - update:function (time) { + update:function (dt) { + dt = this._computeEaseTime(dt); var locInnerAction = this._innerAction; var locDuration = this._duration; var locTimes = this._times; var locNextDt = this._nextDt; - if (time >= locNextDt) { - while (time > locNextDt && this._total < locTimes) { + if (dt >= locNextDt) { + while (dt > locNextDt && this._total < locTimes) { locInnerAction.update(1); this._total++; locInnerAction.stop(); locInnerAction.startWithTarget(this.target); - locNextDt += locInnerAction.getDuration() / locDuration; + locNextDt += locInnerAction._duration / locDuration; this._nextDt = locNextDt; } // fix for issue #1288, incorrect end value of repeat - if (time >= 1.0 && this._total < locTimes) + if (dt >= 1.0 && this._total < locTimes) this._total++; - // don't set a instantaction back or update it, it has no use because it has no duration - if (this._actionInstant) { - if (this._total == locTimes) { + // don't set a instant action back or update it, it has no use because it has no duration + if (!this._actionInstant) { + if (this._total === locTimes) { locInnerAction.update(1); locInnerAction.stop(); } else { // issue #390 prevent jerk, use right update - locInnerAction.update(time - (locNextDt - locInnerAction.getDuration() / locDuration)); + locInnerAction.update(dt - (locNextDt - locInnerAction._duration / locDuration)); } } } else { - locInnerAction.update((time * locTimes) % 1.0); + locInnerAction.update((dt * locTimes) % 1.0); } }, /** + * Return true if the action has finished. * @return {Boolean} */ isDone:function () { - return this._total == this._times; + return this._total === this._times; }, /** - * @return {cc.ActionInterval} + * returns a reversed action. + * @return {cc.Repeat} */ reverse:function () { - return cc.Repeat.create(this._innerAction.reverse(), this._times); + var action = new cc.Repeat(this._innerAction.reverse(), this._times); + this._cloneDecoration(action); + this._reverseEaseList(action); + return action; }, /** + * Set inner Action. * @param {cc.FiniteTimeAction} action */ setInnerAction:function (action) { - if (this._innerAction != action) { + if (this._innerAction !== action) { this._innerAction = action; } }, /** + * Get inner Action. * @return {cc.FiniteTimeAction} */ getInnerAction:function () { return this._innerAction; } }); + /** * Creates a Repeat action. Times is an unsigned integer between 1 and pow(2,30) + * @function * @param {cc.FiniteTimeAction} action * @param {Number} times * @return {cc.Repeat} * @example * // example - * var rep = cc.Repeat.create(cc.Sequence.create(jump2, jump1), 5); + * var rep = cc.repeat(cc.sequence(jump2, jump1), 5); */ -cc.Repeat.create = function (action, times) { +cc.repeat = function (action, times) { return new cc.Repeat(action, times); }; +/** + * Please use cc.repeat instead + * Creates a Repeat action. Times is an unsigned integer between 1 and pow(2,30) + * @static + * @deprecated since v3.0
Please use cc.repeat instead. + * @param {cc.FiniteTimeAction} action + * @param {Number} times + * @return {cc.Repeat} + */ +cc.Repeat.create = cc.repeat; + /** Repeats an action for ever.
* To repeat the an action for a limited number of times use the Repeat action.
- * @warning This action can't be Sequencable because it is not an IntervalAction + * @warning This action can't be Sequenceable because it is not an IntervalAction * @class * @extends cc.ActionInterval + * @param {cc.FiniteTimeAction} action + * @example + * var rep = new cc.RepeatForever(cc.sequence(jump2, jump1), 5); */ - cc.RepeatForever = cc.ActionInterval.extend(/** @lends cc.RepeatForever# */{ _innerAction:null, //CCActionInterval /** - * Create a acton which repeat forever + * Constructor function, override it to extend the construction behavior, remember to call "this._super()" in the extended "ctor" function.
+ * Create a acton which repeat forever. * @param {cc.FiniteTimeAction} action - * @example - * var repeat = new cc.RepeatForever(cc.RotateBy.create(1.0, 360)); */ ctor:function (action) { cc.ActionInterval.prototype.ctor.call(this); @@ -543,11 +770,13 @@ cc.RepeatForever = cc.ActionInterval.extend(/** @lends cc.RepeatForever# */{ */ clone:function () { var action = new cc.RepeatForever(); + this._cloneDecoration(action); action.initWithAction(this._innerAction.clone()); return action; }, /** + * Start the action with target. * @param {cc.Node} target */ startWithTarget:function (target) { @@ -556,22 +785,25 @@ cc.RepeatForever = cc.ActionInterval.extend(/** @lends cc.RepeatForever# */{ }, /** + * called every frame with it's delta time.
+ * DON'T override unless you know what you are doing. * @param dt delta time in seconds */ step:function (dt) { var locInnerAction = this._innerAction; locInnerAction.step(dt); if (locInnerAction.isDone()) { - //var diff = locInnerAction.getElapsed() - locInnerAction.getDuration(); + //var diff = locInnerAction.getElapsed() - locInnerAction._duration; locInnerAction.startWithTarget(this.target); // to prevent jerk. issue #390 ,1247 //this._innerAction.step(0); //this._innerAction.step(diff); - locInnerAction.step(locInnerAction.getElapsed() - locInnerAction.getDuration()); + locInnerAction.step(locInnerAction.getElapsed() - locInnerAction._duration); } }, /** + * Return true if the action has finished. * @return {Boolean} */ isDone:function () { @@ -579,41 +811,61 @@ cc.RepeatForever = cc.ActionInterval.extend(/** @lends cc.RepeatForever# */{ }, /** - * @return {cc.ActionInterval} + * Returns a reversed action. + * @return {cc.RepeatForever} */ reverse:function () { - return (cc.RepeatForever.create(this._innerAction.reverse())); + var action = new cc.RepeatForever(this._innerAction.reverse()); + this._cloneDecoration(action); + this._reverseEaseList(action); + return action; }, /** - * + * Set inner action. * @param {cc.ActionInterval} action */ setInnerAction:function (action) { - if (this._innerAction != action) { + if (this._innerAction !== action) { this._innerAction = action; } }, /** + * Get inner action. * @return {cc.ActionInterval} */ getInnerAction:function () { return this._innerAction; } }); + /** * Create a acton which repeat forever + * @function * @param {cc.FiniteTimeAction} action * @return {cc.RepeatForever} * @example * // example - * var repeat = cc.RepeatForever.create(cc.RotateBy.create(1.0, 360)); + * var repeat = cc.repeatForever(cc.rotateBy(1.0, 360)); */ -cc.RepeatForever.create = function (action) { +cc.repeatForever = function (action) { return new cc.RepeatForever(action); }; +/** + * Please use cc.repeatForever instead + * Create a acton which repeat forever + * @static + * @deprecated since v3.0
Please use cc.repeatForever instead. + * @param {cc.FiniteTimeAction} action + * @return {cc.RepeatForever} + * @param {Array|cc.FiniteTimeAction} tempArray + * @example + * var action = new cc.Spawn(cc.jumpBy(2, cc.p(300, 0), 50, 4), cc.rotateBy(2, 720)); + */ +cc.RepeatForever.create = cc.repeatForever; + /** Spawn a new action immediately * @class @@ -624,10 +876,8 @@ cc.Spawn = cc.ActionInterval.extend(/** @lends cc.Spawn# */{ _two:null, /** - * @constructor + * Constructor function, override it to extend the construction behavior, remember to call "this._super()" in the extended "ctor" function. * @param {Array|cc.FiniteTimeAction} tempArray - * @example - * var action = new cc.Spawn(cc.JumpBy.create(2, cc.p(300, 0), 50, 4), cc.RotateBy.create(2, 720)); */ ctor:function (tempArray) { cc.ActionInterval.prototype.ctor.call(this); @@ -639,17 +889,16 @@ cc.Spawn = cc.ActionInterval.extend(/** @lends cc.Spawn# */{ if ((last >= 0) && (paramArray[last] == null)) cc.log("parameters should not be ending with null in Javascript"); - if (last >= 0) { - var prev = paramArray[0], action1; - for (var i = 1; i < last; i++) { - if (paramArray[i]) { - action1 = prev; - prev = cc.Spwan.create(); - prev.initWithTwoActions(action1, paramArray[i]); - } - } - this.initWithTwoActions(prev, paramArray[last]); - } + if (last >= 0) { + var prev = paramArray[0], action1; + for (var i = 1; i < last; i++) { + if (paramArray[i]) { + action1 = prev; + prev = cc.Spawn._actionOneTwo(action1, paramArray[i]); + } + } + this.initWithTwoActions(prev, paramArray[last]); + } }, /** initializes the Spawn action with the 2 actions to spawn @@ -663,17 +912,17 @@ cc.Spawn = cc.ActionInterval.extend(/** @lends cc.Spawn# */{ var ret = false; - var d1 = action1.getDuration(); - var d2 = action2.getDuration(); + var d1 = action1._duration; + var d2 = action2._duration; if (this.initWithDuration(Math.max(d1, d2))) { this._one = action1; this._two = action2; if (d1 > d2) { - this._two = cc.Sequence._actionOneTwo(action2, cc.DelayTime.create(d1 - d2)); + this._two = cc.Sequence._actionOneTwo(action2, cc.delayTime(d1 - d2)); } else if (d1 < d2) { - this._one = cc.Sequence._actionOneTwo(action1, cc.DelayTime.create(d2 - d1)); + this._one = cc.Sequence._actionOneTwo(action1, cc.delayTime(d2 - d1)); } ret = true; @@ -687,11 +936,13 @@ cc.Spawn = cc.ActionInterval.extend(/** @lends cc.Spawn# */{ */ clone:function () { var action = new cc.Spawn(); + this._cloneDecoration(action); action.initWithTwoActions(this._one.clone(), this._two.clone()); return action; }, /** + * Start the action with target. * @param {cc.Node} target */ startWithTarget:function (target) { @@ -710,31 +961,40 @@ cc.Spawn = cc.ActionInterval.extend(/** @lends cc.Spawn# */{ }, /** - * @param {Number} time time in seconds + * Called once per frame. Time is the number of seconds of a frame interval. + * @param {Number} dt */ - update:function (time) { + update:function (dt) { + dt = this._computeEaseTime(dt); if (this._one) - this._one.update(time); + this._one.update(dt); if (this._two) - this._two.update(time); + this._two.update(dt); }, /** - * @return {cc.FiniteTimeAction} + * Returns a reversed action. + * @return {cc.Spawn} */ reverse:function () { - return cc.Spawn._actionOneTwo(this._one.reverse(), this._two.reverse()); + var action = cc.Spawn._actionOneTwo(this._one.reverse(), this._two.reverse()); + this._cloneDecoration(action); + this._reverseEaseList(action); + return action; } }); /** + * Create a spawn action which runs several actions in parallel. + * @function * @param {Array|cc.FiniteTimeAction}tempArray * @return {cc.FiniteTimeAction} * @example * // example - * var action = cc.Spawn.create(cc.JumpBy.create(2, cc.p(300, 0), 50, 4), cc.RotateBy.create(2, 720)); + * var action = cc.spawn(cc.jumpBy(2, cc.p(300, 0), 50, 4), cc.rotateBy(2, 720)); + * todo:It should be the direct use new */ -cc.Spawn.create = function (/*Multiple Arguments*/tempArray) { +cc.spawn = function (/*Multiple Arguments*/tempArray) { var paramArray = (tempArray instanceof Array) ? tempArray : arguments; if ((paramArray.length > 0) && (paramArray[paramArray.length - 1] == null)) cc.log("parameters should not be ending with null in Javascript"); @@ -742,11 +1002,21 @@ cc.Spawn.create = function (/*Multiple Arguments*/tempArray) { var prev = paramArray[0]; for (var i = 1; i < paramArray.length; i++) { if (paramArray[i] != null) - prev = this._actionOneTwo(prev, paramArray[i]); + prev = cc.Spawn._actionOneTwo(prev, paramArray[i]); } return prev; }; +/** + * Please use cc.spawn instead. + * Create a spawn action which runs several actions in parallel. + * @static + * @deprecated since v3.0
Please use cc.spawn instead. + * @param {Array|cc.FiniteTimeAction}tempArray + * @return {cc.FiniteTimeAction} + */ +cc.Spawn.create = cc.spawn; + /** * @param {cc.FiniteTimeAction} action1 * @param {cc.FiniteTimeAction} action2 @@ -760,11 +1030,17 @@ cc.Spawn._actionOneTwo = function (action1, action2) { }; -/** Rotates a cc.Node object to a certain angle by modifying it's +/** + * Rotates a cc.Node object to a certain angle by modifying it's. * rotation attribute.
* The direction will be decided by the shortest angle. * @class * @extends cc.ActionInterval + * @param {Number} duration duration in seconds + * @param {Number} deltaAngleX deltaAngleX in degrees. + * @param {Number} [deltaAngleY] deltaAngleY in degrees. + * @example + * var rotateTo = new cc.RotateTo(2, 61.0); */ cc.RotateTo = cc.ActionInterval.extend(/** @lends cc.RotateTo# */{ _dstAngleX:0, @@ -776,13 +1052,11 @@ cc.RotateTo = cc.ActionInterval.extend(/** @lends cc.RotateTo# */{ _diffAngleY:0, /** - * Creates a RotateTo action with x and y rotation angles - * @constructor + * Constructor function, override it to extend the construction behavior, remember to call "this._super()" in the extended "ctor" function.
+ * Creates a RotateTo action with x and y rotation angles. * @param {Number} duration duration in seconds * @param {Number} deltaAngleX deltaAngleX in degrees. * @param {Number} [deltaAngleY] deltaAngleY in degrees. - * @example - * var rotateTo = new cc.RotateTo(2, 61.0); */ ctor:function (duration, deltaAngleX, deltaAngleY) { cc.ActionInterval.prototype.ctor.call(this); @@ -791,6 +1065,7 @@ cc.RotateTo = cc.ActionInterval.extend(/** @lends cc.RotateTo# */{ }, /** + * Initializes the action. * @param {Number} duration * @param {Number} deltaAngleX * @param {Number} deltaAngleY @@ -811,11 +1086,13 @@ cc.RotateTo = cc.ActionInterval.extend(/** @lends cc.RotateTo# */{ */ clone:function () { var action = new cc.RotateTo(); + this._cloneDecoration(action); action.initWithDuration(this._duration, this._dstAngleX, this._dstAngleY); return action; }, /** + * Start the action with target. * @param {cc.Node} target */ startWithTarget:function (target) { @@ -842,41 +1119,66 @@ cc.RotateTo = cc.ActionInterval.extend(/** @lends cc.RotateTo# */{ }, /** - * RotateTo reverse not implemented + * RotateTo reverse not implemented. + * Will be overridden. */ reverse:function () { cc.log("cc.RotateTo.reverse(): it should be overridden in subclass."); }, /** - * @param {Number} time time in seconds + * Called once per frame. Time is the number of seconds of a frame interval. + * @param {Number} dt */ - update:function (time) { + update:function (dt) { + dt = this._computeEaseTime(dt); if (this.target) { - this.target.rotationX = this._startAngleX + this._diffAngleX * time; - this.target.rotationY = this._startAngleY + this._diffAngleY * time; + this.target.rotationX = this._startAngleX + this._diffAngleX * dt; + this.target.rotationY = this._startAngleY + this._diffAngleY * dt; } } }); /** - * Creates a RotateTo action with separate rotation angles + * Creates a RotateTo action with separate rotation angles. + * To specify the angle of rotation. + * @function * @param {Number} duration duration in seconds * @param {Number} deltaAngleX deltaAngleX in degrees. * @param {Number} [deltaAngleY] deltaAngleY in degrees. * @return {cc.RotateTo} * @example * // example - * var rotateTo = cc.RotateTo.create(2, 61.0); + * var rotateTo = cc.rotateTo(2, 61.0); */ -cc.RotateTo.create = function (duration, deltaAngleX, deltaAngleY) { +cc.rotateTo = function (duration, deltaAngleX, deltaAngleY) { return new cc.RotateTo(duration, deltaAngleX, deltaAngleY); }; +/** + * Please use cc.rotateTo instead + * Creates a RotateTo action with separate rotation angles. + * To specify the angle of rotation. + * @static + * @deprecated since v3.0
Please use cc.rotateTo instead. + * @param {Number} duration duration in seconds + * @param {Number} deltaAngleX deltaAngleX in degrees. + * @param {Number} [deltaAngleY] deltaAngleY in degrees. + * @return {cc.RotateTo} + */ +cc.RotateTo.create = cc.rotateTo; -/** Rotates a cc.Node object clockwise a number of degrees by modifying it's rotation attribute. + +/** + * Rotates a cc.Node object clockwise a number of degrees by modifying it's rotation attribute. + * Relative to its properties to modify. * @class * @extends cc.ActionInterval + * @param {Number} duration duration in seconds + * @param {Number} deltaAngleX deltaAngleX in degrees + * @param {Number} [deltaAngleY] deltaAngleY in degrees + * @example + * var actionBy = new cc.RotateBy(2, 360); */ cc.RotateBy = cc.ActionInterval.extend(/** @lends cc.RotateBy# */{ _angleX:0, @@ -885,12 +1187,10 @@ cc.RotateBy = cc.ActionInterval.extend(/** @lends cc.RotateBy# */{ _startAngleY:0, /** - * @constructor - * @param {Number} duration druation in seconds + * Constructor function, override it to extend the construction behavior, remember to call "this._super()" in the extended "ctor" function. + * @param {Number} duration duration in seconds * @param {Number} deltaAngleX deltaAngleX in degrees * @param {Number} [deltaAngleY] deltaAngleY in degrees - * @example - * var actionBy = new cc.RotateBy(2, 360); */ ctor: function (duration, deltaAngleX, deltaAngleY) { cc.ActionInterval.prototype.ctor.call(this); @@ -899,6 +1199,7 @@ cc.RotateBy = cc.ActionInterval.extend(/** @lends cc.RotateBy# */{ }, /** + * Initializes the action. * @param {Number} duration duration in seconds * @param {Number} deltaAngleX deltaAngleX in degrees * @param {Number} [deltaAngleY=] deltaAngleY in degrees @@ -919,11 +1220,13 @@ cc.RotateBy = cc.ActionInterval.extend(/** @lends cc.RotateBy# */{ */ clone:function () { var action = new cc.RotateBy(); + this._cloneDecoration(action); action.initWithDuration(this._duration, this._angleX, this._angleY); return action; }, /** + * Start the action with target. * @param {cc.Node} target */ startWithTarget:function (target) { @@ -933,37 +1236,56 @@ cc.RotateBy = cc.ActionInterval.extend(/** @lends cc.RotateBy# */{ }, /** - * @param {Number} time + * Called once per frame. Time is the number of seconds of a frame interval. + * @param {Number} dt */ - update:function (time) { + update:function (dt) { + dt = this._computeEaseTime(dt); if (this.target) { - this.target.rotationX = this._startAngleX + this._angleX * time; - this.target.rotationY = this._startAngleY + this._angleY * time; + this.target.rotationX = this._startAngleX + this._angleX * dt; + this.target.rotationY = this._startAngleY + this._angleY * dt; } }, /** - * @return {cc.ActionInterval} + * Returns a reversed action. + * @return {cc.RotateBy} */ reverse:function () { - return cc.RotateBy.create(this._duration, -this._angleX, -this._angleY); + var action = new cc.RotateBy(this._duration, -this._angleX, -this._angleY); + this._cloneDecoration(action); + this._reverseEaseList(action); + return action; } }); /** - * @param {Number} duration druation in seconds + * Rotates a cc.Node object clockwise a number of degrees by modifying it's rotation attribute. + * Relative to its properties to modify. + * @function + * @param {Number} duration duration in seconds * @param {Number} deltaAngleX deltaAngleX in degrees * @param {Number} [deltaAngleY] deltaAngleY in degrees * @return {cc.RotateBy} * @example * // example - * var actionBy = cc.RotateBy.create(2, 360); + * var actionBy = cc.rotateBy(2, 360); */ -cc.RotateBy.create = function (duration, deltaAngleX, deltaAngleY) { - var rotateBy = new cc.RotateBy(); - rotateBy.initWithDuration(duration, deltaAngleX, deltaAngleY); - return rotateBy; +cc.rotateBy = function (duration, deltaAngleX, deltaAngleY) { + return new cc.RotateBy(duration, deltaAngleX, deltaAngleY); }; +/** + * Please use cc.rotateBy instead. + * Rotates a cc.Node object clockwise a number of degrees by modifying it's rotation attribute. + * Relative to its properties to modify. + * @static + * @deprecated since v3.0
Please use cc.rotateBy instead. + * @param {Number} duration duration in seconds + * @param {Number} deltaAngleX deltaAngleX in degrees + * @param {Number} [deltaAngleY] deltaAngleY in degrees + * @return {cc.RotateBy} + */ +cc.RotateBy.create = cc.rotateBy; /** @@ -975,6 +1297,11 @@ cc.RotateBy.create = function (duration, deltaAngleX, deltaAngleY) { * * @class * @extends cc.ActionInterval + * @param {Number} duration duration in seconds + * @param {cc.Point|Number} deltaPos + * @param {Number} [deltaY] + * @example + * var actionTo = cc.moveBy(2, cc.p(windowSize.width - 40, windowSize.height - 40)); */ cc.MoveBy = cc.ActionInterval.extend(/** @lends cc.MoveBy# */{ _positionDelta:null, @@ -982,12 +1309,10 @@ cc.MoveBy = cc.ActionInterval.extend(/** @lends cc.MoveBy# */{ _previousPosition:null, /** - * @constructor + * Constructor function, override it to extend the construction behavior, remember to call "this._super()" in the extended "ctor" function. * @param {Number} duration duration in seconds * @param {cc.Point|Number} deltaPos * @param {Number} [deltaY] - * @example - * var actionTo = cc.MoveBy.create(2, cc.p(windowSize.width - 40, windowSize.height - 40)); */ ctor:function (duration, deltaPos, deltaY) { cc.ActionInterval.prototype.ctor.call(this); @@ -1000,6 +1325,7 @@ cc.MoveBy = cc.ActionInterval.extend(/** @lends cc.MoveBy# */{ }, /** + * Initializes the action. * @param {Number} duration duration in seconds * @param {cc.Point} position * @param {Number} [y] @@ -1025,12 +1351,14 @@ cc.MoveBy = cc.ActionInterval.extend(/** @lends cc.MoveBy# */{ */ clone:function () { var action = new cc.MoveBy(); - action.initWithDuration(this._duration, this._positionDelta) + this._cloneDecoration(action); + action.initWithDuration(this._duration, this._positionDelta); return action; }, /** - * @param {Number} target + * Start the action with target. + * @param {cc.Node} target */ startWithTarget:function (target) { cc.ActionInterval.prototype.startWithTarget.call(this, target); @@ -1043,12 +1371,14 @@ cc.MoveBy = cc.ActionInterval.extend(/** @lends cc.MoveBy# */{ }, /** - * @param {Number} time time in seconds + * Called once per frame. Time is the number of seconds of a frame interval. + * @param {Number} dt */ - update:function (time) { + update:function (dt) { + dt = this._computeEaseTime(dt); if (this.target) { - var x = this._positionDelta.x * time; - var y = this._positionDelta.y * time; + var x = this._positionDelta.x * dt; + var y = this._positionDelta.y * dt; var locStartPosition = this._startPosition; if (cc.ENABLE_STACKABLE_ACTIONS) { var targetX = this.target.getPositionX(); @@ -1070,24 +1400,42 @@ cc.MoveBy = cc.ActionInterval.extend(/** @lends cc.MoveBy# */{ /** * MoveTo reverse is not implemented + * @return {cc.MoveBy} */ reverse:function () { - return cc.MoveBy.create(this._duration, cc.p(-this._positionDelta.x, -this._positionDelta.y)); + var action = new cc.MoveBy(this._duration, cc.p(-this._positionDelta.x, -this._positionDelta.y)); + this._cloneDecoration(action); + this._reverseEaseList(action); + return action; } }); /** + * Create the action. + * Relative to its coordinate moves a certain distance. + * @function * @param {Number} duration duration in seconds - * @param {cc.Point|Number} deltaPosition + * @param {cc.Point|Number} deltaPos * @param {Number} deltaY * @return {cc.MoveBy} * @example * // example - * var actionTo = cc.MoveBy.create(2, cc.p(windowSize.width - 40, windowSize.height - 40)); + * var actionTo = cc.moveBy(2, cc.p(windowSize.width - 40, windowSize.height - 40)); */ -cc.MoveBy.create = function (duration, deltaPos, deltaY) { +cc.moveBy = function (duration, deltaPos, deltaY) { return new cc.MoveBy(duration, deltaPos, deltaY); }; +/** + * Please use cc.moveBy instead. + * Relative to its coordinate moves a certain distance. + * @static + * @deprecated since v3.0 please use cc.moveBy instead. + * @param {Number} duration duration in seconds + * @param {cc.Point|Number} deltaPos + * @param {Number} deltaY + * @return {cc.MoveBy} + */ +cc.MoveBy.create = cc.moveBy; /** @@ -1096,17 +1444,20 @@ cc.MoveBy.create = function (duration, deltaPos, deltaY) { * movement will be the sum of individual movements. * @class * @extends cc.MoveBy + * @param {Number} duration duration in seconds + * @param {cc.Point|Number} position + * @param {Number} y + * @example + * var actionBy = new cc.MoveTo(2, cc.p(80, 80)); */ cc.MoveTo = cc.MoveBy.extend(/** @lends cc.MoveTo# */{ _endPosition:null, /** - * @constructor + * Constructor function, override it to extend the construction behavior, remember to call "this._super()" in the extended "ctor" function. * @param {Number} duration duration in seconds * @param {cc.Point|Number} position * @param {Number} y - * @example - * var actionBy = cc.MoveTo.create(2, cc.p(80, 80)); */ ctor:function (duration, position, y) { cc.MoveBy.prototype.ctor.call(this); @@ -1116,6 +1467,7 @@ cc.MoveTo = cc.MoveBy.extend(/** @lends cc.MoveTo# */{ }, /** + * Initializes the action. * @param {Number} duration duration in seconds * @param {cc.Point} position * @param {Number} y @@ -1141,11 +1493,13 @@ cc.MoveTo = cc.MoveBy.extend(/** @lends cc.MoveTo# */{ */ clone:function () { var action = new cc.MoveTo(); + this._cloneDecoration(action); action.initWithDuration(this._duration, this._endPosition); return action; }, /** + * Start the action with target. * @param {cc.Node} target */ startWithTarget:function (target) { @@ -1154,23 +1508,43 @@ cc.MoveTo = cc.MoveBy.extend(/** @lends cc.MoveTo# */{ this._positionDelta.y = this._endPosition.y - target.getPositionY(); } }); + /** + * Create new action. + * Moving to the specified coordinates. + * @function * @param {Number} duration duration in seconds * @param {cc.Point} position * @param {Number} y * @return {cc.MoveBy} * @example * // example - * var actionBy = cc.MoveTo.create(2, cc.p(80, 80)); + * var actionBy = cc.moveTo(2, cc.p(80, 80)); */ -cc.MoveTo.create = function (duration, position, y) { +cc.moveTo = function (duration, position, y) { return new cc.MoveTo(duration, position, y); }; +/** + * Please use cc.moveTo instead. + * Moving to the specified coordinates. + * @static + * @deprecated since v3.0
Please use cc.moveTo instead. + * @param {Number} duration duration in seconds + * @param {cc.Point} position + * @param {Number} y + * @return {cc.MoveBy} + */ +cc.MoveTo.create = cc.moveTo; /** * Skews a cc.Node object to given angles by modifying it's skewX and skewY attributes * @class * @extends cc.ActionInterval + * @param {Number} t time in seconds + * @param {Number} sx + * @param {Number} sy + * @example + * var actionTo = new cc.SkewTo(2, 37.2, -37.2); */ cc.SkewTo = cc.ActionInterval.extend(/** @lends cc.SkewTo# */{ _skewX:0, @@ -1183,12 +1557,10 @@ cc.SkewTo = cc.ActionInterval.extend(/** @lends cc.SkewTo# */{ _deltaY:0, /** - * @constructor + * Constructor function, override it to extend the construction behavior, remember to call "this._super()" in the extended "ctor" function. * @param {Number} t time in seconds * @param {Number} sx * @param {Number} sy - * @example - * var actionTo = new cc.SkewTo(2, 37.2, -37.2); */ ctor: function (t, sx, sy) { cc.ActionInterval.prototype.ctor.call(this); @@ -1197,6 +1569,7 @@ cc.SkewTo = cc.ActionInterval.extend(/** @lends cc.SkewTo# */{ }, /** + * Initializes the action. * @param {Number} t time in seconds * @param {Number} sx * @param {Number} sy @@ -1218,11 +1591,13 @@ cc.SkewTo = cc.ActionInterval.extend(/** @lends cc.SkewTo# */{ */ clone:function () { var action = new cc.SkewTo(); + this._cloneDecoration(action); action.initWithDuration(this._duration, this._endSkewX, this._endSkewY); return action; }, /** + * Start the action with target. * @param {cc.Node} target */ startWithTarget:function (target) { @@ -1244,34 +1619,57 @@ cc.SkewTo = cc.ActionInterval.extend(/** @lends cc.SkewTo# */{ }, /** - * @param {Number} t time in seconds + * Called once per frame. Time is the number of seconds of a frame interval. + * @param {Number} dt */ - update:function (t) { - this.target.skewX = this._startSkewX + this._deltaX * t; - this.target.skewY = this._startSkewY + this._deltaY * t; + update:function (dt) { + dt = this._computeEaseTime(dt); + this.target.skewX = this._startSkewX + this._deltaX * dt; + this.target.skewY = this._startSkewY + this._deltaY * dt; } }); /** + * Create new action. + * Skews a cc.Node object to given angles by modifying it's skewX and skewY attributes. + * Changes to the specified value. + * @function * @param {Number} t time in seconds * @param {Number} sx * @param {Number} sy * @return {cc.SkewTo} * @example * // example - * var actionTo = cc.SkewTo.create(2, 37.2, -37.2); + * var actionTo = cc.skewTo(2, 37.2, -37.2); */ -cc.SkewTo.create = function (t, sx, sy) { +cc.skewTo = function (t, sx, sy) { return new cc.SkewTo(t, sx, sy); }; +/** + * Please use cc.skewTo instead. + * Skews a cc.Node object to given angles by modifying it's skewX and skewY attributes。 + * Changes to the specified value. + * @static + * @deprecated since v3.0
Please use cc.skewTo instead. + * @param {Number} t time in seconds + * @param {Number} sx + * @param {Number} sy + * @return {cc.SkewTo} + */ +cc.SkewTo.create = cc.skewTo; -/** Skews a cc.Node object by skewX and skewY degrees +/** + * Skews a cc.Node object by skewX and skewY degrees. + * Relative to its attribute modification. * @class * @extends cc.SkewTo + * @param {Number} t time in seconds + * @param {Number} sx skew in degrees for X axis + * @param {Number} sy skew in degrees for Y axis */ cc.SkewBy = cc.SkewTo.extend(/** @lends cc.SkewBy# */{ /** - * @constructor + * Constructor function, override it to extend the construction behavior, remember to call "this._super()" in the extended "ctor" function. * @param {Number} t time in seconds * @param {Number} sx skew in degrees for X axis * @param {Number} sy skew in degrees for Y axis @@ -1282,6 +1680,7 @@ cc.SkewBy = cc.SkewTo.extend(/** @lends cc.SkewBy# */{ }, /** + * Initializes the action. * @param {Number} t time in seconds * @param {Number} deltaSkewX skew in degrees for X axis * @param {Number} deltaSkewY skew in degrees for Y axis @@ -1303,11 +1702,13 @@ cc.SkewBy = cc.SkewTo.extend(/** @lends cc.SkewBy# */{ */ clone:function () { var action = new cc.SkewBy(); + this._cloneDecoration(action); action.initWithDuration(this._duration, this._skewX, this._skewY); return action; }, /** + * Start the action width target. * @param {cc.Node} target */ startWithTarget:function (target) { @@ -1319,32 +1720,59 @@ cc.SkewBy = cc.SkewTo.extend(/** @lends cc.SkewBy# */{ }, /** - * @return {cc.ActionInterval} + * Returns a reversed action. + * @return {cc.SkewBy} */ reverse:function () { - return cc.SkewBy.create(this._duration, -this._skewX, -this._skewY); + var action = new cc.SkewBy(this._duration, -this._skewX, -this._skewY); + this._cloneDecoration(action); + this._reverseEaseList(action); + return action; } }); + /** + * Skews a cc.Node object by skewX and skewY degrees.
+ * Relative to its attribute modification. + * @function * @param {Number} t time in seconds * @param {Number} sx sx skew in degrees for X axis * @param {Number} sy sy skew in degrees for Y axis * @return {cc.SkewBy} * @example * // example - * var actionBy = cc.SkewBy.create(2, 0, -90); + * var actionBy = cc.skewBy(2, 0, -90); */ -cc.SkewBy.create = function (t, sx, sy) { - var skewBy = new cc.SkewBy(); - if (skewBy) - skewBy.initWithDuration(t, sx, sy); - return skewBy; +cc.skewBy = function (t, sx, sy) { + return new cc.SkewBy(t, sx, sy); }; +/** + * Please use cc.skewBy instead.
+ * Skews a cc.Node object by skewX and skewY degrees.
+ * Relative to its attribute modification. + * @static + * @deprecated since v3.0 please use cc.skewBy instead. + * @param {Number} t time in seconds + * @param {Number} sx sx skew in degrees for X axis + * @param {Number} sy sy skew in degrees for Y axis + * @return {cc.SkewBy} + */ +cc.SkewBy.create = cc.skewBy; -/** Moves a cc.Node object simulating a parabolic jump movement by modifying it's position attribute. +/** + * Moves a cc.Node object simulating a parabolic jump movement by modifying it's position attribute. + * Relative to its movement. * @class * @extends cc.ActionInterval + * @param {Number} duration + * @param {cc.Point|Number} position + * @param {Number} [y] + * @param {Number} height + * @param {Number} jumps + * @example + * var actionBy = new cc.JumpBy(2, cc.p(300, 0), 50, 4); + * var actionBy = new cc.JumpBy(2, 300, 0, 50, 4); */ cc.JumpBy = cc.ActionInterval.extend(/** @lends cc.JumpBy# */{ _startPosition:null, @@ -1354,15 +1782,12 @@ cc.JumpBy = cc.ActionInterval.extend(/** @lends cc.JumpBy# */{ _previousPosition:null, /** - * @constructor + * Constructor function, override it to extend the construction behavior, remember to call "this._super()" in the extended "ctor" function. * @param {Number} duration * @param {cc.Point|Number} position * @param {Number} [y] * @param {Number} height * @param {Number} jumps - * @example - * var actionBy = new cc.JumpBy(2, cc.p(300, 0), 50, 4); - * var actionBy = new cc.JumpBy(2, 300, 0, 50, 4); */ ctor:function (duration, position, y, height, jumps) { cc.ActionInterval.prototype.ctor.call(this); @@ -1373,6 +1798,7 @@ cc.JumpBy = cc.ActionInterval.extend(/** @lends cc.JumpBy# */{ height !== undefined && this.initWithDuration(duration, position, y, height, jumps); }, /** + * Initializes the action. * @param {Number} duration * @param {cc.Point|Number} position * @param {Number} [y] @@ -1406,11 +1832,13 @@ cc.JumpBy = cc.ActionInterval.extend(/** @lends cc.JumpBy# */{ */ clone:function () { var action = new cc.JumpBy(); + this._cloneDecoration(action); action.initWithDuration(this._duration, this._delta, this._height, this._jumps); return action; }, /** + * Start the action with target. * @param {cc.Node} target */ startWithTarget:function (target) { @@ -1424,15 +1852,17 @@ cc.JumpBy = cc.ActionInterval.extend(/** @lends cc.JumpBy# */{ }, /** - * @param {Number} time + * Called once per frame. Time is the number of seconds of a frame interval. + * @param {Number} dt */ - update:function (time) { + update:function (dt) { + dt = this._computeEaseTime(dt); if (this.target) { - var frac = time * this._jumps % 1.0; + var frac = dt * this._jumps % 1.0; var y = this._height * 4 * frac * (1 - frac); - y += this._delta.y * time; + y += this._delta.y * dt; - var x = this._delta.x * time; + var x = this._delta.x * dt; var locStartPosition = this._startPosition; if (cc.ENABLE_STACKABLE_ACTIONS) { var targetX = this.target.getPositionX(); @@ -1453,14 +1883,21 @@ cc.JumpBy = cc.ActionInterval.extend(/** @lends cc.JumpBy# */{ }, /** - * @return {cc.ActionInterval} + * Returns a reversed action. + * @return {cc.JumpBy} */ reverse:function () { - return cc.JumpBy.create(this._duration, cc.p(-this._delta.x, -this._delta.y), this._height, this._jumps); + var action = new cc.JumpBy(this._duration, cc.p(-this._delta.x, -this._delta.y), this._height, this._jumps); + this._cloneDecoration(action); + this._reverseEaseList(action); + return action; } }); /** + * Moves a cc.Node object simulating a parabolic jump movement by modifying it's position attribute. + * Relative to its movement. + * @function * @param {Number} duration * @param {cc.Point|Number} position * @param {Number} [y] @@ -1469,26 +1906,90 @@ cc.JumpBy = cc.ActionInterval.extend(/** @lends cc.JumpBy# */{ * @return {cc.JumpBy} * @example * // example - * var actionBy = cc.JumpBy.create(2, cc.p(300, 0), 50, 4); - * var actionBy = cc.JumpBy.create(2, 300, 0, 50, 4); + * var actionBy = cc.jumpBy(2, cc.p(300, 0), 50, 4); + * var actionBy = cc.jumpBy(2, 300, 0, 50, 4); */ -cc.JumpBy.create = function (duration, position, y, height, jumps) { +cc.jumpBy = function (duration, position, y, height, jumps) { return new cc.JumpBy(duration, position, y, height, jumps); }; +/** + * Please use cc.jumpBy instead.
+ * Moves a cc.Node object simulating a parabolic jump movement by modifying it's position attribute.
+ * Relative to its movement. + * @static + * @deprecated since v3.0 please use cc.jumpBy instead. + * @param {Number} duration + * @param {cc.Point|Number} position + * @param {Number} [y] + * @param {Number} height + * @param {Number} jumps + * @return {cc.JumpBy} + */ +cc.JumpBy.create = cc.jumpBy; -/** Moves a cc.Node object to a parabolic position simulating a jump movement by modifying it's position attribute. +/** + * Moves a cc.Node object to a parabolic position simulating a jump movement by modifying it's position attribute.
+ * Jump to the specified location. * @class * @extends cc.JumpBy + * @param {Number} duration + * @param {cc.Point|Number} position + * @param {Number} [y] + * @param {Number} height + * @param {Number} jumps + * @example + * var actionTo = new cc.JumpTo(2, cc.p(300, 0), 50, 4); + * var actionTo = new cc.JumpTo(2, 300, 0, 50, 4); */ cc.JumpTo = cc.JumpBy.extend(/** @lends cc.JumpTo# */{ + _endPosition:null, - /** + /** + * Constructor function, override it to extend the construction behavior, remember to call "this._super()" in the extended "ctor" function. + * @param {Number} duration + * @param {cc.Point|Number} position + * @param {Number} [y] + * @param {Number} height + * @param {Number} jumps + */ + ctor:function (duration, position, y, height, jumps) { + cc.JumpBy.prototype.ctor.call(this); + this._endPosition = cc.p(0, 0); + + height !== undefined && this.initWithDuration(duration, position, y, height, jumps); + }, + /** + * Initializes the action. + * @param {Number} duration + * @param {cc.Point|Number} position + * @param {Number} [y] + * @param {Number} height + * @param {Number} jumps + * @return {Boolean} + * @example + * actionTo.initWithDuration(2, cc.p(300, 0), 50, 4); + * actionTo.initWithDuration(2, 300, 0, 50, 4); + */ + initWithDuration:function (duration, position, y, height, jumps) { + if (cc.JumpBy.prototype.initWithDuration.call(this, duration, position, y, height, jumps)) { + if (jumps === undefined) { + y = position.y; + position = position.x; + } + this._endPosition.x = position; + this._endPosition.y = y; + return true; + } + return false; + }, + /** + * Start the action with target. * @param {cc.Node} target */ startWithTarget:function (target) { cc.JumpBy.prototype.startWithTarget.call(this, target); - this._delta.x = this._delta.x - this._startPosition.x; - this._delta.y = this._delta.y - this._startPosition.y; + this._delta.x = this._endPosition.x - this._startPosition.x; + this._delta.y = this._endPosition.y - this._startPosition.y; }, /** @@ -1497,12 +1998,16 @@ cc.JumpTo = cc.JumpBy.extend(/** @lends cc.JumpTo# */{ */ clone:function () { var action = new cc.JumpTo(); - action.initWithDuration(this._duration, this._delta, this._height, this._jumps); + this._cloneDecoration(action); + action.initWithDuration(this._duration, this._endPosition, this._height, this._jumps); return action; } }); /** + * Moves a cc.Node object to a parabolic position simulating a jump movement by modifying it's position attribute.
+ * Jump to the specified location. + * @function * @param {Number} duration * @param {cc.Point|Number} position * @param {Number} [y] @@ -1511,12 +2016,26 @@ cc.JumpTo = cc.JumpBy.extend(/** @lends cc.JumpTo# */{ * @return {cc.JumpTo} * @example * // example - * var actionTo = cc.JumpTo.create(2, cc.p(300, 300), 50, 4); - * var actionTo = cc.JumpTo.create(2, 300, 300, 50, 4); + * var actionTo = cc.jumpTo(2, cc.p(300, 300), 50, 4); + * var actionTo = cc.jumpTo(2, 300, 300, 50, 4); */ -cc.JumpTo.create = function (duration, position, y, height, jumps) { +cc.jumpTo = function (duration, position, y, height, jumps) { return new cc.JumpTo(duration, position, y, height, jumps); }; +/** + * Please use cc.jumpTo instead. + * Moves a cc.Node object to a parabolic position simulating a jump movement by modifying it's position attribute.
+ * Jump to the specified location. + * @static + * @deprecated since v3.0 please use cc.jumpTo instead. + * @param {Number} duration + * @param {cc.Point|Number} position + * @param {Number} [y] + * @param {Number} height + * @param {Number} jumps + * @return {cc.JumpTo} + */ +cc.JumpTo.create = cc.jumpTo; /** * @function @@ -1535,8 +2054,14 @@ cc.bezierAt = function (a, b, c, d, t) { }; /** An action that moves the target with a cubic Bezier curve by a certain distance. + * Relative to its movement. * @class * @extends cc.ActionInterval + * @param {Number} t time in seconds + * @param {Array} c Array of points + * @example + * var bezier = [cc.p(0, windowSize.height / 2), cc.p(300, -windowSize.height / 2), cc.p(300, 100)]; + * var bezierForward = new cc.BezierBy(3, bezier); */ cc.BezierBy = cc.ActionInterval.extend(/** @lends cc.BezierBy# */{ _config:null, @@ -1544,12 +2069,9 @@ cc.BezierBy = cc.ActionInterval.extend(/** @lends cc.BezierBy# */{ _previousPosition:null, /** - * @constructor + * Constructor function, override it to extend the construction behavior, remember to call "this._super()" in the extended "ctor" function. * @param {Number} t time in seconds * @param {Array} c Array of points - * @example - * var bezier = [cc.p(0, windowSize.height / 2), cc.p(300, -windowSize.height / 2), cc.p(300, 100)]; - * var bezierForward = new cc.BezierBy(3, bezier); */ ctor:function (t, c) { cc.ActionInterval.prototype.ctor.call(this); @@ -1559,7 +2081,9 @@ cc.BezierBy = cc.ActionInterval.extend(/** @lends cc.BezierBy# */{ c && this.initWithDuration(t, c); }, + /** + * Initializes the action. * @param {Number} t time in seconds * @param {Array} c Array of points * @return {Boolean} @@ -1578,6 +2102,7 @@ cc.BezierBy = cc.ActionInterval.extend(/** @lends cc.BezierBy# */{ */ clone:function () { var action = new cc.BezierBy(); + this._cloneDecoration(action); var newConfigs = []; for (var i = 0; i < this._config.length; i++) { var selConf = this._config[i]; @@ -1588,6 +2113,7 @@ cc.BezierBy = cc.ActionInterval.extend(/** @lends cc.BezierBy# */{ }, /** + * Start the action with target. * @param {cc.Node} target */ startWithTarget:function (target) { @@ -1601,9 +2127,11 @@ cc.BezierBy = cc.ActionInterval.extend(/** @lends cc.BezierBy# */{ }, /** - * @param {Number} time + * Called once per frame. Time is the number of seconds of a frame interval. + * @param {Number} dt */ - update:function (time) { + update:function (dt) { + dt = this._computeEaseTime(dt); if (this.target) { var locConfig = this._config; var xa = 0; @@ -1616,8 +2144,8 @@ cc.BezierBy = cc.ActionInterval.extend(/** @lends cc.BezierBy# */{ var yc = locConfig[1].y; var yd = locConfig[2].y; - var x = cc.bezierAt(xa, xb, xc, xd, time); - var y = cc.bezierAt(ya, yb, yc, yd, time); + var x = cc.bezierAt(xa, xb, xc, xd, dt); + var y = cc.bezierAt(ya, yb, yc, yd, dt); var locStartPosition = this._startPosition; if (cc.ENABLE_STACKABLE_ACTIONS) { @@ -1639,7 +2167,8 @@ cc.BezierBy = cc.ActionInterval.extend(/** @lends cc.BezierBy# */{ }, /** - * @return {cc.ActionInterval} + * Returns a reversed action. + * @return {cc.BezierBy} */ reverse:function () { var locConfig = this._config; @@ -1647,37 +2176,57 @@ cc.BezierBy = cc.ActionInterval.extend(/** @lends cc.BezierBy# */{ cc.pAdd(locConfig[1], cc.pNeg(locConfig[2])), cc.pAdd(locConfig[0], cc.pNeg(locConfig[2])), cc.pNeg(locConfig[2]) ]; - return cc.BezierBy.create(this._duration, r); + var action = new cc.BezierBy(this._duration, r); + this._cloneDecoration(action); + this._reverseEaseList(action); + return action; } }); /** + * An action that moves the target with a cubic Bezier curve by a certain distance. + * Relative to its movement. + * @function * @param {Number} t time in seconds * @param {Array} c Array of points * @return {cc.BezierBy} * @example * // example * var bezier = [cc.p(0, windowSize.height / 2), cc.p(300, -windowSize.height / 2), cc.p(300, 100)]; - * var bezierForward = cc.BezierBy.create(3, bezier); + * var bezierForward = cc.bezierBy(3, bezier); */ -cc.BezierBy.create = function (t, c) { +cc.bezierBy = function (t, c) { return new cc.BezierBy(t, c); }; +/** + * Please use cc.bezierBy instead. + * An action that moves the target with a cubic Bezier curve by a certain distance. + * Relative to its movement. + * @static + * @deprecated since v3.0 please use cc.bezierBy instead. + * @param {Number} t time in seconds + * @param {Array} c Array of points + * @return {cc.BezierBy} + */ +cc.BezierBy.create = cc.bezierBy; /** An action that moves the target with a cubic Bezier curve to a destination point. * @class * @extends cc.BezierBy + * @param {Number} t + * @param {Array} c array of points + * @example + * var bezier = [cc.p(0, windowSize.height / 2), cc.p(300, -windowSize.height / 2), cc.p(300, 100)]; + * var bezierTo = new cc.BezierTo(2, bezier); */ cc.BezierTo = cc.BezierBy.extend(/** @lends cc.BezierTo# */{ _toConfig:null, /** - * @constructor + * Constructor function, override it to extend the construction behavior, remember to call "this._super()" in the extended "ctor" function. * @param {Number} t * @param {Array} c array of points - * @example - * var bezier = [cc.p(0, windowSize.height / 2), cc.p(300, -windowSize.height / 2), cc.p(300, 100)]; * var bezierTo = new cc.BezierTo(2, bezier); */ ctor:function (t, c) { @@ -1687,6 +2236,7 @@ cc.BezierTo = cc.BezierBy.extend(/** @lends cc.BezierTo# */{ }, /** + * Initializes the action. * @param {Number} t time in seconds * @param {Array} c Array of points * @return {Boolean} @@ -1705,11 +2255,13 @@ cc.BezierTo = cc.BezierBy.extend(/** @lends cc.BezierTo# */{ */ clone:function () { var action = new cc.BezierTo(); + this._cloneDecoration(action); action.initWithDuration(this._duration, this._toConfig); return action; }, /** + * Start the action with target. * @param {cc.Node} target */ startWithTarget:function (target) { @@ -1724,23 +2276,43 @@ cc.BezierTo = cc.BezierBy.extend(/** @lends cc.BezierTo# */{ } }); /** + * An action that moves the target with a cubic Bezier curve to a destination point. + * @function * @param {Number} t * @param {Array} c array of points * @return {cc.BezierTo} * @example * // example * var bezier = [cc.p(0, windowSize.height / 2), cc.p(300, -windowSize.height / 2), cc.p(300, 100)]; - * var bezierTo = cc.BezierTo.create(2, bezier); + * var bezierTo = cc.bezierTo(2, bezier); */ -cc.BezierTo.create = function (t, c) { +cc.bezierTo = function (t, c) { return new cc.BezierTo(t, c); }; +/** + * Please use cc.bezierTo instead + * @static + * @deprecated since v3.0 please use cc.bezierTo instead. + * @param {Number} t + * @param {Array} c array of points + * @return {cc.BezierTo} + */ +cc.BezierTo.create = cc.bezierTo; /** Scales a cc.Node object to a zoom factor by modifying it's scale attribute. * @warning This action doesn't support "reverse" * @class * @extends cc.ActionInterval + * @param {Number} duration + * @param {Number} sx scale parameter in X + * @param {Number} [sy] scale parameter in Y, if Null equal to sx + * @example + * // It scales to 0.5 in both X and Y. + * var actionTo = new cc.ScaleTo(2, 0.5); + * + * // It scales to 0.5 in x and 2 in Y + * var actionTo = new cc.ScaleTo(2, 0.5, 2); */ cc.ScaleTo = cc.ActionInterval.extend(/** @lends cc.ScaleTo# */{ _scaleX:1, @@ -1753,16 +2325,10 @@ cc.ScaleTo = cc.ActionInterval.extend(/** @lends cc.ScaleTo# */{ _deltaY:0, /** - * @constructor + * Constructor function, override it to extend the construction behavior, remember to call "this._super()" in the extended "ctor" function. * @param {Number} duration * @param {Number} sx scale parameter in X * @param {Number} [sy] scale parameter in Y, if Null equal to sx - * @example - * // It scales to 0.5 in both X and Y. - * var actionTo = new cc.ScaleTo(2, 0.5); - * - * // It scales to 0.5 in x and 2 in Y - * var actionTo = new cc.ScaleTo(2, 0.5, 2); */ ctor:function (duration, sx, sy) { cc.ActionInterval.prototype.ctor.call(this); @@ -1770,6 +2336,7 @@ cc.ScaleTo = cc.ActionInterval.extend(/** @lends cc.ScaleTo# */{ }, /** + * Initializes the action. * @param {Number} duration * @param {Number} sx * @param {Number} [sy=] @@ -1790,11 +2357,13 @@ cc.ScaleTo = cc.ActionInterval.extend(/** @lends cc.ScaleTo# */{ */ clone:function () { var action = new cc.ScaleTo(); + this._cloneDecoration(action); action.initWithDuration(this._duration, this._endScaleX, this._endScaleY); return action; }, /** + * Start the action with target. * @param {cc.Node} target */ startWithTarget:function (target) { @@ -1806,16 +2375,20 @@ cc.ScaleTo = cc.ActionInterval.extend(/** @lends cc.ScaleTo# */{ }, /** - * @param {Number} time + * Called once per frame. Time is the number of seconds of a frame interval. + * @param {Number} dt */ - update:function (time) { + update:function (dt) { + dt = this._computeEaseTime(dt); if (this.target) { - this.target.scaleX = this._startScaleX + this._deltaX * time; - this.target.scaleY = this._startScaleY + this._deltaY * time; + this.target.scaleX = this._startScaleX + this._deltaX * dt; + this.target.scaleY = this._startScaleY + this._deltaY * dt; } } }); /** + * Scales a cc.Node object to a zoom factor by modifying it's scale attribute. + * @function * @param {Number} duration * @param {Number} sx scale parameter in X * @param {Number} [sy] scale parameter in Y, if Null equal to sx @@ -1823,25 +2396,36 @@ cc.ScaleTo = cc.ActionInterval.extend(/** @lends cc.ScaleTo# */{ * @example * // example * // It scales to 0.5 in both X and Y. - * var actionTo = cc.ScaleTo.create(2, 0.5); + * var actionTo = cc.scaleTo(2, 0.5); * * // It scales to 0.5 in x and 2 in Y - * var actionTo = cc.ScaleTo.create(2, 0.5, 2); + * var actionTo = cc.scaleTo(2, 0.5, 2); */ -cc.ScaleTo.create = function (duration, sx, sy) { //function overload - var scaleTo = new cc.ScaleTo(); - scaleTo.initWithDuration(duration, sx, sy); - return scaleTo; +cc.scaleTo = function (duration, sx, sy) { //function overload + return new cc.ScaleTo(duration, sx, sy); }; +/** + * Please use cc.scaleTo instead. + * Scales a cc.Node object to a zoom factor by modifying it's scale attribute. + * @static + * @deprecated since v3.0 please use cc.scaleTo instead. + * @param {Number} duration + * @param {Number} sx scale parameter in X + * @param {Number} [sy] scale parameter in Y, if Null equal to sx + * @return {cc.ScaleTo} + */ +cc.ScaleTo.create = cc.scaleTo; /** Scales a cc.Node object a zoom factor by modifying it's scale attribute. + * Relative to its changes. * @class * @extends cc.ScaleTo */ cc.ScaleBy = cc.ScaleTo.extend(/** @lends cc.ScaleBy# */{ /** - * @param {Number} target + * Start the action with target. + * @param {cc.Node} target */ startWithTarget:function (target) { cc.ScaleTo.prototype.startWithTarget.call(this, target); @@ -1850,10 +2434,14 @@ cc.ScaleBy = cc.ScaleTo.extend(/** @lends cc.ScaleBy# */{ }, /** - * @return {cc.ActionInterval} + * Returns a reversed action. + * @return {cc.ScaleBy} */ reverse:function () { - return cc.ScaleBy.create(this._duration, 1 / this._endScaleX, 1 / this._endScaleY); + var action = new cc.ScaleBy(this._duration, 1 / this._endScaleX, 1 / this._endScaleY); + this._cloneDecoration(action); + this._reverseEaseList(action); + return action; }, /** @@ -1862,40 +2450,58 @@ cc.ScaleBy = cc.ScaleTo.extend(/** @lends cc.ScaleBy# */{ */ clone:function () { var action = new cc.ScaleBy(); + this._cloneDecoration(action); action.initWithDuration(this._duration, this._endScaleX, this._endScaleY); return action; } }); /** + * Scales a cc.Node object a zoom factor by modifying it's scale attribute. + * Relative to its changes. + * @function * @param {Number} duration duration in seconds * @param {Number} sx sx scale parameter in X * @param {Number|Null} [sy=] sy scale parameter in Y, if Null equal to sx * @return {cc.ScaleBy} * @example * // example without sy, it scales by 2 both in X and Y - * var actionBy = cc.ScaleBy.create(2, 2); + * var actionBy = cc.scaleBy(2, 2); * * //example with sy, it scales by 0.25 in X and 4.5 in Y - * var actionBy2 = cc.ScaleBy.create(2, 0.25, 4.5); + * var actionBy2 = cc.scaleBy(2, 0.25, 4.5); */ -cc.ScaleBy.create = function (duration, sx, sy) { +cc.scaleBy = function (duration, sx, sy) { return new cc.ScaleBy(duration, sx, sy); }; +/** + * Please use cc.scaleBy instead. + * Scales a cc.Node object a zoom factor by modifying it's scale attribute. + * Relative to its changes. + * @static + * @deprecated since v3.0 please use cc.scaleBy() instead. + * @param {Number} duration duration in seconds + * @param {Number} sx sx scale parameter in X + * @param {Number|Null} [sy=] sy scale parameter in Y, if Null equal to sx + * @return {cc.ScaleBy} + */ +cc.ScaleBy.create = cc.scaleBy; /** Blinks a cc.Node object by modifying it's visible attribute * @class * @extends cc.ActionInterval + * @param {Number} duration duration in seconds + * @param {Number} blinks blinks in times + * @example + * var action = new cc.Blink(2, 10); */ cc.Blink = cc.ActionInterval.extend(/** @lends cc.Blink# */{ _times:0, _originalState:false, /** - * @constructor - * @param {Number} duration duration in seconds - * @param (Number) blinks blinks in times - * @example - * var action = new cc.Blink(2, 10); + * Constructor function, override it to extend the construction behavior, remember to call "this._super()" in the extended "ctor" function. + * @param {Number} duration duration in seconds + * @param {Number} blinks blinks in times */ ctor:function (duration, blinks) { cc.ActionInterval.prototype.ctor.call(this); @@ -1903,6 +2509,7 @@ cc.Blink = cc.ActionInterval.extend(/** @lends cc.Blink# */{ }, /** + * Initializes the action. * @param {Number} duration duration in seconds * @param {Number} blinks blinks in times * @return {Boolean} @@ -1921,67 +2528,93 @@ cc.Blink = cc.ActionInterval.extend(/** @lends cc.Blink# */{ */ clone:function () { var action = new cc.Blink(); + this._cloneDecoration(action); action.initWithDuration(this._duration, this._times); return action; }, /** - * @param {Number} time time in seconds + * Called once per frame. Time is the number of seconds of a frame interval. + * @param {Number} dt time in seconds */ - update:function (time) { + update:function (dt) { + dt = this._computeEaseTime(dt); if (this.target && !this.isDone()) { var slice = 1.0 / this._times; - var m = time % slice; + var m = dt % slice; this.target.visible = (m > (slice / 2)); } }, + /** + * Start the action with target. + * @param {cc.Node} target + */ startWithTarget:function (target) { cc.ActionInterval.prototype.startWithTarget.call(this, target); this._originalState = target.visible; }, + /** + * stop the action + */ stop:function () { this.target.visible = this._originalState; cc.ActionInterval.prototype.stop.call(this); }, /** - * @return {cc.ActionInterval} + * Returns a reversed action. + * @return {cc.Blink} */ reverse:function () { - return cc.Blink.create(this._duration, this._times); + var action = new cc.Blink(this._duration, this._times); + this._cloneDecoration(action); + this._reverseEaseList(action); + return action; } }); /** + * Blinks a cc.Node object by modifying it's visible attribute. + * @function * @param {Number} duration duration in seconds * @param blinks blinks in times * @return {cc.Blink} * @example * // example - * var action = cc.Blink.create(2, 10); + * var action = cc.blink(2, 10); */ -cc.Blink.create = function (duration, blinks) { - var blink = new cc.Blink(); - blink.initWithDuration(duration, blinks); - return blink; +cc.blink = function (duration, blinks) { + return new cc.Blink(duration, blinks); }; +/** + * Please use cc.blink instead. + * Blinks a cc.Node object by modifying it's visible attribute. + * @static + * @deprecated since v3.0 please use cc.blink instead. + * @param {Number} duration duration in seconds + * @param blinks blinks in times + * @return {cc.Blink} + */ +cc.Blink.create = cc.blink; /** Fades an object that implements the cc.RGBAProtocol protocol. It modifies the opacity from the current value to a custom one. * @warning This action doesn't support "reverse" * @class * @extends cc.ActionInterval + * @param {Number} duration + * @param {Number} opacity 0-255, 0 is transparent + * @example + * var action = new cc.FadeTo(1.0, 0); */ cc.FadeTo = cc.ActionInterval.extend(/** @lends cc.FadeTo# */{ _toOpacity:0, _fromOpacity:0, /** - * @constructor + * Constructor function, override it to extend the construction behavior, remember to call "this._super()" in the extended "ctor" function. * @param {Number} duration * @param {Number} opacity 0-255, 0 is transparent - * @example - * var action = new cc.FadeTo(1.0, 0); */ ctor:function (duration, opacity) { cc.ActionInterval.prototype.ctor.call(this); @@ -1989,6 +2622,7 @@ cc.FadeTo = cc.ActionInterval.extend(/** @lends cc.FadeTo# */{ }, /** + * Initializes the action. * @param {Number} duration duration in seconds * @param {Number} opacity * @return {Boolean} @@ -2007,56 +2641,84 @@ cc.FadeTo = cc.ActionInterval.extend(/** @lends cc.FadeTo# */{ */ clone:function () { var action = new cc.FadeTo(); + this._cloneDecoration(action); action.initWithDuration(this._duration, this._toOpacity); return action; }, /** + * Called once per frame. Time is the number of seconds of a frame interval. * @param {Number} time time in seconds */ update:function (time) { - if (this.target.RGBAProtocol) { - var fromOpacity = this._fromOpacity; - this.target.opacity = fromOpacity + (this._toOpacity - fromOpacity) * time; - } + time = this._computeEaseTime(time); + var fromOpacity = this._fromOpacity !== undefined ? this._fromOpacity : 255; + this.target.opacity = fromOpacity + (this._toOpacity - fromOpacity) * time; }, /** - * @param {cc.Sprite} target + * Start this action with target. + * @param {cc.Node} target */ startWithTarget:function (target) { cc.ActionInterval.prototype.startWithTarget.call(this, target); - if(this.target.RGBAProtocol){ - this._fromOpacity = target.opacity; - } + this._fromOpacity = target.opacity; } }); /** + * Fades an object that implements the cc.RGBAProtocol protocol. It modifies the opacity from the current value to a custom one. + * @function * @param {Number} duration * @param {Number} opacity 0-255, 0 is transparent * @return {cc.FadeTo} * @example * // example - * var action = cc.FadeTo.create(1.0, 0); + * var action = cc.fadeTo(1.0, 0); */ -cc.FadeTo.create = function (duration, opacity) { +cc.fadeTo = function (duration, opacity) { return new cc.FadeTo(duration, opacity); }; +/** + * Please use cc.fadeTo instead. + * Fades an object that implements the cc.RGBAProtocol protocol. It modifies the opacity from the current value to a custom one. + * @static + * @deprecated since v3.0 please use cc.fadeTo instead. + * @param {Number} duration + * @param {Number} opacity 0-255, 0 is transparent + * @return {cc.FadeTo} + */ +cc.FadeTo.create = cc.fadeTo; /** Fades In an object that implements the cc.RGBAProtocol protocol. It modifies the opacity from 0 to 255.
* The "reverse" of this action is FadeOut * @class * @extends cc.FadeTo + * @param {Number} duration duration in seconds */ cc.FadeIn = cc.FadeTo.extend(/** @lends cc.FadeIn# */{ _reverseAction: null, + /** - * @return {cc.ActionInterval} + * Constructor function, override it to extend the construction behavior, remember to call "this._super()" in the extended "ctor" function. + * @param {Number} duration duration in seconds + */ + ctor:function (duration) { + cc.FadeTo.prototype.ctor.call(this); + if (duration == null) + duration = 0; + this.initWithDuration(duration, 255); + }, + + /** + * Returns a reversed action. + * @return {cc.FadeOut} */ reverse:function () { var action = new cc.FadeOut(); action.initWithDuration(this._duration, 0); + this._cloneDecoration(action); + this._reverseEaseList(action); return action; }, @@ -2066,12 +2728,14 @@ cc.FadeIn = cc.FadeTo.extend(/** @lends cc.FadeIn# */{ */ clone:function () { var action = new cc.FadeIn(); + this._cloneDecoration(action); action.initWithDuration(this._duration, this._toOpacity); return action; }, /** - * @param {cc.Sprite} target + * Start the action with target. + * @param {cc.Node} target */ startWithTarget:function (target) { if(this._reverseAction) @@ -2081,33 +2745,57 @@ cc.FadeIn = cc.FadeTo.extend(/** @lends cc.FadeIn# */{ }); /** + * Fades In an object that implements the cc.RGBAProtocol protocol. It modifies the opacity from 0 to 255. + * @function * @param {Number} duration duration in seconds - * @param {Number} [toOpacity] to opacity * @return {cc.FadeIn} * @example * //example - * var action = cc.FadeIn.create(1.0); + * var action = cc.fadeIn(1.0); */ -cc.FadeIn.create = function (duration, toOpacity) { - if(toOpacity == null) - toOpacity = 255; - return new cc.FadeIn(duration, toOpacity); +cc.fadeIn = function (duration) { + return new cc.FadeIn(duration); }; +/** + * Please use cc.fadeIn instead. + * Fades In an object that implements the cc.RGBAProtocol protocol. It modifies the opacity from 0 to 255. + * @static + * @deprecated since v3.0 please use cc.fadeIn() instead. + * @param {Number} duration duration in seconds + * @return {cc.FadeIn} + */ +cc.FadeIn.create = cc.fadeIn; /** Fades Out an object that implements the cc.RGBAProtocol protocol. It modifies the opacity from 255 to 0. * The "reverse" of this action is FadeIn * @class * @extends cc.FadeTo + * @param {Number} duration duration in seconds */ cc.FadeOut = cc.FadeTo.extend(/** @lends cc.FadeOut# */{ + /** - * @return {cc.ActionInterval} + * Constructor function, override it to extend the construction behavior, remember to call "this._super()" in the extended "ctor" function. + * @param {Number} duration duration in seconds + */ + ctor:function (duration) { + cc.FadeTo.prototype.ctor.call(this); + if (duration == null) + duration = 0; + this.initWithDuration(duration, 0); + }, + + /** + * Returns a reversed action. + * @return {cc.FadeIn} */ reverse:function () { var action = new cc.FadeIn(); action._reverseAction = this; action.initWithDuration(this._duration, 255); + this._cloneDecoration(action); + this._reverseEaseList(action); return action; }, @@ -2117,41 +2805,55 @@ cc.FadeOut = cc.FadeTo.extend(/** @lends cc.FadeOut# */{ */ clone:function () { var action = new cc.FadeOut(); + this._cloneDecoration(action); action.initWithDuration(this._duration, this._toOpacity); return action; } }); /** + * Fades Out an object that implements the cc.RGBAProtocol protocol. It modifies the opacity from 255 to 0. + * @function * @param {Number} d duration in seconds * @return {cc.FadeOut} * @example * // example - * var action = cc.FadeOut.create(1.0); + * var action = cc.fadeOut(1.0); */ -cc.FadeOut.create = function (d) { - var action = new cc.FadeOut(); - action.initWithDuration(d, 0); - return action; +cc.fadeOut = function (d) { + return new cc.FadeOut(d); }; +/** + * Please use cc.fadeOut instead. + * Fades Out an object that implements the cc.RGBAProtocol protocol. It modifies the opacity from 255 to 0. + * @static + * @deprecated since v3.0 please use cc.fadeOut instead. + * @param {Number} d duration in seconds + * @return {cc.FadeOut} + */ +cc.FadeOut.create = cc.fadeOut; /** Tints a cc.Node that implements the cc.NodeRGB protocol from current tint to a custom one. * @warning This action doesn't support "reverse" * @class * @extends cc.ActionInterval + * @param {Number} duration + * @param {Number} red 0-255 + * @param {Number} green 0-255 + * @param {Number} blue 0-255 + * @example + * var action = new cc.TintTo(2, 255, 0, 255); */ cc.TintTo = cc.ActionInterval.extend(/** @lends cc.TintTo# */{ _to:null, _from:null, /** - * @constructor + * Constructor function, override it to extend the construction behavior, remember to call "this._super()" in the extended "ctor" function. * @param {Number} duration * @param {Number} red 0-255 * @param {Number} green 0-255 * @param {Number} blue 0-255 - * @example - * var action = new cc.TintTo(2, 255, 0, 255); */ ctor:function (duration, red, green, blue) { cc.ActionInterval.prototype.ctor.call(this); @@ -2162,6 +2864,7 @@ cc.TintTo = cc.ActionInterval.extend(/** @lends cc.TintTo# */{ }, /** + * Initializes the action. * @param {Number} duration * @param {Number} red 0-255 * @param {Number} green 0-255 @@ -2182,35 +2885,40 @@ cc.TintTo = cc.ActionInterval.extend(/** @lends cc.TintTo# */{ */ clone:function () { var action = new cc.TintTo(); + this._cloneDecoration(action); var locTo = this._to; action.initWithDuration(this._duration, locTo.r, locTo.g, locTo.b); return action; }, /** - * @param {cc.Sprite} target + * Start the action with target. + * @param {cc.Node} target */ startWithTarget:function (target) { cc.ActionInterval.prototype.startWithTarget.call(this, target); - if (this.target.RGBAProtocol) { - this._from = this.target.color; - } + + this._from = this.target.color; }, /** - * @param {Number} time time in seconds + * Called once per frame. Time is the number of seconds of a frame interval. + * @param {Number} dt time in seconds */ - update:function (time) { + update:function (dt) { + dt = this._computeEaseTime(dt); var locFrom = this._from, locTo = this._to; - if (this.target.RGBAProtocol) { - this.target.color = cc.color(locFrom.r + (locTo.r - locFrom.r) * time, - locFrom.g + (locTo.g - locFrom.g) * time, - locFrom.b + (locTo.b - locFrom.b) * time); + if (locFrom) { + this.target.color = cc.color(locFrom.r + (locTo.r - locFrom.r) * dt, + locFrom.g + (locTo.g - locFrom.g) * dt, + locFrom.b + (locTo.b - locFrom.b) * dt); } } }); /** + * Tints a cc.Node that implements the cc.NodeRGB protocol from current tint to a custom one. + * @function * @param {Number} duration * @param {Number} red 0-255 * @param {Number} green 0-255 @@ -2218,16 +2926,35 @@ cc.TintTo = cc.ActionInterval.extend(/** @lends cc.TintTo# */{ * @return {cc.TintTo} * @example * // example - * var action = cc.TintTo.create(2, 255, 0, 255); + * var action = cc.tintTo(2, 255, 0, 255); */ -cc.TintTo.create = function (duration, red, green, blue) { +cc.tintTo = function (duration, red, green, blue) { return new cc.TintTo(duration, red, green, blue); }; +/** + * Please use cc.tintTo instead. + * Tints a cc.Node that implements the cc.NodeRGB protocol from current tint to a custom one. + * @static + * @deprecated since v3.0 please use cc.tintTo instead. + * @param {Number} duration + * @param {Number} red 0-255 + * @param {Number} green 0-255 + * @param {Number} blue 0-255 + * @return {cc.TintTo} + */ +cc.TintTo.create = cc.tintTo; /** Tints a cc.Node that implements the cc.NodeRGB protocol from current tint to a custom one. + * Relative to their own color change. * @class * @extends cc.ActionInterval + * @param {Number} duration duration in seconds + * @param {Number} deltaRed + * @param {Number} deltaGreen + * @param {Number} deltaBlue + * @example + * var action = new cc.TintBy(2, -127, -255, -127); */ cc.TintBy = cc.ActionInterval.extend(/** @lends cc.TintBy# */{ _deltaR:0, @@ -2239,13 +2966,11 @@ cc.TintBy = cc.ActionInterval.extend(/** @lends cc.TintBy# */{ _fromB:0, /** - * @constructor + * Constructor function, override it to extend the construction behavior, remember to call "this._super()" in the extended "ctor" function. * @param {Number} duration duration in seconds * @param {Number} deltaRed * @param {Number} deltaGreen * @param {Number} deltaBlue - * @example - * var action = new cc.TintBy(2, -127, -255, -127); */ ctor:function (duration, deltaRed, deltaGreen, deltaBlue) { cc.ActionInterval.prototype.ctor.call(this); @@ -2253,6 +2978,7 @@ cc.TintBy = cc.ActionInterval.extend(/** @lends cc.TintBy# */{ }, /** + * Initializes the action. * @param {Number} duration * @param {Number} deltaRed 0-255 * @param {Number} deltaGreen 0-255 @@ -2275,43 +3001,54 @@ cc.TintBy = cc.ActionInterval.extend(/** @lends cc.TintBy# */{ */ clone:function () { var action = new cc.TintBy(); + this._cloneDecoration(action); action.initWithDuration(this._duration, this._deltaR, this._deltaG, this._deltaB); return action; }, /** - * @param {cc.Sprite} target + * Start the action with target. + * @param {cc.Node} target */ startWithTarget:function (target) { cc.ActionInterval.prototype.startWithTarget.call(this, target); - if (target.RGBAProtocol) { - var color = target.color; - this._fromR = color.r; - this._fromG = color.g; - this._fromB = color.b; - } + + var color = target.color; + this._fromR = color.r; + this._fromG = color.g; + this._fromB = color.b; + }, /** - * @param {Number} time time in seconds + * Called once per frame. Time is the number of seconds of a frame interval. + * @param {Number} dt time in seconds */ - update:function (time) { - if (this.target.RGBAProtocol) { - this.target.color = cc.color(this._fromR + this._deltaR * time, - this._fromG + this._deltaG * time, - this._fromB + this._deltaB * time); - } + update:function (dt) { + dt = this._computeEaseTime(dt); + + this.target.color = cc.color(this._fromR + this._deltaR * dt, + this._fromG + this._deltaG * dt, + this._fromB + this._deltaB * dt); + }, /** - * @return {cc.ActionInterval} + * Returns a reversed action. + * @return {cc.TintBy} */ reverse:function () { - return cc.TintBy.create(this._duration, -this._deltaR, -this._deltaG, -this._deltaB); + var action = new cc.TintBy(this._duration, -this._deltaR, -this._deltaG, -this._deltaB); + this._cloneDecoration(action); + this._reverseEaseList(action); + return action; } }); /** + * Tints a cc.Node that implements the cc.NodeRGB protocol from current tint to a custom one. + * Relative to their own color change. + * @function * @param {Number} duration duration in seconds * @param {Number} deltaRed * @param {Number} deltaGreen @@ -2319,11 +3056,24 @@ cc.TintBy = cc.ActionInterval.extend(/** @lends cc.TintBy# */{ * @return {cc.TintBy} * @example * // example - * var action = cc.TintBy.create(2, -127, -255, -127); + * var action = cc.tintBy(2, -127, -255, -127); */ -cc.TintBy.create = function (duration, deltaRed, deltaGreen, deltaBlue) { +cc.tintBy = function (duration, deltaRed, deltaGreen, deltaBlue) { return new cc.TintBy(duration, deltaRed, deltaGreen, deltaBlue); }; +/** + * Please use cc.tintBy instead. + * Tints a cc.Node that implements the cc.NodeRGB protocol from current tint to a custom one. + * Relative to their own color change. + * @static + * @deprecated since v3.0 please use cc.tintBy instead. + * @param {Number} duration duration in seconds + * @param {Number} deltaRed + * @param {Number} deltaGreen + * @param {Number} deltaBlue + * @return {cc.TintBy} + */ +cc.TintBy.create = cc.tintBy; /** Delays the action a certain amount of seconds * @class @@ -2331,16 +3081,21 @@ cc.TintBy.create = function (duration, deltaRed, deltaGreen, deltaBlue) { */ cc.DelayTime = cc.ActionInterval.extend(/** @lends cc.DelayTime# */{ /** - * @param {Number} time time in seconds + * Called once per frame. Time is the number of seconds of a frame interval. + * Will be overwrite. + * @param {Number} dt time in seconds */ - update:function (time) { - }, + update:function (dt) {}, /** - * @return {cc.ActionInterval} + * Returns a reversed action. + * @return {cc.DelayTime} */ reverse:function () { - return cc.DelayTime.create(this._duration); + var action = new cc.DelayTime(this._duration); + this._cloneDecoration(action); + this._reverseEaseList(action); + return action; }, /** @@ -2349,39 +3104,53 @@ cc.DelayTime = cc.ActionInterval.extend(/** @lends cc.DelayTime# */{ */ clone:function () { var action = new cc.DelayTime(); + this._cloneDecoration(action); action.initWithDuration(this._duration); return action; } }); /** + * Delays the action a certain amount of seconds + * @function * @param {Number} d duration in seconds * @return {cc.DelayTime} * @example * // example - * var delay = cc.DelayTime.create(1); + * var delay = cc.delayTime(1); */ -cc.DelayTime.create = function (d) { +cc.delayTime = function (d) { return new cc.DelayTime(d); }; +/** + * Please use cc.delayTime instead. + * Delays the action a certain amount of seconds + * @static + * @deprecated since v3.0 please use cc.delaTime instead. + * @param {Number} d duration in seconds + * @return {cc.DelayTime} + */ +cc.DelayTime.create = cc.delayTime; /** - * Executes an action in reverse order, from time=duration to time=0 - * @warning Use this action carefully. This action is not - * sequenceable. Use it as the default "reversed" method - * of your own actions, but using it outside the "reversed" + *
+ * Executes an action in reverse order, from time=duration to time=0
+ * @warning Use this action carefully. This action is not sequenceable.
+ * Use it as the default "reversed" method of your own actions, but using it outside the "reversed"
* scope is not recommended.
+ *
+ * create the animate with animation. * @param {cc.Animation} animation - * @example - * // create the animation with animation - * var anim = new cc.Animate(dance_grey); */ ctor:function (animation) { cc.ActionInterval.prototype.ctor.call(this); @@ -2542,11 +3328,13 @@ cc.Animate = cc.ActionInterval.extend(/** @lends cc.Animate# */{ */ clone:function () { var action = new cc.Animate(); + this._cloneDecoration(action); action.initWithAnimation(this._animation.clone()); return action; }, /** + * Start the action with target. * @param {cc.Sprite} target */ startWithTarget:function (target) { @@ -2558,28 +3346,30 @@ cc.Animate = cc.ActionInterval.extend(/** @lends cc.Animate# */{ }, /** - * @param {Number} time + * Called once per frame. Time is the number of seconds of a frame interval. + * @param {Number} dt */ - update:function (time) { + update:function (dt) { + dt = this._computeEaseTime(dt); // if t==1, ignore. Animation should finish with t==1 - if (time < 1.0) { - time *= this._animation.getLoops(); + if (dt < 1.0) { + dt *= this._animation.getLoops(); // new loop? If so, reset frame counter - var loopNumber = 0 | time; + var loopNumber = 0 | dt; if (loopNumber > this._executedLoops) { this._nextFrame = 0; this._executedLoops++; } // new t for animations - time = time % 1.0; + dt = dt % 1.0; } var frames = this._animation.getFrames(); var numberOfFrames = frames.length, locSplitTimes = this._splitTimes; for (var i = this._nextFrame; i < numberOfFrames; i++) { - if (locSplitTimes[i] <= time) { + if (locSplitTimes[i] <= dt) { this.target.setSpriteFrame(frames[i].getSpriteFrame()); this._nextFrame = i + 1; } else { @@ -2590,7 +3380,8 @@ cc.Animate = cc.ActionInterval.extend(/** @lends cc.Animate# */{ }, /** - * @return {cc.ActionInterval} + * Returns a reversed action. + * @return {cc.Animate} */ reverse:function () { var locAnimation = this._animation; @@ -2605,9 +3396,13 @@ cc.Animate = cc.ActionInterval.extend(/** @lends cc.Animate# */{ newArray.push(element.clone()); } } - var newAnim = cc.Animation.create(newArray, locAnimation.getDelayPerUnit(), locAnimation.getLoops()); + var newAnim = new cc.Animation(newArray, locAnimation.getDelayPerUnit(), locAnimation.getLoops()); newAnim.setRestoreOriginalFrame(locAnimation.getRestoreOriginalFrame()); - return cc.Animate.create(newAnim); + var action = new cc.Animate(newAnim); + this._cloneDecoration(action); + this._reverseEaseList(action); + + return action; }, /** @@ -2622,16 +3417,26 @@ cc.Animate = cc.ActionInterval.extend(/** @lends cc.Animate# */{ /** * create the animate with animation + * @function * @param {cc.Animation} animation * @return {cc.Animate} * @example * // example * // create the animation with animation - * var anim = cc.Animate.create(dance_grey); + * var anim = cc.animate(dance_grey); */ -cc.Animate.create = function (animation) { +cc.animate = function (animation) { return new cc.Animate(animation); }; +/** + * Please use cc.animate instead + * create the animate with animation + * @static + * @deprecated since v3.0 please use cc.animate instead. + * @param {cc.Animation} animation + * @return {cc.Animate} + */ +cc.Animate.create = cc.animate; /** *
@@ -2640,14 +3445,16 @@ cc.Animate.create = function (animation) { *
* @class * @extends cc.ActionInterval + * @param {cc.Node} target + * @param {cc.FiniteTimeAction} action */ cc.TargetedAction = cc.ActionInterval.extend(/** @lends cc.TargetedAction# */{ _action:null, _forcedTarget:null, /** - * Create an action with the specified action and forced target - * @constructor + * Constructor function, override it to extend the construction behavior, remember to call "this._super()" in the extended "ctor" function.+ * Create an action with the specified action and forced target. * @param {cc.Node} target * @param {cc.FiniteTimeAction} action */ @@ -2663,7 +3470,7 @@ cc.TargetedAction = cc.ActionInterval.extend(/** @lends cc.TargetedAction# */{ * @return {Boolean} */ initWithTarget:function (target, action) { - if (this.initWithDuration(action.getDuration())) { + if (this.initWithDuration(action._duration)) { this._forcedTarget = target; this._action = action; return true; @@ -2677,21 +3484,34 @@ cc.TargetedAction = cc.ActionInterval.extend(/** @lends cc.TargetedAction# */{ */ clone:function () { var action = new cc.TargetedAction(); + this._cloneDecoration(action); action.initWithTarget(this._forcedTarget, this._action.clone()); return action; }, + /** + * Start the action with target. + * @param {cc.Node} target + */ startWithTarget:function (target) { cc.ActionInterval.prototype.startWithTarget.call(this, target); this._action.startWithTarget(this._forcedTarget); }, + /** + * stop the action + */ stop:function () { this._action.stop(); }, - update:function (time) { - this._action.update(time); + /** + * Called once per frame. Time is the number of seconds of a frame interval. + * @param {Number} dt + */ + update:function (dt) { + dt = this._computeEaseTime(dt); + this._action.update(dt); }, /** @@ -2707,17 +3527,28 @@ cc.TargetedAction = cc.ActionInterval.extend(/** @lends cc.TargetedAction# */{ * @param {cc.Node} forcedTarget */ setForcedTarget:function (forcedTarget) { - if (this._forcedTarget != forcedTarget) + if (this._forcedTarget !== forcedTarget) this._forcedTarget = forcedTarget; } }); /** * Create an action with the specified action and forced target + * @function * @param {cc.Node} target * @param {cc.FiniteTimeAction} action * @return {cc.TargetedAction} */ -cc.TargetedAction.create = function (target, action) { +cc.targetedAction = function (target, action) { return new cc.TargetedAction(target, action); }; +/** + * Please use cc.targetedAction instead + * Create an action with the specified action and forced target + * @static + * @deprecated since v3.0 please use cc.targetedAction instead. + * @param {cc.Node} target + * @param {cc.FiniteTimeAction} action + * @return {cc.TargetedAction} + */ +cc.TargetedAction.create = cc.targetedAction; diff --git a/cocos2d/actions/CCActionTween.js b/cocos2d/actions/CCActionTween.js index 5877e8c93b..12490a4146 100644 --- a/cocos2d/actions/CCActionTween.js +++ b/cocos2d/actions/CCActionTween.js @@ -1,7 +1,7 @@ /**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2008-2010 Ricardo Quesada - Copyright (c) 2011 Zynga Inc. + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,13 +25,18 @@ ****************************************************************************/ /** + * * @class * @extends cc.Class */ cc.ActionTweenDelegate = cc.Class.extend(/** @lends cc.ActionTweenDelegate */{ - updateTweenAction:function(value, key){ - } + /** + * Update Tween Action. + * @param value + * @param key + */ + updateTweenAction:function(value, key){} }); /** @@ -42,13 +47,17 @@ cc.ActionTweenDelegate = cc.Class.extend(/** @lends cc.ActionTweenDelegate */{ * @extends cc.ActionInterval * @example * //For example, if you want to modify the "width" property of a target from 200 to 300 in 2 seconds, then: - * var modifyWidth = cc.ActionTween.create(2,"width",200,300) + * var modifyWidth = cc.actionTween(2,"width",200,300) * target.runAction(modifyWidth); * * //Another example: cc.ScaleTo action could be rewriten using cc.PropertyAction: * // scaleA and scaleB are equivalents - * var scaleA = cc.ScaleTo.create(2,3); - * var scaleB = cc.ActionTween.create(2,"scale",1,3); + * var scaleA = cc.scaleTo(2,3); + * var scaleB = cc.actionTween(2,"scale",1,3); + * @param {Number} duration + * @param {String} key + * @param {Number} from + * @param {Number} to */ cc.ActionTween = cc.ActionInterval.extend(/** @lends cc.ActionTween */{ key:"", @@ -57,8 +66,8 @@ cc.ActionTween = cc.ActionInterval.extend(/** @lends cc.ActionTween */{ delta:0, /** + * Constructor function, override it to extend the construction behavior, remember to call "this._super()" in the extended "ctor" function.
* Creates an initializes the action with the property name (key), and the from and to parameters. - * @constructor * @param {Number} duration * @param {String} key * @param {Number} from @@ -88,8 +97,10 @@ cc.ActionTween = cc.ActionInterval.extend(/** @lends cc.ActionTween */{ } return false; }, + /** - * @param {cc.Node} target + * Start this tween with target. + * @param {cc.ActionTweenDelegate} target */ startWithTarget:function (target) { if(!target || !target.updateTweenAction) @@ -97,19 +108,30 @@ cc.ActionTween = cc.ActionInterval.extend(/** @lends cc.ActionTween */{ cc.ActionInterval.prototype.startWithTarget.call(this, target); this.delta = this.to - this.from; }, + /** - * @param {Number} dt + * Called once per frame. Time is the number of seconds of a frame interval. + * + * @param {Number} dt */ update:function (dt) { this.target.updateTweenAction(this.to - this.delta * (1 - dt), this.key); }, + /** + * returns a reversed action. * @return {cc.ActionTween} */ reverse:function () { - return cc.ActionTween.create(this.duration, this.key, this.to, this.from); + return new cc.ActionTween(this.duration, this.key, this.to, this.from); }, + /** + * to copy object with deep copy. + * returns a clone of action. + * + * @return {cc.ActionTween} + */ clone:function(){ var action = new cc.ActionTween(); action.initWithDuration(this._duration, this.key, this.from, this.to); @@ -119,15 +141,26 @@ cc.ActionTween = cc.ActionInterval.extend(/** @lends cc.ActionTween */{ /** * Creates an initializes the action with the property name (key), and the from and to parameters. + * @function * @param {Number} duration * @param {String} key * @param {Number} from * @param {Number} to * @return {cc.ActionTween} */ -cc.ActionTween.create = function (duration, key, from, to) { - var ret = new cc.ActionTween(); - if (ret.initWithDuration(duration, key, from, to)) - return ret; - return null; +cc.actionTween = function (duration, key, from, to) { + return new cc.ActionTween(duration, key, from, to); }; + +/** + * Please use cc.actionTween instead. + * Creates an initializes the action with the property name (key), and the from and to parameters. + * @static + * @deprecated since v3.0
Please use cc.actionTween instead. + * @param {Number} duration + * @param {String} key + * @param {Number} from + * @param {Number} to + * @return {cc.ActionTween} + */ +cc.ActionTween.create = cc.actionTween; \ No newline at end of file diff --git a/cocos2d/actions3d/CCActionGrid.js b/cocos2d/actions3d/CCActionGrid.js index 8f7feea8f7..38b5c8a37f 100644 --- a/cocos2d/actions3d/CCActionGrid.js +++ b/cocos2d/actions3d/CCActionGrid.js @@ -1,7 +1,7 @@ /**************************************************************************** - Copyright (c) 2010-2013 cocos2d-x.org Copyright (c) 2008-2010 Ricardo Quesada - Copyright (c) 2011 Zynga Inc. + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -28,13 +28,15 @@ * Base class for Grid actions * @class * @extends cc.ActionInterval + * @param {Number} duration + * @param {cc.Size} gridSize */ cc.GridAction = cc.ActionInterval.extend(/** @lends cc.GridAction# */{ _gridSize:null, + _gridNodeTarget:null, /** - * Creates a grid action with duration and grid size - * @constructor + * Constructor function, override it to extend the construction behavior, remember to call "this._super()" in the extended "ctor" function. * @param {Number} duration * @param {cc.Size} gridSize */ @@ -46,6 +48,14 @@ cc.GridAction = cc.ActionInterval.extend(/** @lends cc.GridAction# */{ gridSize && this.initWithDuration(duration, gridSize); }, + _cacheTargetAsGridNode: function(){}, + + /** + * to copy object with deep copy. + * returns a clone of action. + * + * @return {cc.Action} + */ clone:function(){ var action = new cc.GridAction(); var locGridSize = this._gridSize; @@ -53,14 +63,20 @@ cc.GridAction = cc.ActionInterval.extend(/** @lends cc.GridAction# */{ return action; }, + /** + * called before the action start. It will also set the target. + * + * @param {cc.Node} target + */ startWithTarget:function (target) { cc.ActionInterval.prototype.startWithTarget.call(this, target); + cc.renderer.childrenOrderDirty = true; var newGrid = this.getGrid(); var t = this.target; var targetGrid = t.grid; if (targetGrid && targetGrid.getReuseGrid() > 0) { var locGridSize = targetGrid.getGridSize(); - if (targetGrid.isActive() && (locGridSize.width == this._gridSize.width) && (locGridSize.height == this._gridSize.height)) + if (targetGrid.isActive() && (locGridSize.width === this._gridSize.width) && (locGridSize.height === this._gridSize.height)) targetGrid.reuse(); } else { if (targetGrid && targetGrid.isActive()) @@ -70,12 +86,16 @@ cc.GridAction = cc.ActionInterval.extend(/** @lends cc.GridAction# */{ } }, + /** + * Create a cc.ReverseTime action. Opposite with the original motion trajectory. + * @return {cc.ReverseTime} + */ reverse:function () { - return cc.ReverseTime.create(this); + return new cc.ReverseTime(this); }, /** - * initializes the action with size and duration + * Initializes the action with size and duration. * @param {Number} duration * @param {cc.Size} gridSize * @return {Boolean} @@ -90,7 +110,7 @@ cc.GridAction = cc.ActionInterval.extend(/** @lends cc.GridAction# */{ }, /** - * returns the grid + * Returns the grid. * @return {cc.GridBase} */ getGrid:function () { @@ -101,16 +121,28 @@ cc.GridAction = cc.ActionInterval.extend(/** @lends cc.GridAction# */{ /** * creates the action with size and duration + * @function * @param {Number} duration * @param {cc.Size} gridSize * @return {cc.GridAction} */ -cc.GridAction.create = function (duration, gridSize) { +cc.gridAction = function (duration, gridSize) { return new cc.GridAction(duration, gridSize); }; /** - * Base class for cc.Grid3D actions.
+ * Please use cc.gridAction instead.
+ * Creates the action with size and duration. + * @param {Number} duration + * @param {cc.Size} gridSize + * @return {cc.GridAction} + * @static + * @deprecated since v3.0
Please use cc.gridAction instead. + */ +cc.GridAction.create = cc.gridAction; + +/** + * Base class for cc.Grid3D actions.
* Grid3D actions can modify a non-tiled grid. * @class * @extends cc.GridAction @@ -119,27 +151,47 @@ cc.Grid3DAction = cc.GridAction.extend(/** @lends cc.Grid3DAction# */{ /** * returns the grid - * @return {cc.GridBase} + * @return {cc.Grid3D} */ getGrid:function () { - return cc.Grid3D.create(this._gridSize); + return new cc.Grid3D(this._gridSize); }, /** - * returns the vertex than belongs to certain position in the grid + * returns the vertex than belongs to certain position in the grid.
+ * It will be deprecated in future, please use getVertex instead. * @param {cc.Point} position * @return {cc.Vertex3F} */ vertex:function (position) { - return this.target.grid.vertex(position); + return this.getVertex(position); }, /** - * returns the non-transformed vertex than belongs to certain position in the grid + * returns the vertex than belongs to certain position in the grid * @param {cc.Point} position - * @return {*} + * @return {cc.Vertex3F} + */ + getVertex: function(position){ + return this.target.grid.getVertex(position); + }, + + /** + * returns the non-transformed vertex than belongs to certain position in the grid
+ * It will be deprecated in future, please use getVertex instead. + * @param {cc.Point} position + * @return {cc.Vertex3F} */ originalVertex:function (position) { + return this.getOriginalVertex(position); + }, + + /** + * returns the non-transformed vertex than belongs to certain position in the grid + * @param {cc.Point} position + * @return {cc.Vertex3F} + */ + getOriginalVertex:function (position) { return this.target.grid.originalVertex(position); }, @@ -155,36 +207,67 @@ cc.Grid3DAction = cc.GridAction.extend(/** @lends cc.Grid3DAction# */{ /** * creates the action with size and duration + * @function * @param {Number} duration * @param {cc.Size} gridSize * @return {cc.Grid3DAction} */ -cc.Grid3DAction.create = function (duration, gridSize) { +cc.grid3DAction = function (duration, gridSize) { return new cc.Grid3DAction(duration, gridSize); }; +/** + * Please use cc.grid3DAction instead.
+ * creates the action with size and duration.
+ * @param {Number} duration + * @param {cc.Size} gridSize + * @return {cc.Grid3DAction} + * @static + * @deprecated since v3.0
Please use cc.grid3DAction instead. + */ +cc.Grid3DAction.create = cc.grid3DAction; /** - * Base class for cc.TiledGrid3D actions + * Base class for cc.TiledGrid3D actions. * @class * @extends cc.GridAction */ cc.TiledGrid3DAction = cc.GridAction.extend(/** @lends cc.TiledGrid3DAction# */{ /** - * returns the tile that belongs to a certain position of the grid + * returns the tile that belongs to a certain position of the grid
+ * It will be deprecated in future, please use getTile instead. * @param {cc.Point} position * @return {cc.Quad3} */ tile:function (position) { + return this.getTile(position); + }, + + /** + * returns the tile that belongs to a certain position of the grid + * @param {cc.Point} position + * @return {cc.Quad3} + */ + getTile:function (position) { return this.target.grid.tile(position); }, /** - * returns the non-transformed tile that belongs to a certain position of the grid + * returns the non-transformed tile that belongs to a certain position of the grid
+ * It will be deprecated in future, please use getOriginalTile instead. * @param {cc.Point} position * @return {cc.Quad3} */ originalTile:function (position) { + return this.getOriginalTile(position); + }, + + /** + * returns the non-transformed tile that belongs to a certain position of the grid + * @param {cc.Point} position + * @return {cc.Quad3} + */ + getOriginalTile:function (position) { return this.target.grid.originalTile(position); }, @@ -199,36 +282,55 @@ cc.TiledGrid3DAction = cc.GridAction.extend(/** @lends cc.TiledGrid3DAction# */{ /** * returns the grid - * @return {cc.GridBase} + * @return {cc.TiledGrid3D} */ getGrid:function () { - return cc.TiledGrid3D.create(this._gridSize); + return new cc.TiledGrid3D(this._gridSize); } }); /** * Creates the action with duration and grid size + * @function * @param {Number} duration * @param {cc.Size} gridSize * @return {cc.TiledGrid3DAction} */ -cc.TiledGrid3DAction.create = function (duration, gridSize) { +cc.tiledGrid3DAction = function (duration, gridSize) { return new cc.TiledGrid3DAction(duration, gridSize); }; +/** + * Please use cc.tiledGrid3DAction instead + * Creates the action with duration and grid size + * @param {Number} duration + * @param {cc.Size} gridSize + * @return {cc.TiledGrid3DAction} + * @static + * @deprecated since v3.0
Please use cc.tiledGrid3DAction instead. + */ +cc.TiledGrid3DAction.create = cc.tiledGrid3DAction; + /** *
* cc.StopGrid action.
* @warning Don't call this action if another grid action is active.
* Call if you want to remove the the grid effect. Example:
- * cc.Sequence.create(Lens.action(...), cc.StopGrid.create(...), null);
+ * cc.sequence(Lens.action(...), cc.stopGrid(...), null);
*
Please use cc.stopGrid instead. + */ +cc.StopGrid.create = cc.stopGrid; /** * cc.ReuseGrid action * @class * @extends cc.ActionInstant + * @param {Number} times */ cc.ReuseGrid = cc.ActionInstant.extend(/** @lends cc.ReuseGrid# */{ _times:null, /** - * creates an action with the number of times that the current grid will be reused - * @constructor + * Constructor function, override it to extend the construction behavior, remember to call "this._super()" in the extended "ctor" function. * @param {Number} times */ ctor: function(times) { @@ -271,8 +382,14 @@ cc.ReuseGrid = cc.ActionInstant.extend(/** @lends cc.ReuseGrid# */{ return true; }, + /** + * called before the action start. It will also set the target. + * + * @param {cc.Node} target + */ startWithTarget:function (target) { cc.ActionInstant.prototype.startWithTarget.call(this, target); + cc.renderer.childrenOrderDirty = true; if (this.target.grid && this.target.grid.isActive()) this.target.grid.setReuseGrid(this.target.grid.getReuseGrid() + this._times); } @@ -280,9 +397,19 @@ cc.ReuseGrid = cc.ActionInstant.extend(/** @lends cc.ReuseGrid# */{ /** * creates an action with the number of times that the current grid will be reused + * @function * @param {Number} times * @return {cc.ReuseGrid} */ -cc.ReuseGrid.create = function (times) { +cc.reuseGrid = function (times) { return new cc.ReuseGrid(times); }; +/** + * Please use cc.reuseGrid instead + * creates an action with the number of times that the current grid will be reused + * @param {Number} times + * @return {cc.ReuseGrid} + * @static + * @deprecated since v3.0
Please use cc.reuseGrid instead. + */ +cc.ReuseGrid.create = cc.reuseGrid; diff --git a/cocos2d/actions3d/CCActionGrid3D.js b/cocos2d/actions3d/CCActionGrid3D.js index f1387f1d9c..31be9c2e9a 100644 --- a/cocos2d/actions3d/CCActionGrid3D.js +++ b/cocos2d/actions3d/CCActionGrid3D.js @@ -1,7 +1,7 @@ /**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2008-2010 Ricardo Quesada - Copyright (c) 2011 Zynga Inc. + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,9 +25,14 @@ ****************************************************************************/ /** - * cc.Waves3D action + * cc.Waves3D action.
+ * Reference the test cases (Effects Advanced Test) * @class * @extends cc.Grid3DAction + * @param {Number} duration + * @param {cc.Size} gridSize + * @param {Number} waves + * @param {Number} amplitude */ cc.Waves3D = cc.Grid3DAction.extend(/** @lends cc.Waves3D# */{ _waves: 0, @@ -35,7 +40,8 @@ cc.Waves3D = cc.Grid3DAction.extend(/** @lends cc.Waves3D# */{ _amplitudeRate: 0, /** - * Create a wave 3d action with duration, grid size, waves and amplitude + * Constructor function, override it to extend the construction behavior, remember to call "this._super()" in the extended "ctor" function.
+ * Create a wave 3d action with duration, grid size, waves and amplitude. * @param {Number} duration * @param {cc.Size} gridSize * @param {Number} waves @@ -96,7 +102,12 @@ cc.Waves3D = cc.Grid3DAction.extend(/** @lends cc.Waves3D# */{ return false; }, - update:function (time) { + /** + * Called once per frame. Time is the number of seconds of a frame interval. + * + * @param {Number} dt + */ + update:function (dt) { var locGridSize = this._gridSize; var locAmplitude = this._amplitude, locPos = cc.p(0, 0); var locAmplitudeRate = this._amplitudeRate, locWaves = this._waves; @@ -105,8 +116,8 @@ cc.Waves3D = cc.Grid3DAction.extend(/** @lends cc.Waves3D# */{ locPos.x = i; locPos.y = j; var v = this.originalVertex(locPos); - v.z += (Math.sin(Math.PI * time * locWaves * 2 + (v.y + v.x) * 0.01) * locAmplitude * locAmplitudeRate); - //cc.log("v.z offset is" + (Math.sin(Math.PI * time * this._waves * 2 + (v.y + v.x) * 0.01) * this._amplitude * this._amplitudeRate)); + v.z += (Math.sin(Math.PI * dt * locWaves * 2 + (v.y + v.x) * 0.01) * locAmplitude * locAmplitudeRate); + //cc.log("v.z offset is" + (Math.sin(Math.PI * dt * this._waves * 2 + (v.y + v.x) * 0.01) * this._amplitude * this._amplitudeRate)); this.setVertex(locPos, v); } } @@ -114,26 +125,41 @@ cc.Waves3D = cc.Grid3DAction.extend(/** @lends cc.Waves3D# */{ }); /** - * Create a wave 3d action with duration, grid size, waves and amplitude + * Create a wave 3d action with duration, grid size, waves and amplitude. + * @function * @param {Number} duration * @param {cc.Size} gridSize * @param {Number} waves * @param {Number} amplitude */ -cc.Waves3D.create = function (duration, gridSize, waves, amplitude) { +cc.waves3D = function (duration, gridSize, waves, amplitude) { return new cc.Waves3D(duration, gridSize, waves, amplitude); }; +/** + * Please use cc.waves3D instead.
+ * Create a wave 3d action with duration, grid size, waves and amplitude. + * @param {Number} duration + * @param {cc.Size} gridSize + * @param {Number} waves + * @param {Number} amplitude + * @static + * @deprecated since v3.0
Please use cc.waves3D instead. + */ +cc.Waves3D.create = cc.waves3D; /** - * cc.FlipX3D action + * cc.FlipX3D action.
+ * Flip around.
+ * Reference the test cases (Effects Test) * @class * @extends cc.Grid3DAction + * @param {Number} duration */ cc.FlipX3D = cc.Grid3DAction.extend(/** @lends cc.FlipX3D# */{ /** - * Create a Flip X 3D action with duration - * @constructor + * Constructor function, override it to extend the construction behavior, remember to call "this._super()" in the extended "ctor" function.
+ * Create a Flip X 3D action with duration. * @param {Number} duration */ ctor: function(duration) { @@ -158,7 +184,7 @@ cc.FlipX3D = cc.Grid3DAction.extend(/** @lends cc.FlipX3D# */{ * @return {Boolean} */ initWithSize:function (gridSize, duration) { - if (gridSize.width != 1 || gridSize.height != 1) { + if (gridSize.width !== 1 || gridSize.height !== 1) { // Grid size must be (1,1) cc.log("Grid size must be (1,1)"); return false; @@ -166,8 +192,13 @@ cc.FlipX3D = cc.Grid3DAction.extend(/** @lends cc.FlipX3D# */{ return cc.Grid3DAction.prototype.initWithDuration.call(this, duration, gridSize); }, - update:function (time) { - var angle = Math.PI * time; // 180 degrees + /** + * Called once per frame. Time is the number of seconds of a frame interval. + * + * @param {Number} dt + */ + update:function (dt) { + var angle = Math.PI * dt; // 180 degrees var mz = Math.sin(angle); angle = angle / 2.0; // x calculates degrees from 0 to 90 var mx = Math.cos(angle); @@ -230,24 +261,40 @@ cc.FlipX3D = cc.Grid3DAction.extend(/** @lends cc.FlipX3D# */{ }); /** - * Create a Flip X 3D action with duration + * Create a Flip X 3D action with duration.
+ * Flip around. + * @function * @param {Number} duration * @return {cc.FlipX3D} */ -cc.FlipX3D.create = function (duration) { +cc.flipX3D = function (duration) { return new cc.FlipX3D(duration); }; /** - * cc.FlipY3D action + * Please use cc.flipX3D instead.
+ * Create a Flip X 3D action with duration.
+ * Flip around. + * @param {Number} duration + * @return {cc.FlipX3D} + * @static + * @deprecated since v3.0
Please use cc.flipX3D instead. + */ +cc.FlipX3D.create = cc.flipX3D; + +/** + * cc.FlipY3D action.
+ * Upside down.
+ * Reference the test cases (Effects Test) * @class * @extends cc.FlipX3D + * @param {Number} duration */ cc.FlipY3D = cc.FlipX3D.extend(/** @lends cc.FlipY3D# */{ /** - * Create a flip Y 3d action with duration - * @constructor + * Constructor function, override it to extend the construction behavior, remember to call "this._super()" in the extended "ctor" function.
+ * Create a flip Y 3d action with duration. * @param {Number} duration */ ctor: function(duration) { @@ -256,8 +303,13 @@ cc.FlipY3D = cc.FlipX3D.extend(/** @lends cc.FlipY3D# */{ else cc.GridAction.prototype.ctor.call(this); }, - update:function (time) { - var angle = Math.PI * time; // 180 degrees + /** + * Called once per frame. Time is the number of seconds of a frame interval. + * + * @param {Number} dt + */ + update:function (dt) { + var angle = Math.PI * dt; // 180 degrees var mz = Math.sin(angle); angle = angle / 2.0; // x calculates degrees from 0 to 90 var my = Math.cos(angle); @@ -321,32 +373,50 @@ cc.FlipY3D = cc.FlipX3D.extend(/** @lends cc.FlipY3D# */{ }); /** - * Create a flip Y 3d action with duration + * Create a flip Y 3d action with duration.
+ * Upside down. + * @function * @param {Number} duration * @return {cc.FlipY3D} */ -cc.FlipY3D.create = function (duration) { +cc.flipY3D = function (duration) { return new cc.FlipY3D(duration); }; /** - * cc.Lens3D action + * Please use cc.flipY3D instead.
+ * Create a flip Y 3d action with duration. + * @param {Number} duration + * @return {cc.FlipY3D} + * @static + * @deprecated since v3.0
Please use cc.flipY3D instead. + */ +cc.FlipY3D.create = cc.flipY3D; + +/** + * cc.Lens3D action.
+ * Upside down.
+ * Reference the test cases (Effects Test) * @class - * @extends cc.FlipX3D + * @extends cc.Grid3DAction + * @param {Number} duration + * @param {cc.Size} gridSize + * @param {cc.Point} position + * @param {Number} radius */ cc.Lens3D = cc.Grid3DAction.extend(/** @lends cc.Lens3D# */{ - /* lens center position */ + //lens center position _position:null, _radius:0, - /** lens effect. Defaults to 0.7 - 0 means no effect, 1 is very strong effect */ + //lens effect. Defaults to 0.7 - 0 means no effect, 1 is very strong effect _lensEffect:0, - /** lens is concave. (true = concave, false = convex) default is convex i.e. false */ + //lens is concave. (true = concave, false = convex) default is convex i.e. false _concave:false, _dirty:false, /** - * creates a lens 3d action with center position, radius - * @constructor + * Constructor function, override it to extend the construction behavior, remember to call "this._super()" in the extended "ctor" function.
+ * creates a lens 3d action with center position, radius. * @param {Number} duration * @param {cc.Size} gridSize * @param {cc.Point} position @@ -422,7 +492,12 @@ cc.Lens3D = cc.Grid3DAction.extend(/** @lends cc.Lens3D# */{ return false; }, - update:function (time) { + /** + * Called once per frame. Time is the number of seconds of a frame interval. + * + * @param {Number} dt + */ + update:function (dt) { if (this._dirty) { var locGridSizeWidth = this._gridSize.width, locGridSizeHeight = this._gridSize.height; var locRadius = this._radius, locLensEffect = this._lensEffect; @@ -441,7 +516,7 @@ cc.Lens3D = cc.Grid3DAction.extend(/** @lends cc.Lens3D# */{ if (r < locRadius) { r = locRadius - r; pre_log = r / locRadius; - if (pre_log == 0) + if (pre_log === 0) pre_log = 0.001; l = Math.log(pre_log) * locLensEffect; @@ -467,20 +542,41 @@ cc.Lens3D = cc.Grid3DAction.extend(/** @lends cc.Lens3D# */{ /** * creates a lens 3d action with center position, radius + * @function * @param {Number} duration * @param {cc.Size} gridSize * @param {cc.Point} position * @param {Number} radius * @return {cc.Lens3D} */ -cc.Lens3D.create = function (duration, gridSize, position, radius) { +cc.lens3D = function (duration, gridSize, position, radius) { return new cc.Lens3D(duration, gridSize, position, radius); }; /** - * cc.Ripple3D action + * Please use cc.lens3D instead + * creates a lens 3d action with center position, radius + * @param {Number} duration + * @param {cc.Size} gridSize + * @param {cc.Point} position + * @param {Number} radius + * @return {cc.Lens3D} + * @static + * @deprecated since v3.0
Please use cc.lens3D instead. + */ +cc.Lens3D.create = cc.lens3D; + +/** + * cc.Ripple3D action.
+ * Reference the test cases (Effects Test) * @class * @extends cc.Grid3DAction + * @param {Number} duration + * @param {cc.Size} gridSize + * @param {cc.Point} position + * @param {Number} radius + * @param {Number} waves + * @param {Number} amplitude */ cc.Ripple3D = cc.Grid3DAction.extend(/** @lends cc.Ripple3D# */{ /* center position */ @@ -491,8 +587,8 @@ cc.Ripple3D = cc.Grid3DAction.extend(/** @lends cc.Ripple3D# */{ _amplitudeRate: 0, /** - * creates a ripple 3d action with radius, number of waves, amplitude - * @constructor + * Constructor function, override it to extend the construction behavior, remember to call "this._super()" in the extended "ctor" function.
+ * creates a ripple 3d action with radius, number of waves, amplitude. * @param {Number} duration * @param {cc.Size} gridSize * @param {cc.Point} position @@ -578,7 +674,12 @@ cc.Ripple3D = cc.Grid3DAction.extend(/** @lends cc.Ripple3D# */{ return false; }, - update:function (time) { + /** + * Called once per frame. Time is the number of seconds of a frame interval. + * + * @param {Number} dt + */ + update:function (dt) { var locGridSizeWidth = this._gridSize.width, locGridSizeHeight = this._gridSize.height; var locPos = cc.p(0, 0), locRadius = this._radius; var locWaves = this._waves, locAmplitude = this._amplitude, locAmplitudeRate = this._amplitudeRate; @@ -596,7 +697,7 @@ cc.Ripple3D = cc.Grid3DAction.extend(/** @lends cc.Ripple3D# */{ if (r < locRadius) { r = locRadius - r; var rate = Math.pow(r / locRadius, 2); - v.z += (Math.sin(time * Math.PI * locWaves * 2 + r * 0.1) * locAmplitude * locAmplitudeRate * rate); + v.z += (Math.sin(dt * Math.PI * locWaves * 2 + r * 0.1) * locAmplitude * locAmplitudeRate * rate); } this.setVertex(locPos, v); } @@ -606,6 +707,7 @@ cc.Ripple3D = cc.Grid3DAction.extend(/** @lends cc.Ripple3D# */{ /** * creates a ripple 3d action with radius, number of waves, amplitude + * @function * @param {Number} duration * @param {cc.Size} gridSize * @param {cc.Point} position @@ -614,22 +716,42 @@ cc.Ripple3D = cc.Grid3DAction.extend(/** @lends cc.Ripple3D# */{ * @param {Number} amplitude * @return {cc.Ripple3D} */ -cc.Ripple3D.create = function (duration, gridSize, position, radius, waves, amplitude) { +cc.ripple3D = function (duration, gridSize, position, radius, waves, amplitude) { return new cc.Ripple3D(duration, gridSize, position, radius, waves, amplitude); }; /** - * cc.Shaky3D action + * Please use cc.ripple3D instead + * creates a ripple 3d action with radius, number of waves, amplitude + * @param {Number} duration + * @param {cc.Size} gridSize + * @param {cc.Point} position + * @param {Number} radius + * @param {Number} waves + * @param {Number} amplitude + * @return {cc.Ripple3D} + * @static + * @deprecated since v3.0
Please use cc.ripple3D instead. + */ +cc.Ripple3D.create = cc.ripple3D; + +/** + * cc.Shaky3D action.
+ * Reference the test cases (Effects Test) * @class * @extends cc.Grid3DAction + * @param {Number} duration + * @param {cc.Size} gridSize + * @param {Number} range + * @param {Boolean} shakeZ */ cc.Shaky3D = cc.Grid3DAction.extend(/** @lends cc.Shaky3D# */{ _randRange: 0, _shakeZ: false, /** - * Create a shaky3d action with a range, shake Z vertices - * @constructor + * Constructor function, override it to extend the construction behavior, remember to call "this._super()" in the extended "ctor" function.
+ * Create a shaky3d action with a range, shake Z vertices. * @param {Number} duration * @param {cc.Size} gridSize * @param {Number} range @@ -657,7 +779,12 @@ cc.Shaky3D = cc.Grid3DAction.extend(/** @lends cc.Shaky3D# */{ return false; }, - update:function (time) { + /** + * Called once per frame. Time is the number of seconds of a frame interval. + * + * @param {Number} dt + */ + update:function (dt) { var locGridSizeWidth = this._gridSize.width, locGridSizeHeight = this._gridSize.height; var locRandRange = this._randRange, locShakeZ = this._shakeZ, locP = cc.p(0, 0); var v; @@ -678,20 +805,39 @@ cc.Shaky3D = cc.Grid3DAction.extend(/** @lends cc.Shaky3D# */{ /** * creates the action with a range, shake Z vertices, a grid and duration + * @function * @param {Number} duration * @param {cc.Size} gridSize * @param {Number} range * @param {Boolean} shakeZ * @return {cc.Shaky3D} */ -cc.Shaky3D.create = function (duration, gridSize, range, shakeZ) { +cc.shaky3D = function (duration, gridSize, range, shakeZ) { return new cc.Shaky3D(duration, gridSize, range, shakeZ); }; /** - * cc.Liquid action + * Please use cc.shaky3D instead + * creates the action with a range, shake Z vertices, a grid and duration + * @param {Number} duration + * @param {cc.Size} gridSize + * @param {Number} range + * @param {Boolean} shakeZ + * @return {cc.Shaky3D} + * @static + * @deprecated since v3.0
Please use cc.shaky3D instead. + */ +cc.Shaky3D.create = cc.shaky3D; + +/** + * cc.Liquid action.
+ * Reference the test cases (Effects Test) * @class * @extends cc.Grid3DAction + * @param {Number} duration + * @param {cc.Size} gridSize + * @param {Number} waves + * @param {Number} amplitude */ cc.Liquid = cc.Grid3DAction.extend(/** @lends cc.Liquid# */{ _waves: 0, @@ -699,9 +845,8 @@ cc.Liquid = cc.Grid3DAction.extend(/** @lends cc.Liquid# */{ _amplitudeRate: 0, /** - * Create a liquid action with amplitude, a grid and duration - * - * @constructor + * Constructor function, override it to extend the construction behavior, remember to call "this._super()" in the extended "ctor" function.
+ * Create a liquid action with amplitude, a grid and duration. * @param {Number} duration * @param {cc.Size} gridSize * @param {Number} waves @@ -762,7 +907,12 @@ cc.Liquid = cc.Grid3DAction.extend(/** @lends cc.Liquid# */{ return false; }, - update:function (time) { + /** + * Called once per frame. Time is the number of seconds of a frame interval. + * + * @param {Number} dt + */ + update:function (dt) { var locSizeWidth = this._gridSize.width, locSizeHeight = this._gridSize.height, locPos = cc.p(0, 0); var locWaves = this._waves, locAmplitude = this._amplitude, locAmplitudeRate = this._amplitudeRate; var v; @@ -771,8 +921,8 @@ cc.Liquid = cc.Grid3DAction.extend(/** @lends cc.Liquid# */{ locPos.x = i; locPos.y = j; v = this.originalVertex(locPos); - v.x = (v.x + (Math.sin(time * Math.PI * locWaves * 2 + v.x * .01) * locAmplitude * locAmplitudeRate)); - v.y = (v.y + (Math.sin(time * Math.PI * locWaves * 2 + v.y * .01) * locAmplitude * locAmplitudeRate)); + v.x = (v.x + (Math.sin(dt * Math.PI * locWaves * 2 + v.x * .01) * locAmplitude * locAmplitudeRate)); + v.y = (v.y + (Math.sin(dt * Math.PI * locWaves * 2 + v.y * .01) * locAmplitude * locAmplitudeRate)); this.setVertex(locPos, v); } } @@ -781,20 +931,41 @@ cc.Liquid = cc.Grid3DAction.extend(/** @lends cc.Liquid# */{ /** * creates the action with amplitude, a grid and duration + * @function * @param {Number} duration * @param {cc.Size} gridSize * @param {Number} waves * @param {Number} amplitude * @return {cc.Liquid} */ -cc.Liquid.create = function (duration, gridSize, waves, amplitude) { +cc.liquid = function (duration, gridSize, waves, amplitude) { return new cc.Liquid(duration, gridSize, waves, amplitude); }; /** - * cc.Waves action + * Please use cc.liquid instead + * creates the action with amplitude, a grid and duration + * @param {Number} duration + * @param {cc.Size} gridSize + * @param {Number} waves + * @param {Number} amplitude + * @return {cc.Liquid} + * @static + * @deprecated since v3.0
Please use cc.liquid instead. + */ +cc.Liquid.create = cc.liquid; + +/** + * cc.Waves action.
+ * Reference the test cases (Effects Test) * @class * @extends cc.Grid3DAction + * @param {Number} duration + * @param {cc.Size} gridSize + * @param {Number} waves + * @param {Number} amplitude + * @param {Boolean} horizontal + * @param {Boolean} vertical */ cc.Waves = cc.Grid3DAction.extend(/** @lends cc.Waves# */{ _waves: 0, @@ -804,9 +975,8 @@ cc.Waves = cc.Grid3DAction.extend(/** @lends cc.Waves# */{ _horizontal: false, /** - * Create a wave action with amplitude, horizontal sin, vertical sin, a grid and duration - * - * @constructor + * Constructor function, override it to extend the construction behavior, remember to call "this._super()" in the extended "ctor" function.
+ * Create a wave action with amplitude, horizontal sin, vertical sin, a grid and duration. * @param {Number} duration * @param {cc.Size} gridSize * @param {Number} waves @@ -873,7 +1043,12 @@ cc.Waves = cc.Grid3DAction.extend(/** @lends cc.Waves# */{ return false; }, - update:function (time) { + /** + * Called once per frame. Time is the number of seconds of a frame interval. + * + * @param {Number} dt + */ + update:function (dt) { var locSizeWidth = this._gridSize.width, locSizeHeight = this._gridSize.height, locPos = cc.p(0, 0); var locVertical = this._vertical, locHorizontal = this._horizontal; var locWaves = this._waves, locAmplitude = this._amplitude, locAmplitudeRate = this._amplitudeRate; @@ -884,9 +1059,9 @@ cc.Waves = cc.Grid3DAction.extend(/** @lends cc.Waves# */{ locPos.y = j; v = this.originalVertex(locPos); if (locVertical) - v.x = (v.x + (Math.sin(time * Math.PI * locWaves * 2 + v.y * .01) * locAmplitude * locAmplitudeRate)); + v.x = (v.x + (Math.sin(dt * Math.PI * locWaves * 2 + v.y * .01) * locAmplitude * locAmplitudeRate)); if (locHorizontal) - v.y = (v.y + (Math.sin(time * Math.PI * locWaves * 2 + v.x * .01) * locAmplitude * locAmplitudeRate)); + v.y = (v.y + (Math.sin(dt * Math.PI * locWaves * 2 + v.x * .01) * locAmplitude * locAmplitudeRate)); this.setVertex(locPos, v); } } @@ -895,6 +1070,7 @@ cc.Waves = cc.Grid3DAction.extend(/** @lends cc.Waves# */{ /** * initializes the action with amplitude, horizontal sin, vertical sin, a grid and duration + * @function * @param {Number} duration * @param {cc.Size} gridSize * @param {Number} waves @@ -903,15 +1079,36 @@ cc.Waves = cc.Grid3DAction.extend(/** @lends cc.Waves# */{ * @param {Boolean} vertical * @return {cc.Waves} */ -cc.Waves.create = function (duration, gridSize, waves, amplitude, horizontal, vertical) { +cc.waves = function (duration, gridSize, waves, amplitude, horizontal, vertical) { return new cc.Waves(duration, gridSize, waves, amplitude, horizontal, vertical); }; +/** + * Please use cc.waves instead + * initializes the action with amplitude, horizontal sin, vertical sin, a grid and duration + * @param {Number} duration + * @param {cc.Size} gridSize + * @param {Number} waves + * @param {Number} amplitude + * @param {Boolean} horizontal + * @param {Boolean} vertical + * @return {cc.Waves} + * @static + * @deprecated since v3.0
Please use cc.waves instead. + */ +cc.Waves.create = cc.waves; + /** @brief */ /** - * cc.Twirl action + * cc.Twirl action.
+ * Reference the test cases (Effects Test) * @class * @extends cc.Grid3DAction + * @param {Number} duration + * @param {cc.Size} gridSize + * @param {cc.Point} position + * @param {Number} twirls + * @param {Number} amplitude */ cc.Twirl = cc.Grid3DAction.extend(/** @lends cc.Twirl# */{ /* twirl center */ @@ -921,9 +1118,8 @@ cc.Twirl = cc.Grid3DAction.extend(/** @lends cc.Twirl# */{ _amplitudeRate: 0, /** - * Create a grid 3d action with center position, number of twirls, amplitude, a grid size and duration - * - * @constructor + * Constructor function, override it to extend the construction behavior, remember to call "this._super()" in the extended "ctor" function.
+ * Create a grid 3d action with center position, number of twirls, amplitude, a grid size and duration. * @param {Number} duration * @param {cc.Size} gridSize * @param {cc.Point} position @@ -998,7 +1194,12 @@ cc.Twirl = cc.Grid3DAction.extend(/** @lends cc.Twirl# */{ return false; }, - update:function (time) { + /** + * Called once per frame. Time is the number of seconds of a frame interval. + * + * @param {Number} dt + */ + update:function (dt) { var c = this._position; var locSizeWidth = this._gridSize.width, locSizeHeight = this._gridSize.height, locPos = cc.p(0, 0); var amp = 0.1 * this._amplitude * this._amplitudeRate; @@ -1013,7 +1214,7 @@ cc.Twirl = cc.Grid3DAction.extend(/** @lends cc.Twirl# */{ avg.x = i - (locSizeWidth / 2.0); avg.y = j - (locSizeHeight / 2.0); - a = cc.pLength(avg) * Math.cos(Math.PI / 2.0 + time * Math.PI * locTwirls * 2) * amp; + a = cc.pLength(avg) * Math.cos(Math.PI / 2.0 + dt * Math.PI * locTwirls * 2) * amp; dX = Math.sin(a) * (v.y - c.y) + Math.cos(a) * (v.x - c.x); dY = Math.cos(a) * (v.y - c.y) - Math.sin(a) * (v.x - c.x); @@ -1029,6 +1230,7 @@ cc.Twirl = cc.Grid3DAction.extend(/** @lends cc.Twirl# */{ /** * creates the action with center position, number of twirls, amplitude, a grid size and duration + * @function * @param {Number} duration * @param {cc.Size} gridSize * @param {cc.Point} position @@ -1036,6 +1238,20 @@ cc.Twirl = cc.Grid3DAction.extend(/** @lends cc.Twirl# */{ * @param {Number} amplitude * @return {cc.Twirl} */ -cc.Twirl.create = function (duration, gridSize, position, twirls, amplitude) { +cc.twirl = function (duration, gridSize, position, twirls, amplitude) { return new cc.Twirl(duration, gridSize, position, twirls, amplitude); }; + +/** + * Please use cc.twirl instead + * creates the action with center position, number of twirls, amplitude, a grid size and duration + * @param {Number} duration + * @param {cc.Size} gridSize + * @param {cc.Point} position + * @param {Number} twirls + * @param {Number} amplitude + * @return {cc.Twirl} + * @static + * @deprecated since v3.0
Please use cc.twirl instead. + */ +cc.Twirl.create = cc.twirl; \ No newline at end of file diff --git a/cocos2d/actions3d/CCActionPageTurn3D.js b/cocos2d/actions3d/CCActionPageTurn3D.js index dae59a11ee..a28f0d4852 100644 --- a/cocos2d/actions3d/CCActionPageTurn3D.js +++ b/cocos2d/actions3d/CCActionPageTurn3D.js @@ -1,7 +1,7 @@ /**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2008-2010 Ricardo Quesada - Copyright (c) 2011 Zynga Inc. + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -36,6 +36,18 @@ * @extends cc.Grid3DAction */ cc.PageTurn3D = cc.Grid3DAction.extend(/** @lends cc.PageTurn3D# */{ + getGrid: function(){ + var result = new cc.Grid3D(this._gridSize); + result.setNeedDepthTestForBlit(true); + return result; + }, + + clone: function(){ + var ret = new cc.PageTurn3D(); + ret.initWithDuration(this._duration, this._gridSize); + return ret; + }, + /** * Update each tick
* Time is the percentage of the way through the duration @@ -58,7 +70,7 @@ cc.PageTurn3D = cc.Grid3DAction.extend(/** @lends cc.PageTurn3D# */{ locVer.x = i; locVer.y = j; // Get original vertex - var p = this.originalVertex(locVer); + var p = this.getOriginalVertex(locVer); var R = Math.sqrt((p.x * p.x) + ((p.y - ay) * (p.y - ay))); var r = R * sinTheta; @@ -93,10 +105,21 @@ cc.PageTurn3D = cc.Grid3DAction.extend(/** @lends cc.PageTurn3D# */{ /** * create PageTurn3D action + * @function * @param {Number} duration * @param {cc.Size} gridSize * @return {cc.PageTurn3D} */ -cc.PageTurn3D.create = function (duration, gridSize) { +cc.pageTurn3D = function (duration, gridSize) { return new cc.PageTurn3D(duration, gridSize); }; +/** + * Please use cc.pageTurn3D instead + * create PageTurn3D action + * @param {Number} duration + * @param {cc.Size} gridSize + * @return {cc.PageTurn3D} + * @static + * @deprecated since v3.0 please use cc.pageTurn3D instead. + */ +cc.PageTurn3D.create = cc.pageTurn3D; \ No newline at end of file diff --git a/cocos2d/actions3d/CCActionTiledGrid.js b/cocos2d/actions3d/CCActionTiledGrid.js index b146e8a355..dae3d8daa2 100644 --- a/cocos2d/actions3d/CCActionTiledGrid.js +++ b/cocos2d/actions3d/CCActionTiledGrid.js @@ -1,7 +1,7 @@ /**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2008-2010 Ricardo Quesada - Copyright (c) 2011 Zynga Inc. + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,17 +25,22 @@ ****************************************************************************/ /** - * cc.ShakyTiles3D action + * cc.ShakyTiles3D action.
+ * Reference the test cases (Effects Test) * @class * @extends cc.TiledGrid3DAction + * @param {Number} duration + * @param {cc.Size} gridSize + * @param {Number} range + * @param {Boolean} shakeZ */ cc.ShakyTiles3D = cc.TiledGrid3DAction.extend(/** @lends cc.ShakyTiles3D# */{ _randRange:0, _shakeZ:false, /** - * creates the action with a range, whether or not to shake Z vertices, a grid size, and duration - * @constructor + * Constructor function, override it to extend the construction behavior, remember to call "this._super()" in the extended "ctor" function.
+ * Creates the action with a range, whether or not to shake Z vertices, a grid size, and duration. * @param {Number} duration * @param {cc.Size} gridSize * @param {Number} range @@ -47,7 +52,7 @@ cc.ShakyTiles3D = cc.TiledGrid3DAction.extend(/** @lends cc.ShakyTiles3D# */{ }, /** - * initializes the action with a range, whether or not to shake Z vertices, a grid size, and duration + * Initializes the action with a range, whether or not to shake Z vertices, a grid size, and duration. * @param {Number} duration * @param {cc.Size} gridSize * @param {Number} range @@ -63,7 +68,11 @@ cc.ShakyTiles3D = cc.TiledGrid3DAction.extend(/** @lends cc.ShakyTiles3D# */{ return false; }, - update:function (time) { + /** + * Called once per frame. Time is the number of seconds of a frame interval.
+ * @param {Number} dt + */ + update:function (dt) { var locGridSize = this._gridSize, locRandRange = this._randRange; var locPos = cc.p(0, 0); for (var i = 0; i < locGridSize.width; ++i) { @@ -98,21 +107,42 @@ cc.ShakyTiles3D = cc.TiledGrid3DAction.extend(/** @lends cc.ShakyTiles3D# */{ }); /** - * creates the action with a range, whether or not to shake Z vertices, a grid size, and duration + * Creates the action with a range, whether or not to shake Z vertices, a grid size, and duration.
+ * Reference the test cases (Effects Test) + * @function * @param {Number} duration * @param {cc.Size} gridSize * @param {Number} range * @param {Boolean} shakeZ * @return {cc.ShakyTiles3D} */ -cc.ShakyTiles3D.create = function (duration, gridSize, range, shakeZ) { +cc.shakyTiles3D = function (duration, gridSize, range, shakeZ) { return new cc.ShakyTiles3D(duration, gridSize, range, shakeZ); }; /** - * cc.ShatteredTiles3D action + * Please use cc.shakyTiles3D instead.
+ * creates the action with a range, whether or not to shake Z vertices, a grid size, and duration.
+ * Reference the test cases (Effects Test) + * @param {Number} duration + * @param {cc.Size} gridSize + * @param {Number} range + * @param {Boolean} shakeZ + * @return {cc.ShakyTiles3D} + * @static + * @deprecated since v3.0
Please use cc.shakyTiles3D instead. + */ +cc.ShakyTiles3D.create = cc.shakyTiles3D; + +/** + * cc.ShatteredTiles3D action.
+ * Reference the test cases (Effects Test) * @class * @extends cc.TiledGrid3DAction + * @param {Number} duration + * @param {cc.Size} gridSize + * @param {Number} range + * @param {Boolean} shatterZ */ cc.ShatteredTiles3D = cc.TiledGrid3DAction.extend(/** @lends cc.ShatteredTiles3D# */{ _randRange:0, @@ -120,8 +150,8 @@ cc.ShatteredTiles3D = cc.TiledGrid3DAction.extend(/** @lends cc.ShatteredTiles3D _shatterZ:false, /** - * creates the action with a range, whether of not to shatter Z vertices, a grid size and duration - * @constructor + * Constructor function, override it to extend the construction behavior, remember to call "this._super()" in the extended "ctor" function.
+ * Creates the action with a range, whether of not to shatter Z vertices, a grid size and duration. * @param {Number} duration * @param {cc.Size} gridSize * @param {Number} range @@ -133,7 +163,7 @@ cc.ShatteredTiles3D = cc.TiledGrid3DAction.extend(/** @lends cc.ShatteredTiles3D }, /** - * initializes the action with a range, whether or not to shatter Z vertices, a grid size and duration + * Initializes the action with a range, whether or not to shatter Z vertices, a grid size and duration.
* @param {Number} duration * @param {cc.Size} gridSize * @param {Number} range @@ -150,7 +180,11 @@ cc.ShatteredTiles3D = cc.TiledGrid3DAction.extend(/** @lends cc.ShatteredTiles3D return false; }, - update:function (time) { + /** + * Called once per frame. Time is the number of seconds of a frame interval.
+ * @param {Number} dt + */ + update:function (dt) { if (this._once === false) { var locGridSize = this._gridSize, locRandRange = this._randRange; var coords, locPos = cc.p(0, 0); @@ -187,19 +221,35 @@ cc.ShatteredTiles3D = cc.TiledGrid3DAction.extend(/** @lends cc.ShatteredTiles3D }); /** - * creates the action with a range, whether of not to shatter Z vertices, a grid size and duration + * Creates the action with a range, whether of not to shatter Z vertices, a grid size and duration.
+ * Reference the test cases (Effects Test) + * @function * @param {Number} duration * @param {cc.Size} gridSize * @param {Number} range * @param {Boolean} shatterZ * @return {cc.ShatteredTiles3D} */ -cc.ShatteredTiles3D.create = function (duration, gridSize, range, shatterZ) { +cc.shatteredTiles3D = function (duration, gridSize, range, shatterZ) { return new cc.ShatteredTiles3D(duration, gridSize, range, shatterZ); }; /** - * A Tile composed of position, startPosition and delta + * Please use cc.shatteredTiles3D instead.
+ * Creates the action with a range, whether of not to shatter Z vertices, a grid size and duration.
+ * Reference the test cases (Effects Test) + * @param {Number} duration + * @param {cc.Size} gridSize + * @param {Number} range + * @param {Boolean} shatterZ + * @return {cc.ShatteredTiles3D} + * @static + * @deprecated since v3.0
Please use cc.shatteredTiles3D instead. + */ +cc.ShatteredTiles3D.create = cc.shatteredTiles3D; + +/** + * A Tile composed of position, startPosition and delta. * @Class * @constructor * @param {cc.Point} [position=cc.p(0,0)] @@ -213,9 +263,13 @@ cc.Tile = function (position, startPosition, delta) { }; /** - * cc.ShuffleTiles action, Shuffle the tiles in random order + * cc.ShuffleTiles action, Shuffle the tiles in random order.
+ * Reference the test cases (Effects Test) * @class * @extends cc.TiledGrid3DAction + * @param {Number} duration + * @param {cc.Size} gridSize + * @param {Number} seed */ cc.ShuffleTiles = cc.TiledGrid3DAction.extend(/** @lends cc.ShuffleTiles# */{ _seed:0, @@ -224,8 +278,8 @@ cc.ShuffleTiles = cc.TiledGrid3DAction.extend(/** @lends cc.ShuffleTiles# */{ _tiles:null, /** - * creates the action with a random seed, the grid size and the duration - * @constructor + * Constructor function, override it to extend the construction behavior, remember to call "this._super()" in the extended "ctor" function.
+ * Creates the action with a random seed, the grid size and the duration. * @param {Number} duration * @param {cc.Size} gridSize * @param {Number} seed @@ -239,7 +293,7 @@ cc.ShuffleTiles = cc.TiledGrid3DAction.extend(/** @lends cc.ShuffleTiles# */{ }, /** - * initializes the action with a random seed, the grid size and the duration + * Initializes the action with a random seed, the grid size and the duration. * @param {Number} duration * @param {cc.Size} gridSize * @param {Number} seed @@ -256,7 +310,7 @@ cc.ShuffleTiles = cc.TiledGrid3DAction.extend(/** @lends cc.ShuffleTiles# */{ }, /** - * shuffle + * Shuffle * @param {Array} array * @param {Number} len */ @@ -270,7 +324,7 @@ cc.ShuffleTiles = cc.TiledGrid3DAction.extend(/** @lends cc.ShuffleTiles# */{ }, /** - * get Delta + * Get Delta * @param {cc.Size} pos */ getDelta:function (pos) { @@ -281,7 +335,7 @@ cc.ShuffleTiles = cc.TiledGrid3DAction.extend(/** @lends cc.ShuffleTiles# */{ }, /** - * place Tile + * Place Tile * @param {cc.Point} pos * @param {cc.Tile} tile */ @@ -306,7 +360,7 @@ cc.ShuffleTiles = cc.TiledGrid3DAction.extend(/** @lends cc.ShuffleTiles# */{ }, /** - * start with target + * Start with target * @param {cc.Node} target */ startWithTarget:function (target) { @@ -341,7 +395,11 @@ cc.ShuffleTiles = cc.TiledGrid3DAction.extend(/** @lends cc.ShuffleTiles# */{ } }, - update:function (time) { + /** + * Called once per frame. Time is the number of seconds of a frame interval. + * @param {Number} dt + */ + update:function (dt) { var tileIndex = 0, locGridSize = this._gridSize, locTiles = this._tiles; var selTile, locPos = cc.p(0, 0); for (var i = 0; i < locGridSize.width; ++i) { @@ -349,8 +407,8 @@ cc.ShuffleTiles = cc.TiledGrid3DAction.extend(/** @lends cc.ShuffleTiles# */{ locPos.x = i; locPos.y = j; selTile = locTiles[tileIndex]; - selTile.position.x = selTile.delta.width * time; - selTile.position.y = selTile.delta.height * time; + selTile.position.x = selTile.delta.width * dt; + selTile.position.y = selTile.delta.height * dt; this.placeTile(locPos, selTile); ++tileIndex; } @@ -359,36 +417,53 @@ cc.ShuffleTiles = cc.TiledGrid3DAction.extend(/** @lends cc.ShuffleTiles# */{ }); /** - * creates the action with a random seed, the grid size and the duration + * Creates the action with a random seed, the grid size and the duration.
+ * Reference the test cases (Effects Test) + * @function * @param {Number} duration * @param {cc.Size} gridSize * @param {Number} seed * @return {cc.ShuffleTiles} */ -cc.ShuffleTiles.create = function (duration, gridSize, seed) { +cc.shuffleTiles = function (duration, gridSize, seed) { return new cc.ShuffleTiles(duration, gridSize, seed); }; /** - * cc.FadeOutTRTiles action. Fades out the tiles in a Top-Right direction + * Please use cc.shuffleTiles instead.
+ * Creates the action with a random seed, the grid size and the duration.
+ * Reference the test cases (Effects Test) + * @param {Number} duration + * @param {cc.Size} gridSize + * @param {Number} seed + * @return {cc.ShuffleTiles} + * @static + * @deprecated since v3.0
Please use cc.shuffleTiles instead. + */ +cc.ShuffleTiles.create = cc.shuffleTiles; + +/** + * cc.FadeOutTRTiles action. Fades out the tiles in a Top-Right direction.
+ * Reference the test cases (Effects Test) * @class * @extends cc.TiledGrid3DAction */ cc.FadeOutTRTiles = cc.TiledGrid3DAction.extend(/** @lends cc.FadeOutTRTiles# */{ /** + * Test function * @param {cc.Size} pos * @param {Number} time */ testFunc:function (pos, time) { var locX = this._gridSize.width * time; var locY = this._gridSize.height * time; - if ((locX + locY) == 0.0) + if ((locX + locY) === 0.0) return 1.0; return Math.pow((pos.width + pos.height) / (locX + locY), 6); }, /** - * turn on Tile + * Turn on Tile * @param {cc.Point} pos */ turnOnTile:function (pos) { @@ -396,7 +471,7 @@ cc.FadeOutTRTiles = cc.TiledGrid3DAction.extend(/** @lends cc.FadeOutTRTiles# */ }, /** - * turn Off Tile + * Turn Off Tile * @param {cc.Point} pos */ turnOffTile:function (pos) { @@ -404,7 +479,7 @@ cc.FadeOutTRTiles = cc.TiledGrid3DAction.extend(/** @lends cc.FadeOutTRTiles# */ }, /** - * transform tile + * Transform tile * @param {cc.Point} pos * @param {Number} distance */ @@ -427,7 +502,11 @@ cc.FadeOutTRTiles = cc.TiledGrid3DAction.extend(/** @lends cc.FadeOutTRTiles# */ this.setTile(pos, coords); }, - update:function (time) { + /** + * Called once per frame. Time is the number of seconds of a frame interval. + * @param {Number} dt + */ + update:function (dt) { var locGridSize = this._gridSize; var locPos = cc.p(0, 0), locSize = cc.size(0, 0), distance; for (var i = 0; i < locGridSize.width; ++i) { @@ -436,8 +515,8 @@ cc.FadeOutTRTiles = cc.TiledGrid3DAction.extend(/** @lends cc.FadeOutTRTiles# */ locPos.y = j; locSize.width = i; locSize.height = j; - distance = this.testFunc(locSize, time); - if (distance == 0) + distance = this.testFunc(locSize, dt); + if (distance === 0) this.turnOffTile(locPos); else if (distance < 1) this.transformTile(locPos, distance); @@ -449,29 +528,45 @@ cc.FadeOutTRTiles = cc.TiledGrid3DAction.extend(/** @lends cc.FadeOutTRTiles# */ }); /** - * creates the action with the grid size and the duration + * Creates the action with the grid size and the duration.
+ * Reference the test cases (Effects Test) + * @function * @param duration * @param gridSize * @return {cc.FadeOutTRTiles} */ -cc.FadeOutTRTiles.create = function (duration, gridSize) { +cc.fadeOutTRTiles = function (duration, gridSize) { return new cc.FadeOutTRTiles(duration, gridSize); }; /** - * cc.FadeOutBLTiles action. Fades out the tiles in a Bottom-Left direction + * Please use cc.fadeOutTRTiles instead.
+ * Creates the action with the grid size and the duration.
+ * Reference the test cases (Effects Test) + * @param duration + * @param gridSize + * @return {cc.FadeOutTRTiles} + * @static + * @deprecated since v3.0
Please use cc.fadeOutTRTiles instead. + */ +cc.FadeOutTRTiles.create = cc.fadeOutTRTiles; + +/** + * cc.FadeOutBLTiles action. Fades out the tiles in a Bottom-Left direction.
+ * Reference the test cases (Effects Test) * @class * @extends cc.FadeOutTRTiles */ cc.FadeOutBLTiles = cc.FadeOutTRTiles.extend(/** @lends cc.FadeOutBLTiles# */{ /** + * Test function * @param {cc.Size} pos * @param {Number} time */ testFunc:function (pos, time) { var locX = this._gridSize.width * (1.0 - time); var locY = this._gridSize.height * (1.0 - time); - if ((pos.width + pos.height) == 0) + if ((pos.width + pos.height) === 0) return 1.0; return Math.pow((locX + locY) / (pos.width + pos.height), 6); @@ -479,24 +574,39 @@ cc.FadeOutBLTiles = cc.FadeOutTRTiles.extend(/** @lends cc.FadeOutBLTiles# */{ }); /** - * creates the action with the grid size and the duration + * Creates the action with the grid size and the duration.
+ * Reference the test cases (Effects Test) + * @function * @param duration * @param gridSize * @return {cc.FadeOutBLTiles} */ -cc.FadeOutBLTiles.create = function (duration, gridSize) { +cc.fadeOutBLTiles = function (duration, gridSize) { return new cc.FadeOutBLTiles(duration, gridSize); }; /** - * cc.FadeOutUpTiles action. Fades out the tiles in upwards direction + * Please use cc.fadeOutBLTiles instead.
+ * Creates the action with the grid size and the duration.
+ * Reference the test cases (Effects Test) + * @param duration + * @param gridSize + * @return {cc.FadeOutBLTiles} + * @static + * @deprecated since v3.0
Please use cc.fadeOutBLTiles instead. + */ +cc.FadeOutBLTiles.create = cc.fadeOutBLTiles; + +/** + * cc.FadeOutUpTiles action. Fades out the tiles in upwards direction.
+ * Reference the test cases (Effects Test) * @class * @extends cc.FadeOutTRTiles */ cc.FadeOutUpTiles = cc.FadeOutTRTiles.extend(/** @lends cc.FadeOutUpTiles# */{ testFunc:function (pos, time) { var locY = this._gridSize.height * time; - if (locY == 0.0) + if (locY === 0.0) return 1.0; return Math.pow(pos.height / locY, 6); }, @@ -515,45 +625,82 @@ cc.FadeOutUpTiles = cc.FadeOutTRTiles.extend(/** @lends cc.FadeOutUpTiles# */{ }); /** - * creates the action with the grid size and the duration + * Creates the action with the grid size and the duration.
+ * Reference the test cases (Effects Test) + * @function * @param {Number} duration * @param {cc.Size} gridSize * @return {cc.FadeOutUpTiles} */ -cc.FadeOutUpTiles.create = function (duration, gridSize) { +cc.fadeOutUpTiles = function (duration, gridSize) { return new cc.FadeOutUpTiles(duration, gridSize); }; /** - * cc.FadeOutDownTiles action. Fades out the tiles in downwards direction + * Please use cc.fadeOutUpTiles instead.
+ * Creates the action with the grid size and the duration.
+ * Reference the test cases (Effects Test) + * @param {Number} duration + * @param {cc.Size} gridSize + * @return {cc.FadeOutUpTiles} + * @static + * @deprecated since v3.0
Please use cc.fadeOutUpTiles instead. + */ +cc.FadeOutUpTiles.create = cc.fadeOutUpTiles; + +/** + * cc.FadeOutDownTiles action. Fades out the tiles in downwards direction.
+ * Reference the test cases (Effects Test) * @class * @extends cc.FadeOutUpTiles */ cc.FadeOutDownTiles = cc.FadeOutUpTiles.extend(/** @lends cc.FadeOutDownTiles# */{ testFunc:function (pos, time) { var locY = this._gridSize.height * (1.0 - time); - if (pos.height == 0) + if (pos.height === 0) return 1.0; return Math.pow(locY / pos.height, 6); } }); /** - * creates the action with the grid size and the duration + * Creates the action with the grid size and the duration.
+ * Reference the test cases (Effects Test) + * @function * @param {Number} duration * @param {cc.Size} gridSize * @return {cc.FadeOutDownTiles} */ -cc.FadeOutDownTiles.create = function (duration, gridSize) { +cc.fadeOutDownTiles = function (duration, gridSize) { return new cc.FadeOutDownTiles(duration, gridSize); }; - +/** + * Please use cc.fadeOutDownTiles instead.
+ * Creates the action with the grid size and the duration.
+ * Reference the test cases (Effects Test) + * @param {Number} duration + * @param {cc.Size} gridSize + * @return {cc.FadeOutDownTiles} + * @static + * @deprecated since v3.0
Please use cc.fadeOutDownTiles instead. + */ +cc.FadeOutDownTiles.create = cc.fadeOutDownTiles; /** * cc.TurnOffTiles action.
- * Turn off the files in random order + * Turn off the files in random order.
+ * Reference the test cases (Effects Test) * @class * @extends cc.TiledGrid3DAction + * @param {Number} duration + * @param {cc.Size} gridSize + * @param {Number|Null} [seed=0] + * @example + * // turnOffTiles without seed + * var toff = new cc.TurnOffTiles(this._duration, cc.size(x, y)); + * + * // turnOffTiles with seed + * var toff = new cc.TurnOffTiles(this._duration, cc.size(x, y), 0); */ cc.TurnOffTiles = cc.TiledGrid3DAction.extend(/** @lends cc.TurnOffTiles# */{ _seed:null, @@ -561,16 +708,11 @@ cc.TurnOffTiles = cc.TiledGrid3DAction.extend(/** @lends cc.TurnOffTiles# */{ _tilesOrder:null, /** - * creates the action with a random seed, the grid size and the duration + * Constructor function, override it to extend the construction behavior, remember to call "this._super()" in the extended "ctor" function.
+ * Creates the action with a random seed, the grid size and the duration. * @param {Number} duration * @param {cc.Size} gridSize * @param {Number|Null} [seed=0] - * @example - * // turnOffTiles without seed - * var toff = new cc.TurnOffTiles(this._duration, cc.size(x, y)); - * - * // turnOffTiles with seed - * var toff = new cc.TurnOffTiles(this._duration, cc.size(x, y), 0); */ ctor:function (duration, gridSize, seed) { cc.GridAction.prototype.ctor.call(this); @@ -579,7 +721,8 @@ cc.TurnOffTiles = cc.TiledGrid3DAction.extend(/** @lends cc.TurnOffTiles# */{ gridSize !== undefined && this.initWithDuration(duration, gridSize, seed); }, - /** initializes the action with a random seed, the grid size and the duration + /** + * Initializes the action with a random seed, the grid size and the duration. * @param {Number} duration * @param {cc.Size} gridSize * @param {Number|Null} [seed=0] @@ -595,6 +738,7 @@ cc.TurnOffTiles = cc.TiledGrid3DAction.extend(/** @lends cc.TurnOffTiles# */{ }, /** + * Shuffle * @param {Array} array * @param {Number} len */ @@ -608,6 +752,7 @@ cc.TurnOffTiles = cc.TiledGrid3DAction.extend(/** @lends cc.TurnOffTiles# */{ }, /** + * Turn on tile. * @param {cc.Point} pos */ turnOnTile:function (pos) { @@ -615,6 +760,7 @@ cc.TurnOffTiles = cc.TiledGrid3DAction.extend(/** @lends cc.TurnOffTiles# */{ }, /** + * Turn off title. * @param {cc.Point} pos */ turnOffTile:function (pos) { @@ -622,6 +768,7 @@ cc.TurnOffTiles = cc.TiledGrid3DAction.extend(/** @lends cc.TurnOffTiles# */{ }, /** + * called before the action start. It will also set the target. * @param {cc.Node} target */ startWithTarget:function (target) { @@ -636,10 +783,11 @@ cc.TurnOffTiles = cc.TiledGrid3DAction.extend(/** @lends cc.TurnOffTiles# */{ }, /** - * @param {Number} time + * Called once per frame. Time is the number of seconds of a frame interval. + * @param {Number} dt */ - update:function (time) { - var l = 0 | (time * this._tilesCount), locGridSize = this._gridSize; + update:function (dt) { + var l = 0 | (dt * this._tilesCount), locGridSize = this._gridSize; var t,tilePos = cc.p(0,0), locTilesOrder = this._tilesOrder; for (var i = 0; i < this._tilesCount; i++) { t = locTilesOrder[i]; @@ -654,7 +802,9 @@ cc.TurnOffTiles = cc.TiledGrid3DAction.extend(/** @lends cc.TurnOffTiles# */{ }); /** - * creates the action with a random seed, the grid size and the duration + * Creates the action with a random seed, the grid size and the duration.
+ * Reference the test cases (Effects Test) + * @function * @param {Number} duration * @param {cc.Size} gridSize * @param {Number|Null} [seed=0] @@ -662,19 +812,36 @@ cc.TurnOffTiles = cc.TiledGrid3DAction.extend(/** @lends cc.TurnOffTiles# */{ * @example * // example * // turnOffTiles without seed - * var toff = cc.TurnOffTiles.create(this._duration, cc.size(x, y)); + * var toff = cc.turnOffTiles(this._duration, cc.size(x, y)); * * // turnOffTiles with seed - * var toff = cc.TurnOffTiles.create(this._duration, cc.size(x, y), 0); + * var toff = cc.turnOffTiles(this._duration, cc.size(x, y), 0); */ -cc.TurnOffTiles.create = function (duration, gridSize, seed) { +cc.turnOffTiles = function (duration, gridSize, seed) { return new cc.TurnOffTiles(duration, gridSize, seed); }; +/** + * Please use cc.turnOffTiles instead.
+ * Creates the action with a random seed, the grid size and the duration.
+ * Reference the test cases (Effects Test) + * @param {Number} duration + * @param {cc.Size} gridSize + * @param {Number|Null} [seed=0] + * @return {cc.TurnOffTiles} + * @static + * @deprecated since v3.0
Please use cc.turnOffTiles instead. + */ +cc.TurnOffTiles.create = cc.turnOffTiles; /** - * cc.WavesTiles3D action. + * cc.WavesTiles3D action.
+ * Reference the test cases (Effects Test) * @class * @extends cc.TiledGrid3DAction + * @param {Number} duration + * @param {cc.Size} gridSize + * @param {Number} waves + * @param {Number} amplitude */ cc.WavesTiles3D = cc.TiledGrid3DAction.extend(/** @lends cc.WavesTiles3D# */{ _waves:0, @@ -682,8 +849,8 @@ cc.WavesTiles3D = cc.TiledGrid3DAction.extend(/** @lends cc.WavesTiles3D# */{ _amplitudeRate:0, /** - * creates the action with a number of waves, the waves amplitude, the grid size and the duration - * @constructor + * Constructor function, override it to extend the construction behavior, remember to call "this._super()" in the extended "ctor" function.
+ * creates the action with a number of waves, the waves amplitude, the grid size and the duration. * @param {Number} duration * @param {cc.Size} gridSize * @param {Number} waves @@ -744,7 +911,11 @@ cc.WavesTiles3D = cc.TiledGrid3DAction.extend(/** @lends cc.WavesTiles3D# */{ return false; }, - update:function (time) { + /** + * Called once per frame. Time is the number of seconds of a frame interval. + * @param {Number} dt + */ + update:function (dt) { var locGridSize = this._gridSize, locWaves = this._waves, locAmplitude = this._amplitude, locAmplitudeRate = this._amplitudeRate; var locPos = cc.p(0, 0), coords; for (var i = 0; i < locGridSize.width; i++) { @@ -752,7 +923,7 @@ cc.WavesTiles3D = cc.TiledGrid3DAction.extend(/** @lends cc.WavesTiles3D# */{ locPos.x = i; locPos.y = j; coords = this.originalTile(locPos); - coords.bl.z = (Math.sin(time * Math.PI * locWaves * 2 + + coords.bl.z = (Math.sin(dt * Math.PI * locWaves * 2 + (coords.bl.y + coords.bl.x) * 0.01) * locAmplitude * locAmplitudeRate); coords.br.z = coords.bl.z; coords.tl.z = coords.bl.z; @@ -764,21 +935,41 @@ cc.WavesTiles3D = cc.TiledGrid3DAction.extend(/** @lends cc.WavesTiles3D# */{ }); /** - * creates the action with a number of waves, the waves amplitude, the grid size and the duration + * creates the action with a number of waves, the waves amplitude, the grid size and the duration.
+ * Reference the test cases (Effects Test) + * @function * @param {Number} duration * @param {cc.Size} gridSize * @param {Number} waves * @param {Number} amplitude * @return {cc.WavesTiles3D} */ -cc.WavesTiles3D.create = function (duration, gridSize, waves, amplitude) { +cc.wavesTiles3D = function (duration, gridSize, waves, amplitude) { return new cc.WavesTiles3D(duration, gridSize, waves, amplitude); }; +/** + * Please use cc.wavesTiles3D instead + * creates the action with a number of waves, the waves amplitude, the grid size and the duration.
+ * Reference the test cases (Effects Test) + * @param {Number} duration + * @param {cc.Size} gridSize + * @param {Number} waves + * @param {Number} amplitude + * @return {cc.WavesTiles3D} + * @static + * @deprecated since v3.0
Please use cc.wavesTiles3D instead. + */ +cc.WavesTiles3D.create = cc.wavesTiles3D; /** - * cc.JumpTiles3D action. A sin function is executed to move the tiles across the Z axis + * cc.JumpTiles3D action. A sin function is executed to move the tiles across the Z axis.
+ * Reference the test cases (Effects Test) * @class * @extends cc.TiledGrid3DAction + * @param {Number} duration + * @param {cc.Size} gridSize + * @param {Number} numberOfJumps + * @param {Number} amplitude */ cc.JumpTiles3D = cc.TiledGrid3DAction.extend(/** @lends cc.JumpTiles3D# */{ _jumps:0, @@ -786,8 +977,8 @@ cc.JumpTiles3D = cc.TiledGrid3DAction.extend(/** @lends cc.JumpTiles3D# */{ _amplitudeRate:0, /** - * creates the action with the number of jumps, the sin amplitude, the grid size and the duration - * @constructor + * Constructor function, override it to extend the construction behavior, remember to call "this._super()" in the extended "ctor" function.
+ * creates the action with the number of jumps, the sin amplitude, the grid size and the duration. * @param {Number} duration * @param {cc.Size} gridSize * @param {Number} numberOfJumps @@ -847,9 +1038,13 @@ cc.JumpTiles3D = cc.TiledGrid3DAction.extend(/** @lends cc.JumpTiles3D# */{ return false; }, - update:function (time) { - var sinz = (Math.sin(Math.PI * time * this._jumps * 2) * this._amplitude * this._amplitudeRate ); - var sinz2 = (Math.sin(Math.PI * (time * this._jumps * 2 + 1)) * this._amplitude * this._amplitudeRate ); + /** + * Called once per frame. Time is the number of seconds of a frame interval. + * @param {Number} dt + */ + update:function (dt) { + var sinz = (Math.sin(Math.PI * dt * this._jumps * 2) * this._amplitude * this._amplitudeRate ); + var sinz2 = (Math.sin(Math.PI * (dt * this._jumps * 2 + 1)) * this._amplitude * this._amplitudeRate ); var locGridSize = this._gridSize; var locGrid = this.target.grid; @@ -862,7 +1057,7 @@ cc.JumpTiles3D = cc.TiledGrid3DAction.extend(/** @lends cc.JumpTiles3D# */{ //var coords = this.originalTile(cc.p(i, j)); coords = locGrid.originalTile(locPos); - if (((i + j) % 2) == 0) { + if (((i + j) % 2) === 0) { coords.bl.z += sinz; coords.br.z += sinz; coords.tl.z += sinz; @@ -882,29 +1077,48 @@ cc.JumpTiles3D = cc.TiledGrid3DAction.extend(/** @lends cc.JumpTiles3D# */{ }); /** - * creates the action with the number of jumps, the sin amplitude, the grid size and the duration + * creates the action with the number of jumps, the sin amplitude, the grid size and the duration.
+ * Reference the test cases (Effects Test) + * @function * @param {Number} duration * @param {cc.Size} gridSize * @param {Number} numberOfJumps * @param {Number} amplitude * @return {cc.JumpTiles3D} */ -cc.JumpTiles3D.create = function (duration, gridSize, numberOfJumps, amplitude) { +cc.jumpTiles3D = function (duration, gridSize, numberOfJumps, amplitude) { return new cc.JumpTiles3D(duration, gridSize, numberOfJumps, amplitude); }; /** - * cc.SplitRows action + * Please use cc.jumpTiles3D instead + * creates the action with the number of jumps, the sin amplitude, the grid size and the duration.
+ * Reference the test cases (Effects Test) + * @param {Number} duration + * @param {cc.Size} gridSize + * @param {Number} numberOfJumps + * @param {Number} amplitude + * @return {cc.JumpTiles3D} + * @static + * @deprecated since v3.0
Please use cc.jumpTiles3D instead. + */ +cc.JumpTiles3D.create = cc.jumpTiles3D; + +/** + * cc.SplitRows action.
+ * Reference the test cases (Effects Test) * @class * @extends cc.TiledGrid3DAction + * @param {Number} duration + * @param {Number} rows */ cc.SplitRows = cc.TiledGrid3DAction.extend(/** @lends cc.SplitRows# */{ _rows:0, _winSize:null, /** - * creates the action with the number of rows to split and the duration - * @constructor + * Constructor function, override it to extend the construction behavior, remember to call "this._super()" in the extended "ctor" function.
+ * creates the action with the number of rows to split and the duration. * @param {Number} duration * @param {Number} rows */ @@ -924,7 +1138,11 @@ cc.SplitRows = cc.TiledGrid3DAction.extend(/** @lends cc.SplitRows# */{ return cc.TiledGrid3DAction.prototype.initWithDuration.call(this, duration, cc.size(1, rows)); }, - update:function (time) { + /** + * Called once per frame. Time is the number of seconds of a frame interval. + * @param {Number} dt + */ + update:function (dt) { var locGridSize = this._gridSize, locWinSizeWidth = this._winSize.width; var coords, direction, locPos = cc.p(0, 0); for (var j = 0; j < locGridSize.height; ++j) { @@ -932,18 +1150,22 @@ cc.SplitRows = cc.TiledGrid3DAction.extend(/** @lends cc.SplitRows# */{ coords = this.originalTile(locPos); direction = 1; - if ((j % 2 ) == 0) + if ((j % 2 ) === 0) direction = -1; - coords.bl.x += direction * locWinSizeWidth * time; - coords.br.x += direction * locWinSizeWidth * time; - coords.tl.x += direction * locWinSizeWidth * time; - coords.tr.x += direction * locWinSizeWidth * time; + coords.bl.x += direction * locWinSizeWidth * dt; + coords.br.x += direction * locWinSizeWidth * dt; + coords.tl.x += direction * locWinSizeWidth * dt; + coords.tr.x += direction * locWinSizeWidth * dt; this.setTile(locPos, coords); } }, + /** + * called before the action start. It will also set the target. + * @param {cc.Node} target + */ startWithTarget:function (target) { cc.TiledGrid3DAction.prototype.startWithTarget.call(this, target); this._winSize = cc.director.getWinSizeInPixels(); @@ -951,27 +1173,44 @@ cc.SplitRows = cc.TiledGrid3DAction.extend(/** @lends cc.SplitRows# */{ }); /** - * creates the action with the number of rows to split and the duration + * creates the action with the number of rows to split and the duration.
+ * Reference the test cases (Effects Test) + * @function * @param {Number} duration * @param {Number} rows * @return {cc.SplitRows} */ -cc.SplitRows.create = function (duration, rows) { +cc.splitRows = function (duration, rows) { return new cc.SplitRows(duration, rows); }; /** - * cc.SplitCols action + * Please use cc.splitRows instead + * creates the action with the number of rows to split and the duration.
+ * Reference the test cases (Effects Test) + * @param {Number} duration + * @param {Number} rows + * @return {cc.SplitRows} + * @static + * @deprecated since v3.0
Please use cc.splitRows instead. + */ +cc.SplitRows.create = cc.splitRows; + +/** + * cc.SplitCols action.
+ * Reference the test cases (Effects Test) * @class * @extends cc.TiledGrid3DAction + * @param {Number} duration + * @param {Number} cols */ cc.SplitCols = cc.TiledGrid3DAction.extend(/** @lends cc.SplitCols# */{ _cols:0, _winSize:null, /** - * Creates the action with the number of columns to split and the duration - * @constructor + * Constructor function, override it to extend the construction behavior, remember to call "this._super()" in the extended "ctor" function.
+ * Creates the action with the number of columns to split and the duration. * @param {Number} duration * @param {Number} cols */ @@ -990,7 +1229,11 @@ cc.SplitCols = cc.TiledGrid3DAction.extend(/** @lends cc.SplitCols# */{ return cc.TiledGrid3DAction.prototype.initWithDuration.call(this, duration, cc.size(cols, 1)); }, - update:function (time) { + /** + * Called once per frame. Time is the number of seconds of a frame interval. + * @param {Number} dt + */ + update:function (dt) { var locGridSizeWidth = this._gridSize.width, locWinSizeHeight = this._winSize.height; var coords, direction, locPos = cc.p(0, 0); for (var i = 0; i < locGridSizeWidth; ++i) { @@ -998,19 +1241,21 @@ cc.SplitCols = cc.TiledGrid3DAction.extend(/** @lends cc.SplitCols# */{ coords = this.originalTile(locPos); direction = 1; - if ((i % 2 ) == 0) + if ((i % 2 ) === 0) direction = -1; - coords.bl.y += direction * locWinSizeHeight * time; - coords.br.y += direction * locWinSizeHeight * time; - coords.tl.y += direction * locWinSizeHeight * time; - coords.tr.y += direction * locWinSizeHeight * time; + coords.bl.y += direction * locWinSizeHeight * dt; + coords.br.y += direction * locWinSizeHeight * dt; + coords.tl.y += direction * locWinSizeHeight * dt; + coords.tr.y += direction * locWinSizeHeight * dt; this.setTile(locPos, coords); } + cc.renderer.childrenOrderDirty = true; }, /** + * called before the action start. It will also set the target. * @param {cc.Node} target */ startWithTarget:function (target) { @@ -1020,11 +1265,25 @@ cc.SplitCols = cc.TiledGrid3DAction.extend(/** @lends cc.SplitCols# */{ }); /** - * creates the action with the number of columns to split and the duration + * creates the action with the number of columns to split and the duration.
+ * Reference the test cases (Effects Test) + * @function * @param {Number} duration * @param {Number} cols * @return {cc.SplitCols} */ -cc.SplitCols.create = function (duration, cols) { +cc.splitCols = function (duration, cols) { return new cc.SplitCols(duration, cols); -}; \ No newline at end of file +}; + +/** + * Please use cc.splitCols instead. + * creates the action with the number of columns to split and the duration.
+ * Reference the test cases (Effects Test) + * @param {Number} duration + * @param {Number} cols + * @return {cc.SplitCols} + * @static + * @deprecated since v3.0
Please use cc.splitCols instead. + */ +cc.SplitCols.create = cc.splitCols; \ No newline at end of file diff --git a/cocos2d/audio/CCAudio.js b/cocos2d/audio/CCAudio.js index 2c11b66c59..e3890afd59 100644 --- a/cocos2d/audio/CCAudio.js +++ b/cocos2d/audio/CCAudio.js @@ -1,7 +1,7 @@ /**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2008-2010 Ricardo Quesada - Copyright (c) 2011 Zynga Inc. + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -24,1012 +24,1027 @@ THE SOFTWARE. ****************************************************************************/ -if (cc.sys._supportWebAudio) { - var _ctx = cc.webAudioContext = new (window.AudioContext || window.webkitAudioContext || window.mozAudioContext)(); - /** - * A class of Web Audio. - * @class - * @extends cc.Class - */ - cc.WebAudio = cc.Class.extend({ - _events: null, - _buffer: null, - _sourceNode: null, - _volumeNode: null, - - src: null, - preload: null,//"none" or "metadata" or "auto" or "" (empty string) or empty TODO not used here - autoplay: null, //"autoplay" or "" (empty string) or empty - controls: null, //"controls" or "" (empty string) or empty TODO not used here - mediagroup: null, - - //The following IDL attributes and methods are exposed to dynamic scripts. - currentTime: 0, - startTime: 0, - duration: 0, // TODO not used here - - _loop: null, //"loop" or "" (empty string) or empty - _volume: 1, - - _pauseTime: 0, - _paused: false, - _stopped: true, - - _loadState: -1,//-1 : not loaded, 0 : waiting, 1 : loaded, -2 : load failed - - ctor: function (src) { - var self = this; - self._events = {}; - self.src = src; - - if (_ctx["createGain"]) - self._volumeNode = _ctx["createGain"](); - else - self._volumeNode = _ctx["createGainNode"](); - - self._onSuccess1 = self._onSuccess.bind(this); - self._onError1 = self._onError.bind(this); - }, +/** + * Audio support in the browser + * + * multichannel : Multiple audio while playing - If it doesn't, you can only play background music + * webAudio : Support for WebAudio - Support W3C WebAudio standards, all of the audio can be played + * auto : Supports auto-play audio - if Don‘t support it, On a touch detecting background music canvas, and then replay + * replay : The first music will fail, must be replay after touchstart + * emptied : Whether to use the emptied event to replace load callback + * delay : delay created the context object - only webAudio + * + * May be modifications for a few browser version + */ +(function(){ + + var DEBUG = false; + + var sys = cc.sys; + + var supportTable = { + "common" : {multichannel: true , webAudio: cc.sys._supportWebAudio , auto: true } + }; + supportTable[sys.BROWSER_TYPE_IE] = {multichannel: true , webAudio: cc.sys._supportWebAudio , auto: true, emptied: true}; + // ANDROID // + supportTable[sys.BROWSER_TYPE_ANDROID] = {multichannel: false, webAudio: false, auto: false}; + supportTable[sys.BROWSER_TYPE_CHROME] = {multichannel: true , webAudio: true , auto: false}; + supportTable[sys.BROWSER_TYPE_FIREFOX] = {multichannel: true , webAudio: true , auto: true , delay: true}; + supportTable[sys.BROWSER_TYPE_UC] = {multichannel: true , webAudio: false, auto: false}; + supportTable[sys.BROWSER_TYPE_QQ] = {multichannel: false, webAudio: false, auto: true }; + supportTable[sys.BROWSER_TYPE_OUPENG] = {multichannel: false, webAudio: false, auto: false, replay: true , emptied: true }; + supportTable[sys.BROWSER_TYPE_WECHAT] = {multichannel: false, webAudio: false, auto: false, replay: true , emptied: true }; + supportTable[sys.BROWSER_TYPE_360] = {multichannel: false, webAudio: false, auto: true }; + supportTable[sys.BROWSER_TYPE_MIUI] = {multichannel: false, webAudio: false, auto: true }; + supportTable[sys.BROWSER_TYPE_LIEBAO] = {multichannel: false, webAudio: false, auto: false, replay: true , emptied: true }; + supportTable[sys.BROWSER_TYPE_SOUGOU] = {multichannel: false, webAudio: false, auto: false, replay: true , emptied: true }; + //"Baidu" browser can automatically play + //But because it may be play failed, so need to replay and auto + supportTable[sys.BROWSER_TYPE_BAIDU] = {multichannel: false, webAudio: false, auto: false, replay: true , emptied: true }; + supportTable[sys.BROWSER_TYPE_BAIDU_APP]= {multichannel: false, webAudio: false, auto: false, replay: true , emptied: true }; + + // APPLE // + supportTable[sys.BROWSER_TYPE_SAFARI] = {multichannel: true , webAudio: true , auto: false, webAudioCallback: function(realUrl){ + document.createElement("audio").src = realUrl; + }}; + + /* Determine the browser version number */ + var version, tmp; + try{ + var ua = navigator.userAgent.toLowerCase(); + switch(sys.browserType){ + case sys.BROWSER_TYPE_IE: + tmp = ua.match(/(msie |rv:)([\d.]+)/); + break; + case sys.BROWSER_TYPE_FIREFOX: + tmp = ua.match(/(firefox\/|rv:)([\d.]+)/); + break; + case sys.BROWSER_TYPE_CHROME: + tmp = ua.match(/chrome\/([\d.]+)/); + break; + case sys.BROWSER_TYPE_BAIDU: + tmp = ua.match(/baidubrowser\/([\d.]+)/); + break; + case sys.BROWSER_TYPE_UC: + tmp = ua.match(/ucbrowser\/([\d.]+)/); + break; + case sys.BROWSER_TYPE_QQ: + tmp = ua.match(/qqbrowser\/([\d.]+)/); + break; + case sys.BROWSER_TYPE_OUPENG: + tmp = ua.match(/oupeng\/([\d.]+)/); + break; + case sys.BROWSER_TYPE_WECHAT: + tmp = ua.match(/micromessenger\/([\d.]+)/); + break; + case sys.BROWSER_TYPE_SAFARI: + tmp = ua.match(/safari\/([\d.]+)/); + break; + case sys.BROWSER_TYPE_MIUI: + tmp = ua.match(/miuibrowser\/([\d.]+)/); + break; + } + version = tmp ? tmp[1] : ""; + }catch(e){ + console.log(e); + } - _play: function (offset) { - var self = this; - var sourceNode = self._sourceNode = _ctx["createBufferSource"](); - var volumeNode = self._volumeNode; - - sourceNode.buffer = self._buffer; - volumeNode["gain"].value = self._volume; - sourceNode["connect"](volumeNode); - volumeNode["connect"](_ctx["destination"]); - sourceNode.loop = self._loop; - - self._paused = false; - self._stopped = false; - - /* - * Safari on iOS 6 only supports noteOn(), noteGrainOn(), and noteOff() now.(iOS 6.1.3) - * The latest version of chrome has supported start() and stop() - * start() & stop() are specified in the latest specification (written on 04/26/2013) - * Reference: https://dvcs.w3.org/hg/audio/raw-file/tip/webaudio/specification.html - * noteOn(), noteGrainOn(), and noteOff() are specified in Draft 13 version (03/13/2012) - * Reference: http://www.w3.org/2011/audio/drafts/2WD/Overview.html - */ - if (sourceNode.start) { - // starting from offset means resuming from where it paused last time - sourceNode.start(0, offset); - } else if (sourceNode["noteGrainOn"]) { - var duration = sourceNode.buffer.duration; - if (self.loop) { - /* - * On Safari on iOS 6, if loop == true, the passed in @param duration will be the duration from now on. - * In other words, the sound will keep playing the rest of the music all the time. - * On latest chrome desktop version, the passed in duration will only be the duration in this cycle. - * Now that latest chrome would have start() method, it is prepared for iOS here. - */ - sourceNode["noteGrainOn"](0, offset, duration); - } else { - sourceNode["noteGrainOn"](0, offset, duration - offset); + /////////////////////////// + // Browser compatibility// + /////////////////////////// + if(version){ + switch(sys.browserType){ + case sys.BROWSER_TYPE_CHROME: + if(parseInt(version) < 30){ + supportTable[sys.BROWSER_TYPE_CHROME] = {multichannel: false , webAudio: true , auto: false}; } - } else { - // if only noteOn() is supported, resuming sound will NOT work - sourceNode["noteOn"](0); - } - self._pauseTime = 0; - }, - _stop: function () { - var self = this, sourceNode = self._sourceNode; - if (self._stopped) return; - if (sourceNode.stop) sourceNode.stop(0); - else sourceNode.noteOff(0); - self._stopped = true; - }, - play: function () { - var self = this; - if (self._loadState == -1) { - self._loadState = 0; - return; - } else if (self._loadState != 1) return; - - var sourceNode = self._sourceNode; - if (!self._stopped && sourceNode && sourceNode["playbackState"] == 2) return;//playing - self.startTime = _ctx.currentTime; - this._play(0); - }, - pause: function () { - this._pauseTime = _ctx.currentTime; - this._paused = true; - this._stop(); - }, - resume: function () { - var self = this; - if (self._paused) { - var offset = self._buffer ? (self._pauseTime - self.startTime) % self._buffer.duration : 0; - this._play(offset); - } - }, - stop: function () { - this._pauseTime = 0; - this._paused = false; - this._stop(); - }, - load: function () { - var self = this; - if (self._loadState == 1) return; - self._loadState = -1;//not loaded - - self.played = false; - self.ended = true; - var request = new XMLHttpRequest(); - request.open("GET", self.src, true); - request.responseType = "arraybuffer"; - - // Our asynchronous callback - request.onload = function () { - _ctx["decodeAudioData"](request.response, self._onSuccess1, self._onError1); - }; - request.send(); - }, - - addEventListener: function (eventName, event) { - this._events[eventName] = event.bind(this); - }, - removeEventListener: function (eventName) { - delete this._events[eventName]; - }, - - canplay: function () { - return cc.sys._supportWebAudio; - }, - _onSuccess: function (buffer) { - var self = this; - self._buffer = buffer; - - var success = self._events["success"], canplaythrough = self._events["canplaythrough"]; - if (success) success(); - if (canplaythrough) canplaythrough(); - if (self._loadState == 0 || self.autoplay == "autoplay" || self.autoplay == true) self._play(); - self._loadState = 1;//loaded - }, - _onError: function () { - var error = this._events["error"] - if (error) error(); - this._loadState = -2;//load failed - }, - cloneNode: function () { - var self = this, obj = new cc.WebAudio(self.src); - obj.volume = self.volume; - obj._loadState = self._loadState; - obj._buffer = self._buffer; - if (obj._loadState == 0 || obj._loadState == -1) obj.load(); - return obj; + break; + case sys.BROWSER_TYPE_MIUI: + version = version.match(/\d+/g); + if(version[0] < 2 || (version[0] === 2 && version[1] === 0 && version[2] <= 1)){ + supportTable[sys.BROWSER_TYPE_MIUI].auto = false; + } + break; } + } - }); - var _p = cc.WebAudio.prototype; - /** @expose */ - _p.loop; - cc.defineGetterSetter(_p, "loop", function () { - return this._loop; - }, function (loop) { - this._loop = loop; - if (this._sourceNode) this._sourceNode.loop = loop; - }); - /** @expose */ - _p.volume; - cc.defineGetterSetter(_p, "volume", function () { - return this._volume; - }, function (volume) { - this._volume = volume; - this._volumeNode["gain"].value = volume; - }); - /** @expose */ - _p.ended; - cc.defineGetterSetter(_p, "paused", function () { - return this._paused; - }); - /** @expose */ - _p.ended; - cc.defineGetterSetter(_p, "ended", function () { - var sourceNode = this._sourceNode; - return !this._paused && (this._stopped || !sourceNode || sourceNode["playbackState"] == 3); - }); - /** @expose */ - _p.played; - cc.defineGetterSetter(_p, "played", function () { - var sourceNode = this._sourceNode; - return sourceNode && sourceNode["playbackState"] == 2; - }); + if(cc.sys.isMobile){ + if(cc.sys.os !== cc.sys.OS_IOS) + cc.__audioSupport = supportTable[sys.browserType] || supportTable["common"]; + else + cc.__audioSupport = supportTable[sys.BROWSER_TYPE_SAFARI]; + }else{ + switch(sys.browserType){ + case sys.BROWSER_TYPE_IE: + cc.__audioSupport = supportTable[sys.BROWSER_TYPE_IE]; + break; + case sys.BROWSER_TYPE_FIREFOX: + cc.__audioSupport = supportTable[sys.BROWSER_TYPE_FIREFOX]; + break; + default: + cc.__audioSupport = supportTable["common"]; + } + } + + if(DEBUG){ + setTimeout(function(){ + cc.log("browse type: " + sys.browserType); + cc.log("browse version: " + version); + cc.log("multichannel: " + cc.__audioSupport.multichannel); + cc.log("webAudio: " + cc.__audioSupport.webAudio); + cc.log("auto: " + cc.__audioSupport.auto); + }, 0); + } -} +})(); /** - * @namespace A simple Audio Engine engine API. - * @name cc.audioEngine + * Encapsulate DOM and webAudio */ -cc.AudioEngine = cc.Class.extend(/** @lends cc.audioEngine# */{ - _soundSupported: false, // if sound is not enabled, this engine's init() will return false - - _currMusic: null, - _currMusicPath: null, - _musicPlayState: 0, //0 : stopped, 1 : paused, 2 : playing +cc.Audio = cc.Class.extend({ + //TODO Maybe loader shift in will be better + volume: 1, + loop: false, + src: null, + _touch: false, + + _playing: false, + _AUDIO_TYPE: "AUDIO", + _pause: false, + + //Web Audio + _buffer: null, + _currentSource: null, + _startTime: null, + _currentTime: null, + _context: null, + _volume: null, + + _ignoreEnded: false, + + //DOM Audio + _element: null, + + ctor: function(context, volume, url){ + context && (this._context = context); + volume && (this._volume = volume); + if(context && volume){ + this._AUDIO_TYPE = "WEBAUDIO"; + } + this.src = url; + }, - _audioID: 0, - _effects: {}, //effects cache - _audioPool: {}, //audio pool for effects - _effectsVolume: 1, // the volume applied to all effects - _maxAudioInstance: 5,//max count of audios that has same url + _setBufferCallback: null, + setBuffer: function(buffer){ + if(!buffer) return; + var playing = this._playing; + this._AUDIO_TYPE = "WEBAUDIO"; - _effectPauseCb: null, + if(this._buffer && this._buffer !== buffer && this.getPlaying()) + this.stop(); - _playings: [],//only store when window is hidden + this._buffer = buffer; + if(playing) + this.play(); - ctor: function () { - var self = this; - self._soundSupported = cc._audioLoader._supportedAudioTypes.length > 0; - if (self._effectPauseCb) self._effectPauseCb = self._effectPauseCb.bind(self); + this._volume["gain"].value = this.volume; + this._setBufferCallback && this._setBufferCallback(buffer); }, - /** - * Indicates whether any background music can be played or not. - * @returns {boolean} true if the background music is playing, otherwise false - */ - willPlayMusic: function () { - return false; - }, + _setElementCallback: null, + setElement: function(element){ + if(!element) return; + var playing = this._playing; + this._AUDIO_TYPE = "AUDIO"; - /** - * The volume of the effects max value is 1.0,the min value is 0.0 . - * @return {Number} - * @example - * //example - * var effectVolume = cc.audioEngine.getEffectsVolume(); - */ - getEffectsVolume: function () { - return this._effectsVolume; + if(this._element && this._element !== element && this.getPlaying()) + this.stop(); + + this._element = element; + if(playing) + this.play(); + + element.volume = this.volume; + element.loop = this.loop; + this._setElementCallback && this._setElementCallback(element); }, - //music begin - /** - * Play music. - * @param {String} url The path of the music file without filename extension. - * @param {Boolean} loop Whether the music loop or not. - * @example - * //example - * cc.audioEngine.playMusic(path, false); - */ - playMusic: function (url, loop) { - var self = this; - if (!self._soundSupported) return; - - var audio = self._currMusic; - if (audio) this._stopAudio(audio); - if (url != self._currMusicPath) { - audio = self._getAudioByUrl(url); - self._currMusic = audio; - self._currMusicPath = url; + play: function(offset, loop){ + this._playing = true; + this.loop = loop === undefined ? this.loop : loop; + if(this._AUDIO_TYPE === "AUDIO"){ + this._playOfAudio(offset); + }else{ + this._playOfWebAudio(offset); } - if (!audio) return; - audio.loop = loop || false; - self._playMusic(audio); }, - _getAudioByUrl: function (url) { - var locLoader = cc.loader, audio = locLoader.getRes(url); - if (!audio) { - locLoader.load(url); - audio = locLoader.getRes(url); - } - return audio; - }, - _playMusic: function (audio) { - if (!audio.ended) { - if (audio.stop) {//cc.WebAudio - audio.stop(); - } else { - audio.pause(); - audio.duration && (audio.currentTime = audio.duration); - } + + getPlaying: function(){ + if(!this._playing){ + return this._playing; } - this._musicPlayState = 2; - audio.play(); - }, - /** - * Stop playing music. - * @param {Boolean} releaseData If release the music data or not.As default value is false. - * @example - * //example - * cc.audioEngine.stopMusic(); - */ - stopMusic: function (releaseData) { - if (this._musicPlayState > 0) { - var audio = this._currMusic; - if (!audio) return; - this._stopAudio(audio); - if (releaseData) cc.loader.release(this._currMusicPath); - this._currMusic = null; - this._currMusicPath = null; - this._musicPlayState = 0; + if(this._AUDIO_TYPE === "AUDIO"){ + var audio = this._element; + if(!audio || this._pause){ + this._playing = false; + return false; + }else if(audio.ended){ + this._playing = false; + return false; + }else + return true; + }else{ + var sourceNode = this._currentSource; + if(!sourceNode) + return true; + if(sourceNode["playbackState"] == null) + return this._playing; + else + return this._currentTime + this._context.currentTime - this._startTime < this._currentSource.buffer.duration; } }, - _stopAudio: function (audio) { - if (audio && !audio.ended) { - if (audio.stop) {//cc.WebAudio - audio.stop(); + _playOfWebAudio: function(offset){ + var cs = this._currentSource; + if(!this._buffer){ + return; + } + if(!this._pause && cs){ + if(this._context.currentTime === 0 || this._currentTime + this._context.currentTime - this._startTime > this._currentSource.buffer.duration) + this._stopOfWebAudio(); + else + return; + } + var audio = this._context["createBufferSource"](); + audio.buffer = this._buffer; + audio["connect"](this._volume); + audio.loop = this.loop; + this._startTime = this._context.currentTime; + this._currentTime = offset || 0; + + /* + * Safari on iOS 6 only supports noteOn(), noteGrainOn(), and noteOff() now.(iOS 6.1.3) + * The latest version of chrome has supported start() and stop() + * start() & stop() are specified in the latest specification (written on 04/26/2013) + * Reference: https://dvcs.w3.org/hg/audio/raw-file/tip/webaudio/specification.html + * noteOn(), noteGrainOn(), and noteOff() are specified in Draft 13 version (03/13/2012) + * Reference: http://www.w3.org/2011/audio/drafts/2WD/Overview.html + */ + if(audio.start){ + audio.start(0, offset || 0); + }else if(audio["noteGrainOn"]){ + var duration = audio.buffer.duration; + if (this.loop) { + /* + * On Safari on iOS 6, if loop == true, the passed in @param duration will be the duration from now on. + * In other words, the sound will keep playing the rest of the music all the time. + * On latest chrome desktop version, the passed in duration will only be the duration in this cycle. + * Now that latest chrome would have start() method, it is prepared for iOS here. + */ + audio["noteGrainOn"](0, offset, duration); } else { - audio.pause(); - audio.duration && (audio.currentTime = audio.duration); + audio["noteGrainOn"](0, offset, duration - offset); } + }else { + // if only noteOn() is supported, resuming sound will NOT work + audio["noteOn"](0); } + this._currentSource = audio; + var self = this; + audio["onended"] = function(){ + if(self._ignoreEnded){ + self._ignoreEnded = false; + }else{ + self._playing = false; + } + }; }, - /** - * Pause playing music. - * @example - * //example - * cc.audioEngine.pauseMusic(); - */ - pauseMusic: function () { - if (this._musicPlayState == 2) { - this._currMusic.pause(); - this._musicPlayState = 1; + _playOfAudio: function(){ + var audio = this._element; + if(audio){ + audio.loop = this.loop; + audio.play(); } }, - /** - * Resume playing music. - * @example - * //example - * cc.audioEngine.resumeMusic(); - */ - resumeMusic: function () { - if (this._musicPlayState == 1) { - var audio = this._currMusic; - this._resumeAudio(audio); - this._musicPlayState = 2; - } - }, - _resumeAudio: function (audio) { - if (audio && !audio.ended) { - if (audio.resume) audio.resume();//cc.WebAudio - else audio.play(); + stop: function(){ + this._playing = false; + if(this._AUDIO_TYPE === "AUDIO"){ + this._stopOfAudio(); + }else{ + this._stopOfWebAudio(); } }, - /** - * Rewind playing music. - * @example - * //example - * cc.audioEngine.rewindMusic(); - */ - rewindMusic: function () { - if (this._currMusic) this._playMusic(this._currMusic); - }, - - /** - * The volume of the music max value is 1.0,the min value is 0.0 . - * @return {Number} - * @example - * //example - * var volume = cc.audioEngine.getMusicVolume(); - */ - getMusicVolume: function () { - return this._musicPlayState == 0 ? 0 : this._currMusic.volume; - }, - - /** - * Set the volume of music. - * @param {Number} volume Volume must be in 0.0~1.0 . - * @example - * //example - * cc.audioEngine.setMusicVolume(0.5); - */ - setMusicVolume: function (volume) { - if (this._musicPlayState > 0) { - this._currMusic.volume = Math.min(Math.max(volume, 0), 1); + _stopOfWebAudio: function(){ + var audio = this._currentSource; + this._ignoreEnded = true; + if(audio){ + audio.stop(0); + this._currentSource = null; } }, - /** - * Whether the music is playing. - * @return {Boolean} If is playing return true,or return false. - * @example - * //example - * if (cc.audioEngine.isMusicPlaying()) { - * cc.log("music is playing"); - * } - * else { - * cc.log("music is not playing"); - * } - */ - isMusicPlaying: function () { - return this._musicPlayState == 2 && this._currMusic && !this._currMusic.ended; - }, - //music end - //effect begin - _getEffectList: function (url) { - var list = this._audioPool[url]; - if (!list) list = this._audioPool[url] = []; - return list; - }, - _getEffect: function (url) { - var self = this, audio; - if (!self._soundSupported) return null; - - var effList = this._getEffectList(url); - for (var i = 0, li = effList.length; i < li; i++) { - var eff = effList[i]; - if (eff.ended) { - audio = eff; + _stopOfAudio: function(){ + var audio = this._element; + if(audio){ + audio.pause(); + if (audio.duration && audio.duration !== Infinity) audio.currentTime = 0; - if (window.chrome) audio.load(); - break; - } - } - if (!audio) { - if (effList.length >= this._maxAudioInstance) { - cc.log("Error: " + url + " greater than " + this._maxAudioInstance); - return null; - } - audio = self._getAudioByUrl(url); - if (!audio) return null; - audio = audio.cloneNode(true); - if (self._effectPauseCb) cc._addEventListener(audio, "pause", self._effectPauseCb); - audio.volume = this._effectsVolume; - effList.push(audio); } - return audio; - }, - /** - * Play sound effect. - * @param {String} url The path of the sound effect with filename extension. - * @param {Boolean} loop Whether to loop the effect playing, default value is false - * @return {Number|null} the audio id - * @example - * //example - * var soundId = cc.audioEngine.playEffect(path); - */ - playEffect: function (url, loop) { - var audio = this._getEffect(url); - if (!audio) return null; - audio.loop = loop || false; - audio.play(); - var audioId = this._audioID++; - this._effects[audioId] = audio; - return audioId; }, - /** - * Set the volume of sound effects. - * @param {Number} volume Volume must be in 0.0~1.0 . - * @example - * //example - * cc.audioEngine.setEffectsVolume(0.5); - */ - setEffectsVolume: function (volume) { - volume = this._effectsVolume = Math.min(Math.max(volume, 0), 1); - var effects = this._effects; - for (var key in effects) { - effects[key].volume = volume; + pause: function(){ + if(this.getPlaying() === false) + return; + this._playing = false; + this._pause = true; + if(this._AUDIO_TYPE === "AUDIO"){ + this._pauseOfAudio(); + }else{ + this._pauseOfWebAudio(); } }, - /** - * Pause playing sound effect. - * @param {Number} audioID The return value of function playEffect. - * @example - * //example - * cc.audioEngine.pauseEffect(audioID); - */ - pauseEffect: function (audioID) { - var audio = this._effects[audioID]; - if (audio && !audio.ended) { - audio.pause(); + _pauseOfWebAudio: function(){ + this._currentTime += this._context.currentTime - this._startTime; + var audio = this._currentSource; + if(audio){ + audio.stop(0); } }, - /** - * Pause all playing sound effect. - * @example - * //example - * cc.audioEngine.pauseAllEffects(); - */ - pauseAllEffects: function () { - var effects = this._effects; - for (var key in effects) { - var eff = effects[key]; - if (!eff.ended) eff.pause(); + _pauseOfAudio: function(){ + var audio = this._element; + if(audio){ + audio.pause(); } }, - /** - * Resume playing sound effect. - * @param {Number} effectId The return value of function playEffect. - * @audioID - * //example - * cc.audioEngine.resumeEffect(audioID); - */ - resumeEffect: function (effectId) { - this._resumeAudio(this._effects[effectId]) - }, - - /** - * Resume all playing sound effect - * @example - * //example - * cc.audioEngine.resumeAllEffects(); - */ - resumeAllEffects: function () { - var effects = this._effects; - for (var key in effects) { - this._resumeAudio(effects[key]); + resume: function(){ + if(this._pause){ + if(this._AUDIO_TYPE === "AUDIO"){ + this._resumeOfAudio(); + }else{ + this._resumeOfWebAudio(); + } + this._pause = false; + this._playing = true; } }, - /** - * Stop playing sound effect. - * @param {Number} effectId The return value of function playEffect. - * @example - * //example - * cc.audioEngine.stopEffect(audioID); - */ - stopEffect: function (effectId) { - this._stopAudio(this._effects[effectId]); - delete this._effects[effectId]; + _resumeOfWebAudio: function(){ + var audio = this._currentSource; + if(audio){ + this._startTime = this._context.currentTime; + var offset = this._currentTime % audio.buffer.duration; + this._playOfWebAudio(offset); + } }, - /** - * Stop all playing sound effects. - * @example - * //example - * cc.audioEngine.stopAllEffects(); - */ - stopAllEffects: function () { - var effects = this._effects; - for (var key in effects) { - this._stopAudio(effects[key]); - delete effects[key]; + _resumeOfAudio: function(){ + var audio = this._element; + if(audio){ + audio.play(); } }, - /** - * Unload the preloaded effect from internal buffer - * @param {String} url - * @example - * //example - * cc.audioEngine.unloadEffect(EFFECT_FILE); - */ - unloadEffect: function (url) { - var locLoader = cc.loader, locEffects = this._effects, effectList = this._getEffectList(url); - locLoader.release(url);//release the resource in cc.loader first. - if (effectList.length == 0) return; - var realUrl = effectList[0].src; - delete this._audioPool[url]; - for (var key in locEffects) { - if (locEffects[key].src == realUrl) { - this._stopAudio(locEffects[key]); - delete locEffects[key]; + setVolume: function(volume){ + if(volume > 1) volume = 1; + if(volume < 0) volume = 0; + this.volume = volume; + if(this._AUDIO_TYPE === "AUDIO"){ + if(this._element){ + this._element.volume = volume; + } + }else{ + if(this._volume){ + this._volume["gain"].value = volume; } } }, - //effect end - /** - * End music and effects. - */ - end: function () { - this.stopMusic(); - this.stopAllEffects(); + getVolume: function(){ + return this.volume; }, - /** - * Called only when the hidden event of window occurs. - * @private - */ - _pausePlaying: function () {//in this function, do not change any status of audios - var self = this, effects = self._effects, eff; - for (var key in effects) { - eff = effects[key]; - if (eff && !eff.ended && !eff.paused) { - self._playings.push(eff); - eff.pause(); + cloneNode: function(){ + var audio, self; + if(this._AUDIO_TYPE === "AUDIO"){ + audio = new cc.Audio(); + + var elem = document.createElement("audio"); + elem.src = this.src; + audio.setElement(elem); + }else{ + var volume = this._context["createGain"](); + volume["gain"].value = 1; + volume["connect"](this._context["destination"]); + audio = new cc.Audio(this._context, volume, this.src); + if(this._buffer){ + audio.setBuffer(this._buffer); + }else{ + self = this; + this._setBufferCallback = function(buffer){ + audio.setBuffer(buffer); + self._setBufferCallback = null; + }; } } - if (self.isMusicPlaying()) { - self._playings.push(self._currMusic); - self._currMusic.pause(); + audio._AUDIO_TYPE = this._AUDIO_TYPE; + return audio; + } + +}); + +(function(polyfill){ + + var SWA = polyfill.webAudio, + SWB = polyfill.multichannel, + SWC = polyfill.auto; + + var support = []; + + (function(){ + var audio = document.createElement("audio"); + if(audio.canPlayType) { + var ogg = audio.canPlayType('audio/ogg; codecs="vorbis"'); + if (ogg && ogg !== "") support.push(".ogg"); + var mp3 = audio.canPlayType("audio/mpeg"); + if (mp3 && mp3 !== "") support.push(".mp3"); + var wav = audio.canPlayType('audio/wav; codecs="1"'); + if (wav && wav !== "") support.push(".wav"); + var mp4 = audio.canPlayType("audio/mp4"); + if (mp4 && mp4 !== "") support.push(".mp4"); + var m4a = audio.canPlayType("audio/x-m4a"); + if (m4a && m4a !== "") support.push(".m4a"); } - }, - /** - * Called only when the hidden event of window occurs. - * @private - */ - _resumePlaying: function () {//in this function, do not change any status of audios - var self = this, playings = this._playings; - for (var i = 0, li = playings.length; i < li; i++) { - self._resumeAudio(playings[i]); + })(); + try{ + if(SWA){ + var context = new (window.AudioContext || window.webkitAudioContext || window.mozAudioContext)(); + if(polyfill.delay) + setTimeout(function(){ context = new (window.AudioContext || window.webkitAudioContext || window.mozAudioContext)(); }, 0); } - playings.length = 0; + }catch(error){ + SWA = false; + cc.log("browser don't support webAudio"); } -}); + var loader = { + + cache: {}, + + load: function(realUrl, url, res, cb){ + + if(support.length === 0) + return cb("can not support audio!"); + + var i; + + var extname = cc.path.extname(realUrl); + + var typeList = [extname]; + for(i=0; i
* cc.ClippingNode is a subclass of cc.Node.
- * It draws its content (childs) clipped using a stencil.
+ * It draws its content (children) clipped using a stencil.
* The stencil is an other cc.Node that will not be drawn.
* The clipping is done using the alpha part of the stencil (adjusted with an alphaThreshold).
*
- * The stencil node will be retained, and its parent will be set to this clipping node. + * Initialization of the node, please do not call this function by yourself, you should pass the parameters to constructor to initialize it . + * @function * @param {cc.Node} [stencil=null] */ - init: null, - _className: "ClippingNode", - - _initForWebGL: function (stencil) { + init: function (stencil) { this._stencil = stencil; - this.alphaThreshold = 1; this.inverted = false; - // get (only once) the number of bits of the stencil buffer - cc.ClippingNode._init_once = true; - if (cc.ClippingNode._init_once) { - cc.stencilBits = cc._renderContext.getParameter(cc._renderContext.STENCIL_BITS); - if (cc.stencilBits <= 0) - cc.log("Stencil buffer is not enabled."); - cc.ClippingNode._init_once = false; - } + this._renderCmd.initStencilBits(); return true; }, - _initForCanvas: function (stencil) { - this._stencil = stencil; - this.alphaThreshold = 1; - this.inverted = false; - }, - + /** + *
+ * Event callback that is invoked every time when node enters the 'stage'.
+ * If the CCNode enters the 'stage' with a transition, this event is called when the transition starts.
+ * During onEnter you can't access a "sister/brother" node.
+ * If you override onEnter, you must call its parent's onEnter function with this._super().
+ *
+ * Event callback that is invoked when the node enters in the 'stage'.
+ * If the node enters the 'stage' with a transition, this event is called when the transition finishes.
+ * If you override onEnterTransitionDidFinish, you shall call its parent's onEnterTransitionDidFinish with this._super()
+ *
+ * callback that is called every time the node leaves the 'stage'.
+ * If the node leaves the 'stage' with a transition, this callback is called when the transition starts.
+ * If you override onExitTransitionDidStart, you shall call its parent's onExitTransitionDidStart with this._super()
+ *
- * The stencil node will be retained. This default to nil. - * @return {cc.Node} - */ - getStencil: function () { - return this._stencil; - }, - /** + *
+ * callback that is called every time the node leaves the 'stage'.
+ * If the node leaves the 'stage' with a transition, this callback is called when the transition finishes.
+ * During onExit you can't access a sibling node.
+ * If you override onExit, you shall call its parent's onExit with this._super().
+ *
+ * The stencil node will be retained. This default to nil. + * @return {cc.Node} + */ + getStencil: function () { + return this._stencil; + }, + + /** + * Set stencil. + * @function + * @param {cc.Node} stencil + */ + setStencil: function (stencil) { + if(this._stencil === stencil) + return; + this._renderCmd.setStencil(stencil); + }, + + _createRenderCmd: function(){ + if(cc._renderType === cc._RENDER_TYPE_CANVAS) + return new cc.ClippingNode.CanvasRenderCmd(this); + else + return new cc.ClippingNode.WebGLRenderCmd(this); } }); var _p = cc.ClippingNode.prototype; -if (cc._renderType === cc._RENDER_TYPE_WEBGL) { - //WebGL - _p.init = _p._initForWebGL; - _p.visit = _p._visitForWebGL; - _p.setStencil = _p._setStencilForWebGL; -} else { - _p.init = _p._initForCanvas; - _p.visit = _p._visitForCanvas; - _p.setStencil = _p._setStencilForCanvas; -} - // Extended properties cc.defineGetterSetter(_p, "stencil", _p.getStencil, _p.setStencil); /** @expose */ _p.stencil; - -cc.ClippingNode._init_once = null; -cc.ClippingNode._visit_once = null; -cc.ClippingNode._layer = null; -cc.ClippingNode._sharedCache = null; - -cc.ClippingNode._getSharedCache = function () { - return (cc.ClippingNode._sharedCache) || (cc.ClippingNode._sharedCache = document.createElement("canvas")); -}; - /** - * Creates and initializes a clipping node with an other node as its stencil.
+ * Creates and initializes a clipping node with an other node as its stencil.
* The stencil node will be retained. + * @deprecated since v3.0, please use "new cc.ClippingNode(stencil)" instead * @param {cc.Node} [stencil=null] * @return {cc.ClippingNode} + * @example + * //example + * new cc.ClippingNode(stencil); */ cc.ClippingNode.create = function (stencil) { return new cc.ClippingNode(stencil); diff --git a/cocos2d/clipping-nodes/CCClippingNodeCanvasRenderCmd.js b/cocos2d/clipping-nodes/CCClippingNodeCanvasRenderCmd.js new file mode 100644 index 0000000000..9a0a0d8d2d --- /dev/null +++ b/cocos2d/clipping-nodes/CCClippingNodeCanvasRenderCmd.js @@ -0,0 +1,227 @@ +/**************************************************************************** + Copyright (c) 2013-2014 Chukong Technologies Inc. + + http://www.cocos2d-x.org + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + ****************************************************************************/ + +//-------------------------- ClippingNode's canvas render cmd -------------------------------- +(function(){ + cc.ClippingNode.CanvasRenderCmd = function(renderable){ + cc.Node.CanvasRenderCmd.call(this, renderable); + this._needDraw = false; + + this._godhelpme = false; + this._clipElemType = false; + + this._rendererSaveCmd = new cc.CustomRenderCmd(this, this._saveCmdCallback); + this._rendererClipCmd = new cc.CustomRenderCmd(this, this._clipCmdCallback); + this._rendererRestoreCmd = new cc.CustomRenderCmd(this, this._restoreCmdCallback); + }; + var proto = cc.ClippingNode.CanvasRenderCmd.prototype = Object.create(cc.Node.CanvasRenderCmd.prototype); + proto.constructor = cc.ClippingNode.CanvasRenderCmd; + + proto.initStencilBits = function(){}; + + proto.setStencil = function(stencil){ + if(stencil == null) + return; + + this._node._stencil = stencil; + + // For shape stencil, rewrite the draw of stencil ,only init the clip path and draw nothing. + //else + if (stencil instanceof cc.DrawNode) { + if(stencil._buffer){ + for(var i=0; i
len:"+this.len+" treepos:"+this.treepos); - if (this.len == 17) { //war 17 + if (this.len === 17) { //war 17 return -1; } this.treepos++; @@ -304,7 +304,7 @@ cc.Codec.GZip.prototype.DeflateLoop = function () { last = this.readBit(); type = this.readBits(2); - if (type == 0) { + if (type === 0) { var blockLen, cSum; // Stored @@ -322,7 +322,7 @@ cc.Codec.GZip.prototype.DeflateLoop = function () { c = this.readByte(); this.addBuffer(c); } - } else if (type == 1) { + } else if (type === 1) { var j; /* Fixed Huffman tables -- fixed decode routine */ @@ -368,7 +368,7 @@ cc.Codec.GZip.prototype.DeflateLoop = function () { } if (j < 256) { this.addBuffer(j); - } else if (j == 256) { + } else if (j === 256) { /* EOF */ break; // FIXME: make this the loop-condition } else { @@ -394,7 +394,7 @@ cc.Codec.GZip.prototype.DeflateLoop = function () { } } // while - } else if (type == 2) { + } else if (type === 2) { var j, n, literalCodes, distCodes, lenCodes; var ll = new Array(288 + 32); // "static" just to preserve stack @@ -436,7 +436,7 @@ cc.Codec.GZip.prototype.DeflateLoop = function () { // if (this.debug) document.write("
"+z+" i:"+i+" decode: "+j+" bits "+this.bits+"
"); if (j < 16) { // length of code in bits (0..15) ll[i++] = j; - } else if (j == 16) { // repeat last length 3 to 6 times + } else if (j === 16) { // repeat last length 3 to 6 times var l; j = 3 + this.readBits(2); if (i + j > n) { @@ -448,7 +448,7 @@ cc.Codec.GZip.prototype.DeflateLoop = function () { ll[i++] = l; } } else { - if (j == 17) { // 3 to 10 zero length codes + if (j === 17) { // 3 to 10 zero length codes j = 3 + this.readBits(3); } else { // j == 18: 11 to 138 zero length codes j = 11 + this.readBits(7); @@ -485,7 +485,7 @@ cc.Codec.GZip.prototype.DeflateLoop = function () { if (j >= 256) { // In C64: if carry set var len, dist; j -= 256; - if (j == 0) { + if (j === 0) { // EOF break; } @@ -520,7 +520,7 @@ cc.Codec.GZip.prototype.unzipFile = function (name) { var i; this.gunzip(); for (i = 0; i < this.unzipped.length; i++) { - if (this.unzipped[i][1] == name) { + if (this.unzipped[i][1] === name) { return this.unzipped[i][0]; } } @@ -537,25 +537,25 @@ cc.Codec.GZip.prototype.nextFile = function () { tmp[1] = this.readByte(); // if (this.debug) alert("type: "+tmp[0]+" "+tmp[1]); - if (tmp[0] == 0x78 && tmp[1] == 0xda) { //GZIP + if (tmp[0] === 0x78 && tmp[1] === 0xda) { //GZIP // if (this.debug) alert("GEONExT-GZIP"); this.DeflateLoop(); // if (this.debug) alert(this.outputArr.join('')); this.unzipped[this.files] = [this.outputArr.join(''), "geonext.gxt"]; this.files++; } - if (tmp[0] == 0x1f && tmp[1] == 0x8b) { //GZIP + if (tmp[0] === 0x1f && tmp[1] === 0x8b) { //GZIP // if (this.debug) alert("GZIP"); this.skipdir(); // if (this.debug) alert(this.outputArr.join('')); this.unzipped[this.files] = [this.outputArr.join(''), "file"]; this.files++; } - if (tmp[0] == 0x50 && tmp[1] == 0x4b) { //ZIP + if (tmp[0] === 0x50 && tmp[1] === 0x4b) { //ZIP this.modeZIP = true; tmp[2] = this.readByte(); tmp[3] = this.readByte(); - if (tmp[2] == 0x03 && tmp[3] == 0x04) { + if (tmp[2] === 0x03 && tmp[3] === 0x04) { //MODE_ZIP tmp[0] = this.readByte(); tmp[1] = this.readByte(); @@ -602,7 +602,7 @@ cc.Codec.GZip.prototype.nextFile = function () { this.nameBuf = []; while (filelen--) { var c = this.readByte(); - if (c == "/" | c == ":") { + if (c === "/" | c === ":") { i = 0; } else if (i < cc.Codec.GZip.NAMEMAX - 1) { this.nameBuf[i++] = String.fromCharCode(c); @@ -622,7 +622,7 @@ cc.Codec.GZip.prototype.nextFile = function () { // //skipdir // // if (this.debug) alert("skipdir"); // } - if (method == 8) { + if (method === 8) { this.DeflateLoop(); // if (this.debug) alert(this.outputArr.join('')); this.unzipped[this.files] = [this.outputArr.join(''), this.nameBuf.join('')]; @@ -666,7 +666,7 @@ cc.Codec.GZip.prototype.skipdir = function () { if (this.modeZIP) this.nextFile(); tmp[0] = this.readByte(); - if (tmp[0] != 8) { + if (tmp[0] !== 8) { // if (this.debug) alert("Unknown compression method!"); return 0; } @@ -695,7 +695,7 @@ cc.Codec.GZip.prototype.skipdir = function () { i = 0; this.nameBuf = []; while (c = this.readByte()) { - if (c == "7" || c == ":") + if (c === "7" || c === ":") i = 0; if (i < cc.Codec.GZip.NAMEMAX - 1) this.nameBuf[i++] = c; diff --git a/cocos2d/core/CCActionManager.js b/cocos2d/core/CCActionManager.js index d2351263a7..ac061e3f5a 100644 --- a/cocos2d/core/CCActionManager.js +++ b/cocos2d/core/CCActionManager.js @@ -1,7 +1,7 @@ /**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2008-2010 Ricardo Quesada - Copyright (c) 2011 Zynga Inc. + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -27,6 +27,8 @@ /** * @class * @extends cc.Class + * @example + * var element = new cc.HashElement(); */ cc.HashElement = cc.Class.extend(/** @lends cc.HashElement# */{ actions:null, @@ -51,17 +53,19 @@ cc.HashElement = cc.Class.extend(/** @lends cc.HashElement# */{ }); /** - * cc.ActionManager is a singleton that manages all the actions.
- * Normally you won't need to use this singleton directly. 99% of the cases you will use the CCNode interface, - * which uses this singleton. - * But there are some cases where you might need to use this singleton.
+ * cc.ActionManager is a class that can manage actions.
+ * Normally you won't need to use this class directly. 99% of the cases you will use the CCNode interface, + * which uses this class's singleton object. + * But there are some cases where you might need to use this class.
* Examples:
* - When you want to run an action where the target is different from a CCNode.
* - When you want to pause / resume the actions
* @class * @extends cc.Class + * @example + * var mng = new cc.ActionManager(); */ -cc.ActionManager = cc.Class.extend({ +cc.ActionManager = cc.Class.extend(/** @lends cc.ActionManager# */{ _hashTargets:null, _arrayTargets:null, _currentTarget:null, @@ -69,15 +73,12 @@ cc.ActionManager = cc.Class.extend({ _searchElementByTarget:function (arr, target) { for (var k = 0; k < arr.length; k++) { - if (target == arr[k].target) + if (target === arr[k].target) return arr[k]; } return null; }, - /** - * Constructor - */ ctor:function () { this._hashTargets = {}; this._arrayTargets = []; @@ -142,7 +143,7 @@ cc.ActionManager = cc.Class.extend({ element.currentActionSalvaged = true; element.actions.length = 0; - if (this._currentTarget == element && !forceDelete) { + if (this._currentTarget === element && !forceDelete) { this._currentTargetSalvaged = true; } else { this._deleteHashElement(element); @@ -161,7 +162,7 @@ cc.ActionManager = cc.Class.extend({ if (element) { for (var i = 0; i < element.actions.length; i++) { - if (element.actions[i] == action) { + if (element.actions[i] === action) { element.actions.splice(i, 1); break; } @@ -176,7 +177,7 @@ cc.ActionManager = cc.Class.extend({ * @param {object} target */ removeActionByTag:function (tag, target) { - if(tag == cc.ACTION_TAG_INVALID) + if(tag === cc.ACTION_TAG_INVALID) cc.log(cc._LogInfos.ActionManager_addAction); cc.assert(target, cc._LogInfos.ActionManager_addAction); @@ -187,7 +188,7 @@ cc.ActionManager = cc.Class.extend({ var limit = element.actions.length; for (var i = 0; i < limit; ++i) { var action = element.actions[i]; - if (action && action.getTag() === tag && action.getOriginalTarget() == target) { + if (action && action.getTag() === tag && action.getOriginalTarget() === target) { this._removeActionAtIndex(i, element); break; } @@ -201,7 +202,7 @@ cc.ActionManager = cc.Class.extend({ * @return {cc.Action|Null} return the Action with the given tag on success */ getActionByTag:function (tag, target) { - if(tag == cc.ACTION_TAG_INVALID) + if(tag === cc.ACTION_TAG_INVALID) cc.log(cc._LogInfos.ActionManager_getActionByTag); var element = this._hashTargets[target.__instanceId]; @@ -286,14 +287,14 @@ cc.ActionManager = cc.Class.extend({ * because it uses this, so it can not be static */ purgeSharedManager:function () { - cc.director.getScheduler().unscheduleUpdateForTarget(this); + cc.director.getScheduler().unscheduleUpdate(this); }, //protected _removeActionAtIndex:function (index, element) { var action = element.actions[index]; - if ((action == element.currentAction) && (!element.currentActionSalvaged)) + if ((action === element.currentAction) && (!element.currentActionSalvaged)) element.currentActionSalvaged = true; element.actions.splice(index, 1); @@ -302,8 +303,8 @@ cc.ActionManager = cc.Class.extend({ if (element.actionIndex >= index) element.actionIndex--; - if (element.actions.length == 0) { - if (this._currentTarget == element) { + if (element.actions.length === 0) { + if (this._currentTarget === element) { this._currentTargetSalvaged = true; } else { this._deleteHashElement(element); @@ -338,14 +339,16 @@ cc.ActionManager = cc.Class.extend({ //this._currentTargetSalvaged = false; if (!locCurrTarget.paused) { // The 'actions' CCMutableArray may change while inside this loop. - for (locCurrTarget.actionIndex = 0; locCurrTarget.actionIndex < locCurrTarget.actions.length; + for (locCurrTarget.actionIndex = 0; + locCurrTarget.actionIndex < (locCurrTarget.actions ? locCurrTarget.actions.length : 0); locCurrTarget.actionIndex++) { locCurrTarget.currentAction = locCurrTarget.actions[locCurrTarget.actionIndex]; if (!locCurrTarget.currentAction) continue; locCurrTarget.currentActionSalvaged = false; - locCurrTarget.currentAction.step(dt); + //use for speed + locCurrTarget.currentAction.step(dt * ( locCurrTarget.currentAction._speedMethod ? locCurrTarget.currentAction._speed : 1 ) ); if (locCurrTarget.currentActionSalvaged) { // The currentAction told the node to remove it. To prevent the action from // accidentally deallocating itself before finishing its step, we retained diff --git a/cocos2d/core/CCCamera.js b/cocos2d/core/CCCamera.js index ac01fd8e6f..ea6c6db8c7 100644 --- a/cocos2d/core/CCCamera.js +++ b/cocos2d/core/CCCamera.js @@ -1,7 +1,7 @@ /**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2008-2010 Ricardo Quesada - Copyright (c) 2011 Zynga Inc. + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -42,10 +42,8 @@ *
* - It is recommended to use it ONLY if you are going to create 3D effects. For 2D effecs, use the action CCFollow or position/scale/rotate. * * - * @class - * @extends cc.Class */ -cc.Camera = cc.Class.extend(/** @lends cc.Action# */{ +cc.Camera = cc.Class.extend({ _eyeX:null, _eyeY:null, _eyeZ:null, @@ -58,11 +56,13 @@ cc.Camera = cc.Class.extend(/** @lends cc.Action# */{ _upY:null, _upZ:null, - _dirty:null, + _dirty:false, _lookupMatrix:null, - + /** + * constructor of cc.Camera + */ ctor:function () { - this._lookupMatrix = new cc.kmMat4(); + this._lookupMatrix = new cc.math.Matrix4(); this.restore(); }, @@ -103,7 +103,7 @@ cc.Camera = cc.Class.extend(/** @lends cc.Action# */{ this._upY = 1.0; this._upZ = 0.0; - cc.kmMat4Identity( this._lookupMatrix ); + this._lookupMatrix.identity(); this._dirty = false; }, @@ -113,25 +113,32 @@ cc.Camera = cc.Class.extend(/** @lends cc.Action# */{ */ locate:function () { if (this._dirty) { - var eye = new cc.kmVec3(), center = new cc.kmVec3(), up = new cc.kmVec3(); - - cc.kmVec3Fill( eye, this._eyeX, this._eyeY , this._eyeZ ); - cc.kmVec3Fill( center, this._centerX, this._centerY, this._centerZ); - - cc.kmVec3Fill( up, this._upX, this._upY, this._upZ); - cc.kmMat4LookAt( this._lookupMatrix, eye, center, up); - + var eye = new cc.math.Vec3(this._eyeX, this._eyeY , this._eyeZ), + center = new cc.math.Vec3(this._centerX, this._centerY, this._centerZ), + up = new cc.math.Vec3(this._upX, this._upY, this._upZ); + this._lookupMatrix.lookAt(eye, center, up); this._dirty = false; } cc.kmGLMultMatrix( this._lookupMatrix); }, + _locateForRenderer: function(matrix){ + if (this._dirty) { + var eye = new cc.math.Vec3(this._eyeX, this._eyeY , this._eyeZ), + center = new cc.math.Vec3(this._centerX, this._centerY, this._centerZ), + up = new cc.math.Vec3(this._upX, this._upY, this._upZ); + this._lookupMatrix.lookAt(eye, center, up); + this._dirty = false; + } + matrix.multiply(this._lookupMatrix); + }, + /** * sets the eye values in points * @param {Number} eyeX * @param {Number} eyeY * @param {Number} eyeZ - * @deprecated This function will be deprecated sooner or later. + * @deprecated This function will be deprecated sooner or later please use setEye instead. */ setEyeXYZ:function (eyeX, eyeY, eyeZ) { this.setEye(eyeX,eyeY,eyeZ); @@ -156,7 +163,7 @@ cc.Camera = cc.Class.extend(/** @lends cc.Action# */{ * @param {Number} centerX * @param {Number} centerY * @param {Number} centerZ - * @deprecated This function will be deprecated sooner or later. + * @deprecated This function will be deprecated sooner or later please use setCenter instead. */ setCenterXYZ:function (centerX, centerY, centerZ) { this.setCenter(centerX,centerY,centerZ); @@ -207,7 +214,7 @@ cc.Camera = cc.Class.extend(/** @lends cc.Action# */{ * @param {Number} eyeY * @param {Number} eyeZ * @return {Object} - * @deprecated This function will be deprecated sooner or later. + * @deprecated This function will be deprecated sooner or later, please use getEye instead. */ getEyeXYZ:function (eyeX, eyeY, eyeZ) { return {x:this._eyeX , y:this._eyeY , z: this._eyeZ }; @@ -227,7 +234,7 @@ cc.Camera = cc.Class.extend(/** @lends cc.Action# */{ * @param {Number} centerY * @param {Number} centerZ * @return {Object} - * @deprecated This function will be deprecated sooner or later. + * @deprecated This function will be deprecated sooner or later,please use getCenter instead. */ getCenterXYZ:function (centerX, centerY, centerZ) { return {x:this._centerX ,y:this._centerY ,z:this._centerZ }; @@ -247,7 +254,7 @@ cc.Camera = cc.Class.extend(/** @lends cc.Action# */{ * @param {Number} upY * @param {Number} upZ * @return {Object} - * @deprecated This function will be deprecated sooner or later. + * @deprecated This function will be deprecated sooner or later,please use getUp instead. */ getUpXYZ:function (upX, upY, upZ) { return {x:this._upX,y:this._upY,z:this._upZ}; diff --git a/cocos2d/core/CCConfiguration.js b/cocos2d/core/CCConfiguration.js index 7efd9fac60..e2be6b7ba8 100644 --- a/cocos2d/core/CCConfiguration.js +++ b/cocos2d/core/CCConfiguration.js @@ -1,7 +1,7 @@ /**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2008-2010 Ricardo Quesada - Copyright (c) 2011 Zynga Inc. + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,7 +25,11 @@ ****************************************************************************/ /** - * @namespace cc.configuration contains some openGL variables + * cc.configuration is a singleton object which contains some openGL variables + * @class + * @name cc.configuration + * @example + * var textureSize = cc.configuration.getMaxTextureSize(); */ cc.configuration = /** @lends cc.configuration# */{ // Type constants diff --git a/cocos2d/core/CCDirector.js b/cocos2d/core/CCDirector.js index 4581a54a5b..cd84958624 100644 --- a/cocos2d/core/CCDirector.js +++ b/cocos2d/core/CCDirector.js @@ -1,7 +1,7 @@ /**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2008-2010 Ricardo Quesada - Copyright (c) 2011 Zynga Inc. + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -27,32 +27,34 @@ cc.g_NumberOfDraws = 0; cc.GLToClipTransform = function (transformOut) { - var projection = new cc.kmMat4(); - cc.kmGLGetMatrix(cc.KM_GL_PROJECTION, projection); + //var projection = new cc.math.Matrix4(); + //cc.kmGLGetMatrix(cc.KM_GL_PROJECTION, projection); + cc.kmGLGetMatrix(cc.KM_GL_PROJECTION, transformOut); - var modelview = new cc.kmMat4(); + var modelview = new cc.math.Matrix4(); cc.kmGLGetMatrix(cc.KM_GL_MODELVIEW, modelview); - cc.kmMat4Multiply(transformOut, projection, modelview); + transformOut.multiply(modelview); }; //---------------------------------------------------------------------------------------------------------------------- /** - * @namespace
- * cc.director is a singleton of DisplayLinkDirector type director.
+ *
+ * ATTENTION: USE cc.director INSTEAD OF cc.Director.
+ * cc.director is a singleton object which manage your game's logic flow.
* Since the cc.director is a singleton, you don't need to call any constructor or create functions,
* the standard way to use it is by calling:
* - cc.director.methodName();
*
* It creates and handle the main Window and manages how and when to execute the Scenes.
*
- * The cc.Director is also responsible for:
+ * The cc.director is also responsible for:
* - initializing the OpenGL context
* - setting the OpenGL pixel format (default on is RGB565)
* - setting the OpenGL pixel format (default on is RGB565)
* - setting the OpenGL buffer depth (default one is 0-bit)
* - setting the projection (default one is 3D)
- * - setting the orientation (default one is Protrait)
+ * - setting the orientation (default one is Portrait)
*
*
* The cc.director also sets the default OpenGL context:
@@ -62,70 +64,67 @@ cc.GLToClipTransform = function (transformOut) {
* - GL_TEXTURE_COORD_ARRAY is enabled
*
- * With DisplayLinkDirector functionality, cc.director synchronizes timers with the refresh rate of the display.
+ * cc.director also synchronizes timers with the refresh rate of the display.
* Features and Limitations:
* - Scheduled timers & drawing are synchronizes with the refresh rate of the display
* - Only supports animation intervals of 1/60 1/30 & 1/15
*
+ * Useful to convert (multi) touches coordinates to the current layout (portrait or landscape)
+ * Implementation can be found in CCDirectorWebGL + * @function + * @param {cc.Point} uiPoint + * @return {cc.Point} + */ + convertToGL: null, + + /** + * Converts an WebGL coordinate to a view coordinate
+ * Useful to convert node points to window points for calls such as glScissor
+ * Implementation can be found in CCDirectorWebGL + * @function + * @param {cc.Point} glPoint + * @return {cc.Point} */ + convertToUI: null, /** * Draw the scene. This method is called every frame. Don't call it manually. */ - drawScene: function() { + drawScene: function () { + var renderer = cc.renderer; // calculate "global" dt this.calculateDeltaTime(); @@ -216,11 +235,19 @@ cc.Director = cc.Class.extend(/** @lends cc.director# */{ this.setNextScene(); } - if (this._beforeVisitScene) this._beforeVisitScene(); + if (this._beforeVisitScene) + this._beforeVisitScene(); // draw the scene if (this._runningScene) { - this._runningScene.visit(); + if (renderer.childrenOrderDirty === true) { + cc.renderer.clearRenderCommands(); + this._runningScene._renderCmd._curLevel = 0; //level start from 0; + this._runningScene.visit(); + renderer.resetFlag(); + } else if (renderer.transformDirty() === true) + renderer.transform(); + cc.eventManager.dispatchEvent(this._eventAfterVisit); } @@ -231,9 +258,10 @@ cc.Director = cc.Class.extend(/** @lends cc.director# */{ if (this._displayStats) this._showStats(); - if (this._afterVisitScene) this._afterVisitScene(); + if (this._afterVisitScene) + this._afterVisitScene(); - //TODO + renderer.rendering(cc._renderContext); cc.eventManager.dispatchEvent(this._eventAfterDraw); this._totalFrames++; @@ -245,55 +273,47 @@ cc.Director = cc.Class.extend(/** @lends cc.director# */{ _afterVisitScene: null, /** - * end director + * End the life of director in the next frame */ - end:function () { + end: function () { this._purgeDirectorInNextLoop = true; }, /** - *
get the size in pixels of the surface. It could be different than the screen size.
- * High-res devices might have a higher surface size than the screen size.
- * Only available when compiled using SDK >= 4.0.
- *
+ * High-res devices might have a higher surface size than the screen size. * @return {Number} */ - getContentScaleFactor:function () { + getContentScaleFactor: function () { return this._contentScaleFactor; }, /** - *
- * This object will be visited after the main scene is visited.
- * This object MUST implement the "visit" selector.
- * Useful to hook a notification object, like CCNotifications (http://github.com/manucorporat/CCNotifications)
- *
+ * This object MUST implement the "visit" selector.
+ * Useful to hook a notification object * @return {cc.Node} */ - getNotificationNode:function () { + getNotificationNode: function () { return this._notificationNode; }, /** - *
- * returns the size of the OpenGL view in points.
- * It takes into account any possible rotation (device orientation) of the window
- *
+ * It takes into account any possible rotation (device orientation) of the window * @return {cc.Size} */ - getWinSize:function () { - return this._winSizeInPoints; + getWinSize: function () { + return cc.size(this._winSizeInPoints); }, /** - *
- * returns the size of the OpenGL view in pixels.
- * It takes into account any possible rotation (device orientation) of the window.
- * On Mac winSize and winSizeInPixels return the same value.
- *
+ * It takes into account any possible rotation (device orientation) of the window.
+ * On Mac winSize and winSizeInPixels return the same value. * @return {cc.Size} */ - getWinSizeInPixels:function () { + getWinSizeInPixels: function () { return cc.size(this._winSizeInPoints.width * this._contentScaleFactor, this._winSizeInPoints.height * this._contentScaleFactor); }, @@ -303,9 +323,30 @@ cc.Director = cc.Class.extend(/** @lends cc.director# */{ */ /** - * pause director + * Returns the visible size of the running scene + * @function + * @return {cc.Size} + */ + getVisibleSize: null, + + /** + * Returns the visible origin of the running scene + * @function + * @return {cc.Point} + */ + getVisibleOrigin: null, + + /** + * Returns the z eye, only available in WebGL mode + * @function + * @return {Number} + */ + getZEye: null, + + /** + * Pause the director's ticker */ - pause:function () { + pause: function () { if (this._paused) return; @@ -316,21 +357,19 @@ cc.Director = cc.Class.extend(/** @lends cc.director# */{ }, /** - *
- * Pops out a scene from the queue.
- * This scene will replace the running one.
- * The running scene will be deleted. If there are no more scenes in the stack the execution is terminated.
- * ONLY call it if there is a running scene.
- *
+ * This scene will replace the running one.
+ * The running scene will be deleted. If there are no more scenes in the stack the execution is terminated.
+ * ONLY call it if there is a running scene. */ - popScene:function () { + popScene: function () { cc.assert(this._runningScene, cc._LogInfos.Director_popScene); this._scenesStack.pop(); var c = this._scenesStack.length; - if (c == 0) + if (c === 0) this.end(); else { this._sendCleanupToScene = true; @@ -341,21 +380,21 @@ cc.Director = cc.Class.extend(/** @lends cc.director# */{ /** * Removes cached all cocos2d cached data. It will purge the cc.textureCache, cc.spriteFrameCache, cc.animationCache */ - purgeCachedData:function () { - cc.animationCache._clear(); - cc.spriteFrameCache._clear(); - cc.textureCache._clear(); + purgeCachedData: function () { + cc.animationCache._clear(); + cc.spriteFrameCache._clear(); + cc.textureCache._clear(); }, /** - * purge Director + * Purge the cc.director itself, including unschedule all schedule, remove all event listeners, clean up and exit the running scene, stops all animations, clear cached data. */ - purgeDirector:function () { + purgeDirector: function () { //cleanup scheduler - this.getScheduler().unscheduleAllCallbacks(); + this.getScheduler().unscheduleAll(); // Disable event dispatching - if(cc.eventManager) + if (cc.eventManager) cc.eventManager.setEnabled(false); // don't release the event handlers @@ -383,15 +422,13 @@ cc.Director = cc.Class.extend(/** @lends cc.director# */{ }, /** - *
- * Suspends the execution of the running scene, pushing it on the stack of suspended scenes.
- * The new scene will be executed.
- * Try to avoid big stacks of pushed scenes to reduce memory allocation.
- * ONLY call it if there is a running scene.
- *
+ * The new scene will be executed.
+ * Try to avoid big stacks of pushed scenes to reduce memory allocation.
+ * ONLY call it if there is a running scene. * @param {cc.Scene} scene */ - pushScene:function (scene) { + pushScene: function (scene) { cc.assert(scene, cc._LogInfos.Director_pushScene); @@ -402,21 +439,21 @@ cc.Director = cc.Class.extend(/** @lends cc.director# */{ }, /** - * Run a scene. Replaces the running scene with a new one when the scene is running. + * Run a scene. Replaces the running scene with a new one or enter the first scene. * @param {cc.Scene} scene */ - runScene:function(scene){ + runScene: function (scene) { cc.assert(scene, cc._LogInfos.Director_pushScene); - if(!this._runningScene){ + if (!this._runningScene) { //start scene this.pushScene(scene); this.startAnimation(); - }else{ + } else { //replace scene var i = this._scenesStack.length; - if(i === 0){ + if (i === 0) { this._sendCleanupToScene = true; this._scenesStack[i] = scene; this._nextScene = scene; @@ -429,9 +466,9 @@ cc.Director = cc.Class.extend(/** @lends cc.director# */{ }, /** - * resume director + * Resume director after pause, if the current scene is not paused, nothing will happen. */ - resume:function () { + resume: function () { if (!this._paused) { return; } @@ -447,48 +484,46 @@ cc.Director = cc.Class.extend(/** @lends cc.director# */{ }, /** - *
- * The size in pixels of the surface. It could be different than the screen size.
- * High-res devices might have a higher surface size than the screen size.
- * Only available when compiled using SDK >= 4.0.
- *
+ * High-res devices might have a higher surface size than the screen size. * @param {Number} scaleFactor */ - setContentScaleFactor:function (scaleFactor) { - if (scaleFactor != this._contentScaleFactor) { + setContentScaleFactor: function (scaleFactor) { + if (scaleFactor !== this._contentScaleFactor) { this._contentScaleFactor = scaleFactor; this._createStatsLabel(); } }, /** - * enables/disables OpenGL depth test + * Enables or disables WebGL depth test.
+ * Implementation can be found in CCDirectorCanvas.js/CCDirectorWebGL.js + * @function * @param {Boolean} on - * - * setDepthTest move to CCDirectorCanvas/CCDirectorWebGL */ + setDepthTest: null, /** - * sets the default values based on the CCConfiguration info + * Sets the default values based on the CCConfiguration info */ - setDefaultValues:function(){ + setDefaultValues: function () { }, /** - * set next delta time is zero + * Sets whether next delta time equals to zero * @param {Boolean} nextDeltaTimeZero */ - setNextDeltaTimeZero:function (nextDeltaTimeZero) { + setNextDeltaTimeZero: function (nextDeltaTimeZero) { this._nextDeltaTimeZero = nextDeltaTimeZero; }, /** - * set next scene + * Starts the registered next scene */ - setNextScene:function () { + setNextScene: function () { var runningIsTransition = false, newIsTransition = false; - if(cc.TransitionScene){ + if (cc.TransitionScene) { runningIsTransition = this._runningScene ? this._runningScene instanceof cc.TransitionScene : false; newIsTransition = this._nextScene ? this._nextScene instanceof cc.TransitionScene : false; } @@ -508,52 +543,86 @@ cc.Director = cc.Class.extend(/** @lends cc.director# */{ } this._runningScene = this._nextScene; + cc.renderer.childrenOrderDirty = true; this._nextScene = null; - if ((!runningIsTransition) && (this._runningScene != null)) { + if ((!runningIsTransition) && (this._runningScene !== null)) { this._runningScene.onEnter(); this._runningScene.onEnterTransitionDidFinish(); } }, /** - * set Notification Node + * Sets Notification Node * @param {cc.Node} node */ - setNotificationNode:function (node) { + setNotificationNode: function (node) { this._notificationNode = node; }, /** - * CCDirector delegate. It shall implemente the CCDirectorDelegate protocol - * @return {cc.DirectorDelegate} + * Returns the cc.director delegate. + * @return {cc.DirectorDelegate} */ - getDelegate:function () { + getDelegate: function () { return this._projectionDelegate; }, - setDelegate:function (delegate) { + /** + * Sets the cc.director delegate. It shall implement the CCDirectorDelegate protocol + * @return {cc.DirectorDelegate} + */ + setDelegate: function (delegate) { this._projectionDelegate = delegate; }, /** - * Set the CCEGLView, where everything is rendered - * @param {*} openGLView - * - * setOpenGLView move to CCDirectorCanvas/CCDirectorWebGL - * setViewport move to CCDirectorWebGL + * Sets the view, where everything is rendered, do not call this function.
+ * Implementation can be found in CCDirectorCanvas.js/CCDirectorWebGL.js. + * @function + * @param {cc.view} openGLView */ + setOpenGLView: null, /** - * Sets an OpenGL projection + * Sets an OpenGL projection.
+ * Implementation can be found in CCDirectorCanvas.js/CCDirectorWebGL.js. + * @function * @param {Number} projection - * - * setProjection move to CCDiretorCanvas/CCDiretorWebGL */ + setProjection: null, + + /** + * Update the view port.
+ * Implementation can be found in CCDirectorCanvas.js/CCDirectorWebGL.js. + * @function + */ + setViewport: null, /** - * shows the FPS in the screen + * Get the CCEGLView, where everything is rendered.
+ * Implementation can be found in CCDirectorCanvas.js/CCDirectorWebGL.js. + * @function + * @return {cc.view} + */ + getOpenGLView: null, + + /** + * Sets an OpenGL projection.
+ * Implementation can be found in CCDirectorCanvas.js/CCDirectorWebGL.js. + * @function + * @return {Number} */ + getProjection: null, + + /** + * Enables/disables OpenGL alpha blending.
+ * Implementation can be found in CCDirectorCanvas.js/CCDirectorWebGL.js. + * @function + * @param {Boolean} on + */ + setAlphaBlending: null, + _showStats: function () { this._frames++; this._accumDt += this._deltaTime; @@ -577,109 +646,102 @@ cc.Director = cc.Class.extend(/** @lends cc.director# */{ }, /** - *
- * Whether or not the replaced scene will receive the cleanup message.
- * If the new scene is pushed, then the old scene won't receive the "cleanup" message.
- * If the new scene replaces the old one, the it will receive the "cleanup" message.
- *
+ * If the new scene is pushed, then the old scene won't receive the "cleanup" message.
+ * If the new scene replaces the old one, the it will receive the "cleanup" message. * @return {Boolean} */ - isSendCleanupToScene:function () { + isSendCleanupToScene: function () { return this._sendCleanupToScene; }, /** - * Get current running Scene. Director can only run one Scene at the time + * Returns current running Scene. Director can only run one Scene at the time * @return {cc.Scene} */ - getRunningScene:function () { + getRunningScene: function () { return this._runningScene; }, /** - * Get the FPS value + * Returns the FPS value * @return {Number} */ - getAnimationInterval:function () { + getAnimationInterval: function () { return this._animationInterval; }, /** - * Whether or not to display the FPS on the bottom-left corner + * Returns whether or not to display the FPS informations * @return {Boolean} */ - isDisplayStats:function () { + isDisplayStats: function () { return this._displayStats; }, /** - * Display the FPS on the bottom-left corner + * Sets whether display the FPS on the bottom-left corner * @param {Boolean} displayStats */ - setDisplayStats:function (displayStats) { + setDisplayStats: function (displayStats) { this._displayStats = displayStats; }, /** - * seconds per frame + * Returns seconds per frame * @return {Number} */ - getSecondsPerFrame:function () { + getSecondsPerFrame: function () { return this._secondsPerFrame; }, /** - * is next delta time zero + * Returns whether next delta time equals to zero * @return {Boolean} */ - isNextDeltaTimeZero:function () { + isNextDeltaTimeZero: function () { return this._nextDeltaTimeZero; }, /** - * Whether or not the Director is paused + * Returns whether or not the Director is paused * @return {Boolean} */ - isPaused:function () { + isPaused: function () { return this._paused; }, /** - * How many frames were called since the director started + * Returns how many frames were called since the director started * @return {Number} */ - getTotalFrames:function () { + getTotalFrames: function () { return this._totalFrames; }, /** - *
- * Pops out all scenes from the queue until the root scene in the queue.
- * This scene will replace the running one.
- * Internally it will call `popToSceneStackLevel(1)`
- *
+ * This scene will replace the running one.
+ * Internally it will call "popToSceneStackLevel(1)" */ - popToRootScene:function () { + popToRootScene: function () { this.popToSceneStackLevel(1); }, /** - *
- * Pops out all scenes from the queue until it reaches `level`.
- * If level is 0, it will end the director.
- * If level is 1, it will pop all scenes until it reaches to root scene.
- * If level is <= than the current stack level, it won't do anything.
- *
+ * If level is 0, it will end the director.
+ * If level is 1, it will pop all scenes until it reaches to root scene.
+ * If level is <= than the current stack level, it won't do anything. * @param {Number} level */ popToSceneStackLevel: function (level) { - cc.assert(this._runningScene, cc._LogInfos.Director_popToSceneStackLevel_2); var locScenesStack = this._scenesStack; var c = locScenesStack.length; - if (c == 0) { + if (c === 0) { this.end(); return; } @@ -702,28 +764,45 @@ cc.Director = cc.Class.extend(/** @lends cc.director# */{ }, /** - * (cc.Scheduler associated with this director) + * Returns the cc.Scheduler associated with this director + * @return {cc.Scheduler} */ - getScheduler:function () { + getScheduler: function () { return this._scheduler; }, - setScheduler:function (scheduler) { - if (this._scheduler != scheduler) { + /** + * Sets the cc.Scheduler associated with this director + * @param {cc.Scheduler} scheduler + */ + setScheduler: function (scheduler) { + if (this._scheduler !== scheduler) { this._scheduler = scheduler; } }, - getActionManager:function () { + /** + * Returns the cc.ActionManager associated with this director + * @return {cc.ActionManager} + */ + getActionManager: function () { return this._actionManager; }, - setActionManager:function (actionManager) { - if (this._actionManager != actionManager) { + /** + * Sets the cc.ActionManager associated with this director + * @param {cc.ActionManager} actionManager + */ + setActionManager: function (actionManager) { + if (this._actionManager !== actionManager) { this._actionManager = actionManager; } }, - getDeltaTime:function(){ + /** + * Returns the delta time since last frame + * @return {Number} + */ + getDeltaTime: function () { return this._deltaTime; }, @@ -735,29 +814,68 @@ cc.Director = cc.Class.extend(/** @lends cc.director# */{ } }); +/** + * The event projection changed of cc.Director + * @constant + * @type {string} + * @example + * cc.eventManager.addCustomListener(cc.Director.EVENT_PROJECTION_CHANGED, function(event) { + * cc.log("Projection changed."); + * }); + */ cc.Director.EVENT_PROJECTION_CHANGED = "director_projection_changed"; + +/** + * The event after draw of cc.Director + * @constant + * @type {string} + * @example + * cc.eventManager.addCustomListener(cc.Director.EVENT_AFTER_DRAW, function(event) { + * cc.log("after draw event."); + * }); + */ cc.Director.EVENT_AFTER_DRAW = "director_after_draw"; + +/** + * The event after visit of cc.Director + * @constant + * @type {string} + * @example + * cc.eventManager.addCustomListener(cc.Director.EVENT_AFTER_VISIT, function(event) { + * cc.log("after visit event."); + * }); + */ cc.Director.EVENT_AFTER_VISIT = "director_after_visit"; + +/** + * The event after update of cc.Director + * @constant + * @type {string} + * @example + * cc.eventManager.addCustomListener(cc.Director.EVENT_AFTER_UPDATE, function(event) { + * cc.log("after update event."); + * }); + */ cc.Director.EVENT_AFTER_UPDATE = "director_after_update"; /*************************************************** * implementation of DisplayLinkDirector **************************************************/ -cc.DisplayLinkDirector = cc.Director.extend(/** @lends cc.director# */{ - invalid:false, +cc.DisplayLinkDirector = cc.Director.extend(/** @lends cc.Director# */{ + invalid: false, /** - * start Animation + * Starts Animation */ - startAnimation:function () { + startAnimation: function () { this._nextDeltaTimeZero = true; this.invalid = false; }, /** - * main loop of director + * Run main loop of director */ - mainLoop:function () { + mainLoop: function () { if (this._purgeDirectorInNextLoop) { this._purgeDirectorInNextLoop = false; this.purgeDirector(); @@ -768,17 +886,17 @@ cc.DisplayLinkDirector = cc.Director.extend(/** @lends cc.director# */{ }, /** - * stop animation + * Stops animation */ - stopAnimation:function () { + stopAnimation: function () { this.invalid = true; }, /** - * set Animation Interval - * @param {Number} value + * Sets animation interval + * @param {Number} value the animation interval desired */ - setAnimationInterval:function (value) { + setAnimationInterval: function (value) { this._animationInterval = value; if (!this.invalid) { this.stopAnimation(); @@ -800,37 +918,37 @@ cc.Director._getInstance = function () { }; /** - * set default fps to 60 - * @type Number + * Default fps is 60 + * @type {Number} */ cc.defaultFPS = 60; //Possible OpenGL projections used by director /** - * sets a 2D projection (orthogonal projection) + * Constant for 2D projection (orthogonal projection) * @constant - * @type Number + * @type {Number} */ cc.Director.PROJECTION_2D = 0; /** - * sets a 3D projection with a fovy=60, znear=0.5f and zfar=1500. + * Constant for 3D projection with a fovy=60, znear=0.5f and zfar=1500. * @constant - * @type Number + * @type {Number} */ cc.Director.PROJECTION_3D = 1; /** - * it calls "updateProjection" on the projection delegate. + * Constant for custom projection, if cc.Director's projection set to it, it calls "updateProjection" on the projection delegate. * @constant - * @type Number + * @type {Number} */ cc.Director.PROJECTION_CUSTOM = 3; /** - * Default projection is 3D projection + * Constant for default projection of cc.Director, default projection is 3D projection * @constant - * @type Number + * @type {Number} */ cc.Director.PROJECTION_DEFAULT = cc.Director.PROJECTION_3D; @@ -851,17 +969,18 @@ if (cc._renderType === cc._RENDER_TYPE_CANVAS) { this._winSizeInPoints.width = cc._canvas.width; //this._openGLView.getDesignResolutionSize(); this._winSizeInPoints.height = cc._canvas.height; this._openGLView = openGLView || cc.view; - if(cc.eventManager) + if (cc.eventManager) cc.eventManager.setEnabled(true); }; - _p._clear = function() { + _p._clear = function () { var viewport = this._openGLView.getViewPortRect(); - cc._renderContext.clearRect(-viewport.x, viewport.y, viewport.width, -viewport.height); + var context = cc._renderContext.getContext(); + context.setTransform(1,0,0,1, 0, 0); + context.clearRect(-viewport.x, viewport.y, viewport.width, viewport.height); }; - - _p._createStatsLabel = function(){ + _p._createStatsLabel = function () { var _t = this; var fontSize = 0; if (_t._winSizeInPoints.width > _t._winSizeInPoints.height) @@ -869,9 +988,9 @@ if (cc._renderType === cc._RENDER_TYPE_CANVAS) { else fontSize = 0 | (_t._winSizeInPoints.width / 320 * 24); - _t._FPSLabel = cc.LabelTTF.create("000.0", "Arial", fontSize); - _t._SPFLabel = cc.LabelTTF.create("0.000", "Arial", fontSize); - _t._drawsLabel = cc.LabelTTF.create("0000", "Arial", fontSize); + _t._FPSLabel = new cc.LabelTTF("000.0", "Arial", fontSize); + _t._SPFLabel = new cc.LabelTTF("0.000", "Arial", fontSize); + _t._drawsLabel = new cc.LabelTTF("0000", "Arial", fontSize); var locStatsPosition = cc.DIRECTOR_STATS_POSITION; _t._drawsLabel.setPosition(_t._drawsLabel.width / 2 + locStatsPosition.x, _t._drawsLabel.height * 5 / 2 + locStatsPosition.y); @@ -891,15 +1010,15 @@ if (cc._renderType === cc._RENDER_TYPE_CANVAS) { //if (this._openGLView) { //return this._openGLView.getVisibleOrigin(); //} else { - return cc.p(0,0); + return cc.p(0, 0); //} }; -}else { +} else { cc.Director._fpsImage = new Image(); cc._addEventListener(cc.Director._fpsImage, "load", function () { cc.Director._fpsImageLoaded = true; }); - if(cc._fpsImage){ + if (cc._fpsImage) { cc.Director._fpsImage.src = cc._fpsImage; } } \ No newline at end of file diff --git a/cocos2d/core/CCDirectorWebGL.js b/cocos2d/core/CCDirectorWebGL.js index 5351a14ae5..bdd9d62fb6 100644 --- a/cocos2d/core/CCDirectorWebGL.js +++ b/cocos2d/core/CCDirectorWebGL.js @@ -1,7 +1,7 @@ /**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2008-2010 Ricardo Quesada - Copyright (c) 2011 Zynga Inc. + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -24,328 +24,297 @@ THE SOFTWARE. ****************************************************************************/ -if (cc._renderType === cc._RENDER_TYPE_WEBGL) { +if (cc._renderType === cc._RENDER_TYPE_WEBGL) { + (function () { - /** - * OpenGL projection protocol - * @class - * @extends cc.Class - */ - cc.DirectorDelegate = cc.Class.extend(/** @lends cc.DirectorDelegate# */{ /** - * Called by CCDirector when the projection is updated, and "custom" projection is used - */ - updateProjection:function () { - } - }); - - var _p = cc.Director.prototype; - - _p.setProjection = function (projection) { - var _t = this; - var size = _t._winSizeInPoints; - - _t.setViewport(); - - switch (projection) { - case cc.Director.PROJECTION_2D: - cc.kmGLMatrixMode(cc.KM_GL_PROJECTION); - cc.kmGLLoadIdentity(); - var orthoMatrix = new cc.kmMat4(); - cc.kmMat4OrthographicProjection(orthoMatrix, 0, size.width, 0, size.height, -1024, 1024); - cc.kmGLMultMatrix(orthoMatrix); - cc.kmGLMatrixMode(cc.KM_GL_MODELVIEW); - cc.kmGLLoadIdentity(); - break; - case cc.Director.PROJECTION_3D: - var zeye = _t.getZEye(); - var matrixPerspective = new cc.kmMat4(), matrixLookup = new cc.kmMat4(); - cc.kmGLMatrixMode(cc.KM_GL_PROJECTION); - cc.kmGLLoadIdentity(); - - // issue #1334 - cc.kmMat4PerspectiveProjection(matrixPerspective, 60, size.width / size.height, 0.1, zeye * 2); - - cc.kmGLMultMatrix(matrixPerspective); - - cc.kmGLMatrixMode(cc.KM_GL_MODELVIEW); - cc.kmGLLoadIdentity(); - var eye = cc.kmVec3Fill(null, size.width / 2, size.height / 2, zeye); - var center = cc.kmVec3Fill(null, size.width / 2, size.height / 2, 0.0); - var up = cc.kmVec3Fill(null, 0.0, 1.0, 0.0); - cc.kmMat4LookAt(matrixLookup, eye, center, up); - cc.kmGLMultMatrix(matrixLookup); - break; - case cc.Director.PROJECTION_CUSTOM: - if (_t._projectionDelegate) - _t._projectionDelegate.updateProjection(); - break; - default: - cc.log(cc._LogInfos.Director_setProjection); - break; - } - _t._projection = projection; - cc.eventManager.dispatchEvent(_t._eventProjectionChanged); - cc.setProjectionMatrixDirty(); - }; - - _p.setDepthTest = function (on) { - - var loc_gl= cc._renderContext; - if (on) { - loc_gl.clearDepth(1.0); - loc_gl.enable(loc_gl.DEPTH_TEST); - loc_gl.depthFunc(loc_gl.LEQUAL); - //cc._renderContext.hint(cc._renderContext.PERSPECTIVE_CORRECTION_HINT, cc._renderContext.NICEST); - } else { - loc_gl.disable(loc_gl.DEPTH_TEST); - } - //cc.checkGLErrorDebug(); - }; - - _p.setOpenGLView = function (openGLView) { - var _t = this; - // set size - _t._winSizeInPoints.width = cc._canvas.width; //_t._openGLView.getDesignResolutionSize(); - _t._winSizeInPoints.height = cc._canvas.height; - _t._openGLView = openGLView || cc.view; - - // Configuration. Gather GPU info - var conf = cc.configuration; - conf.gatherGPUInfo(); - conf.dumpInfo(); - - // set size - //_t._winSizeInPoints = _t._openGLView.getDesignResolutionSize(); - //_t._winSizeInPixels = cc.size(_t._winSizeInPoints.width * _t._contentScaleFactor, _t._winSizeInPoints.height * _t._contentScaleFactor); - - //if (_t._openGLView != openGLView) { - // because EAGLView is not kind of CCObject - - _t._createStatsLabel(); - - //if (_t._openGLView) - _t.setGLDefaultValues(); - - /* if (_t._contentScaleFactor != 1) { - _t.updateContentScaleFactor(); - }*/ - - //} - if(cc.eventManager) - cc.eventManager.setEnabled(true); - }; - - _p._clear = function() { - var gl = cc._renderContext; - gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT); - }; - - _p._beforeVisitScene = function() { - cc.kmGLPushMatrix(); - }; - - _p._afterVisitScene = function() { - cc.kmGLPopMatrix(); - }; - - _p._createStatsLabel = function(){ - var _t = this; - if(!cc.LabelAtlas) - return _t._createStatsLabelForCanvas(); - - if((cc.Director._fpsImageLoaded == null) || (cc.Director._fpsImageLoaded == false)) - return; - - var texture = new cc.Texture2D(); - texture.initWithElement(cc.Director._fpsImage); - texture.handleLoadedTexture(); - - /* - We want to use an image which is stored in the file named ccFPSImage.c - for any design resolutions and all resource resolutions. - - To achieve this, - - Firstly, we need to ignore 'contentScaleFactor' in 'CCAtlasNode' and 'CCLabelAtlas'. - So I added a new method called 'setIgnoreContentScaleFactor' for 'CCAtlasNode', - this is not exposed to game developers, it's only used for displaying FPS now. - - Secondly, the size of this image is 480*320, to display the FPS label with correct size, - a factor of design resolution ratio of 480x320 is also needed. + * OpenGL projection protocol + * @class + * @extends cc.Class */ - var factor = cc.view.getDesignResolutionSize().height / 320.0; - if(factor === 0) - factor = _t._winSizeInPoints.height / 320.0; - - var tmpLabel = new cc.LabelAtlas(); - tmpLabel._setIgnoreContentScaleFactor(true); - tmpLabel.initWithString("00.0", texture, 12, 32 , '.'); - tmpLabel.scale = factor; - _t._FPSLabel = tmpLabel; - - tmpLabel = new cc.LabelAtlas(); - tmpLabel._setIgnoreContentScaleFactor(true); - tmpLabel.initWithString("0.000", texture, 12, 32, '.'); - tmpLabel.scale = factor; - _t._SPFLabel = tmpLabel; - - tmpLabel = new cc.LabelAtlas(); - tmpLabel._setIgnoreContentScaleFactor(true); - tmpLabel.initWithString("000", texture, 12, 32, '.'); - tmpLabel.scale = factor; - _t._drawsLabel = tmpLabel; - - var locStatsPosition = cc.DIRECTOR_STATS_POSITION; - _t._drawsLabel.setPosition(locStatsPosition.x, 34 * factor + locStatsPosition.y); - _t._SPFLabel.setPosition(locStatsPosition.x, 17 * factor + locStatsPosition.y); - _t._FPSLabel.setPosition(locStatsPosition); - }; - - _p._createStatsLabelForCanvas = function(){ - var _t = this; - //The original _createStatsLabelForCanvas method - //Because the referenced by a cc.Director.prototype._createStatsLabel - var fontSize = 0; - if (_t._winSizeInPoints.width > _t._winSizeInPoints.height) - fontSize = 0 | (_t._winSizeInPoints.height / 320 * 24); - else - fontSize = 0 | (_t._winSizeInPoints.width / 320 * 24); - - _t._FPSLabel = cc.LabelTTF.create("000.0", "Arial", fontSize); - _t._SPFLabel = cc.LabelTTF.create("0.000", "Arial", fontSize); - _t._drawsLabel = cc.LabelTTF.create("0000", "Arial", fontSize); - - var locStatsPosition = cc.DIRECTOR_STATS_POSITION; - _t._drawsLabel.setPosition(_t._drawsLabel.width / 2 + locStatsPosition.x, _t._drawsLabel.height * 5 / 2 + locStatsPosition.y); - _t._SPFLabel.setPosition(_t._SPFLabel.width / 2 + locStatsPosition.x, _t._SPFLabel.height * 3 / 2 + locStatsPosition.y); - _t._FPSLabel.setPosition(_t._FPSLabel.width / 2 + locStatsPosition.x, _t._FPSLabel.height / 2 + locStatsPosition.y); - }; - - - /** - *
- * converts a UIKit coordinate to an OpenGL coordinate
- * Useful to convert (multi) touches coordinates to the current layout (portrait or landscape)
- *
converts an OpenGL coordinate to a UIKit coordinate
- * Useful to convert node points to window points for calls such as glScissor
* Scheduler is responsible of triggering the scheduled callbacks.
@@ -276,43 +284,78 @@ cc.Timer = cc.Class.extend(/** @lends cc.Timer# */{
*
* @example
* //register a schedule to scheduler
- * cc.director.getScheduler().scheduleSelector(callback, this, interval, !this._isRunning);
+ * cc.director.getScheduler().schedule(callback, this, interval, !this._isRunning);
*/
cc.Scheduler = cc.Class.extend(/** @lends cc.Scheduler# */{
_timeScale:1.0,
- _updates : null, //_updates[0] list of priority < 0, _updates[1] list of priority == 0, _updates[2] list of priority > 0,
-
- _hashForUpdates:null, // hash used to fetch quickly the list entries for pause,delete,etc
- _arrayForUpdates:null,
+ //_updates : null, //_updates[0] list of priority < 0, _updates[1] list of priority == 0, _updates[2] list of priority > 0,
+ _updatesNegList: null,
+ _updates0List: null,
+ _updatesPosList: null,
_hashForTimers:null, //Used for "selectors with interval"
- _arrayForTimes:null,
+ _arrayForTimers:null, //Speed up indexing
+ _hashForUpdates:null, // hash used to fetch quickly the list entries for pause,delete,etc
+ //_arrayForUpdates:null, //Speed up indexing
_currentTarget:null,
_currentTargetSalvaged:false,
_updateHashLocked:false, //If true unschedule will not remove anything from a hash. Elements will only be marked for deletion.
- /**
- * Constructor
- */
+
ctor:function () {
- var self = this;
- self._timeScale = 1.0;
- self._updates = [[], [], []];
+ this._timeScale = 1.0;
+ this._updatesNegList = [];
+ this._updates0List = [];
+ this._updatesPosList = [];
- self._hashForUpdates = {};
- self._arrayForUpdates = [];
+ this._hashForUpdates = {};
+ this._hashForTimers = {};
+ this._currentTarget = null;
+ this._currentTargetSalvaged = false;
+ this._updateHashLocked = false;
- self._hashForTimers = {};
- self._arrayForTimers = [];
+ this._arrayForTimers = [];
+ //this._arrayForUpdates = [];
- self._currentTarget = null;
- self._currentTargetSalvaged = false;
- self._updateHashLocked = false;
},
//-----------------------private method----------------------
+
+ _schedulePerFrame: function(callback, target, priority, paused){
+ var hashElement = this._hashForUpdates[target.__instanceId];
+ if (hashElement && hashElement.entry){
+ // check if priority has changed
+ if (hashElement.entry.priority !== priority){
+ if (this._updateHashLocked){
+ cc.log("warning: you CANNOT change update priority in scheduled function");
+ hashElement.entry.markedForDeletion = false;
+ hashElement.entry.paused = paused;
+ return;
+ }else{
+ // will be added again outside if (hashElement).
+ this.unscheduleUpdate(target);
+ }
+ }else{
+ hashElement.entry.markedForDeletion = false;
+ hashElement.entry.paused = paused;
+ return;
+ }
+ }
+
+ // most of the updates are going to be 0, that's way there
+ // is an special list for updates with priority 0
+ if (priority === 0){
+ this._appendIn(this._updates0List, callback, target, paused);
+ }else if (priority < 0){
+ this._priorityIn(this._updatesNegList, callback, target, priority, paused);
+ }else{
+ // priority > 0
+ this._priorityIn(this._updatesPosList, callback, target, priority, paused);
+ }
+ },
+
_removeHashElement:function (element) {
delete this._hashForTimers[element.target.__instanceId];
cc.arrayRemoveObject(this._arrayForTimers, element);
@@ -328,7 +371,7 @@ cc.Scheduler = cc.Class.extend(/** @lends cc.Scheduler# */{
cc.arrayRemoveObject(element.list, element.entry);
delete self._hashForUpdates[element.target.__instanceId];
- cc.arrayRemoveObject(self._arrayForUpdates, element);
+ //cc.arrayRemoveObject(self._hashForUpdates, element);
element.entry = null;
//hash entry
@@ -336,8 +379,9 @@ cc.Scheduler = cc.Class.extend(/** @lends cc.Scheduler# */{
}
},
- _priorityIn:function (ppList, target, priority, paused) {
- var self = this, listElement = new cc.ListEntry(null, null, target, priority, paused, false);
+ _priorityIn:function (ppList, callback, target, priority, paused) {
+ var self = this,
+ listElement = new cc.ListEntry(null, null, callback, target, priority, paused, false);
// empey list ?
if (!ppList) {
@@ -355,21 +399,17 @@ cc.Scheduler = cc.Class.extend(/** @lends cc.Scheduler# */{
}
//update hash entry for quick access
- var hashElement = new cc.HashUpdateEntry(ppList, listElement, target, null);
- self._arrayForUpdates.push(hashElement);
- self._hashForUpdates[target.__instanceId] = hashElement;
+ self._hashForUpdates[target.__instanceId] = new cc.HashUpdateEntry(ppList, listElement, target, null);
return ppList;
},
- _appendIn:function (ppList, target, paused) {
- var self = this, listElement = new cc.ListEntry(null, null, target, 0, paused, false);
+ _appendIn:function (ppList, callback, target, paused) {
+ var self = this, listElement = new cc.ListEntry(null, null, callback, target, 0, paused, false);
ppList.push(listElement);
//update hash entry for quicker access
- var hashElement = new cc.HashUpdateEntry(ppList, listElement, target, null);
- self._arrayForUpdates.push(hashElement);
- self._hashForUpdates[target.__instanceId] = hashElement;
+ self._hashForUpdates[target.__instanceId] = new cc.HashUpdateEntry(ppList, listElement, target, null, null);
},
//-----------------------public method-------------------------
@@ -388,7 +428,7 @@ cc.Scheduler = cc.Class.extend(/** @lends cc.Scheduler# */{
},
/**
- * returns time scale of scheduler
+ * Returns time scale of scheduler
* @return {Number}
*/
getTimeScale:function () {
@@ -400,33 +440,40 @@ cc.Scheduler = cc.Class.extend(/** @lends cc.Scheduler# */{
* @param {Number} dt delta time
*/
update:function (dt) {
- var self = this;
- var locUpdates = self._updates, locArrayForTimers = self._arrayForTimers;
- var tmpEntry, elt, i, li;
- self._updateHashLocked = true;
-
- if (this._timeScale != 1.0) {
+ this._updateHashLocked = true;
+ if(this._timeScale !== 1)
dt *= this._timeScale;
+
+ var i, list, len, entry;
+
+ for(i=0,list=this._updatesNegList, len = list.length; i
*
- * Schedules the 'update' callback_fn for a given target with a given priority.
- * The 'update' callback_fn will be called every frame.
- * The lower the priority, the earlier it is called.
- *
- * Unschedule a callback function for a given target.
- * If you want to unschedule the "update", use unscheudleUpdateForTarget.
- *
- * Unschedules all function callbacks from all targets.
- * You should NEVER call this method, unless you know what you are doing.
- *
- * Unschedules all function callbacks from all targets with a minimum priority.
- * You should only call this with kCCPriorityNonSystemMin or higher.
- *
* You should only call this with kCCPriorityNonSystemMin or higher. - * @param minPriority + * @param {Number} minPriority */ pauseAllTargetsWithMinPriority:function (minPriority) { var idsWithSelectors = []; - var self = this, element, locArrayForTimers = self._arrayForTimers, locUpdates = self._updates; + var self = this, element, locArrayForTimers = self._arrayForTimers; + var i, li; // Custom Selectors - for(var i = 0, li = locArrayForTimers.length; i < li; i++){ + for(i = 0, li = locArrayForTimers.length; i < li; i++){ element = locArrayForTimers[i]; if (element) { element.paused = true; idsWithSelectors.push(element.target); } } - for(var i = 0, li = locUpdates.length; i < li; i++){ - var updates = locUpdates[i]; - for(var j = 0, lj = updates.length; j < lj; j++){ - element = updates[j]; - if (element) { - element.paused = true; - idsWithSelectors.push(element.target); + + var entry; + if(minPriority < 0){ + for(i=0; i
* This can be useful for undoing a call to pauseAllCallbacks. - * @param targetsToResume + * @param {Array} targetsToResume */ resumeTargets:function (targetsToResume) { if (!targetsToResume) @@ -796,7 +937,95 @@ cc.Scheduler = cc.Class.extend(/** @lends cc.Scheduler# */{ if (element) { return element.paused; } + var elementUpdate = this._hashForUpdates[target.__instanceId]; + if (elementUpdate) { + return elementUpdate.entry.paused; + } return false; + }, + + /** + *
+ * Schedules the 'update' callback_fn for a given target with a given priority.
+ * The 'update' callback_fn will be called every frame.
+ * The lower the priority, the earlier it is called.
+ *
+ * Unschedule a callback function for a given target.
+ * If you want to unschedule the "update", use unscheudleUpdateForTarget.
+ *
+ * Unschedules all function callbacks from all targets.
+ * You should NEVER call this method, unless you know what you are doing.
+ *
+ * Unschedules all function callbacks from all targets with a minimum priority.
+ * You should only call this with kCCPriorityNonSystemMin or higher.
+ *
cc.AtlasNode is a subclass of cc.Node that implements the cc.RGBAProtocol and
- * cc.TextureProtocol protocol
cc.AtlasNode is a subclass of cc.Node, it knows how to render a TextureAtlas object.
* - * It knows how to render a TextureAtlas object.
- * If you are going to render a TextureAtlas consider subclassing cc.AtlasNode (or a subclass of cc.AtlasNode)
If you are going to render a TextureAtlas consider subclassing cc.AtlasNode (or a subclass of cc.AtlasNode)
+ * + *All features from cc.Node are valid
+ * + *You can create a cc.AtlasNode with an Atlas file, the width, the height of each item and the quantity of items to render
* - * All features from cc.Node are valid, plus the following features:
- * - opacity and RGB colors
Constructor function, override it to extend the construction behavior, remember to call "this._super()" in the extended "ctor" function.
* @param {String} tile * @param {Number} tileWidth * @param {Number} tileHeight * @param {Number} itemsToRender - * @example - * var node = new cc.AtlasNode("pathOfTile", 16, 16, 1); */ ctor: function (tile, tileWidth, tileHeight, itemsToRender) { - cc.NodeRGBA.prototype.ctor.call(this); - this._colorUnmodified = cc.color.WHITE; + cc.Node.prototype.ctor.call(this); this._blendFunc = {src: cc.BLEND_SRC, dst: cc.BLEND_DST}; this._ignoreContentScaleFactor = false; - itemsToRender !== undefined && this.initWithTileFile(tile, tileWidth, tileHeight, itemsToRender); }, - /** updates the Atlas (indexed vertex array). - * Shall be overridden in subclasses + _createRenderCmd: function(){ + if(cc._renderType === cc._RENDER_TYPE_CANVAS) + this._renderCmd = new cc.AtlasNode.CanvasRenderCmd(this); + else + this._renderCmd = new cc.AtlasNode.WebGLRenderCmd(this); + }, + + /** + * Updates the Atlas (indexed vertex array). + * Empty implementation, shall be overridden in subclasses + * @function */ updateAtlasValues: function () { - cc.log("cc.AtlasNode.updateAtlasValues(): Shall be overridden in subclasses"); + cc.log(cc._LogInfos.AtlasNode_updateAtlasValues); }, - /** cc.AtlasNode - RGBA protocol + /** + * Get color value of the atlas node + * @function * @return {cc.Color} */ getColor: function () { if (this._opacityModifyRGB) - return this._colorUnmodified; - return cc.NodeRGBA.prototype.getColor.call(this); + return this._renderCmd._colorUnmodified; + return cc.Node.prototype.getColor.call(this); }, /** + * Set whether color should be changed with the opacity value, + * if true, node color will change while opacity changes. + * @function * @param {Boolean} value */ setOpacityModifyRGB: function (value) { var oldColor = this.color; this._opacityModifyRGB = value; - this.color = oldColor; + this.setColor(oldColor); }, /** + * Get whether color should be changed with the opacity value + * @function * @return {Boolean} */ isOpacityModifyRGB: function () { return this._opacityModifyRGB; }, - /** cc.AtlasNode - CocosNodeTexture protocol + /** + * Get node's blend function + * @function * @return {cc.BlendFunc} */ getBlendFunc: function () { @@ -122,7 +142,9 @@ cc.AtlasNode = cc.NodeRGBA.extend(/** @lends cc.AtlasNode# */{ }, /** - * BlendFunc setter + * Set node's blend function + * This function accept either cc.BlendFunc object or source value and destination value + * @function * @param {Number | cc.BlendFunc} src * @param {Number} dst */ @@ -134,13 +156,17 @@ cc.AtlasNode = cc.NodeRGBA.extend(/** @lends cc.AtlasNode# */{ }, /** - * @param {cc.TextureAtlas} value + * Set the atlas texture + * @function + * @param {cc.TextureAtlas} value The texture */ setTextureAtlas: function (value) { this.textureAtlas = value; }, /** + * Get the atlas texture + * @function * @return {cc.TextureAtlas} */ getTextureAtlas: function () { @@ -148,6 +174,8 @@ cc.AtlasNode = cc.NodeRGBA.extend(/** @lends cc.AtlasNode# */{ }, /** + * Get the number of quads to be rendered + * @function * @return {Number} */ getQuadsToDraw: function () { @@ -155,23 +183,21 @@ cc.AtlasNode = cc.NodeRGBA.extend(/** @lends cc.AtlasNode# */{ }, /** + * Set the number of quads to be rendered + * @function * @param {Number} quadsToDraw */ setQuadsToDraw: function (quadsToDraw) { this.quadsToDraw = quadsToDraw; }, - _textureForCanvas: null, - _originalTexture: null, - - _uniformColor: null, - _colorF32Array: null, - - /** initializes an cc.AtlasNode with an Atlas file the width and height of each item and the quantity of items to render - * @param {String} tile - * @param {Number} tileWidth - * @param {Number} tileHeight - * @param {Number} itemsToRender + /** + * Initializes an cc.AtlasNode object with an atlas texture file name, the width, the height of each tile and the quantity of tiles to render + * @function + * @param {String} tile The atlas texture file name + * @param {Number} tileWidth The width of each tile + * @param {Number} tileHeight The height of each tile + * @param {Number} itemsToRender The quantity of tiles to be rendered * @return {Boolean} */ initWithTileFile: function (tile, tileWidth, tileHeight, itemsToRender) { @@ -182,216 +208,52 @@ cc.AtlasNode = cc.NodeRGBA.extend(/** @lends cc.AtlasNode# */{ }, /** - * initializes an CCAtlasNode with a texture the width and height of each item measured in points and the quantity of items to render - * @param {cc.Texture2D} texture - * @param {Number} tileWidth - * @param {Number} tileHeight - * @param {Number} itemsToRender + * Initializes an CCAtlasNode with an atlas texture, the width, the height of each tile and the quantity of tiles to render + * @function + * @param {cc.Texture2D} texture The atlas texture + * @param {Number} tileWidth The width of each tile + * @param {Number} tileHeight The height of each tile + * @param {Number} itemsToRender The quantity of tiles to be rendered * @return {Boolean} */ - initWithTexture: null, - - _initWithTextureForCanvas: function (texture, tileWidth, tileHeight, itemsToRender) { - this._itemWidth = tileWidth; - this._itemHeight = tileHeight; - - this._opacityModifyRGB = true; - this._originalTexture = texture; - if (!this._originalTexture) { - cc.log("cocos2d: Could not initialize cc.AtlasNode. Invalid Texture."); - return false; - } - this._textureForCanvas = this._originalTexture; - this._calculateMaxItems(); - - this.quadsToDraw = itemsToRender; - return true; - }, - - _initWithTextureForWebGL: function (texture, tileWidth, tileHeight, itemsToRender) { - this._itemWidth = tileWidth; - this._itemHeight = tileHeight; - this._colorUnmodified = cc.color.WHITE; - this._opacityModifyRGB = true; - - this._blendFunc.src = cc.BLEND_SRC; - this._blendFunc.dst = cc.BLEND_DST; - - var locRealColor = this._realColor; - this._colorF32Array = new Float32Array([locRealColor.r / 255.0, locRealColor.g / 255.0, locRealColor.b / 255.0, this._realOpacity / 255.0]); - this.textureAtlas = new cc.TextureAtlas(); - this.textureAtlas.initWithTexture(texture, itemsToRender); - - if (!this.textureAtlas) { - cc.log("cocos2d: Could not initialize cc.AtlasNode. Invalid Texture."); - return false; - } - - this._updateBlendFunc(); - this._updateOpacityModifyRGB(); - this._calculateMaxItems(); - this.quadsToDraw = itemsToRender; - - //shader stuff - this.shaderProgram = cc.shaderCache.programForKey(cc.SHADER_POSITION_TEXTURE_UCOLOR); - this._uniformColor = cc._renderContext.getUniformLocation(this.shaderProgram.getProgram(), "u_color"); - return true; - }, - - draw: null, - - /** - * @param {WebGLRenderingContext} ctx renderContext - */ - _drawForWebGL: function (ctx) { - var context = ctx || cc._renderContext; - cc.nodeDrawSetup(this); - cc.glBlendFunc(this._blendFunc.src, this._blendFunc.dst); - context.uniform4fv(this._uniformColor, this._colorF32Array); - this.textureAtlas.drawNumberOfQuads(this.quadsToDraw, 0); + initWithTexture: function(texture, tileWidth, tileHeight, itemsToRender){ + return this._renderCmd.initWithTexture(texture, tileWidth, tileHeight, itemsToRender); }, /** + * Set node's color * @function - * @param {cc.Color} color3 + * @param {cc.Color} color Color object created with cc.color(r, g, b). */ - setColor: null, - - _setColorForCanvas: function (color3) { - var locRealColor = this._realColor; - if ((locRealColor.r == color3.r) && (locRealColor.g == color3.g) && (locRealColor.b == color3.b)) - return; - var temp = cc.color(color3.r, color3.g, color3.b); - this._colorUnmodified = color3; - - if (this._opacityModifyRGB) { - var locDisplayedOpacity = this._displayedOpacity; - temp.r = temp.r * locDisplayedOpacity / 255; - temp.g = temp.g * locDisplayedOpacity / 255; - temp.b = temp.b * locDisplayedOpacity / 255; - } - cc.NodeRGBA.prototype.setColor.call(this, color3); - - if (this.texture) { - var element = this._originalTexture.getHtmlElementObj(); - if (!element) - return; - var cacheTextureForColor = cc.textureCache.getTextureColors(element); - if (cacheTextureForColor) { - var textureRect = cc.rect(0, 0, element.width, element.height); - element = cc.generateTintImage(element, cacheTextureForColor, this._realColor, textureRect); - var locTexture = new cc.Texture2D(); - locTexture.initWithElement(element); - locTexture.handleLoadedTexture(); - this.texture = locTexture; - } - } - }, - - _setColorForWebGL: function (color3) { - var temp = cc.color(color3.r, color3.g, color3.b); - this._colorUnmodified = color3; - var locDisplayedOpacity = this._displayedOpacity; - if (this._opacityModifyRGB) { - temp.r = temp.r * locDisplayedOpacity / 255; - temp.g = temp.g * locDisplayedOpacity / 255; - temp.b = temp.b * locDisplayedOpacity / 255; - } - cc.NodeRGBA.prototype.setColor.call(this, color3); - var locDisplayedColor = this._displayedColor; - this._colorF32Array = new Float32Array([locDisplayedColor.r / 255.0, locDisplayedColor.g / 255.0, - locDisplayedColor.b / 255.0, locDisplayedOpacity / 255.0]); + setColor: function(color){ + this._renderCmd.setColor(color); }, /** + * Set node's opacity * @function - * @param {Number} opacity + * @param {Number} opacity The opacity value */ setOpacity: function (opacity) { + this._renderCmd.setOpacity(opacity); }, - _setOpacityForCanvas: function (opacity) { - cc.NodeRGBA.prototype.setOpacity.call(this, opacity); - // special opacity for premultiplied textures - if (this._opacityModifyRGB) { - this.color = this._colorUnmodified; - } - }, - - _setOpacityForWebGL: function (opacity) { - cc.NodeRGBA.prototype.setOpacity.call(this, opacity); - // special opacity for premultiplied textures - if (this._opacityModifyRGB) { - this.color = this._colorUnmodified; - } else { - var locDisplayedColor = this._displayedColor; - this._colorF32Array = new Float32Array([locDisplayedColor.r / 255.0, locDisplayedColor.g / 255.0, - locDisplayedColor.b / 255.0, this._displayedOpacity / 255.0]); - } - }, - - // cc.Texture protocol /** - * returns the used texture + * Get the current texture * @function * @return {cc.Texture2D} */ - getTexture: null, - - _getTextureForCanvas: function () { - return this._textureForCanvas; - }, - - _getTextureForWebGL: function () { - return this.textureAtlas.texture; + getTexture: function(){ + return this._renderCmd.getTexture(); }, /** - * sets a new texture. it will be retained + * Replace the current texture with a new one * @function - * @param {cc.Texture2D} texture + * @param {cc.Texture2D} texture The new texture */ - setTexture: null, - - _setTextureForCanvas: function (texture) { - this._textureForCanvas = texture; - }, - - _setTextureForWebGL: function (texture) { - this.textureAtlas.texture = texture; - this._updateBlendFunc(); - this._updateOpacityModifyRGB(); - }, - - _calculateMaxItems: null, - - _calculateMaxItemsForCanvas: function () { - var selTexture = this.texture; - var size = selTexture.getContentSize(); - - this._itemsPerColumn = 0 | (size.height / this._itemHeight); - this._itemsPerRow = 0 | (size.width / this._itemWidth); - }, - - _calculateMaxItemsForWebGL: function () { - var selTexture = this.texture; - var size = selTexture.getContentSize(); - if (this._ignoreContentScaleFactor) - size = selTexture.getContentSizeInPixels(); - - this._itemsPerColumn = 0 | (size.height / this._itemHeight); - this._itemsPerRow = 0 | (size.width / this._itemWidth); - }, - - _updateBlendFunc: function () { - if (!this.textureAtlas.texture.hasPremultipliedAlpha()) { - this._blendFunc.src = cc.SRC_ALPHA; - this._blendFunc.dst = cc.ONE_MINUS_SRC_ALPHA; - } - }, - - _updateOpacityModifyRGB: function () { - this._opacityModifyRGB = this.textureAtlas.texture.hasPremultipliedAlpha(); + setTexture: function(texture){ + this._renderCmd.setTexture(texture); }, _setIgnoreContentScaleFactor: function (ignoreContentScaleFactor) { @@ -399,25 +261,8 @@ cc.AtlasNode = cc.NodeRGBA.extend(/** @lends cc.AtlasNode# */{ } }); -var _p = cc.AtlasNode.prototype; -if (cc._renderType === cc._RENDER_TYPE_WEBGL) { - _p.initWithTexture = _p._initWithTextureForWebGL; - _p.draw = _p._drawForWebGL; - _p.setColor = _p._setColorForWebGL; - _p.setOpacity = _p._setOpacityForWebGL; - _p.getTexture = _p._getTextureForWebGL; - _p.setTexture = _p._setTextureForWebGL; - _p._calculateMaxItems = _p._calculateMaxItemsForWebGL; -} else { - _p.initWithTexture = _p._initWithTextureForCanvas; - _p.draw = cc.Node.prototype.draw; - _p.setColor = _p._setColorForCanvas; - _p.setOpacity = _p._setOpacityForCanvas; - _p.getTexture = _p._getTextureForCanvas; - _p.setTexture = _p._setTextureForCanvas; - _p._calculateMaxItems = _p._calculateMaxItemsForCanvas; -} +var _p = cc.AtlasNode.prototype; // Override properties cc.defineGetterSetter(_p, "opacity", _p.getOpacity, _p.setOpacity); cc.defineGetterSetter(_p, "color", _p.getColor, _p.setColor); @@ -431,18 +276,19 @@ _p.textureAtlas; /** @expose */ _p.quadsToDraw; +cc.EventHelper.prototype.apply(_p); -/** creates a cc.AtlasNode with an Atlas file the width and height of each item and the quantity of items to render +/** + * Creates a cc.AtlasNode with an Atlas file the width and height of each item and the quantity of items to render + * @deprecated since v3.0, please use new construction instead + * @function + * @static * @param {String} tile * @param {Number} tileWidth * @param {Number} tileHeight * @param {Number} itemsToRender * @return {cc.AtlasNode} - * @example - * // example - * var node = cc.AtlasNode.create("pathOfTile", 16, 16, 1); */ cc.AtlasNode.create = function (tile, tileWidth, tileHeight, itemsToRender) { return new cc.AtlasNode(tile, tileWidth, tileHeight, itemsToRender); -}; - +}; \ No newline at end of file diff --git a/cocos2d/core/base-nodes/CCAtlasNodeCanvasRenderCmd.js b/cocos2d/core/base-nodes/CCAtlasNodeCanvasRenderCmd.js new file mode 100644 index 0000000000..64e557c966 --- /dev/null +++ b/cocos2d/core/base-nodes/CCAtlasNodeCanvasRenderCmd.js @@ -0,0 +1,138 @@ +/**************************************************************************** + Copyright (c) 2013-2014 Chukong Technologies Inc. + + http://www.cocos2d-x.org + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + ****************************************************************************/ + +/** + * cc.AtlasNode's rendering objects of Canvas + */ +(function(){ + cc.AtlasNode.CanvasRenderCmd = function(renderableObject){ + cc.Node.CanvasRenderCmd.call(this, renderableObject); + this._needDraw = false; + this._colorUnmodified = cc.color.WHITE; + this._originalTexture = null; + this._texture = null; + }; + + var proto = cc.AtlasNode.CanvasRenderCmd.prototype = Object.create(cc.Node.CanvasRenderCmd.prototype); + proto.constructor = cc.AtlasNode.CanvasRenderCmd; + + proto.initWithTexture = function(texture, tileWidth, tileHeight, itemsToRender){ + var node = this._node; + node._itemWidth = tileWidth; + node._itemHeight = tileHeight; + + node._opacityModifyRGB = true; + this._originalTexture = texture; + if (!this._originalTexture) { + cc.log(cc._LogInfos.AtlasNode__initWithTexture); + return false; + } + this._texture = this._originalTexture; + this._calculateMaxItems(); + + node.quadsToDraw = itemsToRender; + return true; + }; + + proto.setColor = function(color3){ + var node = this._node; + var locRealColor = node._realColor; + if ((locRealColor.r === color3.r) && (locRealColor.g === color3.g) && (locRealColor.b === color3.b)) + return; + this._colorUnmodified = color3; + this._changeTextureColor(); + }; + + if(cc.sys._supportCanvasNewBlendModes) + proto._changeTextureColor = function(){ + var node = this._node; + var locTexture = node.getTexture(); + if (locTexture && this._originalTexture) { + var element = this._originalTexture.getHtmlElementObj(); + if(!element) + return; + var locElement = locTexture.getHtmlElementObj(); + var textureRect = cc.rect(0, 0, element.width, element.height); + if (locElement instanceof HTMLCanvasElement) + cc.Sprite.CanvasRenderCmd._generateTintImageWithMultiply(element, this._colorUnmodified, textureRect, locElement); + else { + locElement = cc.Sprite.CanvasRenderCmd._generateTintImageWithMultiply(element, this._colorUnmodified, textureRect); + locTexture = new cc.Texture2D(); + locTexture.initWithElement(locElement); + locTexture.handleLoadedTexture(); + node.setTexture(locTexture); + } + } + }; + else + proto._changeTextureColor = function(){ + var node = this._node; + var locElement, locTexture = node.getTexture(); + if (locTexture && this._originalTexture) { + locElement = locTexture.getHtmlElementObj(); + if (!locElement) + return; + var element = this._originalTexture.getHtmlElementObj(); + var cacheTextureForColor = cc.textureCache.getTextureColors(element); + if (cacheTextureForColor) { + var textureRect = cc.rect(0, 0, element.width, element.height); + if (locElement instanceof HTMLCanvasElement) + cc.Sprite.CanvasRenderCmd._generateTintImage(locElement, cacheTextureForColor, this._displayedColor, textureRect, locElement); + else { + locElement = cc.Sprite.CanvasRenderCmd._generateTintImage(locElement, cacheTextureForColor, this._displayedColor, textureRect); + locTexture = new cc.Texture2D(); + locTexture.initWithElement(locElement); + locTexture.handleLoadedTexture(); + node.setTexture(locTexture); + } + } + } + }; + + proto.setOpacity = function(opacity){ + var node = this._node; + cc.Node.prototype.setOpacity.call(node, opacity); + // special opacity for premultiplied textures + //if (node._opacityModifyRGB) { + // node.color = this._colorUnmodified; + //} + }; + + proto.getTexture = function(){ + return this._texture; + }; + + proto.setTexture = function (texture) { + this._texture = texture; + }; + + proto._calculateMaxItems = function(){ + var node = this._node; + var selTexture = this._texture; + var size = selTexture.getContentSize(); + + node._itemsPerColumn = 0 | (size.height / node._itemHeight); + node._itemsPerRow = 0 | (size.width / node._itemWidth); + }; +})(); diff --git a/cocos2d/core/base-nodes/CCAtlasNodeWebGLRenderCmd.js b/cocos2d/core/base-nodes/CCAtlasNodeWebGLRenderCmd.js new file mode 100644 index 0000000000..d398f20eef --- /dev/null +++ b/cocos2d/core/base-nodes/CCAtlasNodeWebGLRenderCmd.js @@ -0,0 +1,145 @@ +/**************************************************************************** + Copyright (c) 2013-2014 Chukong Technologies Inc. + + http://www.cocos2d-x.org + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + ****************************************************************************/ + +/** + * cc.AtlasNode's rendering objects of WebGL + */ +(function(){ + cc.AtlasNode.WebGLRenderCmd = function(renderableObject){ + cc.Node.WebGLRenderCmd.call(this, renderableObject); + this._needDraw = true; + this._textureAtlas = null; + this._colorUnmodified = cc.color.WHITE; + this._colorF32Array = null; + this._uniformColor = null; + + //shader stuff + this._shaderProgram = cc.shaderCache.programForKey(cc.SHADER_POSITION_TEXTURE_UCOLOR); + this._uniformColor = cc._renderContext.getUniformLocation(this._shaderProgram.getProgram(), "u_color"); + }; + + var proto = cc.AtlasNode.WebGLRenderCmd.prototype = Object.create(cc.Node.WebGLRenderCmd.prototype); + proto.constructor = cc.AtlasNode.WebGLRenderCmd; + + proto._updateBlendFunc = function () { + var node = this._node; + if (!this._textureAtlas.texture.hasPremultipliedAlpha()) { + node._blendFunc.src = cc.SRC_ALPHA; + node._blendFunc.dst = cc.ONE_MINUS_SRC_ALPHA; + } + }; + + proto._updateOpacityModifyRGB = function () { + this._node._opacityModifyRGB = this._textureAtlas.texture.hasPremultipliedAlpha(); + }; + + proto.rendering = function (ctx) { + var context = ctx || cc._renderContext, node = this._node; + + this._shaderProgram.use(); + this._shaderProgram._setUniformForMVPMatrixWithMat4(this._stackMatrix); + + cc.glBlendFunc(node._blendFunc.src, node._blendFunc.dst); + if (this._uniformColor && this._colorF32Array) { + context.uniform4fv(this._uniformColor, this._colorF32Array); + this._textureAtlas.drawNumberOfQuads(node.quadsToDraw, 0); + } + }; + + proto.initWithTexture = function(texture, tileWidth, tileHeight, itemsToRender){ + var node = this._node; + node._itemWidth = tileWidth; + node._itemHeight = tileHeight; + this._colorUnmodified = cc.color.WHITE; + node._opacityModifyRGB = true; + + node._blendFunc.src = cc.BLEND_SRC; + node._blendFunc.dst = cc.BLEND_DST; + + var locRealColor = node._realColor; + this._colorF32Array = new Float32Array([locRealColor.r / 255.0, locRealColor.g / 255.0, locRealColor.b / 255.0, node._realOpacity / 255.0]); + this._textureAtlas = new cc.TextureAtlas(); + this._textureAtlas.initWithTexture(texture, itemsToRender); + + if (!this._textureAtlas) { + cc.log(cc._LogInfos.AtlasNode__initWithTexture); + return false; + } + + this._updateBlendFunc(); + this._updateOpacityModifyRGB(); + this._calculateMaxItems(); + node.quadsToDraw = itemsToRender; + + return true; + }; + + proto.setColor = function(color3){ + var temp = cc.color(color3.r, color3.g, color3.b), node = this._node; + this._colorUnmodified = color3; + var locDisplayedOpacity = this._displayedOpacity; + if (node._opacityModifyRGB) { + temp.r = temp.r * locDisplayedOpacity / 255; + temp.g = temp.g * locDisplayedOpacity / 255; + temp.b = temp.b * locDisplayedOpacity / 255; + } + cc.Node.prototype.setColor.call(node, temp); + }; + + proto.setOpacity = function(opacity){ + var node = this._node; + cc.Node.prototype.setOpacity.call(node, opacity); + // special opacity for premultiplied textures + if (node._opacityModifyRGB) { + node.color = this._colorUnmodified; + } + }; + + proto._updateColor = function(){ + var locDisplayedColor = this._displayedColor; + this._colorF32Array = new Float32Array([locDisplayedColor.r / 255.0, locDisplayedColor.g / 255.0, + locDisplayedColor.b / 255.0, this._displayedOpacity / 255.0]); + }; + + proto.getTexture = function(){ + return this._textureAtlas.texture; + }; + + proto.setTexture = function(texture){ + this._textureAtlas.texture = texture; + this._updateBlendFunc(); + this._updateOpacityModifyRGB(); + }; + + proto._calculateMaxItems = function(){ + var node = this._node; + var selTexture = this._textureAtlas.texture; + var size = selTexture.getContentSize(); + if (node._ignoreContentScaleFactor) + size = selTexture.getContentSizeInPixels(); + + node._itemsPerColumn = 0 | (size.height / node._itemHeight); + node._itemsPerRow = 0 | (size.width / node._itemWidth); + }; +})(); \ No newline at end of file diff --git a/cocos2d/core/base-nodes/CCNode.js b/cocos2d/core/base-nodes/CCNode.js index 8435931689..5184a42b9c 100644 --- a/cocos2d/core/base-nodes/CCNode.js +++ b/cocos2d/core/base-nodes/CCNode.js @@ -1,7 +1,7 @@ /**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2008-2010 Ricardo Quesada - Copyright (c) 2011 Zynga Inc. + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -30,104 +30,103 @@ * @type Number */ cc.NODE_TAG_INVALID = -1; -/** - * Node on enter - * @constant - */ -cc.NODE_ON_ENTER = null; -/** - * Node on exit - * @constant - */ -cc.NODE_ON_EXIT = null; /** - * XXX: Yes, nodes might have a sort problem once every 15 days if the game runs at 60 FPS and each frame sprites are reordered. - * @type Number + * XXX: Yes, nodes might have a sort problem once every 15 days if the game runs at 60 FPS and each frame sprites are reordered. */ cc.s_globalOrderOfArrival = 1; -/**cc.Node is the main element. Anything thats gets drawn or contains things that get drawn is a cc.Node.
- The most popular cc.Nodes are: cc.Scene, cc.Layer, cc.Sprite, cc.Menu.
The main features of a cc.Node are:
- - They can contain other cc.Node nodes (addChild, getChildByTag, removeChild, etc)
- - They can schedule periodic callback (schedule, unschedule, etc)
- - They can execute actions (runAction, stopAction, etc)
Some cc.Node nodes provide extra functionality for them or their children.
- -Subclassing a cc.Node usually means (one/all) of:
- - overriding init to initialize resources and schedule callbacks
- - create callbacks to handle the advancement of time
- - overriding draw to render the node
Features of cc.Node:
- - position
- - scale (x, y)
- - rotation (in degrees, clockwise)
- - anchor point
- - size
- - visible
- - z-order
- - openGL z position
Default values:
- - rotation: 0
- - position: (x=0,y=0)
- - scale: (x=1,y=1)
- - contentSize: (x=0,y=0)
- - anchorPoint: (x=0,y=0)
Limitations:
- - A cc.Node is a "void" object. It doesn't have a texture
Order in transformations with grid disabled
- -# The node will be translated (position)
- -# The node will be rotated (rotation)
- -# The node will be scaled (scale)
-
-
Order in transformations with grid enabled
- -# The node will be translated (position)
- -# The node will be rotated (rotation)
- -# The node will be scaled (scale)
- -# The grid will capture the screen
- -# The node will be moved according to the camera values (camera)
- -# The grid will render the captured screen
cc.Node is the root class of all node. Anything that gets drawn or contains things that get drawn is a cc.Node.
+ * The most popular cc.Nodes are: cc.Scene, cc.Layer, cc.Sprite, cc.Menu.
The main features of a cc.Node are:
+ * - They can contain other cc.Node nodes (addChild, getChildByTag, removeChild, etc)
+ * - They can schedule periodic callback (schedule, unschedule, etc)
+ * - They can execute actions (runAction, stopAction, etc)
Some cc.Node nodes provide extra functionality for them or their children.
+ * + *Subclassing a cc.Node usually means (one/all) of:
+ * - overriding constructor function "ctor" to initialize resources and schedule callbacks
+ * - create callbacks to handle the advancement of time
Features of cc.Node:
+ * - position
+ * - scale (x, y)
+ * - rotation (in degrees, clockwise)
+ * - anchor point
+ * - size
+ * - color
+ * - opacity
+ * - visible
+ * - z-order
+ * - WebGL z position
Default values:
+ * - rotation: 0
+ * - position: (x=0,y=0)
+ * - scale: (x=1,y=1)
+ * - contentSize: (x=0,y=0)
+ * - anchorPoint: (x=0,y=0)
+ * - color: (r=255,g=255,b=255)
+ * - opacity: 255
Limitations:
+ * - A cc.Node is a "void" object. It doesn't have a texture
Order in transformations with grid disabled
+ * -# The node will be translated (position)
+ * -# The node will be rotated (rotation)
+ * -# The node will be scaled (scale)
+ *
+ *
Order in transformations with grid enabled
+ * -# The node will be translated (position)
+ * -# The node will be rotated (rotation)
+ * -# The node will be scaled (scale)
+ * -# The grid will capture the screen
+ * -# The node will be moved according to the camera values (camera)
+ * -# The grid will render the captured screen
Properties configuration function + * All properties in attrs will be set to the node, + * when the setter of the node is available, + * the property will be set via setter function. + *
+ * @function * @param {Object} attrs Properties to be set to node */ attr: function (attrs) { @@ -301,12 +308,13 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{ }, /** - *get the skew degrees in X
- * The X skew angle of the node in degrees.
- * This angle describes the shear distortion in the X direction.
- * Thus, it is the angle between the Y axis and the left edge of the shape
- * The default skewX angle is 0. Positive values distort the node in a CW direction.
- *
Returns the skew degrees in X
+ * The X skew angle of the node in degrees.
+ * This angle describes the shear distortion in the X direction.
+ * Thus, it is the angle between the Y axis and the left edge of the shape
+ * The default skewX angle is 0. Positive values distort the node in a CW direction.
+ *
- * Changes the X skew angle of the node in degrees.
- *
- * This angle describes the shear distortion in the X direction.
- * Thus, it is the angle between the Y axis and the left edge of the shape
- * The default skewX angle is 0. Positive values distort the node in a CW direction.
+ * Changes the X skew angle of the node in degrees.
+ *
+ * This angle describes the shear distortion in the X direction.
+ * Thus, it is the angle between the Y axis and the left edge of the shape
+ * The default skewX angle is 0. Positive values distort the node in a CW direction.
*
get the skew degrees in Y
+ *
Returns the skew degrees in Y
* The Y skew angle of the node in degrees.
* This angle describes the shear distortion in the Y direction.
* Thus, it is the angle between the X axis and the bottom edge of the shape
* The default skewY angle is 0. Positive values distort the node in a CCW direction.
*
* The default skewY angle is 0. Positive values distort the node in a CCW direction.
* + * @function * @param {Number} newSkewY The Y skew angle of the node in degrees. */ setSkewY: function (newSkewY) { this._skewY = newSkewY; - this.setNodeDirty(); + this._renderCmd.setDirtyFlag(cc.Node._dirtyFlags.transformDirty); }, /** @@ -362,10 +373,12 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{ * The Node's parent will sort all its children based ont the LocalZOrder value.
* If two nodes have the same LocalZOrder, then the node that was added first to the children's array
* will be in front of the other node in the array.
- *
- * Also, the Scene Graph is traversed using the "In-Order" tree traversal algorithm ( http://en.wikipedia.org/wiki/Tree_traversal#In-order )
+ *
+ * Also, the Scene Graph is traversed using the "In-Order" tree traversal algorithm ( http://en.wikipedia.org/wiki/Tree_traversal#In-order ) + *
* And Nodes that have LocalZOder values < 0 are the "left" subtree
* While Nodes with LocalZOder >=0 are the "right" subtree. + * @function * @param {Number} localZOrder */ setLocalZOrder: function (localZOrder) { @@ -375,17 +388,14 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{ cc.eventManager._setDirtyForNode(this); }, - /** - * Helper function used by `setLocalZOrder`. Don't use it unless you know what you are doing. - * @param {Number} localZOrder - * @private - */ + //Helper function used by `setLocalZOrder`. Don't use it unless you know what you are doing. _setLocalZOrder: function (localZOrder) { this._localZOrder = localZOrder; }, /** - * Gets the local Z order of this node. + * Returns the local Z order of this node. + * @function * @returns {Number} The local (relative to its siblings) Z order. */ getLocalZOrder: function () { @@ -393,9 +403,10 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{ }, /** - * zOrder getter + * Returns z order of this node + * @function * @return {Number} - * @deprecated + * @deprecated since 3.0, please use getLocalZOrder instead */ getZOrder: function () { cc.log(cc._LogInfos.Node_getZOrder); @@ -411,8 +422,9 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{ * The larger number it is, the later this node will be drawn in each message loop.
* Please refer to setVertexZ(float) for the difference. * + * @function * @param {Number} z Z order of this node. - * @deprecated + * @deprecated since 3.0, please use setLocalZOrder instead */ setZOrder: function (z) { cc.log(cc._LogInfos.Node_setZOrder); @@ -432,17 +444,19 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{ *
* Limitations: Global Z Order can't be used used by Nodes that have SpriteBatchNode as one of their ancestors.
* And if ClippingNode is one of the ancestors, then "global Z order" will be relative to the ClippingNode. + * @function * @param {Number} globalZOrder */ setGlobalZOrder: function (globalZOrder) { - if (this._globalZOrder != globalZOrder) { + if (this._globalZOrder !== globalZOrder) { this._globalZOrder = globalZOrder; cc.eventManager._setDirtyForNode(this); } }, /** - * Returns the Node's Global Z Order. + * Return the Node's Global Z Order. + * @function * @returns {number} The node's global Z order */ getGlobalZOrder: function () { @@ -450,7 +464,8 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{ }, /** - * Gets WebGL Z vertex of this node. + * Returns WebGL Z vertex of this node. + * @function * @return {Number} WebGL Z vertex of this node */ getVertexZ: function () { @@ -462,12 +477,13 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{ * Sets the real WebGL Z vertex.
*
* Differences between openGL Z vertex and cocos2d Z order:
- * - OpenGL Z modifies the Z vertex, and not the Z order in the relation between parent-children
- * - OpenGL Z might require to set 2D projection
- * - cocos2d Z order works OK if all the nodes uses the same openGL Z vertex. eg: vertexZ = 0
+ * - WebGL Z modifies the Z vertex, and not the Z order in the relation between parent-children
+ * - WebGL Z might require to set 2D projection
+ * - cocos2d Z order works OK if all the nodes uses the same WebGL Z vertex. eg: vertexZ = 0
*
* @warning Use it at your own risk since it might break the cocos2d parent-children z order * + * @function * @param {Number} Var */ setVertexZ: function (Var) { @@ -475,7 +491,8 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{ }, /** - * The rotation (angle) of the node in degrees. 0 is the default rotation angle. Positive values rotate node CW. + * Returns the rotation (angle) of the node in degrees. 0 is the default rotation angle. Positive values rotate node clockwise. + * @function * @return {Number} The rotation of the node in degrees. */ getRotation: function () { @@ -491,19 +508,19 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{ * 0 is the default rotation angle.
* Positive values rotate node clockwise, and negative values for anti-clockwise. * + * @function * @param {Number} newRotation The rotation of the node in degrees. */ setRotation: function (newRotation) { this._rotationX = this._rotationY = newRotation; - this._rotationRadiansX = this._rotationX * 0.017453292519943295; //(Math.PI / 180); - this._rotationRadiansY = this._rotationY * 0.017453292519943295; //(Math.PI / 180); - this.setNodeDirty(); + this._renderCmd.setDirtyFlag(cc.Node._dirtyFlags.transformDirty); }, /** - * The rotation (angle) of the node in degrees. 0 is the default rotation angle.
- * Positive values rotate node CW. It only modifies the X rotation performing a horizontal rotational skew . - * (support only in WebGl rendering mode) + * Returns the X axis rotation (angle) which represent a horizontal rotational skew of the node in degrees.
+ * 0 is the default rotation angle. Positive values rotate node clockwise
+ * (support only in WebGL rendering mode) + * @function * @return {Number} The X rotation in degrees. */ getRotationX: function () { @@ -513,7 +530,7 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{ /** *
* Sets the X rotation (angle) of the node in degrees which performs a horizontal rotational skew.
- *
+ * (support only in WebGL rendering mode)
* 0 is the default rotation angle.
* Positive values rotate node clockwise, and negative values for anti-clockwise.
*
- * Positive values rotate node CW. It only modifies the Y rotation performing a vertical rotational skew . + * Returns the Y axis rotation (angle) which represent a vertical rotational skew of the node in degrees.
+ * 0 is the default rotation angle. Positive values rotate node clockwise
+ * (support only in WebGL rendering mode) + * @function * @return {Number} The Y rotation in degrees. */ getRotationY: function () { @@ -537,21 +555,22 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{ /** *
* Sets the Y rotation (angle) of the node in degrees which performs a vertical rotational skew.
- *
- * 0 is the default rotation angle.
- * Positive values rotate node clockwise, and negative values for anti-clockwise.
+ * (support only in WebGL rendering mode)
+ * 0 is the default rotation angle.
+ * Positive values rotate node clockwise, and negative values for anti-clockwise.
*
* Changes the scale factor on X axis of this node
- * The deafult value is 1.0 if you haven't changed it before
+ * The default value is 1.0 if you haven't changed it before
*
* The Default value is 1.0 if you haven't changed it before. * + * @function * @param {Number} newScaleY The scale factor on Y axis. */ setScaleY: function (newScaleY) { this._scaleY = newScaleY; - this.setNodeDirty(); + this._renderCmd.setDirtyFlag(cc.Node._dirtyFlags.transformDirty); }, /** *
- * Changes the position (x,y) of the node in OpenGL coordinates
- * Usually we use ccp(x,y) to compose CCPoint object.
- * The original point (0,0) is at the left-bottom corner of screen.
- * and Passing two numbers (x,y) is much efficient than passing CCPoint object.
+ * Changes the position (x,y) of the node in cocos2d coordinates.
+ * The original point (0,0) is at the left-bottom corner of screen.
+ * Usually we use cc.p(x,y) to compose CCPoint object.
+ * and Passing two numbers (x,y) is more efficient than passing CCPoint object.
*
+ * Sets the position (x,y) using values between 0 and 1.
+ * The positions in pixels is calculated like the following:
+ * _position = _normalizedPosition * parent.getContentSize()
+ *
Position (x,y) of the node in OpenGL coordinates. (0,0) is the left-bottom corner.
- * @const + *Returns a copy of the position (x,y) of the node in cocos2d coordinates. (0,0) is the left-bottom corner.
+ * @function * @return {cc.Point} The position (x,y) of the node in OpenGL coordinates */ getPosition: function () { @@ -645,6 +697,16 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{ }, /** + * returns the normalized position + * @returns {cc.Point} + */ + getNormalizedPosition: function(){ + return cc.p(this._normalizedPosition); + }, + + /** + *Returns the x axis position of the node in cocos2d coordinates.
+ * @function * @return {Number} */ getPositionX: function () { @@ -652,14 +714,18 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{ }, /** - * @param {Number} x + *Sets the x axis position of the node in cocos2d coordinates.
+ * @function + * @param {Number} x The new position in x axis */ setPositionX: function (x) { this._position.x = x; - this.setNodeDirty(); + this._renderCmd.setDirtyFlag(cc.Node._dirtyFlags.transformDirty); }, /** + *Returns the y axis position of the node in cocos2d coordinates.
+ * @function * @return {Number} */ getPositionY: function () { @@ -667,15 +733,18 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{ }, /** - * @param {Number} y + *Sets the y axis position of the node in cocos2d coordinates.
+ * @function + * @param {Number} y The new position in y axis */ setPositionY: function (y) { this._position.y = y; - this.setNodeDirty(); + this._renderCmd.setDirtyFlag(cc.Node._dirtyFlags.transformDirty); }, /** - * Get the amount of children. + * Returns the amount of children. + * @function * @return {Number} The amount of children. */ getChildrenCount: function () { @@ -683,23 +752,25 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{ }, /** - * Return an array of children+ * Returns an array of all children
* Composing a "tree" structure is a very important feature of CCNode + * @function * @return {Array} An array of children * @example * //This sample code traverses all children nodes, and set their position to (0,0) * var allChildren = parent.getChildren(); - * for(var i = 0; i< allChildren.length; i++) { - * allChildren[i].setPosition(0,0); - * } + * for(var i = 0; i< allChildren.length; i++) { + * allChildren[i].setPosition(0,0); + * } */ getChildren: function () { return this._children; }, /** - * Determines if the node is visible - * @see setVisible(bool) + * Returns if the node is visible + * @function + * @see cc.Node#setVisible * @return {Boolean} true if the node is visible, false if the node is hidden. */ isVisible: function () { @@ -708,39 +779,46 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{ /** * Sets whether the node is visible
- * The default value is true, a node is default to visible - * @param {Boolean} Var true if the node is visible, false if the node is hidden. - */ - setVisible: function (Var) { - this._visible = Var; - this.setNodeDirty(); + * The default value is true + * @function + * @param {Boolean} visible Pass true to make the node visible, false to hide the node. + */ + setVisible: function (visible) { + if(this._visible !== visible){ + this._visible = visible; + //if(visible) + this._renderCmd.setDirtyFlag(cc.Node._dirtyFlags.transformDirty); + cc.renderer.childrenOrderDirty = true; + } }, /** - *
anchorPoint is the point around which all transformations and positioning manipulations take place.
+ *
Returns a copy of the anchor point.
+ * Anchor point is the point around which all transformations and positioning manipulations take place.
* It's like a pin in the node where it is "attached" to its parent.
* The anchorPoint is normalized, like a percentage. (0,0) means the bottom-left corner and (1,1) means the top-right corner.
* But you can use values higher than (1,1) and lower than (0,0) too.
- * The default anchorPoint is (0.5,0.5), so it starts in the center of the node.
+ * @function * @return {cc.Point} The anchor point of node. */ getAnchorPoint: function () { - return this._anchorPoint; + return cc.p(this._anchorPoint); }, /** *
* Sets the anchor point in percent.
*
- * anchorPoint is the point around which all transformations and positioning manipulations take place.
+ * anchor point is the point around which all transformations and positioning manipulations take place.
* It's like a pin in the node where it is "attached" to its parent.
* The anchorPoint is normalized, like a percentage. (0,0) means the bottom-left corner and (1,1) means the top-right corner.
* But you can use values higher than (1,1) and lower than (0,0) too.
- * The default anchorPoint is (0.5,0.5), so it starts in the center of the node.
+ * The default anchor point is (0.5,0.5), so it starts at the center of the node.
*
- * you can only read it. If you wish to modify it, use anchorPoint instead - * @see getAnchorPoint() - * @const + * Returns a copy of the anchor point in absolute pixels.
+ * you can only read it. If you wish to modify it, use setAnchorPoint + * @see cc.Node#getAnchorPoint + * @function * @return {cc.Point} The anchor point in absolute pixels. */ getAnchorPointInPoints: function () { - return this._anchorPointInPoints; + return this._renderCmd.getAnchorPointInPoints(); }, _getWidth: function () { @@ -811,27 +869,25 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{ }, _setWidth: function (width) { this._contentSize.width = width; - this._anchorPointInPoints.x = width * this._anchorPoint.x; - this.setNodeDirty(); + this._renderCmd._updateAnchorPointInPoint(); }, _getHeight: function () { return this._contentSize.height; }, _setHeight: function (height) { this._contentSize.height = height; - this._anchorPointInPoints.y = height * this._anchorPoint.y; - this.setNodeDirty(); + this._renderCmd._updateAnchorPointInPoint(); }, /** - *
The untransformed size of the node.
+ *
Returns a copy the untransformed size of the node.
* The contentSize remains the same no matter the node is scaled or rotated.
- * All nodes has a size. Layer and Scene has the same size of the screen.
+ * @function * @return {cc.Size} The untransformed size of the node. */ getContentSize: function () { - return this._contentSize; + return cc.size(this._contentSize); }, /** @@ -841,6 +897,7 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{ * The contentSize remains the same no matter the node is scaled or rotated.
* All nodes has a size. Layer and Scene has the same size of the screen. * + * @function * @param {cc.Size|Number} size The untransformed size of the node or The untransformed size's width of the node. * @param {Number} [height] The untransformed size's height of the node. */ @@ -857,10 +914,7 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{ locContentSize.width = size; locContentSize.height = height; } - var locAPP = this._anchorPointInPoints, locAnchorPoint = this._anchorPoint; - locAPP.x = locContentSize.width * locAnchorPoint.x; - locAPP.y = locContentSize.height * locAnchorPoint.y; - this.setNodeDirty(); + this._renderCmd._updateAnchorPointInPoint(); }, /** @@ -868,6 +922,7 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{ * Returns whether or not the node accepts event callbacks.
* Running means the node accept event callbacks like onEnter(), onExit(), update() * + * @function * @return {Boolean} Whether or not the node is running. */ isRunning: function () { @@ -875,8 +930,9 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{ }, /** - * Returns a pointer to the parent node - * @return {cc.Node} A pointer to the parent node + * Returns a reference to the parent node + * @function + * @return {cc.Node} A reference to the parent node */ getParent: function () { return this._parent; @@ -884,16 +940,18 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{ /** * Sets the parent node - * @param {cc.Node} Var A pointer to the parent node + * @param {cc.Node} parent A reference to the parent node */ - setParent: function (Var) { - this._parent = Var; + setParent: function (parent) { + this._parent = parent; }, /** - * Gets whether the anchor point will be (0,0) when you position this node. - * @see ignoreAnchorPointForPosition(bool) - * @return {Boolean} true if the anchor point will be (0,0) when you position this node. + * Returns whether the anchor point will be ignored when you position this node.
+ * When anchor point ignored, position will be calculated based on the origin point (0, 0) in parent's coordinates. + * @function + * @see cc.Node#ignoreAnchorPointForPosition + * @return {Boolean} true if the anchor point will be ignored when you position this node. */ isIgnoreAnchorPointForPosition: function () { return this._ignoreAnchorPointForPosition; @@ -901,23 +959,24 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{ /** *
- * Sets whether the anchor point will be (0,0) when you position this node.
- *
+ * Sets whether the anchor point will be ignored when you position this node.
+ * When anchor point ignored, position will be calculated based on the origin point (0, 0) in parent's coordinates.
* This is an internal method, only used by CCLayer and CCScene. Don't call it outside framework.
* The default value is false, while in CCLayer and CCScene are true
*
* Please refer to getTag for the sample code. - * @param {Number} Var A integer that identifies the node. + * @function + * @see cc.Node#getTag + * @param {Number} tag A integer that identifies the node. */ - setTag: function (Var) { - this.tag = Var; + setTag: function (tag) { + this.tag = tag; + }, + + /** + * Changes the name that is used to identify the node easily. + * @function + * @param {String} name + */ + setName: function(name){ + this._name = name; + }, + + /** + * Returns a string that is used to identify the node. + * @function + * @returns {string} A string that identifies the node. + */ + getName: function(){ + return this._name; }, /** @@ -959,6 +1038,7 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{ * Returns a custom user data pointer
* You can set everything in UserData pointer, a data block, a structure or an object. * + * @function * @return {object} A custom user data pointer */ getUserData: function () { @@ -967,10 +1047,11 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{ /** *
- * Sets a custom user data pointer
- * You can set everything in UserData pointer, a data block, a structure or an object, etc.
+ * Sets a custom user data reference
+ * You can set everything in UserData reference, a data block, a structure or an object, etc.
*
- * Similar to userData, but instead of holding a void* it holds an id + * Returns a user assigned cocos2d object.
+ * Similar to userData, but instead of holding all kinds of data it can only hold a cocos2d object + * @function * @return {object} A user assigned CCObject */ getUserObject: function () { @@ -988,22 +1070,22 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{ /** *
- * Returns a user assigned CCObject
- * Similar to UserData, but instead of holding a void* it holds an object.
- * The UserObject will be retained once in this method, and the previous UserObject (if existed) will be release.
+ * Sets a user assigned cocos2d object
+ * Similar to UserData, but instead of holding all kinds of data it can only hold a cocos2d object
+ * In JSB, the UserObject will be retained once in this method, and the previous UserObject (if existed) will be release.
* The UserObject will be released in CCNode's destruction.
*
* If two children have the same Z order, the child with larger arrival order will be drawn later. * + * @function * @warning This method is used internally for zOrder sorting, don't change this manually * @param {Number} Var The arrival order. */ @@ -1025,25 +1108,26 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{ }, /** - *
Gets the CCActionManager object that is used by all actions.
+ *
Returns the CCActionManager object that is used by all actions.
* (IMPORTANT: If you set a new cc.ActionManager, then previously created actions are going to be removed.)
Sets the cc.ActionManager object that is used by all actions.
+ * @function * @warning If you set a new CCActionManager, then previously created actions will be removed. * @param {cc.ActionManager} actionManager A CCActionManager object that is used by all actions. */ setActionManager: function (actionManager) { - if (this._actionManager != actionManager) { + if (this._actionManager !== actionManager) { this.stopAllActions(); this._actionManager = actionManager; } @@ -1051,27 +1135,28 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{ /** *
- * cc.Scheduler used to schedule all "updates" and timers.
- * IMPORTANT: If you set a new cc.Scheduler, then previously created timers/update are going to be removed.
+ * Returns the cc.Scheduler object used to schedule all "updates" and timers.
*
* Sets a CCScheduler object that is used to schedule all "updates" and timers.
+ * IMPORTANT: If you set a new cc.Scheduler, then previously created timers/update are going to be removed.
*
- * The returned box is relative only to its parent. - * @note This method returns a temporary variable, so it can't returns const CCRect& - * @const + * @deprecated since v3.0, please use getBoundingBox instead * @return {cc.Rect} */ + boundingBox: function(){ + cc.log(cc._LogInfos.Node_boundingBox); + return this.getBoundingBox(); + }, + + /** + * Returns a "local" axis aligned bounding box of the node.
+ * The returned box is relative only to its parent. + * @function + * @return {cc.Rect} The calculated bounding box of the node + */ getBoundingBox: function () { var rect = cc.rect(0, 0, this._contentSize.width, this._contentSize.height); - return cc._RectApplyAffineTransformIn(rect, this.nodeToParentTransform()); + return cc._rectApplyAffineTransformIn(rect, this.getNodeToParentTransform()); }, /** * Stops all running actions and schedulers + * @function */ cleanup: function () { // actions @@ -1101,63 +1196,101 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{ cc.eventManager.removeListeners(this); // timers - this._arrayMakeObjectsPerformSelector(this._children, cc.Node.StateCallbackType.cleanup); + this._arrayMakeObjectsPerformSelector(this._children, cc.Node._stateCallbackType.cleanup); }, // composition: GET /** - * Gets a child from the container given its tag + * Returns a child from the container given its tag + * @function * @param {Number} aTag An identifier to find the child node. * @return {cc.Node} a CCNode object whose tag equals to the input parameter */ getChildByTag: function (aTag) { var __children = this._children; - if (__children != null) { + if (__children !== null) { for (var i = 0; i < __children.length; i++) { var node = __children[i]; - if (node && node.tag == aTag) + if (node && node.tag === aTag) return node; } } - //throw "not found"; return null; }, + + /** + * Returns a child from the container given its name + * @function + * @param {String} name A name to find the child node. + * @return {cc.Node} a CCNode object whose name equals to the input parameter + */ + getChildByName: function(name){ + if(!name){ + cc.log("Invalid name"); + return null; + } + + var locChildren = this._children; + for(var i = 0, len = locChildren.length; i < len; i++){ + if(locChildren[i]._name === name) + return locChildren[i]; + } + return null; + }, + // composition: ADD - /**
"add" logic MUST only be on this method
"add" logic MUST only be in this method
If the child is added to a 'running' node, then 'onEnter' and 'onEnterTransitionDidFinish' will be called immediately.
- * + * @function * @param {cc.Node} child A child node * @param {Number} [localZOrder=] Z order for drawing priority. Please refer to setZOrder(int) * @param {Number} [tag=] A integer to identify the node easily. Please refer to setTag(int) */ addChild: function (child, localZOrder, tag) { + localZOrder = localZOrder === undefined ? child._localZOrder : localZOrder; + var name, setTag = false; + if(cc.isUndefined(tag)){ + tag = undefined; + name = child._name; + } else if(cc.isString(tag)){ + name = tag; + tag = undefined; + } else if(cc.isNumber(tag)){ + setTag = true; + name = ""; + } cc.assert(child, cc._LogInfos.Node_addChild_3); + cc.assert(child._parent === null, "child already added. It can't be added again"); - if (child === this) { - cc.log(cc._LogInfos.Node_addChild); - return; - } + this._addChildHelper(child, localZOrder, tag, name, setTag); + }, - if (child._parent !== null) { - cc.log(cc._LogInfos.Node_addChild_2); - return; - } + _addChildHelper: function(child, localZOrder, tag, name, setTag){ + if(!this._children) + this._children = []; + + this._insertChild(child, localZOrder); + if(setTag) + child.setTag(tag); + else + child.setName(name); - var tmpzOrder = (localZOrder != null) ? localZOrder : child._localZOrder; - child.tag = (tag != null) ? tag : child.tag; - this._insertChild(child, tmpzOrder); - child._parent = this; - this._cachedParent && (child._cachedParent = this._cachedParent); + child.setParent(this); + child.setOrderOfArrival(cc.s_globalOrderOfArrival++); - if (this._running) { + if( this._running ){ child.onEnter(); // prevent onEnterTransitionDidFinish to be called twice when a node is added in onEnter if (this._isTransitionFinished) child.onEnterTransitionDidFinish(); } + if (this._cascadeColorEnabled) + child._renderCmd.setDirtyFlag(cc.Node._dirtyFlags.colorDirty); + if (this._cascadeOpacityEnabled) + child._renderCmd.setDirtyFlag(cc.Node._dirtyFlags.opacityDirty); }, // composition: REMOVE @@ -1165,12 +1298,13 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{ * Remove itself from its parent node. If cleanup is true, then also remove all actions and callbacks.* If the cleanup parameter is not passed, it will force a cleanup.
* If the node orphan, then nothing happens. - * @param {Boolean} cleanup true if all actions and callbacks on this node should be removed, false otherwise. - * @see removeFromParentAndCleanup(bool) + * @function + * @param {Boolean} [cleanup=true] true if all actions and callbacks on this node should be removed, false otherwise. + * @see cc.Node#removeFromParentAndCleanup */ removeFromParent: function (cleanup) { if (this._parent) { - if (cleanup == null) + if (cleanup === undefined) cleanup = true; this._parent.removeChild(this, cleanup); } @@ -1179,8 +1313,8 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{ /** * Removes this node itself from its parent node.
* If the node orphan, then nothing happens. - * @deprecated - * @param {Boolean} cleanup true if all actions and callbacks on this node should be removed, false otherwise. + * @deprecated since v3.0, please use removeFromParent() instead + * @param {Boolean} [cleanup=true] true if all actions and callbacks on this node should be removed, false otherwise. */ removeFromParentAndCleanup: function (cleanup) { cc.log(cc._LogInfos.Node_removeFromParentAndCleanup); @@ -1189,39 +1323,41 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{ /**
Removes a child from the container. It will also cleanup all running actions depending on the cleanup parameter.
* If the cleanup parameter is not passed, it will force a cleanup.- *
"remove" logic MUST only be on this method
+ *
"remove" logic MUST only be on this method
* If a class wants to extend the 'removeChild' behavior it only needs
* to override this method
+ * @function * @param {Number} tag An integer number that identifies a child node - * @param {Boolean} cleanup true if all running actions and callbacks on the child node will be cleanup, false otherwise. - * @see removeChildByTag(int, bool) + * @param {Boolean} [cleanup=true] true if all running actions and callbacks on the child node will be cleanup, false otherwise. + * @see cc.Node#removeChildByTag */ removeChildByTag: function (tag, cleanup) { if (tag === cc.NODE_TAG_INVALID) cc.log(cc._LogInfos.Node_removeChildByTag); var child = this.getChildByTag(tag); - if (child == null) + if (!child) cc.log(cc._LogInfos.Node_removeChildByTag_2, tag); else this.removeChild(child, cleanup); @@ -1229,50 +1365,46 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{ /** * Removes all children from the container and do a cleanup all running actions depending on the cleanup parameter. - * @deprecated - * @param {Boolean | null } cleanup + * @param {Boolean} [cleanup=true] */ removeAllChildrenWithCleanup: function (cleanup) { - cc.log(cc._LogInfos.Node_removeAllChildrenWithCleanup); this.removeAllChildren(cleanup); }, /** * Removes all children from the container and do a cleanup all running actions depending on the cleanup parameter.
* If the cleanup parameter is not passed, it will force a cleanup.
- * @param {Boolean | null } cleanup true if all running actions on all children nodes should be cleanup, false otherwise. + * @function + * @param {Boolean} [cleanup=true] true if all running actions on all children nodes should be cleanup, false otherwise. */ removeAllChildren: function (cleanup) { // not using detachChild improves speed here var __children = this._children; - if (__children != null) { - if (cleanup == null) + if (__children !== null) { + if (cleanup === undefined) cleanup = true; for (var i = 0; i < __children.length; i++) { var node = __children[i]; if (node) { - // IMPORTANT: - // -1st do onExit - // -2nd cleanup if (this._running) { node.onExitTransitionDidStart(); node.onExit(); } + + // If you don't do cleanup, the node's actions will not get removed and the if (cleanup) node.cleanup(); + // set parent nil at the end node.parent = null; + node._renderCmd.detachFromParent(); } } this._children.length = 0; + cc.renderer.childrenOrderDirty = true; } }, - /** - * @param {cc.Node} child - * @param {Boolean} doCleanup - * @private - */ _detachChild: function (child, doCleanup) { // IMPORTANT: // -1st do onExit @@ -1283,39 +1415,37 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{ } // If you don't do cleanup, the child's actions will not get removed and the - // its scheduledSelectors_ dict will not get released! if (doCleanup) child.cleanup(); // set parent nil at the end child.parent = null; - + child._renderCmd.detachFromParent(); cc.arrayRemoveObject(this._children, child); }, - /** helper used by reorderChild & add - * @param {cc.Node} child - * @param {Number} z - * @private - */ _insertChild: function (child, z) { - this._reorderChildDirty = true; + cc.renderer.childrenOrderDirty = this._reorderChildDirty = true; this._children.push(child); child._setLocalZOrder(z); }, + setNodeDirty: function(){ + this._renderCmd.setDirtyFlag(cc.Node._dirtyFlags.transformDirty); + }, + /** Reorders a child according to a new z value.
* The child MUST be already added. + * @function * @param {cc.Node} child An already added child node. It MUST be already added. * @param {Number} zOrder Z order for drawing priority. Please refer to setZOrder(int) */ reorderChild: function (child, zOrder) { - cc.assert(child, cc._LogInfos.Node_reorderChild) - this._reorderChildDirty = true; + cc.assert(child, cc._LogInfos.Node_reorderChild); + cc.renderer.childrenOrderDirty = this._reorderChildDirty = true; child.arrivalOrder = cc.s_globalOrderOfArrival; cc.s_globalOrderOfArrival++; child._setLocalZOrder(zOrder); - this.setNodeDirty(); }, /** @@ -1323,27 +1453,31 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{ * Sorts the children array once before drawing, instead of every time when a child is added or reordered.
* This approach can improves the performance massively. * + * @function * @note Don't call this manually unless a child added needs to be removed in the same frame */ sortAllChildren: function () { if (this._reorderChildDirty) { var _children = this._children; - var i, j, length = _children.length, tempChild; // insertion sort - for (i = 0; i < length; i++) { - var tempItem = _children[i]; + var len = _children.length, i, j, tmp; + for(i=1; i
Override this method to draw your own node.
- * The following GL states will be enabled by default:
- - glEnableClientState(GL_VERTEX_ARRAY);
- - glEnableClientState(GL_COLOR_ARRAY);
- - glEnableClientState(GL_TEXTURE_COORD_ARRAY);
- - glEnable(GL_TEXTURE_2D);
AND YOU SHOULD NOT DISABLE THEM AFTER DRAWING YOUR NODE
- -But if you enable any other GL state, you should disable it after drawing your node.
- * @param {CanvasContext} ctx + /** + * Render function using the canvas 2d context or WebGL context, internal usage only, please do not call this function + * @function + * @param {CanvasRenderingContext2D | WebGLRenderingContext} ctx The render context */ draw: function (ctx) { // override me @@ -1370,12 +1496,9 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{ // DON'T draw your stuff outside this method }, - /** performs OpenGL view-matrix transformation of it's ancestors.- * Generally the ancestors are already transformed, but in certain cases (eg: attaching a FBO)
- * it's necessary to transform the ancestors again. - */ + // Internal use only, do not call it by yourself, transformAncestors: function () { - if (this._parent != null) { + if (this._parent !== null) { this._parent.transformAncestors(); this._parent.transform(); } @@ -1387,13 +1510,14 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{ * Event callback that is invoked every time when CCNode enters the 'stage'.
* If the CCNode enters the 'stage' with a transition, this event is called when the transition starts.
* During onEnter you can't access a "sister/brother" node.
- * If you override onEnter, you shall call its parent's one, e.g., CCNode::onEnter(). + * If you override onEnter, you must call its parent's onEnter function with this._super(). * + * @function */ onEnter: function () { this._isTransitionFinished = false; this._running = true;//should be running before resumeSchedule - this._arrayMakeObjectsPerformSelector(this._children, cc.Node.StateCallbackType.onEnter); + this._arrayMakeObjectsPerformSelector(this._children, cc.Node._stateCallbackType.onEnter); this.resume(); }, @@ -1401,20 +1525,23 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{ *
* Event callback that is invoked when the CCNode enters in the 'stage'.
* If the CCNode enters the 'stage' with a transition, this event is called when the transition finishes.
- * If you override onEnterTransitionDidFinish, you shall call its parent's one, e.g. CCNode::onEnterTransitionDidFinish()
+ * If you override onEnterTransitionDidFinish, you shall call its parent's onEnterTransitionDidFinish with this._super()
*
callback that is called every time the cc.Node leaves the 'stage'.
- * If the cc.Node leaves the 'stage' with a transition, this callback is called when the transition starts.
+ * If you override onExitTransitionDidStart, you shall call its parent's onExitTransitionDidStart with this._super() + * @function */ onExitTransitionDidStart: function () { - this._arrayMakeObjectsPerformSelector(this._children, cc.Node.StateCallbackType.onExitTransitionDidStart); + this._arrayMakeObjectsPerformSelector(this._children, cc.Node._stateCallbackType.onExitTransitionDidStart); }, /** @@ -1422,28 +1549,27 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{ * callback that is called every time the cc.Node leaves the 'stage'.
* If the cc.Node leaves the 'stage' with a transition, this callback is called when the transition finishes.
* During onExit you can't access a sibling node.
- * If you override onExit, you shall call its parent's one, e.g., CCNode::onExit(). + * If you override onExit, you shall call its parent's onExit with this._super(). * + * @function */ onExit: function () { this._running = false; this.pause(); - this._arrayMakeObjectsPerformSelector(this._children, cc.Node.StateCallbackType.onExit); - if (this._componentContainer) { - this._componentContainer.removeAll(); - } + this._arrayMakeObjectsPerformSelector(this._children, cc.Node._stateCallbackType.onExit); + this.removeAllComponents(); }, // actions /** * Executes an action, and returns the action that is executed.
- * The node becomes the action's target. Refer to CCAction::getTarget() + * The node becomes the action's target. Refer to cc.Action's getTarget() + * @function * @warning Starting from v0.8 actions don't retain their target anymore. * @param {cc.Action} action * @return {cc.Action} An Action pointer */ runAction: function (action) { - cc.assert(action, cc._LogInfos.Node_runAction); this.actionManager.addAction(action, this, !this._running); @@ -1452,6 +1578,7 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{ /** * Stops and removes all actions from the running action list . + * @function */ stopAllActions: function () { this.actionManager && this.actionManager.removeAllActionsFromTarget(this); @@ -1459,6 +1586,7 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{ /** * Stops and removes an action from the running action list. + * @function * @param {cc.Action} action An action object to be removed. */ stopAction: function (action) { @@ -1467,6 +1595,7 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{ /** * Removes an action from the running action list by its tag. + * @function * @param {Number} tag A tag that indicates the action to be removed. */ stopActionByTag: function (tag) { @@ -1478,8 +1607,9 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{ }, /** - * Gets an action from the running action list by its tag. - * @see setTag(int), getTag(). + * Returns an action from the running action list by its tag. + * @function + * @see cc.Node#getTag and cc.Node#setTag * @param {Number} tag * @return {cc.Action} The action object with the given tag. */ @@ -1491,10 +1621,11 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{ return this.actionManager.getActionByTag(tag, this); }, - /** Returns the numbers of actions that are running plus the ones that are schedule to run (actions in actionsToAdd and actions arrays).
+ /**
Returns the numbers of actions that are running plus the ones that are schedule to run (actions in actionsToAdd and actions arrays).
* Composable actions are counted as 1 action. Example:
* If you are running 1 Sequence of 7 actions, it will return 1.
- * If you are running 7 Sequences of 2 actions, it will return 7.
+ * If you are running 7 Sequences of 2 actions, it will return 7.
+ *
schedules the "update" method.
* It will use the order number 0. This method will be called every frame.
* Scheduled methods with a lower order value will be called before the ones that have a higher order value.
- * Only one "update" method could be scheduled per node.
+ * Only one "update" method could be scheduled per node.
* Only one "update" callback function could be scheduled per node (You can't have 2 'update' callback functions).
* + * @function * @param {Number} priority */ scheduleUpdateWithPriority: function (priority) { - this.scheduler.scheduleUpdateForTarget(this, priority, !this._running); + this.scheduler.scheduleUpdate(this, priority, !this._running); }, /** - * unschedules the "update" method. - * @see scheduleUpdate(); + * Unschedules the "update" method. + * @function + * @see cc.Node#scheduleUpdate */ unscheduleUpdate: function () { - this.scheduler.unscheduleUpdateForTarget(this); + this.scheduler.unscheduleUpdate(this); }, /** - * Schedules a custom selector.
- * If the selector is already scheduled, then the interval parameter will be updated without scheduling it again. - * - * @param {function} callback_fn A function wrapped as a selector + *
Schedules a custom selector.
+ * If the selector is already scheduled, then the interval parameter will be updated without scheduling it again.
- * Actions are not affected by this method. + *
unschedule all scheduled callback functions: custom callback functions, and the 'update' callback function.
+ * Actions are not affected by this method.
* This method is called internally by onEnter - * @deprecated + * @function + * @deprecated since v3.0, please use resume() instead */ resumeSchedulerAndActions: function () { cc.log(cc._LogInfos.Node_resumeSchedulerAndActions); @@ -1598,8 +1790,8 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{ }, /** - * Resumes all scheduled selectors and actions.
- * This method is called internally by onEnter + *
Resumes all scheduled selectors and actions.
+ * This method is called internally by onEnter
- * This method is called internally by onExit - * @deprecated + *
Pauses all scheduled selectors and actions.
+ * This method is called internally by onExit
- * This method is called internally by onExit + *
Pauses all scheduled selectors and actions.
+ * This method is called internally by onExit
Sets the additional transform.
- * The additional transform will be concatenated at the end of nodeToParentTransform.
+ *
Sets the additional transform.
+ * The additional transform will be concatenated at the end of getNodeToParentTransform.
* It could be used to simulate `parent-child` relationship between two nodes (e.g. one is in BatchNode, another isn't).
*
* The matrix is in Pixels. + * @function * @return {cc.AffineTransform} */ + getParentToNodeTransform: function () { + this._renderCmd.getParentToNodeTransform(); + }, + + /** + * @function + * @deprecated since v3.0, please use getParentToNodeTransform instead + */ parentToNodeTransform: function () { - if (this._inverseDirty) { - this._inverse = cc.AffineTransformInvert(this.nodeToParentTransform()); - this._inverseDirty = false; - } - return this._inverse; + return this.getParentToNodeTransform(); }, /** - * Returns the world affine transform matrix. The matrix is in Pixels. + * Returns the world affine transform matrix. The matrix is in Pixels. + * @function * @return {cc.AffineTransform} */ - nodeToWorldTransform: function () { - var t = this.nodeToParentTransform(); - for (var p = this._parent; p != null; p = p.parent) - t = cc.AffineTransformConcat(t, p.nodeToParentTransform()); + getNodeToWorldTransform: function () { + //TODO renderCmd has a WorldTransform + var t = this.getNodeToParentTransform(); + for (var p = this._parent; p !== null; p = p.parent) + t = cc.affineTransformConcat(t, p.getNodeToParentTransform()); return t; }, + /** + * @function + * @deprecated since v3.0, please use getNodeToWorldTransform instead + */ + nodeToWorldTransform: function(){ + return this.getNodeToWorldTransform(); + }, + /** * Returns the inverse world affine transform matrix. The matrix is in Pixels. + * @function * @return {cc.AffineTransform} */ + getWorldToNodeTransform: function () { + return cc.affineTransformInvert(this.getNodeToWorldTransform()); + }, + + /** + * @function + * @deprecated since v3.0, please use getWorldToNodeTransform instead + */ worldToNodeTransform: function () { - return cc.AffineTransformInvert(this.nodeToWorldTransform()); + return this.getWorldToNodeTransform(); }, /** * Converts a Point to node (local) space coordinates. The result is in Points. + * @function * @param {cc.Point} worldPoint * @return {cc.Point} */ convertToNodeSpace: function (worldPoint) { - return cc.PointApplyAffineTransform(worldPoint, this.worldToNodeTransform()); + return cc.pointApplyAffineTransform(worldPoint, this.getWorldToNodeTransform()); }, /** * Converts a Point to world space coordinates. The result is in Points. + * @function * @param {cc.Point} nodePoint * @return {cc.Point} */ convertToWorldSpace: function (nodePoint) { - return cc.PointApplyAffineTransform(nodePoint, this.nodeToWorldTransform()); + nodePoint = nodePoint || cc.p(0,0); + return cc.pointApplyAffineTransform(nodePoint, this.getNodeToWorldTransform()); }, /** * Converts a Point to node (local) space coordinates. The result is in Points.
* treating the returned/received node point as anchor relative. + * @function * @param {cc.Point} worldPoint * @return {cc.Point} */ convertToNodeSpaceAR: function (worldPoint) { - return cc.pSub(this.convertToNodeSpace(worldPoint), this._anchorPointInPoints); + return cc.pSub(this.convertToNodeSpace(worldPoint), this._renderCmd.getAnchorPointInPoints()); }, /** * Converts a local Point to world space coordinates.The result is in Points.
* treating the returned/received node point as anchor relative. + * @function * @param {cc.Point} nodePoint * @return {cc.Point} */ convertToWorldSpaceAR: function (nodePoint) { - var pt = cc.pAdd(nodePoint, this._anchorPointInPoints); + nodePoint = nodePoint || cc.p(0,0); + var pt = cc.pAdd(nodePoint, this._renderCmd.getAnchorPointInPoints()); return this.convertToWorldSpace(pt); }, @@ -1757,31 +1985,32 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{ }, /** convenience methods which take a cc.Touch instead of cc.Point - * @param {cc.Touch} touch + * @function + * @param {cc.Touch} touch The touch object * @return {cc.Point} */ convertTouchToNodeSpace: function (touch) { var point = touch.getLocation(); - //TODO This point needn't convert to GL in HTML5 - //point = cc.director.convertToGL(point); return this.convertToNodeSpace(point); }, /** - * converts a cc.Touch (world coordinates) into a local coordiante. This method is AR (Anchor Relative). - * @param {cc.Touch}touch + * converts a cc.Touch (world coordinates) into a local coordinate. This method is AR (Anchor Relative). + * @function + * @param {cc.Touch} touch The touch object * @return {cc.Point} */ convertTouchToNodeSpaceAR: function (touch) { - var point = touch.getLocation(); - point = cc.director.convertToGL(point); + var point = cc.director.convertToGL(touch.getLocation()); return this.convertToNodeSpaceAR(point); }, /** - * Update will be called automatically every frame if "scheduleUpdate" is called, and the node is "live"
- * (override me) - * @param {Number} dt deltaTime + * Update will be called automatically every frame if "scheduleUpdate" is called when the node is "live".
+ * The default behavior is to invoke the visit function of node's componentContainer.
+ * Override me to implement your own update logic. + * @function + * @param {Number} dt Delta time since last update */ update: function (dt) { if (this._componentContainer && !this._componentContainer.isEmpty()) @@ -1796,115 +2025,161 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{ * As the result, you apply CCSpriteBatchNode's optimization on your customed CCNode.
* e.g., batchNode->addChild(myCustomNode), while you can only addChild(sprite) before. * + * @function */ updateTransform: function () { // Recursively iterate over children - this._arrayMakeObjectsPerformSelector(this._children, cc.Node.StateCallbackType.updateTransform); + this._arrayMakeObjectsPerformSelector(this._children, cc.Node._stateCallbackType.updateTransform); }, /** - * Currently JavaScript Bindings (JSB), in some cases, needs to use retain and release. This is a bug in JSB, + *
Currently JavaScript Bindings (JSB), in some cases, needs to use retain and release. This is a bug in JSB,
* and the ugly workaround is to use retain/release. So, these 2 methods were added to be compatible with JSB.
- * This is a hack, and should be removed once JSB fixes the retain/release bug
+ * This is a hack, and should be removed once JSB fixes the retain/release bug
+ * You will need to retain an object if you created an engine object and haven't added it into the scene graph during the same frame.
+ * Otherwise, JSB's native autorelease pool will consider this object a useless one and release it directly,
+ * when you want to use it later, a "Invalid Native Object" error will be raised.
+ * The retain function can increase a reference count for the native object to avoid it being released,
+ * you need to manually invoke release function when you think this object is no longer needed, otherwise, there will be memory learks.
+ * retain and release function call should be paired in developer's game code.
Currently JavaScript Bindings (JSB), in some cases, needs to use retain and release. This is a bug in JSB,
+ * and the ugly workaround is to use retain/release. So, these 2 methods were added to be compatible with JSB.
+ * This is a hack, and should be removed once JSB fixes the retain/release bug
+ * You will need to retain an object if you created an engine object and haven't added it into the scene graph during the same frame.
+ * Otherwise, JSB's native autorelease pool will consider this object a useless one and release it directly,
+ * when you want to use it later, a "Invalid Native Object" error will be raised.
+ * The retain function can increase a reference count for the native object to avoid it being released,
+ * you need to manually invoke release function when you think this object is no longer needed, otherwise, there will be memory learks.
+ * retain and release function call should be paired in developer's game code.
- * The matrix is in Pixels. + *
Returns the matrix that transform the node's (local) space coordinates into the parent's space coordinates.
+ * The matrix is in Pixels.
+ * The matrix is in Pixels. + * @function + * @return {cc.AffineTransform} The affine transform object + */ + getNodeToParentTransform: function(){ + return this._renderCmd.getNodeToParentTransform(); }, /** * Returns a camera object that lets you move the node using a gluLookAt + * @function * @return {cc.Camera} A CCCamera object that lets you move the node using a gluLookAt + * @deprecated since v3.0, no alternative function * @example * var camera = node.getCamera(); * camera.setEye(0, 0, 415/2); * camera.setCenter(0, 0, 0); */ getCamera: function () { - if (!this._camera) { + if (!this._camera) this._camera = new cc.Camera(); - } return this._camera; }, /** - * Returns a grid object that is used when applying effects + *
Returns a grid object that is used when applying effects.
+ * This function have been deprecated, please use cc.NodeGrid to run grid actions
Changes a grid object that is used when applying effects
+ * This function have been deprecated, please use cc.NodeGrid to run grid actions
+ /** + * Returns a "world" axis aligned bounding box of the node. + * @function * @return {cc.Rect} */ getBoundingBoxToWorld: function () { var rect = cc.rect(0, 0, this._contentSize.width, this._contentSize.height); - var trans = this.nodeToWorldTransform(); - rect = cc.RectApplyAffineTransform(rect, this.nodeToWorldTransform()); - //rect = cc.rect(0 | rect.x - 4, 0 | rect.y - 4, 0 | rect.width + 8, 0 | rect.height + 8); + var trans = this.getNodeToWorldTransform(); + rect = cc.rectApplyAffineTransform(rect, trans); //query child's BoundingBox if (!this._children) @@ -1976,8 +2257,8 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{ _getBoundingBoxToCurrentNode: function (parentTransform) { var rect = cc.rect(0, 0, this._contentSize.width, this._contentSize.height); - var trans = (parentTransform == null) ? this.nodeToParentTransform() : cc.AffineTransformConcat(this.nodeToParentTransform(), parentTransform); - rect = cc.RectApplyAffineTransform(rect, trans); + var trans = (parentTransform === undefined) ? this.getNodeToParentTransform() : cc.affineTransformConcat(this.getNodeToParentTransform(), parentTransform); + rect = cc.rectApplyAffineTransform(rect, trans); //query child's BoundingBox if (!this._children) @@ -1994,270 +2275,10 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{ } return rect; }, - _nodeToParentTransformForWebGL: function () { - var _t = this; - if (_t._transformDirty) { - // Translate values - var x = _t._position.x; - var y = _t._position.y; - var apx = _t._anchorPointInPoints.x, napx = -apx; - var apy = _t._anchorPointInPoints.y, napy = -apy; - var scx = _t._scaleX, scy = _t._scaleY; - - if (_t._ignoreAnchorPointForPosition) { - x += apx; - y += apy; - } - - // Rotation values - // Change rotation code to handle X and Y - // If we skew with the exact same value for both x and y then we're simply just rotating - var cx = 1, sx = 0, cy = 1, sy = 0; - if (_t._rotationX !== 0 || _t._rotationY !== 0) { - cx = Math.cos(-_t._rotationRadiansX); - sx = Math.sin(-_t._rotationRadiansX); - cy = Math.cos(-_t._rotationRadiansY); - sy = Math.sin(-_t._rotationRadiansY); - } - var needsSkewMatrix = ( _t._skewX || _t._skewY ); - - // optimization: - // inline anchor point calculation if skew is not needed - // Adjusted transform calculation for rotational skew - if (!needsSkewMatrix && (apx !== 0 || apy !== 0)) { - x += cy * napx * scx + -sx * napy * scy; - y += sy * napx * scx + cx * napy * scy; - } - - // Build Transform Matrix - // Adjusted transform calculation for rotational skew - var t = _t._transform; - t.a = cy * scx; - t.b = sy * scx; - t.c = -sx * scy; - t.d = cx * scy; - t.tx = x; - t.ty = y; - - // XXX: Try to inline skew - // If skew is needed, apply skew and then anchor point - if (needsSkewMatrix) { - t = cc.AffineTransformConcat({a: 1.0, b: Math.tan(cc.degreesToRadians(_t._skewY)), - c: Math.tan(cc.degreesToRadians(_t._skewX)), d: 1.0, tx: 0.0, ty: 0.0}, t); - - // adjust anchor point - if (apx !== 0 || apy !== 0) - t = cc.AffineTransformTranslate(t, napx, napy); - } - - if (_t._additionalTransformDirty) { - t = cc.AffineTransformConcat(t, _t._additionalTransform); - _t._additionalTransformDirty = false; - } - _t._transform = t; - _t._transformDirty = false; - } - return _t._transform; - } -}); - -/** - * allocates and initializes a node. - * @constructs - * @return {cc.Node} - * @example - * // example - * var node = cc.Node.create(); - */ -cc.Node.create = function () { - return new cc.Node(); -}; - -/** - * cc.Node's state callback type - * @constant - * @type Number - */ -cc.Node.StateCallbackType = {onEnter: 1, onExit: 2, cleanup: 3, onEnterTransitionDidFinish: 4, updateTransform: 5, onExitTransitionDidStart: 6, sortAllChildren: 7}; - -if (cc._renderType === cc._RENDER_TYPE_CANVAS) { - - //redefine cc.Node - var _p = cc.Node.prototype; - _p.ctor = function () { - this._initNode(); - }; - - _p.setNodeDirty = function () { - var _t = this; - _t._setNodeDirtyForCache(); - _t._transformDirty === false && (_t._transformDirty = _t._inverseDirty = true); - }; - - _p.visit = function (ctx) { - var _t = this; - // quick return if not visible - if (!_t._visible) - return; - - //visit for canvas - var context = ctx || cc._renderContext, i; - var children = _t._children, child; - context.save(); - _t.transform(context); - var len = children.length; - if (len > 0) { - _t.sortAllChildren(); - // draw children zOrder < 0 - for (i = 0; i < len; i++) { - child = children[i]; - if (child._localZOrder < 0) - child.visit(context); - else - break; - } - _t.draw(context); - for (; i < len; i++) { - children[i].visit(context); - } - } else - _t.draw(context); - - _t.arrivalOrder = 0; - context.restore(); - }; - - _p.transform = function (ctx) { - // transform for canvas - var context = ctx || cc._renderContext, eglViewer = cc.view; - - var t = this.nodeToParentTransform(); - context.transform(t.a, t.c, t.b, t.d, t.tx * eglViewer.getScaleX(), -t.ty * eglViewer.getScaleY()); - }; - - _p.nodeToParentTransform = function () { - var _t = this; - if (_t._transformDirty) { - var t = _t._transform;// quick reference - - // base position - t.tx = _t._position.x; - t.ty = _t._position.y; - - // rotation Cos and Sin - var Cos = 1, Sin = 0; - if (_t._rotationX) { - Cos = Math.cos(_t._rotationRadiansX); - Sin = Math.sin(_t._rotationRadiansX); - } - - // base abcd - t.a = t.d = Cos; - t.b = -Sin; - t.c = Sin; - - var lScaleX = _t._scaleX, lScaleY = _t._scaleY; - var appX = _t._anchorPointInPoints.x, appY = _t._anchorPointInPoints.y; - - // Firefox on Vista and XP crashes - // GPU thread in case of scale(0.0, 0.0) - var sx = (lScaleX < 0.000001 && lScaleX > -0.000001) ? 0.000001 : lScaleX, - sy = (lScaleY < 0.000001 && lScaleY > -0.000001) ? 0.000001 : lScaleY; - - // skew - if (_t._skewX || _t._skewY) { - // offset the anchorpoint - var skx = Math.tan(-_t._skewX * Math.PI / 180); - var sky = Math.tan(-_t._skewY * Math.PI / 180); - var xx = appY * skx * sx; - var yy = appX * sky * sy; - t.a = Cos + -Sin * sky; - t.b = Cos * skx + -Sin; - t.c = Sin + Cos * sky; - t.d = Sin * skx + Cos; - t.tx += Cos * xx + -Sin * yy; - t.ty += Sin * xx + Cos * yy; - } - - // scale - if (lScaleX !== 1 || lScaleY !== 1) { - t.a *= sx; - t.c *= sx; - t.b *= sy; - t.d *= sy; - } - - // adjust anchorPoint - t.tx += Cos * -appX * sx + -Sin * appY * sy; - t.ty -= Sin * -appX * sx + Cos * appY * sy; - - // if ignore anchorPoint - if (_t._ignoreAnchorPointForPosition) { - t.tx += appX; - t.ty += appY; - } - - if (_t._additionalTransformDirty) { - _t._transform = cc.AffineTransformConcat(t, _t._additionalTransform); - _t._additionalTransformDirty = false; - } - - _t._transformDirty = false; - } - return _t._transform; - }; - - _p = null; - -} else { - _tmp.WebGLCCNode(); - delete _tmp.WebGLCCNode; -} -_tmp.PrototypeCCNode(); -delete _tmp.PrototypeCCNode; - - -/** - *
- * cc.NodeRGBA is a subclass of cc.Node that implements the CCRGBAProtocol protocol.
- *
- * All features from CCNode are valid, plus the following new features:
- * - opacity
- * - RGB colors
- *
- * Opacity/Color propagates into children that conform to the CCRGBAProtocol if cascadeOpacity/cascadeColor is enabled.
- *
Sets the color of Node.
+ * When color doesn't include opacity value like cc.color(128,128,128), this function only change the color.
+ * When color include opacity like cc.color(128,128,128,100), then this function will change the color and the opacity.
cc.AffineTransform class represent an affine transform matrix. It's composed basically by translation, rotation, scale transformations.
+ * Please do not use its constructor directly, use cc.affineTransformMake alias function instead.
+ *
Create a identity transformation matrix:
+ * [ 1, 0, 0,
+ * 0, 1, 0 ]
Create a identity transformation matrix:
+ * [ 1, 0, 0,
+ * 0, 1, 0 ]
+ * Concatenate a transform matrix to another and return the result:
* t' = t1 * t2 - * @memberOf cc * @function - * @param {cc.AffineTransform} t1 - * @param {cc.AffineTransform} t2 - * @return {cc.AffineTransform} - * Constructor + * @param {cc.AffineTransform} t1 The first transform object + * @param {cc.AffineTransform} t2 The transform object to concatenate + * @return {cc.AffineTransform} The result of concatenation */ -cc.AffineTransformConcat = function (t1, t2) { +cc.affineTransformConcat = function (t1, t2) { return {a: t1.a * t2.a + t1.b * t2.c, //a b: t1.a * t2.b + t1.b * t2.d, //b c: t1.c * t2.a + t1.d * t2.c, //c @@ -231,27 +245,23 @@ cc.AffineTransformConcat = function (t1, t2) { }; /** - * Return true if `t1' and `t2' are equal, false otherwise. - * @memberOf cc + * Return true if an affine transform equals to another, false otherwise. * @function * @param {cc.AffineTransform} t1 * @param {cc.AffineTransform} t2 * @return {Boolean} - * Constructor */ -cc.AffineTransformEqualToTransform = function (t1, t2) { +cc.affineTransformEqualToTransform = function (t1, t2) { return ((t1.a === t2.a) && (t1.b === t2.b) && (t1.c === t2.c) && (t1.d === t2.d) && (t1.tx === t2.tx) && (t1.ty === t2.ty)); }; /** - * Get the invert value of an AffineTransform object - * @memberOf cc + * Get the invert transform of an AffineTransform object * @function * @param {cc.AffineTransform} t - * @return {cc.AffineTransform} - * Constructor + * @return {cc.AffineTransform} The inverted transform object */ -cc.AffineTransformInvert = function (t) { +cc.affineTransformInvert = function (t) { var determinant = 1 / (t.a * t.d - t.b * t.c); return {a: determinant * t.d, b: -determinant * t.b, c: -determinant * t.c, d: determinant * t.a, tx: determinant * (t.c * t.ty - t.d * t.tx), ty: determinant * (t.b * t.tx - t.a * t.ty)}; diff --git a/cocos2d/core/cocoa/CCGeometry.js b/cocos2d/core/cocoa/CCGeometry.js index 11ace91ee1..0eeffd5ad2 100644 --- a/cocos2d/core/cocoa/CCGeometry.js +++ b/cocos2d/core/cocoa/CCGeometry.js @@ -1,7 +1,7 @@ /**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2008-2010 Ricardo Quesada - Copyright (c) 2011 Zynga Inc. + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -24,16 +24,12 @@ THE SOFTWARE. ****************************************************************************/ -//-------------------------------------------------------- -// -// POINT -// -//-------------------------------------------------------- /** - * @class + * cc.Point is the class for point object, please do not use its constructor to create points, use cc.p() alias function instead. + * @class cc.Point * @param {Number} x * @param {Number} y - * Constructor + * @see cc.p */ cc.Point = function (x, y) { this.x = x || 0; @@ -41,14 +37,16 @@ cc.Point = function (x, y) { }; /** - * Helper macro that creates a cc.Point. + * Helper function that creates a cc.Point. + * @function * @param {Number|cc.Point} x a Number or a size object * @param {Number} y * @return {cc.Point} * @example * var point1 = cc.p(); - * var point2 = cc.p(100,100,100,100); + * var point2 = cc.p(100, 100); * var point3 = cc.p(point2); + * var point4 = cc.p({x: 100, y: 100}); */ cc.p = function (x, y) { // This can actually make use of "hidden classes" in JITs and thus decrease @@ -57,14 +55,15 @@ cc.p = function (x, y) { // but this one will instead flood the heap with newly allocated hash maps // giving little room for optimization by the JIT, // note: we have tested this item on Chrome and firefox, it is faster than cc.p(x, y) - if (x == undefined) + if (x === undefined) return {x: 0, y: 0}; - if (y == undefined) + if (y === undefined) return {x: x.x, y: x.y}; return {x: x, y: y}; }; /** + * Check whether a point's value equals to another * @function * @param {cc.Point} point1 * @param {cc.Point} point2 @@ -75,17 +74,12 @@ cc.pointEqualToPoint = function (point1, point2) { }; -//-------------------------------------------------------- -// -// SIZE -// -//-------------------------------------------------------- - /** - * @class + * cc.Size is the class for size object, please do not use its constructor to create sizes, use cc.size() alias function instead. + * @class cc.Size * @param {Number} width * @param {Number} height - * Constructor + * @see cc.size */ cc.Size = function (width, height) { this.width = width || 0; @@ -93,14 +87,16 @@ cc.Size = function (width, height) { }; /** + * Helper function that creates a cc.Size. * @function * @param {Number|cc.Size} w width or a size object * @param {Number} h height * @return {cc.Size} * @example * var size1 = cc.size(); - * var size2 = cc.size(100,100,100,100); + * var size2 = cc.size(100,100); * var size3 = cc.size(size2); + * var size4 = cc.size({width: 100, height: 100}); */ cc.size = function (w, h) { // This can actually make use of "hidden classes" in JITs and thus decrease @@ -117,29 +113,23 @@ cc.size = function (w, h) { }; /** + * Check whether a point's value equals to another * @function * @param {cc.Size} size1 * @param {cc.Size} size2 * @return {Boolean} */ cc.sizeEqualToSize = function (size1, size2) { - return (size1 && size2 && (size1.width == size2.width) && (size1.height == size2.height)); + return (size1 && size2 && (size1.width === size2.width) && (size1.height === size2.height)); }; -//-------------------------------------------------------- -// -// RECT -// -//-------------------------------------------------------- - /** - * @class - * @param {Number} x a Number value as x - * @param {Number} y a Number value as y + * cc.Rect is the class for rect object, please do not use its constructor to create rects, use cc.rect() alias function instead. + * @class cc.Rect * @param {Number} width * @param {Number} height - * Constructor + * @see cc.rect */ cc.Rect = function (x, y, width, height) { this.x = x||0; @@ -149,7 +139,8 @@ cc.Rect = function (x, y, width, height) { }; /** - * Return a new Rect + * Helper function that creates a cc.Rect. + * @function * @param {Number|cc.Rect} x a number or a rect object * @param {Number} y * @param {Number} w @@ -159,6 +150,7 @@ cc.Rect = function (x, y, width, height) { * var rect1 = cc.rect(); * var rect2 = cc.rect(100,100,100,100); * var rect3 = cc.rect(rect2); + * var rect4 = cc.rect({x: 100, y: 100, width: 100, height: 100}); */ cc.rect = function (x, y, w, h) { if (x === undefined) @@ -169,7 +161,7 @@ cc.rect = function (x, y, w, h) { }; /** - * whether the rect1 equals the rect2 + * Check whether a rect's value equals to another * @function * @param {cc.Rect} rect1 * @param {cc.Rect} rect2 @@ -184,7 +176,7 @@ cc._rectEqualToZero = function(rect){ }; /** - * return whether the rect1 contains rect2 + * Check whether the rect1 contains rect2 * @function * @param {cc.Rect} rect1 * @param {cc.Rect} rect2 @@ -199,39 +191,39 @@ cc.rectContainsRect = function (rect1, rect2) { }; /** - * return the rightmost x-value of 'rect' + * Returns the rightmost x-value of a rect * @function * @param {cc.Rect} rect - * @return {Number} + * @return {Number} The rightmost x value */ cc.rectGetMaxX = function (rect) { return (rect.x + rect.width); }; /** - * return the midpoint x-value of 'rect' + * Return the midpoint x-value of a rect * @function * @param {cc.Rect} rect - * @return {Number} + * @return {Number} The midpoint x value */ cc.rectGetMidX = function (rect) { return (rect.x + rect.width / 2.0); }; /** - * return the leftmost x-value of 'rect' + * Returns the leftmost x-value of a rect * @function * @param {cc.Rect} rect - * @return {Number} + * @return {Number} The leftmost x value */ cc.rectGetMinX = function (rect) { return rect.x; }; /** - * Return the topmost y-value of `rect' + * Return the topmost y-value of a rect * @function * @param {cc.Rect} rect - * @return {Number} + * @return {Number} The topmost y value */ cc.rectGetMaxY = function (rect) { return(rect.y + rect.height); @@ -241,23 +233,24 @@ cc.rectGetMaxY = function (rect) { * Return the midpoint y-value of `rect' * @function * @param {cc.Rect} rect - * @return {Number} + * @return {Number} The midpoint y value */ cc.rectGetMidY = function (rect) { return rect.y + rect.height / 2.0; }; /** - * Return the bottommost y-value of `rect' + * Return the bottommost y-value of a rect * @function * @param {cc.Rect} rect - * @return {Number} + * @return {Number} The bottommost y value */ cc.rectGetMinY = function (rect) { return rect.y; }; /** + * Check whether a rect contains a point * @function * @param {cc.Rect} rect * @param {cc.Point} point @@ -269,19 +262,22 @@ cc.rectContainsPoint = function (rect, point) { }; /** + * Check whether a rect intersect with another * @function * @param {cc.Rect} rectA * @param {cc.Rect} rectB * @return {Boolean} */ -cc.rectIntersectsRect = function (rectA, rectB) { - return !(cc.rectGetMaxX(rectA) < cc.rectGetMinX(rectB) || - cc.rectGetMaxX(rectB) < cc.rectGetMinX(rectA) || - cc.rectGetMaxY(rectA) < cc.rectGetMinY(rectB) || - cc.rectGetMaxY(rectB) < cc.rectGetMinY(rectA)); +cc.rectIntersectsRect = function (ra, rb) { + var maxax = ra.x + ra.width, + maxay = ra.y + ra.height, + maxbx = rb.x + rb.width, + maxby = rb.y + rb.height; + return !(maxax < rb.x || maxbx < ra.x || maxay < rb.y || maxby < ra.y); }; /** + * Check whether a rect overlaps another * @function * @param {cc.Rect} rectA * @param {cc.Rect} rectB diff --git a/cocos2d/core/event-manager/CCEvent.js b/cocos2d/core/event-manager/CCEvent.js index 09535c7500..fa5c47f5a1 100644 --- a/cocos2d/core/event-manager/CCEvent.js +++ b/cocos2d/core/event-manager/CCEvent.js @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2010-2014 cocos2d-x.org + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -42,7 +43,8 @@ cc.Event = cc.Class.extend(/** @lends cc.Event# */{ /** * Gets the event type - * @returns {number} + * @function + * @returns {Number} */ getType: function () { return this._type; @@ -50,6 +52,7 @@ cc.Event = cc.Class.extend(/** @lends cc.Event# */{ /** * Stops propagation for current event + * @function */ stopPropagation: function () { this._isStopped = true; @@ -57,6 +60,7 @@ cc.Event = cc.Class.extend(/** @lends cc.Event# */{ /** * Checks whether the event has been stopped + * @function * @returns {boolean} */ isStopped: function () { @@ -69,6 +73,7 @@ cc.Event = cc.Class.extend(/** @lends cc.Event# */{ * note: It only be available when the event listener is associated with node.
* It returns 0 when the listener is associated with fixed priority. * + * @function * @returns {cc.Node} The target with which the event associates. */ getCurrentTarget: function () { @@ -101,12 +106,18 @@ cc.Event.ACCELERATION = 2; * @type {number} */ cc.Event.MOUSE = 3; +/** + * The type code of UI focus event. + * @constant + * @type {number} + */ +cc.Event.FOCUS = 4; /** * The type code of Custom event. * @constant * @type {number} */ -cc.Event.CUSTOM = 4; +cc.Event.CUSTOM = 6; /** * The Custom event @@ -116,6 +127,7 @@ cc.Event.CUSTOM = 4; cc.EventCustom = cc.Event.extend(/** @lends cc.EventCustom# */{ _eventName: null, _userData: null, // User data + ctor: function (eventName) { cc.Event.prototype.ctor.call(this, cc.Event.CUSTOM); this._eventName = eventName; @@ -167,7 +179,7 @@ cc.EventMouse = cc.Event.extend(/** @lends cc.EventMouse# */{ }, /** - * sets scroll data + * Sets scroll data * @param {number} scrollX * @param {number} scrollY */ @@ -177,7 +189,7 @@ cc.EventMouse = cc.Event.extend(/** @lends cc.EventMouse# */{ }, /** - * gets scrollX data + * Returns the x axis scroll value * @returns {number} */ getScrollX: function () { @@ -185,7 +197,7 @@ cc.EventMouse = cc.Event.extend(/** @lends cc.EventMouse# */{ }, /** - * gets scrollY data + * Returns the y axis scroll value * @returns {number} */ getScrollY: function () { @@ -193,7 +205,7 @@ cc.EventMouse = cc.Event.extend(/** @lends cc.EventMouse# */{ }, /** - * Set cursor location + * Sets cursor location * @param {number} x * @param {number} y */ @@ -203,7 +215,7 @@ cc.EventMouse = cc.Event.extend(/** @lends cc.EventMouse# */{ }, /** - * Get cursor location + * Returns cursor location * @return {cc.Point} location */ getLocation: function () { @@ -211,7 +223,7 @@ cc.EventMouse = cc.Event.extend(/** @lends cc.EventMouse# */{ }, /** - * returns the current touch location in screen coordinates + * Returns the current cursor location in screen coordinates * @return {cc.Point} */ getLocationInView: function() { @@ -223,14 +235,26 @@ cc.EventMouse = cc.Event.extend(/** @lends cc.EventMouse# */{ this._prevY = y; }, + /** + * Returns the delta distance from the previous location to current location + * @return {cc.Point} + */ getDelta: function () { return {x: this._x - this._prevX, y: this._y - this._prevY}; }, + /** + * Returns the X axis delta distance from the previous location to current location + * @return {Number} + */ getDeltaX: function () { return this._x - this._prevX; }, + /** + * Returns the Y axis delta distance from the previous location to current location + * @return {Number} + */ getDeltaY: function () { return this._y - this._prevY; }, @@ -244,7 +268,7 @@ cc.EventMouse = cc.Event.extend(/** @lends cc.EventMouse# */{ }, /** - * Gets mouse button + * Returns mouse button * @returns {number} */ getButton: function () { @@ -252,7 +276,7 @@ cc.EventMouse = cc.Event.extend(/** @lends cc.EventMouse# */{ }, /** - * gets location X axis data + * Returns location X axis data * @returns {number} */ getLocationX: function () { @@ -260,7 +284,7 @@ cc.EventMouse = cc.Event.extend(/** @lends cc.EventMouse# */{ }, /** - * gets location Y axis data + * Returns location Y axis data * @returns {number} */ getLocationY: function () { @@ -371,7 +395,7 @@ cc.EventTouch = cc.Event.extend(/** @lends cc.EventTouch# */{ }, /** - * Gets event code + * Returns event code * @returns {number} */ getEventCode: function () { @@ -379,7 +403,7 @@ cc.EventTouch = cc.Event.extend(/** @lends cc.EventTouch# */{ }, /** - * Get touches of event + * Returns touches of event * @returns {Array} */ getTouches: function () { @@ -395,10 +419,31 @@ cc.EventTouch = cc.Event.extend(/** @lends cc.EventTouch# */{ } }); +/** + * The maximum touch numbers + * @constant + * @type {Number} + */ cc.EventTouch.MAX_TOUCHES = 5; +cc.EventTouch.EventCode = {BEGAN: 0, MOVED: 1, ENDED: 2, CANCELLED: 3}; + /** - * The event code of Touch event. - * @type {Object} + * Focus change event for UI widget + * @class + * @extends cc.Event */ -cc.EventTouch.EventCode = {BEGAN: 0, MOVED: 1, ENDED: 2, CANCELLED: 3}; \ No newline at end of file +cc.EventFocus = cc.Event.extend(/** @lends cc.EventTouch# */{ + _widgetGetFocus: null, + _widgetLoseFocus: null, + /** + * Constructor function. + * @param {ccui.Widget} widgetLoseFocus + * @param {ccui.Widget} widgetGetFocus + */ + ctor: function(widgetLoseFocus, widgetGetFocus){ + cc.Event.prototype.ctor.call(this, cc.Event.FOCUS); + this._widgetGetFocus = widgetGetFocus; + this._widgetLoseFocus = widgetLoseFocus; + } +}); \ No newline at end of file diff --git a/cocos2d/core/event-manager/CCEventExtension.js b/cocos2d/core/event-manager/CCEventExtension.js index 7c3f41f473..a14968f0f7 100644 --- a/cocos2d/core/event-manager/CCEventExtension.js +++ b/cocos2d/core/event-manager/CCEventExtension.js @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2010-2014 cocos2d-x.org + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -43,7 +44,6 @@ cc.EventAcceleration = cc.Event.extend(/** @lends cc.EventAcceleration# */{ cc.EventKeyboard = cc.Event.extend(/** @lends cc.EventKeyboard# */{ _keyCode: 0, _isPressed: false, - ctor: function (keyCode, isPressed) { cc.Event.prototype.ctor.call(this, cc.Event.KEYBOARD); this._keyCode = keyCode; @@ -52,11 +52,10 @@ cc.EventKeyboard = cc.Event.extend(/** @lends cc.EventKeyboard# */{ }); - - //Acceleration cc._EventListenerAcceleration = cc.EventListener.extend({ _onAccelerationEvent: null, + ctor: function (callback) { this._onAccelerationEvent = callback; var selfPointer = this; @@ -112,7 +111,7 @@ cc._EventListenerKeyboard = cc.EventListener.extend({ }, checkAvailable: function () { - if (this.onKeyPressed == null && this.onKeyReleased == null) { + if (this.onKeyPressed === null && this.onKeyReleased === null) { cc.log(cc._LogInfos._EventListenerKeyboard_checkAvailable); return false; } diff --git a/cocos2d/core/event-manager/CCEventListener.js b/cocos2d/core/event-manager/CCEventListener.js index 8d5baaf3ac..3c9dbab79d 100644 --- a/cocos2d/core/event-manager/CCEventListener.js +++ b/cocos2d/core/event-manager/CCEventListener.js @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2010-2014 Chukong Technologies Inc. + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -40,7 +41,7 @@ cc.EventListener = cc.Class.extend(/** @lends cc.EventListener# */{ _fixedPriority: 0, // The higher the number, the higher the priority, 0 is for scene graph base priority. _node: null, // scene graph based priority - _paused: false, // Whether the listener is paused + _paused: true, // Whether the listener is paused _isEnabled: true, // Whether the listener is enabled /** @@ -161,7 +162,7 @@ cc.EventListener = cc.Class.extend(/** @lends cc.EventListener# */{ * @returns {boolean} */ checkAvailable: function () { - return this._onEvent != null; + return this._onEvent !== null; }, /** @@ -193,12 +194,33 @@ cc.EventListener = cc.Class.extend(/** @lends cc.EventListener# */{ }, /** - * Currently JavaScript Bindings (JSB), in some cases, needs to use retain and release. This is a bug in JSB, + *
Currently JavaScript Bindings (JSB), in some cases, needs to use retain and release. This is a bug in JSB,
* and the ugly workaround is to use retain/release. So, these 2 methods were added to be compatible with JSB.
- * This is a hack, and should be removed once JSB fixes the retain/release bug
+ * This is a hack, and should be removed once JSB fixes the retain/release bug
+ * You will need to retain an object if you created a listener and haven't added it any target node during the same frame.
+ * Otherwise, JSB's native autorelease pool will consider this object a useless one and release it directly,
+ * when you want to use it later, a "Invalid Native Object" error will be raised.
+ * The retain function can increase a reference count for the native object to avoid it being released,
+ * you need to manually invoke release function when you think this object is no longer needed, otherwise, there will be memory learks.
+ * retain and release function call should be paired in developer's game code.
Currently JavaScript Bindings (JSB), in some cases, needs to use retain and release. This is a bug in JSB,
+ * and the ugly workaround is to use retain/release. So, these 2 methods were added to be compatible with JSB.
+ * This is a hack, and should be removed once JSB fixes the retain/release bug
+ * You will need to retain an object if you created a listener and haven't added it any target node during the same frame.
+ * Otherwise, JSB's native autorelease pool will consider this object a useless one and release it directly,
+ * when you want to use it later, a "Invalid Native Object" error will be raised.
+ * The retain function can increase a reference count for the native object to avoid it being released,
+ * you need to manually invoke release function when you think this object is no longer needed, otherwise, there will be memory learks.
+ * retain and release function call should be paired in developer's game code.
- * This class manages event listener subscriptions and event dispatching.
+ *
+ * cc.eventManager is a singleton object which manages event listener subscriptions and event dispatching.
*
- * The EventListener list is managed in such a way that event listeners can be added and removed even
- * from within an EventListener, while events are being dispatched.
+ * The EventListener list is managed in such way so that event listeners can be added and removed
+ * while events are being dispatched.
*
- * All features from cc.TextureNode are valid in cc.LabelTTF
- * cc.LabelTTF objects are slow for js-binding on mobile devices.Consider using cc.LabelAtlas or cc.LabelBMFont instead.
+ *
cc.LabelTTF is a subclass of cc.TextureNode that knows how to render text labels with system font or a ttf font file
+ * All features from cc.Sprite are valid in cc.LabelTTF
+ * cc.LabelTTF objects are slow for js-binding on mobile devices.
* Consider using cc.LabelAtlas or cc.LabelBMFont instead.
+ * You can create a cc.LabelTTF from a font name, alignment, dimension and font size or a cc.FontDefinition object.
- * All features from cc.Node are valid, plus the following new features:
- * It can receive iPhone Touches
- * It can receive Accelerometer input + * All features from cc.Node are valid, plus the bake feature: Baked layer can cache a static layer to improve performance * @class * @extends cc.Node */ cc.Layer = cc.Node.extend(/** @lends cc.Layer# */{ - /** - * init layer - * @return {Boolean} - */ _className: "Layer", /** - * @constructor + *
Constructor of cc.Layer, override it to extend the construction behavior, remember to call "this._super()" in the extended "ctor" function.
*/ ctor: function () { var nodep = cc.Node.prototype; @@ -47,306 +41,102 @@ cc.Layer = cc.Node.extend(/** @lends cc.Layer# */{ this._ignoreAnchorPointForPosition = true; nodep.setAnchorPoint.call(this, 0.5, 0.5); nodep.setContentSize.call(this, cc.winSize); - } -}); - -/** - * creates a layer - * @example - * // Example - * var myLayer = cc.Layer.create(); - * //Yes! it's that simple - * @return {cc.Layer|Null} - */ -cc.Layer.create = function () { - var ret = new cc.Layer(); - return ret; - -}; - -/** - *
- * CCLayerRGBA is a subclass of CCLayer that implements the CCRGBAProtocol protocol using a solid color as the background.
- * All features from CCLayer are valid, plus the following new features that propagate into children that conform to the CCRGBAProtocol:
- * - opacity
- * - RGB colors
- *
+ * This is useful only in html5 engine + * @function + * @see cc.Layer#unbake */ - setColor: function (color) { - var locDisplayed = this._displayedColor, locRealColor = this._realColor; - locDisplayed.r = locRealColor.r = color.r; - locDisplayed.g = locRealColor.g = color.g; - locDisplayed.b = locRealColor.b = color.b; - - var parentColor, locParent = this._parent; - if (locParent && locParent.RGBAProtocol && locParent.cascadeColor) - parentColor = locParent.getDisplayedColor(); - else - parentColor = cc.color.WHITE; - this.updateDisplayedColor(parentColor); - - if (color.a !== undefined && !color.a_undefined) { - this.setOpacity(color.a); - } + bake: function(){ + this._renderCmd.bake(); }, /** - * update the displayed color of Node - * @param {cc.Color} parentColor + * Cancel the layer to cache all of children to a bake sprite.
+ * This is useful only in html5 engine + * @function + * @see cc.Layer#bake */ - updateDisplayedColor: function (parentColor) { - var locDisplayedColor = this._displayedColor, locRealColor = this._realColor; - locDisplayedColor.r = 0 | (locRealColor.r * parentColor.r / 255.0); - locDisplayedColor.g = 0 | (locRealColor.g * parentColor.g / 255.0); - locDisplayedColor.b = 0 | (locRealColor.b * parentColor.b / 255.0); - - if (this._cascadeColorEnabled) { - var locChildren = this._children, selItem; - for (var i = 0; i < locChildren.length; i++) { - selItem = locChildren[i]; - if (selItem && selItem.RGBAProtocol) - selItem.updateDisplayedColor(locDisplayedColor); - } - } + unbake: function(){ + this._renderCmd.unbake(); }, /** - * whether or not it will set cascade color. + * Determines if the layer is baked. + * @function * @returns {boolean} + * @see cc.Layer#bake and cc.Layer#unbake */ - isCascadeColorEnabled: function () { - return this._cascadeColorEnabled; + isBaked: function(){ + return this._isBaked; }, - /** - * Enable or disable cascade color - * @param {boolean} cascadeColorEnabled - */ - setCascadeColorEnabled: function (cascadeColorEnabled) { - if (this._cascadeColorEnabled === cascadeColorEnabled) - return; - this._cascadeColorEnabled = cascadeColorEnabled; - if (this._cascadeColorEnabled) - this._enableCascadeColor(); - else - this._disableCascadeColor(); + addChild: function(child, localZOrder, tag){ + cc.Node.prototype.addChild.call(this, child, localZOrder, tag); + this._renderCmd._bakeForAddChild(child); }, - _enableCascadeColor: function () { - var parentColor , locParent = this._parent; - if (locParent && locParent.RGBAProtocol && locParent.cascadeColor) - parentColor = locParent.getDisplayedColor(); + _createRenderCmd: function(){ + if (cc._renderType === cc._RENDER_TYPE_CANVAS) + return new cc.Layer.CanvasRenderCmd(this); else - parentColor = cc.color.WHITE; - this.updateDisplayedColor(parentColor); - }, - - _disableCascadeColor: function () { - var locDisplayedColor = this._displayedColor, locRealColor = this._realColor; - locDisplayedColor.r = locRealColor.r; - locDisplayedColor.g = locRealColor.g; - locDisplayedColor.b = locRealColor.b; - - var selChildren = this._children, whiteColor = cc.color.WHITE, item, i; - for (i = 0; i < selChildren.length; i++) { - item = selChildren[i]; - if (item && item.RGBAProtocol) - item.updateDisplayedColor(whiteColor); - } - }, - - /** - * add a child to layer - * @overried - * @param {cc.Node} child A child node - * @param {Number} [zOrder=] Z order for drawing priority. Please refer to setLocalZOrder(int) - * @param {Number} [tag=] A integer to identify the node easily. Please refer to setTag(int) - */ - addChild: function (child, zOrder, tag) { - cc.Node.prototype.addChild.call(this, child, zOrder, tag); - - if (this._cascadeColorEnabled) - this._enableCascadeColor(); - if (this._cascadeOpacityEnabled) - this._enableCascadeOpacity(); - }, - - setOpacityModifyRGB: function (bValue) { - }, - - isOpacityModifyRGB: function () { - return false; + return new cc.Layer.WebGLRenderCmd(this); } }); -_tmp.PrototypeLayerRGBA(); -delete _tmp.PrototypeLayerRGBA; +/** + * Creates a layer + * @deprecated since v3.0, please use the new construction instead + * @see cc.Layer + * @return {cc.Layer|Null} + */ +cc.Layer.create = function () { + return new cc.Layer(); +}; /** *
* CCLayerColor is a subclass of CCLayer that implements the CCRGBAProtocol protocol.
* All features from CCLayer are valid, plus the following new features:
- *
- opacity
- RGB colors
- *
- * + * - opacity
+ * - RGB colors * @class - * @extends cc.LayerRGBA + * @extends cc.Layer + * + * @param {cc.Color} [color=] The color of the layer + * @param {Number} [width=] The width of the layer + * @param {Number} [height=] The height of the layer + * + * @example + * // Example + * //Create a yellow color layer as background + * var yellowBackground = new cc.LayerColor(cc.color(255,255,0,255)); + * //If you didn't pass in width and height, it defaults to the same size as the canvas + * + * //create a yellow box, 200 by 200 in size + * var yellowBox = new cc.LayerColor(cc.color(255,255,0,255), 200, 200); */ -cc.LayerColor = cc.LayerRGBA.extend(/** @lends cc.LayerColor# */{ +cc.LayerColor = cc.Layer.extend(/** @lends cc.LayerColor# */{ _blendFunc: null, _className: "LayerColor", /** - * blendFunc getter + * Returns the blend function * @return {cc.BlendFunc} */ getBlendFunc: function () { @@ -354,8 +144,9 @@ cc.LayerColor = cc.LayerRGBA.extend(/** @lends cc.LayerColor# */{ }, /** - * change width and height in Points - * @deprecated + * Changes width and height + * @deprecated since v3.0 please use setContentSize instead + * @see cc.Node#setContentSize * @param {Number} w width * @param {Number} h height */ @@ -365,8 +156,9 @@ cc.LayerColor = cc.LayerRGBA.extend(/** @lends cc.LayerColor# */{ }, /** - * change width in Points - * @deprecated + * Changes width in Points + * @deprecated since v3.0 please use setContentSize instead + * @see cc.Node#setContentSize * @param {Number} w width */ changeWidth: function (w) { @@ -375,49 +167,36 @@ cc.LayerColor = cc.LayerRGBA.extend(/** @lends cc.LayerColor# */{ /** * change height in Points - * @deprecated + * @deprecated since v3.0 please use setContentSize instead + * @see cc.Node#setContentSize * @param {Number} h height */ changeHeight: function (h) { this.height = h; }, - /** - * set OpacityModifyRGB of cc.LayerColor - * @param {Boolean} value - */ setOpacityModifyRGB: function (value) { }, - /** - * is OpacityModifyRGB - * @return {Boolean} - */ isOpacityModifyRGB: function () { return false; }, - setColor: function (color) { - cc.LayerRGBA.prototype.setColor.call(this, color); - this._updateColor(); - }, - - setOpacity: function (opacity) { - cc.LayerRGBA.prototype.setOpacity.call(this, opacity); - this._updateColor(); - }, - - _isLighterMode: false, /** - * @constructor + * Constructor of cc.LayerColor * @function * @param {cc.Color} [color=] * @param {Number} [width=] * @param {Number} [height=] */ - ctor: null, + ctor: function(color, width, height){ + cc.Layer.prototype.ctor.call(this); + this._blendFunc = new cc.BlendFunc(cc.BLEND_SRC, cc.BLEND_DST); + cc.LayerColor.prototype.init.call(this, color, width, height); + }, /** + * Initialization of the layer, please do not call this function by yourself, you should pass the parameters to constructor to initialize a layer * @param {cc.Color} [color=] * @param {Number} [width=] * @param {Number} [height=] @@ -432,114 +211,76 @@ cc.LayerColor = cc.LayerRGBA.extend(/** @lends cc.LayerColor# */{ width = width === undefined ? winSize.width : width; height = height === undefined ? winSize.height : height; - var locDisplayedColor = this._displayedColor; - locDisplayedColor.r = color.r; - locDisplayedColor.g = color.g; - locDisplayedColor.b = color.b; - var locRealColor = this._realColor; locRealColor.r = color.r; locRealColor.g = color.g; locRealColor.b = color.b; - - this._displayedOpacity = color.a; this._realOpacity = color.a; + this._renderCmd.setDirtyFlag(cc.Node._dirtyFlags.colorDirty|cc.Node._dirtyFlags.opacityDirty); - var proto = cc.LayerColor.prototype; - proto.setContentSize.call(this, width, height); - proto._updateColor.call(this); + cc.LayerColor.prototype.setContentSize.call(this, width, height); return true; }, /** - * blendFunc setter - * @param {Number} src - * @param {Number} dst + * Sets the blend func, you can pass either a cc.BlendFunc object or source and destination value separately + * @param {Number|cc.BlendFunc} src + * @param {Number} [dst] */ setBlendFunc: function (src, dst) { - var _t = this; - if (dst === undefined) - _t._blendFunc = src; - else - _t._blendFunc = {src: src, dst: dst}; - if (cc._renderType === cc._RENDER_TYPE_CANVAS) - _t._isLighterMode = (_t._blendFunc && (_t._blendFunc.src == 1) && (_t._blendFunc.dst == 771)); + var locBlendFunc = this._blendFunc; + if (dst === undefined) { + locBlendFunc.src = src.src; + locBlendFunc.dst = src.dst; + } else { + locBlendFunc.src = src; + locBlendFunc.dst = dst; + } + this._renderCmd.updateBlendFunc(locBlendFunc); }, - _setWidth: null, - - _setHeight: null, - - _updateColor: null, + _setWidth: function(width){ + cc.Node.prototype._setWidth.call(this, width); + this._renderCmd._updateSquareVerticesWidth(width); + }, - updateDisplayedColor: function (parentColor) { - cc.LayerRGBA.prototype.updateDisplayedColor.call(this, parentColor); - this._updateColor(); + _setHeight: function(height){ + cc.Node.prototype._setHeight.call(this, height); + this._renderCmd._updateSquareVerticesHeight(height); }, - updateDisplayedOpacity: function (parentOpacity) { - cc.LayerRGBA.prototype.updateDisplayedOpacity.call(this, parentOpacity); - this._updateColor(); + setContentSize: function(size, height){ + cc.Layer.prototype.setContentSize.call(this, size, height); + this._renderCmd._updateSquareVertices(size, height); }, - /** - * Renders the layer - * @function - * @param {CanvasRenderingContext2D|WebGLRenderingContext} ctx - */ - draw: null + _createRenderCmd: function(){ + if (cc._renderType === cc._RENDER_TYPE_CANVAS) + return new cc.LayerColor.CanvasRenderCmd(this); + else + return new cc.LayerColor.WebGLRenderCmd(this); + } }); /** - * creates a cc.Layer with color, width and height in Points + * Creates a cc.Layer with color, width and height in Points + * @deprecated since v3.0 please use the new construction instead + * @see cc.LayerColor * @param {cc.Color} color * @param {Number|Null} [width=] * @param {Number|Null} [height=] * @return {cc.LayerColor} - * @example - * // Example - * //Create a yellow color layer as background - * var yellowBackground = cc.LayerColor.create(cc.color(255,255,0,255)); - * //If you didnt pass in width and height, it defaults to the same size as the canvas - * - * //create a yellow box, 200 by 200 in size - * var yellowBox = cc.LayerColor.create(cc.color(255,255,0,255), 200, 200); */ cc.LayerColor.create = function (color, width, height) { return new cc.LayerColor(color, width, height); }; - -if (cc._renderType === cc._RENDER_TYPE_CANVAS) { - //cc.LayerColor define start - var _p = cc.LayerColor.prototype; - _p.ctor = function (color, width, height) { - cc.LayerRGBA.prototype.ctor.call(this); - this._blendFunc = new cc.BlendFunc(cc.BLEND_SRC, cc.BLEND_DST); - cc.LayerColor.prototype.init.call(this, color, width, height); - } - _p._setWidth = cc.LayerRGBA.prototype._setWidth; - _p._setHeight = cc.LayerRGBA.prototype._setHeight; - _p._updateColor = function () { - }; - _p.draw = function (ctx) { - var context = ctx || cc._renderContext, _t = this; - var locEGLViewer = cc.view, locDisplayedColor = _t._displayedColor; - - context.fillStyle = "rgba(" + (0 | locDisplayedColor.r) + "," + (0 | locDisplayedColor.g) + "," - + (0 | locDisplayedColor.b) + "," + _t._displayedOpacity / 255 + ")"; - context.fillRect(0, 0, _t.width * locEGLViewer.getScaleX(), -_t.height * locEGLViewer.getScaleY()); - cc.g_NumberOfDraws++; - }; - //cc.LayerGradient define end - _p = null; -} else { - _tmp.WebGLLayerColor(); - delete _tmp.WebGLLayerColor; -} - -_tmp.PrototypeLayerColor(); -delete _tmp.PrototypeLayerColor; +//LayerColor - Getter Setter +(function(){ + var proto = cc.LayerColor.prototype; + cc.defineGetterSetter(proto, "width", proto._getWidth, proto._setWidth); + cc.defineGetterSetter(proto, "height", proto._getHeight, proto._setHeight); +})(); /** *
@@ -563,61 +304,75 @@ delete _tmp.PrototypeLayerColor;
* @class
* @extends cc.LayerColor
*
+ * @param {cc.Color} start Starting color
+ * @param {cc.Color} end Ending color
+ * @param {cc.Point} [v=cc.p(0, -1)] A vector defines the gradient direction, default direction is from top to bottom
+ *
* @property {cc.Color} startColor - Start color of the color gradient
* @property {cc.Color} endColor - End color of the color gradient
* @property {Number} startOpacity - Start opacity of the color gradient
* @property {Number} endOpacity - End opacity of the color gradient
* @property {Number} vector - Direction vector of the color gradient
- * @property {Number} compresseInterpolation - Indicate whether or not the interpolation will be compressed
+ * @property {Number} compressedInterpolation - Indicate whether or not the interpolation will be compressed
*/
cc.LayerGradient = cc.LayerColor.extend(/** @lends cc.LayerGradient# */{
- _startColor: null,
_endColor: null,
_startOpacity: 255,
_endOpacity: 255,
_alongVector: null,
_compressedInterpolation: false,
- _gradientStartPoint: null,
- _gradientEndPoint: null,
_className: "LayerGradient",
+ _colorStops: [],
/**
- * @constructor
- * @param {cc.Color} start starting color
+ * Constructor of cc.LayerGradient
+ * @param {cc.Color} start
* @param {cc.Color} end
- * @param {cc.Point|Null} v
- */
- ctor: function (start, end, v) {
- var _t = this;
- cc.LayerColor.prototype.ctor.call(_t);
-
- _t._startColor = cc.color(0, 0, 0, 255);
- _t._endColor = cc.color(0, 0, 0, 255);
- _t._alongVector = cc.p(0, -1);
- _t._startOpacity = 255;
- _t._endOpacity = 255;
- _t._gradientStartPoint = cc.p(0, 0);
- _t._gradientEndPoint = cc.p(0, 0);
- cc.LayerGradient.prototype.init.call(_t, start, end, v);
- },
-
- /**
+ * @param {cc.Point} [v=cc.p(0, -1)]
+ * @param {Array|Null} stops
+ *
+ * @example Using ColorStops argument:
+ * //startColor & endColor are for default and backward compatibility
+ * var layerGradient = new cc.LayerGradient(cc.color.RED, new cc.Color(255,0,0,0), cc.p(0, -1),
+ * [{p:0, color: cc.color.RED},
+ * {p:.5, color: new cc.Color(0,0,0,0)},
+ * {p:1, color: cc.color.RED}]);
+ * //where p = A value between 0.0 and 1.0 that represents the position between start and end in a gradient
+ *
+ */
+ ctor: function (start, end, v, stops) {
+ cc.LayerColor.prototype.ctor.call(this);
+ this._endColor = cc.color(0, 0, 0, 255);
+ this._alongVector = cc.p(0, -1);
+ this._startOpacity = 255;
+ this._endOpacity = 255;
+
+ if(stops && stops instanceof Array){
+ this._colorStops = stops;
+ stops.splice(0, 0, {p:0, color: start || cc.color.BLACK});
+ stops.push({p:1, color: end || cc.color.BLACK});
+ } else
+ this._colorStops = [{p:0, color: start || cc.color.BLACK}, {p:1, color: end || cc.color.BLACK}];
+
+ cc.LayerGradient.prototype.init.call(this, start, end, v, stops);
+ },
+
+ /**
+ * Initialization of the layer, please do not call this function by yourself, you should pass the parameters to constructor to initialize a layer
* @param {cc.Color} start starting color
* @param {cc.Color} end
* @param {cc.Point|Null} v
+ * @param {Array|Null} stops
* @return {Boolean}
*/
- init: function (start, end, v) {
+ init: function (start, end, v, stops) {
start = start || cc.color(0, 0, 0, 255);
end = end || cc.color(0, 0, 0, 255);
v = v || cc.p(0, -1);
var _t = this;
// Initializes the CCLayer with a gradient between start and end in the direction of v.
- var locStartColor = _t._startColor, locEndColor = _t._endColor;
- locStartColor.r = start.r;
- locStartColor.g = start.g;
- locStartColor.b = start.b;
+ var locEndColor = _t._endColor;
_t._startOpacity = start.a;
locEndColor.r = end.r;
@@ -627,44 +382,41 @@ cc.LayerGradient = cc.LayerColor.extend(/** @lends cc.LayerGradient# */{
_t._alongVector = v;
_t._compressedInterpolation = true;
- _t._gradientStartPoint = cc.p(0, 0);
- _t._gradientEndPoint = cc.p(0, 0);
cc.LayerColor.prototype.init.call(_t, cc.color(start.r, start.g, start.b, 255));
- cc.LayerGradient.prototype._updateColor.call(_t);
+ this._renderCmd.setDirtyFlag(cc.Node._dirtyFlags.colorDirty|cc.Node._dirtyFlags.opacityDirty|cc.Node._dirtyFlags.gradientDirty);
return true;
},
/**
* Sets the untransformed size of the LayerGradient.
- * @override
* @param {cc.Size|Number} size The untransformed size of the LayerGradient or The untransformed size's width of the LayerGradient.
* @param {Number} [height] The untransformed size's height of the LayerGradient.
*/
setContentSize: function (size, height) {
cc.LayerColor.prototype.setContentSize.call(this, size, height);
- this._updateColor();
+ this._renderCmd.setDirtyFlag(cc.Node._dirtyFlags.gradientDirty);
},
_setWidth: function (width) {
cc.LayerColor.prototype._setWidth.call(this, width);
- this._updateColor();
+ this._renderCmd.setDirtyFlag(cc.Node._dirtyFlags.gradientDirty);
},
_setHeight: function (height) {
cc.LayerColor.prototype._setHeight.call(this, height);
- this._updateColor();
+ this._renderCmd.setDirtyFlag(cc.Node._dirtyFlags.gradientDirty);
},
/**
- * get the starting color
+ * Returns the starting color
* @return {cc.Color}
*/
getStartColor: function () {
- return this._realColor;
+ return cc.color(this._realColor);
},
/**
- * set the starting color
+ * Sets the starting color
* @param {cc.Color} color
* @example
* // Example
@@ -673,10 +425,18 @@ cc.LayerGradient = cc.LayerColor.extend(/** @lends cc.LayerGradient# */{
*/
setStartColor: function (color) {
this.color = color;
+ //update the color stops
+ var stops = this._colorStops;
+ if(stops && stops.length > 0){
+ var selColor = stops[0].color;
+ selColor.r = color.r;
+ selColor.g = color.g;
+ selColor.b = color.b;
+ }
},
/**
- * set the end gradient color
+ * Sets the end gradient color
* @param {cc.Color} color
* @example
* // Example
@@ -684,29 +444,44 @@ cc.LayerGradient = cc.LayerColor.extend(/** @lends cc.LayerGradient# */{
* //set the ending gradient to red
*/
setEndColor: function (color) {
- this._endColor = color;
- this._updateColor();
+ var locColor = this._endColor;
+ locColor.r = color.r;
+ locColor.g = color.g;
+ locColor.b = color.b;
+ //update the color stops
+ var stops = this._colorStops;
+ if(stops && stops.length > 0){
+ var selColor = stops[stops.length -1].color;
+ selColor.r = color.r;
+ selColor.g = color.g;
+ selColor.b = color.b;
+ }
+ this._renderCmd.setDirtyFlag(cc.Node._dirtyFlags.colorDirty);
},
/**
- * get the end color
+ * Returns the end color
* @return {cc.Color}
*/
getEndColor: function () {
- return this._endColor;
+ return cc.color(this._endColor);
},
/**
- * set starting gradient opacity
+ * Sets starting gradient opacity
* @param {Number} o from 0 to 255, 0 is transparent
*/
setStartOpacity: function (o) {
this._startOpacity = o;
- this._updateColor();
+ //update the color stops
+ var stops = this._colorStops;
+ if(stops && stops.length > 0)
+ stops[0].color.a = o;
+ this._renderCmd.setDirtyFlag(cc.Node._dirtyFlags.opacityDirty);
},
/**
- * get the starting gradient opacity
+ * Returns the starting gradient opacity
* @return {Number}
*/
getStartOpacity: function () {
@@ -714,16 +489,19 @@ cc.LayerGradient = cc.LayerColor.extend(/** @lends cc.LayerGradient# */{
},
/**
- * set the end gradient opacity
+ * Sets the end gradient opacity
* @param {Number} o
*/
setEndOpacity: function (o) {
this._endOpacity = o;
- this._updateColor();
+ var stops = this._colorStops;
+ if(stops && stops.length > 0)
+ stops[stops.length -1].color.a = o;
+ this._renderCmd.setDirtyFlag(cc.Node._dirtyFlags.opacityDirty);
},
/**
- * get the end gradient opacity
+ * Returns the end gradient opacity
* @return {Number}
*/
getEndOpacity: function () {
@@ -731,23 +509,25 @@ cc.LayerGradient = cc.LayerColor.extend(/** @lends cc.LayerGradient# */{
},
/**
- * set vector
+ * Sets the direction vector of the gradient
* @param {cc.Point} Var
*/
setVector: function (Var) {
this._alongVector.x = Var.x;
this._alongVector.y = Var.y;
- this._updateColor();
+ this._renderCmd.setDirtyFlag(cc.Node._dirtyFlags.gradientDirty);
},
/**
+ * Returns the direction vector of the gradient
* @return {cc.Point}
*/
getVector: function () {
return cc.p(this._alongVector.x, this._alongVector.y);
},
- /** is Compressed Interpolation
+ /**
+ * Returns whether compressed interpolation is enabled
* @return {Boolean}
*/
isCompressedInterpolation: function () {
@@ -755,80 +535,100 @@ cc.LayerGradient = cc.LayerColor.extend(/** @lends cc.LayerGradient# */{
},
/**
+ * Sets whether compressed interpolation is enabled
* @param {Boolean} compress
*/
setCompressedInterpolation: function (compress) {
this._compressedInterpolation = compress;
- this._updateColor();
+ this._renderCmd.setDirtyFlag(cc.Node._dirtyFlags.gradientDirty);
},
- _draw: null,
+ /**
+ * Return an array of Object representing a colorStop for the gradient, if no stops was specified
+ * start & endColor will be provided as default values
+ * @example
+ * [{p: 0, color: cc.color.RED},{p: 1, color: cc.color.RED},...]
+ * @returns {Array}
+ */
+ getColorStops: function(){
+ return this._colorStops;
+ },
+ /**
+ * Set the colorStops to create the gradient using multiple point & color
+ *
+ * @param colorStops
+ *
+ * @example
+ * //startColor & endColor are for default and backward compatibility
+ * var layerGradient = new cc.LayerGradient(cc.color.RED, new cc.Color(255,0,0,0), cc.p(0, -1));
+ * layerGradient.setColorStops([{p:0, color: cc.color.RED},
+ * {p:.5, color: new cc.Color(0,0,0,0)},
+ * {p:1, color: cc.color.RED}]);
+ * //where p = A value between 0.0 and 1.0 that represents the position between start and end in a gradient
+ *
+ */
+ setColorStops: function(colorStops){
+ this._colorStops = colorStops;
+ //todo need update the start color and end color
+ this._renderCmd.setDirtyFlag(cc.Node._dirtyFlags.colorDirty|cc.Node._dirtyFlags.opacityDirty|cc.Node._dirtyFlags.gradientDirty);
+ },
- _updateColor: null
+ _createRenderCmd: function(){
+ if (cc._renderType === cc._RENDER_TYPE_CANVAS)
+ return new cc.LayerGradient.CanvasRenderCmd(this);
+ else
+ return new cc.LayerGradient.WebGLRenderCmd(this);
+ }
});
/**
- * creates a gradient layer
+ * Creates a gradient layer
+ * @deprecated since v3.0, please use the new construction instead
+ * @see cc.layerGradient
* @param {cc.Color} start starting color
* @param {cc.Color} end ending color
* @param {cc.Point|Null} v
+ * @param {Array|NULL} stops
* @return {cc.LayerGradient}
*/
-cc.LayerGradient.create = function (start, end, v) {
- return new cc.LayerGradient(start, end, v);
+cc.LayerGradient.create = function (start, end, v, stops) {
+ return new cc.LayerGradient(start, end, v, stops);
};
-
-
-if (cc._renderType === cc._RENDER_TYPE_CANVAS) {
- //cc.LayerGradient define start
- var _p = cc.LayerGradient.prototype;
- _p.draw = function (ctx) {
- var context = ctx || cc._renderContext, _t = this;
- if (_t._isLighterMode)
- context.globalCompositeOperation = 'lighter';
-
- context.save();
- var locEGLViewer = cc.view, opacityf = _t._displayedOpacity / 255.0;
- var tWidth = _t.width * locEGLViewer.getScaleX(), tHeight = _t.height * locEGLViewer.getScaleY();
- var tGradient = context.createLinearGradient(_t._gradientStartPoint.x, _t._gradientStartPoint.y,
- _t._gradientEndPoint.x, _t._gradientEndPoint.y);
- var locDisplayedColor = _t._displayedColor, locEndColor = _t._endColor;
- tGradient.addColorStop(0, "rgba(" + Math.round(locDisplayedColor.r) + "," + Math.round(locDisplayedColor.g) + ","
- + Math.round(locDisplayedColor.b) + "," + (opacityf * (_t._startOpacity / 255)).toFixed(4) + ")");
- tGradient.addColorStop(1, "rgba(" + Math.round(locEndColor.r) + "," + Math.round(locEndColor.g) + ","
- + Math.round(locEndColor.b) + "," + (opacityf * (_t._endOpacity / 255)).toFixed(4) + ")");
- context.fillStyle = tGradient;
- context.fillRect(0, 0, tWidth, -tHeight);
-
- if (_t._rotation != 0)
- context.rotate(_t._rotationRadians);
- context.restore();
- };
- _p._updateColor = function () {
- var _t = this;
- var locAlongVector = _t._alongVector, tWidth = _t.width * 0.5, tHeight = _t.height * 0.5;
-
- _t._gradientStartPoint.x = tWidth * (-locAlongVector.x) + tWidth;
- _t._gradientStartPoint.y = tHeight * locAlongVector.y - tHeight;
- _t._gradientEndPoint.x = tWidth * locAlongVector.x + tWidth;
- _t._gradientEndPoint.y = tHeight * (-locAlongVector.y) - tHeight;
- };
- //cc.LayerGradient define end
- _p = null;
-} else {
- _tmp.WebGLLayerGradient();
- delete _tmp.WebGLLayerGradient;
-}
-_tmp.PrototypeLayerGradient();
-delete _tmp.PrototypeLayerGradient;
+//LayerGradient - Getter Setter
+(function(){
+ var proto = cc.LayerGradient.prototype;
+ // Extended properties
+ /** @expose */
+ proto.startColor;
+ cc.defineGetterSetter(proto, "startColor", proto.getStartColor, proto.setStartColor);
+ /** @expose */
+ proto.endColor;
+ cc.defineGetterSetter(proto, "endColor", proto.getEndColor, proto.setEndColor);
+ /** @expose */
+ proto.startOpacity;
+ cc.defineGetterSetter(proto, "startOpacity", proto.getStartOpacity, proto.setStartOpacity);
+ /** @expose */
+ proto.endOpacity;
+ cc.defineGetterSetter(proto, "endOpacity", proto.getEndOpacity, proto.setEndOpacity);
+ /** @expose */
+ proto.vector;
+ cc.defineGetterSetter(proto, "vector", proto.getVector, proto.setVector);
+ /** @expose */
+ proto.colorStops;
+ cc.defineGetterSetter(proto, "colorStops", proto.getColorStops, proto.setColorStops);
+})();
/**
* CCMultipleLayer is a CCLayer with the ability to multiplex it's children.
* Features:
*
- - It supports one or more children *
- - Only one children will be active a time
+ * Switches to a certain layer indexed by n.
* The current (old) layer will be removed from it's parent with 'cleanup:YES'. * @param {Number} n the layer index to switch to */ @@ -874,7 +678,8 @@ cc.LayerMultiplex = cc.Layer.extend(/** @lends cc.LayerMultiplex# */{ this.addChild(this._layers[n]); }, - /** release the current layer and switches to another layer indexed by n.
+ /** + * Release the current layer and switches to another layer indexed by n.
* The current (old) layer will be removed from it's parent with 'cleanup:YES'. * @param {Number} n the layer index to switch to */ @@ -893,6 +698,7 @@ cc.LayerMultiplex = cc.Layer.extend(/** @lends cc.LayerMultiplex# */{ }, /** + * Add a layer to the multiplex layers list * @param {cc.Layer} layer */ addLayer: function (layer) { @@ -905,13 +711,11 @@ cc.LayerMultiplex = cc.Layer.extend(/** @lends cc.LayerMultiplex# */{ }); /** - * creates a cc.LayerMultiplex with one or more layers using a variable argument list. + * Creates a cc.LayerMultiplex with one or more layers using a variable argument list. + * @deprecated since v3.0, please use new construction instead + * @see cc.LayerMultiplex * @return {cc.LayerMultiplex|Null} - * @example - * // Example - * var multiLayer = cc.LayerMultiple.create(layer1, layer2, layer3);//any number of layers */ cc.LayerMultiplex.create = function (/*Multiple Arguments*/) { - return new cc.LayerMultiplex(arguments); -}; - + return new cc.LayerMultiplex(Array.prototype.slice.call(arguments)); +}; \ No newline at end of file diff --git a/cocos2d/core/layers/CCLayerCanvasRenderCmd.js b/cocos2d/core/layers/CCLayerCanvasRenderCmd.js new file mode 100644 index 0000000000..2fb954e115 --- /dev/null +++ b/cocos2d/core/layers/CCLayerCanvasRenderCmd.js @@ -0,0 +1,440 @@ +/**************************************************************************** + Copyright (c) 2013-2014 Chukong Technologies Inc. + + http://www.cocos2d-x.org + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + ****************************************************************************/ + +//-----------------------// +// 1. cc.Layer // +// 2. cc.LayerColor // +// 3. cc.LayerGradient // +//-----------------------// + +/** + * cc.Layer's rendering objects of Canvas + */ +(function(){ + //Layer's canvas render command + cc.Layer.CanvasRenderCmd = function(renderable){ + cc.Node.CanvasRenderCmd.call(this, renderable); + this._isBaked = false; + this._bakeSprite = null; + }; + + var proto = cc.Layer.CanvasRenderCmd.prototype = Object.create(cc.Node.CanvasRenderCmd.prototype); + proto.constructor = cc.Layer.CanvasRenderCmd; + + proto.bake = function(){ + if (!this._isBaked) { + this._needDraw = true; + cc.renderer.childrenOrderDirty = true; + //limit: 1. its children's blendfunc are invalid. + this._isBaked = this._cacheDirty = true; + + var children = this._node._children; + for(var i = 0, len = children.length; i < len; i++) + children[i]._renderCmd._setCachedParent(this); + + if (!this._bakeSprite){ + this._bakeSprite = new cc.BakeSprite(); + this._bakeSprite.setAnchorPoint(0,0); + } + } + }; + + proto.unbake = function(){ + if (this._isBaked) { + cc.renderer.childrenOrderDirty = true; + this._needDraw = false; + this._isBaked = false; + this._cacheDirty = true; + + var children = this._node._children; + for(var i = 0, len = children.length; i < len; i++) + children[i]._renderCmd._setCachedParent(null); + } + }; + + proto.isBaked = function(){ + return this._isBaked; + }; + + proto.rendering = function(){ + if(this._cacheDirty){ + var node = this._node; + var children = node._children, locBakeSprite = this._bakeSprite; + + //compute the bounding box of the bake layer. + this.transform(this.getParentRenderCmd(), true); + + var boundingBox = this._getBoundingBoxForBake(); + boundingBox.width = 0|(boundingBox.width+0.5); + boundingBox.height = 0|(boundingBox.height+0.5); + + var bakeContext = locBakeSprite.getCacheContext(); + var ctx = bakeContext.getContext(); + locBakeSprite.resetCanvasSize(boundingBox.width, boundingBox.height); + + bakeContext.setOffset(0 - boundingBox.x, ctx.canvas.height - boundingBox.height + boundingBox.y ); + locBakeSprite.setPosition(boundingBox.x, boundingBox.y); + + //visit for canvas + node.sortAllChildren(); + cc.renderer._turnToCacheMode(this.__instanceId); + for (var i = 0, len = children.length; i < len; i++) { + children[i].visit(this); + } + cc.renderer._renderingToCacheCanvas(bakeContext, this.__instanceId); + locBakeSprite.transform(); //because bake sprite's position was changed at rendering. + this._cacheDirty = false; + } + }; + + proto.visit = function(parentCmd){ + if(!this._isBaked){ + cc.Node.CanvasRenderCmd.prototype.visit.call(this, parentCmd); + return; + } + + var node = this._node, children = node._children; + var len = children.length; + // quick return if not visible + if (!node._visible || len === 0) + return; + + this._syncStatus(parentCmd); + cc.renderer.pushRenderCommand(this); + + //the bakeSprite is drawing + this._bakeSprite.visit(this); + this._dirtyFlag = 0; + }; + + proto._bakeForAddChild = function(child){ + if(child._parent === this._node && this._isBaked) + child._renderCmd._setCachedParent(this); + }; + + proto._getBoundingBoxForBake = function(){ + var rect = null, node = this._node; + + //query child's BoundingBox + if (!node._children || node._children.length === 0) + return cc.rect(0, 0, 10, 10); + var trans = node.getNodeToWorldTransform(); + + var locChildren = node._children; + for (var i = 0, len = locChildren.length; i < len; i++) { + var child = locChildren[i]; + if (child && child._visible) { + if(rect){ + var childRect = child._getBoundingBoxToCurrentNode(trans); + if (childRect) + rect = cc.rectUnion(rect, childRect); + }else{ + rect = child._getBoundingBoxToCurrentNode(trans); + } + } + } + return rect; + }; +})(); + +/** + * cc.LayerColor's rendering objects of Canvas + */ +(function(){ + //LayerColor's canvas render command + cc.LayerColor.CanvasRenderCmd = function(renderable){ + cc.Layer.CanvasRenderCmd.call(this, renderable); + this._needDraw = true; + this._blendFuncStr = "source-over"; + this._bakeRenderCmd = new cc.CustomRenderCmd(this, this._bakeRendering); + }; + var proto = cc.LayerColor.CanvasRenderCmd.prototype = Object.create(cc.Layer.CanvasRenderCmd.prototype); + proto.constructor = cc.LayerColor.CanvasRenderCmd; + + proto.unbake = function(){ + cc.Layer.CanvasRenderCmd.prototype.unbake.call(this); + this._needDraw = true; + }; + + proto.rendering = function (ctx, scaleX, scaleY) { + var wrapper = ctx || cc._renderContext, context = wrapper.getContext(), + node = this._node, + curColor = this._displayedColor, + opacity = this._displayedOpacity / 255, + locWidth = node._contentSize.width, + locHeight = node._contentSize.height; + + if (opacity === 0) + return; + + wrapper.setCompositeOperation(this._blendFuncStr); + wrapper.setGlobalAlpha(opacity); + wrapper.setFillStyle("rgba(" + (0 | curColor.r) + "," + (0 | curColor.g) + "," + + (0 | curColor.b) + ", 1)"); //TODO: need cache the color string + + wrapper.setTransform(this._worldTransform, scaleX, scaleY); + context.fillRect(0, 0, locWidth * scaleX, -locHeight * scaleY); + + cc.g_NumberOfDraws++; + }; + + proto.updateBlendFunc = function(blendFunc){ + this._blendFuncStr = cc.Node.CanvasRenderCmd._getCompositeOperationByBlendFunc(blendFunc); + }; + + proto._updateSquareVertices = + proto._updateSquareVerticesWidth = + proto._updateSquareVerticesHeight = function(){}; + + proto._bakeRendering = function(){ + if(this._cacheDirty){ + var node = this._node; + var locBakeSprite = this._bakeSprite, children = node._children; + var len = children.length, i; + + //compute the bounding box of the bake layer. + this.transform(this.getParentRenderCmd(), true); + //compute the bounding box of the bake layer. + var boundingBox = this._getBoundingBoxForBake(); + boundingBox.width = 0|(boundingBox.width+0.5); + boundingBox.height = 0|(boundingBox.height+0.5); + + var bakeContext = locBakeSprite.getCacheContext(); + var ctx = bakeContext.getContext(); + locBakeSprite.resetCanvasSize(boundingBox.width, boundingBox.height); + + bakeContext.setOffset(0 - boundingBox.x, ctx.canvas.height - boundingBox.height + boundingBox.y ); + locBakeSprite.setPosition(boundingBox.x, boundingBox.y); + + var child; + cc.renderer._turnToCacheMode(this.__instanceId); + //visit for canvas + if (len > 0) { + node.sortAllChildren(); + // draw children zOrder < 0 + for (i = 0; i < len; i++) { + child = children[i]; + if (child._localZOrder < 0) + child._renderCmd.visit(this); + else + break; + } + cc.renderer.pushRenderCommand(this); + for (; i < len; i++) { + children[i]._renderCmd.visit(this); + } + } else + cc.renderer.pushRenderCommand(this); + cc.renderer._renderingToCacheCanvas(bakeContext, this.__instanceId); + locBakeSprite.transform(); + this._cacheDirty = false; + } + }; + + proto.visit = function(parentCmd){ + if(!this._isBaked){ + cc.Node.CanvasRenderCmd.prototype.visit.call(this); + return; + } + + var node = this._node; + // quick return if not visible + if (!node._visible) + return; + + this._syncStatus(parentCmd); + + cc.renderer.pushRenderCommand(this._bakeRenderCmd); + + //the bakeSprite is drawing + this._bakeSprite._renderCmd.setDirtyFlag(cc.Node._dirtyFlags.transformDirty); + this._bakeSprite.visit(this); + this._dirtyFlag = 0; + }; + + proto._getBoundingBoxForBake = function(){ + var node = this._node; + //default size + var rect = cc.rect(0, 0, node._contentSize.width, node._contentSize.height); + var trans = node.getNodeToWorldTransform(); + rect = cc.rectApplyAffineTransform(rect, node.getNodeToWorldTransform()); + + //query child's BoundingBox + if (!node._children || node._children.length === 0) + return rect; + + var locChildren = node._children; + for (var i = 0; i < locChildren.length; i++) { + var child = locChildren[i]; + if (child && child._visible) { + var childRect = child._getBoundingBoxToCurrentNode(trans); + rect = cc.rectUnion(rect, childRect); + } + } + return rect; + }; +})(); + +(function () { + cc.LayerGradient.RenderCmd = { + updateStatus: function () { + var flags = cc.Node._dirtyFlags, locFlag = this._dirtyFlag; + var colorDirty = locFlag & flags.colorDirty, + opacityDirty = locFlag & flags.opacityDirty; + if (colorDirty) + this._updateDisplayColor(); + + if (opacityDirty) + this._updateDisplayOpacity(); + + if (locFlag & flags.transformDirty) { + //update the transform + this.transform(null, true); + } + + if (colorDirty || opacityDirty || (locFlag & flags.gradientDirty)){ + this._updateColor(); + } + this._dirtyFlag = 0; + } + }; +})(); + +/** + * cc.LayerGradient's rendering objects of Canvas + */ +(function(){ + cc.LayerGradient.CanvasRenderCmd = function(renderable){ + cc.LayerColor.CanvasRenderCmd.call(this, renderable); + this._needDraw = true; + this._startPoint = cc.p(0, 0); + this._endPoint = cc.p(0, 0); + this._startStopStr = null; + this._endStopStr = null; + }; + var proto = cc.LayerGradient.CanvasRenderCmd.prototype = Object.create(cc.LayerColor.CanvasRenderCmd.prototype); + cc.inject(cc.LayerGradient.RenderCmd, proto); + proto.constructor = cc.LayerGradient.CanvasRenderCmd; + + proto.rendering = function (ctx, scaleX, scaleY) { + var wrapper = ctx || cc._renderContext, context = wrapper.getContext(), + node = this._node, + opacity = this._displayedOpacity / 255; + + if (opacity === 0) + return; + + var locWidth = node._contentSize.width, locHeight = node._contentSize.height; + wrapper.setCompositeOperation(this._blendFuncStr); + wrapper.setGlobalAlpha(opacity); + var gradient = context.createLinearGradient(this._startPoint.x*scaleX, this._startPoint.y*scaleY, this._endPoint.x*scaleX, this._endPoint.y*scaleY); + + if(node._colorStops){ //Should always fall here now + for(var i=0; i < node._colorStops.length; i++) { + var stop = node._colorStops[i]; + gradient.addColorStop(stop.p, this._colorStopsStr[i]); + } + }else{ + gradient.addColorStop(0, this._startStopStr); + gradient.addColorStop(1, this._endStopStr); + } + + wrapper.setFillStyle(gradient); + + wrapper.setTransform(this._worldTransform, scaleX, scaleY); + context.fillRect(0, 0, locWidth * scaleX, -locHeight * scaleY); + cc.g_NumberOfDraws++; + }; + + proto._syncStatus = function (parentCmd) { + var flags = cc.Node._dirtyFlags, locFlag = this._dirtyFlag; + var parentNode = parentCmd ? parentCmd._node : null; + + if(parentNode && parentNode._cascadeColorEnabled && (parentCmd._dirtyFlag & flags.colorDirty)) + locFlag |= flags.colorDirty; + + if(parentNode && parentNode._cascadeOpacityEnabled && (parentCmd._dirtyFlag & flags.opacityDirty)) + locFlag |= flags.opacityDirty; + + if(parentCmd && (parentCmd._dirtyFlag & flags.transformDirty)) + locFlag |= flags.transformDirty; + + var colorDirty = locFlag & flags.colorDirty, + opacityDirty = locFlag & flags.opacityDirty; + + this._dirtyFlag = locFlag; + + if (colorDirty) + this._syncDisplayColor(); + + if (opacityDirty) + this._syncDisplayOpacity(); + + if (locFlag & flags.transformDirty) { + //update the transform + this.transform(parentCmd); + } + + if (colorDirty || opacityDirty || (locFlag & flags.gradientDirty)){ + this._updateColor(); + } + }; + + proto._updateColor = function(){ + var node = this._node; + var contentSize = node._contentSize; + var tWidth = contentSize.width * 0.5, tHeight = contentSize.height * 0.5; + this._dirtyFlag = this._dirtyFlag & cc.Node._dirtyFlags.gradientDirty ^ this._dirtyFlag; + + //fix the bug of gradient layer + var angle = cc.pAngleSigned(cc.p(0, -1), node._alongVector); + var p1 = cc.pRotateByAngle(cc.p(0, -1), cc.p(0,0), angle); + var factor = Math.min(Math.abs(1 / p1.x), Math.abs(1/ p1.y)); + + this._startPoint.x = tWidth * (-p1.x * factor) + tWidth; + this._startPoint.y = tHeight * (p1.y * factor) - tHeight; + this._endPoint.x = tWidth * (p1.x * factor) + tWidth; + this._endPoint.y = tHeight * (-p1.y * factor) - tHeight; + + var locStartColor = this._displayedColor, locEndColor = node._endColor; + var startOpacity = node._startOpacity/255, endOpacity = node._endOpacity/255; + this._startStopStr = "rgba(" + Math.round(locStartColor.r) + "," + Math.round(locStartColor.g) + "," + + Math.round(locStartColor.b) + "," + startOpacity.toFixed(4) + ")"; + this._endStopStr = "rgba(" + Math.round(locEndColor.r) + "," + Math.round(locEndColor.g) + "," + + Math.round(locEndColor.b) + "," + endOpacity.toFixed(4) + ")"; + + if( node._colorStops){ + this._startOpacity = 0; + this._endOpacity = 0; + + this._colorStopsStr = []; + for(var i =0; i < node._colorStops.length; i++){ + var stopColor = node._colorStops[i].color; + var stopOpacity = stopColor.a == null ? 1 : stopColor.a / 255; + this._colorStopsStr.push("rgba(" + Math.round(stopColor.r) + "," + Math.round(stopColor.g) + "," + + Math.round(stopColor.b) + "," + stopOpacity.toFixed(4) + ")"); + } + } + }; +})(); \ No newline at end of file diff --git a/cocos2d/core/layers/CCLayerPropertyDefine.js b/cocos2d/core/layers/CCLayerPropertyDefine.js deleted file mode 100644 index 1eac9fd438..0000000000 --- a/cocos2d/core/layers/CCLayerPropertyDefine.js +++ /dev/null @@ -1,70 +0,0 @@ -/**************************************************************************** - Copyright (c) 2010-2014 cocos2d-x.org - - http://www.cocos2d-x.org - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. - ****************************************************************************/ - -_tmp.PrototypeLayerRGBA = function () { - var _p = cc.LayerRGBA.prototype; - // Extended properties - /** @expose */ - _p.opacityModifyRGB; - cc.defineGetterSetter(_p, "opacityModifyRGB", _p.isOpacityModifyRGB, _p.setOpacityModifyRGB); - /** @expose */ - _p.opacity; - cc.defineGetterSetter(_p, "opacity", _p.getOpacity, _p.setOpacity); - /** @expose */ - _p.cascadeOpacity; - cc.defineGetterSetter(_p, "cascadeOpacity", _p.isCascadeOpacityEnabled, _p.setCascadeOpacityEnabled); - /** @expose */ - _p.color; - cc.defineGetterSetter(_p, "color", _p.getColor, _p.setColor); - /** @expose */ - _p.cascadeColor; - cc.defineGetterSetter(_p, "cascadeColor", _p.isCascadeColorEnabled, _p.setCascadeColorEnabled); -}; - -_tmp.PrototypeLayerColor = function () { - var _p = cc.LayerColor.prototype; - // Override properties - cc.defineGetterSetter(_p, "width", _p._getWidth, _p._setWidth); - cc.defineGetterSetter(_p, "height", _p._getHeight, _p._setHeight); -}; - -_tmp.PrototypeLayerGradient = function () { - var _p = cc.LayerGradient.prototype; - // Extended properties - /** @expose */ - _p.startColor; - cc.defineGetterSetter(_p, "startColor", _p.getStartColor, _p.setStartColor); - /** @expose */ - _p.endColor; - cc.defineGetterSetter(_p, "endColor", _p.getEndColor, _p.setEndColor); - /** @expose */ - _p.startOpacity; - cc.defineGetterSetter(_p, "startOpacity", _p.getStartOpacity, _p.setStartOpacity); - /** @expose */ - _p.endOpacity; - cc.defineGetterSetter(_p, "endOpacity", _p.getEndOpacity, _p.setEndOpacity); - /** @expose */ - _p.vector; - cc.defineGetterSetter(_p, "vector", _p.getVector, _p.setVector); -}; \ No newline at end of file diff --git a/cocos2d/core/layers/CCLayerWebGL.js b/cocos2d/core/layers/CCLayerWebGL.js deleted file mode 100644 index a7b58fda77..0000000000 --- a/cocos2d/core/layers/CCLayerWebGL.js +++ /dev/null @@ -1,180 +0,0 @@ -/**************************************************************************** - Copyright (c) 2010-2014 cocos2d-x.org - - http://www.cocos2d-x.org - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. - ****************************************************************************/ - -_tmp.WebGLLayerColor = function () { - //cc.LayerColor define start - var _p = cc.LayerColor.prototype; - _p._squareVertices = null; - _p._squareColors = null; - _p._verticesFloat32Buffer = null; - _p._colorsUint8Buffer = null; - _p._squareVerticesAB = null; - _p._squareColorsAB = null; - _p.ctor = function (color, width, height) { - var _t = this; - _t._squareVerticesAB = new ArrayBuffer(32); - _t._squareColorsAB = new ArrayBuffer(16); - - var locSquareVerticesAB = _t._squareVerticesAB, locSquareColorsAB = _t._squareColorsAB; - var locVertex2FLen = cc.Vertex2F.BYTES_PER_ELEMENT, locColorLen = cc.Color.BYTES_PER_ELEMENT; - _t._squareVertices = [new cc.Vertex2F(0, 0, locSquareVerticesAB, 0), - new cc.Vertex2F(0, 0, locSquareVerticesAB, locVertex2FLen), - new cc.Vertex2F(0, 0, locSquareVerticesAB, locVertex2FLen * 2), - new cc.Vertex2F(0, 0, locSquareVerticesAB, locVertex2FLen * 3)]; - _t._squareColors = [cc.color(0, 0, 0, 255, locSquareColorsAB, 0), - cc.color(0, 0, 0, 255, locSquareColorsAB, locColorLen), - cc.color(0, 0, 0, 255, locSquareColorsAB, locColorLen * 2), - cc.color(0, 0, 0, 255, locSquareColorsAB, locColorLen * 3)]; - _t._verticesFloat32Buffer = cc._renderContext.createBuffer(); - _t._colorsUint8Buffer = cc._renderContext.createBuffer(); - - cc.LayerRGBA.prototype.ctor.call(_t); - _t._blendFunc = new cc.BlendFunc(cc.BLEND_SRC, cc.BLEND_DST); - - cc.LayerColor.prototype.init.call(_t, color, width, height); - }; - _p.setContentSize = function (size, height) { - var locSquareVertices = this._squareVertices; - if (height === undefined) { - locSquareVertices[1].x = size.width; - locSquareVertices[2].y = size.height; - locSquareVertices[3].x = size.width; - locSquareVertices[3].y = size.height; - } else { - locSquareVertices[1].x = size; - locSquareVertices[2].y = height; - locSquareVertices[3].x = size; - locSquareVertices[3].y = height; - } - this._bindLayerVerticesBufferData(); - cc.Layer.prototype.setContentSize.call(this, size, height); - }; - _p._setWidth = function (width) { - var locSquareVertices = this._squareVertices; - locSquareVertices[1].x = width; - locSquareVertices[3].x = width; - this._bindLayerVerticesBufferData(); - cc.Layer.prototype._setWidth.call(this, width); - }; - _p._setHeight = function (height) { - var locSquareVertices = this._squareVertices; - locSquareVertices[2].y = height; - locSquareVertices[3].y = height; - this._bindLayerVerticesBufferData(); - cc.Layer.prototype._setHeight.call(this, height); - }; - _p._updateColor = function () { - var locDisplayedColor = this._displayedColor; - var locDisplayedOpacity = this._displayedOpacity, locSquareColors = this._squareColors; - for (var i = 0; i < 4; i++) { - locSquareColors[i].r = locDisplayedColor.r; - locSquareColors[i].g = locDisplayedColor.g; - locSquareColors[i].b = locDisplayedColor.b; - locSquareColors[i].a = locDisplayedOpacity; - } - this._bindLayerColorsBufferData(); - }; - _p.draw = function (ctx) { - var context = ctx || cc._renderContext; - - cc.nodeDrawSetup(this); - cc.glEnableVertexAttribs(cc.VERTEX_ATTRIB_FLAG_POSITION | cc.VERTEX_ATTRIB_FLAG_COLOR); - - // - // Attributes - // - context.bindBuffer(context.ARRAY_BUFFER, this._verticesFloat32Buffer); - context.vertexAttribPointer(cc.VERTEX_ATTRIB_POSITION, 2, context.FLOAT, false, 0, 0); - - context.bindBuffer(context.ARRAY_BUFFER, this._colorsUint8Buffer); - context.vertexAttribPointer(cc.VERTEX_ATTRIB_COLOR, 4, context.UNSIGNED_BYTE, true, 0, 0); - - cc.glBlendFunc(this._blendFunc.src, this._blendFunc.dst); - context.drawArrays(context.TRIANGLE_STRIP, 0, 4); - }; - _p._bindLayerVerticesBufferData = function () { - var glContext = cc._renderContext; - glContext.bindBuffer(glContext.ARRAY_BUFFER, this._verticesFloat32Buffer); - glContext.bufferData(glContext.ARRAY_BUFFER, this._squareVerticesAB, glContext.STATIC_DRAW); - }; - - _p._bindLayerColorsBufferData = function () { - var glContext = cc._renderContext; - glContext.bindBuffer(glContext.ARRAY_BUFFER, this._colorsUint8Buffer); - glContext.bufferData(glContext.ARRAY_BUFFER, this._squareColorsAB, glContext.STATIC_DRAW); - }; - //cc.LayerColor define end -} - -_tmp.WebGLLayerGradient = function () { - //cc.LayerGradient define start - var _p = cc.LayerGradient.prototype; - _p.draw = cc.LayerColor.prototype.draw; - _p._updateColor = function () { - var _t = this; - var locAlongVector = _t._alongVector; - var h = cc.pLength(locAlongVector); - if (h === 0) - return; - - var c = Math.sqrt(2.0), u = cc.p(locAlongVector.x / h, locAlongVector.y / h); - - // Compressed Interpolation mode - if (_t._compressedInterpolation) { - var h2 = 1 / ( Math.abs(u.x) + Math.abs(u.y) ); - u = cc.pMult(u, h2 * c); - } - - var opacityf = _t._displayedOpacity / 255.0; - var locDisplayedColor = _t._displayedColor, locEndColor = _t._endColor; - var S = { r: locDisplayedColor.r, g: locDisplayedColor.g, b: locDisplayedColor.b, a: _t._startOpacity * opacityf}; - var E = {r: locEndColor.r, g: locEndColor.g, b: locEndColor.b, a: _t._endOpacity * opacityf}; - - // (-1, -1) - var locSquareColors = _t._squareColors; - var locSquareColor0 = locSquareColors[0], locSquareColor1 = locSquareColors[1], locSquareColor2 = locSquareColors[2], locSquareColor3 = locSquareColors[3]; - locSquareColor0.r = ((E.r + (S.r - E.r) * ((c + u.x + u.y) / (2.0 * c)))); - locSquareColor0.g = ((E.g + (S.g - E.g) * ((c + u.x + u.y) / (2.0 * c)))); - locSquareColor0.b = ((E.b + (S.b - E.b) * ((c + u.x + u.y) / (2.0 * c)))); - locSquareColor0.a = ((E.a + (S.a - E.a) * ((c + u.x + u.y) / (2.0 * c)))); - // (1, -1) - locSquareColor1.r = ((E.r + (S.r - E.r) * ((c - u.x + u.y) / (2.0 * c)))); - locSquareColor1.g = ((E.g + (S.g - E.g) * ((c - u.x + u.y) / (2.0 * c)))); - locSquareColor1.b = ((E.b + (S.b - E.b) * ((c - u.x + u.y) / (2.0 * c)))); - locSquareColor1.a = ((E.a + (S.a - E.a) * ((c - u.x + u.y) / (2.0 * c)))); - // (-1, 1) - locSquareColor2.r = ((E.r + (S.r - E.r) * ((c + u.x - u.y) / (2.0 * c)))); - locSquareColor2.g = ((E.g + (S.g - E.g) * ((c + u.x - u.y) / (2.0 * c)))); - locSquareColor2.b = ((E.b + (S.b - E.b) * ((c + u.x - u.y) / (2.0 * c)))); - locSquareColor2.a = ((E.a + (S.a - E.a) * ((c + u.x - u.y) / (2.0 * c)))); - // (1, 1) - locSquareColor3.r = ((E.r + (S.r - E.r) * ((c - u.x - u.y) / (2.0 * c)))); - locSquareColor3.g = ((E.g + (S.g - E.g) * ((c - u.x - u.y) / (2.0 * c)))); - locSquareColor3.b = ((E.b + (S.b - E.b) * ((c - u.x - u.y) / (2.0 * c)))); - locSquareColor3.a = ((E.a + (S.a - E.a) * ((c - u.x - u.y) / (2.0 * c)))); - - _t._bindLayerColorsBufferData(); - } - //cc.LayerGradient define end -} \ No newline at end of file diff --git a/cocos2d/core/layers/CCLayerWebGLRenderCmd.js b/cocos2d/core/layers/CCLayerWebGLRenderCmd.js new file mode 100644 index 0000000000..c9314203ac --- /dev/null +++ b/cocos2d/core/layers/CCLayerWebGLRenderCmd.js @@ -0,0 +1,311 @@ +/**************************************************************************** + Copyright (c) 2013-2014 Chukong Technologies Inc. + + http://www.cocos2d-x.org + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + ****************************************************************************/ + +//-----------------------// +// 1. cc.Layer // +// 2. cc.LayerColor // +// 3. cc.LayerGradient // +//-----------------------// + +/** + * cc.Layer's rendering objects of WebGL + */ +(function(){ + cc.Layer.WebGLRenderCmd = function(renderable){ + cc.Node.WebGLRenderCmd.call(this, renderable); + }; + + var proto = cc.Layer.WebGLRenderCmd.prototype = Object.create(cc.Node.WebGLRenderCmd.prototype); + proto.constructor = cc.Layer.WebGLRenderCmd; + + proto.bake = function(){}; + + proto.unbake = function(){}; + + proto._bakeForAddChild = function(){}; +})(); + +/** + * cc.LayerColor's rendering objects of WebGL + */ +(function(){ + cc.LayerColor.WebGLRenderCmd = function(renderable){ + cc.Layer.WebGLRenderCmd.call(this, renderable); + this._needDraw = true; + + // + var _t = this; + _t._squareVerticesAB = new ArrayBuffer(32); + _t._squareColorsAB = new ArrayBuffer(16); + + var locSquareVerticesAB = _t._squareVerticesAB, locSquareColorsAB = _t._squareColorsAB; + var locVertex2FLen = cc.Vertex2F.BYTES_PER_ELEMENT, locColorLen = cc.Color.BYTES_PER_ELEMENT; + _t._squareVertices = [new cc.Vertex2F(0, 0, locSquareVerticesAB, 0), + new cc.Vertex2F(0, 0, locSquareVerticesAB, locVertex2FLen), + new cc.Vertex2F(0, 0, locSquareVerticesAB, locVertex2FLen * 2), + new cc.Vertex2F(0, 0, locSquareVerticesAB, locVertex2FLen * 3)]; + _t._squareColors = [cc.color(0, 0, 0, 255, locSquareColorsAB, 0), + cc.color(0, 0, 0, 255, locSquareColorsAB, locColorLen), + cc.color(0, 0, 0, 255, locSquareColorsAB, locColorLen * 2), + cc.color(0, 0, 0, 255, locSquareColorsAB, locColorLen * 3)]; + _t._verticesFloat32Buffer = cc._renderContext.createBuffer(); + _t._colorsUint8Buffer = cc._renderContext.createBuffer(); + }; + var proto = cc.LayerColor.WebGLRenderCmd.prototype = Object.create(cc.Layer.WebGLRenderCmd.prototype); + proto.constructor = cc.LayerColor.WebGLRenderCmd; + + proto.rendering = function (ctx) { + var context = ctx || cc._renderContext; + var node = this._node; + + this._shaderProgram.use(); + this._shaderProgram._setUniformForMVPMatrixWithMat4(this._stackMatrix); + cc.glEnableVertexAttribs(cc.VERTEX_ATTRIB_FLAG_POSITION | cc.VERTEX_ATTRIB_FLAG_COLOR); + cc.glBlendFunc(node._blendFunc.src, node._blendFunc.dst); + + // + // Attributes + // + context.bindBuffer(context.ARRAY_BUFFER, this._verticesFloat32Buffer); + context.vertexAttribPointer(cc.VERTEX_ATTRIB_POSITION, 2, context.FLOAT, false, 0, 0); + + context.bindBuffer(context.ARRAY_BUFFER, this._colorsUint8Buffer); + context.vertexAttribPointer(cc.VERTEX_ATTRIB_COLOR, 4, context.UNSIGNED_BYTE, true, 0, 0); + + context.drawArrays(context.TRIANGLE_STRIP, 0, this._squareVertices.length); + }; + + proto._updateSquareVertices = function(size, height){ + var locSquareVertices = this._squareVertices; + if (height === undefined) { + locSquareVertices[1].x = size.width; + locSquareVertices[2].y = size.height; + locSquareVertices[3].x = size.width; + locSquareVertices[3].y = size.height; + } else { + locSquareVertices[1].x = size; + locSquareVertices[2].y = height; + locSquareVertices[3].x = size; + locSquareVertices[3].y = height; + } + this._bindLayerVerticesBufferData(); + }; + + proto._updateSquareVerticesWidth = function(width){ + var locSquareVertices = this._squareVertices; + locSquareVertices[1].x = width; + locSquareVertices[3].x = width; + this._bindLayerVerticesBufferData(); + }; + + proto._updateSquareVerticesHeight = function(height){ + var locSquareVertices = this._squareVertices; + locSquareVertices[2].y = height; + locSquareVertices[3].y = height; + this._bindLayerVerticesBufferData(); + }; + + proto._updateColor = function(){ + var locDisplayedColor = this._displayedColor, locDisplayedOpacity = this._displayedOpacity, + locSquareColors = this._squareColors; + for (var i = 0; i < 4; i++) { + locSquareColors[i].r = locDisplayedColor.r; + locSquareColors[i].g = locDisplayedColor.g; + locSquareColors[i].b = locDisplayedColor.b; + locSquareColors[i].a = locDisplayedOpacity; + } + this._bindLayerColorsBufferData(); + }; + + proto._bindLayerVerticesBufferData = function(){ + var glContext = cc._renderContext; + glContext.bindBuffer(glContext.ARRAY_BUFFER, this._verticesFloat32Buffer); + glContext.bufferData(glContext.ARRAY_BUFFER, this._squareVerticesAB, glContext.STATIC_DRAW); + }; + + proto._bindLayerColorsBufferData = function(){ + var glContext = cc._renderContext; + glContext.bindBuffer(glContext.ARRAY_BUFFER, this._colorsUint8Buffer); + glContext.bufferData(glContext.ARRAY_BUFFER, this._squareColorsAB, glContext.STATIC_DRAW); + }; + + proto.updateBlendFunc = function(blendFunc){}; +})(); + +/** + * cc.LayerGradient's rendering objects of WebGL + */ +(function(){ + cc.LayerGradient.WebGLRenderCmd = function(renderable){ + cc.LayerColor.WebGLRenderCmd.call(this, renderable); + this._needDraw = true; + this._clipRect = new cc.Rect(); + this._clippingRectDirty = false; + }; + var proto = cc.LayerGradient.WebGLRenderCmd.prototype = Object.create(cc.LayerColor.WebGLRenderCmd.prototype); + cc.inject(cc.LayerGradient.RenderCmd, proto); + proto.constructor = cc.LayerGradient.WebGLRenderCmd; + + proto._syncStatus = function (parentCmd) { + var flags = cc.Node._dirtyFlags, locFlag = this._dirtyFlag; + var parentNode = parentCmd ? parentCmd._node : null; + + if(parentNode && parentNode._cascadeColorEnabled && (parentCmd._dirtyFlag & flags.colorDirty)) + locFlag |= flags.colorDirty; + + if(parentNode && parentNode._cascadeOpacityEnabled && (parentCmd._dirtyFlag & flags.opacityDirty)) + locFlag |= flags.opacityDirty; + + if(parentCmd && (parentCmd._dirtyFlag & flags.transformDirty)) + locFlag |= flags.transformDirty; + + var colorDirty = locFlag & flags.colorDirty, + opacityDirty = locFlag & flags.opacityDirty; + + this._dirtyFlag = locFlag; + + if (colorDirty) + this._syncDisplayColor(); + + if (opacityDirty) + this._syncDisplayOpacity(); + + //if (locFlag & flags.transformDirty) { + //update the transform + this.transform(parentCmd); + //} + + if (colorDirty || opacityDirty || (locFlag & flags.gradientDirty)){ + this._updateColor(); + } + }; + + proto._updateColor = function(){ + this._dirtyFlag = this._dirtyFlag & cc.Node._dirtyFlags.gradientDirty ^ this._dirtyFlag; + var node = this._node, stops = node._colorStops; + if(!stops || stops.length < 2) + return; + + this._clippingRectDirty = true; + var stopsLen = stops.length, verticesLen = stopsLen * 2, i, contentSize = node._contentSize; + this._squareVerticesAB = new ArrayBuffer(verticesLen * 8); + this._squareColorsAB = new ArrayBuffer(verticesLen * 4); + var locVertices = this._squareVertices, locColors = this._squareColors; + locVertices.length = 0; + locColors.length = 0; + + var locSquareVerticesAB = this._squareVerticesAB, locSquareColorsAB = this._squareColorsAB; + var locVertex2FLen = cc.Vertex2F.BYTES_PER_ELEMENT, locColorLen = cc.Color.BYTES_PER_ELEMENT; + for(i = 0; i < verticesLen; i++){ + locVertices.push(new cc.Vertex2F(0, 0, locSquareVerticesAB, locVertex2FLen * i)); + locColors.push(cc.color(0, 0, 0, 255, locSquareColorsAB, locColorLen * i)) + } + + //init vertex + var angle = Math.PI + cc.pAngleSigned(cc.p(0, -1), node._alongVector), locAnchor = cc.p(contentSize.width/2, contentSize.height /2); + var degrees = Math.round(cc.radiansToDegrees(angle)); + var transMat = cc.affineTransformMake(1, 0, 0, 1, locAnchor.x, locAnchor.y); + transMat = cc.affineTransformRotate(transMat, angle); + var a, b; + if(degrees < 90) { + a = cc.p(-locAnchor.x, locAnchor.y); + b = cc.p(locAnchor.x, locAnchor.y); + } else if(degrees < 180) { + a = cc.p(locAnchor.x, locAnchor.y); + b = cc.p(locAnchor.x, -locAnchor.y); + } else if(degrees < 270) { + a = cc.p(locAnchor.x, -locAnchor.y); + b = cc.p(-locAnchor.x, -locAnchor.y); + } else { + a = cc.p(-locAnchor.x, -locAnchor.y); + b = cc.p(-locAnchor.x, locAnchor.y); + } + + var sin = Math.sin(angle), cos = Math.cos(angle); + var tx = Math.abs((a.x * cos - a.y * sin)/locAnchor.x), ty = Math.abs((b.x * sin + b.y * cos)/locAnchor.y); + transMat = cc.affineTransformScale(transMat, tx, ty); + for (i = 0; i < stopsLen; i++) { + var stop = stops[i], y = stop.p * contentSize.height ; + var p0 = cc.pointApplyAffineTransform(- locAnchor.x , y - locAnchor.y, transMat); + locVertices[i * 2].x = p0.x; + locVertices[i * 2].y = p0.y; + var p1 = cc.pointApplyAffineTransform(contentSize.width - locAnchor.x, y - locAnchor.y, transMat); + locVertices[i * 2 + 1].x = p1.x; + locVertices[i * 2 + 1].y = p1.y; + } + + //init color + var opacityf = this._displayedOpacity / 255.0; //, displayColor = this._displayedColor; + for(i = 0; i < stopsLen; i++){ + var stopColor = stops[i].color, locSquareColor0 = locColors[i * 2], locSquareColor1 = locColors[i * 2 + 1]; + locSquareColor0.r = stopColor.r; + locSquareColor0.g = stopColor.g; + locSquareColor0.b = stopColor.b; + locSquareColor0.a = stopColor.a * opacityf; + + locSquareColor1.r = stopColor.r; + locSquareColor1.g = stopColor.g; + locSquareColor1.b = stopColor.b; + locSquareColor1.a = stopColor.a * opacityf; + } + this._bindLayerVerticesBufferData(); + this._bindLayerColorsBufferData(); + }; + + proto.rendering = function (ctx) { + var context = ctx || cc._renderContext, node = this._node; + + //it is too expensive to use stencil to clip, so it use Scissor, + //but it has a bug when layer rotated and layer's content size less than canvas's size. + var clippingRect = this._getClippingRect(); + context.enable(context.SCISSOR_TEST); + cc.view.setScissorInPoints(clippingRect.x, clippingRect.y, clippingRect.width, clippingRect.height); + + //draw gradient layer + this._shaderProgram.use(); + this._shaderProgram._setUniformForMVPMatrixWithMat4(this._stackMatrix); + cc.glEnableVertexAttribs(cc.VERTEX_ATTRIB_FLAG_POSITION | cc.VERTEX_ATTRIB_FLAG_COLOR); + cc.glBlendFunc(node._blendFunc.src, node._blendFunc.dst); + // + // Attributes + // + context.bindBuffer(context.ARRAY_BUFFER, this._verticesFloat32Buffer); + context.vertexAttribPointer(cc.VERTEX_ATTRIB_POSITION, 2, context.FLOAT, false, 0, 0); + context.bindBuffer(context.ARRAY_BUFFER, this._colorsUint8Buffer); + context.vertexAttribPointer(cc.VERTEX_ATTRIB_COLOR, 4, context.UNSIGNED_BYTE, true, 0, 0); + context.drawArrays(context.TRIANGLE_STRIP, 0, this._squareVertices.length); + + context.disable(context.SCISSOR_TEST); + }; + + proto._getClippingRect = function(){ + if(this._clippingRectDirty){ + var node = this._node; + var rect = cc.rect(0, 0, node._contentSize.width, node._contentSize.height); + var trans = node.getNodeToWorldTransform(); + this._clipRect = cc._rectApplyAffineTransformIn(rect, trans); + } + return this._clipRect; + }; +})(); \ No newline at end of file diff --git a/cocos2d/core/platform/CCClass.js b/cocos2d/core/platform/CCClass.js index fa61107aae..2aaf3e6621 100644 --- a/cocos2d/core/platform/CCClass.js +++ b/cocos2d/core/platform/CCClass.js @@ -1,7 +1,7 @@ /**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2008-2010 Ricardo Quesada - Copyright (c) 2011 Zynga Inc. + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,17 +23,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -/* Managed JavaScript Inheritance - * Based on John Resig's Simple JavaScript Inheritance http://ejohn.org/blog/simple-javascript-inheritance/ - * MIT Licensed. - */ + +var cc = cc || {}; /** * @namespace + * @name ClassManager */ -var cc = cc || {}; - -// var ClassManager = { id : (0|(Math.random()*998)), @@ -53,7 +49,7 @@ var ClassManager = { //now we have the content of the function, replace this._super //find this._super - while(str.indexOf('this._super')!= -1) + while(str.indexOf('this._super') !== -1) { var sp = str.indexOf('this._super'); //find the first '(' from this._super) @@ -81,8 +77,12 @@ var ClassManager = { }; ClassManager.compileSuper.ClassManager = ClassManager; +/* Managed JavaScript Inheritance + * Based on John Resig's Simple JavaScript Inheritance http://ejohn.org/blog/simple-javascript-inheritance/ + * MIT Licensed. + */ (function () { - var initializing = false, fnTest = /\b_super\b/; + var fnTest = /\b_super\b/; var config = cc.game.config; var releaseMode = config[cc.game.CONFIG_KEY.classReleaseMode]; if(releaseMode) { @@ -98,10 +98,11 @@ ClassManager.compileSuper.ClassManager = ClassManager; /** * Create a new Class that inherits from this Class - * @param {object} prop + * @static + * @param {object} props * @return {function} */ - cc.Class.extend = function (prop) { + cc.Class.extend = function (props) { var _super = this.prototype; // Instantiate a base Class (but only create the instance, @@ -144,63 +145,66 @@ ClassManager.compileSuper.ClassManager = ClassManager; this.__getters__ && (Class.__getters__ = cc.clone(this.__getters__)); this.__setters__ && (Class.__setters__ = cc.clone(this.__setters__)); - for (var name in prop) { - var isFunc = (typeof prop[name] === "function"); - var override = (typeof _super[name] === "function"); - var hasSuperCall = fnTest.test(prop[name]); - - if(releaseMode && isFunc && override && hasSuperCall) { - desc.value = ClassManager.compileSuper(prop[name], name, classId); - Object.defineProperty(prototype, name, desc); - } else if(isFunc && override && hasSuperCall){ - desc.value = (function (name, fn) { - return function () { - var tmp = this._super; - - // Add a new ._super() method that is the same method - // but on the super-Class - this._super = _super[name]; - - // The method only need to be bound temporarily, so we - // remove it when we're done executing - var ret = fn.apply(this, arguments); - this._super = tmp; - - return ret; - }; - })(name, prop[name]); - Object.defineProperty(prototype, name, desc); - } else if(isFunc) { - desc.value = prop[name]; - Object.defineProperty(prototype, name, desc); - } else{ - prototype[name] = prop[name]; + for(var idx = 0, li = arguments.length; idx < li; ++idx) { + var prop = arguments[idx]; + for (var name in prop) { + var isFunc = (typeof prop[name] === "function"); + var override = (typeof _super[name] === "function"); + var hasSuperCall = fnTest.test(prop[name]); + + if (releaseMode && isFunc && override && hasSuperCall) { + desc.value = ClassManager.compileSuper(prop[name], name, classId); + Object.defineProperty(prototype, name, desc); + } else if (isFunc && override && hasSuperCall) { + desc.value = (function (name, fn) { + return function () { + var tmp = this._super; + + // Add a new ._super() method that is the same method + // but on the super-Class + this._super = _super[name]; + + // The method only need to be bound temporarily, so we + // remove it when we're done executing + var ret = fn.apply(this, arguments); + this._super = tmp; + + return ret; + }; + })(name, prop[name]); + Object.defineProperty(prototype, name, desc); + } else if (isFunc) { + desc.value = prop[name]; + Object.defineProperty(prototype, name, desc); + } else { + prototype[name] = prop[name]; + } + + if (isFunc) { + // Override registered getter/setter + var getter, setter, propertyName; + if (this.__getters__ && this.__getters__[name]) { + propertyName = this.__getters__[name]; + for (var i in this.__setters__) { + if (this.__setters__[i] === propertyName) { + setter = i; + break; + } + } + cc.defineGetterSetter(prototype, propertyName, prop[name], prop[setter] ? prop[setter] : prototype[setter], name, setter); + } + if (this.__setters__ && this.__setters__[name]) { + propertyName = this.__setters__[name]; + for (var i in this.__getters__) { + if (this.__getters__[i] === propertyName) { + getter = i; + break; + } + } + cc.defineGetterSetter(prototype, propertyName, prop[getter] ? prop[getter] : prototype[getter], prop[name], getter, name); + } + } } - - if (isFunc) { - // Override registered getter/setter - var getter, setter, propertyName; - if( this.__getters__ && this.__getters__[name] ) { - propertyName = this.__getters__[name]; - for (var i in this.__setters__) { - if (this.__setters__[i] == propertyName) { - setter = i; - break; - } - } - cc.defineGetterSetter(prototype, propertyName, prop[name], prop[setter] ? prop[setter] : prototype[setter], name, setter); - } - if( this.__setters__ && this.__setters__[name] ) { - propertyName = this.__setters__[name]; - for (var i in this.__getters__) { - if (this.__getters__[i] == propertyName) { - getter = i; - break; - } - } - cc.defineGetterSetter(prototype, propertyName, prop[getter] ? prop[getter] : prototype[getter], prop[name], getter, name); - } - } } // And make this Class extendable @@ -214,14 +218,6 @@ ClassManager.compileSuper.ClassManager = ClassManager; }; return Class; }; - - Function.prototype.bind = Function.prototype.bind || function (bind) { - var self = this; - return function () { - var args = Array.prototype.slice.call(arguments); - return self.apply(bind || null, args); - }; - }; })(); /** @@ -253,8 +249,8 @@ cc.defineGetterSetter = function (proto, prop, getter, setter, getterName, sette for (var i = 0; i < props.length; i++) { var name = props[i]; - if( (Object.getOwnPropertyDescriptor ? Object.getOwnPropertyDescriptor(proto, name) - : proto.__lookupGetter__(name)) + if( (proto.__lookupGetter__ ? proto.__lookupGetter__(name) + : Object.getOwnPropertyDescriptor(proto, name)) || typeof proto[name] !== "function" ) continue; @@ -287,10 +283,10 @@ cc.defineGetterSetter = function (proto, prop, getter, setter, getterName, sette }; /** - * copy an new object + * Create a new object and copy all properties in an exist object to the new object * @function - * @param {object|Array} obj source object - * @return {Array|object} + * @param {object|Array} obj The source object + * @return {Array|object} The created object */ cc.clone = function (obj) { // Cloning is better if the new object is having the same prototype chain @@ -320,7 +316,7 @@ cc.clone = function (obj) { for (var key in obj) { var copy = obj[key]; // Beware that typeof null == "object" ! - if (((typeof copy) == "object") && copy && + if (((typeof copy) === "object") && copy && !(copy instanceof cc.Node) && !(copy instanceof HTMLElement)) { newObj[key] = cc.clone(copy); } else { @@ -330,3 +326,8 @@ cc.clone = function (obj) { return newObj; }; +cc.inject = function(srcPrototype, destPrototype){ + for(var key in srcPrototype) + destPrototype[key] = srcPrototype[key]; +}; + diff --git a/cocos2d/core/platform/CCCommon.js b/cocos2d/core/platform/CCCommon.js index 6f6dc3bd95..2db723b4f9 100644 --- a/cocos2d/core/platform/CCCommon.js +++ b/cocos2d/core/platform/CCCommon.js @@ -1,7 +1,7 @@ /**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2008-2010 Ricardo Quesada - Copyright (c) 2011 Zynga Inc. + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -24,6 +24,9 @@ THE SOFTWARE. ****************************************************************************/ +var cc = cc || {}; +cc._tmp = cc._tmp || {}; + /** * Function added for JS bindings compatibility. Not needed in cocos2d-html5. * @function @@ -34,35 +37,40 @@ cc.associateWithNative = function (jsObj, superclass) { }; /** - * keymap - * @example - * //Example - * //to mark a keydown - * cc.keyDown[65] = true; - * //or - * cc.keyMap[cc.KEY.a] + * Key map for keyboard event * - * //to mark a keyup - * do cc.keyDown[65] = false; - * - * //to find out if a key is down, check - * if(cc.keyDown[65]) - * //or - * if,(cc.keyDown[cc.KEY.space]) - * //if its undefined or false or null, its not pressed * @constant - * @type object + * @type {Object} + * @example + cc.eventManager.addListener({ + event: cc.EventListener.KEYBOARD, + onKeyPressed: function(keyCode, event){ + if (cc.KEY["a"] == keyCode) { + cc.log("A is pressed"); + } + } + }, this); */ cc.KEY = { + none:0, + + // android + back:6, + menu:18, + backspace:8, tab:9, + enter:13, + shift:16, //should use shiftkey instead ctrl:17, //should use ctrlkey alt:18, //should use altkey pause:19, capslock:20, + escape:27, + space:32, pageup:33, pagedown:34, end:35, @@ -71,6 +79,8 @@ cc.KEY = { up:38, right:39, down:40, + select:41, + insert:45, Delete:46, 0:48, @@ -109,6 +119,7 @@ cc.KEY = { x:88, y:89, z:90, + num0:96, num1:97, num2:98, @@ -136,13 +147,15 @@ cc.KEY = { f10:121, f11:122, f12:123, + numlock:144, scrolllock:145, + + ';':186, semicolon:186, - ',':186, equal:187, '=':187, - ';':188, + ',':188, comma:188, dash:189, '.':190, @@ -151,83 +164,97 @@ cc.KEY = { grave:192, '[':219, openbracket:219, + backslash:220, ']':221, closebracket:221, - backslash:220, quote:222, - space:32 + + // gamepad controll + dpadLeft:1000, + dpadRight:1001, + dpadUp:1003, + dpadDown:1004, + dpadCenter:1005 }; /** * Image Format:JPG * @constant - * @type Number + * @type {Number} */ cc.FMT_JPG = 0; /** * Image Format:PNG * @constant - * @type Number + * @type {Number} */ cc.FMT_PNG = 1; /** * Image Format:TIFF * @constant - * @type Number + * @type {Number} */ cc.FMT_TIFF = 2; /** * Image Format:RAWDATA * @constant - * @type Number + * @type {Number} */ cc.FMT_RAWDATA = 3; /** * Image Format:WEBP * @constant - * @type Number + * @type {Number} */ cc.FMT_WEBP = 4; /** * Image Format:UNKNOWN * @constant - * @type Number + * @type {Number} */ cc.FMT_UNKNOWN = 5; +/** + * get image format by image data + * @function + * @param {Array} imgData + * @returns {Number} + */ cc.getImageFormatByData = function (imgData) { // if it is a png file buffer. - if (imgData.length > 8 && imgData[0] == 0x89 - && imgData[1] == 0x50 - && imgData[2] == 0x4E - && imgData[3] == 0x47 - && imgData[4] == 0x0D - && imgData[5] == 0x0A - && imgData[6] == 0x1A - && imgData[7] == 0x0A) { + if (imgData.length > 8 && imgData[0] === 0x89 + && imgData[1] === 0x50 + && imgData[2] === 0x4E + && imgData[3] === 0x47 + && imgData[4] === 0x0D + && imgData[5] === 0x0A + && imgData[6] === 0x1A + && imgData[7] === 0x0A) { return cc.FMT_PNG; } // if it is a tiff file buffer. - if (imgData.length > 2 && ((imgData[0] == 0x49 && imgData[1] == 0x49) - || (imgData[0] == 0x4d && imgData[1] == 0x4d) - || (imgData[0] == 0xff && imgData[1] == 0xd8))) { + if (imgData.length > 2 && ((imgData[0] === 0x49 && imgData[1] === 0x49) + || (imgData[0] === 0x4d && imgData[1] === 0x4d) + || (imgData[0] === 0xff && imgData[1] === 0xd8))) { return cc.FMT_TIFF; } return cc.FMT_UNKNOWN; }; -// -// Another way to subclass: Using Google Closure. -// The following code was copied + pasted from goog.base / goog.inherits -// +/** + * Another way to subclass: Using Google Closure. + * The following code was copied + pasted from goog.base / goog.inherits + * @function + * @param {Function} childCtor + * @param {Function} parentCtor + */ cc.inherits = function (childCtor, parentCtor) { - /** @constructor */ function tempCtor() {} tempCtor.prototype = parentCtor.prototype; childCtor.superClass_ = parentCtor.prototype; @@ -240,6 +267,10 @@ cc.inherits = function (childCtor, parentCtor) { // } }; +/** + * @deprecated since v3.0, please use cc.Class.extend and _super + * @cc.Class.extend + */ cc.base = function(me, opt_methodName, var_args) { var caller = arguments.callee.caller; if (caller.superClass_) { diff --git a/cocos2d/core/platform/CCConfig.js b/cocos2d/core/platform/CCConfig.js index 2b52726809..d22450daad 100644 --- a/cocos2d/core/platform/CCConfig.js +++ b/cocos2d/core/platform/CCConfig.js @@ -1,7 +1,7 @@ /**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2008-2010 Ricardo Quesada - Copyright (c) 2011 Zynga Inc. + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,15 +25,13 @@ ****************************************************************************/ /** - *
- * The current version of Cocos2d-html5 being used.
+ * The current version of Cocos2d-JS being used.
* Please DO NOT remove this String, it is an important flag for bug tracking.
* If you post a bug to forum, please attach this flag.
- *
@@ -52,17 +50,19 @@ cc.ENGINE_VERSION = "Cocos2d-html5-v3.0 alpha 2";
* - cc.QuadParticleSystem
* - cc.TileMap
*
- * To enabled set it to 1. Disabled by default.
+ * To enabled set it to 1. Disabled by default.
+ * To modify it, in Web engine please refer to CCConfig.js, in JSB please refer to CCConfig.h
*
+ * To modify it, in Web engine please refer to CCConfig.js, in JSB please refer to CCConfig.h * @constant - * @type cc.Point + * @type {cc.Point} */ cc.DIRECTOR_STATS_POSITION = cc.p(0, 0); @@ -73,9 +73,10 @@ cc.DIRECTOR_STATS_POSITION = cc.p(0, 0); * Having a bigger number means a more reliable FPS
*
* Default value: 0.1f
+ * To modify it, in Web engine please refer to CCConfig.js, in JSB please refer to CCConfig.h * * @constant - * @type Number + * @type {Number} */ cc.DIRECTOR_FPS_INTERVAL = 0.5; @@ -84,10 +85,11 @@ cc.DIRECTOR_FPS_INTERVAL = 0.5; * If enabled, the cc.Node objects (cc.Sprite, cc.Label,etc) will be able to render in subpixels.
* If disabled, integer pixels will be used.
*
- * To enable set it to 1. Enabled by default. + * To enable set it to 1. Enabled by default.
+ * To modify it, in Web engine please refer to CCConfig.js, in JSB please refer to CCConfig.h * * @constant - * @type Number + * @type {Number} */ cc.COCOSNODE_RENDER_SUBPIXEL = 1; @@ -96,10 +98,11 @@ cc.COCOSNODE_RENDER_SUBPIXEL = 1; * If enabled, the cc.Sprite objects rendered with cc.SpriteBatchNode will be able to render in subpixels.
* If disabled, integer pixels will be used.
*
- * To enable set it to 1. Enabled by default. + * To enable set it to 1. Enabled by default.
+ * To modify it, in Web engine please refer to CCConfig.js, in JSB please refer to CCConfig.h * * @constant - * @type Number + * @type {Number} */ cc.SPRITEBATCHNODE_RENDER_SUBPIXEL = 1; @@ -108,10 +111,11 @@ cc.SPRITEBATCHNODE_RENDER_SUBPIXEL = 1; * If most of your images have pre-multiplied alpha, set it to 1 (if you are going to use .PNG/.JPG file images).
* Only set to 0 if ALL your images by-pass Apple UIImage loading system (eg: if you use libpng or PVR images)
*
- * To enable set it to a value different than 0. Enabled by default. + * To enable set it to a value different than 0. Enabled by default.
+ * To modify it, in Web engine please refer to CCConfig.js, in JSB please refer to CCConfig.h * * @constant - * @type Number + * @type {Number} */ cc.OPTIMIZE_BLEND_FUNC_FOR_PREMULTIPLIED_ALPHA = 0; @@ -120,10 +124,11 @@ cc.OPTIMIZE_BLEND_FUNC_FOR_PREMULTIPLIED_ALPHA = 0; * Use GL_TRIANGLE_STRIP instead of GL_TRIANGLES when rendering the texture atlas.
* It seems it is the recommend way, but it is much slower, so, enable it at your own risk
*
- * To enable set it to a value different than 0. Disabled by default. + * To enable set it to a value different than 0. Disabled by default.
+ * To modify it, in Web engine please refer to CCConfig.js, in JSB please refer to CCConfig.h * * @constant - * @type Number + * @type {Number} */ cc.TEXTURE_ATLAS_USE_TRIANGLE_STRIP = 0; @@ -134,9 +139,10 @@ cc.TEXTURE_ATLAS_USE_TRIANGLE_STRIP = 0; * So for certain cases, where you might need hundreds of VAO objects, it might be a good idea to disable it.
*
* To disable it set it to 0. disable by default.(Not Supported on WebGL)
+ * To modify it, in Web engine please refer to CCConfig.js, in JSB please refer to CCConfig.h * * @constant - * @type Number + * @type {Number} */ cc.TEXTURE_ATLAS_USE_VAO = 0; @@ -150,10 +156,11 @@ cc.TEXTURE_ATLAS_USE_VAO = 0; * To enable set it to a value different than 0. Disabled by default.
*
* This value governs only the PNG, GIF, BMP, images.
- * This value DOES NOT govern the PVR (PVR.GZ, PVR.CCZ) files. If NPOT PVR is loaded, then it will create an NPOT texture ignoring this value. + * This value DOES NOT govern the PVR (PVR.GZ, PVR.CCZ) files. If NPOT PVR is loaded, then it will create an NPOT texture ignoring this value.
+ * To modify it, in Web engine please refer to CCConfig.js, in JSB please refer to CCConfig.h * * @constant - * @type Number + * @type {Number} * @deprecated This value will be removed in 1.1 and NPOT textures will be loaded by default if the device supports it. */ cc.TEXTURE_NPOT_SUPPORT = 0; @@ -166,10 +173,11 @@ cc.TEXTURE_NPOT_SUPPORT = 0; * To enable set it to 1. Use 0 to disable it. Enabled by default.
*
* This value governs only the PNG, GIF, BMP, images.
- * This value DOES NOT govern the PVR (PVR.GZ, PVR.CCZ) files. If NPOT PVR is loaded, then it will create an NPOT texture ignoring this value. + * This value DOES NOT govern the PVR (PVR.GZ, PVR.CCZ) files. If NPOT PVR is loaded, then it will create an NPOT texture ignoring this value.
+ * To modify it, in Web engine please refer to CCConfig.js, in JSB please refer to CCConfig.h * * @constant - * @type Number + * @type {Number} * @deprecated This value will be removed in 1.1 and NPOT textures will be loaded by default if the device supports it. */ cc.RETINA_DISPLAY_SUPPORT = 1; @@ -184,7 +192,7 @@ cc.RETINA_DISPLAY_SUPPORT = 1; * Platforms: Only used on Retina Display devices like iPhone 4. * * @constant - * @type String + * @type {String} */ cc.RETINA_DISPLAY_FILENAME_SUFFIX = "-hd"; @@ -197,7 +205,7 @@ cc.RETINA_DISPLAY_FILENAME_SUFFIX = "-hd"; * This feature is enabled by default. * * @constant - * @type Number + * @type {Number} */ cc.USE_LA88_LABELS = 1; @@ -212,7 +220,7 @@ cc.USE_LA88_LABELS = 1; * 2 -- draw texture box * * @constant - * @type Number + * @type {Number} */ cc.SPRITE_DEBUG_DRAW = 0; @@ -224,7 +232,7 @@ cc.SPRITE_DEBUG_DRAW = 0; * To enable set it to a value different than 0. Disabled by default. * * @constant - * @type Number + * @type {Number} */ cc.SPRITEBATCHNODE_DEBUG_DRAW = 0; @@ -236,7 +244,7 @@ cc.SPRITEBATCHNODE_DEBUG_DRAW = 0; * To enable set it to a value different than 0. Disabled by default.
* * @constant - * @type Number + * @type {Number} */ cc.LABELBMFONT_DEBUG_DRAW = 0; @@ -248,21 +256,21 @@ cc.LABELBMFONT_DEBUG_DRAW = 0; * To enable set it to a value different than 0. Disabled by default. * * @constant - * @type Number + * @type {Number} */ cc.LABELATLAS_DEBUG_DRAW = 0; /** - * whether or not support retina display + * Whether or not support retina display * @constant - * @type Number + * @type {Number} */ cc.IS_RETINA_DISPLAY_SUPPORTED = 1; /** - * default engine + * Default engine * @constant - * @type String + * @type {String} */ cc.DEFAULT_ENGINE = cc.ENGINE_VERSION + "-canvas"; @@ -290,6 +298,6 @@ cc.ENABLE_STACKABLE_ACTIONS = 1; * If you are migrating your code from GL ES 1.1, then keep it disabled. Once all your code works as expected, turn it on. * * @constant - * @type Number + * @type {Number} */ cc.ENABLE_GL_STATE_CACHE = 1; \ No newline at end of file diff --git a/cocos2d/core/platform/CCEGLView.js b/cocos2d/core/platform/CCEGLView.js index 4541c1a005..01c58088ed 100644 --- a/cocos2d/core/platform/CCEGLView.js +++ b/cocos2d/core/platform/CCEGLView.js @@ -1,7 +1,7 @@ /**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2008-2010 Ricardo Quesada - Copyright (c) 2011 Zynga Inc. + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -30,9 +30,93 @@ cc.Touches = []; cc.TouchesIntergerDict = {}; +cc.DENSITYDPI_DEVICE = "device-dpi"; +cc.DENSITYDPI_HIGH = "high-dpi"; +cc.DENSITYDPI_MEDIUM = "medium-dpi"; +cc.DENSITYDPI_LOW = "low-dpi"; + +cc.__BrowserGetter = { + init: function(){ + this.html = document.getElementsByTagName("html")[0]; + }, + availWidth: function(frame){ + if(!frame || frame === this.html) + return window.innerWidth; + else + return frame.clientWidth; + }, + availHeight: function(frame){ + if(!frame || frame === this.html) + return window.innerHeight; + else + return frame.clientHeight; + }, + meta: { + "width": "device-width", + "user-scalable": "no" + }, + adaptationType: cc.sys.browserType +}; + +if(window.navigator.userAgent.indexOf("OS 8_1_") > -1) //this mistake like MIUI, so use of MIUI treatment method + cc.__BrowserGetter.adaptationType = cc.sys.BROWSER_TYPE_MIUI; + +if(cc.sys.os === cc.sys.OS_IOS) // All browsers are WebView + cc.__BrowserGetter.adaptationType = cc.sys.BROWSER_TYPE_SAFARI; + +switch(cc.__BrowserGetter.adaptationType){ + case cc.sys.BROWSER_TYPE_SAFARI: + cc.__BrowserGetter.meta["minimal-ui"] = "true"; + cc.__BrowserGetter.availWidth = function(frame){ + return frame.clientWidth; + }; + cc.__BrowserGetter.availHeight = function(frame){ + return frame.clientHeight; + }; + break; + case cc.sys.BROWSER_TYPE_CHROME: + cc.__BrowserGetter.__defineGetter__("target-densitydpi", function(){ + return cc.view._targetDensityDPI; + }); + case cc.sys.BROWSER_TYPE_SOUGOU: + case cc.sys.BROWSER_TYPE_UC: + cc.__BrowserGetter.availWidth = function(frame){ + return frame.clientWidth; + }; + cc.__BrowserGetter.availHeight = function(frame){ + return frame.clientHeight; + }; + break; + case cc.sys.BROWSER_TYPE_MIUI: + cc.__BrowserGetter.init = function(view){ + if(view.__resizeWithBrowserSize) return; + var resize = function(){ + view.setDesignResolutionSize( + view._designResolutionSize.width, + view._designResolutionSize.height, + view._resolutionPolicy + ); + window.removeEventListener("resize", resize, false); + }; + window.addEventListener("resize", resize, false); + }; + break; +} + /** - * @namespace cc.view is the shared view object. + * cc.view is the singleton object which represents the game window.
+ * It's main task include:
+ * - Apply the design resolution policy
+ * - Provide interaction with the window, like resize event on web, retina display support, etc...
+ * - Manage the game view port which can be different with the window
+ * - Manage the content scale and translation
+ *
+ * Since the cc.view is a singleton, you don't need to call any constructor or create functions,
+ * the standard way to use it is by calling:
+ * - cc.view.methodName();
+ * @class * @name cc.view + * @extend cc.Class */ cc.EGLView = cc.Class.extend(/** @lends cc.view# */{ _delegate: null, @@ -46,6 +130,7 @@ cc.EGLView = cc.Class.extend(/** @lends cc.view# */{ // The visible rect in content's coordinate in point _visibleRect: null, _retinaEnabled: false, + _autoFullScreen: true, // The device's pixel ratio (for retina displays) _devicePixelRatio: 1, // the view name @@ -78,9 +163,16 @@ cc.EGLView = cc.Class.extend(/** @lends cc.view# */{ _frameZoomFactor: 1.0, __resizeWithBrowserSize: false, _isAdjustViewPort: true, + _targetDensityDPI: null, + /** + * Constructor of cc.EGLView + */ ctor: function () { var _t = this, d = document, _strategyer = cc.ContainerStrategy, _strategy = cc.ContentStrategy; + + cc.__BrowserGetter.init(this); + _t._frame = (cc.container.parentNode === d.body) ? d.documentElement : cc.container.parentNode; _t._frameSize = cc.size(0, 0); _t._initFrameSize(); @@ -94,8 +186,8 @@ cc.EGLView = cc.Class.extend(/** @lends cc.view# */{ _t._viewName = "Cocos2dHTML5"; var sys = cc.sys; - _t.enableRetina(sys.os == sys.OS_IOS || sys.os == sys.OS_OSX); - cc.visibleRect && cc.visibleRect.init(_t._designResolutionSize); + _t.enableRetina(sys.os === sys.OS_IOS || sys.os === sys.OS_OSX); + cc.visibleRect && cc.visibleRect.init(_t._visibleRect); // Setup system default resolution policies _t._rpExactFit = new cc.ResolutionPolicy(_strategyer.EQUAL_TO_FRAME, _strategy.EXACT_FIT); @@ -106,49 +198,98 @@ cc.EGLView = cc.Class.extend(/** @lends cc.view# */{ _t._hDC = cc._canvas; _t._hRC = cc._renderContext; + _t._targetDensityDPI = cc.DENSITYDPI_HIGH; }, // Resize helper functions _resizeEvent: function () { - var width = this._originalDesignResolutionSize.width; - var height = this._originalDesignResolutionSize.height; - if (this._resizeCallback) { - this._initFrameSize(); - this._resizeCallback.call(); + var view; + if(this.setDesignResolutionSize){ + view = this; + }else{ + view = cc.view; + } + + // Check frame size changed or not + var prevFrameW = view._frameSize.width, prevFrameH = view._frameSize.height; + view._initFrameSize(); + if (view._frameSize.width === prevFrameW && view._frameSize.height === prevFrameH) + return; + + // Frame size changed, do resize works + if (view._resizeCallback) { + view._resizeCallback.call(); } + var width = view._originalDesignResolutionSize.width; + var height = view._originalDesignResolutionSize.height; if (width > 0) - this.setDesignResolutionSize(width, height, this._resolutionPolicy); + view.setDesignResolutionSize(width, height, view._resolutionPolicy); + }, + + /** + *
+ * Sets view's target-densitydpi for android mobile browser. it can be set to:
+ * 1. cc.DENSITYDPI_DEVICE, value is "device-dpi"
+ * 2. cc.DENSITYDPI_HIGH, value is "high-dpi" (default value)
+ * 3. cc.DENSITYDPI_MEDIUM, value is "medium-dpi" (browser's default value)
+ * 4. cc.DENSITYDPI_LOW, value is "low-dpi"
+ * 5. Custom value, e.g: "480"
+ *
+ * Useful only on web. + * @param {Boolean} enabled Whether enable automatic resize with browser's resize event + */ resizeWithBrowserSize: function (enabled) { - var adjustSize, _t = this; if (enabled) { //enable - if (!_t.__resizeWithBrowserSize) { - _t.__resizeWithBrowserSize = true; - adjustSize = _t._resizeEvent.bind(_t); - cc._addEventListener(window, 'resize', adjustSize, false); + if (!this.__resizeWithBrowserSize) { + this.__resizeWithBrowserSize = true; + cc._addEventListener(window, 'resize', this._resizeEvent); + cc._addEventListener(window, 'orientationchange', this._resizeEvent); } } else { //disable - if (_t.__resizeWithBrowserSize) { - _t.__resizeWithBrowserSize = true; - adjustSize = _t._resizeEvent.bind(_t); - window.removeEventListener('resize', adjustSize, false); + if (this.__resizeWithBrowserSize) { + this.__resizeWithBrowserSize = false; + window.removeEventListener('resize', this._resizeEvent); + window.removeEventListener('orientationchange', this._resizeEvent); } } }, + /** + * Sets the callback function for cc.view's resize action,
+ * this callback will be invoked before applying resolution policy,
+ * so you can do any additional modifications within the callback.
+ * Useful only on web. + * @param {Function|null} callback The callback function + */ setResizeCallback: function (callback) { - if (typeof callback == "function" || callback == null) { + if (cc.isFunction(callback) || callback == null) { this._resizeCallback = callback; } }, _initFrameSize: function () { var locFrameSize = this._frameSize; - locFrameSize.width = this._frame.clientWidth; - locFrameSize.height = this._frame.clientHeight; + locFrameSize.width = cc.__BrowserGetter.availWidth(this._frame); + locFrameSize.height = cc.__BrowserGetter.availHeight(this._frame); }, // hack @@ -159,40 +300,41 @@ cc.EGLView = cc.Class.extend(/** @lends cc.view# */{ this.setDesignResolutionSize(designWidth, designHeight, this._resolutionPolicy); }, - _setViewPortMeta: function (width, height) { + _setViewPortMeta: function () { if (this._isAdjustViewPort) { - var viewportMetas = {"user-scalable": "no", "maximum-scale": "1.0", "initial-scale": "1.0"}, elems = document.getElementsByName("viewport"), vp, content; - if (elems.length == 0) { - vp = cc.newElement("meta"); - vp.name = "viewport"; - vp.content = ""; - document.head.appendChild(vp); + var vp = document.getElementById("cocosMetaElement"); + if(vp){ + document.head.removeChild(vp); } - else vp = elems[0]; - // For avoiding Android Firefox issue, to remove once firefox fixes its issue. - if (cc.sys.isMobile && cc.sys.browserType == cc.sys.BROWSER_TYPE_FIREFOX) { - vp.content = "initial-scale:1"; - return; - } + var viewportMetas, + elems = document.getElementsByName("viewport"), + currentVP = elems ? elems[0] : null, + content; + + vp = cc.newElement("meta"); + vp.id = "cocosMetaElement"; + vp.name = "viewport"; + vp.content = ""; + + viewportMetas = cc.__BrowserGetter.meta; - content = vp.content; + content = currentVP ? currentVP.content : ""; for (var key in viewportMetas) { var pattern = new RegExp(key); if (!pattern.test(content)) { - content += (content == "" ? "" : ",") + key + "=" + viewportMetas[key]; + content += "," + key + "=" + viewportMetas[key]; } } - /* - if(width<=320){ - width = 321; - } - if(height) - content ="height="+height+","+content; - if(width) - content ="width="+width+","+content; - */ + if(/^,/.test(content)) + content = content.substr(1); + vp.content = content; + // For adopting certain android devices which don't support second viewport + if (currentVP) + currentVP.content = content; + + document.head.appendChild(vp); } }, @@ -214,20 +356,25 @@ cc.EGLView = cc.Class.extend(/** @lends cc.view# */{ _adjustSizeToBrowser: function () { }, - /** - * init - */ initialize: function () { this._initialized = true; }, + /** + * Sets whether the engine modify the "viewport" meta in your web page.
+ * It's enabled by default, we strongly suggest you not to disable it.
+ * And even when it's enabled, you can still set your own "viewport" meta, it won't be overridden
+ * Only useful on web + * @param {Boolean} enabled Enable automatic modification to "viewport" meta + */ adjustViewPort: function (enabled) { this._isAdjustViewPort = enabled; }, /** - * Retina support is enabled by default for Apple device but disabled for other devices, - * it takes effect only when you called setDesignResolutionPolicy + * Retina support is enabled by default for Apple device but disabled for other devices,
+ * it takes effect only when you called setDesignResolutionPolicy
+ * Only useful on web * @param {Boolean} enabled Enable or disable retina display */ enableRetina: function(enabled) { @@ -235,13 +382,33 @@ cc.EGLView = cc.Class.extend(/** @lends cc.view# */{ }, /** - * Check whether retina display is enabled. + * Check whether retina display is enabled.
+ * Only useful on web * @return {Boolean} */ isRetinaEnabled: function() { return this._retinaEnabled; }, + /** + * If enabled, the application will try automatically to enter full screen mode on mobile devices
+ * You can pass true as parameter to enable it and disable it by passing false.
+ * Only useful on web + * @param {Boolean} enabled Enable or disable auto full screen on mobile devices + */ + enableAutoFullScreen: function(enabled) { + this._autoFullScreen = enabled ? true : false; + }, + + /** + * Check whether auto full screen is enabled.
+ * Only useful on web + * @return {Boolean} Auto full screen enabled or not + */ + isAutoFullScreenEnabled: function() { + return this._autoFullScreen; + }, + /** * Force destroying EGL view, subclass must implement this method. */ @@ -249,12 +416,12 @@ cc.EGLView = cc.Class.extend(/** @lends cc.view# */{ }, /** - * Get whether render system is ready(no matter opengl or canvas), + * Get whether render system is ready(no matter opengl or canvas),
* this name is for the compatibility with cocos2d-x, subclass must implement this method. * @return {Boolean} */ isOpenGLReady: function () { - return (this._hDC != null && this._hRC != null); + return (this._hDC !== null && this._hRC !== null); }, /* @@ -275,14 +442,13 @@ cc.EGLView = cc.Class.extend(/** @lends cc.view# */{ /** * Open or close IME keyboard , subclass must implement this method. + * @param {Boolean} isOpen */ setIMEKeyboardState: function (isOpen) { }, /** - *
- * The resolution translate on EGLView - *
+ * Sets the resolution translate on EGLView * @param {Number} offsetLeft * @param {Number} offsetTop */ @@ -291,9 +457,7 @@ cc.EGLView = cc.Class.extend(/** @lends cc.view# */{ }, /** - *- * get the resolution translate on EGLView - *
+ * Returns the resolution translate on EGLView * @return {cc.Size|Object} */ getContentTranslateLeftTop: function () { @@ -301,8 +465,9 @@ cc.EGLView = cc.Class.extend(/** @lends cc.view# */{ }, /** - * Get the frame size of EGL view. - * In general, it returns the screen size since the EGL view is a fullscreen view. + * Returns the frame size of the view.+ * On native platforms, it returns the screen size since the view is a fullscreen view.
+ * On web, it returns the size of the canvas's outer DOM element. * @return {cc.Size} */ getFrameSize: function () { @@ -310,7 +475,8 @@ cc.EGLView = cc.Class.extend(/** @lends cc.view# */{ }, /** - * Set the frame size of EGL view. + * On native, it sets the frame size of view.
+ * On web, it sets the size of the canvas's outer DOM element. * @param {Number} width * @param {Number} height */ @@ -324,11 +490,14 @@ cc.EGLView = cc.Class.extend(/** @lends cc.view# */{ cc.director.setProjection(cc.director.getProjection()); }, + /** + * Empty function + */ centerWindow: function () { }, /** - * Get the visible area size of OpenGL view port. + * Returns the visible area size of the view port. * @return {cc.Size} */ getVisibleSize: function () { @@ -336,19 +505,24 @@ cc.EGLView = cc.Class.extend(/** @lends cc.view# */{ }, /** - * Get the visible origin of OpenGL view port. + * Returns the visible origin of the view port. * @return {cc.Point} */ getVisibleOrigin: function () { return cc.p(this._visibleRect.x,this._visibleRect.y); }, + /** + * Returns whether developer can set content's scale factor. + * @return {Boolean} + */ canSetContentScaleFactor: function () { return true; }, /** - * Get the current resolution policy + * Returns the current resolution policy + * @see cc.ResolutionPolicy * @return {cc.ResolutionPolicy} */ getResolutionPolicy: function () { @@ -356,7 +530,8 @@ cc.EGLView = cc.Class.extend(/** @lends cc.view# */{ }, /** - * Set the current resolution policy + * Sets the current resolution policy + * @see cc.ResolutionPolicy * @param {cc.ResolutionPolicy|Number} resolutionPolicy */ setResolutionPolicy: function (resolutionPolicy) { @@ -381,83 +556,90 @@ cc.EGLView = cc.Class.extend(/** @lends cc.view# */{ }, /** - * Set the design resolution size. + * Sets the resolution policy with designed view size in points.
+ * The resolution policy include:
+ * [1] ResolutionExactFit Fill screen by stretch-to-fit: if the design resolution ratio of width to height is different from the screen resolution ratio, your game view will be stretched.
+ * [2] ResolutionNoBorder Full screen without black border: if the design resolution ratio of width to height is different from the screen resolution ratio, two areas of your game view will be cut.
+ * [3] ResolutionShowAll Full screen with black border: if the design resolution ratio of width to height is different from the screen resolution ratio, two black borders will be shown.
+ * [4] ResolutionFixedHeight Scale the content's height to screen's height and proportionally scale its width
+ * [5] ResolutionFixedWidth Scale the content's width to screen's width and proportionally scale its height
+ * [cc.ResolutionPolicy] [Web only feature] Custom resolution policy, constructed by cc.ResolutionPolicy
* @param {Number} width Design resolution width. * @param {Number} height Design resolution height. - * @param {cc.ResolutionPolicy|Number} resolutionPolicy The resolution policy desired, you may choose: - * [1] ResolutionExactFit Fill screen by stretch-to-fit: if the design resolution ratio of width to height is different from the screen resolution ratio, your game view will be stretched. - * [2] ResolutionNoBorder Full screen without black border: if the design resolution ratio of width to height is different from the screen resolution ratio, two areas of your game view will be cut. - * [3] ResolutionShowAll Full screen with black border: if the design resolution ratio of width to height is different from the screen resolution ratio, two black borders will be shown. - * [4] ResolutionFixedHeight Scale the content's height to screen's height and proportionally scale its width - * [5] ResolutionFixedWidth Scale the content's width to screen's width and proportionally scale its height - * [cc.ResolutionPolicy] Custom resolution policy, constructed by cc.ResolutionPolicy + * @param {cc.ResolutionPolicy|Number} resolutionPolicy The resolution policy desired */ setDesignResolutionSize: function (width, height, resolutionPolicy) { // Defensive code - if (isNaN(width) || width == 0 || isNaN(height) || height == 0) { + if( !(width > 0 || height > 0) ){ cc.log(cc._LogInfos.EGLView_setDesignResolutionSize); return; } - var _t = this; - _t.setResolutionPolicy(resolutionPolicy); - var policy = _t._resolutionPolicy; - if (policy) - policy.preApply(_t); - else { + + this.setResolutionPolicy(resolutionPolicy); + var policy = this._resolutionPolicy; + if (!policy){ cc.log(cc._LogInfos.EGLView_setDesignResolutionSize_2); return; } + policy.preApply(this); // Reinit frame size - var frameW = _t._frameSize.width, frameH = _t._frameSize.height; - if (cc.sys.isMobile) - _t._setViewPortMeta(_t._frameSize.width, _t._frameSize.height); - _t._initFrameSize(); - // No change - if (resolutionPolicy == _t._resolutionPolicy - && width == _t._originalDesignResolutionSize.width && height == _t._originalDesignResolutionSize.height - && frameW == _t._frameSize.width && frameH == _t._frameSize.height) - return; - _t._designResolutionSize = cc.size(width, height); - _t._originalDesignResolutionSize = cc.size(width, height); + if(cc.sys.isMobile) + this._setViewPortMeta(); + + this._initFrameSize(); + + this._originalDesignResolutionSize.width = this._designResolutionSize.width = width; + this._originalDesignResolutionSize.height = this._designResolutionSize.height = height; + + var result = policy.apply(this, this._designResolutionSize); - var result = policy.apply(_t, _t._designResolutionSize); - if (result.scale && result.scale.length == 2) { - _t._scaleX = result.scale[0]; - _t._scaleY = result.scale[1]; + if(result.scale && result.scale.length === 2){ + this._scaleX = result.scale[0]; + this._scaleY = result.scale[1]; } - if (result.viewport) { - var vp = _t._viewPortRect = result.viewport, visible = _t._visibleRect; - visible.width = cc._canvas.width / _t._scaleX; - visible.height = cc._canvas.height / _t._scaleY; - visible.x = -vp.x / _t._scaleX; - visible.y = -vp.y / _t._scaleY; + + if(result.viewport){ + var vp = this._viewPortRect, + vb = this._visibleRect, + rv = result.viewport; + + vp.x = rv.x; + vp.y = rv.y; + vp.width = rv.width; + vp.height = rv.height; + + vb.x = -vp.x / this._scaleX; + vb.y = -vp.y / this._scaleY; + vb.width = cc._canvas.width / this._scaleX; + vb.height = cc._canvas.height / this._scaleY; + cc._renderContext.setOffset && cc._renderContext.setOffset(vp.x, -vp.y) } // reset director's member variables to fit visible rect var director = cc.director; - director._winSizeInPoints = _t.getDesignResolutionSize(); + director._winSizeInPoints.width = this._designResolutionSize.width; + director._winSizeInPoints.height = this._designResolutionSize.height; + policy.postApply(this); cc.winSize.width = director._winSizeInPoints.width; cc.winSize.height = director._winSizeInPoints.height; - policy.postApply(_t); - - if (cc._renderType == cc._RENDER_TYPE_WEBGL) { + if (cc._renderType === cc._RENDER_TYPE_WEBGL) { // reset director's member variables to fit visible rect director._createStatsLabel(); director.setGLDefaultValues(); } - _t._originalScaleX = _t._scaleX; - _t._originalScaleY = _t._scaleY; + this._originalScaleX = this._scaleX; + this._originalScaleY = this._scaleY; // For editbox if (cc.DOM) cc.DOM._resetEGLViewDiv(); - cc.visibleRect && cc.visibleRect.init(_t.getVisibleSize()); + cc.visibleRect && cc.visibleRect.init(this._visibleRect); }, /** - * Get design resolution size. + * Returns the designed size for the view. * Default resolution size is the same as 'getFrameSize'. * @return {cc.Size} */ @@ -466,7 +648,7 @@ cc.EGLView = cc.Class.extend(/** @lends cc.view# */{ }, /** - * Set opengl view port rectangle with points. + * Sets view port rectangle with points. * @param {Number} x * @param {Number} y * @param {Number} w width @@ -481,7 +663,7 @@ cc.EGLView = cc.Class.extend(/** @lends cc.view# */{ }, /** - * Set Scissor rectangle with points. + * Sets Scissor rectangle with points. * @param {Number} x * @param {Number} y * @param {Number} w @@ -496,7 +678,8 @@ cc.EGLView = cc.Class.extend(/** @lends cc.view# */{ }, /** - * Get whether GL_SCISSOR_TEST is enable + * Returns whether GL_SCISSOR_TEST is enable + * @return {Boolean} */ isScissorEnabled: function () { var gl = cc._renderContext; @@ -504,7 +687,7 @@ cc.EGLView = cc.Class.extend(/** @lends cc.view# */{ }, /** - * Get the current scissor rectangle + * Returns the current scissor rectangle * @return {cc.Rect} */ getScissorRect: function () { @@ -515,6 +698,7 @@ cc.EGLView = cc.Class.extend(/** @lends cc.view# */{ }, /** + * Sets the name of the view * @param {String} viewName */ setViewName: function (viewName) { @@ -524,7 +708,7 @@ cc.EGLView = cc.Class.extend(/** @lends cc.view# */{ }, /** - * get view name + * Returns the name of the view * @return {String} */ getViewName: function () { @@ -532,35 +716,43 @@ cc.EGLView = cc.Class.extend(/** @lends cc.view# */{ }, /** - * Get the opengl view port rectangle. + * Returns the view port rectangle. + * @return {cc.Rect} */ getViewPortRect: function () { return this._viewPortRect; }, /** - * Get scale factor of the horizontal direction. + * Returns scale factor of the horizontal direction (X axis). + * @return {Number} */ getScaleX: function () { return this._scaleX; }, /** - * Get scale factor of the vertical direction. + * Returns scale factor of the vertical direction (Y axis). + * @return {Number} */ getScaleY: function () { return this._scaleY; }, /** - * Get device pixel ratio for retina display. + * Returns device pixel ratio for retina display. + * @return {Number} */ getDevicePixelRatio: function() { return this._devicePixelRatio; }, /** - * Get the real location in view + * Returns the real location in view for a translation based on a related position + * @param {Number} tx The X axis translation + * @param {Number} ty The Y axis translation + * @param {Object} relatedPos The related position object including "left", "top", "width", "height" informations + * @return {cc.Point} */ convertToLocationInView: function (tx, ty, relatedPos) { return {x: this._devicePixelRatio * (tx - relatedPos.left), y: this._devicePixelRatio * (relatedPos.top + relatedPos.height - ty)}; @@ -586,6 +778,11 @@ cc.EGLView = cc.Class.extend(/** @lends cc.view# */{ } }); +/** + * @function + * @return {cc.EGLView} + * @private + */ cc.EGLView._getInstance = function () { if (!this._instance) { this._instance = this._instance || new cc.EGLView(); @@ -627,7 +824,7 @@ cc.ContainerStrategy = cc.Class.extend(/** @lends cc.ContainerStrategy# */{ _setupContainer: function (view, w, h) { var frame = view._frame; - if (cc.sys.isMobile && frame == document.documentElement) { + if (cc.view._autoFullScreen && cc.sys.isMobile && frame === document.documentElement) { // Automatically full screen when user touches on mobile version cc.screen.autoFullScreen(frame); } @@ -643,6 +840,7 @@ cc.ContainerStrategy = cc.Class.extend(/** @lends cc.ContainerStrategy# */{ // Setup canvas locCanvasElement.width = w * devicePixelRatio; locCanvasElement.height = h * devicePixelRatio; + cc._renderContext.resetCache && cc._renderContext.resetCache(); var body = document.body, style; if (body && (style = body.style)) { @@ -702,8 +900,10 @@ cc.ContentStrategy = cc.Class.extend(/** @lends cc.ContentStrategy# */{ contentW, contentH); // Translate the content - if (cc._renderType == cc._RENDER_TYPE_CANVAS) - cc._renderContext.translate(viewport.x, viewport.y + contentH); + if (cc._renderType === cc._RENDER_TYPE_CANVAS){ + //TODO: modify something for setTransform + //cc._renderContext.translate(viewport.x, viewport.y + contentH); + } this._result.scale = [scaleX, scaleY]; this._result.viewport = viewport; @@ -740,12 +940,20 @@ cc.ContentStrategy = cc.Class.extend(/** @lends cc.ContentStrategy# */{ (function () { // Container scale strategys + /** + * @class + * @extends cc.ContainerStrategy + */ var EqualToFrame = cc.ContainerStrategy.extend({ apply: function (view) { this._setupContainer(view, view._frameSize.width, view._frameSize.height); } }); + /** + * @class + * @extends cc.ContainerStrategy + */ var ProportionalToFrame = cc.ContainerStrategy.extend({ apply: function (view, designedResolution) { var frameW = view._frameSize.width, frameH = view._frameSize.height, containerStyle = cc.container.style, @@ -770,6 +978,10 @@ cc.ContentStrategy = cc.Class.extend(/** @lends cc.ContentStrategy# */{ } }); + /** + * @class + * @extends EqualToFrame + */ var EqualToWindow = EqualToFrame.extend({ preApply: function (view) { this._super(view); @@ -782,6 +994,10 @@ cc.ContentStrategy = cc.Class.extend(/** @lends cc.ContentStrategy# */{ } }); + /** + * @class + * @extends ProportionalToFrame + */ var ProportionalToWindow = ProportionalToFrame.extend({ preApply: function (view) { this._super(view); @@ -794,6 +1010,10 @@ cc.ContentStrategy = cc.Class.extend(/** @lends cc.ContentStrategy# */{ } }); + /** + * @class + * @extends cc.ContainerStrategy + */ var OriginalContainer = cc.ContainerStrategy.extend({ apply: function (view) { this._setupContainer(view, cc._canvas.width, cc._canvas.height); @@ -896,11 +1116,18 @@ cc.ContentStrategy = cc.Class.extend(/** @lends cc.ContentStrategy# */{ * * @class * @extends cc.Class + * @param {cc.ContainerStrategy} containerStg The container strategy + * @param {cc.ContentStrategy} contentStg The content strategy */ cc.ResolutionPolicy = cc.Class.extend(/** @lends cc.ResolutionPolicy# */{ _containerStrategy: null, _contentStrategy: null, + /** + * Constructor of cc.ResolutionPolicy + * @param {cc.ContainerStrategy} containerStg + * @param {cc.ContentStrategy} contentStg + */ ctor: function (containerStg, contentStg) { this.setContainerStrategy(containerStg); this.setContentStrategy(contentStg); @@ -956,40 +1183,44 @@ cc.ResolutionPolicy = cc.Class.extend(/** @lends cc.ResolutionPolicy# */{ } }); -/* +/** * @memberOf cc.ResolutionPolicy# * @name EXACT_FIT - * @const + * @constant + * @type Number * @static * The entire application is visible in the specified area without trying to preserve the original aspect ratio.
* Distortion can occur, and the application may appear stretched or compressed. */ cc.ResolutionPolicy.EXACT_FIT = 0; -/* +/** * @memberOf cc.ResolutionPolicy# * @name NO_BORDER - * @const + * @constant + * @type Number * @static * The entire application fills the specified area, without distortion but possibly with some cropping,
* while maintaining the original aspect ratio of the application. */ cc.ResolutionPolicy.NO_BORDER = 1; -/* +/** * @memberOf cc.ResolutionPolicy# * @name SHOW_ALL - * @const + * @constant + * @type Number * @static * The entire application is visible in the specified area without distortion while maintaining the original
* aspect ratio of the application. Borders can appear on two sides of the application. */ cc.ResolutionPolicy.SHOW_ALL = 2; -/* +/** * @memberOf cc.ResolutionPolicy# * @name FIXED_HEIGHT - * @const + * @constant + * @type Number * @static * The application takes the height of the design resolution size and modifies the width of the internal
* canvas so that it fits the aspect ratio of the device
@@ -998,10 +1229,11 @@ cc.ResolutionPolicy.SHOW_ALL = 2; */ cc.ResolutionPolicy.FIXED_HEIGHT = 3; -/* +/** * @memberOf cc.ResolutionPolicy# * @name FIXED_WIDTH - * @const + * @constant + * @type Number * @static * The application takes the width of the design resolution size and modifies the height of the internal
* canvas so that it fits the aspect ratio of the device
@@ -1010,10 +1242,11 @@ cc.ResolutionPolicy.FIXED_HEIGHT = 3; */ cc.ResolutionPolicy.FIXED_WIDTH = 4; -/* +/** * @memberOf cc.ResolutionPolicy# * @name UNKNOWN - * @const + * @constant + * @type Number * @static * Unknow policy */ diff --git a/cocos2d/core/platform/CCInputExtension.js b/cocos2d/core/platform/CCInputExtension.js index 5846094d12..470864db02 100644 --- a/cocos2d/core/platform/CCInputExtension.js +++ b/cocos2d/core/platform/CCInputExtension.js @@ -1,5 +1,5 @@ /**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org + Copyright (c) 2011-2012 cocos2d-x.org Copyright (c) 2013-2014 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -27,6 +27,7 @@ var _p = cc.inputManager; /** * whether enable accelerometer event + * @function * @param {Boolean} isEnable */ _p.setAccelerometerEnabled = function(isEnable){ @@ -38,15 +39,16 @@ _p.setAccelerometerEnabled = function(isEnable){ var scheduler = cc.director.getScheduler(); if(_t._accelEnabled){ _t._accelCurTime = 0; - scheduler.scheduleUpdateForTarget(_t); + scheduler.scheduleUpdate(_t); } else { _t._accelCurTime = 0; - scheduler.unscheduleUpdateForTarget(_t); + scheduler.scheduleUpdate(_t); } }; /** * set accelerometer interval value + * @function * @param {Number} interval */ _p.setAccelerometerInterval = function(interval){ @@ -56,12 +58,16 @@ _p.setAccelerometerInterval = function(interval){ }; _p._registerKeyboardEvent = function(){ - cc._addEventListener(document, "keydown", function (e) { + cc._addEventListener(cc._canvas, "keydown", function (e) { cc.eventManager.dispatchEvent(new cc.EventKeyboard(e.keyCode, true)); - }); - cc._addEventListener(document, "keyup", function (e) { + e.stopPropagation(); + e.preventDefault(); + }, false); + cc._addEventListener(cc._canvas, "keyup", function (e) { cc.eventManager.dispatchEvent(new cc.EventKeyboard(e.keyCode, false)); - }); + e.stopPropagation(); + e.preventDefault(); + }, false); }; _p._registerAccelerometerEvent = function(){ @@ -70,12 +76,12 @@ _p._registerAccelerometerEvent = function(){ _t._accelDeviceEvent = w.DeviceMotionEvent || w.DeviceOrientationEvent; //TODO fix DeviceMotionEvent bug on QQ Browser version 4.1 and below. - if (cc.sys.browserType == cc.sys.BROWSER_TYPE_MOBILE_QQ) + if (cc.sys.browserType === cc.sys.BROWSER_TYPE_MOBILE_QQ) _t._accelDeviceEvent = window.DeviceOrientationEvent; - var _deviceEventType = (_t._accelDeviceEvent == w.DeviceMotionEvent) ? "devicemotion" : "deviceorientation"; + var _deviceEventType = (_t._accelDeviceEvent === w.DeviceMotionEvent) ? "devicemotion" : "deviceorientation"; var ua = navigator.userAgent; - if (/Android/.test(ua) || (/Adr/.test(ua) && cc.sys.browserType == cc.BROWSER_TYPE_UC)) { + if (/Android/.test(ua) || (/Adr/.test(ua) && cc.sys.browserType === cc.BROWSER_TYPE_UC)) { _t._minus = -1; } @@ -88,16 +94,29 @@ _p.didAccelerate = function (eventData) { return; var mAcceleration = _t._acceleration; - if (_t._accelDeviceEvent == window.DeviceMotionEvent) { + + var x, y, z; + + if (_t._accelDeviceEvent === window.DeviceMotionEvent) { var eventAcceleration = eventData["accelerationIncludingGravity"]; - mAcceleration.x = _t._accelMinus * eventAcceleration.x * 0.1; - mAcceleration.y = _t._accelMinus * eventAcceleration.y * 0.1; - mAcceleration.z = eventAcceleration.z * 0.1; + x = _t._accelMinus * eventAcceleration.x * 0.1; + y = _t._accelMinus * eventAcceleration.y * 0.1; + z = eventAcceleration.z * 0.1; } else { - mAcceleration.x = (eventData["gamma"] / 90) * 0.981; - mAcceleration.y = -(eventData["beta"] / 90) * 0.981; - mAcceleration.z = (eventData["alpha"] / 90) * 0.981; + x = (eventData["gamma"] / 90) * 0.981; + y = -(eventData["beta"] / 90) * 0.981; + z = (eventData["alpha"] / 90) * 0.981; } + + if(cc.sys.os === cc.sys.OS_ANDROID){ + mAcceleration.x = -x; + mAcceleration.y = -y; + }else{ + mAcceleration.x = x; + mAcceleration.y = y; + } + mAcceleration.z = z; + mAcceleration.timestamp = eventData.timeStamp || Date.now(); var tmpX = mAcceleration.x; diff --git a/cocos2d/core/platform/CCInputManager.js b/cocos2d/core/platform/CCInputManager.js index 15c5d204f9..545d0b0d90 100644 --- a/cocos2d/core/platform/CCInputManager.js +++ b/cocos2d/core/platform/CCInputManager.js @@ -1,5 +1,5 @@ /**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org + Copyright (c) 2011-2012 cocos2d-x.org Copyright (c) 2013-2014 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -26,19 +26,34 @@ /** * ignore */ -cc.UIInterfaceOrientationLandscapeLeft = -90; +/** + * @constant + * @type {number} + */ +cc.UIInterfaceOrientationLandscapeLeft = -90; +/** + * @constant + * @type {number} + */ cc.UIInterfaceOrientationLandscapeRight = 90; - +/** + * @constant + * @type {number} + */ cc.UIInterfaceOrientationPortraitUpsideDown = 180; - +/** + * @constant + * @type {number} + */ cc.UIInterfaceOrientationPortrait = 0; /** *
* This class manages all events of input. include: touch, mouse, accelerometer, keyboard
*
* and then a reference to the whole object as third variable * - * @param x - * @param y - * @param ref + * @param {String} x + * @param {String} y + * @param {Object} ref * @function - * @deprecated + * @deprecated since v3.0 */ cc.swap = function (x, y, ref) { - if ((typeof ref) == 'object' && (typeof ref.x) != 'undefined' && (typeof ref.y) != 'undefined') { + if (cc.isObject(ref) && !cc.isUndefined(ref.x) && !cc.isUndefined(ref.y)) { var tmp = ref[x]; ref[x] = ref[y]; ref[y] = tmp; @@ -134,6 +140,15 @@ cc.degreesToRadians = function (angle) { return angle * cc.RAD; }; +/** + * converts radians to degrees + * @param {Number} angle + * @return {Number} + * @function + */ +cc.radiansToDegrees = function (angle) { + return angle * cc.DEG; +}; /** * converts radians to degrees * @param {Number} angle @@ -141,6 +156,7 @@ cc.degreesToRadians = function (angle) { * @function */ cc.radiansToDegress = function (angle) { + cc.log(cc._LogInfos.radiansToDegress); return angle * cc.DEG; }; @@ -239,6 +255,7 @@ cc.FLT_EPSILON = 0.0000001192092896; * On Mac it returns 1;
* On iPhone it returns 2 if RetinaDisplay is On. Otherwise it returns 1 * + * @return {Number} * @function */ cc.contentScaleFactor = cc.IS_RETINA_DISPLAY_SUPPORTED ? function () { @@ -260,7 +277,8 @@ cc.pointPointsToPixels = function (points) { /** * Converts a Point in pixels to points - * @param {Point} pixels + * @param {cc.Rect} pixels + * @return {cc.Point} * @function */ cc.pointPixelsToPoints = function (pixels) { @@ -305,6 +323,7 @@ cc._sizePixelsToPointsOut = function (sizeInPixels, outSize) { /** * Converts a rect in pixels to points * @param {cc.Rect} pixel + * @return {cc.Rect} * @function */ cc.rectPixelsToPoints = cc.IS_RETINA_DISPLAY_SUPPORTED ? function (pixel) { @@ -318,6 +337,7 @@ cc.rectPixelsToPoints = cc.IS_RETINA_DISPLAY_SUPPORTED ? function (pixel) { /** * Converts a rect in points to pixels * @param {cc.Rect} point + * @return {cc.Rect} * @function */ cc.rectPointsToPixels = cc.IS_RETINA_DISPLAY_SUPPORTED ? function (point) { @@ -328,6 +348,7 @@ cc.rectPointsToPixels = cc.IS_RETINA_DISPLAY_SUPPORTED ? function (point) { return p; }; +//some gl constant variable /** * @constant * @type Number @@ -406,11 +427,43 @@ cc.ONE_MINUS_CONSTANT_ALPHA = 0x8004; */ cc.ONE_MINUS_CONSTANT_COLOR = 0x8002; +/** + * the constant variable equals gl.LINEAR for texture + * @constant + * @type Number + */ +cc.LINEAR = 0x2601; + +/** + * the constant variable equals gl.REPEAT for texture + * @constant + * @type Number + */ +cc.REPEAT = 0x2901; + +/** + * the constant variable equals gl.CLAMP_TO_EDGE for texture + * @constant + * @type Number + */ +cc.CLAMP_TO_EDGE = 0x812f; + +/** + * the constant variable equals gl.MIRRORED_REPEAT for texture + * @constant + * @type Number + */ +cc.MIRRORED_REPEAT = 0x8370; + +/** + * Check webgl error.Error will be shown in console if exists. + * @function + */ cc.checkGLErrorDebug = function () { - if (cc.renderMode == cc._RENDER_TYPE_WEBGL) { + if (cc.renderMode === cc._RENDER_TYPE_WEBGL) { var _error = cc._renderContext.getError(); if (_error) { - cc.log(CC._localZOrder.checkGLErrorDebug, _error); + cc.log(cc._LogInfos.checkGLErrorDebug, _error); } } }; @@ -700,4 +753,78 @@ cc.SELECTED_TAG = 8802; * @constant * @type Number */ -cc.DISABLE_TAG = 8803; \ No newline at end of file +cc.DISABLE_TAG = 8803; + + +// Array utils + +/** + * Verify Array's Type + * @param {Array} arr + * @param {function} type + * @return {Boolean} + * @function + */ +cc.arrayVerifyType = function (arr, type) { + if (arr && arr.length > 0) { + for (var i = 0; i < arr.length; i++) { + if (!(arr[i] instanceof type)) { + cc.log("element type is wrong!"); + return false; + } + } + } + return true; +}; + +/** + * Searches for the first occurance of object and removes it. If object is not found the function has no effect. + * @function + * @param {Array} arr Source Array + * @param {*} delObj remove object + */ +cc.arrayRemoveObject = function (arr, delObj) { + for (var i = 0, l = arr.length; i < l; i++) { + if (arr[i] === delObj) { + arr.splice(i, 1); + break; + } + } +}; + +/** + * Removes from arr all values in minusArr. For each Value in minusArr, the first matching instance in arr will be removed. + * @function + * @param {Array} arr Source Array + * @param {Array} minusArr minus Array + */ +cc.arrayRemoveArray = function (arr, minusArr) { + for (var i = 0, l = minusArr.length; i < l; i++) { + cc.arrayRemoveObject(arr, minusArr[i]); + } +}; + +/** + * Inserts some objects at index + * @function + * @param {Array} arr + * @param {Array} addObjs + * @param {Number} index + * @return {Array} + */ +cc.arrayAppendObjectsToIndex = function(arr, addObjs,index){ + arr.splice.apply(arr, [index, 0].concat(addObjs)); + return arr; +}; + +/** + * Copy an array's item to a new array (its performance is better than Array.slice) + * @param {Array} arr + * @return {Array} + */ +cc.copyArray = function(arr){ + var i, len = arr.length, arr_clone = new Array(len); + for (i = 0; i < len; i += 1) + arr_clone[i] = arr[i]; + return arr_clone; +}; \ No newline at end of file diff --git a/cocos2d/core/platform/CCSAXParser.js b/cocos2d/core/platform/CCSAXParser.js index df436b38fd..d0088e8f26 100644 --- a/cocos2d/core/platform/CCSAXParser.js +++ b/cocos2d/core/platform/CCSAXParser.js @@ -1,7 +1,7 @@ /**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2008-2010 Ricardo Quesada - Copyright (c) 2011 Zynga Inc. + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,14 +25,18 @@ ****************************************************************************/ /** - * - * @namespace A SAX Parser + * A SAX Parser + * @class * @name cc.saxParser + * @extends cc.Class */ cc.SAXParser = cc.Class.extend(/** @lends cc.saxParser# */{ _parser: null, _isSupportDOMParser: null, + /** + * Constructor of cc.SAXParser + */ ctor: function () { if (window.DOMParser) { this._isSupportDOMParser = true; @@ -42,6 +46,11 @@ cc.SAXParser = cc.Class.extend(/** @lends cc.saxParser# */{ } }, + /** + * @function + * @param {String} xmlTxt + * @return {Document} + */ parse : function(xmlTxt){ return this._parseXML(xmlTxt); }, @@ -64,8 +73,10 @@ cc.SAXParser = cc.Class.extend(/** @lends cc.saxParser# */{ /** * - * @namespace A plist Parser + * cc.plistParser is a singleton object for parsing plist files + * @class * @name cc.plistParser + * @extends cc.SAXParser */ cc.PlistParser = cc.SAXParser.extend(/** @lends cc.plistParser# */{ @@ -77,14 +88,14 @@ cc.PlistParser = cc.SAXParser.extend(/** @lends cc.plistParser# */{ parse : function (xmlTxt) { var xmlDoc = this._parseXML(xmlTxt); var plist = xmlDoc.documentElement; - if (plist.tagName != 'plist') + if (plist.tagName !== 'plist') throw "Not a plist file!"; // Get first real node var node = null; for (var i = 0, len = plist.childNodes.length; i < len; i++) { node = plist.childNodes[i]; - if (node.nodeType == 1) + if (node.nodeType === 1) break; } xmlDoc = null; @@ -93,12 +104,12 @@ cc.PlistParser = cc.SAXParser.extend(/** @lends cc.plistParser# */{ _parseNode: function (node) { var data = null, tagName = node.tagName; - if(tagName == "dict"){ + if(tagName === "dict"){ data = this._parseDict(node); - }else if(tagName == "array"){ + }else if(tagName === "array"){ data = this._parseArray(node); - }else if(tagName == "string"){ - if (node.childNodes.length == 1) + }else if(tagName === "string"){ + if (node.childNodes.length === 1) data = node.firstChild.nodeValue; else { //handle Firefox's 4KB nodeValue limit @@ -106,13 +117,13 @@ cc.PlistParser = cc.SAXParser.extend(/** @lends cc.plistParser# */{ for (var i = 0; i < node.childNodes.length; i++) data += node.childNodes[i].nodeValue; } - }else if(tagName == "false"){ + }else if(tagName === "false"){ data = false; - }else if(tagName == "true"){ + }else if(tagName === "true"){ data = true; - }else if(tagName == "real"){ + }else if(tagName === "real"){ data = parseFloat(node.firstChild.nodeValue); - }else if(tagName == "integer"){ + }else if(tagName === "integer"){ data = parseInt(node.firstChild.nodeValue, 10); } return data; @@ -122,7 +133,7 @@ cc.PlistParser = cc.SAXParser.extend(/** @lends cc.plistParser# */{ var data = []; for (var i = 0, len = node.childNodes.length; i < len; i++) { var child = node.childNodes[i]; - if (child.nodeType != 1) + if (child.nodeType !== 1) continue; data.push(this._parseNode(child)); } @@ -134,11 +145,11 @@ cc.PlistParser = cc.SAXParser.extend(/** @lends cc.plistParser# */{ var key = null; for (var i = 0, len = node.childNodes.length; i < len; i++) { var child = node.childNodes[i]; - if (child.nodeType != 1) + if (child.nodeType !== 1) continue; // Grab the key, next noe should be the value - if (child.tagName == 'key') + if (child.tagName === 'key') key = child.firstChild.nodeValue; else data[key] = this._parseNode(child); // Parse the value node diff --git a/cocos2d/core/platform/CCScreen.js b/cocos2d/core/platform/CCScreen.js index 874c4b035e..f1730fe015 100644 --- a/cocos2d/core/platform/CCScreen.js +++ b/cocos2d/core/platform/CCScreen.js @@ -1,20 +1,20 @@ /**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2008-2010 Ricardo Quesada - Copyright (c) 2011 Zynga Inc. - + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. + http://www.cocos2d-x.org - + Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - + The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -25,117 +25,125 @@ ****************************************************************************/ /** - * @namespace The fullscreen API provides an easy way for web content to be presented using the user's entire screen. - * It's invalid on safari,QQbrowser and android browser + * The fullscreen API provides an easy way for web content to be presented using the user's entire screen. + * It's invalid on safari, QQbrowser and android browser + * @class * @name cc.screen */ cc.screen = /** @lends cc.screen# */{ _supportsFullScreen: false, - // the pre fullscreenchange function + // the pre fullscreenchange function _preOnFullScreenChange: null, _touchEvent: "", - _fn: null, - // Function mapping for cross browser support - _fnMap: [ - [ - 'requestFullscreen', - 'exitFullscreen', - 'fullscreenchange', - 'fullscreenEnabled', - 'fullscreenElement' - ], - [ - 'requestFullScreen', - 'exitFullScreen', - 'fullScreenchange', - 'fullScreenEnabled', - 'fullScreenElement' - ], - [ - 'webkitRequestFullScreen', - 'webkitCancelFullScreen', - 'webkitfullscreenchange', - 'webkitIsFullScreen', - 'webkitCurrentFullScreenElement' - ], - [ - 'mozRequestFullScreen', - 'mozCancelFullScreen', - 'mozfullscreenchange', - 'mozFullScreen', - 'mozFullScreenElement' - ], - [ - 'msRequestFullscreen', - 'msExitFullscreen', - 'MSFullscreenChange', - 'msFullscreenEnabled', - 'msFullscreenElement' - ] - ], - + _fn: null, + // Function mapping for cross browser support + _fnMap: [ + [ + 'requestFullscreen', + 'exitFullscreen', + 'fullscreenchange', + 'fullscreenEnabled', + 'fullscreenElement' + ], + [ + 'requestFullScreen', + 'exitFullScreen', + 'fullScreenchange', + 'fullScreenEnabled', + 'fullScreenElement' + ], + [ + 'webkitRequestFullScreen', + 'webkitCancelFullScreen', + 'webkitfullscreenchange', + 'webkitIsFullScreen', + 'webkitCurrentFullScreenElement' + ], + [ + 'mozRequestFullScreen', + 'mozCancelFullScreen', + 'mozfullscreenchange', + 'mozFullScreen', + 'mozFullScreenElement' + ], + [ + 'msRequestFullscreen', + 'msExitFullscreen', + 'MSFullscreenChange', + 'msFullscreenEnabled', + 'msFullscreenElement' + ] + ], + + /** + * initialize + * @function + */ init: function () { - this._fn = {}; - var i, val, map = this._fnMap, valL; - for (i = 0, l = map.length; i < l; i++ ) { - val = map[ i ]; - if ( val && val[1] in document ) { - for ( i = 0, valL = val.length; i < valL; i++ ) { - this._fn[ map[0][ i ] ] = val[ i ]; - } - break; - } - } + this._fn = {}; + var i, val, map = this._fnMap, valL; + for (i = 0, l = map.length; i < l; i++) { + val = map[i]; + if (val && val[1] in document) { + for (i = 0, valL = val.length; i < valL; i++) { + this._fn[map[0][i]] = val[i]; + } + break; + } + } - this._supportsFullScreen = (this._fn.requestFullscreen != undefined); + this._supportsFullScreen = (typeof this._fn.requestFullscreen !== 'undefined'); this._touchEvent = ('ontouchstart' in window) ? 'touchstart' : 'mousedown'; }, - + /** * return true if it's full now. * @returns {Boolean} */ - fullScreen: function() { - return this._supportsFullScreen && document[ this._fn.fullscreenEnabled ]; + fullScreen: function () { + return this._supportsFullScreen && document[this._fn.fullscreenElement]; }, - + /** * change the screen to full mode. * @param {Element} element * @param {Function} onFullScreenChange */ requestFullScreen: function (element, onFullScreenChange) { - if (!this._supportsFullScreen) return; + if (!this._supportsFullScreen) { + return; + } - element = element || document.documentElement; - element[ this._fn.requestFullscreen ](); + element = element || document.documentElement; - if (onFullScreenChange) { - var eventName = this._fn.fullscreenchange; - if (this._preOnFullScreenChange) - document.removeEventListener(eventName, this._preOnFullScreenChange); - this._preOnFullScreenChange = onFullScreenChange; + if (onFullScreenChange) { + var eventName = this._fn.fullscreenchange; + if (this._preOnFullScreenChange) { + document.removeEventListener(eventName, this._preOnFullScreenChange); + } + this._preOnFullScreenChange = onFullScreenChange; cc._addEventListener(document, eventName, onFullScreenChange, false); - } + } - return element[ this._fn.requestFullscreen ](); + return element[this._fn.requestFullscreen](); }, - + /** * exit the full mode. + * @return {Boolean} */ exitFullScreen: function () { - return this._supportsFullScreen ? document[ this._fn.exitFullscreen ]() : true; + return this._supportsFullScreen ? document[this._fn.exitFullscreen]() : true; }, - + /** * Automatically request full screen with a touch/click event * @param {Element} element * @param {Function} onFullScreenChange */ autoFullScreen: function (element, onFullScreenChange) { - element = element || document.body; - var touchTarget = cc._canvas || element; + element = element || document.body; + var touchTarget = cc._canvas || element; var theScreen = this; // Function bind will be too complicated here because we need the callback function's reference to remove the listener function callback() { diff --git a/cocos2d/core/platform/CCTypes.js b/cocos2d/core/platform/CCTypes.js index 3e0acbb699..06ed754cce 100644 --- a/cocos2d/core/platform/CCTypes.js +++ b/cocos2d/core/platform/CCTypes.js @@ -1,7 +1,7 @@ /**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2008-2010 Ricardo Quesada - Copyright (c) 2011 Zynga Inc. + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,40 +25,55 @@ ****************************************************************************/ /** - * The color class - * @param {Number} r 0 to 255 - * @param {Number} g 0 to 255 - * @param {Number} b 0 to 255 - * @param {Number} a 0 to 255 - * @constructor + * Color class, please use cc.color() to construct a color + * @class cc.Color + * @param {Number} r + * @param {Number} g + * @param {Number} b + * @param {Number} a + * @see cc.color */ cc.Color = function (r, g, b, a) { this.r = r || 0; this.g = g || 0; this.b = b || 0; - this.a = a || 0; + this.a = (a == null) ? 255 : a; }; /** + * Generate a color object based on multiple forms of parameters + * @example + * + * // 1. All channels seperately as parameters + * var color1 = cc.color(255, 255, 255, 255); + * + * // 2. Convert a hex string to a color + * var color2 = cc.color("#000000"); + * + * // 3. An color object as parameter + * var color3 = cc.color({r: 255, g: 255, b: 255, a: 255}); + * + * Alpha channel is optional. Default value is 255 * * @param {Number|String|cc.Color} r * @param {Number} g * @param {Number} b - * @param {Number} a - * @returns {cc.Color} + * @param {Number} [a=255] + * @return {cc.Color} */ cc.color = function (r, g, b, a) { if (r === undefined) return {r: 0, g: 0, b: 0, a: 255}; - if (typeof r === "string") + if (cc.isString(r)) return cc.hexToColor(r); - if (typeof r === "object") - return {r: r.r, g: r.g, b: r.b, a: r.a}; - return {r: r, g: g, b: b, a: a }; + if (cc.isObject(r)) + return {r: r.r, g: r.g, b: r.b, a: (r.a == null) ? 255 : r.a}; + return {r: r, g: g, b: b, a: (a == null ? 255 : a)}; }; /** * returns true if both ccColor3B are equal. Otherwise it returns false. + * @function * @param {cc.Color} color1 * @param {cc.Color} color2 * @return {Boolean} true if both ccColor3B are equal. Otherwise it returns false. @@ -69,6 +84,12 @@ cc.colorEqual = function (color1, color2) { /** * the device accelerometer reports values for each axis in units of g-force + * @class cc.Acceleration + * @constructor + * @param {Number} x + * @param {Number} y + * @param {Number} z + * @param {Number} timestamp */ cc.Acceleration = function (x, y, z, timestamp) { this.x = x || 0; @@ -78,9 +99,8 @@ cc.Acceleration = function (x, y, z, timestamp) { }; /** - * A vertex composed of 2 floats: x, y - * @Class - * @Construct + * @class cc.Vertex2F + * @constructor * @param {Number} x1 * @param {Number} y1 */ @@ -90,7 +110,7 @@ cc.Vertex2F = function (x1, y1) { }; /** - * helper macro that creates an Vertex2F type + * Helper macro that creates an Vertex2F type composed of 2 floats: x, y * @function * @param {Number} x * @param {Number} y @@ -101,9 +121,8 @@ cc.vertex2 = function (x, y) { }; /** - * A vertex composed of 3 floats: x, y, z - * @Class - * @Construct + * @class cc.Vertex3F + * @constructor * @param {Number} x1 * @param {Number} y1 * @param {Number} z1 @@ -115,7 +134,7 @@ cc.Vertex3F = function (x1, y1, z1) { }; /** - * helper macro that creates an Vertex3F type + * Helper macro that creates an Vertex3F type composed of 3 floats: x, y, z * @function * @param {Number} x * @param {Number} y @@ -127,9 +146,8 @@ cc.vertex3 = function (x, y, z) { }; /** - * A texcoord composed of 2 floats: u, y - * @Class - * @Construct + * @class cc.Tex2F + * @constructor * @param {Number} u1 * @param {Number} v1 */ @@ -139,7 +157,7 @@ cc.Tex2F = function (u1, v1) { }; /** - * helper macro that creates an Tex2F type + * Helper macro that creates an Tex2F type: A texcoord composed of 2 floats: u, y * @function * @param {Number} u * @param {Number} v @@ -151,8 +169,8 @@ cc.tex2 = function (u, v) { /** * Blend Function used for textures - * @Class - * @Construct + * @Class cc.BlendFunc + * @Constructor * @param {Number} src1 source blend function * @param {Number} dst1 destination blend function */ @@ -161,6 +179,10 @@ cc.BlendFunc = function (src1, dst1) { this.dst = dst1; }; +/** + * @function + * @returns {cc.BlendFunc} + */ cc.blendFuncDisable = function () { return new cc.BlendFunc(cc.ONE, cc.ZERO); }; @@ -168,6 +190,7 @@ cc.blendFuncDisable = function () { /** * convert a string of color for style to Color. * e.g. "#ff06ff" to : cc.color(255,6,255) + * @function * @param {String} hex * @return {cc.Color} */ @@ -183,6 +206,7 @@ cc.hexToColor = function (hex) { /** * convert Color to a string of color for style. * e.g. cc.color(255,6,255) to : "#ff06ff" + * @function * @param {cc.Color} color * @return {String} */ @@ -313,7 +337,28 @@ cc._Dictionary = cc.Class.extend({ } }); -cc.FontDefinition = function () { +/** + * Common usage: + * + * var fontDef = new cc.FontDefinition(); + * fontDef.fontName = "Arial"; + * fontDef.fontSize = 12; + * ... + * + * OR using inline definition usefull for constructor injection + * + * var fontDef = new cc.FontDefinition({ + * fontName: "Arial", + * fontSize: 12 + * }); + * + * + * + * @class cc.FontDefinition + * @param {Object} properties - (OPTIONAL) Allow inline FontDefinition + * @constructor + */ +cc.FontDefinition = function (properties) { var _t = this; _t.fontName = "Arial"; _t.fontSize = 12; @@ -326,19 +371,38 @@ cc.FontDefinition = function () { _t.strokeEnabled = false; _t.strokeStyle = cc.color(255, 255, 255, 255); _t.lineWidth = 1; + _t.lineHeight = "normal"; + _t.fontStyle = "normal"; + _t.fontWeight = "normal"; _t.shadowEnabled = false; _t.shadowOffsetX = 0; _t.shadowOffsetY = 0; _t.shadowBlur = 0; _t.shadowOpacity = 1.0; + + //properties mapping: + if(properties && properties instanceof Object){ + for(var key in properties){ + _t[key] = properties[key]; + } + } +}; +/** + * Web ONLY + * */ +cc.FontDefinition.prototype._getCanvasFontStr = function(){ + var lineHeight = !this.lineHeight.charAt ? this.lineHeight+"px" : this.lineHeight; + return this.fontStyle + " " + this.fontWeight + " " + this.fontSize + "px/"+lineHeight+" '" + this.fontName + "'"; }; if (cc._renderType === cc._RENDER_TYPE_WEBGL) { - _tmp.WebGLColor(); - delete _tmp.WebGLColor; + cc.assert(cc.isFunction(cc._tmp.WebGLColor), cc._LogInfos.MissingFile, "CCTypesWebGL.js"); + cc._tmp.WebGLColor(); + delete cc._tmp.WebGLColor; } -_tmp.PrototypeColor(); -delete _tmp.PrototypeColor; +cc.assert(cc.isFunction(cc._tmp.PrototypeColor), cc._LogInfos.MissingFile, "CCTypesPropertyDefine.js"); +cc._tmp.PrototypeColor(); +delete cc._tmp.PrototypeColor; diff --git a/cocos2d/core/platform/CCTypesPropertyDefine.js b/cocos2d/core/platform/CCTypesPropertyDefine.js index a80e1d3809..f0be5ac1de 100644 --- a/cocos2d/core/platform/CCTypesPropertyDefine.js +++ b/cocos2d/core/platform/CCTypesPropertyDefine.js @@ -1,7 +1,7 @@ /**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2008-2010 Ricardo Quesada - Copyright (c) 2011 Zynga Inc. + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -24,7 +24,7 @@ THE SOFTWARE. ****************************************************************************/ -_tmp.PrototypeColor = function () { +cc._tmp.PrototypeColor = function () { var _p = cc.color; /** * White color (255, 255, 255, 255) @@ -134,6 +134,32 @@ _tmp.PrototypeColor = function () { /** @expose */ _p.GRAY; cc.defineGetterSetter(_p, "GRAY", _p._getGray); + + cc.BlendFunc._disable = function(){ + return new cc.BlendFunc(cc.ONE, cc.ZERO); + }; + cc.BlendFunc._alphaPremultiplied = function(){ + return new cc.BlendFunc(cc.ONE, cc.ONE_MINUS_SRC_ALPHA); + }; + cc.BlendFunc._alphaNonPremultiplied = function(){ + return new cc.BlendFunc(cc.SRC_ALPHA, cc.ONE_MINUS_SRC_ALPHA); + }; + cc.BlendFunc._additive = function(){ + return new cc.BlendFunc(cc.SRC_ALPHA, cc.ONE); + }; + + /** @expose */ + cc.BlendFunc.DISABLE; + cc.defineGetterSetter(cc.BlendFunc, "DISABLE", cc.BlendFunc._disable); + /** @expose */ + cc.BlendFunc.ALPHA_PREMULTIPLIED; + cc.defineGetterSetter(cc.BlendFunc, "ALPHA_PREMULTIPLIED", cc.BlendFunc._alphaPremultiplied); + /** @expose */ + cc.BlendFunc.ALPHA_NON_PREMULTIPLIED; + cc.defineGetterSetter(cc.BlendFunc, "ALPHA_NON_PREMULTIPLIED", cc.BlendFunc._alphaNonPremultiplied); + /** @expose */ + cc.BlendFunc.ADDITIVE; + cc.defineGetterSetter(cc.BlendFunc, "ADDITIVE", cc.BlendFunc._additive); }; diff --git a/cocos2d/core/platform/CCTypesWebGL.js b/cocos2d/core/platform/CCTypesWebGL.js index b89758ce5e..dbcd2ad478 100644 --- a/cocos2d/core/platform/CCTypesWebGL.js +++ b/cocos2d/core/platform/CCTypesWebGL.js @@ -1,5 +1,7 @@ /**************************************************************************** - Copyright (c) 2010-2014 cocos2d-x.org + Copyright (c) 2008-2010 Ricardo Quesada + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -22,20 +24,43 @@ THE SOFTWARE. ****************************************************************************/ -_tmp.WebGLColor = function () { +var cc = cc || {}; +cc._tmp = cc._tmp || {}; + +cc._tmp.WebGLColor = function () { //redefine some types with ArrayBuffer for WebGL + /** + * @class cc.Color + * @param {Number} r + * @param {Number}g + * @param {Number} b + * @param {Number} a + * @param {Array} arrayBuffer + * @param {Number} offset + * @returns {cc.Color} + */ cc.color = function (r, g, b, a, arrayBuffer, offset) { if (r === undefined) return new cc.Color(0, 0, 0, 255, arrayBuffer, offset); - if (typeof r === "string") { + if (cc.isString(r)) { var color = cc.hexToColor(r); return new cc.Color(color.r, color.g, color.b, color.a); } - if (typeof r === "object") + if (cc.isObject(r)) return new cc.Color(r.r, r.g, r.b, r.a, r.arrayBuffer, r.offset); return new cc.Color(r, g, b, a, arrayBuffer, offset); }; //redefine cc.Color + /** + * @class cc.Color + * @param {Number} r + * @param {Number}g + * @param {Number} b + * @param {Number} a + * @param {Array} arrayBuffer + * @param {Number} offset + * @constructor + */ cc.Color = function (r, g, b, a, arrayBuffer, offset) { this._arrayBuffer = arrayBuffer || new ArrayBuffer(cc.Color.BYTES_PER_ELEMENT); this._offset = offset || 0; @@ -49,16 +74,17 @@ _tmp.WebGLColor = function () { this._rU8[0] = r || 0; this._gU8[0] = g || 0; this._bU8[0] = b || 0; - this._aU8[0] = a || 0; + this._aU8[0] = (a == null) ? 255 : a; - if (a === undefined) { + if (a === undefined) this.a_undefined = true; - } }; + /** + * @constant + * @type {number} + */ cc.Color.BYTES_PER_ELEMENT = 4; - var _p = cc.Color.prototype; - _p._getR = function () { return this._rU8[0]; }; @@ -96,8 +122,15 @@ _tmp.WebGLColor = function () { _p.a; cc.defineGetterSetter(_p, "a", _p._getA, _p._setA); - //redefine cc.Vertex2F + /** + * @class cc.Vertex2F + * @param {Number} x + * @param {Number}y + * @param {Array} arrayBuffer + * @param {Number}offset + * @constructor + */ cc.Vertex2F = function (x, y, arrayBuffer, offset) { this._arrayBuffer = arrayBuffer || new ArrayBuffer(cc.Vertex2F.BYTES_PER_ELEMENT); this._offset = offset || 0; @@ -107,29 +140,42 @@ _tmp.WebGLColor = function () { this._xF32[0] = x || 0; this._yF32[0] = y || 0; }; + /** + * @constant + * @type {number} + */ cc.Vertex2F.BYTES_PER_ELEMENT = 8; - Object.defineProperties(cc.Vertex2F.prototype, { - x: { - get: function () { - return this._xF32[0]; - }, - set: function (xValue) { - this._xF32[0] = xValue; - }, - enumerable: true - }, - y: { - get: function () { - return this._yF32[0]; - }, - set: function (yValue) { - this._yF32[0] = yValue; - }, - enumerable: true - } - }); + + _p = cc.Vertex2F.prototype; + _p._getX = function () { + return this._xF32[0]; + }; + _p._setX = function (xValue) { + this._xF32[0] = xValue; + }; + _p._getY = function () { + return this._yF32[0]; + }; + _p._setY = function (yValue) { + this._yF32[0] = yValue; + }; + /** @expose */ + _p.x; + cc.defineGetterSetter(_p, "x", _p._getX, _p._setX); + /** @expose */ + _p.y; + cc.defineGetterSetter(_p, "y", _p._getY, _p._setY); // redefine cc.Vertex3F + /** + * @class cc.Vertex3F + * @param {Number} x + * @param {Number} y + * @param {Number}z + * @param {Array} arrayBuffer + * @param {Number} offset + * @constructor + */ cc.Vertex3F = function (x, y, z, arrayBuffer, offset) { this._arrayBuffer = arrayBuffer || new ArrayBuffer(cc.Vertex3F.BYTES_PER_ELEMENT); this._offset = offset || 0; @@ -142,38 +188,50 @@ _tmp.WebGLColor = function () { this._zF32 = new Float32Array(locArrayBuffer, locOffset + Float32Array.BYTES_PER_ELEMENT * 2, 1); this._zF32[0] = z || 0; }; + /** + * @constant + * @type {number} + */ cc.Vertex3F.BYTES_PER_ELEMENT = 12; - Object.defineProperties(cc.Vertex3F.prototype, { - x: { - get: function () { - return this._xF32[0]; - }, - set: function (xValue) { - this._xF32[0] = xValue; - }, - enumerable: true - }, - y: { - get: function () { - return this._yF32[0]; - }, - set: function (yValue) { - this._yF32[0] = yValue; - }, - enumerable: true - }, - z: { - get: function () { - return this._zF32[0]; - }, - set: function (zValue) { - this._zF32[0] = zValue; - }, - enumerable: true - } - }); + + _p = cc.Vertex3F.prototype; + _p._getX = function () { + return this._xF32[0]; + }; + _p._setX = function (xValue) { + this._xF32[0] = xValue; + }; + _p._getY = function () { + return this._yF32[0]; + }; + _p._setY = function (yValue) { + this._yF32[0] = yValue; + }; + _p._getZ = function () { + return this._zF32[0]; + }; + _p._setZ = function (zValue) { + this._zF32[0] = zValue; + }; + /** @expose */ + _p.x; + cc.defineGetterSetter(_p, "x", _p._getX, _p._setX); + /** @expose */ + _p.y; + cc.defineGetterSetter(_p, "y", _p._getY, _p._setY); + /** @expose */ + _p.z; + cc.defineGetterSetter(_p, "z", _p._getZ, _p._setZ); // redefine cc.Tex2F + /** + * @class cc.Tex2F + * @param {Number} u + * @param {Number} v + * @param {Array} arrayBuffer + * @param {Number} offset + * @constructor + */ cc.Tex2F = function (u, v, arrayBuffer, offset) { this._arrayBuffer = arrayBuffer || new ArrayBuffer(cc.Tex2F.BYTES_PER_ELEMENT); this._offset = offset || 0; @@ -183,29 +241,43 @@ _tmp.WebGLColor = function () { this._uF32[0] = u || 0; this._vF32[0] = v || 0; }; + /** + * @constants + * @type {number} + */ cc.Tex2F.BYTES_PER_ELEMENT = 8; - Object.defineProperties(cc.Tex2F.prototype, { - u: { - get: function () { - return this._uF32[0]; - }, - set: function (xValue) { - this._uF32[0] = xValue; - }, - enumerable: true - }, - v: { - get: function () { - return this._vF32[0]; - }, - set: function (yValue) { - this._vF32[0] = yValue; - }, - enumerable: true - } - }); + + _p = cc.Tex2F.prototype; + _p._getU = function () { + return this._uF32[0]; + }; + _p._setU = function (xValue) { + this._uF32[0] = xValue; + }; + _p._getV = function () { + return this._vF32[0]; + }; + _p._setV = function (yValue) { + this._vF32[0] = yValue; + }; + /** @expose */ + _p.u; + cc.defineGetterSetter(_p, "u", _p._getU, _p._setU); + /** @expose */ + _p.v; + cc.defineGetterSetter(_p, "v", _p._getV, _p._setV); //redefine cc.Quad2 + /** + * @class cc.Quad2 + * @param {cc.Vertex2F} tl + * @param {cc.Vertex2F} tr + * @param {cc.Vertex2F} bl + * @param {cc.Vertex2F} br + * @param {Array} arrayBuffer + * @param {Number} offset + * @constructor + */ cc.Quad2 = function (tl, tr, bl, br, arrayBuffer, offset) { this._arrayBuffer = arrayBuffer || new ArrayBuffer(cc.Quad2.BYTES_PER_ELEMENT); this._offset = offset || 0; @@ -216,11 +288,58 @@ _tmp.WebGLColor = function () { this._bl = bl ? new cc.Vertex2F(bl.x, bl.y, locArrayBuffer, locElementLen * 2) : new cc.Vertex2F(0, 0, locArrayBuffer, locElementLen * 2); this._br = br ? new cc.Vertex2F(br.x, br.y, locArrayBuffer, locElementLen * 3) : new cc.Vertex2F(0, 0, locArrayBuffer, locElementLen * 3); }; + /** + * @constant + * @type {number} + */ cc.Quad2.BYTES_PER_ELEMENT = 32; + _p = cc.Quad2.prototype; + _p._getTL = function () { + return this._tl; + }; + _p._setTL = function (tlValue) { + this._tl.x = tlValue.x; + this._tl.y = tlValue.y; + }; + _p._getTR = function () { + return this._tr; + }; + _p._setTR = function (trValue) { + this._tr.x = trValue.x; + this._tr.y = trValue.y; + }; + _p._getBL = function() { + return this._bl; + }; + _p._setBL = function (blValue) { + this._bl.x = blValue.x; + this._bl.y = blValue.y; + }; + _p._getBR = function () { + return this._br; + }; + _p._setBR = function (brValue) { + this._br.x = brValue.x; + this._br.y = brValue.y; + }; + + /** @expose */ + _p.tl; + cc.defineGetterSetter(_p, "tl", _p._getTL, _p._setTL); + /** @expose */ + _p.tr; + cc.defineGetterSetter(_p, "tr", _p._getTR, _p._setTR); + /** @expose */ + _p.bl; + cc.defineGetterSetter(_p, "bl", _p._getBL, _p._setBL); + /** @expose */ + _p.br; + cc.defineGetterSetter(_p, "br", _p._getBR, _p._setBR); + /** * A 3D Quad. 4 * 3 floats - * @Class + * @Class cc.Quad3 * @Construct * @param {cc.Vertex3F} bl1 * @param {cc.Vertex3F} br1 @@ -234,50 +353,16 @@ _tmp.WebGLColor = function () { this.tr = tr1 || new cc.Vertex3F(0, 0, 0); }; - Object.defineProperties(cc.Quad2.prototype, { - tl: { - get: function () { - return this._tl; - }, - set: function (tlValue) { - this._tl.x = tlValue.x; - this._tl.y = tlValue.y; - }, - enumerable: true - }, - tr: { - get: function () { - return this._tr; - }, - set: function (trValue) { - this._tr.x = trValue.x; - this._tr.y = trValue.y; - }, - enumerable: true - }, - bl: { - get: function () { - return this._bl; - }, - set: function (blValue) { - this._bl.x = blValue.x; - this._bl.y = blValue.y; - }, - enumerable: true - }, - br: { - get: function () { - return this._br; - }, - set: function (brValue) { - this._br.x = brValue.x; - this._br.y = brValue.y; - }, - enumerable: true - } - }); - //redefine cc.V3F_C4B_T2F + /** + * @class cc.V3F_C4B_T2F + * @param {cc.Vertex3F} vertices + * @param { cc.color} colors + * @param {cc.Tex2F} texCoords + * @param {Array} arrayBuffer + * @param {Number} offset + * @constructor + */ cc.V3F_C4B_T2F = function (vertices, colors, texCoords, arrayBuffer, offset) { this._arrayBuffer = arrayBuffer || new ArrayBuffer(cc.V3F_C4B_T2F.BYTES_PER_ELEMENT); this._offset = offset || 0; @@ -290,46 +375,60 @@ _tmp.WebGLColor = function () { this._texCoords = texCoords ? new cc.Tex2F(texCoords.u, texCoords.v, locArrayBuffer, locOffset + locElementLen + cc.Color.BYTES_PER_ELEMENT) : new cc.Tex2F(0, 0, locArrayBuffer, locOffset + locElementLen + cc.Color.BYTES_PER_ELEMENT); }; + /** + * @constant + * @type {number} + */ cc.V3F_C4B_T2F.BYTES_PER_ELEMENT = 24; - Object.defineProperties(cc.V3F_C4B_T2F.prototype, { - vertices: { - get: function () { - return this._vertices; - }, - set: function (verticesValue) { - var locVertices = this._vertices; - locVertices.x = verticesValue.x; - locVertices.y = verticesValue.y; - locVertices.z = verticesValue.z; - }, - enumerable: true - }, - colors: { - get: function () { - return this._colors; - }, - set: function (colorValue) { - var locColors = this._colors; - locColors.r = colorValue.r; - locColors.g = colorValue.g; - locColors.b = colorValue.b; - locColors.a = colorValue.a; - }, - enumerable: true - }, - texCoords: { - get: function () { - return this._texCoords; - }, - set: function (texValue) { - this._texCoords.u = texValue.u; - this._texCoords.v = texValue.v; - }, - enumerable: true - } - }); + + _p = cc.V3F_C4B_T2F.prototype; + _p._getVertices = function () { + return this._vertices; + }; + _p._setVertices = function (verticesValue) { + var locVertices = this._vertices; + locVertices.x = verticesValue.x; + locVertices.y = verticesValue.y; + locVertices.z = verticesValue.z; + }; + _p._getColor = function () { + return this._colors; + }; + _p._setColor = function (colorValue) { + var locColors = this._colors; + locColors.r = colorValue.r; + locColors.g = colorValue.g; + locColors.b = colorValue.b; + locColors.a = colorValue.a; + }; + _p._getTexCoords = function () { + return this._texCoords; + }; + _p._setTexCoords = function (texValue) { + this._texCoords.u = texValue.u; + this._texCoords.v = texValue.v; + }; + /** @expose */ + _p.vertices; + cc.defineGetterSetter(_p, "vertices", _p._getVertices, _p._setVertices); + /** @expose */ + _p.colors; + cc.defineGetterSetter(_p, "colors", _p._getColor, _p._setColor); + /** @expose */ + _p.texCoords; + cc.defineGetterSetter(_p, "texCoords", _p._getTexCoords, _p._setTexCoords); //redefine cc.V3F_C4B_T2F_Quad + /** + * @cc.class cc.V3F_C4B_T2F_Quad + * @param {cc.V3F_C4B_T2F} tl + * @param {cc.V3F_C4B_T2F} bl + * @param {cc.V3F_C4B_T2F} tr + * @param {cc.V3F_C4B_T2F} br + * @param {Array} arrayBuffer + * @param {Number} offset + * @constructor + */ cc.V3F_C4B_T2F_Quad = function (tl, bl, tr, br, arrayBuffer, offset) { this._arrayBuffer = arrayBuffer || new ArrayBuffer(cc.V3F_C4B_T2F_Quad.BYTES_PER_ELEMENT); this._offset = offset || 0; @@ -344,67 +443,81 @@ _tmp.WebGLColor = function () { this._br = br ? new cc.V3F_C4B_T2F(br.vertices, br.colors, br.texCoords, locArrayBuffer, locOffset + locElementLen * 3) : new cc.V3F_C4B_T2F(null, null, null, locArrayBuffer, locOffset + locElementLen * 3); }; + /** + * @constant + * @type {number} + */ cc.V3F_C4B_T2F_Quad.BYTES_PER_ELEMENT = 96; - Object.defineProperties(cc.V3F_C4B_T2F_Quad.prototype, { - tl: { - get: function () { - return this._tl; - }, - set: function (tlValue) { - var locTl = this._tl; - locTl.vertices = tlValue.vertices; - locTl.colors = tlValue.colors; - locTl.texCoords = tlValue.texCoords; - }, - enumerable: true - }, - bl: { - get: function () { - return this._bl; - }, - set: function (blValue) { - var locBl = this._bl; - locBl.vertices = blValue.vertices; - locBl.colors = blValue.colors; - locBl.texCoords = blValue.texCoords; - }, - enumerable: true - }, - tr: { - get: function () { - return this._tr; - }, - set: function (trValue) { - var locTr = this._tr; - locTr.vertices = trValue.vertices; - locTr.colors = trValue.colors; - locTr.texCoords = trValue.texCoords; - }, - enumerable: true - }, - br: { - get: function () { - return this._br; - }, - set: function (brValue) { - var locBr = this._br; - locBr.vertices = brValue.vertices; - locBr.colors = brValue.colors; - locBr.texCoords = brValue.texCoords; - }, - enumerable: true - }, - arrayBuffer: { - get: function () { - return this._arrayBuffer; - }, - enumerable: true - } - }); + _p = cc.V3F_C4B_T2F_Quad.prototype; + _p._getTL = function () { + return this._tl; + }; + _p._setTL = function (tlValue) { + var locTl = this._tl; + locTl.vertices = tlValue.vertices; + locTl.colors = tlValue.colors; + locTl.texCoords = tlValue.texCoords; + }; + _p._getBL = function () { + return this._bl; + }; + _p._setBL = function (blValue) { + var locBl = this._bl; + locBl.vertices = blValue.vertices; + locBl.colors = blValue.colors; + locBl.texCoords = blValue.texCoords; + }; + _p._getTR = function () { + return this._tr; + }; + _p._setTR = function (trValue) { + var locTr = this._tr; + locTr.vertices = trValue.vertices; + locTr.colors = trValue.colors; + locTr.texCoords = trValue.texCoords; + }; + _p._getBR = function () { + return this._br; + }; + _p._setBR = function (brValue) { + var locBr = this._br; + locBr.vertices = brValue.vertices; + locBr.colors = brValue.colors; + locBr.texCoords = brValue.texCoords; + }; + _p._getArrayBuffer = function () { + return this._arrayBuffer; + }; + + /** @expose */ + _p.tl; + cc.defineGetterSetter(_p, "tl", _p._getTL, _p._setTL); + /** @expose */ + _p.tr; + cc.defineGetterSetter(_p, "tr", _p._getTR, _p._setTR); + /** @expose */ + _p.bl; + cc.defineGetterSetter(_p, "bl", _p._getBL, _p._setBL); + /** @expose */ + _p.br; + cc.defineGetterSetter(_p, "br", _p._getBR, _p._setBR); + /** @expose */ + _p.arrayBuffer; + cc.defineGetterSetter(_p, "arrayBuffer", _p._getArrayBuffer, null); + + /** + * @function + * @returns {cc.V3F_C4B_T2F_Quad} + */ cc.V3F_C4B_T2F_QuadZero = function () { return new cc.V3F_C4B_T2F_Quad(); }; + /** + * @function + * @param {cc.V3F_C4B_T2F_Quad} sourceQuad + * @return {cc.V3F_C4B_T2F_Quad} + */ cc.V3F_C4B_T2F_QuadCopy = function (sourceQuad) { if (!sourceQuad) return cc.V3F_C4B_T2F_QuadZero(); @@ -427,6 +540,11 @@ _tmp.WebGLColor = function () { }; }; + /** + * @function + * @param {Array} sourceQuads + * @returns {Array} + */ cc.V3F_C4B_T2F_QuadsCopy = function (sourceQuads) { if (!sourceQuads) return []; @@ -439,6 +557,15 @@ _tmp.WebGLColor = function () { }; //redefine cc.V2F_C4B_T2F + /** + * @class cc.V2F_C4B_T2F + * @param {cc.Vertex2F} vertices + * @param {cc.color} colors + * @param {cc.Tex2F} texCoords + * @param {Array} arrayBuffer + * @param {Number} offset + * @constructor + */ cc.V2F_C4B_T2F = function (vertices, colors, texCoords, arrayBuffer, offset) { this._arrayBuffer = arrayBuffer || new ArrayBuffer(cc.V2F_C4B_T2F.BYTES_PER_ELEMENT); this._offset = offset || 0; @@ -451,44 +578,58 @@ _tmp.WebGLColor = function () { this._texCoords = texCoords ? new cc.Tex2F(texCoords.u, texCoords.v, locArrayBuffer, locOffset + locElementLen + cc.Color.BYTES_PER_ELEMENT) : new cc.Tex2F(0, 0, locArrayBuffer, locOffset + locElementLen + cc.Color.BYTES_PER_ELEMENT); }; + + /** + * @constant + * @type {number} + */ cc.V2F_C4B_T2F.BYTES_PER_ELEMENT = 20; - Object.defineProperties(cc.V2F_C4B_T2F.prototype, { - vertices: { - get: function () { - return this._vertices; - }, - set: function (verticesValue) { - this._vertices.x = verticesValue.x; - this._vertices.y = verticesValue.y; - }, - enumerable: true - }, - colors: { - get: function () { - return this._colors; - }, - set: function (colorValue) { - var locColors = this._colors; - locColors.r = colorValue.r; - locColors.g = colorValue.g; - locColors.b = colorValue.b; - locColors.a = colorValue.a; - }, - enumerable: true - }, - texCoords: { - get: function () { - return this._texCoords; - }, - set: function (texValue) { - this._texCoords.u = texValue.u; - this._texCoords.v = texValue.v; - }, - enumerable: true - } - }); + _p = cc.V2F_C4B_T2F.prototype; + _p._getVertices = function () { + return this._vertices; + }; + _p._setVertices = function (verticesValue) { + this._vertices.x = verticesValue.x; + this._vertices.y = verticesValue.y; + }; + _p._getColor = function () { + return this._colors; + }; + _p._setColor = function (colorValue) { + var locColors = this._colors; + locColors.r = colorValue.r; + locColors.g = colorValue.g; + locColors.b = colorValue.b; + locColors.a = colorValue.a; + }; + _p._getTexCoords = function () { + return this._texCoords; + }; + _p._setTexCoords = function (texValue) { + this._texCoords.u = texValue.u; + this._texCoords.v = texValue.v; + }; + + /** @expose */ + _p.vertices; + cc.defineGetterSetter(_p, "vertices", _p._getVertices, _p._setVertices); + /** @expose */ + _p.colors; + cc.defineGetterSetter(_p, "colors", _p._getColor, _p._setColor); + /** @expose */ + _p.texCoords; + cc.defineGetterSetter(_p, "texCoords", _p._getTexCoords, _p._setTexCoords); //redefine cc.V2F_C4B_T2F_Triangle + /** + * @class cc.V2F_C4B_T2F_Triangle + * @param {cc.V2F_C4B_T2F} a + * @param {cc.V2F_C4B_T2F} b + * @param {cc.V2F_C4B_T2F} c + * @param {Array} arrayBuffer + * @param {Number} offset + * @constructor + */ cc.V2F_C4B_T2F_Triangle = function (a, b, c, arrayBuffer, offset) { this._arrayBuffer = arrayBuffer || new ArrayBuffer(cc.V2F_C4B_T2F_Triangle.BYTES_PER_ELEMENT); this._offset = offset || 0; @@ -501,43 +642,47 @@ _tmp.WebGLColor = function () { this._c = c ? new cc.V2F_C4B_T2F(c.vertices, c.colors, c.texCoords, locArrayBuffer, locOffset + locElementLen * 2) : new cc.V2F_C4B_T2F(null, null, null, locArrayBuffer, locOffset + locElementLen * 2); }; + /** + * @constant + * @type {number} + */ cc.V2F_C4B_T2F_Triangle.BYTES_PER_ELEMENT = 60; - Object.defineProperties(cc.V2F_C4B_T2F_Triangle.prototype, { - a: { - get: function () { - return this._a; - }, - set: function (aValue) { - var locA = this._a; - locA.vertices = aValue.vertices; - locA.colors = aValue.colors; - locA.texCoords = aValue.texCoords; - }, - enumerable: true - }, - b: { - get: function () { - return this._b; - }, - set: function (bValue) { - var locB = this._b; - locB.vertices = bValue.vertices; - locB.colors = bValue.colors; - locB.texCoords = bValue.texCoords; - }, - enumerable: true - }, - c: { - get: function () { - return this._c; - }, - set: function (cValue) { - var locC = this._c; - locC.vertices = cValue.vertices; - locC.colors = cValue.colors; - locC.texCoords = cValue.texCoords; - }, - enumerable: true - } - }); -} \ No newline at end of file + _p = cc.V2F_C4B_T2F_Triangle.prototype; + _p._getA = function () { + return this._a; + }; + _p._setA = function (aValue) { + var locA = this._a; + locA.vertices = aValue.vertices; + locA.colors = aValue.colors; + locA.texCoords = aValue.texCoords; + }; + _p._getB = function () { + return this._b; + }; + _p._setB = function (bValue) { + var locB = this._b; + locB.vertices = bValue.vertices; + locB.colors = bValue.colors; + locB.texCoords = bValue.texCoords; + }; + _p._getC = function () { + return this._c; + }; + _p._setC = function (cValue) { + var locC = this._c; + locC.vertices = cValue.vertices; + locC.colors = cValue.colors; + locC.texCoords = cValue.texCoords; + }; + + /** @expose */ + _p.a; + cc.defineGetterSetter(_p, "a", _p._getA, _p._setA); + /** @expose */ + _p.b; + cc.defineGetterSetter(_p, "b", _p._getB, _p._setB); + /** @expose */ + _p.c; + cc.defineGetterSetter(_p, "c", _p._getC, _p._setC); +}; \ No newline at end of file diff --git a/cocos2d/core/platform/CCVisibleRect.js b/cocos2d/core/platform/CCVisibleRect.js index 98b818f2a2..c6545e9f72 100644 --- a/cocos2d/core/platform/CCVisibleRect.js +++ b/cocos2d/core/platform/CCVisibleRect.js @@ -1,7 +1,6 @@ /**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org - Copyright (c) 2008-2010 Ricardo Quesada - Copyright (c) 2011 Zynga Inc. + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -26,104 +25,76 @@ ****************************************************************************/ /** + * cc.visibleRect is a singleton object which defines the actual visible rect of the current view, + * it should represent the same rect as cc.view.getViewportRect() * - * @type Object + * @property {cc.Point} topLeft - Top left coordinate of the screen related to the game scene + * @property {cc.Point} topRight - Top right coordinate of the screen related to the game scene + * @property {cc.Point} top - Top center coordinate of the screen related to the game scene + * @property {cc.Point} bottomLeft - Bottom left coordinate of the screen related to the game scene + * @property {cc.Point} bottomRight - Bottom right coordinate of the screen related to the game scene + * @property {cc.Point} bottom - Bottom center coordinate of the screen related to the game scene + * @property {cc.Point} center - Center coordinate of the screen related to the game scene + * @property {cc.Point} left - Left center coordinate of the screen related to the game scene + * @property {cc.Point} right - Right center coordinate of the screen related to the game scene + * @property {Number} width - Width of the screen + * @property {Number} height - Height of the screen + * + * @class + * @name cc.visibleRect */ cc.visibleRect = { - _topLeft:cc.p(0,0), - _topRight:cc.p(0,0), - _top:cc.p(0,0), - _bottomLeft:cc.p(0,0), - _bottomRight:cc.p(0,0), - _bottom:cc.p(0,0), - _center:cc.p(0,0), - _left:cc.p(0,0), - _right:cc.p(0,0), - _width:0, - _height:0, - init:function(size){ - this._width = size.width; - this._height = size.height; + topLeft:cc.p(0,0), + topRight:cc.p(0,0), + top:cc.p(0,0), + bottomLeft:cc.p(0,0), + bottomRight:cc.p(0,0), + bottom:cc.p(0,0), + center:cc.p(0,0), + left:cc.p(0,0), + right:cc.p(0,0), + width:0, + height:0, + + /** + * initialize + * @param {cc.Rect} visibleRect + */ + init:function(visibleRect){ - var w = this._width; - var h = this._height; + var w = this.width = visibleRect.width; + var h = this.height = visibleRect.height; + var l = visibleRect.x, + b = visibleRect.y, + t = b + h, + r = l + w; //top - this._topLeft.y = h; - this._topRight.x = w; - this._topRight.y = h; - this._top.x = w/2; - this._top.y = h; + this.topLeft.x = l; + this.topLeft.y = t; + this.topRight.x = r; + this.topRight.y = t; + this.top.x = l + w/2; + this.top.y = t; //bottom - this._bottomRight.x = w; - this._bottom.x = w/2; + this.bottomLeft.x = l; + this.bottomLeft.y = b; + this.bottomRight.x = r; + this.bottomRight.y = b; + this.bottom.x = l + w/2; + this.bottom.y = b; //center - this._center.x = w/2; - this._center.y = h/2; + this.center.x = l + w/2; + this.center.y = b + h/2; //left - this._left.y = h/2; + this.left.x = l; + this.left.y = b + h/2; //right - this._right.x = w; - this._right.y = h/2; + this.right.x = r; + this.right.y = b + h/2; } -}; - -/** @expose */ -cc.visibleRect.width; -cc.defineGetterSetter(cc.visibleRect, "width", function(){ - return this._width; -}); -/** @expose */ -cc.visibleRect.height; -cc.defineGetterSetter(cc.visibleRect, "height", function(){ - return this._height; -}); -/** @expose */ -cc.visibleRect.topLeft; -cc.defineGetterSetter(cc.visibleRect, "topLeft", function(){ - return this._topLeft; -}); -/** @expose */ -cc.visibleRect.topRight; -cc.defineGetterSetter(cc.visibleRect, "topRight", function(){ - return this._topRight; -}); -/** @expose */ -cc.visibleRect.top; -cc.defineGetterSetter(cc.visibleRect, "top", function(){ - return this._top; -}); -/** @expose */ -cc.visibleRect.bottomLeft; -cc.defineGetterSetter(cc.visibleRect, "bottomLeft", function(){ - return this._bottomLeft; -}); -/** @expose */ -cc.visibleRect.bottomRight; -cc.defineGetterSetter(cc.visibleRect, "bottomRight", function(){ - return this._bottomRight; -}); -/** @expose */ -cc.visibleRect.bottom; -cc.defineGetterSetter(cc.visibleRect, "bottom", function(){ - return this._bottom; -}); -/** @expose */ -cc.visibleRect.center; -cc.defineGetterSetter(cc.visibleRect, "center", function(){ - return this._center; -}); -/** @expose */ -cc.visibleRect.left; -cc.defineGetterSetter(cc.visibleRect, "left", function(){ - return this._left; -}); -/** @expose */ -cc.visibleRect.right; -cc.defineGetterSetter(cc.visibleRect, "right", function(){ - return this._right; -}); \ No newline at end of file +}; \ No newline at end of file diff --git a/cocos2d/core/platform/miniFramework.js b/cocos2d/core/platform/miniFramework.js index 10e9397378..048a2db325 100644 --- a/cocos2d/core/platform/miniFramework.js +++ b/cocos2d/core/platform/miniFramework.js @@ -1,7 +1,7 @@ /**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2008-2010 Ricardo Quesada - Copyright (c) 2011 Zynga Inc. + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -28,12 +28,12 @@ * the dollar sign, classic like jquery, this selector add extra methods to HTMLElement without touching its prototype * it is also chainable like jquery * @param {HTMLElement|String} x pass in a css selector in string or the whole HTMLElement - * @class + * @function * @return {cc.$} */ cc.$ = function (x) { /** @lends cc.$# */ - var parent = (this == cc) ? document : this; + var parent = (this === cc) ? document : this; var el = (x instanceof HTMLElement) ? x : parent.querySelector(x); diff --git a/cocos2d/core/renderer/RendererCanvas.js b/cocos2d/core/renderer/RendererCanvas.js new file mode 100644 index 0000000000..855207715b --- /dev/null +++ b/cocos2d/core/renderer/RendererCanvas.js @@ -0,0 +1,274 @@ +/**************************************************************************** + Copyright (c) 2013-2014 Chukong Technologies Inc. + + http://www.cocos2d-x.org + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + ****************************************************************************/ + +//if (cc._renderType === cc._RENDER_TYPE_CANVAS) { +cc.rendererCanvas = { + childrenOrderDirty: true, + _transformNodePool: [], //save nodes transform dirty + _renderCmds: [], //save renderer commands + + _isCacheToCanvasOn: false, //a switch that whether cache the rendererCmd to cacheToCanvasCmds + _cacheToCanvasCmds: {}, // an array saves the renderer commands need for cache to other canvas + _cacheInstanceIds: [], + _currentID: 0, + + getRenderCmd: function (renderableObject) { + //TODO Add renderCmd pool here + return renderableObject._createRenderCmd(); + }, + + /** + * drawing all renderer command to context (default is cc._renderContext) + * @param {cc.CanvasContextWrapper} [ctx=cc._renderContext] + */ + rendering: function (ctx) { + var locCmds = this._renderCmds, i, len, + scaleX = cc.view.getScaleX(), + scaleY = cc.view.getScaleY(); + var context = ctx || cc._renderContext; + context.computeRealOffsetY(); + for (i = 0, len = locCmds.length; i < len; i++) { + locCmds[i].rendering(context, scaleX, scaleY); + } + }, + + /** + * drawing all renderer command to cache canvas' context + * @param {cc.CanvasContextWrapper} ctx + * @param {Number} [instanceID] + * @param {Number} [scaleX] + * @param {Number} [scaleY] + */ + _renderingToCacheCanvas: function (ctx, instanceID, scaleX, scaleY) { + if (!ctx) + cc.log("The context of RenderTexture is invalid."); + scaleX = cc.isUndefined(scaleX) ? 1 : scaleX; + scaleY = cc.isUndefined(scaleY) ? 1 : scaleY; + instanceID = instanceID || this._currentID; + var locCmds = this._cacheToCanvasCmds[instanceID], i, len; + ctx.computeRealOffsetY(); + for (i = 0, len = locCmds.length; i < len; i++) { + locCmds[i].rendering(ctx, scaleX, scaleY); + } + locCmds.length = 0; + var locIDs = this._cacheInstanceIds; + delete this._cacheToCanvasCmds[instanceID]; + cc.arrayRemoveObject(locIDs, instanceID); + + if (locIDs.length === 0) + this._isCacheToCanvasOn = false; + else + this._currentID = locIDs[locIDs.length - 1]; + }, + + _turnToCacheMode: function (renderTextureID) { + this._isCacheToCanvasOn = true; + renderTextureID = renderTextureID || 0; + this._cacheToCanvasCmds[renderTextureID] = []; + if(this._cacheInstanceIds.indexOf(renderTextureID) === -1) + this._cacheInstanceIds.push(renderTextureID); + this._currentID = renderTextureID; + }, + + _turnToNormalMode: function () { + this._isCacheToCanvasOn = false; + }, + + resetFlag: function () { + this.childrenOrderDirty = false; + this._transformNodePool.length = 0; + }, + + transform: function () { + var locPool = this._transformNodePool; + //sort the pool + locPool.sort(this._sortNodeByLevelAsc); + + //transform node + for (var i = 0, len = locPool.length; i < len; i++) { + if (locPool[i]._dirtyFlag !== 0) + locPool[i].updateStatus(); + } + locPool.length = 0; + }, + + transformDirty: function () { + return this._transformNodePool.length > 0; + }, + + _sortNodeByLevelAsc: function (n1, n2) { + return n1._curLevel - n2._curLevel; + }, + + pushDirtyNode: function (node) { + this._transformNodePool.push(node); + }, + + clearRenderCommands: function () { + this._renderCmds.length = 0; + }, + + pushRenderCommand: function (cmd) { + if(!cmd._needDraw) + return; + if (this._isCacheToCanvasOn) { + var currentId = this._currentID, locCmdBuffer = this._cacheToCanvasCmds; + var cmdList = locCmdBuffer[currentId]; + if (cmdList.indexOf(cmd) === -1) + cmdList.push(cmd); + } else { + if (this._renderCmds.indexOf(cmd) === -1) + this._renderCmds.push(cmd); + } + } +}; + +if (cc._renderType === cc._RENDER_TYPE_CANVAS) + cc.renderer = cc.rendererCanvas; + +(function () { + cc.CanvasContextWrapper = function (context) { + this._context = context; + + this._saveCount = 0; + this._currentAlpha = context.globalAlpha; + this._currentCompositeOperation = context.globalCompositeOperation; + this._currentFillStyle = context.fillStyle; + this._currentStrokeStyle = context.strokeStyle; + + this._offsetX = 0; + this._offsetY = 0; + this._realOffsetY = this.height; + this._armatureMode = 0; + }; + + var proto = cc.CanvasContextWrapper.prototype; + + proto.resetCache = function(){ + var context = this._context; + //call it after resize cc._canvas, because context will reset. + this._currentAlpha = context.globalAlpha; + this._currentCompositeOperation = context.globalCompositeOperation; + this._currentFillStyle = context.fillStyle; + this._currentStrokeStyle = context.strokeStyle; + this._realOffsetY = this._context.canvas.height + this._offsetY; + }; + + proto.setOffset = function(x, y){ + this._offsetX = x; + this._offsetY = y; + this._realOffsetY = this._context.canvas.height + this._offsetY; + }; + + proto.computeRealOffsetY = function(){ + this._realOffsetY = this._context.canvas.height + this._offsetY; + }; + + proto.setViewScale = function(scaleX, scaleY){ + //call it at cc.renderCanvas.rendering + this._scaleX = scaleX; + this._scaleY = scaleY; + }; + + proto.getContext = function(){ + return this._context; + }; + + proto.save = function () { + this._context.save(); + this._saveCount++; + }; + + proto.restore = function () { + this._context.restore(); + this._saveCount--; + }; + + proto.setGlobalAlpha = function (alpha) { + if (this._saveCount > 0) { + this._context.globalAlpha = alpha; + } else { + if (this._currentAlpha !== alpha) { + this._currentAlpha = alpha; + this._context.globalAlpha = alpha; + } + } + }; + + proto.setCompositeOperation = function(compositionOperation){ + if (this._saveCount > 0) { + this._context.globalCompositeOperation = compositionOperation; + } else { + if (this._currentCompositeOperation !== compositionOperation) { + this._currentCompositeOperation = compositionOperation; + this._context.globalCompositeOperation = compositionOperation; + } + } + }; + + proto.setFillStyle = function(fillStyle){ + if (this._saveCount > 0) { + this._context.fillStyle = fillStyle; + } else { + if (this._currentFillStyle !== fillStyle) { + this._currentFillStyle = fillStyle; + this._context.fillStyle = fillStyle; + } + } + }; + + proto.setStrokeStyle = function(strokeStyle){ + if (this._saveCount > 0) { + this._context.strokeStyle = strokeStyle; + } else { + if (this._currentStrokeStyle !== strokeStyle) { + this._currentStrokeStyle = strokeStyle; + this._context.strokeStyle = strokeStyle; + } + } + }; + + proto.setTransform = function(t, scaleX, scaleY){ + if (this._armatureMode > 0) { + //ugly for armature + this.restore(); + this.save(); + this._context.transform(t.a, -t.b, -t.c, t.d, t.tx * scaleX, -(t.ty * scaleY)); + } else { + this._context.setTransform(t.a, -t.b, -t.c, t.d, this._offsetX + t.tx * scaleX, this._realOffsetY - (t.ty * scaleY)); + } + }; + + proto._switchToArmatureMode = function(enable, t, scaleX, scaleY){ + if(enable){ + this._armatureMode++; + this._context.setTransform(t.a, t.c, t.b, t.d, this._offsetX + t.tx * scaleX, this._realOffsetY - (t.ty * scaleY)); + this.save(); + }else{ + this._armatureMode--; + this.restore(); + } + }; +})(); + diff --git a/cocos2d/core/renderer/RendererWebGL.js b/cocos2d/core/renderer/RendererWebGL.js new file mode 100644 index 0000000000..e9c9284857 --- /dev/null +++ b/cocos2d/core/renderer/RendererWebGL.js @@ -0,0 +1,137 @@ +/**************************************************************************** + Copyright (c) 2013-2014 Chukong Technologies Inc. + + http://www.cocos2d-x.org + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + ****************************************************************************/ + +cc.rendererWebGL = { + childrenOrderDirty: true, + _transformNodePool: [], //save nodes transform dirty + _renderCmds: [], //save renderer commands + + _isCacheToBufferOn: false, //a switch that whether cache the rendererCmd to cacheToCanvasCmds + _cacheToBufferCmds: {}, // an array saves the renderer commands need for cache to other canvas + _cacheInstanceIds: [], + _currentID: 0, + + getRenderCmd: function (renderableObject) { + //TODO Add renderCmd pool here + return renderableObject._createRenderCmd(); + }, + + /** + * drawing all renderer command to context (default is cc._renderContext) + * @param {WebGLRenderingContext} [ctx=cc._renderContext] + */ + rendering: function (ctx) { + var locCmds = this._renderCmds, + i, + len; + var context = ctx || cc._renderContext; + for (i = 0, len = locCmds.length; i < len; i++) { + locCmds[i].rendering(context); + } + }, + + _turnToCacheMode: function (renderTextureID) { + this._isCacheToBufferOn = true; + renderTextureID = renderTextureID || 0; + this._cacheToBufferCmds[renderTextureID] = []; + this._cacheInstanceIds.push(renderTextureID); + this._currentID = renderTextureID; + }, + + _turnToNormalMode: function () { + this._isCacheToBufferOn = false; + }, + + /** + * drawing all renderer command to cache canvas' context + * @param {Number} [renderTextureId] + */ + _renderingToBuffer: function (renderTextureId) { + renderTextureId = renderTextureId || this._currentID; + var locCmds = this._cacheToBufferCmds[renderTextureId], i, len; + var ctx = cc._renderContext, locIDs = this._cacheInstanceIds; + for (i = 0, len = locCmds.length; i < len; i++) { + locCmds[i].rendering(ctx); + } + locCmds.length = 0; + delete this._cacheToBufferCmds[renderTextureId]; + cc.arrayRemoveObject(locIDs, renderTextureId); + + if (locIDs.length === 0) + this._isCacheToBufferOn = false; + else + this._currentID = locIDs[locIDs.length - 1]; + }, + + //reset renderer's flag + resetFlag: function () { + this.childrenOrderDirty = false; + this._transformNodePool.length = 0; + }, + + //update the transform data + transform: function () { + var locPool = this._transformNodePool; + //sort the pool + locPool.sort(this._sortNodeByLevelAsc); + //transform node + for (var i = 0, len = locPool.length; i < len; i++) { + locPool[i].updateStatus(); + } + locPool.length = 0; + }, + + transformDirty: function () { + return this._transformNodePool.length > 0; + }, + + _sortNodeByLevelAsc: function (n1, n2) { + return n1._curLevel - n2._curLevel; + }, + + pushDirtyNode: function (node) { + //if (this._transformNodePool.indexOf(node) === -1) + this._transformNodePool.push(node); + }, + + clearRenderCommands: function () { + this._renderCmds.length = 0; + }, + + pushRenderCommand: function (cmd) { + if(!cmd._needDraw) + return; + if (this._isCacheToBufferOn) { + var currentId = this._currentID, locCmdBuffer = this._cacheToBufferCmds; + var cmdList = locCmdBuffer[currentId]; + if (cmdList.indexOf(cmd) === -1) + cmdList.push(cmd); + } else { + if (this._renderCmds.indexOf(cmd) === -1) + this._renderCmds.push(cmd); + } + } +}; +if (cc._renderType === cc._RENDER_TYPE_WEBGL) + cc.renderer = cc.rendererWebGL; diff --git a/cocos2d/core/scenes/CCLoaderScene.js b/cocos2d/core/scenes/CCLoaderScene.js index cdd596a123..562b71ff30 100644 --- a/cocos2d/core/scenes/CCLoaderScene.js +++ b/cocos2d/core/scenes/CCLoaderScene.js @@ -1,7 +1,6 @@ /**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org - Copyright (c) 2008-2010 Ricardo Quesada - Copyright (c) 2011 Zynga Inc. + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,26 +22,33 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ - +/** + *
cc.LoaderScene is a scene that you can load it when you loading files
+ *cc.LoaderScene can present thedownload progress
+ * @class + * @extends cc.Scene + * @example + * var lc = new cc.LoaderScene(); + */ cc.LoaderScene = cc.Scene.extend({ _interval : null, - _length : 0, - _count : 0, _label : null, _className:"LoaderScene", + cb: null, + target: null, + /** + * Contructor of cc.LoaderScene + * @returns {boolean} + */ init : function(){ var self = this; - var winSize = cc.director.getWinSize(); - //logo var logoWidth = 160; var logoHeight = 200; - var centerPos = cc.p(winSize.width / 2, winSize.height / 2); // bg - var bgLayer = self._bgLayer = cc.LayerColor.create(cc.color(32, 32, 32, 255)); - bgLayer.setPosition(0, 0); + var bgLayer = self._bgLayer = new cc.LayerColor(cc.color(32, 32, 32, 255)); self.addChild(bgLayer, 0); //image move to CCSceneFile.js @@ -52,14 +58,14 @@ cc.LoaderScene = cc.Scene.extend({ cc.loader.loadImg(cc._loaderImage, {isCrossOrigin : false }, function(err, img){ logoWidth = img.width; logoHeight = img.height; - self._initStage(img, centerPos); + self._initStage(img, cc.visibleRect.center); }); fontSize = 14; lblHeight = -logoHeight / 2 - 10; } //loading percent - var label = self._label = cc.LabelTTF.create("Loading... 0%", "Arial", fontSize); - label.setPosition(cc.pAdd(centerPos, cc.p(0, lblHeight))); + var label = self._label = new cc.LabelTTF("Loading... 0%", "Arial", fontSize); + label.setPosition(cc.pAdd(cc.visibleRect.center, cc.p(0, lblHeight))); label.setColor(cc.color(180, 180, 180)); bgLayer.addChild(this._label, 10); return true; @@ -70,19 +76,23 @@ cc.LoaderScene = cc.Scene.extend({ var texture2d = self._texture2d = new cc.Texture2D(); texture2d.initWithElement(img); texture2d.handleLoadedTexture(); - var logo = self._logo = cc.Sprite.create(texture2d); + var logo = self._logo = new cc.Sprite(texture2d); logo.setScale(cc.contentScaleFactor()); logo.x = centerPos.x; logo.y = centerPos.y; self._bgLayer.addChild(logo, 10); }, - + /** + * custom onEnter + */ onEnter: function () { var self = this; cc.Node.prototype.onEnter.call(self); self.schedule(self._startLoading, 0.3); }, - + /** + * custom onExit + */ onExit: function () { cc.Node.prototype.onExit.call(this); var tmpStr = "Loading... 0%"; @@ -93,41 +103,51 @@ cc.LoaderScene = cc.Scene.extend({ * init with resources * @param {Array} resources * @param {Function|String} cb + * @param {Object} target */ - initWithResources: function (resources, cb) { - if(typeof resources == "string") resources = [resources]; + initWithResources: function (resources, cb, target) { + if(cc.isString(resources)) + resources = [resources]; this.resources = resources || []; this.cb = cb; + this.target = target; }, _startLoading: function () { var self = this; self.unschedule(self._startLoading); var res = self.resources; - self._length = res.length; - cc.loader.load(res, function(result, count){ self._count = count; }, function(){ - self.cb(); - }); - self.schedule(self._updatePercent); - }, - - _updatePercent: function () { - var self = this; - var count = self._count; - var length = self._length; - var percent = (count / length * 100) | 0; - percent = Math.min(percent, 100); - self._label.setString("Loading... " + percent + "%"); - if(count >= length) self.unschedule(self._updatePercent); + cc.loader.load(res, + function (result, count, loadedCount) { + var percent = (loadedCount / count * 100) | 0; + percent = Math.min(percent, 100); + self._label.setString("Loading... " + percent + "%"); + }, function () { + if (self.cb) + self.cb.call(self.target); + }); } }); -cc.LoaderScene.preload = function(resources, cb){ +/** + *cc.LoaderScene.preload can present a loaderScene with download progress.
+ *when all the resource are downloaded it will invoke call function
+ * @param resources + * @param cb + * @param target + * @returns {cc.LoaderScene|*} + * @example + * //Example + * cc.LoaderScene.preload(g_resources, function () { + cc.director.runScene(new HelloWorldScene()); + }, this); + */ +cc.LoaderScene.preload = function(resources, cb, target){ var _cc = cc; if(!_cc.loaderScene) { _cc.loaderScene = new cc.LoaderScene(); _cc.loaderScene.init(); } - _cc.loaderScene.initWithResources(resources, cb); + _cc.loaderScene.initWithResources(resources, cb, target); cc.director.runScene(_cc.loaderScene); return _cc.loaderScene; diff --git a/cocos2d/core/scenes/CCScene.js b/cocos2d/core/scenes/CCScene.js index af8bd9f754..a54a179dcd 100644 --- a/cocos2d/core/scenes/CCScene.js +++ b/cocos2d/core/scenes/CCScene.js @@ -1,7 +1,7 @@ /**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2008-2010 Ricardo Quesada - Copyright (c) 2011 Zynga Inc. + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -36,10 +36,12 @@ *It is a good practice to use and cc.Scene as the parent of all your nodes.
* @class * @extends cc.Node + * @example + * var scene = new cc.Scene(); */ cc.Scene = cc.Node.extend(/** @lends cc.Scene# */{ /** - * Constructor + * Constructor of cc.Scene */ _className:"Scene", ctor:function () { @@ -52,12 +54,8 @@ cc.Scene = cc.Node.extend(/** @lends cc.Scene# */{ /** * creates a scene + * @deprecated since v3.0,please use new cc.Scene() instead. * @return {cc.Scene} - * @example - * // Example - * var aScene = cc.Scene.create(); - * //OR - * var aScene = new cc.Scene(); */ cc.Scene.create = function () { return new cc.Scene(); diff --git a/cocos2d/core/scenes/CCSceneFile.js b/cocos2d/core/scenes/CCSceneFile.js deleted file mode 100644 index f0a881e45e..0000000000 --- a/cocos2d/core/scenes/CCSceneFile.js +++ /dev/null @@ -1,27 +0,0 @@ -/**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org - Copyright (c) 2008-2010 Ricardo Quesada - Copyright (c) 2011 Zynga Inc. - - http://www.cocos2d-x.org - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. - ****************************************************************************/ - -cc._loaderImage = "data:image/jpeg;base64,/9j/4QAYRXhpZgAASUkqAAgAAAAAAAAAAAAAAP/sABFEdWNreQABAAQAAAAlAAD/4QMpaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLwA8P3hwYWNrZXQgYmVnaW49Iu+7vyIgaWQ9Ilc1TTBNcENlaGlIenJlU3pOVGN6a2M5ZCI/PiA8eDp4bXBtZXRhIHhtbG5zOng9ImFkb2JlOm5zOm1ldGEvIiB4OnhtcHRrPSJBZG9iZSBYTVAgQ29yZSA1LjAtYzA2MCA2MS4xMzQ3NzcsIDIwMTAvMDIvMTItMTc6MzI6MDAgICAgICAgICI+IDxyZGY6UkRGIHhtbG5zOnJkZj0iaHR0cDovL3d3dy53My5vcmcvMTk5OS8wMi8yMi1yZGYtc3ludGF4LW5zIyI+IDxyZGY6RGVzY3JpcHRpb24gcmRmOmFib3V0PSIiIHhtbG5zOnhtcE1NPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvbW0vIiB4bWxuczpzdFJlZj0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL3NUeXBlL1Jlc291cmNlUmVmIyIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjM4MDBEMDY2QTU1MjExRTFBQTAzQjEzMUNFNzMxRkQwIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjM4MDBEMDY1QTU1MjExRTFBQTAzQjEzMUNFNzMxRkQwIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzUgV2luZG93cyI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkU2RTk0OEM4OERCNDExRTE5NEUyRkE3M0M3QkE1NTlEIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOkU2RTk0OEM5OERCNDExRTE5NEUyRkE3M0M3QkE1NTlEIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+/+4ADkFkb2JlAGTAAAAAAf/bAIQADQkJCQoJDQoKDRMMCwwTFhENDREWGhUVFhUVGhkUFhUVFhQZGR0fIB8dGScnKionJzk4ODg5QEBAQEBAQEBAQAEODAwOEA4RDw8RFA4RDhQVERISERUfFRUXFRUfKB0ZGRkZHSgjJiAgICYjLCwoKCwsNzc1NzdAQEBAQEBAQEBA/8AAEQgAyACgAwEiAAIRAQMRAf/EALAAAAEFAQEAAAAAAAAAAAAAAAQAAgMFBgcBAQEAAwEBAAAAAAAAAAAAAAAAAQMEAgUQAAIBAgIEBwoLBgQGAwAAAAECAwAEEQUhMRIGQVFxsTITFGGBwdEiQlKSMzWRoeFicqKyI1NzFYJjJDQWB9KjVCbxwkNkJWXik3QRAAIBAgMFBQcDBQEAAAAAAAABAhEDIRIEMUFRcTJhwVIUBZGhsSJyEzOB0ULhYpIjUxX/2gAMAwEAAhEDEQA/AMJSpUqAVKlXuFAeUq9wpUB5XuFe4V6ooDzZHDox0CnGMinzwl7Z8NajaHeoO3vmTBZBtp9YUIqTEV5ROxHKnWRnaU8VRMhFBUjpV7hSoSeUq9pUB5Sr2lhQHlKvcK8oBV7hSFSRrtaKAZs07YNPM1pG2xJIAw1jSeandry/8X4m8VCKkWwaWwam7Xl/4v1W8VLtmX/i/VbxUoKkWwakSM407tmX/i/VbxUmzGwjQsjdY41IARie/U0IbZO0kNtCXnOCkEBeFu4KI3Bs7DNb27ya+jDx3kJeEnpJJEcQVbWDsk17u5urd591ucZkWhym2Vnd9RkCDEpFxDRpbw0bunu5mlp2De2FMLYXOD2wB2xbOeraUcYGJ72mlSUiqzzdzMd3Z3mixltA2yzcK/NlHM1DQyRXce1HocdNOEfJXZ88y9ZojOqhiBszIRiHQ8Y4cK5TvHuzLljHNMqxNoDjLFraHHnjPxcNCGVbxEUzYNTx5jZSxhpW6qTzlwJ+DCvO2Zf+L9VvFSgqyHYNLYNTdssPxfibxUu15f8Ai/VPiqCakOwa82DU/a8v/F+JvFTDdWPBL8R8VKCvYRYV5UzoMAy6QdIIqI0B4KJtxiRQwou16QoGUkntH5Tz0RbZbmF2hktraSVBo2lUkY8tDye0flPPXTslVUyiyVRsjqUOA4yMT8dW2ram2m6UVTNq9S7EIyUVJydMTn/6DnP+im9Wl+g5z/opvVrpteEhQWY4AaSTwAVf5WPiZh/9S5/zj7zltzlmYWkfWXNvJDGTgGcYDHirR7i7mSbwXParsFMrgb7w6jKw/wCmnc9I14kF3vpvCljbMyWMOJL4aEiB8qU/ObUK7HYWVrl1pFZWiCOCBQqKOLjPGTrNZZqKbUXVHq2nNwTuJRk1VpbgXN8s7Rk5ym0UQQzhIG2NAjhxHWbI+gCBVjBBFbwxwQqEiiUJGg1BVGAFe7dV28WYLYZFmF2Th1UD7JGjymGyn1iK5OyzIBGB1HgrLZhamzumQAGJwSqnSCh1q3GOCodxt4cxurdcpzuN4cyhiWaF5Bg09udUmnWw1H/jV9nFuJ7Quo+8h8peThFA+047vduyMtk7fYqTl07YFdfUufMPzT5p71UdtlmYXaGS2t3mQHAsgxANdadYJopLe4QS2867EsZ4QfCNYrCFbjdDPmgkYyWFxgVf04ifJf6ScNdRUW1XBb6FU5TjF5EpSSrGu/s5lN+g5z/opvVpfoOc/wCim9WtdHnatvObJXDW7xLGhB8nrPaY9/HCr+tEdPCVaSeDoYLnqF63lzW4/PFSW3ecxbI84VSzWUwUaSdg0DXXK5nvAipnd6qgKvWnQO7pri9ZUEmm3Vl2j1kr8pRlFRyquBNZjGxQ/S56Y1S2fu9OVueon11Szahoou06QoQUXadIVCD2FJJ7R+U89dMydv8Axdn+TH9muZye0flPPXQstlK5Tbka1gUjlC1q0vVLkeb6r+O3Tx9xcY1nt8c0NrZCyiOE1108NYjGv1joo7Js1jzKyScYLIvkzL6LDwHXVJksH9Sb49dKNq0tj1jA6uriOCL+02FWX7iVtZX1/AzaHTyeoauKn2MX9W79zebiZCuR5MjSrhfXuEtwTrUeZH+yNfdrRNcxI6IzhXlJEak6WIGJ2Rw4ChWnChndtlVBLMdQA0k1gbXNMzzDfDLs6mjaPKppJbWwJ1bOwwxw43OnHh71YT3DpfWUJmFlb5jHHDdeXBHIsrRea5TSqvxqG04cNN62vetoCS4tre5mgnkGE9q+3DKOkuI2WX6LDQRRHWDh1UCtwj7QRg2wdl8Djgw1qe7XvW0BQ3kfZ7mSLgU+T9E6RVbnuVrnWVSWqj+Lt8ZbRuHEdKPkYVcZ2MJY5fSGyeVar45+rkWQHAqccalPE5km1htWK5nK4Wnt5FuUBUwOMG4nGkA/BXUrW4S6torlOjMgcd/xVn7rLo7zKs0uEjCNeSvdwoBhgsZxX1l2j36k3Lu+uyprdj5Vs5A+i/lD48a0aaVJOPi7jB6lbzWozpjB48pf1NDXNN4vfl7+Z4BXS65pvF78vfzPAK71XTHmZ/S/yT+jvJ7L3fHytz1E+upbL+Qj5W56jfXWRnsIYKLtekKEFGWvSFQgyjk9o/Keet3YthlMP/5x9msJJ7R+U89biyb/AMXEv7gD6tadL1T+kwepRrC39ZkLDMbiwMvUHRPG0bjlGg8ore/23sxBldxfMPLupNhT8yL/AORNZbdzJ484scytxgLqJY5LZj6Q2sV5G1Vud1mjjyG0ij0NEGSZToKyhjtqw4waztuiXA3qKTbSxltfGhbZlE95ZtZqxVbgiOZhrER9ph3Svk9+pJILZ4Y4DGBFCUMKjRsGPobPFhUfW0NJmljE2xJcIrcI2vFUEln1lRXd6lrazXT9GCNpD+yNqoI7mOVduNw6nzlOIoPOUa6yye1XXcbMR5GdQ3xY0BSbj31/FcTQZirJ+q431q7anbHCTZ72Bw7lbPrKBMcBWNNgbMBBh+bsjBdni0VJ1lARZs6yWiupxCuMDy6KpS2IwOo6DTr3Mre3e5tZZVUM4ZBjqOOJoWO4jkXajcOOMHGgDISvWIrdAkKR80+TzVl908bPPL3LzxOuHdifxVfiTAg92qI/w+/8gGgSyN/mR7XPVlp0lF/3L3mbVKtu5Hjbk/8AHE2Fc03i9+Xv5ngFdKNc13i9+Xv5ngFaNV0x5nn+l/kn9HeEWXu+PlbnqJ9dS2Xu9OVueon11kZ7CGCjLXpCgxRlr0hUIPYUcntH5Tz1s8vb+Bt1/dqPirGSe0flPPWusG/g4Py15q06XqlyMWvVYQ+ruI9xJOqzO9hOto/sP8tbGOFIrmWeM7IuMDMnAXXQJOUjQeOsJk0nY96ip0CYunrjaHx1t+srPJUbXBm2LrFPikwTOb+T+VhbZxGMrDXp83x1QSy2tucJpUjPETp+Cn5/ftaRvKvtp3Kx48HG3erHMzOxZiWZtLMdJNQSbbL71Vk6yynViOkqnEEfOWtPbXi3EQkGg6mXiNckjeSJxJGxR10qw0GtxuxmvbImD4CZMFlA4fRfv0BqesqqzTMZNMEDbIHtHH2QeCiZJSqMQdOGiue53mz3czQwsRbIcNHnkec3c4qAMuriz68gTIToxwOOnlp0MjxMJYW741Gs3RVldtbygE/dMcHX/moDaxTiWNZB53B3arb8/wC+4SOF4sf/AKxU9kcBsfOGHfoUHtG/RbzY5Die5HHhXdvavqiZ9Q8Jdlq4/gbKua7xe/L38zwCuhpf2Uk/Zo50kmwJKIdogDjw1VzzeL35e/meAVp1LTgqY4nn+mRauzqmqwrjzCLL3fHytz1E+upLL+Qj5W56jfXWRnroYKLtekKEFF2vSFQg9hSSe0flPPWosm/hIfoLzVl5PaPynnrRWb/w0X0F5q06XqlyM2sVYx5gmbFre/t71NY2T+0h8VbSO5SWNJUOKSAMp7jDGspmMPaLRlXS6eWve1/FRO7WYdbZm1Y/eW/R7qHxHRXGojlm3ulid6aVbaW+OALvgCLq2Hm9WxHKWqjhj6xsK1e8dm15l4niG1LZkswGsxtrPeOmsvayBJA1VItlWjptLuTdPMo7LtjRDq9naK4+WF9IrUW7BaHOljGqVHB7w2hzVoZt87d8vaNYSLl02CcRsDEbJbj71Uu7UBkvJ7/D7q2QoDxySaAO8MTXdxRVMpRp5XZOWdF/ms7R5XdyKfKWJsO/5PhrG5XlNxmEywW6bTnTxAAcJNbGSMXkM1pjgbiNo1PziPJ+Os7u7m/6ReM00ZOgxSpqYYHT3wRXMKN4ll9zUG4bQfNshu8sZVuEA2hirA4qe/VOwwrVbzbww5mI44UKRRYkbWG0S3JWctbd7u5WFfOOLHiUdJqmaipfLsIsObhWe001lMkMVvJNjhghIALMcBxCs7fxXQmkupx1bXDswGPlaTidVaEyKNXkoo4eBV+Sq7L7Vs9zcBgeyQ4GQ/MB1crmoim2orezqcowTuSeEY48jQ7oZX2PLzdyLhNd6RjrEY6I7+uspvH78vfzPAK6UAAAFGAGgAcArmu8Xvy9/M8ArTfio24RW5nnaG67uou3H/KPuqT2X8hHytz1G+upLL3enK3PUb66ys9RDBRdr0hQgou06QqEGUkntH5Tz1e238vF9BeaqKT2j8p56vbb+Xi+gvNWjTdUuRn1XTHmTh8KrJTJlt8t1CPIY44cGnpJVjTJYkmjaN9Ib4u7V923njTethRauZJV3PaW1rfLIiXEDYg6R4VYc9CXW7thfOZbKdbGZtLW8uPVY/u3GrkNUkM9zlcxUjbhfWOA90cRq4gv4LhdqN+VToNYWmnRm9NNVWNTyHc6VWBv8wt4YeHqm6xyPmroq1Z7WGFLSxTq7WLSuPSdjrkfumq5yHXDUeA92oO2SKpVumNAaoJLMXH3myp0rpJ4uKhc3tbDM5BMri1zAj79j7KTiY8TcdBpcsith0286o+sPCagEX9Pzg4zXUCp6QYse8oouCG3tk6m1BYv05W6T+IdyolxbHDAAa2OgDlNCz3ryN2WxBd5PJMg1t81eId2ukqnLlTBbfcuY+9uJLiRcvtPvHdsHK+cfRHcHDWsyawjyy0WBcDI3lTP6TeIcFV+S5OmXx9bJg1048o8Cj0V8Jq2DVu09nL80up7OxHi+oal3P8AXB/IsZS8T/YOV65zvCcc7vfzPAK3ivWCz445zeH954BXOr6I8yfSfyz+jvCLP3fHytz1G+upLP3fHytz1E+usbPaQ0UXadIUIKLtekKhB7Ckk9o/Keer22/l4/oLzVRSe0flPPV7b/y8X0F5q0abqlyM+q6Y8yQsBTDMor1o8aiaE1pbluMqS3sbLLHIhSRQyngqukhaJ9uBjo+H5aOa3ao2t34qouRlLajTalGP8v0IY8ylXQ+PKPFU/bYXOLPge6CKia0LaxTOxHu1Q7cuBd9yPEJ7TbjXKO8CajbMIF6CNIeNvJHjqIWJ7tSpYkalqVblwIdyG+RGXur0hXYJFxal+Dhq5y3slkv3Y2pD0pTr+QUClpJRUdo9XW4OLrTHtM16cZLLWkeC7y4jvlNEpcRtw1Ux27Ci448NZrTFy3nn3IQWxlgGrDZ3pza7/M8ArZo+ArF5171uvp+CqdV0R5l/psUrs2vB3hdl7vTlbnqJ9dS2Xu+PlbnqJ9dY2eshooq16QoQUXa9IVCD2FLJ7RuU89WNtmUSQqkgYMgw0accKrpPaPynnrZWG4Vi+VWmY5tnMWXG+XrIYnA0rhj0mdcTgdNdwnKDqjmduM1SRR/qlr8/4KX6pa8T/BVzDuLZXudRZblmbxXcPUNPc3KqCIwrbOzgrHEnHjoyD+3eSXkht7DeKG4umDGOJVUklfouThXfmbnZ7Cvy1vt9pmv1W1+d8FL9VteJvgq5yrcOGfLmzHN80iyyETPbptAEFo2ZG8pmUa1OFNn3Ky6W/sbDKM5hv5bx2WTZA+7RF2y52WOPJTzE+z2Dy1vt9pT/AKpacTerS/U7Tib1a04/t7kDXPY03jhN0W6sQ7K7W3q2dnrMccaDy/8At80kuZfqWYxWNtlcvUPPhiGYhWDeUy7IwYU8xPs9g8tb7faUn6pacTerTxm9oOBvVq3v9z927aynuId44LiWKNnjhAXF2UYhRg516qpsryjLr21665zFLSTaK9U2GOA87SwqY37knRU+BzOzags0s1Oyr+BKM6sxwP6tSDPLMen6vy0rvdm3Sxlu7K/S7WDDrFUDUTxgnTU826eXW7KlxmqQuwDBXUKcD+1Xee/wXuKX5XDGWLapSVcOyhEM/seJ/V+WnjeGx4pPV+Wkm6kKZlFay3Jlt7iFpYZY8ASVK6DjtDDA0f8A0Tl340/1f8Ndx8xJVWXB0KbktFFpNzdVXAC/qOwA0CQni2flrO3Vwbm5lnI2TKxbDirX/wBE5d+NcfV/wVR7xZPa5U9utvI8nWhmbbw0YEAYYAVxfhfy5rlKR4Fulu6X7mW1mzT8S4Yis/5CPlbnqJ9dSWfu9OVueon11mZvQ2i7XpChKKtekKhBlNJ7R+U89bDfGTb3a3ZX0Lcj6kdY+T2j8p560288m1kWQr6MJ+ylSAr+2cnV5renjs3H1loX+3j9XvbbtxLN9lqW4UnV5jdnjtXHxihtyZNjeSBu5J9k1BJe7xy7W5CJ/wCzuD/mTVTf2+fq97LJuLrPsNRueS7W6aJ/38x+vLVXuY+xvHaNxbf2GoCezf8A36j/APsSf8w1sLnqczTefJluYoLm5uo5F61sBshItP1cNFYe1f8A3ir/APfE/wCZUe9bB94r5jwuPsrQFhmG4l/Z2M17HdW90tuu3IkTHaCjWdIw0VVZdks9/C06yJFEp2dp+E1bbqybGTZ8vpQD7L1XRv8A7blT96Oda7tpNuuNE37Cq9KSisjyuUoxrStKllHbLlWTXsMs8chuSuwEPDqwoLe5y+YRE/gLzmqRekvKKtd4327yM/ulHxmrHJStySWVRyrjxKI2XC/CTlnlPPKTpTdFbP0L1bgrf5Lp0G3dPhQHwV0S1lzBsns3sESR8Crh9WAJGjSOKuU3E+zdZQ3oJh8IArdZXFDmOTpHa3i2+YrI2KtKy4ricBsBuHHgFXSo440+Wa2qqxjvM9uMoy+WvzWpLCWWWE28HxL6e43ojgkeSCBY1Ri5BGIUDT51cl3vm276BBqSEH4WbxV0tlkyXJcxTMb+OW6uY9mGHrCzDQwwAbTp2uKuTZ9N1uYsfRRR8WPhrm419mSSjRyiqxVK7y23B/ftuTm2oSdJyzNVw3BFn7vTlbnqF9dS2fu9OVueon11lZuQ2iLdsGFD05H2dNQGV0ntG5Tz1dWm9N1b2kVq8EVwsI2UaQaQOKhmitZGLOmk68DhSFvY+gfWNSAg7z3Qvo7yKCKIohiaNR5LKxx8qpxvjcqS0VpbxvwOAcRQPZ7D0G9Y0uz2HoH1jUCpLY7zXlpbm3eKO5QuzjrBqZji3x17PvNcyT288VvDBJbMWUovS2hslW7mFQ9nsPQPrGl2ew9A+saCod/WNxtbYsrfb17WBxx5ddD2281xC88klvDcSXEnWuzrqOGGC9zRUPZ7D0G9Y0uzWHoH1jQVCLreq6ntZbaO3it1mGy7RjTs1X2mYy20ZiCq8ZOODcdEdmsPQb1jS7PYegfWNdJuLqnQiSUlRqpFLmryxtH1Ma7Qw2gNNPOdSt0oI27p007s9h6B9Y0uz2HoH1jXX3Z+I4+1b8IJdX89xLHKQFMXQUahpxoiPN5P+onfU+A0/s9h6DesaXZ7D0D6xpG7OLbUtu0StW5JJx2bBsmbtiSiEk+cxoCWWSaVpZOk2vDVo0VYdnsPQb1jSNvZcCH1jSd2c+p1XAmFqEOmOPEfaH+BQd1ueo211IzrgFUYKNAAqI1WztCpUqVCRUqVKgFSpUqAVKlSoBUqVKgFSpUqAVKlSoBUqVKgFSpUqAVKlSoD/9k="; diff --git a/cocos2d/core/sprites/CCAnimation.js b/cocos2d/core/sprites/CCAnimation.js index 41ac829eb9..1c653a0bea 100644 --- a/cocos2d/core/sprites/CCAnimation.js +++ b/cocos2d/core/sprites/CCAnimation.js @@ -1,7 +1,7 @@ /**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2008-2010 Ricardo Quesada - Copyright (c) 2011 Zynga Inc. + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -34,26 +34,44 @@ * * @class * @extends cc.Class + * @param spriteFrame + * @param delayUnits + * @param userInfo + * @returns {AnimationFrame} */ cc.AnimationFrame = cc.Class.extend(/** @lends cc.AnimationFrame# */{ _spriteFrame:null, _delayPerUnit:0, _userInfo:null, - ctor:function () { - this._delayPerUnit = 0; + ctor:function (spriteFrame, delayUnits, userInfo) { + this._spriteFrame = spriteFrame || null; + this._delayPerUnit = delayUnits || 0; + this._userInfo = userInfo || null; }, + /** + * Create a new animation frame and copy all contents into it + * @returns {AnimationFrame} + */ clone: function(){ var frame = new cc.AnimationFrame(); frame.initWithSpriteFrame(this._spriteFrame.clone(), this._delayPerUnit, this._userInfo); return frame; }, + /** + * Create a new animation frame and copy all contents into it + * @returns {AnimationFrame} + */ copyWithZone:function (pZone) { return cc.clone(this); }, + /** + * Create a new animation frame and copy all contents into it + * @returns {AnimationFrame} + */ copy:function (pZone) { var newFrame = new cc.AnimationFrame(); newFrame.initWithSpriteFrame(this._spriteFrame.clone(), this._delayPerUnit, this._userInfo); @@ -75,7 +93,7 @@ cc.AnimationFrame = cc.Class.extend(/** @lends cc.AnimationFrame# */{ }, /** - * cc.SpriteFrameName to be used + * Returns sprite frame to be used * @return {cc.SpriteFrame} */ getSpriteFrame:function () { @@ -83,7 +101,7 @@ cc.AnimationFrame = cc.Class.extend(/** @lends cc.AnimationFrame# */{ }, /** - * cc.SpriteFrameName to be used + * Sets sprite frame to be used * @param {cc.SpriteFrame} spriteFrame */ setSpriteFrame:function (spriteFrame) { @@ -91,7 +109,7 @@ cc.AnimationFrame = cc.Class.extend(/** @lends cc.AnimationFrame# */{ }, /** - * how many units of time the frame takes getter + * Returns how many units of time the frame takes getter * @return {Number} */ getDelayUnits:function () { @@ -99,7 +117,7 @@ cc.AnimationFrame = cc.Class.extend(/** @lends cc.AnimationFrame# */{ }, /** - * how many units of time the frame takes setter + * Sets how many units of time the frame takes setter * @param delayUnits */ setDelayUnits:function (delayUnits) { @@ -107,8 +125,7 @@ cc.AnimationFrame = cc.Class.extend(/** @lends cc.AnimationFrame# */{ }, /** - *A cc.AnimationFrameDisplayedNotification notification will be broadcasted when the frame is displayed with this dictionary as UserInfo.
- * If UserInfo is nil, then no notification will be broadcasted.
* A cc.Animation object is used to perform animations on the cc.Sprite objects.
*
* The cc.Animation object contains cc.SpriteFrame objects, and a possible delay between the frames.
- * You can animate a cc.Animation object by using the cc.Animate action. Example:
+ * You can animate a cc.Animation object by using the cc.Animate action.
*
Currently JavaScript Bindings (JSB), in some cases, needs to use retain and release. This is a bug in JSB,
* and the ugly workaround is to use retain/release. So, these 2 methods were added to be compatible with JSB.
- * This is a hack, and should be removed once JSB fixes the retain/release bug
+ * This is a hack, and should be removed once JSB fixes the retain/release bug
+ * You will need to retain an object if you created an engine object and haven't added it into the scene graph during the same frame.
+ * Otherwise, JSB's native autorelease pool will consider this object a useless one and release it directly,
+ * when you want to use it later, a "Invalid Native Object" error will be raised.
+ * The retain function can increase a reference count for the native object to avoid it being released,
+ * you need to manually invoke release function when you think this object is no longer needed, otherwise, there will be memory learks.
+ * retain and release function call should be paired in developer's game code.
Currently JavaScript Bindings (JSB), in some cases, needs to use retain and release. This is a bug in JSB,
+ * and the ugly workaround is to use retain/release. So, these 2 methods were added to be compatible with JSB.
+ * This is a hack, and should be removed once JSB fixes the retain/release bug
+ * You will need to retain an object if you created an engine object and haven't added it into the scene graph during the same frame.
+ * Otherwise, JSB's native autorelease pool will consider this object a useless one and release it directly,
+ * when you want to use it later, a "Invalid Native Object" error will be raised.
+ * The retain function can increase a reference count for the native object to avoid it being released,
+ * you need to manually invoke release function when you think this object is no longer needed, otherwise, there will be memory learks.
+ * retain and release function call should be paired in developer's game code.
- * Singleton that manages the Animations.
+ * cc.animationCache is a singleton object that manages the Animations.
* It saves in a cache the animations. You should use this class if you want to save your animations in a cache.
*
* example
* cc.animationCache.addAnimation(animation,"animation1");
*
- * Adds an animation from an NSDictionary
- * Make sure that the frames were previously loaded in the cc.SpriteFrameCache.
- *
- * Adds an animation from a plist file.
+ * Adds an animations from a plist file.
* Make sure that the frames were previously loaded in the cc.SpriteFrameCache.
*
cc.Sprite is a 2d image ( http://en.wikipedia.org/wiki/Sprite_(computer_graphics) )
*
@@ -240,11 +47,33 @@ cc.cutRotateImageToCanvas = function (texture, rect) {
*
* The default anchorPoint in cc.Sprite is (0.5, 0.5).
+ * Please pass parameters to the constructor to initialize the sprite, do not call this function yourself, * @param {cc.SpriteFrame} spriteFrame A CCSpriteFrame object. It should includes a valid texture and a rect * @return {Boolean} true if the sprite is initialized properly, false otherwise. - * @example - * var spriteFrame = cc.spriteFrameCache.getSpriteFrame("grossini_dance_01.png"); - * var sprite = new cc.Sprite(); - * sprite.initWithSpriteFrame(spriteFrame); */ initWithSpriteFrame:function (spriteFrame) { - cc.assert(spriteFrame, cc._LogInfos.Sprite_initWithSpriteFrame); if(!spriteFrame.textureLoaded()){ //add event listener this._textureLoaded = false; - spriteFrame.addLoadedEventListener(this._spriteFrameLoadedCallback, this); + spriteFrame.addEventListener("load", this._renderCmd._spriteFrameLoadedCallback, this); } - var ret = this.initWithTexture(spriteFrame.getTexture(), spriteFrame.getRect()); + + //TODO + var rotated = cc._renderType === cc._RENDER_TYPE_CANVAS ? false : spriteFrame._rotated; + var ret = this.initWithTexture(spriteFrame.getTexture(), spriteFrame.getRect(), rotated); this.setSpriteFrame(spriteFrame); return ret; }, - _spriteFrameLoadedCallback:null, - /** * Initializes a sprite with a sprite frame name.
* A cc.SpriteFrame will be fetched from the cc.SpriteFrameCache by name.
* If the cc.SpriteFrame doesn't exist it will raise an exception.
- * @param {String} spriteFrameName A key string that can fected a volid cc.SpriteFrame from cc.SpriteFrameCache + * Please pass parameters to the constructor to initialize the sprite, do not call this function yourself. + * @param {String} spriteFrameName A key string that can fected a valid cc.SpriteFrame from cc.SpriteFrameCache * @return {Boolean} true if the sprite is initialized properly, false otherwise. * @example * var sprite = new cc.Sprite(); * sprite.initWithSpriteFrameName("grossini_dance_01.png"); */ initWithSpriteFrameName:function (spriteFrameName) { - - cc.assert(cc._LogInfos.Sprite_initWithSpriteFrameName); - + cc.assert(spriteFrameName, cc._LogInfos.Sprite_initWithSpriteFrameName); var frame = cc.spriteFrameCache.getSpriteFrame(spriteFrameName); + cc.assert(frame, spriteFrameName + cc._LogInfos.Sprite_initWithSpriteFrameName1); return this.initWithSpriteFrame(frame); }, /** - * tell the sprite to use batch node render. + * Tell the sprite to use batch node render. * @param {cc.SpriteBatchNode} batchNode */ useBatchNode:function (batchNode) { - this.textureAtlas = batchNode.textureAtlas; // weak ref + this.textureAtlas = batchNode.getTextureAtlas(); // weak ref this._batchNode = batchNode; }, @@ -471,35 +299,49 @@ cc.Sprite = cc.NodeRGBA.extend(/** @lends cc.Sprite# */{ * @param {cc.Rect} rect */ setVertexRect:function (rect) { - this._rect.x = rect.x; - this._rect.y = rect.y; - this._rect.width = rect.width; - this._rect.height = rect.height; + var locRect = this._rect; + locRect.x = rect.x; + locRect.y = rect.y; + locRect.width = rect.width; + locRect.height = rect.height; }, + /** + * Sort all children of this sprite node. + * @override + */ sortAllChildren:function () { if (this._reorderChildDirty) { - var j, tempItem, locChildren = this._children, tempChild; - for (var i = 1; i < locChildren.length; i++) { - tempItem = locChildren[i]; + var _children = this._children; + + // insertion sort + var len = _children.length, i, j, tmp; + for(i=1; i
- * Returns the flag which indicates whether the sprite is flipped horizontally or not.
+ * Returns the flag which indicates whether the sprite is flipped horizontally or not.
*
* It only flips the texture of the sprite, and not the texture of the sprite's children.
* Also, flipping the texture doesn't alter the anchorPoint.
* If you want to flip the anchorPoint too, and/or to flip the children too use:
- * sprite->setScaleX(sprite->getScaleX() * -1);
* Also, flipping the texture doesn't alter the anchorPoint.
* If you want to flip the anchorPoint too, and/or to flip the children too use:
- * sprite->setScaleY(sprite->getScaleY() * -1); - * @return {Boolean} true if the sprite is flipped vertically, flase otherwise. + * sprite.setScaleY(sprite.getScaleY() * -1); + * @return {Boolean} true if the sprite is flipped vertically, false otherwise. */ isFlippedY:function () { return this._flippedY; @@ -662,32 +478,34 @@ cc.Sprite = cc.NodeRGBA.extend(/** @lends cc.Sprite# */{ // RGBA protocol // /** - * opacity: conforms to CCRGBAProtocol protocol + * Sets whether opacity modify color or not. * @function * @param {Boolean} modify */ - setOpacityModifyRGB:null, + setOpacityModifyRGB: function (modify) { + if (this._opacityModifyRGB !== modify) { + this._opacityModifyRGB = modify; + this._renderCmd._setColorDirty(); + } + }, /** - * return IsOpacityModifyRGB value + * Returns whether opacity modify color or not. * @return {Boolean} */ isOpacityModifyRGB:function () { return this._opacityModifyRGB; }, - updateDisplayedOpacity: null, - // Animation /** - * changes the display frame with animation name and index.
+ * Changes the display frame with animation name and index.
* The animation name will be get from the CCAnimationCache - * @param animationName - * @param frameIndex + * @param {String} animationName + * @param {Number} frameIndex */ setDisplayFrameWithAnimationName:function (animationName, frameIndex) { - cc.assert(animationName, cc._LogInfos.Sprite_setDisplayFrameWithAnimationName_3); var cache = cc.animationCache.getAnimation(animationName); @@ -716,7 +534,7 @@ cc.Sprite = cc.NodeRGBA.extend(/** @lends cc.Sprite# */{ if (!this._reorderChildDirty) { this._reorderChildDirty = true; var pNode = this._parent; - while (pNode && pNode != this._batchNode) { + while (pNode && pNode !== this._batchNode) { pNode._setReorderChildDirtyRecursively(); pNode = pNode.parent; } @@ -724,45 +542,34 @@ cc.Sprite = cc.NodeRGBA.extend(/** @lends cc.Sprite# */{ }, // CCTextureProtocol + /** + * Returns the texture of the sprite node + * @returns {cc.Texture2D} + */ getTexture:function () { return this._texture; }, - _quad:null, // vertex coords, texture coords and color info - _quadWebBuffer:null, - _quadDirty:false, - _colorized:false, - _isLighterMode:false, - _originalTexture:null, - _textureRect_Canvas:null, - _drawSize_Canvas:null, - - /** - * Constructor - * @function - * @param {String|cc.SpriteFrame|cc.SpriteBatchNode|HTMLImageElement|cc.Texture2D} fileName sprite construct parameter - * @param {cc.Rect} rect Only the contents inside rect of pszFileName's texture will be applied for this sprite. - */ - ctor: null, - - _softInit: function (fileName, rect) { + _softInit: function (fileName, rect, rotated) { if (fileName === undefined) cc.Sprite.prototype.init.call(this); - else if (typeof(fileName) === "string") { + else if (cc.isString(fileName)) { if (fileName[0] === "#") { // Init with a sprite frame name var frameName = fileName.substr(1, fileName.length - 1); var spriteFrame = cc.spriteFrameCache.getSpriteFrame(frameName); - this.initWithSpriteFrame(spriteFrame); + if (spriteFrame) + this.initWithSpriteFrame(spriteFrame); + else + cc.log("%s does not exist", fileName); } else { // Init with filename and rect cc.Sprite.prototype.init.call(this, fileName, rect); } - } - else if (typeof(fileName) === "object") { + } else if (typeof fileName === "object") { if (fileName instanceof cc.Texture2D) { // Init with texture and rect - this.initWithTexture(fileName, rect); + this.initWithTexture(fileName, rect, rotated); } else if (fileName instanceof cc.SpriteFrame) { // Init with a sprite frame this.initWithSpriteFrame(fileName); @@ -778,10 +585,10 @@ cc.Sprite = cc.NodeRGBA.extend(/** @lends cc.Sprite# */{ /** * Returns the quad (tex coords, vertex coords and color) information. - * @return {cc.V3F_C4B_T2F_Quad} + * @return {cc.V3F_C4B_T2F_Quad|null} Returns a cc.V3F_C4B_T2F_Quad object when render mode is WebGL, returns null when render mode is Canvas. */ getQuad:function () { - return this._quad; + return this._renderCmd.getQuad(); }, /** @@ -790,149 +597,267 @@ cc.Sprite = cc.NodeRGBA.extend(/** @lends cc.Sprite# */{ * @param {Number|cc.BlendFunc} src * @param {Number} dst */ - setBlendFunc: null, + setBlendFunc: function (src, dst) { + var locBlendFunc = this._blendFunc; + if (dst === undefined) { + locBlendFunc.src = src.src; + locBlendFunc.dst = src.dst; + } else { + locBlendFunc.src = src; + locBlendFunc.dst = dst; + } + this._renderCmd.updateBlendFunc(locBlendFunc); + }, /** - * Initializes an empty sprite with nothing init. + * Initializes an empty sprite with nothing init.
+ * Please pass parameters to the constructor to initialize the sprite, do not call this function yourself. * @function * @return {Boolean} */ - init:null, + init: function () { + var _t = this; + if (arguments.length > 0) + return _t.initWithFile(arguments[0], arguments[1]); + + cc.Node.prototype.init.call(_t); + _t.dirty = _t._recursiveDirty = false; + + _t._blendFunc.src = cc.BLEND_SRC; + _t._blendFunc.dst = cc.BLEND_DST; + + _t.texture = null; + _t._flippedX = _t._flippedY = false; + + // default transform anchor: center + _t.anchorX = 0.5; + _t.anchorY = 0.5; + + // zwoptex default values + _t._offsetPosition.x = 0; + _t._offsetPosition.y = 0; + _t._hasChildren = false; + + this._renderCmd._init(); + // updated in "useSelfRender" + // Atlas: TexCoords + _t.setTextureRect(cc.rect(0, 0, 0, 0), false, cc.size(0, 0)); + return true; + }, /** *
- * Initializes a sprite with an image filename.
+ * Initializes a sprite with an image filename.
*
- * This method will find pszFilename from local file system, load its content to CCTexture2D,
- * then use CCTexture2D to create a sprite.
- * After initialization, the rect used will be the size of the image. The offset will be (0,0).
+ * This method will find pszFilename from local file system, load its content to CCTexture2D,
+ * then use CCTexture2D to create a sprite.
+ * After initialization, the rect used will be the size of the image. The offset will be (0,0).
+ * Please pass parameters to the constructor to initialize the sprite, do not call this function yourself.
*
- * After initialization, the rect used will be the size of the texture, and the offset will be (0,0). + * After initialization, the rect used will be the size of the texture, and the offset will be (0,0).
+ * Please pass parameters to the constructor to initialize the sprite, do not call this function yourself. * @function * @param {cc.Texture2D|HTMLImageElement|HTMLCanvasElement} texture A pointer to an existing CCTexture2D object. You can use a CCTexture2D object for many sprites. - * @param {cc.Rect} rect Only the contents inside rect of this texture will be applied for this sprite. + * @param {cc.Rect} [rect] Only the contents inside rect of this texture will be applied for this sprite. * @param {Boolean} [rotated] Whether or not the texture rectangle is rotated. + * @param {Boolean} [counterclockwise=true] Whether or not the texture rectangle rotation is counterclockwise (texture package is counterclockwise, spine is clockwise). * @return {Boolean} true if the sprite is initialized properly, false otherwise. - * @example - * var img =cc.textureCache.addImage("HelloHTML5World.png"); - * var mySprite = new cc.Sprite(); - * mySprite.initWithTexture(img,cc.rect(0,0,480,320)); */ - initWithTexture: null, + initWithTexture: function (texture, rect, rotated, counterclockwise) { + var _t = this; + cc.assert(arguments.length !== 0, cc._LogInfos.CCSpriteBatchNode_initWithTexture); + + rotated = rotated || false; + texture = this._renderCmd._handleTextureForRotatedTexture(texture, rect, rotated, counterclockwise); + + if (!cc.Node.prototype.init.call(_t)) + return false; + + _t._batchNode = null; + _t._recursiveDirty = false; + _t.dirty = false; + _t._opacityModifyRGB = true; + + _t._blendFunc.src = cc.BLEND_SRC; + _t._blendFunc.dst = cc.BLEND_DST; + + _t._flippedX = _t._flippedY = false; + + // default transform anchor: center + _t.setAnchorPoint(0.5, 0.5); + + // zwoptex default values + _t._offsetPosition.x = 0; + _t._offsetPosition.y = 0; + _t._hasChildren = false; + + this._renderCmd._init(); + + var locTextureLoaded = texture.isLoaded(); + _t._textureLoaded = locTextureLoaded; + + if (!locTextureLoaded) { + _t._rectRotated = rotated; + if (rect) { + _t._rect.x = rect.x; + _t._rect.y = rect.y; + _t._rect.width = rect.width; + _t._rect.height = rect.height; + } + if(_t.texture) + _t.texture.removeEventListener("load", _t); + texture.addEventListener("load", _t._renderCmd._textureLoadedCallback, _t); + _t.texture = texture; + return true; + } + + if (!rect) + rect = cc.rect(0, 0, texture.width, texture.height); + + this._renderCmd._checkTextureBoundary(texture, rect, rotated); + + _t.texture = texture; + _t.setTextureRect(rect, rotated); - _textureLoadedCallback: null, + // by default use "Self Render". + // if the sprite is added to a batchnode, then it will automatically switch to "batchnode Render" + _t.setBatchNode(null); + return true; + }, /** - * updates the texture rect of the CCSprite in points. + * Updates the texture rect of the CCSprite in points. * @function * @param {cc.Rect} rect a rect of texture - * @param {Boolean} rotated - * @param {cc.Size} untrimmedSize + * @param {Boolean} [rotated] Whether or not the texture is rotated + * @param {cc.Size} [untrimmedSize] The original pixels size of the texture */ - setTextureRect:null, + setTextureRect: function (rect, rotated, untrimmedSize, needConvert) { + var _t = this; + _t._rectRotated = rotated || false; + _t.setContentSize(untrimmedSize || rect); + + _t.setVertexRect(rect); + _t._renderCmd._setTextureCoords(rect, needConvert); + + var relativeOffsetX = _t._unflippedOffsetPositionFromCenter.x, relativeOffsetY = _t._unflippedOffsetPositionFromCenter.y; + if (_t._flippedX) + relativeOffsetX = -relativeOffsetX; + if (_t._flippedY) + relativeOffsetY = -relativeOffsetY; + var locRect = _t._rect; + _t._offsetPosition.x = relativeOffsetX + (_t._contentSize.width - locRect.width) / 2; + _t._offsetPosition.y = relativeOffsetY + (_t._contentSize.height - locRect.height) / 2; + + // rendering using batch node + if (_t._batchNode) { + // update dirty, don't update _recursiveDirty + _t.dirty = true; + } else { + // self rendering + // Atlas: Vertex + this._renderCmd._resetForBatchNode(); + } + }, // BatchNode methods /** - * updates the quad according the the rotation, position, scale values. + * Updates the quad according the the rotation, position, scale values. * @function */ - updateTransform: null, + updateTransform: function(){ + this._renderCmd.updateTransform(); + }, /** - * Add child to sprite (override cc.Node ) + * Add child to sprite (override cc.Node) * @function * @param {cc.Sprite} child * @param {Number} localZOrder child's zOrder - * @param {String} tag child's tag + * @param {String} [tag] child's tag * @override */ - addChild: null, + addChild: function (child, localZOrder, tag) { + cc.assert(child, cc._LogInfos.CCSpriteBatchNode_addChild_2); - /** - * Update sprite's color - */ - updateColor:function () { - var locDisplayedColor = this._displayedColor, locDisplayedOpacity = this._displayedOpacity; - var color4 = {r: locDisplayedColor.r, g: locDisplayedColor.g, b: locDisplayedColor.b, a: locDisplayedOpacity}; - // special opacity for premultiplied textures - if (this._opacityModifyRGB) { - color4.r *= locDisplayedOpacity / 255.0; - color4.g *= locDisplayedOpacity / 255.0; - color4.b *= locDisplayedOpacity / 255.0; - } - var locQuad = this._quad; - locQuad.bl.colors = color4; - locQuad.br.colors = color4; - locQuad.tl.colors = color4; - locQuad.tr.colors = color4; - - // renders using Sprite Manager - if (this._batchNode) { - if (this.atlasIndex != cc.Sprite.INDEX_NOT_INITIALIZED) { - this.textureAtlas.updateQuad(locQuad, this.atlasIndex) - } else { - // no need to set it recursively - // update dirty_, don't update recursiveDirty_ - this.dirty = true; - } + if (localZOrder == null) + localZOrder = child._localZOrder; + if (tag == null) + tag = child.tag; + + if(this._renderCmd._setBatchNodeForAddChild(child)){ + //cc.Node already sets isReorderChildDirty_ so this needs to be after batchNode check + cc.Node.prototype.addChild.call(this, child, localZOrder, tag); + this._hasChildren = true; } - // self render - // do nothing - this._quadDirty = true; }, - /** - * Opacity setter - * @function - * @param {Number} opacity - */ - setOpacity:null, - - /** - * Color setter - * @function - * @param {cc.Color} color3 - */ - setColor: null, - - updateDisplayedColor: null, - // Frames /** - * Sets a new spriteFrame to the cc.Sprite. + * Sets a new sprite frame to the sprite. * @function * @param {cc.SpriteFrame|String} newFrame */ - setSpriteFrame: null, + setSpriteFrame: function (newFrame) { + var _t = this; + if(cc.isString(newFrame)){ + newFrame = cc.spriteFrameCache.getSpriteFrame(newFrame); + cc.assert(newFrame, cc._LogInfos.Sprite_setSpriteFrame) + } - /** - * Sets a new display frame to the cc.Sprite. + this.setNodeDirty(true); + + var frameOffset = newFrame.getOffset(); + _t._unflippedOffsetPositionFromCenter.x = frameOffset.x; + _t._unflippedOffsetPositionFromCenter.y = frameOffset.y; + + // update rect + var pNewTexture = newFrame.getTexture(); + var locTextureLoaded = newFrame.textureLoaded(); + if (!locTextureLoaded) { + _t._textureLoaded = false; + newFrame.addEventListener("load", function (sender) { + _t._textureLoaded = true; + var locNewTexture = sender.getTexture(); + if (locNewTexture !== _t._texture) + _t.texture = locNewTexture; + _t.setTextureRect(sender.getRect(), sender.isRotated(), sender.getOriginalSize()); + _t.dispatchEvent("load"); + _t.setColor(_t.color); + }, _t); + }else{ + // update texture before updating texture rect + if (pNewTexture !== _t._texture) + _t.texture = pNewTexture; + _t.setTextureRect(newFrame.getRect(), newFrame.isRotated(), newFrame.getOriginalSize()); + } + this._renderCmd._updateForSetSpriteFrame(pNewTexture); + }, + + /** + * Sets a new display frame to the sprite. * @param {cc.SpriteFrame|String} newFrame * @deprecated */ @@ -947,14 +872,25 @@ cc.Sprite = cc.NodeRGBA.extend(/** @lends cc.Sprite# */{ * @param {cc.SpriteFrame} frame * @return {Boolean} */ - isFrameDisplayed: null, + isFrameDisplayed: function(frame){ + return this._renderCmd.isFrameDisplayed(frame); + }, /** * Returns the current displayed frame. + * @deprecated since 3.4, please use getSpriteFrame instead * @return {cc.SpriteFrame} */ displayFrame: function () { - return cc.SpriteFrame.create(this._texture, + return this.getSpriteFrame(); + }, + + /** + * Returns the current displayed frame. + * @return {cc.SpriteFrame} + */ + getSpriteFrame: function () { + return new cc.SpriteFrame(this._texture, cc.rectPointsToPixels(this._rect), this._rectRotated, cc.pointPointsToPixels(this._unflippedOffsetPositionFromCenter), @@ -966,636 +902,141 @@ cc.Sprite = cc.NodeRGBA.extend(/** @lends cc.Sprite# */{ * @function * @param {cc.SpriteBatchNode|null} spriteBatchNode * @example - * var batch = cc.SpriteBatchNode.create("Images/grossini_dance_atlas.png", 15); - * var sprite = cc.Sprite.create(batch.texture, cc.rect(0, 0, 57, 57)); + * var batch = new cc.SpriteBatchNode("Images/grossini_dance_atlas.png", 15); + * var sprite = new cc.Sprite(batch.texture, cc.rect(0, 0, 57, 57)); * batch.addChild(sprite); * layer.addChild(batch); */ - setBatchNode:null, + setBatchNode:function (spriteBatchNode) { + var _t = this; + _t._batchNode = spriteBatchNode; // weak reference + + // self render + if (!_t._batchNode) { + _t.atlasIndex = cc.Sprite.INDEX_NOT_INITIALIZED; + _t.textureAtlas = null; + _t._recursiveDirty = false; + _t.dirty = false; + + this._renderCmd._resetForBatchNode(); + } else { + // using batch + _t._transformToBatch = cc.affineTransformIdentity(); + _t.textureAtlas = _t._batchNode.getTextureAtlas(); // weak ref + } + }, // CCTextureProtocol /** - * Texture of sprite setter + * Sets the texture of sprite * @function * @param {cc.Texture2D|String} texture */ - setTexture: null, + setTexture: function (texture) { + if(!texture) + return this._renderCmd._setTexture(null); - // Texture protocol - _updateBlendFunc:function () { - if(this._batchNode){ - cc.log(cc._LogInfos.Sprite__updateBlendFunc); - return; - } + if(cc.isString(texture)){ + texture = cc.textureCache.addImage(texture); - // it's possible to have an untextured sprite - if (!this._texture || !this._texture.hasPremultipliedAlpha()) { - this._blendFunc.src = cc.SRC_ALPHA; - this._blendFunc.dst = cc.ONE_MINUS_SRC_ALPHA; - this.opacityModifyRGB = false; - } else { - this._blendFunc.src = cc.BLEND_SRC; - this._blendFunc.dst = cc.BLEND_DST; - this.opacityModifyRGB = true; + if(!texture._textureLoaded){ + texture.addEventListener("load", function(){ + this._clearRect(); + this._renderCmd._setTexture(texture); + this._changeRectWithTexture(texture.getContentSize()); + this.setColor(this._realColor); + this._textureLoaded = true; + }, this); + }else{ + this._clearRect(); + this._renderCmd._setTexture(texture); + this._changeRectWithTexture(texture.getContentSize()); + this.setColor(this._realColor); + this._textureLoaded = true; + } + }else{ + // CCSprite: setTexture doesn't work when the sprite is rendered using a CCSpriteSheet + cc.assert(texture instanceof cc.Texture2D, cc._LogInfos.Sprite_setTexture_2); + this._clearRect(); + this._changeRectWithTexture(texture.getContentSize()); + this._renderCmd._setTexture(texture); } }, - _changeTextureColor: function () { - var locElement, locTexture = this._texture, locRect = this._textureRect_Canvas; //this.getTextureRect(); - if (locTexture && locRect.validRect && this._originalTexture) { - locElement = locTexture.getHtmlElementObj(); - if (!locElement) - return; - - var cacheTextureForColor = cc.textureCache.getTextureColors(this._originalTexture.getHtmlElementObj()); - if (cacheTextureForColor) { - this._colorized = true; - //generate color texture cache - if (locElement instanceof HTMLCanvasElement && !this._rectRotated && !this._newTextureWhenChangeColor) - cc.generateTintImage(locElement, cacheTextureForColor, this._displayedColor, locRect, locElement); - else { - locElement = cc.generateTintImage(locElement, cacheTextureForColor, this._displayedColor, locRect); - locTexture = new cc.Texture2D(); - locTexture.initWithElement(locElement); - locTexture.handleLoadedTexture(); - this.texture = locTexture; - } - } + _clearRect: function(){ + var texture = this._texture; + if(texture){ + var textureRect = texture._contentSize; + var spriteRect = this._rect; + if( + textureRect.width === spriteRect.width && + textureRect.height === spriteRect.height + ) + spriteRect.width = spriteRect.height = 0; } }, - _setTextureCoords:function (rect) { - rect = cc.rectPointsToPixels(rect); - - var tex = this._batchNode ? this.textureAtlas.texture : this._texture; - if (!tex) - return; - - var atlasWidth = tex.pixelsWidth; - var atlasHeight = tex.pixelsHeight; - - var left, right, top, bottom, tempSwap, locQuad = this._quad; - if (this._rectRotated) { - if (cc.FIX_ARTIFACTS_BY_STRECHING_TEXEL) { - left = (2 * rect.x + 1) / (2 * atlasWidth); - right = left + (rect.height * 2 - 2) / (2 * atlasWidth); - top = (2 * rect.y + 1) / (2 * atlasHeight); - bottom = top + (rect.width * 2 - 2) / (2 * atlasHeight); - } else { - left = rect.x / atlasWidth; - right = (rect.x + rect.height) / atlasWidth; - top = rect.y / atlasHeight; - bottom = (rect.y + rect.width) / atlasHeight; - }// CC_FIX_ARTIFACTS_BY_STRECHING_TEXEL - - if (this._flippedX) { - tempSwap = top; - top = bottom; - bottom = tempSwap; - } - - if (this._flippedY) { - tempSwap = left; - left = right; - right = tempSwap; - } - - locQuad.bl.texCoords.u = left; - locQuad.bl.texCoords.v = top; - locQuad.br.texCoords.u = left; - locQuad.br.texCoords.v = bottom; - locQuad.tl.texCoords.u = right; - locQuad.tl.texCoords.v = top; - locQuad.tr.texCoords.u = right; - locQuad.tr.texCoords.v = bottom; - } else { - if (cc.FIX_ARTIFACTS_BY_STRECHING_TEXEL) { - left = (2 * rect.x + 1) / (2 * atlasWidth); - right = left + (rect.width * 2 - 2) / (2 * atlasWidth); - top = (2 * rect.y + 1) / (2 * atlasHeight); - bottom = top + (rect.height * 2 - 2) / (2 * atlasHeight); - } else { - left = rect.x / atlasWidth; - right = (rect.x + rect.width) / atlasWidth; - top = rect.y / atlasHeight; - bottom = (rect.y + rect.height) / atlasHeight; - } // ! CC_FIX_ARTIFACTS_BY_STRECHING_TEXEL - - if (this._flippedX) { - tempSwap = left; - left = right; - right = tempSwap; - } - - if (this._flippedY) { - tempSwap = top; - top = bottom; - bottom = tempSwap; - } - - locQuad.bl.texCoords.u = left; - locQuad.bl.texCoords.v = bottom; - locQuad.br.texCoords.u = right; - locQuad.br.texCoords.v = bottom; - locQuad.tl.texCoords.u = left; - locQuad.tl.texCoords.v = top; - locQuad.tr.texCoords.u = right; - locQuad.tr.texCoords.v = top; - } - this._quadDirty = true; + _changeRectWithTexture: function(rect){ + if(!rect || (!rect.width && !rect.height)) return; + var textureRect = this.getTextureRect(); + if(textureRect.height || textureRect.width) return; + rect.x = rect.x || 0; + rect.y = rect.y || 0; + rect.width = rect.width || 0; + rect.height = rect.height || 0; + this.setTextureRect(rect); }, - /** - * draw sprite to canvas - * @function - */ - draw: null + + _createRenderCmd: function(){ + if(cc._renderType === cc._RENDER_TYPE_CANVAS) + return new cc.Sprite.CanvasRenderCmd(this); + else + return new cc.Sprite.WebGLRenderCmd(this); + } }); /** * Create a sprite with image path or frame name or texture or spriteFrame. - * @constructs + * @deprecated since v3.0, please use new construction instead + * @see cc.Sprite * @param {String|cc.SpriteFrame|HTMLImageElement|cc.Texture2D} fileName The string which indicates a path to image file, e.g., "scene1/monster.png". * @param {cc.Rect} rect Only the contents inside rect of pszFileName's texture will be applied for this sprite. + * @param {Boolean} [rotated] Whether or not the texture rectangle is rotated. * @return {cc.Sprite} A valid sprite object - * @example - * - * 1.Create a sprite with image path and rect - * var sprite1 = cc.Sprite.create("res/HelloHTML5World.png"); - * var sprite2 = cc.Sprite.create("res/HelloHTML5World.png",cc.rect(0,0,480,320)); - * - * 2.Create a sprite with a sprite frame name. Must add "#" before frame name. - * var sprite = cc.Sprite.create('#grossini_dance_01.png'); - * - * 3.Create a sprite with a sprite frame - * var spriteFrame = cc.spriteFrameCache.getSpriteFrame("grossini_dance_01.png"); - * var sprite = cc.Sprite.create(spriteFrame); - * - * 4.Create a sprite with an exsiting texture contained in a CCTexture2D object - * After creation, the rect will be the size of the texture, and the offset will be (0,0). - * var texture = cc.textureCache.addImage("HelloHTML5World.png"); - * var sprite1 = cc.Sprite.create(texture); - * var sprite2 = cc.Sprite.create(texture, cc.rect(0,0,480,320)); - * */ -cc.Sprite.create = function (fileName, rect) { - return new cc.Sprite(fileName, rect); +cc.Sprite.create = function (fileName, rect, rotated) { + return new cc.Sprite(fileName, rect, rotated); }; +/** + * @deprecated since v3.0, please use new construction instead + * @see cc.Sprite + * @function + */ +cc.Sprite.createWithTexture = cc.Sprite.create; + +/** + * @deprecated since v3.0, please use new construction instead + * @see cc.Sprite + * @function + */ +cc.Sprite.createWithSpriteFrameName = cc.Sprite.create; +/** + * @deprecated since v3.0, please use new construction instead + * @see cc.Sprite + * @function + */ +cc.Sprite.createWithSpriteFrame = cc.Sprite.create; /** * cc.Sprite invalid index on the cc.SpriteBatchNode * @constant - * @type Number + * @type {Number} */ cc.Sprite.INDEX_NOT_INITIALIZED = -1; +cc.EventHelper.prototype.apply(cc.Sprite.prototype); -if (cc._renderType === cc._RENDER_TYPE_CANVAS) { - - var _p = cc.Sprite.prototype; - - _p._spriteFrameLoadedCallback = function(spriteFrame){ - var _t = this; - _t.setNodeDirty(true); - _t.setTextureRect(spriteFrame.getRect(), spriteFrame.isRotated(), spriteFrame.getOriginalSize()); - var curColor = _t.color; - if (curColor.r !== 255 || curColor.g !== 255 || curColor.b !== 255) - _t._changeTextureColor(); - - _t._callLoadedEventCallbacks(); - }; - - _p.setOpacityModifyRGB = function (modify) { - if (this._opacityModifyRGB !== modify) { - this._opacityModifyRGB = modify; - this.setNodeDirty(true); - } - }; - - _p.updateDisplayedOpacity = function (parentOpacity) { - cc.NodeRGBA.prototype.updateDisplayedOpacity.call(this, parentOpacity); - this._setNodeDirtyForCache(); - }; - - _p.ctor = function (fileName, rect) { - var self = this; - cc.NodeRGBA.prototype.ctor.call(self); - self._shouldBeHidden = false; - self._offsetPosition = cc.p(0, 0); - self._unflippedOffsetPositionFromCenter = cc.p(0, 0); - self._blendFunc = {src: cc.BLEND_SRC, dst: cc.BLEND_DST}; - self._rect = cc.rect(0, 0, 0, 0); - - self._newTextureWhenChangeColor = false; - self._textureLoaded = true; - self._textureRect_Canvas = {x: 0, y: 0, width: 0, height:0, validRect: false}; - self._drawSize_Canvas = cc.size(0, 0); - - self._softInit(fileName, rect); - }; - - _p.setBlendFunc = function (src, dst) { - var locBlendFunc = this._blendFunc; - if (dst === undefined) { - locBlendFunc.src = src.src; - locBlendFunc.dst = src.dst; - } else { - locBlendFunc.src = src; - locBlendFunc.dst = dst; - } - this._isLighterMode = (locBlendFunc && - (( locBlendFunc.src == cc.SRC_ALPHA && locBlendFunc.dst == cc.ONE) || (locBlendFunc.src == cc.ONE && locBlendFunc.dst == cc.ONE))); - }; - - _p.init = function () { - var _t = this; - if (arguments.length > 0) - return _t.initWithFile(arguments[0], arguments[1]); - - cc.NodeRGBA.prototype.init.call(_t); - _t.dirty = _t._recursiveDirty = false; - _t._opacityModifyRGB = true; - - _t._blendFunc.src = cc.BLEND_SRC; - _t._blendFunc.dst = cc.BLEND_DST; - - // update texture (calls _updateBlendFunc) - _t.texture = null; - _t._textureLoaded = true; - _t._flippedX = _t._flippedY = false; - - // default transform anchor: center - _t.anchorX = 0.5; - _t.anchorY = 0.5; - - // zwoptex default values - _t._offsetPosition.x = 0; - _t._offsetPosition.y = 0; - _t._hasChildren = false; - - // updated in "useSelfRender" - // Atlas: TexCoords - _t.setTextureRect(cc.rect(0, 0, 0, 0), false, cc.size(0, 0)); - return true; - }; - - _p.initWithTexture = function (texture, rect, rotated) { - var _t = this; - var argnum = arguments.length; - - cc.assert(argnum != 0, cc._LogInfos.CCSpriteBatchNode_initWithTexture); - - rotated = rotated || false; - - if (!cc.NodeRGBA.prototype.init.call(_t)) - return false; - - _t._batchNode = null; - - _t._recursiveDirty = false; - _t.dirty = false; - _t._opacityModifyRGB = true; - - _t._blendFunc.src = cc.BLEND_SRC; - _t._blendFunc.dst = cc.BLEND_DST; - - _t._flippedX = _t._flippedY = false; - - // default transform anchor: center - _t.anchorX = 0.5; - _t.anchorY = 0.5; - - // zwoptex default values - _t._offsetPosition.x = 0; - _t._offsetPosition.y = 0; - _t._hasChildren = false; - - var locTextureLoaded = texture.isLoaded(); - _t._textureLoaded = locTextureLoaded; - - if (!locTextureLoaded) { - _t._rectRotated = rotated || false; - if (rect) { - _t._rect.x = rect.x; - _t._rect.y = rect.y; - _t._rect.width = rect.width; - _t._rect.height = rect.height; - } - texture.addLoadedEventListener(_t._textureLoadedCallback, _t); - return true; - } - - if (!rect) { - rect = cc.rect(0, 0, texture.width, texture.height); - } - _t._originalTexture = texture; - - _t.texture = texture; - _t.setTextureRect(rect, rotated); - - // by default use "Self Render". - // if the sprite is added to a batchnode, then it will automatically switch to "batchnode Render" - _t.batchNode = null; - return true; - }; - - _p._textureLoadedCallback = function (sender) { - var _t = this; - if(_t._textureLoaded) - return; - - _t._textureLoaded = true; - var locRect = _t._rect; - if (!locRect) { - locRect = cc.rect(0, 0, sender.width, sender.height); - } else if (cc._rectEqualToZero(locRect)) { - locRect.width = sender.width; - locRect.height = sender.height; - } - _t._originalTexture = sender; - - _t.texture = sender; - _t.setTextureRect(locRect, _t._rectRotated); - - // by default use "Self Render". - // if the sprite is added to a batchnode, then it will automatically switch to "batchnode Render" - _t.batchNode = _t._batchNode; - _t._callLoadedEventCallbacks(); - }; - - _p.setTextureRect = function (rect, rotated, untrimmedSize) { - var _t = this; - _t._rectRotated = rotated || false; - _t.setContentSize(untrimmedSize || rect); - - _t.setVertexRect(rect); - - var locTextureRect = _t._textureRect_Canvas, scaleFactor = cc.contentScaleFactor(); - locTextureRect.x = 0 | (rect.x * scaleFactor); - locTextureRect.y = 0 | (rect.y * scaleFactor); - locTextureRect.width = 0 | (rect.width * scaleFactor); - locTextureRect.height = 0 | (rect.height * scaleFactor); - locTextureRect.validRect = !(locTextureRect.width === 0 || locTextureRect.height === 0 || locTextureRect.x < 0 || locTextureRect.y < 0); - - var relativeOffset = _t._unflippedOffsetPositionFromCenter; - if (_t._flippedX) - relativeOffset.x = -relativeOffset.x; - if (_t._flippedY) - relativeOffset.y = -relativeOffset.y; - _t._offsetPosition.x = relativeOffset.x + (_t._contentSize.width - _t._rect.width) / 2; - _t._offsetPosition.y = relativeOffset.y + (_t._contentSize.height - _t._rect.height) / 2; - - // rendering using batch node - if (_t._batchNode) { - // update dirty, don't update _recursiveDirty - _t.dirty = true; - } - }; - - _p.updateTransform = function () { - var _t = this; - //cc.assert(_t._batchNode, "updateTransform is only valid when cc.Sprite is being rendered using an cc.SpriteBatchNode"); - - // recaculate matrix only if it is dirty - if (_t.dirty) { - // If it is not visible, or one of its ancestors is not visible, then do nothing: - var locParent = _t._parent; - if (!_t._visible || ( locParent && locParent != _t._batchNode && locParent._shouldBeHidden)) { - _t._shouldBeHidden = true; - } else { - _t._shouldBeHidden = false; - - if (!locParent || locParent == _t._batchNode) { - _t._transformToBatch = _t.nodeToParentTransform(); - } else { - //cc.assert(_t._parent instanceof cc.Sprite, "Logic error in CCSprite. Parent must be a CCSprite"); - _t._transformToBatch = cc.AffineTransformConcat(_t.nodeToParentTransform(), locParent._transformToBatch); - } - } - _t._recursiveDirty = false; - _t.dirty = false; - } - - // recursively iterate over children - if (_t._hasChildren) - _t._arrayMakeObjectsPerformSelector(_t._children, cc.Node.StateCallbackType.updateTransform); - }; - - _p.addChild = function (child, localZOrder, tag) { - - cc.assert(child, cc._LogInfos.CCSpriteBatchNode_addChild_2); - - if (localZOrder == null) - localZOrder = child._localZOrder; - if (tag == null) - tag = child.tag; - - //cc.Node already sets isReorderChildDirty_ so this needs to be after batchNode check - cc.NodeRGBA.prototype.addChild.call(this, child, localZOrder, tag); - this._hasChildren = true; - }; - - _p.setOpacity = function (opacity) { - cc.NodeRGBA.prototype.setOpacity.call(this, opacity); - this._setNodeDirtyForCache(); - }; - - _p.setColor = function (color3) { - var _t = this; - var curColor = _t.color; - if ((curColor.r === color3.r) && (curColor.g === color3.g) && (curColor.b === color3.b) && (curColor.a === color3.a)) - return; - - cc.NodeRGBA.prototype.setColor.call(_t, color3); - _t._changeTextureColor(); - _t._setNodeDirtyForCache(); - }; - - _p.updateDisplayedColor = function (parentColor) { - var _t = this; - var oldColor = _t.color; - cc.NodeRGBA.prototype.updateDisplayedColor.call(_t, parentColor); - var newColor = _t._displayedColor; - if ((oldColor.r === newColor.r) && (oldColor.g === newColor.g) && (oldColor.b === newColor.b)) - return; - _t._changeTextureColor(); - _t._setNodeDirtyForCache(); - }; - - _p.setSpriteFrame = function (newFrame) { - var _t = this; - if(typeof(newFrame) == "string"){ - newFrame = cc.spriteFrameCache.getSpriteFrame(newFrame); - - cc.assert(newFrame, cc._LogInfos.CCSpriteBatchNode_setSpriteFrame) - - } - - _t.setNodeDirty(true); - - var frameOffset = newFrame.getOffset(); - _t._unflippedOffsetPositionFromCenter.x = frameOffset.x; - _t._unflippedOffsetPositionFromCenter.y = frameOffset.y; - - // update rect - _t._rectRotated = newFrame.isRotated(); - - var pNewTexture = newFrame.getTexture(); - var locTextureLoaded = newFrame.textureLoaded(); - if (!locTextureLoaded) { - _t._textureLoaded = false; - newFrame.addLoadedEventListener(function (sender) { - _t._textureLoaded = true; - var locNewTexture = sender.getTexture(); - if (locNewTexture != _t._texture) - _t.texture = locNewTexture; - _t.setTextureRect(sender.getRect(), sender.isRotated(), sender.getOriginalSize()); - _t._callLoadedEventCallbacks(); - }, _t); - } - // update texture before updating texture rect - if (pNewTexture != _t._texture) - _t.texture = pNewTexture; - - if (_t._rectRotated) - _t._originalTexture = pNewTexture; - - _t.setTextureRect(newFrame.getRect(), _t._rectRotated, newFrame.getOriginalSize()); - _t._colorized = false; - if (locTextureLoaded) { - var curColor = _t.color; - if (curColor.r !== 255 || curColor.g !== 255 || curColor.b !== 255) - _t._changeTextureColor(); - } - }; - - _p.isFrameDisplayed = function (frame) { - if (frame.getTexture() != this._texture) - return false; - return cc.rectEqualToRect(frame.getRect(), this._rect); - }; - - _p.setBatchNode = function (spriteBatchNode) { - var _t = this; - _t._batchNode = spriteBatchNode; // weak reference - - // self render - if (!_t._batchNode) { - _t.atlasIndex = cc.Sprite.INDEX_NOT_INITIALIZED; - _t.textureAtlas = null; - _t._recursiveDirty = false; - _t.dirty = false; - } else { - // using batch - _t._transformToBatch = cc.AffineTransformIdentity(); - _t.textureAtlas = _t._batchNode.textureAtlas; // weak ref - } - }; - - - _p.setTexture = function (texture) { - var _t = this; - if(texture && (typeof(texture) === "string")){ - texture = cc.textureCache.addImage(texture); - _t.setTexture(texture); - - //TODO - var size = texture.getContentSize(); - _t.setTextureRect(cc.rect(0,0, size.width, size.height)); - return; - } - - // CCSprite: setTexture doesn't work when the sprite is rendered using a CCSpriteSheet - - cc.assert(!texture || texture instanceof cc.Texture2D, cc._LogInfos.CCSpriteBatchNode_setTexture); - - if (_t._texture != texture) { - if (texture && texture.getHtmlElementObj() instanceof HTMLImageElement) { - _t._originalTexture = texture; - } - _t._texture = texture; - } - }; - - _p.draw = function (ctx) { - var _t = this; - if (!_t._textureLoaded) - return; - - var context = ctx || cc._renderContext; - if (_t._isLighterMode) - context.globalCompositeOperation = 'lighter'; - - var locEGL_ScaleX = cc.view.getScaleX(), locEGL_ScaleY = cc.view.getScaleY(); - - context.globalAlpha = _t._displayedOpacity / 255; - var locRect = _t._rect, locContentSize = _t._contentSize, locOffsetPosition = _t._offsetPosition, locDrawSizeCanvas = _t._drawSize_Canvas; - var flipXOffset = 0 | (locOffsetPosition.x), flipYOffset = -locOffsetPosition.y - locRect.height, locTextureCoord = _t._textureRect_Canvas; - locDrawSizeCanvas.width = locRect.width * locEGL_ScaleX; - locDrawSizeCanvas.height = locRect.height * locEGL_ScaleY; - - if (_t._flippedX || _t._flippedY) { - context.save(); - if (_t._flippedX) { - flipXOffset = -locOffsetPosition.x - locRect.width; - context.scale(-1, 1); - } - if (_t._flippedY) { - flipYOffset = locOffsetPosition.y; - context.scale(1, -1); - } - } - - flipXOffset *= locEGL_ScaleX; - flipYOffset *= locEGL_ScaleY; - - if (_t._texture && locTextureCoord.validRect) { - var image = _t._texture.getHtmlElementObj(); - if (_t._colorized) { - context.drawImage(image, - 0, 0, locTextureCoord.width, locTextureCoord.height, - flipXOffset, flipYOffset, locDrawSizeCanvas.width, locDrawSizeCanvas.height); - } else { - context.drawImage(image, - locTextureCoord.x, locTextureCoord.y, locTextureCoord.width, locTextureCoord.height, - flipXOffset, flipYOffset, locDrawSizeCanvas.width , locDrawSizeCanvas.height); - } - } else if (locContentSize.width !== 0) { - var curColor = _t.color; - context.fillStyle = "rgba(" + curColor.r + "," + curColor.g + "," + curColor.b + ",1)"; - context.fillRect(flipXOffset, flipYOffset, locContentSize.width * locEGL_ScaleX, locContentSize.height * locEGL_ScaleY); - } - - if (cc.SPRITE_DEBUG_DRAW === 1 || _t._showNode) { - // draw bounding box - context.strokeStyle = "rgba(0,255,0,1)"; - flipXOffset /= locEGL_ScaleX; - flipYOffset /= locEGL_ScaleY; - flipYOffset = -flipYOffset; - var vertices1 = [cc.p(flipXOffset, flipYOffset), - cc.p(flipXOffset + locRect.width, flipYOffset), - cc.p(flipXOffset + locRect.width, flipYOffset - locRect.height), - cc.p(flipXOffset, flipYOffset - locRect.height)]; - cc._drawingUtil.drawPoly(vertices1, 4, true); - } else if (cc.SPRITE_DEBUG_DRAW === 2) { - // draw texture box - context.strokeStyle = "rgba(0,255,0,1)"; - var drawRect = _t._rect; - flipYOffset = -flipYOffset; - var vertices2 = [cc.p(flipXOffset, flipYOffset), cc.p(flipXOffset + drawRect.width, flipYOffset), - cc.p(flipXOffset + drawRect.width, flipYOffset - drawRect.height), cc.p(flipXOffset, flipYOffset - drawRect.height)]; - cc._drawingUtil.drawPoly(vertices2, 4, true); - } - if (_t._flippedX || _t._flippedY) - context.restore(); - cc.g_NumberOfDraws++; - }; - - delete _p; -} else { - _tmp.WebGLSprite(); - delete _tmp.WebGLSprite; -} -_tmp.PrototypeSprite(); -delete _tmp.PrototypeSprite; - +cc.assert(cc.isFunction(cc._tmp.PrototypeSprite), cc._LogInfos.MissingFile, "SpritesPropertyDefine.js"); +cc._tmp.PrototypeSprite(); +delete cc._tmp.PrototypeSprite; \ No newline at end of file diff --git a/cocos2d/core/sprites/CCSpriteBatchNode.js b/cocos2d/core/sprites/CCSpriteBatchNode.js index 33a1c656a8..a67c4cac19 100644 --- a/cocos2d/core/sprites/CCSpriteBatchNode.js +++ b/cocos2d/core/sprites/CCSpriteBatchNode.js @@ -1,7 +1,7 @@ /**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2008-2010 Ricardo Quesada - Copyright (c) 2011 Zynga Inc. + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -24,18 +24,9 @@ THE SOFTWARE. ****************************************************************************/ -/** - * @constant - * @type Number - */ -cc.DEFAULT_SPRITE_BATCH_CAPACITY = 29; /** *
- * In Canvas render mode ,cc.SpriteBatchNodeCanvas is like a normal node: if it contains children.
- * If its _useCache is set to true, it can cache the result that all children of SpriteBatchNode to a canvas
- * (often known as "batch draw").
- *
* A cc.SpriteBatchNode can reference one and only one texture (one image file, one texture atlas).
* Only the cc.Sprites that are contained in that texture can be added to the cc.SpriteBatchNode.
* All cc.Sprites added to a cc.SpriteBatchNode are drawn in one WebGL draw call.
@@ -50,21 +41,43 @@ cc.DEFAULT_SPRITE_BATCH_CAPACITY = 29;
* @class
* @extends cc.Node
*
+ * @param {String|cc.Texture2D} fileImage
+ * @param {Number} capacity
+ * @example
+ *
+ * // 1. create a SpriteBatchNode with image path
+ * var spriteBatchNode = new cc.SpriteBatchNode("res/animations/grossini.png", 50);
+ *
+ * // 2. create a SpriteBatchNode with texture
+ * var texture = cc.textureCache.addImage("res/animations/grossini.png");
+ * var spriteBatchNode = new cc.SpriteBatchNode(texture,50);
+ *
* @property {cc.TextureAtlas} textureAtlas - The texture atlas
* @property {Array} descendants - <@readonly> Descendants of sprite batch node
- *
- * @example
- * //create a SpriteBatchNode
- * var parent2 = cc.SpriteBatchNode.create("res/animations/grossini.png", 50);
*/
cc.SpriteBatchNode = cc.Node.extend(/** @lends cc.SpriteBatchNode# */{
- textureAtlas: null,
-
_blendFunc: null,
// all descendants: chlidren, gran children, etc...
_descendants: null,
_className: "SpriteBatchNode",
+ ctor: function (fileImage, capacity) {
+ cc.Node.prototype.ctor.call(this);
+ this._descendants = [];
+ this._blendFunc = new cc.BlendFunc(cc.BLEND_SRC, cc.BLEND_DST);
+
+ var texture2D;
+ capacity = capacity || cc.SpriteBatchNode.DEFAULT_CAPACITY;
+ if (cc.isString(fileImage)) {
+ texture2D = cc.textureCache.getTextureForKey(fileImage);
+ if (!texture2D)
+ texture2D = cc.textureCache.addImage(fileImage);
+ }else if (fileImage instanceof cc.Texture2D)
+ texture2D = fileImage;
+
+ texture2D && this.initWithTexture(texture2D, capacity);
+ },
+
/**
*
* This is the opposite of "addQuadFromSprite.
@@ -76,7 +89,6 @@ cc.SpriteBatchNode = cc.Node.extend(/** @lends cc.SpriteBatchNode# */{
* @return {cc.SpriteBatchNode}
*/
addSpriteWithoutQuad: function (child, z, aTag) {
-
cc.assert(child, cc._LogInfos.SpriteBatchNode_addSpriteWithoutQuad_2);
if (!(child instanceof cc.Sprite)) {
@@ -88,12 +100,12 @@ cc.SpriteBatchNode = cc.Node.extend(/** @lends cc.SpriteBatchNode# */{
child.atlasIndex = z;
// XXX: optimize with a binary search
- var i = 0, locDescendants = this._descendants;
+ var i = 0, len, locDescendants = this._descendants;
if (locDescendants && locDescendants.length > 0) {
- for (var index = 0; index < locDescendants.length; index++) {
- var obj = locDescendants[index];
+ for (i = 0, len = locDescendants.length; i < len; i++) {
+ var obj = locDescendants[i];
if (obj && (obj.atlasIndex >= z))
- ++i;
+ break;
}
}
locDescendants.splice(i, 0, child);
@@ -112,7 +124,7 @@ cc.SpriteBatchNode = cc.Node.extend(/** @lends cc.SpriteBatchNode# */{
* @return {cc.TextureAtlas}
*/
getTextureAtlas: function () {
- return this.textureAtlas;
+ return this._renderCmd.getTextureAtlas();
},
/**
@@ -120,9 +132,7 @@ cc.SpriteBatchNode = cc.Node.extend(/** @lends cc.SpriteBatchNode# */{
* @param {cc.TextureAtlas} textureAtlas
*/
setTextureAtlas: function (textureAtlas) {
- if (textureAtlas != this.textureAtlas) {
- this.textureAtlas = textureAtlas;
- }
+ this._renderCmd.getTextureAtlas(textureAtlas);
},
/**
@@ -130,67 +140,59 @@ cc.SpriteBatchNode = cc.Node.extend(/** @lends cc.SpriteBatchNode# */{
* @return {Array}
*/
getDescendants: function () {
- return this._descendants;
+ return this._descendants;
},
/**
*
- * initializes a cc.SpriteBatchNode with a file image (.png, .jpeg, .pvr, etc) and a capacity of children.
+ * Initializes a cc.SpriteBatchNode with a file image (.png, .jpeg, .pvr, etc) and a capacity of children.
* The capacity will be increased in 33% in runtime if it run out of space.
- * The file will be loaded using the TextureMgr.
+ * The file will be loaded using the TextureMgr.
+ * Please pass parameters to constructor to initialize the sprite batch node, do not call this function yourself.
*
* initializes a cc.SpriteBatchNode with a file image (.png, .jpeg, .pvr, etc) and a capacity of children.
* The capacity will be increased in 33% in runtime if it run out of space.
- * The file will be loaded using the TextureMgr.
+ * The file will be loaded using the TextureMgr.
+ * Please pass parameters to constructor to initialize the sprite batch node, do not call this function yourself.
*
- * Constructor
- * creates a cc.SpriteBatchNodeCanvas with a file image (.png, .jpg etc) with a default capacity of 29 children.
- * The capacity will be increased in 33% in runtime if it run out of space.
- * The file will be loaded using the TextureMgr.
- *
* Updates a quad at a certain index into the texture atlas. The CCSprite won't be added into the children array.
@@ -442,70 +377,24 @@ cc.SpriteBatchNode = cc.Node.extend(/** @lends cc.SpriteBatchNode# */{
* @param {cc.Sprite} sprite
* @param {Number} index
*/
- updateQuadFromSprite: null,
-
- _updateQuadFromSpriteForCanvas: function (sprite, index) {
-
+ updateQuadFromSprite: function (sprite, index) {
cc.assert(sprite, cc._LogInfos.CCSpriteBatchNode_updateQuadFromSprite_2);
-
if (!(sprite instanceof cc.Sprite)) {
cc.log(cc._LogInfos.CCSpriteBatchNode_updateQuadFromSprite);
return;
}
+ this._renderCmd.checkAtlasCapacity();
//
// update the quad directly. Don't add the sprite to the scene graph
//
sprite.batchNode = this;
sprite.atlasIndex = index;
-
sprite.dirty = true;
// UpdateTransform updates the textureAtlas quad
sprite.updateTransform();
},
- _updateQuadFromSpriteForWebGL: function (sprite, index) {
-
- cc.assert(sprite, cc._LogInfos.CCSpriteBatchNode_updateQuadFromSprite);
-
- if (!(sprite instanceof cc.Sprite)) {
- cc.log(cc._LogInfos.CCSpriteBatchNode_updateQuadFromSprite);
- return;
- }
-
- // make needed room
- var locCapacity = this.textureAtlas.capacity;
- while (index >= locCapacity || locCapacity == this.textureAtlas.totalQuads) {
- this.increaseAtlasCapacity();
- }
-
- //
- // update the quad directly. Don't add the sprite to the scene graph
- //
- sprite.batchNode = this;
- sprite.atlasIndex = index;
-
- sprite.dirty = true;
- // UpdateTransform updates the textureAtlas quad
- sprite.updateTransform();
- },
-
- _swap: function (oldIndex, newIndex) {
- var locDescendants = this._descendants;
- var locTextureAtlas = this.textureAtlas;
- var quads = locTextureAtlas.quads;
- var tempItem = locDescendants[oldIndex];
- var tempIteQuad = cc.V3F_C4B_T2F_QuadCopy(quads[oldIndex]);
-
- //update the index of other swapped item
- locDescendants[newIndex].atlasIndex = oldIndex;
- locDescendants[oldIndex] = locDescendants[newIndex];
-
- locTextureAtlas.updateQuad(quads[newIndex], oldIndex);
- locDescendants[newIndex] = tempItem;
- locTextureAtlas.updateQuad(tempIteQuad, newIndex);
- },
-
/**
*
* Inserts a quad at a certain index into the texture atlas. The cc.Sprite won't be added into the children array.
@@ -516,16 +405,13 @@ cc.SpriteBatchNode = cc.Node.extend(/** @lends cc.SpriteBatchNode# */{
* @param {cc.Sprite} sprite
* @param {Number} index
*/
- insertQuadFromSprite: null,
-
- _insertQuadFromSpriteForCanvas: function (sprite, index) {
-
+ insertQuadFromSprite: function (sprite, index) {
cc.assert(sprite, cc._LogInfos.CCSpriteBatchNode_insertQuadFromSprite_2);
-
if (!(sprite instanceof cc.Sprite)) {
cc.log(cc._LogInfos.CCSpriteBatchNode_insertQuadFromSprite);
return;
}
+ this._renderCmd.insertQuad(sprite, index);
//
// update the quad directly. Don't add the sprite to the scene graph
@@ -537,150 +423,41 @@ cc.SpriteBatchNode = cc.Node.extend(/** @lends cc.SpriteBatchNode# */{
// XXX: so, it should be AFTER the insertQuad
sprite.dirty = true;
sprite.updateTransform();
- this._children.splice(index, 0, sprite);
- },
-
- _insertQuadFromSpriteForWebGL: function (sprite, index) {
-
- cc.assert(sprite, cc._LogInfos.Sprite_insertQuadFromSprite_2);
-
- if (!(sprite instanceof cc.Sprite)) {
- cc.log(cc._LogInfos.Sprite_insertQuadFromSprite);
- return;
- }
-
- // make needed room
- var locTextureAtlas = this.textureAtlas;
- while (index >= locTextureAtlas.capacity || locTextureAtlas.capacity === locTextureAtlas.totalQuads)
- this.increaseAtlasCapacity();
-
- //
- // update the quad directly. Don't add the sprite to the scene graph
- //
- sprite.batchNode = this;
- sprite.atlasIndex = index;
- locTextureAtlas.insertQuad(sprite.quad, index);
-
- // XXX: updateTransform will update the textureAtlas too, using updateQuad.
- // XXX: so, it should be AFTER the insertQuad
- sprite.dirty = true;
- sprite.updateTransform();
- },
-
- _updateAtlasIndex: function (sprite, curIndex) {
- var count = 0;
- var pArray = sprite.children;
- if (pArray)
- count = pArray.length;
-
- var oldIndex = 0;
- if (count === 0) {
- oldIndex = sprite.atlasIndex;
- sprite.atlasIndex = curIndex;
- sprite.arrivalOrder = 0;
- if (oldIndex != curIndex)
- this._swap(oldIndex, curIndex);
- curIndex++;
- } else {
- var needNewIndex = true;
- if (pArray[0].zIndex >= 0) {
- //all children are in front of the parent
- oldIndex = sprite.atlasIndex;
- sprite.atlasIndex = curIndex;
- sprite.arrivalOrder = 0;
- if (oldIndex != curIndex)
- this._swap(oldIndex, curIndex);
- curIndex++;
- needNewIndex = false;
- }
- for (var i = 0; i < pArray.length; i++) {
- var child = pArray[i];
- if (needNewIndex && child.zIndex >= 0) {
- oldIndex = sprite.atlasIndex;
- sprite.atlasIndex = curIndex;
- sprite.arrivalOrder = 0;
- if (oldIndex != curIndex) {
- this._swap(oldIndex, curIndex);
- }
- curIndex++;
- needNewIndex = false;
- }
- curIndex = this._updateAtlasIndex(child, curIndex);
- }
-
- if (needNewIndex) {
- //all children have a zOrder < 0)
- oldIndex = sprite.atlasIndex;
- sprite.atlasIndex = curIndex;
- sprite.arrivalOrder = 0;
- if (oldIndex != curIndex) {
- this._swap(oldIndex, curIndex);
- }
- curIndex++;
- }
- }
-
- return curIndex;
- },
-
- _updateBlendFunc: function () {
- if (!this.textureAtlas.texture.hasPremultipliedAlpha()) {
- this._blendFunc.src = cc.SRC_ALPHA;
- this._blendFunc.dst = cc.ONE_MINUS_SRC_ALPHA;
- }
+ this._renderCmd.cutting(sprite, index);
},
/**
*
- * initializes a CCSpriteBatchNode with a texture2d and capacity of children.
- * The capacity will be increased in 33% in runtime if it run out of space.
+ * Initializes a cc.SpriteBatchNode with a texture2d and capacity of children.
+ * The capacity will be increased in 33% in runtime if it run out of space.
+ * Please pass parameters to constructor to initialize the sprite batch node, do not call this function yourself.
*
Removes all children from the container and do a cleanup all running actions depending on the cleanup parameter.
- * (override removeAllChildren of cc.Node)
+ * (override removeAllChildren of cc.Node) * @function * @param {Boolean} cleanup */ - removeAllChildren: null, - - _removeAllChildrenForCanvas: function (cleanup) { - // Invalidate atlas index. issue #569 - // useSelfRender should be performed on all descendants. issue #1216 - var locDescendants = this._descendants; - if (locDescendants && locDescendants.length > 0) { - for (var i = 0, len = locDescendants.length; i < len; i++) { - if (locDescendants[i]) - locDescendants[i].batchNode = null; - } - } - - cc.Node.prototype.removeAllChildren.call(this, cleanup); - this._descendants.length = 0; - }, - - _removeAllChildrenForWebGL: function (cleanup) { + removeAllChildren: function (cleanup) { // Invalidate atlas index. issue #569 // useSelfRender should be performed on all descendants. issue #1216 var locDescendants = this._descendants; @@ -977,41 +590,13 @@ cc.SpriteBatchNode = cc.Node.extend(/** @lends cc.SpriteBatchNode# */{ } cc.Node.prototype.removeAllChildren.call(this, cleanup); this._descendants.length = 0; - this.textureAtlas.removeAllQuads(); + this._renderCmd.removeAllQuads(); }, - sortAllChildren: null, - - _sortAllChildrenForCanvas: function () { - if (this._reorderChildDirty) { - var i, j = 0, locChildren = this._children; - var length = locChildren.length, tempChild; - //insertion sort - for (i = 1; i < length; i++) { - var tempItem = locChildren[i]; - j = i - 1; - tempChild = locChildren[j]; - - //continue moving element downwards while zOrder is smaller or when zOrder is the same but mutatedIndex is smaller - while (j >= 0 && ( tempItem._localZOrder < tempChild._localZOrder || - ( tempItem._localZOrder == tempChild._localZOrder && tempItem.arrivalOrder < tempChild.arrivalOrder ))) { - locChildren[j + 1] = tempChild; - j = j - 1; - tempChild = locChildren[j]; - } - locChildren[j + 1] = tempItem; - } - - //sorted now check all children - if (locChildren.length > 0) { - //first sort all children recursively based on zOrder - this._arrayMakeObjectsPerformSelector(locChildren, cc.Node.StateCallbackType.sortAllChildren); - } - this._reorderChildDirty = false; - } - }, - - _sortAllChildrenForWebGL: function () { + /** + * Sort all children nodes (override draw of cc.Node) + */ + sortAllChildren: function () { if (this._reorderChildDirty) { var childrenArr = this._children; var i, j = 0, length = childrenArr.length, tempChild; @@ -1023,7 +608,7 @@ cc.SpriteBatchNode = cc.Node.extend(/** @lends cc.SpriteBatchNode# */{ //continue moving element downwards while zOrder is smaller or when zOrder is the same but mutatedIndex is smaller while (j >= 0 && ( tempItem._localZOrder < tempChild._localZOrder || - ( tempItem._localZOrder == tempChild._localZOrder && tempItem.arrivalOrder < tempChild.arrivalOrder ))) { + ( tempItem._localZOrder === tempChild._localZOrder && tempItem.arrivalOrder < tempChild.arrivalOrder ))) { childrenArr[j + 1] = tempChild; j = j - 1; tempChild = childrenArr[j]; @@ -1034,72 +619,26 @@ cc.SpriteBatchNode = cc.Node.extend(/** @lends cc.SpriteBatchNode# */{ //sorted now check all children if (childrenArr.length > 0) { //first sort all children recursively based on zOrder - this._arrayMakeObjectsPerformSelector(childrenArr, cc.Node.StateCallbackType.sortAllChildren); - - var index = 0; - //fast dispatch, give every child a new atlasIndex based on their relative zOrder (keep parent -> child relations intact) - // and at the same time reorder descedants and the quads to the right index - for (i = 0; i < childrenArr.length; i++) - index = this._updateAtlasIndex(childrenArr[i], index); + this._arrayMakeObjectsPerformSelector(childrenArr, cc.Node._stateCallbackType.sortAllChildren); + this._renderCmd.updateChildrenAtlasIndex(childrenArr); } this._reorderChildDirty = false; } }, - /** - * draw cc.SpriteBatchNode (override draw of cc.Node) - * @function - */ - draw: null, - - _drawForWebGL: function () { - // Optimization: Fast Dispatch - if (this.textureAtlas.totalQuads === 0) - return; - //cc.nodeDrawSetup(this); - this._shaderProgram.use(); - this._shaderProgram.setUniformForModelViewAndProjectionMatrixWithMat4(); - this._arrayMakeObjectsPerformSelector(this._children, cc.Node.StateCallbackType.updateTransform); - cc.glBlendFunc(this._blendFunc.src, this._blendFunc.dst); - - this.textureAtlas.drawQuads(); + _createRenderCmd: function(){ + if(cc._renderType === cc._RENDER_TYPE_CANVAS) + return new cc.SpriteBatchNode.CanvasRenderCmd(this); + else + return new cc.SpriteBatchNode.WebGLRenderCmd(this); } }); var _p = cc.SpriteBatchNode.prototype; -if (cc._renderType === cc._RENDER_TYPE_WEBGL) { - _p.ctor = _p._ctorForWebGL; - _p.updateQuadFromSprite = _p._updateQuadFromSpriteForWebGL; - _p.insertQuadFromSprite = _p._insertQuadFromSpriteForWebGL; - _p.initWithTexture = _p._initWithTextureForWebGL; - _p.appendChild = _p._appendChildForWebGL; - _p.removeSpriteFromAtlas = _p._removeSpriteFromAtlasForWebGL; - _p.getTexture = _p._getTextureForWebGL; - _p.setTexture = _p._setTextureForWebGL; - _p.visit = _p._visitForWebGL; - _p.addChild = _p._addChildForWebGL; - _p.removeAllChildren = _p._removeAllChildrenForWebGL; - _p.sortAllChildren = _p._sortAllChildrenForWebGL; - _p.draw = _p._drawForWebGL; -} else { - _p.ctor = _p._ctorForCanvas; - _p.updateQuadFromSprite = _p._updateQuadFromSpriteForCanvas; - _p.insertQuadFromSprite = _p._insertQuadFromSpriteForCanvas; - _p.initWithTexture = _p._initWithTextureForCanvas; - _p.appendChild = _p._appendChildForCanvas; - _p.removeSpriteFromAtlas = _p._removeSpriteFromAtlasForCanvas; - _p.getTexture = _p._getTextureForCanvas; - _p.setTexture = _p._setTextureForCanvas; - _p.visit = _p._visitForCanvas; - _p.removeAllChildren = _p._removeAllChildrenForCanvas; - _p.addChild = _p._addChildForCanvas; - _p.sortAllChildren = _p._sortAllChildrenForCanvas; - _p.draw = cc.Node.prototype.draw; -} - // Override properties cc.defineGetterSetter(_p, "texture", _p.getTexture, _p.setTexture); +cc.defineGetterSetter(_p, "textureAtlas", _p.getTextureAtlas, _p.setTextureAtlas); // Extended properties /** @expose */ @@ -1107,24 +646,31 @@ _p.descendants; cc.defineGetterSetter(_p, "descendants", _p.getDescendants); +/** + * @constant + * @type Number + */ +cc.SpriteBatchNode.DEFAULT_CAPACITY = 29; + /** *
* creates a cc.SpriteBatchNodeCanvas with a file image (.png, .jpg etc) with a default capacity of 29 children.
* The capacity will be increased in 33% in runtime if it run out of space.
* The file will be loaded using the TextureMgr.
*
- * Create a cc.SpriteFrame with a texture filename, rect, rotated, offset and originalSize in pixels.
- * The originalSize is the size in pixels of the frame before being trimmed.
- *
- * return is rotated of SpriteFrame.
- *
+ * Please pass parameters to the constructor to initialize the sprite, do not call this function yourself. * @param {String|cc.Texture2D} texture * @param {cc.Rect} rect if parameters' length equal 2, rect in points, else rect in pixels * @param {Boolean} [rotated=false] @@ -346,15 +337,35 @@ cc.SpriteFrame = cc.Class.extend(/** @lends cc.SpriteFrame# */{ originalSize = originalSize || rect; rotated = rotated || false; - if (typeof(texture) == "string"){ + if (cc.isString(texture)){ this._texture = null; this._textureFilename = texture; } else if (texture instanceof cc.Texture2D){ this.setTexture(texture); } + texture = this.getTexture(); + this._rectInPixels = rect; - this._rect = cc.rectPixelsToPoints(rect); + rect = this._rect = cc.rectPixelsToPoints(rect); + + if(texture && texture.url && texture.isLoaded()) { + var _x, _y; + if(rotated){ + _x = rect.x + rect.height; + _y = rect.y + rect.width; + }else{ + _x = rect.x + rect.width; + _y = rect.y + rect.height; + } + if(_x > texture.getPixelsWide()){ + cc.error(cc._LogInfos.RectWidth, texture.url); + } + if(_y > texture.getPixelsHigh()){ + cc.error(cc._LogInfos.RectHeight, texture.url); + } + } + this._offsetInPixels.x = offset.x; this._offsetInPixels.y = offset.y; cc._pointPixelsToPointsOut(offset, this._offset); @@ -366,33 +377,33 @@ cc.SpriteFrame = cc.Class.extend(/** @lends cc.SpriteFrame# */{ } }); +cc.EventHelper.prototype.apply(cc.SpriteFrame.prototype); + /** *
* Create a cc.SpriteFrame with a texture filename, rect, rotated, offset and originalSize in pixels.
* The originalSize is the size in pixels of the frame before being trimmed.
*
- * Singleton that handles the loading of the sprite frames. It saves in a cache the sprite frames.
+ *
+ * cc.spriteFrameCache is a singleton that handles the loading of the sprite frames. It saves in a cache the sprite frames.
*
* example
* // add SpriteFrames to spriteFrameCache With File
* cc.spriteFrameCache.addSpriteFrames(s_grossiniPlist);
*
- * The string is not localized, so items are always separated with a comma.
- * If the string is not well-formed, the function returns cc.rect(0, 0, 0, 0). - * @function - * @param {String} content content A string object whose contents are of the form "{{x,y},{w, h}}",
- * where x is the x coordinate, y is the y coordinate, w is the width, and h is the height.
- * These components can represent integer or float values. - * @return {cc.Rect} A Core Graphics structure that represents a rectangle. - * Constructor - * @example - * // example - * var rect = this._rectFromString("{{3,2},{4,5}}"); - */ _rectFromString : function (content) { var result = this._CCNS_REG2.exec(content); if(!result) return cc.rect(0, 0, 0, 0); return cc.rect(parseFloat(result[1]), parseFloat(result[2]), parseFloat(result[3]), parseFloat(result[4])); }, - /** - * Returns a Core Graphics point structure corresponding to the data in a given string. - * @function - * @param {String} content A string object whose contents are of the form "{x,y}", - * where x is the x coordinate and y is the y coordinate.
- * The x and y values can represent integer or float values.
- * The string is not localized, so items are always separated with a comma.
- * @return {cc.Point} A Core Graphics structure that represents a point.
- * If the string is not well-formed, the function returns cc.p(0,0). - * Constructor - * @example - * //example - * var point = this._pointFromString("{3.0,2.5}"); - */ _pointFromString : function (content) { var result = this._CCNS_REG1.exec(content); if(!result) return cc.p(0,0); return cc.p(parseFloat(result[1]), parseFloat(result[2])); }, - /** - * Returns a Core Graphics size structure corresponding to the data in a given string. - * @function - * @param {String} content A string object whose contents are of the form "{w, h}",
- * where w is the width and h is the height.
- * The w and h values can be integer or float values.
- * The string is not localized, so items are always separated with a comma.
- * @return {cc.Size} A Core Graphics structure that represents a size.
- * If the string is not well-formed, the function returns cc.size(0,0). - * @example - * // example - * var size = this._sizeFromString("{3.0,2.5}"); - */ + _sizeFromString : function (content) { var result = this._CCNS_REG1.exec(content); if(!result) return cc.size(0, 0); return cc.size(parseFloat(result[1]), parseFloat(result[2])); }, - /** - * Get the real data structure of frame used by engine. - * @param url - * @returns {*} - * @private - */ _getFrameConfig : function(url){ var dict = cc.loader.getRes(url); @@ -115,6 +71,17 @@ cc.spriteFrameCache = /** @lends cc.spriteFrameCache# */{ this._frameConfigCache[url] = dict; return dict; } + this._frameConfigCache[url] = this._parseFrameConfig(dict); + return this._frameConfigCache[url]; + }, + + _getFrameConfigByJsonObject: function(url, jsonObject) { + cc.assert(jsonObject, cc._LogInfos.spriteFrameCache__getFrameConfig_2, url); + this._frameConfigCache[url] = this._parseFrameConfig(jsonObject); + return this._frameConfigCache[url]; + }, + + _parseFrameConfig: function(dict) { var tempFrames = dict["frames"], tempMeta = dict["metadata"] || dict["meta"]; var frames = {}, meta = {}; var format = 0; @@ -169,69 +136,56 @@ cc.spriteFrameCache = /** @lends cc.spriteFrameCache# */{ } frames[key] = tempFrame; } - var cfg = this._frameConfigCache[url] = { - _inited : true, - frames : frames, - meta : meta - }; - return cfg; + return {_inited: true, frames: frames, meta: meta}; }, - /** - *
- * Adds multiple Sprite Frames from a plist or json file.
- * A texture will be loaded automatically. The texture name will composed by replacing the .plist or .json suffix with .png
- * If you want to use another texture, you should use the addSpriteFrames:texture method.
- *
+ * Adds multiple Sprite Frames from a plist or json file.
+ * A texture will be loaded automatically. The texture name will composed by replacing the .plist or .json suffix with .png
+ * If you want to use another texture, you should use the addSpriteFrames:texture method.
+ *
* It is convinient to call this method when a specific texture needs to be removed.
* - * @param {String} url plist filename + * @param {String} url Plist filename */ removeSpriteFramesFromFile: function (url) { var self = this, spriteFrames = self._spriteFrames, @@ -320,7 +300,7 @@ cc.spriteFrameCache = /** @lends cc.spriteFrameCache# */{ if (spriteFrames[key]) { delete(spriteFrames[key]); for (var alias in aliases) {//remove alias - if(aliases[alias] == key) delete aliases[alias]; + if(aliases[alias] === key) delete aliases[alias]; } } } @@ -329,7 +309,7 @@ cc.spriteFrameCache = /** @lends cc.spriteFrameCache# */{ /** *
* Removes all Sprite Frames associated with the specified textures.
- * It is convinient to call this method when a specific texture needs to be removed.
+ * It is convenient to call this method when a specific texture needs to be removed.
*
+ * note that to truly test intersection for segments we have to make
+ * sure that s & t lie within [0..1] and for rays, make sure s & t > 0
+ * the hit point is p3 + t * (p4 - p3);
+ * the hit point also is p1 + s * (p2 - p1); * @param {cc.Point} A A is the startpoint for the first line P1 = (p1 - p2). * @param {cc.Point} B B is the endpoint for the first line P1 = (p1 - p2). * @param {cc.Point} C C is the startpoint for the second line P2 = (p3 - p4). @@ -363,14 +369,9 @@ cc.pRotateByAngle = function (v, pivot, angle) { * @param {cc.Point} retP retP.x is the range for a hitpoint in P1 (pa = p1 + s*(p2 - p1)),
* retP.y is the range for a hitpoint in P3 (pa = p2 + t*(p4 - p3)). * @return {Boolean} - * indicating successful intersection of a line
- * note that to truly test intersection for segments we have to make
- * sure that s & t lie within [0..1] and for rays, make sure s & t > 0
- * the hit point is p3 + t * (p4 - p3);
- * the hit point also is p1 + s * (p2 - p1); */ cc.pLineIntersect = function (A, B, C, D, retP) { - if ((A.x == B.x && A.y == B.y) || (C.x == D.x && C.y == D.y)) { + if ((A.x === B.x && A.y === B.y) || (C.x === D.x && C.y === D.y)) { return false; } var BAx = B.x - A.x; @@ -385,8 +386,8 @@ cc.pLineIntersect = function (A, B, C, D, retP) { retP.x = DCx * ACy - DCy * ACx; retP.y = BAx * ACy - BAy * ACx; - if (denom == 0) { - if (retP.x == 0 || retP.y == 0) { + if (denom === 0) { + if (retP.x === 0 || retP.y === 0) { // Lines incident return true; } @@ -446,7 +447,7 @@ cc.pIntersectPoint = function (A, B, C, D) { */ cc.pSameAs = function (A, B) { if ((A != null) && (B != null)) { - return (A.x == B.x && A.y == B.y); + return (A.x === B.x && A.y === B.y); } return false; }; @@ -456,48 +457,58 @@ cc.pSameAs = function (A, B) { // High Perfomance In Place Operationrs --------------------------------------- /** - * sets the position of the point to 0 - */ + * sets the position of the point to 0 + * @param {cc.Point} v + */ cc.pZeroIn = function(v) { v.x = 0; v.y = 0; }; /** - * copies the position of one point to another - */ + * copies the position of one point to another + * @param {cc.Point} v1 + * @param {cc.Point} v2 + */ cc.pIn = function(v1, v2) { v1.x = v2.x; v1.y = v2.y; }; /** - * multiplies the point with the given factor (inplace) - */ + * multiplies the point with the given factor (inplace) + * @param {cc.Point} point + * @param {Number} floatVar + */ cc.pMultIn = function(point, floatVar) { point.x *= floatVar; point.y *= floatVar; }; /** - * subtracts one point from another (inplace) - */ + * subtracts one point from another (inplace) + * @param {cc.Point} v1 + * @param {cc.Point} v2 + */ cc.pSubIn = function(v1, v2) { v1.x -= v2.x; v1.y -= v2.y; }; /** - * adds one point to another (inplace) - */ + * adds one point to another (inplace) + * @param {cc.Point} v1 + * @param {cc.point} v2 + */ cc.pAddIn = function(v1, v2) { v1.x += v2.x; v1.y += v2.y; }; /** - * normalizes the point (inplace) - */ + * normalizes the point (inplace) + * @param {cc.Point} v + */ cc.pNormalizeIn = function(v) { cc.pMultIn(v, 1.0 / Math.sqrt(v.x * v.x + v.y * v.y)); }; diff --git a/cocos2d/core/support/CCVertex.js b/cocos2d/core/support/CCVertex.js index a5b3f06026..44b92f0d22 100644 --- a/cocos2d/core/support/CCVertex.js +++ b/cocos2d/core/support/CCVertex.js @@ -1,5 +1,7 @@ /**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org + Copyright (c) 2008-2010 Ricardo Quesada + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. Copyright (c) 2009 Valentin Milea http://www.cocos2d-x.org @@ -74,7 +76,7 @@ cc.vertexLineToPolygon = function (points, stroke, vertices, offset, nuPoints) { } // Validate vertexes - offset = (offset == 0) ? 0 : offset - 1; + offset = (offset === 0) ? 0 : offset - 1; for (i = offset; i < nuPointsMinus; i++) { idx = i * 2; var idx1 = idx + 2; @@ -115,7 +117,7 @@ cc.vertexLineIntersect = function (Ax, Ay, Bx, By, Cx, Cy, Dx, Dy) { var distAB, theCos, theSin, newX; // FAIL: Line undefined - if ((Ax == Bx && Ay == By) || (Cx == Dx && Cy == Dy)) + if ((Ax === Bx && Ay === By) || (Cx === Dx && Cy === Dy)) return {isSuccess:false, value:0}; // Translate system to make A the origin @@ -140,11 +142,29 @@ cc.vertexLineIntersect = function (Ax, Ay, Bx, By, Cx, Cy, Dx, Dy) { Dx = newX; // FAIL: Lines are parallel. - if (Cy == Dy) return {isSuccess:false, value:0}; + if (Cy === Dy) return {isSuccess:false, value:0}; // Discover the relative position of the intersection in the line AB var t = (Dx + (Cx - Dx) * Dy / (Dy - Cy)) / distAB; // Success. return {isSuccess:true, value:t}; +}; + +/** + * returns wheter or not polygon defined by vertex list is clockwise + * @param {Array} verts + * @return {Boolean} + */ +cc.vertexListIsClockwise = function(verts) { + for (var i = 0, len = verts.length; i < len; i++) { + var a = verts[i]; + var b = verts[(i + 1) % len]; + var c = verts[(i + 2) % len]; + + if (cc.pCross(cc.pSub(b, a), cc.pSub(c, b)) > 0) + return false; + } + + return true; }; \ No newline at end of file diff --git a/cocos2d/core/support/TransformUtils.js b/cocos2d/core/support/TransformUtils.js index 80cd797290..bb57c6f8c4 100644 --- a/cocos2d/core/support/TransformUtils.js +++ b/cocos2d/core/support/TransformUtils.js @@ -1,5 +1,7 @@ /**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org + Copyright (c) 2008-2010 Ricardo Quesada + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. Copyright (c) 2009 Valentin Milea http://www.cocos2d-x.org diff --git a/cocos2d/core/textures/CCTexture2D.js b/cocos2d/core/textures/CCTexture2D.js index cd1401d309..dca144d060 100644 --- a/cocos2d/core/textures/CCTexture2D.js +++ b/cocos2d/core/textures/CCTexture2D.js @@ -1,7 +1,7 @@ /**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2008-2010 Ricardo Quesada - Copyright (c) 2011 Zynga Inc. + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -110,6 +110,7 @@ if (cc._renderType === cc._RENDER_TYPE_CANVAS) { * @extends cc.Class * * @property {WebGLTexture} name - <@readonly> WebGLTexture Object + * @property {Number} defaultPixelFormat - The default pixel format * @property {Number} pixelFormat - <@readonly> Pixel format of the texture * @property {Number} pixelsWidth - <@readonly> Width in pixels * @property {Number} pixelsHeight - <@readonly> Height in pixels @@ -119,29 +120,40 @@ if (cc._renderType === cc._RENDER_TYPE_CANVAS) { * @property {Number} maxS - Texture max S * @property {Number} maxT - Texture max T */ - - cc.Texture2D = cc.Class.extend({ + cc.Texture2D = cc.Class.extend(/** @lends cc.Texture2D# */{ _contentSize: null, - _isLoaded: false, + _textureLoaded: false, _htmlElementObj: null, - _loadedEventListeners: null, - url: null, + _pattern: null, ctor: function () { this._contentSize = cc.size(0, 0); - this._isLoaded = false; + this._textureLoaded = false; this._htmlElementObj = null; + this._pattern = ""; }, + /** + * get width in pixels + * @return {Number} + */ getPixelsWide: function () { return this._contentSize.width; }, + /** + * get height of in pixels + * @return {Number} + */ getPixelsHigh: function () { return this._contentSize.height; }, + /** + * get content size + * @returns {cc.Size} + */ getContentSize: function () { var locScaleFactor = cc.contentScaleFactor(); return cc.size(this._contentSize.width / locScaleFactor, this._contentSize.height / locScaleFactor); @@ -154,45 +166,67 @@ if (cc._renderType === cc._RENDER_TYPE_CANVAS) { return this._contentSize.height / cc.contentScaleFactor(); }, + /** + * get content size in pixels + * @returns {cc.Size} + */ getContentSizeInPixels: function () { return this._contentSize; }, + /** + * init with HTML element + * @param {HTMLImageElement|HTMLCanvasElement} element + */ initWithElement: function (element) { if (!element) return; this._htmlElementObj = element; + this._contentSize.width = element.width; + this._contentSize.height = element.height; + this._textureLoaded = true; }, /** * HTMLElement Object getter - * @return {HTMLElement} + * @return {HTMLImageElement|HTMLCanvasElement} */ getHtmlElementObj: function () { return this._htmlElementObj; }, + /** + * check whether texture is loaded + * @returns {boolean} + */ isLoaded: function () { - return this._isLoaded; + return this._textureLoaded; }, + /** + * handle loaded texture + */ handleLoadedTexture: function () { - var self = this - if (self._isLoaded) return; + var self = this; + if (self._textureLoaded) return; if (!self._htmlElementObj) { var img = cc.loader.getRes(self.url); if (!img) return; self.initWithElement(img); } - self._isLoaded = true; var locElement = self._htmlElementObj; self._contentSize.width = locElement.width; self._contentSize.height = locElement.height; - self._callLoadedEventCallbacks(); + //dispatch load event to listener. + self.dispatchEvent("load"); }, + /** + * description of cc.Texture2D + * @returns {string} + */ description: function () { return "
Creates a TextureAtlas with an filename and with an initial capacity for Quads.
* The TextureAtlas capacity can be increased in runtime.
Creates a TextureAtlas with an filename and with an initial capacity for Quads.
* The TextureAtlas capacity can be increased in runtime.
* * @param haveAlphaPremultiplied - * @constructor */ _c.PVRImagesHavePremultipliedAlpha = function (haveAlphaPremultiplied) { cc.PVRHaveAlphaPremultiplied_ = haveAlphaPremultiplied; @@ -203,7 +202,7 @@ _tmp.PrototypeTexture2D = function () { _c.defaultPixelFormat = _c.PIXEL_FORMAT_DEFAULT; }; -_tmp.PrototypeTextureAtlas = function () { +cc._tmp.PrototypeTextureAtlas = function () { var _p = cc.TextureAtlas.prototype; diff --git a/cocos2d/core/textures/TexturesWebGL.js b/cocos2d/core/textures/TexturesWebGL.js index 190b39eee9..c08cd2c49d 100644 --- a/cocos2d/core/textures/TexturesWebGL.js +++ b/cocos2d/core/textures/TexturesWebGL.js @@ -1,7 +1,7 @@ /**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2008-2010 Ricardo Quesada - Copyright (c) 2011 Zynga Inc. + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -24,7 +24,7 @@ THE SOFTWARE. ****************************************************************************/ -_tmp.WebGLTexture2D = function () { +cc._tmp.WebGLTexture2D = function () { /** *
@@ -38,6 +38,7 @@ _tmp.WebGLTexture2D = function () {
* @extends cc.Class
*
* @property {WebGLTexture} name - <@readonly> WebGLTexture Object
+ * @property {Number} defaultPixelFormat - The default pixel format
* @property {Number} pixelFormat - <@readonly> Pixel format of the texture
* @property {Number} pixelsWidth - <@readonly> Width in pixels
* @property {Number} pixelsHeight - <@readonly> Height in pixels
@@ -63,19 +64,23 @@ _tmp.WebGLTexture2D = function () {
shaderProgram: null,
- _isLoaded: false,
+ _textureLoaded: false,
_htmlElementObj: null,
_webTextureObj: null,
url: null,
- _loadedEventListeners: null,
- /*public:*/
+ /**
+ * constructor of cc.Texture2D
+ */
ctor: function () {
this._contentSize = cc.size(0, 0);
this._pixelFormat = cc.Texture2D.defaultPixelFormat;
},
+ /**
+ * release texture
+ */
releaseTexture: function () {
if (this._webTextureObj)
cc._renderContext.deleteTexture(this._webTextureObj);
@@ -129,24 +134,42 @@ _tmp.WebGLTexture2D = function () {
return this._contentSize.height / cc.contentScaleFactor();
},
+ /**
+ * get content size in pixels
+ * @return {cc.Size}
+ */
getContentSizeInPixels: function () {
return this._contentSize;
},
- /** texture max S */
+ /**
+ * texture max S
+ * @return {Number}
+ */
getMaxS: function () {
return this.maxS;
},
+ /**
+ * set texture max S
+ * @param {Number} maxS
+ */
setMaxS: function (maxS) {
this.maxS = maxS;
},
- /** texture max T */
+ /**
+ * get texture max T
+ * @return {Number}
+ */
getMaxT: function () {
return this.maxT;
},
+ /**
+ * set texture max T
+ * @param {Number} maxT
+ */
setMaxT: function (maxT) {
this.maxT = maxT;
},
@@ -175,10 +198,18 @@ _tmp.WebGLTexture2D = function () {
return this._hasPremultipliedAlpha;
},
+ /**
+ * whether or not use mipmap
+ * @return {Boolean}
+ */
hasMipmaps: function () {
return this._hasMipmaps;
},
+ /**
+ * description
+ * @return {string}
+ */
description: function () {
var _t = this;
return "
Draws n quads from an index (offset).
* n + start can't be greater than the capacity of the atlas
+ * It will be deprecated in future, please use getVertex instead. * @param {cc.Point} pos * @return {cc.Vertex3F} */ vertex:function (pos) { + return this.getVertex(pos); + }, + + /** + * returns the vertex at a given position + * @param {cc.Point} pos + * @return {cc.Vertex3F} + */ + getVertex: function(pos){ if(pos.x !== (0| pos.x) || pos.y !== (0| pos.y)) cc.log("cc.Grid3D.vertex() : Numbers must be integers"); var index = 0 | ((pos.x * (this._gridSize.height + 1) + pos.y) * 3); @@ -333,11 +358,21 @@ cc.Grid3D = cc.GridBase.extend(/** @lends cc.Grid3D# */{ }, /** - * returns the original (non-transformed) vertex at a given position + * returns the original (non-transformed) vertex at a given position
+ * It will be deprecated in future, please use getOriginalVertex instead. * @param {cc.Point} pos * @return {cc.Vertex3F} */ originalVertex:function (pos) { + return this.getOriginalVertex(pos); + }, + + /** + * returns the original (non-transformed) vertex at a given position + * @param {cc.Point} pos + * @return {cc.Vertex3F} + */ + getOriginalVertex: function(pos) { if(pos.x !== (0| pos.x) || pos.y !== (0| pos.y)) cc.log("cc.Grid3D.originalVertex() : Numbers must be integers"); var index = 0 | ((pos.x * (this._gridSize.height + 1) + pos.y) * 3); @@ -361,11 +396,34 @@ cc.Grid3D = cc.GridBase.extend(/** @lends cc.Grid3D# */{ this._dirty = true; }, - blit:function () { + beforeBlit: function () { + if (this._needDepthTestForBlit) { + var gl = cc._renderContext; + this._oldDepthTestValue = gl.isEnabled(gl.DEPTH_TEST); + this._oldDepthWriteValue = gl.getParameter(gl.DEPTH_WRITEMASK); + //CHECK_GL_ERROR_DEBUG(); + gl.enable(gl.DEPTH_TEST); + gl.depthMask(true); + } + }, + + afterBlit: function () { + if (this._needDepthTestForBlit) { + var gl = cc._renderContext; + if (this._oldDepthTestValue) + gl.enable(gl.DEPTH_TEST); + else + gl.disable(gl.DEPTH_TEST); + gl.depthMask(this._oldDepthWriteValue); + } + }, + + blit:function (target) { var n = this._gridSize.width * this._gridSize.height; cc.glEnableVertexAttribs(cc.VERTEX_ATTRIB_FLAG_POSITION | cc.VERTEX_ATTRIB_FLAG_TEX_COORDS); this._shaderProgram.use(); - this._shaderProgram.setUniformsForBuiltins(); + //this._shaderProgram.setUniformsForBuiltins(); + this._shaderProgram._setUniformForMVPMatrixWithMat4(target._renderCmd._stackMatrix); var gl = cc._renderContext, locDirty = this._dirty; // @@ -476,11 +534,20 @@ cc.Grid3D = cc.GridBase.extend(/** @lends cc.Grid3D# */{ gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, this._indicesBuffer); gl.bufferData(gl.ELEMENT_ARRAY_BUFFER, this._indices, gl.STATIC_DRAW); this._dirty = true; + }, + + setNeedDepthTestForBlit: function(needDepthTest){ + this._needDepthTestForBlit = needDepthTest; + }, + + getNeedDepthTestForBlit: function(){ + return this._needDepthTestForBlit; } }); /** * create one Grid3D object + * @deprecated * @param {cc.Size} gridSize * @param {cc.Texture2D} [texture=] * @param {Boolean} [flipped=] @@ -508,7 +575,7 @@ cc.TiledGrid3D = cc.GridBase.extend(/** @lends cc.TiledGrid3D# */{ /** * create one TiledGrid3D object - * @constructor + * Constructor of cc.TiledGrid3D * @param {cc.Size} gridSize * @param {cc.Texture2D} [texture=] * @param {Boolean} [flipped=] @@ -529,11 +596,21 @@ cc.TiledGrid3D = cc.GridBase.extend(/** @lends cc.TiledGrid3D# */{ }, /** - * returns the tile at the given position + * returns the tile at the given position
+ * It will be deprecated in future, please use getTile instead. * @param {cc.Point} pos * @return {cc.Quad3} */ tile:function (pos) { + return this.getTile(pos); + }, + + /** + * returns the tile at the given position + * @param {cc.Point} pos + * @return {cc.Quad3} + */ + getTile: function(pos){ if(pos.x !== (0| pos.x) || pos.y !== (0| pos.y)) cc.log("cc.TiledGrid3D.tile() : Numbers must be integers"); @@ -550,7 +627,7 @@ cc.TiledGrid3D = cc.GridBase.extend(/** @lends cc.TiledGrid3D# */{ * @param {cc.Point} pos * @return {cc.Quad3} */ - originalTile:function (pos) { + getOriginalTile:function (pos) { if(pos.x !== (0| pos.x) || pos.y !== (0| pos.y)) cc.log("cc.TiledGrid3D.originalTile() : Numbers must be integers"); @@ -562,6 +639,16 @@ cc.TiledGrid3D = cc.GridBase.extend(/** @lends cc.TiledGrid3D# */{ new cc.Vertex3F(locOriginalVertices[idx + 9], locOriginalVertices[idx + 10], locOriginalVertices[idx + 11])); }, + /** + * returns the original tile (untransformed) at the given position.
+ * It will be deprecated in future, please use getOriginalTile instead. + * @param {cc.Point} pos + * @return {cc.Quad3} + */ + originalTile: function(pos) { + return this.getOriginalTile(pos); + }, + /** * sets a new tile * @param {cc.Point} pos @@ -588,11 +675,12 @@ cc.TiledGrid3D = cc.GridBase.extend(/** @lends cc.TiledGrid3D# */{ this._dirty = true; }, - blit:function () { + blit: function (target) { var n = this._gridSize.width * this._gridSize.height; this._shaderProgram.use(); - this._shaderProgram.setUniformsForBuiltins(); + this._shaderProgram._setUniformForMVPMatrixWithMat4(target._renderCmd._stackMatrix); + //this._shaderProgram.setUniformsForBuiltins(); // // Attributes @@ -718,6 +806,7 @@ cc.TiledGrid3D = cc.GridBase.extend(/** @lends cc.TiledGrid3D# */{ /** * create one TiledGrid3D object + * @deprecated since v3.0, please use new cc.TiledGrid3D(gridSize, texture, flipped) instead * @param {cc.Size} gridSize * @param {cc.Texture2D} [texture=] * @param {Boolean} [flipped=] diff --git a/cocos2d/kazmath/aabb.js b/cocos2d/kazmath/aabb.js index a5c8a116d2..8c5dc5b664 100644 --- a/cocos2d/kazmath/aabb.js +++ b/cocos2d/kazmath/aabb.js @@ -1,5 +1,7 @@ /** - Copyright (c) 2010-2012 cocos2d-x.org + Copyright (c) 2008-2010 Ricardo Quesada + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. Copyright (c) 2008, Luke Benstead. All rights reserved. @@ -25,42 +27,52 @@ */ /** - * A struture that represents an axis-aligned - * bounding box. + * A structure that represents an axis-aligned bounding box. + * cc.kmAABB => cc.math.AABB */ -cc.kmAABB = function (min, max) { +cc.math.AABB = function (min, max) { /** The max corner of the box */ - this.min = min || new cc.kmVec3(); + this.min = min || new cc.math.Vec3(); /** The min corner of the box */ - this.max = max || new cc.kmVec3(); + this.max = max || new cc.math.Vec3(); }; /** - * Returns KM_TRUE if point is in the specified AABB, returns - * KM_FALSE otherwise. + * Returns true if point is in the specified AABB, returns false otherwise. + * @param {cc.math.Vec3} point + * @returns {boolean} */ -cc.kmAABBContainsPoint = function (pPoint, pBox) { - if (pPoint.x >= pBox.min.x && pPoint.x <= pBox.max.x && +cc.math.AABB.prototype.containsPoint = function (point) { + return (point.x >= this.min.x && point.x <= this.max.x && + point.y >= this.min.y && point.y <= this.max.y && + point.z >= this.min.z && point.z <= this.max.z); +}; + +/** + * Returns true if point is in the specified AABB, returns + * false otherwise. + */ +cc.math.AABB.containsPoint = function (pPoint, pBox) { + return (pPoint.x >= pBox.min.x && pPoint.x <= pBox.max.x && pPoint.y >= pBox.min.y && pPoint.y <= pBox.max.y && - pPoint.z >= pBox.min.z && pPoint.z <= pBox.max.z) { - return cc.KM_TRUE; - } - return cc.KM_FALSE; + pPoint.z >= pBox.min.z && pPoint.z <= pBox.max.z); }; /** - * Assigns pIn to pOut, returns pOut. + * Assigns aabb to current AABB object + * @param {cc.math.AABB} aabb */ -cc.kmAABBAssign = function (pOut, pIn) { - cc.kmVec3Assign(pOut.min, pIn.min); - cc.kmVec3Assign(pOut.max, pIn.max); - return pOut; +cc.math.AABB.prototype.assignFrom = function(aabb){ + this.min.assignFrom(aabb.min); + this.max.assignFrom(aabb.max); }; /** - * Scales pIn by s, stores the resulting AABB in pOut. Returns pOut + * Assigns pIn to pOut, returns pOut. */ -cc.kmAABBScale = function (pOut, pIn, s) { - cc.log("cc.kmAABBScale hasn't been supported."); +cc.math.AABB.assign = function (pOut, pIn) { //cc.kmAABBAssign + pOut.min.assignFrom(pIn.min); + pOut.max.assignFrom(pIn.max); + return pOut; }; diff --git a/cocos2d/kazmath/gl/mat4stack.js b/cocos2d/kazmath/gl/mat4stack.js index 0532d759dc..ecd3aceba3 100644 --- a/cocos2d/kazmath/gl/mat4stack.js +++ b/cocos2d/kazmath/gl/mat4stack.js @@ -1,5 +1,7 @@ /** - Copyright (c) 2010-2012 cocos2d-x.org + Copyright (c) 2008-2010 Ricardo Quesada + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. Copyright (c) 2008, Luke Benstead. All rights reserved. @@ -24,33 +26,72 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -cc.km_mat4_stack = function(capacity, item_count, top, stack){ - this.top = top ; - this.stack = stack ; -}; - -cc.km_mat4_stack.INITIAL_SIZE = 30; - -cc.km_mat4_stack_initialize = function(stack){ - stack.stack = []; //allocate the memory - stack.top = null; //Set the top to NULL -}; - -cc.km_mat4_stack_push = function(stack, item){ - stack.stack.push(stack.top); - stack.top = new cc.kmMat4(); - cc.kmMat4Assign(stack.top, item); -}; - -cc.km_mat4_stack_pop = function(stack, pOut){ - stack.top = stack.stack.pop(); -}; - -cc.km_mat4_stack_release = function(stack){ - stack.stack = null; - stack.top = null; - stack = null; -}; +(function(cc){ + /** + * The stack of cc.math.Matrix4 + * @param {cc.math.Matrix4} [top] + * @param {Array} [stack] + * @constructor + */ + cc.math.Matrix4Stack = function(top, stack) { + this.top = top; + this.stack = stack || []; + //this._matrixPool = []; // use pool in next version + }; + cc.km_mat4_stack = cc.math.Matrix4Stack; + var proto = cc.math.Matrix4Stack.prototype; + + proto.initialize = function() { //cc.km_mat4_stack_initialize + this.stack.length = 0; + this.top = null; + }; + + //for compatibility + cc.km_mat4_stack_push = function(stack, item){ + stack.stack.push(stack.top); + stack.top = new cc.math.Matrix4(item); + }; + + cc.km_mat4_stack_pop = function(stack, pOut){ + stack.top = stack.stack.pop(); + }; + + cc.km_mat4_stack_release = function(stack){ + stack.stack = null; + stack.top = null; + }; + + proto.push = function(item) { + item = item || this.top; + this.stack.push(this.top); + this.top = new cc.math.Matrix4(item); + //this.top = this._getFromPool(item); + }; + + proto.pop = function() { + //this._putInPool(this.top); + this.top = this.stack.pop(); + }; + + proto.release = function(){ + this.stack = null; + this.top = null; + this._matrixPool = null; + }; + + proto._getFromPool = function (item) { + var pool = this._matrixPool; + if (pool.length === 0) + return new cc.math.Matrix4(item); + var ret = pool.pop(); + ret.assignFrom(item); + return ret; + }; + + proto._putInPool = function(matrix){ + this._matrixPool.push(matrix); + }; +})(cc); diff --git a/cocos2d/kazmath/gl/matrix.js b/cocos2d/kazmath/gl/matrix.js index 6459b51bda..3975fa620c 100644 --- a/cocos2d/kazmath/gl/matrix.js +++ b/cocos2d/kazmath/gl/matrix.js @@ -1,5 +1,7 @@ /** - Copyright (c) 2010-2012 cocos2d-x.org + Copyright (c) 2008-2010 Ricardo Quesada + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. Copyright (c) 2008, Luke Benstead. All rights reserved. @@ -24,144 +26,142 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -cc.KM_GL_MODELVIEW = 0x1700; +(function(cc) { + cc.KM_GL_MODELVIEW = 0x1700; + cc.KM_GL_PROJECTION = 0x1701; + cc.KM_GL_TEXTURE = 0x1702; -cc.KM_GL_PROJECTION = 0x1701; + cc.modelview_matrix_stack = new cc.math.Matrix4Stack(); + cc.projection_matrix_stack = new cc.math.Matrix4Stack(); + cc.texture_matrix_stack = new cc.math.Matrix4Stack(); -cc.KM_GL_TEXTURE = 0x1702; + cc.current_stack = null; + var initialized = false; -cc.modelview_matrix_stack = new cc.km_mat4_stack(); -cc.projection_matrix_stack = new cc.km_mat4_stack(); -cc.texture_matrix_stack = new cc.km_mat4_stack(); + cc.lazyInitialize = function () { + if (!initialized) { + var identity = new cc.math.Matrix4(); //Temporary identity matrix -cc.current_stack = null; + //Initialize all 3 stacks + cc.modelview_matrix_stack.initialize(); + cc.projection_matrix_stack.initialize(); + cc.texture_matrix_stack.initialize(); -cc.initialized = false; - -cc.lazyInitialize = function () { - if (!cc.initialized) { - var identity = new cc.kmMat4(); //Temporary identity matrix - - //Initialize all 3 stacks - cc.km_mat4_stack_initialize(cc.modelview_matrix_stack); - cc.km_mat4_stack_initialize(cc.projection_matrix_stack); - cc.km_mat4_stack_initialize(cc.texture_matrix_stack); - - cc.current_stack = cc.modelview_matrix_stack; - cc.initialized = true; - cc.kmMat4Identity(identity); - - //Make sure that each stack has the identity matrix - cc.km_mat4_stack_push(cc.modelview_matrix_stack, identity); - cc.km_mat4_stack_push(cc.projection_matrix_stack, identity); - cc.km_mat4_stack_push(cc.texture_matrix_stack, identity); - } -}; - -cc.lazyInitialize(); - -cc.kmGLFreeAll = function () { - //Clear the matrix stacks - cc.km_mat4_stack_release(cc.modelview_matrix_stack); - cc.km_mat4_stack_release(cc.projection_matrix_stack); - cc.km_mat4_stack_release(cc.texture_matrix_stack); - - //Delete the matrices - cc.initialized = false; //Set to uninitialized - cc.current_stack = null; //Set the current stack to point nowhere -}; - -cc.kmGLPushMatrix = function () { - cc.km_mat4_stack_push(cc.current_stack, cc.current_stack.top); -}; - -cc.kmGLPushMatrixWitMat4 = function (saveMat) { - cc.current_stack.stack.push(cc.current_stack.top); - cc.kmMat4Assign(saveMat, cc.current_stack.top); - cc.current_stack.top = saveMat; -}; - -cc.kmGLPopMatrix = function () { - //No need to lazy initialize, you shouldnt be popping first anyway! - //cc.km_mat4_stack_pop(cc.current_stack, null); - cc.current_stack.top = cc.current_stack.stack.pop(); -}; - -cc.kmGLMatrixMode = function (mode) { - //cc.lazyInitialize(); - switch (mode) { - case cc.KM_GL_MODELVIEW: cc.current_stack = cc.modelview_matrix_stack; - break; - case cc.KM_GL_PROJECTION: - cc.current_stack = cc.projection_matrix_stack; - break; - case cc.KM_GL_TEXTURE: - cc.current_stack = cc.texture_matrix_stack; - break; - default: - throw "Invalid matrix mode specified"; //TODO: Proper error handling - break; - } -}; - -cc.kmGLLoadIdentity = function () { - //cc.lazyInitialize(); - cc.kmMat4Identity(cc.current_stack.top); //Replace the top matrix with the identity matrix -}; - -cc.kmGLLoadMatrix = function (pIn) { - //cc.lazyInitialize(); - cc.kmMat4Assign(cc.current_stack.top, pIn); -}; - -cc.kmGLMultMatrix = function (pIn) { - //cc.lazyInitialize(); - cc.kmMat4Multiply(cc.current_stack.top, cc.current_stack.top, pIn); -}; - -cc.kmGLTranslatef = function (x, y, z) { - var translation = new cc.kmMat4(); - - //Create a rotation matrix using the axis and the angle - cc.kmMat4Translation(translation, x, y, z); - - //Multiply the rotation matrix by the current matrix - cc.kmMat4Multiply(cc.current_stack.top, cc.current_stack.top, translation); -}; - -cc.kmGLRotatef = function (angle, x, y, z) { - var axis = new cc.kmVec3(x, y, z); - var rotation = new cc.kmMat4(); - - //Create a rotation matrix using the axis and the angle - cc.kmMat4RotationAxisAngle(rotation, axis, cc.kmDegreesToRadians(angle)); - - //Multiply the rotation matrix by the current matrix - cc.kmMat4Multiply(cc.current_stack.top, cc.current_stack.top, rotation); -}; - -cc.kmGLScalef = function (x, y, z) { - var scaling = new cc.kmMat4(); - cc.kmMat4Scaling(scaling, x, y, z); - cc.kmMat4Multiply(cc.current_stack.top, cc.current_stack.top, scaling); -}; - -cc.kmGLGetMatrix = function (mode, pOut) { - //cc.lazyInitialize(); - - switch (mode) { - case cc.KM_GL_MODELVIEW: - cc.kmMat4Assign(pOut, cc.modelview_matrix_stack.top); - break; - case cc.KM_GL_PROJECTION: - cc.kmMat4Assign(pOut, cc.projection_matrix_stack.top); - break; - case cc.KM_GL_TEXTURE: - cc.kmMat4Assign(pOut, cc.texture_matrix_stack.top); - break; - default: - throw "Invalid matrix mode specified"; //TODO: Proper error handling - break; - } -}; + cc.initialized = true; + identity.identity(); + + //Make sure that each stack has the identity matrix + cc.modelview_matrix_stack.push(identity); + cc.projection_matrix_stack.push(identity); + cc.texture_matrix_stack.push(identity); + } + }; + + cc.lazyInitialize(); + + cc.kmGLFreeAll = function () { + //Clear the matrix stacks + cc.modelview_matrix_stack.release(); + cc.modelview_matrix_stack = null; + cc.projection_matrix_stack.release(); + cc.projection_matrix_stack = null; + cc.texture_matrix_stack.release(); + cc.texture_matrix_stack = null; + + //Delete the matrices + cc.initialized = false; //Set to uninitialized + cc.current_stack = null; //Set the current stack to point nowhere + }; + + cc.kmGLPushMatrix = function () { + cc.current_stack.push(cc.current_stack.top); + }; + + cc.kmGLPushMatrixWitMat4 = function (saveMat) { + cc.current_stack.stack.push(cc.current_stack.top); + saveMat.assignFrom(cc.current_stack.top); + cc.current_stack.top = saveMat; + }; + + cc.kmGLPopMatrix = function () { + //No need to lazy initialize, you shouldnt be popping first anyway! + //cc.km_mat4_stack_pop(cc.current_stack, null); + cc.current_stack.top = cc.current_stack.stack.pop(); + }; + + cc.kmGLMatrixMode = function (mode) { + //cc.lazyInitialize(); + switch (mode) { + case cc.KM_GL_MODELVIEW: + cc.current_stack = cc.modelview_matrix_stack; + break; + case cc.KM_GL_PROJECTION: + cc.current_stack = cc.projection_matrix_stack; + break; + case cc.KM_GL_TEXTURE: + cc.current_stack = cc.texture_matrix_stack; + break; + default: + throw "Invalid matrix mode specified"; //TODO: Proper error handling + break; + } + }; + + cc.kmGLLoadIdentity = function () { + //cc.lazyInitialize(); + cc.current_stack.top.identity(); //Replace the top matrix with the identity matrix + }; + + cc.kmGLLoadMatrix = function (pIn) { + //cc.lazyInitialize(); + cc.current_stack.top.assignFrom(pIn); + }; + + cc.kmGLMultMatrix = function (pIn) { + //cc.lazyInitialize(); + cc.current_stack.top.multiply(pIn); + }; + + var tempMatrix = new cc.math.Matrix4(); //an internal matrix + cc.kmGLTranslatef = function (x, y, z) { + //Create a rotation matrix using translation + var translation = cc.math.Matrix4.createByTranslation(x, y, z, tempMatrix); + + //Multiply the rotation matrix by the current matrix + cc.current_stack.top.multiply(translation); + }; + + var tempVector3 = new cc.math.Vec3(); + cc.kmGLRotatef = function (angle, x, y, z) { + tempVector3.fill(x, y, z); + //Create a rotation matrix using the axis and the angle + var rotation = cc.math.Matrix4.createByAxisAndAngle(tempVector3, cc.degreesToRadians(angle), tempMatrix); + + //Multiply the rotation matrix by the current matrix + cc.current_stack.top.multiply(rotation); + }; + + cc.kmGLScalef = function (x, y, z) { + var scaling = cc.math.Matrix4.createByScale(x, y, z, tempMatrix); + cc.current_stack.top.multiply(scaling); + }; + + cc.kmGLGetMatrix = function (mode, pOut) { + //cc.lazyInitialize(); + switch (mode) { + case cc.KM_GL_MODELVIEW: + pOut.assignFrom(cc.modelview_matrix_stack.top); + break; + case cc.KM_GL_PROJECTION: + pOut.assignFrom(cc.projection_matrix_stack.top); + break; + case cc.KM_GL_TEXTURE: + pOut.assignFrom(cc.texture_matrix_stack.top); + break; + default: + throw "Invalid matrix mode specified"; //TODO: Proper error handling + break; + } + }; +})(cc); diff --git a/cocos2d/kazmath/mat3.js b/cocos2d/kazmath/mat3.js index 7bcc8a1c77..05cdbe1417 100644 --- a/cocos2d/kazmath/mat3.js +++ b/cocos2d/kazmath/mat3.js @@ -1,5 +1,7 @@ /** - Copyright (c) 2010-2012 cocos2d-x.org + Copyright (c) 2008-2010 Ricardo Quesada + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. Copyright (c) 2008, Luke Benstead. All rights reserved. @@ -25,301 +27,315 @@ */ var Float32Array = Float32Array || Array; - -cc.kmMat3 = function () { - this.mat = new Float32Array([0, 0, 0, - 0, 0, 0, - 0, 0, 0]); -}; - -cc.kmMat3Fill = function (pOut, pMat) { - for (var i = 0; i < 9; i++) { - pOut.mat[i] = pMat; - } - return pOut; -}; - -cc.kmMat3Adjugate = function (pOut, pIn) { - pOut.mat[0] = pIn.mat[4] * pIn.mat[8] - pIn.mat[5] * pIn.mat[7]; - pOut.mat[1] = pIn.mat[2] * pIn.mat[7] - pIn.mat[1] * pIn.mat[8]; - pOut.mat[2] = pIn.mat[1] * pIn.mat[5] - pIn.mat[2] * pIn.mat[4]; - pOut.mat[3] = pIn.mat[5] * pIn.mat[6] - pIn.mat[3] * pIn.mat[8]; - pOut.mat[4] = pIn.mat[0] * pIn.mat[8] - pIn.mat[2] * pIn.mat[6]; - pOut.mat[5] = pIn.mat[2] * pIn.mat[3] - pIn.mat[0] * pIn.mat[5]; - pOut.mat[6] = pIn.mat[3] * pIn.mat[7] - pIn.mat[4] * pIn.mat[6]; - - // XXX: pIn.mat[9] is invalid! -// pOut.mat[7] = pIn.mat[1] * pIn.mat[6] - pIn.mat[9] * pIn.mat[7]; - pOut.mat[8] = pIn.mat[0] * pIn.mat[4] - pIn.mat[1] * pIn.mat[3]; - - return pOut; -}; - -cc.kmMat3Identity = function (pOut) { - pOut.mat[1] = pOut.mat[2] = pOut.mat[3] = - pOut.mat[5] = pOut.mat[6] = pOut.mat[7] = 0; - pOut.mat[0] = pOut.mat[4] = pOut.mat[8] = 1.0; - return pOut; -}; - -cc.kmMat3Inverse = function (pOut, pDeterminate, pM) { - var detInv; - var adjugate = new cc.kmMat3(); - - if (pDeterminate === 0.0) - return null; - - detInv = 1.0 / pDeterminate; - - cc.kmMat3Adjugate(adjugate, pM); - cc.kmMat3ScalarMultiply(pOut, adjugate, detInv); - - return pOut; -}; - -cc.kmMat3._identity = - new Float32Array([1.0, 0.0, 0.0, - 0.0, 1.0, 0.0, - 0.0, 0.0, 1.0]); - -cc.kmMat3IsIdentity = function (pIn) { - for (var i = 0; i < 9; i++) { - if (cc.kmMat3._identity[i] !== pIn.mat[i]) - return false; - } - return true; -}; - -cc.kmMat3Transpose = function (pOut, pIn) { - var z, x; - for (z = 0; z < 3; ++z) { - for (x = 0; x < 3; ++x) - pOut.mat[(z * 3) + x] = pIn.mat[(x * 3) + z]; - } - - return pOut; -}; - -cc.kmMat3Determinant = function (pIn) { - var output; - /* - calculating the determinant following the rule of sarus, - | 0 3 6 | 0 3 | - m = | 1 4 7 | 1 4 | - | 2 5 8 | 2 5 | - now sum up the products of the diagonals going to the right (i.e. 0,4,8) - and substract the products of the other diagonals (i.e. 2,4,6) - */ - - output = pIn.mat[0] * pIn.mat[4] * pIn.mat[8] + pIn.mat[1] * pIn.mat[5] * pIn.mat[6] + pIn.mat[2] * pIn.mat[3] * pIn.mat[7]; - output -= pIn.mat[2] * pIn.mat[4] * pIn.mat[6] + pIn.mat[0] * pIn.mat[5] * pIn.mat[7] + pIn.mat[1] * pIn.mat[3] * pIn.mat[8]; - - return output; -}; - -cc.kmMat3Multiply = function (pOut, pM1, pM2) { - var m1 = pM1.mat, m2 = pM2.mat; - - pOut.mat[0] = m1[0] * m2[0] + m1[3] * m2[1] + m1[6] * m2[2]; - pOut.mat[1] = m1[1] * m2[0] + m1[4] * m2[1] + m1[7] * m2[2]; - pOut.mat[2] = m1[2] * m2[0] + m1[5] * m2[1] + m1[8] * m2[2]; - - pOut.mat[3] = m1[0] * m2[3] + m1[3] * m2[4] + m1[6] * m2[5]; - pOut.mat[4] = m1[1] * m2[3] + m1[4] * m2[4] + m1[7] * m2[5]; - pOut.mat[5] = m1[2] * m2[3] + m1[5] * m2[4] + m1[8] * m2[5]; - - pOut.mat[6] = m1[0] * m2[6] + m1[3] * m2[7] + m1[6] * m2[8]; - pOut.mat[7] = m1[1] * m2[6] + m1[4] * m2[7] + m1[7] * m2[8]; - pOut.mat[8] = m1[2] * m2[6] + m1[5] * m2[7] + m1[8] * m2[8]; - - return pOut; -}; - -cc.kmMat3ScalarMultiply = function (pOut, pM, pFactor) { - for (var i = 0; i < 9; i++) { - pOut.mat[i] = pM.mat[i] * pFactor; - } - return pOut; -}; - -cc.kmMat3RotationAxisAngle = function (pOut, axis, radians) { - var rcos = Math.cos(radians); - var rsin = Math.sin(radians); - - pOut.mat[0] = rcos + axis.x * axis.x * (1 - rcos); - pOut.mat[1] = axis.z * rsin + axis.y * axis.x * (1 - rcos); - pOut.mat[2] = -axis.y * rsin + axis.z * axis.x * (1 - rcos); - - pOut.mat[3] = -axis.z * rsin + axis.x * axis.y * (1 - rcos); - pOut.mat[4] = rcos + axis.y * axis.y * (1 - rcos); - pOut.mat[5] = axis.x * rsin + axis.z * axis.y * (1 - rcos); - - pOut.mat[6] = axis.y * rsin + axis.x * axis.z * (1 - rcos); - pOut.mat[7] = -axis.x * rsin + axis.y * axis.z * (1 - rcos); - pOut.mat[8] = rcos + axis.z * axis.z * (1 - rcos); - - return pOut; -}; - -cc.kmMat3Assign = function (pOut, pIn) { - if(pOut == pIn) { - cc.log("cc.kmMat3Assign(): pOut equals pIn"); - return pOut; - } - - for (var i = 0; i < 9; i++) - pOut.mat[i] = pIn.mat[i]; - return pOut; -}; - -cc.kmMat3AreEqual = function (pMat1, pMat2) { - if (pMat1 == pMat2) - return true; - - for (var i = 0; i < 9; ++i) { - if (!(pMat1.mat[i] + cc.kmEpsilon > pMat2.mat[i] && - pMat1.mat[i] - cc.kmEpsilon < pMat2.mat[i])) { - return false; +(function(cc){ + cc.math.Matrix3 = function(mat3) { + if (mat3 && mat3.mat) { + this.mat = new Float32Array(mat3.mat); + } else { + this.mat = new Float32Array(9); + } + }; + cc.kmMat3 = cc.math.Matrix3; + var proto = cc.math.Matrix3.prototype; + + proto.fill = function(mat3) { //cc.kmMat3Fill + var mat = this.mat, matIn = mat3.mat; + mat[0] = matIn[0]; + mat[1] = matIn[1]; + mat[2] = matIn[2]; + mat[3] = matIn[3]; + mat[4] = matIn[4]; + mat[5] = matIn[5]; + mat[6] = matIn[6]; + mat[7] = matIn[7]; + mat[8] = matIn[8]; + return this; + }; + + proto.adjugate = function(){ //= cc.kmMat3Adjugate + var mat = this.mat; + var m0 = mat[0], m1 = mat[1], m2 = mat[2], m3 = mat[3], m4 = mat[4], + m5 = mat[5], m6 = mat[6], m7 = mat[7], m8 = mat[8]; + mat[0] = m4 * m8 - m5 * m7; + mat[1] = m2 * m7 - m1 * m8; + mat[2] = m1 * m5 - m2 * m4; + mat[3] = m5 * m6 - m3 * m8; + mat[4] = m0 * m8 - m2 * m6; + mat[5] = m2 * m3 - m0 * m5; + mat[6] = m3 * m7 - m4 * m6; + + // XXX: pIn.mat[9] is invalid! + //mat[7] = m1 * m6 - pIn.mat[9] * m7; + mat[8] = m0 * m4 - m1 * m3; + return this; + }; + + proto.identity = function() { //cc.kmMat3Identity + var mat = this.mat; + mat[1] = mat[2] = mat[3] = + mat[5] = mat[6] = mat[7] = 0; + mat[0] = mat[4] = mat[8] = 1.0; + return this; + }; + + var tmpMatrix = new cc.math.Matrix3(); // internal matrix + + proto.inverse = function(determinate){ //cc.kmMat3Inverse + if (determinate === 0.0) + return this; + tmpMatrix.assignFrom(this); + var detInv = 1.0 / determinate; + this.adjugate(); + this.multiplyScalar(detInv); + return this; + }; + + proto.isIdentity = function(){ //= cc.kmMat3IsIdentity + var mat = this.mat; + return (mat[0] === 1 && mat[1] === 0 && mat[2] === 0 + && mat[3] === 0 && mat[4] === 1 && mat[5] === 0 + && mat[6] === 0 && mat[7] === 0 && mat[8] === 1); + }; + + proto.transpose = function(){ // cc.kmMat3Transpose + var mat = this.mat; + var m1 = mat[1], m2 = mat[2], m3 = mat[3], m5 = mat[5], + m6 = mat[6], m7 = mat[7]; + // m0 = mat[0],m8 = mat[8], m4 = mat[4]; + //mat[0] = m0; + //mat[8] = m8; + //mat[4] = m4 + mat[1] = m3; + mat[2] = m6; + mat[3] = m1; + mat[5] = m7; + mat[6] = m2; + mat[7] = m5; + return this; + }; + + proto.determinant = function(){ + var mat = this.mat; + /* + calculating the determinant following the rule of sarus, + | 0 3 6 | 0 3 | + m = | 1 4 7 | 1 4 | + | 2 5 8 | 2 5 | + now sum up the products of the diagonals going to the right (i.e. 0,4,8) + and substract the products of the other diagonals (i.e. 2,4,6) + */ + var output = mat[0] * mat[4] * mat[8] + mat[1] * mat[5] * mat[6] + mat[2] * mat[3] * mat[7]; + output -= mat[2] * mat[4] * mat[6] + mat[0] * mat[5] * mat[7] + mat[1] * mat[3] * mat[8]; + return output; + }; + + proto.multiply = function(mat3){ + var m1 = this.mat, m2 = mat3.mat; + var a0 = m1[0], a1 = m1[1], a2 = m1[2], a3 = m1[3], a4 = m1[4], a5 = m1[5], + a6 = m1[6], a7 = m1[7], a8 = m1[8]; + var b0 = m2[0], b1 = m2[1], b2 = m2[2], b3 = m2[3], b4 = m2[4], b5 = m2[5], + b6 = m2[6], b7 = m2[7], b8 = m2[8]; + + m1[0] = a0 * b0 + a3 * b1 + a6 * b2; + m1[1] = a1 * b0 + a4 * b1 + a7 * b2; + m1[2] = a2 * b0 + a5 * b1 + a8 * b2; + + m1[3] = a2 * b0 + a5 * b1 + a8 * b2; + m1[4] = a1 * b3 + a4 * b4 + a7 * b5; + m1[5] = a2 * b3 + a5 * b4 + a8 * b5; + + m1[6] = a0 * b6 + a3 * b7 + a6 * b8; + m1[7] = a1 * b6 + a4 * b7 + a7 * b8; + m1[8] = a2 * b6 + a5 * b7 + a8 * b8; + return this; + }; + + proto.multiplyScalar = function(factor) { + var mat = this.mat; + mat[0] *= factor; + mat[1] *= factor; + mat[2] *= factor; + mat[3] *= factor; + mat[4] *= factor; + mat[5] *= factor; + mat[6] *= factor; + mat[7] *= factor; + mat[8] *= factor; + return this; + }; + + cc.math.Matrix3.rotationAxisAngle = function(axis, radians) { //cc.kmMat3RotationAxisAngle + var rcos = Math.cos(radians), rsin = Math.sin(radians); + var retMat = new cc.math.Matrix3(); + var mat = retMat.mat; + + mat[0] = rcos + axis.x * axis.x * (1 - rcos); + mat[1] = axis.z * rsin + axis.y * axis.x * (1 - rcos); + mat[2] = -axis.y * rsin + axis.z * axis.x * (1 - rcos); + + mat[3] = -axis.z * rsin + axis.x * axis.y * (1 - rcos); + mat[4] = rcos + axis.y * axis.y * (1 - rcos); + mat[5] = axis.x * rsin + axis.z * axis.y * (1 - rcos); + + mat[6] = axis.y * rsin + axis.x * axis.z * (1 - rcos); + mat[7] = -axis.x * rsin + axis.y * axis.z * (1 - rcos); + mat[8] = rcos + axis.z * axis.z * (1 - rcos); + + return retMat; + }; + + proto.assignFrom = function(matIn){ // cc.kmMat3Assign + if(this === matIn) { + cc.log("cc.math.Matrix3.assign(): current matrix equals matIn"); + return this; } + var mat = this.mat, m2 = matIn.mat; + mat[0] = m2[0]; + mat[1] = m2[1]; + mat[2] = m2[2]; + mat[3] = m2[3]; + mat[4] = m2[4]; + mat[5] = m2[5]; + mat[6] = m2[6]; + mat[7] = m2[7]; + mat[8] = m2[8]; + return this; + }; + + proto.equals = function(mat3) { + if (this === mat3) + return true; + var EPSILON = cc.math.EPSILON,m1 = this.mat, m2 = mat3.mat; + for (var i = 0; i < 9; ++i) { + if (!(m1[i] + EPSILON > m2[i] && m1[i] - EPSILON < m2[i])) + return false; + } + return true; + }; + + cc.math.Matrix3.createByRotationX = function(radians) { + var retMat = new cc.math.Matrix3(), mat = retMat.mat; + mat[0] = 1.0; + mat[1] = 0.0; + mat[2] = 0.0; + + mat[3] = 0.0; + mat[4] = Math.cos(radians); + mat[5] = Math.sin(radians); + + mat[6] = 0.0; + mat[7] = -Math.sin(radians); + mat[8] = Math.cos(radians); + return retMat; + }; + + cc.math.Matrix3.createByRotationY = function(radians) { + /* + | cos(A) 0 sin(A) | + M = | 0 1 0 | + | -sin(A) 0 cos(A) | + */ + var retMat = new cc.math.Matrix3(), mat = retMat.mat; + mat[0] = Math.cos(radians); + mat[1] = 0.0; + mat[2] = -Math.sin(radians); + + mat[3] = 0.0; + mat[4] = 1.0; + mat[5] = 0.0; + + mat[6] = Math.sin(radians); + mat[7] = 0.0; + mat[8] = Math.cos(radians); + return retMat; + }; + + cc.math.Matrix3.createByRotationZ = function(radians) { + /* + | cos(A) -sin(A) 0 | + M = | sin(A) cos(A) 0 | + | 0 0 1 | + */ + var retMat = new cc.math.Matrix3(), mat = retMat.mat; + mat[0] = Math.cos(radians); + mat[1] = -Math.sin(radians); + mat[2] = 0.0; + + mat[3] = Math.sin(radians); + mat[4] = Math.cos(radians); + mat[5] = 0.0; + + mat[6] = 0.0; + mat[7] = 0.0; + mat[8] = 1.0; + return retMat; + }; + + cc.math.Matrix3.createByRotation = function(radians) { + /* + | cos(A) -sin(A) 0 | + M = | sin(A) cos(A) 0 | + | 0 0 1 | + */ + var retMat = new cc.math.Matrix3(), mat = retMat.mat; + mat[0] = Math.cos(radians); + mat[1] = Math.sin(radians); + mat[2] = 0.0; + + mat[3] = -Math.sin(radians); + mat[4] = Math.cos(radians); + mat[5] = 0.0; + + mat[6] = 0.0; + mat[7] = 0.0; + mat[8] = 1.0; + return retMat; + }; + + cc.math.Matrix3.createByScale = function(x, y) { + var ret = new cc.math.Matrix3(); + ret.identity(); + ret.mat[0] = x; + ret.mat[4] = y; + return ret; + }; + + cc.math.Matrix3.createByTranslation = function(x, y){ + var ret = new cc.math.Matrix3(); + ret.identity(); + ret.mat[6] = x; + ret.mat[7] = y; + return ret; + }; + + cc.math.Matrix3.createByQuaternion = function(quaternion) { //cc.kmMat3RotationQuaternion + if(!quaternion) + return null; + + var ret = new cc.math.Matrix3(), mat = ret.mat; + // First row + mat[0] = 1.0 - 2.0 * (quaternion.y * quaternion.y + quaternion.z * quaternion.z); + mat[1] = 2.0 * (quaternion.x * quaternion.y - quaternion.w * quaternion.z); + mat[2] = 2.0 * (quaternion.x * quaternion.z + quaternion.w * quaternion.y); + + // Second row + mat[3] = 2.0 * (quaternion.x * quaternion.y + quaternion.w * quaternion.z); + mat[4] = 1.0 - 2.0 * (quaternion.x * quaternion.x + quaternion.z * quaternion.z); + mat[5] = 2.0 * (quaternion.y * quaternion.z - quaternion.w * quaternion.x); + + // Third row + mat[6] = 2.0 * (quaternion.x * quaternion.z - quaternion.w * quaternion.y); + mat[7] = 2.0 * (quaternion.y * quaternion.z + quaternion.w * quaternion.x); + mat[8] = 1.0 - 2.0 * (quaternion.x * quaternion.x + quaternion.y * quaternion.y); + return ret; + }; + + proto.rotationToAxisAngle = function() { //cc.kmMat3RotationToAxisAngle + return cc.math.Quaternion.rotationMatrix(this).toAxisAndAngle(); } +})(cc); + - return true; -}; - -cc.kmMat3RotationX = function (pOut, radians) { - /* - | 1 0 0 | - M = | 0 cos(A) -sin(A) | - | 0 sin(A) cos(A) | - - */ - - pOut.mat[0] = 1.0; - pOut.mat[1] = 0.0; - pOut.mat[2] = 0.0; - - pOut.mat[3] = 0.0; - pOut.mat[4] = Math.cos(radians); - pOut.mat[5] = Math.sin(radians); - - pOut.mat[6] = 0.0; - pOut.mat[7] = -Math.sin(radians); - pOut.mat[8] = Math.cos(radians); - - return pOut; -}; - -cc.kmMat3RotationY = function (pOut, radians) { - /* - | cos(A) 0 sin(A) | - M = | 0 1 0 | - | -sin(A) 0 cos(A) | - */ - - pOut.mat[0] = Math.cos(radians); - pOut.mat[1] = 0.0; - pOut.mat[2] = -Math.sin(radians); - - pOut.mat[3] = 0.0; - pOut.mat[4] = 1.0; - pOut.mat[5] = 0.0; - - pOut.mat[6] = Math.sin(radians); - pOut.mat[7] = 0.0; - pOut.mat[8] = Math.cos(radians); - - return pOut; -}; - -cc.kmMat3RotationZ = function (pOut, radians) { - /* - | cos(A) -sin(A) 0 | - M = | sin(A) cos(A) 0 | - | 0 0 1 | - */ - pOut.mat[0] = Math.cos(radians); - pOut.mat[1] = -Math.sin(radians); - pOut.mat[2] = 0.0; - - pOut.mat[3] = Math.sin(radians); - pOut.mat[4] = Math.cos(radians); - pOut.mat[5] = 0.0; - - pOut.mat[6] = 0.0; - pOut.mat[7] = 0.0; - pOut.mat[8] = 1.0; - - return pOut; -}; - -cc.kmMat3Rotation = function (pOut, radians) { - /* - | cos(A) -sin(A) 0 | - M = | sin(A) cos(A) 0 | - | 0 0 1 | - */ - pOut.mat[0] = Math.cos(radians); - pOut.mat[1] = Math.sin(radians); - pOut.mat[2] = 0.0; - - pOut.mat[3] = -Math.sin(radians); - pOut.mat[4] = Math.cos(radians); - pOut.mat[5] = 0.0; - - pOut.mat[6] = 0.0; - pOut.mat[7] = 0.0; - pOut.mat[8] = 1.0; - return pOut; -}; - -cc.kmMat3Scaling = function (pOut, x, y) { -// memset(pOut.mat, 0, sizeof(float) * 9); - cc.kmMat3Identity(pOut); - pOut.mat[0] = x; - pOut.mat[4] = y; - - return pOut; -}; - -cc.kmMat3Translation = function (pOut, x, y) { -// memset(pOut.mat, 0, sizeof(float) * 9); - cc.kmMat3Identity(pOut); - pOut.mat[6] = x; - pOut.mat[7] = y; -// pOut.mat[8] = 1.0; - - return pOut; -}; - -cc.kmMat3RotationQuaternion = function (pOut, pIn) { - if (!pIn || !pOut) - return null; - - // First row - pOut.mat[0] = 1.0 - 2.0 * (pIn.y * pIn.y + pIn.z * pIn.z); - pOut.mat[1] = 2.0 * (pIn.x * pIn.y - pIn.w * pIn.z); - pOut.mat[2] = 2.0 * (pIn.x * pIn.z + pIn.w * pIn.y); - - // Second row - pOut.mat[3] = 2.0 * (pIn.x * pIn.y + pIn.w * pIn.z); - pOut.mat[4] = 1.0 - 2.0 * (pIn.x * pIn.x + pIn.z * pIn.z); - pOut.mat[5] = 2.0 * (pIn.y * pIn.z - pIn.w * pIn.x); - - // Third row - pOut.mat[6] = 2.0 * (pIn.x * pIn.z - pIn.w * pIn.y); - pOut.mat[7] = 2.0 * (pIn.y * pIn.z + pIn.w * pIn.x); - pOut.mat[8] = 1.0 - 2.0 * (pIn.x * pIn.x + pIn.y * pIn.y); - - return pOut; -}; - -cc.kmMat3RotationToAxisAngle = function (pAxis, radians, pIn) { - /*Surely not this easy?*/ - var temp; - cc.kmQuaternionRotationMatrix(temp, pIn); - cc.kmQuaternionToAxisAngle(temp, pAxis, radians); - return pAxis; -}; diff --git a/cocos2d/kazmath/mat4.js b/cocos2d/kazmath/mat4.js index 8fa12a41de..b1af75efc3 100644 --- a/cocos2d/kazmath/mat4.js +++ b/cocos2d/kazmath/mat4.js @@ -1,5 +1,7 @@ /** - Copyright (c) 2010-2012 cocos2d-x.org + Copyright (c) 2008-2010 Ricardo Quesada + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. Copyright (c) 2008, Luke Benstead. All rights reserved. @@ -24,784 +26,986 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/** - *
- A 4x4 matrix - - mat = - | 0 4 8 12 | - | 1 5 9 13 | - | 2 6 10 14 | - | 3 7 11 15 | -
- */ -cc.kmMat4 = function () { - this.mat = new Float32Array([0, 0, 0, 0, - 0, 0, 0, 0, - 0, 0, 0, 0, - 0, 0, 0, 0]); -}; +(function(cc) { + /** + *+ * A 4x4 matrix + * + * mat = + * | 0 4 8 12 | + * | 1 5 9 13 | + * | 2 6 10 14 | + * | 3 7 11 15 | + *
+ * @param {cc.math.Matrix4} [mat4] + */ + cc.math.Matrix4 = function (mat4) { + if(mat4 && mat4.mat){ + this.mat = new Float32Array(mat4.mat); + } else { + this.mat = new Float32Array(16); + } + }; + cc.kmMat4 = cc.math.Matrix4; + var proto = cc.math.Matrix4.prototype; -/** - * Fills a kmMat4 structure with the values from a 16 element array of floats - * @Params pOut - A pointer to the destination matrix - * @Params pMat - A 16 element array of floats - * @Return Returns pOut so that the call can be nested - */ -cc.kmMat4Fill = function (pOut, pMat) { - pOut.mat[0] = pOut.mat[1] = pOut.mat[2] =pOut.mat[3] = - pOut.mat[4] =pOut.mat[5] =pOut.mat[6] =pOut.mat[7] = - pOut.mat[8] =pOut.mat[9] =pOut.mat[10] =pOut.mat[11] = - pOut.mat[12] =pOut.mat[13] =pOut.mat[14] =pOut.mat[15] =pMat; -}; + /** + * Fills a cc.math.Matrix4 structure with the values from a 16 element array of floats + * @param {Array} scalarArr + */ + proto.fill = function(scalarArr){ //cc.kmMat4Fill + var mat = this.mat; + for(var i = 0; i < 16; i++){ + mat[i] = scalarArr[i]; + } + return this; + }; -/** - * Sets pOut to an identity matrix returns pOut - * @Params pOut - A pointer to the matrix to set to identity - * @Return Returns pOut so that the call can be nested - */ -cc.kmMat4Identity = function (pOut) { - pOut.mat[1] = pOut.mat[2] = pOut.mat[3] - = pOut.mat[4] = pOut.mat[6] = pOut.mat[7] - = pOut.mat[8] = pOut.mat[9] = pOut.mat[11] - = pOut.mat[12] = pOut.mat[13] = pOut.mat[14] = 0; - pOut.mat[0] = pOut.mat[5] = pOut.mat[10] = pOut.mat[15] = 1.0; - return pOut; -}; - -cc.kmMat4._get = function (pIn, row, col) { - return pIn.mat[row + 4 * col]; -}; - -cc.kmMat4._set = function (pIn, row, col, value) { - pIn.mat[row + 4 * col] = value; -}; - -cc.kmMat4._swap = function (pIn, r1, c1, r2, c2) { - var tmp = cc.kmMat4._get(pIn, r1, c1); - cc.kmMat4._set(pIn, r1, c1, cc.kmMat4._get(pIn, r2, c2)); - cc.kmMat4._set(pIn, r2, c2, tmp); -}; - -//Returns an upper and a lower triangular matrix which are L and R in the Gauss algorithm -cc.kmMat4._gaussj = function (a, b) { - var i, icol = 0, irow = 0, j, k, l, ll, n = 4, m = 4; - var big, dum, pivinv; - var indxc = [0, 0, 0, 0]; - var indxr = [0, 0, 0, 0]; - var ipiv = [0, 0, 0, 0]; - - /* for (j = 0; j < n; j++) { - ipiv[j] = 0; - }*/ - - for (i = 0; i < n; i++) { - big = 0.0; - for (j = 0; j < n; j++) { - if (ipiv[j] != 1) { - for (k = 0; k < n; k++) { - if (ipiv[k] == 0) { - if (Math.abs(cc.kmMat4._get(a, j, k)) >= big) { - big = Math.abs(cc.kmMat4._get(a, j, k)); - irow = j; - icol = k; + /** + * Sets pOut to an identity matrix returns pOut + * @Params pOut - A pointer to the matrix to set to identity + * @Return Returns pOut so that the call can be nested + */ + cc.kmMat4Identity = function (pOut) { + var mat = pOut.mat; + mat[1] = mat[2] = mat[3] = mat[4] = mat[6] = mat[7] + = mat[8] = mat[9] = mat[11] = mat[12] = mat[13] = mat[14] = 0; + mat[0] = mat[5] = mat[10] = mat[15] = 1.0; + return pOut; + }; + + /** + * Sets matrix to identity value. + * @returns {cc.math.Matrix4} + */ + proto.identity = function(){ + var mat = this.mat; + mat[1] = mat[2] = mat[3] = mat[4] = mat[6] = mat[7] + = mat[8] = mat[9] = mat[11] = mat[12] = mat[13] = mat[14] = 0; + mat[0] = mat[5] = mat[10] = mat[15] = 1.0; + return this; + }; + + proto.get = function(row, col){ + return this.mat[row + 4 * col]; + }; + + proto.set = function(row, col, value){ + this.mat[row + 4 * col] = value; + }; + + proto.swap = function(r1, c1, r2, c2) { +/* var tmp = this.get(r1, c1); + this.set(r1, c1, this.get(r2, c2)); + this.set(r2, c2, tmp);*/ + var mat = this.mat, tmp = mat[r1 + 4 * c1]; + mat[r1 + 4 * c1] = mat[r2 + 4 * c2]; + mat[r2 + 4 * c2] = tmp; + }; + + //Returns an upper and a lower triangular matrix which are L and R in the Gauss algorithm + cc.math.Matrix4._gaussj = function (a, b) { + var i, icol = 0, irow = 0, j, k, l, ll, n = 4, m = 4, selElement; + var big, dum, pivinv; + var indxc = [0, 0, 0, 0], indxr = [0, 0, 0, 0], ipiv = [0, 0, 0, 0]; + + /* for (j = 0; j < n; j++) { + ipiv[j] = 0; + }*/ + + for (i = 0; i < n; i++) { + big = 0.0; + for (j = 0; j < n; j++) { + if (ipiv[j] !== 1) { + for (k = 0; k < n; k++) { + if (ipiv[k] === 0) { + selElement = Math.abs(a.get(j, k)); + if (selElement >= big) { + big = selElement; + irow = j; + icol = k; + } } } } } - } - ++(ipiv[icol]); - if (irow != icol) { - for (l = 0; l < n; l++) - cc.kmMat4._swap(a, irow, l, icol, l); - for (l = 0; l < m; l++) - cc.kmMat4._swap(b, irow, l, icol, l); - } - indxr[i] = irow; - indxc[i] = icol; - if (cc.kmMat4._get(a, icol, icol) == 0.0) - return cc.KM_FALSE; - - pivinv = 1.0 / cc.kmMat4._get(a, icol, icol); - cc.kmMat4._set(a, icol, icol, 1.0); - for (l = 0; l < n; l++) - cc.kmMat4._set(a, icol, l, cc.kmMat4._get(a, icol, l) * pivinv); - - for (l = 0; l < m; l++) - cc.kmMat4._set(b, icol, l, cc.kmMat4._get(b, icol, l) * pivinv); - - for (ll = 0; ll < n; ll++) { - if (ll != icol) { - dum = cc.kmMat4._get(a, ll, icol); - cc.kmMat4._set(a, ll, icol, 0.0); + ++(ipiv[icol]); + if (irow !== icol) { for (l = 0; l < n; l++) - cc.kmMat4._set(a, ll, l, cc.kmMat4._get(a, ll, l) - cc.kmMat4._get(a, icol, l) * dum); - + a.swap(irow, l, icol, l); for (l = 0; l < m; l++) - cc.kmMat4._set(b, ll, l, cc.kmMat4._get(a, ll, l) - cc.kmMat4._get(b, icol, l) * dum); + b.swap(irow, l, icol, l); } - } - } -// This is the end of the main loop over columns of the reduction. It only remains to unscram- -// ble the solution in view of the column interchanges. We do this by interchanging pairs of -// columns in the reverse order that the permutation was built up. - for (l = n - 1; l >= 0; l--) { - if (indxr[l] != indxc[l]) { - for (k = 0; k < n; k++) - cc.kmMat4._swap(a, k, indxr[l], k, indxc[l]); - } - } - return cc.KM_TRUE; -}; - -cc.kmMat4._identity = - new Float32Array([1.0, 0.0, 0.0, 0.0, - 0.0, 1.0, 0.0, 0.0, - 0.0, 0.0, 1.0, 0.0, - 0.0, 0.0, 0.0, 1.0]); - -/** - * Calculates the inverse of pM and stores the result in - * pOut. - * @Return Returns NULL if there is no inverse, else pOut - */ -cc.kmMat4Inverse = function (pOut, pM) { - var inv = new cc.kmMat4(); - var tmp = new cc.kmMat4(); + indxr[i] = irow; + indxc[i] = icol; + if (a.get(icol, icol) === 0.0) + return false; - cc.kmMat4Assign(inv, pM); - cc.kmMat4Identity(tmp); - - if (cc.kmMat4._gaussj(inv, tmp) == cc.KM_FALSE) - return null; + pivinv = 1.0 / a.get(icol, icol); + a.set(icol, icol, 1.0); + for (l = 0; l < n; l++) + a.set(icol, l, a.get(icol, l) * pivinv); - cc.kmMat4Assign(pOut, inv); - return pOut; -}; + for (l = 0; l < m; l++) + b.set(icol, l, b.get(icol, l) * pivinv); -/** - * Returns KM_TRUE if pIn is an identity matrix - * KM_FALSE otherwise - */ -cc.kmMat4IsIdentity = function (pIn) { - for (var i = 0; i < 16; i++) { - if (cc.kmMat4._identity[i] != pIn.mat[i]) - return false; - } - return true; -}; + for (ll = 0; ll < n; ll++) { + if (ll !== icol) { + dum = a.get(ll, icol); + a.set(ll, icol, 0.0); + for (l = 0; l < n; l++) + a.set(ll, l, a.get(ll, l) - a.get(icol, l) * dum); -/** - * Sets pOut to the transpose of pIn, returns pOut - */ -cc.kmMat4Transpose = function (pOut, pIn) { - var x, z, outArr = pOut.mat,inArr = pIn.mat; - for (z = 0; z < 4; ++z) { - for (x = 0; x < 4; ++x) - outArr[(z * 4) + x] = inArr[(x * 4) + z]; - } - return pOut; -}; + for (l = 0; l < m; l++) + b.set(ll, l, a.get(ll, l) - b.get(icol, l) * dum); + } + } + } + // This is the end of the main loop over columns of the reduction. It only remains to unscram- + // ble the solution in view of the column interchanges. We do this by interchanging pairs of + // columns in the reverse order that the permutation was built up. + for (l = n - 1; l >= 0; l--) { + if (indxr[l] !== indxc[l]) { + for (k = 0; k < n; k++) + a.swap(k, indxr[l], k, indxc[l]); + } + } + return true; + }; -/** - * Multiplies pM1 with pM2, stores the result in pOut, returns pOut - */ -cc.kmMat4Multiply = function (pOut, pM1, pM2) { - // Cache the matrix values (makes for huge speed increases!) - var outArray = pOut.mat; - var a00 = pM1.mat[0], a01 = pM1.mat[1], a02 = pM1.mat[2], a03 = pM1.mat[3]; - var a10 = pM1.mat[4], a11 = pM1.mat[5], a12 = pM1.mat[6], a13 = pM1.mat[7]; - var a20 = pM1.mat[8], a21 = pM1.mat[9], a22 = pM1.mat[10], a23 = pM1.mat[11]; - var a30 = pM1.mat[12], a31 = pM1.mat[13], a32 = pM1.mat[14], a33 = pM1.mat[15]; - - var b00 = pM2.mat[0], b01 = pM2.mat[1], b02 = pM2.mat[2], b03 = pM2.mat[3]; - var b10 = pM2.mat[4], b11 = pM2.mat[5], b12 = pM2.mat[6], b13 = pM2.mat[7]; - var b20 = pM2.mat[8], b21 = pM2.mat[9], b22 = pM2.mat[10], b23 = pM2.mat[11]; - var b30 = pM2.mat[12], b31 = pM2.mat[13], b32 = pM2.mat[14], b33 = pM2.mat[15]; - - outArray[0] = b00 * a00 + b01 * a10 + b02 * a20 + b03 * a30; - outArray[1] = b00 * a01 + b01 * a11 + b02 * a21 + b03 * a31; - outArray[2] = b00 * a02 + b01 * a12 + b02 * a22 + b03 * a32; - outArray[3] = b00 * a03 + b01 * a13 + b02 * a23 + b03 * a33; - outArray[4] = b10 * a00 + b11 * a10 + b12 * a20 + b13 * a30; - outArray[5] = b10 * a01 + b11 * a11 + b12 * a21 + b13 * a31; - outArray[6] = b10 * a02 + b11 * a12 + b12 * a22 + b13 * a32; - outArray[7] = b10 * a03 + b11 * a13 + b12 * a23 + b13 * a33; - outArray[8] = b20 * a00 + b21 * a10 + b22 * a20 + b23 * a30; - outArray[9] = b20 * a01 + b21 * a11 + b22 * a21 + b23 * a31; - outArray[10] = b20 * a02 + b21 * a12 + b22 * a22 + b23 * a32; - outArray[11] = b20 * a03 + b21 * a13 + b22 * a23 + b23 * a33; - outArray[12] = b30 * a00 + b31 * a10 + b32 * a20 + b33 * a30; - outArray[13] = b30 * a01 + b31 * a11 + b32 * a21 + b33 * a31; - outArray[14] = b30 * a02 + b31 * a12 + b32 * a22 + b33 * a32; - outArray[15] = b30 * a03 + b31 * a13 + b32 * a23 + b33 * a33; - return pOut; -}; - -cc.getMat4MultiplyValue = function (pM1, pM2) { - var m1 = pM1.mat, m2 = pM2.mat; - var mat = new Float32Array(16); - - mat[0] = m1[0] * m2[0] + m1[4] * m2[1] + m1[8] * m2[2] + m1[12] * m2[3]; - mat[1] = m1[1] * m2[0] + m1[5] * m2[1] + m1[9] * m2[2] + m1[13] * m2[3]; - mat[2] = m1[2] * m2[0] + m1[6] * m2[1] + m1[10] * m2[2] + m1[14] * m2[3]; - mat[3] = m1[3] * m2[0] + m1[7] * m2[1] + m1[11] * m2[2] + m1[15] * m2[3]; - - mat[4] = m1[0] * m2[4] + m1[4] * m2[5] + m1[8] * m2[6] + m1[12] * m2[7]; - mat[5] = m1[1] * m2[4] + m1[5] * m2[5] + m1[9] * m2[6] + m1[13] * m2[7]; - mat[6] = m1[2] * m2[4] + m1[6] * m2[5] + m1[10] * m2[6] + m1[14] * m2[7]; - mat[7] = m1[3] * m2[4] + m1[7] * m2[5] + m1[11] * m2[6] + m1[15] * m2[7]; - - mat[8] = m1[0] * m2[8] + m1[4] * m2[9] + m1[8] * m2[10] + m1[12] * m2[11]; - mat[9] = m1[1] * m2[8] + m1[5] * m2[9] + m1[9] * m2[10] + m1[13] * m2[11]; - mat[10] = m1[2] * m2[8] + m1[6] * m2[9] + m1[10] * m2[10] + m1[14] * m2[11]; - mat[11] = m1[3] * m2[8] + m1[7] * m2[9] + m1[11] * m2[10] + m1[15] * m2[11]; - - mat[12] = m1[0] * m2[12] + m1[4] * m2[13] + m1[8] * m2[14] + m1[12] * m2[15]; - mat[13] = m1[1] * m2[12] + m1[5] * m2[13] + m1[9] * m2[14] + m1[13] * m2[15]; - mat[14] = m1[2] * m2[12] + m1[6] * m2[13] + m1[10] * m2[14] + m1[14] * m2[15]; - mat[15] = m1[3] * m2[12] + m1[7] * m2[13] + m1[11] * m2[14] + m1[15] * m2[15]; - - return mat; -}; - -cc.getMat4MultiplyWithMat4 = function (pM1, pM2, swapMat) { - var m1 = pM1.mat, m2 = pM2.mat; - var mat = swapMat.mat; - - mat[0] = m1[0] * m2[0] + m1[4] * m2[1] + m1[8] * m2[2] + m1[12] * m2[3]; - mat[1] = m1[1] * m2[0] + m1[5] * m2[1] + m1[9] * m2[2] + m1[13] * m2[3]; - mat[2] = m1[2] * m2[0] + m1[6] * m2[1] + m1[10] * m2[2] + m1[14] * m2[3]; - mat[3] = m1[3] * m2[0] + m1[7] * m2[1] + m1[11] * m2[2] + m1[15] * m2[3]; - - mat[4] = m1[0] * m2[4] + m1[4] * m2[5] + m1[8] * m2[6] + m1[12] * m2[7]; - mat[5] = m1[1] * m2[4] + m1[5] * m2[5] + m1[9] * m2[6] + m1[13] * m2[7]; - mat[6] = m1[2] * m2[4] + m1[6] * m2[5] + m1[10] * m2[6] + m1[14] * m2[7]; - mat[7] = m1[3] * m2[4] + m1[7] * m2[5] + m1[11] * m2[6] + m1[15] * m2[7]; - - mat[8] = m1[0] * m2[8] + m1[4] * m2[9] + m1[8] * m2[10] + m1[12] * m2[11]; - mat[9] = m1[1] * m2[8] + m1[5] * m2[9] + m1[9] * m2[10] + m1[13] * m2[11]; - mat[10] = m1[2] * m2[8] + m1[6] * m2[9] + m1[10] * m2[10] + m1[14] * m2[11]; - mat[11] = m1[3] * m2[8] + m1[7] * m2[9] + m1[11] * m2[10] + m1[15] * m2[11]; - - mat[12] = m1[0] * m2[12] + m1[4] * m2[13] + m1[8] * m2[14] + m1[12] * m2[15]; - mat[13] = m1[1] * m2[12] + m1[5] * m2[13] + m1[9] * m2[14] + m1[13] * m2[15]; - mat[14] = m1[2] * m2[12] + m1[6] * m2[13] + m1[10] * m2[14] + m1[14] * m2[15]; - mat[15] = m1[3] * m2[12] + m1[7] * m2[13] + m1[11] * m2[14] + m1[15] * m2[15]; - - return swapMat.mat; -}; + var identityMatrix = new cc.math.Matrix4().identity(); + /** + * Calculates the inverse of pM and stores the result in pOut. + * Please use matrix4's inverse function instead. + * @Return Returns NULL if there is no inverse, else pOut + */ + cc.kmMat4Inverse = function (pOut, pM) { + var inv = new cc.math.Matrix4(pM); + if (cc.math.Matrix4._gaussj(inv, identityMatrix) === false) + return null; + pOut.assignFrom(inv); + return pOut; + }; -/** - * Assigns the value of pIn to pOut - */ -cc.kmMat4Assign = function (pOut, pIn) { - if(pOut == pIn) { - cc.log("cc.kmMat4Assign(): pOut equals pIn"); + /** + * Calculates the inverse of current matrix. + * @returns {cc.math.Matrix4} Returns null if there is no inverse, else returns a new inverse matrix object + */ + proto.inverse = function(){ //cc.kmMat4Inverse + var inv = new cc.math.Matrix4(this); + if (cc.math.Matrix4._gaussj(inv, identityMatrix) === false) + return null; + return inv; + }; + + /** + * Returns true if current matrix is an identity matrix, false otherwise + */ + proto.isIdentity = function () { // cc.kmMat4IsIdentity + var mat = this.mat; + return (mat[0] === 1 && mat[1] === 0 && mat[2] === 0 && mat[3] === 0 + && mat[4] === 0 && mat[5] === 1 && mat[6] === 0 && mat[7] === 0 + && mat[8] === 0 && mat[9] === 0 && mat[10] === 1 && mat[11] === 0 + && mat[12] === 0 && mat[13] === 0 && mat[14] === 0 && mat[15] === 1); + }; + + /** + * transpose the current matrix + */ + proto.transpose = function() { // cc.kmMat4Transpose + var mat = this.mat; + var m1 = mat[1], m2 = mat[2], m3 = mat[3], + m4 = mat[4], m6 = mat[6], m7 = mat[7], + m8 = mat[8], m9 = mat[9], m11 = mat[11], + m12 = mat[12], m13 = mat[13], m14 = mat[14]; + mat[1] = m4; + mat[2] = m8; + mat[3] = m12; + + mat[4] = m1; + mat[6] = m9; + mat[7] = m13; + + mat[8] = m2; + mat[9] = m6; + mat[11] = m14; + + mat[12] = m3; + mat[13] = m7; + mat[14] = m11; + return this; + }; + + /** + * Multiplies pM1 with pM2, stores the result in pOut, returns pOut + */ + cc.kmMat4Multiply = function (pOut, pM1, pM2) { + // Cache the matrix values (makes for huge speed increases!) + var outArray = pOut.mat, mat1 = pM1.mat, mat2 = pM2.mat; + var a00 = mat1[0], a01 = mat1[1], a02 = mat1[2], a03 = mat1[3]; + var a10 = mat1[4], a11 = mat1[5], a12 = mat1[6], a13 = mat1[7]; + var a20 = mat1[8], a21 = mat1[9], a22 = mat1[10], a23 = mat1[11]; + var a30 = mat1[12], a31 = mat1[13], a32 = mat1[14], a33 = mat1[15]; + + var b00 = mat2[0], b01 = mat2[1], b02 = mat2[2], b03 = mat2[3]; + var b10 = mat2[4], b11 = mat2[5], b12 = mat2[6], b13 = mat2[7]; + var b20 = mat2[8], b21 = mat2[9], b22 = mat2[10], b23 = mat2[11]; + var b30 = mat2[12], b31 = mat2[13], b32 = mat2[14], b33 = mat2[15]; + + outArray[0] = b00 * a00 + b01 * a10 + b02 * a20 + b03 * a30; + outArray[1] = b00 * a01 + b01 * a11 + b02 * a21 + b03 * a31; + outArray[2] = b00 * a02 + b01 * a12 + b02 * a22 + b03 * a32; + outArray[3] = b00 * a03 + b01 * a13 + b02 * a23 + b03 * a33; + outArray[4] = b10 * a00 + b11 * a10 + b12 * a20 + b13 * a30; + outArray[5] = b10 * a01 + b11 * a11 + b12 * a21 + b13 * a31; + outArray[6] = b10 * a02 + b11 * a12 + b12 * a22 + b13 * a32; + outArray[7] = b10 * a03 + b11 * a13 + b12 * a23 + b13 * a33; + outArray[8] = b20 * a00 + b21 * a10 + b22 * a20 + b23 * a30; + outArray[9] = b20 * a01 + b21 * a11 + b22 * a21 + b23 * a31; + outArray[10] = b20 * a02 + b21 * a12 + b22 * a22 + b23 * a32; + outArray[11] = b20 * a03 + b21 * a13 + b22 * a23 + b23 * a33; + outArray[12] = b30 * a00 + b31 * a10 + b32 * a20 + b33 * a30; + outArray[13] = b30 * a01 + b31 * a11 + b32 * a21 + b33 * a31; + outArray[14] = b30 * a02 + b31 * a12 + b32 * a22 + b33 * a32; + outArray[15] = b30 * a03 + b31 * a13 + b32 * a23 + b33 * a33; return pOut; - } + }; - var outArr = pOut.mat; - var inArr = pIn.mat; + /** + * current matrix multiplies with other matrix mat4 + * @param {cc.math.Matrix4} mat4 + * @returns {cc.math.Matrix4} + */ + proto.multiply = function(mat4){ + // Cache the matrix values (makes for huge speed increases!) + var mat = this.mat, mat2 = mat4.mat; + var a00 = mat[0], a01 = mat[1], a02 = mat[2], a03 = mat[3]; + var a10 = mat[4], a11 = mat[5], a12 = mat[6], a13 = mat[7]; + var a20 = mat[8], a21 = mat[9], a22 = mat[10], a23 = mat[11]; + var a30 = mat[12], a31 = mat[13], a32 = mat[14], a33 = mat[15]; + + var b00 = mat2[0], b01 = mat2[1], b02 = mat2[2], b03 = mat2[3]; + var b10 = mat2[4], b11 = mat2[5], b12 = mat2[6], b13 = mat2[7]; + var b20 = mat2[8], b21 = mat2[9], b22 = mat2[10], b23 = mat2[11]; + var b30 = mat2[12], b31 = mat2[13], b32 = mat2[14], b33 = mat2[15]; + + mat[0] = b00 * a00 + b01 * a10 + b02 * a20 + b03 * a30; + mat[1] = b00 * a01 + b01 * a11 + b02 * a21 + b03 * a31; + mat[2] = b00 * a02 + b01 * a12 + b02 * a22 + b03 * a32; + mat[3] = b00 * a03 + b01 * a13 + b02 * a23 + b03 * a33; + mat[4] = b10 * a00 + b11 * a10 + b12 * a20 + b13 * a30; + mat[5] = b10 * a01 + b11 * a11 + b12 * a21 + b13 * a31; + mat[6] = b10 * a02 + b11 * a12 + b12 * a22 + b13 * a32; + mat[7] = b10 * a03 + b11 * a13 + b12 * a23 + b13 * a33; + mat[8] = b20 * a00 + b21 * a10 + b22 * a20 + b23 * a30; + mat[9] = b20 * a01 + b21 * a11 + b22 * a21 + b23 * a31; + mat[10] = b20 * a02 + b21 * a12 + b22 * a22 + b23 * a32; + mat[11] = b20 * a03 + b21 * a13 + b22 * a23 + b23 * a33; + mat[12] = b30 * a00 + b31 * a10 + b32 * a20 + b33 * a30; + mat[13] = b30 * a01 + b31 * a11 + b32 * a21 + b33 * a31; + mat[14] = b30 * a02 + b31 * a12 + b32 * a22 + b33 * a32; + mat[15] = b30 * a03 + b31 * a13 + b32 * a23 + b33 * a33; + return this; + }; + + cc.getMat4MultiplyValue = function (pM1, pM2) { + var m1 = pM1.mat, m2 = pM2.mat; + var mat = new Float32Array(16); + + mat[0] = m1[0] * m2[0] + m1[4] * m2[1] + m1[8] * m2[2] + m1[12] * m2[3]; + mat[1] = m1[1] * m2[0] + m1[5] * m2[1] + m1[9] * m2[2] + m1[13] * m2[3]; + mat[2] = m1[2] * m2[0] + m1[6] * m2[1] + m1[10] * m2[2] + m1[14] * m2[3]; + mat[3] = m1[3] * m2[0] + m1[7] * m2[1] + m1[11] * m2[2] + m1[15] * m2[3]; + + mat[4] = m1[0] * m2[4] + m1[4] * m2[5] + m1[8] * m2[6] + m1[12] * m2[7]; + mat[5] = m1[1] * m2[4] + m1[5] * m2[5] + m1[9] * m2[6] + m1[13] * m2[7]; + mat[6] = m1[2] * m2[4] + m1[6] * m2[5] + m1[10] * m2[6] + m1[14] * m2[7]; + mat[7] = m1[3] * m2[4] + m1[7] * m2[5] + m1[11] * m2[6] + m1[15] * m2[7]; + + mat[8] = m1[0] * m2[8] + m1[4] * m2[9] + m1[8] * m2[10] + m1[12] * m2[11]; + mat[9] = m1[1] * m2[8] + m1[5] * m2[9] + m1[9] * m2[10] + m1[13] * m2[11]; + mat[10] = m1[2] * m2[8] + m1[6] * m2[9] + m1[10] * m2[10] + m1[14] * m2[11]; + mat[11] = m1[3] * m2[8] + m1[7] * m2[9] + m1[11] * m2[10] + m1[15] * m2[11]; + + mat[12] = m1[0] * m2[12] + m1[4] * m2[13] + m1[8] * m2[14] + m1[12] * m2[15]; + mat[13] = m1[1] * m2[12] + m1[5] * m2[13] + m1[9] * m2[14] + m1[13] * m2[15]; + mat[14] = m1[2] * m2[12] + m1[6] * m2[13] + m1[10] * m2[14] + m1[14] * m2[15]; + mat[15] = m1[3] * m2[12] + m1[7] * m2[13] + m1[11] * m2[14] + m1[15] * m2[15]; + + return mat; + }; + + /** + * Assigns the value of pIn to pOut + */ + cc.kmMat4Assign = function (pOut, pIn) { + if (pOut === pIn) { + cc.log("cc.kmMat4Assign(): pOut equals pIn"); + return pOut; + } - outArr[0] = inArr[0]; - outArr[1] = inArr[1]; - outArr[2] = inArr[2]; - outArr[3] = inArr[3]; + var outArr = pOut.mat; + var inArr = pIn.mat; - outArr[4] = inArr[4]; - outArr[5] = inArr[5]; - outArr[6] = inArr[6]; - outArr[7] = inArr[7]; + outArr[0] = inArr[0]; + outArr[1] = inArr[1]; + outArr[2] = inArr[2]; + outArr[3] = inArr[3]; - outArr[8] = inArr[8]; - outArr[9] = inArr[9]; - outArr[10] = inArr[10]; - outArr[11] = inArr[11]; + outArr[4] = inArr[4]; + outArr[5] = inArr[5]; + outArr[6] = inArr[6]; + outArr[7] = inArr[7]; - outArr[12] = inArr[12]; - outArr[13] = inArr[13]; - outArr[14] = inArr[14]; - outArr[15] = inArr[15]; - return pOut; -}; + outArr[8] = inArr[8]; + outArr[9] = inArr[9]; + outArr[10] = inArr[10]; + outArr[11] = inArr[11]; -/** - * Returns KM_TRUE if the 2 matrices are equal (approximately) - */ -cc.kmMat4AreEqual = function (pMat1, pMat2) { - if(pMat1 == pMat2){ - cc.log("cc.kmMat4AreEqual(): pMat1 and pMat2 are same object."); - return true; - } + outArr[12] = inArr[12]; + outArr[13] = inArr[13]; + outArr[14] = inArr[14]; + outArr[15] = inArr[15]; + return pOut; + }; - for (var i = 0; i < 16; i++) { - if (!(pMat1.mat[i] + cc.kmEpsilon > pMat2.mat[i] && - pMat1.mat[i] - cc.kmEpsilon < pMat2.mat[i])) { - return false; + /** + * Assigns the value of current matrix from mat4 + * @param {cc.math.Matrix4} mat4 + * @returns {cc.math.Matrix4} + */ + proto.assignFrom = function(mat4) { + if (this === mat4) { + cc.log("cc.mat.Matrix4.assignFrom(): mat4 equals current matrix"); + return this; } - } - return true; -}; - -/** - * Builds an X-axis rotation matrix and stores it in pOut, returns pOut - */ -cc.kmMat4RotationX = function (pOut, radians) { - /* - | 1 0 0 0 | - M = | 0 cos(A) -sin(A) 0 | - | 0 sin(A) cos(A) 0 | - | 0 0 0 1 | - + var outArr = this.mat, inArr = mat4.mat; + + outArr[0] = inArr[0]; + outArr[1] = inArr[1]; + outArr[2] = inArr[2]; + outArr[3] = inArr[3]; + + outArr[4] = inArr[4]; + outArr[5] = inArr[5]; + outArr[6] = inArr[6]; + outArr[7] = inArr[7]; + + outArr[8] = inArr[8]; + outArr[9] = inArr[9]; + outArr[10] = inArr[10]; + outArr[11] = inArr[11]; + + outArr[12] = inArr[12]; + outArr[13] = inArr[13]; + outArr[14] = inArr[14]; + outArr[15] = inArr[15]; + return this; + }; + + /** + * Returns true if current matrix equal mat4 (approximately) + * @param {cc.math.Matrix4} mat4 + * @returns {boolean} */ + proto.equals = function(mat4) { + if (this === mat4) { + cc.log("cc.kmMat4AreEqual(): pMat1 and pMat2 are same object."); + return true; + } + var matA = this.mat, matB = mat4.mat, EPSILON = cc.math.EPSILON; + for (var i = 0; i < 16; i++) { + if (!(matA[i] + EPSILON > matB[i] && matA[i] - EPSILON < matB[i])) + return false; + } + return true; + }; - pOut.mat[0] = 1.0; - pOut.mat[1] = 0.0; - pOut.mat[2] = 0.0; - pOut.mat[3] = 0.0; - - pOut.mat[4] = 0.0; - pOut.mat[5] = Math.cos(radians); - pOut.mat[6] = Math.sin(radians); - pOut.mat[7] = 0.0; - - pOut.mat[8] = 0.0; - pOut.mat[9] = -Math.sin(radians); - pOut.mat[10] = Math.cos(radians); - pOut.mat[11] = 0.0; - - pOut.mat[12] = 0.0; - pOut.mat[13] = 0.0; - pOut.mat[14] = 0.0; - pOut.mat[15] = 1.0; - - return pOut; -}; - -/** - * Builds a rotation matrix using the rotation around the Y-axis - * The result is stored in pOut, pOut is returned. - */ -cc.kmMat4RotationY = function (pOut, radians) { - /* - | cos(A) 0 sin(A) 0 | - M = | 0 1 0 0 | - | -sin(A) 0 cos(A) 0 | - | 0 0 0 1 | - */ - pOut.mat[0] = Math.cos(radians); - pOut.mat[1] = 0.0; - pOut.mat[2] = -Math.sin(radians); - pOut.mat[3] = 0.0; - - pOut.mat[4] = 0.0; - pOut.mat[5] = 1.0; - pOut.mat[6] = 0.0; - pOut.mat[7] = 0.0; - - pOut.mat[8] = Math.sin(radians); - pOut.mat[9] = 0.0; - pOut.mat[10] = Math.cos(radians); - pOut.mat[11] = 0.0; - - pOut.mat[12] = 0.0; - pOut.mat[13] = 0.0; - pOut.mat[14] = 0.0; - pOut.mat[15] = 1.0; - - return pOut; -}; - -/** - * Builds a rotation matrix around the Z-axis. The resulting - * matrix is stored in pOut. pOut is returned. - */ -cc.kmMat4RotationZ = function (pOut, radians) { - /* - | cos(A) -sin(A) 0 0 | - M = | sin(A) cos(A) 0 0 | - | 0 0 1 0 | - | 0 0 0 1 | - */ - pOut.mat[0] = Math.cos(radians); - pOut.mat[1] = Math.sin(radians); - pOut.mat[2] = 0.0; - pOut.mat[3] = 0.0; - - pOut.mat[4] = -Math.sin(radians); - pOut.mat[5] = Math.cos(radians); - pOut.mat[6] = 0.0; - pOut.mat[7] = 0.0; - - pOut.mat[8] = 0.0; - pOut.mat[9] = 0.0; - pOut.mat[10] = 1.0; - pOut.mat[11] = 0.0; - - pOut.mat[12] = 0.0; - pOut.mat[13] = 0.0; - pOut.mat[14] = 0.0; - pOut.mat[15] = 1.0; - - return pOut; -}; - -/** - * Builds a rotation matrix from pitch, yaw and roll. The resulting - * matrix is stored in pOut and pOut is returned - */ -cc.kmMat4RotationPitchYawRoll = function (pOut, pitch, yaw, roll) { - var cr = Math.cos(pitch); - var sr = Math.sin(pitch); - var cp = Math.cos(yaw); - var sp = Math.sin(yaw); - var cy = Math.cos(roll); - var sy = Math.sin(roll); - var srsp = sr * sp; - var crsp = cr * sp; - - pOut.mat[0] = cp * cy; - pOut.mat[4] = cp * sy; - pOut.mat[8] = -sp; - - pOut.mat[1] = srsp * cy - cr * sy; - pOut.mat[5] = srsp * sy + cr * cy; - pOut.mat[9] = sr * cp; - - pOut.mat[2] = crsp * cy + sr * sy; - pOut.mat[6] = crsp * sy - sr * cy; - pOut.mat[10] = cr * cp; - - pOut.mat[3] = pOut.mat[7] = pOut.mat[11] = 0.0; - pOut.mat[15] = 1.0; - - return pOut; -}; - -/** Converts a quaternion to a rotation matrix, - * the result is stored in pOut, returns pOut - */ -cc.kmMat4RotationQuaternion = function (pOut, pQ) { - pOut.mat[0] = 1.0 - 2.0 * (pQ.y * pQ.y + pQ.z * pQ.z ); - pOut.mat[1] = 2.0 * (pQ.x * pQ.y + pQ.z * pQ.w); - pOut.mat[2] = 2.0 * (pQ.x * pQ.z - pQ.y * pQ.w); - pOut.mat[3] = 0.0; - - // Second row - pOut.mat[4] = 2.0 * ( pQ.x * pQ.y - pQ.z * pQ.w ); - pOut.mat[5] = 1.0 - 2.0 * ( pQ.x * pQ.x + pQ.z * pQ.z ); - pOut.mat[6] = 2.0 * (pQ.z * pQ.y + pQ.x * pQ.w ); - pOut.mat[7] = 0.0; - - // Third row - pOut.mat[8] = 2.0 * ( pQ.x * pQ.z + pQ.y * pQ.w ); - pOut.mat[9] = 2.0 * ( pQ.y * pQ.z - pQ.x * pQ.w ); - pOut.mat[10] = 1.0 - 2.0 * ( pQ.x * pQ.x + pQ.y * pQ.y ); - pOut.mat[11] = 0.0; - - // Fourth row - pOut.mat[12] = 0; - pOut.mat[13] = 0; - pOut.mat[14] = 0; - pOut.mat[15] = 1.0; - - return pOut; -}; - -/** Build a 4x4 OpenGL transformation matrix using a 3x3 rotation matrix, - * and a 3d vector representing a translation. Assign the result to pOut, - * pOut is also returned. - */ -cc.kmMat4RotationTranslation = function (pOut, rotation, translation) { - pOut.mat[0] = rotation.mat[0]; - pOut.mat[1] = rotation.mat[1]; - pOut.mat[2] = rotation.mat[2]; - pOut.mat[3] = 0.0; - - pOut.mat[4] = rotation.mat[3]; - pOut.mat[5] = rotation.mat[4]; - pOut.mat[6] = rotation.mat[5]; - pOut.mat[7] = 0.0; - - pOut.mat[8] = rotation.mat[6]; - pOut.mat[9] = rotation.mat[7]; - pOut.mat[10] = rotation.mat[8]; - pOut.mat[11] = 0.0; - - pOut.mat[12] = translation.x; - pOut.mat[13] = translation.y; - pOut.mat[14] = translation.z; - pOut.mat[15] = 1.0; - - return pOut; -}; - -/** Builds a scaling matrix */ -cc.kmMat4Scaling = function (pOut, x, y, z) { - pOut.mat[0] = x; - pOut.mat[5] = y; - pOut.mat[10] = z; - pOut.mat[15] = 1.0; - pOut.mat[1] = pOut.mat[2] = pOut.mat[3] = - pOut.mat[4] = pOut.mat[6] = pOut.mat[7] = - pOut.mat[8] = pOut.mat[9] = pOut.mat[11] = - pOut.mat[12] = pOut.mat[13] = pOut.mat[14] = 0; - return pOut; -}; - -/** - * Builds a translation matrix. All other elements in the matrix - * will be set to zero except for the diagonal which is set to 1.0 - */ -cc.kmMat4Translation = function (pOut, x, y, z) { - //FIXME: Write a test for this - pOut.mat[0] = pOut.mat[5] = pOut.mat[10] = pOut.mat[15] = 1.0; - pOut.mat[1] = pOut.mat[2] = pOut.mat[3] = - pOut.mat[4] = pOut.mat[6] = pOut.mat[7] = - pOut.mat[8] = pOut.mat[9] = pOut.mat[11] = 0.0; - pOut.mat[12] = x; - pOut.mat[13] = y; - pOut.mat[14] = z; - return pOut; -}; - -/** - * Get the up vector from a matrix. pIn is the matrix you - * wish to extract the vector from. pOut is a pointer to the - * kmVec3 structure that should hold the resulting vector - */ -cc.kmMat4GetUpVec3 = function (pOut, pIn) { - pOut.x = pIn.mat[4]; - pOut.y = pIn.mat[5]; - pOut.z = pIn.mat[6]; - cc.kmVec3Normalize(pOut, pOut); - return pOut; -}; - -/** Extract the right vector from a 4x4 matrix. The result is - * stored in pOut. Returns pOut. - */ -cc.kmMat4GetRightVec3 = function (pOut, pIn) { - pOut.x = pIn.mat[0]; - pOut.y = pIn.mat[1]; - pOut.z = pIn.mat[2]; - cc.kmVec3Normalize(pOut, pOut); - return pOut; -}; - -/** - * Extract the forward vector from a 4x4 matrix. The result is - * stored in pOut. Returns pOut. - */ -cc.kmMat4GetForwardVec3 = function (pOut, pIn) { - pOut.x = pIn.mat[8]; - pOut.y = pIn.mat[9]; - pOut.z = pIn.mat[10]; - cc.kmVec3Normalize(pOut, pOut); - return pOut; -}; - -/** - * Creates a perspective projection matrix in the - * same way as gluPerspective - */ -cc.kmMat4PerspectiveProjection = function (pOut, fovY, aspect, zNear, zFar) { - var r = cc.kmDegreesToRadians(fovY / 2); - var deltaZ = zFar - zNear; - var s = Math.sin(r); - - if (deltaZ == 0 || s == 0 || aspect == 0) - return null; - - //cos(r) / sin(r) = cot(r) - var cotangent = Math.cos(r) / s; - - cc.kmMat4Identity(pOut); - pOut.mat[0] = cotangent / aspect; - pOut.mat[5] = cotangent; - pOut.mat[10] = -(zFar + zNear) / deltaZ; - pOut.mat[11] = -1; - pOut.mat[14] = -2 * zNear * zFar / deltaZ; - pOut.mat[15] = 0; - - return pOut; -}; - -/** Creates an orthographic projection matrix like glOrtho */ -cc.kmMat4OrthographicProjection = function (pOut, left, right, bottom, top, nearVal, farVal) { - cc.kmMat4Identity(pOut); - pOut.mat[0] = 2 / (right - left); - pOut.mat[5] = 2 / (top - bottom); - pOut.mat[10] = -2 / (farVal - nearVal); - pOut.mat[12] = -((right + left) / (right - left)); - pOut.mat[13] = -((top + bottom) / (top - bottom)); - pOut.mat[14] = -((farVal + nearVal) / (farVal - nearVal)); - return pOut; -}; - -/** - * Builds a translation matrix in the same way as gluLookAt() - * the resulting matrix is stored in pOut. pOut is returned. - */ -cc.kmMat4LookAt = function (pOut, pEye, pCenter, pUp) { - var f = new cc.kmVec3(), up = new cc.kmVec3(), s = new cc.kmVec3(), u = new cc.kmVec3(); - var translate = new cc.kmMat4(); - - cc.kmVec3Subtract(f, pCenter, pEye); - cc.kmVec3Normalize(f, f); - - cc.kmVec3Assign(up, pUp); - cc.kmVec3Normalize(up, up); - - cc.kmVec3Cross(s, f, up); - cc.kmVec3Normalize(s, s); - - cc.kmVec3Cross(u, s, f); - cc.kmVec3Normalize(s, s); - - cc.kmMat4Identity(pOut); + /** + * Builds an X-axis rotation matrix and stores it in matrix, returns matrix, if matrix is null, create a new matrix + * @param {Number} radians + * @param {cc.math.Matrix4} [matrix] + * @returns {cc.math.Matrix4} + */ + cc.math.Matrix4.createByRotationX = function(radians, matrix) { //cc.kmMat4RotationX + /* + | 1 0 0 0 | + M = | 0 cos(A) -sin(A) 0 | + | 0 sin(A) cos(A) 0 | + | 0 0 0 1 | + */ + matrix = matrix || new cc.math.Matrix4(); + var mat = matrix.mat; + mat[0] = 1.0; + mat[3] = mat[2] = mat[1] = 0.0; + + mat[4] = 0.0; + mat[5] = Math.cos(radians); + mat[6] = Math.sin(radians); + mat[7] = 0.0; + + mat[8] = 0.0; + mat[9] = -Math.sin(radians); + mat[10] = Math.cos(radians); + mat[11] = 0.0; + + mat[14] = mat[13] = mat[12] = 0.0; + mat[15] = 1.0; + return matrix; + }; + + /** + * Builds a rotation matrix using the rotation around the Y-axis, The result is stored in matrix, matrix is returned. + * @param {Number} radians + * @param {cc.math.Matrix4} [matrix] + * @returns {*} + */ + cc.math.Matrix4.createByRotationY = function(radians, matrix) { // cc.kmMat4RotationY + /* + | cos(A) 0 sin(A) 0 | + M = | 0 1 0 0 | + | -sin(A) 0 cos(A) 0 | + | 0 0 0 1 | + */ + matrix = matrix || new cc.math.Matrix4(); + var mat = matrix.mat; + mat[0] = Math.cos(radians); + mat[1] = 0.0; + mat[2] = -Math.sin(radians); + mat[3] = 0.0; + + mat[7] = mat[6] = mat[4] = 0.0; + mat[5] = 1.0; + + mat[8] = Math.sin(radians); + mat[9] = 0.0; + mat[10] = Math.cos(radians); + mat[11] = 0.0; + + mat[14] = mat[13] = mat[12] = 0.0; + mat[15] = 1.0; + return matrix; + }; + + /** + * Builds a rotation matrix around the Z-axis. The resulting matrix is stored in matrix. matrix is returned. + * @param {Number} radians + * @param {cc.math.Matrix4} matrix + * @return {cc.math.Matrix4} + */ + cc.math.Matrix4.createByRotationZ = function(radians, matrix){ // cc.kmMat4RotationZ + /* + | cos(A) -sin(A) 0 0 | + M = | sin(A) cos(A) 0 0 | + | 0 0 1 0 | + | 0 0 0 1 | + */ + matrix = matrix || new cc.math.Matrix4(); + var mat = matrix.mat; + mat[0] = Math.cos(radians); + mat[1] = Math.sin(radians); + mat[3] = mat[2] = 0.0; + + mat[4] = -Math.sin(radians); + mat[5] = Math.cos(radians); + mat[7] = mat[6] = 0.0; + + mat[11] = mat[9] = mat[8] = 0.0; + mat[10] = 1.0; + + mat[14] = mat[13] = mat[12] = 0.0; + mat[15] = 1.0; + + return matrix; + }; + + /** + * Builds a rotation matrix from pitch, yaw and roll. The resulting matrix is stored in parameter matrix and returns. + * @param {Number} pitch + * @param {Number} yaw + * @param {Number} roll + * @param {cc.math.Matrix4} [matrix] if matrix is undefined, creates a new matrix. + * @returns {cc.math.Matrix4} + */ + cc.math.Matrix4.createByPitchYawRoll = function(pitch, yaw, roll, matrix) { + matrix = matrix || new cc.math.Matrix4(); + var cr = Math.cos(pitch), sr = Math.sin(pitch); + var cp = Math.cos(yaw), sp = Math.sin(yaw); + var cy = Math.cos(roll), sy = Math.sin(roll); + var srsp = sr * sp, crsp = cr * sp; + var mat = matrix.mat; + + mat[0] = cp * cy; + mat[4] = cp * sy; + mat[8] = -sp; + + mat[1] = srsp * cy - cr * sy; + mat[5] = srsp * sy + cr * cy; + mat[9] = sr * cp; + + mat[2] = crsp * cy + sr * sy; + mat[6] = crsp * sy - sr * cy; + mat[10] = cr * cp; + + mat[3] = mat[7] = mat[11] = 0.0; + mat[15] = 1.0; + return matrix; + }; + + /** + * Builds a matrix by a quaternion. + * @param {cc.math.Quaternion} quaternion + * @param {cc.math.Matrix4} [matrix] if matrix is undefined, creates a new matrix. + * @returns {cc.math.Matrix4} + */ + cc.math.Matrix4.createByQuaternion = function(quaternion, matrix) { + matrix = matrix || new cc.math.Matrix4(); + var mat = matrix.mat; + mat[0] = 1.0 - 2.0 * (quaternion.y * quaternion.y + quaternion.z * quaternion.z ); + mat[1] = 2.0 * (quaternion.x * quaternion.y + quaternion.z * quaternion.w); + mat[2] = 2.0 * (quaternion.x * quaternion.z - quaternion.y * quaternion.w); + mat[3] = 0.0; + + // Second row + mat[4] = 2.0 * ( quaternion.x * quaternion.y - quaternion.z * quaternion.w ); + mat[5] = 1.0 - 2.0 * ( quaternion.x * quaternion.x + quaternion.z * quaternion.z ); + mat[6] = 2.0 * (quaternion.z * quaternion.y + quaternion.x * quaternion.w ); + mat[7] = 0.0; + + // Third row + mat[8] = 2.0 * ( quaternion.x * quaternion.z + quaternion.y * quaternion.w ); + mat[9] = 2.0 * ( quaternion.y * quaternion.z - quaternion.x * quaternion.w ); + mat[10] = 1.0 - 2.0 * ( quaternion.x * quaternion.x + quaternion.y * quaternion.y ); + mat[11] = 0.0; + + // Fourth row + mat[14] = mat[13] = mat[12] = 0; + mat[15] = 1.0; + return matrix; + }; + + /** + * Build a 4x4 OpenGL transformation matrix using a 3x3 rotation matrix, and a 3d vector representing a translation. + * @param {cc.math.Matrix3} rotation + * @param {cc.math.Vec3} translation + * @param {cc.math.Matrix4} [matrix] if matrix is undefined, creates a new matrix. + * @returns {cc.math.Matrix4} + */ + cc.math.Matrix4.createByRotationTranslation = function(rotation, translation, matrix) { + matrix = matrix || new cc.math.Matrix4(); + var mat = matrix.mat, rMat = rotation.mat; + mat[0] = rMat[0]; + mat[1] = rMat[1]; + mat[2] = rMat[2]; + mat[3] = 0.0; + + mat[4] = rMat[3]; + mat[5] = rMat[4]; + mat[6] = rMat[5]; + mat[7] = 0.0; + + mat[8] = rMat[6]; + mat[9] = rMat[7]; + mat[10] = rMat[8]; + mat[11] = 0.0; + + mat[12] = translation.x; + mat[13] = translation.y; + mat[14] = translation.z; + mat[15] = 1.0; + return matrix; + }; + + /** + * Builds a scaling matrix + * @param {Number} x + * @param {Number} y + * @param {Number} z + * @param {cc.math.Matrix4} [matrix] if matrix is undefined, creates a new matrix. + * @returns {cc.math.Matrix4} + */ + cc.math.Matrix4.createByScale = function(x, y, z, matrix) { //cc.kmMat4Scaling + matrix = matrix || new cc.math.Matrix4(); + var mat = matrix.mat; + mat[0] = x; + mat[5] = y; + mat[10] = z; + mat[15] = 1.0; + mat[1] = mat[2] = mat[3] = mat[4] = mat[6] = mat[7] = + mat[8] = mat[9] = mat[11] = mat[12] = mat[13] = mat[14] = 0; + return matrix; + }; + + /** + * Builds a translation matrix. All other elements in the matrix + * will be set to zero except for the diagonal which is set to 1.0 + */ + cc.kmMat4Translation = function (pOut, x, y, z) { + //FIXME: Write a test for this + pOut.mat[0] = pOut.mat[5] = pOut.mat[10] = pOut.mat[15] = 1.0; + pOut.mat[1] = pOut.mat[2] = pOut.mat[3] = + pOut.mat[4] = pOut.mat[6] = pOut.mat[7] = + pOut.mat[8] = pOut.mat[9] = pOut.mat[11] = 0.0; + pOut.mat[12] = x; + pOut.mat[13] = y; + pOut.mat[14] = z; + return pOut; + }; + + /** + * Builds a translation matrix. + * @param {Number} x + * @param {Number} y + * @param {Number} z + * @param {cc.math.Matrix4} [matrix] if matrix is undefined, creates a new matrix. + * @returns {cc.math.Matrix4} + */ + cc.math.Matrix4.createByTranslation = function(x, y, z, matrix){ //cc.kmMat4Translation + matrix = matrix || new cc.math.Matrix4(); + matrix.identity(); + matrix.mat[12] = x; + matrix.mat[13] = y; + matrix.mat[14] = z; + return matrix; + }; + + /** + * Get the up vector from a matrix. + * @returns {cc.math.Vec3} + */ + proto.getUpVec3 = function() { + var mat = this.mat; + var ret = new cc.math.Vec3(mat[4],mat[5], mat[6]); + return ret.normalize(); + }; + + /** + * Extract the right vector from a 4x4 matrix. + * @returns {cc.math.Vec3} + */ + proto.getRightVec3 = function(){ + var mat = this.mat; + var ret = new cc.math.Vec3(mat[0],mat[1], mat[2]); + return ret.normalize(); + }; + + /** + * Extract the forward vector from a 4x4 matrix. + * @returns {cc.math.Vec3} + */ + proto.getForwardVec3 = function() { + var mat = this.mat; + var ret = new cc.math.Vec3(mat[8],mat[9], mat[10]); + return ret.normalize(); + }; + + /** + * Creates a perspective projection matrix in the + * same way as gluPerspective + */ + cc.kmMat4PerspectiveProjection = function (pOut, fovY, aspect, zNear, zFar) { + var r = cc.degreesToRadians(fovY / 2); + var deltaZ = zFar - zNear; + var s = Math.sin(r); + + if (deltaZ === 0 || s === 0 || aspect === 0) + return null; + + //cos(r) / sin(r) = cot(r) + var cotangent = Math.cos(r) / s; + pOut.identity(); + pOut.mat[0] = cotangent / aspect; + pOut.mat[5] = cotangent; + pOut.mat[10] = -(zFar + zNear) / deltaZ; + pOut.mat[11] = -1; + pOut.mat[14] = -2 * zNear * zFar / deltaZ; + pOut.mat[15] = 0; - pOut.mat[0] = s.x; - pOut.mat[4] = s.y; - pOut.mat[8] = s.z; + return pOut; + }; + + /** + * Creates a perspective projection matrix in the same way as gluPerspective + * @param {Number} fovY + * @param {Number} aspect + * @param {Number} zNear + * @param {Number} zFar + * @returns {cc.math.Matrix4|Null} + */ + cc.math.Matrix4.createPerspectiveProjection = function(fovY, aspect, zNear, zFar){ + var r = cc.degreesToRadians(fovY / 2), deltaZ = zFar - zNear; + var s = Math.sin(r); + + if (deltaZ === 0 || s === 0 || aspect === 0) + return null; + + //cos(r) / sin(r) = cot(r) + var cotangent = Math.cos(r) / s; + var matrix = new cc.math.Matrix4(), mat = matrix.mat; + matrix.identity(); + mat[0] = cotangent / aspect; + mat[5] = cotangent; + mat[10] = -(zFar + zNear) / deltaZ; + mat[11] = -1; + mat[14] = -2 * zNear * zFar / deltaZ; + mat[15] = 0; + return matrix; + }; + + /** Creates an orthographic projection matrix like glOrtho */ + cc.kmMat4OrthographicProjection = function (pOut, left, right, bottom, top, nearVal, farVal) { + pOut.identity(); + pOut.mat[0] = 2 / (right - left); + pOut.mat[5] = 2 / (top - bottom); + pOut.mat[10] = -2 / (farVal - nearVal); + pOut.mat[12] = -((right + left) / (right - left)); + pOut.mat[13] = -((top + bottom) / (top - bottom)); + pOut.mat[14] = -((farVal + nearVal) / (farVal - nearVal)); + return pOut; + }; + + /** + * Creates an orthographic projection matrix like glOrtho + * @param {Number} left + * @param {Number} right + * @param {Number} bottom + * @param {Number} top + * @param {Number} nearVal + * @param {Number} farVal + * @returns {cc.math.Matrix4} + */ + cc.math.Matrix4.createOrthographicProjection = function (left, right, bottom, top, nearVal, farVal) { + var matrix = new cc.math.Matrix4(), mat = matrix.mat; + matrix.identity(); + mat[0] = 2 / (right - left); + mat[5] = 2 / (top - bottom); + mat[10] = -2 / (farVal - nearVal); + mat[12] = -((right + left) / (right - left)); + mat[13] = -((top + bottom) / (top - bottom)); + mat[14] = -((farVal + nearVal) / (farVal - nearVal)); + return matrix; + }; + + /** + * Builds a translation matrix in the same way as gluLookAt() + * the resulting matrix is stored in pOut. pOut is returned. + */ + cc.kmMat4LookAt = function (pOut, pEye, pCenter, pUp) { + var f = new cc.math.Vec3(pCenter), up = new cc.math.Vec3(pUp); + f.subtract(pEye); + f.normalize(); + up.normalize(); - pOut.mat[1] = u.x; - pOut.mat[5] = u.y; - pOut.mat[9] = u.z; + var s = new cc.math.Vec3(f); + s.cross(up); + s.normalize(); - pOut.mat[2] = -f.x; - pOut.mat[6] = -f.y; - pOut.mat[10] = -f.z; + var u = new cc.math.Vec3(s); + u.cross(f); + s.normalize(); - cc.kmMat4Translation(translate, -pEye.x, -pEye.y, -pEye.z); - cc.kmMat4Multiply(pOut, pOut, translate); + pOut.identity(); - return pOut; -}; + pOut.mat[0] = s.x; + pOut.mat[4] = s.y; + pOut.mat[8] = s.z; -/** - * Build a rotation matrix from an axis and an angle. Result is stored in pOut. - * pOut is returned. - */ -cc.kmMat4RotationAxisAngle = function (pOut, axis, radians) { - var rcos = Math.cos(radians); - var rsin = Math.sin(radians); + pOut.mat[1] = u.x; + pOut.mat[5] = u.y; + pOut.mat[9] = u.z; - var normalizedAxis = new cc.kmVec3(); - cc.kmVec3Normalize(normalizedAxis, axis); + pOut.mat[2] = -f.x; + pOut.mat[6] = -f.y; + pOut.mat[10] = -f.z; - pOut.mat[0] = rcos + normalizedAxis.x * normalizedAxis.x * (1 - rcos); - pOut.mat[1] = normalizedAxis.z * rsin + normalizedAxis.y * normalizedAxis.x * (1 - rcos); - pOut.mat[2] = -normalizedAxis.y * rsin + normalizedAxis.z * normalizedAxis.x * (1 - rcos); - pOut.mat[3] = 0.0; + var translate = cc.math.Matrix4.createByTranslation(-pEye.x, -pEye.y, -pEye.z); + pOut.multiply(translate); + return pOut; + }; + + var tempMatrix = new cc.math.Matrix4(); // an internal matrix + proto.lookAt = function(eyeVec, centerVec, upVec) { + var f = new cc.math.Vec3(centerVec), up = new cc.math.Vec3(upVec), mat = this.mat; + f.subtract(eyeVec); + f.normalize(); + up.normalize(); + + var s = new cc.math.Vec3(f); + s.cross(up); + s.normalize(); + + var u = new cc.math.Vec3(s); + u.cross(f); + s.normalize(); + + this.identity(); + mat[0] = s.x; + mat[4] = s.y; + mat[8] = s.z; + + mat[1] = u.x; + mat[5] = u.y; + mat[9] = u.z; + + mat[2] = -f.x; + mat[6] = -f.y; + mat[10] = -f.z; + + tempMatrix = cc.math.Matrix4.createByTranslation(-eyeVec.x, -eyeVec.y, -eyeVec.z, tempMatrix); + this.multiply(tempMatrix); + return this; + }; + + /** + * Build a rotation matrix from an axis and an angle. Result is stored in pOut. + * pOut is returned. + */ + cc.kmMat4RotationAxisAngle = function (pOut, axis, radians) { + var rcos = Math.cos(radians), rsin = Math.sin(radians); - pOut.mat[4] = -normalizedAxis.z * rsin + normalizedAxis.x * normalizedAxis.y * (1 - rcos); - pOut.mat[5] = rcos + normalizedAxis.y * normalizedAxis.y * (1 - rcos); - pOut.mat[6] = normalizedAxis.x * rsin + normalizedAxis.z * normalizedAxis.y * (1 - rcos); - pOut.mat[7] = 0.0; + var normalizedAxis = new cc.math.Vec3(axis); + normalizedAxis.normalize(); - pOut.mat[8] = normalizedAxis.y * rsin + normalizedAxis.x * normalizedAxis.z * (1 - rcos); - pOut.mat[9] = -normalizedAxis.x * rsin + normalizedAxis.y * normalizedAxis.z * (1 - rcos); - pOut.mat[10] = rcos + normalizedAxis.z * normalizedAxis.z * (1 - rcos); - pOut.mat[11] = 0.0; + pOut.mat[0] = rcos + normalizedAxis.x * normalizedAxis.x * (1 - rcos); + pOut.mat[1] = normalizedAxis.z * rsin + normalizedAxis.y * normalizedAxis.x * (1 - rcos); + pOut.mat[2] = -normalizedAxis.y * rsin + normalizedAxis.z * normalizedAxis.x * (1 - rcos); + pOut.mat[3] = 0.0; - pOut.mat[12] = 0.0; - pOut.mat[13] = 0.0; - pOut.mat[14] = 0.0; - pOut.mat[15] = 1.0; + pOut.mat[4] = -normalizedAxis.z * rsin + normalizedAxis.x * normalizedAxis.y * (1 - rcos); + pOut.mat[5] = rcos + normalizedAxis.y * normalizedAxis.y * (1 - rcos); + pOut.mat[6] = normalizedAxis.x * rsin + normalizedAxis.z * normalizedAxis.y * (1 - rcos); + pOut.mat[7] = 0.0; - return pOut; -}; + pOut.mat[8] = normalizedAxis.y * rsin + normalizedAxis.x * normalizedAxis.z * (1 - rcos); + pOut.mat[9] = -normalizedAxis.x * rsin + normalizedAxis.y * normalizedAxis.z * (1 - rcos); + pOut.mat[10] = rcos + normalizedAxis.z * normalizedAxis.z * (1 - rcos); + pOut.mat[11] = 0.0; -/** - * Extract a 3x3 rotation matrix from the input 4x4 transformation. - * Stores the result in pOut, returns pOut - */ -cc.kmMat4ExtractRotation = function (pOut, pIn) { - pOut.mat[0] = pIn.mat[0]; - pOut.mat[1] = pIn.mat[1]; - pOut.mat[2] = pIn.mat[2]; - - pOut.mat[3] = pIn.mat[4]; - pOut.mat[4] = pIn.mat[5]; - pOut.mat[5] = pIn.mat[6]; - - pOut.mat[6] = pIn.mat[8]; - pOut.mat[7] = pIn.mat[9]; - pOut.mat[8] = pIn.mat[10]; - - return pOut; -}; - -cc.kmMat4ExtractPlane = function (pOut, pIn, plane) { - switch (plane) { - case cc.KM_PLANE_RIGHT: - pOut.a = pIn.mat[3] - pIn.mat[0]; - pOut.b = pIn.mat[7] - pIn.mat[4]; - pOut.c = pIn.mat[11] - pIn.mat[8]; - pOut.d = pIn.mat[15] - pIn.mat[12]; - break; - case cc.KM_PLANE_LEFT: - pOut.a = pIn.mat[3] + pIn.mat[0]; - pOut.b = pIn.mat[7] + pIn.mat[4]; - pOut.c = pIn.mat[11] + pIn.mat[8]; - pOut.d = pIn.mat[15] + pIn.mat[12]; - break; - case cc.KM_PLANE_BOTTOM: - pOut.a = pIn.mat[3] + pIn.mat[1]; - pOut.b = pIn.mat[7] + pIn.mat[5]; - pOut.c = pIn.mat[11] + pIn.mat[9]; - pOut.d = pIn.mat[15] + pIn.mat[13]; - break; - case cc.KM_PLANE_TOP: - pOut.a = pIn.mat[3] - pIn.mat[1]; - pOut.b = pIn.mat[7] - pIn.mat[5]; - pOut.c = pIn.mat[11] - pIn.mat[9]; - pOut.d = pIn.mat[15] - pIn.mat[13]; - break; - case cc.KM_PLANE_FAR: - pOut.a = pIn.mat[3] - pIn.mat[2]; - pOut.b = pIn.mat[7] - pIn.mat[6]; - pOut.c = pIn.mat[11] - pIn.mat[10]; - pOut.d = pIn.mat[15] - pIn.mat[14]; - break; - case cc.KM_PLANE_NEAR: - pOut.a = pIn.mat[3] + pIn.mat[2]; - pOut.b = pIn.mat[7] + pIn.mat[6]; - pOut.c = pIn.mat[11] + pIn.mat[10]; - pOut.d = pIn.mat[15] + pIn.mat[14]; - break; - default: - cc.log("cc.kmMat4ExtractPlane(): Invalid plane index"); - break; - } - - var t = Math.sqrt(pOut.a * pOut.a + - pOut.b * pOut.b + - pOut.c * pOut.c); - pOut.a /= t; - pOut.b /= t; - pOut.c /= t; - pOut.d /= t; - - return pOut; -}; + pOut.mat[12] = 0.0; + pOut.mat[13] = 0.0; + pOut.mat[14] = 0.0; + pOut.mat[15] = 1.0; -/** - * Take the rotation from a 4x4 transformation matrix, and return it as an axis and an angle (in radians) - * returns the output axis. - */ -cc.kmMat4RotationToAxisAngle = function (pAxis, radians, pIn) { - /*Surely not this easy?*/ - var temp = new cc.kmQuaternion(); - var rotation = new cc.kmMat3(); - cc.kmMat4ExtractRotation(rotation, pIn); - cc.kmQuaternionRotationMatrix(temp, rotation); - cc.kmQuaternionToAxisAngle(temp, pAxis, radians); - return pAxis; -}; + return pOut; + }; + + /** + * Build a rotation matrix from an axis and an angle. + * @param {cc.math.Vec3} axis + * @param {Number} radians + * @param {cc.math.Matrix4} [matrix] + * @returns {cc.math.Matrix4} + */ + cc.math.Matrix4.createByAxisAndAngle = function(axis, radians, matrix) { + matrix = matrix || new cc.math.Matrix4(); + var mat = this.mat, rcos = Math.cos(radians), rsin = Math.sin(radians) ; + + var normalizedAxis = new cc.math.Vec3(axis); + normalizedAxis.normalize(); + + mat[0] = rcos + normalizedAxis.x * normalizedAxis.x * (1 - rcos); + mat[1] = normalizedAxis.z * rsin + normalizedAxis.y * normalizedAxis.x * (1 - rcos); + mat[2] = -normalizedAxis.y * rsin + normalizedAxis.z * normalizedAxis.x * (1 - rcos); + mat[3] = 0.0; + + mat[4] = -normalizedAxis.z * rsin + normalizedAxis.x * normalizedAxis.y * (1 - rcos); + mat[5] = rcos + normalizedAxis.y * normalizedAxis.y * (1 - rcos); + mat[6] = normalizedAxis.x * rsin + normalizedAxis.z * normalizedAxis.y * (1 - rcos); + mat[7] = 0.0; + + mat[8] = normalizedAxis.y * rsin + normalizedAxis.x * normalizedAxis.z * (1 - rcos); + mat[9] = -normalizedAxis.x * rsin + normalizedAxis.y * normalizedAxis.z * (1 - rcos); + mat[10] = rcos + normalizedAxis.z * normalizedAxis.z * (1 - rcos); + mat[11] = 0.0; + + mat[12] = mat[13] = mat[14] = 0.0; + mat[15] = 1.0; + return matrix; + }; + + /** + * Extract a 3x3 rotation matrix from the input 4x4 transformation. + * @returns {cc.math.Matrix3} + */ + proto.extractRotation = function(){ + var matrix = new cc.math.Matrix3(), mat4 = this.mat, mat3 = matrix.mat; + mat3[0] = mat4[0]; + mat3[1] = mat4[1]; + mat3[2] = mat4[2]; + + mat3[3] = mat4[4]; + mat3[4] = mat4[5]; + mat3[5] = mat4[6]; + + mat3[6] = mat4[8]; + mat3[7] = mat4[9]; + mat3[8] = mat4[10]; + return matrix; + }; + + proto.extractPlane = function(planeType) { + var plane = new cc.math.Plane(), mat = this.mat; + switch (planeType) { + case cc.math.Plane.RIGHT: + plane.a = mat[3] - mat[0]; + plane.b = mat[7] - mat[4]; + plane.c = mat[11] - mat[8]; + plane.d = mat[15] - mat[12]; + break; + case cc.math.Plane.LEFT: + plane.a = mat[3] + mat[0]; + plane.b = mat[7] + mat[4]; + plane.c = mat[11] + mat[8]; + plane.d = mat[15] + mat[12]; + break; + case cc.math.Plane.BOTTOM: + plane.a = mat[3] + mat[1]; + plane.b = mat[7] + mat[5]; + plane.c = mat[11] + mat[9]; + plane.d = mat[15] + mat[13]; + break; + case cc.math.Plane.TOP: + plane.a = mat[3] - mat[1]; + plane.b = mat[7] - mat[5]; + plane.c = mat[11] - mat[9]; + plane.d = mat[15] - mat[13]; + break; + case cc.math.Plane.FAR: + plane.a = mat[3] - mat[2]; + plane.b = mat[7] - mat[6]; + plane.c = mat[11] - mat[10]; + plane.d = mat[15] - mat[14]; + break; + case cc.math.Plane.NEAR: + plane.a = mat[3] + mat[2]; + plane.b = mat[7] + mat[6]; + plane.c = mat[11] + mat[10]; + plane.d = mat[15] + mat[14]; + break; + default: + cc.log("cc.math.Matrix4.extractPlane: Invalid plane index"); + break; + } + var t = Math.sqrt(plane.a * plane.a + plane.b * plane.b + plane.c * plane.c); + plane.a /= t; + plane.b /= t; + plane.c /= t; + plane.d /= t; + return plane; + }; + + /** + * Take the rotation from a 4x4 transformation matrix, and return it as an axis and an angle (in radians) + * @returns {*|{axis: cc.math.Vec3, angle: number}} + */ + proto.toAxisAndAngle = function() { + /*Surely not this easy?*/ + var rotation = this.extractRotation(); + var temp = cc.math.Quaternion.rotationMatrix(rotation); + return temp.toAxisAndAngle(); + }; +})(cc); diff --git a/cocos2d/kazmath/plane.js b/cocos2d/kazmath/plane.js index 5470415f1a..94ab4e9b71 100644 --- a/cocos2d/kazmath/plane.js +++ b/cocos2d/kazmath/plane.js @@ -1,5 +1,7 @@ /** - Copyright (c) 2010-2012 cocos2d-x.org + Copyright (c) 2008-2010 Ricardo Quesada + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. Copyright (c) 2008, Luke Benstead. All rights reserved. @@ -27,156 +29,109 @@ /** * @ignore */ -cc.KM_PLANE_LEFT = 0; +(function(cc){ + cc.math.Plane = function (a, b, c, d) { + if (a && b === undefined) { + this.a = a.a; + this.b = a.b; + this.c = a.c; + this.d = a.d; + } else { + this.a = a || 0; + this.b = b || 0; + this.c = c || 0; + this.d = d || 0; + } + }; + cc.kmPlane = cc.math.Plane; + var proto = cc.math.Plane.prototype; + + cc.math.Plane.LEFT = 0; + + cc.math.Plane.RIGHT = 1; + + cc.math.Plane.BOTTOM = 2; + + cc.math.Plane.TOP = 3; + + cc.math.Plane.NEAR = 4; + + cc.math.Plane.FAR = 5; + + cc.math.Plane.POINT_INFRONT_OF_PLANE = 0; + + cc.math.Plane.POINT_BEHIND_PLANE = 1; + + cc.math.Plane.POINT_ON_PLANE = 2; + + proto.dot = function(vec4){ //cc.kmPlaneDot + return (this.a * vec4.x + this.b * vec4.y + this.c * vec4.z + this.d * vec4.w); + }; + + proto.dotCoord = function(vec3) { //=cc.kmPlaneDotCoord + return (this.a * vec3.x + this.b * vec3.y + this.c * vec3.z + this.d); + }; + + proto.dotNormal = function(vec3) { //=cc.kmPlaneDotNormal + return (this.a * vec3.x + this.b * vec3.y + this.c * vec3.z); + }; + + cc.math.Plane.fromPointNormal = function(vec3, normal) { //cc.kmPlaneFromPointNormal + /* + Planea = Nx + Planeb = Ny + Planec = Nz + Planed = −N⋅P + */ + return new cc.math.Plane(normal.x, normal.y, normal.z, -normal.dot(vec3)); + }; + + cc.math.Plane.fromPoints = function(vec1, vec2, vec3) { //cc.kmPlaneFromPoints + /* + v = (B − A) × (C − A) + n = 1⁄|v| v + Outa = nx + Outb = ny + Outc = nz + Outd = −n⋅A + */ + var v1 = new cc.math.Vec3(vec2), v2 = new cc.math.Vec3(vec3), plane = new cc.math.Plane(); + v1.subtract(vec1); //Create the vectors for the 2 sides of the triangle + v2.subtract(vec1); + v1.cross(v2); // Use the cross product to get the normal + v1.normalize(); //Normalize it and assign to pOut.m_N + + plane.a = v1.x; + plane.b = v1.y; + plane.c = v1.z; + plane.d = v1.scale(-1.0).dot(vec1); + return plane; + }; + + proto.normalize = function(){ //cc.kmPlaneNormalize + var n = new cc.math.Vec3(this.a, this.b, this.c), l = 1.0 / n.length(); //Get 1/length + n.normalize(); //Normalize the vector and assign to pOut + this.a = n.x; + this.b = n.y; + this.c = n.z; + this.d = this.d * l; //Scale the D value and assign to pOut + return this; + }; + + proto.classifyPoint = function(vec3) { + // This function will determine if a point is on, in front of, or behind + // the plane. First we store the dot product of the plane and the point. + var distance = this.a * vec3.x + this.b * vec3.y + this.c * vec3.z + this.d; + + // Simply put if the dot product is greater than 0 then it is infront of it. + // If it is less than 0 then it is behind it. And if it is 0 then it is on it. + if(distance > 0.001) + return cc.math.Plane.POINT_INFRONT_OF_PLANE; + if(distance < -0.001) + return cc.math.Plane.POINT_BEHIND_PLANE; + return cc.math.Plane.POINT_ON_PLANE; + }; +})(cc); -cc.KM_PLANE_RIGHT = 1; - -cc.KM_PLANE_BOTTOM = 2; - -cc.KM_PLANE_TOP = 3; - -cc.KM_PLANE_NEAR = 4; - -cc.KM_PLANE_FAR = 5; - -cc.kmPlane = function (a, b, c, d) { - this.a = a || 0; - this.b = b || 0; - this.c = c || 0; - this.d = d || 0; -}; - -cc.POINT_INFRONT_OF_PLANE = 0; - -cc.POINT_BEHIND_PLANE = 1; - -cc.POINT_ON_PLANE = 2; - -cc.kmPlaneDot = function(pP, pV){ - //a*x + b*y + c*z + d*w - return (pP.a * pV.x + - pP.b * pV.y + - pP.c * pV.z + - pP.d * pV.w); -}; - -cc.kmPlaneDotCoord = function(pP, pV){ - return (pP.a * pV.x + - pP.b * pV.y + - pP.c * pV.z + pP.d); -}; - -cc.kmPlaneDotNormal = function(pP, pV){ - return (pP.a * pV.x + - pP.b * pV.y + - pP.c * pV.z); -}; - -cc.kmPlaneFromPointNormal = function(pOut, pPoint, pNormal){ - /* - Planea = Nx - Planeb = Ny - Planec = Nz - Planed = −N⋅P - */ - pOut.a = pNormal.x; - pOut.b = pNormal.y; - pOut.c = pNormal.z; - pOut.d = -cc.kmVec3Dot(pNormal, pPoint); - - return pOut; -}; - -/** - * Creates a plane from 3 points. The result is stored in pOut. - * pOut is returned. - */ -cc.kmPlaneFromPoints = function(pOut, p1, p2, p3){ - /* - v = (B − A) × (C − A) - n = 1⁄|v| v - Outa = nx - Outb = ny - Outc = nz - Outd = −n⋅A - */ - - var n = new cc.kmVec3(), v1 = new cc.kmVec3(), v2 = new cc.kmVec3(); - cc.kmVec3Subtract(v1, p2, p1); //Create the vectors for the 2 sides of the triangle - cc.kmVec3Subtract(v2, p3, p1); - cc.kmVec3Cross(n, v1, v2); //Use the cross product to get the normal - - cc.kmVec3Normalize(n, n); //Normalize it and assign to pOut.m_N - - pOut.a = n.x; - pOut.b = n.y; - pOut.c = n.z; - pOut.d = cc.kmVec3Dot(cc.kmVec3Scale(n, n, -1.0), p1); - - return pOut; -}; - -cc.kmPlaneIntersectLine = function(pOut, pP, pV1, pV2){ - throw "cc.kmPlaneIntersectLine() hasn't been implemented."; - /* - n = (Planea, Planeb, Planec) - d = V − U - Out = U − d⋅(Pd + n⋅U)⁄(d⋅n) [iff d⋅n ≠ 0] - */ - //var d = new cc.kmVec3(); - - //cc.kmVec3Subtract(d, pV2, pV1); //Get the direction vector - - //TODO: Continue here! - /*if (fabs(kmVec3Dot(&pP.m_N, &d)) > kmEpsilon) - { - //If we get here then the plane and line are parallel (i.e. no intersection) - pOut = nullptr; //Set to nullptr - - return pOut; - } */ - - //return null; -}; - -cc.kmPlaneNormalize = function(pOut, pP){ - var n = new cc.kmVec3(); - - n.x = pP.a; - n.y = pP.b; - n.z = pP.c; - - var l = 1.0 / cc.kmVec3Length(n); //Get 1/length - cc.kmVec3Normalize(n, n); //Normalize the vector and assign to pOut - - pOut.a = n.x; - pOut.b = n.y; - pOut.c = n.z; - - pOut.d = pP.d * l; //Scale the D value and assign to pOut - - return pOut; -}; - -cc.kmPlaneScale = function(pOut, pP, s){ - cc.log("cc.kmPlaneScale() has not been implemented."); -}; - -/** - * Returns POINT_INFRONT_OF_PLANE if pP is infront of pIn. Returns - * POINT_BEHIND_PLANE if it is behind. Returns POINT_ON_PLANE otherwise - */ -cc.kmPlaneClassifyPoint = function(pIn, pP){ - // This function will determine if a point is on, in front of, or behind - // the plane. First we store the dot product of the plane and the point. - var distance = pIn.a * pP.x + pIn.b * pP.y + pIn.c * pP.z + pIn.d; - - // Simply put if the dot product is greater than 0 then it is infront of it. - // If it is less than 0 then it is behind it. And if it is 0 then it is on it. - if(distance > 0.001) return cc.POINT_INFRONT_OF_PLANE; - if(distance < -0.001) return cc.POINT_BEHIND_PLANE; - - return cc.POINT_ON_PLANE; -}; diff --git a/cocos2d/kazmath/quaternion.js b/cocos2d/kazmath/quaternion.js index 54e1de8e17..ac926ebec2 100644 --- a/cocos2d/kazmath/quaternion.js +++ b/cocos2d/kazmath/quaternion.js @@ -1,5 +1,7 @@ /** - Copyright (c) 2010-2012 cocos2d-x.org + Copyright (c) 2008-2010 Ricardo Quesada + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. Copyright (c) 2008, Luke Benstead. All rights reserved. @@ -24,463 +26,425 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/** - * The Quaternion class - * @param {Number} x - * @param {Number} y - * @param {Number} z - * @param {Number} w - * @constructor - */ -cc.kmQuaternion = function (x, y, z, w) { - this.x = x || 0; - this.y = y || 0; - this.z = z || 0; - this.w = w || 0; -}; - -///< Returns pOut, sets pOut to the conjugate of pIn -cc.kmQuaternionConjugate = function (pOut, pIn) { - pOut.x = -pIn.x; - pOut.y = -pIn.y; - pOut.z = -pIn.z; - pOut.w = pIn.w; - - return pOut; -}; - -///< Returns the dot product of the 2 quaternions -cc.kmQuaternionDot = function (q1, q2) { - // A dot B = B dot A = AtBt + AxBx + AyBy + AzBz - return (q1.w * q2.w + - q1.x * q2.x + - q1.y * q2.y + - q1.z * q2.z); -}; - -///< Returns the exponential of the quaternion -cc.kmQuaternionExp = function (pOut, pIn) { - //TODO not implement - //cc.assert(0); - return pOut; -}; - -///< Makes the passed quaternion an identity quaternion -cc.kmQuaternionIdentity = function (pOut) { - pOut.x = 0.0; - pOut.y = 0.0; - pOut.z = 0.0; - pOut.w = 1.0; - - return pOut; -}; - -///< Returns the inverse of the passed Quaternion -cc.kmQuaternionInverse = function (pOut, pIn) { - var l = cc.kmQuaternionLength(pIn); - var tmp = new cc.kmQuaternion(); - - if (Math.abs(l) > cc.kmEpsilon) { - pOut.x = 0.0; - pOut.y = 0.0; - pOut.z = 0.0; - pOut.w = 0.0; - return pOut; - } - - ///Get the conjugute and divide by the length - cc.kmQuaternionScale(pOut, - cc.kmQuaternionConjugate(tmp, pIn), 1.0 / l); - - return pOut; -}; - -///< Returns true if the quaternion is an identity quaternion -cc.kmQuaternionIsIdentity = function (pIn) { - return (pIn.x == 0.0 && pIn.y == 0.0 && pIn.z == 0.0 && - pIn.w == 1.0); -}; - -///< Returns the length of the quaternion -cc.kmQuaternionLength = function (pIn) { - return Math.sqrt(cc.kmQuaternionLengthSq(pIn)); -}; - -///< Returns the length of the quaternion squared (prevents a sqrt) -cc.kmQuaternionLengthSq = function (pIn) { - return pIn.x * pIn.x + pIn.y * pIn.y + - pIn.z * pIn.z + pIn.w * pIn.w; -}; - -///< Returns the natural logarithm -cc.kmQuaternionLn = function (pOut, pIn) { - /* - A unit quaternion, is defined by: - Q == (cos(theta), sin(theta) * v) where |v| = 1 - The natural logarithm of Q is, ln(Q) = (0, theta * v) +(function(cc) { + /** + * The Quaternion class + * @param {Number|cc.math.Quaternion} [x=0] + * @param {Number} [y=0] + * @param {Number} [z=0] + * @param {Number} [w=0] + * @constructor */ - //assert(0); - //TODO not implement - return pOut; -}; - -///< Multiplies 2 quaternions together -cc.kmQuaternionMultiply = function (pOut, q1, q2) { - pOut.w = q1.w * q2.w - q1.x * q2.x - q1.y * q2.y - q1.z * q2.z; - pOut.x = q1.w * q2.x + q1.x * q2.w + q1.y * q2.z - q1.z * q2.y; - pOut.y = q1.w * q2.y + q1.y * q2.w + q1.z * q2.x - q1.x * q2.z; - pOut.z = q1.w * q2.z + q1.z * q2.w + q1.x * q2.y - q1.y * q2.x; - - return pOut; -}; - -///< Normalizes a quaternion -cc.kmQuaternionNormalize = function (pOut, pIn) { - var length = cc.kmQuaternionLength(pIn); - if(Math.abs(length) <= cc.kmEpsilon) - throw "cc.kmQuaternionNormalize(): pIn is an invalid value"; - cc.kmQuaternionScale(pOut, pIn, 1.0 / length); - - return pOut; -}; - -///< Rotates a quaternion around an axis -cc.kmQuaternionRotationAxis = function (pOut, pV, angle) { - var rad = angle * 0.5; - var scale = Math.sin(rad); - - pOut.w = Math.cos(rad); - pOut.x = pV.x * scale; - pOut.y = pV.y * scale; - pOut.z = pV.z * scale; - - return pOut; -}; - -///< Creates a quaternion from a rotation matrix -cc.kmQuaternionRotationMatrix = function (pOut, pIn) { - /* - Note: The OpenGL matrices are transposed from the description below - taken from the Matrix and Quaternion FAQ - - if ( mat[0] > mat[5] && mat[0] > mat[10] ) { // Column 0: - S = sqrt( 1.0 + mat[0] - mat[5] - mat[10] ) * 2; - X = 0.25 * S; - Y = (mat[4] + mat[1] ) / S; - Z = (mat[2] + mat[8] ) / S; - W = (mat[9] - mat[6] ) / S; - } else if ( mat[5] > mat[10] ) { // Column 1: - S = sqrt( 1.0 + mat[5] - mat[0] - mat[10] ) * 2; - X = (mat[4] + mat[1] ) / S; - Y = 0.25 * S; - Z = (mat[9] + mat[6] ) / S; - W = (mat[2] - mat[8] ) / S; - } else { // Column 2: - S = sqrt( 1.0 + mat[10] - mat[0] - mat[5] ) * 2; - X = (mat[2] + mat[8] ) / S; - Y = (mat[9] + mat[6] ) / S; - Z = 0.25 * S; - W = (mat[4] - mat[1] ) / S; - } - */ - var x, y, z, w; - var m4x4 = []; - var scale = 0.0; - var diagonal = 0.0; - - if (!pIn) { - return null; - } - - /* 0 3 6 - 1 4 7 - 2 5 8 - - 0 1 2 3 - 4 5 6 7 - 8 9 10 11 - 12 13 14 15*/ - - m4x4[0] = pIn.mat[0]; - m4x4[1] = pIn.mat[3]; - m4x4[2] = pIn.mat[6]; - m4x4[4] = pIn.mat[1]; - m4x4[5] = pIn.mat[4]; - m4x4[6] = pIn.mat[7]; - m4x4[8] = pIn.mat[2]; - m4x4[9] = pIn.mat[5]; - m4x4[10] = pIn.mat[8]; - m4x4[15] = 1; - var pMatrix = m4x4[0]; - - diagonal = pMatrix[0] + pMatrix[5] + pMatrix[10] + 1; - - if (diagonal > cc.kmEpsilon) { - // Calculate the scale of the diagonal - scale = Math.sqrt(diagonal) * 2; - - // Calculate the x, y, x and w of the quaternion through the respective equation - x = ( pMatrix[9] - pMatrix[6] ) / scale; - y = ( pMatrix[2] - pMatrix[8] ) / scale; - z = ( pMatrix[4] - pMatrix[1] ) / scale; - w = 0.25 * scale; - } else { - // If the first element of the diagonal is the greatest value - if (pMatrix[0] > pMatrix[5] && pMatrix[0] > pMatrix[10]) { - // Find the scale according to the first element, and double that value - scale = Math.sqrt(1.0 + pMatrix[0] - pMatrix[5] - pMatrix[10]) * 2.0; - - // Calculate the x, y, x and w of the quaternion through the respective equation - x = 0.25 * scale; - y = (pMatrix[4] + pMatrix[1] ) / scale; - z = (pMatrix[2] + pMatrix[8] ) / scale; - w = (pMatrix[9] - pMatrix[6] ) / scale; - } - // Else if the second element of the diagonal is the greatest value - else if (pMatrix[5] > pMatrix[10]) { - // Find the scale according to the second element, and double that value - scale = Math.sqrt(1.0 + pMatrix[5] - pMatrix[0] - pMatrix[10]) * 2.0; - - // Calculate the x, y, x and w of the quaternion through the respective equation - x = (pMatrix[4] + pMatrix[1] ) / scale; - y = 0.25 * scale; - z = (pMatrix[9] + pMatrix[6] ) / scale; - w = (pMatrix[2] - pMatrix[8] ) / scale; + cc.math.Quaternion = function (x, y, z, w) { + if (x && y === undefined) { + this.x = x.x; + this.y = x.y; + this.z = x.z; + this.w = x.w; } else { - // Else the third element of the diagonal is the greatest value - - // Find the scale according to the third element, and double that value - scale = Math.sqrt(1.0 + pMatrix[10] - pMatrix[0] - pMatrix[5]) * 2.0; - - // Calculate the x, y, x and w of the quaternion through the respective equation - x = (pMatrix[2] + pMatrix[8] ) / scale; - y = (pMatrix[9] + pMatrix[6] ) / scale; - z = 0.25 * scale; - w = (pMatrix[4] - pMatrix[1] ) / scale; + this.x = x || 0; + this.y = y || 0; + this.z = z || 0; + this.w = w || 0; } - } - - pOut.x = x; - pOut.y = y; - pOut.z = z; - pOut.w = w; - - return pOut; -}; - -///< Create a quaternion from yaw, pitch and roll -cc.kmQuaternionRotationYawPitchRoll = function (pOut, yaw, pitch, roll) { - var ex, ey, ez; // temp half euler angles - var cr, cp, cy, sr, sp, sy, cpcy, spsy; // temp vars in roll,pitch yaw - - ex = cc.kmDegreesToRadians(pitch) / 2.0; // convert to rads and half them - ey = cc.kmDegreesToRadians(yaw) / 2.0; - ez = cc.kmDegreesToRadians(roll) / 2.0; + }; + cc.kmQuaternion = cc.math.Quaternion; + var proto = cc.math.Quaternion.prototype; - cr = Math.cos(ex); - cp = Math.cos(ey); - cy = Math.cos(ez); - - sr = Math.sin(ex); - sp = Math.sin(ey); - sy = Math.sin(ez); - - cpcy = cp * cy; - spsy = sp * sy; - - pOut.w = cr * cpcy + sr * spsy; - - pOut.x = sr * cpcy - cr * spsy; - pOut.y = cr * sp * cy + sr * cp * sy; - pOut.z = cr * cp * sy - sr * sp * cy; - - cc.kmQuaternionNormalize(pOut, pOut); - - return pOut; -}; - -///< Interpolate between 2 quaternions -cc.kmQuaternionSlerp = function (pOut, q1, q2, t) { - /*float CosTheta = Q0.DotProd(Q1); - float Theta = acosf(CosTheta); - float SinTheta = sqrtf(1.0f-CosTheta*CosTheta); - - float Sin_T_Theta = sinf(T*Theta)/SinTheta; - float Sin_OneMinusT_Theta = sinf((1.0f-T)*Theta)/SinTheta; - - Quaternion Result = Q0*Sin_OneMinusT_Theta; - Result += (Q1*Sin_T_Theta); - - return Result;*/ - - if (q1.x == q2.x && - q1.y == q2.y && - q1.z == q2.z && - q1.w == q2.w) { - - pOut.x = q1.x; - pOut.y = q1.y; - pOut.z = q1.z; - pOut.w = q1.w; - - return pOut; - } - - var ct = cc.kmQuaternionDot(q1, q2); - var theta = Math.acos(ct); - var st = Math.sqrt(1.0 - cc.kmSQR(ct)); - - var stt = Math.sin(t * theta) / st; - var somt = Math.sin((1.0 - t) * theta) / st; - - var temp = new cc.kmQuaternion(), temp2 = new cc.kmQuaternion(); - cc.kmQuaternionScale(temp, q1, somt); - cc.kmQuaternionScale(temp2, q2, stt); - cc.kmQuaternionAdd(pOut, temp, temp2); - - return pOut; -}; - -///< Get the axis and angle of rotation from a quaternion -cc.kmQuaternionToAxisAngle = function (pIn, pAxis, pAngle) { - var tempAngle; // temp angle - var scale; // temp vars - - tempAngle = Math.acos(pIn.w); - scale = Math.sqrt(cc.kmSQR(pIn.x) + cc.kmSQR(pIn.y) + cc.kmSQR(pIn.z)); - - if (((scale > -cc.kmEpsilon) && scale < cc.kmEpsilon) - || (scale < 2 * cc.kmPI + cc.kmEpsilon && scale > 2 * cc.kmPI - cc.kmEpsilon)) { // angle is 0 or 360 so just simply set axis to 0,0,1 with angle 0 - pAngle = 0.0; - - pAxis.x = 0.0; - pAxis.y = 0.0; - pAxis.z = 1.0; - } else { - pAngle = tempAngle * 2.0; // angle in radians - - pAxis.x = pIn.x / scale; - pAxis.y = pIn.y / scale; - pAxis.z = pIn.z / scale; - cc.kmVec3Normalize(pAxis, pAxis); - } -}; - -///< Scale a quaternion -cc.kmQuaternionScale = function (pOut, pIn, s) { - pOut.x = pIn.x * s; - pOut.y = pIn.y * s; - pOut.z = pIn.z * s; - pOut.w = pIn.w * s; - - return pOut; -}; - -cc.kmQuaternionAssign = function (pOut, pIn) { - pOut.x = pIn.x; - pOut.y = pIn.y; - pOut.z = pIn.z; - pOut.w = pIn.w; - - return pOut; -}; + /** + * Sets the conjugate of quaternion to self + * @param {cc.math.Quaternion} quaternion + */ + proto.conjugate = function (quaternion) { //= cc.kmQuaternionConjugate + this.x = -quaternion.x; + this.y = -quaternion.y; + this.z = -quaternion.z; + this.w = quaternion.w; + return this; + }; + + /** + * Returns the dot product of the current quaternion and parameter quaternion + * @param quaternion + * @returns {number} + */ + proto.dot = function(quaternion) { // = cc.kmQuaternionDot + // A dot B = B dot A = AtBt + AxBx + AyBy + AzBz + return (this.w * quaternion.w + this.x * quaternion.x + this.y * quaternion.y + this.z * quaternion.z); + }; + + /** + * Returns the exponential of the quaternion, this function doesn't implemented. + * @returns {cc.math.Quaternion} + */ + proto.exponential = function(){ //=cc.kmQuaternionExp + return this; + }; -cc.kmQuaternionAdd = function (pOut, pQ1, pQ2) { - pOut.x = pQ1.x + pQ2.x; - pOut.y = pQ1.y + pQ2.y; - pOut.z = pQ1.z + pQ2.z; - pOut.w = pQ1.w + pQ2.w; - - return pOut; -}; - -/** Adapted from the OGRE engine! - - Gets the shortest arc quaternion to rotate this vector to the destination - vector. - @remarks - If you call this with a dest vector that is close to the inverse - of this vector, we will rotate 180 degrees around the 'fallbackAxis' - (if specified, or a generated axis if not) since in this case - ANY axis of rotation is valid. - */ -cc.kmQuaternionRotationBetweenVec3 = function (pOut, vec1, vec2, fallback) { - var v1 = new cc.kmVec3(), v2 = new cc.kmVec3(); - var a; + /** + * Makes the current quaternion an identity quaternion + */ + proto.identity = function(){ //=cc.kmQuaternionIdentity + this.x = 0.0; + this.y = 0.0; + this.z = 0.0; + this.w = 1.0; + return this; + }; + + /** + * Inverses the value of current Quaternion + */ + proto.inverse = function(){ //=cc.kmQuaternionInverse + var len = this.length(); + if (Math.abs(len) > cc.math.EPSILON) { + this.x = 0.0; + this.y = 0.0; + this.z = 0.0; + this.w = 0.0; + return this; + } - cc.kmVec3Assign(v1, vec1); - cc.kmVec3Assign(v2, vec2); + ///Get the conjugute and divide by the length + this.conjugate(this).scale(1.0 / len); + return this; + }; - cc.kmVec3Normalize(v1, v1); - cc.kmVec3Normalize(v2, v2); + /** + * Returns true if the quaternion is an identity quaternion + * @returns {boolean} + */ + proto.isIdentity = function(){ //=cc.kmQuaternionIsIdentity + return (this.x === 0.0 && this.y === 0.0 && this.z === 0.0 && this.w === 1.0); + }; - a = cc.kmVec3Dot(v1, v2); + /** + * Returns the length of the quaternion + * @returns {number} + */ + proto.length = function() { //=cc.kmQuaternionLength + return Math.sqrt(this.lengthSq()); + }; - if (a >= 1.0) { - cc.kmQuaternionIdentity(pOut); - return pOut; - } + /** + * Returns the length of the quaternion squared (prevents a sqrt) + * @returns {number} + */ + proto.lengthSq = function() { //=cc.kmQuaternionLengthSq + return this.x * this.x + this.y * this.y + this.z * this.z + this.w * this.w; + }; + + /** + * Uses current quaternion multiplies other quaternion. + * @param {cc.math.Quaternion} quaternion + * @returns {cc.math.Quaternion} + */ + proto.multiply = function(quaternion) { //cc.kmQuaternionMultiply + var x = this.x, y = this.y, z = this.z, w = this.w; + this.w = w * quaternion.w - x * quaternion.x - y * quaternion.y - z * quaternion.z; + this.x = w * quaternion.x + x * quaternion.w + y * quaternion.z - z * quaternion.y; + this.y = w * quaternion.y + y * quaternion.w + z * quaternion.x - x * quaternion.z; + this.z = w * quaternion.z + z * quaternion.w + x * quaternion.y - y * quaternion.x; + return this; + }; + + /** + * Normalizes a quaternion + * @returns {cc.math.Quaternion} + */ + proto.normalize = function(){ //=cc.kmQuaternionNormalize + var length = this.length(); + if (Math.abs(length) <= cc.math.EPSILON) + throw "current quaternion is an invalid value"; + this.scale(1.0 / length); + return this; + }; + + /** + * Rotates a quaternion around an axis and an angle + * @param {cc.math.Vec3} axis + * @param {Number} angle + */ + proto.rotationAxis = function(axis, angle){ //cc.kmQuaternionRotationAxis + var rad = angle * 0.5, scale = Math.sin(rad); + this.w = Math.cos(rad); + this.x = axis.x * scale; + this.y = axis.y * scale; + this.z = axis.z * scale; + return this; + }; + + /** + * Creates a quaternion from a rotation matrix + * @param mat3 + * @returns {*} + */ + cc.math.Quaternion.rotationMatrix = function (mat3) { //cc.kmQuaternionRotationMatrix + if (!mat3) + return null; + + var x, y, z, w; + var m4x4 = [], mat = mat3.mat, scale = 0.0; + + /* 0 3 6 + 1 4 7 + 2 5 8 + + 0 1 2 3 + 4 5 6 7 + 8 9 10 11 + 12 13 14 15*/ + m4x4[0] = mat[0]; + m4x4[1] = mat[3]; + m4x4[2] = mat[6]; + m4x4[4] = mat[1]; + m4x4[5] = mat[4]; + m4x4[6] = mat[7]; + m4x4[8] = mat[2]; + m4x4[9] = mat[5]; + m4x4[10] = mat[8]; + m4x4[15] = 1; + var pMatrix = m4x4[0]; + + var diagonal = pMatrix[0] + pMatrix[5] + pMatrix[10] + 1; + if (diagonal > cc.math.EPSILON) { + // Calculate the scale of the diagonal + scale = Math.sqrt(diagonal) * 2; - if (a < (1e-6 - 1.0)) { - if (Math.abs(cc.kmVec3LengthSq(fallback)) < cc.kmEpsilon) { - cc.kmQuaternionRotationAxis(pOut, fallback, cc.kmPI); + // Calculate the x, y, x and w of the quaternion through the respective equation + x = ( pMatrix[9] - pMatrix[6] ) / scale; + y = ( pMatrix[2] - pMatrix[8] ) / scale; + z = ( pMatrix[4] - pMatrix[1] ) / scale; + w = 0.25 * scale; } else { - var axis = new cc.kmVec3(); - var X = new cc.kmVec3(); - X.x = 1.0; - X.y = 0.0; - X.z = 0.0; - - cc.kmVec3Cross(axis, X, vec1); - - //If axis is zero - if (Math.abs(cc.kmVec3LengthSq(axis)) < cc.kmEpsilon) { - var Y = new cc.kmVec3(); - Y.x = 0.0; - Y.y = 1.0; - Y.z = 0.0; - - cc.kmVec3Cross(axis, Y, vec1); + // If the first element of the diagonal is the greatest value + if (pMatrix[0] > pMatrix[5] && pMatrix[0] > pMatrix[10]) { + // Find the scale according to the first element, and double that value + scale = Math.sqrt(1.0 + pMatrix[0] - pMatrix[5] - pMatrix[10]) * 2.0; + + // Calculate the x, y, x and w of the quaternion through the respective equation + x = 0.25 * scale; + y = (pMatrix[4] + pMatrix[1] ) / scale; + z = (pMatrix[2] + pMatrix[8] ) / scale; + w = (pMatrix[9] - pMatrix[6] ) / scale; + } + // Else if the second element of the diagonal is the greatest value + else if (pMatrix[5] > pMatrix[10]) { + // Find the scale according to the second element, and double that value + scale = Math.sqrt(1.0 + pMatrix[5] - pMatrix[0] - pMatrix[10]) * 2.0; + + // Calculate the x, y, x and w of the quaternion through the respective equation + x = (pMatrix[4] + pMatrix[1] ) / scale; + y = 0.25 * scale; + z = (pMatrix[9] + pMatrix[6] ) / scale; + w = (pMatrix[2] - pMatrix[8] ) / scale; + } else { + // Else the third element of the diagonal is the greatest value + + // Find the scale according to the third element, and double that value + scale = Math.sqrt(1.0 + pMatrix[10] - pMatrix[0] - pMatrix[5]) * 2.0; + + // Calculate the x, y, x and w of the quaternion through the respective equation + x = (pMatrix[2] + pMatrix[8] ) / scale; + y = (pMatrix[9] + pMatrix[6] ) / scale; + z = 0.25 * scale; + w = (pMatrix[4] - pMatrix[1] ) / scale; } - - cc.kmVec3Normalize(axis, axis); - cc.kmQuaternionRotationAxis(pOut, axis, cc.kmPI); } - } else { - var s = Math.sqrt((1 + a) * 2); - var invs = 1 / s; - - var c = new cc.kmVec3(); - cc.kmVec3Cross(c, v1, v2); - - pOut.x = c.x * invs; - pOut.y = c.y * invs; - pOut.z = c.z * invs; - pOut.w = s * 0.5; - - cc.kmQuaternionNormalize(pOut, pOut); - } - return pOut; -}; - -cc.kmQuaternionMultiplyVec3 = function (pOut, q, v) { - var uv = new cc.kmVec3(), uuv = new cc.kmVec3(), qvec = new cc.kmVec3(); - - qvec.x = q.x; - qvec.y = q.y; - qvec.z = q.z; + return new cc.math.Quaternion(x, y, z, w); + }; + + /** + * Create a quaternion from yaw, pitch and roll + * @param yaw + * @param pitch + * @param roll + * @returns {cc.math.Quaternion} + */ + cc.math.Quaternion.rotationYawPitchRoll = function (yaw, pitch, roll) { //cc.kmQuaternionRotationYawPitchRoll + var ex, ey, ez; // temp half euler angles + var cr, cp, cy, sr, sp, sy, cpcy, spsy; // temp vars in roll,pitch yaw + + ex = cc.degreesToRadians(pitch) / 2.0; // convert to rads and half them + ey = cc.degreesToRadians(yaw) / 2.0; + ez = cc.degreesToRadians(roll) / 2.0; + + cr = Math.cos(ex); + cp = Math.cos(ey); + cy = Math.cos(ez); + + sr = Math.sin(ex); + sp = Math.sin(ey); + sy = Math.sin(ez); + + cpcy = cp * cy; + spsy = sp * sy; + + var ret = new cc.math.Quaternion(); + ret.w = cr * cpcy + sr * spsy; + ret.x = sr * cpcy - cr * spsy; + ret.y = cr * sp * cy + sr * cp * sy; + ret.z = cr * cp * sy - sr * sp * cy; + ret.normalize(); + return ret; + }; + + /** + * Interpolate with other quaternions + * @param {cc.math.Quaternion} quaternion + * @param {Number} t + * @returns {cc.math.Quaternion} + */ + proto.slerp = function(quaternion, t) { //=cc.kmQuaternionSlerp + if (this.x === quaternion.x && this.y === quaternion.y && this.z === quaternion.z && this.w === quaternion.w) { + return this; + } + var ct = this.dot(quaternion), theta = Math.acos(ct), st = Math.sqrt(1.0 - cc.math.square(ct)); + var stt = Math.sin(t * theta) / st, somt = Math.sin((1.0 - t) * theta) / st; + var temp2 = new cc.math.Quaternion(quaternion); + this.scale(somt); + temp2.scale(stt); + this.add(temp2); + return this; + }; + + /** + * Get the axis and angle of rotation from a quaternion + * @returns {{axis: cc.math.Vec3, angle: number}} + */ + proto.toAxisAndAngle = function(){ //=cc.kmQuaternionToAxisAngle + var tempAngle; // temp angle + var scale; // temp vars + var retAngle, retAxis = new cc.math.Vec3(); + + tempAngle = Math.acos(this.w); + scale = Math.sqrt(cc.math.square(this.x) + cc.math.square(this.y) + cc.math.square(this.z)); + + if (((scale > -cc.math.EPSILON) && scale < cc.math.EPSILON) + || (scale < 2 * Math.PI + cc.math.EPSILON && scale > 2 * Math.PI - cc.math.EPSILON)) { // angle is 0 or 360 so just simply set axis to 0,0,1 with angle 0 + retAngle = 0.0; + retAxis.x = 0.0; + retAxis.y = 0.0; + retAxis.z = 1.0; + } else { + retAngle = tempAngle * 2.0; // angle in radians + retAxis.x = this.x / scale; + retAxis.y = this.y / scale; + retAxis.z = this.z / scale; + retAxis.normalize(); + } + return {axis: retAxis, angle: retAngle}; + }; - cc.kmVec3Cross(uv, qvec, v); - cc.kmVec3Cross(uuv, qvec, uv); + /** + * Scale a quaternion + * @param {Number} scale + */ + proto.scale = function(scale) { //cc.kmQuaternionScale + this.x *= scale; + this.y *= scale; + this.z *= scale; + this.w *= scale; + return this; + }; + + /** + * Assign current quaternion value from a quaternion. + * @param {cc.math.Quaternion} quaternion + * @returns {cc.math.Quaternion} current quaternion + */ + proto.assignFrom = function(quaternion){ //=cc.kmQuaternionAssign + this.x = quaternion.x; + this.y = quaternion.y; + this.z = quaternion.z; + this.w = quaternion.w; + return this; + }; + + /** + * Adds other quaternion + * @param {cc.math.Quaternion} quaternion + * @returns {cc.math.Quaternion} + */ + proto.add = function(quaternion) { //cc.kmQuaternionAdd + this.x += quaternion.x; + this.y += quaternion.y; + this.z += quaternion.z; + this.w += quaternion.w; + return this; + }; + + /** + *
+ * Adapted from the OGRE engine!
+ * Gets the shortest arc quaternion to rotate this vector to the destination vector.
+ * @remarks
+ * If you call this with a destination vector that is close to the inverse
+ * of this vector, we will rotate 180 degrees around the 'fallbackAxis'
+ * (if specified, or a generated axis if not) since in this case ANY axis of rotation is valid.
+ *
The main namespace of Cocos2d-html5's math library,
+ * all math core classes, functions, properties and constants are defined in this namespace
- * Create a label atlas.
- * It accepts two groups of parameters:
- * a) string, fntFile
- * b) label, textureFilename, width, height, startChar
+ * Constructor function, override it to extend the construction behavior, remember to call "this._super()" in the extended "ctor" function.
+ * Create a label atlas.
+ * It accepts two groups of parameters:
+ * a) string, fntFile
+ * b) label, textureFilename, width, height, startChar
*
- * initializes the cc.LabelAtlas with a string, a char map file(the atlas),
- * the width and height of each element and the starting char of the atlas
- * It accepts two groups of parameters:
- * a) string, fntFile
- * b) label, textureFilename, width, height, startChar
+ * initializes the cc.LabelAtlas with a string, a char map file(the atlas),
+ * the width and height of each element and the starting char of the atlas
+ * It accepts two groups of parameters:
+ * a) string, fntFile
+ * b) label, textureFilename, width, height, startChar
*
- * Create a label atlas.
- * It accepts two groups of parameters:
- * a) string, fntFile
- * b) label, textureFilename, width, height, startChar
+ * Please use new cc.LabelAtlas instead.
+ * Create a label atlas.
+ * It accepts two groups of parameters:
+ * a) string, fntFile
+ * b) label, textureFilename, width, height, startChar
*
+ * creates a bitmap font atlas with an initial string and the FNT file. * @param {String} str * @param {String} fntFile * @param {Number} [width=-1] * @param {Number} [alignment=cc.TEXT_ALIGNMENT_LEFT] * @param {cc.Point} [imageOffset=cc.p(0,0)] - * @example - * // Example 01 - * var label1 = new cc.LabelBMFont("Test case", "test.fnt"); - * - * // Example 02 - * var label2 = new cc.LabelBMFont("test case", "test.fnt", 200, cc.TEXT_ALIGNMENT_LEFT); - * - * // Example 03 - * var label3 = new cc.LabelBMFont("This is a \n test case", "test.fnt", 200, cc.TEXT_ALIGNMENT_LEFT, cc.p(0,0)); */ ctor: function (str, fntFile, width, alignment, imageOffset) { - var self = this; - cc.SpriteBatchNode.prototype.ctor.call(self); - self._imageOffset = cc.p(0, 0); - self._displayedColor = cc.color(255, 255, 255, 255); - self._realColor = cc.color(255, 255, 255, 255); - self._reusedChar = []; - + cc.SpriteBatchNode.prototype.ctor.call(this); + this._imageOffset = cc.p(0, 0); + this._reusedChar = []; + this._cascadeColorEnabled = true; + this._cascadeOpacityEnabled = true; this.initWithString(str, fntFile, width, alignment, imageOffset); }, + /** * return texture is loaded * @returns {boolean} @@ -164,73 +168,18 @@ cc.LabelBMFont = cc.SpriteBatchNode.extend(/** @lends cc.LabelBMFont# */{ }, /** - * add texture loaded event listener + * add texture loaded event listener.
+ * Will execute the callback in the loaded. * @param {Function} callback * @param {Object} target + * @deprecated since 3.1, please use addEventListener instead */ addLoadedEventListener: function (callback, target) { - if (!this._loadedEventListeners) - this._loadedEventListeners = []; - this._loadedEventListeners.push({eventCallback: callback, eventTarget: target}); - }, - - _callLoadedEventCallbacks: function () { - if (!this._loadedEventListeners) - return; - var locListeners = this._loadedEventListeners; - for (var i = 0, len = locListeners.length; i < len; i++) { - var selCallback = locListeners[i]; - selCallback.eventCallback.call(selCallback.eventTarget, this); - } - locListeners.length = 0; - }, - - /** - * @param {CanvasRenderingContext2D} ctx - */ - draw: function (ctx) { - cc.SpriteBatchNode.prototype.draw.call(this, ctx); - - //LabelBMFont - Debug draw - if (cc.LABELBMFONT_DEBUG_DRAW) { - var size = this.getContentSize(); - var pos = cc.p(0 | ( -this._anchorPointInPoints.x), 0 | ( -this._anchorPointInPoints.y)); - var vertices = [cc.p(pos.x, pos.y), cc.p(pos.x + size.width, pos.y), cc.p(pos.x + size.width, pos.y + size.height), cc.p(pos.x, pos.y + size.height)]; - cc._drawingUtil.setDrawColor(0, 255, 0, 255); - cc._drawingUtil.drawPoly(vertices, 4, true); - } - }, - - //TODO - /** - * tint this label - * @param {cc.Color} color - */ - setColor: function (color) { - var locDisplayed = this._displayedColor, locRealColor = this._realColor; - if ((locRealColor.r == color.r) && (locRealColor.g == color.g) && (locRealColor.b == color.b) && (locRealColor.a == color.a)) - return; - locDisplayed.r = locRealColor.r = color.r; - locDisplayed.g = locRealColor.g = color.g; - locDisplayed.b = locRealColor.b = color.b; - - if (this._textureLoaded) { - if (this._cascadeColorEnabled) { - var parentColor = cc.color.WHITE; - var locParent = this._parent; - if (locParent && locParent.RGBAProtocol && locParent.cascadeColor) - parentColor = locParent.getDisplayedColor(); - this.updateDisplayedColor(parentColor); - } - } - - if (color.a !== undefined && !color.a_undefined) { - this.setOpacity(color.a); - } + this.addEventListener("load", callback, target); }, /** - * conforms to cc.RGBAProtocol protocol + * Conforms to cc.RGBAProtocol protocol. * @return {Boolean} */ isOpacityModifyRGB: function () { @@ -238,6 +187,7 @@ cc.LabelBMFont = cc.SpriteBatchNode.extend(/** @lends cc.LabelBMFont# */{ }, /** + * Set whether to support cc.RGBAProtocol protocol * @param {Boolean} opacityModifyRGB */ setOpacityModifyRGB: function (opacityModifyRGB) { @@ -246,130 +196,25 @@ cc.LabelBMFont = cc.SpriteBatchNode.extend(/** @lends cc.LabelBMFont# */{ if (locChildren) { for (var i = 0; i < locChildren.length; i++) { var node = locChildren[i]; - if (node && node.RGBAProtocol) + if (node) node.opacityModifyRGB = this._opacityModifyRGB; } } }, - getOpacity: function () { - return this._realOpacity; - }, - - getDisplayedOpacity: function () { - return this._displayedOpacity; - }, - - /** - * Override synthesized setOpacity to recurse items - * @param {Number} opacity - */ - setOpacity: function (opacity) { - this._displayedOpacity = this._realOpacity = opacity; - if (this._cascadeOpacityEnabled) { - var parentOpacity = 255; - var locParent = this._parent; - if (locParent && locParent.RGBAProtocol && locParent.cascadeOpacity) - parentOpacity = locParent.getDisplayedOpacity(); - this.updateDisplayedOpacity(parentOpacity); - } - - this._displayedColor.a = this._realColor.a = opacity; - }, - - updateDisplayedOpacity: function (parentOpacity) { - this._displayedOpacity = this._realOpacity * parentOpacity / 255.0; - var locChildren = this._children; - for (var i = 0; i < locChildren.length; i++) { - var locChild = locChildren[i]; - if (cc._renderType == cc._RENDER_TYPE_WEBGL) { - locChild.updateDisplayedOpacity(this._displayedOpacity); - } else { - cc.NodeRGBA.prototype.updateDisplayedOpacity.call(locChild, this._displayedOpacity); - locChild.setNodeDirty(); - } - } - this._changeTextureColor(); - }, - - isCascadeOpacityEnabled: function () { - return false; - }, - - setCascadeOpacityEnabled: function (cascadeOpacityEnabled) { - this._cascadeOpacityEnabled = cascadeOpacityEnabled; - }, - - getColor: function () { - var locRealColor = this._realColor; - return cc.color(locRealColor.r, locRealColor.g, locRealColor.b, locRealColor.a); - }, - - getDisplayedColor: function () { - return this._displayedColor; - }, - - updateDisplayedColor: function (parentColor) { - var locDispColor = this._displayedColor; - var locRealColor = this._realColor; - locDispColor.r = locRealColor.r * parentColor.r / 255.0; - locDispColor.g = locRealColor.g * parentColor.g / 255.0; - locDispColor.b = locRealColor.b * parentColor.b / 255.0; - - var locChildren = this._children; - for (var i = 0; i < locChildren.length; i++) { - var locChild = locChildren[i]; - if (cc._renderType == cc._RENDER_TYPE_WEBGL) { - locChild.updateDisplayedColor(this._displayedColor); - } else { - cc.NodeRGBA.prototype.updateDisplayedColor.call(locChild, this._displayedColor); - locChild.setNodeDirty(); - } - } - this._changeTextureColor(); - }, - _changeTextureColor: function () { - if (cc._renderType == cc._RENDER_TYPE_WEBGL) { - return; - } - var locElement, locTexture = this.texture; - if (locTexture && locTexture.width > 0) { - locElement = locTexture.getHtmlElementObj(); - if (!locElement) - return; - var cacheTextureForColor = cc.textureCache.getTextureColors(this._originalTexture.getHtmlElementObj()); - if (cacheTextureForColor) { - if (locElement instanceof HTMLCanvasElement && !this._rectRotated) - cc.generateTintImage(locElement, cacheTextureForColor, this._displayedColor, null, locElement); - else { - locElement = cc.generateTintImage(locElement, cacheTextureForColor, this._displayedColor); - locTexture = new cc.Texture2D(); - locTexture.initWithElement(locElement); - locTexture.handleLoadedTexture(); - this.texture = locTexture; - } - } - } - }, - - isCascadeColorEnabled: function () { - return false; - }, - - setCascadeColorEnabled: function (cascadeColorEnabled) { - this._cascadeColorEnabled = cascadeColorEnabled; + this._renderCmd._changeTextureColor(); }, /** - * init LabelBMFont + * Initialization of the node, please do not call this function by yourself, you should pass the parameters to constructor to initialize it . */ init: function () { return this.initWithString(null, null, null, null, null); }, /** - * init a bitmap font altas with an initial string and the FNT file + * init a bitmap font atlas with an initial string and the FNT file * @param {String} str * @param {String} fntFile * @param {Number} [width=-1] @@ -379,11 +224,11 @@ cc.LabelBMFont = cc.SpriteBatchNode.extend(/** @lends cc.LabelBMFont# */{ */ initWithString: function (str, fntFile, width, alignment, imageOffset) { var self = this, theString = str || ""; + var cmd = this._renderCmd; if (self._config) cc.log("cc.LabelBMFont.initWithString(): re-init is no longer supported"); - var texture; if (fntFile) { var newConf = cc.loader.getRes(fntFile); @@ -398,13 +243,13 @@ cc.LabelBMFont = cc.SpriteBatchNode.extend(/** @lends cc.LabelBMFont# */{ var locIsLoaded = texture.isLoaded(); self._textureLoaded = locIsLoaded; if (!locIsLoaded) { - texture.addLoadedEventListener(function (sender) { + texture.addEventListener("load", function (sender) { var self1 = this; self1._textureLoaded = true; //reset the LabelBMFont self1.initWithTexture(sender, self1._initialString.length); self1.setString(self1._initialString, true); - self1._callLoadedEventCallbacks(); + self1.dispatchEvent("load"); }, self); } } else { @@ -419,25 +264,16 @@ cc.LabelBMFont = cc.SpriteBatchNode.extend(/** @lends cc.LabelBMFont# */{ self._imageOffset = imageOffset || cc.p(0, 0); self._width = (width == null) ? -1 : width; - self._displayedOpacity = self._realOpacity = 255; - self._displayedColor = cc.color(255, 255, 255, 255); + self._realOpacity = 255; self._realColor = cc.color(255, 255, 255, 255); - self._cascadeOpacityEnabled = true; - self._cascadeColorEnabled = true; self._contentSize.width = 0; self._contentSize.height = 0; self.setAnchorPoint(0.5, 0.5); - if (cc._renderType === cc._RENDER_TYPE_WEBGL) { - var locTexture = self.textureAtlas.texture; - self._opacityModifyRGB = locTexture.hasPremultipliedAlpha(); + this._renderCmd._initBatchTexture(); - var reusedChar = self._reusedChar = new cc.Sprite(); - reusedChar.initWithTexture(locTexture, cc.rect(0, 0, 0, 0), false); - reusedChar.batchNode = self; - } self.setString(theString, true); return true; } @@ -449,8 +285,8 @@ cc.LabelBMFont = cc.SpriteBatchNode.extend(/** @lends cc.LabelBMFont# */{ */ createFontChars: function () { var self = this; - var locContextType = cc._renderType; - var locTexture = (locContextType === cc._RENDER_TYPE_CANVAS) ? self.texture : self.textureAtlas.texture; + var cmd = this._renderCmd; + var locTexture = cmd._texture || self.textureAtlas.texture; var nextFontPositionX = 0; @@ -469,7 +305,7 @@ cc.LabelBMFont = cc.SpriteBatchNode.extend(/** @lends cc.LabelBMFont# */{ var i, locCfg = self._config, locKerningDict = locCfg.kerningDict, locCommonH = locCfg.commonHeight, locFontDict = locCfg.fontDefDictionary; for (i = 0; i < stringLen - 1; i++) { - if (locStr.charCodeAt(i) == 10) quantityOfLines++; + if (locStr.charCodeAt(i) === 10) quantityOfLines++; } var totalHeight = locCommonH * quantityOfLines; @@ -478,7 +314,7 @@ cc.LabelBMFont = cc.SpriteBatchNode.extend(/** @lends cc.LabelBMFont# */{ var prev = -1; for (i = 0; i < stringLen; i++) { var key = locStr.charCodeAt(i); - if (key == 0) continue; + if (key === 0) continue; if (key === 10) { //new line @@ -500,34 +336,19 @@ cc.LabelBMFont = cc.SpriteBatchNode.extend(/** @lends cc.LabelBMFont# */{ rect.y += self._imageOffset.y; var fontChar = self.getChildByTag(i); - //var hasSprite = true; - if (!fontChar) { + + if(!fontChar){ fontChar = new cc.Sprite(); - if ((key === 32) && (locContextType === cc._RENDER_TYPE_CANVAS)) rect = cc.rect(0, 0, 0, 0); fontChar.initWithTexture(locTexture, rect, false); fontChar._newTextureWhenChangeColor = true; - self.addChild(fontChar, 0, i); - } else { - if ((key === 32) && (locContextType === cc._RENDER_TYPE_CANVAS)) { - fontChar.setTextureRect(rect, false, cc.size(0, 0)); - } else { - // updating previous sprite - fontChar.setTextureRect(rect, false); - // restore to default in case they were modified - fontChar.visible = true; - } + this.addChild(fontChar, 0, i); + }else{ + this._renderCmd._updateCharTexture(fontChar, rect, key); } + // Apply label properties - fontChar.opacityModifyRGB = self._opacityModifyRGB; - // Color MUST be set before opacity, since opacity might change color if OpacityModifyRGB is on - if (cc._renderType == cc._RENDER_TYPE_WEBGL) { - fontChar.updateDisplayedColor(self._displayedColor); - fontChar.updateDisplayedOpacity(self._displayedOpacity); - } else { - cc.NodeRGBA.prototype.updateDisplayedColor.call(fontChar, self._displayedColor); - cc.NodeRGBA.prototype.updateDisplayedOpacity.call(fontChar, self._displayedOpacity); - fontChar.setNodeDirty(); - } + fontChar.opacityModifyRGB = this._opacityModifyRGB; + this._renderCmd._updateCharColorAndOpacity(fontChar); var yOffset = locCfg.commonHeight - fontDef.yOffset; var fontPos = cc.p(nextFontPositionX + fontDef.xOffset + fontDef.rect.width * 0.5 + kerningAmount, @@ -542,13 +363,19 @@ cc.LabelBMFont = cc.SpriteBatchNode.extend(/** @lends cc.LabelBMFont# */{ longestLine = nextFontPositionX; } - tmpSize.width = longestLine; + //If the last character processed has an xAdvance which is less that the width of the characters image, then we need + // to adjust the width of the string to take this into account, or the character will overlap the end of the bounding box + if(fontDef && fontDef.xAdvance < fontDef.rect.width) + tmpSize.width = longestLine - fontDef.xAdvance + fontDef.rect.width; + else + tmpSize.width = longestLine; tmpSize.height = totalHeight; self.setContentSize(cc.sizePixelsToPoints(tmpSize)); }, /** - * update String + * Update String.
+ * Only update this label display string. * @param {Boolean} fromUpdate */ updateString: function (fromUpdate) { @@ -568,7 +395,7 @@ cc.LabelBMFont = cc.SpriteBatchNode.extend(/** @lends cc.LabelBMFont# */{ }, /** - * get the text of this label + * Gets the text of this label * @return {String} */ getString: function () { @@ -576,7 +403,7 @@ cc.LabelBMFont = cc.SpriteBatchNode.extend(/** @lends cc.LabelBMFont# */{ }, /** - * set the text + * Set the text * @param {String} newString * @param {Boolean|null} needUpdateLabel */ @@ -584,7 +411,7 @@ cc.LabelBMFont = cc.SpriteBatchNode.extend(/** @lends cc.LabelBMFont# */{ newString = String(newString); if (needUpdateLabel == null) needUpdateLabel = true; - if (newString == null || typeof(newString) != "string") + if (newString == null || !cc.isString(newString)) newString = newString + ""; this._initialString = newString; @@ -596,153 +423,148 @@ cc.LabelBMFont = cc.SpriteBatchNode.extend(/** @lends cc.LabelBMFont# */{ }, /** - * @deprecated + * Set the text.
+ * Change this Label display string. + * @deprecated since v3.0 please use .setString * @param label */ setCString: function (label) { this.setString(label, true); }, - /** - * update Label - */ - updateLabel: function () { + // calc the text all with in a line + _getCharsWidth:function (startIndex, endIndex) { + if (endIndex <= 0) + { + return 0; + } + var curTextFirstSprite = this.getChildByTag(startIndex); + var curTextLastSprite = this.getChildByTag(startIndex + endIndex); + return this._getLetterPosXLeft(curTextLastSprite) - this._getLetterPosXLeft(curTextFirstSprite); + }, + + _checkWarp:function (strArr, i, maxWidth, initStringWrapNum) { var self = this; - self.string = self._initialString; + var text = strArr[i]; + var curLength = 0; + for (var strArrIndex = 0; strArrIndex < i; strArrIndex++) + { + curLength += strArr[strArrIndex].length; + } - // Step 1: Make multiline - if (self._width > 0) { - var stringLength = self._string.length; - var multiline_string = []; - var last_word = []; + curLength = curLength + i - initStringWrapNum; // add the wrap line num - var line = 1, i = 0, start_line = false, start_word = false, startOfLine = -1, startOfWord = -1, skip = 0; + var allWidth = self._getCharsWidth(curLength, strArr[i].length - 1); - var characterSprite; - for (var j = 0, lj = self._children.length; j < lj; j++) { - var justSkipped = 0; - while (!(characterSprite = self.getChildByTag(j + skip + justSkipped))) - justSkipped++; - skip += justSkipped; + if (allWidth > maxWidth && text.length > 1) { + var fuzzyLen = text.length * ( maxWidth / allWidth ) | 0; + var tmpText = text.substr(fuzzyLen); + var width = allWidth - this._getCharsWidth(curLength + fuzzyLen, tmpText.length - 1); + var sLine; + var pushNum = 0; - if (i >= stringLength) - break; + //Increased while cycle maximum ceiling. default 100 time + var checkWhile = 0; + + //Exceeded the size + while (width > maxWidth && checkWhile++ < 100) { + fuzzyLen *= maxWidth / width; + fuzzyLen = fuzzyLen | 0; + tmpText = text.substr(fuzzyLen); + width = allWidth - this._getCharsWidth(curLength + fuzzyLen, tmpText.length - 1); + } + + checkWhile = 0; - var character = self._string[i]; - if (!start_word) { - startOfWord = self._getLetterPosXLeft(characterSprite); - start_word = true; + //Find the truncation point + while (width < maxWidth && checkWhile++ < 100) { + if (tmpText) { + var exec = cc.LabelTTF._wordRex.exec(tmpText); + pushNum = exec ? exec[0].length : 1; + sLine = tmpText; } - if (!start_line) { - startOfLine = startOfWord; - start_line = true; + if (self._lineBreakWithoutSpaces) { + pushNum = 0; } + fuzzyLen = fuzzyLen + pushNum; + tmpText = text.substr(fuzzyLen); + width = allWidth - this._getCharsWidth(curLength + fuzzyLen, tmpText.length - 1); + } - // Newline. - if (character.charCodeAt(0) == 10) { - last_word.push('\n'); - multiline_string = multiline_string.concat(last_word); - last_word.length = 0; - start_word = false; - start_line = false; - startOfWord = -1; - startOfLine = -1; - //i+= justSkipped; - j--; - skip -= justSkipped; - line++; - - if (i >= stringLength) - break; - - character = self._string[i]; - if (!startOfWord) { - startOfWord = self._getLetterPosXLeft(characterSprite); - start_word = true; - } - if (!startOfLine) { - startOfLine = startOfWord; - start_line = true; + fuzzyLen -= pushNum; + if (fuzzyLen === 0) { + fuzzyLen = 1; + sLine = sLine.substr(1); + } + + var sText = text.substr(0, fuzzyLen), result; + + //symbol in the first + if (cc.LabelTTF.wrapInspection) { + if (cc.LabelTTF._symbolRex.test(sLine || tmpText)) { + result = cc.LabelTTF._lastWordRex.exec(sText); + pushNum = result ? result[0].length : 0; + if (self._lineBreakWithoutSpaces) { + pushNum = 0; } - i++; - continue; - } + fuzzyLen -= pushNum; - // Whitespace. - if (cc.isspace_unicode(character)) { - last_word.push(character); - multiline_string = multiline_string.concat(last_word); - last_word.length = 0; - start_word = false; - startOfWord = -1; - i++; - continue; + sLine = text.substr(fuzzyLen); + sText = text.substr(0, fuzzyLen); } + } - // Out of bounds. - if (self._getLetterPosXRight(characterSprite) - startOfLine > self._width) { - if (!self._lineBreakWithoutSpaces) { - last_word.push(character); - - var found = multiline_string.lastIndexOf(" "); - if (found != -1) - cc.utf8_trim_ws(multiline_string); - else - multiline_string = []; - - if (multiline_string.length > 0) - multiline_string.push('\n'); - - line++; - start_line = false; - startOfLine = -1; - i++; - } else { - cc.utf8_trim_ws(last_word); - - last_word.push('\n'); - multiline_string = multiline_string.concat(last_word); - last_word.length = 0; - start_word = false; - start_line = false; - startOfWord = -1; - startOfLine = -1; - line++; - - if (i >= stringLength) - break; - - if (!startOfWord) { - startOfWord = self._getLetterPosXLeft(characterSprite); - start_word = true; - } - if (!startOfLine) { - startOfLine = startOfWord; - start_line = true; - } - j--; + //To judge whether a English words are truncated + if (cc.LabelTTF._firsrEnglish.test(sLine)) { + result = cc.LabelTTF._lastEnglish.exec(sText); + if (result && sText !== result[0]) { + pushNum = result[0].length; + if (self._lineBreakWithoutSpaces) { + pushNum = 0; } - } else { - // Character is normal. - last_word.push(character); - i++; + fuzzyLen -= pushNum; + sLine = text.substr(fuzzyLen); + sText = text.substr(0, fuzzyLen); } } + strArr[i] = sLine || tmpText; + strArr.splice(i, 0, sText); + } + }, - multiline_string = multiline_string.concat(last_word); - var len = multiline_string.length; - var str_new = ""; - - for (i = 0; i < len; ++i) - str_new += multiline_string[i]; - - str_new = str_new + String.fromCharCode(0); - //this.updateString(true); - self._setString(str_new, false) + /** + * Update Label.
+ * Update this Label display string and more... + */ + updateLabel: function () { + var self = this; + self.string = self._initialString; + var i, j, characterSprite; + // process string + // Step 1: Make multiline + if (self._width > 0) { + var stringArr = self.string.split('\n'); + var wrapString = ""; + var newWrapNum = 0; + var oldArrLength = 0; + for (i = 0; i < stringArr.length; i++) { + oldArrLength = stringArr.length; + this._checkWarp(stringArr, i, self._width * this._scaleX, newWrapNum); + if (oldArrLength < stringArr.length) { + newWrapNum++; + } + if (i > 0) + { + wrapString += "\n"; + } + wrapString += stringArr[i]; + } + wrapString = wrapString + String.fromCharCode(0); + self._setString(wrapString, false); } // Step 2: Make alignment - if (self._alignment != cc.TEXT_ALIGNMENT_LEFT) { + if (self._alignment !== cc.TEXT_ALIGNMENT_LEFT) { i = 0; var lineNumber = 0; @@ -750,11 +572,11 @@ cc.LabelBMFont = cc.SpriteBatchNode.extend(/** @lends cc.LabelBMFont# */{ var last_line = []; for (var ctr = 0; ctr < strlen; ctr++) { - if (self._string[ctr].charCodeAt(0) == 10 || self._string[ctr].charCodeAt(0) == 0) { + if (self._string[ctr].charCodeAt(0) === 10 || self._string[ctr].charCodeAt(0) === 0) { var lineWidth = 0; var line_length = last_line.length; // if last line is empty we must just increase lineNumber and work with next line - if (line_length == 0) { + if (line_length === 0) { lineNumber++; continue; } @@ -778,7 +600,7 @@ cc.LabelBMFont = cc.SpriteBatchNode.extend(/** @lends cc.LabelBMFont# */{ break; } - if (shift != 0) { + if (shift !== 0) { for (j = 0; j < line_length; j++) { index = i + j + lineNumber; if (index < 0) continue; @@ -800,7 +622,7 @@ cc.LabelBMFont = cc.SpriteBatchNode.extend(/** @lends cc.LabelBMFont# */{ }, /** - * Set text alignment + * Set text alignment. * @param {Number} alignment */ setAlignment: function (alignment) { @@ -813,6 +635,8 @@ cc.LabelBMFont = cc.SpriteBatchNode.extend(/** @lends cc.LabelBMFont# */{ }, /** + * Set the bounding width.
+ * max with display width. The exceeding string will be wrapping. * @param {Number} width */ setBoundingWidth: function (width) { @@ -825,6 +649,8 @@ cc.LabelBMFont = cc.SpriteBatchNode.extend(/** @lends cc.LabelBMFont# */{ }, /** + * Set the param to change English word warp according to whether the space.
+ * default is false. * @param {Boolean} breakWithoutSpace */ setLineBreakWithoutSpace: function (breakWithoutSpace) { @@ -833,8 +659,10 @@ cc.LabelBMFont = cc.SpriteBatchNode.extend(/** @lends cc.LabelBMFont# */{ }, /** + * Set scale.
+ * Input a number, will be decrease or increase the font size.
* @param {Number} scale - * @param {Number} [scaleY=null] + * @param {Number} [scaleY=null] default is scale */ setScale: function (scale, scaleY) { cc.Node.prototype.setScale.call(this, scale, scaleY); @@ -842,6 +670,9 @@ cc.LabelBMFont = cc.SpriteBatchNode.extend(/** @lends cc.LabelBMFont# */{ }, /** + * Set scale of x.
+ * Input a number, will be decrease or increase the font size.
+ * Horizontal scale. * @param {Number} scaleX */ setScaleX: function (scaleX) { @@ -850,6 +681,9 @@ cc.LabelBMFont = cc.SpriteBatchNode.extend(/** @lends cc.LabelBMFont# */{ }, /** + * Set scale of x.
+ * Input a number, will be decrease or increase the font size.
+ * Longitudinal scale. * @param {Number} scaleY */ setScaleY: function (scaleY) { @@ -857,14 +691,14 @@ cc.LabelBMFont = cc.SpriteBatchNode.extend(/** @lends cc.LabelBMFont# */{ this.updateLabel(); }, - //TODO /** - * set fnt file path + * set fnt file path.
+ * Change the fnt file path. * @param {String} fntFile */ setFntFile: function (fntFile) { var self = this; - if (fntFile != null && fntFile != self._fntFile) { + if (fntFile != null && fntFile !== self._fntFile) { var newConf = cc.loader.getRes(fntFile); if (!newConf) { @@ -879,17 +713,17 @@ cc.LabelBMFont = cc.SpriteBatchNode.extend(/** @lends cc.LabelBMFont# */{ var locIsLoaded = texture.isLoaded(); self._textureLoaded = locIsLoaded; self.texture = texture; - if (cc._renderType === cc._RENDER_TYPE_CANVAS) - self._originalTexture = self.texture; + this._renderCmd._updateFntFileTexture(); if (!locIsLoaded) { - texture.addLoadedEventListener(function (sender) { + texture.addEventListener("load", function (sender) { var self1 = this; self1._textureLoaded = true; self1.texture = sender; self1.createFontChars(); self1._changeTextureColor(); self1.updateLabel(); - self1._callLoadedEventCallbacks(); + + self1.dispatchEvent("load"); }, self); } else { self.createFontChars(); @@ -898,14 +732,20 @@ cc.LabelBMFont = cc.SpriteBatchNode.extend(/** @lends cc.LabelBMFont# */{ }, /** + * Return the fnt file path. * @return {String} */ getFntFile: function () { return this._fntFile; }, + setTexture: function(texture){ + this._renderCmd.setTexture(texture); + }, + /** - * set the AnchorPoint of the labelBMFont + * Set the AnchorPoint of the labelBMFont.
+ * In order to change the location of label. * @override * @param {cc.Point|Number} point The anchor point of labelBMFont or The anchor point.x of labelBMFont. * @param {Number} [y] The anchor point.y of labelBMFont. @@ -915,21 +755,17 @@ cc.LabelBMFont = cc.SpriteBatchNode.extend(/** @lends cc.LabelBMFont# */{ this.updateLabel(); }, - _setAnchor: function (p) { - cc.Node.prototype._setAnchor.call(this, p); - this.updateLabel(); - }, _setAnchorX: function (x) { cc.Node.prototype._setAnchorX.call(this, x); this.updateLabel(); }, + _setAnchorY: function (y) { cc.Node.prototype._setAnchorY.call(this, y); this.updateLabel(); }, - _atlasNameFromFntFile: function (fntFile) { - }, + _atlasNameFromFntFile: function (fntFile) {}, _kerningAmountForFirst: function (first, second) { var ret = 0; @@ -948,109 +784,77 @@ cc.LabelBMFont = cc.SpriteBatchNode.extend(/** @lends cc.LabelBMFont# */{ _getLetterPosXRight: function (sp) { return sp.getPositionX() * this._scaleX + (sp._getWidth() * this._scaleX * sp._getAnchorX()); + }, + + //Checking whether the character is a whitespace + _isspace_unicode: function(ch){ + ch = ch.charCodeAt(0); + return ((ch >= 9 && ch <= 13) || ch === 32 || ch === 133 || ch === 160 || ch === 5760 + || (ch >= 8192 && ch <= 8202) || ch === 8232 || ch === 8233 || ch === 8239 + || ch === 8287 || ch === 12288) + }, + + _utf8_trim_ws: function(str){ + var len = str.length; + + if (len <= 0) + return; + + var last_index = len - 1; + + // Only start trimming if the last character is whitespace.. + if (this._isspace_unicode(str[last_index])) { + for (var i = last_index - 1; i >= 0; --i) { + if (this._isspace_unicode(str[i])) { + last_index = i; + } + else { + break; + } + } + this._utf8_trim_from(str, last_index); + } + }, + + //Trims str st str=[0, index) after the operation. + //Return value: the trimmed string. + _utf8_trim_from: function(str, index){ + var len = str.length; + if (index >= len || index < 0) + return; + str.splice(index, len); } }); -var _p = cc.LabelBMFont.prototype; - -// Extended properties -/** @expose */ -_p.opacityModifyRGB; -cc.defineGetterSetter(_p, "opacityModifyRGB", _p.isOpacityModifyRGB, _p.setOpacityModifyRGB); -/** @expose */ -_p.opacity; -cc.defineGetterSetter(_p, "opacity", _p.getOpacity, _p.setOpacity); -/** @expose */ -_p.cascadeOpacity; -cc.defineGetterSetter(_p, "cascadeOpacity", _p.isCascadeOpacityEnabled, _p.setCascadeOpacityEnabled); -/** @expose */ -_p.color; -cc.defineGetterSetter(_p, "color", _p.getColor, _p.setColor); -/** @expose */ -_p.cascadeColor; -cc.defineGetterSetter(_p, "cascadeColor", _p.isCascadeColorEnabled, _p.setCascadeColorEnabled); -/** @expose */ -_p.string; -cc.defineGetterSetter(_p, "string", _p.getString, _p._setStringForSetter); -/** @expose */ -_p.boundingWidth; -cc.defineGetterSetter(_p, "boundingWidth", _p._getBoundingWidth, _p.setBoundingWidth); -/** @expose */ -_p.textAlign; -cc.defineGetterSetter(_p, "textAlign", _p._getAlignment, _p.setAlignment); +(function(){ + var p = cc.LabelBMFont.prototype; + cc.EventHelper.prototype.apply(p); + + /** @expose */ + p.string; + cc.defineGetterSetter(p, "string", p.getString, p._setStringForSetter); + /** @expose */ + p.boundingWidth; + cc.defineGetterSetter(p, "boundingWidth", p._getBoundingWidth, p.setBoundingWidth); + /** @expose */ + p.textAlign; + cc.defineGetterSetter(p, "textAlign", p._getAlignment, p.setAlignment); +})(); /** * creates a bitmap font atlas with an initial string and the FNT file + * @deprecated since v3.0 please use new cc.LabelBMFont * @param {String} str * @param {String} fntFile * @param {Number} [width=-1] * @param {Number} [alignment=cc.TEXT_ALIGNMENT_LEFT] * @param {cc.Point} [imageOffset=cc.p(0,0)] * @return {cc.LabelBMFont|Null} - * @example - * // Example 01 - * var label1 = cc.LabelBMFont.create("Test case", "test.fnt"); - * - * // Example 02 - * var label2 = cc.LabelBMFont.create("test case", "test.fnt", 200, cc.TEXT_ALIGNMENT_LEFT); - * - * // Example 03 - * var label3 = cc.LabelBMFont.create("This is a \n test case", "test.fnt", 200, cc.TEXT_ALIGNMENT_LEFT, cc.p(0,0)); */ cc.LabelBMFont.create = function (str, fntFile, width, alignment, imageOffset) { return new cc.LabelBMFont(str, fntFile, width, alignment, imageOffset); }; -/** - * @param {String} ch - * @return {Boolean} weather the character is a whitespace character. - */ -cc.isspace_unicode = function (ch) { - ch = ch.charCodeAt(0); - return ((ch >= 9 && ch <= 13) || ch == 32 || ch == 133 || ch == 160 || ch == 5760 - || (ch >= 8192 && ch <= 8202) || ch == 8232 || ch == 8233 || ch == 8239 - || ch == 8287 || ch == 12288) -}; - -/** - * @param {Array} str - */ -cc.utf8_trim_ws = function (str) { - var len = str.length; - - if (len <= 0) - return; - - var last_index = len - 1; - - // Only start trimming if the last character is whitespace.. - if (cc.isspace_unicode(str[last_index])) { - for (var i = last_index - 1; i >= 0; --i) { - if (cc.isspace_unicode(str[i])) { - last_index = i; - } - else { - break; - } - } - cc.utf8_trim_from(str, last_index); - } -}; - -/** - * Trims str st str=[0, index) after the operation. - * Return value: the trimmed string. - * @param {Array} str he string to trim - * @param {Number} index the index to start trimming from. - */ -cc.utf8_trim_from = function (str, index) { - var len = str.length; - if (index >= len || index < 0) - return; - str.splice(index, len); -}; - - cc._fntLoader = { INFO_EXP: /info [^\n]*(\n|$)/gi, COMMON_EXP: /common [^\n]*(\n|$)/gi, @@ -1070,12 +874,19 @@ cc._fntLoader = { var key = tempStr.substring(0, index); var value = tempStr.substring(index + 1); if (value.match(this.INT_EXP)) value = parseInt(value); - else if (value[0] == '"') value = value.substring(1, value.length - 1); + else if (value[0] === '"') value = value.substring(1, value.length - 1); obj[key] = value; } } return obj; }, + + /** + * Parse Fnt string. + * @param fntStr + * @param url + * @returns {{}} + */ parseFnt: function (fntStr, url) { var self = this, fnt = {}; //padding @@ -1086,7 +897,7 @@ cc._fntLoader = { top: parseInt(paddingArr[1]), right: parseInt(paddingArr[2]), bottom: parseInt(paddingArr[3]) - } + }; //common var commonObj = self._parseStrToObj(fntStr.match(self.COMMON_EXP)[0]); @@ -1129,6 +940,13 @@ cc._fntLoader = { return fnt; }, + /** + * load the fnt + * @param realUrl + * @param url + * @param res + * @param cb + */ load: function (realUrl, url, res, cb) { var self = this; cc.loader.loadTxt(realUrl, function (err, txt) { diff --git a/cocos2d/labels/CCLabelBMFontCanvasRenderCmd.js b/cocos2d/labels/CCLabelBMFontCanvasRenderCmd.js new file mode 100644 index 0000000000..2fd0ac9792 --- /dev/null +++ b/cocos2d/labels/CCLabelBMFontCanvasRenderCmd.js @@ -0,0 +1,142 @@ +/**************************************************************************** + Copyright (c) 2008-2010 Ricardo Quesada + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. + + http://www.cocos2d-x.org + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + + Use any of these editors to generate BMFonts: + http://glyphdesigner.71squared.com/ (Commercial, Mac OS X) + http://www.n4te.com/hiero/hiero.jnlp (Free, Java) + http://slick.cokeandcode.com/demos/hiero.jnlp (Free, Java) + http://www.angelcode.com/products/bmfont/ (Free, Windows only) + ****************************************************************************/ + +(function(){ + cc.LabelBMFont.CanvasRenderCmd = function(renderableObject){ + cc.SpriteBatchNode.CanvasRenderCmd.call(this, renderableObject); + this._needDraw = true; + }; + + var proto = cc.LabelBMFont.CanvasRenderCmd.prototype = Object.create(cc.SpriteBatchNode.CanvasRenderCmd.prototype); + proto.constructor = cc.LabelBMFont.CanvasRenderCmd; + + proto.rendering = function(){ + void 0; + }; + + proto._updateCharTexture = function(fontChar, rect, key){ + if (key === 32) { + fontChar.setTextureRect(rect, false, cc.size(0, 0)); + } else { + // updating previous sprite + fontChar.setTextureRect(rect, false); + // restore to default in case they were modified + fontChar.visible = true; + } + }; + + proto._updateCharColorAndOpacity = function(fontChar){ + // Color MUST be set before opacity, since opacity might change color if OpacityModifyRGB is on + fontChar._displayedColor = this._displayedColor; + fontChar._renderCmd.setDirtyFlag(cc.Node._dirtyFlags.colorDirty); + fontChar._displayedOpacity = this._displayedOpacity; + fontChar._renderCmd.setDirtyFlag(cc.Node._dirtyFlags.opacityDirty); + }; + + proto._updateFntFileTexture = function(){ + var node = this._node; + node._originalTexture = node.texture; + }; + + proto.setTexture = function (texture) { + var node = this._node; + var locChildren = node._children; + var locDisplayedColor = this._displayedColor; + for (var i = 0; i < locChildren.length; i++) { + var selChild = locChildren[i]; + var cm = selChild._renderCmd; + var childDColor = cm._displayedColor; + if (this._texture !== cm._texture && (childDColor.r !== locDisplayedColor.r || + childDColor.g !== locDisplayedColor.g || childDColor.b !== locDisplayedColor.b)) + continue; + selChild.texture = texture; + } + this._texture = texture; + }; + + if(cc.sys._supportCanvasNewBlendModes) + proto._changeTextureColor = function(){ + var node = this._node; + var locTexture = node.getTexture(); + if (locTexture && locTexture.getContentSize().width>0) { + var element = this._originalTexture.getHtmlElementObj(); + if(!element) + return; + var locElement = locTexture.getHtmlElementObj(); + var textureRect = cc.rect(0, 0, element.width, element.height); + if (locElement instanceof HTMLCanvasElement && !node._rectRotated){ + cc.Sprite.CanvasRenderCmd._generateTintImageWithMultiply(element, this._displayedColor, textureRect, locElement); + node.setTexture(locTexture); + } else { + locElement = cc.Sprite.CanvasRenderCmd._generateTintImageWithMultiply(element, this._displayedColor, textureRect); + locTexture = new cc.Texture2D(); + locTexture.initWithElement(locElement); + locTexture.handleLoadedTexture(); + node.setTexture(locTexture); + } + } + }; + else + proto._changeTextureColor = function () { + var node = this._node; + var locElement, locTexture = node.getTexture(); + if (locTexture && locTexture.getContentSize().width > 0) { + locElement = locTexture.getHtmlElementObj(); + if (!locElement) + return; + var cacheTextureForColor = cc.textureCache.getTextureColors(this._originalTexture.getHtmlElementObj()); + if (cacheTextureForColor) { + if (locElement instanceof HTMLCanvasElement && !this._rectRotated) { + cc.Sprite.CanvasRenderCmd._generateTintImage(locElement, cacheTextureForColor, this._displayedColor, null, locElement); + this.setTexture(locTexture); + } else { + locElement = cc.Sprite.CanvasRenderCmd._generateTintImage(locElement, cacheTextureForColor, this._displayedColor); + locTexture = new cc.Texture2D(); + locTexture.initWithElement(locElement); + locTexture.handleLoadedTexture(); + node.setTexture(locTexture); + } + } + } + }; + + proto._updateChildrenDisplayedOpacity = function(locChild){ + cc.Node.prototype.updateDisplayedOpacity.call(locChild, this._displayedOpacity); + }; + + proto._updateChildrenDisplayedColor = function(locChild){ + cc.Node.prototype.updateDisplayedColor.call(locChild, this._displayedColor); + }; + + proto._initBatchTexture = function(){}; + +})(); \ No newline at end of file diff --git a/cocos2d/labels/CCLabelBMFontWebGLRenderCmd.js b/cocos2d/labels/CCLabelBMFontWebGLRenderCmd.js new file mode 100644 index 0000000000..8d0aee5e13 --- /dev/null +++ b/cocos2d/labels/CCLabelBMFontWebGLRenderCmd.js @@ -0,0 +1,87 @@ +/**************************************************************************** + Copyright (c) 2008-2010 Ricardo Quesada + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. + + http://www.cocos2d-x.org + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + + Use any of these editors to generate BMFonts: + http://glyphdesigner.71squared.com/ (Commercial, Mac OS X) + http://www.n4te.com/hiero/hiero.jnlp (Free, Java) + http://slick.cokeandcode.com/demos/hiero.jnlp (Free, Java) + http://www.angelcode.com/products/bmfont/ (Free, Windows only) + ****************************************************************************/ + +(function(){ + cc.LabelBMFont.WebGLRenderCmd = function(renderableObject){ + cc.SpriteBatchNode.WebGLRenderCmd.call(this, renderableObject); + this._needDraw = true; + }; + + var proto = cc.LabelBMFont.WebGLRenderCmd.prototype = Object.create(cc.SpriteBatchNode.WebGLRenderCmd.prototype); + proto.constructor = cc.LabelBMFont.WebGLRenderCmd; + + proto._updateCharTexture = function(fontChar, rect, key){ + // updating previous sprite + fontChar.setTextureRect(rect, false); + // restore to default in case they were modified + fontChar.visible = true; + }; + + + proto._updateFntFileTexture = function(){}; + + proto._changeTextureColor = function(){}; + + proto._updateChildrenDisplayedOpacity = function(locChild){ + locChild.updateDisplayedOpacity(this._displayedOpacity); + }; + + proto._updateChildrenDisplayedColor = function(locChild){ + locChild.updateDisplayedColor(this._displayedColor); + }; + + proto._initBatchTexture = function(){ + var node = this._node; + var locTexture = node.textureAtlas.texture; + node._opacityModifyRGB = locTexture.hasPremultipliedAlpha(); + + var reusedChar = node._reusedChar = new cc.Sprite(); + reusedChar.initWithTexture(locTexture, cc.rect(0, 0, 0, 0), false); + reusedChar.batchNode = node; + }; + + proto.rendering = function(ctx){ + cc.SpriteBatchNode.WebGLRenderCmd.prototype.rendering.call(this, ctx); + + var node = this._node; + //LabelBMFont - Debug draw + if (cc.LABELBMFONT_DEBUG_DRAW) { + var size = node.getContentSize(); + var pos = cc.p(0 | ( -this._anchorPointInPoints.x), 0 | ( -this._anchorPointInPoints.y)); + var vertices = [cc.p(pos.x, pos.y), cc.p(pos.x + size.width, pos.y), cc.p(pos.x + size.width, pos.y + size.height), cc.p(pos.x, pos.y + size.height)]; + cc._drawingUtil.setDrawColor(0, 255, 0, 255); + cc._drawingUtil.drawPoly(vertices, 4, true); + } + }; + + proto._updateCharColorAndOpacity = function(){}; +})(); \ No newline at end of file diff --git a/cocos2d/menus/CCMenu.js b/cocos2d/menus/CCMenu.js index 90ad1289ef..53c34e6a1f 100644 --- a/cocos2d/menus/CCMenu.js +++ b/cocos2d/menus/CCMenu.js @@ -1,7 +1,7 @@ /**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2008-2010 Ricardo Quesada - Copyright (c) 2011 Zynga Inc. + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -46,38 +46,29 @@ cc.MENU_HANDLER_PRIORITY = -128; cc.DEFAULT_PADDING = 5; /** - *
Features and Limitation:
+ *
Features and Limitation:
* - You can add MenuItem objects in runtime using addChild:
* - But the only accepted children are MenuItem objects
+ * Event callback that is invoked every time when CCMenu enters the 'stage'.
+ * If the CCMenu enters the 'stage' with a transition, this event is called when the transition starts.
+ * During onEnter you can't access a "sister/brother" node.
+ * If you override onEnter, you must call its parent's onEnter function with this._super().
+ *
+ * callback that is called every time the cc.Menu leaves the 'stage'.
+ * If the cc.Menu leaves the 'stage' with a transition, this callback is called when the transition finishes.
+ * During onExit you can't access a sibling node.
+ * If you override onExit, you shall call its parent's onExit with this._super().
+ *
* Not recommended to use the base class, should use more defined menu item classes + * @deprecated since v3.0, please use new cc.MenuItem(callback,target) instead * @param {function|String} callback callback * @param {cc.Node} target * @return {cc.MenuItem} @@ -200,19 +207,24 @@ cc.MenuItem.create = function (callback, target) { * - cc.LabelTTF
* @class * @extends cc.MenuItem + * @param {cc.Node} label + * @param {function|String} selector + * @param {cc.Node} target + * @example + * var menuitemLabel = new cc.MenuItemLabel(label,selector,target); * * @property {String} string - Content string of label item * @property {cc.Node} label - Label of label item - * @property {cc.Color} disabledColor - Color of label when it's diabled + * @property {cc.Color} disabledColor - Color of label when it's disabled */ cc.MenuItemLabel = cc.MenuItem.extend(/** @lends cc.MenuItemLabel# */{ _disabledColor: null, _label: null, - _orginalScale: 0, + _originalScale: 0, _colorBackup: null, /** - * @constructor + * Constructor of cc.MenuItemLabel * @param {cc.Node} label * @param {function|String} selector * @param {cc.Node} target @@ -221,7 +233,6 @@ cc.MenuItemLabel = cc.MenuItem.extend(/** @lends cc.MenuItemLabel# */{ cc.MenuItem.prototype.ctor.call(this, selector, target); this._disabledColor = null; this._label = null; - this._orginalScale = 0; this._colorBackup = null; if (label) { @@ -236,6 +247,7 @@ cc.MenuItemLabel = cc.MenuItem.extend(/** @lends cc.MenuItemLabel# */{ }, /** + * return the disable color for this cc.MenuItemLabel * @return {cc.Color} */ getDisabledColor: function () { @@ -243,6 +255,7 @@ cc.MenuItemLabel = cc.MenuItem.extend(/** @lends cc.MenuItemLabel# */{ }, /** + * set the disable color for this cc.MenuItemLabel * @param {cc.Color} color */ setDisabledColor: function (color) { @@ -250,7 +263,7 @@ cc.MenuItemLabel = cc.MenuItem.extend(/** @lends cc.MenuItemLabel# */{ }, /** - * return label of MenuItemLabel + * return label of cc.MenuItemLabel * @return {cc.Node} */ getLabel: function () { @@ -258,6 +271,7 @@ cc.MenuItemLabel = cc.MenuItem.extend(/** @lends cc.MenuItemLabel# */{ }, /** + * set a label for cc.MenuItemLabel * @param {cc.Node} label */ setLabel: function (label) { @@ -277,10 +291,11 @@ cc.MenuItemLabel = cc.MenuItem.extend(/** @lends cc.MenuItemLabel# */{ }, /** + * set enable value to cc.MenuItemLabel * @param {Boolean} enabled */ setEnabled: function (enabled) { - if (this._enabled != enabled) { + if (this._enabled !== enabled) { var locLabel = this._label; if (!enabled) { this._colorBackup = locLabel.color; @@ -293,6 +308,7 @@ cc.MenuItemLabel = cc.MenuItem.extend(/** @lends cc.MenuItemLabel# */{ }, /** + * set opacity for cc.MenuItemLabel * @param {Number} opacity from 0-255 */ setOpacity: function (opacity) { @@ -300,6 +316,7 @@ cc.MenuItemLabel = cc.MenuItem.extend(/** @lends cc.MenuItemLabel# */{ }, /** + * return the opacity of cc.MenuItemLabel * @return {Number} */ getOpacity: function () { @@ -307,6 +324,7 @@ cc.MenuItemLabel = cc.MenuItem.extend(/** @lends cc.MenuItemLabel# */{ }, /** + * set the opacity for cc.MenuItemLabel * @param {cc.Color} color */ setColor: function (color) { @@ -314,6 +332,7 @@ cc.MenuItemLabel = cc.MenuItem.extend(/** @lends cc.MenuItemLabel# */{ }, /** + * return the color of cc.MenuItemLabel * @return {cc.Color} */ getColor: function () { @@ -321,6 +340,7 @@ cc.MenuItemLabel = cc.MenuItem.extend(/** @lends cc.MenuItemLabel# */{ }, /** + * initializes a cc.MenuItemLabel with a label * @param {cc.Node} label * @param {function|String} selector * @param {cc.Node} target @@ -340,6 +360,7 @@ cc.MenuItemLabel = cc.MenuItem.extend(/** @lends cc.MenuItemLabel# */{ }, /** + * set the string for cc.MenuItemLabel * @param {String} label */ setString: function (label) { @@ -347,7 +368,10 @@ cc.MenuItemLabel = cc.MenuItem.extend(/** @lends cc.MenuItemLabel# */{ this.width = this._label.width; this.height = this._label.height; }, - + /** + * return the string of cc.MenuItemLabel + * @returns {*|string|_p.string|ret.string|q.string|String} + */ getString: function () { return this._label.string; }, @@ -376,7 +400,7 @@ cc.MenuItemLabel = cc.MenuItem.extend(/** @lends cc.MenuItemLabel# */{ else this._originalScale = this.scale; - var zoomAction = cc.ScaleTo.create(0.1, this._originalScale * 1.2); + var zoomAction = cc.scaleTo(0.1, this._originalScale * 1.2); zoomAction.setTag(cc.ZOOM_ACTION_TAG); this.runAction(zoomAction); } @@ -389,7 +413,7 @@ cc.MenuItemLabel = cc.MenuItem.extend(/** @lends cc.MenuItemLabel# */{ if (this._enabled) { cc.MenuItem.prototype.unselected.call(this); this.stopActionByTag(cc.ZOOM_ACTION_TAG); - var zoomAction = cc.ScaleTo.create(0.1, this._originalScale); + var zoomAction = cc.scaleTo(0.1, this._originalScale); zoomAction.setTag(cc.ZOOM_ACTION_TAG); this.runAction(zoomAction); } @@ -411,6 +435,7 @@ cc.defineGetterSetter(_p, "label", _p.getLabel, _p.setLabel); /** + * @deprecated since v3.0 ,please use new cc.MenuItemLabel(label,selector,target) instead * @param {cc.Node} label * @param {function|String|Null} [selector=] * @param {cc.Node|Null} [target=] @@ -424,10 +449,20 @@ cc.MenuItemLabel.create = function (label, selector, target) { * Helper class that creates a MenuItemLabel class with a LabelAtlas * @class * @extends cc.MenuItemLabel + * @param {String} value + * @param {String} charMapFile + * @param {Number} itemWidth + * @param {Number} itemHeight + * @param {String} startCharMap a single character + * @param {function|String|Null} callback + * @param {cc.Node|Null} target + * @example + * var menuItem = new cc.MenuItemAtlasFont(param1,param2...); */ cc.MenuItemAtlasFont = cc.MenuItemLabel.extend(/** @lends cc.MenuItemAtlasFont# */{ /** + * the contructor of cc.MenuItemAtlasFont * @param {String} value * @param {String} charMapFile * @param {Number} itemWidth @@ -439,13 +474,14 @@ cc.MenuItemAtlasFont = cc.MenuItemLabel.extend(/** @lends cc.MenuItemAtlasFont# ctor: function (value, charMapFile, itemWidth, itemHeight, startCharMap, callback, target) { var label; if (value && value.length > 0) { - label = cc.LabelAtlas.create(value, charMapFile, itemWidth, itemHeight, startCharMap); + label = new cc.LabelAtlas(value, charMapFile, itemWidth, itemHeight, startCharMap); } cc.MenuItemLabel.prototype.ctor.call(this, label, callback, target); }, /** + * initializes a cc.MenuItemAtlasFont with string * @param {String} value * @param {String} charMapFile * @param {Number} itemWidth @@ -456,7 +492,7 @@ cc.MenuItemAtlasFont = cc.MenuItemLabel.extend(/** @lends cc.MenuItemAtlasFont# * @return {Boolean} */ initWithString: function (value, charMapFile, itemWidth, itemHeight, startCharMap, callback, target) { - if (!value || value.length == 0) + if (!value || value.length === 0) throw "cc.MenuItemAtlasFont.initWithString(): value should be non-null and its length should be greater than 0"; var label = new cc.LabelAtlas(); @@ -470,6 +506,7 @@ cc.MenuItemAtlasFont = cc.MenuItemLabel.extend(/** @lends cc.MenuItemAtlasFont# /** * create menu item from string with font + * @deprecated since v3.0 ,please use new cc.MenuItemAtlasFont() instead. * @param {String} value the text to display * @param {String} charMapFile the character map file * @param {Number} itemWidth @@ -478,12 +515,6 @@ cc.MenuItemAtlasFont = cc.MenuItemLabel.extend(/** @lends cc.MenuItemAtlasFont# * @param {function|String|Null} [callback=null] * @param {cc.Node|Null} [target=] * @return {cc.MenuItemAtlasFont} - * @example - * // Example - * var item = cc.MenuItemAtlasFont.create('text to display', 'font.fnt', 12, 32, ' ') - * - * //OR - * var item = cc.MenuItemAtlasFont.create('text to display', 'font.fnt', 12, 32, ' ', game.run, game) */ cc.MenuItemAtlasFont.create = function (value, charMapFile, itemWidth, itemHeight, startCharMap, callback, target) { return new cc.MenuItemAtlasFont(value, charMapFile, itemWidth, itemHeight, startCharMap, callback, target); @@ -493,6 +524,11 @@ cc.MenuItemAtlasFont.create = function (value, charMapFile, itemWidth, itemHeigh * Helper class that creates a CCMenuItemLabel class with a Label * @class * @extends cc.MenuItemLabel + * @param {String} value text for the menu item + * @param {function|String} callback + * @param {cc.Node} target + * @example + * var menuItem = new cc.MenuItemFont(value, callback, target); * * @property {Number} fontSize - Font size of font item * @property {String} fontName - Font name of font item @@ -502,7 +538,7 @@ cc.MenuItemFont = cc.MenuItemLabel.extend(/** @lends cc.MenuItemFont# */{ _fontName: null, /** - * @constructor + * Constructor of cc.MenuItemFont * @param {String} value text for the menu item * @param {function|String} callback * @param {cc.Node} target @@ -512,7 +548,7 @@ cc.MenuItemFont = cc.MenuItemLabel.extend(/** @lends cc.MenuItemFont# */{ if (value && value.length > 0) { this._fontName = cc._globalFontName; this._fontSize = cc._globalFontSize; - label = cc.LabelTTF.create(value, this._fontName, this._fontSize); + label = new cc.LabelTTF(value, this._fontName, this._fontSize); } else { this._fontSize = 0; @@ -523,19 +559,20 @@ cc.MenuItemFont = cc.MenuItemLabel.extend(/** @lends cc.MenuItemFont# */{ }, /** + * initializes cc.MenuItemFont with string * @param {String} value text for the menu item * @param {function|String} callback * @param {cc.Node} target * @return {Boolean} */ initWithString: function (value, callback, target) { - if (!value || value.length == 0) + if (!value || value.length === 0) throw "Value should be non-null and its length should be greater than 0"; this._fontName = cc._globalFontName; this._fontSize = cc._globalFontSize; - var label = cc.LabelTTF.create(value, this._fontName, this._fontSize); + var label = new cc.LabelTTF(value, this._fontName, this._fontSize); if (this.initWithLabel(label, callback, target)) { // do something ? } @@ -543,6 +580,7 @@ cc.MenuItemFont = cc.MenuItemLabel.extend(/** @lends cc.MenuItemFont# */{ }, /** + * set the font size for cc.MenuItemFont * @param {Number} s */ setFontSize: function (s) { @@ -551,7 +589,7 @@ cc.MenuItemFont = cc.MenuItemLabel.extend(/** @lends cc.MenuItemFont# */{ }, /** - * + *return the font size of cc.MenuItemFont * @return {Number} */ getFontSize: function () { @@ -559,6 +597,7 @@ cc.MenuItemFont = cc.MenuItemLabel.extend(/** @lends cc.MenuItemFont# */{ }, /** + * set the font name for cc.MenuItemFont * @param {String} name */ setFontName: function (name) { @@ -567,6 +606,7 @@ cc.MenuItemFont = cc.MenuItemLabel.extend(/** @lends cc.MenuItemFont# */{ }, /** + * return the font name for cc.MenuItemFont * @return {String} */ getFontName: function () { @@ -574,7 +614,7 @@ cc.MenuItemFont = cc.MenuItemLabel.extend(/** @lends cc.MenuItemFont# */{ }, _recreateLabel: function () { - var label = cc.LabelTTF.create(this._label.string, this._fontName, this._fontSize); + var label = new cc.LabelTTF(this._label.string, this._fontName, this._fontSize); this.setLabel(label); } }); @@ -628,22 +668,11 @@ cc.MenuItemFont.fontName = function () { /** * create a menu item from string + * @deprecated since v3.0, please use new construction instead * @param {String} value the text to display * @param {String|function|Null} callback the callback to run, either in function name or pass in the actual function * @param {cc.Node|Null} target the target to run callback * @return {cc.MenuItemFont} - * @example - * // Example - * var item = cc.MenuItemFont.create("Game start", 'start', Game) - * //creates a menu item from string "Game start", and when clicked, it will run Game.start() - * - * var item = cc.MenuItemFont.create("Game start", game.start, Game)//same as above - * - * var item = cc.MenuItemFont.create("i do nothing")//create a text menu item that does nothing - * - * //you can set font size and name before or after - * cc.MenuItemFont.setFontName('my Fancy Font'); - * cc.MenuItemFont.setFontSize(62); */ cc.MenuItemFont.create = function (value, callback, target) { return new cc.MenuItemFont(value, callback, target); @@ -658,6 +687,19 @@ cc.MenuItemFont.create = function (value, callback, target) { * - disabled image
* @class * @extends cc.MenuItem + * @param {Image|Null} normalSprite normal state image + * @param {Image|Null} selectedSprite selected state image + * @param {Image|cc.Node|Null} three disabled state image OR target node + * @param {String|function|cc.Node|Null} four callback function name in string or actual function, OR target Node + * @param {String|function|Null} five callback function name in string or actual function + * + * @example + * var item = new cc.MenuItemSprite(normalImage)//create a menu item from a sprite with no functionality + * var item = new cc.MenuItemSprite(normalImage, selectedImage)//create a menu Item, nothing will happen when clicked + * var item = new cc.MenuItemSprite(normalImage, SelectedImage, disabledImage)//same above, but with disabled state image + * var item = new cc.MenuItemSprite(normalImage, SelectedImage, 'callback', targetNode)//create a menu item, when clicked runs targetNode.callback() + * var item = new cc.MenuItemSprite(normalImage, SelectedImage, disabledImage, targetNode.callback, targetNode) + * //same as above, but with disabled image, and passing in callback function * * @property {cc.Sprite} normalImage - Sprite in normal state * @property {cc.Sprite} selectedImage - Sprite in selected state @@ -669,21 +711,12 @@ cc.MenuItemSprite = cc.MenuItem.extend(/** @lends cc.MenuItemSprite# */{ _disabledImage: null, /** - * @constructor + * Constructor of cc.MenuItemSprite * @param {Image|Null} normalSprite normal state image * @param {Image|Null} selectedSprite selected state image * @param {Image|cc.Node|Null} three disabled state image OR target node * @param {String|function|cc.Node|Null} four callback function name in string or actual function, OR target Node * @param {String|function|Null} five callback function name in string or actual function - * - * @example - * // Example - * var item = new cc.MenuItemSprite(normalImage)//create a menu item from a sprite with no functionality - * var item = new cc.MenuItemSprite(normalImage, selectedImage)//create a menu Item, nothing will happen when clicked - * var item = new cc.MenuItemSprite(normalImage, SelectedImage, disabledImage)//same above, but with disabled state image - * var item = new cc.MenuItemSprite(normalImage, SelectedImage, 'callback', targetNode)//create a menu item, when clicked runs targetNode.callback() - * var item = new cc.MenuItemSprite(normalImage, SelectedImage, disabledImage, targetNode.callback, targetNode) - * //same as above, but with disabled image, and passing in callback function */ ctor: function (normalSprite, selectedSprite, three, four, five) { cc.MenuItem.prototype.ctor.call(this); @@ -692,29 +725,30 @@ cc.MenuItemSprite = cc.MenuItem.extend(/** @lends cc.MenuItemSprite# */{ this._disabledImage = null; if (selectedSprite !== undefined) { - normalSprite = normalSprite; - selectedSprite = selectedSprite; + //normalSprite = normalSprite; + //selectedSprite = selectedSprite; var disabledImage, target, callback; //when you send 4 arguments, five is undefined if (five !== undefined) { disabledImage = three; callback = four; target = five; - } else if (four !== undefined && typeof four === "function") { + } else if (four !== undefined && cc.isFunction(four)) { disabledImage = three; callback = four; - } else if (four !== undefined && typeof three === "function") { + } else if (four !== undefined && cc.isFunction(three)) { target = four; callback = three; - disabledImage = selectedSprite; + disabledImage = null; } else if (three === undefined) { - disabledImage = selectedSprite; + disabledImage = null; } this.initWithNormalSprite(normalSprite, selectedSprite, disabledImage, callback, target); } }, /** + * return the normal status image(cc.Sprite) * @return {cc.Sprite} */ getNormalImage: function () { @@ -722,10 +756,11 @@ cc.MenuItemSprite = cc.MenuItem.extend(/** @lends cc.MenuItemSprite# */{ }, /** + * set the normal status image(cc.Sprite) * @param {cc.Sprite} normalImage */ setNormalImage: function (normalImage) { - if (this._normalImage == normalImage) { + if (this._normalImage === normalImage) { return; } if (normalImage) { @@ -743,7 +778,7 @@ cc.MenuItemSprite = cc.MenuItem.extend(/** @lends cc.MenuItemSprite# */{ this._updateImagesVisibility(); if (normalImage.textureLoaded && !normalImage.textureLoaded()) { - normalImage.addLoadedEventListener(function (sender) { + normalImage.addEventListener("load", function (sender) { this.width = sender.width; this.height = sender.height; }, this); @@ -751,6 +786,7 @@ cc.MenuItemSprite = cc.MenuItem.extend(/** @lends cc.MenuItemSprite# */{ }, /** + * return the selected status image(cc.Sprite) of cc.MenuItemSprite * @return {cc.Sprite} */ getSelectedImage: function () { @@ -758,10 +794,11 @@ cc.MenuItemSprite = cc.MenuItem.extend(/** @lends cc.MenuItemSprite# */{ }, /** + * set the selected status image(cc.Sprite) * @param {cc.Sprite} selectedImage */ setSelectedImage: function (selectedImage) { - if (this._selectedImage == selectedImage) + if (this._selectedImage === selectedImage) return; if (selectedImage) { @@ -779,6 +816,7 @@ cc.MenuItemSprite = cc.MenuItem.extend(/** @lends cc.MenuItemSprite# */{ }, /** + * return the disabled status of cc.MenuItemSprite * @return {cc.Sprite} */ getDisabledImage: function () { @@ -786,10 +824,11 @@ cc.MenuItemSprite = cc.MenuItem.extend(/** @lends cc.MenuItemSprite# */{ }, /** + * set the disabled status image(cc.Sprite) * @param {cc.Sprite} disabledImage */ setDisabledImage: function (disabledImage) { - if (this._disabledImage == disabledImage) + if (this._disabledImage === disabledImage) return; if (disabledImage) { @@ -806,6 +845,7 @@ cc.MenuItemSprite = cc.MenuItem.extend(/** @lends cc.MenuItemSprite# */{ }, /** + * initializes cc.MenuItemSprite with a cc.Sprite * @param {cc.Node} normalSprite * @param {cc.Node} selectedSprite * @param {cc.Node} disabledSprite @@ -824,7 +864,7 @@ cc.MenuItemSprite = cc.MenuItem.extend(/** @lends cc.MenuItemSprite# */{ this.height = locNormalImage.height; if (locNormalImage.textureLoaded && !locNormalImage.textureLoaded()) { - locNormalImage.addLoadedEventListener(function (sender) { + locNormalImage.addEventListener("load", function (sender) { this.width = sender.width; this.height = sender.height; this.cascadeColor = true; @@ -838,6 +878,7 @@ cc.MenuItemSprite = cc.MenuItem.extend(/** @lends cc.MenuItemSprite# */{ }, /** + * set the color for cc.MenuItemSprite * @param {cc.Color} color */ setColor: function (color) { @@ -851,6 +892,7 @@ cc.MenuItemSprite = cc.MenuItem.extend(/** @lends cc.MenuItemSprite# */{ }, /** + * return the color of cc.MenuItemSprite * @return {cc.Color} */ getColor: function () { @@ -858,6 +900,7 @@ cc.MenuItemSprite = cc.MenuItem.extend(/** @lends cc.MenuItemSprite# */{ }, /** + * set the opacity for cc.MenuItemSprite * @param {Number} opacity 0 - 255 */ setOpacity: function (opacity) { @@ -871,6 +914,7 @@ cc.MenuItemSprite = cc.MenuItem.extend(/** @lends cc.MenuItemSprite# */{ }, /** + * return the opacity of cc.MenuItemSprite * @return {Number} opacity from 0 - 255 */ getOpacity: function () { @@ -911,10 +955,11 @@ cc.MenuItemSprite = cc.MenuItem.extend(/** @lends cc.MenuItemSprite# */{ }, /** + * set cc.MenuItemSprite enable to receive the touch event * @param {Boolean} bEnabled */ setEnabled: function (bEnabled) { - if (this._enabled != bEnabled) { + if (this._enabled !== bEnabled) { cc.MenuItem.prototype.setEnabled.call(this, bEnabled); this._updateImagesVisibility(); } @@ -962,24 +1007,13 @@ cc.defineGetterSetter(_p, "disabledImage", _p.getDisabledImage, _p.setDisabledIm /** * create a menu item from sprite + * @deprecated since v3.0 please use new cc.MenuItemSprite(normalSprite, selectedSprite, three, four, five) instead * @param {Image} normalSprite normal state image * @param {Image|Null} selectedSprite selected state image * @param {Image|cc.Node|Null} three disabled state image OR target node * @param {String|function|cc.Node|Null} four callback function name in string or actual function, OR target Node * @param {String|function|Null} five callback function name in string or actual function * @return {cc.MenuItemSprite} - * @example - * // Example - * var item = cc.MenuItemSprite.create(normalImage)//create a menu item from a sprite with no functionality - * - * var item = cc.MenuItemSprite.create(normalImage, selectedImage)//create a menu Item, nothing will happen when clicked - * - * var item = cc.MenuItemSprite.create(normalImage, SelectedImage, disabledImage)//same above, but with disabled state image - * - * var item = cc.MenuItemSprite.create(normalImage, SelectedImage, 'callback', targetNode)//create a menu item, when clicked runs targetNode.callback() - * - * var item = cc.MenuItemSprite.create(normalImage, SelectedImage, disabledImage, targetNode.callback, targetNode) - * //same as above, but with disabled image, and passing in callback function */ cc.MenuItemSprite.create = function (normalSprite, selectedSprite, three, four, five) { return new cc.MenuItemSprite(normalSprite, selectedSprite, three, four, five || undefined); @@ -995,11 +1029,18 @@ cc.MenuItemSprite.create = function (normalSprite, selectedSprite, three, four, * For best results try that all images are of the same size
* @class * @extends cc.MenuItemSprite + * @param {string|null} normalImage + * @param {string|null} selectedImage + * @param {string|null} disabledImage + * @param {function|string|null} callback + * @param {cc.Node|null} target + * @example + * var menuItem = new cc.MenuItemImage(normalImage, selectedImage, three, four, five); */ cc.MenuItemImage = cc.MenuItemSprite.extend(/** @lends cc.MenuItemImage# */{ /** - * @constructor + * Constructor of cc.MenuItemImage * @param {string|null} normalImage * @param {string|null} selectedImage * @param {string|null} disabledImage @@ -1017,9 +1058,9 @@ cc.MenuItemImage = cc.MenuItemSprite.extend(/** @lends cc.MenuItemImage# */{ cc.MenuItemSprite.prototype.ctor.call(this); } else { - normalSprite = cc.Sprite.create(normalImage); + normalSprite = new cc.Sprite(normalImage); selectedImage && - (selectedSprite = cc.Sprite.create(selectedImage)); + (selectedSprite = new cc.Sprite(selectedImage)); if (four === undefined) { callback = three; } @@ -1028,7 +1069,7 @@ cc.MenuItemImage = cc.MenuItemSprite.extend(/** @lends cc.MenuItemImage# */{ target = four; } else if (five) { - disabledSprite = cc.Sprite.create(three); + disabledSprite = new cc.Sprite(three); callback = four; target = five; } @@ -1041,7 +1082,7 @@ cc.MenuItemImage = cc.MenuItemSprite.extend(/** @lends cc.MenuItemImage# */{ * @param {cc.SpriteFrame} frame */ setNormalSpriteFrame: function (frame) { - this.setNormalImage(cc.Sprite.create(frame)); + this.setNormalImage(new cc.Sprite(frame)); }, /** @@ -1049,7 +1090,7 @@ cc.MenuItemImage = cc.MenuItemSprite.extend(/** @lends cc.MenuItemImage# */{ * @param {cc.SpriteFrame} frame */ setSelectedSpriteFrame: function (frame) { - this.setSelectedImage(cc.Sprite.create(frame)); + this.setSelectedImage(new cc.Sprite(frame)); }, /** @@ -1057,10 +1098,11 @@ cc.MenuItemImage = cc.MenuItemSprite.extend(/** @lends cc.MenuItemImage# */{ * @param {cc.SpriteFrame} frame */ setDisabledSpriteFrame: function (frame) { - this.setDisabledImage(cc.Sprite.create(frame)); + this.setDisabledImage(new cc.Sprite(frame)); }, /** + * initializes a cc.MenuItemImage * @param {string|null} normalImage * @param {string|null} selectedImage * @param {string|null} disabledImage @@ -1074,13 +1116,13 @@ cc.MenuItemImage = cc.MenuItemSprite.extend(/** @lends cc.MenuItemImage# */{ var disabledSprite = null; if (normalImage) { - normalSprite = cc.Sprite.create(normalImage); + normalSprite = new cc.Sprite(normalImage); } if (selectedImage) { - selectedSprite = cc.Sprite.create(selectedImage); + selectedSprite = new cc.Sprite(selectedImage); } if (disabledImage) { - disabledSprite = cc.Sprite.create(disabledImage); + disabledSprite = new cc.Sprite(disabledImage); } return this.initWithNormalSprite(normalSprite, selectedSprite, disabledSprite, callback, target); } @@ -1088,19 +1130,13 @@ cc.MenuItemImage = cc.MenuItemSprite.extend(/** @lends cc.MenuItemImage# */{ /** * creates a new menu item image + * @deprecated since v3.0, please use new cc.MenuItemImage(normalImage, selectedImage, three, four, five) instead. * @param {String} normalImage file name for normal state * @param {String} selectedImage image for selected state * @param {String|cc.Node} three Disabled image OR callback function * @param {String|function|Null} [four] callback function, either name in string or pass the whole function OR the target * @param {cc.Node|String|function|Null} [five] cc.Node target to run callback when clicked * @return {cc.MenuItemImage} - * @example - * // Example - * //create a dom menu item with normal and selected state, when clicked it will run the run function from gameScene object - * var item = cc.MenuItemImage.create('normal.png', 'selected.png', 'run', gameScene) - * - * //same as above, but pass in the actual function and disabled image - * var item = cc.MenuItemImage.create('normal.png', 'selected.png', 'disabled.png', gameScene.run, gameScene) */ cc.MenuItemImage.create = function (normalImage, selectedImage, three, four, five) { return new cc.MenuItemImage(normalImage, selectedImage, three, four, five); @@ -1115,6 +1151,17 @@ cc.MenuItemImage.create = function (normalImage, selectedImage, three, four, fiv * * @property {Array} subItems - Sub items * @property {Number} selectedIndex - Index of selected sub item + * + *@example + * // Example + * //create a toggle item with 2 menu items (which you can then toggle between them later) + * var toggler = new cc.MenuItemToggle( new cc.MenuItemFont("On"), new cc.MenuItemFont("Off"), this.callback, this) + * //Note: the first param is the target, the second is the callback function, afterwards, you can pass in any number of menuitems + * + * //if you pass only 1 variable, then it must be a cc.MenuItem + * var notYetToggler = new cc.MenuItemToggle(cc.MenuItemFont("On"));//it is useless right now, until you add more stuff to it + * notYetToggler.addSubItem(new cc.MenuItemFont("Off")); + * //this is useful for constructing a toggler without a callback function (you wish to control the behavior from somewhere else) */ cc.MenuItemToggle = cc.MenuItem.extend(/** @lends cc.MenuItemToggle# */{ subItems: null, @@ -1124,51 +1171,23 @@ cc.MenuItemToggle = cc.MenuItem.extend(/** @lends cc.MenuItemToggle# */{ _color: null, /** - * @constructor - * @example - * // Example - * //create a toggle item with 2 menu items (which you can then toggle between them later) - * var toggler = new cc.MenuItemToggle( cc.MenuItemFont.create("On"), cc.MenuItemFont.create("Off"), this.callback, this) - * //Note: the first param is the target, the second is the callback function, afterwards, you can pass in any number of menuitems - * - * //if you pass only 1 variable, then it must be a cc.MenuItem - * var notYetToggler = new cc.MenuItemToggle(cc.MenuItemFont.create("On"));//it is useless right now, until you add more stuff to it - * notYetToggler.addSubItem(cc.MenuItemFont.create("Off")); - * //this is useful for constructing a toggler without a callback function (you wish to control the behavior from somewhere else) - */ + * Constructor of cc.MenuItemToggle + */ ctor: function (/*Multiple arguments follow*/) { - var argc = arguments.length, callback, target; - // passing callback. - if (typeof arguments[argc - 2] === 'function') { - callback = arguments[argc - 2]; - target = arguments[argc - 1]; - argc = argc - 2; - } else if (typeof arguments[argc - 1] === 'function') { - callback = arguments[argc - 1]; - argc = argc - 1; - } - cc.MenuItem.prototype.ctor.call(this, callback, target); + cc.MenuItem.prototype.ctor.call(this); this._selectedIndex = 0; this.subItems = []; this._opacity = 0; this._color = cc.color.WHITE; - if (argc > 0) { - var locSubItems = this.subItems; - locSubItems.length = 0; - for (var i = 0; i < argc; i++) { - if (arguments[i]) - locSubItems.push(arguments[i]); - } - this._selectedIndex = cc.UINT_MAX; - this.setSelectedIndex(0); - this.setCascadeColorEnabled(true); - this.setCascadeOpacityEnabled(true); - } + if(arguments.length > 0) + this.initWithItems(Array.prototype.slice.apply(arguments)); + }, /** + * return the opacity of cc.MenuItemToggle * @return {Number} */ getOpacity: function () { @@ -1176,6 +1195,7 @@ cc.MenuItemToggle = cc.MenuItem.extend(/** @lends cc.MenuItemToggle# */{ }, /** + * set the opacity for cc.MenuItemToggle * @param {Number} opacity */ setOpacity: function (opacity) { @@ -1189,6 +1209,7 @@ cc.MenuItemToggle = cc.MenuItem.extend(/** @lends cc.MenuItemToggle# */{ }, /** + * return the color of cc.MenuItemToggle * @return {cc.Color} */ getColor: function () { @@ -1197,6 +1218,7 @@ cc.MenuItemToggle = cc.MenuItem.extend(/** @lends cc.MenuItemToggle# */{ }, /** + * set the color for cc.MenuItemToggle * @param {cc.Color} Color */ setColor: function (color) { @@ -1217,6 +1239,7 @@ cc.MenuItemToggle = cc.MenuItem.extend(/** @lends cc.MenuItemToggle# */{ }, /** + * return the index of selected * @return {Number} */ getSelectedIndex: function () { @@ -1224,10 +1247,11 @@ cc.MenuItemToggle = cc.MenuItem.extend(/** @lends cc.MenuItemToggle# */{ }, /** + * set the seleceted index for cc.MenuItemToggle * @param {Number} SelectedIndex */ setSelectedIndex: function (SelectedIndex) { - if (SelectedIndex != this._selectedIndex) { + if (SelectedIndex !== this._selectedIndex) { this._selectedIndex = SelectedIndex; var currItem = this.getChildByTag(cc.CURRENT_ITEM); if (currItem) @@ -1243,7 +1267,7 @@ cc.MenuItemToggle = cc.MenuItem.extend(/** @lends cc.MenuItemToggle# */{ }, /** - * similar to get children + * similar to get children,return the sumItem array. * @return {Array} */ getSubItems: function () { @@ -1251,6 +1275,7 @@ cc.MenuItemToggle = cc.MenuItem.extend(/** @lends cc.MenuItemToggle# */{ }, /** + * set the subitem for cc.MenuItemToggle * @param {cc.MenuItem} subItems */ setSubItems: function (subItems) { @@ -1258,6 +1283,7 @@ cc.MenuItemToggle = cc.MenuItem.extend(/** @lends cc.MenuItemToggle# */{ }, /** + * initializes a cc.MenuItemToggle with items * @param {cc.MenuItem} args[0...last-2] the rest in the array are cc.MenuItems * @param {function|String} args[last-1] the second item in the args array is the callback * @param {cc.Node} args[last] the first item in the args array is a target @@ -1266,10 +1292,10 @@ cc.MenuItemToggle = cc.MenuItem.extend(/** @lends cc.MenuItemToggle# */{ initWithItems: function (args) { var l = args.length; // passing callback. - if (typeof args[args.length - 2] === 'function') { + if (cc.isFunction(args[args.length - 2])) { this.initWithCallback(args[args.length - 2], args[args.length - 1]); l = l - 2; - } else if (typeof args[args.length - 1] === 'function') { + } else if (cc.isFunction(args[args.length - 1])) { this.initWithCallback(args[args.length - 1], null); l = l - 1; } else { @@ -1292,6 +1318,7 @@ cc.MenuItemToggle = cc.MenuItem.extend(/** @lends cc.MenuItemToggle# */{ }, /** + * add the subitem for cc.MenuItemToggle * @param {cc.MenuItem} item */ addSubItem: function (item) { @@ -1327,10 +1354,11 @@ cc.MenuItemToggle = cc.MenuItem.extend(/** @lends cc.MenuItemToggle# */{ }, /** + * set the enable status for cc.MenuItemToggle * @param {Boolean} enabled */ setEnabled: function (enabled) { - if (this._enabled != enabled) { + if (this._enabled !== enabled) { cc.MenuItem.prototype.setEnabled.call(this, enabled); var locItems = this.subItems; if (locItems && locItems.length > 0) { @@ -1341,13 +1369,29 @@ cc.MenuItemToggle = cc.MenuItem.extend(/** @lends cc.MenuItemToggle# */{ }, /** - * returns the selected item + * returns the selected item (deprecated in -x, please use getSelectedItem instead.) * @return {cc.MenuItem} */ selectedItem: function () { return this.subItems[this._selectedIndex]; }, + /** + * returns the selected item. + * @return {cc.MenuItem} + */ + getSelectedItem: function() { + return this.subItems[this._selectedIndex]; + }, + + /** + * *
+ * Event callback that is invoked every time when cc.MenuItemToggle enters the 'stage'.
+ * If the cc.MenuItemToggle enters the 'stage' with a transition, this event is called when the transition starts.
+ * During onEnter you can't access a "sister/brother" node.
+ * If you override onEnter, you must call its parent's onEnter function with this._super().
+ *
* The inner items can be any MenuItem + * @deprecated since v3.0 please use new cc.MenuItemToggle(params) instead * @return {cc.MenuItemToggle} * @example - * // Example - * - * //create a toggle item with 2 menu items (which you can then toggle between them later) - * var toggler = cc.MenuItemToggle.create( cc.MenuItemFont.create("On"), cc.MenuItemFont.create("Off"), this.callback, this) - * //Note: the first param is the target, the second is the callback function, afterwards, you can pass in any number of menuitems - * - * //if you pass only 1 variable, then it must be a cc.MenuItem - * var notYetToggler = cc.MenuItemToggle.create(cc.MenuItemFont.create("On"));//it is useless right now, until you add more stuff to it - * notYetToggler.addSubItem(cc.MenuItemFont.create("Off")); - * //this is useful for constructing a toggler without a callback function (you wish to control the behavior from somewhere else) */ cc.MenuItemToggle.create = function (/*Multiple arguments follow*/) { if ((arguments.length > 0) && (arguments[arguments.length - 1] == null)) diff --git a/cocos2d/motion-streak/CCMotionStreak.js b/cocos2d/motion-streak/CCMotionStreak.js index 13254d9a79..85b43531dd 100644 --- a/cocos2d/motion-streak/CCMotionStreak.js +++ b/cocos2d/motion-streak/CCMotionStreak.js @@ -1,7 +1,7 @@ /**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2008-2010 Ricardo Quesada - Copyright (c) 2011 Zynga Inc. + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. Copyright (c) 2008-2009 Jason Booth http://www.cocos2d-x.org @@ -34,13 +34,16 @@ * length is the how many pixels the texture is stretched across. The texture
* is vertically aligned along the streak segment. * @class - * @extends cc.NodeRGBA + * @extends cc.Node * * @property {cc.Texture2D} texture - Texture used for the motion streak. * @property {Boolean} fastMode - Indicate whether use fast mode. * @property {Boolean} startingPositionInitialized - Indicate whether starting position initialized. + * @example + * //example + * new cc.MotionStreak(2, 3, 32, cc.color.GREEN, s_streak); */ -cc.MotionStreak = cc.NodeRGBA.extend(/** @lends cc.MotionStreak# */{ +cc.MotionStreak = cc.Node.extend(/** @lends cc.MotionStreak# */{ texture:null, fastMode:false, startingPositionInitialized:false, @@ -55,7 +58,7 @@ cc.MotionStreak = cc.NodeRGBA.extend(/** @lends cc.MotionStreak# */{ _nuPoints:0, _previousNuPoints:0, - /** Pointers */ + /* Pointers */ _pointVertexes:null, _pointState:null, @@ -70,8 +73,8 @@ cc.MotionStreak = cc.NodeRGBA.extend(/** @lends cc.MotionStreak# */{ _className:"MotionStreak", /** - * creates and initializes a motion streak with fade in seconds, minimum segments, stroke's width, color, texture filename or texture - * @constructor + * creates and initializes a motion streak with fade in seconds, minimum segments, stroke's width, color, texture filename or texture
+ * Constructor of cc.MotionStreak * @param {Number} fade time to fade * @param {Number} minSeg minimum segment size * @param {Number} stroke stroke's width @@ -79,10 +82,9 @@ cc.MotionStreak = cc.NodeRGBA.extend(/** @lends cc.MotionStreak# */{ * @param {string|cc.Texture2D} texture texture filename or texture */ ctor: function (fade, minSeg, stroke, color, texture) { - cc.NodeRGBA.prototype.ctor.call(this); + cc.Node.prototype.ctor.call(this); this._positionR = cc.p(0, 0); this._blendFunc = new cc.BlendFunc(cc.SRC_ALPHA, cc.ONE_MINUS_SRC_ALPHA); - this._vertexWebGLBuffer = cc._renderContext.createBuffer(); this.fastMode = false; this.startingPositionInitialized = false; @@ -115,6 +117,7 @@ cc.MotionStreak = cc.NodeRGBA.extend(/** @lends cc.MotionStreak# */{ }, /** + * Gets the texture. * @return {cc.Texture2D} */ getTexture:function () { @@ -122,14 +125,16 @@ cc.MotionStreak = cc.NodeRGBA.extend(/** @lends cc.MotionStreak# */{ }, /** + * Set the texture. * @param {cc.Texture2D} texture */ setTexture:function (texture) { - if (this.texture != texture) + if (this.texture !== texture) this.texture = texture; }, /** + * Gets the blend func. * @return {cc.BlendFunc} */ getBlendFunc:function () { @@ -137,6 +142,7 @@ cc.MotionStreak = cc.NodeRGBA.extend(/** @lends cc.MotionStreak# */{ }, /** + * Set the blend func. * @param {Number} src * @param {Number} dst */ @@ -149,32 +155,45 @@ cc.MotionStreak = cc.NodeRGBA.extend(/** @lends cc.MotionStreak# */{ } }, + /** + * Gets opacity. + * @warning cc.MotionStreak.getOpacity has not been supported. + * @returns {number} + */ getOpacity:function () { cc.log("cc.MotionStreak.getOpacity has not been supported."); return 0; }, + /** + * Set opacity. + * @warning cc.MotionStreak.setOpacity has not been supported. + * @param opacity + */ setOpacity:function (opacity) { cc.log("cc.MotionStreak.setOpacity has not been supported."); }, + /** + * set opacity modify RGB. + * @warning cc.MotionStreak.setOpacityModifyRGB has not been supported. + * @param value + */ setOpacityModifyRGB:function (value) { }, + /** + * Checking OpacityModifyRGB. + * @returns {boolean} + */ isOpacityModifyRGB:function () { return false; }, - onExit:function(){ - cc.Node.prototype.onExit.call(this); - if(this._verticesBuffer) - cc._renderContext.deleteBuffer(this._verticesBuffer); - if(this._texCoordsBuffer) - cc._renderContext.deleteBuffer(this._texCoordsBuffer); - if(this._colorPointerBuffer) - cc._renderContext.deleteBuffer(this._colorPointerBuffer); - }, - + /** + * Checking fast mode. + * @returns {boolean} + */ isFastMode:function () { return this.fastMode; }, @@ -187,14 +206,38 @@ cc.MotionStreak = cc.NodeRGBA.extend(/** @lends cc.MotionStreak# */{ this.fastMode = fastMode; }, + /** + * Checking starting position initialized. + * @returns {boolean} + */ isStartingPositionInitialized:function () { return this.startingPositionInitialized; }, + /** + * Set Starting Position Initialized. + * @param {Boolean} startingPositionInitialized + */ setStartingPositionInitialized:function (startingPositionInitialized) { this.startingPositionInitialized = startingPositionInitialized; }, + /** + * Get stroke. + * @returns {Number} stroke + */ + getStroke:function () { + return this._stroke; + }, + + /** + * Set stroke. + * @param {Number} stroke + */ + setStroke:function (stroke) { + this._stroke = stroke; + }, + /** * initializes a motion streak with fade in seconds, minimum segments, stroke's width, color and texture filename or texture * @param {Number} fade time to fade @@ -208,7 +251,7 @@ cc.MotionStreak = cc.NodeRGBA.extend(/** @lends cc.MotionStreak# */{ if(!texture) throw "cc.MotionStreak.initWithFade(): Invalid filename or texture"; - if (typeof(texture) === "string") + if (cc.isString(texture)) texture = cc.textureCache.addImage(texture); cc.Node.prototype.setPosition.call(this, cc.p(0,0)); @@ -218,13 +261,14 @@ cc.MotionStreak = cc.NodeRGBA.extend(/** @lends cc.MotionStreak# */{ this.startingPositionInitialized = false; this.fastMode = true; - this._minSeg = (minSeg == -1.0) ? (stroke / 5.0) : minSeg; + this._minSeg = (minSeg === -1.0) ? (stroke / 5.0) : minSeg; this._minSeg *= this._minSeg; this._stroke = stroke; this._fadeDelta = 1.0 / fade; var locMaxPoints = (0 | (fade * 60)) + 2; + this._maxPoints = locMaxPoints; this._nuPoints = 0; this._pointState = new Float32Array(locMaxPoints); this._pointVertexes = new Float32Array(locMaxPoints * 2); @@ -232,9 +276,6 @@ cc.MotionStreak = cc.NodeRGBA.extend(/** @lends cc.MotionStreak# */{ this._vertices = new Float32Array(locMaxPoints * 4); this._texCoords = new Float32Array(locMaxPoints * 4); this._colorPointer = new Uint8Array(locMaxPoints * 8); - this._maxPoints = locMaxPoints; - - var gl = cc._renderContext; this._verticesBuffer = gl.createBuffer(); this._texCoordsBuffer = gl.createBuffer(); @@ -244,9 +285,6 @@ cc.MotionStreak = cc.NodeRGBA.extend(/** @lends cc.MotionStreak# */{ this._blendFunc.src = gl.SRC_ALPHA; this._blendFunc.dst = gl.ONE_MINUS_SRC_ALPHA; - // shader program - this.shaderProgram = cc.shaderCache.programForKey(cc.SHADER_POSITION_TEXTURECOLOR); - this.texture = texture; this.color = color; this.scheduleUpdate(); @@ -286,8 +324,10 @@ cc.MotionStreak = cc.NodeRGBA.extend(/** @lends cc.MotionStreak# */{ }, /** - * @override - * @param {cc.Point} position + * Set the position.
+ * + * @param {cc.Point|Number} position + * @param {Number} [yValue=undefined] If not exists, the first parameter must be cc.Point. */ setPosition:function (position, yValue) { this.startingPositionInitialized = true; @@ -301,6 +341,7 @@ cc.MotionStreak = cc.NodeRGBA.extend(/** @lends cc.MotionStreak# */{ }, /** + * Gets the position.x * @return {Number} */ getPositionX:function () { @@ -308,6 +349,7 @@ cc.MotionStreak = cc.NodeRGBA.extend(/** @lends cc.MotionStreak# */{ }, /** + * Set the position.x * @param {Number} x */ setPositionX:function (x) { @@ -317,6 +359,7 @@ cc.MotionStreak = cc.NodeRGBA.extend(/** @lends cc.MotionStreak# */{ }, /** + * Gets the position.y * @return {Number} */ getPositionY:function () { @@ -324,6 +367,7 @@ cc.MotionStreak = cc.NodeRGBA.extend(/** @lends cc.MotionStreak# */{ }, /** + * Set the position.y * @param {Number} y */ setPositionY:function (y) { @@ -333,49 +377,19 @@ cc.MotionStreak = cc.NodeRGBA.extend(/** @lends cc.MotionStreak# */{ }, /** - * @override - * @param {WebGLRenderingContext} ctx - */ - draw:function (ctx) { - if (this._nuPoints <= 1) - return; - - if(this.texture && this.texture.isLoaded()){ - ctx = ctx || cc._renderContext; - cc.nodeDrawSetup(this); - cc.glEnableVertexAttribs(cc.VERTEX_ATTRIB_FLAG_POS_COLOR_TEX); - cc.glBlendFunc(this._blendFunc.src, this._blendFunc.dst); - - cc.glBindTexture2D(this.texture); - - //position - ctx.bindBuffer(ctx.ARRAY_BUFFER, this._verticesBuffer); - ctx.bufferData(ctx.ARRAY_BUFFER, this._vertices, ctx.DYNAMIC_DRAW); - ctx.vertexAttribPointer(cc.VERTEX_ATTRIB_POSITION, 2, ctx.FLOAT, false, 0, 0); - - //texcoords - ctx.bindBuffer(ctx.ARRAY_BUFFER, this._texCoordsBuffer); - ctx.bufferData(ctx.ARRAY_BUFFER, this._texCoords, ctx.DYNAMIC_DRAW); - ctx.vertexAttribPointer(cc.VERTEX_ATTRIB_TEX_COORDS, 2, ctx.FLOAT, false, 0, 0); - - //colors - ctx.bindBuffer(ctx.ARRAY_BUFFER, this._colorPointerBuffer); - ctx.bufferData(ctx.ARRAY_BUFFER, this._colorPointer, ctx.DYNAMIC_DRAW); - ctx.vertexAttribPointer(cc.VERTEX_ATTRIB_COLOR, 4, ctx.UNSIGNED_BYTE, true, 0, 0); - - ctx.drawArrays(ctx.TRIANGLE_STRIP, 0, this._nuPoints * 2); - cc.g_NumberOfDraws ++; - } - }, - - /** - * @override + *
schedules the "update" method.
+ * It will use the order number 0. This method will be called every frame.
+ * Scheduled methods with a lower order value will be called before the ones that have a higher order value.
+ * Only one "update" method could be scheduled per node.
+ * Creates and initializes a motion streak with fade in seconds, minimum segments, stroke's width, color, texture filename or texture + * @deprecated since v3.0 please use new cc.MotionStreak instead. * @param {Number} fade time to fade * @param {Number} minSeg minimum segment size * @param {Number} stroke stroke's width * @param {Number} color * @param {string|cc.Texture2D} texture texture filename or texture * @return {cc.MotionStreak} + * @example + * //example + * new cc.MotionStreak(2, 3, 32, cc.color.GREEN, s_streak); */ cc.MotionStreak.create = function (fade, minSeg, stroke, color, texture) { return new cc.MotionStreak(fade, minSeg, stroke, color, texture); diff --git a/cocos2d/motion-streak/CCMotionStreakWebGLRenderCmd.js b/cocos2d/motion-streak/CCMotionStreakWebGLRenderCmd.js new file mode 100644 index 0000000000..45ab07cafd --- /dev/null +++ b/cocos2d/motion-streak/CCMotionStreakWebGLRenderCmd.js @@ -0,0 +1,66 @@ +/**************************************************************************** + Copyright (c) 2013-2014 Chukong Technologies Inc. + + http://www.cocos2d-x.org + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + ****************************************************************************/ + +cc.MotionStreak.WebGLRenderCmd = function(renderableObject){ + cc.Node.WebGLRenderCmd.call(this, renderableObject); + this._needDraw = true; + this._shaderProgram = cc.shaderCache.programForKey(cc.SHADER_POSITION_TEXTURECOLOR); +}; + +cc.MotionStreak.WebGLRenderCmd.prototype = Object.create(cc.Node.WebGLRenderCmd.prototype); +cc.MotionStreak.WebGLRenderCmd.prototype.constructor = cc.Sprite.WebGLRenderCmd; + +cc.MotionStreak.WebGLRenderCmd.prototype.rendering = function(ctx){ + var node = this._node; + if (node._nuPoints <= 1) + return; + + if (node.texture && node.texture.isLoaded()) { + ctx = ctx || cc._renderContext; + this._shaderProgram.use(); + this._shaderProgram._setUniformForMVPMatrixWithMat4(this._stackMatrix); + cc.glEnableVertexAttribs(cc.VERTEX_ATTRIB_FLAG_POS_COLOR_TEX); + cc.glBlendFunc(node._blendFunc.src, node._blendFunc.dst); + + cc.glBindTexture2D(node.texture); + + //position + ctx.bindBuffer(ctx.ARRAY_BUFFER, node._verticesBuffer); + ctx.bufferData(ctx.ARRAY_BUFFER, node._vertices, ctx.DYNAMIC_DRAW); + ctx.vertexAttribPointer(cc.VERTEX_ATTRIB_POSITION, 2, ctx.FLOAT, false, 0, 0); + + //texcoords + ctx.bindBuffer(ctx.ARRAY_BUFFER, node._texCoordsBuffer); + ctx.bufferData(ctx.ARRAY_BUFFER, node._texCoords, ctx.DYNAMIC_DRAW); + ctx.vertexAttribPointer(cc.VERTEX_ATTRIB_TEX_COORDS, 2, ctx.FLOAT, false, 0, 0); + + //colors + ctx.bindBuffer(ctx.ARRAY_BUFFER, node._colorPointerBuffer); + ctx.bufferData(ctx.ARRAY_BUFFER, node._colorPointer, ctx.DYNAMIC_DRAW); + ctx.vertexAttribPointer(cc.VERTEX_ATTRIB_COLOR, 4, ctx.UNSIGNED_BYTE, true, 0, 0); + + ctx.drawArrays(ctx.TRIANGLE_STRIP, 0, node._nuPoints * 2); + cc.g_NumberOfDraws++; + } +}; \ No newline at end of file diff --git a/cocos2d/node-grid/CCNodeGrid.js b/cocos2d/node-grid/CCNodeGrid.js index b5cc41e2a5..781b8db4c8 100644 --- a/cocos2d/node-grid/CCNodeGrid.js +++ b/cocos2d/node-grid/CCNodeGrid.js @@ -1,7 +1,7 @@ /**************************************************************************** - Copyright (c) 2010-2014 cocos2d-x.org Copyright (c) 2008-2010 Ricardo Quesada - Copyright (c) 2011 Zynga Inc. + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -26,7 +26,8 @@ /** *
NodeGrid class is a class serves as a decorator of cc.Node,
- * Grid node can run grid actions over all its children
* Implementation cc.NodeGrid - * @return {cc.NodeGrid|null} + * @deprecated since v3.0 please new cc.NodeGrid instead. + * @return {cc.NodeGrid} */ cc.NodeGrid.create = function () { return new cc.NodeGrid(); diff --git a/cocos2d/node-grid/CCNodeGridWebGLRenderCmd.js b/cocos2d/node-grid/CCNodeGridWebGLRenderCmd.js new file mode 100644 index 0000000000..8c45377dfe --- /dev/null +++ b/cocos2d/node-grid/CCNodeGridWebGLRenderCmd.js @@ -0,0 +1,98 @@ +/**************************************************************************** + Copyright (c) 2013-2014 Chukong Technologies Inc. + + http://www.cocos2d-x.org + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + ****************************************************************************/ + +(function(){ + cc.NodeGrid.WebGLRenderCmd = function(renderable){ + cc.Node.WebGLRenderCmd.call(this, renderable); + this._needDraw = false; + this._gridBeginCommand = new cc.CustomRenderCmd(this, this.onGridBeginDraw); + this._gridEndCommand = new cc.CustomRenderCmd(this, this.onGridEndDraw); + }; + + var proto = cc.NodeGrid.WebGLRenderCmd.prototype = Object.create(cc.Node.WebGLRenderCmd.prototype); + proto.constructor = cc.NodeGrid.WebGLRenderCmd; + + proto.visit = function(parentCmd) { + var node = this._node; + // quick return if not visible + if (!node._visible) + return; + + parentCmd = parentCmd || this.getParentRenderCmd(); + if (node._parent && node._parent._renderCmd) + this._curLevel = node._parent._renderCmd._curLevel + 1; + + var currentStack = cc.current_stack; + currentStack.stack.push(currentStack.top); + this._syncStatus(parentCmd); + currentStack.top = this._stackMatrix; + + /*var beforeProjectionType = cc.director.PROJECTION_DEFAULT; + if (locGrid && locGrid._active) { + //var backMatrix = new cc.kmMat4(); + //cc.kmMat4Assign(backMatrix, this._stackMatrix); + + beforeProjectionType = cc.director.getProjection(); + //locGrid.set2DProjection(); + + //reset this._stackMatrix to current_stack.top + //cc.kmMat4Assign(currentStack.top, backMatrix); + }*/ + cc.renderer.pushRenderCommand(this._gridBeginCommand); + + if (node._target) + node._target.visit(); + + var locChildren = node._children; + if (locChildren && locChildren.length > 0) { + var childLen = locChildren.length; + node.sortAllChildren(); + // draw children + for (var i = 0; i < childLen; i++) { + var child = locChildren[i]; + child && child.visit(); + } + } + + //if (locGrid && locGrid._active) { + //cc.director.setProjection(beforeProjectionType); + //} + cc.renderer.pushRenderCommand(this._gridEndCommand); + + this._dirtyFlag = 0; + currentStack.top = currentStack.stack.pop(); + }; + + proto.onGridBeginDraw = function(){ + var locGrid = this._node.grid; + if (locGrid && locGrid._active) + locGrid.beforeDraw(); + }; + + proto.onGridEndDraw = function(){ + var locGrid = this._node.grid; + if (locGrid && locGrid._active) + locGrid.afterDraw(this._node); + }; +})(); diff --git a/cocos2d/parallax/CCParallaxNode.js b/cocos2d/parallax/CCParallaxNode.js index e2b33b860b..ca41c526aa 100644 --- a/cocos2d/parallax/CCParallaxNode.js +++ b/cocos2d/parallax/CCParallaxNode.js @@ -1,7 +1,7 @@ /**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2008-2010 Ricardo Quesada - Copyright (c) 2011 Zynga Inc. + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,6 +25,8 @@ ****************************************************************************/ /** + * Parallax Object.
+ * Parallax required attributes are stored. * @class * @extends cc.Class */ @@ -33,14 +35,20 @@ cc.PointObject = cc.Class.extend(/** @lends cc.PointObject# */{ _offset:null, _child:null, + ctor: function(ratio, offset){ + this.initWithCCPoint(ratio, offset); + }, + /** - * @return {cc.Point} + * Gets the ratio. + * @return {cc.Point} Not point, this is ratio. */ getRatio:function () { return this._ratio; }, /** + * Set the ratio. * @param {cc.Point} value */ setRatio:function (value) { @@ -48,6 +56,7 @@ cc.PointObject = cc.Class.extend(/** @lends cc.PointObject# */{ }, /** + * Gets the offset. * @return {cc.Point} */ getOffset:function () { @@ -55,6 +64,7 @@ cc.PointObject = cc.Class.extend(/** @lends cc.PointObject# */{ }, /** + * Set the offset. * @param {cc.Point} value */ setOffset:function (value) { @@ -62,6 +72,7 @@ cc.PointObject = cc.Class.extend(/** @lends cc.PointObject# */{ }, /** + * Gets the child. * @return {cc.Node} */ getChild:function () { @@ -69,6 +80,7 @@ cc.PointObject = cc.Class.extend(/** @lends cc.PointObject# */{ }, /** + * Set the child. * @param {cc.Node} value */ setChild:function (value) { @@ -76,7 +88,8 @@ cc.PointObject = cc.Class.extend(/** @lends cc.PointObject# */{ }, /** - * @param {cc.Point} ratio + * initializes cc.PointObject + * @param {cc.Point} ratio Not point, this is a ratio. * @param {cc.Point} offset * @return {Boolean} */ @@ -89,14 +102,14 @@ cc.PointObject = cc.Class.extend(/** @lends cc.PointObject# */{ }); /** + * Create a object to stored parallax data. * @param {cc.Point} ratio * @param {cc.Point} offset * @return {cc.PointObject} + * @deprecated since v3.0 please use new cc.PointObject() instead. */ cc.PointObject.create = function (ratio, offset) { - var ret = new cc.PointObject(); - ret.initWithCCPoint(ratio, offset); - return ret; + return new cc.PointObject(ratio, offset); }; /** @@ -107,13 +120,14 @@ cc.PointObject.create = function (ratio, offset) { * * @property {Array} parallaxArray - Parallax nodes array */ -cc.ParallaxNode = cc.NodeRGBA.extend(/** @lends cc.ParallaxNode# */{ +cc.ParallaxNode = cc.Node.extend(/** @lends cc.ParallaxNode# */{ parallaxArray:null, _lastPosition:null, _className:"ParallaxNode", /** + * Gets the parallax array. * @return {Array} */ getParallaxArray:function () { @@ -121,6 +135,7 @@ cc.ParallaxNode = cc.NodeRGBA.extend(/** @lends cc.ParallaxNode# */{ }, /** + * Set parallax array. * @param {Array} value */ setParallaxArray:function (value) { @@ -128,10 +143,10 @@ cc.ParallaxNode = cc.NodeRGBA.extend(/** @lends cc.ParallaxNode# */{ }, /** - * Constructor + * Constructor function, override it to extend the construction behavior, remember to call "this._super()" in the extended "ctor" function. */ ctor:function () { - cc.NodeRGBA.prototype.ctor.call(this); + cc.Node.prototype.ctor.call(this); this.parallaxArray = []; this._lastPosition = cc.p(-100, -100); }, @@ -149,18 +164,18 @@ cc.ParallaxNode = cc.NodeRGBA.extend(/** @lends cc.ParallaxNode# */{ */ addChild:function (child, z, ratio, offset) { if (arguments.length === 3) { - cc.log("ParallaxNode: use addChild(child, z, ratio, offset) instead") + cc.log("ParallaxNode: use addChild(child, z, ratio, offset) instead"); return; } if(!child) throw "cc.ParallaxNode.addChild(): child should be non-null"; - var obj = cc.PointObject.create(ratio, offset); + var obj = new cc.PointObject(ratio, offset); obj.setChild(child); this.parallaxArray.push(obj); child.setPosition(this._position.x * ratio.x + offset.x, this._position.y * ratio.y + offset.y); - cc.NodeRGBA.prototype.addChild.call(this, child, z, child.tag); + cc.Node.prototype.addChild.call(this, child, z, child.tag); }, /** @@ -175,12 +190,12 @@ cc.ParallaxNode = cc.NodeRGBA.extend(/** @lends cc.ParallaxNode# */{ var locParallaxArray = this.parallaxArray; for (var i = 0; i < locParallaxArray.length; i++) { var point = locParallaxArray[i]; - if (point.getChild() == child) { + if (point.getChild() === child) { locParallaxArray.splice(i, 1); break; } } - cc.NodeRGBA.prototype.removeChild.call(this, child, cleanup); + cc.Node.prototype.removeChild.call(this, child, cleanup); }, /** @@ -189,43 +204,48 @@ cc.ParallaxNode = cc.NodeRGBA.extend(/** @lends cc.ParallaxNode# */{ */ removeAllChildren:function (cleanup) { this.parallaxArray.length = 0; - cc.NodeRGBA.prototype.removeAllChildren.call(this, cleanup); + cc.Node.prototype.removeAllChildren.call(this, cleanup); }, - /** - * Visit - */ - visit:function () { + _updateParallaxPosition: function(){ var pos = this._absolutePosition(); if (!cc.pointEqualToPoint(pos, this._lastPosition)) { var locParallaxArray = this.parallaxArray; for (var i = 0, len = locParallaxArray.length; i < len; i++) { var point = locParallaxArray[i]; - var child = point.getChild(); - child.setPosition(-pos.x + pos.x * point.getRatio().x + point.getOffset().x, - -pos.y + pos.y * point.getRatio().y + point.getOffset().y); + var child = point.getChild(); + child.setPosition(-pos.x + pos.x * point.getRatio().x + point.getOffset().x, + -pos.y + pos.y * point.getRatio().y + point.getOffset().y); } this._lastPosition = pos; } - cc.NodeRGBA.prototype.visit.call(this); }, _absolutePosition:function () { var ret = this._position; var cn = this; - while (cn.parent != null) { + while (cn.parent !== null) { cn = cn.parent; ret = cc.pAdd(ret, cn.getPosition()); } return ret; + }, + + _createRenderCmd: function(){ + if(cc._renderType === cc._RENDER_TYPE_CANVAS) + return new cc.ParallaxNode.CanvasRenderCmd(this); + else + return new cc.ParallaxNode.WebGLRenderCmd(this); } }); /** + * Create new parallax node. + * @deprecated since v3.0 please use new cc.ParallaxNode() instead. * @return {cc.ParallaxNode} * @example * //example - * var voidNode = cc.ParallaxNode.create(); + * var voidNode = new cc.ParallaxNode(); */ cc.ParallaxNode.create = function () { return new cc.ParallaxNode(); diff --git a/cocos2d/parallax/CCParallaxNodeRenderCmd.js b/cocos2d/parallax/CCParallaxNodeRenderCmd.js new file mode 100644 index 0000000000..690a7849f6 --- /dev/null +++ b/cocos2d/parallax/CCParallaxNodeRenderCmd.js @@ -0,0 +1,69 @@ +/**************************************************************************** + Copyright (c) 2013-2014 Chukong Technologies Inc. + + http://www.cocos2d-x.org + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + ****************************************************************************/ + +//TODO find a way to simple these code. + +(function(){ + cc.ParallaxNode.CanvasRenderCmd = function(renderable){ + cc.Node.CanvasRenderCmd.call(this, renderable); + this._needDraw = false; + }; + + var proto = cc.ParallaxNode.CanvasRenderCmd.prototype = Object.create(cc.Node.CanvasRenderCmd.prototype); + proto.constructor = cc.ParallaxNode.CanvasRenderCmd; + + proto.updateStatus = function(){ + this._node._updateParallaxPosition(); + cc.Node.CanvasRenderCmd.prototype.updateStatus.call(this); + }; + + proto._syncStatus = function(parentCmd){ + this._node._updateParallaxPosition(); + cc.Node.CanvasRenderCmd.prototype._syncStatus.call(this, parentCmd); + } +})(); + +(function(){ + if(cc._renderType !== cc._RENDER_TYPE_WEBGL) + return; + + cc.ParallaxNode.WebGLRenderCmd = function(renderable){ + cc.Node.WebGLRenderCmd.call(this, renderable); + this._needDraw = false; + }; + + var proto = cc.ParallaxNode.WebGLRenderCmd.prototype = Object.create(cc.Node.WebGLRenderCmd.prototype); + proto.constructor = cc.ParallaxNode.WebGLRenderCmd; + + proto.updateStatus = function(){ + this._node._updateParallaxPosition(); + cc.Node.WebGLRenderCmd.prototype.updateStatus.call(this); + }; + + proto._syncStatus = function(parentCmd){ + this._node._updateParallaxPosition(); + cc.Node.WebGLRenderCmd.prototype._syncStatus.call(this, parentCmd); + } +})(); + diff --git a/cocos2d/particle/CCPNGReader.js b/cocos2d/particle/CCPNGReader.js index 99fb63c2cb..20667a2cbc 100644 --- a/cocos2d/particle/CCPNGReader.js +++ b/cocos2d/particle/CCPNGReader.js @@ -1,7 +1,8 @@ /**************************************************************************** Copyright (c) 2011 Devon Govett - Copyright (c) 2010-2012 cocos2d-x.org - + Copyright (c) 2008-2010 Ricardo Quesada + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,6 +26,10 @@ THE SOFTWARE. ****************************************************************************/ +/** + * A png file reader + * @name cc.tiffReader + */ cc.PNGReader = cc.Class.extend({ ctor:function(data){ var chunkSize, colors, delayDen, delayNum, frame, i, index, key, section, ccshort, text, _i, _j, _ref; diff --git a/cocos2d/particle/CCParticleBatchNode.js b/cocos2d/particle/CCParticleBatchNode.js index 5f44b8f557..b92f11bc27 100644 --- a/cocos2d/particle/CCParticleBatchNode.js +++ b/cocos2d/particle/CCParticleBatchNode.js @@ -1,8 +1,8 @@ /** - * Copyright (c) 2010-2012 cocos2d-x.org + * Copyright (c) 2008-2010 Ricardo Quesada + * Copyright (c) 2011-2012 cocos2d-x.org + * Copyright (c) 2013-2014 Chukong Technologies Inc. * Copyright (C) 2009 Matt Oswald - * Copyright (c) 2009-2010 Ricardo Quesada - * Copyright (c) 2011 Zynga Inc. * Copyright (c) 2011 Marco Tillemans * * http://www.cocos2d-x.org @@ -54,21 +54,31 @@ cc.PARTICLE_DEFAULT_CAPACITY = 500; * * @class * @extends cc.ParticleSystem + * @param {String|cc.Texture2D} fileImage + * @param {Number} capacity * * @property {cc.Texture2D|HTMLImageElement|HTMLCanvasElement} texture - The used texture * @property {cc.TextureAtlas} textureAtlas - The texture atlas used for drawing the quads + * + * @example + * 1. + * //Create a cc.ParticleBatchNode with image path and capacity + * var particleBatchNode = new cc.ParticleBatchNode("res/grossini_dance.png",30); + * + * 2. + * //Create a cc.ParticleBatchNode with a texture and capacity + * var texture = cc.TextureCache.getInstance().addImage("res/grossini_dance.png"); + * var particleBatchNode = new cc.ParticleBatchNode(texture, 30); */ cc.ParticleBatchNode = cc.Node.extend(/** @lends cc.ParticleBatchNode# */{ textureAtlas:null, - - TextureProtocol:true, //the blend function used for drawing the quads _blendFunc:null, _className:"ParticleBatchNode", /** * initializes the particle system with the name of a file on disk (for a list of supported formats look at the cc.Texture2D class), a capacity of particles - * @constructor + * Constructor of cc.ParticleBatchNode * @param {String|cc.Texture2D} fileImage * @param {Number} capacity * @example @@ -84,13 +94,20 @@ cc.ParticleBatchNode = cc.Node.extend(/** @lends cc.ParticleBatchNode# */{ ctor:function (fileImage, capacity) { cc.Node.prototype.ctor.call(this); this._blendFunc = {src:cc.BLEND_SRC, dst:cc.BLEND_DST}; - if (typeof(fileImage) == "string") { + if (cc.isString(fileImage)) { this.init(fileImage, capacity); } else if (fileImage instanceof cc.Texture2D) { this.initWithTexture(fileImage, capacity); } }, + _createRenderCmd: function(){ + if(cc._renderType === cc._RENDER_TYPE_CANVAS) + return new cc.ParticleBatchNode.CanvasRenderCmd(this); + else + return new cc.ParticleBatchNode.WebGLRenderCmd(this); + }, + /** * initializes the particle system with cc.Texture2D, a capacity of particles * @param {cc.Texture2D|HTMLImageElement|HTMLCanvasElement} texture @@ -104,8 +121,7 @@ cc.ParticleBatchNode = cc.Node.extend(/** @lends cc.ParticleBatchNode# */{ // no lazy alloc in this node this._children.length = 0; - if (cc._renderType === cc._RENDER_TYPE_WEBGL) - this.shaderProgram = cc.shaderCache.programForKey(cc.SHADER_POSITION_TEXTURECOLOR); + this._renderCmd._initWithTexture(); return true; }, @@ -127,7 +143,7 @@ cc.ParticleBatchNode = cc.Node.extend(/** @lends cc.ParticleBatchNode# */{ * @return {Boolean} */ init:function (fileImage, capacity) { - var tex = cc.TextureCache.getInstance().addImage(fileImage); + var tex = cc.textureCache.addImage(fileImage); return this.initWithTexture(tex, capacity); }, @@ -145,7 +161,7 @@ cc.ParticleBatchNode = cc.Node.extend(/** @lends cc.ParticleBatchNode# */{ zOrder = (zOrder == null) ? child.zIndex : zOrder; tag = (tag == null) ? child.tag : tag; - if(child.getTexture() != this.textureAtlas.texture) + if(child.getTexture() !== this.textureAtlas.texture) throw "cc.ParticleSystem.addChild() : the child is not using the same texture id"; // If this is the 1st children, then copy blending function @@ -153,7 +169,7 @@ cc.ParticleBatchNode = cc.Node.extend(/** @lends cc.ParticleBatchNode# */{ if (this._children.length === 0) this.setBlendFunc(childBlendFunc); else{ - if((childBlendFunc.src != this._blendFunc.src) || (childBlendFunc.dst != this._blendFunc.dst)){ + if((childBlendFunc.src !== this._blendFunc.src) || (childBlendFunc.dst !== this._blendFunc.dst)){ cc.log("cc.ParticleSystem.addChild() : Can't add a ParticleSystem that uses a different blending function"); return; } @@ -165,7 +181,7 @@ cc.ParticleBatchNode = cc.Node.extend(/** @lends cc.ParticleBatchNode# */{ //get new atlasIndex var atlasIndex = 0; - if (pos != 0) { + if (pos !== 0) { var p = this._children[pos - 1]; atlasIndex = p.getAtlasIndex() + p.getTotalParticles(); } else @@ -194,7 +210,7 @@ cc.ParticleBatchNode = cc.Node.extend(/** @lends cc.ParticleBatchNode# */{ } // make room for quads, not necessary for last child - if (pSystem.getAtlasIndex() + totalParticles != totalQuads) + if (pSystem.getAtlasIndex() + totalParticles !== totalQuads) locTextureAtlas.moveQuadsFromIndex(index, index + totalParticles); // increase totalParticles here for new particles, update method of particlesystem will fill the quads @@ -213,7 +229,7 @@ cc.ParticleBatchNode = cc.Node.extend(/** @lends cc.ParticleBatchNode# */{ if(!(child instanceof cc.ParticleSystem)) throw "cc.ParticleBatchNode.removeChild(): only supports cc.ParticleSystem as children"; - if(this._children.indexOf(child) == -1){ + if(this._children.indexOf(child) === -1){ cc.log("cc.ParticleBatchNode.removeChild(): doesn't contain the sprite. Can't remove it"); return; } @@ -248,14 +264,14 @@ cc.ParticleBatchNode = cc.Node.extend(/** @lends cc.ParticleBatchNode# */{ return; } - if (zOrder == child.zIndex) + if (zOrder === child.zIndex) return; // no reordering if only 1 child if (this._children.length > 1) { var getIndexes = this._getCurrentIndex(child, zOrder); - if (getIndexes.oldIndex != getIndexes.newIndex) { + if (getIndexes.oldIndex !== getIndexes.newIndex) { // reorder m_pChildren.array this._children.splice(getIndexes.oldIndex, 1) this._children.splice(getIndexes.newIndex, 0, child); @@ -271,7 +287,7 @@ cc.ParticleBatchNode = cc.Node.extend(/** @lends cc.ParticleBatchNode# */{ var locChildren = this._children; for (var i = 0; i < locChildren.length; i++) { var pNode = locChildren[i]; - if (pNode == child) { + if (pNode === child) { newAtlasIndex = child.getAtlasIndex(); break; } @@ -317,28 +333,9 @@ cc.ParticleBatchNode = cc.Node.extend(/** @lends cc.ParticleBatchNode# */{ this.textureAtlas._setDirty(true); }, - /** - * @override - * @param {CanvasContext} ctx - */ - draw:function (ctx) { - //cc.PROFILER_STOP("CCParticleBatchNode - draw"); - if (cc._renderType === cc._RENDER_TYPE_CANVAS) - return; - - if (this.textureAtlas.totalQuads == 0) - return; - - cc.nodeDrawSetup(this); - cc.glBlendFuncForParticle(this._blendFunc.src, this._blendFunc.dst); - this.textureAtlas.drawQuads(); - - //cc.PROFILER_STOP("CCParticleBatchNode - draw"); - }, - /** * returns the used texture - * @return {cc.Texture2D|HTMLImageElement|HTMLCanvasElement} + * @return {cc.Texture2D} */ getTexture:function () { return this.textureAtlas.texture; @@ -346,14 +343,14 @@ cc.ParticleBatchNode = cc.Node.extend(/** @lends cc.ParticleBatchNode# */{ /** * sets a new texture. it will be retained - * @param {cc.Texture2D|HTMLImageElement|HTMLCanvasElement} texture + * @param {cc.Texture2D} texture */ setTexture:function (texture) { this.textureAtlas.texture = texture; // If the new texture has No premultiplied alpha, AND the blendFunc hasn't been changed, then update it var locBlendFunc = this._blendFunc; - if (texture && !texture.hasPremultipliedAlpha() && ( locBlendFunc.src == cc.BLEND_SRC && locBlendFunc.dst == cc.BLEND_DST )) { + if (texture && !texture.hasPremultipliedAlpha() && ( locBlendFunc.src === cc.BLEND_SRC && locBlendFunc.dst === cc.BLEND_DST )) { locBlendFunc.src = cc.SRC_ALPHA; locBlendFunc.dst = cc.ONE_MINUS_SRC_ALPHA; } @@ -361,7 +358,7 @@ cc.ParticleBatchNode = cc.Node.extend(/** @lends cc.ParticleBatchNode# */{ /** * set the blending function used for the texture - * @param {Number|cc.BlencFunc} src + * @param {Number|Object} src * @param {Number} dst */ setBlendFunc:function (src, dst) { @@ -372,7 +369,6 @@ cc.ParticleBatchNode = cc.Node.extend(/** @lends cc.ParticleBatchNode# */{ this._blendFunc.src = src; this._blendFunc.src = dst; } - }, /** @@ -380,38 +376,7 @@ cc.ParticleBatchNode = cc.Node.extend(/** @lends cc.ParticleBatchNode# */{ * @return {cc.BlendFunc} */ getBlendFunc:function () { - return {src:this._blendFunc.src, dst:this._blendFunc.dst}; - }, - - // override visit. - // Don't call visit on it's children - visit:function (ctx) { - if (cc._renderType === cc._RENDER_TYPE_CANVAS) - return; - - // CAREFUL: - // This visit is almost identical to cc.Node#visit - // with the exception that it doesn't call visit on it's children - // - // The alternative is to have a void cc.Sprite#visit, but - // although this is less mantainable, is faster - // - if (!this._visible) - return; - - cc.kmGLPushMatrix(); - if (this.grid && this.grid.isActive()) { - this.grid.beforeDraw(); - this.transformAncestors(); - } - - this.transform(ctx); - this.draw(ctx); - - if (this.grid && this.grid.isActive()) - this.grid.afterDraw(this); - - cc.kmGLPopMatrix(); + return new cc.BlendFunc(this._blendFunc.src, this._blendFunc.dst); }, _updateAllAtlasIndexes:function () { @@ -464,7 +429,7 @@ cc.ParticleBatchNode = cc.Node.extend(/** @lends cc.ParticleBatchNode# */{ break; } // current index - if (child == pNode) { + if (child === pNode) { oldIndex = i; foundCurrentIdx = true; if (!foundNewIdx) @@ -479,19 +444,19 @@ cc.ParticleBatchNode = cc.Node.extend(/** @lends cc.ParticleBatchNode# */{ return {newIndex:newIndex, oldIndex:oldIndex}; }, - /** - *
- * don't use lazy sorting, reordering the particle systems quads afterwards would be too complex
- * XXX research whether lazy sorting + freeing current quads and calloc a new block with size of capacity would be faster
- * XXX or possibly using vertexZ for reordering, that would be fastest
- * this helper is almost equivalent to CCNode's addChild, but doesn't make use of the lazy sorting
- *
+ // don't use lazy sorting, reordering the particle systems quads afterwards would be too complex
+ // XXX research whether lazy sorting + freeing current quads and calloc a new block with size of capacity would be faster
+ // XXX or possibly using vertexZ for reordering, that would be fastest
+ // this helper is almost equivalent to CCNode's addChild, but doesn't make use of the lazy sorting
+ //
The cc.ParticleFire's constructor.
+ * This function will automatically be invoked when you create a node using new construction: "var node = new cc.ParticleFire()".
+ * Override it to extend its behavior, remember to call "this._super()" in the extended "ctor" function.
The cc.ParticleFireworks's constructor.
+ * This function will automatically be invoked when you create a node using new construction: "var node = new cc.ParticleFireworks()".
+ * Override it to extend its behavior, remember to call "this._super()" in the extended "ctor" function.
The cc.ParticleSun's constructor.
+ * This function will automatically be invoked when you create a node using new construction: "var node = new cc.ParticleSun()".
+ * Override it to extend its behavior, remember to call "this._super()" in the extended "ctor" function.
The cc.ParticleGalaxy's constructor.
+ * This function will automatically be invoked when you create a node using new construction: "var node = new cc.ParticleGalaxy()".
+ * Override it to extend its behavior, remember to call "this._super()" in the extended "ctor" function.
The cc.ParticleFlower's constructor.
+ * This function will automatically be invoked when you create a node using new construction: "var node = new cc.ParticleFlower()".
+ * Override it to extend its behavior, remember to call "this._super()" in the extended "ctor" function.
The cc.ParticleMeteor's constructor.
+ * This function will automatically be invoked when you create a node using new construction: "var node = new cc.ParticleMeteor()".
+ * Override it to extend its behavior, remember to call "this._super()" in the extended "ctor" function.
The cc.ParticleSpiral's constructor.
+ * This function will automatically be invoked when you create a node using new construction: "var node = new cc.ParticleSpiral()".
+ * Override it to extend its behavior, remember to call "this._super()" in the extended "ctor" function.
The cc.ParticleExplosion's constructor.
+ * This function will automatically be invoked when you create a node using new construction: "var node = new cc.ParticleExplosion()".
+ * Override it to extend its behavior, remember to call "this._super()" in the extended "ctor" function.
The cc.ParticleSmoke's constructor.
+ * This function will automatically be invoked when you create a node using new construction: "var node = new cc.ParticleSmoke()".
+ * Override it to extend its behavior, remember to call "this._super()" in the extended "ctor" function.
The cc.ParticleSnow's constructor.
+ * This function will automatically be invoked when you create a node using new construction: "var node = new cc.ParticleSnow()".
+ * Override it to extend its behavior, remember to call "this._super()" in the extended "ctor" function.
The cc.ParticleRain's constructor.
+ * This function will automatically be invoked when you create a node using new construction: "var node = new cc.ParticleRain()".
+ * Override it to extend its behavior, remember to call "this._super()" in the extended "ctor" function.
- * Use case: Attach an emitter to an sprite, and you want that the emitter follows the sprite. - * @constant - * @type Number - */ -cc.PARTICLE_TYPE_RELATIVE = 1; - -/** - * Living particles are attached to the emitter and are translated along with it. - * @constant - * @type Number - */ -cc.PARTICLE_TYPE_GROUPED = 2; /** * Structure that contains the values of each particle @@ -244,7 +163,7 @@ cc.Particle.TemporaryPoints = [ * @property {Boolean} opacityModifyRGB - Indicate whether the alpha value modify color. * @property {cc.SpriteBatchNode} batchNode - Weak reference to the sprite batch node. * @property {Boolean} active - <@readonly> Indicate whether the particle system is activated. - * @property {Number} shapeType - ShapeType of ParticleSystem : cc.PARTICLE_BALL_SHAPE | cc.PARTICLE_STAR_SHAPE. + * @property {Number} shapeType - ShapeType of ParticleSystem : cc.ParticleSystem.BALL_SHAPE | cc.ParticleSystem.STAR_SHAPE. * @property {Number} atlasIndex - Index of system in batch node array. * @property {Number} particleCount - Current quantity of particles that are being simulated. * @property {Number} duration - How many seconds the emitter wil run. -1 means 'forever' @@ -281,8 +200,8 @@ cc.Particle.TemporaryPoints = [ * @property {cc.Color} endColor - Ending color of each particle. * @property {cc.Color} endColorVar - Variation of the end color. * @property {Number} emissionRate - Emission rate of the particles. - * @property {Number} emitterMode - Emitter modes: CCPARTICLE_MODE_GRAVITY: uses gravity, speed, radial and tangential acceleration; CCPARTICLE_MODE_RADIUS: uses radius movement + rotation. - * @property {Number} positionType - Particles movement type: cc.PARTICLE_TYPE_FREE | cc.PARTICLE_TYPE_GROUPED. + * @property {Number} emitterMode - Emitter modes: CCParticleSystem.MODE_GRAVITY: uses gravity, speed, radial and tangential acceleration; CCParticleSystem.MODE_RADIUS: uses radius movement + rotation. + * @property {Number} positionType - Particles movement type: cc.ParticleSystem.TYPE_FREE | cc.ParticleSystem.TYPE_GROUPED. * @property {Number} totalParticles - Maximum particles of the system. * @property {Boolean} autoRemoveOnFinish - Indicate whether the node will be auto-removed when it has no particles left. * @property {cc.Texture2D} texture - Texture of Particle System. @@ -292,11 +211,11 @@ cc.Particle.TemporaryPoints = [ * emitter.startSpin = 0; */ cc.ParticleSystem = cc.Node.extend(/** @lends cc.ParticleSystem# */{ + _className:"ParticleSystem", //***********variables************* _plistFile: "", //! time elapsed since the start of the system (in seconds) _elapsed: 0, - _dontTint: false, // Different modes @@ -304,7 +223,6 @@ cc.ParticleSystem = cc.Node.extend(/** @lends cc.ParticleSystem# */{ modeA: null, //! Mode B: circular movement (gravity, radial accel and tangential accel don't are not used in this mode) modeB: null, - _className:"ParticleSystem", //private POINTZERO for ParticleSystem _pointZeroForParticle: cc.p(0, 0), @@ -327,11 +245,6 @@ cc.ParticleSystem = cc.Node.extend(/** @lends cc.ParticleSystem# */{ _transformSystemDirty: false, _allocatedParticles: 0, - //drawMode - drawMode: cc.PARTICLE_SHAPE_MODE, - - //shape type - shapeType: cc.PARTICLE_BALL_SHAPE, _isActive: false, particleCount: 0, duration: 0, @@ -358,34 +271,23 @@ cc.ParticleSystem = cc.Node.extend(/** @lends cc.ParticleSystem# */{ _texture: null, _blendFunc: null, _opacityModifyRGB: false, - positionType: cc.PARTICLE_TYPE_FREE, + positionType: null, autoRemoveOnFinish: false, emitterMode: 0, - // quads to be rendered - _quads:null, - // indices - _indices:null, - - //_VAOname:0, - //0: vertex 1: indices - _buffersVBO:null, - _pointRect:null, - _textureLoaded: null, - _quadsArrayBuffer:null, /** *
return the string found by key in dict.
* This plist files can be create manually or with Particle Designer:
* http://particledesigner.71squared.com/
*
+ * It's very expensive to change color on Canvas mode, so if set it to true, particle system will ignore the changing color operation. + * @param {boolean} ignore */ - initIndices:function () { - var locIndices = this._indices; - for (var i = 0, len = this._totalParticles; i < len; ++i) { - var i6 = i * 6; - var i4 = i * 4; - locIndices[i6 + 0] = i4 + 0; - locIndices[i6 + 1] = i4 + 1; - locIndices[i6 + 2] = i4 + 2; - - locIndices[i6 + 5] = i4 + 1; - locIndices[i6 + 4] = i4 + 2; - locIndices[i6 + 3] = i4 + 3; - } + ignoreColor: function(ignore){ + this._dontTint = ignore; }, /** @@ -479,73 +371,7 @@ cc.ParticleSystem = cc.Node.extend(/** @lends cc.ParticleSystem# */{ * @param {cc.Rect} pointRect */ initTexCoordsWithRect:function (pointRect) { - var scaleFactor = cc.contentScaleFactor(); - // convert to pixels coords - var rect = cc.rect( - pointRect.x * scaleFactor, - pointRect.y * scaleFactor, - pointRect.width * scaleFactor, - pointRect.height * scaleFactor); - - var wide = pointRect.width; - var high = pointRect.height; - - if (this._texture) { - wide = this._texture.pixelsWidth; - high = this._texture.pixelsHeight; - } - - if(cc._renderType === cc._RENDER_TYPE_CANVAS) - return; - - var left, bottom, right, top; - if (cc.FIX_ARTIFACTS_BY_STRECHING_TEXEL) { - left = (rect.x * 2 + 1) / (wide * 2); - bottom = (rect.y * 2 + 1) / (high * 2); - right = left + (rect.width * 2 - 2) / (wide * 2); - top = bottom + (rect.height * 2 - 2) / (high * 2); - } else { - left = rect.x / wide; - bottom = rect.y / high; - right = left + rect.width / wide; - top = bottom + rect.height / high; - } - - // Important. Texture in cocos2d are inverted, so the Y component should be inverted - var temp = top; - top = bottom; - bottom = temp; - - var quads; - var start = 0, end = 0; - if (this._batchNode) { - quads = this._batchNode.textureAtlas.quads; - start = this.atlasIndex; - end = this.atlasIndex + this._totalParticles; - } else { - quads = this._quads; - start = 0; - end = this._totalParticles; - } - - for (var i = start; i < end; i++) { - if (!quads[i]) - quads[i] = cc.V3F_C4B_T2F_QuadZero(); - - // bottom-left vertex: - var selQuad = quads[i]; - selQuad.bl.texCoords.u = left; - selQuad.bl.texCoords.v = bottom; - // bottom-right vertex: - selQuad.br.texCoords.u = right; - selQuad.br.texCoords.v = bottom; - // top-left vertex: - selQuad.tl.texCoords.u = left; - selQuad.tl.texCoords.v = top; - // top-right vertex: - selQuad.tr.texCoords.u = right; - selQuad.tr.texCoords.v = top; - } + this._renderCmd.initTexCoordsWithRect(pointRect); }, /** @@ -561,38 +387,7 @@ cc.ParticleSystem = cc.Node.extend(/** @lends cc.ParticleSystem# */{ * @param {cc.ParticleBatchNode} batchNode */ setBatchNode:function (batchNode) { - if (this._batchNode != batchNode) { - var oldBatch = this._batchNode; - - this._batchNode = batchNode; //weak reference - - if (batchNode) { - var locParticles = this._particles; - for (var i = 0; i < this._totalParticles; i++) - locParticles[i].atlasIndex = i; - } - - // NEW: is self render ? - if (!batchNode) { - this._allocMemory(); - this.initIndices(); - this.setTexture(oldBatch.getTexture()); - //if (cc.TEXTURE_ATLAS_USE_VAO) - // this._setupVBOandVAO(); - //else - this._setupVBO(); - } else if (!oldBatch) { - // OLD: was it self render cleanup ? - // copy current state to batch - this._batchNode.textureAtlas._copyQuadsToTextureAtlas(this._quads, this.atlasIndex); - - //delete buffer - cc._renderContext.deleteBuffer(this._buffersVBO[1]); //where is re-bindBuffer code? - - //if (cc.TEXTURE_ATLAS_USE_VAO) - // glDeleteVertexArrays(1, this._VAOname); - } - } + this._renderCmd.setBatchNode(batchNode); }, /** @@ -612,35 +407,35 @@ cc.ParticleSystem = cc.Node.extend(/** @lends cc.ParticleSystem# */{ }, /** - * Return DrawMode of ParticleSystem + * Return DrawMode of ParticleSystem (Canvas Mode only) * @return {Number} */ getDrawMode:function () { - return this.drawMode; + return this._renderCmd.getDrawMode(); }, /** - * DrawMode of ParticleSystem setter + * DrawMode of ParticleSystem setter (Canvas Mode only) * @param {Number} drawMode */ setDrawMode:function (drawMode) { - this.drawMode = drawMode; + this._renderCmd.setDrawMode(drawMode); }, /** - * Return ShapeType of ParticleSystem + * Return ShapeType of ParticleSystem (Canvas Mode only) * @return {Number} */ getShapeType:function () { - return this.shapeType; + return this._renderCmd.getShapeType(); }, /** - * ShapeType of ParticleSystem setter + * ShapeType of ParticleSystem setter (Canvas Mode only) * @param {Number} shapeType */ setShapeType:function (shapeType) { - this.shapeType = shapeType; + this._renderCmd.setShapeType(shapeType); }, /** @@ -688,7 +483,7 @@ cc.ParticleSystem = cc.Node.extend(/** @lends cc.ParticleSystem# */{ * @return {cc.Point | Object} */ getSourcePosition:function () { - return {x:this._sourcePosition.x, y:this._sourcePosition.y}; + return {x: this._sourcePosition.x, y: this._sourcePosition.y}; }, /** @@ -785,7 +580,7 @@ cc.ParticleSystem = cc.Node.extend(/** @lends cc.ParticleSystem# */{ * @return {cc.Point} */ getGravity:function () { - if(this.emitterMode !== cc.PARTICLE_MODE_GRAVITY) + if(this.emitterMode !== cc.ParticleSystem.MODE_GRAVITY) cc.log("cc.ParticleBatchNode.getGravity() : Particle Mode should be Gravity"); var locGravity = this.modeA.gravity; return cc.p(locGravity.x, locGravity.y); @@ -796,7 +591,7 @@ cc.ParticleSystem = cc.Node.extend(/** @lends cc.ParticleSystem# */{ * @param {cc.Point} gravity */ setGravity:function (gravity) { - if(this.emitterMode !== cc.PARTICLE_MODE_GRAVITY) + if(this.emitterMode !== cc.ParticleSystem.MODE_GRAVITY) cc.log("cc.ParticleBatchNode.setGravity() : Particle Mode should be Gravity"); this.modeA.gravity = gravity; }, @@ -806,7 +601,7 @@ cc.ParticleSystem = cc.Node.extend(/** @lends cc.ParticleSystem# */{ * @return {Number} */ getSpeed:function () { - if(this.emitterMode !== cc.PARTICLE_MODE_GRAVITY) + if(this.emitterMode !== cc.ParticleSystem.MODE_GRAVITY) cc.log("cc.ParticleBatchNode.getSpeed() : Particle Mode should be Gravity"); return this.modeA.speed; }, @@ -816,7 +611,7 @@ cc.ParticleSystem = cc.Node.extend(/** @lends cc.ParticleSystem# */{ * @param {Number} speed */ setSpeed:function (speed) { - if(this.emitterMode !== cc.PARTICLE_MODE_GRAVITY) + if(this.emitterMode !== cc.ParticleSystem.MODE_GRAVITY) cc.log("cc.ParticleBatchNode.setSpeed() : Particle Mode should be Gravity"); this.modeA.speed = speed; }, @@ -826,7 +621,7 @@ cc.ParticleSystem = cc.Node.extend(/** @lends cc.ParticleSystem# */{ * @return {Number} */ getSpeedVar:function () { - if(this.emitterMode !== cc.PARTICLE_MODE_GRAVITY) + if(this.emitterMode !== cc.ParticleSystem.MODE_GRAVITY) cc.log("cc.ParticleBatchNode.getSpeedVar() : Particle Mode should be Gravity"); return this.modeA.speedVar; }, @@ -836,7 +631,7 @@ cc.ParticleSystem = cc.Node.extend(/** @lends cc.ParticleSystem# */{ * @param {Number} speedVar */ setSpeedVar:function (speedVar) { - if(this.emitterMode !== cc.PARTICLE_MODE_GRAVITY) + if(this.emitterMode !== cc.ParticleSystem.MODE_GRAVITY) cc.log("cc.ParticleBatchNode.setSpeedVar() : Particle Mode should be Gravity"); this.modeA.speedVar = speedVar; }, @@ -846,7 +641,7 @@ cc.ParticleSystem = cc.Node.extend(/** @lends cc.ParticleSystem# */{ * @return {Number} */ getTangentialAccel:function () { - if(this.emitterMode !== cc.PARTICLE_MODE_GRAVITY) + if(this.emitterMode !== cc.ParticleSystem.MODE_GRAVITY) cc.log("cc.ParticleBatchNode.getTangentialAccel() : Particle Mode should be Gravity"); return this.modeA.tangentialAccel; }, @@ -856,7 +651,7 @@ cc.ParticleSystem = cc.Node.extend(/** @lends cc.ParticleSystem# */{ * @param {Number} tangentialAccel */ setTangentialAccel:function (tangentialAccel) { - if(this.emitterMode !== cc.PARTICLE_MODE_GRAVITY) + if(this.emitterMode !== cc.ParticleSystem.MODE_GRAVITY) cc.log("cc.ParticleBatchNode.setTangentialAccel() : Particle Mode should be Gravity"); this.modeA.tangentialAccel = tangentialAccel; }, @@ -866,7 +661,7 @@ cc.ParticleSystem = cc.Node.extend(/** @lends cc.ParticleSystem# */{ * @return {Number} */ getTangentialAccelVar:function () { - if(this.emitterMode !== cc.PARTICLE_MODE_GRAVITY) + if(this.emitterMode !== cc.ParticleSystem.MODE_GRAVITY) cc.log("cc.ParticleBatchNode.getTangentialAccelVar() : Particle Mode should be Gravity"); return this.modeA.tangentialAccelVar; }, @@ -876,7 +671,7 @@ cc.ParticleSystem = cc.Node.extend(/** @lends cc.ParticleSystem# */{ * @param {Number} tangentialAccelVar */ setTangentialAccelVar:function (tangentialAccelVar) { - if(this.emitterMode !== cc.PARTICLE_MODE_GRAVITY) + if(this.emitterMode !== cc.ParticleSystem.MODE_GRAVITY) cc.log("cc.ParticleBatchNode.setTangentialAccelVar() : Particle Mode should be Gravity"); this.modeA.tangentialAccelVar = tangentialAccelVar; }, @@ -886,7 +681,7 @@ cc.ParticleSystem = cc.Node.extend(/** @lends cc.ParticleSystem# */{ * @return {Number} */ getRadialAccel:function () { - if(this.emitterMode !== cc.PARTICLE_MODE_GRAVITY) + if(this.emitterMode !== cc.ParticleSystem.MODE_GRAVITY) cc.log("cc.ParticleBatchNode.getRadialAccel() : Particle Mode should be Gravity"); return this.modeA.radialAccel; }, @@ -896,7 +691,7 @@ cc.ParticleSystem = cc.Node.extend(/** @lends cc.ParticleSystem# */{ * @param {Number} radialAccel */ setRadialAccel:function (radialAccel) { - if(this.emitterMode !== cc.PARTICLE_MODE_GRAVITY) + if(this.emitterMode !== cc.ParticleSystem.MODE_GRAVITY) cc.log("cc.ParticleBatchNode.setRadialAccel() : Particle Mode should be Gravity"); this.modeA.radialAccel = radialAccel; }, @@ -906,7 +701,7 @@ cc.ParticleSystem = cc.Node.extend(/** @lends cc.ParticleSystem# */{ * @return {Number} */ getRadialAccelVar:function () { - if(this.emitterMode !== cc.PARTICLE_MODE_GRAVITY) + if(this.emitterMode !== cc.ParticleSystem.MODE_GRAVITY) cc.log("cc.ParticleBatchNode.getRadialAccelVar() : Particle Mode should be Gravity"); return this.modeA.radialAccelVar; }, @@ -916,7 +711,7 @@ cc.ParticleSystem = cc.Node.extend(/** @lends cc.ParticleSystem# */{ * @param {Number} radialAccelVar */ setRadialAccelVar:function (radialAccelVar) { - if(this.emitterMode !== cc.PARTICLE_MODE_GRAVITY) + if(this.emitterMode !== cc.ParticleSystem.MODE_GRAVITY) cc.log("cc.ParticleBatchNode.setRadialAccelVar() : Particle Mode should be Gravity"); this.modeA.radialAccelVar = radialAccelVar; }, @@ -926,7 +721,7 @@ cc.ParticleSystem = cc.Node.extend(/** @lends cc.ParticleSystem# */{ * @returns {boolean} */ getRotationIsDir: function(){ - if(this.emitterMode !== cc.PARTICLE_MODE_GRAVITY) + if(this.emitterMode !== cc.ParticleSystem.MODE_GRAVITY) cc.log("cc.ParticleBatchNode.getRotationIsDir() : Particle Mode should be Gravity"); return this.modeA.rotationIsDir; }, @@ -936,7 +731,7 @@ cc.ParticleSystem = cc.Node.extend(/** @lends cc.ParticleSystem# */{ * @param {boolean} t */ setRotationIsDir: function(t){ - if(this.emitterMode !== cc.PARTICLE_MODE_GRAVITY) + if(this.emitterMode !== cc.ParticleSystem.MODE_GRAVITY) cc.log("cc.ParticleBatchNode.setRotationIsDir() : Particle Mode should be Gravity"); this.modeA.rotationIsDir = t; }, @@ -947,7 +742,7 @@ cc.ParticleSystem = cc.Node.extend(/** @lends cc.ParticleSystem# */{ * @return {Number} */ getStartRadius:function () { - if(this.emitterMode !== cc.PARTICLE_MODE_RADIUS) + if(this.emitterMode !== cc.ParticleSystem.MODE_RADIUS) cc.log("cc.ParticleBatchNode.getStartRadius() : Particle Mode should be Radius"); return this.modeB.startRadius; }, @@ -957,7 +752,7 @@ cc.ParticleSystem = cc.Node.extend(/** @lends cc.ParticleSystem# */{ * @param {Number} startRadius */ setStartRadius:function (startRadius) { - if(this.emitterMode !== cc.PARTICLE_MODE_RADIUS) + if(this.emitterMode !== cc.ParticleSystem.MODE_RADIUS) cc.log("cc.ParticleBatchNode.setStartRadius() : Particle Mode should be Radius"); this.modeB.startRadius = startRadius; }, @@ -967,7 +762,7 @@ cc.ParticleSystem = cc.Node.extend(/** @lends cc.ParticleSystem# */{ * @return {Number} */ getStartRadiusVar:function () { - if(this.emitterMode !== cc.PARTICLE_MODE_RADIUS) + if(this.emitterMode !== cc.ParticleSystem.MODE_RADIUS) cc.log("cc.ParticleBatchNode.getStartRadiusVar() : Particle Mode should be Radius"); return this.modeB.startRadiusVar; }, @@ -977,7 +772,7 @@ cc.ParticleSystem = cc.Node.extend(/** @lends cc.ParticleSystem# */{ * @param {Number} startRadiusVar */ setStartRadiusVar:function (startRadiusVar) { - if(this.emitterMode !== cc.PARTICLE_MODE_RADIUS) + if(this.emitterMode !== cc.ParticleSystem.MODE_RADIUS) cc.log("cc.ParticleBatchNode.setStartRadiusVar() : Particle Mode should be Radius"); this.modeB.startRadiusVar = startRadiusVar; }, @@ -987,7 +782,7 @@ cc.ParticleSystem = cc.Node.extend(/** @lends cc.ParticleSystem# */{ * @return {Number} */ getEndRadius:function () { - if(this.emitterMode !== cc.PARTICLE_MODE_RADIUS) + if(this.emitterMode !== cc.ParticleSystem.MODE_RADIUS) cc.log("cc.ParticleBatchNode.getEndRadius() : Particle Mode should be Radius"); return this.modeB.endRadius; }, @@ -997,7 +792,7 @@ cc.ParticleSystem = cc.Node.extend(/** @lends cc.ParticleSystem# */{ * @param {Number} endRadius */ setEndRadius:function (endRadius) { - if(this.emitterMode !== cc.PARTICLE_MODE_RADIUS) + if(this.emitterMode !== cc.ParticleSystem.MODE_RADIUS) cc.log("cc.ParticleBatchNode.setEndRadius() : Particle Mode should be Radius"); this.modeB.endRadius = endRadius; }, @@ -1007,7 +802,7 @@ cc.ParticleSystem = cc.Node.extend(/** @lends cc.ParticleSystem# */{ * @return {Number} */ getEndRadiusVar:function () { - if(this.emitterMode !== cc.PARTICLE_MODE_RADIUS) + if(this.emitterMode !== cc.ParticleSystem.MODE_RADIUS) cc.log("cc.ParticleBatchNode.getEndRadiusVar() : Particle Mode should be Radius"); return this.modeB.endRadiusVar; }, @@ -1017,7 +812,7 @@ cc.ParticleSystem = cc.Node.extend(/** @lends cc.ParticleSystem# */{ * @param endRadiusVar */ setEndRadiusVar:function (endRadiusVar) { - if(this.emitterMode !== cc.PARTICLE_MODE_RADIUS) + if(this.emitterMode !== cc.ParticleSystem.MODE_RADIUS) cc.log("cc.ParticleBatchNode.setEndRadiusVar() : Particle Mode should be Radius"); this.modeB.endRadiusVar = endRadiusVar; }, @@ -1027,7 +822,7 @@ cc.ParticleSystem = cc.Node.extend(/** @lends cc.ParticleSystem# */{ * @return {Number} */ getRotatePerSecond:function () { - if(this.emitterMode !== cc.PARTICLE_MODE_RADIUS) + if(this.emitterMode !== cc.ParticleSystem.MODE_RADIUS) cc.log("cc.ParticleBatchNode.getRotatePerSecond() : Particle Mode should be Radius"); return this.modeB.rotatePerSecond; }, @@ -1037,7 +832,7 @@ cc.ParticleSystem = cc.Node.extend(/** @lends cc.ParticleSystem# */{ * @param {Number} degrees */ setRotatePerSecond:function (degrees) { - if(this.emitterMode !== cc.PARTICLE_MODE_RADIUS) + if(this.emitterMode !== cc.ParticleSystem.MODE_RADIUS) cc.log("cc.ParticleBatchNode.setRotatePerSecond() : Particle Mode should be Radius"); this.modeB.rotatePerSecond = degrees; }, @@ -1047,7 +842,7 @@ cc.ParticleSystem = cc.Node.extend(/** @lends cc.ParticleSystem# */{ * @return {Number} */ getRotatePerSecondVar:function () { - if(this.emitterMode !== cc.PARTICLE_MODE_RADIUS) + if(this.emitterMode !== cc.ParticleSystem.MODE_RADIUS) cc.log("cc.ParticleBatchNode.getRotatePerSecondVar() : Particle Mode should be Radius"); return this.modeB.rotatePerSecondVar; }, @@ -1057,7 +852,7 @@ cc.ParticleSystem = cc.Node.extend(/** @lends cc.ParticleSystem# */{ * @param degrees */ setRotatePerSecondVar:function (degrees) { - if(this.emitterMode !== cc.PARTICLE_MODE_RADIUS) + if(this.emitterMode !== cc.ParticleSystem.MODE_RADIUS) cc.log("cc.ParticleBatchNode.setRotatePerSecondVar() : Particle Mode should be Radius"); this.modeB.rotatePerSecondVar = degrees; }, @@ -1153,7 +948,7 @@ cc.ParticleSystem = cc.Node.extend(/** @lends cc.ParticleSystem# */{ * @return {cc.Color} */ getStartColor:function () { - return this._startColor; + return cc.color(this._startColor.r, this._startColor.g, this._startColor.b, this._startColor.a); }, /** @@ -1169,7 +964,7 @@ cc.ParticleSystem = cc.Node.extend(/** @lends cc.ParticleSystem# */{ * @return {cc.Color} */ getStartColorVar:function () { - return this._startColorVar; + return cc.color(this._startColorVar.r, this._startColorVar.g, this._startColorVar.b, this._startColorVar.a); }, /** @@ -1185,7 +980,7 @@ cc.ParticleSystem = cc.Node.extend(/** @lends cc.ParticleSystem# */{ * @return {cc.Color} */ getEndColor:function () { - return this._endColor; + return cc.color(this._endColor.r, this._endColor.g, this._endColor.b, this._endColor.a); }, /** @@ -1201,7 +996,7 @@ cc.ParticleSystem = cc.Node.extend(/** @lends cc.ParticleSystem# */{ * @return {cc.Color} */ getEndColorVar:function () { - return this._endColorVar; + return cc.color(this._endColorVar.r, this._endColorVar.g, this._endColorVar.b, this._endColorVar.a); }, /** @@ -1305,53 +1100,7 @@ cc.ParticleSystem = cc.Node.extend(/** @lends cc.ParticleSystem# */{ * @param {Number} tp totalParticles */ setTotalParticles:function (tp) { - //cc.assert(tp <= this._allocatedParticles, "Particle: resizing particle array only supported for quads"); - if (cc._renderType === cc._RENDER_TYPE_CANVAS){ - this._totalParticles = (tp < 200) ? tp : 200; - return; - } - - // If we are setting the total numer of particles to a number higher - // than what is allocated, we need to allocate new arrays - if (tp > this._allocatedParticles) { - var quadSize = cc.V3F_C4B_T2F_Quad.BYTES_PER_ELEMENT; - // Allocate new memory - this._indices = new Uint16Array(tp * 6); - var locQuadsArrayBuffer = new ArrayBuffer(tp * quadSize); - //TODO need fix - // Assign pointers - var locParticles = this._particles; - locParticles.length = 0; - var locQuads = this._quads; - locQuads.length = 0; - for (var j = 0; j < tp; j++) { - locParticles[j] = new cc.Particle(); - locQuads[j] = new cc.V3F_C4B_T2F_Quad(null, null, null, null, locQuadsArrayBuffer, j * quadSize); - } - this._allocatedParticles = tp; - this._totalParticles = tp; - - // Init particles - if (this._batchNode) { - for (var i = 0; i < tp; i++) - locParticles[i].atlasIndex = i; - } - - this._quadsArrayBuffer = locQuadsArrayBuffer; - - this.initIndices(); - //if (cc.TEXTURE_ATLAS_USE_VAO) - // this._setupVBOandVAO(); - //else - this._setupVBO(); - - //set the texture coord - if(this._texture){ - this.initTexCoordsWithRect(cc.rect(0, 0, this._texture.width, this._texture.height)); - } - } else - this._totalParticles = tp; - this.resetSystem(); + this._renderCmd.setTotalParticles(tp); }, /** @@ -1367,11 +1116,14 @@ cc.ParticleSystem = cc.Node.extend(/** @lends cc.ParticleSystem# */{ * @param {cc.Texture2D } texture */ setTexture:function (texture) { + if(!texture) + return; + if(texture.isLoaded()){ this.setTextureWithRect(texture, cc.rect(0, 0, texture.width, texture.height)); } else { this._textureLoaded = false; - texture.addLoadedEventListener(function(sender){ + texture.addEventListener("load", function(sender){ this._textureLoaded = true; this.setTextureWithRect(sender, cc.rect(0, 0, sender.width, sender.height)); }, this); @@ -1394,12 +1146,12 @@ cc.ParticleSystem = cc.Node.extend(/** @lends cc.ParticleSystem# */{ */ setBlendFunc:function (src, dst) { if (dst === undefined) { - if (this._blendFunc != src) { + if (this._blendFunc !== src) { this._blendFunc = src; this._updateBlendFunc(); } } else { - if (this._blendFunc.src != src || this._blendFunc.dst != dst) { + if (this._blendFunc.src !== src || this._blendFunc.dst !== dst) { this._blendFunc = {src:src, dst:dst}; this._updateBlendFunc(); } @@ -1432,7 +1184,7 @@ cc.ParticleSystem = cc.Node.extend(/** @lends cc.ParticleSystem# */{ * dest blend function = GL_ONE; */ isBlendAdditive:function () { - return (( this._blendFunc.src == cc.SRC_ALPHA && this._blendFunc.dst == cc.ONE) || (this._blendFunc.src == cc.ONE && this._blendFunc.dst == cc.ONE)); + return (( this._blendFunc.src === cc.SRC_ALPHA && this._blendFunc.dst === cc.ONE) || (this._blendFunc.src === cc.ONE && this._blendFunc.dst === cc.ONE)); }, /** @@ -1447,18 +1199,7 @@ cc.ParticleSystem = cc.Node.extend(/** @lends cc.ParticleSystem# */{ locBlendFunc.src = cc.SRC_ALPHA; locBlendFunc.dst = cc.ONE; } else { - if (cc._renderType === cc._RENDER_TYPE_WEBGL) { - if (this._texture && !this._texture.hasPremultipliedAlpha()) { - locBlendFunc.src = cc.SRC_ALPHA; - locBlendFunc.dst = cc.ONE_MINUS_SRC_ALPHA; - } else { - locBlendFunc.src = cc.BLEND_SRC; - locBlendFunc.dst = cc.BLEND_DST; - } - } else { - locBlendFunc.src = cc.BLEND_SRC; - locBlendFunc.dst = cc.BLEND_DST; - } + this._renderCmd._setBlendAdditive(); } }, @@ -1508,8 +1249,8 @@ cc.ParticleSystem = cc.Node.extend(/** @lends cc.ParticleSystem# */{ /** *
Switch between different kind of emitter modes:
- * - CCPARTICLE_MODE_GRAVITY: uses gravity, speed, radial and tangential acceleration
- * - CCPARTICLE_MODE_RADIUS: uses radius movement + rotation
+ * - CCParticleSystem.MODE_GRAVITY: uses gravity, speed, radial and tangential acceleration
+ * - CCParticleSystem.MODE_RADIUS: uses radius movement + rotation
*
* http://particledesigner.71squared.com/
* + * @deprecated since v3.0 please use new cc.ParticleSysytem(plistFile) instead. * @param {String|Number} plistFile * @return {cc.ParticleSystem} */ @@ -2780,6 +2141,18 @@ cc.ParticleSystem.create = function (plistFile) { return new cc.ParticleSystem(plistFile); }; +/** + *
return the string found by key in dict.
+ * This plist files can be create manually or with Particle Designer:
+ * http://particledesigner.71squared.com/
+ *
+ * Use case: Attach an emitter to an sprite, and you want that the emitter follows the sprite. + * @constant + * @type Number + */ +cc.ParticleSystem.TYPE_RELATIVE = 1; + +/** + * Living particles are attached to the emitter and are translated along with it. + * @constant + * @type Number + */ +cc.ParticleSystem.TYPE_GROUPED = 2; diff --git a/cocos2d/particle/CCParticleSystemCanvasRenderCmd.js b/cocos2d/particle/CCParticleSystemCanvasRenderCmd.js new file mode 100644 index 0000000000..7537bb94d5 --- /dev/null +++ b/cocos2d/particle/CCParticleSystemCanvasRenderCmd.js @@ -0,0 +1,217 @@ +/**************************************************************************** + Copyright (c) 2013-2014 Chukong Technologies Inc. + + http://www.cocos2d-x.org + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + ****************************************************************************/ + +/** + * ParticleSystem's canvas render command + */ +(function(){ + cc.ParticleSystem.CanvasRenderCmd = function(renderable){ + cc.Node.CanvasRenderCmd.call(this, renderable); + this._needDraw = true; + + this._drawMode = cc.ParticleSystem.TEXTURE_MODE; + this._shapeType = cc.ParticleSystem.BALL_SHAPE; + + this._pointRect = cc.rect(0, 0, 0, 0); + }; + var proto = cc.ParticleSystem.CanvasRenderCmd.prototype = Object.create(cc.Node.CanvasRenderCmd.prototype); + proto.constructor = cc.ParticleSystem.CanvasRenderCmd; + + proto.getDrawMode = function(){ + return this._drawMode; + }; + + proto.setDrawMode = function(drawMode){ + this._drawMode = drawMode; + }; + + proto.getShapeType = function(){ + return this._shapeType; + }; + + proto.setShapeType = function(shapeType){ + this._shapeType = shapeType; + }; + + proto.setBatchNode = function(batchNode){ + if (this._batchNode !== batchNode) { + this._node._batchNode = batchNode; + } + }; + + proto.updateQuadWithParticle = function (particle, newPosition) { + //do nothing + }; + + proto.updateParticlePosition = function(particle, position){ + cc.pIn(particle.drawPos, position); + }; + + proto.rendering = function (ctx, scaleX, scaleY) { + //TODO: need refactor rendering for performance + var wrapper = ctx || cc._renderContext, context = wrapper.getContext(), + node = this._node, pointRect = this._pointRect; + + wrapper.setTransform(this._worldTransform, scaleX, scaleY); + wrapper.save(); + if (node.isBlendAdditive()) + context.globalCompositeOperation = 'lighter'; + else + context.globalCompositeOperation = 'source-over'; + + var i, particle, lpx, alpha; + var particleCount = this._node.particleCount, particles = this._node._particles; + if (node.drawMode !== cc.ParticleSystem.SHAPE_MODE && node._texture) { + // Delay drawing until the texture is fully loaded by the browser + if (!node._texture._textureLoaded) { + wrapper.restore(); + return; + } + var element = node._texture.getHtmlElementObj(); + if (!element.width || !element.height) { + wrapper.restore(); + return; + } + + var drawElement = element; + for (i = 0; i < particleCount; i++) { + particle = particles[i]; + lpx = (0 | (particle.size * 0.5)); + + alpha = particle.color.a / 255; + if (alpha === 0) continue; + context.globalAlpha = alpha; + + context.save(); + context.translate((0 | particle.drawPos.x), -(0 | particle.drawPos.y)); + + var size = Math.floor(particle.size / 4) * 4; + var w = pointRect.width; + var h = pointRect.height; + + context.scale(Math.max((1 / w) * size, 0.000001), Math.max((1 / h) * size, 0.000001)); + if (particle.rotation) + context.rotate(cc.degreesToRadians(particle.rotation)); + + drawElement = particle.isChangeColor ? this._changeTextureColor(element, particle.color, this._pointRect) : element; + context.drawImage(drawElement, -(0 | (w / 2)), -(0 | (h / 2))); + context.restore(); + } + } else { + var drawTool = cc._drawingUtil; + for (i = 0; i < particleCount; i++) { + particle = particles[i]; + lpx = (0 | (particle.size * 0.5)); + alpha = particle.color.a / 255; + if (alpha === 0) continue; + context.globalAlpha = alpha; + + context.save(); + context.translate(0 | particle.drawPos.x, -(0 | particle.drawPos.y)); + if (node.shapeType === cc.ParticleSystem.STAR_SHAPE) { + if (particle.rotation) + context.rotate(cc.degreesToRadians(particle.rotation)); + drawTool.drawStar(wrapper, lpx, particle.color); + } else + drawTool.drawColorBall(wrapper, lpx, particle.color); + context.restore(); + } + } + wrapper.restore(); + cc.g_NumberOfDraws++; + }; + + if(!cc.sys._supportCanvasNewBlendModes){ + proto._changeTextureColor = function(element, color, rect){ + var cacheTextureForColor = cc.textureCache.getTextureColors(element); + if (cacheTextureForColor) { + // Create another cache for the tinted version + // This speeds up things by a fair bit + if (!cacheTextureForColor.tintCache) { + cacheTextureForColor.tintCache = document.createElement('canvas'); + cacheTextureForColor.tintCache.width = element.width; + cacheTextureForColor.tintCache.height = element.height; + } + cc.Sprite.CanvasRenderCmd._generateTintImage(element, cacheTextureForColor, color, rect, cacheTextureForColor.tintCache); + return cacheTextureForColor.tintCache; + } + return null + } + }else{ + proto._changeTextureColor = function(element, color, rect){ + if (!element.tintCache) { + element.tintCache = document.createElement('canvas'); + element.tintCache.width = element.width; + element.tintCache.height = element.height; + } + return cc.Sprite.CanvasRenderCmd._generateTintImageWithMultiply(element, color, rect, element.tintCache); + } + } + + proto.initTexCoordsWithRect = function(pointRect){ + this._pointRect = pointRect; + }; + + proto.setTotalParticles = function(tp){ + //cc.assert(tp <= this._allocatedParticles, "Particle: resizing particle array only supported for quads"); + this._node._totalParticles = (tp < 200) ? tp : 200; + }; + + proto.addParticle = function(){ + var node = this._node, + particles = node._particles, + particle; + if (node.particleCount < particles.length) { + particle = particles[node.particleCount]; + } else { + particle = new cc.Particle(); + particles.push(particle); + } + return particle; + }; + + proto._setupVBO = function(){}; + proto._allocMemory = function(){ + return true; + }; + + proto.postStep = function(){}; + + proto._setBlendAdditive = function(){ + var locBlendFunc = this._node._blendFunc; + locBlendFunc.src = cc.BLEND_SRC; + locBlendFunc.dst = cc.BLEND_DST; + }; + + proto._initWithTotalParticles = function(totalParticles){}; + proto._updateDeltaColor = function(selParticle, dt){ + if (!this._node._dontTint) { + selParticle.color.r += selParticle.deltaColor.r * dt; + selParticle.color.g += selParticle.deltaColor.g * dt; + selParticle.color.b += selParticle.deltaColor.b * dt; + selParticle.color.a += selParticle.deltaColor.a * dt; + selParticle.isChangeColor = true; + } + }; +})(); diff --git a/cocos2d/particle/CCParticleSystemWebGLRenderCmd.js b/cocos2d/particle/CCParticleSystemWebGLRenderCmd.js new file mode 100644 index 0000000000..eb1ce063b0 --- /dev/null +++ b/cocos2d/particle/CCParticleSystemWebGLRenderCmd.js @@ -0,0 +1,401 @@ +/**************************************************************************** + Copyright (c) 2013-2014 Chukong Technologies Inc. + + http://www.cocos2d-x.org + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + ****************************************************************************/ + +(function(){ + /** + * ParticleSystem's WebGL render command + */ + cc.ParticleSystem.WebGLRenderCmd = function(renderable){ + cc.Node.WebGLRenderCmd.call(this, renderable); + this._needDraw = true; + + this._buffersVBO = [0, 0]; + this._quads = []; + this._indices = []; + this._quadsArrayBuffer = null; + }; + var proto = cc.ParticleSystem.WebGLRenderCmd.prototype = Object.create(cc.Node.WebGLRenderCmd.prototype); + proto.constructor = cc.ParticleSystem.WebGLRenderCmd; + + proto.getDrawMode = function(){}; + proto.setDrawMode = function(drawMode){}; + proto.getShapeType = function(){}; + proto.setShapeType = function(shapeType){}; + + proto.setBatchNode = function(batchNode){ + var node = this._node; + if (node._batchNode !== batchNode) { + var oldBatch = node._batchNode; + node._batchNode = batchNode; //weak reference + + if (batchNode) { + var locParticles = node._particles; + for (var i = 0; i < node._totalParticles; i++) + locParticles[i].atlasIndex = i; + } + + // NEW: is self render ? + if (!batchNode) { + this._allocMemory(); + this.initIndices(node._totalParticles); + node.setTexture(oldBatch.getTexture()); + this._setupVBO(); + + } else if (!oldBatch) { + // OLD: was it self render cleanup ? + // copy current state to batch + node._batchNode.textureAtlas._copyQuadsToTextureAtlas(this._quads, node.atlasIndex); + + //delete buffer + cc._renderContext.deleteBuffer(this._buffersVBO[1]); //where is re-bindBuffer code? + } + } + }; + + proto.initIndices = function (totalParticles) { + var locIndices = this._indices; + for (var i = 0, len = totalParticles; i < len; ++i) { + var i6 = i * 6; + var i4 = i * 4; + locIndices[i6 + 0] = i4 + 0; + locIndices[i6 + 1] = i4 + 1; + locIndices[i6 + 2] = i4 + 2; + + locIndices[i6 + 5] = i4 + 1; + locIndices[i6 + 4] = i4 + 2; + locIndices[i6 + 3] = i4 + 3; + } + }; + + proto.isDifferentTexture = function(texture1, texture2){ + return (texture1 === texture2); + }; + + proto.updateParticlePosition = function(particle, position){ + // IMPORTANT: newPos may not be used as a reference here! (as it is just the temporary tpa point) + // the implementation of updateQuadWithParticle must use + // the x and y values directly + this.updateQuadWithParticle(particle, position); + }; + + proto.updateQuadWithParticle = function (particle, newPosition) { + var quad = null, node = this._node; + if (node._batchNode) { + var batchQuads = node._batchNode.textureAtlas.quads; + quad = batchQuads[node.atlasIndex + particle.atlasIndex]; + node._batchNode.textureAtlas.dirty = true; + } else + quad = this._quads[node._particleIdx]; + + var r, g, b, a; + if (node._opacityModifyRGB) { + r = 0 | (particle.color.r * particle.color.a/255); + g = 0 | (particle.color.g * particle.color.a/255); + b = 0 | (particle.color.b * particle.color.a/255); + } else { + r = 0 | (particle.color.r ); + g = 0 | (particle.color.g ); + b = 0 | (particle.color.b ); + } + a = 0 | (particle.color.a ); + + var blColors = quad.bl.colors, brColors = quad.br.colors, tlColors = quad.tl.colors, trColors = quad.tr.colors; + blColors.r = brColors.r = tlColors.r = trColors.r = r; + blColors.g = brColors.g = tlColors.g = trColors.g = g; + blColors.b = brColors.b = tlColors.b = trColors.b = b; + blColors.a = brColors.a = tlColors.a = trColors.a = a; + + // vertices + var size_2 = particle.size / 2; + if (particle.rotation) { + var x1 = -size_2, y1 = -size_2; + + var x2 = size_2, y2 = size_2; + var x = newPosition.x, y = newPosition.y; + + var rad = -cc.degreesToRadians(particle.rotation); + var cr = Math.cos(rad), sr = Math.sin(rad); + var ax = x1 * cr - y1 * sr + x; + var ay = x1 * sr + y1 * cr + y; + var bx = x2 * cr - y1 * sr + x; + var by = x2 * sr + y1 * cr + y; + var cx = x2 * cr - y2 * sr + x; + var cy = x2 * sr + y2 * cr + y; + var dx = x1 * cr - y2 * sr + x; + var dy = x1 * sr + y2 * cr + y; + + // bottom-left + quad.bl.vertices.x = ax; + quad.bl.vertices.y = ay; + + // bottom-right vertex: + quad.br.vertices.x = bx; + quad.br.vertices.y = by; + + // top-left vertex: + quad.tl.vertices.x = dx; + quad.tl.vertices.y = dy; + + // top-right vertex: + quad.tr.vertices.x = cx; + quad.tr.vertices.y = cy; + } else { + // bottom-left vertex: + quad.bl.vertices.x = newPosition.x - size_2; + quad.bl.vertices.y = newPosition.y - size_2; + + // bottom-right vertex: + quad.br.vertices.x = newPosition.x + size_2; + quad.br.vertices.y = newPosition.y - size_2; + + // top-left vertex: + quad.tl.vertices.x = newPosition.x - size_2; + quad.tl.vertices.y = newPosition.y + size_2; + + // top-right vertex: + quad.tr.vertices.x = newPosition.x + size_2; + quad.tr.vertices.y = newPosition.y + size_2; + } + }; + + proto.rendering = function (ctx) { + var node = this._node; + if (!node._texture) + return; + + var gl = ctx || cc._renderContext; + + this._shaderProgram.use(); + this._shaderProgram._setUniformForMVPMatrixWithMat4(this._stackMatrix); //; + + cc.glBindTexture2D(node._texture); + cc.glBlendFuncForParticle(node._blendFunc.src, node._blendFunc.dst); + + // + // Using VBO without VAO + // + cc.glEnableVertexAttribs(cc.VERTEX_ATTRIB_FLAG_POS_COLOR_TEX); + + gl.bindBuffer(gl.ARRAY_BUFFER, this._buffersVBO[0]); + gl.vertexAttribPointer(cc.VERTEX_ATTRIB_POSITION, 3, gl.FLOAT, false, 24, 0); // vertices + gl.vertexAttribPointer(cc.VERTEX_ATTRIB_COLOR, 4, gl.UNSIGNED_BYTE, true, 24, 12); // colors + gl.vertexAttribPointer(cc.VERTEX_ATTRIB_TEX_COORDS, 2, gl.FLOAT, false, 24, 16); // tex coords + + gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, this._buffersVBO[1]); + gl.drawElements(gl.TRIANGLES, node._particleIdx * 6, gl.UNSIGNED_SHORT, 0); + }; + + proto.initTexCoordsWithRect = function(pointRect){ + var node = this._node; + var texture = node.texture; + var scaleFactor = cc.contentScaleFactor(); + // convert to pixels coords + var rect = cc.rect( + pointRect.x * scaleFactor, + pointRect.y * scaleFactor, + pointRect.width * scaleFactor, + pointRect.height * scaleFactor); + + var wide = pointRect.width; + var high = pointRect.height; + + if (texture) { + wide = texture.pixelsWidth; + high = texture.pixelsHeight; + } + + var left, bottom, right, top; + if (cc.FIX_ARTIFACTS_BY_STRECHING_TEXEL) { + left = (rect.x * 2 + 1) / (wide * 2); + bottom = (rect.y * 2 + 1) / (high * 2); + right = left + (rect.width * 2 - 2) / (wide * 2); + top = bottom + (rect.height * 2 - 2) / (high * 2); + } else { + left = rect.x / wide; + bottom = rect.y / high; + right = left + rect.width / wide; + top = bottom + rect.height / high; + } + + // Important. Texture in cocos2d are inverted, so the Y component should be inverted + var temp = top; + top = bottom; + bottom = temp; + + var quads; + var start = 0, end = 0; + if (node._batchNode) { + quads = node._batchNode.textureAtlas.quads; + start = node.atlasIndex; + end = node.atlasIndex + node._totalParticles; + } else { + quads = this._quads; + start = 0; + end = node._totalParticles; + } + + for (var i = start; i < end; i++) { + if (!quads[i]) + quads[i] = cc.V3F_C4B_T2F_QuadZero(); + + // bottom-left vertex: + var selQuad = quads[i]; + selQuad.bl.texCoords.u = left; + selQuad.bl.texCoords.v = bottom; + // bottom-right vertex: + selQuad.br.texCoords.u = right; + selQuad.br.texCoords.v = bottom; + // top-left vertex: + selQuad.tl.texCoords.u = left; + selQuad.tl.texCoords.v = top; + // top-right vertex: + selQuad.tr.texCoords.u = right; + selQuad.tr.texCoords.v = top; + } + }; + + proto.setTotalParticles = function(tp){ + var node = this._node; + // If we are setting the total numer of particles to a number higher + // than what is allocated, we need to allocate new arrays + if (tp > node._allocatedParticles) { + var quadSize = cc.V3F_C4B_T2F_Quad.BYTES_PER_ELEMENT; + // Allocate new memory + this._indices = new Uint16Array(tp * 6); + var locQuadsArrayBuffer = new ArrayBuffer(tp * quadSize); + //TODO need fix + // Assign pointers + var locParticles = node._particles; + locParticles.length = 0; + var locQuads = this._quads; + locQuads.length = 0; + for (var j = 0; j < tp; j++) { + locParticles[j] = new cc.Particle(); + locQuads[j] = new cc.V3F_C4B_T2F_Quad(null, null, null, null, locQuadsArrayBuffer, j * quadSize); + } + node._allocatedParticles = tp; + node._totalParticles = tp; + + // Init particles + if (node._batchNode) { + for (var i = 0; i < tp; i++) + locParticles[i].atlasIndex = i; + } + + this._quadsArrayBuffer = locQuadsArrayBuffer; + this.initIndices(tp); + this._setupVBO(); + + //set the texture coord + if(node._texture){ + this.initTexCoordsWithRect(cc.rect(0, 0, node._texture.width, node._texture.height)); + } + } else + node._totalParticles = tp; + node.resetSystem(); + }; + + proto.addParticle = function(){ + var node = this._node, + particles = node._particles; + return particles[node.particleCount]; + }; + + proto._setupVBO = function(){ + var node = this; + var gl = cc._renderContext; + + //gl.deleteBuffer(this._buffersVBO[0]); + this._buffersVBO[0] = gl.createBuffer(); + gl.bindBuffer(gl.ARRAY_BUFFER, this._buffersVBO[0]); + gl.bufferData(gl.ARRAY_BUFFER, this._quadsArrayBuffer, gl.DYNAMIC_DRAW); + + this._buffersVBO[1] = gl.createBuffer(); + gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, this._buffersVBO[1]); + gl.bufferData(gl.ELEMENT_ARRAY_BUFFER, this._indices, gl.STATIC_DRAW); + + //cc.checkGLErrorDebug(); + }; + + proto._allocMemory = function(){ + var node = this._node; + //cc.assert((!this._quads && !this._indices), "Memory already allocated"); + if(node._batchNode){ + cc.log("cc.ParticleSystem._allocMemory(): Memory should not be allocated when not using batchNode"); + return false; + } + + var quadSize = cc.V3F_C4B_T2F_Quad.BYTES_PER_ELEMENT; + var totalParticles = node._totalParticles; + var locQuads = this._quads; + locQuads.length = 0; + this._indices = new Uint16Array(totalParticles * 6); + var locQuadsArrayBuffer = new ArrayBuffer(quadSize * totalParticles); + + for (var i = 0; i < totalParticles; i++) + locQuads[i] = new cc.V3F_C4B_T2F_Quad(null, null, null, null, locQuadsArrayBuffer, i * quadSize); + if (!locQuads || !this._indices) { + cc.log("cocos2d: Particle system: not enough memory"); + return false; + } + this._quadsArrayBuffer = locQuadsArrayBuffer; + return true; + }; + + proto.postStep = function(){ + var gl = cc._renderContext; + gl.bindBuffer(gl.ARRAY_BUFFER, this._buffersVBO[0]); + gl.bufferData(gl.ARRAY_BUFFER, this._quadsArrayBuffer, gl.DYNAMIC_DRAW); + }; + + proto._setBlendAdditive = function(){ + var locBlendFunc = this._node._blendFunc; + if (this._texture && !this._texture.hasPremultipliedAlpha()) { + locBlendFunc.src = cc.SRC_ALPHA; + locBlendFunc.dst = cc.ONE_MINUS_SRC_ALPHA; + } else { + locBlendFunc.src = cc.BLEND_SRC; + locBlendFunc.dst = cc.BLEND_DST; + } + }; + + proto._initWithTotalParticles = function(totalParticles){ + // allocating data space + if (!this._allocMemory()) + return false; + + this.initIndices(totalParticles); + this._setupVBO(); + + this._shaderProgram = cc.shaderCache.programForKey(cc.SHADER_POSITION_TEXTURECOLOR); + }; + + proto._updateDeltaColor = function (selParticle, dt) { + selParticle.color.r += selParticle.deltaColor.r * dt; + selParticle.color.g += selParticle.deltaColor.g * dt; + selParticle.color.b += selParticle.deltaColor.b * dt; + selParticle.color.a += selParticle.deltaColor.a * dt; + selParticle.isChangeColor = true; + }; +})(); \ No newline at end of file diff --git a/cocos2d/particle/CCTIFFReader.js b/cocos2d/particle/CCTIFFReader.js index 8eb693f8d6..da832b4717 100644 --- a/cocos2d/particle/CCTIFFReader.js +++ b/cocos2d/particle/CCTIFFReader.js @@ -2,7 +2,10 @@ Copyright (c) 2011 Gordon P. Hemsley http://gphemsley.org/ - Copyright (c) 2010-2013 cocos2d-x.org + Copyright (c) 2008-2010 Ricardo Quesada + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. + http://www.cocos2d-x.org Permission is hereby granted, free of charge, to any person obtaining a copy @@ -24,9 +27,10 @@ THE SOFTWARE. ****************************************************************************/ - /** - * @namespace A tiff file reader, it can parse byte array to draw into a canvas + * cc.tiffReader is a singleton object, it's a tiff file reader, it can parse byte array to draw into a canvas + * @class + * @name cc.tiffReader */ cc.tiffReader = /** @lends cc.tiffReader# */{ _littleEndian: false, @@ -224,7 +228,7 @@ cc.tiffReader = /** @lends cc.tiffReader# */{ }, /** - * + * @function * @param {Array} tiffData * @param {HTMLCanvasElement} canvas * @returns {*} diff --git a/cocos2d/physics/CCPhysicsDebugNode.js b/cocos2d/physics/CCPhysicsDebugNode.js index 93c8c9d203..17bfe544a4 100644 --- a/cocos2d/physics/CCPhysicsDebugNode.js +++ b/cocos2d/physics/CCPhysicsDebugNode.js @@ -1,7 +1,7 @@ /**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2008-2010 Ricardo Quesada - Copyright (c) 2011 Zynga Inc. + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. Copyright (c) 2012 Scott Lembcke and Howling Moon Software http://www.cocos2d-x.org @@ -34,7 +34,12 @@ as the private API may change with little or no warning. */ -// Helper. Converts an array of numbers into an array of vectors(x,y) +/** + * Converts an array of numbers into an array of vectors(x,y) + * @function + * @param {Array} verts + * @return {Array} + */ cc.__convertVerts = function (verts) { var ret = []; for (var i = 0; i < verts.length / 2; i++) { @@ -43,6 +48,12 @@ cc.__convertVerts = function (verts) { return ret; }; +/** + * color for body + * @function + * @param {cp.Body} body + * @return {cc.color} + */ cc.ColorForBody = function (body) { if (body.isRogue() || body.isSleeping()) { return cc.color(128, 128, 128, 128); @@ -53,6 +64,11 @@ cc.ColorForBody = function (body) { } }; +/** + * draw shape + * @param {cp.Shape} shape + * @param renderer + */ cc.DrawShape = function (shape, renderer) { var body = shape.body; var color = cc.ColorForBody(body); @@ -74,6 +90,11 @@ cc.DrawShape = function (shape, renderer) { } }; +/** + * draw constraint + * @param {cp.Constraint} constraint + * @param renderer + */ cc.DrawConstraint = function (constraint, renderer) { var body_a = constraint.a; var body_b = constraint.b; @@ -111,8 +132,13 @@ cc.DrawConstraint = function (constraint, renderer) { } }; +/** + * @constant + * @type {cc.color} + */ cc.CONSTRAINT_COLOR = cc.color(0, 255, 0, 128); + /** *
A Node that draws the components of a physics engine.
* Supported physics engines:
@@ -125,50 +151,62 @@ cc.CONSTRAINT_COLOR = cc.color(0, 255, 0, 128);
* @property {cp.Space} space Physic world space
*/
cc.PhysicsDebugNode = cc.DrawNode.extend({
- space:null,
-
- _spaceObj:null,
+ _space:null,
_className:"PhysicsDebugNode",
+ /**
+ * constructor of cc.PhysicsDebugNode
+ * @param {cp.Space} space
+ */
+ ctor: function (space) {
+ cc.DrawNode.prototype.ctor.call(this);
+ this._space = space;
+ },
+
+ /**
+ * get space
+ * @returns {cp.Space}
+ */
getSpace:function () {
- return this.space;
+ return this._space;
},
+ /**
+ * set space
+ * @param {cp.Space} space
+ */
setSpace:function (space) {
- this.space = space;
+ this._space = space;
},
+ /**
+ * draw
+ * @param {object} context
+ */
draw:function (context) {
- if (!this.space)
+ if (!this._space)
return;
- this.space.eachShape(cc.DrawShape.bind(this));
- this.space.eachConstraint(cc.DrawConstraint.bind(this));
+ this._space.eachShape(cc.DrawShape.bind(this));
+ this._space.eachConstraint(cc.DrawConstraint.bind(this));
cc.DrawNode.prototype.draw.call(this);
this.clear();
- }
-});
+ },
-/** Create a debug node for an Objective-Chipmunk space. */
-cc.PhysicsDebugNode.debugNodeForChipmunkSpace = function (space) {
- var node = new cc.PhysicsDebugNode();
- if (node.init()) {
- node._spaceObj = space;
- node.space = space.space;
- return node;
+ _createRenderCmd: function(){
+ if(cc._renderType === cc._RENDER_TYPE_CANVAS)
+ return new cc.PhysicsDebugNode.CanvasRenderCmd(this);
+ else
+ return new cc.PhysicsDebugNode.WebGLRenderCmd(this);
}
- return null;
-};
+});
-/** Create a debug node for a regular Chipmunk space. */
-cc.PhysicsDebugNode.debugNodeForCPSpace = function (space) {
- var node = new cc.PhysicsDebugNode();
- if (node.init()) {
- node.space = space;
- return node;
- }
- return null;
+/**
+ * Create a debug node for a regular Chipmunk space.
+ * @deprecated since v3.0, please use new cc.PhysicsDebugNode(space)
+ * @param {cp.Space} space
+ * @return {cc.PhysicsDebugNode}
+ */
+cc.PhysicsDebugNode.create = function (space) {
+ return new cc.PhysicsDebugNode(space);
};
-
-cc.PhysicsDebugNode.create = cc.PhysicsDebugNode.debugNodeForCPSpace;
-
diff --git a/cocos2d/physics/CCPhysicsDebugNodeCanvasRenderCmd.js b/cocos2d/physics/CCPhysicsDebugNodeCanvasRenderCmd.js
new file mode 100644
index 0000000000..be1f6f14ba
--- /dev/null
+++ b/cocos2d/physics/CCPhysicsDebugNodeCanvasRenderCmd.js
@@ -0,0 +1,52 @@
+/****************************************************************************
+ Copyright (c) 2013-2014 Chukong Technologies Inc.
+
+ http://www.cocos2d-x.org
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+ ****************************************************************************/
+
+/**
+ * cc.PhysicsDebugNode's rendering objects of Canvas
+ */
+(function(){
+ cc.PhysicsDebugNode.CanvasRenderCmd = function(renderableObject){
+ cc.Node.CanvasRenderCmd.call(this, renderableObject);
+ this._buffer = renderableObject._buffer;
+ this._needDraw = true;
+ };
+
+ var proto = cc.PhysicsDebugNode.CanvasRenderCmd.prototype = Object.create(cc.Node.CanvasRenderCmd.prototype);
+ proto.constructor = cc.PhysicsDebugNode.CanvasRenderCmd;
+
+ proto.rendering = function(ctx, scaleX, scaleY){
+ var node = this._node;
+ if (!node._space)
+ return;
+ node._space.eachShape(cc.DrawShape.bind(node));
+ node._space.eachConstraint(cc.DrawConstraint.bind(node));
+ cc.DrawNode.CanvasRenderCmd.prototype.rendering.call(this, ctx, scaleX, scaleY);
+ node.clear();
+ };
+
+ proto._drawDot = cc.DrawNode.CanvasRenderCmd.prototype._drawDot;
+ proto._drawSegment = cc.DrawNode.CanvasRenderCmd.prototype._drawSegment;
+ proto._drawPoly = cc.DrawNode.CanvasRenderCmd.prototype._drawPoly;
+
+})();
diff --git a/extensions/pluginx/samples/HelloSocial/main.js b/cocos2d/physics/CCPhysicsDebugNodeWebGLRenderCmd.js
similarity index 50%
rename from extensions/pluginx/samples/HelloSocial/main.js
rename to cocos2d/physics/CCPhysicsDebugNodeWebGLRenderCmd.js
index 183e53c1c5..38ddf9f630 100644
--- a/extensions/pluginx/samples/HelloSocial/main.js
+++ b/cocos2d/physics/CCPhysicsDebugNodeWebGLRenderCmd.js
@@ -1,11 +1,8 @@
/****************************************************************************
- Copyright (c) 2010-2012 cocos2d-x.org
- Copyright (c) 2008-2010 Ricardo Quesada
- Copyright (c) 2011 Zynga Inc.
+ Copyright (c) 2013-2014 Chukong Technologies Inc.
http://www.cocos2d-x.org
-
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
@@ -24,36 +21,33 @@
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
-var cocos2dApp = cc.Application.extend({
- config:document['ccConfig'],
- ctor:function (scene) {
- this._super();
- this.startScene = scene;
- cc.COCOS2D_DEBUG = this.config['COCOS2D_DEBUG'];
- cc.initDebugSetting();
- cc.setup(this.config['tag']);
- cc.AppController.shareAppController().didFinishLaunchingWithOptions();
- },
- applicationDidFinishLaunching:function () {
- // initialize director
- var director = cc.director;
- var designSize = cc.size(800, 450);
-
- cc.view.setDesignResolutionSize(designSize.width, designSize.height, cc.ResolutionPolicy.SHOW_ALL);
-
- // turn on display FPS
- director.setDisplayStats(this.config['showFPS']);
-
- // set FPS. the default value is 1.0/60 if you don't call this
- director.setAnimationInterval(1.0 / this.config['frameRate']);
-
- //load resources
- cc.LoaderScene.preload(g_ressources, function () {
- director.runScene(new this.startScene());
- }, this);
-
- return true;
- }
-});
-
-var myApp = new cocos2dApp(MyScene);
\ No newline at end of file
+
+/**
+ * cc.PhysicsDebugNode's rendering objects of WebGL
+ */
+(function(){
+ cc.PhysicsDebugNode.WebGLRenderCmd = function (renderableObject) {
+ cc.Node.WebGLRenderCmd.call(this, renderableObject);
+ this._needDraw = true;
+ };
+
+ cc.PhysicsDebugNode.WebGLRenderCmd.prototype = Object.create(cc.Node.WebGLRenderCmd.prototype);
+ cc.PhysicsDebugNode.WebGLRenderCmd.prototype.constructor = cc.PhysicsDebugNode.WebGLRenderCmd;
+
+ cc.PhysicsDebugNode.WebGLRenderCmd.prototype.rendering = function (ctx) {
+ var node = this._node;
+ if (!node._space)
+ return;
+
+ node._space.eachShape(cc.DrawShape.bind(node));
+ node._space.eachConstraint(cc.DrawConstraint.bind(node));
+
+ //cc.DrawNode.prototype.draw.call(node);
+ cc.glBlendFunc(node._blendFunc.src, node._blendFunc.dst);
+ this._shaderProgram.use();
+ this._shaderProgram._setUniformForMVPMatrixWithMat4(this._stackMatrix);
+ node._render();
+
+ node.clear();
+ };
+})();
\ No newline at end of file
diff --git a/cocos2d/physics/CCPhysicsSprite.js b/cocos2d/physics/CCPhysicsSprite.js
index 455ac7c322..2fa248da8f 100644
--- a/cocos2d/physics/CCPhysicsSprite.js
+++ b/cocos2d/physics/CCPhysicsSprite.js
@@ -1,4 +1,8 @@
-/** Copyright (c) 2012 Scott Lembcke and Howling Moon Software
+/**
+ * Copyright (c) 2012 Scott Lembcke and Howling Moon Software
+ * Copyright (c) 2008-2010 Ricardo Quesada
+ * Copyright (c) 2011-2012 cocos2d-x.org
+ * Copyright (c) 2013-2014 Chukong Technologies Inc.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -39,13 +43,13 @@
_rotation:1,
/**
* Create a PhysicsSprite with filename and rect
- * @constructor
+ * Constructor of cc.PhysicsSprite for Box2d
* @param {String|cc.Texture2D|cc.SpriteFrame} fileName
* @param {cc.Rect} rect
* @example
*
* 1.Create a sprite with image path and rect
- * var physicsSprite1 = cc.PhysicsSprite.create("res/HelloHTML5World.png");
+ * var physicsSprite1 = new cc.PhysicsSprite("res/HelloHTML5World.png");
* var physicsSprite2 = new cc.PhysicsSprite("res/HelloHTML5World.png",cc.rect(0,0,480,320));
*
* 2.Create a sprite with a sprite frame name. Must add "#" before fame name.
@@ -55,7 +59,7 @@
* var spriteFrame = cc.spriteFrameCache.getSpriteFrame("grossini_dance_01.png");
* var physicsSprite = new cc.PhysicsSprite(spriteFrame);
*
- * 4.Creates a sprite with an exsiting texture contained in a CCTexture2D object
+ * 4.Creates a sprite with an existing texture contained in a CCTexture2D object
* After creation, the rect will be the size of the texture, and the offset will be (0,0).
* var texture = cc.textureCache.addImage("HelloHTML5World.png");
* var physicsSprite1 = new cc.PhysicsSprite(texture);
@@ -67,7 +71,7 @@
if (fileName === undefined) {
cc.PhysicsSprite.prototype.init.call(this);
- }else if (typeof(fileName) === "string") {
+ }else if (cc.isString(fileName)) {
if (fileName[0] === "#") {
//init with a sprite frame name
var frameName = fileName.substr(1, fileName.length - 1);
@@ -77,7 +81,7 @@
//init with filename and rect
this.init(fileName, rect);
}
- }else if (typeof(fileName) === "object") {
+ }else if (cc.isObject(fileName)) {
if (fileName instanceof cc.Texture2D) {
//init with texture and rect
this.initWithTexture(fileName, rect);
@@ -86,33 +90,80 @@
this.initWithSpriteFrame(fileName);
}
}
+ //this._transformCmd = new cc.PhysicsSpriteTransformCmdCanvas(this);
+ //cc.rendererCanvas.pushRenderCommand(this._transformCmd);
},
+
+ //visit: function(){
+ // cc.Sprite.prototype.visit.call(this);
+ // cc.rendererCanvas.pushRenderCommand(this._transformCmd);
+ //},
+
+ /**
+ * set body
+ * @param {Box2D.Dynamics.b2Body} body
+ */
setBody:function (body) {
this._body = body;
},
+
+ /**
+ * get body
+ * @return {Box2D.Dynamics.b2Body}
+ */
getBody:function () {
return this._body;
},
+
+ /**
+ * set PTM ratio
+ * @param {Number} r
+ */
setPTMRatio:function (r) {
this._PTMRatio = r;
},
+
+ /**
+ * get PTM ration
+ * @return {Number}
+ */
getPTMRatio:function () {
return this._PTMRatio;
},
+
+ /**
+ * get position
+ * @return {cc.Point}
+ */
getPosition:function () {
var pos = this._body.GetPosition();
var locPTMRatio =this._PTMRatio;
return cc.p(pos.x * locPTMRatio, pos.y * locPTMRatio);
},
+
+ /**
+ * set position
+ * @param {cc.Point} p
+ */
setPosition:function (p) {
var angle = this._body.GetAngle();
var locPTMRatio =this._PTMRatio;
this._body.setTransform(Box2D.b2Vec2(p.x / locPTMRatio, p.y / locPTMRatio), angle);
this.setNodeDirty();
},
+
+ /**
+ * get rotation
+ * @return {Number}
+ */
getRotation:function () {
- return (this._ignoreBodyRotation ? cc.radiansToDegress(this._rotationRadians) : cc.radiansToDegress(this._body.GetAngle()));
+ return (this._ignoreBodyRotation ? cc.radiansToDegrees(this._rotationRadians) : cc.radiansToDegrees(this._body.GetAngle()));
},
+
+ /**
+ * set rotation
+ * @param {Number} r
+ */
setRotation:function (r) {
if (this._ignoreBodyRotation) {
this._rotation = r;
@@ -132,6 +183,9 @@
_syncRotation:function () {
this._rotationRadians = this._body.GetAngle();
},
+ /**
+ * visit
+ */
visit:function () {
if (this._body && this._PTMRatio) {
this._syncPosition();
@@ -143,10 +197,16 @@
}
this._super();
},
+
+ /**
+ * set whether to ingore body's rotation
+ * @param {Boolean} b
+ */
setIgnoreBodyRotation: function(b) {
this._ignoreBodyRotation = b;
}
};
+
var chipmunkAPI = {
_ignoreBodyRotation:false,
_body:null, //physics body
@@ -154,16 +214,16 @@
/**
* Create a PhysicsSprite with filename and rect
- * @constructor
+ * Constructor of cc.PhysicsSprite for chipmunk
* @param {String|cc.Texture2D|cc.SpriteFrame} fileName
* @param {cc.Rect} rect
* @example
*
* 1.Create a sprite with image path and rect
- * var physicsSprite1 = cc.PhysicsSprite.create("res/HelloHTML5World.png");
+ * var physicsSprite1 = new cc.PhysicsSprite("res/HelloHTML5World.png");
* var physicsSprite2 = new cc.PhysicsSprite("res/HelloHTML5World.png",cc.rect(0,0,480,320));
*
- * 2.Create a sprite with a sprite frame name. Must add "#" before fame name.
+ * 2.Create a sprite with a sprite frame name. Must add "#" before frame name.
* var physicsSprite = new cc.PhysicsSprite('#grossini_dance_01.png');
*
* 3.Create a sprite with a sprite frame
@@ -182,7 +242,7 @@
if (fileName === undefined) {
cc.PhysicsSprite.prototype.init.call(this);
- }else if (typeof(fileName) === "string") {
+ }else if (cc.isString(fileName)) {
if (fileName[0] === "#") {
//init with a sprite frame name
var frameName = fileName.substr(1, fileName.length - 1);
@@ -192,7 +252,7 @@
//init with filename and rect
this.init(fileName, rect);
}
- }else if (typeof(fileName) === "object") {
+ }else if (cc.isObject(fileName)) {
if (fileName instanceof cc.Texture2D) {
//init with texture and rect
this.initWithTexture(fileName, rect);
@@ -201,26 +261,61 @@
this.initWithSpriteFrame(fileName);
}
}
+
+ cc.renderer.pushRenderCommand(this._renderCmd);
+ },
+
+ visit: function(){
+ cc.renderer.pushRenderCommand(this._renderCmd);
+ cc.Sprite.prototype.visit.call(this);
},
+
+ /**
+ * set body
+ * @param {cp.Body} body
+ */
setBody:function (body) {
this._body = body;
},
+
+ /**
+ * get body
+ * @returns {cp.Body}
+ */
getBody:function () {
return this._body;
},
+
+ /**
+ * get position
+ * @return {cc.Point}
+ */
getPosition:function () {
var locBody = this._body;
return {x:locBody.p.x, y:locBody.p.y};
},
+ /**
+ * get position x
+ * @return {Number}
+ */
getPositionX:function () {
return this._body.p.x;
},
+ /**
+ * get position y
+ * @return {Number}
+ */
getPositionY:function () {
return this._body.p.y;
},
+ /**
+ * set position
+ * @param {cc.Point|Number}newPosOrxValue
+ * @param {Number}yValue
+ */
setPosition:function (newPosOrxValue, yValue) {
if (yValue === undefined) {
this._body.p.x = newPosOrxValue.x;
@@ -231,10 +326,20 @@
}
//this._syncPosition();
},
+
+ /**
+ * set position x
+ * @param {Number} xValue
+ */
setPositionX:function (xValue) {
this._body.p.x = xValue;
//this._syncPosition();
},
+
+ /**
+ * set position y
+ * @param {Number} yValue
+ */
setPositionY:function (yValue) {
this._body.p.y = yValue;
//this._syncPosition();
@@ -242,13 +347,23 @@
_syncPosition:function () {
var locPosition = this._position, locBody = this._body;
- if (locPosition.x != locBody.p.x || locPosition.y != locBody.p.y) {
+ if (locPosition.x !== locBody.p.x || locPosition.y !== locBody.p.y) {
cc.Sprite.prototype.setPosition.call(this, locBody.p.x, locBody.p.y);
}
},
+
+ /**
+ * get rotation
+ * @return {Number}
+ */
getRotation:function () {
- return this._ignoreBodyRotation ? cc.radiansToDegress(this._rotationRadiansX) : -cc.radiansToDegress(this._body.a);
+ return this._ignoreBodyRotation ? this._rotationX : -cc.radiansToDegrees(this._body.a);
},
+
+ /**
+ * set rotation
+ * @param {Number} r
+ */
setRotation:function (r) {
if (this._ignoreBodyRotation) {
cc.Sprite.prototype.setRotation.call(this, r);
@@ -258,94 +373,41 @@
}
},
_syncRotation:function () {
- if (this._rotationRadiansX != -this._body.a) {
- cc.Sprite.prototype.setRotation.call(this, -cc.radiansToDegress(this._body.a));
+ if (this._rotationX !== -cc.radiansToDegrees(this._body.a)) {
+ cc.Sprite.prototype.setRotation.call(this, -cc.radiansToDegrees(this._body.a));
}
},
- nodeToParentTransform:function () {
- if(cc._renderType === cc._RENDER_TYPE_CANVAS)
- return this._nodeToParentTransformForCanvas();
-
- var locBody = this._body, locAnchorPIP = this._anchorPointInPoints, locScaleX = this._scaleX, locScaleY = this._scaleY;
- var x = locBody.p.x;
- var y = locBody.p.y;
- if (this._ignoreAnchorPointForPosition) {
- x += locAnchorPIP.x;
- y += locAnchorPIP.y;
- }
-
- // Make matrix
- var radians = locBody.a;
- var c = Math.cos(radians);
- var s = Math.sin(radians);
-
- // Although scale is not used by physics engines, it is calculated just in case
- // the sprite is animated (scaled up/down) using actions.
- // For more info see: http://www.cocos2d-iphone.org/forum/topic/68990
- if (!cc._rectEqualToZero(locAnchorPIP)) {
- x += c * -locAnchorPIP.x * locScaleX + -s * -locAnchorPIP.y * locScaleY;
- y += s * -locAnchorPIP.x * locScaleX + c * -locAnchorPIP.y * locScaleY;
- }
-
- // Rot, Translate Matrix
- this._transform = cc.AffineTransformMake(c * locScaleX, s * locScaleX,
- -s * locScaleY, c * locScaleY,
- x, y);
-
- return this._transform;
- },
-
- _nodeToParentTransformForCanvas: function () {
- if (this.dirty) {
- var t = this._transform;// quick reference
- // base position
- var locBody = this._body, locScaleX = this._scaleX, locScaleY = this._scaleY, locAnchorPIP = this._anchorPointInPoints;
- t.tx = locBody.p.x;
- t.ty = locBody.p.y;
-
- // rotation Cos and Sin
- var radians = -locBody.a;
- var Cos = 1, Sin = 0;
- if (radians) {
- Cos = Math.cos(radians);
- Sin = Math.sin(radians);
- }
-
- // base abcd
- t.a = t.d = Cos;
- t.b = -Sin;
- t.c = Sin;
-
- // scale
- if (locScaleX !== 1 || locScaleY !== 1) {
- t.a *= locScaleX;
- t.c *= locScaleX;
- t.b *= locScaleY;
- t.d *= locScaleY;
- }
-
- // adjust anchorPoint
- t.tx += Cos * -locAnchorPIP.x * locScaleX + -Sin * locAnchorPIP.y * locScaleY;
- t.ty -= Sin * -locAnchorPIP.x * locScaleX + Cos * locAnchorPIP.y * locScaleY;
-
- // if ignore anchorPoint
- if (this._ignoreAnchorPointForPosition) {
- t.tx += locAnchorPIP.x;
- t.ty += locAnchorPIP.y;
- }
- this._transformDirty = false;
- }
- return this._transform;
+ /**
+ * get the affine transform matrix of node to parent coordinate frame
+ * @return {cc.AffineTransform}
+ */
+ getNodeToParentTransform:function () {
+ return this._renderCmd.getNodeToParentTransform();
},
+ /**
+ * whether dirty
+ * @return {Boolean}
+ */
isDirty:function(){
return !this._body.isSleeping();
},
setDirty: function(){ },
+ /**
+ * set whether to ignore rotation of body
+ * @param {Boolean} b
+ */
setIgnoreBodyRotation: function(b) {
this._ignoreBodyRotation = b;
+ },
+
+ _createRenderCmd: function(){
+ if(cc._renderType === cc._RENDER_TYPE_CANVAS)
+ return new cc.PhysicsSprite.CanvasRenderCmd(this);
+ else
+ return new cc.PhysicsSprite.WebGLRenderCmd(this);
}
};
cc.PhysicsSprite = cc.Sprite.extend(chipmunkAPI);
@@ -362,31 +424,24 @@
/**
* Create a PhysicsSprite with filename and rect
- * @constructor
+ * @deprecated since v3.0, please use new cc.PhysicsSprite(fileName, rect) instead
* @param {String|cc.Texture2D|cc.SpriteFrame} fileName
* @param {cc.Rect} rect
* @return {cc.PhysicsSprite}
- * @example
- *
- * 1.Create a sprite with image path and rect
- * var physicsSprite1 = cc.PhysicsSprite.create("res/HelloHTML5World.png");
- * var physicsSprite2 = cc.PhysicsSprite.create("res/HelloHTML5World.png",cc.rect(0,0,480,320));
- *
- * 2.Create a sprite with a sprite frame name. Must add "#" before fame name.
- * var physicsSprite = cc.PhysicsSprite.create('#grossini_dance_01.png');
- *
- * 3.Create a sprite with a sprite frame
- * var spriteFrame = cc.spriteFrameCache.getSpriteFrame("grossini_dance_01.png");
- * var physicsSprite = cc.PhysicsSprite.create(spriteFrame);
- *
- * 4.Creates a sprite with an exsiting texture contained in a CCTexture2D object
- * After creation, the rect will be the size of the texture, and the offset will be (0,0).
- * var texture = cc.textureCache.addImage("HelloHTML5World.png");
- * var physicsSprite1 = cc.PhysicsSprite.create(texture);
- * var physicsSprite2 = cc.PhysicsSprite.create(texture, cc.rect(0,0,480,320));
- *
*/
cc.PhysicsSprite.create = function (fileName, rect) {
return new cc.PhysicsSprite(fileName, rect);
};
+
+ /**
+ * @deprecated since v3.0, please use new cc.PhysicsSprite(spriteFrameName) instead
+ * @type {Function}
+ */
+ cc.PhysicsSprite.createWithSpriteFrameName = cc.PhysicsSprite.create;
+
+ /**
+ * @deprecated since v3.0, please use new cc.PhysicsSprite(spriteFrame) instead
+ * @type {Function}
+ */
+ cc.PhysicsSprite.createWithSpriteFrame = cc.PhysicsSprite.create;
})();
diff --git a/cocos2d/physics/CCPhysicsSpriteCanvasRenderCmd.js b/cocos2d/physics/CCPhysicsSpriteCanvasRenderCmd.js
new file mode 100644
index 0000000000..ae95d94df9
--- /dev/null
+++ b/cocos2d/physics/CCPhysicsSpriteCanvasRenderCmd.js
@@ -0,0 +1,93 @@
+/****************************************************************************
+ Copyright (c) 2013-2014 Chukong Technologies Inc.
+
+ http://www.cocos2d-x.org
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+ ****************************************************************************/
+
+/**
+ * cc.PhysicsSprite's rendering objects of Canvas
+ */
+(function(){
+ cc.PhysicsSprite.CanvasRenderCmd = function(renderableObject){
+ cc.Sprite.CanvasRenderCmd.call(this, renderableObject);
+ this._needDraw = true;
+ };
+
+ var proto = cc.PhysicsSprite.CanvasRenderCmd.prototype = Object.create(cc.Sprite.CanvasRenderCmd.prototype);
+ proto.constructor = cc.PhysicsSprite.CanvasRenderCmd;
+
+ proto.rendering = function(ctx, scaleX, scaleY){
+ // This is a special class
+ // Sprite can not obtain sign
+ // So here must to calculate of each frame
+ var node = this._node;
+ node._syncPosition();
+ if(!node._ignoreBodyRotation)
+ node._syncRotation();
+ this.transform(this.getParentRenderCmd());
+
+ cc.Sprite.CanvasRenderCmd.prototype.rendering.call(this, ctx, scaleX, scaleY);
+ };
+
+ proto.getNodeToParentTransform = function(){
+ var node = this._node;
+
+ var t = this._transform;// quick reference
+ // base position
+ var locBody = node._body, locScaleX = node._scaleX, locScaleY = node._scaleY, locAnchorPIP = this._anchorPointInPoints;
+ t.tx = locBody.p.x;
+ t.ty = locBody.p.y;
+
+ // rotation Cos and Sin
+ var radians = -locBody.a;
+ var Cos = 1, Sin = 0;
+ if (radians && !node._ignoreBodyRotation) {
+ Cos = Math.cos(radians);
+ Sin = Math.sin(radians);
+ }
+
+ // base abcd
+ t.a = t.d = Cos;
+ t.b = -Sin;
+ t.c = Sin;
+
+ // scale
+ if (locScaleX !== 1 || locScaleY !== 1) {
+ t.a *= locScaleX;
+ t.c *= locScaleX;
+ t.b *= locScaleY;
+ t.d *= locScaleY;
+ }
+
+ // adjust anchorPoint
+ t.tx += Cos * -locAnchorPIP.x * locScaleX + -Sin * locAnchorPIP.y * locScaleY;
+ t.ty -= Sin * -locAnchorPIP.x * locScaleX + Cos * locAnchorPIP.y * locScaleY;
+
+ // if ignore anchorPoint
+ if (this._ignoreAnchorPointForPosition) {
+ t.tx += locAnchorPIP.x;
+ t.ty += locAnchorPIP.y;
+ }
+
+ return this._transform;
+ };
+
+})();
\ No newline at end of file
diff --git a/cocos2d/physics/CCPhysicsSpriteWebGLRenderCmd.js b/cocos2d/physics/CCPhysicsSpriteWebGLRenderCmd.js
new file mode 100644
index 0000000000..332c8e5d6f
--- /dev/null
+++ b/cocos2d/physics/CCPhysicsSpriteWebGLRenderCmd.js
@@ -0,0 +1,87 @@
+/****************************************************************************
+ Copyright (c) 2013-2014 Chukong Technologies Inc.
+
+ http://www.cocos2d-x.org
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+ ****************************************************************************/
+
+/**
+ * cc.PhysicsSprite's rendering objects of WebGL
+ */
+(function(){
+ cc.PhysicsSprite.WebGLRenderCmd = function(renderableObject){
+ cc.Sprite.WebGLRenderCmd.call(this, renderableObject);
+ this._needDraw = true;
+ };
+
+ var proto = cc.PhysicsSprite.WebGLRenderCmd.prototype = Object.create(cc.Sprite.WebGLRenderCmd.prototype);
+ proto.constructor = cc.PhysicsSprite.WebGLRenderCmd;
+
+ proto.rendering = function(ctx){
+ // This is a special class
+ // Sprite can not obtain sign
+ // So here must to calculate of each frame
+ var node = this._node;
+ node._syncPosition();
+ if(!node._ignoreBodyRotation)
+ node._syncRotation();
+ this.transform(this.getParentRenderCmd());
+
+ cc.Sprite.WebGLRenderCmd.prototype.rendering.call(this, ctx);
+ };
+
+ proto.getNodeToParentTransform = function(){
+ var node = this._node;
+ var locBody = node._body, locAnchorPIP = this._anchorPointInPoints, locScaleX = node._scaleX, locScaleY = node._scaleY;
+ var x = locBody.p.x;
+ var y = locBody.p.y;
+
+ if (this._ignoreAnchorPointForPosition) {
+ x += locAnchorPIP.x;
+ y += locAnchorPIP.y;
+ }
+
+ // Make matrix
+ var radians = locBody.a, c = 1, s=0;
+ if (radians && !node._ignoreBodyRotation) {
+ c = Math.cos(radians);
+ s = Math.sin(radians);
+ }
+
+ // Although scale is not used by physics engines, it is calculated just in case
+ // the sprite is animated (scaled up/down) using actions.
+ // For more info see: http://www.cocos2d-iphone.org/forum/topic/68990
+ if (!cc._rectEqualToZero(locAnchorPIP)) {
+ x += c * -locAnchorPIP.x * locScaleX + -s * -locAnchorPIP.y * locScaleY;
+ y += s * -locAnchorPIP.x * locScaleX + c * -locAnchorPIP.y * locScaleY;
+ }
+
+ // Rot, Translate Matrix
+ this._transform = cc.affineTransformMake(c * locScaleX, s * locScaleX,
+ -s * locScaleY, c * locScaleY, x, y);
+
+ return this._transform;
+ };
+
+ proto.updateTransform = function(){
+ this._dirty = this._node.isDirty();
+ cc.Sprite.WebGLRenderCmd.prototype.updateTransform.call(this);
+ };
+})();
\ No newline at end of file
diff --git a/cocos2d/progress-timer/CCActionProgressTimer.js b/cocos2d/progress-timer/CCActionProgressTimer.js
index 6245b0024a..026af89750 100644
--- a/cocos2d/progress-timer/CCActionProgressTimer.js
+++ b/cocos2d/progress-timer/CCActionProgressTimer.js
@@ -1,5 +1,7 @@
/****************************************************************************
- Copyright (c) 2010-2012 cocos2d-x.org
+ Copyright (c) 2008-2010 Ricardo Quesada
+ Copyright (c) 2011-2012 cocos2d-x.org
+ Copyright (c) 2013-2014 Chukong Technologies Inc.
Copyright (C) 2010 Lam Pham
http://www.cocos2d-x.org
@@ -27,6 +29,10 @@
* Progress to percentage
* @class
* @extends cc.ActionInterval
+ * @param {Number} duration duration in seconds
+ * @param {Number} percent
+ * @example
+ * var to = new cc.ProgressTo(2, 100);
*/
cc.ProgressTo = cc.ActionInterval.extend(/** @lends cc.ProgressTo# */{
_to:0,
@@ -34,11 +40,9 @@ cc.ProgressTo = cc.ActionInterval.extend(/** @lends cc.ProgressTo# */{
/**
* Creates a ProgressTo action with a duration and a percent
- * @constructor
- * @param {Number} duration duration in seconds
- * @param {Number} percent
- * @example
- * var to = new cc.ProgressTo(2, 100);
+ * Constructor of cc.ProgressTo
+ * @param {Number} duration duration in seconds
+ * @param {Number} percent
*/
ctor: function(duration, percent){
cc.ActionInterval.prototype.ctor.call(this);
@@ -60,32 +64,35 @@ cc.ProgressTo = cc.ActionInterval.extend(/** @lends cc.ProgressTo# */{
}
return false;
},
-
+ /**
+ * return a new cc.ProgressTo, all the configuration is the same as the original
+ * @returns {cc.ProgressTo}
+ */
clone:function(){
var action = new cc.ProgressTo();
action.initWithDuration(this._duration, this._to);
return action;
},
-
+ /**
+ * reverse hasn't been supported
+ * @returns {null}
+ */
reverse: function(){
cc.log("cc.ProgressTo.reverse(): reverse hasn't been supported.");
return null;
},
/**
+ * start with a target
* @param {cc.Node} target
*/
startWithTarget:function (target) {
cc.ActionInterval.prototype.startWithTarget.call(this, target);
this._from = target.percentage;
-
- // XXX: Is this correct ?
- // Adding it to support CCRepeat
- if (this._from == 100)
- this._from = 0;
},
/**
+ * custom update
* @param {Number} time time in seconds
*/
update:function (time) {
@@ -94,22 +101,39 @@ cc.ProgressTo = cc.ActionInterval.extend(/** @lends cc.ProgressTo# */{
}
});
-/** Creates and initializes with a duration and a percent
+/**
+ * Creates and initializes with a duration and a percent
+ * @function
* @param {Number} duration duration in seconds
* @param {Number} percent
* @return {cc.ProgressTo}
* @example
* // example
- * var to = cc.ProgressTo.create(2, 100);
+ * var to = cc.progressTo(2, 100);
*/
-cc.ProgressTo.create = function (duration, percent) {
+cc.progressTo = function (duration, percent) {
return new cc.ProgressTo(duration, percent);
};
+/**
+ * Please use cc.progressTo instead
+ * Creates and initializes with a duration and a percent
+ * @static
+ * @deprecated since v3.0,please use cc.progressTo instead.
+ * @param {Number} duration duration in seconds
+ * @param {Number} percent
+ * @return {cc.ProgressTo}
+ */
+cc.ProgressTo.create = cc.progressTo;
/**
* Progress from a percentage to another percentage
* @class
* @extends cc.ActionInterval
+ * @param {Number} duration duration in seconds
+ * @param {Number} fromPercentage
+ * @param {Number} toPercentage
+ * @example
+ * var fromTo = new cc.ProgressFromTo(2, 100.0, 0.0);
*/
cc.ProgressFromTo = cc.ActionInterval.extend(/** @lends cc.ProgressFromTo# */{
_to:0,
@@ -117,12 +141,10 @@ cc.ProgressFromTo = cc.ActionInterval.extend(/** @lends cc.ProgressFromTo# */{
/**
* Creates and initializes the action with a duration, a "from" percentage and a "to" percentage
- * @constructor
- * @param {Number} duration duration in seconds
- * @param {Number} fromPercentage
- * @param {Number} toPercentage
- * @example
- * var fromTo = new cc.ProgressFromTo(2, 100.0, 0.0);
+ * Constructor of cc.ProgressFromTo
+ * @param {Number} duration duration in seconds
+ * @param {Number} fromPercentage
+ * @param {Number} toPercentage
*/
ctor:function(duration, fromPercentage, toPercentage){
cc.ActionInterval.prototype.ctor.call(this);
@@ -146,7 +168,10 @@ cc.ProgressFromTo = cc.ActionInterval.extend(/** @lends cc.ProgressFromTo# */{
}
return false;
},
-
+ /**
+ * return a new cc.ProgressTo, all the configuration is the same as the original
+ * @returns {cc.ProgressFromTo}
+ */
clone:function(){
var action = new cc.ProgressFromTo();
action.initWithDuration(this._duration, this._from, this._to);
@@ -157,10 +182,11 @@ cc.ProgressFromTo = cc.ActionInterval.extend(/** @lends cc.ProgressFromTo# */{
* @return {cc.ActionInterval}
*/
reverse:function () {
- return cc.ProgressFromTo.create(this._duration, this._to, this._from);
+ return cc.progressFromTo(this._duration, this._to, this._from);
},
/**
+ * start with a target
* @param {cc.Node} target
*/
startWithTarget:function (target) {
@@ -177,14 +203,25 @@ cc.ProgressFromTo = cc.ActionInterval.extend(/** @lends cc.ProgressFromTo# */{
});
/** Creates and initializes the action with a duration, a "from" percentage and a "to" percentage
+ * @function
* @param {Number} duration duration in seconds
* @param {Number} fromPercentage
* @param {Number} toPercentage
* @return {cc.ProgressFromTo}
* @example
* // example
- * var fromTO = cc.ProgressFromTo.create(2, 100.0, 0.0);
+ * var fromTo = cc.progressFromTo(2, 100.0, 0.0);
*/
-cc.ProgressFromTo.create = function (duration, fromPercentage, toPercentage) {
+cc.progressFromTo = function (duration, fromPercentage, toPercentage) {
return new cc.ProgressFromTo(duration, fromPercentage, toPercentage);
};
+/**
+ * Creates and initializes the action with a duration, a "from" percentage and a "to" percentage
+ * @static
+ * @deprecated since v3.0,please use cc.ProgressFromTo(duration, fromPercentage, toPercentage) instead.
+ * @param {Number} duration duration in seconds
+ * @param {Number} fromPercentage
+ * @param {Number} toPercentage
+ * @return {cc.ProgressFromTo}
+ */
+cc.ProgressFromTo.create = cc.progressFromTo;
diff --git a/cocos2d/progress-timer/CCProgressTimer.js b/cocos2d/progress-timer/CCProgressTimer.js
index ee35370fea..3ad05586f0 100644
--- a/cocos2d/progress-timer/CCProgressTimer.js
+++ b/cocos2d/progress-timer/CCProgressTimer.js
@@ -1,5 +1,7 @@
/****************************************************************************
- Copyright (c) 2010-2011 cocos2d-x.org
+ Copyright (c) 2008-2010 Ricardo Quesada
+ Copyright (c) 2011-2012 cocos2d-x.org
+ Copyright (c) 2013-2014 Chukong Technologies Inc.
Copyright (c) 2010 Lam Pham
http://www.cocos2d-x.org
@@ -23,38 +25,12 @@
THE SOFTWARE.
****************************************************************************/
-
-/**
- * Radial Counter-Clockwise
- * @type Number
- * @constant
- */
-cc.PROGRESS_TIMER_TYPE_RADIAL = 0;
-/**
- * Bar
- * @type Number
- * @constant
- */
-cc.PROGRESS_TIMER_TYPE_BAR = 1;
-
-/**
- * @constant
- * @type Number
- */
-cc.PROGRESS_TEXTURE_COORDS_COUNT = 4;
-
-/**
- * @constant
- * @type Number
- */
-cc.PROGRESS_TEXTURE_COORDS = 0x4b;
-
/**
* cc.Progresstimer is a subclass of cc.Node.
* It renders the inner sprite according to the percentage.
* The progress can be Radial, Horizontal or vertical.
* @class
- * @extends cc.NodeRGBA
+ * @extends cc.Node
*
* @property {cc.Point} midPoint
- Midpoint is used to modify the progress start position.
* If you're using radials type then the midpoint changes the center point
@@ -65,12 +41,13 @@ cc.PROGRESS_TEXTURE_COORDS = 0x4b;
* you want a bottom to top then set the midpoint all the way to cc.p(x,0)
* you want a top to bottom then set the midpoint all the way to cc.p(x,1)
- * Update does the work of mapping the texture onto the triangles
- * It now doesn't occur the cost of free/alloc data every update cycle.
- * It also only changes the percentage point but no other points if they have not been modified.
- *
- * It now deals with flipped texture. If you run into this problem, just use the
- * sprite property and enable the methods flipX, flipY.
- *
- * Update does the work of mapping the texture onto the triangles for the bar
- * It now doesn't occur the cost of free/alloc data every update cycle.
- * It also only changes the percentage point but no other points if they have not been modified.
- *
- * It now deals with flipped texture. If you run into this problem, just use the
- * sprite property and enable the methods flipX, flipY.
- *
+ * Update does the work of mapping the texture onto the triangles for the bar
+ * It now doesn't occur the cost of free/alloc data every update cycle.
+ * It also only changes the percentage point but no other points if they have not been modified.
+ *
+ * It now deals with flipped texture. If you run into this problem, just use the
+ * sprite property and enable the methods flipX, flipY.
+ *
+ * Update does the work of mapping the texture onto the triangles
+ * It now doesn't occur the cost of free/alloc data every update cycle.
+ * It also only changes the percentage point but no other points if they have not been modified.
+ *
+ * It now deals with flipped texture. If you run into this problem, just use the
+ * sprite property and enable the methods flipX, flipY.
+ *
Code for "auto" update
- * Valid flags: GL_COLOR_BUFFER_BIT, GL_DEPTH_BUFFER_BIT, GL_STENCIL_BUFFER_BIT.
- * They can be OR'ed. Valid when "autoDraw is YES.
Code for "auto" update
+ // Valid flags: GL_COLOR_BUFFER_BIT, GL_DEPTH_BUFFER_BIT, GL_STENCIL_BUFFER_BIT.
+ // They can be OR'ed. Valid when "autoDraw is YES.
* This is more efficient then calling -clear first and then -begin - * @param {Number} r red 0-1 - * @param {Number} g green 0-1 - * @param {Number} b blue 0-1 - * @param {Number} a alpha 0-1 0 is transparent + * @param {Number} r red 0-255 + * @param {Number} g green 0-255 + * @param {Number} b blue 0-255 + * @param {Number} a alpha 0-255 0 is transparent * @param {Number} [depthValue=] * @param {Number} [stencilValue=] */ beginWithClear:function (r, g, b, a, depthValue, stencilValue) { + //todo: only for WebGL? var gl = cc._renderContext; depthValue = depthValue || gl.COLOR_BUFFER_BIT; stencilValue = stencilValue || (gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT); - this._beginWithClear(r, g, b, a, depthValue, stencilValue, (gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT | gl.STENCIL_BUFFER_BIT)); - }, - - _beginWithClear: null, - - _beginWithClearForCanvas: function (r, g, b, a, depthValue, stencilValue, flags) { - this.begin(); - - r = r || 0; - g = g || 0; - b = b || 0; - a = isNaN(a) ? 1 : a; - - //var context = cc._renderContext; - var context = this._cacheContext; - var locCanvas = this._cacheCanvas; - context.save(); - context.fillStyle = "rgba(" + (0 | r) + "," + (0 | g) + "," + (0 | b) + "," + a / 255 + ")"; - context.clearRect(0, 0, locCanvas.width, -locCanvas.height); - context.fillRect(0, 0, locCanvas.width, -locCanvas.height); - context.restore(); + this._beginWithClear(r , g , b , a , depthValue, stencilValue, (gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT | gl.STENCIL_BUFFER_BIT)); }, - _beginWithClearForWebGL: function (r, g, b, a, depthValue, stencilValue, flags) { + _beginWithClear: function(r, g, b, a, depthValue, stencilValue, flags){ this.begin(); - - var gl = cc._renderContext; - - // save clear color - var clearColor = [0.0, 0.0, 0.0, 0.0]; - var depthClearValue = 0.0; - var stencilClearValue = 0; - - if (flags & gl.COLOR_BUFFER_BIT) { - clearColor = gl.getParameter(gl.COLOR_CLEAR_VALUE); - gl.clearColor(r, g, b, a); - } - - if (flags & gl.DEPTH_BUFFER_BIT) { - depthClearValue = gl.getParameter(gl.DEPTH_CLEAR_VALUE); - gl.clearDepth(depthValue); - } - - if (flags & gl.STENCIL_BUFFER_BIT) { - stencilClearValue = gl.getParameter(gl.STENCIL_CLEAR_VALUE); - gl.clearStencil(stencilValue); - } - - gl.clear(flags); - - // restore - if (flags & gl.COLOR_BUFFER_BIT) - gl.clearColor(clearColor[0], clearColor[1], clearColor[2], clearColor[3]); - - if (flags & gl.DEPTH_BUFFER_BIT) - gl.clearDepth(depthClearValue); - - if (flags & gl.STENCIL_BUFFER_BIT) - gl.clearStencil(stencilClearValue); + this._renderCmd._beginWithClear(r, g, b, a, depthValue, stencilValue, flags); }, /** * ends grabbing * @function */ - end: null, - - _endForCanvas: function () { - cc._renderContext = cc._mainRenderContextBackup; - cc.view._resetScale(); - - //TODO - /*//restore viewport - director.setViewport(); - cc.kmGLMatrixMode(cc.KM_GL_PROJECTION); - cc.kmGLPopMatrix(); - cc.kmGLMatrixMode(cc.KM_GL_MODELVIEW); - cc.kmGLPopMatrix();*/ - }, - - _endForWebGL: function () { - var gl = cc._renderContext; - var director = cc.director; - gl.bindFramebuffer(gl.FRAMEBUFFER, this._oldFBO); - - //restore viewport - director.setViewport(); - cc.kmGLMatrixMode(cc.KM_GL_PROJECTION); - cc.kmGLPopMatrix(); - cc.kmGLMatrixMode(cc.KM_GL_MODELVIEW); - cc.kmGLPopMatrix(); - - /* var size = director.getWinSizeInPixels(); - - // restore viewport - gl.viewport(0, 0, size.width * cc.contentScaleFactor(), size.height * cc.contentScaleFactor()); - - // special viewport for 3d projection + retina display - if (director.getProjection() == cc.Director.PROJECTION_3D && cc.contentScaleFactor() != 1) { - gl.viewport((-size.width / 2), (-size.height / 2), (size.width * cc.contentScaleFactor()), (size.height * cc.contentScaleFactor())); - } - - director.setProjection(director.getProjection());*/ + end: function(){ + this._renderCmd.end(); }, /** @@ -510,14 +231,16 @@ cc.RenderTexture = cc.Node.extend(/** @lends cc.RenderTexture# */{ this.end(); }, - clearRect:null, - - _clearRectForCanvas:function(x, y, width, height){ - this._cacheContext.clearRect(x, y, width, -height); - }, - - _clearRectForWebGL:function(x, y, width, height){ - //TODO need to implement + /** + * clears the texture with rect. + * @function + * @param {number} x + * @param {number} y + * @param {number} width + * @param {number} height + */ + clearRect: function(x, y, width, height){ + this._renderCmd.clearRect(x, y, width, height); }, /** @@ -525,25 +248,8 @@ cc.RenderTexture = cc.Node.extend(/** @lends cc.RenderTexture# */{ * @function * @param {Number} depthValue */ - clearDepth:null, - - _clearDepthForCanvas:function (depthValue) { - cc.log("clearDepth isn't supported on Cocos2d-Html5"); - }, - - _clearDepthForWebGL:function (depthValue) { - this.begin(); - - var gl = cc._renderContext; - //! save old depth value - var depthClearValue = gl.getParameter(gl.DEPTH_CLEAR_VALUE); - - gl.clearDepth(depthValue); - gl.clear(gl.DEPTH_BUFFER_BIT); - - // restore clear color - gl.clearDepth(depthClearValue); - this.end(); + clearDepth: function(depthValue){ + this._renderCmd.clearDepth(depthValue); }, /** @@ -551,195 +257,8 @@ cc.RenderTexture = cc.Node.extend(/** @lends cc.RenderTexture# */{ * @function * @param {Number} stencilValue */ - clearStencil:null, - - _clearStencilForCanvas:function (stencilValue) { - cc.log("clearDepth isn't supported on Cocos2d-Html5"); - }, - - _clearStencilForWebGL:function (stencilValue) { - var gl = cc._renderContext; - // save old stencil value - var stencilClearValue = gl.getParameter(gl.STENCIL_CLEAR_VALUE); - - gl.clearStencil(stencilValue); - gl.clear(gl.STENCIL_BUFFER_BIT); - - // restore clear color - gl.clearStencil(stencilClearValue); - }, - - visit:null, - - _visitForCanvas:function (ctx) { - // override visit. - // Don't call visit on its children - if (!this._visible) - return; - - ctx = ctx || cc._renderContext; - ctx.save(); - - this.draw(ctx); // update children of RenderTexture before - this.transform(ctx); - this.sprite.visit(); // draw the RenderTexture - - ctx.restore(); - - this.arrivalOrder = 0; - }, - - _visitForWebGL:function (ctx) { - // override visit. - // Don't call visit on its children - if (!this._visible) - return; - - cc.kmGLPushMatrix(); - - var locGrid = this.grid; - if (locGrid && locGrid.isActive()) { - locGrid.beforeDraw(); - this.transformAncestors(); - } - - this.transform(ctx); - this.sprite.visit(); - this.draw(ctx); - - if (locGrid && locGrid.isActive()) - locGrid.afterDraw(this); - - cc.kmGLPopMatrix(); - - this.arrivalOrder = 0; - }, - - draw:null, - - _drawForCanvas: function (ctx) { - ctx = ctx || cc._renderContext; - if (this.autoDraw) { - this.begin(); - - if (this.clearFlags) { - var locCanvas = this._cacheCanvas; - ctx.save(); - ctx.fillStyle = this._clearColorStr; - ctx.clearRect(0, 0, locCanvas.width, -locCanvas.height); - ctx.fillRect(0, 0, locCanvas.width, -locCanvas.height); - ctx.restore(); - } - - //! make sure all children are drawn - this.sortAllChildren(); - var locChildren = this._children; - var childrenLen = locChildren.length; - var selfSprite = this.sprite; - for (var i = 0; i < childrenLen; i++) { - var getChild = locChildren[i]; - if (getChild != selfSprite) - getChild.visit(); - } - - this.end(); - } - }, - - _drawForWebGL: function (ctx) { - var gl = cc._renderContext; - if (this.autoDraw) { - this.begin(); - - var locClearFlags = this.clearFlags; - if (locClearFlags) { - var oldClearColor = [0.0, 0.0, 0.0, 0.0]; - var oldDepthClearValue = 0.0; - var oldStencilClearValue = 0; - - // backup and set - if (locClearFlags & gl.COLOR_BUFFER_BIT) { - oldClearColor = gl.getParameter(gl.COLOR_CLEAR_VALUE); - gl.clearColor(this._clearColor.r/255, this._clearColor.g/255, this._clearColor.b/255, this._clearColor.a/255); - } - - if (locClearFlags & gl.DEPTH_BUFFER_BIT) { - oldDepthClearValue = gl.getParameter(gl.DEPTH_CLEAR_VALUE); - gl.clearDepth(this.clearDepthVal); - } - - if (locClearFlags & gl.STENCIL_BUFFER_BIT) { - oldStencilClearValue = gl.getParameter(gl.STENCIL_CLEAR_VALUE); - gl.clearStencil(this.clearStencilVal); - } - - // clear - gl.clear(locClearFlags); - - // restore - if (locClearFlags & gl.COLOR_BUFFER_BIT) - gl.clearColor(oldClearColor[0], oldClearColor[1], oldClearColor[2], oldClearColor[3]); - - if (locClearFlags & gl.DEPTH_BUFFER_BIT) - gl.clearDepth(oldDepthClearValue); - - if (locClearFlags & gl.STENCIL_BUFFER_BIT) - gl.clearStencil(oldStencilClearValue); - } - - //! make sure all children are drawn - this.sortAllChildren(); - var locChildren = this._children; - for (var i = 0; i < locChildren.length; i++) { - var getChild = locChildren[i]; - if (getChild != this.sprite) - getChild.visit(); - } - - this.end(); - } - }, - - /** - * creates a new CCImage from with the texture's data. Caller is responsible for releasing it by calling delete. - * @return {*} - */ - newCCImage:function(flipImage){ - cc.log("saveToFile isn't supported on cocos2d-html5"); - return null; - }, - - _memcpy:function (destArr, destIndex, srcArr, srcIndex, size) { - for (var i = 0; i < size; i++) { - destArr[destIndex + i] = srcArr[srcIndex + i]; - } - }, - - /** - * saves the texture into a file using JPEG format. The file will be saved in the Documents folder. - * Returns YES if the operation is successful. - * (doesn't support in HTML5) - * @param {Number} filePath - * @param {Number} format - */ - saveToFile:function (filePath, format) { - cc.log("saveToFile isn't supported on Cocos2d-Html5"); - }, - - /** - * Listen "come to background" message, and save render texture. It only has effect on Android. - * @param {cc.Class} obj - */ - listenToBackground:function (obj) { - cc.log("listenToBackground isn't supported on Cocos2d-Html5"); - }, - - /** - * Listen "come to foreground" message and restore the frame buffer object. It only has effect on Android. - * @param {cc.Class} obj - */ - listenToForeground:function (obj) { - cc.log("listenToForeground isn't supported on Cocos2d-Html5"); + clearStencil: function(stencilValue) { + this._renderCmd.clearStencil(stencilValue); }, /** @@ -750,6 +269,10 @@ cc.RenderTexture = cc.Node.extend(/** @lends cc.RenderTexture# */{ return this.clearFlags; }, + /** + * Set the clearFlags + * @param {Number} clearFlags + */ setClearFlags:function (clearFlags) { this.clearFlags = clearFlags; }, @@ -768,24 +291,13 @@ cc.RenderTexture = cc.Node.extend(/** @lends cc.RenderTexture# */{ * @function * @param {cc.Color} clearColor The clear color */ - setClearColor:null, - - _setClearColorForCanvas:function (clearColor) { - var locClearColor = this._clearColor; - locClearColor.r = clearColor.r; - locClearColor.g = clearColor.g; - locClearColor.b = clearColor.b; - locClearColor.a = clearColor.a; - - this._clearColorStr = "rgba(" + (0 | clearColor.r) + "," + (0 | clearColor.g) + "," + (0 | clearColor.b) + "," + clearColor.a / 255 + ")"; - }, - - _setClearColorForWebGL:function (clearColor) { + setClearColor: function(clearColor){ var locClearColor = this._clearColor; locClearColor.r = clearColor.r; locClearColor.g = clearColor.g; locClearColor.b = clearColor.b; locClearColor.a = clearColor.a; + this._renderCmd.updateClearColor(clearColor); }, /** @@ -796,6 +308,10 @@ cc.RenderTexture = cc.Node.extend(/** @lends cc.RenderTexture# */{ return this.clearDepthVal; }, + /** + * Set value for clearDepth. Valid only when autoDraw is true. + * @param {Number} clearDepth + */ setClearDepth:function (clearDepth) { this.clearDepthVal = clearDepth; }, @@ -808,6 +324,10 @@ cc.RenderTexture = cc.Node.extend(/** @lends cc.RenderTexture# */{ return this.clearStencilVal; }, + /** + * Set value for clear Stencil. Valid only when autoDraw is true + * @return {Number} + */ setClearStencil:function (clearStencil) { this.clearStencilVal = clearStencil; }, @@ -821,41 +341,50 @@ cc.RenderTexture = cc.Node.extend(/** @lends cc.RenderTexture# */{ return this.autoDraw; }, + /** + * When enabled, it will render its children into the texture automatically. Disabled by default for compatiblity reasons.
+ * Will be enabled in the future. + * @return {Boolean} + */ setAutoDraw:function (autoDraw) { this.autoDraw = autoDraw; - } -}); + }, -var _p = cc.RenderTexture.prototype; + //---- some stub functions for jsb + /** + * saves the texture into a file using JPEG format. The file will be saved in the Documents folder. + * Returns YES if the operation is successful. + * (doesn't support in HTML5) + * @param {Number} filePath + * @param {Number} format + */ + saveToFile:function (filePath, format) { + cc.log("saveToFile isn't supported on Cocos2d-Html5"); + }, -if(cc._renderType == cc._RENDER_TYPE_WEBGL){ - _p.ctor = _p._ctorForWebGL; - _p.cleanup = _p._cleanupForWebGL; - _p.initWithWidthAndHeight = _p._initWithWidthAndHeightForWebGL; - _p.begin = _p._beginForWebGL; - _p._beginWithClear = _p._beginWithClearForWebGL; - _p.end = _p._endForWebGL; - _p.clearRect = _p._clearRectForWebGL; - _p.clearDepth = _p._clearDepthForWebGL; - _p.clearStencil = _p._clearStencilForWebGL; - _p.visit = _p._visitForWebGL; - _p.draw = _p._drawForWebGL; - _p.setClearColor = _p._setClearColorForWebGL; -} else { - _p.ctor = _p._ctorForCanvas; - _p.cleanup = _p._cleanupForCanvas; - _p.initWithWidthAndHeight = _p._initWithWidthAndHeightForCanvas; - _p.begin = _p._beginForCanvas; - _p._beginWithClear = _p._beginWithClearForCanvas; - _p.end = _p._endForCanvas; - _p.clearRect = _p._clearRectForCanvas; - _p.clearDepth = _p._clearDepthForCanvas; - _p.clearStencil = _p._clearStencilForCanvas; - _p.visit = _p._visitForCanvas; - _p.draw = _p._drawForCanvas; - _p.setClearColor = _p._setClearColorForCanvas; -} + /** + * creates a new CCImage from with the texture's data. Caller is responsible for releasing it by calling delete. + * @return {*} + */ + newCCImage:function(flipImage){ + cc.log("saveToFile isn't supported on cocos2d-html5"); + return null; + }, + + /** + * Listen "come to background" message, and save render texture. It only has effect on Android. + * @param {cc.Class} obj + */ + listenToBackground:function (obj) { }, + /** + * Listen "come to foreground" message and restore the frame buffer object. It only has effect on Android. + * @param {cc.Class} obj + */ + listenToForeground:function (obj) { } +}); + +var _p = cc.RenderTexture.prototype; // Extended /** @expose */ _p.clearColorVal; @@ -864,14 +393,12 @@ cc.defineGetterSetter(_p, "clearColorVal", _p.getClearColor, _p.setClearColor); /** * creates a RenderTexture object with width and height in Points and a pixel format, only RGB and RGBA formats are valid + * @deprecated since v3.0 please use new cc.RenderTexture() instead. * @param {Number} width * @param {Number} height * @param {cc.IMAGE_FORMAT_JPEG|cc.IMAGE_FORMAT_PNG|cc.IMAGE_FORMAT_RAWDATA} format * @param {Number} depthStencilFormat * @return {cc.RenderTexture} - * @example - * // Example - * var rt = cc.RenderTexture.create() */ cc.RenderTexture.create = function (width, height, format, depthStencilFormat) { return new cc.RenderTexture(width, height, format, depthStencilFormat); diff --git a/cocos2d/render-texture/CCRenderTextureCanvasRenderCmd.js b/cocos2d/render-texture/CCRenderTextureCanvasRenderCmd.js new file mode 100644 index 0000000000..6df19091a0 --- /dev/null +++ b/cocos2d/render-texture/CCRenderTextureCanvasRenderCmd.js @@ -0,0 +1,107 @@ +/**************************************************************************** + Copyright (c) 2013-2014 Chukong Technologies Inc. + + http://www.cocos2d-x.org + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + ****************************************************************************/ + +(function(){ + cc.RenderTexture.CanvasRenderCmd = function(renderableObject){ + cc.Node.CanvasRenderCmd.call(this, renderableObject); + this._needDraw = true; + this._clearColorStr = "rgba(255,255,255,1)"; + + this._cacheCanvas = cc.newElement('canvas'); + this._cacheContext = new cc.CanvasContextWrapper(this._cacheCanvas.getContext('2d')); + }; + + var proto = cc.RenderTexture.CanvasRenderCmd.prototype = Object.create(cc.Node.CanvasRenderCmd.prototype); + proto.constructor = cc.RenderTexture.CanvasRenderCmd; + + proto.cleanup = function(){ + this._cacheContext = null; + this._cacheCanvas = null; + }; + + proto.clearStencil = function (stencilValue) { }; + + proto.setVirtualViewport = function(rtBegin, fullRect, fullViewport) {}; + + proto.updateClearColor = function(clearColor){ + this._clearColorStr = "rgba(" + (0 | clearColor.r) + "," + (0 | clearColor.g) + "," + (0 | clearColor.b) + "," + clearColor.a / 255 + ")"; + }; + + proto.initWithWidthAndHeight = function(width, height, format, depthStencilFormat){ + var node = this._node; + var locCacheCanvas = this._cacheCanvas, locScaleFactor = cc.contentScaleFactor(); + locCacheCanvas.width = 0 | (width * locScaleFactor); + locCacheCanvas.height = 0 | (height * locScaleFactor); + + var texture = new cc.Texture2D(); + texture.initWithElement(locCacheCanvas); + texture.handleLoadedTexture(); + + var locSprite = node.sprite = new cc.Sprite(texture); + locSprite.setBlendFunc(cc.ONE, cc.ONE_MINUS_SRC_ALPHA); + // Disabled by default. + node.autoDraw = false; + // add sprite for backward compatibility + node.addChild(locSprite); + return true; + }; + + proto.begin = function(){}; + + proto._beginWithClear = function(r, g, b, a, depthValue, stencilValue, flags){ + r = r || 0; + g = g || 0; + b = b || 0; + a = isNaN(a) ? 255 : a; + + var context = this._cacheContext.getContext(); + var locCanvas = this._cacheCanvas; + context.setTransform(1,0,0,1,0,0); + this._cacheContext.setFillStyle("rgba(" + (0 | r) + "," + (0 | g) + "," + (0 | b) + "," + a / 255 + ")"); + context.clearRect(0, 0, locCanvas.width, locCanvas.height); + context.fillRect(0, 0, locCanvas.width, locCanvas.height); + }; + + proto.end = function(){ + var node = this._node; + + var scale = cc.contentScaleFactor(); + cc.renderer._renderingToCacheCanvas(this._cacheContext, node.__instanceId, scale, scale); + }; + + proto.clearRect = function(x, y, width, height){ + this._cacheContext.clearRect(x, y, width, -height); + }; + + proto.clearDepth = function(depthValue){ + cc.log("clearDepth isn't supported on Cocos2d-Html5"); + }; + + proto.visit = function(parentCmd){ + var node = this._node; + this._syncStatus(parentCmd); + node.sprite.visit(this); + this._dirtyFlag = 0; + }; +})(); \ No newline at end of file diff --git a/cocos2d/render-texture/CCRenderTextureWebGLRenderCmd.js b/cocos2d/render-texture/CCRenderTextureWebGLRenderCmd.js new file mode 100644 index 0000000000..50bed35f16 --- /dev/null +++ b/cocos2d/render-texture/CCRenderTextureWebGLRenderCmd.js @@ -0,0 +1,387 @@ +/**************************************************************************** + Copyright (c) 2013-2014 Chukong Technologies Inc. + + http://www.cocos2d-x.org + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + ****************************************************************************/ + +(function(){ + cc.RenderTexture.WebGLRenderCmd = function(renderableObject){ + cc.Node.WebGLRenderCmd.call(this, renderableObject); + this._needDraw = true; + + this._fBO = null; + this._oldFBO = null; + this._textureCopy = null; + this._depthRenderBuffer = null; + + this._rtTextureRect = new cc.Rect(); + this._fullRect = new cc.Rect(); + this._fullViewport = new cc.Rect(); + }; + + var proto = cc.RenderTexture.WebGLRenderCmd.prototype = Object.create(cc.Node.WebGLRenderCmd.prototype); + proto.constructor = cc.RenderTexture.WebGLRenderCmd; + + proto.setVirtualViewport = function(rtBegin, fullRect, fullViewport) { + this._rtTextureRect.x = rtBegin.x; + this._rtTextureRect.y = rtBegin.y; + + this._fullRect = fullRect; + this._fullViewport = fullViewport; + }; + + proto.rendering = function (ctx) { + var gl = ctx || cc._renderContext; + var node = this._node; + if (node.autoDraw) { + node.begin(); + + var locClearFlags = node.clearFlags; + if (locClearFlags) { + var oldClearColor = [0.0, 0.0, 0.0, 0.0]; + var oldDepthClearValue = 0.0; + var oldStencilClearValue = 0; + + // backup and set + if (locClearFlags & gl.COLOR_BUFFER_BIT) { + oldClearColor = gl.getParameter(gl.COLOR_CLEAR_VALUE); + gl.clearColor(node._clearColor.r / 255, node._clearColor.g / 255, node._clearColor.b / 255, node._clearColor.a / 255); + } + + if (locClearFlags & gl.DEPTH_BUFFER_BIT) { + oldDepthClearValue = gl.getParameter(gl.DEPTH_CLEAR_VALUE); + gl.clearDepth(node.clearDepthVal); + } + + if (locClearFlags & gl.STENCIL_BUFFER_BIT) { + oldStencilClearValue = gl.getParameter(gl.STENCIL_CLEAR_VALUE); + gl.clearStencil(node.clearStencilVal); + } + + // clear + gl.clear(locClearFlags); + + // restore + if (locClearFlags & gl.COLOR_BUFFER_BIT) + gl.clearColor(oldClearColor[0], oldClearColor[1], oldClearColor[2], oldClearColor[3]); + + if (locClearFlags & gl.DEPTH_BUFFER_BIT) + gl.clearDepth(oldDepthClearValue); + + if (locClearFlags & gl.STENCIL_BUFFER_BIT) + gl.clearStencil(oldStencilClearValue); + } + + //! make sure all children are drawn + node.sortAllChildren(); + var locChildren = node._children; + for (var i = 0; i < locChildren.length; i++) { + var getChild = locChildren[i]; + if (getChild !== node.sprite){ + getChild._renderCmd.visit(node.sprite._renderCmd); //TODO it's very Strange + } + } + node.end(); + } + }; + + proto.clearStencil = function(stencilValue) { + var gl = cc._renderContext; + // save old stencil value + var stencilClearValue = gl.getParameter(gl.STENCIL_CLEAR_VALUE); + + gl.clearStencil(stencilValue); + gl.clear(gl.STENCIL_BUFFER_BIT); + + // restore clear color + gl.clearStencil(stencilClearValue); + }; + + proto.cleanup = function(){ + var node = this._node; + //node.sprite = null; + this._textureCopy = null; + + var gl = cc._renderContext; + gl.deleteFramebuffer(this._fBO); + if (this._depthRenderBuffer) + gl.deleteRenderbuffer(this._depthRenderBuffer); + }; + + proto.updateClearColor = function(clearColor){ }; + + proto.initWithWidthAndHeight = function(width, height, format, depthStencilFormat){ + var node = this._node; + if(format === cc.Texture2D.PIXEL_FORMAT_A8) + cc.log( "cc.RenderTexture._initWithWidthAndHeightForWebGL() : only RGB and RGBA formats are valid for a render texture;"); + + var gl = cc._renderContext, locScaleFactor = cc.contentScaleFactor(); + this._fullRect = new cc.Rect(0,0, width, height); + this._fullViewport = new cc.Rect(0,0, width, height); + + width = 0 | (width * locScaleFactor); + height = 0 | (height * locScaleFactor); + + this._oldFBO = gl.getParameter(gl.FRAMEBUFFER_BINDING); + + // textures must be power of two squared + var powW , powH; + + if (cc.configuration.supportsNPOT()) { + powW = width; + powH = height; + } else { + powW = cc.NextPOT(width); + powH = cc.NextPOT(height); + } + + //void *data = malloc(powW * powH * 4); + var dataLen = powW * powH * 4; + var data = new Uint8Array(dataLen); + //memset(data, 0, (int)(powW * powH * 4)); + for (var i = 0; i < powW * powH * 4; i++) + data[i] = 0; + + this._pixelFormat = format; + + var locTexture = node._texture = new cc.Texture2D(); + if (!node._texture) + return false; + + locTexture.initWithData(data, node._pixelFormat, powW, powH, cc.size(width, height)); + //free( data ); + + var oldRBO = gl.getParameter(gl.RENDERBUFFER_BINDING); + + if (cc.configuration.checkForGLExtension("GL_QCOM")) { + this._textureCopy = new cc.Texture2D(); + if (!this._textureCopy) + return false; + this._textureCopy.initWithData(data, node._pixelFormat, powW, powH, cc.size(width, height)); + } + + // generate FBO + this._fBO = gl.createFramebuffer(); + gl.bindFramebuffer(gl.FRAMEBUFFER, this._fBO); + + // associate texture with FBO + gl.framebufferTexture2D(gl.FRAMEBUFFER, gl.COLOR_ATTACHMENT0, gl.TEXTURE_2D, locTexture._webTextureObj, 0); + + if (depthStencilFormat !== 0) { + //create and attach depth buffer + this._depthRenderBuffer = gl.createRenderbuffer(); + gl.bindRenderbuffer(gl.RENDERBUFFER, this._depthRenderBuffer); + gl.renderbufferStorage(gl.RENDERBUFFER, depthStencilFormat, powW, powH); + if(depthStencilFormat === gl.DEPTH_STENCIL) + gl.framebufferRenderbuffer(gl.FRAMEBUFFER, gl.DEPTH_STENCIL_ATTACHMENT, gl.RENDERBUFFER, this._depthRenderBuffer); + else if(depthStencilFormat === gl.STENCIL_INDEX || depthStencilFormat === gl.STENCIL_INDEX8) + gl.framebufferRenderbuffer(gl.FRAMEBUFFER, gl.STENCIL_ATTACHMENT, gl.RENDERBUFFER, this._depthRenderBuffer); + else if(depthStencilFormat === gl.DEPTH_COMPONENT16) + gl.framebufferRenderbuffer(gl.FRAMEBUFFER, gl.DEPTH_ATTACHMENT, gl.RENDERBUFFER, this._depthRenderBuffer); + } + + // check if it worked (probably worth doing :) ) + if(gl.checkFramebufferStatus(gl.FRAMEBUFFER) !== gl.FRAMEBUFFER_COMPLETE) + cc.log("Could not attach texture to the framebuffer"); + + locTexture.setAliasTexParameters(); + + var locSprite = node.sprite = new cc.Sprite(locTexture); + locSprite.scaleY = -1; + locSprite.setBlendFunc(gl.ONE, gl.ONE_MINUS_SRC_ALPHA); + + gl.bindRenderbuffer(gl.RENDERBUFFER, oldRBO); + gl.bindFramebuffer(gl.FRAMEBUFFER, this._oldFBO); + + // Disabled by default. + node.autoDraw = false; + + // add sprite for backward compatibility + node.addChild(locSprite); + return true; + }; + + proto.begin = function(){ + var node = this._node; + // Save the current matrix + cc.kmGLMatrixMode(cc.KM_GL_PROJECTION); + cc.kmGLPushMatrix(); + cc.kmGLMatrixMode(cc.KM_GL_MODELVIEW); + cc.kmGLPushMatrix(); + + var gl = cc._renderContext; + + var director = cc.director; + director.setProjection(director.getProjection()); + + var texSize = node._texture.getContentSizeInPixels(); + + // Calculate the adjustment ratios based on the old and new projections + var size = cc.director.getWinSizeInPixels(); + var widthRatio = size.width / texSize.width; + var heightRatio = size.height / texSize.height; + + var orthoMatrix = cc.math.Matrix4.createOrthographicProjection(-1.0 / widthRatio, 1.0 / widthRatio, + -1.0 / heightRatio, 1.0 / heightRatio, -1, 1); + cc.kmGLMultMatrix(orthoMatrix); + + //calculate viewport + var viewport = new cc.Rect(0, 0, 0, 0); + viewport.width = this._fullViewport.width; + viewport.height = this._fullViewport.height; + var viewPortRectWidthRatio = viewport.width / this._fullRect.width; + var viewPortRectHeightRatio = viewport.height / this._fullRect.height; + viewport.x = (this._fullRect.x - this._rtTextureRect.x) * viewPortRectWidthRatio; + viewport.y = (this._fullRect.y - this._rtTextureRect.y) * viewPortRectHeightRatio; + gl.viewport(viewport.x, viewport.y, viewport.width, viewport.height); + + this._oldFBO = gl.getParameter(gl.FRAMEBUFFER_BINDING); + gl.bindFramebuffer(gl.FRAMEBUFFER, this._fBO);//Will direct drawing to the frame buffer created above + + /* Certain Qualcomm Andreno gpu's will retain data in memory after a frame buffer switch which corrupts the render to the texture. + * The solution is to clear the frame buffer before rendering to the texture. However, calling glClear has the unintended result of clearing the current texture. + * Create a temporary texture to overcome this. At the end of CCRenderTexture::begin(), switch the attached texture to the second one, call glClear, + * and then switch back to the original texture. This solution is unnecessary for other devices as they don't have the same issue with switching frame buffers. + */ + if (cc.configuration.checkForGLExtension("GL_QCOM")) { + // -- bind a temporary texture so we can clear the render buffer without losing our texture + gl.framebufferTexture2D(gl.FRAMEBUFFER, gl.COLOR_ATTACHMENT0, gl.TEXTURE_2D, this._textureCopy._webTextureObj, 0); + //cc.checkGLErrorDebug(); + gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT); + gl.framebufferTexture2D(gl.FRAMEBUFFER, gl.COLOR_ATTACHMENT0, gl.TEXTURE_2D, node._texture._webTextureObj, 0); + } + }; + + proto._beginWithClear = function(r, g, b, a, depthValue, stencilValue, flags){ + r = r / 255; + g = g / 255; + b = b / 255; + a = a / 255; + + var gl = cc._renderContext; + + // save clear color + var clearColor = [0.0, 0.0, 0.0, 0.0]; + var depthClearValue = 0.0; + var stencilClearValue = 0; + + if (flags & gl.COLOR_BUFFER_BIT) { + clearColor = gl.getParameter(gl.COLOR_CLEAR_VALUE); + gl.clearColor(r, g, b, a); + } + + if (flags & gl.DEPTH_BUFFER_BIT) { + depthClearValue = gl.getParameter(gl.DEPTH_CLEAR_VALUE); + gl.clearDepth(depthValue); + } + + if (flags & gl.STENCIL_BUFFER_BIT) { + stencilClearValue = gl.getParameter(gl.STENCIL_CLEAR_VALUE); + gl.clearStencil(stencilValue); + } + + gl.clear(flags); + + // restore + if (flags & gl.COLOR_BUFFER_BIT) + gl.clearColor(clearColor[0], clearColor[1], clearColor[2], clearColor[3]); + + if (flags & gl.DEPTH_BUFFER_BIT) + gl.clearDepth(depthClearValue); + + if (flags & gl.STENCIL_BUFFER_BIT) + gl.clearStencil(stencilClearValue); + }; + + proto.end = function(){ + var node = this._node; + cc.renderer._renderingToBuffer(node.__instanceId); + + var gl = cc._renderContext; + var director = cc.director; + gl.bindFramebuffer(gl.FRAMEBUFFER, this._oldFBO); + + //restore viewport + director.setViewport(); + cc.kmGLMatrixMode(cc.KM_GL_PROJECTION); + cc.kmGLPopMatrix(); + cc.kmGLMatrixMode(cc.KM_GL_MODELVIEW); + cc.kmGLPopMatrix(); + + /* var size = director.getWinSizeInPixels(); + + // restore viewport + gl.viewport(0, 0, size.width * cc.contentScaleFactor(), size.height * cc.contentScaleFactor()); + + // special viewport for 3d projection + retina display + if (director.getProjection() == cc.Director.PROJECTION_3D && cc.contentScaleFactor() != 1) { + gl.viewport((-size.width / 2), (-size.height / 2), (size.width * cc.contentScaleFactor()), (size.height * cc.contentScaleFactor())); + } + + director.setProjection(director.getProjection());*/ + }; + + proto.clearRect = function(x, y, width, height){ + //TODO need to implement + }; + + proto.clearDepth = function(depthValue){ + var node = this._node; + node.begin(); + + var gl = cc._renderContext; + //! save old depth value + var depthClearValue = gl.getParameter(gl.DEPTH_CLEAR_VALUE); + + gl.clearDepth(depthValue); + gl.clear(gl.DEPTH_BUFFER_BIT); + + // restore clear color + gl.clearDepth(depthClearValue); + node.end(); + }; + + proto.visit = function(parentCmd){ + var node = this._node; + if (!node._visible) + return; + cc.kmGLPushMatrix(); + + //TODO using GridNode + /* var locGrid = this.grid; + if (locGrid && locGrid.isActive()) { + locGrid.beforeDraw(); + this.transformAncestors(); + }*/ + + this._syncStatus(parentCmd); + //this.toRenderer(); + cc.renderer.pushRenderCommand(this); + node.sprite.visit(this); + + //TODO GridNode + /* if (locGrid && locGrid.isActive()) + locGrid.afterDraw(this);*/ + + this._dirtyFlag = 0; + cc.kmGLPopMatrix(); + }; +})(); \ No newline at end of file diff --git a/cocos2d/shaders/CCGLProgram.js b/cocos2d/shaders/CCGLProgram.js index 991efd0722..4e63c3c435 100644 --- a/cocos2d/shaders/CCGLProgram.js +++ b/cocos2d/shaders/CCGLProgram.js @@ -1,9 +1,9 @@ /**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2008-2010 Ricardo Quesada + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. Copyright 2011 Jeff Lamarche Copyright 2012 Goffredo Marocchi - Copyright (c) 2011 Zynga Inc. http://www.cocos2d-x.org @@ -33,11 +33,11 @@ cc.HashUniformEntry = function (value, location, hh) { }; /** - * Class that implements a glProgram + * Class that implements a WebGL program * @class * @extends cc.Class */ -cc.GLProgram = cc.Class.extend({ +cc.GLProgram = cc.Class.extend(/** @lends cc.GLProgram# */{ _glContext: null, _programObj: null, _vertShader: null, @@ -83,8 +83,8 @@ cc.GLProgram = cc.Class.extend({ if (!source || !shader) return false; - //var preStr = (type == this._glContext.VERTEX_SHADER) ? "precision highp float;\n" : "precision mediump float;\n"; - source = "precision highp float; \n" + var preStr = cc.GLProgram._isHighpSupported() ? "precision highp float;\n" : "precision mediump float;\n"; + source = preStr + "uniform mat4 CC_PMatrix; \n" + "uniform mat4 CC_MVMatrix; \n" + "uniform mat4 CC_MVPMatrix; \n" @@ -92,6 +92,7 @@ cc.GLProgram = cc.Class.extend({ + "uniform vec4 CC_SinTime; \n" + "uniform vec4 CC_CosTime; \n" + "uniform vec4 CC_Random01; \n" + + "uniform sampler2D CC_Texture0; \n" + "//CC INCLUDES END \n" + source; this._glContext.shaderSource(shader, source); @@ -100,12 +101,12 @@ cc.GLProgram = cc.Class.extend({ if (!status) { cc.log("cocos2d: ERROR: Failed to compile shader:\n" + this._glContext.getShaderSource(shader)); - if (type == this._glContext.VERTEX_SHADER) + if (type === this._glContext.VERTEX_SHADER) cc.log("cocos2d: \n" + this.vertexShaderLog()); else cc.log("cocos2d: \n" + this.fragmentShaderLog()); } - return ( status == 1 ); + return ( status === true ); }, /** @@ -122,6 +123,9 @@ cc.GLProgram = cc.Class.extend({ vShaderFileName && fShaderFileName && this.init(vShaderFileName, fShaderFileName); }, + /** + * destroy program + */ destroyProgram: function () { this._vertShader = null; this._fragShader = null; @@ -294,10 +298,18 @@ cc.GLProgram = cc.Class.extend({ return this._glContext.getUniformLocation(this._programObj, name); }, + /** + * get uniform MVP matrix + * @returns {WebGLUniformLocation} + */ getUniformMVPMatrix: function () { return this._uniforms[cc.UNIFORM_MVPMATRIX]; }, + /** + * get uniform sampler + * @returns {WebGLUniformLocation} + */ getUniformSampler: function () { return this._uniforms[cc.UNIFORM_SAMPLER]; }, @@ -531,9 +543,9 @@ cc.GLProgram = cc.Class.extend({ * will update the builtin uniforms if they are different than the previous call for this same shader program. */ setUniformsForBuiltins: function () { - var matrixP = new cc.kmMat4(); - var matrixMV = new cc.kmMat4(); - var matrixMVP = new cc.kmMat4(); + var matrixP = new cc.math.Matrix4(); + var matrixMV = new cc.math.Matrix4(); + var matrixMVP = new cc.math.Matrix4(); cc.kmGLGetMatrix(cc.KM_GL_PROJECTION, matrixP); cc.kmGLGetMatrix(cc.KM_GL_MODELVIEW, matrixMV); @@ -556,7 +568,40 @@ cc.GLProgram = cc.Class.extend({ this.setUniformLocationWith4f(this._uniforms[cc.UNIFORM_COSTIME], time / 8.0, time / 4.0, time / 2.0, Math.cos(time)); } - if (this._uniforms[cc.UNIFORM_RANDOM01] != -1) + if (this._uniforms[cc.UNIFORM_RANDOM01] !== -1) + this.setUniformLocationWith4f(this._uniforms[cc.UNIFORM_RANDOM01], Math.random(), Math.random(), Math.random(), Math.random()); + }, + + _setUniformsForBuiltinsForRenderer: function (node) { + if(!node || !node._renderCmd) + return; + + var matrixP = new cc.math.Matrix4(); + //var matrixMV = new cc.kmMat4(); + var matrixMVP = new cc.math.Matrix4(); + + cc.kmGLGetMatrix(cc.KM_GL_PROJECTION, matrixP); + //cc.kmGLGetMatrix(cc.KM_GL_MODELVIEW, node._stackMatrix); + + cc.kmMat4Multiply(matrixMVP, matrixP, node._renderCmd._stackMatrix); + + this.setUniformLocationWithMatrix4fv(this._uniforms[cc.UNIFORM_PMATRIX], matrixP.mat, 1); + this.setUniformLocationWithMatrix4fv(this._uniforms[cc.UNIFORM_MVMATRIX], node._renderCmd._stackMatrix.mat, 1); + this.setUniformLocationWithMatrix4fv(this._uniforms[cc.UNIFORM_MVPMATRIX], matrixMVP.mat, 1); + + if (this._usesTime) { + var director = cc.director; + // This doesn't give the most accurate global time value. + // Cocos2D doesn't store a high precision time value, so this will have to do. + // Getting Mach time per frame per shader using time could be extremely expensive. + var time = director.getTotalFrames() * director.getAnimationInterval(); + + this.setUniformLocationWith4f(this._uniforms[cc.UNIFORM_TIME], time / 10.0, time, time * 2, time * 4); + this.setUniformLocationWith4f(this._uniforms[cc.UNIFORM_SINTIME], time / 8.0, time / 4.0, time / 2.0, Math.sin(time)); + this.setUniformLocationWith4f(this._uniforms[cc.UNIFORM_COSTIME], time / 8.0, time / 4.0, time / 2.0, Math.cos(time)); + } + + if (this._uniforms[cc.UNIFORM_RANDOM01] !== -1) this.setUniformLocationWith4f(this._uniforms[cc.UNIFORM_RANDOM01], Math.random(), Math.random(), Math.random(), Math.random()); }, @@ -578,6 +623,12 @@ cc.GLProgram = cc.Class.extend({ this._glContext.uniformMatrix4fv(this._uniforms[cc.UNIFORM_PMATRIX], false, cc.projection_matrix_stack.top.mat); }, + _setUniformForMVPMatrixWithMat4: function(modelViewMatrix){ + if(!modelViewMatrix) + throw "modelView matrix is undefined."; + this._glContext.uniformMatrix4fv(this._uniforms[cc.UNIFORM_MVMATRIX], false, modelViewMatrix.mat); + this._glContext.uniformMatrix4fv(this._uniforms[cc.UNIFORM_PMATRIX], false, cc.projection_matrix_stack.top.mat); + }, /** * returns the vertexShader error log @@ -671,6 +722,7 @@ cc.GLProgram = cc.Class.extend({ /** * Create a cc.GLProgram object + * @deprecated since v3.0, please use new cc.GLProgram(vShaderFileName, fShaderFileName) instead * @param {String} vShaderFileName * @param {String} fShaderFileName * @returns {cc.GLProgram} @@ -678,3 +730,38 @@ cc.GLProgram = cc.Class.extend({ cc.GLProgram.create = function (vShaderFileName, fShaderFileName) { return new cc.GLProgram(vShaderFileName, fShaderFileName); }; + +cc.GLProgram._highpSupported = null; + +cc.GLProgram._isHighpSupported = function(){ + if(cc.GLProgram._highpSupported == null){ + var ctx = cc._renderContext; + var highp = ctx.getShaderPrecisionFormat(ctx.FRAGMENT_SHADER, ctx.HIGH_FLOAT); + cc.GLProgram._highpSupported = highp.precision !== 0; + } + return cc.GLProgram._highpSupported; +}; + +/** + *
+ * Sets the shader program for this node + * + * Since v2.0, each rendering node must set its shader program. + * It should be set in initialize phase. + *
+ * @function + * @param {cc.Node} node + * @param {cc.GLProgram} program The shader program which fetches from CCShaderCache. + * @example + * cc.setGLProgram(node, cc.shaderCache.programForKey(cc.SHADER_POSITION_TEXTURECOLOR)); + */ +cc.setProgram = function (node, program) { + node.shaderProgram = program; + + var children = node.children; + if (!children) + return; + + for (var i = 0; i < children.length; i++) + cc.setProgram(children[i], program); +}; diff --git a/cocos2d/shaders/CCGLStateCache.js b/cocos2d/shaders/CCGLStateCache.js index c8d890ae32..f048ce03e3 100644 --- a/cocos2d/shaders/CCGLStateCache.js +++ b/cocos2d/shaders/CCGLStateCache.js @@ -1,7 +1,7 @@ /**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2008-2010 Ricardo Quesada - Copyright (c) 2011 Zynga Inc. + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -46,6 +46,7 @@ if (cc.ENABLE_GL_STATE_CACHE) { /** * Invalidates the GL state cache.* If CC_ENABLE_GL_STATE_CACHE it will reset the GL state cache. + * @function */ cc.glInvalidateStateCache = function () { cc.kmGLFreeAll(); @@ -67,6 +68,7 @@ cc.glInvalidateStateCache = function () { /** * Uses the GL program in case program is different than the current one.
* If CC_ENABLE_GL_STATE_CACHE is disabled, it will the glUseProgram() directly. + * @function * @param {WebGLProgram} program */ cc.glUseProgram = function (program) { @@ -85,6 +87,7 @@ if(!cc.ENABLE_GL_STATE_CACHE){ /** * Deletes the GL program. If it is the one that is being used, it invalidates it.
* If CC_ENABLE_GL_STATE_CACHE is disabled, it will the glDeleteProgram() directly. + * @function * @param {WebGLProgram} program */ cc.glDeleteProgram = function (program) { @@ -98,6 +101,7 @@ cc.glDeleteProgram = function (program) { /** * Uses a blending function in case it not already used.
* If CC_ENABLE_GL_STATE_CACHE is disabled, it will the glBlendFunc() directly. + * @function * @param {Number} sfactor * @param {Number} dfactor */ @@ -109,6 +113,11 @@ cc.glBlendFunc = function (sfactor, dfactor) { } }; +/** + * @function + * @param {Number} sfactor + * @param {Number} dfactor + */ cc.setBlending = function (sfactor, dfactor) { var ctx = cc._renderContext; if ((sfactor === ctx.ONE) && (dfactor === ctx.ZERO)) { @@ -121,6 +130,11 @@ cc.setBlending = function (sfactor, dfactor) { } }; +/** + * @function + * @param {Number} sfactor + * @param {Number} dfactor + */ cc.glBlendFuncForParticle = function(sfactor, dfactor) { if ((sfactor !== cc._blendingSource) || (dfactor !== cc._blendingDest)) { cc._blendingSource = sfactor; @@ -143,6 +157,7 @@ if(!cc.ENABLE_GL_STATE_CACHE){ /** * Resets the blending mode back to the cached state in case you used glBlendFuncSeparate() or glBlendEquation().
* If CC_ENABLE_GL_STATE_CACHE is disabled, it will just set the default blending mode using GL_FUNC_ADD. + * @function */ cc.glBlendResetToCache = function () { var ctx = cc._renderContext; @@ -155,6 +170,7 @@ cc.glBlendResetToCache = function () { /** * sets the projection matrix as dirty + * @function */ cc.setProjectionMatrixDirty = function () { cc._currentProjectionMatrix = -1; @@ -170,6 +186,7 @@ cc.setProjectionMatrixDirty = function () { *
* These flags can be ORed. The flags that are not present, will be disabled. * + * @function * @param {cc.VERTEX_ATTRIB_FLAG_POSITION | cc.VERTEX_ATTRIB_FLAG_COLOR | cc.VERTEX_ATTRIB_FLAG_TEX_OORDS} flags */ cc.glEnableVertexAttribs = function (flags) { @@ -208,6 +225,7 @@ cc.glEnableVertexAttribs = function (flags) { /** * If the texture is not already bound, it binds it.
* If CC_ENABLE_GL_STATE_CACHE is disabled, it will call glBindTexture() directly. + * @function * @param {cc.Texture2D} textureId */ cc.glBindTexture2D = function (textureId) { @@ -217,11 +235,12 @@ cc.glBindTexture2D = function (textureId) { /** * If the texture is not already bound to a given unit, it binds it.
* If CC_ENABLE_GL_STATE_CACHE is disabled, it will call glBindTexture() directly. + * @function * @param {Number} textureUnit * @param {cc.Texture2D} textureId */ cc.glBindTexture2DN = function (textureUnit, textureId) { - if (cc._currentBoundTexture[textureUnit] == textureId) + if (cc._currentBoundTexture[textureUnit] === textureId) return; cc._currentBoundTexture[textureUnit] = textureId; @@ -246,6 +265,7 @@ if (!cc.ENABLE_GL_STATE_CACHE){ /** * It will delete a given texture. If the texture was bound, it will invalidate the cached.
* If CC_ENABLE_GL_STATE_CACHE is disabled, it will call glDeleteTextures() directly. + * @function * @param {WebGLTexture} textureId */ cc.glDeleteTexture = function (textureId) { @@ -255,12 +275,13 @@ cc.glDeleteTexture = function (textureId) { /** * It will delete a given texture. If the texture was bound, it will invalidate the cached for the given texture unit.
* If CC_ENABLE_GL_STATE_CACHE is disabled, it will call glDeleteTextures() directly. + * @function * @param {Number} textureUnit * @param {WebGLTexture} textureId */ cc.glDeleteTextureN = function (textureUnit, textureId) { if (cc.ENABLE_GL_STATE_CACHE) { - if (textureId == cc._currentBoundTexture[ textureUnit ]) + if (textureId === cc._currentBoundTexture[ textureUnit ]) cc._currentBoundTexture[ textureUnit ] = -1; } cc._renderContext.deleteTexture(textureId); @@ -269,14 +290,15 @@ cc.glDeleteTextureN = function (textureUnit, textureId) { /** * If the vertex array is not already bound, it binds it.
* If CC_ENABLE_GL_STATE_CACHE is disabled, it will call glBindVertexArray() directly. - * @param vaoId + * @function + * @param {Number} vaoId */ cc.glBindVAO = function (vaoId) { if (!cc.TEXTURE_ATLAS_USE_VAO) return; if (cc.ENABLE_GL_STATE_CACHE) { - if (cc._uVAO != vaoId) { + if (cc._uVAO !== vaoId) { cc._uVAO = vaoId; //TODO need fixed //glBindVertexArray(vaoId); @@ -289,6 +311,7 @@ cc.glBindVAO = function (vaoId) { /** * It will enable / disable the server side GL states.
* If CC_ENABLE_GL_STATE_CACHE is disabled, it will call glEnable() directly. + * @function * @param {Number} flags */ cc.glEnable = function (flags) { diff --git a/cocos2d/shaders/CCShaderCache.js b/cocos2d/shaders/CCShaderCache.js index 8b56228447..f78780ddb6 100644 --- a/cocos2d/shaders/CCShaderCache.js +++ b/cocos2d/shaders/CCShaderCache.js @@ -1,7 +1,7 @@ /**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2008-2010 Ricardo Quesada - Copyright (c) 2011 Zynga Inc. + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,7 +25,9 @@ ****************************************************************************/ /** - * @namespace Singleton object that stores manages GL shaders + * cc.shaderCache is a singleton object that stores manages GL shaders + * @class + * @name cc.shaderCache */ cc.shaderCache = /** @lends cc.shaderCache# */{ @@ -271,7 +273,10 @@ cc.shaderCache = /** @lends cc.shaderCache# */{ this._loadDefaultShader(program, this.TYPE_POSITION_UCOLOR); }, - /** returns a GL program for a given key */ + /** + * returns a GL program for a given key + * @param {String} key + */ programForKey: function (key) { return this._programs[key]; }, @@ -279,13 +284,17 @@ cc.shaderCache = /** @lends cc.shaderCache# */{ /** * returns a GL program for a shader name * @param {String} shaderName - * @return cc.GLProgram + * @return {cc.GLProgram} */ getProgram: function (shaderName) { return this._programs[shaderName]; }, - /** adds a CCGLProgram to the cache for a given name */ + /** + * adds a CCGLProgram to the cache for a given name + * @param {cc.GLProgram} program + * @param {String} key + */ addProgram: function (program, key) { this._programs[key] = program; } diff --git a/cocos2d/shaders/CCShaders.js b/cocos2d/shaders/CCShaders.js index 1304248d1a..437ce589aa 100644 --- a/cocos2d/shaders/CCShaders.js +++ b/cocos2d/shaders/CCShaders.js @@ -1,7 +1,7 @@ /**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2008-2010 Ricardo Quesada - Copyright (c) 2011 Zynga Inc. + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -125,7 +125,6 @@ cc.SHADER_POSITION_COLOR_LENGTH_TEXTURE_VERT = cc.SHADER_POSITION_TEXTURE_FRAG = "precision lowp float; \n" + "varying vec2 v_texCoord; \n" - + "uniform sampler2D CC_Texture0; \n" + "void main() \n" + "{ \n" + " gl_FragColor = texture2D(CC_Texture0, v_texCoord); \n" @@ -155,7 +154,6 @@ cc.SHADER_POSITION_TEXTURE_UCOLOR_FRAG = "precision lowp float; \n" + "uniform vec4 u_color; \n" + "varying vec2 v_texCoord; \n" - + "uniform sampler2D CC_Texture0; \n" + "void main() \n" + "{ \n" + " gl_FragColor = texture2D(CC_Texture0, v_texCoord) * u_color; \n" @@ -185,7 +183,6 @@ cc.SHADER_POSITION_TEXTURE_A8COLOR_FRAG = "precision lowp float; \n" + "varying vec4 v_fragmentColor; \n" + "varying vec2 v_texCoord; \n" - + "uniform sampler2D CC_Texture0; \n" + "void main() \n" + "{ \n" + " gl_FragColor = vec4( v_fragmentColor.rgb, \n" // RGB from uniform @@ -220,7 +217,6 @@ cc.SHADER_POSITION_TEXTURE_COLOR_FRAG = "precision lowp float;\n" + "varying vec4 v_fragmentColor; \n" + "varying vec2 v_texCoord; \n" - + "uniform sampler2D CC_Texture0; \n" + "void main() \n" + "{ \n" + " gl_FragColor = v_fragmentColor * texture2D(CC_Texture0, v_texCoord); \n" @@ -253,13 +249,12 @@ cc.SHADER_POSITION_TEXTURE_COLOR_ALPHATEST_FRAG = "precision lowp float; \n" + "varying vec4 v_fragmentColor; \n" + "varying vec2 v_texCoord; \n" - + "uniform sampler2D CC_Texture0; \n" + "uniform float CC_alpha_value; \n" + "void main() \n" + "{ \n" + " vec4 texColor = texture2D(CC_Texture0, v_texCoord); \n" - + " // mimic: glAlphaFunc(GL_GREATER) \n" - + " //pass if ( incoming_pixel >= CC_alpha_value ) => fail if incoming_pixel < CC_alpha_value \n" + // mimic: glAlphaFunc(GL_GREATER) + //pass if ( incoming_pixel >= CC_alpha_value ) => fail if incoming_pixel < CC_alpha_value + " if ( texColor.a <= CC_alpha_value ) \n" + " discard; \n" + " gl_FragColor = texColor * v_fragmentColor; \n" diff --git a/cocos2d/shape-nodes/CCDrawNode.js b/cocos2d/shape-nodes/CCDrawNode.js index 57abf6a9ea..1d222cb9e7 100644 --- a/cocos2d/shape-nodes/CCDrawNode.js +++ b/cocos2d/shape-nodes/CCDrawNode.js @@ -1,7 +1,7 @@ /**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2008-2010 Ricardo Quesada - Copyright (c) 2011 Zynga Inc. + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. Copyright (c) 2012 Scott Lembcke and Howling Moon Software http://www.cocos2d-x.org @@ -88,30 +88,42 @@ cc.__t = function (v) { * @name cc.DrawNode * @extends cc.Node */ -cc.DrawNodeCanvas = cc.Node.extend(/** @lends cc.DrawNode# */{ +cc.DrawNodeCanvas = cc.Node.extend(/** @lends cc.DrawNode# */{ //TODO need refactor _buffer: null, _blendFunc: null, _lineWidth: 1, _drawColor: null, _className:"DrawNodeCanvas", - /* - * @constructor - */ + /** + *
The cc.DrawNodeCanvas's constructor.
+ * This function will automatically be invoked when you create a node using new construction: "var node = new cc.DrawNodeCanvas()".
+ * Override it to extend its behavior, remember to call "this._super()" in the extended "ctor" function.
+ * This is the inner class... * @class * @extends cc.Class * @name cc.IMEDispatcher.Impl @@ -494,7 +499,7 @@ cc.IMEDispatcher.Impl = cc.Class.extend(/** @lends cc.IMEDispatcher.Impl# */{ _delegateWithIme:null, _delegateList:null, /** - * Constructor + * Constructor function, override it to extend the construction behavior, remember to call "this._super()" in the extended "ctor" function. */ ctor:function () { this._delegateList = []; @@ -506,7 +511,7 @@ cc.IMEDispatcher.Impl = cc.Class.extend(/** @lends cc.IMEDispatcher.Impl# */{ */ findDelegate:function (delegate) { for (var i = 0; i < this._delegateList.length; i++) { - if (this._delegateList[i] == delegate) + if (this._delegateList[i] === delegate) return i; } return null; @@ -515,4 +520,9 @@ cc.IMEDispatcher.Impl = cc.Class.extend(/** @lends cc.IMEDispatcher.Impl# */{ // Initialize imeDispatcher singleton cc.imeDispatcher = new cc.IMEDispatcher(); -cc.imeDispatcher.init(); \ No newline at end of file + +document.body ? + cc.imeDispatcher.init() : + cc._addEventListener(window, 'load', function () { + cc.imeDispatcher.init(); + }, false); \ No newline at end of file diff --git a/cocos2d/text-input/CCTextFieldTTF.js b/cocos2d/text-input/CCTextFieldTTF.js index 04fd28cb02..b5c9fb1283 100644 --- a/cocos2d/text-input/CCTextFieldTTF.js +++ b/cocos2d/text-input/CCTextFieldTTF.js @@ -1,7 +1,7 @@ /**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2008-2010 Ricardo Quesada - Copyright (c) 2011 Zynga Inc. + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -89,11 +89,25 @@ cc.TextFieldDelegate = cc.Class.extend(/** @lends cc.TextFieldDelegate# */{ * @property {Number} charCount - <@readonly> Characators count * @property {String} placeHolder - Place holder for the field * @property {cc.Color} colorSpaceHolder + * + * @param {String} placeholder + * @param {cc.Size} dimensions + * @param {Number} alignment + * @param {String} fontName + * @param {Number} fontSize + * + * @example + * //example + * // When five parameters + * var textField = new cc.TextFieldTTF("
+ * creates a cc.TextFieldTTF from a fontName, alignment, dimension and font size. * @param {String} placeholder * @param {cc.Size} dimensions * @param {Number} alignment * @param {String} fontName * @param {Number} fontSize - * @example - * //example - * // When five parameters - * var textField = cc.TextFieldTTF.create("
+ * display this string if string equal "". * @param {String} text */ setPlaceHolder:function (text) { this._placeHolder = text || ""; if (!this._inputText.length) { cc.LabelTTF.prototype.setString.call(this,this._placeHolder); + this.setColor(this.colorSpaceHolder); } }, /** + * Gets the place holder.
+ * default display string. * @return {String} */ getPlaceHolder:function () { @@ -242,7 +284,8 @@ cc.TextFieldTTF = cc.LabelTTF.extend(/** @lends cc.TextFieldTTF# */{ }, /** - * @param {CanvasContext} ctx + * Render function using the canvas 2d context or WebGL context, internal usage only, please do not call this function. + * @param {CanvasRenderingContext2D | WebGLRenderingContext} ctx The render context */ draw:function (ctx) { //console.log("size",this._contentSize); @@ -250,20 +293,13 @@ cc.TextFieldTTF = cc.LabelTTF.extend(/** @lends cc.TextFieldTTF# */{ if (this.delegate && this.delegate.onDraw(this)) return; - if (this._inputText && this._inputText.length > 0) { - cc.LabelTTF.prototype.draw.call(this, context); - return; - } - - // draw placeholder - var color = this.color; - this.color = this.colorSpaceHolder; - if(cc._renderType === cc._RENDER_TYPE_CANVAS) - this._updateTexture(); cc.LabelTTF.prototype.draw.call(this, context); - this.color = color; }, + /** + * Recursive method that visit its children and draw them. + * @param {CanvasRenderingContext2D|WebGLRenderingContext} ctx + */ visit: function(ctx){ this._super(ctx); }, @@ -288,6 +324,7 @@ cc.TextFieldTTF = cc.LabelTTF.extend(/** @lends cc.TextFieldTTF# */{ }, /** + * Return whether to allow attach with IME. * @return {Boolean} */ canAttachWithIME:function () { @@ -301,6 +338,7 @@ cc.TextFieldTTF = cc.LabelTTF.extend(/** @lends cc.TextFieldTTF# */{ }, /** + * Return whether to allow detach with IME. * @return {Boolean} */ canDetachWithIME:function () { @@ -314,11 +352,11 @@ cc.TextFieldTTF = cc.LabelTTF.extend(/** @lends cc.TextFieldTTF# */{ }, /** - * Delete backward + * Delete backward */ deleteBackward:function () { var strLen = this._inputText.length; - if (strLen == 0) + if (strLen === 0) return; // get the delete byte number @@ -334,6 +372,7 @@ cc.TextFieldTTF = cc.LabelTTF.extend(/** @lends cc.TextFieldTTF# */{ this._inputText = ""; this._charCount = 0; cc.LabelTTF.prototype.setString.call(this,this._placeHolder); + this.setColor(this.colorSpaceHolder); return; } @@ -348,7 +387,28 @@ cc.TextFieldTTF = cc.LabelTTF.extend(/** @lends cc.TextFieldTTF# */{ cc.imeDispatcher.removeDelegate(this); }, + _tipMessage: "please enter your word:", + /** + * Sets the input tip message to show on mobile browser. (mobile Web only) + * @param {string} tipMessage + */ + setTipMessage: function (tipMessage) { + if (tipMessage == null) + return; + this._tipMessage = tipMessage; + }, + /** + * Gets the input tip message to show on mobile browser. (mobile Web only) + * @returns {string} + */ + getTipMessage: function () { + return this._tipMessage; + }, + + /** + * Append the text.
+ * Input the character. * @param {String} text * @param {Number} len */ @@ -372,7 +432,7 @@ cc.TextFieldTTF = cc.LabelTTF.extend(/** @lends cc.TextFieldTTF# */{ this.string = sText; } - if (pos == -1) + if (pos === -1) return; // '\n' has inserted, let delegate process first @@ -382,7 +442,9 @@ cc.TextFieldTTF = cc.LabelTTF.extend(/** @lends cc.TextFieldTTF# */{ // if delegate hasn't process, detach with ime as default this.detachWithIME(); }, + /** + * Gets the input text. * @return {String} */ getContentText:function () { @@ -412,21 +474,16 @@ cc.defineGetterSetter(_p, "charCount", _p.getCharCount); _p.placeHolder; cc.defineGetterSetter(_p, "placeHolder", _p.getPlaceHolder, _p.setPlaceHolder); - /** - * creates a cc.TextFieldTTF from a fontName, alignment, dimension and font size + * Please use new TextFieldTTF instead.
+ * Creates a cc.TextFieldTTF from a fontName, alignment, dimension and font size. + * @deprecated since v3.0 Please use new TextFieldTTF instead. * @param {String} placeholder * @param {cc.Size} dimensions * @param {Number} alignment * @param {String} fontName * @param {Number} fontSize * @return {cc.TextFieldTTF|Null} - * @example - * //example - * // When five parameters - * var textField = cc.TextFieldTTF.create("
The cc.BinaryStreamReader's constructor.
+ * This function will automatically be invoked when you create a node using new construction: "var node = new cc.BinaryStreamReader()".
+ * Override it to extend its behavior, remember to call "this._super()" in the extended "ctor" function.
+ * Constructor of cc.TMXLayer * @param {cc.TMXTilesetInfo} tilesetInfo * @param {cc.TMXLayerInfo} layerInfo * @param {cc.TMXMapInfo} mapInfo @@ -105,26 +94,17 @@ cc.TMXLayer = cc.SpriteBatchNode.extend(/** @lends cc.TMXLayer# */{ this._layerSize = cc.size(0, 0); this._mapTileSize = cc.size(0, 0); - if(cc._renderType === cc._RENDER_TYPE_CANVAS){ - var locCanvas = cc._canvas; - var tmpCanvas = cc.newElement('canvas'); - tmpCanvas.width = locCanvas.width; - tmpCanvas.height = locCanvas.height; - this._cacheCanvas = tmpCanvas; - this._cacheContext = this._cacheCanvas.getContext('2d'); - var tempTexture = new cc.Texture2D(); - tempTexture.initWithElement(tmpCanvas); - tempTexture.handleLoadedTexture(); - this._cacheTexture = tempTexture; - this.width = locCanvas.width; - this.height = locCanvas.height; - // This class uses cache, so its default cachedParent should be himself - this._cachedParent = this; - } if(mapInfo !== undefined) this.initWithTilesetInfo(tilesetInfo, layerInfo, mapInfo); }, + _createRenderCmd: function(){ + if(cc._renderType === cc._RENDER_TYPE_CANVAS) + return new cc.TMXLayer.CanvasRenderCmd(this); + else + return new cc.TMXLayer.WebGLRenderCmd(this); + }, + /** * Sets the untransformed size of the TMXLayer. * @override @@ -132,142 +112,21 @@ cc.TMXLayer = cc.SpriteBatchNode.extend(/** @lends cc.TMXLayer# */{ * @param {Number} [height] The untransformed size's height of the TMXLayer. */ setContentSize:function (size, height) { - var locContentSize = this._contentSize; cc.Node.prototype.setContentSize.call(this, size, height); - - if(cc._renderType === cc._RENDER_TYPE_CANVAS){ - var locCanvas = this._cacheCanvas; - var scaleFactor = cc.contentScaleFactor(); - locCanvas.width = 0 | (locContentSize.width * 1.5 * scaleFactor); - locCanvas.height = 0 | (locContentSize.height * 1.5 * scaleFactor); - - this._cacheContext.translate(0, locCanvas.height); - var locTexContentSize = this._cacheTexture._contentSize; - locTexContentSize.width = locCanvas.width; - locTexContentSize.height = locCanvas.height; - - // Init sub caches if needed - var totalPixel = locCanvas.width * locCanvas.height; - if(totalPixel > this._maxCachePixel) { - if(!this._subCacheCanvas) this._subCacheCanvas = []; - if(!this._subCacheContext) this._subCacheContext = []; - - this._subCacheCount = Math.ceil( totalPixel / this._maxCachePixel ); - var locSubCacheCanvas = this._subCacheCanvas, i; - for(i = 0; i < this._subCacheCount; i++) { - if(!locSubCacheCanvas[i]) { - locSubCacheCanvas[i] = document.createElement('canvas'); - this._subCacheContext[i] = locSubCacheCanvas[i].getContext('2d'); - } - var tmpCanvas = locSubCacheCanvas[i]; - tmpCanvas.width = this._subCacheWidth = Math.round( locCanvas.width / this._subCacheCount ); - tmpCanvas.height = locCanvas.height; - } - // Clear wasted cache to release memory - for(i = this._subCacheCount; i < locSubCacheCanvas.length; i++) { - tmpCanvas.width = 0; - tmpCanvas.height = 0; - } - } - // Otherwise use count as a flag to disable sub caches - else this._subCacheCount = 0; - } + this._renderCmd._updateCacheContext(size, height); }, - /** * Return texture of cc.SpriteBatchNode + * @function * @return {cc.Texture2D} */ - getTexture: null, - - _getTextureForCanvas:function () { - return this._cacheTexture; - }, - - /** - * don't call visit on it's children ( override visit of cc.Node ) - * @override - * @param {CanvasRenderingContext2D} ctx - */ - visit: null, - - _visitForCanvas: function (ctx) { - var context = ctx || cc._renderContext; - // quick return if not visible - if (!this._visible) - return; - - context.save(); - this.transform(ctx); - var i, locChildren = this._children; - - if (this._cacheDirty) { - // - var eglViewer = cc.view; - eglViewer._setScaleXYForRenderTexture(); - //add dirty region - var locCacheContext = this._cacheContext, locCacheCanvas = this._cacheCanvas; - locCacheContext.clearRect(0, 0, locCacheCanvas.width, -locCacheCanvas.height); - locCacheContext.save(); - locCacheContext.translate(this._anchorPointInPoints.x, -(this._anchorPointInPoints.y)); - if (locChildren) { - this.sortAllChildren(); - for (i = 0; i < locChildren.length; i++) { - if (locChildren[i]) - locChildren[i].visit(locCacheContext); - } - } - locCacheContext.restore(); - // Update sub caches if needed - if(this._subCacheCount > 0) { - var subCacheW = this._subCacheWidth, subCacheH = locCacheCanvas.height; - for(i = 0; i < this._subCacheCount; i++) { - this._subCacheContext[i].drawImage(locCacheCanvas, i * subCacheW, 0, subCacheW, subCacheH, 0, 0, subCacheW, subCacheH); - } - } - - //reset Scale - eglViewer._resetScale(); - this._cacheDirty = false; - } - // draw RenderTexture - this.draw(ctx); - context.restore(); - }, - - /** - * draw cc.SpriteBatchNode (override draw of cc.Node) - * @param {CanvasRenderingContext2D} ctx - */ - draw:null, - - _drawForCanvas:function (ctx) { - var context = ctx || cc._renderContext; - //context.globalAlpha = this._opacity / 255; - var posX = 0 | ( -this._anchorPointInPoints.x), posY = 0 | ( -this._anchorPointInPoints.y); - var eglViewer = cc.view; - var locCacheCanvas = this._cacheCanvas; - //direct draw image by canvas drawImage - if (locCacheCanvas) { - var locSubCacheCount = this._subCacheCount, locCanvasHeight = locCacheCanvas.height * eglViewer._scaleY; - if(locSubCacheCount > 0) { - var locSubCacheCanvasArr = this._subCacheCanvas; - for(var i = 0; i < locSubCacheCount; i++){ - var selSubCanvas = locSubCacheCanvasArr[i]; - context.drawImage(locSubCacheCanvasArr[i], 0, 0, selSubCanvas.width, selSubCanvas.height, - posX + i * this._subCacheWidth, -(posY + locCanvasHeight), selSubCanvas.width * eglViewer._scaleX, locCanvasHeight); - } - } else{ - //context.drawImage(locCacheCanvas, 0, 0, locCacheCanvas.width, locCacheCanvas.height, - // posX, -(posY + locCacheCanvas.height ), locCacheCanvas.width, locCacheCanvas.height ); - context.drawImage(locCacheCanvas, 0, 0, locCacheCanvas.width, locCacheCanvas.height, - posX, -(posY + locCanvasHeight), locCacheCanvas.width * eglViewer._scaleX, locCanvasHeight); - } - } + getTexture: function(){ + return this._renderCmd.getTexture(); }, /** + * Gets layer size. * @return {cc.Size} */ getLayerSize:function () { @@ -275,6 +134,7 @@ cc.TMXLayer = cc.SpriteBatchNode.extend(/** @lends cc.TMXLayer# */{ }, /** + * Set layer size * @param {cc.Size} Var */ setLayerSize:function (Var) { @@ -304,6 +164,7 @@ cc.TMXLayer = cc.SpriteBatchNode.extend(/** @lends cc.TMXLayer# */{ }, /** + * Set the map tile size. * @param {cc.Size} Var */ setMapTileSize:function (Var) { @@ -333,6 +194,7 @@ cc.TMXLayer = cc.SpriteBatchNode.extend(/** @lends cc.TMXLayer# */{ }, /** + * Pointer to the map of tiles * @param {Array} Var */ setTiles:function (Var) { @@ -348,6 +210,7 @@ cc.TMXLayer = cc.SpriteBatchNode.extend(/** @lends cc.TMXLayer# */{ }, /** + * Tile set information for the layer * @param {cc.TMXTilesetInfo} Var */ setTileset:function (Var) { @@ -363,6 +226,7 @@ cc.TMXLayer = cc.SpriteBatchNode.extend(/** @lends cc.TMXLayer# */{ }, /** + * Layer orientation, which is the same as the map orientation * @param {Number} Var */ setLayerOrientation:function (Var) { @@ -378,6 +242,7 @@ cc.TMXLayer = cc.SpriteBatchNode.extend(/** @lends cc.TMXLayer# */{ }, /** + * properties from the layer. They can be added using Tiled * @param {Array} Var */ setProperties:function (Var) { @@ -452,12 +317,15 @@ cc.TMXLayer = cc.SpriteBatchNode.extend(/** @lends cc.TMXLayer# */{ * You can remove either by calling:
* - layer.removeChild(sprite, cleanup);
* - or layer.removeTileAt(ccp(x,y)); - * @param {cc.Point} pos + * @param {cc.Point|Number} pos or x + * @param {Number} [y] * @return {cc.Sprite} */ - getTileAt: function (pos) { + getTileAt: function (pos, y) { if(!pos) throw "cc.TMXLayer.getTileAt(): pos should be non-null"; + if(y !== undefined) + pos = cc.p(pos, y); if(pos.x >= this._layerSize.width || pos.y >= this._layerSize.height || pos.x < 0 || pos.y < 0) throw "cc.TMXLayer.getTileAt(): invalid position"; if(!this.tiles || !this._atlasIndexArray){ @@ -465,8 +333,7 @@ cc.TMXLayer = cc.SpriteBatchNode.extend(/** @lends cc.TMXLayer# */{ return null; } - var tile = null; - var gid = this.getTileGIDAt(pos); + var tile = null, gid = this.getTileGIDAt(pos); // if GID == 0, then no tile is present if (gid === 0) @@ -498,12 +365,15 @@ cc.TMXLayer = cc.SpriteBatchNode.extend(/** @lends cc.TMXLayer# */{ * Returns the tile gid at a given tile coordinate.
* if it returns 0, it means that the tile is empty.
* This method requires the the tile map has not been previously released (eg. don't call layer.releaseMap())
- * @param {cc.Point} pos + * @param {cc.Point|Number} pos or x + * @param {Number} [y] * @return {Number} */ - getTileGIDAt:function (pos) { - if(!pos) + getTileGIDAt:function (pos, y) { + if(pos == null) throw "cc.TMXLayer.getTileGIDAt(): pos should be non-null"; + if(y !== undefined) + pos = cc.p(pos, y); if(pos.x >= this._layerSize.width || pos.y >= this._layerSize.height || pos.x < 0 || pos.y < 0) throw "cc.TMXLayer.getTileGIDAt(): invalid position"; if(!this.tiles || !this._atlasIndexArray){ @@ -522,12 +392,15 @@ cc.TMXLayer = cc.SpriteBatchNode.extend(/** @lends cc.TMXLayer# */{ /** * lipped tiles can be changed dynamically - * @param {cc.Point} pos + * @param {cc.Point|Number} pos or x + * @param {Number} [y] * @return {Number} */ - getTileFlagsAt:function (pos) { + getTileFlagsAt:function (pos, y) { if(!pos) throw "cc.TMXLayer.getTileFlagsAt(): pos should be non-null"; + if(y !== undefined) + pos = cc.p(pos, y); if(pos.x >= this._layerSize.width || pos.y >= this._layerSize.height || pos.x < 0 || pos.y < 0) throw "cc.TMXLayer.getTileFlagsAt(): invalid position"; if(!this.tiles || !this._atlasIndexArray){ @@ -549,30 +422,37 @@ cc.TMXLayer = cc.SpriteBatchNode.extend(/** @lends cc.TMXLayer# */{ * The Tile GID can be obtained by using the method "tileGIDAt" or by using the TMX editor . Tileset Mgr +1.
* If a tile is already placed at that position, then it will be removed. * @param {Number} gid - * @param {cc.Point} pos - * @param {Number} flags + * @param {cc.Point|Number} posOrX position or x + * @param {Number} flagsOrY flags or y + * @param {Number} [flags] */ - setTileGID:function (gid, pos, flags) { - if(!pos) + setTileGID: function(gid, posOrX, flagsOrY, flags) { + if(!posOrX) throw "cc.TMXLayer.setTileGID(): pos should be non-null"; + var pos; + if (flags !== undefined) { + pos = cc.p(posOrX, flagsOrY); + } else { + pos = posOrX; + flags = flagsOrY; + } if(pos.x >= this._layerSize.width || pos.y >= this._layerSize.height || pos.x < 0 || pos.y < 0) throw "cc.TMXLayer.setTileGID(): invalid position"; if(!this.tiles || !this._atlasIndexArray){ cc.log("cc.TMXLayer.setTileGID(): TMXLayer: the tiles map has been released"); - return null; + return; } if(gid !== 0 && gid < this.tileset.firstGid){ cc.log( "cc.TMXLayer.setTileGID(): invalid gid:" + gid); - return null; + return; } flags = flags || 0; this._setNodeDirtyForCache(); - var currentFlags = this.getTileFlagsAt(pos); var currentGID = this.getTileGIDAt(pos); - if (currentGID != gid || currentFlags != flags) { + if (currentGID !== gid || currentFlags !== flags) { var gidAndFlags = (gid | flags) >>> 0; // setting gid=0 is equal to remove the tile if (gid === 0) @@ -599,16 +479,19 @@ cc.TMXLayer = cc.SpriteBatchNode.extend(/** @lends cc.TMXLayer# */{ /** * Removes a tile at given tile coordinate - * @param {cc.Point} pos + * @param {cc.Point|Number} pos position or x + * @param {Number} [y] */ - removeTileAt:function (pos) { + removeTileAt:function (pos, y) { if(!pos) throw "cc.TMXLayer.removeTileAt(): pos should be non-null"; + if(y !== undefined) + pos = cc.p(pos, y); if(pos.x >= this._layerSize.width || pos.y >= this._layerSize.height || pos.x < 0 || pos.y < 0) throw "cc.TMXLayer.removeTileAt(): invalid position"; if(!this.tiles || !this._atlasIndexArray){ cc.log("cc.TMXLayer.removeTileAt(): TMXLayer: the tiles map has been released"); - return null; + return; } var gid = this.getTileGIDAt(pos); @@ -650,10 +533,13 @@ cc.TMXLayer = cc.SpriteBatchNode.extend(/** @lends cc.TMXLayer# */{ /** * Returns the position in pixels of a given tile coordinate - * @param {cc.Point} pos + * @param {cc.Point|Number} pos position or x + * @param {Number} [y] * @return {cc.Point} */ - getPositionAt:function (pos) { + getPositionAt:function (pos, y) { + if (y !== undefined) + pos = cc.p(pos, y); var ret = cc.p(0,0); switch (this.layerOrientation) { case cc.TMX_ORIENTATION_ORTHO: @@ -685,18 +571,7 @@ cc.TMXLayer = cc.SpriteBatchNode.extend(/** @lends cc.TMXLayer# */{ */ setupTiles:function () { // Optimization: quick hack that sets the image size on the tileset - if (cc._renderType === cc._RENDER_TYPE_CANVAS) { - this.tileset.imageSize = this._originalTexture.getContentSizeInPixels(); - } else { - this.tileset.imageSize = this.textureAtlas.texture.getContentSizeInPixels(); - - // By default all the tiles are aliased - // pros: - // - easier to render - // cons: - // - difficult to scale / rotate / etc. - this.textureAtlas.texture.setAliasTexParameters(); - } + this._renderCmd.initImageSize(); // Parse cocos2d properties this._parseInternalProperties(); @@ -757,9 +632,11 @@ cc.TMXLayer = cc.SpriteBatchNode.extend(/** @lends cc.TMXLayer# */{ this.tiles[zz] = 0; this._atlasIndexArray.splice(atlasIndex, 1); cc.SpriteBatchNode.prototype.removeChild.call(this, sprite, cleanup); + cc.renderer.childrenOrderDirty = true; }, /** + * Gets the layer name * @return {String} */ getLayerName:function () { @@ -767,6 +644,7 @@ cc.TMXLayer = cc.SpriteBatchNode.extend(/** @lends cc.TMXLayer# */{ }, /** + * Set the layer name * @param {String} layerName */ setLayerName:function (layerName) { @@ -784,7 +662,7 @@ cc.TMXLayer = cc.SpriteBatchNode.extend(/** @lends cc.TMXLayer# */{ }, _positionForHexAt:function (pos) { - var diffY = (pos.x % 2 == 1) ? (-this._mapTileSize.height / 2) : 0; + var diffY = (pos.x % 2 === 1) ? (-this._mapTileSize.height / 2) : 0; return cc.p(pos.x * this._mapTileSize.width * 3 / 4, (this._layerSize.height - pos.y - 1) * this._mapTileSize.height + diffY); }, @@ -812,7 +690,7 @@ cc.TMXLayer = cc.SpriteBatchNode.extend(/** @lends cc.TMXLayer# */{ rect = cc.rectPixelsToPoints(rect); var z = 0 | (pos.x + pos.y * this._layerSize.width); - var tile = this._reusedTileWithRect(rect); + var tile = this._renderCmd._reusedTileWithRect(rect); this._setupTileSprite(tile, pos, gid); // optimization: @@ -833,7 +711,7 @@ cc.TMXLayer = cc.SpriteBatchNode.extend(/** @lends cc.TMXLayer# */{ rect = cc.rectPixelsToPoints(rect); var z = 0 | (pos.x + pos.y * this._layerSize.width); - var tile = this._reusedTileWithRect(rect); + var tile = this._renderCmd._reusedTileWithRect(rect); this._setupTileSprite(tile, pos, gid); // get atlas index @@ -867,12 +745,11 @@ cc.TMXLayer = cc.SpriteBatchNode.extend(/** @lends cc.TMXLayer# */{ rect.width / locScaleFactor, rect.height / locScaleFactor); var z = pos.x + pos.y * this._layerSize.width; - var tile = this._reusedTileWithRect(rect); + var tile = this._renderCmd._reusedTileWithRect(rect); this._setupTileSprite(tile, pos, gid); // get atlas index - var indexForZ = this._atlasIndexForExistantZ(z); - tile.atlasIndex = indexForZ; + tile.atlasIndex = this._atlasIndexForExistantZ(z); tile.dirty = true; tile.updateTransform(); this.tiles[z] = gid; @@ -885,14 +762,14 @@ cc.TMXLayer = cc.SpriteBatchNode.extend(/** @lends cc.TMXLayer# */{ // if cc_vertex=automatic, then tiles will be rendered using vertexz var vertexz = this.getProperty("cc_vertexz"); if (vertexz) { - if (vertexz == "automatic") { + if (vertexz === "automatic") { this._useAutomaticVertexZ = true; var alphaFuncVal = this.getProperty("cc_alpha_func"); var alphaFuncValue = 0; if (alphaFuncVal) alphaFuncValue = parseFloat(alphaFuncVal); - if (cc._renderType === cc._RENDER_TYPE_WEBGL) { + if (cc._renderType === cc._RENDER_TYPE_WEBGL) { //todo: need move to WebGL render cmd this.shaderProgram = cc.shaderCache.programForKey(cc.SHADER_POSITION_TEXTURECOLORALPHATEST); var alphaValueLocation = cc._renderContext.getUniformLocation(this.shaderProgram.getProgram(), cc.UNIFORM_ALPHA_TEST_VALUE_S); // NOTE: alpha test shader is hard-coded to use the equivalent of a glAlphaFunc(GL_GREATER) comparison @@ -932,11 +809,11 @@ cc.TMXLayer = cc.SpriteBatchNode.extend(/** @lends cc.TMXLayer# */{ var flag = (gid & (cc.TMX_TILE_HORIZONTAL_FLAG | cc.TMX_TILE_VERTICAL_FLAG) >>> 0) >>> 0; // handle the 4 diagonally flipped states. - if (flag == cc.TMX_TILE_HORIZONTAL_FLAG) + if (flag === cc.TMX_TILE_HORIZONTAL_FLAG) sprite.rotation = 90; - else if (flag == cc.TMX_TILE_VERTICAL_FLAG) + else if (flag === cc.TMX_TILE_VERTICAL_FLAG) sprite.rotation = 270; - else if (flag == (cc.TMX_TILE_VERTICAL_FLAG | cc.TMX_TILE_HORIZONTAL_FLAG) >>> 0) { + else if (flag === (cc.TMX_TILE_VERTICAL_FLAG | cc.TMX_TILE_HORIZONTAL_FLAG) >>> 0) { sprite.rotation = 90; sprite.setFlippedX(true); } else { @@ -954,32 +831,6 @@ cc.TMXLayer = cc.SpriteBatchNode.extend(/** @lends cc.TMXLayer# */{ } }, - _reusedTileWithRect:function (rect) { - if(cc._renderType === cc._RENDER_TYPE_WEBGL){ - if (!this._reusedTile) { - this._reusedTile = new cc.Sprite(); - this._reusedTile.initWithTexture(this.texture, rect, false); - this._reusedTile.batchNode = this; - } else { - // XXX HACK: Needed because if "batch node" is nil, - // then the Sprite'squad will be reset - this._reusedTile.batchNode = null; - - // Re-init the sprite - this._reusedTile.setTextureRect(rect, false); - - // restore the batch node - this._reusedTile.batchNode = this; - } - } else { - this._reusedTile = new cc.Sprite(); - this._reusedTile.initWithTexture(this._textureForCanvas, rect, false); - this._reusedTile.batchNode = this; - this._reusedTile.parent = this; - } - return this._reusedTile; - }, - _vertexZForPos:function (pos) { var ret = 0; var maxVal = 0; @@ -1010,11 +861,11 @@ cc.TMXLayer = cc.SpriteBatchNode.extend(/** @lends cc.TMXLayer# */{ var locAtlasIndexArray = this._atlasIndexArray; for (var i = 0, len = locAtlasIndexArray.length; i < len; i++) { item = locAtlasIndexArray[i]; - if (item == z) + if (item === z) break; } } - if(typeof item != "number") + if(!cc.isNumber(item)) cc.log("cc.TMXLayer._atlasIndexForExistantZ(): TMX atlas index not found. Shall not happen"); return i; }, @@ -1032,16 +883,6 @@ cc.TMXLayer = cc.SpriteBatchNode.extend(/** @lends cc.TMXLayer# */{ var _p = cc.TMXLayer.prototype; -if(cc._renderType == cc._RENDER_TYPE_WEBGL){ - _p.draw = cc.SpriteBatchNode.prototype.draw; - _p.visit = cc.SpriteBatchNode.prototype.visit; - _p.getTexture = cc.SpriteBatchNode.prototype.getTexture; -}else{ - _p.draw = _p._drawForCanvas; - _p.visit = _p._visitForCanvas; - _p.getTexture = _p._getTextureForCanvas; -} - /** @expose */ cc.defineGetterSetter(_p, "texture", _p.getTexture, _p.setTexture); @@ -1062,6 +903,7 @@ cc.defineGetterSetter(_p, "tileHeight", _p._getTileHeight, _p._setTileHeight); /** * Creates a cc.TMXLayer with an tile set info, a layer info and a map info + * @deprecated since v3.0 please use new cc.TMXLayer(tilesetInfo, layerInfo, mapInfo) instead. * @param {cc.TMXTilesetInfo} tilesetInfo * @param {cc.TMXLayerInfo} layerInfo * @param {cc.TMXMapInfo} mapInfo diff --git a/cocos2d/tilemap/CCTMXLayerCanvasRenderCmd.js b/cocos2d/tilemap/CCTMXLayerCanvasRenderCmd.js new file mode 100644 index 0000000000..6589bb2643 --- /dev/null +++ b/cocos2d/tilemap/CCTMXLayerCanvasRenderCmd.js @@ -0,0 +1,220 @@ +/**************************************************************************** + Copyright (c) 2013-2014 Chukong Technologies Inc. + + http://www.cocos2d-x.org + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + ****************************************************************************/ + +(function(){ + cc.TMXLayer.CanvasRenderCmd = function(renderable){ + cc.SpriteBatchNode.CanvasRenderCmd.call(this, renderable); + this._needDraw = true; + this._realWorldTransform = {a: 1, b: 0, c: 0, d: 1, tx: 0, ty: 0}; + + var locCanvas = cc._canvas; + var tmpCanvas = cc.newElement('canvas'); + tmpCanvas.width = locCanvas.width; + tmpCanvas.height = locCanvas.height; + this._cacheCanvas = tmpCanvas; + this._cacheContext = new cc.CanvasContextWrapper(this._cacheCanvas.getContext('2d')); + var tempTexture = new cc.Texture2D(); + tempTexture.initWithElement(tmpCanvas); + tempTexture.handleLoadedTexture(); + this._cacheTexture = tempTexture; + // This class uses cache, so its default cachedParent should be himself + this._cacheDirty = false; + }; + + var proto = cc.TMXLayer.CanvasRenderCmd.prototype = Object.create(cc.SpriteBatchNode.CanvasRenderCmd.prototype); + proto.constructor = cc.TMXLayer.CanvasRenderCmd; + + //set the cache dirty flag for canvas + proto._setNodeDirtyForCache = function () { + this._cacheDirty = true; + }; + + proto._renderingChildToCache = function () { + if (this._cacheDirty) { + var wrapper = this._cacheContext, + context = wrapper.getContext(), locCanvas = this._cacheCanvas; + + //wrapper.save(); + context.setTransform(1, 0, 0, 1, 0, 0); + context.clearRect(0, 0, locCanvas.width, locCanvas.height); + //reset the cache context + + var locChildren = this._node._children; + for (var i = 0, len = locChildren.length; i < len; i++) { + if (locChildren[i]){ + var selCmd = locChildren[i]._renderCmd; + if(selCmd){ + selCmd.rendering(wrapper, 1, 1); + selCmd._cacheDirty = false; + } + } + } + + //wrapper.restore(); + this._cacheDirty = false; + } + }; + + proto.rendering = function (ctx, scaleX, scaleY) { + var alpha = this._displayedOpacity / 255; + if (alpha <= 0) + return; + + var node = this._node; + this._renderingChildToCache(); + var wrapper = ctx || cc._renderContext, context = wrapper.getContext(); + wrapper.setGlobalAlpha(alpha); + + var locCacheCanvas = this._cacheCanvas; + //direct draw image by canvas drawImage + if (locCacheCanvas && locCacheCanvas.width !== 0 && locCacheCanvas.height !== 0) { + wrapper.setTransform(this._realWorldTransform, scaleX, scaleY); + var locCanvasHeight = locCacheCanvas.height * scaleY; + if (node.layerOrientation === cc.TMX_ORIENTATION_HEX) { + var halfTileSize = node._mapTileSize.height * 0.5 * scaleY; + context.drawImage(locCacheCanvas, 0, 0, locCacheCanvas.width, locCacheCanvas.height, + 0, -locCanvasHeight + halfTileSize, locCacheCanvas.width * scaleX, locCanvasHeight); + } else { + context.drawImage(locCacheCanvas, 0, 0, locCacheCanvas.width, locCacheCanvas.height, + 0, -locCanvasHeight, locCacheCanvas.width * scaleX, locCanvasHeight); + } + } + cc.g_NumberOfDraws++; + }; + + proto._updateCacheContext = function(size, height){ + var node = this._node, + locContentSize = node._contentSize, + locCanvas = this._cacheCanvas, + scaleFactor = cc.contentScaleFactor(); + locCanvas.width = 0 | (locContentSize.width * 1.5 * scaleFactor); + locCanvas.height = 0 | (locContentSize.height * 1.5 * scaleFactor); + + //todo: need change the wrapper's height + if(node.layerOrientation === cc.TMX_ORIENTATION_HEX) + this._cacheContext.setOffset(0, -node._mapTileSize.height * 0.5); //translate for hexagonal + else + this._cacheContext.setOffset(0, 0); + var locTexContentSize = this._cacheTexture._contentSize; + locTexContentSize.width = locCanvas.width; + locTexContentSize.height = locCanvas.height; + }; + + proto.getTexture = function(){ + return this._cacheTexture; + }; + + proto.visit = function(parentCmd){ + var node = this._node; + //TODO: it will implement dynamic compute child cutting automation. + var i, len, locChildren = node._children; + // quick return if not visible + if (!node._visible || !locChildren || locChildren.length === 0) + return; + + parentCmd = parentCmd || this.getParentRenderCmd(); + if (parentCmd) + this._curLevel = parentCmd._curLevel + 1; + + this._syncStatus(parentCmd); + if (this._cacheDirty) { + var wrapper = this._cacheContext, locCanvas = this._cacheCanvas, context = wrapper.getContext(), + instanceID = node.__instanceId, renderer = cc.renderer; + //begin cache + renderer._turnToCacheMode(instanceID); + + node.sortAllChildren(); + for (i = 0, len = locChildren.length; i < len; i++) { + if (locChildren[i]){ + var selCmd = locChildren[i]._renderCmd; + if(selCmd){ + selCmd.visit(this); + selCmd._cacheDirty = false; + } + } + } + + //wrapper.save(); + context.setTransform(1, 0, 0, 1, 0, 0); + context.clearRect(0, 0, locCanvas.width, locCanvas.height); + //set the wrapper's offset + + //draw to cache canvas + renderer._renderingToCacheCanvas(wrapper, instanceID); + //wrapper.restore(); //todo: it can be reserve. + this._cacheDirty = false + } + cc.renderer.pushRenderCommand(this); + this._dirtyFlag = 0; + }; + + proto.transform = function (parentCmd, recursive) { + // transform for canvas + var t = this.getNodeToParentTransform(), + worldT = this._realWorldTransform; //get the world transform + + if (parentCmd) { + var pt = parentCmd._worldTransform; + // cc.AffineTransformConcat is incorrect at get world transform + worldT.a = t.a * pt.a + t.b * pt.c; //a + worldT.b = t.a * pt.b + t.b * pt.d; //b + worldT.c = t.c * pt.a + t.d * pt.c; //c + worldT.d = t.c * pt.b + t.d * pt.d; //d + + worldT.tx = pt.a * t.tx + pt.c * t.ty + pt.tx; + worldT.ty = pt.d * t.ty + pt.ty + pt.b * t.tx; + } else { + worldT.a = t.a; + worldT.b = t.b; + worldT.c = t.c; + worldT.d = t.d; + worldT.tx = t.tx; + worldT.ty = t.ty; + } + if (recursive) { + var locChildren = this._node._children; + if (!locChildren || locChildren.length === 0) + return; + var i, len; + for (i = 0, len = locChildren.length; i < len; i++) { + locChildren[i]._renderCmd.transform(this, recursive); + } + } + }; + + proto.initImageSize = function(){ + var node = this._node; + node.tileset.imageSize = this._originalTexture.getContentSizeInPixels(); + }; + + proto._reusedTileWithRect = function(rect){ + var node = this._node; + node._reusedTile = new cc.Sprite(); + node._reusedTile.initWithTexture(node._renderCmd._texture, rect, false); + node._reusedTile.batchNode = node; + node._reusedTile.parent = node; + node._reusedTile._renderCmd._cachedParent = node._renderCmd; + return node._reusedTile; + }; +})(); \ No newline at end of file diff --git a/cocos2d/tilemap/CCTMXLayerWebGLRenderCmd.js b/cocos2d/tilemap/CCTMXLayerWebGLRenderCmd.js new file mode 100644 index 0000000000..8c1906f640 --- /dev/null +++ b/cocos2d/tilemap/CCTMXLayerWebGLRenderCmd.js @@ -0,0 +1,67 @@ +/**************************************************************************** + Copyright (c) 2013-2014 Chukong Technologies Inc. + + http://www.cocos2d-x.org + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + ****************************************************************************/ + +(function(){ + cc.TMXLayer.WebGLRenderCmd = function(renderableObject){ + cc.SpriteBatchNode.WebGLRenderCmd.call(this, renderableObject); + this._needDraw = true; + }; + + var proto = cc.TMXLayer.WebGLRenderCmd.prototype = Object.create(cc.SpriteBatchNode.WebGLRenderCmd.prototype); + proto.constructor = cc.TMXLayer.WebGLRenderCmd; + + proto._updateCacheContext = function(){}; + + proto.initImageSize = function(){ + var node = this._node; + node.tileset.imageSize = this._textureAtlas.texture.getContentSizeInPixels(); + + // By default all the tiles are aliased + // pros: + // - easier to render + // cons: + // - difficult to scale / rotate / etc. + this._textureAtlas.texture.setAliasTexParameters(); + }; + + proto._reusedTileWithRect = function(rect){ + var node = this._node; + if (!node._reusedTile) { + node._reusedTile = new cc.Sprite(); + node._reusedTile.initWithTexture(node.texture, rect, false); + node._reusedTile.batchNode = node; + } else { + // XXX HACK: Needed because if "batch node" is nil, + // then the Sprite'squad will be reset + node._reusedTile.batchNode = null; + + // Re-init the sprite + node._reusedTile.setTextureRect(rect, false); + + // restore the batch node + node._reusedTile.batchNode = node; + } + return node._reusedTile; + }; +})(); diff --git a/cocos2d/tilemap/CCTMXObjectGroup.js b/cocos2d/tilemap/CCTMXObjectGroup.js index 47233e51e1..560c690afe 100644 --- a/cocos2d/tilemap/CCTMXObjectGroup.js +++ b/cocos2d/tilemap/CCTMXObjectGroup.js @@ -1,7 +1,7 @@ /**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2008-2010 Ricardo Quesada - Copyright (c) 2011 Zynga Inc. + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -39,6 +39,11 @@ cc.TMXObjectGroup = cc.Class.extend(/** @lends cc.TMXObjectGroup# */{ _positionOffset: null, _objects: null, + /** + *
The cc.TMXObjectGroup's constructor.
+ * This function will automatically be invoked when you create a node using new construction: "var node = new cc.TMXObjectGroup()".
+ * Override it to extend its behavior, remember to call "this._super()" in the extended "ctor" function.
Return the dictionary for the specific object name.
* It will return the 1st object found on the array for the given name.
Return the dictionary for the specific object name.
+ * It will return the 1st object found on the array for the given name.
+ * Constructor of cc.TMXTiledMap * @param {String} tmxFile tmxFile fileName or content string * @param {String} resourcePath If tmxFile is a file name ,it is not required.If tmxFile is content string ,it is must required. - * @example - * //example - * 1. - * //create a TMXTiledMap with file name - * var tmxTiledMap = new cc.TMXTiledMap("res/orthogonal-test1.tmx"); - * 2. - * //create a TMXTiledMap with content string and resource path - * var resources = "res/TileMaps"; - * var filePath = "res/TileMaps/orthogonal-test1.tmx"; - * var xmlStr = cc.loader.getRes(filePath); - * var tmxTiledMap = new cc.TMXTiledMap(xmlStr, resources); */ ctor:function(tmxFile,resourcePath){ cc.Node.prototype.ctor.call(this); @@ -149,6 +152,7 @@ cc.TMXTiledMap = cc.NodeRGBA.extend(/** @lends cc.TMXTiledMap# */{ }, /** + * Gets the map size. * @return {cc.Size} */ getMapSize:function () { @@ -156,6 +160,7 @@ cc.TMXTiledMap = cc.NodeRGBA.extend(/** @lends cc.TMXTiledMap# */{ }, /** + * Set the map size. * @param {cc.Size} Var */ setMapSize:function (Var) { @@ -177,6 +182,7 @@ cc.TMXTiledMap = cc.NodeRGBA.extend(/** @lends cc.TMXTiledMap# */{ }, /** + * Gets the tile size. * @return {cc.Size} */ getTileSize:function () { @@ -184,6 +190,7 @@ cc.TMXTiledMap = cc.NodeRGBA.extend(/** @lends cc.TMXTiledMap# */{ }, /** + * Set the tile size * @param {cc.Size} Var */ setTileSize:function (Var) { @@ -213,6 +220,7 @@ cc.TMXTiledMap = cc.NodeRGBA.extend(/** @lends cc.TMXTiledMap# */{ }, /** + * map orientation * @param {Number} Var */ setMapOrientation:function (Var) { @@ -228,6 +236,7 @@ cc.TMXTiledMap = cc.NodeRGBA.extend(/** @lends cc.TMXTiledMap# */{ }, /** + * object groups * @param {Array} Var */ setObjectGroups:function (Var) { @@ -235,7 +244,7 @@ cc.TMXTiledMap = cc.NodeRGBA.extend(/** @lends cc.TMXTiledMap# */{ }, /** - * properties + * Gets the properties * @return {object} */ getProperties:function () { @@ -243,6 +252,7 @@ cc.TMXTiledMap = cc.NodeRGBA.extend(/** @lends cc.TMXTiledMap# */{ }, /** + * Set the properties * @param {object} Var */ setProperties:function (Var) { @@ -250,19 +260,20 @@ cc.TMXTiledMap = cc.NodeRGBA.extend(/** @lends cc.TMXTiledMap# */{ }, /** + * Initializes the instance of cc.TMXTiledMap with tmxFile * @param {String} tmxFile - * @return {Boolean} + * @return {Boolean} Whether the initialization was successful. * @example * //example * var map = new cc.TMXTiledMap() * map.initWithTMXFile("hello.tmx"); */ initWithTMXFile:function (tmxFile) { - if(!tmxFile || tmxFile.length == 0) + if(!tmxFile || tmxFile.length === 0) throw "cc.TMXTiledMap.initWithTMXFile(): tmxFile should be non-null or non-empty string."; this.width = 0; this.height = 0; - var mapInfo = cc.TMXMapInfo.create(tmxFile); + var mapInfo = new cc.TMXMapInfo(tmxFile); if (!mapInfo) return false; @@ -273,11 +284,17 @@ cc.TMXTiledMap = cc.NodeRGBA.extend(/** @lends cc.TMXTiledMap# */{ return true; }, + /** + * Initializes the instance of cc.TMXTiledMap with tmxString + * @param {String} tmxString + * @param {String} resourcePath + * @return {Boolean} Whether the initialization was successful. + */ initWithXML:function(tmxString, resourcePath){ this.width = 0; this.height = 0; - var mapInfo = cc.TMXMapInfo.create(tmxString, resourcePath); + var mapInfo = new cc.TMXMapInfo(tmxString, resourcePath); var locTilesets = mapInfo.getTilesets(); if(!locTilesets || locTilesets.length === 0) cc.log("cc.TMXTiledMap.initWithXML(): Map not found. Please check the filename."); @@ -311,6 +328,10 @@ cc.TMXTiledMap = cc.NodeRGBA.extend(/** @lends cc.TMXTiledMap# */{ } }, + /** + * Return All layers array. + * @returns {Array} + */ allLayers: function () { var retArr = [], locChildren = this._children; for(var i = 0, len = locChildren.length;i< len;i++){ @@ -332,7 +353,7 @@ cc.TMXTiledMap = cc.NodeRGBA.extend(/** @lends cc.TMXTiledMap# */{ var locChildren = this._children; for (var i = 0; i < locChildren.length; i++) { var layer = locChildren[i]; - if (layer && layer.layerName == layerName) + if (layer && layer.layerName === layerName) return layer; } // layer not found @@ -350,7 +371,7 @@ cc.TMXTiledMap = cc.NodeRGBA.extend(/** @lends cc.TMXTiledMap# */{ if (this.objectGroups) { for (var i = 0; i < this.objectGroups.length; i++) { var objectGroup = this.objectGroups[i]; - if (objectGroup && objectGroup.groupName == groupName) { + if (objectGroup && objectGroup.groupName === groupName) { return objectGroup; } } @@ -372,14 +393,25 @@ cc.TMXTiledMap = cc.NodeRGBA.extend(/** @lends cc.TMXTiledMap# */{ * Return properties dictionary for tile GID * @param {Number} GID * @return {object} + * @deprecated */ propertiesForGID:function (GID) { + cc.log("propertiesForGID is deprecated. Please use getPropertiesForGID instead."); + return this.getPropertiesForGID[GID]; + }, + + /** + * Return properties dictionary for tile GID + * @param {Number} GID + * @return {object} + */ + getPropertiesForGID: function(GID) { return this._tileProperties[GID]; }, _parseLayer:function (layerInfo, mapInfo) { var tileset = this._tilesetForLayer(layerInfo, mapInfo); - var layer = cc.TMXLayer.create(tileset, layerInfo, mapInfo); + var layer = new cc.TMXLayer(tileset, layerInfo, mapInfo); // tell the layerinfo to release the ownership of the tiles map. layerInfo.ownTiles = false; layer.setupTiles(); @@ -397,7 +429,7 @@ cc.TMXTiledMap = cc.NodeRGBA.extend(/** @lends cc.TMXTiledMap# */{ for (var x = 0; x < size.width; x++) { var pos = x + size.width * y; var gid = layerInfo._tiles[pos]; - if (gid != 0) { + if (gid !== 0) { // Optimization: quick return // if the layer is invalid (more than 1 tileset per layer) an cc.assert will be thrown later if (((gid & cc.TMX_TILE_FLIPPED_MASK)>>>0) >= tileset.firstGid) { @@ -437,20 +469,10 @@ cc.defineGetterSetter(_p, "tileHeight", _p._getTileHeight, _p._setTileHeight); /** * Creates a TMX Tiled Map with a TMX file or content string. * Implementation cc.TMXTiledMap + * @deprecated since v3.0 please use new cc.TMXTiledMap(tmxFile,resourcePath) instead. * @param {String} tmxFile tmxFile fileName or content string * @param {String} resourcePath If tmxFile is a file name ,it is not required.If tmxFile is content string ,it is must required. * @return {cc.TMXTiledMap|undefined} - * @example - * //example - * 1. - * //create a TMXTiledMap with file name - * var tmxTiledMap = cc.TMXTiledMap.create("res/orthogonal-test1.tmx"); - * 2. - * //create a TMXTiledMap with content string and resource path - * var resources = "res/TileMaps"; - * var filePath = "res/TileMaps/orthogonal-test1.tmx"; - * var xmlStr = cc.loader.getRes(filePath); - * var tmxTiledMap = cc.TMXTiledMap.create(xmlStr, resources); */ cc.TMXTiledMap.create = function (tmxFile,resourcePath) { return new cc.TMXTiledMap(tmxFile,resourcePath); diff --git a/cocos2d/tilemap/CCTMXXMLParser.js b/cocos2d/tilemap/CCTMXXMLParser.js index 984d63c562..63b295d0e7 100644 --- a/cocos2d/tilemap/CCTMXXMLParser.js +++ b/cocos2d/tilemap/CCTMXXMLParser.js @@ -1,7 +1,7 @@ /**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2008-2010 Ricardo Quesada - Copyright (c) 2011 Zynga Inc. + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -24,27 +24,6 @@ THE SOFTWARE. ****************************************************************************/ -/** - * @constant - * @type Number - */ -cc.TMX_LAYER_ATTRIB_NONE = 1 << 0; -/** - * @constant - * @type Number - */ -cc.TMX_LAYER_ATTRIB_BASE64 = 1 << 1; -/** - * @constant - * @type Number - */ -cc.TMX_LAYER_ATTRIB_GZIP = 1 << 2; -/** - * @constant - * @type Number - */ -cc.TMX_LAYER_ATTRIB_ZLIB = 1 << 3; - /** * @constant * @type Number @@ -154,6 +133,7 @@ cc.TMXLayerInfo = cc.Class.extend(/** @lends cc.TMXLayerInfo# */{ }, /** + * Gets the Properties. * @return {Array} */ getProperties:function () { @@ -161,6 +141,7 @@ cc.TMXLayerInfo = cc.Class.extend(/** @lends cc.TMXLayerInfo# */{ }, /** + * Set the Properties. * @param {object} value */ setProperties:function (value) { @@ -180,38 +161,33 @@ cc.TMXLayerInfo = cc.Class.extend(/** @lends cc.TMXLayerInfo# */{ * This information is obtained from the TMX file. * @class * @extends cc.Class + * + * @property {string} name - Tileset name + * @property {number} firstGid - First grid + * @property {number} spacing - Spacing + * @property {number} margin - Margin + * @property {string} sourceImage - Filename containing the tiles (should be sprite sheet / texture atlas) + * @property {cc.Size|null} imageSize - Size in pixels of the image */ cc.TMXTilesetInfo = cc.Class.extend(/** @lends cc.TMXTilesetInfo# */{ - /** - * Tileset name - */ + //Tileset name name:"", - /** - * First grid - */ + //First grid firstGid:0, _tileSize:null, - /** - * Spacing - */ + //Spacing spacing:0, - /** - * Margin - */ + //Margin margin:0, - /** - * Filename containing the tiles (should be sprite sheet / texture atlas) - */ + //Filename containing the tiles (should be sprite sheet / texture atlas) sourceImage:"", - /** - * Size in pixels of the image - */ + //Size in pixels of the image imageSize:null, ctor:function () { @@ -220,6 +196,7 @@ cc.TMXTilesetInfo = cc.Class.extend(/** @lends cc.TMXTilesetInfo# */{ }, /** + * Return rect * @param {Number} gid * @return {cc.Rect} */ @@ -263,6 +240,19 @@ cc.TMXTilesetInfo = cc.Class.extend(/** @lends cc.TMXTilesetInfo# */{ * @property {Number} mapHeight - Height of the map * @property {Number} tileWidth - Width of a tile * @property {Number} tileHeight - Height of a tile + * + * @param {String} tmxFile fileName or content string + * @param {String} resourcePath If tmxFile is a file name ,it is not required.If tmxFile is content string ,it is must required. + * @example + * 1. + * //create a TMXMapInfo with file name + * var tmxMapInfo = new cc.TMXMapInfo("res/orthogonal-test1.tmx"); + * 2. + * //create a TMXMapInfo with content string and resource path + * var resources = "res/TileMaps"; + * var filePath = "res/TileMaps/orthogonal-test1.tmx"; + * var xmlStr = cc.loader.getRes(filePath); + * var tmxMapInfo = new cc.TMXMapInfo(xmlStr, resources); */ cc.TMXMapInfo = cc.SAXParser.extend(/** @lends cc.TMXMapInfo# */{ properties:null, @@ -285,20 +275,10 @@ cc.TMXMapInfo = cc.SAXParser.extend(/** @lends cc.TMXMapInfo# */{ _currentFirstGID:0, /** - * Creates a TMX Format with a tmx file or content string - * @constructor + * Creates a TMX Format with a tmx file or content string
+ * Constructor of cc.TMXMapInfo * @param {String} tmxFile fileName or content string * @param {String} resourcePath If tmxFile is a file name ,it is not required.If tmxFile is content string ,it is must required. - * @example - * 1. - * //create a TMXMapInfo with file name - * var tmxMapInfo = cc.TMXMapInfo.create("res/orthogonal-test1.tmx"); - * 2. - * //create a TMXMapInfo with content string and resource path - * var resources = "res/TileMaps"; - * var filePath = "res/TileMaps/orthogonal-test1.tmx"; - * var xmlStr = cc.loader.getRes(filePath); - * var tmxMapInfo = cc.TMXMapInfo.create(xmlStr, resources); */ ctor:function (tmxFile, resourcePath) { cc.SAXParser.prototype.ctor.apply(this); @@ -319,6 +299,7 @@ cc.TMXMapInfo = cc.SAXParser.extend(/** @lends cc.TMXMapInfo# */{ } }, /** + * Gets Map orientation. * @return {Number} */ getOrientation:function () { @@ -326,6 +307,7 @@ cc.TMXMapInfo = cc.SAXParser.extend(/** @lends cc.TMXMapInfo# */{ }, /** + * Set the Map orientation. * @param {Number} value */ setOrientation:function (value) { @@ -341,6 +323,7 @@ cc.TMXMapInfo = cc.SAXParser.extend(/** @lends cc.TMXMapInfo# */{ }, /** + * Map width & height * @param {cc.Size} value */ setMapSize:function (value) { @@ -370,6 +353,7 @@ cc.TMXMapInfo = cc.SAXParser.extend(/** @lends cc.TMXMapInfo# */{ }, /** + * Tiles width & height * @param {cc.Size} value */ setTileSize:function (value) { @@ -399,6 +383,7 @@ cc.TMXMapInfo = cc.SAXParser.extend(/** @lends cc.TMXMapInfo# */{ }, /** + * Layers * @param {cc.TMXLayerInfo} value */ setLayers:function (value) { @@ -414,6 +399,7 @@ cc.TMXMapInfo = cc.SAXParser.extend(/** @lends cc.TMXMapInfo# */{ }, /** + * tilesets * @param {cc.TMXTilesetInfo} value */ setTilesets:function (value) { @@ -429,6 +415,7 @@ cc.TMXMapInfo = cc.SAXParser.extend(/** @lends cc.TMXMapInfo# */{ }, /** + * ObjectGroups * @param {cc.TMXObjectGroup} value */ setObjectGroups:function (value) { @@ -444,6 +431,7 @@ cc.TMXMapInfo = cc.SAXParser.extend(/** @lends cc.TMXMapInfo# */{ }, /** + * parent element * @param {Object} value */ setParentElement:function (value) { @@ -459,6 +447,7 @@ cc.TMXMapInfo = cc.SAXParser.extend(/** @lends cc.TMXMapInfo# */{ }, /** + * parent GID * @param {Number} value */ setParentGID:function (value) { @@ -474,6 +463,7 @@ cc.TMXMapInfo = cc.SAXParser.extend(/** @lends cc.TMXMapInfo# */{ }, /** + * Layer attribute * @param {Object} value */ setLayerAttribs:function (value) { @@ -489,6 +479,7 @@ cc.TMXMapInfo = cc.SAXParser.extend(/** @lends cc.TMXMapInfo# */{ }, /** + * Is reading storing characters stream * @param {Boolean} value */ setStoringCharacters:function (value) { @@ -504,6 +495,7 @@ cc.TMXMapInfo = cc.SAXParser.extend(/** @lends cc.TMXMapInfo# */{ }, /** + * Properties * @param {object} value */ setProperties:function (value) { @@ -550,15 +542,15 @@ cc.TMXMapInfo = cc.SAXParser.extend(/** @lends cc.TMXMapInfo# */{ var version = map.getAttribute('version'); var orientationStr = map.getAttribute('orientation'); - if (map.nodeName == "map") { - if (version != "1.0" && version !== null) + if (map.nodeName === "map") { + if (version !== "1.0" && version !== null) cc.log("cocos2d: TMXFormat: Unsupported TMX version:" + version); - if (orientationStr == "orthogonal") + if (orientationStr === "orthogonal") this.orientation = cc.TMX_ORIENTATION_ORTHO; - else if (orientationStr == "isometric") + else if (orientationStr === "isometric") this.orientation = cc.TMX_ORIENTATION_ISO; - else if (orientationStr == "hexagonal") + else if (orientationStr === "hexagonal") this.orientation = cc.TMX_ORIENTATION_HEX; else if (orientationStr !== null) cc.log("cocos2d: TMXFomat: Unsupported orientation:" + orientationStr); @@ -630,24 +622,23 @@ cc.TMXMapInfo = cc.SAXParser.extend(/** @lends cc.TMXMapInfo# */{ tileset.sourceImage = this._resources + (this._resources ? "/" : "") + imagename; } this.setTilesets(tileset); - } - } - // PARSE
cc.TileMapAtlas is a subclass of cc.AtlasNode.
- * - *It knows how to render a map based of tiles.
- * The tiles must be in a .PNG format while the map must be a .TGA file.
For more information regarding the format, please see this post:
- * http://www.cocos2d-iphone.org/archives/27
All features from cc.AtlasNode are valid in cc.TileMapAtlas
- * - *IMPORTANT:
- * This class is deprecated. It is maintained for compatibility reasons only.
- * You SHOULD not use this class.
- * Instead, use the newer TMX file format: cc.TMXTiledMap
Creates a cc.TileMap with a tile file (atlas) with a map file and the width and height of each tile in points.
- * The tile file will be loaded using the TextureMgr.
- * The file will be loaded using the TextureMgr. - * @param {String} tile - * @param {String} mapFile - * @param {Number} tileWidth - * @param {Number} tileHeight - * @return {Boolean} - * @example - * //example - * var tmpAtlas = new cc.TileMapAtlas(); - * tmpAtlas.initWithTileFile("hello.png", "hello.tga", 16, 16); - */ - initWithTileFile:function (tile, mapFile, tileWidth, tileHeight) { - this._calculateItemsToRender(); - if (cc.AtlasNode.prototype.initWithTileFile.call(this, tile, tileWidth, tileHeight, this._itemsToRender)) { - this._color = cc.color.WHITE; - this._posToAtlasIndex = {}; - this._updateAtlasValues(); - this.width = this.tgaInfo.width * this._itemWidth; - this.height = this.tgaInfo.height * this._itemHeight; - return true; - } - return false; - }, - - /** - *
Returns a tile from position x,y.
- * For the moment only channel R is used.
Creates a cc.TileMap with a tile file (atlas) with a map file and the width and height of each tile in points.
- * The tile file will be loaded using the TextureMgr.
+ * Event callback that is invoked every time when cc.TransitionScene enters the 'stage'.
+ * If the TransitionScene enters the 'stage' with a transition, this event is called when the transition starts.
+ * During onEnter you can't access a "sister/brother" node.
+ * If you override onEnter, you must call its parent's onEnter function with this._super().
+ *
+ * callback that is called every time the cc.TransitionScene leaves the 'stage'.
+ * If the cc.TransitionScene leaves the 'stage' with a transition, this callback is called when the transition finishes.
+ * During onExit you can't access a sibling node.
+ * If you override onExit, you shall call its parent's onExit with this._super().
+ *
* The front face is the outgoing scene and the back face is the incoming scene. + * @deprecated since v3.0,please use new cc.TransitionFlipX(t, scene,o) instead. * @param {Number} t time in seconds * @param {cc.Scene} scene * @param {cc.TRANSITION_ORIENTATION_LEFT_OVER|cc.TRANSITION_ORIENTATION_RIGHT_OVER|cc.TRANSITION_ORIENTATION_UP_OVER|cc.TRANSITION_ORIENTATION_DOWN_OVER} o * @return {cc.TransitionFlipX} - * @example - * // Example - * var myTransition = cc.TransitionFlipX.create(1.5, nextScene) //default is cc.TRANSITION_ORIENTATION_RIGHT_OVER - * - * //OR - * var myTransition = cc.TransitionFlipX.create(1.5, nextScene, cc.TRANSITION_ORIENTATION_UP_OVER) */ cc.TransitionFlipX.create = function (t, scene, o) { - if (o == null) - o = cc.TRANSITION_ORIENTATION_RIGHT_OVER; - - var tempScene = new cc.TransitionFlipX(); - tempScene.initWithDuration(t, scene, o); - return tempScene; + return new cc.TransitionFlipX(t, scene, o); }; /** @@ -888,9 +988,26 @@ cc.TransitionFlipX.create = function (t, scene, o) { * The front face is the outgoing scene and the back face is the incoming scene. * @class * @extends cc.TransitionSceneOriented + * @param {Number} t time in seconds + * @param {cc.Scene} scene + * @param {cc.TRANSITION_ORIENTATION_LEFT_OVER|cc.TRANSITION_ORIENTATION_RIGHT_OVER|cc.TRANSITION_ORIENTATION_UP_OVER|cc.TRANSITION_ORIENTATION_DOWN_OVER} o + * @example + * var trans = new cc.TransitionFlipY(time,scene,0); */ cc.TransitionFlipY = cc.TransitionSceneOriented.extend(/** @lends cc.TransitionFlipY# */{ + /** + * Constructor of TransitionFlipY + * @param {Number} t time in seconds + * @param {cc.Scene} scene + * @param {cc.TRANSITION_ORIENTATION_LEFT_OVER|cc.TRANSITION_ORIENTATION_RIGHT_OVER|cc.TRANSITION_ORIENTATION_UP_OVER|cc.TRANSITION_ORIENTATION_DOWN_OVER} o + */ + ctor:function (t, scene, o) { + cc.TransitionSceneOriented.prototype.ctor.call(this); + if(o == null) + o = cc.TRANSITION_ORIENTATION_UP_OVER; + scene && this.initWithDuration(t, scene, o); + }, /** * custom on enter */ @@ -902,7 +1019,7 @@ cc.TransitionFlipY = cc.TransitionSceneOriented.extend(/** @lends cc.TransitionF var inDeltaZ, inAngleZ, outDeltaZ, outAngleZ; - if (this._orientation == cc.TRANSITION_ORIENTATION_UP_OVER) { + if (this._orientation === cc.TRANSITION_ORIENTATION_UP_OVER) { inDeltaZ = 90; inAngleZ = 270; outDeltaZ = 90; @@ -914,14 +1031,14 @@ cc.TransitionFlipY = cc.TransitionSceneOriented.extend(/** @lends cc.TransitionF outAngleZ = 0; } - inA = cc.Sequence.create( - cc.DelayTime.create(this._duration / 2), cc.Show.create(), - cc.OrbitCamera.create(this._duration / 2, 1, 0, inAngleZ, inDeltaZ, 90, 0), - cc.CallFunc.create(this.finish, this) + inA = cc.sequence( + cc.delayTime(this._duration / 2), cc.show(), + cc.orbitCamera(this._duration / 2, 1, 0, inAngleZ, inDeltaZ, 90, 0), + cc.callFunc(this.finish, this) ); - outA = cc.Sequence.create( - cc.OrbitCamera.create(this._duration / 2, 1, 0, outAngleZ, outDeltaZ, 90, 0), - cc.Hide.create(), cc.DelayTime.create(this._duration / 2) + outA = cc.sequence( + cc.orbitCamera(this._duration / 2, 1, 0, outAngleZ, outDeltaZ, 90, 0), + cc.hide(), cc.delayTime(this._duration / 2) ); this._inScene.runAction(inA); @@ -932,25 +1049,14 @@ cc.TransitionFlipY = cc.TransitionSceneOriented.extend(/** @lends cc.TransitionF /** * Flips the screen vertically.
* The front face is the outgoing scene and the back face is the incoming scene. + * @deprecated since v3.0,please use new cc.TransitionFlipY(t, scene,o) instead. * @param {Number} t time in seconds * @param {cc.Scene} scene * @param {cc.TRANSITION_ORIENTATION_LEFT_OVER|cc.TRANSITION_ORIENTATION_RIGHT_OVER|cc.TRANSITION_ORIENTATION_UP_OVER|cc.TRANSITION_ORIENTATION_DOWN_OVER} o * @return {cc.TransitionFlipY} - * @example - * // Example - * var myTransition = cc.TransitionFlipY.create(1.5, nextScene)//default is cc.TRANSITION_ORIENTATION_UP_OVER - * - * //OR - * var myTransition = cc.TransitionFlipY.create(1.5, nextScene, cc.TRANSITION_ORIENTATION_RIGHT_OVER) */ cc.TransitionFlipY.create = function (t, scene, o) { - if (o == null) - o = cc.TRANSITION_ORIENTATION_UP_OVER; - - var tempScene = new cc.TransitionFlipY(); - tempScene.initWithDuration(t, scene, o); - - return tempScene; + return new cc.TransitionFlipY(t, scene, o); }; /** @@ -958,8 +1064,25 @@ cc.TransitionFlipY.create = function (t, scene, o) { * The front face is the outgoing scene and the back face is the incoming scene. * @class * @extends cc.TransitionSceneOriented + * @param {Number} t time in seconds + * @param {cc.Scene} scene + * @param {cc.TRANSITION_ORIENTATION_LEFT_OVER|cc.TRANSITION_ORIENTATION_RIGHT_OVER|cc.TRANSITION_ORIENTATION_UP_OVER|cc.TRANSITION_ORIENTATION_DOWN_OVER} o + * @example + * var trans = cc.TransitionFlipAngular(time,scene,o); */ cc.TransitionFlipAngular = cc.TransitionSceneOriented.extend(/** @lends cc.TransitionFlipAngular# */{ + /** + * Constructor of TransitionFlipAngular + * @param {Number} t time in seconds + * @param {cc.Scene} scene + * @param {cc.TRANSITION_ORIENTATION_LEFT_OVER|cc.TRANSITION_ORIENTATION_RIGHT_OVER|cc.TRANSITION_ORIENTATION_UP_OVER|cc.TRANSITION_ORIENTATION_DOWN_OVER} o + */ + ctor:function (t, scene, o) { + cc.TransitionSceneOriented.prototype.ctor.call(this); + if(o == null) + o = cc.TRANSITION_ORIENTATION_RIGHT_OVER; + scene && this.initWithDuration(t, scene, o); + }, /** * custom on enter */ @@ -983,14 +1106,14 @@ cc.TransitionFlipAngular = cc.TransitionSceneOriented.extend(/** @lends cc.Trans outAngleZ = 0; } - inA = cc.Sequence.create( - cc.DelayTime.create(this._duration / 2), cc.Show.create(), - cc.OrbitCamera.create(this._duration / 2, 1, 0, inAngleZ, inDeltaZ, -45, 0), - cc.CallFunc.create(this.finish, this) + inA = cc.sequence( + cc.delayTime(this._duration / 2), cc.show(), + cc.orbitCamera(this._duration / 2, 1, 0, inAngleZ, inDeltaZ, -45, 0), + cc.callFunc(this.finish, this) ); - outA = cc.Sequence.create( - cc.OrbitCamera.create(this._duration / 2, 1, 0, outAngleZ, outDeltaZ, 45, 0), - cc.Hide.create(), cc.DelayTime.create(this._duration / 2) + outA = cc.sequence( + cc.orbitCamera(this._duration / 2, 1, 0, outAngleZ, outDeltaZ, 45, 0), + cc.hide(), cc.delayTime(this._duration / 2) ); this._inScene.runAction(inA); @@ -1001,25 +1124,14 @@ cc.TransitionFlipAngular = cc.TransitionSceneOriented.extend(/** @lends cc.Trans /** * Flips the screen half horizontally and half vertically.
* The front face is the outgoing scene and the back face is the incoming scene. + * @deprecated since v3.0,please use new new cc.TransitionFlipAngular(t, scene, o) instead * @param {Number} t time in seconds * @param {cc.Scene} scene * @param {cc.TRANSITION_ORIENTATION_LEFT_OVER|cc.TRANSITION_ORIENTATION_RIGHT_OVER|cc.TRANSITION_ORIENTATION_UP_OVER|cc.TRANSITION_ORIENTATION_DOWN_OVER} o * @return {cc.TransitionFlipAngular} - * @example - * // Example - * var myTransition = cc.TransitionFlipAngular.create(1.5, nextScene)//default is cc.TRANSITION_ORIENTATION_RIGHT_OVER - * - * //or - * var myTransition = cc.TransitionFlipAngular.create(1.5, nextScene, cc.TRANSITION_ORIENTATION_DOWN_OVER) */ cc.TransitionFlipAngular.create = function (t, scene, o) { - if (o == null) - o = cc.TRANSITION_ORIENTATION_RIGHT_OVER; - - var tempScene = new cc.TransitionFlipAngular(); - tempScene.initWithDuration(t, scene, o); - - return tempScene; + return new cc.TransitionFlipAngular(t, scene, o); }; /** @@ -1027,9 +1139,26 @@ cc.TransitionFlipAngular.create = function (t, scene, o) { * The front face is the outgoing scene and the back face is the incoming scene. * @class * @extends cc.TransitionSceneOriented + * @param {Number} t time in seconds + * @param {cc.Scene} scene + * @param {cc.TRANSITION_ORIENTATION_LEFT_OVER|cc.TRANSITION_ORIENTATION_RIGHT_OVER|cc.TRANSITION_ORIENTATION_UP_OVER|cc.TRANSITION_ORIENTATION_DOWN_OVER} o + * @example + * var trans = new cc.TransitionZoomFlipX(time,scene,o); */ cc.TransitionZoomFlipX = cc.TransitionSceneOriented.extend(/** @lends cc.TransitionZoomFlipX# */{ + /** + * Constructor of TransitionZoomFlipX + * @param {Number} t time in seconds + * @param {cc.Scene} scene + * @param {cc.TRANSITION_ORIENTATION_LEFT_OVER|cc.TRANSITION_ORIENTATION_RIGHT_OVER|cc.TRANSITION_ORIENTATION_UP_OVER|cc.TRANSITION_ORIENTATION_DOWN_OVER} o + */ + ctor:function (t, scene, o) { + cc.TransitionSceneOriented.prototype.ctor.call(this); + if(o == null) + o = cc.TRANSITION_ORIENTATION_RIGHT_OVER; + scene && this.initWithDuration(t, scene, o); + }, /** * custom on enter */ @@ -1053,19 +1182,19 @@ cc.TransitionZoomFlipX = cc.TransitionSceneOriented.extend(/** @lends cc.Transit outAngleZ = 0; } - inA = cc.Sequence.create( - cc.DelayTime.create(this._duration / 2), - cc.Spawn.create( - cc.OrbitCamera.create(this._duration / 2, 1, 0, inAngleZ, inDeltaZ, 0, 0), - cc.ScaleTo.create(this._duration / 2, 1), cc.Show.create()), - cc.CallFunc.create(this.finish, this) + inA = cc.sequence( + cc.delayTime(this._duration / 2), + cc.spawn( + cc.orbitCamera(this._duration / 2, 1, 0, inAngleZ, inDeltaZ, 0, 0), + cc.scaleTo(this._duration / 2, 1), cc.show()), + cc.callFunc(this.finish, this) ); - outA = cc.Sequence.create( - cc.Spawn.create( - cc.OrbitCamera.create(this._duration / 2, 1, 0, outAngleZ, outDeltaZ, 0, 0), - cc.ScaleTo.create(this._duration / 2, 0.5)), - cc.Hide.create(), - cc.DelayTime.create(this._duration / 2) + outA = cc.sequence( + cc.spawn( + cc.orbitCamera(this._duration / 2, 1, 0, outAngleZ, outDeltaZ, 0, 0), + cc.scaleTo(this._duration / 2, 0.5)), + cc.hide(), + cc.delayTime(this._duration / 2) ); this._inScene.scale = 0.5; @@ -1077,25 +1206,14 @@ cc.TransitionZoomFlipX = cc.TransitionSceneOriented.extend(/** @lends cc.Transit /** * Flips the screen horizontally doing a zoom out/in
* The front face is the outgoing scene and the back face is the incoming scene. + * @deprecated since v3.0,please use new new cc.TransitionZoomFlipX(t, scene, o) instead * @param {Number} t time in seconds * @param {cc.Scene} scene * @param {cc.TRANSITION_ORIENTATION_LEFT_OVER|cc.TRANSITION_ORIENTATION_RIGHT_OVER|cc.TRANSITION_ORIENTATION_UP_OVER|cc.TRANSITION_ORIENTATION_DOWN_OVER} o * @return {cc.TransitionZoomFlipX} - * @example - * // Example - * var myTransition = cc.TransitionZoomFlipX.create(1.5, nextScene)//default is cc.TRANSITION_ORIENTATION_RIGHT_OVER - * - * //OR - * var myTransition = cc.TransitionZoomFlipX.create(1.5, nextScene, cc.TRANSITION_ORIENTATION_DOWN_OVER) */ cc.TransitionZoomFlipX.create = function (t, scene, o) { - if (o == null) - o = cc.TRANSITION_ORIENTATION_RIGHT_OVER; - - var tempScene = new cc.TransitionZoomFlipX(); - tempScene.initWithDuration(t, scene, o); - - return tempScene; + return new cc.TransitionZoomFlipX(t, scene, o); }; /** @@ -1103,9 +1221,26 @@ cc.TransitionZoomFlipX.create = function (t, scene, o) { * The front face is the outgoing scene and the back face is the incoming scene. * @class * @extends cc.TransitionSceneOriented + * @param {Number} t time in seconds + * @param {cc.Scene} scene + * @param {cc.TRANSITION_ORIENTATION_LEFT_OVER|cc.TRANSITION_ORIENTATION_RIGHT_OVER|cc.TRANSITION_ORIENTATION_UP_OVER|cc.TRANSITION_ORIENTATION_DOWN_OVER} o + * @example + * var trans = new cc.TransitionZoomFlipY(t,scene,o); */ cc.TransitionZoomFlipY = cc.TransitionSceneOriented.extend(/** @lends cc.TransitionZoomFlipY# */{ + /** + * Constructor of TransitionZoomFlipY + * @param {Number} t time in seconds + * @param {cc.Scene} scene + * @param {cc.TRANSITION_ORIENTATION_LEFT_OVER|cc.TRANSITION_ORIENTATION_RIGHT_OVER|cc.TRANSITION_ORIENTATION_UP_OVER|cc.TRANSITION_ORIENTATION_DOWN_OVER} o + */ + ctor:function (t, scene, o) { + cc.TransitionSceneOriented.prototype.ctor.call(this); + if(o == null) + o = cc.TRANSITION_ORIENTATION_UP_OVER; + scene && this.initWithDuration(t, scene, o); + }, /** * custom on enter */ @@ -1129,18 +1264,18 @@ cc.TransitionZoomFlipY = cc.TransitionSceneOriented.extend(/** @lends cc.Transit outAngleZ = 0; } - inA = cc.Sequence.create( - cc.DelayTime.create(this._duration / 2), - cc.Spawn.create( - cc.OrbitCamera.create(this._duration / 2, 1, 0, inAngleZ, inDeltaZ, 90, 0), - cc.ScaleTo.create(this._duration / 2, 1), cc.Show.create()), - cc.CallFunc.create(this.finish, this)); + inA = cc.sequence( + cc.delayTime(this._duration / 2), + cc.spawn( + cc.orbitCamera(this._duration / 2, 1, 0, inAngleZ, inDeltaZ, 90, 0), + cc.scaleTo(this._duration / 2, 1), cc.show()), + cc.callFunc(this.finish, this)); - outA = cc.Sequence.create( - cc.Spawn.create( - cc.OrbitCamera.create(this._duration / 2, 1, 0, outAngleZ, outDeltaZ, 90, 0), - cc.ScaleTo.create(this._duration / 2, 0.5)), - cc.Hide.create(), cc.DelayTime.create(this._duration / 2)); + outA = cc.sequence( + cc.spawn( + cc.orbitCamera(this._duration / 2, 1, 0, outAngleZ, outDeltaZ, 90, 0), + cc.scaleTo(this._duration / 2, 0.5)), + cc.hide(), cc.delayTime(this._duration / 2)); this._inScene.scale = 0.5; this._inScene.runAction(inA); @@ -1151,25 +1286,14 @@ cc.TransitionZoomFlipY = cc.TransitionSceneOriented.extend(/** @lends cc.Transit /** * Flips the screen vertically doing a little zooming out/in
* The front face is the outgoing scene and the back face is the incoming scene. + * @deprecated since v3.0,please use new new cc.TransitionZoomFlipY(t, scene, o) instead * @param {Number} t time in seconds * @param {cc.Scene} scene * @param {cc.TRANSITION_ORIENTATION_LEFT_OVER|cc.TRANSITION_ORIENTATION_RIGHT_OVER|cc.TRANSITION_ORIENTATION_UP_OVER|cc.TRANSITION_ORIENTATION_DOWN_OVER} o * @return {cc.TransitionZoomFlipY} - * @example - * // Example - * var myTransition = cc.TransitionZoomFlipY.create(1.5, nextScene)//default is cc.TRANSITION_ORIENTATION_UP_OVER - * - * //OR - * var myTransition = cc.TransitionZoomFlipY.create(1.5, nextScene, cc.TRANSITION_ORIENTATION_DOWN_OVER) */ cc.TransitionZoomFlipY.create = function (t, scene, o) { - if (o == null) - o = cc.TRANSITION_ORIENTATION_UP_OVER; - - var tempScene = new cc.TransitionZoomFlipY(); - tempScene.initWithDuration(t, scene, o); - - return tempScene; + return new cc.TransitionZoomFlipY(t, scene, o); }; /** @@ -1177,9 +1301,26 @@ cc.TransitionZoomFlipY.create = function (t, scene, o) { * The front face is the outgoing scene and the back face is the incoming scene. * @class * @extends cc.TransitionSceneOriented + * @param {Number} t time in seconds + * @param {cc.Scene} scene + * @param {cc.TRANSITION_ORIENTATION_LEFT_OVER|cc.TRANSITION_ORIENTATION_RIGHT_OVER|cc.TRANSITION_ORIENTATION_UP_OVER|cc.TRANSITION_ORIENTATION_DOWN_OVER} o + * @example + * var trans = new cc.TransitionZoomFlipAngular(time,scene,o); */ cc.TransitionZoomFlipAngular = cc.TransitionSceneOriented.extend(/** @lends cc.TransitionZoomFlipAngular# */{ + /** + * Constructor of TransitionZoomFlipAngular + * @param {Number} t time in seconds + * @param {cc.Scene} scene + * @param {cc.TRANSITION_ORIENTATION_LEFT_OVER|cc.TRANSITION_ORIENTATION_RIGHT_OVER|cc.TRANSITION_ORIENTATION_UP_OVER|cc.TRANSITION_ORIENTATION_DOWN_OVER} o + */ + ctor:function (t, scene, o) { + cc.TransitionSceneOriented.prototype.ctor.call(this); + if(o == null) + o = cc.TRANSITION_ORIENTATION_RIGHT_OVER; + scene && this.initWithDuration(t, scene, o); + }, /** * custom on enter */ @@ -1202,18 +1343,18 @@ cc.TransitionZoomFlipAngular = cc.TransitionSceneOriented.extend(/** @lends cc.T outAngleZ = 0; } - inA = cc.Sequence.create( - cc.DelayTime.create(this._duration / 2), - cc.Spawn.create( - cc.OrbitCamera.create(this._duration / 2, 1, 0, inAngleZ, inDeltaZ, -45, 0), - cc.ScaleTo.create(this._duration / 2, 1), cc.Show.create()), - cc.Show.create(), - cc.CallFunc.create(this.finish, this)); - outA = cc.Sequence.create( - cc.Spawn.create( - cc.OrbitCamera.create(this._duration / 2, 1, 0, outAngleZ, outDeltaZ, 45, 0), - cc.ScaleTo.create(this._duration / 2, 0.5)), - cc.Hide.create(), cc.DelayTime.create(this._duration / 2)); + inA = cc.sequence( + cc.delayTime(this._duration / 2), + cc.spawn( + cc.orbitCamera(this._duration / 2, 1, 0, inAngleZ, inDeltaZ, -45, 0), + cc.scaleTo(this._duration / 2, 1), cc.show()), + cc.show(), + cc.callFunc(this.finish, this)); + outA = cc.sequence( + cc.spawn( + cc.orbitCamera(this._duration / 2, 1, 0, outAngleZ, outDeltaZ, 45, 0), + cc.scaleTo(this._duration / 2, 0.5)), + cc.hide(), cc.delayTime(this._duration / 2)); this._inScene.scale = 0.5; this._inScene.runAction(inA); @@ -1224,41 +1365,39 @@ cc.TransitionZoomFlipAngular = cc.TransitionSceneOriented.extend(/** @lends cc.T /** * Flips the screen half horizontally and half vertically doing a little zooming out/in.
* The front face is the outgoing scene and the back face is the incoming scene. + * @deprecated since v3.0,please use new new cc.TransitionZoomFlipAngular(t, scene, o) instead * @param {Number} t time in seconds * @param {cc.Scene} scene * @param {cc.TRANSITION_ORIENTATION_LEFT_OVER|cc.TRANSITION_ORIENTATION_RIGHT_OVER|cc.TRANSITION_ORIENTATION_UP_OVER|cc.TRANSITION_ORIENTATION_DOWN_OVER} o * @return {cc.TransitionZoomFlipAngular} - * @example - * // Example - * var myTransition = cc.TransitionZoomFlipAngular.create(1.5, nextScene)//default is cc.TRANSITION_ORIENTATION_RIGHT_OVER - * - * //OR - * var myTransition = cc.TransitionZoomFlipAngular.create(1.5, nextScene, cc.TRANSITION_ORIENTATION_DOWN_OVER) */ cc.TransitionZoomFlipAngular.create = function (t, scene, o) { - if (o == null) - o = cc.TRANSITION_ORIENTATION_RIGHT_OVER; - - var tempScene = new cc.TransitionZoomFlipAngular(); - tempScene.initWithDuration(t, scene, o); - - return tempScene; + return new cc.TransitionZoomFlipAngular(t, scene, o); }; /** * Fade out the outgoing scene and then fade in the incoming scene. * @class * @extends cc.TransitionScene + * @param {Number} t time in seconds + * @param {cc.Scene} scene + * @param {cc.TRANSITION_ORIENTATION_LEFT_OVER|cc.TRANSITION_ORIENTATION_RIGHT_OVER|cc.TRANSITION_ORIENTATION_UP_OVER|cc.TRANSITION_ORIENTATION_DOWN_OVER} o + * @example + * var trans = new cc.TransitionFade(time,scene,color) */ cc.TransitionFade = cc.TransitionScene.extend(/** @lends cc.TransitionFade# */{ _color:null, /** - * Constructor + * Constructor of TransitionFade + * @param {Number} t time in seconds + * @param {cc.Scene} scene + * @param {cc.TRANSITION_ORIENTATION_LEFT_OVER|cc.TRANSITION_ORIENTATION_RIGHT_OVER|cc.TRANSITION_ORIENTATION_UP_OVER|cc.TRANSITION_ORIENTATION_DOWN_OVER} o */ - ctor:function () { + ctor:function (t, scene, color) { cc.TransitionScene.prototype.ctor.call(this); - this._color = cc.color() + this._color = cc.color(); + scene && this.initWithDuration(t, scene, color); }, /** @@ -1267,17 +1406,17 @@ cc.TransitionFade = cc.TransitionScene.extend(/** @lends cc.TransitionFade# */{ onEnter:function () { cc.TransitionScene.prototype.onEnter.call(this); - var l = cc.LayerColor.create(this._color); + var l = new cc.LayerColor(this._color); this._inScene.visible = false; this.addChild(l, 2, cc.SCENE_FADE); var f = this.getChildByTag(cc.SCENE_FADE); - var a = cc.Sequence.create( - cc.FadeIn.create(this._duration / 2), - cc.CallFunc.create(this.hideOutShowIn, this), //CCCallFunc.actionWithTarget:self selector:@selector(hideOutShowIn)], - cc.FadeOut.create(this._duration / 2), - cc.CallFunc.create(this.finish, this) //:self selector:@selector(finish)], + var a = cc.sequence( + cc.fadeIn(this._duration / 2), + cc.callFunc(this.hideOutShowIn, this), + cc.fadeOut(this._duration / 2), + cc.callFunc(this.finish, this) ); f.runAction(a); }, @@ -1312,26 +1451,35 @@ cc.TransitionFade = cc.TransitionScene.extend(/** @lends cc.TransitionFade# */{ /** * Fade out the outgoing scene and then fade in the incoming scene. + * @deprecated since v3.0,please use new cc.TransitionFade(time,scene,color) instead. * @param {Number} t time in seconds * @param {cc.Scene} scene * @param {cc.Color} color * @return {cc.TransitionFade} - * @example - * // Example - * var myTransition = cc.TransitionFade.create(1.5, nextScene, cc.color(255,0,0))//fade to red */ cc.TransitionFade.create = function (t, scene, color) { - var transition = new cc.TransitionFade(); - transition.initWithDuration(t, scene, color); - return transition; + return new cc.TransitionFade(t, scene, color); }; /** * Cross fades two scenes using the cc.RenderTexture object. * @class * @extends cc.TransitionScene + * @param {Number} t time in seconds + * @param {cc.Scene} scene + * @example + * var trans = new cc.TransitionCrossFade(time,scene); */ cc.TransitionCrossFade = cc.TransitionScene.extend(/** @lends cc.TransitionCrossFade# */{ + /** + * Constructor of TransitionCrossFade + * @param {Number} t time in seconds + * @param {cc.Scene} scene + */ + ctor:function (t, scene) { + cc.TransitionScene.prototype.ctor.call(this); + scene && this.initWithDuration(t, scene); + }, /** * custom on enter */ @@ -1342,13 +1490,10 @@ cc.TransitionCrossFade = cc.TransitionScene.extend(/** @lends cc.TransitionCross // in which we are going to add our rendertextures var color = cc.color(0, 0, 0, 0); var winSize = cc.director.getWinSize(); - var layer = cc.LayerColor.create(color); + var layer = new cc.LayerColor(color); // create the first render texture for inScene - var inTexture = cc.RenderTexture.create(winSize.width, winSize.height); - - if (null == inTexture) - return; + var inTexture = new cc.RenderTexture(winSize.width, winSize.height); inTexture.sprite.anchorX = 0.5; inTexture.sprite.anchorY = 0.5; @@ -1365,7 +1510,7 @@ cc.TransitionCrossFade = cc.TransitionScene.extend(/** @lends cc.TransitionCross inTexture.end(); // create the second render texture for outScene - var outTexture = cc.RenderTexture.create(winSize.width, winSize.height); + var outTexture = new cc.RenderTexture(winSize.width, winSize.height); outTexture.setPosition(winSize.width / 2, winSize.height / 2); outTexture.sprite.anchorX = outTexture.anchorX = 0.5; outTexture.sprite.anchorY = outTexture.anchorY = 0.5; @@ -1387,9 +1532,9 @@ cc.TransitionCrossFade = cc.TransitionScene.extend(/** @lends cc.TransitionCross outTexture.sprite.opacity = 255; // create the blend action - var layerAction = cc.Sequence.create( - cc.FadeTo.create(this._duration, 0), cc.CallFunc.create(this.hideOutShowIn, this), - cc.CallFunc.create(this.finish, this) + var layerAction = cc.sequence( + cc.fadeTo(this._duration, 0), cc.callFunc(this.hideOutShowIn, this), + cc.callFunc(this.finish, this) ); // run the blend action @@ -1407,6 +1552,13 @@ cc.TransitionCrossFade = cc.TransitionScene.extend(/** @lends cc.TransitionCross cc.TransitionScene.prototype.onExit.call(this); }, + /** + * stuff gets drawn here + */ + visit:function () { + cc.Node.prototype.visit.call(this); + }, + /** * overide draw */ @@ -1417,25 +1569,37 @@ cc.TransitionCrossFade = cc.TransitionScene.extend(/** @lends cc.TransitionCross /** * Cross fades two scenes using the cc.RenderTexture object. + * @deprecated since v3.0,please use new cc.TransitionCrossFade(t, scene) instead. * @param {Number} t time in seconds * @param {cc.Scene} scene * @return {cc.TransitionCrossFade} - * @example - * // Example - * var myTransition = cc.TransitionCrossFade.create(1.5, nextScene) */ cc.TransitionCrossFade.create = function (t, scene) { - var Transition = new cc.TransitionCrossFade(); - Transition.initWithDuration(t, scene); - return Transition; + return new cc.TransitionCrossFade(t, scene); }; /** * Turn off the tiles of the outgoing scene in random order * @class * @extends cc.TransitionScene + * @param {Number} t time in seconds + * @param {cc.Scene} scene + * @example + * var trans = new cc.TransitionTurnOffTiles(time,scene); */ cc.TransitionTurnOffTiles = cc.TransitionScene.extend(/** @lends cc.TransitionTurnOffTiles# */{ + _gridProxy: null, + /** + * Constructor of TransitionCrossFade + * @param {Number} t time in seconds + * @param {cc.Scene} scene + */ + ctor:function (t, scene) { + cc.TransitionScene.prototype.ctor.call(this); + this._gridProxy = new cc.NodeGrid(); + scene && this.initWithDuration(t, scene); + }, + _sceneOrder:function () { this._isInSceneOnTop = false; }, @@ -1445,13 +1609,21 @@ cc.TransitionTurnOffTiles = cc.TransitionScene.extend(/** @lends cc.TransitionTu */ onEnter:function () { cc.TransitionScene.prototype.onEnter.call(this); + this._gridProxy.setTarget(this._outScene); + this._gridProxy.onEnter(); + var winSize = cc.director.getWinSize(); var aspect = winSize.width / winSize.height; var x = 0 | (12 * aspect); var y = 12; - var toff = cc.TurnOffTiles.create(this._duration, cc.size(x, y)); + var toff = cc.turnOffTiles(this._duration, cc.size(x, y)); var action = this.easeActionWithAction(toff); - this._outScene.runAction(cc.Sequence.create(action, cc.CallFunc.create(this.finish, this), cc.StopGrid.create())); + this._gridProxy.runAction(cc.sequence(action, cc.callFunc(this.finish, this), cc.stopGrid())); + }, + + visit: function(){ + this._inScene.visit(); + this._gridProxy.visit(); }, /** @@ -1465,114 +1637,156 @@ cc.TransitionTurnOffTiles = cc.TransitionScene.extend(/** @lends cc.TransitionTu /** * Turn off the tiles of the outgoing scene in random order + * @deprecated since v3.0,please use new cc.TransitionTurnOffTiles(t, scene) instead. * @param {Number} t time in seconds * @param {cc.Scene} scene * @return {cc.TransitionTurnOffTiles} - * @example - * // Example - * var myTransition = cc.TransitionTurnOffTiles.create(1.5, nextScene) */ cc.TransitionTurnOffTiles.create = function (t, scene) { - var tempScene = new cc.TransitionTurnOffTiles(); - if ((tempScene != null) && (tempScene.initWithDuration(t, scene))) { - return tempScene; - } - return null; + return new cc.TransitionTurnOffTiles(t, scene); }; /** * The odd columns goes upwards while the even columns goes downwards. * @class * @extends cc.TransitionScene + * @param {Number} t time in seconds + * @param {cc.Scene} scene + * @example + * var trans = new cc.TransitionSplitCols(time,scene); */ cc.TransitionSplitCols = cc.TransitionScene.extend(/** @lends cc.TransitionSplitCols# */{ + _gridProxy: null, + + _switchTargetToInscene: function(){ + this._gridProxy.setTarget(this._inScene); + }, + /** + * Constructor of TransitionSplitCols + * @param {Number} t time in seconds + * @param {cc.Scene} scene + */ + ctor:function (t, scene) { + cc.TransitionScene.prototype.ctor.call(this); + this._gridProxy = new cc.NodeGrid(); + scene && this.initWithDuration(t, scene); + }, /** * custom on enter */ onEnter:function () { cc.TransitionScene.prototype.onEnter.call(this); - this._inScene.visible = false; + //this._inScene.visible = false; + this._gridProxy.setTarget(this._outScene); + this._gridProxy.onEnter(); var split = this.action(); - var seq = cc.Sequence.create( - split, cc.CallFunc.create(this.hideOutShowIn, this), split.reverse()); + var seq = cc.sequence( + split, cc.callFunc(this._switchTargetToInscene, this), split.reverse()); - this.runAction( - cc.Sequence.create(this.easeActionWithAction(seq), cc.CallFunc.create(this.finish, this), cc.StopGrid.create()) + this._gridProxy.runAction( + cc.sequence(this.easeActionWithAction(seq), cc.callFunc(this.finish, this), cc.stopGrid()) ); }, + onExit: function(){ + this._gridProxy.setTarget(null); + this._gridProxy.onExit(); + cc.TransitionScene.prototype.onExit.call(this); + }, + + visit: function(){ + this._gridProxy.visit(); + }, + /** * @param {cc.ActionInterval} action * @return {cc.EaseInOut} */ easeActionWithAction:function (action) { - return cc.EaseInOut.create(action, 3.0); + return new cc.EaseInOut(action, 3.0); }, /** * @return {*} */ action:function () { - return cc.SplitCols.create(this._duration / 2.0, 3); + return cc.splitCols(this._duration / 2.0, 3); } }); /** * The odd columns goes upwards while the even columns goes downwards. + * @deprecated since v3.0,please use new cc.TransitionSplitCols(t, scene) instead. * @param {Number} t time in seconds * @param {cc.Scene} scene * @return {cc.TransitionSplitCols} - * @example - * // Example - * var myTransition = cc.TransitionSplitCols.create(1.5, nextScene) */ cc.TransitionSplitCols.create = function (t, scene) { - var tempScene = new cc.TransitionSplitCols(); - if ((tempScene != null) && (tempScene.initWithDuration(t, scene))) { - return tempScene; - } - return null; + return new cc.TransitionSplitCols(t, scene); }; /** * The odd rows goes to the left while the even rows goes to the right. * @class * @extends cc.TransitionSplitCols + * @param {Number} t time in seconds + * @param {cc.Scene} scene + * @example + * var trans = new cc.TransitionSplitRows(time,scene); */ cc.TransitionSplitRows = cc.TransitionSplitCols.extend(/** @lends cc.TransitionSplitRows# */{ + + /** + * Constructor of TransitionSplitRows + * @param {Number} t time in seconds + * @param {cc.Scene} scene + */ + ctor:function (t, scene) { + cc.TransitionSplitCols.prototype.ctor.call(this); + scene && this.initWithDuration(t, scene); + }, /** * @return {*} */ action:function () { - return cc.SplitRows.create(this._duration / 2.0, 3); + return cc.splitRows(this._duration / 2.0, 3); } }); /** * The odd rows goes to the left while the even rows goes to the right. + * @deprecated since v3.0,please use new cc.TransitionSplitRows(t, scene) instead. * @param {Number} t time in seconds * @param {cc.Scene} scene * @return {cc.TransitionSplitRows} - * @example - * // Example - * var myTransition = cc.TransitionSplitRows.create(1.5, nextScene) */ cc.TransitionSplitRows.create = function (t, scene) { - var tempScene = new cc.TransitionSplitRows(); - if ((tempScene != null) && (tempScene.initWithDuration(t, scene))) { - return tempScene; - } - return null; + return new cc.TransitionSplitRows(t, scene); }; /** * Fade the tiles of the outgoing scene from the left-bottom corner the to top-right corner. * @class * @extends cc.TransitionScene + * @param {Number} t time in seconds + * @param {cc.Scene} scene + * @example + * var trans = new cc.TransitionFadeTR(time,scene); */ cc.TransitionFadeTR = cc.TransitionScene.extend(/** @lends cc.TransitionFadeTR# */{ + _gridProxy: null, + /** + * Constructor of TransitionFadeTR + * @param {Number} t time in seconds + * @param {cc.Scene} scene + */ + ctor:function (t, scene) { + cc.TransitionScene.prototype.ctor.call(this); + this._gridProxy = new cc.NodeGrid(); + scene && this.initWithDuration(t, scene); + }, _sceneOrder:function () { this._isInSceneOnTop = false; }, @@ -1583,18 +1797,25 @@ cc.TransitionFadeTR = cc.TransitionScene.extend(/** @lends cc.TransitionFadeTR# onEnter:function () { cc.TransitionScene.prototype.onEnter.call(this); + this._gridProxy.setTarget(this._outScene); + this._gridProxy.onEnter(); + var winSize = cc.director.getWinSize(); var aspect = winSize.width / winSize.height; var x = 0 | (12 * aspect); var y = 12; var action = this.actionWithSize(cc.size(x, y)); - this._outScene.runAction( - cc.Sequence.create(this.easeActionWithAction(action), cc.CallFunc.create(this.finish, this), - cc.StopGrid.create()) + this._gridProxy.runAction( + cc.sequence(this.easeActionWithAction(action), cc.callFunc(this.finish, this), cc.stopGrid()) ); }, + visit: function(){ + this._inScene.visit(); + this._gridProxy.visit(); + }, + /** * @param {cc.ActionInterval} action * @return {cc.ActionInterval} @@ -1608,120 +1829,140 @@ cc.TransitionFadeTR = cc.TransitionScene.extend(/** @lends cc.TransitionFadeTR# * @return {*} */ actionWithSize:function (size) { - return cc.FadeOutTRTiles.create(this._duration, size); + return cc.fadeOutTRTiles(this._duration, size); } }); /** * Fade the tiles of the outgoing scene from the left-bottom corner the to top-right corner. + * @deprecated since v3.0 please use new cc.TransitionFadeTR(t, scene) instead. * @param {Number} t time in seconds * @param {cc.Scene} scene * @return {cc.TransitionFadeTR} - * @example - * // Example - * var myTransition = cc.TransitionFadeTR.create(1.5, nextScene) */ cc.TransitionFadeTR.create = function (t, scene) { - var tempScene = new cc.TransitionFadeTR(); - if ((tempScene != null) && (tempScene.initWithDuration(t, scene))) - return tempScene; - return null; + return new cc.TransitionFadeTR(t, scene); }; /** * Fade the tiles of the outgoing scene from the top-right corner to the bottom-left corner. * @class * @extends cc.TransitionFadeTR + * @param {Number} t time in seconds + * @param {cc.Scene} scene + * @example + * var trans = new cc.TransitionFadeBL(time,scene) */ cc.TransitionFadeBL = cc.TransitionFadeTR.extend(/** @lends cc.TransitionFadeBL# */{ + /** + * Constructor of TransitionFadeBL + * @param {Number} t time in seconds + * @param {cc.Scene} scene + */ + ctor:function (t, scene) { + cc.TransitionFadeTR.prototype.ctor.call(this); + scene && this.initWithDuration(t, scene); + }, /** * @param {cc.Size} size * @return {*} */ actionWithSize:function (size) { - return cc.FadeOutBLTiles.create(this._duration, size); + return cc.fadeOutBLTiles(this._duration, size); } }); /** * Fade the tiles of the outgoing scene from the top-right corner to the bottom-left corner. + * @deprecated since v3.0,please use new cc.TransitionFadeBL(t, scene); * @param {Number} t time in seconds * @param {cc.Scene} scene * @return {cc.TransitionFadeBL} - * @example - * // Example - * var myTransition = cc.TransitionFadeBL.create(1.5, nextScene) */ cc.TransitionFadeBL.create = function (t, scene) { - var tempScene = new cc.TransitionFadeBL(); - if ((tempScene != null) && (tempScene.initWithDuration(t, scene))) - return tempScene; - return null; + return new cc.TransitionFadeBL(t, scene); }; /** * Fade the tiles of the outgoing scene from the top-right corner to the bottom-left corner. * @class * @extends cc.TransitionFadeTR + * @param {Number} t time in seconds + * @param {cc.Scene} scene + * @example + * var trans = new cc.TransitionFadeUp(time,scene); */ cc.TransitionFadeUp = cc.TransitionFadeTR.extend(/** @lends cc.TransitionFadeUp# */{ + /** + * Constructor of TransitionFadeUp + * @function + * @param {Number} t time in seconds + * @param {cc.Scene} scene + */ + ctor:function (t, scene) { + cc.TransitionFadeTR.prototype.ctor.call(this); + scene && this.initWithDuration(t, scene); + }, + /** * @param {cc.Size} size - * @return {*} + * @return {cc.FadeOutUpTiles} */ actionWithSize:function (size) { - return cc.FadeOutUpTiles.create(this._duration, size); + return new cc.FadeOutUpTiles(this._duration, size); } }); /** * Fade the tiles of the outgoing scene from the top-right corner to the bottom-left corner. + * @deprecated since v3.0,please use new cc.TransitionFadeUp(t, scene) instead. * @param {Number} t time in seconds * @param {cc.Scene} scene * @return {cc.TransitionFadeUp} - * @example - * // Example - * var myTransition = cc.TransitionFadeUp.create(1.5, nextScene) */ cc.TransitionFadeUp.create = function (t, scene) { - var tempScene = new cc.TransitionFadeUp(); - if ((tempScene != null) && (tempScene.initWithDuration(t, scene))) { - return tempScene; - } - return null; + return new cc.TransitionFadeUp(t, scene); }; /** * Fade the tiles of the outgoing scene from the top to the bottom. * @class * @extends cc.TransitionFadeTR + * @param {Number} t time in seconds + * @param {cc.Scene} scene + * @example + * var trans = new cc.TransitionFadeDown(time,scene); */ cc.TransitionFadeDown = cc.TransitionFadeTR.extend(/** @lends cc.TransitionFadeDown# */{ + /** + * Constructor of TransitionFadeDown + * @param {Number} t time in seconds + * @param {cc.Scene} scene + */ + ctor:function (t, scene) { + cc.TransitionFadeTR.prototype.ctor.call(this); + scene && this.initWithDuration(t, scene); + }, + /** * @param {cc.Size} size * @return {*} */ actionWithSize:function (size) { - return cc.FadeOutDownTiles.create( this._duration, size); + return cc.fadeOutDownTiles( this._duration, size); } }); /** * Fade the tiles of the outgoing scene from the top to the bottom. + * @deprecated since v3.0,please use new cc.TransitionFadeDown(t, scene) instead. * @param {Number} t time in seconds * @param {cc.Scene} scene * @return {cc.TransitionFadeDown} - * @example - * // Example - * var myTransition = cc.TransitionFadeDown.create(1.5, nextScene) */ cc.TransitionFadeDown.create = function (t, scene) { - var tempScene = new cc.TransitionFadeDown(); - if ((tempScene != null) && (tempScene.initWithDuration(t, scene))) { - return tempScene; - } - return null; + return new cc.TransitionFadeDown(t, scene); }; diff --git a/cocos2d/transitions/CCTransitionPageTurn.js b/cocos2d/transitions/CCTransitionPageTurn.js index 49baf685fb..6b71fd848b 100644 --- a/cocos2d/transitions/CCTransitionPageTurn.js +++ b/cocos2d/transitions/CCTransitionPageTurn.js @@ -1,7 +1,7 @@ /**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2008-2010 Ricardo Quesada - Copyright (c) 2011 Zynga Inc. + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -34,12 +34,30 @@ *
cc.director.setDepthBufferFormat(kDepthBuffer16);
* @class * @extends cc.TransitionScene + * @param {Number} t time in seconds + * @param {cc.Scene} scene + * @param {Boolean} backwards + * @example + * var trans = new cc.TransitionPageTurn(t, scene, backwards); */ cc.TransitionPageTurn = cc.TransitionScene.extend(/** @lends cc.TransitionPageTurn# */{ + + /** + * @param {Number} t time in seconds + * @param {cc.Scene} scene + * @param {Boolean} backwards + */ + ctor:function (t, scene, backwards) { + cc.TransitionScene.prototype.ctor.call(this); + this._gridProxy = new cc.NodeGrid(); + this.initWithDuration(t, scene, backwards); + }, + /** * @type Boolean */ _back:true, + _gridProxy: null, _className:"TransitionPageTurn", /** @@ -67,9 +85,9 @@ cc.TransitionPageTurn = cc.TransitionScene.extend(/** @lends cc.TransitionPageTu */ actionWithSize:function (vector) { if (this._back) - return cc.ReverseTime.create(cc.PageTurn3D.create(this._duration, vector)); // Get hold of the PageTurn3DAction + return cc.reverseTime(cc.pageTurn3D(this._duration, vector)); // Get hold of the PageTurn3DAction else - return cc.PageTurn3D.create(this._duration, vector); // Get hold of the PageTurn3DAction + return cc.pageTurn3D(this._duration, vector); // Get hold of the PageTurn3DAction }, /** @@ -87,19 +105,33 @@ cc.TransitionPageTurn = cc.TransitionScene.extend(/** @lends cc.TransitionPageTu y = 16; } - var action = this.actionWithSize(cc.size(x, y)); + var action = this.actionWithSize(cc.size(x, y)), gridProxy = this._gridProxy; if (!this._back) { - this._outScene.runAction( cc.Sequence.create(action,cc.CallFunc.create(this.finish, this),cc.StopGrid.create())); + gridProxy.setTarget(this._outScene); + gridProxy.onEnter(); + gridProxy.runAction( cc.sequence(action,cc.callFunc(this.finish, this),cc.stopGrid())); } else { + gridProxy.setTarget(this._inScene); + gridProxy.onEnter(); // to prevent initial flicker this._inScene.visible = false; - this._inScene.runAction( - cc.Sequence.create(cc.Show.create(),action, cc.CallFunc.create(this.finish, this), cc.StopGrid.create()) + gridProxy.runAction( + cc.sequence(action, cc.callFunc(this.finish, this), cc.stopGrid()) ); + this._inScene.runAction(cc.show()); } }, + visit: function(){ + //cc.TransitionScene.prototype.visit.call(this); + if(this._back) + this._outScene.visit(); + else + this._inScene.visit(); + this._gridProxy.visit(); + }, + _sceneOrder:function () { this._isInSceneOnTop = this._back; } @@ -109,16 +141,12 @@ cc.TransitionPageTurn = cc.TransitionScene.extend(/** @lends cc.TransitionPageTu * Creates a base transition with duration and incoming scene.* If back is true then the effect is reversed to appear as if the incoming
* scene is being turned from left over the outgoing scene. + * @deprecated since v3.0,please use new cc.TransitionPageTurn(t, scene, backwards) instead. * @param {Number} t time in seconds * @param {cc.Scene} scene * @param {Boolean} backwards * @return {cc.TransitionPageTurn} - * @example - * // Example - * var myTransition = cc.TransitionPageTurn.create(1.5, nextScene, true)//true means backwards */ cc.TransitionPageTurn.create = function (t, scene, backwards) { - var transition = new cc.TransitionPageTurn(); - transition.initWithDuration(t, scene, backwards); - return transition; + return new cc.TransitionPageTurn(t, scene, backwards); }; diff --git a/cocos2d/transitions/CCTransitionProgress.js b/cocos2d/transitions/CCTransitionProgress.js index 275163c22e..803fe4d20f 100644 --- a/cocos2d/transitions/CCTransitionProgress.js +++ b/cocos2d/transitions/CCTransitionProgress.js @@ -1,7 +1,7 @@ /**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2008-2010 Ricardo Quesada - Copyright (c) 2011 Zynga Inc. + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -35,6 +35,10 @@ cc.SCENE_RADIAL = 0xc001; * cc.TransitionProgress transition. * @class * @extends cc.TransitionScene + * @param {Number} t time + * @param {cc.Scene} scene + * @example + * var trans = new cc.TransitionProgress(time,scene); */ cc.TransitionProgress = cc.TransitionScene.extend(/** @lends cc.TransitionProgress# */{ _to:0, @@ -42,6 +46,15 @@ cc.TransitionProgress = cc.TransitionScene.extend(/** @lends cc.TransitionProgre _sceneToBeModified:null, _className:"TransitionProgress", + /** + * @param {Number} t time + * @param {cc.Scene} scene + */ + ctor:function (t, scene) { + cc.TransitionScene.prototype.ctor.call(this); + scene && this.initWithDuration(t, scene); + }, + _setAttrs: function(node, x, y) { node.attr({ x: x, @@ -53,6 +66,7 @@ cc.TransitionProgress = cc.TransitionScene.extend(/** @lends cc.TransitionProgre /** * @override + * custom on enter */ onEnter:function () { cc.TransitionScene.prototype.onEnter.call(this); @@ -63,7 +77,7 @@ cc.TransitionProgress = cc.TransitionScene.extend(/** @lends cc.TransitionProgre var winSize = cc.director.getWinSize(); // create the second render texture for outScene - var texture = cc.RenderTexture.create(winSize.width, winSize.height); + var texture = new cc.RenderTexture(winSize.width, winSize.height); texture.sprite.anchorX = 0.5; texture.sprite.anchorY = 0.5; this._setAttrs(texture, winSize.width / 2, winSize.height / 2); @@ -75,16 +89,16 @@ cc.TransitionProgress = cc.TransitionScene.extend(/** @lends cc.TransitionProgre texture.end(); // Since we've passed the outScene to the texture we don't need it. - if (this._sceneToBeModified == this._outScene) + if (this._sceneToBeModified === this._outScene) this.hideOutShowIn(); // We need the texture in RenderTexture. var pNode = this._progressTimerNodeWithRenderTexture(texture); // create the blend action - var layerAction = cc.Sequence.create( - cc.ProgressFromTo.create(this._duration, this._from, this._to), - cc.CallFunc.create(this.finish, this)); + var layerAction = cc.sequence( + cc.progressFromTo(this._duration, this._from, this._to), + cc.callFunc(this.finish, this)); // run the blend action pNode.runAction(layerAction); @@ -94,6 +108,7 @@ cc.TransitionProgress = cc.TransitionScene.extend(/** @lends cc.TransitionProgre /** * @override + * custom on exit */ onExit:function () { // remove our layer and release all containing objects @@ -119,17 +134,14 @@ cc.TransitionProgress = cc.TransitionScene.extend(/** @lends cc.TransitionProgre /** * create a cc.TransitionProgress object + * @deprecated since v3.0,please use new cc.TransitionProgress(t, scene) instead. * @function * @param {Number} t time * @param {cc.Scene} scene * @return {cc.TransitionProgress} */ cc.TransitionProgress.create = function (t, scene) { - var tempScene = new cc.TransitionProgress(); - if ((tempScene != null) && (tempScene.initWithDuration(t, scene))) { - return tempScene; - } - return null; + return new cc.TransitionProgress(t, scene); }; /** @@ -137,17 +149,31 @@ cc.TransitionProgress.create = function (t, scene) { * A counter clock-wise radial transition to the next scene * @class * @extends cc.TransitionProgress + * @param {Number} t time + * @param {cc.Scene} scene + * @example + * var trans = new cc.TransitionProgressRadialCCW(t, scene); */ cc.TransitionProgressRadialCCW = cc.TransitionProgress.extend(/** @lends cc.TransitionProgressRadialCCW# */{ + + /** + * @param {Number} t time + * @param {cc.Scene} scene + */ + ctor:function (t, scene) { + cc.TransitionProgress.prototype.ctor.call(this); + scene && this.initWithDuration(t, scene); + }, + _progressTimerNodeWithRenderTexture:function (texture) { var size = cc.director.getWinSize(); - var pNode = cc.ProgressTimer.create(texture.sprite); + var pNode = new cc.ProgressTimer(texture.sprite); // but it is flipped upside down so we flip the sprite if (cc._renderType === cc._RENDER_TYPE_WEBGL) pNode.sprite.flippedY = true; - pNode.type = cc.PROGRESS_TIMER_TYPE_RADIAL; + pNode.type = cc.ProgressTimer.TYPE_RADIAL; // Return the radial type that we want to use pNode.reverseDir = false; @@ -160,17 +186,15 @@ cc.TransitionProgressRadialCCW = cc.TransitionProgress.extend(/** @lends cc.Tran /** * create a cc.TransitionProgressRadialCCW object - * @function + * @deprecated since v3.0,please use new cc.TransitionProgressRadialCCW(t, scene) instead. * @param {Number} t time * @param {cc.Scene} scene * @return {cc.TransitionProgressRadialCCW} + * @example + * var trans = new cc.TransitionProgressRadialCCW(time,scene); */ cc.TransitionProgressRadialCCW.create = function (t, scene) { - var tempScene = new cc.TransitionProgressRadialCCW(); - if ((tempScene != null) && (tempScene.initWithDuration(t, scene))) { - return tempScene; - } - return null; + return new cc.TransitionProgressRadialCCW(t, scene); }; /** @@ -178,17 +202,30 @@ cc.TransitionProgressRadialCCW.create = function (t, scene) { * A counter colock-wise radial transition to the next scene * @class * @extends cc.TransitionProgress + * @param {Number} t time + * @param {cc.Scene} scene + * @example + * var trans = new cc.TransitionProgressRadialCW(t, scene); */ cc.TransitionProgressRadialCW = cc.TransitionProgress.extend(/** @lends cc.TransitionProgressRadialCW# */{ + /** + * @param {Number} t time + * @param {cc.Scene} scene + */ + ctor:function (t, scene) { + cc.TransitionProgress.prototype.ctor.call(this); + scene && this.initWithDuration(t, scene); + }, + _progressTimerNodeWithRenderTexture:function (texture) { var size = cc.director.getWinSize(); - var pNode = cc.ProgressTimer.create(texture.sprite); + var pNode = new cc.ProgressTimer(texture.sprite); // but it is flipped upside down so we flip the sprite if (cc._renderType === cc._RENDER_TYPE_WEBGL) pNode.sprite.flippedY = true; - pNode.type = cc.PROGRESS_TIMER_TYPE_RADIAL; + pNode.type = cc.ProgressTimer.TYPE_RADIAL; // Return the radial type that we want to use pNode.reverseDir = true; @@ -201,17 +238,17 @@ cc.TransitionProgressRadialCW = cc.TransitionProgress.extend(/** @lends cc.Trans /** * create a cc.TransitionProgressRadialCW object - * @function + * @deprecated since v3.0,please use cc.TransitionProgressRadialCW(t, scene) instead. * @param {Number} t time * @param {cc.Scene} scene * @return {cc.TransitionProgressRadialCW} */ cc.TransitionProgressRadialCW.create = function (t, scene) { var tempScene = new cc.TransitionProgressRadialCW(); - if ((tempScene != null) && (tempScene.initWithDuration(t, scene))) { + if ((tempScene !== null) && (tempScene.initWithDuration(t, scene))) { return tempScene; } - return null; + return new cc.TransitionProgressRadialCW(t, scene); }; /** @@ -219,17 +256,30 @@ cc.TransitionProgressRadialCW.create = function (t, scene) { * A colock-wise radial transition to the next scene * @class * @extends cc.TransitionProgress + * @param {Number} t time + * @param {cc.Scene} scene + * @example + * var trans = new cc.TransitionProgressHorizontal(t, scene); */ cc.TransitionProgressHorizontal = cc.TransitionProgress.extend(/** @lends cc.TransitionProgressHorizontal# */{ + /** + * @param {Number} t time + * @param {cc.Scene} scene + */ + ctor:function (t, scene) { + cc.TransitionProgress.prototype.ctor.call(this); + scene && this.initWithDuration(t, scene); + }, + _progressTimerNodeWithRenderTexture:function (texture) { var size = cc.director.getWinSize(); - var pNode = cc.ProgressTimer.create(texture.sprite); + var pNode = new cc.ProgressTimer(texture.sprite); // but it is flipped upside down so we flip the sprite if (cc._renderType === cc._RENDER_TYPE_WEBGL) pNode.sprite.flippedY = true; - pNode.type = cc.PROGRESS_TIMER_TYPE_BAR; + pNode.type = cc.ProgressTimer.TYPE_BAR; pNode.midPoint = cc.p(1, 0); pNode.barChangeRate = cc.p(1, 0); @@ -243,34 +293,44 @@ cc.TransitionProgressHorizontal = cc.TransitionProgress.extend(/** @lends cc.Tra /** * create a cc.TransitionProgressHorizontal object - * @function + * @deprecated since v3.0,please use new cc.TransitionProgressHorizontal(t, scene) instead. * @param {Number} t time * @param {cc.Scene} scene * @return {cc.TransitionProgressHorizontal} */ cc.TransitionProgressHorizontal.create = function (t, scene) { - var tempScene = new cc.TransitionProgressHorizontal(); - if ((tempScene != null) && (tempScene.initWithDuration(t, scene))) { - return tempScene; - } - return null; + return new cc.TransitionProgressHorizontal(t, scene); }; /** * cc.TransitionProgressVertical transition. * @class * @extends cc.TransitionProgress + * @param {Number} t time + * @param {cc.Scene} scene + * @example + * var trans = new cc.TransitionProgressVertical(t, scene); */ cc.TransitionProgressVertical = cc.TransitionProgress.extend(/** @lends cc.TransitionProgressVertical# */{ + + /** + * @param {Number} t time + * @param {cc.Scene} scene + */ + ctor:function (t, scene) { + cc.TransitionProgress.prototype.ctor.call(this); + scene && this.initWithDuration(t, scene); + }, + _progressTimerNodeWithRenderTexture:function (texture) { var size = cc.director.getWinSize(); - var pNode = cc.ProgressTimer.create(texture.sprite); + var pNode = new cc.ProgressTimer(texture.sprite); // but it is flipped upside down so we flip the sprite if (cc._renderType === cc._RENDER_TYPE_WEBGL) pNode.sprite.flippedY = true; - pNode.type = cc.PROGRESS_TIMER_TYPE_BAR; + pNode.type = cc.ProgressTimer.TYPE_BAR; pNode.midPoint = cc.p(0, 0); pNode.barChangeRate = cc.p(0, 1); @@ -284,17 +344,13 @@ cc.TransitionProgressVertical = cc.TransitionProgress.extend(/** @lends cc.Trans /** * create a cc.TransitionProgressVertical object - * @function + * @deprecated since v3.0,please use new cc.TransitionProgressVertical(t, scene) instead. * @param {Number} t time * @param {cc.Scene} scene * @return {cc.TransitionProgressVertical} */ cc.TransitionProgressVertical.create = function (t, scene) { - var tempScene = new cc.TransitionProgressVertical(); - if ((tempScene != null) && (tempScene.initWithDuration(t, scene))) { - return tempScene; - } - return null; + return new cc.TransitionProgressVertical(t, scene); }; /** @@ -303,14 +359,25 @@ cc.TransitionProgressVertical.create = function (t, scene) { * @extends cc.TransitionProgress */ cc.TransitionProgressInOut = cc.TransitionProgress.extend(/** @lends cc.TransitionProgressInOut# */{ + + /** + * The constructor of cc.TransitionProgressInOut. override it to extend the construction behavior, remember to call "this._super()" in the extended "ctor" function. + * @param {Number} t time + * @param {cc.Scene} scene + */ + ctor:function (t, scene) { + cc.TransitionProgress.prototype.ctor.call(this); + scene && this.initWithDuration(t, scene); + }, + _progressTimerNodeWithRenderTexture:function (texture) { var size = cc.director.getWinSize(); - var pNode = cc.ProgressTimer.create(texture.sprite); + var pNode = new cc.ProgressTimer(texture.sprite); // but it is flipped upside down so we flip the sprite if (cc._renderType === cc._RENDER_TYPE_WEBGL) pNode.sprite.flippedY = true; - pNode.type = cc.PROGRESS_TIMER_TYPE_BAR; + pNode.type = cc.ProgressTimer.TYPE_BAR; pNode.midPoint = cc.p(0.5, 0.5); pNode.barChangeRate = cc.p(1, 1); @@ -333,16 +400,13 @@ cc.TransitionProgressInOut = cc.TransitionProgress.extend(/** @lends cc.Transiti /** * create a cc.TransitionProgressInOut object * @function + * @deprecated * @param {Number} t time * @param {cc.Scene} scene * @return {cc.TransitionProgressInOut} */ cc.TransitionProgressInOut.create = function (t, scene) { - var tempScene = new cc.TransitionProgressInOut(); - if ((tempScene != null) && (tempScene.initWithDuration(t, scene))) { - return tempScene; - } - return null; + return new cc.TransitionProgressInOut(t, scene); }; /** @@ -351,20 +415,31 @@ cc.TransitionProgressInOut.create = function (t, scene) { * @extends cc.TransitionProgress */ cc.TransitionProgressOutIn = cc.TransitionProgress.extend(/** @lends cc.TransitionProgressOutIn# */{ + + /** + * The constructor of cc.TransitionProgressOutIn. override it to extend the construction behavior, remember to call "this._super()" in the extended "ctor" function. + * @param {Number} t time + * @param {cc.Scene} scene + */ + ctor:function (t, scene) { + cc.TransitionProgress.prototype.ctor.call(this); + scene && this.initWithDuration(t, scene); + }, + _progressTimerNodeWithRenderTexture:function (texture) { var size = cc.director.getWinSize(); - var pNode = cc.ProgressTimer.create(texture.sprite); + var pNode = new cc.ProgressTimer(texture.sprite); // but it is flipped upside down so we flip the sprite if (cc._renderType === cc._RENDER_TYPE_WEBGL) pNode.sprite.flippedY = true; - pNode.type = cc.PROGRESS_TIMER_TYPE_BAR; + pNode.type = cc.ProgressTimer.TYPE_BAR; pNode.midPoint = cc.p(0.5, 0.5); pNode.barChangeRate = cc.p(1, 1); pNode.percentage = 100; - this._setAttrs(pNode, winSize.width / 2, winSize.height / 2); + this._setAttrs(pNode, size.width / 2, size.height / 2); return pNode; } @@ -373,14 +448,11 @@ cc.TransitionProgressOutIn = cc.TransitionProgress.extend(/** @lends cc.Transiti /** * create a cc.TransitionProgressOutIn object * @function + * @deprecated * @param {Number} t time * @param {cc.Scene} scene * @return {cc.TransitionProgressOutIn} */ cc.TransitionProgressOutIn.create = function (t, scene) { - var tempScene = new cc.TransitionProgressOutIn(); - if ((tempScene != null) && (tempScene.initWithDuration(t, scene))) { - return tempScene; - } - return null; + return new cc.TransitionProgressOutIn(t, scene); }; diff --git a/extensions/ccb-reader/CCBAnimationManager.js b/extensions/ccb-reader/CCBAnimationManager.js index 17c4b4317a..8952fc9de7 100644 --- a/extensions/ccb-reader/CCBAnimationManager.js +++ b/extensions/ccb-reader/CCBAnimationManager.js @@ -1,7 +1,7 @@ /**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2008-2010 Ricardo Quesada - Copyright (c) 2011 Zynga Inc. + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -205,7 +205,7 @@ cc.BuilderAnimationManager = cc.Class.extend({ // Move base values var locBaseValues = this._baseValues; var baseValue = locBaseValues.objectForKey(fromNode); - if(baseValue != null) { + if(baseValue !== null) { locBaseValues.setObject(baseValue, toNode); locBaseValues.removeObjectForKey(fromNode); } @@ -231,7 +231,7 @@ cc.BuilderAnimationManager = cc.Class.extend({ var timeSinceLastKeyframe = keyframe.getTime() - lastKeyframeTime; lastKeyframeTime = keyframe.getTime(); if(timeSinceLastKeyframe > 0) { - actions.push(cc.DelayTime.create(timeSinceLastKeyframe)); + actions.push(cc.delayTime(timeSinceLastKeyframe)); } var keyVal = keyframe.getValue(); @@ -246,23 +246,21 @@ cc.BuilderAnimationManager = cc.Class.extend({ actions.push(callback); } else { var target; - if(selectorTarget == CCB_TARGETTYPE_DOCUMENTROOT) + if(selectorTarget === CCB_TARGETTYPE_DOCUMENTROOT) target = this._rootNode; - else if (selectorTarget == CCB_TARGETTYPE_OWNER) + else if (selectorTarget === CCB_TARGETTYPE_OWNER) target = this._owner; if(target != null) { if(selectorName.length > 0) { var selCallFunc = 0; - var targetAsCCBSelectorResolver = target; - if(target.onResolveCCBCCCallFuncSelector != null) - selCallFunc = targetAsCCBSelectorResolver.onResolveCCBCCCallFuncSelector(target, selectorName); - if(selCallFunc == 0) + selCallFunc = target.onResolveCCBCCCallFuncSelector(target, selectorName); + if(selCallFunc === 0) cc.log("Skipping selector '" + selectorName + "' since no CCBSelectorResolver is present."); else - actions.push(cc.CallFunc.create(selCallFunc,target)); + actions.push(cc.callFunc(selCallFunc,target)); } else { cc.log("Unexpected empty selector."); } @@ -272,7 +270,7 @@ cc.BuilderAnimationManager = cc.Class.extend({ if(actions.length < 1) return null; - return cc.Sequence.create(actions); + return cc.sequence(actions); }, getActionForSoundChannel:function(channel) { var lastKeyframeTime = 0; @@ -286,7 +284,7 @@ cc.BuilderAnimationManager = cc.Class.extend({ var timeSinceLastKeyframe = keyframe.getTime() - lastKeyframeTime; lastKeyframeTime = keyframe.getTime(); if(timeSinceLastKeyframe > 0) { - actions.push(cc.DelayTime.create(timeSinceLastKeyframe)); + actions.push(cc.delayTime(timeSinceLastKeyframe)); } var keyVal = keyframe.getValue(); @@ -298,7 +296,7 @@ cc.BuilderAnimationManager = cc.Class.extend({ if(actions.length < 1) return null; - return cc.Sequence.create(actions); + return cc.sequence(actions); }, runAnimationsForSequenceNamed:function(name){ @@ -342,7 +340,7 @@ cc.BuilderAnimationManager = cc.Class.extend({ var baseKeys = nodeBaseValues.allKeys(); for(j = 0; j < baseKeys.length;j++){ var selBaseKey = baseKeys[j]; - if(seqNodePropNames.indexOf(selBaseKey) == -1){ + if(seqNodePropNames.indexOf(selBaseKey) === -1){ var value = nodeBaseValues.objectForKey(selBaseKey); if(value != null) this._setAnimatedProperty(selBaseKey,node, value, tweenDuration); @@ -353,8 +351,8 @@ cc.BuilderAnimationManager = cc.Class.extend({ // Make callback at end of sequence var seq = this._getSequence(nSeqId); - var completeAction = cc.Sequence.create(cc.DelayTime.create(seq.getDuration() + tweenDuration), - cc.CallFunc.create(this._sequenceCompleted,this)); + var completeAction = cc.sequence(cc.delayTime(seq.getDuration() + tweenDuration), + cc.callFunc(this._sequenceCompleted,this)); this._rootNode.runAction(completeAction); // Playback callbacks and sounds @@ -381,7 +379,7 @@ cc.BuilderAnimationManager = cc.Class.extend({ runAnimations:function (name, tweenDuration) { tweenDuration = tweenDuration || 0; var nSeqId; - if(typeof(name) === "string") + if(cc.isString(name)) nSeqId = this._getSequenceId(name); else nSeqId = name; @@ -444,19 +442,19 @@ cc.BuilderAnimationManager = cc.Class.extend({ } else if (propName === "rotationY") { return cc.BuilderRotateYTo.create(duration, keyframe1.getValue()); } else if (propName === "opacity") { - return cc.FadeTo.create(duration, keyframe1.getValue()); + return cc.fadeTo(duration, keyframe1.getValue()); } else if (propName === "color") { var selColor = keyframe1.getValue().getColor(); - return cc.TintTo.create(duration, selColor.r, selColor.g, selColor.b); + return cc.tintTo(duration, selColor.r, selColor.g, selColor.b); } else if (propName === "visible") { var isVisible = keyframe1.getValue(); if (isVisible) { - return cc.Sequence.create(cc.DelayTime.create(duration), cc.Show.create()); + return cc.sequence(cc.delayTime(duration), cc.show()); } else { - return cc.Sequence.create(cc.DelayTime.create(duration), cc.Hide.create()); + return cc.sequence(cc.delayTime(duration), cc.hide()); } } else if (propName === "displayFrame") { - return cc.Sequence.create(cc.DelayTime.create(duration), cc.BuilderSetSpriteFrame.create(keyframe1.getValue())); + return cc.sequence(cc.delayTime(duration), cc.BuilderSetSpriteFrame.create(keyframe1.getValue())); } else if(propName === "position"){ getArr = this._getBaseValue(node,propName); type = getArr[2]; @@ -470,7 +468,7 @@ cc.BuilderAnimationManager = cc.Class.extend({ var absPos = cc._getAbsolutePosition(x,y, type,containerSize,propName); - return cc.MoveTo.create(duration,absPos); + return cc.moveTo(duration,absPos); } else if( propName === "scale"){ getArr = this._getBaseValue(node,propName); type = getArr[2]; @@ -487,13 +485,13 @@ cc.BuilderAnimationManager = cc.Class.extend({ y *= resolutionScale; } - return cc.ScaleTo.create(duration,x,y); + return cc.scaleTo(duration,x,y); } else if( propName === "skew") { //get relative position getValueArr = keyframe1.getValue(); x = getValueArr[0]; y = getValueArr[1]; - return cc.SkewTo.create(duration,x,y); + return cc.skewTo(duration,x,y); } else { cc.log("BuilderReader: Failed to create animation for property: " + propName); } @@ -539,7 +537,13 @@ cc.BuilderAnimationManager = cc.Class.extend({ // TODO only handle rotation, opacity, displayFrame, color if(propName === "rotation"){ node.setRotation(value); - } else if(propName === "opacity"){ + } else if(propName === "rotationX") + { + node.setRotationSkewX(value); + }else if(propName === "rotationY") + { + node.setRotationSkewY(value); + }else if(propName === "opacity"){ node.setOpacity(value); } else if(propName === "displayFrame"){ node.setSpriteFrame(value); @@ -578,29 +582,29 @@ cc.BuilderAnimationManager = cc.Class.extend({ if (easingType === CCB_KEYFRAME_EASING_LINEAR || easingType === CCB_KEYFRAME_EASING_INSTANT ) { return action; } else if (easingType === CCB_KEYFRAME_EASING_CUBIC_IN) { - return cc.EaseIn.create(action, easingOpt); + return action.easing(cc.easeIn(easingOpt)); } else if (easingType === CCB_KEYFRAME_EASING_CUBIC_OUT) { - return cc.EaseOut.create(action, easingOpt); + return action.easing(cc.easeOut(easingOpt)); } else if (easingType === CCB_KEYFRAME_EASING_CUBIC_INOUT) { - return cc.EaseInOut.create(action, easingOpt); + return action.easing(cc.easeInOut(easingOpt)); } else if (easingType === CCB_KEYFRAME_EASING_BACK_IN) { - return cc.EaseBackIn.create(action); + return action.easing(cc.easeBackIn()); } else if (easingType === CCB_KEYFRAME_EASING_BACK_OUT) { - return cc.EaseBackOut.create(action); + return action.easing(cc.easeBackOut()); } else if (easingType === CCB_KEYFRAME_EASING_BACK_INOUT) { - return cc.EaseBackInOut.create(action); + return action.easing(cc.easeBackInOut()); } else if (easingType === CCB_KEYFRAME_EASING_BOUNCE_IN) { - return cc.EaseBounceIn.create(action); + return action.easing(cc.easeBounceIn()); } else if (easingType === CCB_KEYFRAME_EASING_BOUNCE_OUT) { - return cc.EaseBounceOut.create(action); + return action.easing(cc.easeBounceOut()); } else if (easingType === CCB_KEYFRAME_EASING_BOUNCE_INOUT) { - return cc.EaseBounceInOut.create(action); + return action.easing(cc.easeBounceInOut()); } else if (easingType === CCB_KEYFRAME_EASING_ELASTIC_IN) { - return cc.EaseElasticIn.create(action, easingOpt); + return action.easing(cc.easeElasticIn(easingOpt)); } else if (easingType === CCB_KEYFRAME_EASING_ELASTIC_OUT) { - return cc.EaseElasticOut.create(action, easingOpt); + return action.easing(cc.easeElasticOut(easingOpt)); } else if (easingType === CCB_KEYFRAME_EASING_ELASTIC_INOUT) { - return cc.EaseElasticInOut.create(action, easingOpt); + return action.easing(cc.easeElasticInOut(easingOpt)); } else { cc.log("BuilderReader: Unkown easing type " + easingType); return action; @@ -619,7 +623,7 @@ cc.BuilderAnimationManager = cc.Class.extend({ var timeFirst = keyframeFirst.getTime() + tweenDuration; if (timeFirst > 0) { - actions.push(cc.DelayTime.create(timeFirst)); + actions.push(cc.delayTime(timeFirst)); } for (var i = 0; i < numKeyframes - 1; ++i) { @@ -634,8 +638,7 @@ cc.BuilderAnimationManager = cc.Class.extend({ } } - var seq = cc.Sequence.create(actions); - node.runAction(seq); + node.runAction(cc.sequence(actions)); } }, @@ -651,7 +654,7 @@ cc.BuilderAnimationManager = cc.Class.extend({ var nextSeqId = locRunningSequence.getChainedSequenceId(); this._runningSequence = null; - if (nextSeqId != -1) + if (nextSeqId !== -1) this.runAnimations(nextSeqId, 0); if (this._delegate) diff --git a/extensions/ccb-reader/CCBKeyframe.js b/extensions/ccb-reader/CCBKeyframe.js index 57da466e85..c3eb7afaeb 100644 --- a/extensions/ccb-reader/CCBKeyframe.js +++ b/extensions/ccb-reader/CCBKeyframe.js @@ -1,7 +1,7 @@ /**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2008-2010 Ricardo Quesada - Copyright (c) 2011 Zynga Inc. + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. http://www.cocos2d-x.org diff --git a/extensions/ccb-reader/CCBReader.js b/extensions/ccb-reader/CCBReader.js index 98636f9c47..657f68f607 100644 --- a/extensions/ccb-reader/CCBReader.js +++ b/extensions/ccb-reader/CCBReader.js @@ -1,7 +1,7 @@ /**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2008-2010 Ricardo Quesada - Copyright (c) 2011 Zynga Inc. + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -159,7 +159,7 @@ cc.BuilderReader = cc.Class.extend({ this._currentBit = -1; this._currentByte = -1; - if (arguments.length != 0) { + if (arguments.length !== 0) { if (ccNodeLoaderLibrary instanceof cc.BuilderReader) { var ccbReader = ccNodeLoaderLibrary; @@ -222,7 +222,7 @@ cc.BuilderReader = cc.Class.extend({ if (/msie/i.test(navigator.userAgent) && !/opera/i.test(navigator.userAgent)) { req.setRequestHeader("Accept-Charset", "x-user-defined"); req.send(null); - if (req.status != 200) { + if (req.status !== 200) { cc.log(errInfo); return null; } @@ -236,7 +236,7 @@ cc.BuilderReader = cc.Class.extend({ if (req.overrideMimeType) req.overrideMimeType('text\/plain; charset=x-user-defined'); req.send(null); - if (req.status != 200) { + if (req.status !== 200) { cc.log(errInfo); return null; } @@ -280,7 +280,7 @@ cc.BuilderReader = cc.Class.extend({ var nodeGraph = this.readFileWithCleanUp(true); - if (nodeGraph && locAnimationManager.getAutoPlaySequenceId() != -1) { + if (nodeGraph && locAnimationManager.getAutoPlaySequenceId() !== -1) { //auto play animations locAnimationManager.runAnimations(locAnimationManager.getAutoPlaySequenceId(), 0); } @@ -305,7 +305,7 @@ cc.BuilderReader = cc.Class.extend({ createSceneWithNodeGraphFromFile:function (ccbFileName, owner, parentSize, animationManager) { var node = this.readNodeGraphFromFile(ccbFileName, owner, parentSize, animationManager); - var scene = cc.Scene.create(); + var scene = new cc.Scene(); scene.addChild(node); return scene; }, @@ -376,7 +376,7 @@ cc.BuilderReader = cc.Class.extend({ }, readBool:function () { - return (0 != this.readByte()); + return (0 !== this.readByte()); }, readFloat:function () { @@ -428,7 +428,7 @@ cc.BuilderReader = cc.Class.extend({ this._currentByte += size; - return exponent == (bias << 1) + 1 ? significand ? NaN : signal ? -Infinity : +Infinity + return exponent === (bias << 1) + 1 ? significand ? NaN : signal ? -Infinity : +Infinity : (1 + signal * -2) * (exponent || significand ? !exponent ? Math.pow(2, -bias + 1) * significand : Math.pow(2, exponent - bias) * (1 + significand) : 0); }, @@ -458,7 +458,7 @@ cc.BuilderReader = cc.Class.extend({ }, _shl:function (a, b) { - for (++b; --b; a = ((a %= 0x7fffffff + 1) & 0x40000000) == 0x40000000 ? a * 2 : (a - 0x40000000) * 2 + 0x7fffffff + 1); + for (++b; --b; a = ((a %= 0x7fffffff + 1) & 0x40000000) === 0x40000000 ? a * 2 : (a - 0x40000000) * 2 + 0x7fffffff + 1); return a; }, @@ -669,34 +669,34 @@ cc.BuilderReader = cc.Class.extend({ keyframe.setEasingType(easingType); keyframe.setEasingOpt(easingOpt); - if (type == CCB_PROPTYPE_CHECK) { + if (type === CCB_PROPTYPE_CHECK) { value = this.readBool(); - } else if (type == CCB_PROPTYPE_BYTE) { + } else if (type === CCB_PROPTYPE_BYTE) { value = this.readByte(); - } else if (type == CCB_PROPTYPE_COLOR3) { + } else if (type === CCB_PROPTYPE_COLOR3) { var c = cc.color(this.readByte(), this.readByte(), this.readByte()); value = cc.Color3BWapper.create(c); - } else if (type == CCB_PROPTYPE_FLOATXY) { + } else if (type === CCB_PROPTYPE_FLOATXY) { value = [this.readFloat(), this.readFloat()]; - } else if (type == CCB_PROPTYPE_DEGREES) { + } else if (type === CCB_PROPTYPE_DEGREES) { value = this.readFloat(); - } else if (type == CCB_PROPTYPE_SCALELOCK || type == CCB_PROPTYPE_POSITION || type == CCB_PROPTYPE_FLOATXY) { + } else if (type === CCB_PROPTYPE_SCALELOCK || type === CCB_PROPTYPE_POSITION || type === CCB_PROPTYPE_FLOATXY) { value = [this.readFloat(), this.readFloat()]; - } else if (type == CCB_PROPTYPE_SPRITEFRAME) { + } else if (type === CCB_PROPTYPE_SPRITEFRAME) { var spriteSheet = this.readCachedString(); var spriteFile = this.readCachedString(); - if (spriteSheet == "") { + if (spriteSheet === "") { spriteFile = this._ccbRootPath + spriteFile; var texture = cc.textureCache.addImage(spriteFile); var locContentSize = texture.getContentSize(); var bounds = cc.rect(0, 0, locContentSize.width, locContentSize.height); - value = cc.SpriteFrame.create(texture, bounds); + value = new cc.SpriteFrame(texture, bounds); } else { spriteSheet = this._ccbRootPath + spriteSheet; var frameCache = cc.spriteFrameCache; // Load the sprite sheet only if it is not loaded - if (this._loadedSpriteSheets.indexOf(spriteSheet) == -1) { + if (this._loadedSpriteSheets.indexOf(spriteSheet) === -1) { frameCache.addSpriteFrames(spriteSheet); this._loadedSpriteSheets.push(spriteSheet); } @@ -709,21 +709,20 @@ cc.BuilderReader = cc.Class.extend({ _readHeader:function () { /* If no bytes loaded, don't crash about it. */ - if (this._data == null) { + if (!this._data) return false; - } /* Read magic bytes */ var magicBytes = this._readStringFromBytes(this._currentByte, 4, true); this._currentByte += 4; - if (magicBytes != 'ccbi') { + if (magicBytes !== 'ccbi') { return false; } /* Read version. */ var version = this.readInt(false); - if (version != CCB_VERSION) { + if (version !== CCB_VERSION) { cc.log("WARNING! Incompatible ccbi file version (file: " + version + " reader: " + CCB_VERSION + ")"); return false; } @@ -783,7 +782,7 @@ cc.BuilderReader = cc.Class.extend({ var memberVarAssignmentType = this.readInt(false); var memberVarAssignmentName; - if (memberVarAssignmentType != CCB_TARGETTYPE_NONE) { + if (memberVarAssignmentType !== CCB_TARGETTYPE_NONE) { memberVarAssignmentName = this.readCachedString(); } @@ -799,7 +798,7 @@ cc.BuilderReader = cc.Class.extend({ if (!locActionManager.getRootNode()) locActionManager.setRootNode(node); - if (locJsControlled && node == locActionManager.getRootNode()) { + if (locJsControlled && node === locActionManager.getRootNode()) { locActionManager.setDocumentControllerName(jsControlledName); } @@ -855,7 +854,7 @@ cc.BuilderReader = cc.Class.extend({ node = embeddedNode; } var target = null, locMemberAssigner = null; - if (memberVarAssignmentType != CCB_TARGETTYPE_NONE) { + if (memberVarAssignmentType !== CCB_TARGETTYPE_NONE) { if (!locJsControlled) { if (memberVarAssignmentType === CCB_TARGETTYPE_DOCUMENTROOT) { target = locActionManager.getRootNode(); @@ -863,19 +862,19 @@ cc.BuilderReader = cc.Class.extend({ target = this._owner; } - if (target != null) { + if (!target) { var assigned = false; - if (target != null && (target.onAssignCCBMemberVariable)) { + if (target.onAssignCCBMemberVariable) assigned = target.onAssignCCBMemberVariable(target, memberVarAssignmentName, node); - } + locMemberAssigner = this._ccbMemberVariableAssigner; if (!assigned && locMemberAssigner != null && locMemberAssigner.onAssignCCBMemberVariable) { locMemberAssigner.onAssignCCBMemberVariable(target, memberVarAssignmentName, node); } } } else { - if (memberVarAssignmentType == CCB_TARGETTYPE_DOCUMENTROOT) { + if (memberVarAssignmentType === CCB_TARGETTYPE_DOCUMENTROOT) { locActionManager.addDocumentOutletName(memberVarAssignmentName); locActionManager.addDocumentOutletNode(node); } else { @@ -928,15 +927,15 @@ cc.BuilderReader = cc.Class.extend({ }, _getBit:function () { - var bit = (this._data[this._currentByte] & (1 << this._currentBit)) != 0; - + var bit = (this._data[this._currentByte] & (1 << this._currentBit)) !== 0; this._currentBit++; if (this._currentBit >= 8) { this._currentBit = 0; this._currentByte++; + if(this._currentByte > this._data.length) + throw "out of the data bound"; } - return bit; }, @@ -965,7 +964,7 @@ cc.BuilderReader.loadAsScene = function (ccbFilePath, owner, parentSize, ccbRoot var getNode = cc.BuilderReader.load(ccbFilePath, owner, parentSize, ccbRootPath); - var scene = cc.Scene.create(); + var scene = new cc.Scene(); scene.addChild(getNode); return scene; }; @@ -978,7 +977,7 @@ cc.BuilderReader.load = function (ccbFilePath, owner, parentSize, ccbRootPath) { ccbRootPath = ccbRootPath || cc.BuilderReader.getResourcePath(); var reader = new cc.BuilderReader(cc.NodeLoaderLibrary.newDefaultCCNodeLoaderLibrary()); reader.setCCBRootPath(ccbRootPath); - if((ccbFilePath.length < 5)||(ccbFilePath.toLowerCase().lastIndexOf(".ccbi") != ccbFilePath.length - 5)) + if((ccbFilePath.length < 5)||(ccbFilePath.toLowerCase().lastIndexOf(".ccbi") !== ccbFilePath.length - 5)) ccbFilePath = ccbFilePath + ".ccbi"; var node = reader.readNodeGraphFromFile(ccbFilePath, owner, parentSize); @@ -1060,7 +1059,7 @@ cc.BuilderReader.load = function (ccbFilePath, owner, parentSize, ccbRootPath) { controller[outletName] = outletNode; } - if (controller.onDidLoadFromCCB && typeof(controller.onDidLoadFromCCB) == "function") + if (controller.onDidLoadFromCCB && cc.isFunction(controller.onDidLoadFromCCB)) controller.onDidLoadFromCCB(); // Setup timeline callbacks @@ -1071,13 +1070,16 @@ cc.BuilderReader.load = function (ccbFilePath, owner, parentSize, ccbRootPath) { var kfCallbackName = callbackSplit[1]; if (callbackType == 1){ // Document callback - animationManager.setCallFunc(cc.CallFunc.create(controller[kfCallbackName], controller), keyframeCallbacks[j]); + animationManager.setCallFunc(cc.callFunc(controller[kfCallbackName], controller), keyframeCallbacks[j]); } else if (callbackType == 2 && owner) {// Owner callback - animationManager.setCallFunc(cc.CallFunc.create(owner[kfCallbackName], owner), keyframeCallbacks[j]); + animationManager.setCallFunc(cc.callFunc(owner[kfCallbackName], owner), keyframeCallbacks[j]); } } } + //auto play animations + animationManager.runAnimations(animationManager.getAutoPlaySequenceId(), 0); + return node; }; @@ -1092,7 +1094,7 @@ cc.BuilderReader.getResourcePath = function () { cc.BuilderReader.lastPathComponent = function (pathStr) { var slashPos = pathStr.lastIndexOf("/"); - if (slashPos != -1) { + if (slashPos !== -1) { return pathStr.substring(slashPos + 1, pathStr.length - slashPos); } return pathStr; @@ -1100,7 +1102,7 @@ cc.BuilderReader.lastPathComponent = function (pathStr) { cc.BuilderReader.deletePathExtension = function (pathStr) { var dotPos = pathStr.lastIndexOf("."); - if (dotPos != -1) { + if (dotPos !== -1) { return pathStr.substring(0, dotPos); } return pathStr; @@ -1112,7 +1114,7 @@ cc.BuilderReader.toLowerCase = function (sourceStr) { cc.BuilderReader.endsWith = function (sourceStr, ending) { if (sourceStr.length >= ending.length) - return (sourceStr.lastIndexOf(ending) == 0); + return (sourceStr.lastIndexOf(ending) === 0); else return false; }; diff --git a/extensions/ccb-reader/CCBReaderUtil.js b/extensions/ccb-reader/CCBReaderUtil.js index ec327c8533..d3ebcfa821 100644 --- a/extensions/ccb-reader/CCBReaderUtil.js +++ b/extensions/ccb-reader/CCBReaderUtil.js @@ -1,7 +1,7 @@ /**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2008-2010 Ricardo Quesada - Copyright (c) 2011 Zynga Inc. + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. http://www.cocos2d-x.org diff --git a/extensions/ccb-reader/CCBRelativePositioning.js b/extensions/ccb-reader/CCBRelativePositioning.js index b314bab304..53c7e901a9 100644 --- a/extensions/ccb-reader/CCBRelativePositioning.js +++ b/extensions/ccb-reader/CCBRelativePositioning.js @@ -1,7 +1,7 @@ /**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2008-2010 Ricardo Quesada - Copyright (c) 2011 Zynga Inc. + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. http://www.cocos2d-x.org diff --git a/extensions/ccb-reader/CCBSequence.js b/extensions/ccb-reader/CCBSequence.js index b991c48e4b..a1bc0e2734 100644 --- a/extensions/ccb-reader/CCBSequence.js +++ b/extensions/ccb-reader/CCBSequence.js @@ -1,7 +1,7 @@ /**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2008-2010 Ricardo Quesada - Copyright (c) 2011 Zynga Inc. + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. http://www.cocos2d-x.org diff --git a/extensions/ccb-reader/CCBValue.js b/extensions/ccb-reader/CCBValue.js index c8f028f0c7..781c25d861 100644 --- a/extensions/ccb-reader/CCBValue.js +++ b/extensions/ccb-reader/CCBValue.js @@ -1,7 +1,7 @@ /**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2008-2010 Ricardo Quesada - Copyright (c) 2011 Zynga Inc. + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -76,12 +76,6 @@ cc.BuilderValue = cc.Class.extend({ }); cc.BuilderValue.create = function (value) { - var ret = new cc.BuilderValue(); - if(ret){ - if(typeof(value) == "number"){ - - } - } - return ret; + return new cc.BuilderValue(); }; diff --git a/extensions/ccb-reader/CCControlLoader.js b/extensions/ccb-reader/CCControlLoader.js index 859f9eceed..901f8509dd 100644 --- a/extensions/ccb-reader/CCControlLoader.js +++ b/extensions/ccb-reader/CCControlLoader.js @@ -1,7 +1,7 @@ /**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2008-2010 Ricardo Quesada - Copyright (c) 2011 Zynga Inc. + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -31,7 +31,7 @@ cc.BuilderFileLoader = cc.NodeLoader.extend({ return cc.BuilderFile.create(); }, onHandlePropTypeCCBFile:function (node, parent, propertyName, ccbFileNode, ccbReader) { - if (propertyName == PROPERTY_CCBFILE) { + if (propertyName === PROPERTY_CCBFILE) { node.setCCBFileNode(ccbFileNode); } else { cc.NodeLoader.prototype.onHandlePropTypeCCBFile.call(this, node, parent, propertyName, ccbFileNode, ccbReader); @@ -51,16 +51,16 @@ cc.ControlLoader = cc.NodeLoader.extend({ _createCCNode:function (parent, ccbReander) { }, onHandlePropTypeBlockCCControl:function (node, parent, propertyName, blockCCControlData, ccbReader) { - if (propertyName == PROPERTY_CCCONTROL) { + if (propertyName === PROPERTY_CCCONTROL) { node.addTargetWithActionForControlEvents(blockCCControlData.target, blockCCControlData.selCCControlHandler, blockCCControlData.controlEvents); } else { cc.NodeLoader.prototype.onHandlePropTypeBlockCCControl.call(this, node, parent, propertyName, blockCCControlData, ccbReader); } }, onHandlePropTypeCheck:function (node, parent, propertyName, check, ccbReader) { - if (propertyName == PROPERTY_ENABLED) { + if (propertyName === PROPERTY_ENABLED) { node.setEnabled(check); - } else if (propertyName == PROPERTY_SELECTED) { + } else if (propertyName === PROPERTY_SELECTED) { node.setSelected(check); } else { cc.NodeLoader.prototype.onHandlePropTypeCheck.call(this, node, parent, propertyName, check, ccbReader); @@ -89,73 +89,73 @@ var PROPERTY_BACKGROUNDSPRITEFRAME_DISABLED = "backgroundSpriteFrame|3"; cc.ControlButtonLoader = cc.ControlLoader.extend({ _createCCNode:function (parent, ccbReader) { - return cc.ControlButton.create(); + return new cc.ControlButton(); }, onHandlePropTypeCheck:function (node, parent, propertyName, check, ccbReader) { - if (propertyName == PROPERTY_ZOOMONTOUCHDOWN) { + if (propertyName === PROPERTY_ZOOMONTOUCHDOWN) { node.setZoomOnTouchDown(check); } else { cc.ControlLoader.prototype.onHandlePropTypeCheck.call(this, node, parent, propertyName, check, ccbReader); } }, onHandlePropTypeString:function (node, parent, propertyName, stringValue, ccbReader) { - if (propertyName == PROPERTY_TITLE_NORMAL) { + if (propertyName === PROPERTY_TITLE_NORMAL) { node.setTitleForState(stringValue, cc.CONTROL_STATE_NORMAL); - } else if (propertyName == PROPERTY_TITLE_HIGHLIGHTED) { + } else if (propertyName === PROPERTY_TITLE_HIGHLIGHTED) { node.setTitleForState(stringValue, cc.CONTROL_STATE_HIGHLIGHTED); - } else if (propertyName == PROPERTY_TITLE_DISABLED) { + } else if (propertyName === PROPERTY_TITLE_DISABLED) { node.setTitleForState(stringValue, cc.CONTROL_STATE_DISABLED); } else { cc.ControlLoader.prototype.onHandlePropTypeString.call(this, node, parent, propertyName, stringValue, ccbReader); } }, onHandlePropTypeFontTTF:function (node, parent, propertyName, fontTTF, ccbReader) { - if (propertyName == PROPERTY_TITLETTF_NORMAL) { + if (propertyName === PROPERTY_TITLETTF_NORMAL) { node.setTitleTTFForState(fontTTF, cc.CONTROL_STATE_NORMAL); - } else if (propertyName == PROPERTY_TITLETTF_HIGHLIGHTED) { + } else if (propertyName === PROPERTY_TITLETTF_HIGHLIGHTED) { node.setTitleTTFForState(fontTTF, cc.CONTROL_STATE_HIGHLIGHTED); - } else if (propertyName == PROPERTY_TITLETTF_DISABLED) { + } else if (propertyName === PROPERTY_TITLETTF_DISABLED) { node.setTitleTTFForState(fontTTF, cc.CONTROL_STATE_DISABLED); } else { cc.ControlLoader.prototype.onHandlePropTypeFontTTF.call(this, node, parent, propertyName, fontTTF, ccbReader); } }, onHandlePropTypeFloatScale:function (node, parent, propertyName, floatScale, ccbReader) { - if (propertyName == PROPERTY_TITLETTFSIZE_NORMAL) { + if (propertyName === PROPERTY_TITLETTFSIZE_NORMAL) { node.setTitleTTFSizeForState(floatScale, cc.CONTROL_STATE_NORMAL); - } else if (propertyName == PROPERTY_TITLETTFSIZE_HIGHLIGHTED) { + } else if (propertyName === PROPERTY_TITLETTFSIZE_HIGHLIGHTED) { node.setTitleTTFSizeForState(floatScale, cc.CONTROL_STATE_HIGHLIGHTED); - } else if (propertyName == PROPERTY_TITLETTFSIZE_DISABLED) { + } else if (propertyName === PROPERTY_TITLETTFSIZE_DISABLED) { node.setTitleTTFSizeForState(floatScale, cc.CONTROL_STATE_DISABLED); } else { cc.ControlLoader.prototype.onHandlePropTypeFloatScale.call(this, node, parent, propertyName, floatScale, ccbReader); } }, onHandlePropTypePoint:function (node, parent, propertyName, point, ccbReader) { - if (propertyName == PROPERTY_LABELANCHORPOINT) { + if (propertyName === PROPERTY_LABELANCHORPOINT) { node.setLabelAnchorPoint(point); } else { cc.ControlLoader.prototype.onHandlePropTypePoint.call(this, node, parent, propertyName, point, ccbReader); } }, onHandlePropTypeSize:function (node, parent, propertyName, size, ccbReader) { - if (propertyName == PROPERTY_PREFEREDSIZE) { + if (propertyName === PROPERTY_PREFEREDSIZE) { node.setPreferredSize(size); } else { cc.ControlLoader.prototype.onHandlePropTypeSize.call(this, node, parent, propertyName, size, ccbReader); } }, onHandlePropTypeSpriteFrame:function (node, parent, propertyName, spriteFrame, ccbReader) { - if (propertyName == PROPERTY_BACKGROUNDSPRITEFRAME_NORMAL) { + if (propertyName === PROPERTY_BACKGROUNDSPRITEFRAME_NORMAL) { if (spriteFrame != null) { node.setBackgroundSpriteFrameForState(spriteFrame, cc.CONTROL_STATE_NORMAL); } - } else if (propertyName == PROPERTY_BACKGROUNDSPRITEFRAME_HIGHLIGHTED) { + } else if (propertyName === PROPERTY_BACKGROUNDSPRITEFRAME_HIGHLIGHTED) { if (spriteFrame != null) { node.setBackgroundSpriteFrameForState(spriteFrame, cc.CONTROL_STATE_HIGHLIGHTED); } - } else if (propertyName == PROPERTY_BACKGROUNDSPRITEFRAME_DISABLED) { + } else if (propertyName === PROPERTY_BACKGROUNDSPRITEFRAME_DISABLED) { if (spriteFrame != null) { node.setBackgroundSpriteFrameForState(spriteFrame, cc.CONTROL_STATE_DISABLED); } @@ -164,11 +164,11 @@ cc.ControlButtonLoader = cc.ControlLoader.extend({ } }, onHandlePropTypeColor3:function (node, parent, propertyName, ccColor3B, ccbReader) { - if (propertyName == PROPERTY_TITLECOLOR_NORMAL) { + if (propertyName === PROPERTY_TITLECOLOR_NORMAL) { node.setTitleColorForState(ccColor3B, cc.CONTROL_STATE_NORMAL); - } else if (propertyName == PROPERTY_TITLECOLOR_HIGHLIGHTED) { + } else if (propertyName === PROPERTY_TITLECOLOR_HIGHLIGHTED) { node.setTitleColorForState(ccColor3B, cc.CONTROL_STATE_HIGHLIGHTED); - } else if (propertyName == PROPERTY_TITLECOLOR_DISABLED) { + } else if (propertyName === PROPERTY_TITLECOLOR_DISABLED) { node.setTitleColorForState(ccColor3B, cc.CONTROL_STATE_DISABLED); } else { cc.ControlLoader.prototype.onHandlePropTypeColor3.call(this, node, parent, propertyName, ccColor3B, ccbReader); @@ -188,11 +188,11 @@ var PROPERTY_SCALE = "scale"; cc.ScrollViewLoader = cc.NodeLoader.extend({ _createCCNode:function (parent, ccbReader) { - return cc.ScrollView.create(); + return new cc.ScrollView(); }, onHandlePropTypeSize:function(node,parent,propertyName,size,ccbReader){ - if(propertyName == PROPERTY_CONTENTSIZE){ + if(propertyName === PROPERTY_CONTENTSIZE){ node.setViewSize(size); }else{ cc.NodeLoader.prototype.onHandlePropTypeSize.call(this, node,parent,propertyName,size,ccbReader); @@ -200,7 +200,7 @@ cc.ScrollViewLoader = cc.NodeLoader.extend({ }, onHandlePropTypeCCBFile:function (node, parent, propertyName, ccbFileNode, ccbReader) { - if (propertyName == PROPERTY_CONTAINER) { + if (propertyName === PROPERTY_CONTAINER) { node.setContainer(ccbFileNode); node.updateInset(); } else { @@ -208,23 +208,23 @@ cc.ScrollViewLoader = cc.NodeLoader.extend({ } }, onHandlePropTypeCheck:function (node, parent, propertyName, check, ccbReader) { - if (propertyName == PROPERTY_CLIPSTOBOUNDS) { + if (propertyName === PROPERTY_CLIPSTOBOUNDS) { node.setClippingToBounds(check); - } else if (propertyName == PROPERTY_BOUNCES) { + } else if (propertyName === PROPERTY_BOUNCES) { node.setBounceable(check); } else { cc.NodeLoader.prototype.onHandlePropTypeCheck.call(this, node, parent, propertyName, check, ccbReader); } }, onHandlePropTypeFloat:function (node, parent, propertyName, floatValue, ccbReader) { - if (propertyName == PROPERTY_SCALE) { + if (propertyName === PROPERTY_SCALE) { node.setScale(floatValue); } else { cc.NodeLoader.prototype.onHandlePropTypeFloat.call(this, node, parent, propertyName, floatValue, ccbReader); } }, onHandlePropTypeIntegerLabeled:function (node, parent, propertyName, integerLabeled, ccbReader) { - if (propertyName == PROPERTY_DIRECTION) { + if (propertyName === PROPERTY_DIRECTION) { node.setDirection(integerLabeled); } else { cc.NodeLoader.prototype.onHandlePropTypeIntegerLabeled.call(this, node, parent, propertyName, integerLabeled, ccbReader); @@ -248,7 +248,7 @@ var PROPERTY_INSETBOTTOM = "insetBottom"; cc.Scale9SpriteLoader = cc.NodeLoader.extend({ _createCCNode:function(parent,ccbReader){ - var sprite = cc.Scale9Sprite.create(); + var sprite = new cc.Scale9Sprite(); sprite.setAnchorPoint(0, 0); @@ -256,7 +256,7 @@ cc.Scale9SpriteLoader = cc.NodeLoader.extend({ }, onHandlePropTypeColor3:function(node, parent, propertyName, ccColor3B,ccbReader){ - if(propertyName == PROPERTY_COLOR) { + if(propertyName === PROPERTY_COLOR) { if(ccColor3B.r !== 255 || ccColor3B.g !== 255 || ccColor3B.b !== 255){ node.setColor(ccColor3B); } @@ -265,14 +265,14 @@ cc.Scale9SpriteLoader = cc.NodeLoader.extend({ } }, onHandlePropTypeByte:function(node, parent, propertyName, byteValue,ccbReader){ - if(propertyName == PROPERTY_OPACITY) { + if(propertyName === PROPERTY_OPACITY) { node.setOpacity(byteValue); } else { cc.NodeLoader.prototype.onHandlePropTypeByte.call(this, node, parent, propertyName, byteValue,ccbReader); } }, onHandlePropTypeBlendFunc:function(node, parent, propertyName, ccBlendFunc,ccbReader){ - if(propertyName == PROPERTY_BLENDFUNC) { + if(propertyName === PROPERTY_BLENDFUNC) { // TODO Not exported by CocosBuilder yet! // node.setBlendFunc(ccBlendFunc); } else { @@ -280,29 +280,29 @@ cc.Scale9SpriteLoader = cc.NodeLoader.extend({ } }, onHandlePropTypeSpriteFrame:function(node, parent, propertyName, spriteFrame,ccbReader){ - if(propertyName == PROPERTY_SPRITEFRAME) { + if(propertyName === PROPERTY_SPRITEFRAME) { node.setSpriteFrame(spriteFrame); } else { cc.NodeLoader.prototype.onHandlePropTypeSpriteFrame.call(this, node, parent, propertyName, spriteFrame,ccbReader); } }, onHandlePropTypeSize:function(node, parent, propertyName, size,ccbReader){ - if(propertyName == PROPERTY_CONTENTSIZE) { + if(propertyName === PROPERTY_CONTENTSIZE) { //node.setContentSize(size); - } else if(propertyName == PROPERTY_PREFEREDSIZE) { + } else if(propertyName === PROPERTY_PREFEREDSIZE) { node.setPreferredSize(size); } else { cc.NodeLoader.prototype.onHandlePropTypeSize.call(this, node, parent, propertyName, size,ccbReader); } }, onHandlePropTypeFloat:function(node, parent, propertyName, floatValue,ccbReader){ - if(propertyName == PROPERTY_INSETLEFT) { + if(propertyName === PROPERTY_INSETLEFT) { node.setInsetLeft(floatValue); - } else if(propertyName == PROPERTY_INSETTOP) { + } else if(propertyName === PROPERTY_INSETTOP) { node.setInsetTop(floatValue); - } else if(propertyName == PROPERTY_INSETRIGHT) { + } else if(propertyName === PROPERTY_INSETRIGHT) { node.setInsetRight(floatValue); - } else if(propertyName == PROPERTY_INSETBOTTOM) { + } else if(propertyName === PROPERTY_INSETBOTTOM) { node.setInsetBottom(floatValue); } else { cc.NodeLoader.prototype.onHandlePropTypeFloat.call(this, node, parent, propertyName, floatValue,ccbReader); diff --git a/extensions/ccb-reader/CCNodeLoader.js b/extensions/ccb-reader/CCNodeLoader.js index 4a2da84488..67b575f41a 100644 --- a/extensions/ccb-reader/CCNodeLoader.js +++ b/extensions/ccb-reader/CCNodeLoader.js @@ -1,7 +1,7 @@ /**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2008-2010 Ricardo Quesada - Copyright (c) 2011 Zynga Inc. + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -89,9 +89,9 @@ cc.NodeLoader = cc.Class.extend({ node = node.getCCBFileNode(); //skip properties that doesn't have a value to override var getExtraPropsNames = node.userObject; - setProp = getExtraPropsNames.indexOf(propertyName) != -1; + setProp = getExtraPropsNames.indexOf(propertyName) !== -1; } - } else if(isExtraProp && node == ccbReader.getAnimationManager().getRootNode()){ + } else if(isExtraProp && node === ccbReader.getAnimationManager().getRootNode()){ var extraPropsNames = node.userObject; if(!extraPropsNames){ extraPropsNames = []; @@ -332,7 +332,7 @@ cc.NodeLoader = cc.Class.extend({ }, _createCCNode:function (parent, ccbReader) { - return cc.Node.create(); + return new cc.Node(); }, parsePropTypePosition:function (node, parent, ccbReader, propertyName) { @@ -418,7 +418,7 @@ cc.NodeLoader = cc.Class.extend({ ccbReader.getAnimationManager().setBaseValue([x,y,type],node,propertyName); } - if (type == CCB_SCALETYPE_MULTIPLY_RESOLUTION) { + if (type === CCB_SCALETYPE_MULTIPLY_RESOLUTION) { x *= cc.BuilderReader.getResolutionScale(); y *= cc.BuilderReader.getResolutionScale(); } @@ -443,7 +443,7 @@ cc.NodeLoader = cc.Class.extend({ var type = ccbReader.readInt(false); - if (type == CCB_SCALETYPE_MULTIPLY_RESOLUTION) { + if (type === CCB_SCALETYPE_MULTIPLY_RESOLUTION) { f *= cc.BuilderReader.getResolutionScale(); } @@ -477,19 +477,19 @@ cc.NodeLoader = cc.Class.extend({ var spriteFile = ccbReader.readCachedString(); var spriteFrame; - if(spriteFile != null && spriteFile.length != 0){ - if(spriteSheet.length == 0){ + if(spriteFile != null && spriteFile.length !== 0){ + if(spriteSheet.length === 0){ spriteFile = ccbReader.getCCBRootPath() + spriteFile; var texture = cc.textureCache.addImage(spriteFile); var locContentSize = texture.getContentSize(); var bounds = cc.rect(0, 0, locContentSize.width, locContentSize.height); - spriteFrame = cc.SpriteFrame.create(texture, bounds); + spriteFrame = new cc.SpriteFrame(texture, bounds); } else { var frameCache = cc.spriteFrameCache; spriteSheet = ccbReader.getCCBRootPath() + spriteSheet; //load the sprite sheet only if it is not loaded - if(ccbReader.getLoadedSpriteSheet().indexOf(spriteSheet) == -1){ + if(ccbReader.getLoadedSpriteSheet().indexOf(spriteSheet) === -1){ frameCache.addSpriteFrames(spriteSheet); ccbReader.getLoadedSpriteSheet().push(spriteSheet); } @@ -517,7 +517,7 @@ cc.NodeLoader = cc.Class.extend({ animation = cc.BuilderReader.lastPathComponent(animation); animationFile = cc.BuilderReader.lastPathComponent(animationFile); - if (animation != null && animation != "") { + if (animation != null && animation !== "") { var animationCache = cc.animationCache; animationCache.addAnimations(animationFile); @@ -529,7 +529,7 @@ cc.NodeLoader = cc.Class.extend({ parsePropTypeTexture:function (node, parent, ccbReader) { var spriteFile = ccbReader.getCCBRootPath() + ccbReader.readCachedString(); - if(spriteFile != "") + if(spriteFile !== "") return cc.textureCache.addImage(spriteFile); return null; }, @@ -624,21 +624,21 @@ cc.NodeLoader = cc.Class.extend({ target = ccbReader.getOwner(); } - if (target != null) { + if (target !== null) { if (selectorName.length > 0) { var selMenuHandler = 0; //var targetAsCCBSelectorResolver = target; - if (target != null && target.onResolveCCBCCMenuItemSelector) + if (target.onResolveCCBCCMenuItemSelector) selMenuHandler = target.onResolveCCBCCMenuItemSelector(target, selectorName); - if (selMenuHandler == 0) { + if (selMenuHandler === 0) { var ccbSelectorResolver = ccbReader.getCCBSelectorResolver(); if (ccbSelectorResolver != null) selMenuHandler = ccbSelectorResolver.onResolveCCBCCMenuItemSelector(target, selectorName); } - if (selMenuHandler == 0) { + if (selMenuHandler === 0) { cc.log("Skipping selector '" +selectorName+ "' since no CCBSelectorResolver is present."); } else { return new BlockData(selMenuHandler,target); @@ -672,27 +672,27 @@ cc.NodeLoader = cc.Class.extend({ if (selectorTarget !== CCB_TARGETTYPE_NONE) { if(!ccbReader.isJSControlled()){ var target = null; - if (selectorTarget == CCB_TARGETTYPE_DOCUMENTROOT) { + if (selectorTarget === CCB_TARGETTYPE_DOCUMENTROOT) { target = ccbReader.getAnimationManager().getRootNode(); - } else if (selectorTarget == CCB_TARGETTYPE_OWNER) { + } else if (selectorTarget === CCB_TARGETTYPE_OWNER) { target = ccbReader.getOwner(); } - if (target != null) { + if (target !== null) { if (selectorName.length > 0) { var selCCControlHandler = 0; - if (target != null && target.onResolveCCBCCControlSelector) { + if (target.onResolveCCBCCControlSelector) { selCCControlHandler = target.onResolveCCBCCControlSelector(target, selectorName); } - if (selCCControlHandler == 0) { + if (selCCControlHandler === 0) { var ccbSelectorResolver = ccbReader.getCCBSelectorResolver(); if (ccbSelectorResolver != null) { selCCControlHandler = ccbSelectorResolver.onResolveCCBCCControlSelector(target, selectorName); } } - if (selCCControlHandler == 0) { + if (selCCControlHandler === 0) { cc.log("Skipping selector '" + selectorName + "' since no CCBSelectorResolver is present."); } else { return new BlockCCControlData(selCCControlHandler,target,controlEvents); @@ -704,7 +704,7 @@ cc.NodeLoader = cc.Class.extend({ cc.log("Unexpected NULL target for selector."); } } else { - if(selectorTarget == CCB_TARGETTYPE_DOCUMENTROOT){ + if(selectorTarget === CCB_TARGETTYPE_DOCUMENTROOT){ ccbReader.addDocumentCallbackNode(node); ccbReader.addDocumentCallbackName(selectorName); ccbReader.addDocumentCallbackControlEvents(controlEvents); @@ -740,10 +740,9 @@ cc.NodeLoader = cc.Class.extend({ myCCBReader.getAnimationManager().setOwner(ccbReader.getOwner()); var ccbFileNode = myCCBReader.readFileWithCleanUp(false); - ccbReader.setAnimationManagers(myCCBReader.getAnimationManagers()); - if(ccbFileNode && myCCBReader.getAnimationManager().getAutoPlaySequenceId() != -1) + if(ccbFileNode && myCCBReader.getAnimationManager().getAutoPlaySequenceId() !== -1) myCCBReader.getAnimationManager().runAnimations(myCCBReader.getAnimationManager().getAutoPlaySequenceId(),0); return ccbFileNode; diff --git a/extensions/ccb-reader/CCNodeLoaderLibrary.js b/extensions/ccb-reader/CCNodeLoaderLibrary.js index 85a6b4cbfb..487dc7b2fe 100644 --- a/extensions/ccb-reader/CCNodeLoaderLibrary.js +++ b/extensions/ccb-reader/CCNodeLoaderLibrary.js @@ -1,7 +1,7 @@ /**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2008-2010 Ricardo Quesada - Copyright (c) 2011 Zynga Inc. + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. http://www.cocos2d-x.org diff --git a/extensions/ccb-reader/CCSpriteLoader.js b/extensions/ccb-reader/CCSpriteLoader.js index 13c0ceaee6..857b2bb025 100644 --- a/extensions/ccb-reader/CCSpriteLoader.js +++ b/extensions/ccb-reader/CCSpriteLoader.js @@ -1,7 +1,7 @@ /**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2008-2010 Ricardo Quesada - Copyright (c) 2011 Zynga Inc. + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -32,7 +32,7 @@ var PROPERTY_BLENDFUNC = "blendFunc"; cc.SpriteLoader = cc.NodeLoader.extend({ _createCCNode:function (parent, ccbReader) { - return cc.Sprite.create(); + return new cc.Sprite(); }, onHandlePropTypeColor3:function (node, parent, propertyName, ccColor3B, ccbReader) { @@ -94,7 +94,7 @@ var PROPERTY_IS_KEYBOARD_ENABLED = "isKeyboardEnabled"; cc.LayerLoader = cc.NodeLoader.extend({ _createCCNode:function (parent, ccbReader) { - var layer=cc.Layer.create(); + var layer = new cc.Layer(); layer.setContentSize(0,0); @@ -128,7 +128,7 @@ cc.LayerLoader.loader = function () { cc.LayerColorLoader = cc.LayerLoader.extend({ _createCCNode:function (parent, ccbReader) { - return cc.LayerColor.create(); + return new cc.LayerColor(); }, onHandlePropTypeColor3:function (node, parent, propertyName, ccColor3B, ccbReader) { @@ -166,12 +166,12 @@ var PROPERTY_VECTOR = "vector"; cc.LayerGradientLoader = cc.LayerLoader.extend({ _createCCNode:function (parent, ccbReader) { - return cc.LayerGradient.create(); + return new cc.LayerGradient(); }, onHandlePropTypeColor3:function (node, parent, propertyName, ccColor3B, ccbReader) { if (propertyName === PROPERTY_STARTCOLOR) { node.setStartColor(ccColor3B); - } else if (propertyName == PROPERTY_ENDCOLOR) { + } else if (propertyName === PROPERTY_ENDCOLOR) { node.setEndColor(ccColor3B); } else { cc.LayerLoader.prototype.onHandlePropTypeColor3.call(this, node, parent, propertyName, ccColor3B, ccbReader); @@ -210,7 +210,7 @@ cc.LayerGradientLoader.loader = function () { cc.MenuLoader = cc.LayerLoader.extend({ _createCCNode:function (parent, ccbReader) { - var menu = cc.Menu.create(); + var menu = new cc.Menu(); menu.setContentSize(0,0); @@ -254,7 +254,7 @@ var PROPERTY_DISABLEDDISPLAYFRAME = "disabledSpriteFrame"; cc.MenuItemImageLoader = cc.MenuItemLoader.extend({ _createCCNode:function (parent, ccbReader) { - return cc.MenuItemImage.create(); + return new cc.MenuItemImage(); }, onHandlePropTypeSpriteFrame:function (node, parent, propertyName, spriteFrame, ccbReader) { @@ -289,7 +289,7 @@ var PROPERTY_DIMENSIONS = "dimensions"; cc.LabelTTFLoader = cc.NodeLoader.extend({ _createCCNode:function (parent, ccbReader) { - return cc.LabelTTF.create(); + return new cc.LabelTTF(); }, onHandlePropTypeColor3:function (node, parent, propertyName, ccColor3B, ccbReader) { if (propertyName === PROPERTY_COLOR) { @@ -361,7 +361,7 @@ var PROPERTY_FNTFILE = "fntFile"; cc.LabelBMFontLoader = cc.NodeLoader.extend({ _createCCNode:function (parent, ccbReader) { - return cc.LabelBMFont.create(); + return new cc.LabelBMFont(); }, onHandlePropTypeColor3:function (node, parent, propertyName, ccColor3B, ccbReader) { @@ -429,7 +429,7 @@ var PROPERTY_ROTATEPERSECOND = "rotatePerSecond"; cc.ParticleSystemLoader = cc.NodeLoader.extend({ _createCCNode:function (parent, ccbReader) { - return cc.ParticleSystem.create(); + return new cc.ParticleSystem(); }, onHandlePropTypeIntegerLabeled:function (node, parent, propertyName, integerLabeled, ccbReader) { diff --git a/extensions/ccpool/CCPool.js b/extensions/ccpool/CCPool.js new file mode 100644 index 0000000000..205c8a2295 --- /dev/null +++ b/extensions/ccpool/CCPool.js @@ -0,0 +1,146 @@ +/**************************************************************************** + Copyright (c) 2008-2010 Ricardo Quesada + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. + + http://www.cocos2d-x.org + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + ****************************************************************************/ + +/** + *
+ * cc.pool is a singleton object serves as an object cache pool.
+ * It can helps you to improve your game performance for objects which need frequent release and recreate operations
+ * Some common use case is :
+ * 1. Bullets in game (die very soon, massive creation and recreation, no side effect on other objects)
+ * 2. Blocks in candy crash (massive creation and recreation)
+ * etc...
+ *
+ * Adds a child to the container with z order and tag
+ * If the child is added to a 'running' node, then 'onEnter' and 'onEnterTransitionDidFinish' will be called immediately.
+ *
+ * It will also cleanup all running actions depending on the cleanup parameter + * @param {Number} tag + * @param {Boolean} [cleanup=true] + */ + removeProtectedChildByTag: function(tag, cleanup){ + cc.assert( tag !== cc.NODE_TAG_INVALID, "Invalid tag"); + + if(cleanup == null) + cleanup = true; + + var child = this.getProtectedChildByTag(tag); + + if (child == null) + cc.log("cocos2d: removeChildByTag(tag = %d): child not found!", tag); + else + this.removeProtectedChild(child, cleanup); + }, + + /** + * Removes all children from the container with a cleanup. + * @see cc.ProtectedNode#removeAllProtectedChildrenWithCleanup + */ + removeAllProtectedChildren: function(){ + this.removeAllProtectedChildrenWithCleanup(true); + }, + + /** + * Removes all children from the container, and do a cleanup to all running actions depending on the cleanup parameter. + * @param {Boolean} [cleanup=true] true if all running actions on all children nodes should be cleanup, false otherwise. + */ + removeAllProtectedChildrenWithCleanup: function(cleanup){ + if(cleanup == null) + cleanup = true; + var locChildren = this._protectedChildren; + // not using detachChild improves speed here + for (var i = 0, len = locChildren.length; i< len; i++) { + var child = locChildren[i]; + // IMPORTANT: + // -1st do onExit + // -2nd cleanup + if(this._running){ + child.onExitTransitionDidStart(); + child.onExit(); + } + + if (cleanup) + child.cleanup(); + // set parent nil at the end + child.setParent(null); + } + locChildren.length = 0; + }, + + /** + * Reorders a child according to a new z value. + * @param {cc.Node} child An already added child node. It MUST be already added. + * @param {Number} localZOrder Z order for drawing priority. Please refer to setLocalZOrder(int) + */ + reorderProtectedChild: function(child, localZOrder){ + cc.assert( child != null, "Child must be non-nil"); + this._reorderProtectedChildDirty = true; + child.setOrderOfArrival(cc.s_globalOrderOfArrival++); + child._setLocalZOrder(localZOrder); + }, + + /** + *
+ * Sorts the children array once before drawing, instead of every time when a child is added or reordered.
+ * This approach can improves the performance massively.
+ * @note Don't call this manually unless a child added needs to be removed in the same frame
+ *
+ * Event callback that is invoked when the Node enters in the 'stage'.
+ * If the Node enters the 'stage' with a transition, this event is called when the transition finishes.
+ * If you override onEnterTransitionDidFinish, you shall call its parent's one, e.g. Node::onEnterTransitionDidFinish()
+ *
+ * Event callback that is called every time the Node leaves the 'stage'.
+ * If the Node leaves the 'stage' with a transition, this callback is called when the transition starts.
+ *
+ * A 9-slice sprite for cocos2d UI.
+ *
+ * 9-slice scaling allows you to specify how scaling is applied
+ * to specific areas of a sprite. With 9-slice scaling (3x3 grid),
+ * you can ensure that the sprite does not become distorted when
+ * scaled.
+ * @note: it will refactor in v3.1
+ * @see http://yannickloriot.com/library/ios/cccontrolextension/Classes/CCScale9Sprite.html
+ *
+ * Returns the flag which indicates whether the widget is flipped horizontally or not.
+ *
+ * It only flips the texture of the widget, and not the texture of the widget's children.
+ * Also, flipping the texture doesn't alter the anchorPoint.
+ * If you want to flip the anchorPoint too, and/or to flip the children too use:
+ * widget->setScaleX(sprite->getScaleX() * -1);
+ *
+ * Return the flag which indicates whether the widget is flipped vertically or not.
+ *
+ * It only flips the texture of the widget, and not the texture of the widget's children.
+ * Also, flipping the texture doesn't alter the anchorPoint.
+ * If you want to flip the anchorPoint too, and/or to flip the children too use:
+ * widget->setScaleY(widget->getScaleY() * -1);
+ *
+ * Sets whether the widget is enabled
+ * true if the widget is enabled, widget may be touched , false if the widget is disabled, widget cannot be touched.
+ * The default value is true, a widget is default to enabled
+ *
+ * When a widget is in a layout, you could call this method to get the next focused widget within a specified direction.
+ * If the widget is not in a layout, it will return itself
+ *
+ * When a widget lose/get focus, this method will be called. Be Caution when you provide your own version,
+ * you must call widget.setFocused(true/false) to change the focus state of the current focused widget;
+ *
+ * The callback of touch began event.
+ * If the bounding box of ccui.Widget contains the touch point, it will do the following things:
+ * 1. sets highlight state,
+ * 2. sends event to parent widget by interceptTouchEvent
+ * 3. calls the callback of touch began event.
+ * 4. returns true,
+ * otherwise returns false directly.
+ *
+ * The callback of touch moved event.
+ * It sets the highlight state by touch, sends event to parent widget by interceptTouchEvent and calls the callback of touch moved event.
+ *
+ * The callback of touch end event + * It sends event to parent widget by interceptTouchEvent, + * calls the callback of touch end event (highlight= true) or touch canceled event (highlight= false). + * sets the highlight state to false , + *
+ * @param touch + * @param event + */ + onTouchEnded: function (touch, event) { + var touchPoint = touch.getLocation(); + this._touchEndPosition.x = touchPoint.x; + this._touchEndPosition.y = touchPoint.y; + /* + * Propagate touch events to its parents + */ + if (this._propagateTouchEvents) + this.propagateTouchEvent(ccui.Widget.TOUCH_ENDED, this, touch); + + var highlight = this._highlight; + this.setHighlighted(false); + if (highlight) + this._releaseUpEvent(); + else + this._cancelUpEvent(); }, /** @@ -888,8 +1002,8 @@ ccui.Widget = ccui.Node.extend(/** @lends ccui.Widget# */{ * @param {cc.Point} touchPoint */ onTouchCancelled: function (touchPoint) { - this.setFocused(false); - this.cancelUpEvent(); + this.setHighlighted(false); + this._cancelUpEvent(); }, /** @@ -901,71 +1015,74 @@ ccui.Widget = ccui.Node.extend(/** @lends ccui.Widget# */{ }, //call back function called widget's state changed to dark. - - pushDownEvent: function () { - if (this._touchEventListener && this._touchEventSelector) { - if (this._touchEventSelector) { - this._touchEventSelector.call(this._touchEventListener, this, ccui.Widget.TOUCH_BEGAN); - } - } + _pushDownEvent: function () { + if (this._touchEventCallback) + this._touchEventCallback(this, ccui.Widget.TOUCH_BEGAN); + if (this._touchEventListener && this._touchEventSelector) + this._touchEventSelector.call(this._touchEventListener, this, ccui.Widget.TOUCH_BEGAN); }, - moveEvent: function () { - if (this._touchEventListener && this._touchEventSelector) { - if (this._touchEventSelector) { - this._touchEventSelector.call(this._touchEventListener, this, ccui.Widget.TOUCH_MOVED); - } - } + _moveEvent: function () { + if (this._touchEventCallback) + this._touchEventCallback(this, ccui.Widget.TOUCH_MOVED); + if (this._touchEventListener && this._touchEventSelector) + this._touchEventSelector.call(this._touchEventListener, this, ccui.Widget.TOUCH_MOVED); }, - releaseUpEvent: function () { - if (this._touchEventListener && this._touchEventSelector) { - if (this._touchEventSelector) { - this._touchEventSelector.call(this._touchEventListener, this, ccui.Widget.TOUCH_ENDED); - } - } + _releaseUpEvent: function () { + if (this._touchEventCallback) + this._touchEventCallback(this, ccui.Widget.TOUCH_ENDED); + if (this._touchEventListener && this._touchEventSelector) + this._touchEventSelector.call(this._touchEventListener, this, ccui.Widget.TOUCH_ENDED); + if (this._clickEventListener) + this._clickEventListener(this); }, - cancelUpEvent: function () { - if (this._touchEventSelector) { + _cancelUpEvent: function () { + if (this._touchEventCallback) + this._touchEventCallback(this, ccui.Widget.TOUCH_CANCELED); + if (this._touchEventListener && this._touchEventSelector) this._touchEventSelector.call(this._touchEventListener, this, ccui.Widget.TOUCH_CANCELED); - } }, longClickEvent: function () { - + //TODO it will implement in v3.1 }, /** - * Sets the touch event target/selector of the menu item + * Sets the touch event target/selector of the ccui.Widget * @param {Function} selector * @param {Object} target */ addTouchEventListener: function (selector, target) { - this._touchEventSelector = selector; - this._touchEventListener = target; + if(target === undefined) + this._touchEventCallback = selector; + else { + this._touchEventSelector = selector; + this._touchEventListener = target; + } + }, + + addClickEventListener: function(callback){ + this._clickEventListener = callback; }, /** * Checks a point if is in widget's space * @param {cc.Point} pt - * @returns {boolean} + * @returns {boolean} true if the point is in widget's space, false otherwise. */ hitTest: function (pt) { - var nsp = this.convertToNodeSpace(pt); - var bb = cc.rect(-this._size.width * this._anchorPoint.x, -this._size.height * this._anchorPoint.y, this._size.width, this._size.height); - if (nsp.x >= bb.x && nsp.x <= bb.x + bb.width && nsp.y >= bb.y && nsp.y <= bb.y + bb.height) { - return true; - } - return false; + var bb = cc.rect(0,0, this._contentSize.width, this._contentSize.height); + return cc.rectContainsPoint(bb, this.convertToNodeSpace(pt)); }, /** - * Checks a point if in parent's area. - * @param {cc.Point} pt + * returns whether clipping parent widget contains point. + * @param {cc.Point} pt location point * @returns {Boolean} */ - clippingParentAreaContainPoint: function (pt) { + isClippingParentContainsPoint: function(pt){ this._affectByClipping = false; var parent = this.getParent(); var clippingParent = null; @@ -980,209 +1097,235 @@ ccui.Widget = ccui.Node.extend(/** @lends ccui.Widget# */{ parent = parent.getParent(); } - if (!this._affectByClipping) { + if (!this._affectByClipping) return true; - } - if (clippingParent) { - var bRet = false; - if (clippingParent.hitTest(pt)) { - bRet = true; - } - if (bRet) { - return clippingParent.clippingParentAreaContainPoint(pt); - } + if (clippingParent.hitTest(pt)) + return clippingParent.isClippingParentContainsPoint(pt); return false; } return true; }, /** - * Sends the touch event to widget's parent + * Calls the checkChildInfo of widget's parent, its subclass will override it. * @param {number} handleState * @param {ccui.Widget} sender * @param {cc.Point} touchPoint */ checkChildInfo: function (handleState, sender, touchPoint) { var widgetParent = this.getWidgetParent(); - if (widgetParent) { + if (widgetParent) widgetParent.checkChildInfo(handleState, sender, touchPoint); - } }, /** * Changes the position (x,y) of the widget . - * @param {cc.Point||Number} pos - * @param {Number} posY + * The original point (0,0) is at the left-bottom corner of screen. + * @override + * @param {cc.Point|Number} pos + * @param {Number} [posY] */ setPosition: function (pos, posY) { - if (this._running) { + if (!this._usingLayoutComponent && this._running) { var widgetParent = this.getWidgetParent(); if (widgetParent) { - var pSize = widgetParent.getSize(); + var pSize = widgetParent.getContentSize(); if (pSize.width <= 0 || pSize.height <= 0) { this._positionPercent.x = 0; this._positionPercent.y = 0; - } - else { - if(posY){ - this._positionPercent.x = pos / pSize.width; - this._positionPercent.y = posY / pSize.height; - }else{ + } else { + if (posY === undefined) { this._positionPercent.x = pos.x / pSize.width; this._positionPercent.y = pos.y / pSize.height; + } else { + this._positionPercent.x = pos / pSize.width; + this._positionPercent.y = posY / pSize.height; } } } } - cc.Node.prototype.setPosition.apply(this, arguments); - }, - - setPositionX: function (x) { - if (this._running) { - var widgetParent = this.getWidgetParent(); - if (widgetParent) { - var pw = widgetParent.width; - if (pw <= 0) - this._positionPercent.x = 0; - else - this._positionPercent.x = x / pw; - } - } - - cc.Node.prototype.setPositionX.call(this, x); - }, - setPositionY: function (y) { - if (this._running) { - var widgetParent = this.getWidgetParent(); - if (widgetParent) { - var ph = widgetParent.height; - if (ph <= 0) - this._positionPercent.y = 0; - else - this._positionPercent.y = y / ph; - } - } - - cc.Node.prototype.setPositionY.call(this, y); - }, + cc.Node.prototype.setPosition.call(this, pos, posY); + //this._positionType = ccui.Widget.POSITION_ABSOLUTE; + }, + + setPositionX: function (x) { + if (this._running) { + var widgetParent = this.getWidgetParent(); + if (widgetParent) { + var pw = widgetParent.width; + if (pw <= 0) + this._positionPercent.x = 0; + else + this._positionPercent.x = x / pw; + } + } + + cc.Node.prototype.setPositionX.call(this, x); + }, + setPositionY: function (y) { + if (this._running) { + var widgetParent = this.getWidgetParent(); + if (widgetParent) { + var ph = widgetParent.height; + if (ph <= 0) + this._positionPercent.y = 0; + else + this._positionPercent.y = y / ph; + } + } + + cc.Node.prototype.setPositionY.call(this, y); + }, /** * Changes the position (x,y) of the widget * @param {cc.Point} percent */ setPositionPercent: function (percent) { - this._positionPercent = percent; - if (this._running) { - var widgetParent = this.getWidgetParent(); - if(widgetParent){ - var parentSize = widgetParent.getSize(); - this.setPosition(parentSize.width * this._positionPercent.x, parentSize.height * this._positionPercent.y); - } + if (this._usingLayoutComponent){ + var component = this._getOrCreateLayoutComponent(); + component.setPositionPercentX(percent.x); + component.setPositionPercentY(percent.y); + component.refreshLayout(); + return; + }else{ + this._setXPercent(percent.x); + this._setYPercent(percent.y); } + this._renderCmd.setDirtyFlag(cc.Node._dirtyFlags.transformDirty); }, - _setXPercent: function (percent) { - this._positionPercent.x = percent; - if (this._running) { - var widgetParent = this.getWidgetParent(); - if(widgetParent){ - var absX = widgetParent.width * percent; - this.setPositionX(absX); - } - } - }, - _setYPercent: function (percent) { - this._positionPercent.y = percent; - if (this._running) { - var widgetParent = this.getWidgetParent(); - if(widgetParent){ - var absY = widgetParent.height * percent; - this.setPositionY(absY); - } - } - }, - - updateAnchorPoint:function(){ - this.setAnchorPoint(this.getAnchorPoint()); + _setXPercent: function (percent) { + if (this._usingLayoutComponent){ + var component = this._getOrCreateLayoutComponent(); + component.setPositionPercentX(percent.x); + component.refreshLayout(); + return; + } + this._positionPercent.x = percent; + }, + _setYPercent: function (percent) { + if (this._usingLayoutComponent){ + var component = this._getOrCreateLayoutComponent(); + component.setPositionPercentY(percent.x); + component.refreshLayout(); + return; + } + this._positionPercent.y = percent; }, /** * Gets the percent (x,y) of the widget - * @returns {cc.Point} + * @returns {cc.Point} The percent (x,y) of the widget in OpenGL coordinates */ getPositionPercent: function () { - return this._positionPercent; + if (this._usingLayoutComponent) { + var component = this._getOrCreateLayoutComponent(); + this._positionPercent.x = component.getPositionPercentX(); + this._positionPercent.y = component.getPositionPercentY(); + } + return cc.p(this._positionPercent); + }, + + _getXPercent: function () { + if (this._usingLayoutComponent) { + var component = this._getOrCreateLayoutComponent(); + this._positionPercent.x = component.getPositionPercentX(); + this._positionPercent.y = component.getPositionPercentY(); + } + return this._positionPercent.x; + }, + _getYPercent: function () { + if (this._usingLayoutComponent) { + var component = this._getOrCreateLayoutComponent(); + this._positionPercent.x = component.getPositionPercentX(); + this._positionPercent.y = component.getPositionPercentY(); + } + return this._positionPercent.y; }, - _getXPercent: function () { - return this._positionPercent.x; - }, - _getYPercent: function () { - return this._positionPercent.y; - }, /** * Changes the position type of the widget - * @param {ccui.Widget.POSITION_ABSOLUTE|ccui.Widget.POSITION_PERCENT} type + * @param {Number} type the position type of widget */ setPositionType: function (type) { - this.positionType = type; + this._positionType = type; + if(this._usingLayoutComponent){ + var component = this._getOrCreateLayoutComponent(); + if (type === ccui.POSITION_ABSOLUTE){ + component.setPositionPercentXEnabled(false); + component.setPositionPercentYEnabled(false); + } else { + component.setPositionPercentXEnabled(true); + component.setPositionPercentYEnabled(true); + } + } + this._renderCmd.setDirtyFlag(cc.Node._dirtyFlags.transformDirty); }, /** * Gets the position type of the widget - * @returns {cc.pPositionType} + * @returns {Number} the position type of widget */ getPositionType: function () { - return this.positionType; + return this._positionType; }, /** - * Set flipped x - * @param {Boolean} flipX + * Sets whether the widget should be flipped horizontally or not. + * @param {Boolean} flipX true if the widget should be flipped horizontally, false otherwise. */ setFlippedX: function (flipX) { + var realScale = this.getScaleX(); this._flippedX = flipX; - this.updateFlippedX(); + this.setScaleX(realScale); }, /** - * Get flipped x - * @returns {Boolean} + *
+ * Returns the flag which indicates whether the widget is flipped horizontally or not.
+ * It only flips the texture of the widget, and not the texture of the widget's children.
+ * Also, flipping the texture doesn't alter the anchorPoint.
+ * If you want to flip the anchorPoint too, and/or to flip the children too use:
+ * widget.setScaleX(sprite.getScaleX() * -1);
+ *
+ * Return the flag which indicates whether the widget is flipped vertically or not.
+ * It only flips the texture of the widget, and not the texture of the widget's children.
+ * Also, flipping the texture doesn't alter the anchorPoint.
+ * If you want to flip the anchorPoint too, and/or to flip the children too use:
+ * widget.setScaleY(widget.getScaleY() * -1);
+ *
+ * Calls adaptRenderers (its subclass will override it.) and do layout. + * If clippingEnabled is true, it will clip/scissor area. + *
+ * @override + * @param {cc.Node.RenderCmd} [parentCmd] + */ + visit: function (parentCmd) { + if (!this._visible) return; - } + this._adaptRenderers(); + this._doLayout(); + if (this._clippingEnabled) { switch (this._clippingType) { case ccui.Layout.CLIPPING_STENCIL: - this.stencilClippingVisit(ctx); + this._renderCmd.stencilClippingVisit(parentCmd); break; case ccui.Layout.CLIPPING_SCISSOR: - this.scissorClippingVisit(ctx); + this._renderCmd.scissorClippingVisit(parentCmd); break; default: break; } - } - else { - cc.Node.prototype.visit.call(this,ctx); - } - }, - - sortAllChildren: function () { - ccui.Widget.prototype.sortAllChildren.call(this); - this._doLayout(); - }, - - stencilClippingVisit : null, - - _stencilClippingVisitForWebGL: function (ctx) { - var gl = ctx || cc._renderContext; - - // if stencil buffer disabled - if (cc.stencilBits < 1) { - // draw everything, as if there where no stencil - cc.Node.prototype.visit.call(this, ctx); - return; - } - - // return fast (draw nothing, or draw everything if in inverted mode) if: - // - nil stencil node - // - or stencil node invisible: - if (!this._clippingStencil || !this._clippingStencil.isVisible()) { - return; - } - - // store the current stencil layer (position in the stencil buffer), - // this will allow nesting up to n CCClippingNode, - // where n is the number of bits of the stencil buffer. - ccui.Layout._layer = -1; - - // all the _stencilBits are in use? - if (ccui.Layout._layer + 1 == cc.stencilBits) { - // warn once - ccui.Layout._visit_once = true; - if (ccui.Layout._visit_once) { - cc.log("Nesting more than " + cc.stencilBits + "stencils is not supported. Everything will be drawn without stencil for this node and its childs."); - ccui.Layout._visit_once = false; - } - // draw everything, as if there where no stencil - cc.Node.prototype.visit.call(this, ctx); - return; - } - - /////////////////////////////////// - // INIT - - // increment the current layer - ccui.Layout._layer++; - - // mask of the current layer (ie: for layer 3: 00000100) - var mask_layer = 0x1 << ccui.Layout._layer; - // mask of all layers less than the current (ie: for layer 3: 00000011) - var mask_layer_l = mask_layer - 1; - // mask of all layers less than or equal to the current (ie: for layer 3: 00000111) - var mask_layer_le = mask_layer | mask_layer_l; - - // manually save the stencil state - var currentStencilEnabled = gl.isEnabled(gl.STENCIL_TEST); - var currentStencilWriteMask = gl.getParameter(gl.STENCIL_WRITEMASK); - var currentStencilFunc = gl.getParameter(gl.STENCIL_FUNC); - var currentStencilRef = gl.getParameter(gl.STENCIL_REF); - var currentStencilValueMask = gl.getParameter(gl.STENCIL_VALUE_MASK); - var currentStencilFail = gl.getParameter(gl.STENCIL_FAIL); - var currentStencilPassDepthFail = gl.getParameter(gl.STENCIL_PASS_DEPTH_FAIL); - var currentStencilPassDepthPass = gl.getParameter(gl.STENCIL_PASS_DEPTH_PASS); - - // enable stencil use - gl.enable(gl.STENCIL_TEST); - // check for OpenGL error while enabling stencil test - //cc.checkGLErrorDebug(); - - // all bits on the stencil buffer are readonly, except the current layer bit, - // this means that operation like glClear or glStencilOp will be masked with this value - gl.stencilMask(mask_layer); - - // manually save the depth test state - //GLboolean currentDepthTestEnabled = GL_TRUE; - //currentDepthTestEnabled = glIsEnabled(GL_DEPTH_TEST); - var currentDepthWriteMask = gl.getParameter(gl.DEPTH_WRITEMASK); - - // disable depth test while drawing the stencil - //glDisable(GL_DEPTH_TEST); - // disable update to the depth buffer while drawing the stencil, - // as the stencil is not meant to be rendered in the real scene, - // it should never prevent something else to be drawn, - // only disabling depth buffer update should do - gl.depthMask(false); - - /////////////////////////////////// - // CLEAR STENCIL BUFFER - - // manually clear the stencil buffer by drawing a fullscreen rectangle on it - // setup the stencil test func like this: - // for each pixel in the fullscreen rectangle - // never draw it into the frame buffer - // if not in inverted mode: set the current layer value to 0 in the stencil buffer - // if in inverted mode: set the current layer value to 1 in the stencil buffer - gl.stencilFunc(gl.NEVER, mask_layer, mask_layer); - gl.stencilOp(gl.ZERO, gl.KEEP, gl.KEEP); - - // draw a fullscreen solid rectangle to clear the stencil buffer - //ccDrawSolidRect(CCPointZero, ccpFromSize([[CCDirector sharedDirector] winSize]), ccc4f(1, 1, 1, 1)); - cc._drawingUtil.drawSolidRect(cc.p(0,0), cc.pFromSize(cc.director.getWinSize()), cc.color(255, 255, 255, 255)); - - /////////////////////////////////// - // DRAW CLIPPING STENCIL - - // setup the stencil test func like this: - // for each pixel in the stencil node - // never draw it into the frame buffer - // if not in inverted mode: set the current layer value to 1 in the stencil buffer - // if in inverted mode: set the current layer value to 0 in the stencil buffer - gl.stencilFunc(gl.NEVER, mask_layer, mask_layer); - gl.stencilOp(gl.REPLACE, gl.KEEP, gl.KEEP); - - - // draw the stencil node as if it was one of our child - // (according to the stencil test func/op and alpha (or alpha shader) test) - cc.kmGLPushMatrix(); - this.transform(); - this._clippingStencil.visit(); - cc.kmGLPopMatrix(); - - // restore alpha test state - //if (this._alphaThreshold < 1) { - // XXX: we need to find a way to restore the shaders of the stencil node and its childs - //} - - // restore the depth test state - gl.depthMask(currentDepthWriteMask); - //if (currentDepthTestEnabled) { - // glEnable(GL_DEPTH_TEST); - //} - - /////////////////////////////////// - // DRAW CONTENT - - // setup the stencil test func like this: - // for each pixel of this node and its childs - // if all layers less than or equals to the current are set to 1 in the stencil buffer - // draw the pixel and keep the current layer in the stencil buffer - // else - // do not draw the pixel but keep the current layer in the stencil buffer - gl.stencilFunc(gl.EQUAL, mask_layer_le, mask_layer_le); - gl.stencilOp(gl.KEEP, gl.KEEP, gl.KEEP); - - // draw (according to the stencil test func) this node and its childs - cc.Node.prototype.visit.call(this, ctx); - - /////////////////////////////////// - // CLEANUP - - // manually restore the stencil state - gl.stencilFunc(currentStencilFunc, currentStencilRef, currentStencilValueMask); - gl.stencilOp(currentStencilFail, currentStencilPassDepthFail, currentStencilPassDepthPass); - gl.stencilMask(currentStencilWriteMask); - if (!currentStencilEnabled) - gl.disable(gl.STENCIL_TEST); - - // we are done using this layer, decrement - ccui.Layout._layer--; - }, - - _stencilClippingVisitForCanvas: function (ctx) { - // return fast (draw nothing, or draw everything if in inverted mode) if: - // - nil stencil node - // - or stencil node invisible: - if (!this._clippingStencil || !this._clippingStencil.isVisible()) { - return; - } - var context = ctx || cc._renderContext; - // Composition mode, costy but support texture stencil - if (this._cangodhelpme() || this._clippingStencil instanceof cc.Sprite) { - // Cache the current canvas, for later use (This is a little bit heavy, replace this solution with other walkthrough) - var canvas = context.canvas; - var locCache = ccui.Layout._getSharedCache(); - locCache.width = canvas.width; - locCache.height = canvas.height; - var locCacheCtx = locCache.getContext("2d"); - locCacheCtx.drawImage(canvas, 0, 0); - - context.save(); - // Draw everything first using node visit function - cc.Node.prototype.visit.call(this, context); - - context.globalCompositeOperation = "destination-in"; - - this.transform(context); - this._clippingStencil.visit(); - - context.restore(); - - // Redraw the cached canvas, so that the cliped area shows the background etc. - context.save(); - context.setTransform(1, 0, 0, 1, 0, 0); - context.globalCompositeOperation = "destination-over"; - context.drawImage(locCache, 0, 0); - context.restore(); - } - // Clip mode, fast, but only support cc.DrawNode - else { - var i, children = this._children, locChild; - - context.save(); - this.transform(context); - this._clippingStencil.visit(context); - context.clip(); - - // Clip mode doesn't support recusive stencil, so once we used a clip stencil, - // so if it has ClippingNode as a child, the child must uses composition stencil. - this._cangodhelpme(true); - var len = children.length; - if (len > 0) { - this.sortAllChildren(); - // draw children zOrder < 0 - for (i = 0; i < len; i++) { - locChild = children[i]; - if (locChild._localZOrder < 0) - locChild.visit(context); - else - break; - } - this.draw(context); - for (; i < len; i++) { - children[i].visit(context); - } - } else - this.draw(context); - this._cangodhelpme(false); - - context.restore(); - } - }, - - _godhelpme:false, - _cangodhelpme: function (godhelpme) { - if (godhelpme === true || godhelpme === false) - cc.ClippingNode.prototype._godhelpme = godhelpme; - return cc.ClippingNode.prototype._godhelpme; - }, - - scissorClippingVisit : null, - _scissorClippingVisitForWebGL: function (ctx) { - var clippingRect = this.getClippingRect(); - var gl = ctx || cc._renderContext; - if (this._handleScissor) { - gl.enable(gl.SCISSOR_TEST); - } - cc.view.setScissorInPoints(clippingRect.x, clippingRect.y, clippingRect.width, clippingRect.height); - cc.Node.prototype.visit.call(this); - if (this._handleScissor) { - gl.disable(gl.SCISSOR_TEST); - } + } else + ccui.Widget.prototype.visit.call(this, parentCmd); }, /** * Changes if layout can clip it's content and locChild. - * @param {Boolean} able + * If you really need this, please enable it. But it would reduce the rendering efficiency. + * @param {Boolean} able clipping enabled. */ setClippingEnabled: function (able) { - if (able == this._clippingEnabled) { + if (able === this._clippingEnabled) return; - } this._clippingEnabled = able; switch (this._clippingType) { case ccui.Layout.CLIPPING_STENCIL: - if (able) { - this.setStencilClippingSize(this._size); - } - else { + if (able){ + this._clippingStencil = new cc.DrawNode(); + this._renderCmd.rebindStencilRendering(this._clippingStencil); + if (this._running) + this._clippingStencil.onEnter(); + this._setStencilClippingSize(this._contentSize); + } else { + if (this._running && this._clippingStencil) + this._clippingStencil.onExit(); this._clippingStencil = null; } break; @@ -472,11 +363,14 @@ ccui.Layout = ccui.Widget.extend(/** @lends ccui.Layout# */{ }, /** - * Set clipping type + * Sets clipping type to ccui.Layout * @param {ccui.Layout.CLIPPING_STENCIL|ccui.Layout.CLIPPING_SCISSOR} type */ setClippingType: function (type) { - if (type == this._clippingType) { + if (type === this._clippingType) + return; + if(cc._renderType === cc._RENDER_TYPE_CANVAS && type === ccui.Layout.CLIPPING_SCISSOR){ + cc.log("Only supports STENCIL on canvas mode."); return; } var clippingEnabled = this.isClippingEnabled(); @@ -486,15 +380,15 @@ ccui.Layout = ccui.Widget.extend(/** @lends ccui.Layout# */{ }, /** - * Get clipping type + * Gets clipping type of ccui.Layout * @returns {ccui.Layout.CLIPPING_STENCIL|ccui.Layout.CLIPPING_SCISSOR} */ - getClippingType : function(){ + getClippingType: function () { return this._clippingType; }, - setStencilClippingSize: function (size) { - if (this._clippingEnabled && this._clippingType == ccui.Layout.CLIPPING_STENCIL) { + _setStencilClippingSize: function (size) { + if (this._clippingEnabled && this._clippingType === ccui.Layout.CLIPPING_STENCIL) { var rect = []; rect[0] = cc.p(0, 0); rect[1] = cc.p(size.width, 0); @@ -506,39 +400,25 @@ ccui.Layout = ccui.Widget.extend(/** @lends ccui.Layout# */{ } }, - rendererVisitCallBack: function () { - this._doLayout(); - }, - - getClippingRect: function () { - if (this._clippingRectDirty){ - this._handleScissor = true; + _getClippingRect: function () { + if (this._clippingRectDirty) { var worldPos = this.convertToWorldSpace(cc.p(0, 0)); - var t = this.nodeToWorldTransform(); - var scissorWidth = this._size.width * t.a; - var scissorHeight = this._size.height * t.d; + var t = this.getNodeToWorldTransform(); + var scissorWidth = this._contentSize.width * t.a; + var scissorHeight = this._contentSize.height * t.d; var parentClippingRect; var parent = this; - var firstClippingParentFounded = false; + while (parent) { parent = parent.getParent(); - if (parent && parent instanceof ccui.Layout) { - if (parent.isClippingEnabled()) { - if (!firstClippingParentFounded) { - this._clippingParent = parent; - firstClippingParentFounded = true; - } - - if (parent._clippingType == ccui.Layout.CLIPPING_SCISSOR) { - this._handleScissor = false; - break; - } - } + if (parent && parent instanceof ccui.Layout && parent.isClippingEnabled()) { + this._clippingParent = parent; + break; } } if (this._clippingParent) { - parentClippingRect = this._clippingParent.getClippingRect(); + parentClippingRect = this._clippingParent._getClippingRect(); var finalX = worldPos.x - (scissorWidth * this._anchorPoint.x); var finalY = worldPos.y - (scissorHeight * this._anchorPoint.y); var finalWidth = scissorWidth; @@ -550,30 +430,25 @@ ccui.Layout = ccui.Widget.extend(/** @lends ccui.Layout# */{ finalWidth += leftOffset; } var rightOffset = (worldPos.x + scissorWidth) - (parentClippingRect.x + parentClippingRect.width); - if (rightOffset > 0) { + if (rightOffset > 0) finalWidth -= rightOffset; - } var topOffset = (worldPos.y + scissorHeight) - (parentClippingRect.y + parentClippingRect.height); - if (topOffset > 0) { + if (topOffset > 0) finalHeight -= topOffset; - } var bottomOffset = worldPos.y - parentClippingRect.y; if (bottomOffset < 0) { finalY = parentClippingRect.x; finalHeight += bottomOffset; } - if (finalWidth < 0) { + if (finalWidth < 0) finalWidth = 0; - } - if (finalHeight < 0) { + if (finalHeight < 0) finalHeight = 0; - } this._clippingRect.x = finalX; this._clippingRect.y = finalY; this._clippingRect.width = finalWidth; this._clippingRect.height = finalHeight; - } - else { + } else { this._clippingRect.x = worldPos.x - (scissorWidth * this._anchorPoint.x); this._clippingRect.y = worldPos.y - (scissorHeight * this._anchorPoint.y); this._clippingRect.width = scissorWidth; @@ -584,55 +459,43 @@ ccui.Layout = ccui.Widget.extend(/** @lends ccui.Layout# */{ return this._clippingRect; }, - onSizeChanged: function () { - ccui.Widget.prototype.onSizeChanged.call(this); - this.setContentSize(this._size); - this.setStencilClippingSize(this._size); + _onSizeChanged: function () { + ccui.Widget.prototype._onSizeChanged.call(this); + var locContentSize = this._contentSize; + this._setStencilClippingSize(locContentSize); this._doLayoutDirty = true; this._clippingRectDirty = true; if (this._backGroundImage) { - this._backGroundImage.setPosition(this._size.width / 2.0, this._size.height / 2.0); - if (this._backGroundScale9Enabled) { - if (this._backGroundImage instanceof cc.Scale9Sprite) { - this._backGroundImage.setPreferredSize(this._size); - } - } - } - if (this._colorRender) { - this._colorRender.setContentSize(this._size); - } - if (this._gradientRender) { - this._gradientRender.setContentSize(this._size); + this._backGroundImage.setPosition(locContentSize.width * 0.5, locContentSize.height * 0.5); + if (this._backGroundScale9Enabled && this._backGroundImage instanceof ccui.Scale9Sprite) + this._backGroundImage.setPreferredSize(locContentSize); } + if (this._colorRender) + this._colorRender.setContentSize(locContentSize); + if (this._gradientRender) + this._gradientRender.setContentSize(locContentSize); }, /** * Sets background image use scale9 renderer. - * @param {Boolean} able + * @param {Boolean} able true that use scale9 renderer, false otherwise. */ setBackGroundImageScale9Enabled: function (able) { - if (this._backGroundScale9Enabled == able) { + if (this._backGroundScale9Enabled === able) return; - } - cc.Node.prototype.removeChild.call(this, this._backGroundImage, true); + this.removeProtectedChild(this._backGroundImage); this._backGroundImage = null; this._backGroundScale9Enabled = able; - if (this._backGroundScale9Enabled) { - this._backGroundImage = cc.Scale9Sprite.create(); - } - else { - this._backGroundImage = cc.Sprite.create(); - } - cc.Node.prototype.addChild.call(this, this._backGroundImage, ccui.Layout.BACKGROUND_IMAGE_ZORDER, -1); + this._addBackGroundImage(); this.setBackGroundImage(this._backGroundImageFileName, this._bgImageTexType); this.setBackGroundImageCapInsets(this._backGroundImageCapInsets); }, /** - * Get background image is use scale9 renderer. + * Get whether background image is use scale9 renderer. * @returns {Boolean} */ - isBackGroundImageScale9Enabled:function(){ + isBackGroundImageScale9Enabled: function () { return this._backGroundScale9Enabled; }, @@ -642,53 +505,59 @@ ccui.Layout = ccui.Widget.extend(/** @lends ccui.Layout# */{ * @param {ccui.Widget.LOCAL_TEXTURE|ccui.Widget.PLIST_TEXTURE} texType */ setBackGroundImage: function (fileName, texType) { - if (!fileName) { + if (!fileName) return; - } texType = texType || ccui.Widget.LOCAL_TEXTURE; - if (this._backGroundImage == null) { - this.addBackGroundImage(); + if (this._backGroundImage === null){ + this._addBackGroundImage(); + this.setBackGroundImageScale9Enabled(this._backGroundScale9Enabled); } this._backGroundImageFileName = fileName; this._bgImageTexType = texType; + var locBackgroundImage = this._backGroundImage; switch (this._bgImageTexType) { case ccui.Widget.LOCAL_TEXTURE: - this._backGroundImage.initWithFile(fileName); + locBackgroundImage.initWithFile(fileName); break; case ccui.Widget.PLIST_TEXTURE: - this._backGroundImage.initWithSpriteFrameName(fileName); + locBackgroundImage.initWithSpriteFrameName(fileName); break; default: break; } - if (this._backGroundScale9Enabled) { - this._backGroundImage.setPreferredSize(this._size); - } - this._backGroundImageTextureSize = this._backGroundImage.getContentSize(); - this._backGroundImage.setPosition(this._size.width / 2.0, this._size.height / 2.0); - this.updateBackGroundImageColor(); + if (this._backGroundScale9Enabled) + locBackgroundImage.setPreferredSize(this._contentSize); + + this._backGroundImageTextureSize = locBackgroundImage.getContentSize(); + locBackgroundImage.setPosition(this._contentSize.width * 0.5, this._contentSize.height * 0.5); + this._updateBackGroundImageColor(); }, /** - * Sets a background image capinsets for layout, if the background image is a scale9 render. - * @param {cc.Rect} capInsets + * Sets a background image CapInsets for layout, if the background image is a scale9 render. + * @param {cc.Rect} capInsets capinsets of background image. */ setBackGroundImageCapInsets: function (capInsets) { - this._backGroundImageCapInsets = capInsets; - if (this._backGroundScale9Enabled) { + if(!capInsets) + return; + var locInsets = this._backGroundImageCapInsets; + locInsets.x = capInsets.x; + locInsets.y = capInsets.y; + locInsets.width = capInsets.width; + locInsets.height = capInsets.height; + if (this._backGroundScale9Enabled) this._backGroundImage.setCapInsets(capInsets); - } }, /** - * Get background image cap insets. + * Gets background image capinsets of ccui.Layout. * @returns {cc.Rect} */ - getBackGroundImageCapInsets:function(){ - return this._backGroundImageCapInsets; + getBackGroundImageCapInsets: function () { + return cc.rect(this._backGroundImageCapInsets); }, - supplyTheLayoutParameterLackToChild: function (locChild) { + _supplyTheLayoutParameterLackToChild: function (locChild) { if (!locChild) { return; } @@ -698,77 +567,70 @@ ccui.Layout = ccui.Widget.extend(/** @lends ccui.Layout# */{ case ccui.Layout.LINEAR_HORIZONTAL: case ccui.Layout.LINEAR_VERTICAL: var layoutParameter = locChild.getLayoutParameter(ccui.LayoutParameter.LINEAR); - if (!layoutParameter) { - locChild.setLayoutParameter(ccui.LinearLayoutParameter.create()); - } + if (!layoutParameter) + locChild.setLayoutParameter(new ccui.LinearLayoutParameter()); break; case ccui.Layout.RELATIVE: var layoutParameter = locChild.getLayoutParameter(ccui.LayoutParameter.RELATIVE); - if (!layoutParameter) { - locChild.setLayoutParameter(ccui.RelativeLayoutParameter.create()); - } + if (!layoutParameter) + locChild.setLayoutParameter(new ccui.RelativeLayoutParameter()); break; default: break; } }, - /** - * init background image renderer. - */ - addBackGroundImage: function () { + _addBackGroundImage: function () { + var contentSize = this._contentSize; if (this._backGroundScale9Enabled) { - this._backGroundImage = cc.Scale9Sprite.create(); - this._backGroundImage.setPreferredSize(this._size); - } - else { - this._backGroundImage = cc.Sprite.create(); - } - cc.Node.prototype.addChild.call(this, this._backGroundImage, ccui.Layout.BACKGROUND_IMAGE_ZORDER, -1); - this._backGroundImage.setPosition(this._size.width / 2.0, this._size.height / 2.0); + this._backGroundImage = new ccui.Scale9Sprite(); + this._backGroundImage.setPreferredSize(contentSize); + } else + this._backGroundImage = new cc.Sprite(); + this.addProtectedChild(this._backGroundImage, ccui.Layout.BACKGROUND_IMAGE_ZORDER, -1); + this._backGroundImage.setPosition(contentSize.width * 0.5, contentSize.height * 0.5); }, /** - * Remove the background image of layout. + * Remove the background image of ccui.Layout. */ removeBackGroundImage: function () { - if (!this._backGroundImage) { + if (!this._backGroundImage) return; - } - cc.Node.prototype.removeChild.call(this, this._backGroundImage, true); + this.removeProtectedChild(this._backGroundImage); this._backGroundImage = null; this._backGroundImageFileName = ""; - this._backGroundImageTextureSize = cc.size(0, 0); + this._backGroundImageTextureSize.width = 0; + this._backGroundImageTextureSize.height = 0; }, /** - * Sets Color Type for layout. + * Sets Color Type for ccui.Layout. * @param {ccui.Layout.BG_COLOR_NONE|ccui.Layout.BG_COLOR_SOLID|ccui.Layout.BG_COLOR_GRADIENT} type */ setBackGroundColorType: function (type) { - if (this._colorType == type) { + if (this._colorType === type) return; - } switch (this._colorType) { case ccui.Layout.BG_COLOR_NONE: if (this._colorRender) { - cc.Node.prototype.removeChild.call(this, this._colorRender, true); + this.removeProtectedChild(this._colorRender); this._colorRender = null; } if (this._gradientRender) { - cc.Node.prototype.removeChild.call(this, this._gradientRender, true); + this.removeProtectedChild(this._gradientRender); this._gradientRender = null; } break; case ccui.Layout.BG_COLOR_SOLID: if (this._colorRender) { - cc.Node.prototype.removeChild.call(this, this._colorRender, true); + this.removeProtectedChild(this._colorRender); this._colorRender = null; } break; case ccui.Layout.BG_COLOR_GRADIENT: if (this._gradientRender) { - cc.Node.prototype.removeChild.call(this, this._gradientRender, true); + this.removeProtectedChild(this._gradientRender); this._gradientRender = null; } break; @@ -780,20 +642,20 @@ ccui.Layout = ccui.Widget.extend(/** @lends ccui.Layout# */{ case ccui.Layout.BG_COLOR_NONE: break; case ccui.Layout.BG_COLOR_SOLID: - this._colorRender = cc.LayerColor.create(); - this._colorRender.setContentSize(this._size); + this._colorRender = new cc.LayerColor(); + this._colorRender.setContentSize(this._contentSize); this._colorRender.setOpacity(this._opacity); this._colorRender.setColor(this._color); - cc.Node.prototype.addChild.call(this, this._colorRender, ccui.Layout.BACKGROUND_RENDERER_ZORDER, -1); + this.addProtectedChild(this._colorRender, ccui.Layout.BACKGROUND_RENDERER_ZORDER, -1); break; case ccui.Layout.BG_COLOR_GRADIENT: - this._gradientRender = cc.LayerGradient.create(cc.color(255, 0, 0, 255), cc.color(0, 255, 0, 255)); - this._gradientRender.setContentSize(this._size); + this._gradientRender = new cc.LayerGradient(cc.color(255, 0, 0, 255), cc.color(0, 255, 0, 255)); + this._gradientRender.setContentSize(this._contentSize); this._gradientRender.setOpacity(this._opacity); this._gradientRender.setStartColor(this._startColor); this._gradientRender.setEndColor(this._endColor); this._gradientRender.setVector(this._alongVector); - cc.Node.prototype.addChild.call(this, this._gradientRender, ccui.Layout.BACKGROUND_RENDERER_ZORDER, -1); + this.addProtectedChild(this._gradientRender, ccui.Layout.BACKGROUND_RENDERER_ZORDER, -1); break; default: break; @@ -801,67 +663,69 @@ ccui.Layout = ccui.Widget.extend(/** @lends ccui.Layout# */{ }, /** - * Get color type. + * Get background color type of ccui.Layout. * @returns {ccui.Layout.BG_COLOR_NONE|ccui.Layout.BG_COLOR_SOLID|ccui.Layout.BG_COLOR_GRADIENT} */ - getBackGroundColorType:function(){ + getBackGroundColorType: function () { return this._colorType; }, /** * Sets background color for layout, if color type is Layout.COLOR_SOLID * @param {cc.Color} color - * @param {cc.Color} endColor + * @param {cc.Color} [endColor] */ setBackGroundColor: function (color, endColor) { if (!endColor) { this._color.r = color.r; this._color.g = color.g; this._color.b = color.b; - if (this._colorRender) { + if (this._colorRender) this._colorRender.setColor(color); - } } else { this._startColor.r = color.r; this._startColor.g = color.g; this._startColor.b = color.b; - - if (this._gradientRender) { + if (this._gradientRender) this._gradientRender.setStartColor(color); - } - this._endColor = endColor; - if (this._gradientRender) { + + this._endColor.r = endColor.r; + this._endColor.g = endColor.g; + this._endColor.b = endColor.b; + if (this._gradientRender) this._gradientRender.setEndColor(endColor); - } } }, /** - * Get back ground color + * Gets background color of ccui.Layout, if color type is Layout.COLOR_SOLID. * @returns {cc.Color} */ - getBackGroundColor:function(){ - return this._color; + getBackGroundColor: function () { + var tmpColor = this._color; + return cc.color(tmpColor.r, tmpColor.g, tmpColor.b, tmpColor.a); }, /** - * Get back ground start color + * Gets background start color of ccui.Layout * @returns {cc.Color} */ - getBackGroundStartColor:function(){ - return this._startColor; + getBackGroundStartColor: function () { + var tmpColor = this._startColor; + return cc.color(tmpColor.r, tmpColor.g, tmpColor.b, tmpColor.a); }, /** - * Get back ground end color + * Gets background end color of ccui.Layout * @returns {cc.Color} */ - getBackGroundEndColor:function(){ - return this._endColor; + getBackGroundEndColor: function () { + var tmpColor = this._endColor; + return cc.color(tmpColor.r, tmpColor.g, tmpColor.b, tmpColor.a); }, /** - * Sets background opacity layout. + * Sets background opacity to ccui.Layout. * @param {number} opacity */ setBackGroundColorOpacity: function (opacity) { @@ -881,10 +745,10 @@ ccui.Layout = ccui.Widget.extend(/** @lends ccui.Layout# */{ }, /** - * Get background opacity value. + * Get background opacity value of ccui.Layout. * @returns {Number} */ - getBackGroundColorOpacity:function(){ + getBackGroundColorOpacity: function () { return this._opacity; }, @@ -901,15 +765,15 @@ ccui.Layout = ccui.Widget.extend(/** @lends ccui.Layout# */{ }, /** - * Get background color value. + * Gets background color vector of ccui.Layout, if color type is Layout.COLOR_GRADIENT * @returns {cc.Point} */ - getBackGroundColorVector:function(){ + getBackGroundColorVector: function () { return this._alongVector; }, /** - * Set backGround image color + * Sets backGround image color * @param {cc.Color} color */ setBackGroundImageColor: function (color) { @@ -917,14 +781,11 @@ ccui.Layout = ccui.Widget.extend(/** @lends ccui.Layout# */{ this._backGroundImageColor.g = color.g; this._backGroundImageColor.b = color.b; - this.updateBackGroundImageColor(); - if (color.a !== undefined && !color.a_undefined) { - this.setBackGroundImageOpacity(color.a); - } + this._updateBackGroundImageColor(); }, /** - * Get backGround image color + * Sets backGround image Opacity * @param {Number} opacity */ setBackGroundImageOpacity: function (opacity) { @@ -933,7 +794,7 @@ ccui.Layout = ccui.Widget.extend(/** @lends ccui.Layout# */{ }, /** - * Get backGround image color + * Gets backGround image color * @returns {cc.Color} */ getBackGroundImageColor: function () { @@ -942,15 +803,16 @@ ccui.Layout = ccui.Widget.extend(/** @lends ccui.Layout# */{ }, /** - * Get backGround image opacity + * Gets backGround image opacity * @returns {Number} */ getBackGroundImageOpacity: function () { return this._backGroundImageColor.a; }, - updateBackGroundImageColor: function () { - this._backGroundImage.setColor(this._backGroundImageColor); + _updateBackGroundImageColor: function () { + if(this._backGroundImage) + this._backGroundImage.setColor(this._backGroundImageColor); }, /** @@ -962,22 +824,23 @@ ccui.Layout = ccui.Widget.extend(/** @lends ccui.Layout# */{ }, /** - * Sets LayoutType. + * Sets LayoutType to ccui.Layout, LayoutManager will do layout by layout type.. * @param {ccui.Layout.ABSOLUTE|ccui.Layout.LINEAR_VERTICAL|ccui.Layout.LINEAR_HORIZONTAL|ccui.Layout.RELATIVE} type */ setLayoutType: function (type) { this._layoutType = type; - var layoutChildrenArray = this._widgetChildren; + var layoutChildrenArray = this._children; var locChild = null; for (var i = 0; i < layoutChildrenArray.length; i++) { locChild = layoutChildrenArray[i]; - this.supplyTheLayoutParameterLackToChild(locChild); + if(locChild instanceof ccui.Widget) + this._supplyTheLayoutParameterLackToChild(locChild); } this._doLayoutDirty = true; }, /** - * Gets LayoutType. + * Gets LayoutType of ccui.Layout. * @returns {null} */ getLayoutType: function () { @@ -985,489 +848,563 @@ ccui.Layout = ccui.Widget.extend(/** @lends ccui.Layout# */{ }, /** - * request do layout + * request to refresh widget layout, it will do layout at visit calls */ requestDoLayout: function () { this._doLayoutDirty = true; }, - doLayout_LINEAR_VERTICAL: function () { - var layoutChildrenArray = this._widgetChildren; - var layoutSize = this.getSize(); - var topBoundary = layoutSize.height; - for (var i = 0; i < layoutChildrenArray.length; ++i) { - var locChild = layoutChildrenArray[i]; - var locLayoutParameter = locChild.getLayoutParameter(ccui.LayoutParameter.LINEAR); - - if (locLayoutParameter) { - var locChildGravity = locLayoutParameter.getGravity(); - var locAP = locChild.getAnchorPoint(); - var locSize = locChild.getSize(); - var locFinalPosX = locAP.x * locSize.width; - var locFinalPosY = topBoundary - ((1 - locAP.y) * locSize.height); - switch (locChildGravity) { - case ccui.LINEAR_GRAVITY_NONE: - case ccui.LINEAR_GRAVITY_LEFT: - break; - case ccui.LINEAR_GRAVITY_RIGHT: - locFinalPosX = layoutSize.width - ((1 - locAP.x) * locSize.width); - break; - case ccui.LINEAR_GRAVITY_CENTER_HORIZONTAL: - locFinalPosX = layoutSize.width / 2 - locSize.width * (0.5 - locAP.x); - break; - default: - break; + _doLayout: function () { + if (!this._doLayoutDirty) + return; + + this.sortAllChildren(); + + var executant = ccui.getLayoutManager(this._layoutType); + if (executant) + executant._doLayout(this); + this._doLayoutDirty = false; + }, + + _getLayoutContentSize: function(){ + return this.getContentSize(); + }, + + _getLayoutElements: function(){ + return this.getChildren(); + }, + + _updateBackGroundImageOpacity: function(){ + if (this._backGroundImage) + this._backGroundImage.setOpacity(this._backGroundImageOpacity); + }, + + _updateBackGroundImageRGBA: function(){ + if (this._backGroundImage) { + this._backGroundImage.setColor(this._backGroundImageColor); + this._backGroundImage.setOpacity(this._backGroundImageOpacity); + } + }, + + /** + * Gets the content size of the layout, it will accumulate all its children's content size + * @returns {cc.Size} + * @private + */ + _getLayoutAccumulatedSize: function(){ + var children = this.getChildren(); + var layoutSize = cc.size(0, 0); + var widgetCount = 0, locSize; + for(var i = 0, len = children.length; i < len; i++) { + var layout = children[i]; + if (null !== layout && layout instanceof ccui.Layout){ + locSize = layout._getLayoutAccumulatedSize(); + layoutSize.width += locSize.width; + layoutSize.height += locSize.height; + } else { + if (layout instanceof ccui.Widget) { + widgetCount++; + var m = layout.getLayoutParameter().getMargin(); + locSize = layout.getContentSize(); + layoutSize.width += locSize.width + (m.right + m.left) * 0.5; + layoutSize.height += locSize.height + (m.top + m.bottom) * 0.5; } - var locMargin = locLayoutParameter.getMargin(); - locFinalPosX += locMargin.left; - locFinalPosY -= locMargin.top; - locChild.setPosition(locFinalPosX, locFinalPosY); - topBoundary = locChild.getBottomInParent() - locMargin.bottom; } } + + //substract extra size + var type = this.getLayoutType(); + if (type === ccui.Layout.LINEAR_HORIZONTAL) + layoutSize.height = layoutSize.height - layoutSize.height/widgetCount * (widgetCount-1); + + if (type === ccui.Layout.LINEAR_VERTICAL) + layoutSize.width = layoutSize.width - layoutSize.width/widgetCount * (widgetCount-1); + return layoutSize; }, - doLayout_LINEAR_HORIZONTAL: function () { - var layoutChildrenArray = this._widgetChildren; - var layoutSize = this.getSize(); - var leftBoundary = 0; - for (var i = 0; i < layoutChildrenArray.length; ++i) { - var locChild = layoutChildrenArray[i]; - var locLayoutParameter = locChild.getLayoutParameter(ccui.LayoutParameter.LINEAR); - - if (locLayoutParameter) { - var locChildGravity = locLayoutParameter.getGravity(); - var locAP = locChild.getAnchorPoint(); - var locSize = locChild.getSize(); - var locFinalPosX = leftBoundary + (locAP.x * locSize.width); - var locFinalPosY = layoutSize.height - (1 - locAP.y) * locSize.height; - switch (locChildGravity) { - case ccui.LINEAR_GRAVITY_NONE: - case ccui.LINEAR_GRAVITY_TOP: - break; - case ccui.LINEAR_GRAVITY_BOTTOM: - locFinalPosY = locAP.y * locSize.height; - break; - case ccui.LINEAR_GRAVITY_CENTER_VERTICAL: - locFinalPosY = layoutSize.height / 2 - locSize.height * (0.5 - locAP.y); - break; - default: - break; + + /** + * When the layout get focused, it the layout pass the focus to its child, it will use this method to determine which child+ * will get the focus. The current algorithm to determine which child will get focus is nearest-distance-priority algorithm + * @param {Number} direction next focused widget direction + * @param {ccui.Widget} baseWidget + * @returns {Number} + * @private + */ + _findNearestChildWidgetIndex: function(direction, baseWidget){ + if (baseWidget == null || baseWidget === this) + return this._findFirstFocusEnabledWidgetIndex(); + + var index = 0, locChildren = this.getChildren(); + var count = locChildren.length, widgetPosition; + + var distance = cc.FLT_MAX, found = 0; + if (direction === ccui.Widget.LEFT || direction === ccui.Widget.RIGHT || direction === ccui.Widget.DOWN || direction === ccui.Widget.UP) { + widgetPosition = this._getWorldCenterPoint(baseWidget); + while (index < count) { + var w = locChildren[index]; + if (w && w instanceof ccui.Widget && w.isFocusEnabled()) { + var length = (w instanceof ccui.Layout)? w._calculateNearestDistance(baseWidget) + : cc.pLength(cc.pSub(this._getWorldCenterPoint(w), widgetPosition)); + if (length < distance){ + found = index; + distance = length; + } } - var locMargin = locLayoutParameter.getMargin(); - locFinalPosX += locMargin.left; - locFinalPosY -= locMargin.top; - locChild.setPosition(locFinalPosX, locFinalPosY); - leftBoundary = locChild.getRightInParent() + locMargin.right; + index++; } + return found; } + cc.log("invalid focus direction!"); + return 0; }, - doLayout_RELATIVE: function () { - var layoutChildrenArray = this._widgetChildren; - var length = layoutChildrenArray.length; - var unlayoutChildCount = length; - var layoutSize = this.getSize(); - for (var i = 0; i < length; i++) { - var locChild = layoutChildrenArray[i]; - var locLayoutParameter = locChild.getLayoutParameter(ccui.LayoutParameter.RELATIVE); - locLayoutParameter._put = false; + /** + * When the layout get focused, it the layout pass the focus to its child, it will use this method to determine which child + * will get the focus. The current algorithm to determine which child will get focus is farthest-distance-priority algorithm + * @param {Number} direction next focused widget direction + * @param {ccui.Widget} baseWidget + * @returns {Number} The index of child widget in the container + * @private + */ + _findFarthestChildWidgetIndex: function(direction, baseWidget){ + if (baseWidget == null || baseWidget === this) + return this._findFirstFocusEnabledWidgetIndex(); + + var index = 0, locChildren = this.getChildren(); + var count = locChildren.length; + + var distance = -cc.FLT_MAX, found = 0; + if (direction === ccui.Widget.LEFT || direction === ccui.Widget.RIGHT || direction === ccui.Widget.DOWN || direction === ccui.Widget.UP) { + var widgetPosition = this._getWorldCenterPoint(baseWidget); + while (index < count) { + var w = locChildren[index]; + if (w && w instanceof ccui.Widget && w.isFocusEnabled()) { + var length = (w instanceof ccui.Layout)?w._calculateFarthestDistance(baseWidget) + : cc.pLength(cc.pSub(this._getWorldCenterPoint(w), widgetPosition)); + if (length > distance){ + found = index; + distance = length; + } + } + index++; + } + return found; } + cc.log("invalid focus direction!!!"); + return 0; + }, - while (unlayoutChildCount > 0) { - for (var i = 0; i < length; i++) { - var locChild = layoutChildrenArray[i]; - var locLayoutParameter = locChild.getLayoutParameter(ccui.LayoutParameter.RELATIVE); + /** + * calculate the nearest distance between the baseWidget and the children of the layout + * @param {ccui.Widget} baseWidget the base widget which will be used to calculate the distance between the layout's children and itself + * @returns {Number} return the nearest distance between the baseWidget and the layout's children + * @private + */ + _calculateNearestDistance: function(baseWidget){ + var distance = cc.FLT_MAX; + var widgetPosition = this._getWorldCenterPoint(baseWidget); + var locChildren = this._children; + + for (var i = 0, len = locChildren.length; i < len; i++) { + var widget = locChildren[i], length; + if (widget instanceof ccui.Layout) + length = widget._calculateNearestDistance(baseWidget); + else { + if (widget instanceof ccui.Widget && widget.isFocusEnabled()) + length = cc.pLength(cc.pSub(this._getWorldCenterPoint(widget), widgetPosition)); + else + continue; + } + if (length < distance) + distance = length; + } + return distance; + }, - if (locLayoutParameter) { - if (locLayoutParameter._put) { - continue; + /** + * calculate the farthest distance between the baseWidget and the children of the layout + * @param baseWidget + * @returns {number} + * @private + */ + _calculateFarthestDistance:function(baseWidget){ + var distance = -cc.FLT_MAX; + var widgetPosition = this._getWorldCenterPoint(baseWidget); + var locChildren = this._children; + + for (var i = 0, len = locChildren.length; i < len; i++) { + var layout = locChildren[i]; + var length; + if (layout instanceof ccui.Layout) + length = layout._calculateFarthestDistance(baseWidget); + else { + if (layout instanceof ccui.Widget && layout.isFocusEnabled()) { + var wPosition = this._getWorldCenterPoint(layout); + length = cc.pLength(cc.pSub(wPosition, widgetPosition)); + } else + continue; + } + + if (length > distance) + distance = length; + } + return distance; + }, + + /** + * when a layout pass the focus to it's child, use this method to determine which algorithm to use, nearest or farthest distance algorithm or not + * @param direction + * @param baseWidget + * @private + */ + _findProperSearchingFunctor: function(direction, baseWidget){ + if (baseWidget == null) + return; + + var previousWidgetPosition = this._getWorldCenterPoint(baseWidget); + var widgetPosition = this._getWorldCenterPoint(this._findFirstNonLayoutWidget()); + if (direction === ccui.Widget.LEFT) { + this.onPassFocusToChild = (previousWidgetPosition.x > widgetPosition.x) ? this._findNearestChildWidgetIndex.bind(this) + : this._findFarthestChildWidgetIndex.bind(this); + } else if (direction === ccui.Widget.RIGHT) { + this.onPassFocusToChild = (previousWidgetPosition.x > widgetPosition.x) ? this._findFarthestChildWidgetIndex.bind(this) + : this._findNearestChildWidgetIndex.bind(this); + }else if(direction === ccui.Widget.DOWN) { + this.onPassFocusToChild = (previousWidgetPosition.y > widgetPosition.y) ? this._findNearestChildWidgetIndex.bind(this) + : this._findFarthestChildWidgetIndex.bind(this); + }else if(direction === ccui.Widget.UP) { + this.onPassFocusToChild = (previousWidgetPosition.y < widgetPosition.y) ? this._findNearestChildWidgetIndex.bind(this) + : this._findFarthestChildWidgetIndex.bind(this); + }else + cc.log("invalid direction!"); + }, + + /** + * find the first non-layout widget in this layout + * @returns {ccui.Widget} + * @private + */ + _findFirstNonLayoutWidget:function(){ + var locChildren = this._children; + for(var i = 0, len = locChildren.length; i < len; i++) { + var child = locChildren[i]; + if (child instanceof ccui.Layout){ + var widget = child._findFirstNonLayoutWidget(); + if(widget) + return widget; + } else{ + if (child instanceof ccui.Widget) + return child; + } + } + return null; + }, + + /** + * find the first focus enabled widget index in the layout, it will recursive searching the child widget + * @returns {number} + * @private + */ + _findFirstFocusEnabledWidgetIndex: function(){ + var index = 0, locChildren = this.getChildren(); + var count = locChildren.length; + while (index < count) { + var w = locChildren[index]; + if (w && w instanceof ccui.Widget && w.isFocusEnabled()) + return index; + index++; + } + return 0; + }, + + /** + * find a focus enabled child Widget in the layout by index + * @param index + * @returns {*} + * @private + */ + _findFocusEnabledChildWidgetByIndex: function(index){ + var widget = this._getChildWidgetByIndex(index); + if (widget){ + if (widget.isFocusEnabled()) + return widget; + index = index + 1; + return this._findFocusEnabledChildWidgetByIndex(index); + } + return null; + }, + + /** + * get the center point of a widget in world space + * @param {ccui.Widget} widget + * @returns {cc.Point} + * @private + */ + _getWorldCenterPoint: function(widget){ + //FIXEDME: we don't need to calculate the content size of layout anymore + var widgetSize = widget instanceof ccui.Layout ? widget._getLayoutAccumulatedSize() : widget.getContentSize(); + return widget.convertToWorldSpace(cc.p(widgetSize.width /2, widgetSize.height /2)); + }, + + /** + * this method is called internally by nextFocusedWidget. When the dir is Right/Down, then this method will be called + * @param {Number} direction + * @param {ccui.Widget} current the current focused widget + * @returns {ccui.Widget} the next focused widget + * @private + */ + _getNextFocusedWidget: function(direction, current){ + var nextWidget = null, locChildren = this._children; + var previousWidgetPos = locChildren.indexOf(current); + previousWidgetPos = previousWidgetPos + 1; + if (previousWidgetPos < locChildren.length) { + nextWidget = this._getChildWidgetByIndex(previousWidgetPos); + //handle widget + if (nextWidget) { + if (nextWidget.isFocusEnabled()) { + if (nextWidget instanceof ccui.Layout) { + nextWidget._isFocusPassing = true; + return nextWidget.findNextFocusedWidget(direction, nextWidget); + } else { + this.dispatchFocusEvent(current, nextWidget); + return nextWidget; } - var locAP = locChild.getAnchorPoint(); - var locSize = locChild.getSize(); - var locAlign = locLayoutParameter.getAlign(); - var locRelativeName = locLayoutParameter.getRelativeToWidgetName(); - var locRelativeWidget = null; - var locRelativeWidgetLP = null; - var locFinalPosX = 0; - var locFinalPosY = 0; - if (locRelativeName) { - locRelativeWidget = ccui.helper.seekWidgetByRelativeName(this, locRelativeName); - if (locRelativeWidget) { - locRelativeWidgetLP = locRelativeWidget.getLayoutParameter(ccui.LayoutParameter.RELATIVE); + } else + return this._getNextFocusedWidget(direction, nextWidget); + } else + return current; + } else { + if (this._loopFocus) { + if (this._checkFocusEnabledChild()) { + previousWidgetPos = 0; + nextWidget = this._getChildWidgetByIndex(previousWidgetPos); + if (nextWidget.isFocusEnabled()) { + if (nextWidget instanceof ccui.Layout) { + nextWidget._isFocusPassing = true; + return nextWidget.findNextFocusedWidget(direction, nextWidget); + } else { + this.dispatchFocusEvent(current, nextWidget); + return nextWidget; } - } - switch (locAlign) { - case ccui.RELATIVE_ALIGN_NONE: - case ccui.RELATIVE_ALIGN_PARENT_TOP_LEFT: - locFinalPosX = locAP.x * locSize.width; - locFinalPosY = layoutSize.height - ((1 - locAP.y) * locSize.height); - break; - case ccui.RELATIVE_ALIGN_PARENT_TOP_CENTER_HORIZONTAL: - locFinalPosX = layoutSize.width * 0.5 - locSize.width * (0.5 - locAP.x); - locFinalPosY = layoutSize.height - ((1 - locAP.y) * locSize.height); - break; - case ccui.RELATIVE_ALIGN_PARENT_TOP_RIGHT: - locFinalPosX = layoutSize.width - ((1 - locAP.x) * locSize.width); - locFinalPosY = layoutSize.height - ((1 - locAP.y) * locSize.height); - break; - case ccui.RELATIVE_ALIGN_PARENT_LEFT_CENTER_VERTICAL: - locFinalPosX = locAP.x * locSize.width; - locFinalPosY = layoutSize.height * 0.5 - locSize.height * (0.5 - locAP.y); - break; - case ccui.RELATIVE_ALIGN_PARENT_CENTER: - locFinalPosX = layoutSize.width * 0.5 - locSize.width * (0.5 - locAP.x); - locFinalPosY = layoutSize.height * 0.5 - locSize.height * (0.5 - locAP.y); - break; - case ccui.RELATIVE_ALIGN_PARENT_RIGHT_CENTER_VERTICAL: - locFinalPosX = layoutSize.width - ((1 - locAP.x) * locSize.width); - locFinalPosY = layoutSize.height * 0.5 - locSize.height * (0.5 - locAP.y); - break; - case ccui.RELATIVE_ALIGN_PARENT_LEFT_BOTTOM: - locFinalPosX = locAP.x * locSize.width; - locFinalPosY = locAP.y * locSize.height; - break; - case ccui.RELATIVE_ALIGN_PARENT_BOTTOM_CENTER_HORIZONTAL: - locFinalPosX = layoutSize.width * 0.5 - locSize.width * (0.5 - locAP.x); - locFinalPosY = locAP.y * locSize.height; - break; - case ccui.RELATIVE_ALIGN_PARENT_RIGHT_BOTTOM: - locFinalPosX = layoutSize.width - ((1 - locAP.x) * locSize.width); - locFinalPosY = locAP.y * locSize.height; - break; - - case ccui.RELATIVE_ALIGN_LOCATION_ABOVE_LEFT: - if (locRelativeWidget) { - if (locRelativeWidgetLP && !locRelativeWidgetLP._put) { - continue; - } - var locationBottom = locRelativeWidget.getTopInParent(); - var locationLeft = locRelativeWidget.getLeftInParent(); - locFinalPosY = locationBottom + locAP.y * locSize.height; - locFinalPosX = locationLeft + locAP.x * locSize.width; - } - break; - case ccui.RELATIVE_ALIGN_LOCATION_ABOVE_CENTER: - if (locRelativeWidget) { - if (locRelativeWidgetLP && !locRelativeWidgetLP._put) { - continue; - } - var rbs = locRelativeWidget.getSize(); - var locationBottom = locRelativeWidget.getTopInParent(); - - locFinalPosY = locationBottom + locAP.y * locSize.height; - locFinalPosX = locRelativeWidget.getLeftInParent() + rbs.width * 0.5 + locAP.x * locSize.width - locSize.width * 0.5; - } - break; - case ccui.RELATIVE_ALIGN_LOCATION_ABOVE_RIGHT: - if (locRelativeWidget) { - if (locRelativeWidgetLP && !locRelativeWidgetLP._put) { - continue; - } - var locationBottom = locRelativeWidget.getTopInParent(); - var locationRight = locRelativeWidget.getRightInParent(); - locFinalPosY = locationBottom + locAP.y * locSize.height; - locFinalPosX = locationRight - (1 - locAP.x) * locSize.width; - } - break; - case ccui.RELATIVE_ALIGN_LOCATION_LEFT_TOP: - if (locRelativeWidget) { - if (locRelativeWidgetLP && !locRelativeWidgetLP._put) { - continue; - } - var locationTop = locRelativeWidget.getTopInParent(); - var locationRight = locRelativeWidget.getLeftInParent(); - locFinalPosY = locationTop - (1 - locAP.y) * locSize.height; - locFinalPosX = locationRight - (1 - locAP.x) * locSize.width; - } - break; - case ccui.RELATIVE_ALIGN_LOCATION_LEFT_CENTER: - if (locRelativeWidget) { - if (locRelativeWidgetLP && !locRelativeWidgetLP._put) { - continue; - } - var rbs = locRelativeWidget.getSize(); - var locationRight = locRelativeWidget.getLeftInParent(); - locFinalPosX = locationRight - (1 - locAP.x) * locSize.width; - - locFinalPosY = locRelativeWidget.getBottomInParent() + rbs.height * 0.5 + locAP.y * locSize.height - locSize.height * 0.5; - } - break; - case ccui.RELATIVE_ALIGN_LOCATION_LEFT_BOTTOM: - if (locRelativeWidget) { - if (locRelativeWidgetLP && !locRelativeWidgetLP._put) { - continue; - } - var locationBottom = locRelativeWidget.getBottomInParent(); - var locationRight = locRelativeWidget.getLeftInParent(); - locFinalPosY = locationBottom + locAP.y * locSize.height; - locFinalPosX = locationRight - (1 - locAP.x) * locSize.width; - } - break; - case ccui.RELATIVE_ALIGN_LOCATION_RIGHT_TOP: - if (locRelativeWidget) { - if (locRelativeWidgetLP && !locRelativeWidgetLP._put) { - continue; - } - var locationTop = locRelativeWidget.getTopInParent(); - var locationLeft = locRelativeWidget.getRightInParent(); - locFinalPosY = locationTop - (1 - locAP.y) * locSize.height; - locFinalPosX = locationLeft + locAP.x * locSize.width; - } - break; - case ccui.RELATIVE_ALIGN_LOCATION_RIGHT_CENTER: - if (locRelativeWidget) { - if (locRelativeWidgetLP && !locRelativeWidgetLP._put) { - continue; - } - var rbs = locRelativeWidget.getSize(); - var locationLeft = locRelativeWidget.getRightInParent(); - locFinalPosX = locationLeft + locAP.x * locSize.width; - - locFinalPosY = locRelativeWidget.getBottomInParent() + rbs.height * 0.5 + locAP.y * locSize.height - locSize.height * 0.5; - } - break; - case ccui.RELATIVE_ALIGN_LOCATION_RIGHT_BOTTOM: - if (locRelativeWidget) { - if (locRelativeWidgetLP && !locRelativeWidgetLP._put) { - continue; - } - var locationBottom = locRelativeWidget.getBottomInParent(); - var locationLeft = locRelativeWidget.getRightInParent(); - locFinalPosY = locationBottom + locAP.y * locSize.height; - locFinalPosX = locationLeft + locAP.x * locSize.width; - } - break; - case ccui.RELATIVE_ALIGN_LOCATION_BELOW_TOP: - if (locRelativeWidget) { - if (locRelativeWidgetLP && !locRelativeWidgetLP._put) { - continue; - } - var locationTop = locRelativeWidget.getBottomInParent(); - var locationLeft = locRelativeWidget.getLeftInParent(); - locFinalPosY = locationTop - (1 - locAP.y) * locSize.height; - locFinalPosX = locationLeft + locAP.x * locSize.width; - } - break; - case ccui.RELATIVE_ALIGN_LOCATION_BELOW_CENTER: - if (locRelativeWidget) { - if (locRelativeWidgetLP && !locRelativeWidgetLP._put) { - continue; - } - var rbs = locRelativeWidget.getSize(); - var locationTop = locRelativeWidget.getBottomInParent(); - - locFinalPosY = locationTop - (1 - locAP.y) * locSize.height; - locFinalPosX = locRelativeWidget.getLeftInParent() + rbs.width * 0.5 + locAP.x * locSize.width - locSize.width * 0.5; - } - break; - case ccui.RELATIVE_ALIGN_LOCATION_BELOW_BOTTOM: - if (locRelativeWidget) { - if (locRelativeWidgetLP && !locRelativeWidgetLP._put) { - continue; - } - var locationTop = locRelativeWidget.getBottomInParent(); - var locationRight = locRelativeWidget.getRightInParent(); - locFinalPosY = locationTop - (1 - locAP.y) * locSize.height; - locFinalPosX = locationRight - (1 - locAP.x) * locSize.width; - } - break; - default: - break; - } - var locRelativeWidgetMargin,locRelativeWidgetLPAlign; - var locMargin = locLayoutParameter.getMargin(); - if (locRelativeWidgetLP) { - locRelativeWidgetMargin = locRelativeWidgetLP.getMargin(); - locRelativeWidgetLPAlign = locRelativeWidgetLP.getAlign(); - } - //handle margin - switch (locAlign) { - case ccui.RELATIVE_ALIGN_NONE: - case ccui.RELATIVE_ALIGN_PARENT_TOP_LEFT: - locFinalPosX += locMargin.left; - locFinalPosY -= locMargin.top; - break; - case ccui.RELATIVE_ALIGN_PARENT_TOP_CENTER_HORIZONTAL: - locFinalPosY -= locMargin.top; - break; - case ccui.RELATIVE_ALIGN_PARENT_TOP_RIGHT: - locFinalPosX -= locMargin.right; - locFinalPosY -= locMargin.top; - break; - case ccui.RELATIVE_ALIGN_PARENT_LEFT_CENTER_VERTICAL: - locFinalPosX += locMargin.left; - break; - case ccui.RELATIVE_ALIGN_PARENT_CENTER: - break; - case ccui.RELATIVE_ALIGN_PARENT_RIGHT_CENTER_VERTICAL: - locFinalPosX -= locMargin.right; - break; - case ccui.RELATIVE_ALIGN_PARENT_LEFT_BOTTOM: - locFinalPosX += locMargin.left; - locFinalPosY += locMargin.bottom; - break; - case ccui.RELATIVE_ALIGN_PARENT_BOTTOM_CENTER_HORIZONTAL: - locFinalPosY += locMargin.bottom; - break; - case ccui.RELATIVE_ALIGN_PARENT_RIGHT_BOTTOM: - locFinalPosX -= locMargin.right; - locFinalPosY += locMargin.bottom; - break; - - case ccui.RELATIVE_ALIGN_LOCATION_ABOVE_LEFT: - locFinalPosY += locMargin.bottom; - if (locRelativeWidgetLPAlign != ccui.RELATIVE_ALIGN_PARENT_TOP_CENTER_HORIZONTAL - && locRelativeWidgetLPAlign != ccui.RELATIVE_ALIGN_PARENT_TOP_LEFT - && locRelativeWidgetLPAlign != ccui.RELATIVE_ALIGN_NONE - && locRelativeWidgetLPAlign != ccui.RELATIVE_ALIGN_PARENT_TOP_RIGHT) - { - locFinalPosY += locRelativeWidgetMargin.top; - } - locFinalPosY += locMargin.left; - break; - case ccui.RELATIVE_ALIGN_LOCATION_ABOVE_CENTER: - locFinalPosY += locMargin.bottom; - if (locRelativeWidgetLPAlign != ccui.RELATIVE_ALIGN_PARENT_TOP_CENTER_HORIZONTAL - && locRelativeWidgetLPAlign != ccui.RELATIVE_ALIGN_PARENT_TOP_LEFT - && locRelativeWidgetLPAlign != ccui.RELATIVE_ALIGN_NONE - && locRelativeWidgetLPAlign != ccui.RELATIVE_ALIGN_PARENT_TOP_RIGHT) - { - locFinalPosY += locRelativeWidgetMargin.top; - } - break; - case ccui.RELATIVE_ALIGN_LOCATION_ABOVE_RIGHT: - locFinalPosY += locMargin.bottom; - if (locRelativeWidgetLPAlign != ccui.RELATIVE_ALIGN_PARENT_TOP_CENTER_HORIZONTAL - && locRelativeWidgetLPAlign != ccui.RELATIVE_ALIGN_PARENT_TOP_LEFT - && locRelativeWidgetLPAlign != ccui.RELATIVE_ALIGN_NONE - && locRelativeWidgetLPAlign != ccui.RELATIVE_ALIGN_PARENT_TOP_RIGHT) - { - locFinalPosY += locRelativeWidgetMargin.top; - } - locFinalPosX -= locMargin.right; - break; - case ccui.RELATIVE_ALIGN_LOCATION_LEFT_TOP: - locFinalPosX -= locMargin.right; - if (locRelativeWidgetLPAlign != ccui.RELATIVE_ALIGN_PARENT_TOP_LEFT - && locRelativeWidgetLPAlign != ccui.RELATIVE_ALIGN_NONE - && locRelativeWidgetLPAlign != ccui.RELATIVE_ALIGN_PARENT_LEFT_BOTTOM - && locRelativeWidgetLPAlign != ccui.RELATIVE_ALIGN_PARENT_LEFT_CENTER_VERTICAL) - { - locFinalPosX -= locRelativeWidgetMargin.left; - } - locFinalPosY -= locMargin.top; - break; - case ccui.RELATIVE_ALIGN_LOCATION_LEFT_CENTER: - locFinalPosX -= locMargin.right; - if (locRelativeWidgetLPAlign != ccui.RELATIVE_ALIGN_PARENT_TOP_LEFT - && locRelativeWidgetLPAlign != ccui.RELATIVE_ALIGN_NONE - && locRelativeWidgetLPAlign != ccui.RELATIVE_ALIGN_PARENT_LEFT_BOTTOM - && locRelativeWidgetLPAlign != ccui.RELATIVE_ALIGN_PARENT_LEFT_CENTER_VERTICAL) - { - locFinalPosX -= locRelativeWidgetMargin.left; - } - break; - case ccui.RELATIVE_ALIGN_LOCATION_LEFT_BOTTOM: - locFinalPosX -= locMargin.right; - if (locRelativeWidgetLPAlign != ccui.RELATIVE_ALIGN_PARENT_TOP_LEFT - && locRelativeWidgetLPAlign != ccui.RELATIVE_ALIGN_NONE - && locRelativeWidgetLPAlign != ccui.RELATIVE_ALIGN_PARENT_LEFT_BOTTOM - && locRelativeWidgetLPAlign != ccui.RELATIVE_ALIGN_PARENT_LEFT_CENTER_VERTICAL) - { - locFinalPosX -= locRelativeWidgetMargin.left; - } - locFinalPosY += locMargin.bottom; - break; - break; - case ccui.RELATIVE_ALIGN_LOCATION_RIGHT_TOP: - locFinalPosX += locMargin.left; - if (locRelativeWidgetLPAlign != ccui.RELATIVE_ALIGN_PARENT_TOP_RIGHT - && locRelativeWidgetLPAlign != ccui.RELATIVE_ALIGN_PARENT_RIGHT_BOTTOM - && locRelativeWidgetLPAlign != ccui.RELATIVE_ALIGN_PARENT_RIGHT_CENTER_VERTICAL) - { - locFinalPosX += locRelativeWidgetMargin.right; - } - locFinalPosY -= locMargin.top; - break; - case ccui.RELATIVE_ALIGN_LOCATION_RIGHT_CENTER: - locFinalPosX += locMargin.left; - if (locRelativeWidgetLPAlign != ccui.RELATIVE_ALIGN_PARENT_TOP_RIGHT - && locRelativeWidgetLPAlign != ccui.RELATIVE_ALIGN_PARENT_RIGHT_BOTTOM - && locRelativeWidgetLPAlign != ccui.RELATIVE_ALIGN_PARENT_RIGHT_CENTER_VERTICAL) - { - locFinalPosX += locRelativeWidgetMargin.right; - } - break; - case ccui.RELATIVE_ALIGN_LOCATION_RIGHT_BOTTOM: - locFinalPosX += locMargin.left; - if (locRelativeWidgetLPAlign != ccui.RELATIVE_ALIGN_PARENT_TOP_RIGHT - && locRelativeWidgetLPAlign != ccui.RELATIVE_ALIGN_PARENT_RIGHT_BOTTOM - && locRelativeWidgetLPAlign != ccui.RELATIVE_ALIGN_PARENT_RIGHT_CENTER_VERTICAL) - { - locFinalPosX += locRelativeWidgetMargin.right; - } - locFinalPosY += locMargin.bottom; - break; - break; - case ccui.RELATIVE_ALIGN_LOCATION_BELOW_TOP: - locFinalPosY -= locMargin.top; - if (locRelativeWidgetLPAlign != ccui.RELATIVE_ALIGN_PARENT_LEFT_BOTTOM - && locRelativeWidgetLPAlign != ccui.RELATIVE_ALIGN_PARENT_RIGHT_BOTTOM - && locRelativeWidgetLPAlign != ccui.RELATIVE_ALIGN_PARENT_BOTTOM_CENTER_HORIZONTAL) - { - locFinalPosY -= locRelativeWidgetMargin.bottom; - } - locFinalPosX += locMargin.left; - break; - case ccui.RELATIVE_ALIGN_LOCATION_BELOW_CENTER: - locFinalPosY -= locMargin.top; - if (locRelativeWidgetLPAlign != ccui.RELATIVE_ALIGN_PARENT_LEFT_BOTTOM - && locRelativeWidgetLPAlign != ccui.RELATIVE_ALIGN_PARENT_RIGHT_BOTTOM - && locRelativeWidgetLPAlign != ccui.RELATIVE_ALIGN_PARENT_BOTTOM_CENTER_HORIZONTAL) - { - locFinalPosY -= locRelativeWidgetMargin.bottom; - } - break; - case ccui.RELATIVE_ALIGN_LOCATION_BELOW_BOTTOM: - locFinalPosY -= locMargin.top; - if (locRelativeWidgetLPAlign != ccui.RELATIVE_ALIGN_PARENT_LEFT_BOTTOM - && locRelativeWidgetLPAlign != ccui.RELATIVE_ALIGN_PARENT_RIGHT_BOTTOM - && locRelativeWidgetLPAlign != ccui.RELATIVE_ALIGN_PARENT_BOTTOM_CENTER_HORIZONTAL) - { - locFinalPosY -= locRelativeWidgetMargin.bottom; - } - locFinalPosX -= locMargin.right; - break; - default: - break; - } - locChild.setPosition(locFinalPosX, locFinalPosY); - locLayoutParameter._put = true; - unlayoutChildCount--; + } else + return this._getNextFocusedWidget(direction, nextWidget); + } else + return (current instanceof ccui.Layout) ? current : ccui.Widget._focusedWidget; + } else{ + if (this._isLastWidgetInContainer(current, direction)){ + if (this._isWidgetAncestorSupportLoopFocus(this, direction)) + return ccui.Widget.prototype.findNextFocusedWidget.call(this, direction, this); + return (current instanceof ccui.Layout) ? current : ccui.Widget._focusedWidget; + } else + return ccui.Widget.prototype.findNextFocusedWidget.call(this, direction, this); + } + } + }, + + /** + * this method is called internally by nextFocusedWidget. When the dir is Left/Up, then this method will be called + * @param direction + * @param {ccui.Widget} current the current focused widget + * @returns {ccui.Widget} the next focused widget + * @private + */ + _getPreviousFocusedWidget: function(direction, current){ + var nextWidget = null, locChildren = this._children; + var previousWidgetPos = locChildren.indexOf(current); + previousWidgetPos = previousWidgetPos - 1; + if (previousWidgetPos >= 0){ + nextWidget = this._getChildWidgetByIndex(previousWidgetPos); + if (nextWidget.isFocusEnabled()) { + if (nextWidget instanceof ccui.Layout){ + nextWidget._isFocusPassing = true; + return nextWidget.findNextFocusedWidget(direction, nextWidget); } + this.dispatchFocusEvent(current, nextWidget); + return nextWidget; + } else + return this._getPreviousFocusedWidget(direction, nextWidget); //handling the disabled widget, there is no actual focus lose or get, so we don't need any envet + }else { + if (this._loopFocus){ + if (this._checkFocusEnabledChild()) { + previousWidgetPos = locChildren.length -1; + nextWidget = this._getChildWidgetByIndex(previousWidgetPos); + if (nextWidget.isFocusEnabled()){ + if (nextWidget instanceof ccui.Layout){ + nextWidget._isFocusPassing = true; + return nextWidget.findNextFocusedWidget(direction, nextWidget); + } else { + this.dispatchFocusEvent(current, nextWidget); + return nextWidget; + } + } else + return this._getPreviousFocusedWidget(direction, nextWidget); + } else + return (current instanceof ccui.Layout) ? current : ccui.Widget._focusedWidget; + } else { + if (this._isLastWidgetInContainer(current, direction)) { + if (this._isWidgetAncestorSupportLoopFocus(this, direction)) + return ccui.Widget.prototype.findNextFocusedWidget.call(this, direction, this); + return (current instanceof ccui.Layout) ? current : ccui.Widget._focusedWidget; + } else + return ccui.Widget.prototype.findNextFocusedWidget.call(this, direction, this); } } }, - _doLayout: function () { - if(!this._doLayoutDirty){ - return; + + /** + * find the nth element in the _children array. Only the Widget descendant object will be returned + * @param {Number} index + * @returns {ccui.Widget} + * @private + */ + _getChildWidgetByIndex: function (index) { + var locChildren = this._children; + var size = locChildren.length, count = 0, oldIndex = index; + while (index < size) { + var firstChild = locChildren[index]; + if (firstChild && firstChild instanceof ccui.Widget) + return firstChild; + count++; + index++; } - switch (this._layoutType) { - case ccui.Layout.ABSOLUTE: - break; - case ccui.Layout.LINEAR_VERTICAL: - this.doLayout_LINEAR_VERTICAL(); - break; - case ccui.Layout.LINEAR_HORIZONTAL: - this.doLayout_LINEAR_HORIZONTAL(); - break; - case ccui.Layout.RELATIVE: - this.doLayout_RELATIVE(); - break; - default: - break; + + var begin = 0; + while (begin < oldIndex) { + var child = locChildren[begin]; + if (child && child instanceof ccui.Widget) + return child; + count++; + begin++; } - this._doLayoutDirty = false; + return null; + }, + + /** + * whether it is the last element according to all their parents + * @param {ccui.Widget} widget + * @param {Number} direction + * @returns {Boolean} + * @private + */ + _isLastWidgetInContainer:function(widget, direction){ + var parent = widget.getParent(); + if (parent == null || !(parent instanceof ccui.Layout)) + return true; + + var container = parent.getChildren(); + var index = container.indexOf(widget); + if (parent.getLayoutType() === ccui.Layout.LINEAR_HORIZONTAL) { + if (direction === ccui.Widget.LEFT) { + if (index === 0) + return this._isLastWidgetInContainer(parent, direction); + else + return false; + } + if (direction === ccui.Widget.RIGHT) { + if (index === container.length - 1) + return this._isLastWidgetInContainer(parent, direction); + else + return false; + } + if (direction === ccui.Widget.DOWN) + return this._isLastWidgetInContainer(parent, direction); + + if (direction === ccui.Widget.UP) + return this._isLastWidgetInContainer(parent, direction); + } else if(parent.getLayoutType() === ccui.Layout.LINEAR_VERTICAL){ + if (direction === ccui.Widget.UP){ + if (index === 0) + return this._isLastWidgetInContainer(parent, direction); + else + return false; + } + if (direction === ccui.Widget.DOWN) { + if (index === container.length - 1) + return this._isLastWidgetInContainer(parent, direction); + else + return false; + } + if (direction === ccui.Widget.LEFT) + return this._isLastWidgetInContainer(parent, direction); + + if (direction === ccui.Widget.RIGHT) + return this._isLastWidgetInContainer(parent, direction); + } else { + cc.log("invalid layout Type"); + return false; + } + }, + + /** + * Lookup any parent widget with a layout type as the direction, if the layout is loop focused, then return true, otherwise it returns false. + * @param {ccui.Widget} widget + * @param {Number} direction + * @returns {Boolean} + * @private + */ + _isWidgetAncestorSupportLoopFocus: function(widget, direction){ + var parent = widget.getParent(); + if (parent == null || !(parent instanceof ccui.Layout)) + return false; + if (parent.isLoopFocus()) { + var layoutType = parent.getLayoutType(); + if (layoutType === ccui.Layout.LINEAR_HORIZONTAL) { + if (direction === ccui.Widget.LEFT || direction === ccui.Widget.RIGHT) + return true; + else + return this._isWidgetAncestorSupportLoopFocus(parent, direction); + } + if (layoutType === ccui.Layout.LINEAR_VERTICAL){ + if (direction === ccui.Widget.DOWN || direction === ccui.Widget.UP) + return true; + else + return this._isWidgetAncestorSupportLoopFocus(parent, direction); + } else{ + cc.assert(0, "invalid layout type"); + return false; + } + } else + return this._isWidgetAncestorSupportLoopFocus(parent, direction); + }, + + /** + * pass the focus to the layout's next focus enabled child + * @param {Number} direction + * @param {ccui.Widget} current + * @returns {ccui.Widget} + * @private + */ + _passFocusToChild: function(direction, current){ + if (this._checkFocusEnabledChild()) { + var previousWidget = ccui.Widget.getCurrentFocusedWidget(); + this._findProperSearchingFunctor(direction, previousWidget); + var index = this.onPassFocusToChild(direction, previousWidget); + + var widget = this._getChildWidgetByIndex(index); + if (widget instanceof ccui.Layout) { + widget._isFocusPassing = true; + return widget.findNextFocusedWidget(direction, widget); + } else { + this.dispatchFocusEvent(current, widget); + return widget; + } + }else + return this; + }, + + /** + * If there are no focus enabled child in the layout, it will return false, otherwise it returns true + * @returns {boolean} + * @private + */ + _checkFocusEnabledChild: function(){ + var locChildren = this._children; + for(var i = 0, len = locChildren.length; i < len; i++){ + var widget = locChildren[i]; + if (widget && widget instanceof ccui.Widget && widget.isFocusEnabled()) + return true; + } + return false; }, /** @@ -1478,15 +1415,17 @@ ccui.Layout = ccui.Widget.extend(/** @lends ccui.Layout# */{ return "Layout"; }, - createCloneInstance: function () { - return ccui.Layout.create(); + _createCloneInstance: function () { + return new ccui.Layout(); }, - copyClonedWidgetChildren: function (model) { - ccui.Widget.prototype.copyClonedWidgetChildren.call(this, model); + _copyClonedWidgetChildren: function (model) { + ccui.Widget.prototype._copyClonedWidgetChildren.call(this, model); }, - copySpecialProperties: function (layout) { + _copySpecialProperties: function (layout) { + if(!(layout instanceof ccui.Layout)) + return; this.setBackGroundImageScale9Enabled(layout._backGroundScale9Enabled); this.setBackGroundImage(layout._backGroundImageFileName, layout._bgImageTexType); this.setBackGroundImageCapInsets(layout._backGroundImageCapInsets); @@ -1498,28 +1437,28 @@ ccui.Layout = ccui.Widget.extend(/** @lends ccui.Layout# */{ this.setLayoutType(layout._layoutType); this.setClippingEnabled(layout._clippingEnabled); this.setClippingType(layout._clippingType); + this._loopFocus = layout._loopFocus; + this.__passFocusToChild = layout.__passFocusToChild; + this._isInterceptTouch = layout._isInterceptTouch; + }, + + /** + * force refresh widget layout + */ + forceDoLayout: function(){ + this.requestDoLayout(); + this._doLayout(); + }, + + _createRenderCmd: function(){ + if(cc._renderType === cc._RENDER_TYPE_WEBGL) + return new ccui.Layout.WebGLRenderCmd(this); + else + return new ccui.Layout.CanvasRenderCmd(this); } }); -ccui.Layout._init_once = null; -ccui.Layout._visit_once = null; -ccui.Layout._layer = null; -ccui.Layout._sharedCache = null; - -if(cc._renderType == cc._RENDER_TYPE_WEBGL){ - //WebGL - ccui.Layout.prototype.initStencil = ccui.Layout.prototype._initStencilForWebGL; - ccui.Layout.prototype.stencilClippingVisit = ccui.Layout.prototype._stencilClippingVisitForWebGL; - ccui.Layout.prototype.scissorClippingVisit = ccui.Layout.prototype._scissorClippingVisitForWebGL; -}else{ - ccui.Layout.prototype.initStencil = ccui.Layout.prototype._initStencilForCanvas; - ccui.Layout.prototype.stencilClippingVisit = ccui.Layout.prototype._stencilClippingVisitForCanvas; - ccui.Layout.prototype.scissorClippingVisit = ccui.Layout.prototype._stencilClippingVisitForCanvas; -} -ccui.Layout._getSharedCache = function () { - return (cc.ClippingNode._sharedCache) || (cc.ClippingNode._sharedCache = cc.newElement("canvas")); -}; -window._p = ccui.Layout.prototype; +var _p = ccui.Layout.prototype; // Extended properties /** @expose */ @@ -1532,40 +1471,88 @@ cc.defineGetterSetter(_p, "clippingType", null, _p.setClippingType); _p.layoutType; cc.defineGetterSetter(_p, "layoutType", _p.getLayoutType, _p.setLayoutType); -delete window._p; +_p = null; /** * allocates and initializes a UILayout. - * @constructs + * @deprecated since v3.0, please use new ccui.Layout() instead. * @return {ccui.Layout} - * @example - * // example - * var uiLayout = ccui.Layout.create(); */ ccui.Layout.create = function () { - var layout = new ccui.Layout(); - if (layout && layout.init()) { - return layout; - } - return null; + return new ccui.Layout(); }; // Constants //layoutBackGround color type +/** + * The None of ccui.Layout's background color type + * @constant + * @type {number} + */ ccui.Layout.BG_COLOR_NONE = 0; +/** + * The solid of ccui.Layout's background color type, it will use a LayerColor to draw the background. + * @constant + * @type {number} + */ ccui.Layout.BG_COLOR_SOLID = 1; +/** + * The gradient of ccui.Layout's background color type, it will use a LayerGradient to draw the background. + * @constant + * @type {number} + */ ccui.Layout.BG_COLOR_GRADIENT = 2; //Layout type +/** + * The absolute of ccui.Layout's layout type. + * @type {number} + * @constant + */ ccui.Layout.ABSOLUTE = 0; +/** + * The vertical of ccui.Layout's layout type. + * @type {number} + * @constant + */ ccui.Layout.LINEAR_VERTICAL = 1; +/** + * The horizontal of ccui.Layout's layout type. + * @type {number} + * @constant + */ ccui.Layout.LINEAR_HORIZONTAL = 2; +/** + * The relative of ccui.Layout's layout type. + * @type {number} + * @constant + */ ccui.Layout.RELATIVE = 3; //Layout clipping type +/** + * The stencil of ccui.Layout's clipping type. + * @type {number} + * @constant + */ ccui.Layout.CLIPPING_STENCIL = 0; +/** + * The scissor of ccui.Layout's clipping type. + * @type {number} + * @constant + */ ccui.Layout.CLIPPING_SCISSOR = 1; +/** + * The zOrder value of ccui.Layout's image background. + * @type {number} + * @constant + */ ccui.Layout.BACKGROUND_IMAGE_ZORDER = -2; +/** + * The zOrder value of ccui.Layout's color background. + * @type {number} + * @constant + */ ccui.Layout.BACKGROUND_RENDERER_ZORDER = -2; \ No newline at end of file diff --git a/extensions/ccui/layouts/UILayoutCanvasRenderCmd.js b/extensions/ccui/layouts/UILayoutCanvasRenderCmd.js new file mode 100644 index 0000000000..d3861d2573 --- /dev/null +++ b/extensions/ccui/layouts/UILayoutCanvasRenderCmd.js @@ -0,0 +1,179 @@ +/**************************************************************************** + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. + + http://www.cocos2d-x.org + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + ****************************************************************************/ + +(function(){ + ccui.Layout.CanvasRenderCmd = function(renderable){ + ccui.ProtectedNode.CanvasRenderCmd.call(this, renderable); + this._needDraw = false; + + this._clipElemType = false; + this._locCache = null; + this._rendererSaveCmd = new cc.CustomRenderCmd(this, this._onRenderSaveCmd); + this._rendererSaveCmdSprite = new cc.CustomRenderCmd(this, this._onRenderSaveSpriteCmd); + this._rendererClipCmd = new cc.CustomRenderCmd(this, this._onRenderClipCmd); + this._rendererRestoreCmd = new cc.CustomRenderCmd(this, this._onRenderRestoreCmd); + }; + + var proto = ccui.Layout.CanvasRenderCmd.prototype = Object.create(ccui.ProtectedNode.CanvasRenderCmd.prototype); + proto.constructor = ccui.Layout.CanvasRenderCmd; + + proto.visit = function(parentCmd){ + var node = this._node; + if (!node._visible) + return; + node._adaptRenderers(); + node._doLayout(); + + if (node._clippingEnabled) { + switch (node._clippingType) { + case ccui.Layout.CLIPPING_STENCIL: + this.stencilClippingVisit(parentCmd); + break; + case ccui.Layout.CLIPPING_SCISSOR: + this.scissorClippingVisit(parentCmd); + break; + default: + break; + } + } else + ccui.Widget.CanvasRenderCmd.prototype.visit.call(this, parentCmd); + }; + + proto._onRenderSaveCmd = function(ctx, scaleX, scaleY){ + var wrapper = ctx || cc._renderContext, context = wrapper.getContext(); + if (this._clipElemType) { + var canvas = context.canvas; + this._locCache = ccui.Layout.CanvasRenderCmd._getSharedCache(); + this._locCache.width = canvas.width; + this._locCache.height = canvas.height; + var locCacheCtx = this._locCache.getContext("2d"); + locCacheCtx.drawImage(canvas, 0, 0); + } else { + wrapper.save(); + wrapper.save(); + wrapper.setTransform(this._worldTransform, scaleX, scaleY); + } + }; + + proto._onRenderSaveSpriteCmd = function(ctx){ + var wrapper = ctx || cc._renderContext; + //var node = this._node; + if (this._clipElemType) { + wrapper.setCompositeOperation("destination-in"); + } + }; + + proto._onRenderClipCmd = function(ctx){ + var wrapper = ctx || cc._renderContext, context = wrapper.getContext(); + if (!this._clipElemType) { + wrapper.restore(); + context.clip(); + } + }; + + proto._onRenderRestoreCmd = function(ctx){ + var wrapper = ctx || cc._renderContext, context = wrapper.getContext(); + + if (this._clipElemType) { + // Redraw the cached canvas, so that the cliped area shows the background etc. + context.save(); + context.setTransform(1, 0, 0, 1, 0, 0); + context.globalCompositeOperation = "destination-over"; + context.drawImage(this._locCache, 0, 0); + context.restore(); + }else{ + wrapper.restore(); //use for restore clip operation + } + }; + + proto.rebindStencilRendering = function(stencil){ + stencil._renderCmd.rendering = this.__stencilDraw; + }; + + proto.__stencilDraw = function(ctx,scaleX, scaleY){ //Only for Canvas + var wrapper = ctx || cc._renderContext, locContext = wrapper.getContext(), buffer = this._buffer; + + for (var i = 0, bufLen = buffer.length; i < bufLen; i++) { + var element = buffer[i], vertices = element.verts; + var firstPoint = vertices[0]; + locContext.beginPath(); + locContext.moveTo(firstPoint.x * scaleX, -firstPoint.y * scaleY); + for (var j = 1, len = vertices.length; j < len; j++) + locContext.lineTo(vertices[j].x * scaleX, -vertices[j].y * scaleY); + locContext.closePath(); + } + }; + + proto.stencilClippingVisit = proto.scissorClippingVisit = function(parentCmd){ + var node = this._node; + if (!node._clippingStencil || !node._clippingStencil.isVisible()) + return; + + this._clipElemType = node._stencil instanceof cc.Sprite; + this._syncStatus(parentCmd); + this._dirtyFlag = 0; + + cc.renderer.pushRenderCommand(this._rendererSaveCmd); + if (this._clipElemType) { + cc.ProtectedNode.prototype.visit.call(node, parentCmd); + cc.renderer.pushRenderCommand(this._rendererSaveCmdSprite); + } + node._clippingStencil.visit(this); + + cc.renderer.pushRenderCommand(this._rendererClipCmd); + if (!this._clipElemType) { + node.sortAllChildren(); + node.sortAllProtectedChildren(); + + var children = node._children; + var j=0, locProtectChildren = node._protectedChildren, i = 0, locChild; + var iLen = children.length, jLen = locProtectChildren.length; + + for( ; i < iLen; i++ ){ + locChild = children[i]; + if ( locChild && locChild.getLocalZOrder() < 0 ) + locChild.visit(this); + else + break; + } + for( ; j < jLen; j++ ) { + locChild = locProtectChildren[j]; + if ( locChild && locChild.getLocalZOrder() < 0 ) + locChild.visit(this); + else + break; + } + for (; i < iLen; i++) + children[i].visit(this); + for (; j < jLen; j++) + locProtectChildren[j].visit(this); + cc.renderer.pushRenderCommand(this._rendererRestoreCmd); + } + }; + + ccui.Layout.CanvasRenderCmd._getSharedCache = function () { + return (cc.ClippingNode._sharedCache) || (cc.ClippingNode._sharedCache = cc.newElement("canvas")); + }; +})(); \ No newline at end of file diff --git a/extensions/ccui/layouts/UILayoutComponent.js b/extensions/ccui/layouts/UILayoutComponent.js new file mode 100644 index 0000000000..96a9dbf3fa --- /dev/null +++ b/extensions/ccui/layouts/UILayoutComponent.js @@ -0,0 +1,585 @@ +/**************************************************************************** + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. + + http://www.cocos2d-x.org + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + ****************************************************************************/ + +ccui.LayoutComponent_ReferencePoint = { + BOTTOM_LEFT: 0, + TOP_LEFT: 1, + BOTTOM_RIGHT: 2, + TOP_RIGHT: 3 +}; +ccui.LayoutComponent_PositionType = { + Position: 0, + RelativePosition: 1, + PreRelativePosition: 2, + PreRelativePositionEnable: 3 +}; +ccui.LayoutComponent_SizeType = { + Size: 0, + PreSize: 1, + PreSizeEnable: 2 +}; + +//refactor since v3.3 +ccui.LayoutComponent = cc.Component.extend({ + _horizontalEdge: 0, + _verticalEdge: 0, + + _leftMargin: 0, + _rightMargin: 0, + _bottomMargin: 0, + _topMargin: 0, + + _usingPositionPercentX: false, + _positionPercentX: 0, + _usingPositionPercentY: false, + _positionPercentY: 0, + + _usingStretchWidth: false, + _usingStretchHeight: false, + + _percentWidth: 0, + _usingPercentWidth: false, + + _percentHeight: 0, + _usingPercentHeight: false, + + _actived: true, + _isPercentOnly: false, + + ctor: function () { + this._name = ccui.LayoutComponent.NAME; + }, + + init: function () { + var ret = true; + + if (!cc.Component.prototype.init.call(this)) { + return false; + } + + //put layout component initalized code here + + return ret; + }, + + getPercentContentSize: function () { + return cc.p(this._percentWidth, this._percentHeight); + }, + setPercentContentSize: function (percent) { + this.setPercentWidth(percent.x); + this.setPercentHeight(percent.y); + }, + + setUsingPercentContentSize: function (isUsed) { + this._usingPercentWidth = this._usingPercentHeight = isUsed; + }, + + //old + SetActiveEnable: function (enable) { + this._actived = enable; + }, + + //v3.3 + getUsingPercentContentSize: function () { + return this._usingPercentWidth && this._usingPercentHeight; + }, + + //position & margin + getAnchorPosition: function () { + return this._owner.getAnchorPoint(); + }, + + setAnchorPosition: function (point, y) { + var oldRect = this._owner.getBoundingBox(); + this._owner.setAnchorPoint(point, y); + var newRect = this._owner.getBoundingBox(); + var offSetX = oldRect.x - newRect.x, offSetY = oldRect.y - newRect.y; + + var ownerPosition = this._owner.getPosition(); + ownerPosition.x += offSetX; + ownerPosition.y += offSetY; + this.setPosition(ownerPosition); + }, + + getPosition: function () { + return this._owner.getPosition(); + }, + + setPosition: function (position, y) { + var parent = this._getOwnerParent(), x; + if (parent != null) { + if (y === undefined) { + x = position.x; + y = position.y; + } else + x = position; + var parentSize = parent.getContentSize(); + + if (parentSize.width !== 0) + this._positionPercentX = x / parentSize.width; + else { + this._positionPercentX = 0; + if (this._usingPositionPercentX) + x = 0; + } + + if (parentSize.height !== 0) + this._positionPercentY = y / parentSize.height; + else { + this._positionPercentY = 0; + if (this._usingPositionPercentY) + y = 0; + } + + this._owner.setPosition(x, y); + this._refreshHorizontalMargin(); + this._refreshVerticalMargin(); + } else + this._owner.setPosition(position, y); + }, + + isPositionPercentXEnabled: function () { + return this._usingPositionPercentX; + }, + setPositionPercentXEnabled: function (isUsed) { + this._usingPositionPercentX = isUsed; + if (this._usingPositionPercentX) + this._horizontalEdge = ccui.LayoutComponent.horizontalEdge.NONE; + }, + + getPositionPercentX: function () { + return this._positionPercentX; + }, + setPositionPercentX: function (percentMargin) { + this._positionPercentX = percentMargin; + + var parent = this._getOwnerParent(); + if (parent !== null) { + this._owner.setPositionX(parent.width * this._positionPercentX); + this._refreshHorizontalMargin(); + } + }, + + isPositionPercentYEnabled: function () { + return this._usingPositionPercentY; + }, + setPositionPercentYEnabled: function (isUsed) { + this._usingPositionPercentY = isUsed; + if (this._usingPositionPercentY) + this._verticalEdge = ccui.LayoutComponent.verticalEdge.NONE; + }, + + getPositionPercentY: function () { + return this._positionPercentY; + }, + setPositionPercentY: function (percentMargin) { + this._positionPercentY = percentMargin; + + var parent = this._getOwnerParent(); + if (parent !== null) { + this._owner.setPositionY(parent.height * this._positionPercentY); + this._refreshVerticalMargin(); + } + }, + + getHorizontalEdge: function () { + return this._horizontalEdge; + }, + setHorizontalEdge: function (hEdge) { + this._horizontalEdge = hEdge; + if (this._horizontalEdge !== ccui.LayoutComponent.horizontalEdge.NONE) + this._usingPositionPercentX = false; + + var parent = this._getOwnerParent(); + if (parent !== null) { + var ownerPoint = this._owner.getPosition(); + var parentSize = parent.getContentSize(); + if (parentSize.width !== 0) + this._positionPercentX = ownerPoint.x / parentSize.width; + else { + this._positionPercentX = 0; + ownerPoint.x = 0; + if (this._usingPositionPercentX) + this._owner.setPosition(ownerPoint); + } + this._refreshHorizontalMargin(); + } + }, + + getVerticalEdge: function () { + return this._verticalEdge; + }, + setVerticalEdge: function (vEdge) { + this._verticalEdge = vEdge; + if (this._verticalEdge !== ccui.LayoutComponent.verticalEdge.NONE) + this._usingPositionPercentY = false; + + var parent = this._getOwnerParent(); + if (parent !== null) { + var ownerPoint = this._owner.getPosition(); + var parentSize = parent.getContentSize(); + if (parentSize.height !== 0) + this._positionPercentY = ownerPoint.y / parentSize.height; + else { + this._positionPercentY = 0; + ownerPoint.y = 0; + if (this._usingPositionPercentY) + this._owner.setPosition(ownerPoint); + } + this._refreshVerticalMargin(); + } + }, + + getLeftMargin: function () { + return this._leftMargin; + }, + setLeftMargin: function (margin) { + this._leftMargin = margin; + }, + + getRightMargin: function () { + return this._rightMargin; + }, + setRightMargin: function (margin) { + this._rightMargin = margin; + }, + + getTopMargin: function () { + return this._topMargin; + }, + setTopMargin: function (margin) { + this._topMargin = margin; + }, + + getBottomMargin: function () { + return this._bottomMargin; + }, + setBottomMargin: function (margin) { + this._bottomMargin = margin; + }, + + //size & + getSize: function () { + return this.getOwner().getContentSize(); + }, + setSize: function (size) { + var parent = this._getOwnerParent(); + if (parent !== null) { + var ownerSize = size, parentSize = parent.getContentSize(); + + if (parentSize.width !== 0) + this._percentWidth = ownerSize.width / parentSize.width; + else { + this._percentWidth = 0; + if (this._usingPercentWidth) + ownerSize.width = 0; + } + + if (parentSize.height !== 0) + this._percentHeight = ownerSize.height / parentSize.height; + else { + this._percentHeight = 0; + if (this._usingPercentHeight) + ownerSize.height = 0; + } + + this._owner.setContentSize(ownerSize); + + this._refreshHorizontalMargin(); + this._refreshVerticalMargin(); + } + else + this._owner.setContentSize(size); + }, + + isPercentWidthEnabled: function () { + return this._usingPercentWidth; + }, + setPercentWidthEnabled: function (isUsed) { + this._usingPercentWidth = isUsed; + if (this._usingPercentWidth) + this._usingStretchWidth = false; + }, + + getSizeWidth: function () { + return this._owner.width; + }, + setSizeWidth: function (width) { + var ownerSize = this._owner.getContentSize(); + ownerSize.width = width; + + var parent = this._getOwnerParent(); + if (parent !== null) { + var parentSize = parent.getContentSize(); + if (parentSize.width !== 0) + this._percentWidth = ownerSize.width / parentSize.width; + else { + this._percentWidth = 0; + if (this._usingPercentWidth) + ownerSize.width = 0; + } + this._owner.setContentSize(ownerSize); + this._refreshHorizontalMargin(); + } else + this._owner.setContentSize(ownerSize); + }, + + getPercentWidth: function () { + return this._percentWidth; + }, + setPercentWidth: function (percentWidth) { + this._percentWidth = percentWidth; + + var parent = this._getOwnerParent(); + if (parent !== null) { + var ownerSize = this._owner.getContentSize(); + ownerSize.width = parent.width * this._percentWidth; + this._owner.setContentSize(ownerSize); + this._refreshHorizontalMargin(); + } + }, + + isPercentHeightEnabled: function () { + return this._usingPercentHeight; + }, + setPercentHeightEnabled: function (isUsed) { + this._usingPercentHeight = isUsed; + if (this._usingPercentHeight) + this._usingStretchHeight = false; + }, + + getSizeHeight: function () { + return this._owner.height; + }, + setSizeHeight: function (height) { + var ownerSize = this._owner.getContentSize(); + ownerSize.height = height; + + var parent = this._getOwnerParent(); + if (parent !== null) { + var parentSize = parent.getContentSize(); + if (parentSize.height !== 0) + this._percentHeight = ownerSize.height / parentSize.height; + else { + this._percentHeight = 0; + if (this._usingPercentHeight) + ownerSize.height = 0; + } + this._owner.setContentSize(ownerSize); + this._refreshVerticalMargin(); + } + else + this._owner.setContentSize(ownerSize); + }, + + getPercentHeight: function () { + return this._percentHeight; + }, + setPercentHeight: function (percentHeight) { + this._percentHeight = percentHeight; + + var parent = this._getOwnerParent(); + if (parent !== null) { + var ownerSize = this._owner.getContentSize(); + ownerSize.height = parent.height * this._percentHeight; + this._owner.setContentSize(ownerSize); + this._refreshVerticalMargin(); + } + }, + + isStretchWidthEnabled: function () { + return this._usingStretchWidth; + }, + setStretchWidthEnabled: function (isUsed) { + this._usingStretchWidth = isUsed; + if (this._usingStretchWidth) + this._usingPercentWidth = false; + }, + + isStretchHeightEnabled: function () { + return this._usingStretchHeight; + }, + setStretchHeightEnabled: function (isUsed) { + this._usingStretchHeight = isUsed; + if (this._usingStretchHeight) + this._usingPercentHeight = false; + }, + + setPercentOnlyEnabled: function(enable){ + this._isPercentOnly = enable; + }, + + setActiveEnabled: function (enable) { + this._actived = enable; + }, + refreshLayout: function () { + if(!this._actived) + return; + + var parent = this._getOwnerParent(); + if (parent === null) + return; + + var parentSize = parent.getContentSize(), locOwner = this._owner; + var ownerAnchor = locOwner.getAnchorPoint(), ownerSize = locOwner.getContentSize(); + var ownerPosition = locOwner.getPosition(); + + switch (this._horizontalEdge) { + case ccui.LayoutComponent.horizontalEdge.NONE: + if (this._usingStretchWidth && !this._isPercentOnly) { + ownerSize.width = parentSize.width * this._percentWidth; + ownerPosition.x = this._leftMargin + ownerAnchor.x * ownerSize.width; + } else { + if (this._usingPositionPercentX) + ownerPosition.x = parentSize.width * this._positionPercentX; + if (this._usingPercentWidth) + ownerSize.width = parentSize.width * this._percentWidth; + } + break; + case ccui.LayoutComponent.horizontalEdge.LEFT: + if(this._isPercentOnly) + break; + if (this._usingPercentWidth || this._usingStretchWidth) + ownerSize.width = parentSize.width * this._percentWidth; + ownerPosition.x = this._leftMargin + ownerAnchor.x * ownerSize.width; + break; + case ccui.LayoutComponent.horizontalEdge.RIGHT: + if(this._isPercentOnly) + break; + if (this._usingPercentWidth || this._usingStretchWidth) + ownerSize.width = parentSize.width * this._percentWidth; + ownerPosition.x = parentSize.width - (this._rightMargin + (1 - ownerAnchor.x) * ownerSize.width); + break; + case ccui.LayoutComponent.horizontalEdge.CENTER: + if(this._isPercentOnly) + break; + if (this._usingStretchWidth) { + ownerSize.width = parentSize.width - this._leftMargin - this._rightMargin; + if (ownerSize.width < 0) + ownerSize.width = 0; + ownerPosition.x = this._leftMargin + ownerAnchor.x * ownerSize.width; + } else { + if (this._usingPercentWidth) + ownerSize.width = parentSize.width * this._percentWidth; + ownerPosition.x = parentSize.width * this._positionPercentX; + } + break; + default: + break; + } + + switch (this._verticalEdge) { + case ccui.LayoutComponent.verticalEdge.NONE: + if (this._usingStretchHeight && !this._isPercentOnly) { + ownerSize.height = parentSize.height * this._percentHeight; + ownerPosition.y = this._bottomMargin + ownerAnchor.y * ownerSize.height; + } else { + if (this._usingPositionPercentY) + ownerPosition.y = parentSize.height * this._positionPercentY; + if (this._usingPercentHeight) + ownerSize.height = parentSize.height * this._percentHeight; + } + break; + case ccui.LayoutComponent.verticalEdge.BOTTOM: + if(this._isPercentOnly) + break; + if (this._usingPercentHeight || this._usingStretchHeight) + ownerSize.height = parentSize.height * this._percentHeight; + ownerPosition.y = this._bottomMargin + ownerAnchor.y * ownerSize.height; + break; + case ccui.LayoutComponent.verticalEdge.TOP: + if(this._isPercentOnly) + break; + if (this._usingPercentHeight || this._usingStretchHeight) + ownerSize.height = parentSize.height * this._percentHeight; + ownerPosition.y = parentSize.height - (this._topMargin + (1 - ownerAnchor.y) * ownerSize.height); + break; + case ccui.LayoutComponent.verticalEdge.CENTER: + if(this._isPercentOnly) + break; + if (this._usingStretchHeight) { + ownerSize.height = parentSize.height - this._topMargin - this._bottomMargin; + if (ownerSize.height < 0) + ownerSize.height = 0; + ownerPosition.y = this._bottomMargin + ownerAnchor.y * ownerSize.height; + } else { + if(this._usingPercentHeight) + ownerSize.height = parentSize.height * this._percentHeight; + ownerPosition.y = parentSize.height * this._positionPercentY; + } + break; + default: + break; + } + + locOwner.setPosition(ownerPosition); + locOwner.setContentSize(ownerSize); + + ccui.helper.doLayout(locOwner); + }, + + _getOwnerParent: function () { + return this._owner ? this._owner.getParent() : null; + }, + _refreshHorizontalMargin: function () { + var parent = this._getOwnerParent(); + if (parent === null) + return; + + var ownerPoint = this._owner.getPosition(), ownerAnchor = this._owner.getAnchorPoint(); + var ownerSize = this._owner.getContentSize(), parentSize = parent.getContentSize(); + + this._leftMargin = ownerPoint.x - ownerAnchor.x * ownerSize.width; + this._rightMargin = parentSize.width - (ownerPoint.x + (1 - ownerAnchor.x) * ownerSize.width); + }, + _refreshVerticalMargin: function () { + var parent = this._getOwnerParent(); + if (parent === null) + return; + + var ownerPoint = this._owner.getPosition(), ownerAnchor = this._owner.getAnchorPoint(); + var ownerSize = this._owner.getContentSize(), parentSize = parent.getContentSize(); + + this._bottomMargin = ownerPoint.y - ownerAnchor.y * ownerSize.height; + this._topMargin = parentSize.height - (ownerPoint.y + (1 - ownerAnchor.y) * ownerSize.height); + } +}); + +ccui.LayoutComponent.horizontalEdge = {NONE: 0, LEFT: 1, RIGHT: 2, CENTER: 3}; +ccui.LayoutComponent.verticalEdge = {NONE: 0, BOTTOM: 1, TOP: 2, CENTER: 3}; + +ccui.LayoutComponent.NAME = "__ui_layout"; +ccui.LayoutComponent.bindLayoutComponent = function (node) { + var layout = node.getComponent(ccui.LayoutComponent.NAME); + if (layout !== undefined) + return layout; + + layout = new ccui.LayoutComponent(); + if (layout && layout.init()) { + node.addComponent(layout); + return layout; + } + return null; +}; \ No newline at end of file diff --git a/extensions/ccui/layouts/UILayoutDefine.js b/extensions/ccui/layouts/UILayoutDefine.js deleted file mode 100644 index ab8ba0afb1..0000000000 --- a/extensions/ccui/layouts/UILayoutDefine.js +++ /dev/null @@ -1,114 +0,0 @@ -/**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org - - http://www.cocos2d-x.org - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. - ****************************************************************************/ - -//LinearGravity -/** - * @ignore - */ -ccui.LINEAR_GRAVITY_NONE = 0; -ccui.LINEAR_GRAVITY_LEFT = 1; -ccui.LINEAR_GRAVITY_TOP = 2; -ccui.LINEAR_GRAVITY_RIGHT = 3; -ccui.LINEAR_GRAVITY_BOTTOM = 4; -ccui.LINEAR_GRAVITY_CENTER_VERTICAL = 5; -ccui.LINEAR_GRAVITY_CENTER_HORIZONTAL = 6; - -//RelativeAlign -ccui.RELATIVE_ALIGN_NONE = 0; -ccui.RELATIVE_ALIGN_PARENT_TOP_LEFT = 1; -ccui.RELATIVE_ALIGN_PARENT_TOP_CENTER_HORIZONTAL = 2; -ccui.RELATIVE_ALIGN_PARENT_TOP_RIGHT = 3; -ccui.RELATIVE_ALIGN_PARENT_LEFT_CENTER_VERTICAL = 4; -ccui.RELATIVE_ALIGN_PARENT_CENTER = 5; -ccui.RELATIVE_ALIGN_PARENT_RIGHT_CENTER_VERTICAL = 6; -ccui.RELATIVE_ALIGN_PARENT_LEFT_BOTTOM = 7; -ccui.RELATIVE_ALIGN_PARENT_BOTTOM_CENTER_HORIZONTAL = 8; -ccui.RELATIVE_ALIGN_PARENT_RIGHT_BOTTOM = 9; - -ccui.RELATIVE_ALIGN_LOCATION_ABOVE_LEFT = 10; -ccui.RELATIVE_ALIGN_LOCATION_ABOVE_CENTER = 11; -ccui.RELATIVE_ALIGN_LOCATION_ABOVE_RIGHT = 12; - -ccui.RELATIVE_ALIGN_LOCATION_LEFT_TOP = 13; -ccui.RELATIVE_ALIGN_LOCATION_LEFT_CENTER = 14; -ccui.RELATIVE_ALIGN_LOCATION_LEFT_BOTTOM = 15; - -ccui.RELATIVE_ALIGN_LOCATION_RIGHT_TOP = 16; -ccui.RELATIVE_ALIGN_LOCATION_RIGHT_CENTER = 17; -ccui.RELATIVE_ALIGN_LOCATION_RIGHT_BOTTOM = 18; - -ccui.RELATIVE_ALIGN_LOCATION_BELOW_TOP = 19; -ccui.RELATIVE_ALIGN_LOCATION_BELOW_CENTER = 20; -ccui.RELATIVE_ALIGN_LOCATION_BELOW_BOTTOM = 21; - -/** - * Base class for ccui.Margin - * @class - * @extends ccui.Class - */ -ccui.Margin = ccui.Class.extend(/** @lends ccui.Margin# */{ - left: 0, - top: 0, - right: 0, - bottom: 0, - ctor: function (margin, top, right, bottom) { - if (margin && top === undefined) { - this.left = margin.left; - this.top = margin.top; - this.right = margin.right; - this.bottom = margin.bottom; - } - if (bottom !== undefined) { - this.left = margin; - this.top = top; - this.right = right; - this.bottom = bottom; - } - }, - /** - * set margin - * @param {Number} l - * @param {Number} t - * @param {Number} r - * @param {Number} b - */ - setMargin: function (l, t, r, b) { - this.left = l; - this.top = t; - this.right = r; - this.bottom = b; - }, - /** - * check is equals - * @param {ccui.Margin} target - * @returns {boolean} - */ - equals: function (target) { - return (this.left == target.left && this.top == target.top && this.right == target.right && this.bottom == target.bottom); - } -}); - -ccui.MarginZero = function(){ - return new ccui.Margin(0,0,0,0); -}; \ No newline at end of file diff --git a/extensions/ccui/layouts/UILayoutManager.js b/extensions/ccui/layouts/UILayoutManager.js new file mode 100644 index 0000000000..e12cc31333 --- /dev/null +++ b/extensions/ccui/layouts/UILayoutManager.js @@ -0,0 +1,457 @@ +/**************************************************************************** + Copyright (c) 2013-2014 Chukong Technologies Inc. + + http://www.cocos2d-x.org + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + ****************************************************************************/ + +/** + * Gets the layout manager by ccui.Layout's layout type. + * @param {Number} type + * @returns {ccui.linearVerticalLayoutManager|ccui.linearHorizontalLayoutManager|ccui.relativeLayoutManager|null} + */ +ccui.getLayoutManager = function (type) { + switch (type) { + case ccui.Layout.LINEAR_VERTICAL: + return ccui.linearVerticalLayoutManager; + case ccui.Layout.LINEAR_HORIZONTAL: + return ccui.linearHorizontalLayoutManager; + case ccui.Layout.RELATIVE: + return ccui.relativeLayoutManager; + } + return null; +}; + +/** + * ccui.linearVerticalLayoutManager is a singleton object which is the linear vertical layout manager for ccui.Layout. + * @class + * @name ccui.linearVerticalLayoutManager + */ +ccui.linearVerticalLayoutManager = /** @lends ccui.linearVerticalLayoutManager# */{ + _doLayout: function(layout){ + var layoutSize = layout._getLayoutContentSize(); + var container = layout._getLayoutElements(); + var topBoundary = layoutSize.height; + + for (var i = 0, len = container.length; i < len; i++) { + var child = container[i]; + if (child) { + var layoutParameter = child.getLayoutParameter(); + + if (layoutParameter){ + var childGravity = layoutParameter.getGravity(); + var ap = child.getAnchorPoint(); + var cs = child.getContentSize(); + var finalPosX = ap.x * cs.width; + var finalPosY = topBoundary - ((1.0 - ap.y) * cs.height); + switch (childGravity){ + case ccui.LinearLayoutParameter.NONE: + case ccui.LinearLayoutParameter.LEFT: + break; + case ccui.LinearLayoutParameter.RIGHT: + finalPosX = layoutSize.width - ((1.0 - ap.x) * cs.width); + break; + case ccui.LinearLayoutParameter.CENTER_HORIZONTAL: + finalPosX = layoutSize.width / 2.0 - cs.width * (0.5 - ap.x); + break; + default: + break; + } + var mg = layoutParameter.getMargin(); + finalPosX += mg.left; + finalPosY -= mg.top; + child.setPosition(finalPosX, finalPosY); + topBoundary = child.getPositionY() - ap.y * cs.height - mg.bottom; + } + } + } + } +}; + +/** + * ccui.linearHorizontalLayoutManager is a singleton object which is the linear horizontal layout manager for ccui.Layout + * @class + * @name ccui.linearHorizontalLayoutManager + */ +ccui.linearHorizontalLayoutManager = /** @lends ccui.linearHorizontalLayoutManager# */{ + _doLayout: function(layout){ + var layoutSize = layout._getLayoutContentSize(); + var container = layout._getLayoutElements(); + var leftBoundary = 0.0; + for (var i = 0, len = container.length; i < len; i++) { + var child = container[i]; + if (child) { + var layoutParameter = child.getLayoutParameter(); + if (layoutParameter){ + var childGravity = layoutParameter.getGravity(); + var ap = child.getAnchorPoint(); + var cs = child.getContentSize(); + var finalPosX = leftBoundary + (ap.x * cs.width); + var finalPosY = layoutSize.height - (1.0 - ap.y) * cs.height; + switch (childGravity){ + case ccui.LinearLayoutParameter.NONE: + case ccui.LinearLayoutParameter.TOP: + break; + case ccui.LinearLayoutParameter.BOTTOM: + finalPosY = ap.y * cs.height; + break; + case ccui.LinearLayoutParameter.CENTER_VERTICAL: + finalPosY = layoutSize.height / 2.0 - cs.height * (0.5 - ap.y); + break; + default: + break; + } + var mg = layoutParameter.getMargin(); + finalPosX += mg.left; + finalPosY -= mg.top; + child.setPosition(finalPosX, finalPosY); + leftBoundary = child.getRightBoundary() + mg.right; + } + } + } + } +}; + +/** + * ccui.relativeLayoutManager is the singleton object which is the relative layout manager for ccui.Layout, it has a _doLayout function to do layout. + * @class + * @name ccui.relativeLayoutManager + */ +ccui.relativeLayoutManager = /** @lends ccui.relativeLayoutManager# */{ + _unlayoutChildCount: 0, + _widgetChildren: [], + _widget: null, + _finalPositionX:0, + _finalPositionY:0, + _relativeWidgetLP:null, + + _doLayout: function(layout){ + this._widgetChildren = this._getAllWidgets(layout); + + var locChildren = this._widgetChildren; + while (this._unlayoutChildCount > 0) { + for (var i = 0, len = locChildren.length; i < len; i++) { + this._widget = locChildren[i]; + + var layoutParameter = this._widget.getLayoutParameter(); + if (layoutParameter){ + if (layoutParameter._put) + continue; + + var ret = this._calculateFinalPositionWithRelativeWidget(layout); + if (!ret) + continue; + + this._calculateFinalPositionWithRelativeAlign(); + + this._widget.setPosition(this._finalPositionX, this._finalPositionY); + layoutParameter._put = true; + } + } + this._unlayoutChildCount--; + } + this._widgetChildren.length = 0; + }, + + _getAllWidgets: function(layout){ + var container = layout._getLayoutElements(); + var locWidgetChildren = this._widgetChildren; + locWidgetChildren.length = 0; + for (var i = 0, len = container.length; i < len; i++){ + var child = container[i]; + if (child) { + var layoutParameter = child.getLayoutParameter(); + layoutParameter._put = false; + this._unlayoutChildCount++; + locWidgetChildren.push(child); + } + } + return locWidgetChildren; + }, + + _getRelativeWidget: function(widget){ + var relativeWidget = null; + var layoutParameter = widget.getLayoutParameter(); + var relativeName = layoutParameter.getRelativeToWidgetName(); + + if (relativeName && relativeName.length !== 0) { + var locChildren = this._widgetChildren; + for(var i = 0, len = locChildren.length; i < len; i++){ + var child = locChildren[i]; + if (child){ + var rlayoutParameter = child.getLayoutParameter(); + if (rlayoutParameter && rlayoutParameter.getRelativeName() === relativeName) { + relativeWidget = child; + this._relativeWidgetLP = rlayoutParameter; + break; + } + } + } + } + return relativeWidget; + }, + + _calculateFinalPositionWithRelativeWidget: function(layout){ + var locWidget = this._widget; + var ap = locWidget.getAnchorPoint(); + var cs = locWidget.getContentSize(); + + this._finalPositionX = 0.0; + this._finalPositionY = 0.0; + + var relativeWidget = this._getRelativeWidget(locWidget); + var layoutParameter = locWidget.getLayoutParameter(); + var align = layoutParameter.getAlign(); + var layoutSize = layout._getLayoutContentSize(); + + switch (align) { + case ccui.RelativeLayoutParameter.NONE: + case ccui.RelativeLayoutParameter.PARENT_TOP_LEFT: + this._finalPositionX = ap.x * cs.width; + this._finalPositionY = layoutSize.height - ((1.0 - ap.y) * cs.height); + break; + case ccui.RelativeLayoutParameter.PARENT_TOP_CENTER_HORIZONTAL: + this._finalPositionX = layoutSize.width * 0.5 - cs.width * (0.5 - ap.x); + this._finalPositionY = layoutSize.height - ((1.0 - ap.y) * cs.height); + break; + case ccui.RelativeLayoutParameter.PARENT_TOP_RIGHT: + this._finalPositionX = layoutSize.width - ((1.0 - ap.x) * cs.width); + this._finalPositionY = layoutSize.height - ((1.0 - ap.y) * cs.height); + break; + case ccui.RelativeLayoutParameter.PARENT_LEFT_CENTER_VERTICAL: + this._finalPositionX = ap.x * cs.width; + this._finalPositionY = layoutSize.height * 0.5 - cs.height * (0.5 - ap.y); + break; + case ccui.RelativeLayoutParameter.CENTER_IN_PARENT: + this._finalPositionX = layoutSize.width * 0.5 - cs.width * (0.5 - ap.x); + this._finalPositionY = layoutSize.height * 0.5 - cs.height * (0.5 - ap.y); + break; + case ccui.RelativeLayoutParameter.PARENT_RIGHT_CENTER_VERTICAL: + this._finalPositionX = layoutSize.width - ((1.0 - ap.x) * cs.width); + this._finalPositionY = layoutSize.height * 0.5 - cs.height * (0.5 - ap.y); + break; + case ccui.RelativeLayoutParameter.PARENT_LEFT_BOTTOM: + this._finalPositionX = ap.x * cs.width; + this._finalPositionY = ap.y * cs.height; + break; + case ccui.RelativeLayoutParameter.PARENT_BOTTOM_CENTER_HORIZONTAL: + this._finalPositionX = layoutSize.width * 0.5 - cs.width * (0.5 - ap.x); + this._finalPositionY = ap.y * cs.height; + break; + case ccui.RelativeLayoutParameter.PARENT_RIGHT_BOTTOM: + this._finalPositionX = layoutSize.width - ((1.0 - ap.x) * cs.width); + this._finalPositionY = ap.y * cs.height; + break; + + case ccui.RelativeLayoutParameter.LOCATION_ABOVE_LEFTALIGN: + if (relativeWidget){ + if (this._relativeWidgetLP && !this._relativeWidgetLP._put) + return false; + this._finalPositionY = relativeWidget.getTopBoundary() + ap.y * cs.height; + this._finalPositionX = relativeWidget.getLeftBoundary() + ap.x * cs.width; + } + break; + case ccui.RelativeLayoutParameter.LOCATION_ABOVE_CENTER: + if (relativeWidget){ + if (this._relativeWidgetLP && !this._relativeWidgetLP._put) + return false; + var rbs = relativeWidget.getContentSize(); + this._finalPositionY = relativeWidget.getTopBoundary() + ap.y * cs.height; + this._finalPositionX = relativeWidget.getLeftBoundary() + rbs.width * 0.5 + ap.x * cs.width - cs.width * 0.5; + } + break; + case ccui.RelativeLayoutParameter.LOCATION_ABOVE_RIGHTALIGN: + if (relativeWidget) { + if (this._relativeWidgetLP && !this._relativeWidgetLP._put) + return false; + this._finalPositionY = relativeWidget.getTopBoundary() + ap.y * cs.height; + this._finalPositionX = relativeWidget.getRightBoundary() - (1.0 - ap.x) * cs.width; + } + break; + case ccui.RelativeLayoutParameter.LOCATION_LEFT_OF_TOPALIGN: + if (relativeWidget){ + if (this._relativeWidgetLP && !this._relativeWidgetLP._put) + return false; + this._finalPositionY = relativeWidget.getTopBoundary() - (1.0 - ap.y) * cs.height; + this._finalPositionX = relativeWidget.getLeftBoundary() - (1.0 - ap.x) * cs.width; + } + break; + case ccui.RelativeLayoutParameter.LOCATION_LEFT_OF_CENTER: + if (relativeWidget) { + if (this._relativeWidgetLP && !this._relativeWidgetLP._put) + return false; + var rbs = relativeWidget.getContentSize(); + this._finalPositionX = relativeWidget.getLeftBoundary() - (1.0 - ap.x) * cs.width; + this._finalPositionY = relativeWidget.getBottomBoundary() + rbs.height * 0.5 + ap.y * cs.height - cs.height * 0.5; + } + break; + case ccui.RelativeLayoutParameter.LOCATION_LEFT_OF_BOTTOMALIGN: + if (relativeWidget) { + if (this._relativeWidgetLP && !this._relativeWidgetLP._put) + return false; + this._finalPositionY = relativeWidget.getBottomBoundary() + ap.y * cs.height; + this._finalPositionX = relativeWidget.getLeftBoundary() - (1.0 - ap.x) * cs.width; + } + break; + case ccui.RelativeLayoutParameter.LOCATION_RIGHT_OF_TOPALIGN: + if (relativeWidget){ + if (this._relativeWidgetLP && !this._relativeWidgetLP._put) + return false; + this._finalPositionY = relativeWidget.getTopBoundary() - (1.0 - ap.y) * cs.height; + this._finalPositionX = relativeWidget.getRightBoundary() + ap.x * cs.width; + } + break; + case ccui.RelativeLayoutParameter.LOCATION_RIGHT_OF_CENTER: + if (relativeWidget){ + if (this._relativeWidgetLP && !this._relativeWidgetLP._put) + return false; + var rbs = relativeWidget.getContentSize(); + var locationRight = relativeWidget.getRightBoundary(); + this._finalPositionX = locationRight + ap.x * cs.width; + this._finalPositionY = relativeWidget.getBottomBoundary() + rbs.height * 0.5 + ap.y * cs.height - cs.height * 0.5; + } + break; + case ccui.RelativeLayoutParameter.LOCATION_RIGHT_OF_BOTTOMALIGN: + if (relativeWidget){ + if (this._relativeWidgetLP && !this._relativeWidgetLP._put) + return false; + this._finalPositionY = relativeWidget.getBottomBoundary() + ap.y * cs.height; + this._finalPositionX = relativeWidget.getRightBoundary() + ap.x * cs.width; + } + break; + case ccui.RelativeLayoutParameter.LOCATION_BELOW_LEFTALIGN: + if (relativeWidget){ + if (this._relativeWidgetLP && !this._relativeWidgetLP._put) + return false; + this._finalPositionY = relativeWidget.getBottomBoundary() - (1.0 - ap.y) * cs.height; + this._finalPositionX = relativeWidget.getLeftBoundary() + ap.x * cs.width; + } + break; + case ccui.RelativeLayoutParameter.LOCATION_BELOW_CENTER: + if (relativeWidget) { + if (this._relativeWidgetLP && !this._relativeWidgetLP._put) + return false; + var rbs = relativeWidget.getContentSize(); + this._finalPositionY = relativeWidget.getBottomBoundary() - (1.0 - ap.y) * cs.height; + this._finalPositionX = relativeWidget.getLeftBoundary() + rbs.width * 0.5 + ap.x * cs.width - cs.width * 0.5; + } + break; + case ccui.RelativeLayoutParameter.LOCATION_BELOW_RIGHTALIGN: + if (relativeWidget) { + if (this._relativeWidgetLP && !this._relativeWidgetLP._put) + return false; + this._finalPositionY = relativeWidget.getBottomBoundary() - (1.0 - ap.y) * cs.height; + this._finalPositionX = relativeWidget.getRightBoundary() - (1.0 - ap.x) * cs.width; + } + break; + default: + break; + } + return true; + }, + + _calculateFinalPositionWithRelativeAlign: function(){ + var layoutParameter = this._widget.getLayoutParameter(); + + var mg = layoutParameter.getMargin(); + var align = layoutParameter.getAlign(); + + //handle margin + switch (align) { + case ccui.RelativeLayoutParameter.NONE: + case ccui.RelativeLayoutParameter.PARENT_TOP_LEFT: + this._finalPositionX += mg.left; + this._finalPositionY -= mg.top; + break; + case ccui.RelativeLayoutParameter.PARENT_TOP_CENTER_HORIZONTAL: + this._finalPositionY -= mg.top; + break; + case ccui.RelativeLayoutParameter.PARENT_TOP_RIGHT: + this._finalPositionX -= mg.right; + this._finalPositionY -= mg.top; + break; + case ccui.RelativeLayoutParameter.PARENT_LEFT_CENTER_VERTICAL: + this._finalPositionX += mg.left; + break; + case ccui.RelativeLayoutParameter.CENTER_IN_PARENT: + break; + case ccui.RelativeLayoutParameter.PARENT_RIGHT_CENTER_VERTICAL: + this._finalPositionX -= mg.right; + break; + case ccui.RelativeLayoutParameter.PARENT_LEFT_BOTTOM: + this._finalPositionX += mg.left; + this._finalPositionY += mg.bottom; + break; + case ccui.RelativeLayoutParameter.PARENT_BOTTOM_CENTER_HORIZONTAL: + this._finalPositionY += mg.bottom; + break; + case ccui.RelativeLayoutParameter.PARENT_RIGHT_BOTTOM: + this._finalPositionX -= mg.right; + this._finalPositionY += mg.bottom; + break; + case ccui.RelativeLayoutParameter.LOCATION_ABOVE_LEFTALIGN: + this._finalPositionY += mg.bottom; + this._finalPositionX += mg.left; + break; + case ccui.RelativeLayoutParameter.LOCATION_ABOVE_RIGHTALIGN: + this._finalPositionY += mg.bottom; + this._finalPositionX -= mg.right; + break; + case ccui.RelativeLayoutParameter.LOCATION_ABOVE_CENTER: + this._finalPositionY += mg.bottom; + break; + case ccui.RelativeLayoutParameter.LOCATION_LEFT_OF_TOPALIGN: + this._finalPositionX -= mg.right; + this._finalPositionY -= mg.top; + break; + case ccui.RelativeLayoutParameter.LOCATION_LEFT_OF_BOTTOMALIGN: + this._finalPositionX -= mg.right; + this._finalPositionY += mg.bottom; + break; + case ccui.RelativeLayoutParameter.LOCATION_LEFT_OF_CENTER: + this._finalPositionX -= mg.right; + break; + case ccui.RelativeLayoutParameter.LOCATION_RIGHT_OF_TOPALIGN: + this._finalPositionX += mg.left; + this._finalPositionY -= mg.top; + break; + case ccui.RelativeLayoutParameter.LOCATION_RIGHT_OF_BOTTOMALIGN: + this._finalPositionX += mg.left; + this._finalPositionY += mg.bottom; + break; + case ccui.RelativeLayoutParameter.LOCATION_RIGHT_OF_CENTER: + this._finalPositionX += mg.left; + break; + case ccui.RelativeLayoutParameter.LOCATION_BELOW_LEFTALIGN: + this._finalPositionY -= mg.top; + this._finalPositionX += mg.left; + break; + case ccui.RelativeLayoutParameter.LOCATION_BELOW_RIGHTALIGN: + this._finalPositionY -= mg.top; + this._finalPositionX -= mg.right; + break; + case ccui.RelativeLayoutParameter.LOCATION_BELOW_CENTER: + this._finalPositionY -= mg.top; + break; + default: + break; + } + } +}; \ No newline at end of file diff --git a/extensions/ccui/layouts/UILayoutParameter.js b/extensions/ccui/layouts/UILayoutParameter.js index ab0d88d7a8..2ea2919426 100644 --- a/extensions/ccui/layouts/UILayoutParameter.js +++ b/extensions/ccui/layouts/UILayoutParameter.js @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,31 +24,111 @@ ****************************************************************************/ /** - * Base class for ccui.LayoutParameter + * Base class for ccui.Margin + * @class + * @extends ccui.Class + * + * @property {Number} left - Left of margin + * @property {Number} top - Top of margin + * @property {Number} right - right of margin + * @property {Number} bottom - bottom of margin + */ +ccui.Margin = ccui.Class.extend(/** @lends ccui.Margin# */{ + left: 0, + top: 0, + right: 0, + bottom: 0, + /** + * Constructor of ccui.Margin. + * @param {Number|ccui.Margin} margin a margin or left + * @param {Number} [top] + * @param {Number} [right] + * @param {Number} [bottom] + */ + ctor: function (margin, top, right, bottom) { + if (margin !== undefined && top === undefined) { + this.left = margin.left; + this.top = margin.top; + this.right = margin.right; + this.bottom = margin.bottom; + } + if (bottom !== undefined) { + this.left = margin; + this.top = top; + this.right = right; + this.bottom = bottom; + } + }, + /** + * Sets boundary of margin + * @param {Number} l left + * @param {Number} t top + * @param {Number} r right + * @param {Number} b bottom + */ + setMargin: function (l, t, r, b) { + this.left = l; + this.top = t; + this.right = r; + this.bottom = b; + }, + /** + * Checks target whether equals itself. + * @param {ccui.Margin} target + * @returns {boolean} + */ + equals: function (target) { + return (this.left === target.left && this.top === target.top && this.right === target.right && this.bottom === target.bottom); + } +}); + +/** + * Gets a zero margin object + * @function + * @returns {ccui.Margin} + */ +ccui.MarginZero = function(){ + return new ccui.Margin(0,0,0,0); +}; + +/** + * Layout parameter contains a margin and layout parameter type. It uses for ccui.LayoutManager. * @class * @extends ccui.Class */ ccui.LayoutParameter = ccui.Class.extend(/** @lends ccui.LayoutParameter# */{ _margin: null, _layoutParameterType: null, + + /** + * The constructor of ccui.LayoutParameter. + * @function + */ ctor: function () { this._margin = new ccui.Margin(); this._layoutParameterType = ccui.LayoutParameter.NONE; }, /** - * Sets Margin parameter for LayoutParameter. + * Sets Margin to LayoutParameter. * @param {ccui.Margin} margin */ setMargin: function (margin) { - this._margin.left = margin.left; - this._margin.top = margin.top; - this._margin.right = margin.right; - this._margin.bottom = margin.bottom; + if(cc.isObject(margin)){ + this._margin.left = margin.left; + this._margin.top = margin.top; + this._margin.right = margin.right; + this._margin.bottom = margin.bottom; + }else{ + this._margin.left = arguments[0]; + this._margin.top = arguments[1]; + this._margin.right = arguments[2]; + this._margin.bottom = arguments[3]; + } }, /** - * Gets Margin parameter of LayoutParameter. + * Gets Margin of LayoutParameter. * @returns {ccui.Margin} */ getMargin: function () { @@ -56,15 +137,19 @@ ccui.LayoutParameter = ccui.Class.extend(/** @lends ccui.LayoutParameter# */{ /** * Gets LayoutParameterType of LayoutParameter. - * @returns {ccui.UILayoutParameterType} + * @returns {Number} */ getLayoutType: function () { return this._layoutParameterType; }, + /** + * Clones a ccui.LayoutParameter object from itself. + * @returns {ccui.LayoutParameter} + */ clone:function(){ - var parameter = this.createCloneInstance(); - parameter.copyProperties(this); + var parameter = this._createCloneInstance(); + parameter._copyProperties(this); return parameter; }, @@ -72,19 +157,19 @@ ccui.LayoutParameter = ccui.Class.extend(/** @lends ccui.LayoutParameter# */{ * create clone instance. * @returns {ccui.LayoutParameter} */ - createCloneInstance:function(){ - return ccui.LayoutParameter.create(); + _createCloneInstance:function(){ + return new ccui.LayoutParameter(); }, /** - * copy properties + * copy properties from model. * @param {ccui.LayoutParameter} model */ - copyProperties:function(model){ + _copyProperties:function(model){ + this._margin.bottom = model._margin.bottom; this._margin.left = model._margin.left; - this._margin.top = model._margin.top; this._margin.right = model._margin.right; - this._margin.bottom = model._margin.bottom; + this._margin.top = model._margin.top; } }); @@ -92,59 +177,73 @@ ccui.LayoutParameter = ccui.Class.extend(/** @lends ccui.LayoutParameter# */{ * allocates and initializes a LayoutParameter. * @constructs * @return {ccui.LayoutParameter} - * @example - * // example - * var uiLayoutParameter = ccui.LayoutParameter.create(); */ ccui.LayoutParameter.create = function () { - var parameter = new ccui.LayoutParameter(); - return parameter; + return new ccui.LayoutParameter(); }; +// Constants +//layout parameter type +/** + * The none of ccui.LayoutParameter's type. + * @constant + * @type {number} + */ +ccui.LayoutParameter.NONE = 0; +/** + * The linear of ccui.LayoutParameter's type. + * @constant + * @type {number} + */ +ccui.LayoutParameter.LINEAR = 1; +/** + * The relative of ccui.LayoutParameter's type. + * @constant + * @type {number} + */ +ccui.LayoutParameter.RELATIVE = 2; + /** - * Base class for ccui.LinearLayoutParameter + * The linear of Layout parameter. its parameter type is ccui.LayoutParameter.LINEAR. * @class * @extends ccui.LayoutParameter */ ccui.LinearLayoutParameter = ccui.LayoutParameter.extend(/** @lends ccui.LinearLayoutParameter# */{ _linearGravity: null, + /** + * The constructor of ccui.LinearLayoutParameter. + * @function + */ ctor: function () { ccui.LayoutParameter.prototype.ctor.call(this); - this._linearGravity = ccui.LINEAR_GRAVITY_NONE; + this._linearGravity = ccui.LinearLayoutParameter.NONE; this._layoutParameterType = ccui.LayoutParameter.LINEAR; }, /** - * Sets LinearGravity parameter for LayoutParameter. - * @param {ccui.LINEAR_GRAVITY_NONE|ccui.LINEAR_GRAVITY_TOP|ccui.LINEAR_GRAVITY_RIGHT|ccui.LINEAR_GRAVITY_BOTTOM|ccui.LINEAR_GRAVITY_CENTER_VERTICAL|ccui.LINEAR_GRAVITY_CENTER_HORIZONTAL} gravity + * Sets LinearGravity to LayoutParameter. + * @param {Number} gravity */ setGravity: function (gravity) { this._linearGravity = gravity; }, /** - * Gets LinearGravity parameter for LayoutParameter. - * @returns {ccui.LINEAR_GRAVITY_NONE|ccui.LINEAR_GRAVITY_TOP|ccui.LINEAR_GRAVITY_RIGHT|ccui.LINEAR_GRAVITY_BOTTOM|ccui.LINEAR_GRAVITY_CENTER_VERTICAL|ccui.LINEAR_GRAVITY_CENTER_HORIZONTAL} + * Gets LinearGravity of LayoutParameter. + * @returns {Number} */ getGravity: function () { return this._linearGravity; }, - /** - * create clone instance. - * @returns {ccui.LinearLayoutParameter} - */ - createCloneInstance: function () { - return ccui.LinearLayoutParameter.create(); + _createCloneInstance: function () { + return new ccui.LinearLayoutParameter(); }, - /** - * copy properties - * @param {ccui.LinearLayoutParameter} model - */ - copyProperties: function (model) { - ccui.LayoutParameter.prototype.copyProperties.call(this, model); - this.setGravity(model._linearGravity); + _copyProperties: function (model) { + ccui.LayoutParameter.prototype._copyProperties.call(this, model); + if (model instanceof ccui.LinearLayoutParameter) + this.setGravity(model._linearGravity); } }); @@ -152,17 +251,60 @@ ccui.LinearLayoutParameter = ccui.LayoutParameter.extend(/** @lends ccui.LinearL * allocates and initializes a LinearLayoutParameter. * @constructs * @return {ccui.LinearLayoutParameter} - * @example - * // example - * var uiLinearLayoutParameter = ccui.LinearLayoutParameter.create(); + * @deprecated since v3.0, please use new construction instead */ ccui.LinearLayoutParameter.create = function () { - var parameter = new ccui.LinearLayoutParameter(); - return parameter; + return new ccui.LinearLayoutParameter(); }; +// Constants +//Linear layout parameter LinearGravity /** - * Base class for ccui.RelativeLayoutParameter + * The none of ccui.LinearLayoutParameter's linear gravity. + * @constant + * @type {number} + */ +ccui.LinearLayoutParameter.NONE = 0; + +/** + * The left of ccui.LinearLayoutParameter's linear gravity. + * @constant + * @type {number} + */ +ccui.LinearLayoutParameter.LEFT = 1; +/** + * The top of ccui.LinearLayoutParameter's linear gravity. + * @constant + * @type {number} + */ +ccui.LinearLayoutParameter.TOP = 2; +/** + * The right of ccui.LinearLayoutParameter's linear gravity. + * @constant + * @type {number} + */ +ccui.LinearLayoutParameter.RIGHT = 3; +/** + * The bottom of ccui.LinearLayoutParameter's linear gravity. + * @constant + * @type {number} + */ +ccui.LinearLayoutParameter.BOTTOM = 4; +/** + * The center vertical of ccui.LinearLayoutParameter's linear gravity. + * @constant + * @type {number} + */ +ccui.LinearLayoutParameter.CENTER_VERTICAL = 5; +/** + * The center horizontal of ccui.LinearLayoutParameter's linear gravity. + * @constant + * @type {number} + */ +ccui.LinearLayoutParameter.CENTER_HORIZONTAL = 6; + +/** + * The relative of layout parameter. Its layout parameter type is ccui.LayoutParameter.RELATIVE. * @class * @extends ccui.LayoutParameter */ @@ -171,9 +313,13 @@ ccui.RelativeLayoutParameter = ccui.LayoutParameter.extend(/** @lends ccui.Relat _relativeWidgetName: "", _relativeLayoutName: "", _put:false, + /** + * The constructor of ccui.RelativeLayoutParameter + * @function + */ ctor: function () { ccui.LayoutParameter.prototype.ctor.call(this); - this._relativeAlign = ccui.RELATIVE_ALIGN_NONE; + this._relativeAlign = ccui.RelativeLayoutParameter.NONE; this._relativeWidgetName = ""; this._relativeLayoutName = ""; this._put = false; @@ -182,7 +328,7 @@ ccui.RelativeLayoutParameter = ccui.LayoutParameter.extend(/** @lends ccui.Relat /** * Sets RelativeAlign parameter for LayoutParameter. - * @param {ccui.RELATIVE_ALIGN_*} align + * @param {Number} align */ setAlign: function (align) { this._relativeAlign = align; @@ -190,7 +336,7 @@ ccui.RelativeLayoutParameter = ccui.LayoutParameter.extend(/** @lends ccui.Relat /** * Gets RelativeAlign parameter for LayoutParameter. - * @returns {ccui.RELATIVE_ALIGN_*} + * @returns {Number} */ getAlign: function () { return this._relativeAlign; @@ -228,42 +374,203 @@ ccui.RelativeLayoutParameter = ccui.LayoutParameter.extend(/** @lends ccui.Relat return this._relativeLayoutName; }, - /** - * create clone instance. - * @returns {ccui.RelativeLayoutParameter} - */ - createCloneInstance:function(){ - return ccui.LinearLayoutParameter.create(); + _createCloneInstance:function(){ + return new ccui.RelativeLayoutParameter(); }, - /** - * copy properties - * @param {ccui.RelativeLayoutParameter} model - */ - copyProperties:function(model){ - ccui.LayoutParameter.prototype.copyProperties.call(this, model); - this.setAlign(model._relativeAlign); - this.setRelativeToWidgetName(model._relativeWidgetName); - this.setRelativeName(model._relativeLayoutName); + _copyProperties:function(model){ + ccui.LayoutParameter.prototype._copyProperties.call(this, model); + if (model instanceof ccui.RelativeLayoutParameter) { + this.setAlign(model._relativeAlign); + this.setRelativeToWidgetName(model._relativeWidgetName); + this.setRelativeName(model._relativeLayoutName); + } } }); /** - * allocates and initializes a RelativeLayoutParameter. - * @constructs + * Allocates and initializes a RelativeLayoutParameter. + * @function + * @deprecated since v3.0, please use new ccui.RelativeLayoutParameter() instead. * @return {ccui.RelativeLayoutParameter} - * @example - * // example - * var uiRelativeLayoutParameter = ccui.RelativeLayoutParameter.create(); */ ccui.RelativeLayoutParameter.create = function () { - var parameter = new ccui.RelativeLayoutParameter(); - return parameter; + return new ccui.RelativeLayoutParameter(); }; - // Constants -//layout parameter type -ccui.LayoutParameter.NONE = 0; -ccui.LayoutParameter.LINEAR = 1; -ccui.LayoutParameter.RELATIVE = 2; \ No newline at end of file +//Relative layout parameter RelativeAlign +/** + * The none of ccui.RelativeLayoutParameter's relative align. + * @constant + * @type {number} + */ +ccui.RelativeLayoutParameter.NONE = 0; +/** + * The parent's top left of ccui.RelativeLayoutParameter's relative align. + * @constant + * @type {number} + */ +ccui.RelativeLayoutParameter.PARENT_TOP_LEFT = 1; +/** + * The parent's top center horizontal of ccui.RelativeLayoutParameter's relative align. + * @constant + * @type {number} + */ +ccui.RelativeLayoutParameter.PARENT_TOP_CENTER_HORIZONTAL = 2; +/** + * The parent's top right of ccui.RelativeLayoutParameter's relative align. + * @constant + * @type {number} + */ +ccui.RelativeLayoutParameter.PARENT_TOP_RIGHT = 3; +/** + * The parent's left center vertical of ccui.RelativeLayoutParameter's relative align. + * @constant + * @type {number} + */ +ccui.RelativeLayoutParameter.PARENT_LEFT_CENTER_VERTICAL = 4; + +/** + * The center in parent of ccui.RelativeLayoutParameter's relative align. + * @constant + * @type {number} + */ +ccui.RelativeLayoutParameter.CENTER_IN_PARENT = 5; + +/** + * The parent's right center vertical of ccui.RelativeLayoutParameter's relative align. + * @constant + * @type {number} + */ +ccui.RelativeLayoutParameter.PARENT_RIGHT_CENTER_VERTICAL = 6; +/** + * The parent's left bottom of ccui.RelativeLayoutParameter's relative align. + * @constant + * @type {number} + */ +ccui.RelativeLayoutParameter.PARENT_LEFT_BOTTOM = 7; +/** + * The parent's bottom center horizontal of ccui.RelativeLayoutParameter's relative align. + * @constant + * @type {number} + */ +ccui.RelativeLayoutParameter.PARENT_BOTTOM_CENTER_HORIZONTAL = 8; +/** + * The parent's right bottom of ccui.RelativeLayoutParameter's relative align. + * @constant + * @type {number} + */ +ccui.RelativeLayoutParameter.PARENT_RIGHT_BOTTOM = 9; + +/** + * The location above left align of ccui.RelativeLayoutParameter's relative align. + * @constant + * @type {number} + */ +ccui.RelativeLayoutParameter.LOCATION_ABOVE_LEFTALIGN = 10; +/** + * The location above center of ccui.RelativeLayoutParameter's relative align. + * @constant + * @type {number} + */ +ccui.RelativeLayoutParameter.LOCATION_ABOVE_CENTER = 11; +/** + * The location above right align of ccui.RelativeLayoutParameter's relative align. + * @constant + * @type {number} + */ +ccui.RelativeLayoutParameter.LOCATION_ABOVE_RIGHTALIGN = 12; +/** + * The location left of top align of ccui.RelativeLayoutParameter's relative align. + * @constant + * @type {number} + */ +ccui.RelativeLayoutParameter.LOCATION_LEFT_OF_TOPALIGN = 13; +/** + * The location left of center of ccui.RelativeLayoutParameter's relative align. + * @constant + * @type {number} + */ +ccui.RelativeLayoutParameter.LOCATION_LEFT_OF_CENTER = 14; +/** + * The location left of bottom align of ccui.RelativeLayoutParameter's relative align. + * @constant + * @type {number} + */ +ccui.RelativeLayoutParameter.LOCATION_LEFT_OF_BOTTOMALIGN = 15; +/** + * The location right of top align of ccui.RelativeLayoutParameter's relative align. + * @constant + * @type {number} + */ +ccui.RelativeLayoutParameter.LOCATION_RIGHT_OF_TOPALIGN = 16; +/** + * The location right of center of ccui.RelativeLayoutParameter's relative align. + * @constant + * @type {number} + */ +ccui.RelativeLayoutParameter.LOCATION_RIGHT_OF_CENTER = 17; +/** + * The location right of bottom align of ccui.RelativeLayoutParameter's relative align. + * @constant + * @type {number} + */ +ccui.RelativeLayoutParameter.LOCATION_RIGHT_OF_BOTTOMALIGN = 18; +/** + * The location below left align of ccui.RelativeLayoutParameter's relative align. + * @constant + * @type {number} + */ +ccui.RelativeLayoutParameter.LOCATION_BELOW_LEFTALIGN = 19; +/** + * The location below center of ccui.RelativeLayoutParameter's relative align. + * @constant + * @type {number} + */ +ccui.RelativeLayoutParameter.LOCATION_BELOW_CENTER = 20; +/** + * The location below right align of ccui.RelativeLayoutParameter's relative align. + * @constant + * @type {number} + */ +ccui.RelativeLayoutParameter.LOCATION_BELOW_RIGHTALIGN = 21; + +/** + * @ignore + */ +ccui.LINEAR_GRAVITY_NONE = 0; +ccui.LINEAR_GRAVITY_LEFT = 1; +ccui.LINEAR_GRAVITY_TOP = 2; +ccui.LINEAR_GRAVITY_RIGHT = 3; +ccui.LINEAR_GRAVITY_BOTTOM = 4; +ccui.LINEAR_GRAVITY_CENTER_VERTICAL = 5; +ccui.LINEAR_GRAVITY_CENTER_HORIZONTAL = 6; + +//RelativeAlign +ccui.RELATIVE_ALIGN_NONE = 0; +ccui.RELATIVE_ALIGN_PARENT_TOP_LEFT = 1; +ccui.RELATIVE_ALIGN_PARENT_TOP_CENTER_HORIZONTAL = 2; +ccui.RELATIVE_ALIGN_PARENT_TOP_RIGHT = 3; +ccui.RELATIVE_ALIGN_PARENT_LEFT_CENTER_VERTICAL = 4; +ccui.RELATIVE_ALIGN_PARENT_CENTER = 5; +ccui.RELATIVE_ALIGN_PARENT_RIGHT_CENTER_VERTICAL = 6; +ccui.RELATIVE_ALIGN_PARENT_LEFT_BOTTOM = 7; +ccui.RELATIVE_ALIGN_PARENT_BOTTOM_CENTER_HORIZONTAL = 8; +ccui.RELATIVE_ALIGN_PARENT_RIGHT_BOTTOM = 9; + +ccui.RELATIVE_ALIGN_LOCATION_ABOVE_LEFT = 10; +ccui.RELATIVE_ALIGN_LOCATION_ABOVE_CENTER = 11; +ccui.RELATIVE_ALIGN_LOCATION_ABOVE_RIGHT = 12; + +ccui.RELATIVE_ALIGN_LOCATION_LEFT_TOP = 13; +ccui.RELATIVE_ALIGN_LOCATION_LEFT_CENTER = 14; +ccui.RELATIVE_ALIGN_LOCATION_LEFT_BOTTOM = 15; + +ccui.RELATIVE_ALIGN_LOCATION_RIGHT_TOP = 16; +ccui.RELATIVE_ALIGN_LOCATION_RIGHT_CENTER = 17; +ccui.RELATIVE_ALIGN_LOCATION_RIGHT_BOTTOM = 18; + +ccui.RELATIVE_ALIGN_LOCATION_BELOW_TOP = 19; +ccui.RELATIVE_ALIGN_LOCATION_BELOW_CENTER = 20; +ccui.RELATIVE_ALIGN_LOCATION_BELOW_BOTTOM = 21; \ No newline at end of file diff --git a/extensions/ccui/layouts/UILayoutWebGLRenderCmd.js b/extensions/ccui/layouts/UILayoutWebGLRenderCmd.js new file mode 100644 index 0000000000..baf4773fca --- /dev/null +++ b/extensions/ccui/layouts/UILayoutWebGLRenderCmd.js @@ -0,0 +1,242 @@ +/**************************************************************************** + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. + + http://www.cocos2d-x.org + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + ****************************************************************************/ + +(function(){ + if(!ccui.ProtectedNode.WebGLRenderCmd) + return; + ccui.Layout.WebGLRenderCmd = function(renderable){ + ccui.ProtectedNode.WebGLRenderCmd.call(this, renderable); + this._needDraw = false; + + this._currentStencilEnabled = 0; + this._currentStencilWriteMask = 0; + this._currentStencilFunc = 0; + this._currentStencilRef = 0; + this._currentStencilValueMask = 0; + this._currentStencilFail = 0; + this._currentStencilPassDepthFail = 0; + this._currentStencilPassDepthPass = 0; + this._currentDepthWriteMask = false; + + this._mask_layer_le = 0; + + this._beforeVisitCmdStencil = new cc.CustomRenderCmd(this, this._onBeforeVisitStencil); + this._afterDrawStencilCmd = new cc.CustomRenderCmd(this, this._onAfterDrawStencil); + this._afterVisitCmdStencil = new cc.CustomRenderCmd(this, this._onAfterVisitStencil); + this._beforeVisitCmdScissor = new cc.CustomRenderCmd(this, this._onBeforeVisitScissor); + this._afterVisitCmdScissor = new cc.CustomRenderCmd(this, this._onAfterVisitScissor); + }; + + var proto = ccui.Layout.WebGLRenderCmd.prototype = Object.create(ccui.ProtectedNode.WebGLRenderCmd.prototype); + proto.constructor = ccui.Layout.WebGLRenderCmd; + + proto.visit = function(parentCmd){ + var node = this._node; + if (!node._visible) + return; + node._adaptRenderers(); + node._doLayout(); + + if (node._clippingEnabled) { + switch (node._clippingType) { + case ccui.Layout.CLIPPING_STENCIL: + this.stencilClippingVisit(parentCmd); + break; + case ccui.Layout.CLIPPING_SCISSOR: + this.scissorClippingVisit(parentCmd); + break; + default: + break; + } + } else + ccui.Widget.WebGLRenderCmd.prototype.visit.call(this, parentCmd); + }; + + proto._onBeforeVisitStencil = function(ctx){ + var gl = ctx || cc._renderContext; + + ccui.Layout.WebGLRenderCmd._layer++; + + var mask_layer = 0x1 << ccui.Layout.WebGLRenderCmd._layer; + var mask_layer_l = mask_layer - 1; + this._mask_layer_le = mask_layer | mask_layer_l; + + // manually save the stencil state + this._currentStencilEnabled = gl.isEnabled(gl.STENCIL_TEST); + this._currentStencilWriteMask = gl.getParameter(gl.STENCIL_WRITEMASK); + this._currentStencilFunc = gl.getParameter(gl.STENCIL_FUNC); + this._currentStencilRef = gl.getParameter(gl.STENCIL_REF); + this._currentStencilValueMask = gl.getParameter(gl.STENCIL_VALUE_MASK); + this._currentStencilFail = gl.getParameter(gl.STENCIL_FAIL); + this._currentStencilPassDepthFail = gl.getParameter(gl.STENCIL_PASS_DEPTH_FAIL); + this._currentStencilPassDepthPass = gl.getParameter(gl.STENCIL_PASS_DEPTH_PASS); + + gl.enable(gl.STENCIL_TEST); + + gl.stencilMask(mask_layer); + + this._currentDepthWriteMask = gl.getParameter(gl.DEPTH_WRITEMASK); + + gl.depthMask(false); + + gl.stencilFunc(gl.NEVER, mask_layer, mask_layer); + gl.stencilOp(gl.ZERO, gl.KEEP, gl.KEEP); + + // draw a fullscreen solid rectangle to clear the stencil buffer + this._drawFullScreenQuadClearStencil(); + + gl.stencilFunc(gl.NEVER, mask_layer, mask_layer); + gl.stencilOp(gl.REPLACE, gl.KEEP, gl.KEEP); + }; + + proto._onAfterDrawStencil = function(ctx){ + var gl = ctx || cc._renderContext; + gl.depthMask(this._currentDepthWriteMask); + gl.stencilFunc(gl.EQUAL, this._mask_layer_le, this._mask_layer_le); + gl.stencilOp(gl.KEEP, gl.KEEP, gl.KEEP); + }; + + proto._onAfterVisitStencil = function(ctx){ + var gl = ctx || cc._renderContext; + // manually restore the stencil state + gl.stencilFunc(this._currentStencilFunc, this._currentStencilRef, this._currentStencilValueMask); + gl.stencilOp(this._currentStencilFail, this._currentStencilPassDepthFail, this._currentStencilPassDepthPass); + gl.stencilMask(this._currentStencilWriteMask); + if (!this._currentStencilEnabled) + gl.disable(gl.STENCIL_TEST); + ccui.Layout.WebGLRenderCmd._layer--; + }; + + proto._onBeforeVisitScissor = function(ctx){ + var clippingRect = this._getClippingRect(); + var gl = ctx || cc._renderContext; + gl.enable(gl.SCISSOR_TEST); + + cc.view.setScissorInPoints(clippingRect.x, clippingRect.y, clippingRect.width, clippingRect.height); + }; + + proto._onAfterVisitScissor = function(ctx){ + var gl = ctx || cc._renderContext; + gl.disable(gl.SCISSOR_TEST); + }; + + proto._drawFullScreenQuadClearStencil = function(){ + // draw a fullscreen solid rectangle to clear the stencil buffer + cc.kmGLMatrixMode(cc.KM_GL_PROJECTION); + cc.kmGLPushMatrix(); + cc.kmGLLoadIdentity(); + cc.kmGLMatrixMode(cc.KM_GL_MODELVIEW); + cc.kmGLPushMatrix(); + cc.kmGLLoadIdentity(); + cc._drawingUtil.drawSolidRect(cc.p(-1,-1), cc.p(1,1), cc.color(255, 255, 255, 255)); + cc.kmGLMatrixMode(cc.KM_GL_PROJECTION); + cc.kmGLPopMatrix(); + cc.kmGLMatrixMode(cc.KM_GL_MODELVIEW); + cc.kmGLPopMatrix(); + }; + + proto.rebindStencilRendering = function(stencil){}; + + proto.transform = function(parentCmd, recursive){ + var node = this._node; + ccui.ProtectedNode.WebGLRenderCmd.prototype.transform.call(this, parentCmd, recursive); + if(node._clippingStencil) + node._clippingStencil._renderCmd.transform(this, recursive); + }; + + proto.stencilClippingVisit = function (parentCmd) { + var node = this._node; + if (!node._clippingStencil || !node._clippingStencil.isVisible()) + return; + + // all the _stencilBits are in use? + if (ccui.Layout.WebGLRenderCmd._layer + 1 === cc.stencilBits) { + // warn once + ccui.Layout.WebGLRenderCmd._visit_once = true; + if (ccui.Layout.WebGLRenderCmd._visit_once) { + cc.log("Nesting more than " + cc.stencilBits + "stencils is not supported. Everything will be drawn without stencil for this node and its childs."); + ccui.Layout.WebGLRenderCmd._visit_once = false; + } + // draw everything, as if there where no stencil + cc.Node.prototype.visit.call(node, parentCmd); + return; + } + + cc.renderer.pushRenderCommand(this._beforeVisitCmdStencil); + + //optimize performance for javascript + var currentStack = cc.current_stack; + currentStack.stack.push(currentStack.top); + this._syncStatus(parentCmd); + this._dirtyFlag = 0; + currentStack.top = this._stackMatrix; + + node._clippingStencil.visit(this); + + cc.renderer.pushRenderCommand(this._afterDrawStencilCmd); + + // draw (according to the stencil test func) this node and its childs + var i = 0; // used by _children + var j = 0; // used by _protectedChildren + + node.sortAllChildren(); + node.sortAllProtectedChildren(); + var locChildren = node._children, locProtectChildren = node._protectedChildren; + var iLen = locChildren.length, jLen = locProtectChildren.length, child; + for( ; i < iLen; i++ ){ + child = locChildren[i]; + if ( child && child.getLocalZOrder() < 0 ) + child.visit(this); + else + break; + } + for( ; j < jLen; j++ ) { + child = locProtectChildren[j]; + if ( child && child.getLocalZOrder() < 0 ) + child.visit(this); + else + break; + } + + for (; i < iLen; i++) + locChildren[i].visit(this); + for (; j < jLen; j++) + locProtectChildren[j].visit(this); + + cc.renderer.pushRenderCommand(this._afterVisitCmdStencil); + + //optimize performance for javascript + currentStack.top = currentStack.stack.pop(); + }; + + proto.scissorClippingVisit = function(parentCmd){ + cc.renderer.pushRenderCommand(this._beforeVisitCmdScissor); + cc.ProtectedNode.prototype.visit.call(this._node, parentCmd); + cc.renderer.pushRenderCommand(this._afterVisitCmdScissor); + }; + + ccui.Layout.WebGLRenderCmd._layer = -1; + ccui.Layout.WebGLRenderCmd._visit_once = null; +})(); diff --git a/extensions/ccui/layouts/UIRelativeBox.js b/extensions/ccui/layouts/UIRelativeBox.js new file mode 100644 index 0000000000..500c9eee2b --- /dev/null +++ b/extensions/ccui/layouts/UIRelativeBox.js @@ -0,0 +1,79 @@ +/**************************************************************************** + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. + + http://www.cocos2d-x.org + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + ****************************************************************************/ + +/** + * The Relative box for Cocos UI layout. Its layout type is ccui.Layout.RELATIVE. + * @class + * @extends ccui.Layout + */ +ccui.RelativeBox = ccui.Layout.extend(/** @lends ccui.RelativeBox# */{ + /** + * The constructor of ccui.RelativeBox + * @function + * @param {cc.Size} [size] + */ + ctor: function(size){ + if(size) + this.initWithSize(size); + else + this.init(); + }, + + /** + * Initializes a relative box. please do not call this function by yourself, you should pass the parameters to constructor to initialize it. + * @override + * @returns {boolean} + */ + init: function(){ + if(ccui.Layout.prototype.init.call(this)){ + this.setLayoutType(ccui.Layout.RELATIVE); + return true; + } + return false; + }, + + /** + * Initializes a relative box with size + * @param {cc.Size} [size] + * @returns {boolean} + */ + initWithSize: function(size){ + if(this.init()){ + this.setContentSize(size); + return true; + } + return false; + } +}); + +/** + * Creates a relative box + * @deprecated since v3.0, please use new ccui.RelativeBox(size) instead. + * @param {cc.Size} size + * @returns {ccui.RelativeBox} + */ +ccui.RelativeBox.create = function(size){ + return new ccui.RelativeBox(size); +}; \ No newline at end of file diff --git a/extensions/ccui/layouts/UIVBox.js b/extensions/ccui/layouts/UIVBox.js new file mode 100644 index 0000000000..d816c729db --- /dev/null +++ b/extensions/ccui/layouts/UIVBox.js @@ -0,0 +1,79 @@ +/**************************************************************************** + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. + + http://www.cocos2d-x.org + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + ****************************************************************************/ + +/** + * The vertical box of Cocos UI. Its layout type is ccui.Layout.LINEAR_VERTICAL. + * @class + * @extends ccui.Layout + */ +ccui.VBox = ccui.Layout.extend(/** @lends ccui.VBox# */{ + /** + * The constructor of ccui.VBox + * @function + * @param {cc.Size} size + */ + ctor: function(size){ + ccui.Layout.prototype.ctor.call(this, size); + if(size !== undefined) + this.initWithSize(size); + else + this.init(); + }, + + /** + * Initializes a VBox. please do not call this function by yourself, you should pass the parameters to constructor to initialize it. + * @override + * @returns {boolean} + */ + init: function(){ + if(ccui.Layout.prototype.init.call(this)){ + this.setLayoutType(ccui.Layout.LINEAR_VERTICAL); + return true; + } + return false; + }, + + /** + * Initializes a VBox with size. + * @param {cc.Size} size + * @returns {boolean} + */ + initWithSize: function(size){ + if(this.init()){ + this.setContentSize(size); + return true; + } + return false; + } +}); + +/** + * Creates a VBox + * @param {cc.Size} size + * @returns {ccui.VBox} + */ +ccui.VBox.create = function(size){ + return new ccui.VBox(size); +}; \ No newline at end of file diff --git a/extensions/ccui/system/CocosGUI.js b/extensions/ccui/system/CocosGUI.js index 5d8966092b..30622d0c97 100644 --- a/extensions/ccui/system/CocosGUI.js +++ b/extensions/ccui/system/CocosGUI.js @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -21,12 +22,15 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ + /** - * @namespace Base namespace of Cocos GUI + * The namespace of Cocos UI + * @namespace * @name ccui */ var ccui = ccui || {}; +//These classes defines are use for jsDoc /** * The same as cc.Class * @class @@ -42,8 +46,17 @@ ccui.Class.extend = ccui.Class.extend || cc.Class.extend; ccui.Node = ccui.Node || cc.Node; ccui.Node.extend = ccui.Node.extend || cc.Node.extend; + +/** + * that same as cc.Node + * @class + * @extends ccui.Node + */ +ccui.ProtectedNode = ccui.ProtectedNode || cc.ProtectedNode; +ccui.ProtectedNode.extend = ccui.ProtectedNode.extend || cc.ProtectedNode.extend; + /** - * Cocos GUI version + * Cocos UI version * @type {String} */ ccui.cocosGUIVersion = "CocosGUI v1.0.0.0"; \ No newline at end of file diff --git a/extensions/ccui/system/UIHelper.js b/extensions/ccui/system/UIHelper.js index 9497372000..70d82c9b84 100644 --- a/extensions/ccui/system/UIHelper.js +++ b/extensions/ccui/system/UIHelper.js @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -22,9 +23,13 @@ THE SOFTWARE. ****************************************************************************/ +//todo maybe need change here + + /** - * UI Helper - * @type {Object} + * ccui.helper is the singleton object which is the Helper object contains some functions for seek widget + * @class + * @name ccui.helper */ ccui.helper = { /** @@ -34,20 +39,18 @@ ccui.helper = { * @returns {ccui.Widget} */ seekWidgetByTag: function (root, tag) { - if (!root) { + if (!root) return null; - } - if (root.getTag() == tag) { + if (root.getTag() === tag) return root; - } + var arrayRootChildren = root.getChildren(); var length = arrayRootChildren.length; for (var i = 0; i < length; i++) { var child = arrayRootChildren[i]; - var res = this.seekWidgetByTag(child, tag); - if (res != null) { + var res = ccui.helper.seekWidgetByTag(child, tag); + if (res !== null) return res; - } } return null; }, @@ -59,20 +62,17 @@ ccui.helper = { * @returns {ccui.Widget} */ seekWidgetByName: function (root, name) { - if (!root) { + if (!root) return null; - } - if (root.getName() == name) { + if (root.getName() === name) return root; - } var arrayRootChildren = root.getChildren(); var length = arrayRootChildren.length; for (var i = 0; i < length; i++) { var child = arrayRootChildren[i]; - var res = this.seekWidgetByName(child, name); - if (res != null) { + var res = ccui.helper.seekWidgetByName(child, name); + if (res !== null) return res; - } } return null; }, @@ -85,39 +85,80 @@ ccui.helper = { * @returns {ccui.Widget} */ seekWidgetByRelativeName: function (root, name) { - if (!root) { + if (!root) return null; - } var arrayRootChildren = root.getChildren(); var length = arrayRootChildren.length; for (var i = 0; i < length; i++) { var child = arrayRootChildren[i]; var layoutParameter = child.getLayoutParameter(ccui.LayoutParameter.RELATIVE); - if (layoutParameter && layoutParameter.getRelativeName() == name) { + if (layoutParameter && layoutParameter.getRelativeName() === name) return child; - } } return null; }, - /*temp action*/ + /** + * Finds a widget whose action tag equals to param name from root widget. + * @param {ccui.Widget} root + * @param {Number} tag + * @returns {ccui.Widget} + */ seekActionWidgetByActionTag: function (root, tag) { - if (!root) { + if (!root) return null; - } - if (root.getActionTag() == tag) { + if (root.getActionTag() === tag) return root; - } var arrayRootChildren = root.getChildren(); for (var i = 0; i < arrayRootChildren.length; i++) { var child = arrayRootChildren[i]; - var res = this.seekActionWidgetByActionTag(child, tag); - if (res != null) { + var res = ccui.helper.seekActionWidgetByActionTag(child, tag); + if (res !== null) return res; - } } return null; - } + } , + + _activeLayout: true, + /** + * Refresh object and it's children layout state + * @param {cc.Node} rootNode + */ + doLayout: function(rootNode){ + if(!this._activeLayout) + return; + var children = rootNode.getChildren(), node; + for(var i = 0, len = children.length;i < len; i++) { + node = children[i]; + var com = node.getComponent(ccui.LayoutComponent.NAME); + var parent = node.getParent(); + if (null != com && null !== parent && com.refreshLayout) + com.refreshLayout(); + } + }, + + changeLayoutSystemActiveState: function(active){ + this._activeLayout = active; + }, + + /** + * restrict capInsetSize, when the capInsets' width is larger than the textureSize, it will restrict to 0,
+ * the height goes the same way as width. + * @param {cc.Rect} capInsets + * @param {cc.Size} textureSize + */ + restrictCapInsetRect: function (capInsets, textureSize) { + var x = capInsets.x, y = capInsets.y; + var width = capInsets.width, height = capInsets.height; + if (textureSize.width < width) { + x = 0.0; + width = 0.0; + } + if (textureSize.height < height) { + y = 0.0; + height = 0.0; + } + return cc.rect(x, y, width, height); + } }; -ccui.helper; diff --git a/extensions/ccui/uiwidgets/UIButton.js b/extensions/ccui/uiwidgets/UIButton.js index 97529c3601..3d6a21103d 100644 --- a/extensions/ccui/uiwidgets/UIButton.js +++ b/extensions/ccui/uiwidgets/UIButton.js @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,7 +24,7 @@ ****************************************************************************/ /** - * Base class for ccui.Button + * The button controls of Cocos UI. * @class * @extends ccui.Widget * @@ -39,152 +40,200 @@ ccui.Button = ccui.Widget.extend(/** @lends ccui.Button# */{ _buttonClickedRenderer: null, _buttonDisableRenderer: null, _titleRenderer: null, + _normalFileName: "", _clickedFileName: "", _disabledFileName: "", + _prevIgnoreSize: true, _scale9Enabled: false, -// CCRect _capInsets:null, + _capInsetsNormal: null, _capInsetsPressed: null, _capInsetsDisabled: null, - _normalTexType: null, - _pressedTexType: null, - _disabledTexType: null, + + _normalTexType: ccui.Widget.LOCAL_TEXTURE, + _pressedTexType: ccui.Widget.LOCAL_TEXTURE, + _disabledTexType: ccui.Widget.LOCAL_TEXTURE, + _normalTextureSize: null, _pressedTextureSize: null, _disabledTextureSize: null, + pressedActionEnabled: false, _titleColor: null, _normalTextureScaleXInSize: 1, _normalTextureScaleYInSize: 1, _pressedTextureScaleXInSize: 1, _pressedTextureScaleYInSize: 1, + + _zoomScale: 0.1, + _normalTextureLoaded: false, _pressedTextureLoaded: false, _disabledTextureLoaded: false, - _className:"Button", - ctor: function () { - ccui.Widget.prototype.ctor.call(this); - this._buttonNormalRenderer = null; - this._buttonClickedRenderer = null; - this._buttonDisableRenderer = null; - this._titleRenderer = null; - this._normalFileName = ""; - this._clickedFileName = ""; - this._disabledFileName = ""; - this._prevIgnoreSize = true; - this._scale9Enabled = false; + + _className: "Button", + _normalTextureAdaptDirty: true, + _pressedTextureAdaptDirty: true, + _disabledTextureAdaptDirty: true, + + _fontName: "Thonburi", + _fontSize: 12, + _type: 0, + + /** + * Allocates and initializes a UIButton. + * Constructor of ccui.Button. override it to extend the construction behavior, remember to call "this._super()" in the extended "ctor" function. + * @param {String} normalImage + * @param {String} [selectedImage=""] + * @param {String} [disableImage=""] + * @param {Number} [texType=ccui.Widget.LOCAL_TEXTURE] + * @example + * // example + * var uiButton = new ccui.Button(); + */ + ctor: function (normalImage, selectedImage, disableImage, texType) { this._capInsetsNormal = cc.rect(0, 0, 0, 0); this._capInsetsPressed = cc.rect(0, 0, 0, 0); this._capInsetsDisabled = cc.rect(0, 0, 0, 0); - this._normalTexType = ccui.Widget.LOCAL_TEXTURE; - this._pressedTexType = ccui.Widget.LOCAL_TEXTURE; - this._disabledTexType = ccui.Widget.LOCAL_TEXTURE; - var locSize = this._size; - this._normalTextureSize = cc.size(locSize.width, locSize.height); - this._pressedTextureSize = cc.size(locSize.width, locSize.height); - this._disabledTextureSize = cc.size(locSize.width, locSize.height); - this.pressedActionEnabled = false; + this._normalTextureSize = cc.size(0, 0); + this._pressedTextureSize = cc.size(0, 0); + this._disabledTextureSize = cc.size(0, 0); this._titleColor = cc.color.WHITE; - this._normalTextureScaleXInSize = 1; - this._normalTextureScaleYInSize = 1; - this._pressedTextureScaleXInSize = 1; - this._pressedTextureScaleYInSize = 1; - this._normalTextureLoaded = false; - this._pressedTextureLoaded = false; - this._disabledTextureLoaded = false; - }, - - init: function () { - if (ccui.Widget.prototype.init.call(this)){ - this.setTouchEnabled(true); - return true; + ccui.Widget.prototype.ctor.call(this); + this.setTouchEnabled(true); + this.init(normalImage, selectedImage, disableImage, texType); + }, + + /** + * Initializes a button. please do not call this function by yourself, you should pass the parameters to constructor to initialize it. + * @param {String} normalImage + * @param {String} [selectedImage=""] + * @param {String} [disableImage=""] + * @param {Number} [texType=ccui.Widget.LOCAL_TEXTURE] + * @returns {boolean} + * @override + */ + init: function (normalImage, selectedImage,disableImage, texType) { + if (ccui.Widget.prototype.init.call(this)) { + if(normalImage === undefined) + return true; + this.loadTextures(normalImage, selectedImage,disableImage, texType); } return false; }, - initRenderer: function () { - this._buttonNormalRenderer = cc.Sprite.create(); - this._buttonClickedRenderer = cc.Sprite.create(); - this._buttonDisableRenderer = cc.Sprite.create(); - this._titleRenderer = cc.LabelTTF.create(""); - cc.Node.prototype.addChild.call(this, this._buttonNormalRenderer, ccui.Button.NORMAL_RENDERER_ZORDER); - cc.Node.prototype.addChild.call(this, this._buttonClickedRenderer, ccui.Button.PRESSED_RENDERER_ZORDER); - cc.Node.prototype.addChild.call(this, this._buttonDisableRenderer, ccui.Button.DISABLED_RENDERER_ZORDER); - cc.Node.prototype.addChild.call(this, this._titleRenderer, ccui.Button.TITLE_RENDERER_ZORDER); + _initRenderer: function () { + //todo create Scale9Sprite + this._buttonNormalRenderer = new cc.Sprite(); + this._buttonClickedRenderer = new cc.Sprite(); + this._buttonDisableRenderer = new cc.Sprite(); + this._titleRenderer = new cc.LabelTTF(""); + this._titleRenderer.setAnchorPoint(0.5, 0.5); + + this.addProtectedChild(this._buttonNormalRenderer, ccui.Button.NORMAL_RENDERER_ZORDER, -1); + this.addProtectedChild(this._buttonClickedRenderer, ccui.Button.PRESSED_RENDERER_ZORDER, -1); + this.addProtectedChild(this._buttonDisableRenderer, ccui.Button.DISABLED_RENDERER_ZORDER, -1); + this.addProtectedChild(this._titleRenderer, ccui.Button.TITLE_RENDERER_ZORDER, -1); }, /** * Sets if button is using scale9 renderer. - * @param {Boolean} able + * @param {Boolean} able true that using scale9 renderer, false otherwise. */ setScale9Enabled: function (able) { - if (this._scale9Enabled == able) { + //todo create Scale9Sprite + if (this._scale9Enabled === able) return; - } + this._brightStyle = ccui.Widget.BRIGHT_STYLE_NONE; this._scale9Enabled = able; - cc.Node.prototype.removeChild.call(this, this._buttonNormalRenderer, true); - cc.Node.prototype.removeChild.call(this, this._buttonClickedRenderer, true); - cc.Node.prototype.removeChild.call(this, this._buttonDisableRenderer, true); + this.removeProtectedChild(this._buttonNormalRenderer); + this.removeProtectedChild(this._buttonClickedRenderer); + this.removeProtectedChild(this._buttonDisableRenderer); if (this._scale9Enabled) { - this._buttonNormalRenderer = cc.Scale9Sprite.create(); - this._buttonClickedRenderer = cc.Scale9Sprite.create(); - this._buttonDisableRenderer = cc.Scale9Sprite.create(); - } - else { - this._buttonNormalRenderer = cc.Sprite.create(); - this._buttonClickedRenderer = cc.Sprite.create(); - this._buttonDisableRenderer = cc.Sprite.create(); + this._buttonNormalRenderer = new ccui.Scale9Sprite(); + this._buttonClickedRenderer = new ccui.Scale9Sprite(); + this._buttonDisableRenderer = new ccui.Scale9Sprite(); + } else { + this._buttonNormalRenderer = new cc.Sprite(); + this._buttonClickedRenderer = new cc.Sprite(); + this._buttonDisableRenderer = new cc.Sprite(); } + this._buttonClickedRenderer.setVisible(false); + this._buttonDisableRenderer.setVisible(false); + this.loadTextureNormal(this._normalFileName, this._normalTexType); this.loadTexturePressed(this._clickedFileName, this._pressedTexType); this.loadTextureDisabled(this._disabledFileName, this._disabledTexType); - cc.Node.prototype.addChild.call(this, this._buttonNormalRenderer, ccui.Button.NORMAL_RENDERER_ZORDER); - cc.Node.prototype.addChild.call(this, this._buttonClickedRenderer, ccui.Button.PRESSED_RENDERER_ZORDER); - cc.Node.prototype.addChild.call(this, this._buttonDisableRenderer, ccui.Button.DISABLED_RENDERER_ZORDER); + + this.addProtectedChild(this._buttonNormalRenderer, ccui.Button.NORMAL_RENDERER_ZORDER, -1); + this.addProtectedChild(this._buttonClickedRenderer, ccui.Button.PRESSED_RENDERER_ZORDER, -1); + this.addProtectedChild(this._buttonDisableRenderer, ccui.Button.DISABLED_RENDERER_ZORDER, -1); if (this._scale9Enabled) { var ignoreBefore = this._ignoreSize; this.ignoreContentAdaptWithSize(false); this._prevIgnoreSize = ignoreBefore; - } - else { + } else { this.ignoreContentAdaptWithSize(this._prevIgnoreSize); } this.setCapInsetsNormalRenderer(this._capInsetsNormal); this.setCapInsetsPressedRenderer(this._capInsetsPressed); this.setCapInsetsDisabledRenderer(this._capInsetsDisabled); this.setBright(this._bright); + + this._normalTextureAdaptDirty = true; + this._pressedTextureAdaptDirty = true; + this._disabledTextureAdaptDirty = true; }, /** - * Get button is using scale9 renderer or not. + * Returns button is using scale9 renderer or not. * @returns {Boolean} */ - isScale9Enabled:function(){ + isScale9Enabled: function () { return this._scale9Enabled; }, /** - * ignoreContentAdaptWithSize - * @param {Boolean} ignore + * Sets whether ignore the widget size + * @param {Boolean} ignore true that widget will ignore it's size, use texture size, false otherwise. Default value is true. + * @override */ ignoreContentAdaptWithSize: function (ignore) { + if(this._unifySize){ + this._updateContentSize(); + return; + } if (!this._scale9Enabled || (this._scale9Enabled && !ignore)) { ccui.Widget.prototype.ignoreContentAdaptWithSize.call(this, ignore); this._prevIgnoreSize = ignore; } }, + /** + * Returns the renderer size. + * @returns {cc.Size} + */ + getVirtualRendererSize: function(){ + if (this._unifySize) + return this._getNormalSize(); + + if (!this._normalTextureLoaded && this._titleRenderer.getString().length > 0) { + return this._titleRenderer.getContentSize(); + } + return cc.size(this._normalTextureSize); + }, + /** * Load textures for button. - * @param {String} normal - * @param {String} selected - * @param {String} disabled + * @param {String} normal normal state of texture's filename. + * @param {String} selected selected state of texture's filename. + * @param {String} disabled disabled state of texture's filename. * @param {ccui.Widget.LOCAL_TEXTURE|ccui.Widget.PLIST_TEXTURE} texType */ loadTextures: function (normal, selected, disabled, texType) { @@ -195,151 +244,138 @@ ccui.Button = ccui.Widget.extend(/** @lends ccui.Button# */{ /** * Load normal state texture for button. - * @param {String} normal + * @param {String} normal normal state of texture's filename. * @param {ccui.Widget.LOCAL_TEXTURE|ccui.Widget.PLIST_TEXTURE} texType */ loadTextureNormal: function (normal, texType) { - if (!normal) { + if (!normal) return; - } - texType = texType||ccui.Widget.LOCAL_TEXTURE; + texType = texType || ccui.Widget.LOCAL_TEXTURE; this._normalFileName = normal; this._normalTexType = texType; - var buttonNormalRenderer = this._buttonNormalRenderer; - switch (this._normalTexType) { + + var self = this; + var normalRenderer = this._buttonNormalRenderer; + if(!normalRenderer._textureLoaded){ + normalRenderer.addEventListener("load", function(){ + self.loadTextureNormal(self._normalFileName, self._normalTexType); + }); + } + switch (this._normalTexType){ case ccui.Widget.LOCAL_TEXTURE: - buttonNormalRenderer.initWithFile(normal); + //SetTexture cannot load resource + normalRenderer.initWithFile(normal); break; case ccui.Widget.PLIST_TEXTURE: - buttonNormalRenderer.initWithSpriteFrameName(normal); + //SetTexture cannot load resource + normalRenderer.initWithSpriteFrameName(normal); break; default: break; } - var buttonRenderSize = buttonNormalRenderer.getContentSize(); - if(buttonNormalRenderer.textureLoaded()){ - this._normalTextureSize.width = buttonRenderSize.width; - this._normalTextureSize.height = buttonRenderSize.height; - }else{ - buttonNormalRenderer.addLoadedEventListener(function(){ - this._normalTextureSize = buttonNormalRenderer.getContentSize(); - if (buttonNormalRenderer.setCapInsets) { - buttonNormalRenderer.setCapInsets(this._capInsetsNormal); - } - this.normalTextureScaleChangedWithSize(); - },this); - this._normalTextureSize.width = this._customSize.width; - this._normalTextureSize.height = this._customSize.height; - } - if (this._scale9Enabled) { - buttonNormalRenderer.setCapInsets(this._capInsetsNormal); - } + this._normalTextureSize = this._buttonNormalRenderer.getContentSize(); + this._updateChildrenDisplayedRGBA(); + if (this._unifySize){ + if (this._scale9Enabled){ + normalRenderer.setCapInsets(this._capInsetsNormal); + this._updateContentSizeWithTextureSize(this._getNormalSize()); + } + }else + this._updateContentSizeWithTextureSize(this._normalTextureSize); - this.updateColorToRenderer(buttonNormalRenderer); - this.updateAnchorPoint(); - this.updateFlippedX(); - this.updateFlippedY(); - this.normalTextureScaleChangedWithSize(); this._normalTextureLoaded = true; + this._normalTextureAdaptDirty = true; + this._findLayout(); }, /** * Load selected state texture for button. - * @param {String} selected + * @param {String} selected selected state of texture's filename. * @param {ccui.Widget.LOCAL_TEXTURE|ccui.Widget.PLIST_TEXTURE} texType */ loadTexturePressed: function (selected, texType) { - if (!selected) { + if (!selected) return; - } texType = texType || ccui.Widget.LOCAL_TEXTURE; this._clickedFileName = selected; this._pressedTexType = texType; + + var self = this; var clickedRenderer = this._buttonClickedRenderer; + if(!clickedRenderer._textureLoaded){ + clickedRenderer.addEventListener("load", function(){ + self.loadTexturePressed(self._clickedFileName, self._pressedTexType); + }); + } + switch (this._pressedTexType) { case ccui.Widget.LOCAL_TEXTURE: + //SetTexture cannot load resource clickedRenderer.initWithFile(selected); break; case ccui.Widget.PLIST_TEXTURE: + //SetTexture cannot load resource clickedRenderer.initWithSpriteFrameName(selected); break; default: break; } - if(clickedRenderer.textureLoaded()){ - this._pressedTextureSize = clickedRenderer.getContentSize(); - }else{ - clickedRenderer.addLoadedEventListener(function(){ - this._pressedTextureSize = clickedRenderer.getContentSize(); - if (clickedRenderer.setCapInsets) { - clickedRenderer.setCapInsets(this._capInsetsNormal); - } - this.pressedTextureScaleChangedWithSize(); - },this); - this._pressedTextureSize.width = this._customSize.width; - this._pressedTextureSize.height = this._customSize.height; - } + if (this._scale9Enabled) + clickedRenderer.setCapInsets(this._capInsetsPressed); + + this._pressedTextureSize = this._buttonClickedRenderer.getContentSize(); + this._updateChildrenDisplayedRGBA(); - if (this._scale9Enabled) { - clickedRenderer.setCapInsets(this._capInsetsNormal); - } - this.updateColorToRenderer(clickedRenderer); - this.updateAnchorPoint(); - this.updateFlippedX(); - this.updateFlippedY(); - this.pressedTextureScaleChangedWithSize(); this._pressedTextureLoaded = true; + this._pressedTextureAdaptDirty = true; + this._findLayout(); }, /** * Load dark state texture for button. - * @param {String} disabled + * @param {String} disabled disabled state of texture's filename. * @param {ccui.Widget.LOCAL_TEXTURE|ccui.Widget.PLIST_TEXTURE} texType */ loadTextureDisabled: function (disabled, texType) { - if (!disabled) { + if (!disabled) return; - } + texType = texType || ccui.Widget.LOCAL_TEXTURE; this._disabledFileName = disabled; this._disabledTexType = texType; - var disableRenderer = this._buttonDisableRenderer; + + var self = this; + var disabledRenderer = this._buttonDisableRenderer; + if(!disabledRenderer._textureLoaded){ + disabledRenderer.addEventListener("load", function() { + self.loadTextureDisabled(self._disabledFileName, self._disabledTexType); + }); + } + switch (this._disabledTexType) { case ccui.Widget.LOCAL_TEXTURE: - disableRenderer.initWithFile(disabled); + //SetTexture cannot load resource + disabledRenderer.initWithFile(disabled); break; case ccui.Widget.PLIST_TEXTURE: - disableRenderer.initWithSpriteFrameName(disabled); + //SetTexture cannot load resource + disabledRenderer.initWithSpriteFrameName(disabled); break; default: break; } - if(disableRenderer.textureLoaded()){ - this._disabledTextureSize = disableRenderer.getContentSize(); - }else{ - disableRenderer.addLoadedEventListener(function(){ - this._disabledTextureSize = disableRenderer.getContentSize(); - if (disableRenderer.setCapInsets) { - disableRenderer.setCapInsets(this._capInsetsNormal); - } - this.disabledTextureScaleChangedWithSize(); - },this); - this._disabledTextureSize.width = this._customSize.width; - this._disabledTextureSize.height = this._customSize.height; - } + if (this._scale9Enabled) + disabledRenderer.setCapInsets(this._capInsetsDisabled); + + this._disabledTextureSize = this._buttonDisableRenderer.getContentSize(); + this._updateChildrenDisplayedRGBA(); - if (this._scale9Enabled) { - disableRenderer.setCapInsets(this._capInsetsNormal); - } - this.updateColorToRenderer(disableRenderer); - this.updateAnchorPoint(); - this.updateFlippedX(); - this.updateFlippedY(); - this.disabledTextureScaleChangedWithSize(); this._disabledTextureLoaded = true; + this._disabledTextureAdaptDirty = true; + this._findLayout(); }, /** @@ -357,19 +393,37 @@ ccui.Button = ccui.Widget.extend(/** @lends ccui.Button# */{ * @param {cc.Rect} capInsets */ setCapInsetsNormalRenderer: function (capInsets) { - this._capInsetsNormal = capInsets; - if (!this._scale9Enabled) { + if(!capInsets) return; + + var x = capInsets.x, y = capInsets.y; + var width = capInsets.width, height = capInsets.height; + if (this._normalTextureSize.width < width){ + x = 0; + width = 0; } - this._buttonNormalRenderer.setCapInsets(capInsets); + if (this._normalTextureSize.height < height){ + y = 0; + height = 0; + } + + var locInsets = this._capInsetsNormal; + locInsets.x = x; + locInsets.y = y; + locInsets.width = width; + locInsets.height = height; + + if (!this._scale9Enabled) + return; + this._buttonNormalRenderer.setCapInsets(locInsets); }, /** - * Get normal renderer cap insets . + * Returns normal renderer cap insets. * @returns {cc.Rect} */ - getCapInsetNormalRenderer:function(){ - return this._capInsetsNormal; + getCapInsetsNormalRenderer:function(){ + return cc.rect(this._capInsetsNormal); }, /** @@ -377,19 +431,36 @@ ccui.Button = ccui.Widget.extend(/** @lends ccui.Button# */{ * @param {cc.Rect} capInsets */ setCapInsetsPressedRenderer: function (capInsets) { - this._capInsetsPressed = capInsets; - if (!this._scale9Enabled) { + if(!capInsets || !this._scale9Enabled) return; + + var x = capInsets.x, y = capInsets.y; + var width = capInsets.width, height = capInsets.height; + + if (this._pressedTextureSize.width < width) { + x = 0; + width = 0; } - this._buttonClickedRenderer.setCapInsets(capInsets); + if (this._pressedTextureSize.height < height) { + y = 0; + height = 0; + } + + var locInsets = this._capInsetsPressed; + locInsets.x = x; + locInsets.y = y; + locInsets.width = width; + locInsets.height = height; + + this._buttonClickedRenderer.setCapInsets(locInsets); }, /** - * Get pressed renderer cap insets . + * Returns pressed renderer cap insets. * @returns {cc.Rect} */ - getCapInsetPressedRenderer:function(){ - return this._capInsetsPressed; + getCapInsetsPressedRenderer: function () { + return cc.rect(this._capInsetsPressed); }, /** @@ -397,172 +468,157 @@ ccui.Button = ccui.Widget.extend(/** @lends ccui.Button# */{ * @param {cc.Rect} capInsets */ setCapInsetsDisabledRenderer: function (capInsets) { - this._capInsetsDisabled = capInsets; - if (!this._scale9Enabled) { + if(!capInsets || !this._scale9Enabled) return; + + var x = capInsets.x, y = capInsets.y; + var width = capInsets.width, height = capInsets.height; + + if (this._disabledTextureSize.width < width) { + x = 0; + width = 0; + } + if (this._disabledTextureSize.height < height) { + y = 0; + height = 0; } - this._buttonDisableRenderer.setCapInsets(capInsets); + + var locInsets = this._capInsetsDisabled; + locInsets.x = x; + locInsets.y = y; + locInsets.width = width; + locInsets.height = height; + + this._buttonDisableRenderer.setCapInsets(locInsets); }, /** - * Get disable renderer cap insets . + * Returns disable renderer cap insets. * @returns {cc.Rect} */ - getCapInsetDisabledRenderer:function(){ - return this._capInsetsDisabled; + getCapInsetsDisabledRenderer: function () { + return cc.rect(this._capInsetsDisabled); }, - onPressStateChangedToNormal: function () { + _onPressStateChangedToNormal: function () { this._buttonNormalRenderer.setVisible(true); this._buttonClickedRenderer.setVisible(false); this._buttonDisableRenderer.setVisible(false); + if (this._scale9Enabled) + this._buttonNormalRenderer.setState( ccui.Scale9Sprite.state.NORMAL); if (this._pressedTextureLoaded) { - if (this.pressedActionEnabled) { + if (this.pressedActionEnabled){ this._buttonNormalRenderer.stopAllActions(); this._buttonClickedRenderer.stopAllActions(); - this._buttonDisableRenderer.stopAllActions(); - var zoomAction = cc.ScaleTo.create(0.05, 1.0); - var zoomAction1 = cc.ScaleTo.create(0.05, 1.0); - var zoomAction2 = cc.ScaleTo.create(0.05, 1.0); - this._buttonNormalRenderer.runAction(zoomAction); - this._buttonClickedRenderer.runAction(zoomAction1); - this._buttonDisableRenderer.runAction(zoomAction2); + //var zoomAction = cc.scaleTo(ccui.Button.ZOOM_ACTION_TIME_STEP, this._normalTextureScaleXInSize, this._normalTextureScaleYInSize); + //fixme: the zoomAction will run in the next frame which will cause the _buttonNormalRenderer to a wrong scale + //this._buttonNormalRenderer.runAction(zoomAction); + this._buttonNormalRenderer.setScale(this._normalTextureScaleXInSize, this._normalTextureScaleYInSize); + this._buttonClickedRenderer.setScale(this._pressedTextureScaleXInSize, this._pressedTextureScaleYInSize); + + this._titleRenderer.stopAllActions(); + if (this._unifySize){ + var zoomTitleAction = cc.scaleTo(ccui.Button.ZOOM_ACTION_TIME_STEP, 1, 1); + this._titleRenderer.runAction(zoomTitleAction); + }else{ + this._titleRenderer.setScaleX(1); + this._titleRenderer.setScaleY(1); + } } } else { this._buttonNormalRenderer.stopAllActions(); this._buttonNormalRenderer.setScale(this._normalTextureScaleXInSize, this._normalTextureScaleYInSize); + + this._titleRenderer.stopAllActions(); + if (this._scale9Enabled) + this._buttonNormalRenderer.setColor(cc.color.WHITE); + + this._titleRenderer.setScaleX(1); + this._titleRenderer.setScaleY(1); } }, - onPressStateChangedToPressed: function () { + _onPressStateChangedToPressed: function () { + var locNormalRenderer = this._buttonNormalRenderer; + if (this._scale9Enabled) + locNormalRenderer.setState(ccui.Scale9Sprite.state.NORMAL); + if (this._pressedTextureLoaded) { - this._buttonNormalRenderer.setVisible(false); + locNormalRenderer.setVisible(false); this._buttonClickedRenderer.setVisible(true); this._buttonDisableRenderer.setVisible(false); if (this.pressedActionEnabled) { - this._buttonNormalRenderer.stopAllActions(); + locNormalRenderer.stopAllActions(); this._buttonClickedRenderer.stopAllActions(); - this._buttonDisableRenderer.stopAllActions(); - var zoomAction = cc.ScaleTo.create(0.05, 1.1); - var zoomAction1 = cc.ScaleTo.create(0.05, 1.1); - var zoomAction2 = cc.ScaleTo.create(0.05, 1.1); - this._buttonNormalRenderer.runAction(zoomAction); - this._buttonClickedRenderer.runAction(zoomAction1); - this._buttonDisableRenderer.runAction(zoomAction2); + var zoomAction = cc.scaleTo(ccui.Button.ZOOM_ACTION_TIME_STEP, this._pressedTextureScaleXInSize + this._zoomScale, + this._pressedTextureScaleYInSize + this._zoomScale); + this._buttonClickedRenderer.runAction(zoomAction); + locNormalRenderer.setScale(this._pressedTextureScaleXInSize + this._zoomScale, this._pressedTextureScaleYInSize + this._zoomScale); + + this._titleRenderer.stopAllActions(); + this._titleRenderer.runAction(cc.scaleTo(ccui.Button.ZOOM_ACTION_TIME_STEP, 1 + this._zoomScale, 1 + this._zoomScale)); } } else { - this._buttonNormalRenderer.setVisible(true); + locNormalRenderer.setVisible(true); this._buttonClickedRenderer.setVisible(true); this._buttonDisableRenderer.setVisible(false); - this._buttonNormalRenderer.stopAllActions(); - this._buttonClickedRenderer.setScale(this._pressedTextureScaleXInSize, this._pressedTextureScaleYInSize); + locNormalRenderer.stopAllActions(); + locNormalRenderer.setScale(this._normalTextureScaleXInSize + this._zoomScale, this._normalTextureScaleYInSize + this._zoomScale); + + this._titleRenderer.stopAllActions(); + this._titleRenderer.setScaleX(1 + this._zoomScale); + this._titleRenderer.setScaleY(1 + this._zoomScale); } }, - onPressStateChangedToDisabled: function () { - this._buttonNormalRenderer.setVisible(false); + _onPressStateChangedToDisabled: function () { + //if disable resource is null + if (!this._disabledTextureLoaded){ + if (this._normalTextureLoaded && this._scale9Enabled) + this._buttonNormalRenderer.setState(ccui.Scale9Sprite.state.GRAY); + }else{ + this._buttonNormalRenderer.setVisible(false); + this._buttonDisableRenderer.setVisible(true); + } + this._buttonClickedRenderer.setVisible(false); - this._buttonDisableRenderer.setVisible(true); this._buttonNormalRenderer.setScale(this._normalTextureScaleXInSize, this._normalTextureScaleYInSize); this._buttonClickedRenderer.setScale(this._pressedTextureScaleXInSize, this._pressedTextureScaleYInSize); }, - updateFlippedX: function () { - this._titleRenderer.setFlippedX(this._flippedX); - if (this._scale9Enabled) { - if (this._flippedX) { - this._buttonNormalRenderer.setScaleX(-1); - this._buttonClickedRenderer.setScaleX(-1); - this._buttonDisableRenderer.setScaleX(-1); - } - else { - this._buttonNormalRenderer.setScaleX(1); - this._buttonClickedRenderer.setScaleX(1); - this._buttonDisableRenderer.setScaleX(1); - } - } else { - this._buttonNormalRenderer.setFlippedX(this._flippedX); - this._buttonClickedRenderer.setFlippedX(this._flippedX); - this._buttonDisableRenderer.setFlippedX(this._flippedX); - } - }, - - updateFlippedY: function () { - this._titleRenderer.setFlippedY(this._flippedY); - if (this._scale9Enabled) { - if (this._flippedX) { - this._buttonNormalRenderer.setScaleY(-1); - this._buttonClickedRenderer.setScaleX(-1); - this._buttonDisableRenderer.setScaleX(-1); - } - else { - this._buttonNormalRenderer.setScaleY(1); - this._buttonClickedRenderer.setScaleY(1); - this._buttonDisableRenderer.setScaleY(1); + _updateContentSize: function(){ + if (this._unifySize){ + if (this._scale9Enabled) + ccui.ProtectedNode.setContentSize(this._customSize); + else{ + var s = this._getNormalSize(); + ccui.ProtectedNode.setContentSize(s); } - }else{ - this._buttonNormalRenderer.setFlippedY(this._flippedY); - this._buttonClickedRenderer.setFlippedY(this._flippedY); - this._buttonDisableRenderer.setFlippedY(this._flippedY); + this._onSizeChanged(); + return; } - }, - /** - * override "setAnchorPoint" of widget. - * @param {cc.Point|Number} point The anchor point of UIButton or The anchor point.x of UIButton. - * @param {Number} [y] The anchor point.y of UIButton. - */ - setAnchorPoint: function (point, y) { - if(y === undefined){ - ccui.Widget.prototype.setAnchorPoint.call(this, point); - this._buttonNormalRenderer.setAnchorPoint(point); - this._buttonClickedRenderer.setAnchorPoint(point); - this._buttonDisableRenderer.setAnchorPoint(point); - } else { - ccui.Widget.prototype.setAnchorPoint.call(this, point, y); - this._buttonNormalRenderer.setAnchorPoint(point, y); - this._buttonClickedRenderer.setAnchorPoint(point, y); - this._buttonDisableRenderer.setAnchorPoint(point, y); - } - this._titleRenderer.setPosition(this._size.width * (0.5 - this._anchorPoint.x), this._size.height * (0.5 - this._anchorPoint.y)); + if (this._ignoreSize) + this.setContentSize(this.getVirtualRendererSize()); }, - _setAnchorX: function (value) { - ccui.Widget.prototype._setAnchorX.call(this, value); - this._buttonNormalRenderer._setAnchorX(value); - this._buttonClickedRenderer._setAnchorX(value); - this._buttonDisableRenderer._setAnchorX(value); - this._titleRenderer.setPositionX(this._size.width * (0.5 - this._anchorPoint.x)); - }, - _setAnchorY: function (value) { - ccui.Widget.prototype._setAnchorY.call(this, value); - this._buttonNormalRenderer._setAnchorY(value); - this._buttonClickedRenderer._setAnchorY(value); - this._buttonDisableRenderer._setAnchorY(value); + _updateTexturesRGBA: function(){ + this._buttonNormalRenderer.setColor(this.getColor()); + this._buttonClickedRenderer.setColor(this.getColor()); + this._buttonDisableRenderer.setColor(this.getColor()); - this._titleRenderer.setPositionY(this._size.height * (0.5 - this._anchorPoint.y)); - }, - - onSizeChanged: function () { - ccui.Widget.prototype.onSizeChanged.call(this); - this.normalTextureScaleChangedWithSize(); - this.pressedTextureScaleChangedWithSize(); - this.disabledTextureScaleChangedWithSize(); + this._buttonNormalRenderer.setOpacity(this.getOpacity()); + this._buttonClickedRenderer.setOpacity(this.getOpacity()); + this._buttonDisableRenderer.setOpacity(this.getOpacity()); }, - /** - * override "getContentSize" method of widget. - * @returns {cc.Size} - */ - getContentSize: function () { - return this._normalTextureSize; + _onSizeChanged: function () { + ccui.Widget.prototype._onSizeChanged.call(this); + this._updateTitleLocation(); + this._normalTextureAdaptDirty = true; + this._pressedTextureAdaptDirty = true; + this._disabledTextureAdaptDirty = true; }, - _getWidth: function () { - return this._scale9Enabled ? this._size.width : this._normalTextureSize.width; - }, - _getHeight: function () { - return this._scale9Enabled ? this._size.height : this._normalTextureSize.height; - }, /** * Gets the Virtual Renderer of widget. @@ -578,92 +634,107 @@ ccui.Button = ccui.Widget.extend(/** @lends ccui.Button# */{ default: return null; } - } - else { + } else return this._buttonDisableRenderer; - } }, - normalTextureScaleChangedWithSize: function () { - if (this._ignoreSize) { - if (!this._scale9Enabled) { - this._buttonNormalRenderer.setScale(1.0); + _normalTextureScaleChangedWithSize: function () { + if(this._ignoreSize && !this._unifySize){ + if(!this._scale9Enabled){ + this._buttonNormalRenderer.setScale(1); this._normalTextureScaleXInSize = this._normalTextureScaleYInSize = 1; - this._size.width = this._normalTextureSize.width; - this._size.height = this._normalTextureSize.height; } - } - else { - if (this._scale9Enabled) { - this._buttonNormalRenderer.setPreferredSize(this._size); + }else{ + if (this._scale9Enabled){ + this._buttonNormalRenderer.setPreferredSize(this._contentSize); this._normalTextureScaleXInSize = this._normalTextureScaleYInSize = 1; - } - else { + this._buttonNormalRenderer.setScale(this._normalTextureScaleXInSize, this._normalTextureScaleYInSize); + }else{ var textureSize = this._normalTextureSize; - if (textureSize.width <= 0.0 || textureSize.height <= 0.0) { - this._buttonNormalRenderer.setScale(1.0); + if (textureSize.width <= 0 || textureSize.height <= 0) + { + this._buttonNormalRenderer.setScale(1); return; } - var scaleX = this._size.width / textureSize.width; - var scaleY = this._size.height / textureSize.height; + var scaleX = this._contentSize.width / textureSize.width; + var scaleY = this._contentSize.height / textureSize.height; this._buttonNormalRenderer.setScaleX(scaleX); this._buttonNormalRenderer.setScaleY(scaleY); this._normalTextureScaleXInSize = scaleX; this._normalTextureScaleYInSize = scaleY; } } + this._buttonNormalRenderer.setPosition(this._contentSize.width / 2, this._contentSize.height / 2); }, - pressedTextureScaleChangedWithSize: function () { - if (this._ignoreSize) { + _pressedTextureScaleChangedWithSize: function () { + if (this._ignoreSize && !this._unifySize) { if (!this._scale9Enabled) { - this._buttonClickedRenderer.setScale(1.0); + this._buttonClickedRenderer.setScale(1); this._pressedTextureScaleXInSize = this._pressedTextureScaleYInSize = 1; } - } - else { + } else { if (this._scale9Enabled) { - this._buttonClickedRenderer.setPreferredSize(this._size); + this._buttonClickedRenderer.setPreferredSize(this._contentSize); this._pressedTextureScaleXInSize = this._pressedTextureScaleYInSize = 1; - } - else { + this._buttonClickedRenderer.setScale(this._pressedTextureScaleXInSize, this._pressedTextureScaleYInSize); + } else { var textureSize = this._pressedTextureSize; - if (textureSize.width <= 0.0 || textureSize.height <= 0.0) { - this._buttonClickedRenderer.setScale(1.0); + if (textureSize.width <= 0 || textureSize.height <= 0) { + this._buttonClickedRenderer.setScale(1); return; } - var scaleX = this._size.width / textureSize.width; - var scaleY = this._size.height / textureSize.height; + var scaleX = this._contentSize.width / textureSize.width; + var scaleY = this._contentSize.height / textureSize.height; this._buttonClickedRenderer.setScaleX(scaleX); this._buttonClickedRenderer.setScaleY(scaleY); this._pressedTextureScaleXInSize = scaleX; this._pressedTextureScaleYInSize = scaleY; } } + this._buttonClickedRenderer.setPosition(this._contentSize.width / 2, this._contentSize.height / 2); }, - disabledTextureScaleChangedWithSize: function () { - if (this._ignoreSize) { - if (!this._scale9Enabled) { - this._buttonDisableRenderer.setScale(1.0); - } - } - else { - if (this._scale9Enabled) { - this._buttonDisableRenderer.setPreferredSize(this._size); - } - else { + _disabledTextureScaleChangedWithSize: function () { + if(this._ignoreSize && !this._unifySize){ + if (this._scale9Enabled) + this._buttonDisableRenderer.setScale(1); + }else { + if (this._scale9Enabled){ + this._buttonDisableRenderer.setScale(1); + this._buttonDisableRenderer.setPreferredSize(this._contentSize); + }else{ var textureSize = this._disabledTextureSize; - if (textureSize.width <= 0.0 || textureSize.height <= 0.0) { - this._buttonDisableRenderer.setScale(1.0); + if (textureSize.width <= 0 || textureSize.height <= 0) { + this._buttonDisableRenderer.setScale(1); return; } - var scaleX = this._size.width / textureSize.width; - var scaleY = this._size.height / textureSize.height; + var scaleX = this._contentSize.width / textureSize.width; + var scaleY = this._contentSize.height / textureSize.height; this._buttonDisableRenderer.setScaleX(scaleX); this._buttonDisableRenderer.setScaleY(scaleY); } } + this._buttonDisableRenderer.setPosition(this._contentSize.width / 2, this._contentSize.height / 2); + }, + + _adaptRenderers: function(){ + if (this._normalTextureAdaptDirty) { + this._normalTextureScaleChangedWithSize(); + this._normalTextureAdaptDirty = false; + } + if (this._pressedTextureAdaptDirty) { + this._pressedTextureScaleChangedWithSize(); + this._pressedTextureAdaptDirty = false; + } + if (this._disabledTextureAdaptDirty) { + this._disabledTextureScaleChangedWithSize(); + this._disabledTextureAdaptDirty = false; + } + }, + + _updateTitleLocation: function(){ + this._titleRenderer.setPosition(this._contentSize.width * 0.5, this._contentSize.height * 0.5); }, /** @@ -675,15 +746,23 @@ ccui.Button = ccui.Widget.extend(/** @lends ccui.Button# */{ }, /** - * set title text + * Sets title text to ccui.Button * @param {String} text */ setTitleText: function (text) { + if(text === this.getTitleText()) + return; this._titleRenderer.setString(text); + if (this._ignoreSize){ + var s = this.getVirtualRendererSize(); + this.setContentSize(s); + }else{ + this._titleRenderer._renderCmd._updateTTF(); + } }, /** - * get title text + * Returns title text of ccui.Button * @returns {String} text */ getTitleText: function () { @@ -691,88 +770,113 @@ ccui.Button = ccui.Widget.extend(/** @lends ccui.Button# */{ }, /** - * set title color + * Sets title color to ccui.Button. * @param {cc.Color} color */ setTitleColor: function (color) { - this._titleColor.r = color.r; - this._titleColor.g = color.g; - this._titleColor.b = color.b; - this._titleRenderer.setColor(color); + this._titleRenderer.setFontFillColor(color); }, /** - * get title color + * Returns title color of ccui.Button * @returns {cc.Color} */ getTitleColor: function () { - return this._titleRenderer.getColor(); + return this._titleRenderer._getFillStyle(); }, /** - * set title fontSize + * Sets title fontSize to ccui.Button * @param {cc.Size} size */ setTitleFontSize: function (size) { this._titleRenderer.setFontSize(size); + this._fontSize = size; }, /** - * get title fontSize - * @returns {cc.Size} + * Returns title fontSize of ccui.Button. + * @returns {Number} */ getTitleFontSize: function () { return this._titleRenderer.getFontSize(); }, /** - * set title fontName + * When user pressed the button, the button will zoom to a scale. + * The final scale of the button equals (button original scale + _zoomScale) + * @since v3.2 + * @param scale + */ + setZoomScale: function(scale){ + this._zoomScale = scale; + }, + + /** + * Returns a zoom scale + * @since v3.2 + * @returns {number} + */ + getZoomScale: function(){ + return this._zoomScale; + }, + + /** + * Returns the normalize of texture size + * @since v3.3 + * @returns {cc.Size} + */ + getNormalTextureSize: function(){ + return this._normalTextureSize; + }, + + /** + * Sets title fontName to ccui.Button. * @param {String} fontName */ setTitleFontName: function (fontName) { this._titleRenderer.setFontName(fontName); + this._fontName = fontName; + }, + + /** + * Get the title renderer. + * title ttf object. + * @returns {cc.LabelTTF} + */ + getTitleRenderer: function(){ + return this._titleRenderer; }, /** - * get title fontName + * Gets title fontName of ccui.Button. * @returns {String} */ getTitleFontName: function () { return this._titleRenderer.getFontName(); }, - _setTitleFont: function (font) { - this._titleRenderer.font = font; - }, - _getTitleFont: function () { - return this._titleRenderer.font; - }, - - updateTextureColor: function () { - this.updateColorToRenderer(this._buttonNormalRenderer); - this.updateColorToRenderer(this._buttonClickedRenderer); - this.updateColorToRenderer(this._buttonDisableRenderer); + _setTitleFont: function (font) { + this._titleRenderer.font = font; }, - - updateTextureOpacity: function () { - this.updateOpacityToRenderer(this._buttonNormalRenderer); - this.updateOpacityToRenderer(this._buttonClickedRenderer); - this.updateOpacityToRenderer(this._buttonDisableRenderer); + _getTitleFont: function () { + return this._titleRenderer.font; }, /** * Returns the "class name" of widget. + * @override * @returns {string} */ getDescription: function () { return "Button"; }, - createCloneInstance:function(){ - return ccui.Button.create(); + _createCloneInstance: function () { + return new ccui.Button(); }, - copySpecialProperties:function(uiButton){ + _copySpecialProperties: function (uiButton) { this._prevIgnoreSize = uiButton._prevIgnoreSize; this.setScale9Enabled(uiButton._scale9Enabled); this.loadTextureNormal(uiButton._normalFileName, uiButton._normalTexType); @@ -786,11 +890,30 @@ ccui.Button = ccui.Widget.extend(/** @lends ccui.Button# */{ this.setTitleFontSize(uiButton.getTitleFontSize()); this.setTitleColor(uiButton.getTitleColor()); this.setPressedActionEnabled(uiButton.pressedActionEnabled); - } + this.setZoomScale(uiButton._zoomScale); + }, + + setColor: function(color){ + cc.ProtectedNode.prototype.setColor.call(this, color); + this._updateTexturesRGBA(); + }, + + _getNormalSize: function(){ + var titleSize; + if (this._titleRenderer !== null) + titleSize = this._titleRenderer.getContentSize(); + var imageSize; + if (this._buttonNormalRenderer !== null) + imageSize = this._buttonNormalRenderer.getContentSize(); + var width = titleSize.width > imageSize.width ? titleSize.width : imageSize.width; + var height = titleSize.height > imageSize.height ? titleSize.height : imageSize.height; + + return cc.size(width,height); + } }); -window._p = ccui.Button.prototype; +var _p = ccui.Button.prototype; // Extended properties /** @expose */ @@ -809,26 +932,56 @@ cc.defineGetterSetter(_p, "titleFontName", _p.getTitleFontName, _p.setTitleFontN _p.titleColor; cc.defineGetterSetter(_p, "titleColor", _p.getTitleColor, _p.setTitleColor); -delete window._p; +_p = null; /** * allocates and initializes a UIButton. - * @constructs + * @deprecated since v3.0, please use new ccui.Button() instead. + * @param {string} [normalImage] normal state texture name + * @param {string} [selectedImage] selected state texture name + * @param {string} [disableImage] disabled state texture name + * @param {string} [texType] * @return {ccui.Button} - * @example - * // example - * var uiButton = ccui.Button.create(); */ -ccui.Button.create = function () { - var uiButton = new ccui.Button(); - if (uiButton && uiButton.init()) { - return uiButton; - } - return null; +ccui.Button.create = function (normalImage, selectedImage, disableImage, texType) { + return new ccui.Button(normalImage, selectedImage, disableImage, texType); }; // Constants +/** + * The normal renderer's zOrder value of ccui.Button. + * @constant + * @type {number} + */ ccui.Button.NORMAL_RENDERER_ZORDER = -2; +/** + * The pressed renderer's zOrder value ccui.Button. + * @constant + * @type {number} + */ ccui.Button.PRESSED_RENDERER_ZORDER = -2; +/** + * The disabled renderer's zOrder value of ccui.Button. + * @constant + * @type {number} + */ ccui.Button.DISABLED_RENDERER_ZORDER = -2; +/** + * The title renderer's zOrder value of ccui.Button. + * @constant + * @type {number} + */ ccui.Button.TITLE_RENDERER_ZORDER = -1; + +/** + * the zoom action time step of ccui.Button + * @constant + * @type {number} + */ +ccui.Button.ZOOM_ACTION_TIME_STEP = 0.05; + +/** + * @ignore + */ +ccui.Button.SYSTEM = 0; +ccui.Button.TTF = 1; diff --git a/extensions/ccui/uiwidgets/UICheckBox.js b/extensions/ccui/uiwidgets/UICheckBox.js index 859adcf853..dc4b3ed922 100644 --- a/extensions/ccui/uiwidgets/UICheckBox.js +++ b/extensions/ccui/uiwidgets/UICheckBox.js @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,7 +24,7 @@ ****************************************************************************/ /** - * Base class for ccui.CheckBox + * The CheckBox control of Cocos UI. * @class * @extends ccui.Widget * @@ -35,65 +36,112 @@ ccui.CheckBox = ccui.Widget.extend(/** @lends ccui.CheckBox# */{ _frontCrossRenderer: null, _backGroundBoxDisabledRenderer: null, _frontCrossDisabledRenderer: null, + _isSelected: true, + _checkBoxEventListener: null, - _checkBoxEventSelector: null, - _backGroundTexType: null, - _backGroundSelectedTexType: null, - _frontCrossTexType: null, - _backGroundDisabledTexType: null, - _frontCrossDisabledTexType: null, + _checkBoxEventSelector:null, + + _backGroundTexType: ccui.Widget.LOCAL_TEXTURE, + _backGroundSelectedTexType: ccui.Widget.LOCAL_TEXTURE, + _frontCrossTexType: ccui.Widget.LOCAL_TEXTURE, + _backGroundDisabledTexType: ccui.Widget.LOCAL_TEXTURE, + _frontCrossDisabledTexType: ccui.Widget.LOCAL_TEXTURE, + _backGroundFileName: "", _backGroundSelectedFileName: "", _frontCrossFileName: "", _backGroundDisabledFileName: "", _frontCrossDisabledFileName: "", - _className:"CheckBox", - ctor: function () { + _className: "CheckBox", + + _zoomScale: 0.1, + _backgroundTextureScaleX: 0.1, + _backgroundTextureScaleY: 0.1, + + _backGroundBoxRendererAdaptDirty:true, + _backGroundSelectedBoxRendererAdaptDirty:true, + _frontCrossRendererAdaptDirty: true, + _backGroundBoxDisabledRendererAdaptDirty: true, + _frontCrossDisabledRendererAdaptDirty: true, + + /** + * allocates and initializes a UICheckBox. + * Constructor of ccui.CheckBox, override it to extend the construction behavior, remember to call "this._super()" in the extended "ctor" function. + * @param {String} backGround + * @param {String} backGroundSelected + * @param {String} cross + * @param {String} backGroundDisabled + * @param {String} frontCrossDisabled + * @param {Number} [texType=ccui.Widget.LOCAL_TEXTURE] + * @example + * // example + * var uiCheckBox = new ccui.CheckBox(); + */ + ctor: function (backGround, backGroundSelected,cross,backGroundDisabled,frontCrossDisabled,texType) { ccui.Widget.prototype.ctor.call(this); - this._backGroundBoxRenderer = null; - this._backGroundSelectedBoxRenderer = null; - this._frontCrossRenderer = null; - this._backGroundBoxDisabledRenderer = null; - this._frontCrossDisabledRenderer = null; - this._isSelected = true; - this._checkBoxEventListener = null; - this._checkBoxEventSelector = null; - this._backGroundTexType = ccui.Widget.LOCAL_TEXTURE; - this._backGroundSelectedTexType = ccui.Widget.LOCAL_TEXTURE; - this._frontCrossTexType = ccui.Widget.LOCAL_TEXTURE; - this._backGroundDisabledTexType = ccui.Widget.LOCAL_TEXTURE; - this._frontCrossDisabledTexType = ccui.Widget.LOCAL_TEXTURE; - this._backGroundFileName = ""; - this._backGroundSelectedFileName = ""; - this._frontCrossFileName = ""; - this._backGroundDisabledFileName = ""; - this._frontCrossDisabledFileName = ""; - }, - init: function () { + this.setTouchEnabled(true); + var strNum = 0; + for(var i=0; i
* LoadingBarTypeLeft means progress left to right, LoadingBarTypeRight otherwise. * @param {ccui.LoadingBar.TYPE_LEFT | ccui.LoadingBar.TYPE_RIGHT} dir */ setDirection: function (dir) { - if (this._barType == dir) { + if (this._direction === dir) return; - } - this._barType = dir; - - switch (this._barType) { + this._direction = dir; + switch (this._direction) { case ccui.LoadingBar.TYPE_LEFT: - this._barRenderer.setAnchorPoint(0.0, 0.5); - this._barRenderer.setPosition(-this._totalLength * 0.5, 0.0); - if (!this._scale9Enabled) { + this._barRenderer.setAnchorPoint(0, 0.5); + this._barRenderer.setPosition(0, this._contentSize.height*0.5); + if (!this._scale9Enabled) this._barRenderer.setFlippedX(false); - } break; case ccui.LoadingBar.TYPE_RIGHT: - this._barRenderer.setAnchorPoint(1.0, 0.5); - this._barRenderer.setPosition(this._totalLength * 0.5, 0.0); - if (!this._scale9Enabled) { + this._barRenderer.setAnchorPoint(1, 0.5); + this._barRenderer.setPosition(this._totalLength,this._contentSize.height*0.5); + if (!this._scale9Enabled) this._barRenderer.setFlippedX(true); - } break; } }, /** - * Gets the progress direction of loadingbar. + * Returns the progress direction of LoadingBar.
* LoadingBarTypeLeft means progress left to right, LoadingBarTypeRight otherwise. * @returns {ccui.LoadingBar.TYPE_LEFT | ccui.LoadingBar.TYPE_RIGHT} */ getDirection: function () { - return this._barType; + return this._direction; }, /** - * Load texture for loadingbar. + * Loads texture for LoadingBar. * @param {String} texture * @param {ccui.Widget.LOCAL_TEXTURE|ccui.Widget.PLIST_TEXTURE} texType */ loadTexture: function (texture, texType) { - if (!texture) { + if (!texture) return; - } texType = texType || ccui.Widget.LOCAL_TEXTURE; this._renderBarTexType = texType; this._textureFile = texture; var barRenderer = this._barRenderer; + + var self = this; + if(!barRenderer._textureLoaded){ + barRenderer.addEventListener("load", function(){ + self.loadTexture(self._textureFile, self._renderBarTexType); + self._setPercent(self._percent); + }); + } + switch (this._renderBarTexType) { case ccui.Widget.LOCAL_TEXTURE: - if(this._scale9Enabled) - barRenderer.initWithFile(texture); - else - barRenderer.init(texture); + barRenderer.initWithFile(texture); break; case ccui.Widget.PLIST_TEXTURE: barRenderer.initWithSpriteFrameName(texture); @@ -127,156 +139,163 @@ ccui.LoadingBar = ccui.Widget.extend(/** @lends ccui.LoadingBar# */{ default: break; } - if (this._scale9Enabled){ - barRenderer.setCapInsets(this._capInsets); - } - this.updateColorToRenderer(barRenderer); - - var textLoaded = barRenderer.textureLoaded(); - this._isTextureLoaded = textLoaded; - if (!textLoaded) { - this._barRendererTextureSize.width = this._customSize.width; - this._barRendererTextureSize.height = this._customSize.height; - barRenderer.addLoadedEventListener(function () { - this._isTextureLoaded = true; - if (barRenderer.setCapInsets) { - barRenderer.setCapInsets(this._capInsets); - } - var locSize = barRenderer.getContentSize(); - this._barRendererTextureSize.width = locSize.width; - this._barRendererTextureSize.height = locSize.height; - this.barRendererScaleChangedWithSize(); - this.setPercent(this._percent); - }, this); - } else { - var locBarSize = barRenderer.getContentSize(); - this._barRendererTextureSize.width = locBarSize.width; - this._barRendererTextureSize.height = locBarSize.height; - } - switch (this._barType) { + var bz = barRenderer.getContentSize(); + this._barRendererTextureSize.width = bz.width; + this._barRendererTextureSize.height = bz.height; + + switch (this._direction) { case ccui.LoadingBar.TYPE_LEFT: - barRenderer.setAnchorPoint(0.0, 0.5); - if (!this._scale9Enabled) { + barRenderer.setAnchorPoint(0,0.5); + if (!this._scale9Enabled) barRenderer.setFlippedX(false); - } break; case ccui.LoadingBar.TYPE_RIGHT: - barRenderer.setAnchorPoint(1.0, 0.5); - if (!this._scale9Enabled) { + barRenderer.setAnchorPoint(1,0.5); + if (!this._scale9Enabled) barRenderer.setFlippedX(true); - } break; } - this.barRendererScaleChangedWithSize(); + if (this._scale9Enabled) + barRenderer.setCapInsets(this._capInsets); + + this._updateChildrenDisplayedRGBA(); + this._barRendererScaleChangedWithSize(); + this._updateContentSizeWithTextureSize(this._barRendererTextureSize); + this._barRendererAdaptDirty = true; + this._findLayout(); }, /** - * Sets if loadingbar is using scale9 renderer. + * Sets if LoadingBar is using scale9 renderer. * @param {Boolean} enabled */ setScale9Enabled: function (enabled) { - if (this._scale9Enabled == enabled) { + //todo use setScale9Enabled + if (this._scale9Enabled === enabled) return; - } this._scale9Enabled = enabled; - cc.Node.prototype.removeChild.call(this, this._barRenderer, true); - this._barRenderer = null; - if (this._scale9Enabled) { - this._barRenderer = cc.Scale9Sprite.create(); - } - else { - this._barRenderer = cc.Sprite.create(); - } + this.removeProtectedChild(this._barRenderer); + + this._barRenderer = this._scale9Enabled ? new ccui.Scale9Sprite() : new cc.Sprite(); + this.loadTexture(this._textureFile, this._renderBarTexType); - cc.Node.prototype.addChild.call(this, this._barRenderer, ccui.LoadingBar.RENDERER_ZORDER, -1); + this.addProtectedChild(this._barRenderer, ccui.LoadingBar.RENDERER_ZORDER, -1); if (this._scale9Enabled) { var ignoreBefore = this._ignoreSize; this.ignoreContentAdaptWithSize(false); this._prevIgnoreSize = ignoreBefore; - } - else { + } else this.ignoreContentAdaptWithSize(this._prevIgnoreSize); - } this.setCapInsets(this._capInsets); this.setPercent(this._percent); + this._barRendererAdaptDirty = true; }, /** - * Get loadingBar is using scale9 renderer or not.. + * Returns LoadingBar is using scale9 renderer or not.. * @returns {Boolean} */ - isScale9Enabled:function(){ + isScale9Enabled: function () { return this._scale9Enabled; }, /** - * Sets capinsets for loadingbar, if loadingbar is using scale9 renderer. + * Sets capinsets for LoadingBar, if LoadingBar is using scale9 renderer. * @param {cc.Rect} capInsets */ setCapInsets: function (capInsets) { - this._capInsets = capInsets; - if (!this._scale9Enabled) { + if(!capInsets) return; - } - this._barRenderer.setCapInsets(capInsets); + var locInsets = this._capInsets; + locInsets.x = capInsets.x; + locInsets.y = capInsets.y; + locInsets.width = capInsets.width; + locInsets.height = capInsets.height; + + if (this._scale9Enabled) + this._barRenderer.setCapInsets(capInsets); }, /** - * Get cap insets for loadingBar. + * Returns cap insets for loadingBar. * @returns {cc.Rect} */ - getCapInsets:function(){ - return this._capInsets; + getCapInsets: function () { + return cc.rect(this._capInsets); }, /** - * The current progress of loadingbar - * @param {number} percent + * The current progress of loadingBar + * @param {number} percent percent value from 1 to 100. */ setPercent: function (percent) { - if (percent < 0 || percent > 100) { - return; - } - if (this._totalLength <= 0) { + if(percent > 100) + percent = 100; + if(percent < 0) + percent = 0; + if (percent === this._percent) return; - } this._percent = percent; - if(!this._isTextureLoaded){ + this._setPercent(percent); + }, + + _setPercent: function(percent){ + if (this._totalLength <= 0) return; - } var res = this._percent / 100.0; - var x = 0, y = 0; - if(this._renderBarTexType==ccui.Widget.PLIST_TEXTURE){ - var barNode = this._barRenderer; - if (barNode) { - var to = barNode.getTextureRect()._origin; - x = to.x; - y = to.y; - } - } if (this._scale9Enabled) - this.setScale9Scale(); - else - this._barRenderer.setTextureRect(cc.rect(x, y, this._barRendererTextureSize.width * res, this._barRendererTextureSize.height)); + this._setScale9Scale(); + else { + var spriteRenderer = this._barRenderer; + var rect = spriteRenderer.getTextureRect(); + rect.width = this._barRendererTextureSize.width * res; + this._barRenderer.setTextureRect( + cc.rect( + rect.x, + rect.y, + this._barRendererTextureSize.width * res, + this._barRendererTextureSize.height + ) + ); + } }, /** - * Gets the progress direction of loadingbar. - * @returns {number} + * Sets the contentSize of ccui.LoadingBar + * @override + * @param {Number|cc.Size} contentSize + * @param {Number} [height] + */ + setContentSize: function(contentSize, height){ + ccui.Widget.prototype.setContentSize.call(this, contentSize, height); + this._totalLength = (height === undefined) ? contentSize.width : contentSize; + }, + + /** + * Returns the progress direction of LoadingBar. + * @returns {number} percent value from 1 to 100. */ getPercent: function () { return this._percent; }, - onSizeChanged: function () { - ccui.Widget.prototype.onSizeChanged.call(this); - this.barRendererScaleChangedWithSize(); + _onSizeChanged: function () { + ccui.Widget.prototype._onSizeChanged.call(this); + this._barRendererAdaptDirty = true; + }, + + _adaptRenderers: function(){ + if (this._barRendererAdaptDirty){ + this._barRendererScaleChangedWithSize(); + this._barRendererAdaptDirty = false; + } }, /** - * override "ignoreContentAdaptWithSize" method of widget. + * Ignore the LoadingBar's custom size, if ignore is true that LoadingBar will ignore it's custom size, use renderer's content size, false otherwise. + * @override * @param {Boolean}ignore */ ignoreContentAdaptWithSize: function (ignore) { @@ -287,76 +306,64 @@ ccui.LoadingBar = ccui.Widget.extend(/** @lends ccui.LoadingBar# */{ }, /** - * override "getContentSize" method of widget. - * @returns {cc.Size} + * Returns the texture size of renderer. + * @returns {cc.Size|*} */ - getContentSize: function () { - return this._barRendererTextureSize; + getVirtualRendererSize:function(){ + return cc.size(this._barRendererTextureSize); }, - _getWidth: function () { - return this._barRendererTextureSize.width; - }, - _getHeight: function () { - return this._barRendererTextureSize.height; - }, /** - * override "getContentSize" method of widget. + * Returns the renderer of ccui.LoadingBar + * @override * @returns {cc.Node} */ getVirtualRenderer: function () { return this._barRenderer; }, - barRendererScaleChangedWithSize: function () { - if (this._ignoreSize) { + _barRendererScaleChangedWithSize: function () { + var locBarRender = this._barRenderer, locContentSize = this._contentSize; + if(this._unifySize){ + this._totalLength = this._contentSize.width; + this.setPercent(this._percent); + }else if (this._ignoreSize) { if (!this._scale9Enabled) { this._totalLength = this._barRendererTextureSize.width; - this._barRenderer.setScale(1.0); - this._size.width = this._barRendererTextureSize.width; + locBarRender.setScale(1.0); } - } - else { - this._totalLength = this._size.width; - if (this._scale9Enabled) { - this.setScale9Scale(); - } - else { - + } else { + this._totalLength = locContentSize.width; + if (this._scale9Enabled){ + this._setScale9Scale(); + locBarRender.setScale(1.0); + } else { var textureSize = this._barRendererTextureSize; if (textureSize.width <= 0.0 || textureSize.height <= 0.0) { - this._barRenderer.setScale(1.0); + locBarRender.setScale(1.0); return; } - var scaleX = this._size.width / textureSize.width; - var scaleY = this._size.height / textureSize.height; - this._barRenderer.setScaleX(scaleX); - this._barRenderer.setScaleY(scaleY); + var scaleX = locContentSize.width / textureSize.width; + var scaleY = locContentSize.height / textureSize.height; + locBarRender.setScaleX(scaleX); + locBarRender.setScaleY(scaleY); } } - switch (this._barType) { + switch (this._direction) { case ccui.LoadingBar.TYPE_LEFT: - this._barRenderer.setPosition(-this._totalLength * 0.5, 0.0); + locBarRender.setPosition(0, locContentSize.height * 0.5); break; case ccui.LoadingBar.TYPE_RIGHT: - this._barRenderer.setPosition(this._totalLength * 0.5, 0.0); + locBarRender.setPosition(this._totalLength, locContentSize.height * 0.5); break; default: break; } }, - setScale9Scale: function () { + _setScale9Scale: function () { var width = (this._percent) / 100 * this._totalLength; - this._barRenderer.setPreferredSize(cc.size(width, this._size.height)); - }, - - updateTextureColor: function () { - this.updateColorToRenderer(this._barRenderer); - }, - - updateTextureOpacity: function () { - this.updateOpacityToRenderer(this._barRenderer); + this._barRenderer.setPreferredSize(cc.size(width, this._contentSize.height)); }, /** @@ -367,21 +374,23 @@ ccui.LoadingBar = ccui.Widget.extend(/** @lends ccui.LoadingBar# */{ return "LoadingBar"; }, - createCloneInstance: function () { - return ccui.LoadingBar.create(); + _createCloneInstance: function () { + return new ccui.LoadingBar(); }, - copySpecialProperties: function (loadingBar) { - this._prevIgnoreSize = loadingBar._prevIgnoreSize; - this.setScale9Enabled(loadingBar._scale9Enabled); - this.loadTexture(loadingBar._textureFile, loadingBar._renderBarTexType); - this.setCapInsets(loadingBar._capInsets); - this.setPercent(loadingBar._percent); - this.setDirection(loadingBar._barType); + _copySpecialProperties: function (loadingBar) { + if(loadingBar instanceof ccui.LoadingBar){ + this._prevIgnoreSize = loadingBar._prevIgnoreSize; + this.setScale9Enabled(loadingBar._scale9Enabled); + this.loadTexture(loadingBar._textureFile, loadingBar._renderBarTexType); + this.setCapInsets(loadingBar._capInsets); + this.setPercent(loadingBar._percent); + this.setDirection(loadingBar._direction); + } } }); -window._p = ccui.LoadingBar.prototype; +var _p = ccui.LoadingBar.prototype; // Extended properties /** @expose */ @@ -391,27 +400,38 @@ cc.defineGetterSetter(_p, "direction", _p.getDirection, _p.setDirection); _p.percent; cc.defineGetterSetter(_p, "percent", _p.getPercent, _p.setPercent); -delete window._p; +_p = null; /** - * allocates and initializes a UILoadingBar. - * @constructs + * Allocates and initializes a UILoadingBar. + * @deprecated since v3.0, please use new ccui.LoadingBar() instead. + * @param {string} textureName + * @param {Number} percentage * @return {ccui.LoadingBar} - * @example - * // example - * var uiLoadingBar = ccui.LoadingBar.create(); */ -ccui.LoadingBar.create = function () { - var uiLoadingBar = new ccui.LoadingBar(); - if (uiLoadingBar && uiLoadingBar.init()) { - return uiLoadingBar; - } - return null; +ccui.LoadingBar.create = function (textureName, percentage) { + return new ccui.LoadingBar(textureName, percentage); }; // Constants //loadingBar Type + +/** + * The left direction of ccui.LoadingBar. + * @constant + * @type {number} + */ ccui.LoadingBar.TYPE_LEFT = 0; +/** + * The right direction of ccui.LoadingBar. + * @constant + * @type {number} + */ ccui.LoadingBar.TYPE_RIGHT = 1; +/** + * The zOrder value of ccui.LoadingBar's renderer. + * @constant + * @type {number} + */ ccui.LoadingBar.RENDERER_ZORDER = -1; \ No newline at end of file diff --git a/extensions/ccui/uiwidgets/UIRichText.js b/extensions/ccui/uiwidgets/UIRichText.js index a3b15e9df5..a92b642063 100644 --- a/extensions/ccui/uiwidgets/UIRichText.js +++ b/extensions/ccui/uiwidgets/UIRichText.js @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,53 +24,117 @@ ****************************************************************************/ /** - * Base class for ccui.RichElement + * ccui.RichElement is the base class of RichElementText, RichElementImage etc. It has type, tag, color and opacity attributes. * @class * @extends ccui.Class */ ccui.RichElement = ccui.Class.extend(/** @lends ccui.RichElement# */{ - type: 0, - tag: 0, - color: null, + _type: 0, + _tag: 0, + _color: null, + _opacity:0, + /** + * Constructor of ccui.RichElement + */ ctor: function () { - this.tag = 0; - this.color = cc.color(255, 255, 255, 255); + this._type = 0; + this._tag = 0; + this._color = cc.color(255, 255, 255, 255); }, + + /** + * Initializes a richElement. + * @param {Number} tag + * @param {cc.Color} color + * @param {Number} opacity + */ init: function (tag, color, opacity) { - this.tag = tag; - this.color.r = color.r; - this.color.g = color.g; - this.color.b = color.b; - this.color.a = opacity; + this._tag = tag; + this._color.r = color.r; + this._color.g = color.g; + this._color.b = color.b; + this._opacity = opacity; + if(opacity === undefined) + this._color.a = color.a; + else + this._color.a = opacity; } }); /** - * Base class for ccui.RichElementText + * The text element for RichText, it has text, fontName, fontSize attributes. * @class * @extends ccui.RichElement */ ccui.RichElementText = ccui.RichElement.extend(/** @lends ccui.RichElementText# */{ - text: "", - fontName: "", - fontSize: 0, - ctor: function () { + _text: "", + _fontName: "", + _fontSize: 0, + /** @type cc.FontDefinition */ + _fontDefinition: null, + /** + * Usage Example using FontDefinition: + * + * var rtEl = new ccui.RichElementText("tag", new cc.FontDefinition({ + * fillStyle: cc.color.BLACK, + * fontName: "Arial", + * fontSize: 12, + * fontWeight: "bold", + * fontStyle: "normal", + * lineHeight: 14 + * }), 255, "Some Text"); + * + * Constructor of ccui.RichElementText + * @param {Number} tag + * @param {cc.Color|cc.FontDefinition} colorOrFontDef + * @param {Number} opacity + * @param {String} text + * @param {String} fontName + * @param {Number} fontSize + */ + ctor: function (tag, colorOrFontDef, opacity, text, fontName, fontSize) { ccui.RichElement.prototype.ctor.call(this); - this.type = ccui.RichElement.TYPE_TEXT; - this.text = ""; - this.fontName = ""; - this.fontSize = 0; + this._type = ccui.RichElement.TEXT; + this._text = ""; + this._fontName = ""; + this._fontSize = 0; + + if( colorOrFontDef && colorOrFontDef instanceof cc.FontDefinition) + this.initWithStringAndTextDefinition(tag, text, colorOrFontDef, opacity); + else + fontSize && this.init(tag, colorOrFontDef, opacity, text, fontName, fontSize); }, + + /** + * Initializes a ccui.RichElementText. + * @param {Number} tag + * @param {cc.Color} color + * @param {Number} opacity + * @param {String} text + * @param {String} fontName + * @param {Number} fontSize + * @override + */ init: function (tag, color, opacity, text, fontName, fontSize) { ccui.RichElement.prototype.init.call(this, tag, color, opacity); - this.text = text; - this.fontName = fontName; - this.fontSize = fontSize; + this._text = text; + this._fontName = fontName; + this._fontSize = fontSize; + }, + initWithStringAndTextDefinition: function(tag, text, fontDef, opacity){ + + ccui.RichElement.prototype.init.call(this, tag, fontDef.fillStyle, opacity); + this._fontDefinition = fontDef; + this._text = text; + this._fontName = fontDef.fontName; + this._fontSize = fontDef.fontSize; + } }); /** * Create a richElementText + * @deprecated since v3.0, please use new ccui.RichElementText() instead. * @param {Number} tag * @param {cc.Color} color * @param {Number} opacity @@ -79,81 +144,115 @@ ccui.RichElementText = ccui.RichElement.extend(/** @lends ccui.RichElementText# * @returns {ccui.RichElementText} */ ccui.RichElementText.create = function (tag, color, opacity, text, fontName, fontSize) { - var element = new ccui.RichElementText(); - element.init(tag, color, opacity, text, fontName, fontSize); - return element; + return new ccui.RichElementText(tag, color, opacity, text, fontName, fontSize); }; /** - * Base class for ccui.RichElementImage + * The image element for RichText, it has filePath, textureRect, textureType attributes. * @class * @extends ccui.RichElement */ ccui.RichElementImage = ccui.RichElement.extend(/** @lends ccui.RichElementImage# */{ - filePath: "", - textureRect: null, - textureType: 0, - ctor: function () { + _filePath: "", + _textureRect: null, + _textureType: 0, + + /** + * Constructor of ccui.RichElementImage + * @param {Number} tag + * @param {cc.Color} color + * @param {Number} opacity + * @param {String} filePath + */ + ctor: function (tag, color, opacity, filePath) { ccui.RichElement.prototype.ctor.call(this); - this.type = ccui.RichElement.TYPE_IMAGE; - this.filePath = ""; - this.textureRect = cc.rect(0, 0, 0, 0); - this.textureType = 0; + this._type = ccui.RichElement.IMAGE; + this._filePath = ""; + this._textureRect = cc.rect(0, 0, 0, 0); + this._textureType = 0; + + filePath !== undefined && this.init(tag, color, opacity, filePath); }, + + /** + * Initializes a ccui.RichElementImage + * @param {Number} tag + * @param {cc.Color} color + * @param {Number} opacity + * @param {String} filePath + * @override + */ init: function (tag, color, opacity, filePath) { ccui.RichElement.prototype.init.call(this, tag, color, opacity); - this.filePath = filePath; + this._filePath = filePath; } }); /** * Create a richElementImage + * @deprecated since v3.0, please use new ccui.RichElementImage() instead. * @param {Number} tag * @param {cc.Color} color * @param {Number} opacity * @param {String} filePath - * @returns {ccui.RichElementText} + * @returns {ccui.RichElementImage} */ ccui.RichElementImage.create = function (tag, color, opacity, filePath) { - var element = new ccui.RichElementImage(); - element.init(tag, color, opacity, filePath); - return element; + return new ccui.RichElementImage(tag, color, opacity, filePath); }; /** - * Base class for ccui.RichElementCustomNode + * The custom node element for RichText. * @class * @extends ccui.RichElement */ ccui.RichElementCustomNode = ccui.RichElement.extend(/** @lends ccui.RichElementCustomNode# */{ - customNode: null, - ctor: function () { + _customNode: null, + + /** + * Constructor of ccui.RichElementCustomNode + * @param {Number} tag + * @param {cc.Color} color + * @param {Number} opacity + * @param {cc.Node} customNode + */ + ctor: function (tag, color, opacity, customNode) { ccui.RichElement.prototype.ctor.call(this); - this.type = ccui.RichElement.TYPE_CUSTOM; - this.customNode = null; + this._type = ccui.RichElement.CUSTOM; + this._customNode = null; + + customNode !== undefined && this.init(tag, color, opacity, customNode); }, + + /** + * Initializes a ccui.RichElementCustomNode + * @param {Number} tag + * @param {cc.Color} color + * @param {Number} opacity + * @param {cc.Node} customNode + * @override + */ init: function (tag, color, opacity, customNode) { ccui.RichElement.prototype.init.call(this, tag, color, opacity); - this.customNode = customNode; + this._customNode = customNode; } }); /** * Create a richElementCustomNode + * @deprecated since v3.0, please use new ccui.RichElementCustomNode() instead. * @param {Number} tag * @param {Number} color * @param {Number} opacity * @param {cc.Node} customNode - * @returns {RichElementText} + * @returns {ccui.RichElementCustomNode} */ ccui.RichElementCustomNode.create = function (tag, color, opacity, customNode) { - var element = new ccui.RichElementCustomNode(); - element.init(tag, color, opacity, customNode); - return element; + return new ccui.RichElementCustomNode(tag, color, opacity, customNode); }; /** - * Base class for ccui.RichText + * The rich text control of Cocos UI. It receives text, image, and custom node as its children to display. * @class * @extends ccui.Widget */ @@ -164,7 +263,16 @@ ccui.RichText = ccui.Widget.extend(/** @lends ccui.RichText# */{ _leftSpaceWidth: 0, _verticalSpace: 0, _elementRenderersContainer: null, + _lineBreakOnSpace: false, + _textHorizontalAlignment: null, + _textVerticalAlignment: null, + /** + * create a rich text + * Constructor of ccui.RichText. override it to extend the construction behavior, remember to call "this._super()" in the extended "ctor" function. + * @example + * var uiRichText = new ccui.RichTex(); + */ ctor: function () { ccui.Widget.prototype.ctor.call(this); this._formatTextDirty = false; @@ -172,13 +280,14 @@ ccui.RichText = ccui.Widget.extend(/** @lends ccui.RichText# */{ this._elementRenders = []; this._leftSpaceWidth = 0; this._verticalSpace = 0; - this._elementRenderersContainer = null; + this._textHorizontalAlignment = cc.TEXT_ALIGNMENT_LEFT; + this._textVerticalAlignment = cc.VERTICAL_TEXT_ALIGNMENT_TOP; }, - initRenderer: function () { - this._elementRenderersContainer = cc.Node.create(); - this._elementRenderersContainer.setAnchorPoint(cc.p(0.5, 0.5)); - cc.Node.prototype.addChild.call(this,this._elementRenderersContainer, 0, -1); + _initRenderer: function () { + this._elementRenderersContainer = new cc.Node(); + this._elementRenderersContainer.setAnchorPoint(0.5, 0.5); + this.addProtectedChild(this._elementRenderersContainer, 0, -1); }, /** @@ -205,53 +314,62 @@ ccui.RichText = ccui.Widget.extend(/** @lends ccui.RichText# */{ * @param {ccui.RichElement} element */ removeElement: function (element) { - if (typeof element === "number") { + if (cc.isNumber(element)) this._richElements.splice(element, 1); - } else { + else cc.arrayRemoveObject(this._richElements, element); - } this._formatTextDirty = true; }, + /** + * Formats the richText's content. + */ formatText: function () { if (this._formatTextDirty) { this._elementRenderersContainer.removeAllChildren(); this._elementRenders.length = 0; + var i, element, locRichElements = this._richElements; if (this._ignoreSize) { - this.addNewLine(); - for (var i = 0; i < this._richElements.length; i++) { - var element = this._richElements[i]; + this._addNewLine(); + for (i = 0; i < locRichElements.length; i++) { + element = locRichElements[i]; var elementRenderer = null; - switch (element.type) { - case ccui.RichElement.TYPE_TEXT: - elementRenderer = cc.LabelTTF.create(element.text, element.fontName, element.fontSize); + switch (element._type) { + case ccui.RichElement.TEXT: + if( element._fontDefinition) + elementRenderer = new cc.LabelTTF(element._text, element._fontDefinition); + else //todo: There may be ambiguous + elementRenderer = new cc.LabelTTF(element._text, element._fontName, element._fontSize); break; - case ccui.RichElement.TYPE_IMAGE: - elementRenderer = cc.Sprite.create(element.filePath); + case ccui.RichElement.IMAGE: + elementRenderer = new cc.Sprite(element._filePath); break; - case ccui.RichElement.TYPE_CUSTOM: - elementRenderer = element.customNode; + case ccui.RichElement.CUSTOM: + elementRenderer = element._customNode; break; default: break; } - elementRenderer.setColor(element.color); - this.pushToContainer(elementRenderer); + elementRenderer.setColor(element._color); + elementRenderer.setOpacity(element._color.a); + this._pushToContainer(elementRenderer); } - } - else { - this.addNewLine(); - for (var i = 0; i < this._richElements.length; i++) { - var element = this._richElements[i]; - switch (element.type) { - case ccui.RichElement.TYPE_TEXT: - this.handleTextRenderer(element.text, element.fontName, element.fontSize, element.color); + } else { + this._addNewLine(); + for (i = 0; i < locRichElements.length; i++) { + element = locRichElements[i]; + switch (element._type) { + case ccui.RichElement.TEXT: + if( element._fontDefinition) + this._handleTextRenderer(element._text, element._fontDefinition, element._fontDefinition.fontSize, element._fontDefinition.fillStyle); + else + this._handleTextRenderer(element._text, element._fontName, element._fontSize, element._color); break; - case ccui.RichElement.TYPE_IMAGE: - this.handleImageRenderer(element.filePath, element.color); + case ccui.RichElement.IMAGE: + this._handleImageRenderer(element._filePath, element._color, element._color.a); break; - case ccui.RichElement.TYPE_CUSTOM: - this.handleCustomRenderer(element.customNode); + case ccui.RichElement.CUSTOM: + this._handleCustomRenderer(element._customNode); break; default: break; @@ -262,16 +380,24 @@ ccui.RichText = ccui.Widget.extend(/** @lends ccui.RichText# */{ this._formatTextDirty = false; } }, - /** - * Handle text renderer + * Prepare the child LabelTTF based on line breaking * @param {String} text - * @param {String} fontName + * @param {String|cc.FontDefinition} fontNameOrFontDef * @param {Number} fontSize * @param {cc.Color} color + * @private */ - handleTextRenderer: function (text, fontName, fontSize, color) { - var textRenderer = cc.LabelTTF.create(text, fontName, fontSize); + _handleTextRenderer: function (text, fontNameOrFontDef, fontSize, color) { + if(text === "") + return; + + if(text === "\n"){ //Force Line Breaking + this._addNewLine(); + return; + } + + var textRenderer = fontNameOrFontDef instanceof cc.FontDefinition ? new cc.LabelTTF(text, fontNameOrFontDef) : new cc.LabelTTF(text, fontNameOrFontDef, fontSize); var textRendererWidth = textRenderer.getContentSize().width; this._leftSpaceWidth -= textRendererWidth; if (this._leftSpaceWidth < 0) { @@ -281,137 +407,180 @@ ccui.RichText = ccui.Widget.extend(/** @lends ccui.RichText# */{ var leftLength = stringLength * (1 - overstepPercent); var leftWords = curText.substr(0, leftLength); var cutWords = curText.substr(leftLength, curText.length - 1); - if (leftLength > 0) { - var leftRenderer = cc.LabelTTF.create(leftWords.substr(0, leftLength), fontName, fontSize); - leftRenderer.setColor(color); - this.pushToContainer(leftRenderer); + var validLeftLength = leftLength > 0; + + if(this._lineBreakOnSpace){ + var lastSpaceIndex = leftWords.lastIndexOf(' '); + leftLength = lastSpaceIndex === -1 ? leftLength : lastSpaceIndex+1 ; + cutWords = curText.substr(leftLength, curText.length - 1); + validLeftLength = leftLength > 0 && cutWords !== " "; } - this.addNewLine(); - this.handleTextRenderer(cutWords, fontName, fontSize, color); - } - else { - textRenderer.setColor(color); - this.pushToContainer(textRenderer); + if (validLeftLength) { + var leftRenderer = null; + if( fontNameOrFontDef instanceof cc.FontDefinition) + { + leftRenderer = new cc.LabelTTF(leftWords.substr(0, leftLength), fontNameOrFontDef); + leftRenderer.setOpacity(fontNameOrFontDef.fillStyle.a); //TODO: Verify that might not be needed... + }else{ + leftRenderer = new cc.LabelTTF(leftWords.substr(0, leftLength), fontNameOrFontDef, fontSize); + leftRenderer.setColor(color); + leftRenderer.setOpacity(color.a); + } + this._pushToContainer(leftRenderer); + } + + this._addNewLine(); + this._handleTextRenderer(cutWords, fontNameOrFontDef, fontSize, color); + } else { + if( fontNameOrFontDef instanceof cc.FontDefinition) { + textRenderer.setOpacity(fontNameOrFontDef.fillStyle.a); //TODO: Verify that might not be needed... + }else { + textRenderer.setColor(color); + textRenderer.setOpacity(color.a); + } + this._pushToContainer(textRenderer); } }, - /** - * Handle image renderer - * @param {String} filePath - * @param {cc.Color} color - * @param {Number} opacity - */ - handleImageRenderer: function (filePath, color, opacity) { - var imageRenderer = cc.Sprite.create(filePath); - this.handleCustomRenderer(imageRenderer); + _handleImageRenderer: function (filePath, color, opacity) { + var imageRenderer = new cc.Sprite(filePath); + this._handleCustomRenderer(imageRenderer); }, - /** - * Handle custom renderer - * @param {cc.Node} renderer - */ - handleCustomRenderer: function (renderer) { + _handleCustomRenderer: function (renderer) { var imgSize = renderer.getContentSize(); this._leftSpaceWidth -= imgSize.width; if (this._leftSpaceWidth < 0) { - this.addNewLine(); - this.pushToContainer(renderer); + this._addNewLine(); + this._pushToContainer(renderer); this._leftSpaceWidth -= imgSize.width; - } - else { - this.pushToContainer(renderer); - } + } else + this._pushToContainer(renderer); }, - addNewLine: function () { + _addNewLine: function () { this._leftSpaceWidth = this._customSize.width; this._elementRenders.push([]); }, + /** + * Formats richText's renderer. + */ formatRenderers: function () { + var newContentSizeHeight = 0, locRenderersContainer = this._elementRenderersContainer; + var locElementRenders = this._elementRenders; + var i, j, row, nextPosX, l; if (this._ignoreSize) { var newContentSizeWidth = 0; - var newContentSizeHeight = 0; + row = locElementRenders[0]; + nextPosX = 0; - var row = this._elementRenders[0]; - var nextPosX = 0; - for (var j = 0; j < row.length; j++) { - var l = row[j]; + for (j = 0; j < row.length; j++) { + l = row[j]; l.setAnchorPoint(cc.p(0, 0)); - l.setPosition(cc.p(nextPosX, 0)); - this._elementRenderersContainer.addChild(l, 1, j); + l.setPosition(nextPosX, 0); + locRenderersContainer.addChild(l, 1, j); + + var lineHeight = l.getLineHeight ? l.getLineHeight() : newContentSizeHeight; + var iSize = l.getContentSize(); newContentSizeWidth += iSize.width; - newContentSizeHeight = Math.max(newContentSizeHeight, iSize.height); + newContentSizeHeight = Math.max(Math.min(newContentSizeHeight, lineHeight), iSize.height); nextPosX += iSize.width; } - this._elementRenderersContainer.setContentSize(cc.size(newContentSizeWidth, newContentSizeHeight)); - } - else { - var newContentSizeHeight = 0; - var maxHeights = []; - for (var i = 0; i < this._elementRenders.length; i++) { - var row = this._elementRenders[i]; + //Text flow horizontal alignment: + if(this._textHorizontalAlignment !== cc.TEXT_ALIGNMENT_LEFT) { + var offsetX = 0; + if (this._textHorizontalAlignment === cc.TEXT_ALIGNMENT_RIGHT) + offsetX = this._contentSize.width - nextPosX; + else if (this._textHorizontalAlignment === cc.TEXT_ALIGNMENT_CENTER) + offsetX = (this._contentSize.width - nextPosX) / 2; + + for (j = 0; j < row.length; j++) + row[j].x += offsetX; + } + + locRenderersContainer.setContentSize(newContentSizeWidth, newContentSizeHeight); + } else { + var maxHeights = []; + for (i = 0; i < locElementRenders.length; i++) { + row = locElementRenders[i]; var maxHeight = 0; - for (var j = 0; j < row.length; j++) { - var l = row[j]; - maxHeight = Math.max(l.getContentSize().height, maxHeight); + for (j = 0; j < row.length; j++) { + l = row[j]; + var lineHeight = l.getLineHeight ? l.getLineHeight() : l.getContentSize().height; + cc.log(lineHeight); + maxHeight = Math.max(Math.min(l.getContentSize().height, lineHeight), maxHeight); } maxHeights[i] = maxHeight; newContentSizeHeight += maxHeights[i]; } - var nextPosY = this._customSize.height; - for (var i = 0; i < this._elementRenders.length; i++) { - var row = this._elementRenders[i]; - var nextPosX = 0; + + for (i = 0; i < locElementRenders.length; i++) { + row = locElementRenders[i]; + nextPosX = 0; nextPosY -= (maxHeights[i] + this._verticalSpace); - for (var j = 0; j < row.length; j++) { - var l = row[j]; + for (j = 0; j < row.length; j++) { + l = row[j]; l.setAnchorPoint(cc.p(0, 0)); l.setPosition(cc.p(nextPosX, nextPosY)); - this._elementRenderersContainer.addChild(l, 1, i * 10 + j); + locRenderersContainer.addChild(l, 1); nextPosX += l.getContentSize().width; } + //Text flow alignment(s) + if( this._textHorizontalAlignment !== cc.TEXT_ALIGNMENT_LEFT || this._textVerticalAlignment !== cc.VERTICAL_TEXT_ALIGNMENT_TOP) { + var offsetX = 0; + if (this._textHorizontalAlignment === cc.TEXT_ALIGNMENT_RIGHT) + offsetX = this._contentSize.width - nextPosX; + else if (this._textHorizontalAlignment === cc.TEXT_ALIGNMENT_CENTER) + offsetX = (this._contentSize.width - nextPosX) / 2; + + var offsetY = 0; + if (this._textVerticalAlignment === cc.VERTICAL_TEXT_ALIGNMENT_BOTTOM) + offsetY = this._customSize.height - newContentSizeHeight; + else if (this._textVerticalAlignment === cc.VERTICAL_TEXT_ALIGNMENT_CENTER) + offsetY = (this._customSize.height - newContentSizeHeight) / 2; + + for (j = 0; j < row.length; j++) { + l = row[j]; + l.x += offsetX; + l.y -= offsetY; + } + } } - this._elementRenderersContainer.setContentSize(this._size); - } - this._elementRenders.length = 0; - if (this._ignoreSize) { - var s = this.getContentSize(); - this._size.width = s.width; - this._size.height = s.height; + + locRenderersContainer.setContentSize(this._contentSize); } - else { - this._size.width = this._customSize.width; - this._size.height = this._customSize.height; + + var length = locElementRenders.length; + for (i = 0; i
+ * Constructor of ccui.TextAtlas, override it to extend the construction behavior, remember to call "this._super()" in the extended "ctor" function. + * @param {String} stringValue + * @param {String} charMapFile + * @param {number} itemWidth + * @param {number} itemHeight + * @param {String} startCharMap + * @example + * // example + * var uiLabelAtlas = new ccui.TextAtlas(); + */ + ctor: function (stringValue, charMapFile, itemWidth, itemHeight, startCharMap) { ccui.Widget.prototype.ctor.call(this); - this._labelAtlasRenderer = null; + startCharMap !== undefined && this.setProperty(stringValue, charMapFile, itemWidth, itemHeight, startCharMap); }, - initRenderer: function () { + _initRenderer: function () { this._labelAtlasRenderer = new cc.LabelAtlas(); - cc.Node.prototype.addChild.call(this, this._labelAtlasRenderer, ccui.TextAtlas.RENDERER_ZORDER, -1); + this._labelAtlasRenderer.setAnchorPoint(cc.p(0.5, 0.5)); + this.addProtectedChild(this._labelAtlasRenderer, ccui.TextAtlas.RENDERER_ZORDER, -1); }, /** @@ -61,155 +77,153 @@ ccui.TextAtlas = ccui.Widget.extend(/** @lends ccui.TextAtlas# */{ this._itemWidth = itemWidth; this._itemHeight = itemHeight; this._startCharMap = startCharMap; - var renderer = this._labelAtlasRenderer; - renderer.initWithString(stringValue, charMapFile, itemWidth, itemHeight, startCharMap[0]); - this.updateAnchorPoint(); - this.labelAtlasScaleChangedWithSize(); - - if (!renderer.textureLoaded()) { - renderer.addLoadedEventListener(function () { - this.labelAtlasScaleChangedWithSize(); - }, this); - } + + this._labelAtlasRenderer.initWithString( + stringValue, + this._charMapFileName, + this._itemWidth, + this._itemHeight, + this._startCharMap[0] + ); + + this._updateContentSizeWithTextureSize(this._labelAtlasRenderer.getContentSize()); + this._labelAtlasRendererAdaptDirty = true; }, /** - * set string value for labelatlas. + * Sets string value for ui text atlas. * @param {String} value */ - setStringValue: function (value) { + setString: function (value) { + if(value === this._labelAtlasRenderer.getString()) + return; this._stringValue = value; this._labelAtlasRenderer.setString(value); - this.labelAtlasScaleChangedWithSize(); + this._updateContentSizeWithTextureSize(this._labelAtlasRenderer.getContentSize()); + this._labelAtlasRendererAdaptDirty = true; + }, + + /** + * Sets string value for text atlas. + * @deprecated since v3.0, please use setString instead. + * @param {String} value + */ + setStringValue: function (value) { + cc.log("Please use the setString"); + this.setString(value); }, /** - * get string value for labelatlas. + * get string value for text atlas. + * @deprecated since v3.0, please use getString instead. * @returns {String} */ getStringValue: function () { + cc.log("Please use the getString"); + return this.getString(); + }, + + /** + * get string value for ui text atlas. + * @returns {String} + */ + getString: function () { return this._labelAtlasRenderer.getString(); }, /** - * override "setAnchorPoint" of widget. - * @param {cc.Point|Number} point The anchor point of UILabelAtlas or The anchor point.x of UILabelAtlas. - * @param {Number} [y] The anchor point.y of UILabelAtlas. + * Returns the length of string. + * @returns {*|Number|long|int} */ - setAnchorPoint: function (point, y) { - if (y === undefined) { - ccui.Widget.prototype.setAnchorPoint.call(this, point); - this._labelAtlasRenderer.setAnchorPoint(point); - } else { - ccui.Widget.prototype.setAnchorPoint.call(this, point, y); - this._labelAtlasRenderer.setAnchorPoint(point, y); - } + getStringLength: function(){ + return this._labelAtlasRenderer.getStringLength(); }, - _setAnchorX: function (value) { - ccui.Widget.prototype._setAnchorX.call(this, value); - this._labelAtlasRenderer._setAnchorX(value); - }, - _setAnchorY: function (value) { - ccui.Widget.prototype._setAnchorY.call(this, value); - this._labelAtlasRenderer._setAnchorY(value); - }, - - onSizeChanged: function () { - ccui.Widget.prototype.onSizeChanged.call(this); - this.labelAtlasScaleChangedWithSize(); + + _onSizeChanged: function () { + ccui.Widget.prototype._onSizeChanged.call(this); + this._labelAtlasRendererAdaptDirty = true; + }, + + _adaptRenderers: function(){ + if (this._labelAtlasRendererAdaptDirty){ + this._labelAtlasScaleChangedWithSize(); + this._labelAtlasRendererAdaptDirty = false; + } }, /** - * override "getContentSize" method of widget. + * Returns the renderer's content size + * @overrider * @returns {cc.Size} */ - getContentSize: function () { + getVirtualRendererSize: function(){ return this._labelAtlasRenderer.getContentSize(); }, - _getWidth: function () { - return this._labelAtlasRenderer._getWidth(); - }, - _getHeight: function () { - return this._labelAtlasRenderer._getHeight(); - }, /** - * override "getVirtualRenderer" method of widget. + * Returns the renderer of ccui.TextAtlas. * @returns {cc.Node} */ getVirtualRenderer: function () { return this._labelAtlasRenderer; }, - labelAtlasScaleChangedWithSize: function () { + _labelAtlasScaleChangedWithSize: function () { + var locRenderer = this._labelAtlasRenderer; if (this._ignoreSize) { - this._labelAtlasRenderer.setScale(1.0); - var atlasRenderSize = this._labelAtlasRenderer.getContentSize(); - this._size.width = atlasRenderSize.width; - this._size.height = atlasRenderSize.height; - } - else { - var textureSize = this._labelAtlasRenderer.getContentSize(); + locRenderer.setScale(1.0); + } else { + var textureSize = locRenderer.getContentSize(); if (textureSize.width <= 0.0 || textureSize.height <= 0.0) { - this._labelAtlasRenderer.setScale(1.0); + locRenderer.setScale(1.0); return; } - var scaleX = this._size.width / textureSize.width; - var scaleY = this._size.height / textureSize.height; - this._labelAtlasRenderer.setScaleX(scaleX); - this._labelAtlasRenderer.setScaleY(scaleY); + locRenderer.setScaleX(this._contentSize.width / textureSize.width); + locRenderer.setScaleY(this._contentSize.height / textureSize.height); } - }, - - updateTextureColor: function () { - this.updateColorToRenderer(this._labelAtlasRenderer); - }, - - updateTextureOpacity: function () { - this.updateOpacityToRenderer(this._labelAtlasRenderer); + locRenderer.setPosition(this._contentSize.width / 2.0, this._contentSize.height / 2.0); }, /** - * Returns the "class name" of widget. + * Returns the "class name" of ccui.TextAtlas. * @returns {string} */ getDescription: function () { return "LabelAtlas"; }, - createCloneInstance: function () { - return ccui.TextAtlas.create(); + _copySpecialProperties: function (labelAtlas) { + if (labelAtlas){ + this.setProperty(labelAtlas._stringValue, labelAtlas._charMapFileName, labelAtlas._itemWidth, labelAtlas._itemHeight, labelAtlas._startCharMap); + } }, - copySpecialProperties: function (labelAtlas) { - this.setProperty(labelAtlas._stringValue, labelAtlas._charMapFileName, labelAtlas._itemWidth, labelAtlas._itemHeight, labelAtlas._startCharMap); + _createCloneInstance: function () { + return new ccui.TextAtlas(); } }); -window._p = ccui.TextAtlas.prototype; +var _p = ccui.TextAtlas.prototype; // Extended properties /** @expose */ _p.string; -cc.defineGetterSetter(_p, "string", _p.getStringValue, _p.setStringValue); +cc.defineGetterSetter(_p, "string", _p.getString, _p.setString); -delete window._p; +_p = null; /** * allocates and initializes a UILabelAtlas. - * @constructs + * @deprecated since v3.0, please use new ccui.TextAtlas() instead. * @return {ccui.TextAtlas} - * @example - * // example - * var uiLabelAtlas = ccui.TextAtlas.create(); */ -ccui.TextAtlas.create = function () { - var uiLabelAtlas = new ccui.TextAtlas(); - if (uiLabelAtlas && uiLabelAtlas.init()) { - return uiLabelAtlas; - } - return null; +ccui.TextAtlas.create = function (stringValue, charMapFile, itemWidth, itemHeight, startCharMap) { + return new ccui.TextAtlas(stringValue, charMapFile, itemWidth, itemHeight, startCharMap); }; // Constants +/** + * The zOrder value of ccui.TextAtlas's renderer. + * @type {number} + */ ccui.TextAtlas.RENDERER_ZORDER = -1; \ No newline at end of file diff --git a/extensions/ccui/uiwidgets/UITextBMFont.js b/extensions/ccui/uiwidgets/UITextBMFont.js index 99823bc98d..e77f043765 100644 --- a/extensions/ccui/uiwidgets/UITextBMFont.js +++ b/extensions/ccui/uiwidgets/UITextBMFont.js @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,191 +24,193 @@ ****************************************************************************/ /** - * Base class for ccui.TextBMFont + * The TextBMFont control of Cocos UI, it rendered by LabelBMFont. * @class * @extends ccui.Widget * * @property {String} string - Content string of the label */ -ccui.TextBMFont = ccui.Widget.extend(/** @lends ccui.TextBMFont# */{ +ccui.LabelBMFont = ccui.TextBMFont = ccui.Widget.extend(/** @lends ccui.TextBMFont# */{ _labelBMFontRenderer: null, - _fileHasInit: false, + _fntFileHasInit: false, _fntFileName: "", _stringValue: "", - _className:"TextBMFont", - ctor: function () { + _className: "TextBMFont", + _labelBMFontRendererAdaptDirty: true, + + /** + * Allocates and initializes a TextBMFont.
+ * Constructor of ccui.TextBMFont. override it to extend the construction behavior, remember to call "this._super()" in the extended "ctor" function. + * @param {String} text + * @param {String} filename + * @example + * // example + * var uiLabelBMFont = new ccui.TextBMFont(); + */ + ctor: function (text, filename) { ccui.Widget.prototype.ctor.call(this); - this._labelBMFontRenderer = null; - this._fileHasInit = false; + + if(filename != undefined){ + this.setFntFile(filename); + this.setString(text); + } }, - initRenderer: function () { - this._labelBMFontRenderer = cc.LabelBMFont.create(); - cc.Node.prototype.addChild.call(this, this._labelBMFontRenderer, ccui.TextBMFont.RENDERER_ZORDER, -1); + + _initRenderer: function () { + this._labelBMFontRenderer = new cc.LabelBMFont(); + this.addProtectedChild(this._labelBMFontRenderer, ccui.TextBMFont.RENDERER_ZORDER, -1); }, /** - * init a bitmap font atlas with an initial string and the FNT file + * Initializes a bitmap font atlas with an initial string and the FNT file * @param {String} fileName */ setFntFile: function (fileName) { - if (!fileName) { + if (!fileName) return; - } this._fntFileName = fileName; - this._labelBMFontRenderer.initWithString("", fileName); - this.updateAnchorPoint(); - this.labelBMFontScaleChangedWithSize(); - this._fileHasInit = true; - this.setText(this._stringValue); - - if (!this._labelBMFontRenderer.textureLoaded()) { - this._labelBMFontRenderer.addLoadedEventListener(function () { - this.labelBMFontScaleChangedWithSize(); - }, this); + + this._fntFileHasInit = true; + this._labelBMFontRenderer.initWithString(this._stringValue, fileName); + this._updateContentSizeWithTextureSize(this._labelBMFontRenderer.getContentSize()); + this._labelBMFontRendererAdaptDirty = true; + + var _self = this; + var locRenderer = _self._labelBMFontRenderer; + if(!locRenderer._textureLoaded){ + locRenderer.addEventListener("load", function(){ + _self.setFntFile(_self._fntFileName); + }); } }, /** - * set string value for labelbmfont + * Sets string value for TextBMFont + * @deprecated since v3.0, please use setString instead. * @param {String} value */ setText: function (value) { - if (!value) { + cc.log("Please use the setString"); + this.setString(value); + }, + + /** + * Sets string value for TextBMFont + * @param {String} value + */ + setString: function (value) { + if(value === this._labelBMFontRenderer.getString()) return; - } this._stringValue = value; this._labelBMFontRenderer.setString(value); - this.labelBMFontScaleChangedWithSize(); + if (!this._fntFileHasInit) + return; + this._updateContentSizeWithTextureSize(this._labelBMFontRenderer.getContentSize()); + this._labelBMFontRendererAdaptDirty = true; }, /** - * get string value for labelbmfont. + * Returns string value for TextBMFont. * @returns {String} */ - getStringValue: function () { + getString: function () { return this._stringValue; }, /** - * override "setAnchorPoint" of widget. - * @param {cc.Point|Number} point The anchor point of UILabelBMFont or The anchor point.x of UILabelBMFont. - * @param {Number} [y] The anchor point.y of UILabelBMFont. + * Returns the length of TextBMFont's string. + * @returns {Number} */ - setAnchorPoint: function (point, y) { - if(y === undefined){ - ccui.Widget.prototype.setAnchorPoint.call(this, point); - this._labelBMFontRenderer.setAnchorPoint(point); - } else { - ccui.Widget.prototype.setAnchorPoint.call(this, point, y); - this._labelBMFontRenderer.setAnchorPoint(point, y); - } + getStringLength: function(){ + return this._labelBMFontRenderer.getStringLength(); }, - _setAnchorX: function (value) { - ccui.Widget.prototype._setAnchorX.call(this, value); - this._labelBMFontRenderer._setAnchorX(value); - }, - _setAnchorY: function (value) { - ccui.Widget.prototype._setAnchorY.call(this, value); - this._labelBMFontRenderer._setAnchorY(value); - }, - - onSizeChanged: function () { - ccui.Widget.prototype.onSizeChanged.call(this); - this.labelBMFontScaleChangedWithSize(); + + _onSizeChanged: function () { + ccui.Widget.prototype._onSizeChanged.call(this); + this._labelBMFontRendererAdaptDirty = true; + }, + + _adaptRenderers: function(){ + if (this._labelBMFontRendererAdaptDirty){ + this._labelBMFontScaleChangedWithSize(); + this._labelBMFontRendererAdaptDirty = false; + } }, /** - * get content size + * Returns TextBMFont's content size + * @override * @returns {cc.Size} */ - getContentSize: function () { + getVirtualRendererSize: function(){ return this._labelBMFontRenderer.getContentSize(); }, - _getWidth: function () { - return this._labelBMFontRenderer._getWidth(); - }, - _getHeight: function () { - return this._labelBMFontRenderer._getHeight(); - }, /** - * override "getVirtualRenderer" method of widget. + * Returns the renderer of TextBMFont + * @override * @returns {cc.Node} */ getVirtualRenderer: function () { return this._labelBMFontRenderer; }, - labelBMFontScaleChangedWithSize: function () { - if (this._ignoreSize) { - this._labelBMFontRenderer.setScale(1.0); - var rendererSize = this._labelBMFontRenderer.getContentSize(); - this._size.width = rendererSize.width; - this._size.height = rendererSize.height; - } + _labelBMFontScaleChangedWithSize: function () { + var locRenderer = this._labelBMFontRenderer; + if (this._ignoreSize) + locRenderer.setScale(1.0); else { - var textureSize = this._labelBMFontRenderer.getContentSize(); + var textureSize = locRenderer.getContentSize(); if (textureSize.width <= 0.0 || textureSize.height <= 0.0) { - this._labelBMFontRenderer.setScale(1.0); + locRenderer.setScale(1.0); return; } - var scaleX = this._size.width / textureSize.width; - var scaleY = this._size.height / textureSize.height; - this._labelBMFontRenderer.setScaleX(scaleX); - this._labelBMFontRenderer.setScaleY(scaleY); + locRenderer.setScaleX(this._contentSize.width / textureSize.width); + locRenderer.setScaleY(this._contentSize.height / textureSize.height); } - }, - - updateTextureColor: function () { - this.updateColorToRenderer(this._labelBMFontRenderer); - }, - - updateTextureOpacity: function () { - this.updateOpacityToRenderer(this._labelBMFontRenderer); + locRenderer.setPosition(this._contentSize.width / 2.0, this._contentSize.height / 2.0); }, /** - * Returns the "class name" of widget. + * Returns the "class name" of ccui.TextBMFont. * @returns {string} */ getDescription: function () { - return "LabelBMFont"; + return "TextBMFont"; }, - createCloneInstance: function () { - return ccui.TextBMFont.create(); + _createCloneInstance: function () { + return new ccui.TextBMFont(); }, - copySpecialProperties: function (labelBMFont) { + _copySpecialProperties: function (labelBMFont) { this.setFntFile(labelBMFont._fntFileName); - this.setText(labelBMFont._stringValue); + this.setString(labelBMFont._stringValue); } }); -window._p = ccui.TextBMFont.prototype; +var _p = ccui.TextBMFont.prototype; // Extended properties /** @expose */ _p.string; -cc.defineGetterSetter(_p, "string", _p.getStringValue, _p.setStringValue); +cc.defineGetterSetter(_p, "string", _p.getString, _p.setString); -delete window._p; +_p = null; /** * allocates and initializes a UILabelBMFont. - * @constructs + * @deprecated since v3.0, please use new ccui.TextBMFont() instead. * @return {ccui.TextBMFont} - * @example - * // example - * var uiLabelBMFont = ccui.TextBMFont.create(); */ -ccui.TextBMFont.create = function () { - var uiLabelBMFont = new ccui.TextBMFont(); - if (uiLabelBMFont && uiLabelBMFont.init()) { - return uiLabelBMFont; - } - return null; +ccui.TextBMFont.create = function (text, filename) { + return new ccui.TextBMFont(text, filename); }; // Constants -ccui.TextBMFont.RENDERER_ZORDER = -1; \ No newline at end of file +/** + * The zOrder value of TextBMFont's renderer. + * @constant + * @type {number} + */ +ccui.TextBMFont.RENDERER_ZORDER = -1; diff --git a/extensions/ccui/uiwidgets/UITextField.js b/extensions/ccui/uiwidgets/UITextField.js index 711e371c48..8fd34e0173 100644 --- a/extensions/ccui/uiwidgets/UITextField.js +++ b/extensions/ccui/uiwidgets/UITextField.js @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,66 +24,48 @@ ****************************************************************************/ /** - * Base class for ccui.UICCTextField - * @class - * @extends cc.TextFieldTTF - * - * @property {Boolean} maxLengthEnabled - Indicate whether max length limit is enabled - * @property {Number} maxLength - The max length of the text field - * @property {Boolean} passwordEnabled - Indicate whether the text field is for entering password + * @ignore */ -ccui.UICCTextField = cc.TextFieldTTF.extend(/** @lends ccui.UICCTextField# */{ - maxLengthEnabled: false, - maxLength: 0, - passwordEnabled: false, +//it's a private class, it's a renderer of ccui.TextField. +ccui._TextFieldRenderer = cc.TextFieldTTF.extend({ + _maxLengthEnabled: false, + _maxLength: 0, + _passwordEnabled: false, _passwordStyleText: "", _attachWithIME: false, _detachWithIME: false, _insertText: false, _deleteBackward: false, - _className:"UICCTextField", + _className: "_TextFieldRenderer", + ctor: function () { cc.TextFieldTTF.prototype.ctor.call(this); - this.maxLengthEnabled = false; - this.maxLength = 0; - this.passwordEnabled = false; + this._maxLengthEnabled = false; + this._maxLength = 0; + this._passwordEnabled = false; this._passwordStyleText = "*"; this._attachWithIME = false; this._detachWithIME = false; this._insertText = false; this._deleteBackward = false; }, - init:function(){ - if(ccui.Widget.prototype.init.call(this)){ - this.setTouchEnabled(true); - return true; - } - return false; - }, + onEnter: function () { cc.TextFieldTTF.prototype.onEnter.call(this); - cc.TextFieldTTF.prototype.setDelegate.call(this,this); + cc.TextFieldTTF.prototype.setDelegate.call(this, this); }, - //CCTextFieldDelegate - onTextFieldAttachWithIME: function (sender) { this.setAttachWithIME(true); return false; }, onTextFieldInsertText: function (sender, text, len) { - if (len == 1 && text == "\n") { + if (len === 1 && text === "\n") return false; - } - this.setInsertText(true); - if (this.maxLengthEnabled) { - if (cc.TextFieldTTF.prototype.getCharCount.call(this) >= this.maxLength) { - return true; - } - } - return false; + this.setInsertText(true); + return (this._maxLengthEnabled) && (cc.TextFieldTTF.prototype.getCharCount.call(this) >= this._maxLength); }, onTextFieldDeleteBackward: function (sender, delText, nLen) { @@ -96,43 +79,31 @@ ccui.UICCTextField = cc.TextFieldTTF.extend(/** @lends ccui.UICCTextField# */{ }, insertText: function (text, len) { - var str_text = text; - var locString = cc.TextFieldTTF.prototype.getString.call(this); - var str_len = locString.length; - var multiple, header; - if (text != "\n") { - if (this.maxLengthEnabled) { - multiple = 1; - header = text.charCodeAt(0); - if (header < 0 || header > 127) { - multiple = 3; - } - - if (str_len + len > this.maxLength * multiple) { - str_text = str_text.substr(0, this.maxLength * multiple); - len = this.maxLength * multiple; + var input_text = text; + + if (text !== "\n"){ + if (this._maxLengthEnabled){ + var text_count = this.getString().length; + if (text_count >= this._maxLength){ + // password + if (this._passwordEnabled) + this.setPasswordText(this.getString()); + return; } } } - cc.TextFieldTTF.prototype.insertText.call(this,str_text, len); + cc.TextFieldTTF.prototype.insertText.call(this, input_text, len); // password - if (this.passwordEnabled) { - if (cc.TextFieldTTF.prototype.getCharCount.call(this) > 0) { - this.setPasswordText(this._inputText); - } - } + if (this._passwordEnabled && cc.TextFieldTTF.prototype.getCharCount.call(this) > 0) + this.setPasswordText(this.getString()); }, deleteBackward: function () { cc.TextFieldTTF.prototype.deleteBackward.call(this); - if (cc.TextFieldTTF.prototype.getCharCount.call(this) > 0) { - // password - if (this.passwordEnabled) { - this.setPasswordText(this._inputText); - } - } + if (cc.TextFieldTTF.prototype.getCharCount.call(this) > 0 && this._passwordEnabled) + this.setPasswordText(this._inputText); }, openIME: function () { @@ -142,23 +113,21 @@ ccui.UICCTextField = cc.TextFieldTTF.extend(/** @lends ccui.UICCTextField# */{ closeIME: function () { cc.TextFieldTTF.prototype.detachWithIME.call(this); }, - onDraw:function (sender) { - return false; - }, + setMaxLengthEnabled: function (enable) { - this.maxLengthEnabled = enable; + this._maxLengthEnabled = enable; }, isMaxLengthEnabled: function () { - return this.maxLengthEnabled; + return this._maxLengthEnabled; }, setMaxLength: function (length) { - this.maxLength = length; + this._maxLength = length; }, getMaxLength: function () { - return this.maxLength; + return this._maxLength; }, getCharCount: function () { @@ -166,29 +135,33 @@ ccui.UICCTextField = cc.TextFieldTTF.extend(/** @lends ccui.UICCTextField# */{ }, setPasswordEnabled: function (enable) { - this.passwordEnabled = enable; + this._passwordEnabled = enable; }, isPasswordEnabled: function () { - return this.passwordEnabled; + return this._passwordEnabled; }, setPasswordStyleText: function (styleText) { - if (styleText.length > 1) { + if (styleText.length > 1) return; - } var header = styleText.charCodeAt(0); - if (header < 33 || header > 126) { + if (header < 33 || header > 126) return; - } this._passwordStyleText = styleText; }, setPasswordText: function (text) { var tempStr = ""; - for (var i = 0; i < text.length; ++i) { + var text_count = text.length; + var max = text_count; + + if (this._maxLengthEnabled && text_count > this._maxLength) + max = this._maxLength; + + for (var i = 0; i < max; ++i) tempStr += this._passwordStyleText; - } + cc.LabelTTF.prototype.setString.call(this, tempStr); }, @@ -222,27 +195,30 @@ ccui.UICCTextField = cc.TextFieldTTF.extend(/** @lends ccui.UICCTextField# */{ getDeleteBackward: function () { return this._deleteBackward; + }, + + onDraw: function (sender) { + return false; } }); -ccui.UICCTextField.create = function (placeholder, fontName, fontSize) { - var ret = new ccui.UICCTextField(); +ccui._TextFieldRenderer.create = function (placeholder, fontName, fontSize) { + var ret = new ccui._TextFieldRenderer(); if (ret && ret.initWithString("", fontName, fontSize)) { - if (placeholder) { + if (placeholder) ret.setPlaceHolder(placeholder); - } return ret; } return null; }; /** - * Base class for ccui.TextField + * * @class * @extends ccui.Widget * * @property {String} string - The content string of the label - * @property {Number} placeHolder - The place holder of the text field + * @property {String} placeHolder - The place holder of the text field * @property {String} font - The text field font with a style string: e.g. "18px Verdana" * @property {String} fontName - The text field font name * @property {Number} fontSize - The text field font size @@ -251,471 +227,567 @@ ccui.UICCTextField.create = function (placeholder, fontName, fontSize) { * @property {Boolean} passwordEnabled - Indicate whether the text field is for entering password */ ccui.TextField = ccui.Widget.extend(/** @lends ccui.TextField# */{ - _textFieldRender: null, + _textFieldRenderer: null, _touchWidth: 0, _touchHeight: 0, _useTouchArea: false, _textFieldEventListener: null, _textFieldEventSelector: null, - _attachWithIMEListener: null, - _detachWithIMEListener: null, - _insertTextListener: null, - _deleteBackwardListener: null, - _attachWithIMESelector: null, - _detachWithIMESelector: null, - _insertTextSelector: null, - _deleteBackwardSelector: null, - _passwordStyleText:"", - ctor: function () { + _passwordStyleText: "", + _textFieldRendererAdaptDirty: true, + _fontName: "", + _fontSize: 12, + + _ccEventCallback: null, + + /** + * allocates and initializes a UITextField. + * Constructor of ccui.TextField. override it to extend the construction behavior, remember to call "this._super()" in the extended "ctor" function. + * @param {string} placeholder + * @param {string} fontName + * @param {Number} fontSize + * @example + * // example + * var uiTextField = new ccui.TextField(); + */ + ctor: function (placeholder, fontName, fontSize) { ccui.Widget.prototype.ctor.call(this); - this._textFieldRender = null; - this._touchWidth = 0; - this._touchHeight = 0; - this._useTouchArea = false; - - this._textFieldEventListener = null; - this._textFieldEventSelector = null; - this._attachWithIMEListener = null; - this._detachWithIMEListener = null; - this._insertTextListener = null; - this._deleteBackwardListener = null; - this._attachWithIMESelector = null; - this._detachWithIMESelector = null; - this._insertTextSelector = null; - this._deleteBackwardSelector = null; - }, - - onEnter:function(){ - ccui.Widget.prototype.onEnter.call(this); - this.setUpdateEnabled(true); + if (fontName) + this.setFontName(fontName); + if (fontSize) + this.setFontSize(fontSize); + if (placeholder) + this.setPlaceHolder(placeholder); }, - initRenderer: function () { - this._textFieldRender = ccui.UICCTextField.create("input words here", "Thonburi", 20); - cc.Node.prototype.addChild.call(this, this._textFieldRender, ccui.TextField.RENDERER_ZORDER, -1); + /** + * Initializes a ccui.TextField. Please do not call this function by yourself, you should pass the parameters to constructor to initialize it. + * @returns {boolean} + * @override + */ + init: function(){ + if(ccui.Widget.prototype.init.call(this)){ + this.setTouchEnabled(true); + return true; + } + return false; + }, + /** + * Calls parent class' onEnter and schedules update function. + * @override + */ + onEnter: function () { + ccui.Widget.prototype.onEnter.call(this); + this.scheduleUpdate(); + }, + + _initRenderer: function () { + this._textFieldRenderer = ccui._TextFieldRenderer.create("input words here", "Thonburi", 20); + this.addProtectedChild(this._textFieldRenderer, ccui.TextField.RENDERER_ZORDER, -1); }, /** - * Set touch size + * Sets touch size of ccui.TextField. * @param {cc.Size} size */ setTouchSize: function (size) { - this._useTouchArea = true; this._touchWidth = size.width; this._touchHeight = size.height; }, /** - * Get touch size. + * Sets whether use touch area. + * @param enable + */ + setTouchAreaEnabled: function(enable){ + this._useTouchArea = enable; + }, + + /** + * Checks a point if is in ccui.TextField's space + * @param {cc.Point} pt + * @returns {boolean} + */ + hitTest: function(pt){ + if (this._useTouchArea) { + var nsp = this.convertToNodeSpace(pt); + var bb = cc.rect( + -this._touchWidth * this._anchorPoint.x, + -this._touchHeight * this._anchorPoint.y, + this._touchWidth, this._touchHeight + ); + + return ( nsp.x >= bb.x && nsp.x <= bb.x + bb.width && + nsp.y >= bb.y && nsp.y <= bb.y + bb.height ); + } else + return ccui.Widget.prototype.hitTest.call(this, pt); + }, + + /** + * Returns touch size of ccui.TextField. * @returns {cc.Size} */ - getTouchSize:function(){ - return cc.size(this._touchWidth,this._touchHeight); + getTouchSize: function () { + return cc.size(this._touchWidth, this._touchHeight); }, /** * Changes the string value of textField. + * @deprecated since v3.0, please use setString instead. * @param {String} text */ setText: function (text) { - if (!text) { + cc.log("Please use the setString"); + this.setString(text); + }, + + /** + * Changes the string value of textField. + * @param {String} text + */ + setString: function (text) { + if (text == null) return; - } + text = String(text); - if (this.isMaxLengthEnabled()) { + if (this.isMaxLengthEnabled()) text = text.substr(0, this.getMaxLength()); - } if (this.isPasswordEnabled()) { - this._textFieldRender.setPasswordText(text); - this._textFieldRender.insertText(text, text.length); - } - else { - this._textFieldRender.setString(text); - } - this._textFieldRender.setString(text); - this.textfieldRendererScaleChangedWithSize(); + this._textFieldRenderer.setPasswordText(text); + this._textFieldRenderer.setString(""); + this._textFieldRenderer.insertText(text, text.length); + } else + this._textFieldRenderer.setString(text); + this._textFieldRendererAdaptDirty = true; + this._updateContentSizeWithTextureSize(this._textFieldRenderer.getContentSize()); }, /** + * Sets the placeholder string.
+ * display this string if string equal "". * @param {String} value */ setPlaceHolder: function (value) { - this._textFieldRender.setPlaceHolder(value); - this.textfieldRendererScaleChangedWithSize(); + this._textFieldRenderer.setPlaceHolder(value); + this._textFieldRendererAdaptDirty = true; + this._updateContentSizeWithTextureSize(this._textFieldRenderer.getContentSize()); }, /** + * Returns the placeholder string. * @returns {String} */ - getPlaceHolder:function(){ - return this._textFieldRender.getPlaceHolder(); + getPlaceHolder: function () { + return this._textFieldRenderer.getPlaceHolder(); }, - _setFont: function (font) { - this._textFieldRender._setFont(font); - this.textfieldRendererScaleChangedWithSize(); - }, + /** + * Returns the color of ccui.TextField's place holder. + * @returns {cc.Color} + */ + getPlaceHolderColor: function(){ + return this._textFieldRenderer.getPlaceHolderColor(); + }, - _getFont: function () { - return this._textFieldRender._getFont(); - }, + /** + * Sets the place holder color to ccui.TextField. + * @param color + */ + setPlaceHolderColor: function(color){ + this._textFieldRenderer.setColorSpaceHolder(color); + }, /** - * Set font size for text field content - * @param {cc.Size} size + * Sets the text color to ccui.TextField + * @param textColor + */ + setTextColor: function(textColor){ + this._textFieldRenderer.setTextColor(textColor); + }, + + /** + * Sets font size for ccui.TextField. + * @param {Number} size */ setFontSize: function (size) { - this._textFieldRender.setFontSize(size); - this.textfieldRendererScaleChangedWithSize(); + this._textFieldRenderer.setFontSize(size); + this._fontSize = size; + this._textFieldRendererAdaptDirty = true; + this._updateContentSizeWithTextureSize(this._textFieldRenderer.getContentSize()); }, - /** - * Get font size for text field content - * @param {cc.Size} size - */ - getFontSize: function () { - return this._textFieldRender.getFontSize(); - }, + /** + * Gets font size of ccui.TextField. + * @return {Number} size + */ + getFontSize: function () { + return this._fontSize; + }, /** - * Set font name for text field content + * Sets font name for ccui.TextField * @param {String} name */ setFontName: function (name) { - this._textFieldRender.setFontName(name); - this.textfieldRendererScaleChangedWithSize(); + this._textFieldRenderer.setFontName(name); + this._fontName = name; + this._textFieldRendererAdaptDirty = true; + this._updateContentSizeWithTextureSize(this._textFieldRenderer.getContentSize()); }, - /** - * Get font name for text field content - * @param {cc.Size} size - */ - getFontName: function () { - return this._textFieldRender.getFontName(); - }, + /** + * Returns font name of ccui.TextField. + * @return {String} font name + */ + getFontName: function () { + return this._fontName; + }, /** * detach with IME */ didNotSelectSelf: function () { - this._textFieldRender.detachWithIME(); + this._textFieldRenderer.detachWithIME(); }, /** - * get textField string value + * Returns textField string value + * @deprecated since v3.0, please use getString instead. * @returns {String} */ getStringValue: function () { - return this._textFieldRender.getString(); + cc.log("Please use the getString"); + return this.getString(); }, /** - * touch began - * @param {cc.Point} touchPoint + * Returns string value of ccui.TextField. + * @returns {String} */ - onTouchBegan: function (touchPoint) { - var pass = ccui.Widget.prototype.onTouchBegan.call(this, touchPoint); - return pass; + getString: function () { + return this._textFieldRenderer.getString(); }, /** - * touch ended - * @param touchPoint + * Returns the length of ccui.TextField. + * @returns {Number} */ - onTouchEnded: function (touchPoint) { - ccui.Widget.prototype.onTouchEnded.call(this, touchPoint); - this._textFieldRender.attachWithIME(); + getStringLength: function(){ + return this._textFieldRenderer.getStringLength(); }, /** + * The touch began event callback handler. + * @param {cc.Point} touchPoint + */ + onTouchBegan: function (touchPoint, unusedEvent) { + var self = this; + var pass = ccui.Widget.prototype.onTouchBegan.call(self, touchPoint, unusedEvent); + if (self._hit) { + setTimeout(function(){ + self._textFieldRenderer.attachWithIME(); + }, 0); + }else{ + setTimeout(function(){ + self._textFieldRenderer.detachWithIME(); + }, 0); + } + return pass; + }, + + /** + * Sets Whether to open string length limit for ccui.TextField. * @param {Boolean} enable */ setMaxLengthEnabled: function (enable) { - this._textFieldRender.setMaxLengthEnabled(enable); + this._textFieldRenderer.setMaxLengthEnabled(enable); }, /** + * Returns Whether to open string length limit. * @returns {Boolean} */ isMaxLengthEnabled: function () { - return this._textFieldRender.isMaxLengthEnabled(); + return this._textFieldRenderer.isMaxLengthEnabled(); }, /** + * Sets the max length of ccui.TextField. Only when you turn on the string length limit, it is valid. * @param {number} length */ setMaxLength: function (length) { - this._textFieldRender.setMaxLength(length); + this._textFieldRenderer.setMaxLength(length); + this.setString(this.getString()); }, /** + * Returns the max length of ccui.TextField. * @returns {number} length */ getMaxLength: function () { - return this._textFieldRender.getMaxLength(); + return this._textFieldRenderer.getMaxLength(); }, /** + * Sets whether to open setting string as password character. * @param {Boolean} enable */ setPasswordEnabled: function (enable) { - this._textFieldRender.setPasswordEnabled(enable); + this._textFieldRenderer.setPasswordEnabled(enable); }, /** + * Returns whether to open setting string as password character. * @returns {Boolean} */ isPasswordEnabled: function () { - return this._textFieldRender.isPasswordEnabled(); + return this._textFieldRenderer.isPasswordEnabled(); }, /** - * @param {String} enable + * Sets the password style character, Only when you turn on setting string as password character, it is valid. + * @param styleText */ - setPasswordStyleText: function (styleText) { - this._textFieldRender.setPasswordStyleText(styleText); + setPasswordStyleText: function(styleText){ + this._textFieldRenderer.setPasswordStyleText(styleText); this._passwordStyleText = styleText; + + this.setString(this.getString()); }, /** + * Returns the password style character. * @returns {String} */ - getPasswordStyleText:function(){ + getPasswordStyleText: function () { return this._passwordStyleText; }, update: function (dt) { - if (this.getAttachWithIME()) { - this.attachWithIMEEvent(); - this.setAttachWithIME(false); - } if (this.getDetachWithIME()) { - this.detachWithIMEEvent(); + this._detachWithIMEEvent(); this.setDetachWithIME(false); } + if (this.getAttachWithIME()) { + this._attachWithIMEEvent(); + this.setAttachWithIME(false); + } if (this.getInsertText()) { - this.insertTextEvent(); - this.setInsertText(false); + this._textFieldRendererAdaptDirty = true; + this._updateContentSizeWithTextureSize(this._textFieldRenderer.getContentSize()); - this.textfieldRendererScaleChangedWithSize(); + this._insertTextEvent(); + this.setInsertText(false); } if (this.getDeleteBackward()) { - this.deleteBackwardEvent(); + this._textFieldRendererAdaptDirty = true; + this._updateContentSizeWithTextureSize(this._textFieldRenderer.getContentSize()); + + this._deleteBackwardEvent(); this.setDeleteBackward(false); } }, /** - * get whether attach with IME. + * Returns whether attach with IME. * @returns {Boolean} */ getAttachWithIME: function () { - return this._textFieldRender.getAttachWithIME(); + return this._textFieldRenderer.getAttachWithIME(); }, /** - * set attach with IME. + * Sets attach with IME. * @param {Boolean} attach */ setAttachWithIME: function (attach) { - this._textFieldRender.setAttachWithIME(attach); + this._textFieldRenderer.setAttachWithIME(attach); }, /** - * get whether eetach with IME. + * Returns whether detach with IME. * @returns {Boolean} */ getDetachWithIME: function () { - return this._textFieldRender.getDetachWithIME(); + return this._textFieldRenderer.getDetachWithIME(); }, /** - * set detach with IME. + * Sets detach with IME. * @param {Boolean} detach */ setDetachWithIME: function (detach) { - this._textFieldRender.setDetachWithIME(detach); + this._textFieldRenderer.setDetachWithIME(detach); }, /** - * get insertText + * Returns insertText string of ccui.TextField. * @returns {String} */ getInsertText: function () { - return this._textFieldRender.getInsertText(); + return this._textFieldRenderer.getInsertText(); }, /** - * set insertText + * Sets insertText string to ccui.TextField. * @param {String} insertText */ setInsertText: function (insertText) { - this._textFieldRender.setInsertText(insertText); + this._textFieldRenderer.setInsertText(insertText); }, /** + * Returns the delete backward of ccui.TextField. * @returns {Boolean} */ getDeleteBackward: function () { - return this._textFieldRender.getDeleteBackward(); + return this._textFieldRenderer.getDeleteBackward(); }, /** + * Sets the delete backward of ccui.TextField. * @param {Boolean} deleteBackward */ setDeleteBackward: function (deleteBackward) { - this._textFieldRender.setDeleteBackward(deleteBackward); + this._textFieldRenderer.setDeleteBackward(deleteBackward); }, - attachWithIMEEvent: function () { - if (this._textFieldEventListener && this._textFieldEventSelector) { - this._textFieldEventSelector.call(this._textFieldEventListener, this, ccui.TextField.EVENT_ATTACH_WITH_ME); + _attachWithIMEEvent: function () { + if(this._textFieldEventSelector){ + if (this._textFieldEventListener) + this._textFieldEventSelector.call(this._textFieldEventListener, this, ccui.TextField.EVENT_ATTACH_WITH_IME); + else + this._textFieldEventSelector(this, ccui.TextField.EVENT_ATTACH_WITH_IME); + } + if (this._ccEventCallback){ + this._ccEventCallback(this, ccui.TextField.EVENT_ATTACH_WITH_IME); } }, - detachWithIMEEvent: function () { - if (this._textFieldEventListener && this._textFieldEventSelector) { - this._textFieldEventSelector.call(this._textFieldEventListener, this, ccui.TextField.EVENT_DETACH_WITH_ME); + _detachWithIMEEvent: function () { + if(this._textFieldEventSelector){ + if (this._textFieldEventListener) + this._textFieldEventSelector.call(this._textFieldEventListener, this, ccui.TextField.EVENT_DETACH_WITH_IME); + else + this._textFieldEventSelector(this, ccui.TextField.EVENT_DETACH_WITH_IME); } + if (this._ccEventCallback) + this._ccEventCallback(this, ccui.TextField.EVENT_DETACH_WITH_IME); }, - insertTextEvent: function () { - if (this._textFieldEventListener && this._textFieldEventSelector) { - this._textFieldEventSelector.call(this._textFieldEventListener, this, ccui.TextField.EVENT_INSERT_TEXT); + _insertTextEvent: function () { + if(this._textFieldEventSelector){ + if (this._textFieldEventListener) + this._textFieldEventSelector.call(this._textFieldEventListener, this, ccui.TextField.EVENT_INSERT_TEXT); + else + this._textFieldEventSelector(this, ccui.TextField.EVENT_INSERT_TEXT); //eventCallback } + if (this._ccEventCallback) + this._ccEventCallback(this, ccui.TextField.EVENT_INSERT_TEXT); }, - deleteBackwardEvent: function () { - if (this._textFieldEventListener && this._textFieldEventSelector) { - this._textFieldEventSelector.call(this._textFieldEventListener, this, ccui.TextField.EVENT_DELETE_BACKWARD); + _deleteBackwardEvent: function () { + if(this._textFieldEventSelector){ + if (this._textFieldEventListener) + this._textFieldEventSelector.call(this._textFieldEventListener, this, ccui.TextField.EVENT_DELETE_BACKWARD); + else + this._textFieldEventSelector(this, ccui.TextField.EVENT_DELETE_BACKWARD); //eventCallback } + if (this._ccEventCallback) + this._ccEventCallback(this, ccui.TextField.EVENT_DELETE_BACKWARD); }, /** - * add event listener + * Adds event listener to cuci.TextField. + * @param {Object} [target=] * @param {Function} selector - * @param {Object} target + * @deprecated since v3.0, please use addEventListener instead. */ addEventListenerTextField: function (selector, target) { - this._textFieldEventSelector = selector; - this._textFieldEventListener = target; + this.addEventListener(selector, target); }, /** - * check hit - * @param {cc.Point} pt - * @returns {boolean} + * Adds event listener callback. + * @param {Object} [target=] + * @param {Function} selector */ - hitTest: function (pt) { - var nsp = this.convertToNodeSpace(pt); - var locSize = this._textFieldRender.getContentSize(); - var bb = cc.rect(-locSize.width * this._anchorPoint.x, -locSize.height * this._anchorPoint.y, locSize.width, locSize.height); - if (nsp.x >= bb.x && nsp.x <= bb.x + bb.width && nsp.y >= bb.y && nsp.y <= bb.y + bb.height) { - return true; - } - return false; + addEventListener: function(selector, target){ + this._textFieldEventSelector = selector; //when target is undefined, _textFieldEventSelector is ccEventCallback. + this._textFieldEventListener = target; }, - /** - * override "setAnchorPoint" of widget. - * @param {cc.Point|Number} point The anchor point of UILabelBMFont or The anchor point.x of UILabelBMFont. - * @param {Number} [y] The anchor point.y of UILabelBMFont. - */ - setAnchorPoint: function (point, y) { - if(y === undefined){ - ccui.Widget.prototype.setAnchorPoint.call(this, point); - this._textFieldRender.setAnchorPoint(point); - } else { - ccui.Widget.prototype.setAnchorPoint.call(this, point, y); - this._textFieldRender.setAnchorPoint(point, y); - } + _onSizeChanged: function () { + ccui.Widget.prototype._onSizeChanged.call(this); + this._textFieldRendererAdaptDirty = true; }, - _setAnchorX: function (value) { - ccui.Widget.prototype._setAnchorX.call(this, value); - this._textFieldRender._setAnchorX(value); - }, - _setAnchorY: function (value) { - ccui.Widget.prototype._setAnchorY.call(this, value); - this._textFieldRender._setAnchorY(value); - }, - - onSizeChanged: function () { - ccui.Widget.prototype.onSizeChanged.call(this); - this.textfieldRendererScaleChangedWithSize(); - }, - - textfieldRendererScaleChangedWithSize: function () { - if (this._ignoreSize) { - this._textFieldRender.setScale(1.0); - var rendererSize = this.getContentSize(); - this._size.width = rendererSize.width; - this._size.height = rendererSize.height; + + _adaptRenderers: function(){ + if (this._textFieldRendererAdaptDirty) { + this._textfieldRendererScaleChangedWithSize(); + this._textFieldRendererAdaptDirty = false; } - else { - var textureSize = this.getContentSize(); - if (textureSize.width <= 0.0 || textureSize.height <= 0.0) { - this._textFieldRender.setScale(1.0); - return; - } - var scaleX = this._size.width / textureSize.width; - var scaleY = this._size.height / textureSize.height; - this._textFieldRender.setScaleX(scaleX); - this._textFieldRender.setScaleY(scaleY); + }, + + _textfieldRendererScaleChangedWithSize: function () { + if (!this._ignoreSize) + this._textFieldRenderer.setDimensions(this._contentSize); + this._textFieldRenderer.setPosition(this._contentSize.width / 2, this._contentSize.height / 2); + }, + + //@since v3.3 + getAutoRenderSize: function(){ + var virtualSize = this._textFieldRenderer.getContentSize(); + if (!this._ignoreSize) { + this._textFieldRenderer.setDimensions(0, 0); + virtualSize = this._textFieldRenderer.getContentSize(); + this._textFieldRenderer.setDimensions(this._contentSize.width, this._contentSize.height); } + return virtualSize; }, /** - * override "getContentSize" method of widget. + * Returns the ccui.TextField's content size. * @returns {cc.Size} */ - getContentSize: function () { - return this._textFieldRender.getContentSize(); + getVirtualRendererSize: function(){ + return this._textFieldRenderer.getContentSize(); }, - _getWidth: function () { - return this._textFieldRender._getWidth(); - }, - _getHeight: function () { - return this._textFieldRender._getHeight(); - }, /** - * override "getContentSize" method of widget. + * Returns the renderer of ccui.TextField. * @returns {cc.Node} */ getVirtualRenderer: function () { - return this._textFieldRender; - }, - - updateTextureColor: function () { - this.updateColorToRenderer(this._textFieldRender); - }, - - updateTextureOpacity: function () { - this.updateOpacityToRenderer(this._textFieldRender); + return this._textFieldRenderer; }, /** - * Returns the "class name" of widget. + * Returns the "class name" of ccui.TextField. * @returns {string} */ getDescription: function () { return "TextField"; }, + /** + * Open keyboard and receive input text. + * @return {Boolean} + */ attachWithIME: function () { - this._textFieldRender.attachWithIME(); + this._textFieldRenderer.attachWithIME(); }, - createCloneInstance: function () { - return ccui.TextField.create(); + _createCloneInstance: function () { + return new ccui.TextField(); }, - copySpecialProperties: function (textField) { - this.setText(textField._textFieldRender.getString()); - this.setPlaceHolder(textField.getStringValue()); - this.setFontSize(textField._textFieldRender.getFontSize()); - this.setFontName(textField._textFieldRender.getFontName()); + _copySpecialProperties: function (textField) { + this.setString(textField._textFieldRenderer.getString()); + this.setPlaceHolder(textField.getString()); + this.setFontSize(textField._textFieldRenderer.getFontSize()); + this.setFontName(textField._textFieldRenderer.getFontName()); this.setMaxLengthEnabled(textField.isMaxLengthEnabled()); this.setMaxLength(textField.getMaxLength()); this.setPasswordEnabled(textField.isPasswordEnabled()); @@ -724,15 +796,66 @@ ccui.TextField = ccui.Widget.extend(/** @lends ccui.TextField# */{ this.setDetachWithIME(textField.getDetachWithIME()); this.setInsertText(textField.getInsertText()); this.setDeleteBackward(textField.getDeleteBackward()); + this._ccEventCallback = textField._ccEventCallback; + this._textFieldEventListener = textField._textFieldEventListener; + this._textFieldEventSelector = textField._textFieldEventSelector; + }, + + /** + * Sets the text area size to ccui.TextField. + * @param {cc.Size} size + */ + setTextAreaSize: function(size){ + this.setContentSize(size); + }, + + /** + * Sets the text horizontal alignment of ccui.TextField. + * @param alignment + */ + setTextHorizontalAlignment: function(alignment){ + this._textFieldRenderer.setHorizontalAlignment(alignment); + }, + + /** + * Sets the text vertical alignment of ccui.TextField. + * @param alignment + */ + setTextVerticalAlignment: function(alignment){ + this._textFieldRenderer.setVerticalAlignment(alignment); + }, + _setFont: function (font) { + this._textFieldRenderer._setFont(font); + this._textFieldRendererAdaptDirty = true; + }, + + _getFont: function () { + return this._textFieldRenderer._getFont(); + }, + + _changePosition: function(){ + this._adaptRenderers(); } }); -window._p = ccui.TextField.prototype; +/** + * Creates a ccui.TextField. + * @deprecated since v3.0, please use new ccui.TextField() instead. + * @param {String} placeholder + * @param {String} fontName + * @param {Number} fontSize + * @returns {ccui.TextField} + */ +ccui.TextField.create = function(placeholder, fontName, fontSize){ + return new ccui.TextField(placeholder, fontName, fontSize); +}; + +var _p = ccui.TextField.prototype; // Extended properties /** @expose */ _p.string; -cc.defineGetterSetter(_p, "string", _p.getStringValue, _p.setText); +cc.defineGetterSetter(_p, "string", _p.getString, _p.setString); /** @expose */ _p.placeHolder; cc.defineGetterSetter(_p, "placeHolder", _p.getPlaceHolder, _p.setPlaceHolder); @@ -755,29 +878,38 @@ cc.defineGetterSetter(_p, "maxLength", _p.getMaxLength, _p.setMaxLength); _p.passwordEnabled; cc.defineGetterSetter(_p, "passwordEnabled", _p.isPasswordEnabled, _p.setPasswordEnabled); -delete window._p; - -/** - * allocates and initializes a UITextField. - * @constructs - * @return {ccui.TextField} - * @example - * // example - * var uiTextField = ccui.TextField.create(); - */ -ccui.TextField.create = function () { - var uiTextField = new ccui.TextField(); - if (uiTextField && uiTextField.init()) { - return uiTextField; - } - return null; -}; +_p = null; // Constants //TextField event -ccui.TextField.EVENT_ATTACH_WITH_ME = 0; -ccui.TextField.EVENT_DETACH_WITH_ME = 1; +/** + * The attach with IME event flag of ccui.TextField + * @constant + * @type {number} + */ +ccui.TextField.EVENT_ATTACH_WITH_IME = 0; +/** + * The detach with IME event flag of ccui.TextField + * @constant + * @type {number} + */ +ccui.TextField.EVENT_DETACH_WITH_IME = 1; +/** + * The insert text event flag of ccui.TextField + * @constant + * @type {number} + */ ccui.TextField.EVENT_INSERT_TEXT = 2; +/** + * The delete backward event flag of ccui.TextField + * @constant + * @type {number} + */ ccui.TextField.EVENT_DELETE_BACKWARD = 3; +/** + * The zOrder value of ccui.TextField's renderer. + * @constant + * @type {number} + */ ccui.TextField.RENDERER_ZORDER = -1; \ No newline at end of file diff --git a/extensions/ccui/uiwidgets/scroll-widget/UIListView.js b/extensions/ccui/uiwidgets/scroll-widget/UIListView.js index 0c5be09bd6..370dd411b3 100644 --- a/extensions/ccui/uiwidgets/scroll-widget/UIListView.js +++ b/extensions/ccui/uiwidgets/scroll-widget/UIListView.js @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2013 cocos2d-x.org + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,35 +24,54 @@ ****************************************************************************/ /** - * Base class for ccui.ListView + * The list view control of Cocos UI. * @class * @extends ccui.ScrollView + * @example + * var listView = new ccui.ListView(); + * // set list view ex direction + * listView.setDirection(ccui.ScrollView.DIR_VERTICAL); + * listView.setTouchEnabled(true); + * listView.setBounceEnabled(true); + * listView.setBackGroundImage("res/cocosui/green_edit.png"); + * listView.setBackGroundImageScale9Enabled(true); + * listView.setContentSize(cc.size(240, 130)); + * this.addChild(listView); */ ccui.ListView = ccui.ScrollView.extend(/** @lends ccui.ListView# */{ _model: null, _items: null, _gravity: null, _itemsMargin: 0, - _listViewEventListener: null, - _listViewEventSelector: null, + _curSelectedIndex: 0, _refreshViewDirty: true, - _className:"ListView", + + _listViewEventListener: null, + _listViewEventSelector: null, + /** + * allocates and initializes a UIListView. + * Constructor of ccui.ListView, override it to extend the construction behavior, remember to call "this._super()" in the extended "ctor" function. + * @example + * // example + * var aListView = new ccui.ListView(); + */ ctor: function () { ccui.ScrollView.prototype.ctor.call(this); - this._model = null; this._items = []; - this._gravity = ccui.ListView.GRAVITY_CENTER_HORIZONTAL; - this._itemsMargin = 0; - this._listViewEventListener = null; - this._listViewEventSelector = null; - this._curSelectedIndex = 0; - this._refreshViewDirty = true; + this._gravity = ccui.ListView.GRAVITY_CENTER_VERTICAL; + this.setTouchEnabled(true); + + this.init(); }, + /** + * Initializes a ccui.ListView. Please do not call this function by yourself, you should pass the parameters to constructor to initialize it. + * @returns {boolean} + * @override + */ init: function () { if (ccui.ScrollView.prototype.init.call(this)) { - this._items = []; this.setLayoutType(ccui.Layout.LINEAR_VERTICAL); return true; } @@ -59,198 +79,206 @@ ccui.ListView = ccui.ScrollView.extend(/** @lends ccui.ListView# */{ }, /** - * Sets a item model for listview. A model will be cloned for adding default item. + * Sets a item model for ListView. A model will be cloned for adding default item. * @param {ccui.Widget} model */ setItemModel: function (model) { - if (!model) { + if (!model){ + cc.log("Can't set a null to item model!"); return; } + this._model = model; }, - updateInnerContainerSize: function () { + _updateInnerContainerSize: function () { + var locItems = this._items, length, i; switch (this.direction) { case ccui.ScrollView.DIR_VERTICAL: - var length = this._items.length; + length = locItems.length; var totalHeight = (length - 1) * this._itemsMargin; - for (var i = 0; i < length; i++) { - var item = this._items[i]; - totalHeight += item.getSize().height; + for (i = 0; i < length; i++) { + totalHeight += locItems[i].getContentSize().height; } - var finalWidth = this._size.width; - var finalHeight = totalHeight; - this.setInnerContainerSize(cc.size(finalWidth, finalHeight)); + this.setInnerContainerSize(cc.size(this._contentSize.width, totalHeight)); break; case ccui.ScrollView.DIR_HORIZONTAL: - var length = this._items.length; + length = locItems.length; var totalWidth = (length - 1) * this._itemsMargin; - for (var i = 0; i < length; i++) { - var item = this._items[i]; - totalWidth += item.getSize().width; + for (i = 0; i < length; i++) { + totalWidth += locItems[i].getContentSize().width; } - var finalWidth = totalWidth; - var finalHeight = this._size.height; - this.setInnerContainerSize(cc.size(finalWidth, finalHeight)); + this.setInnerContainerSize(cc.size(totalWidth, this._contentSize.height)); break; default: break; } }, - remedyLayoutParameter: function (item) { - if (!item) { - return; + _remedyLayoutParameter: function (item) { + cc.assert(null != item, "ListView Item can't be nil!"); + + var linearLayoutParameter = item.getLayoutParameter(); + var isLayoutParameterExists = true; + if (!linearLayoutParameter) { + linearLayoutParameter = new ccui.LinearLayoutParameter(); + isLayoutParameterExists = false; } + var itemIndex = this.getIndex(item); switch (this.direction) { case ccui.ScrollView.DIR_VERTICAL: - var llp = item.getLayoutParameter(ccui.LayoutParameter.LINEAR); - if (!llp) { - var defaultLp = ccui.LinearLayoutParameter.create(); - switch (this._gravity) { - case ccui.ListView.GRAVITY_LEFT: - defaultLp.setGravity(ccui.LINEAR_GRAVITY_LEFT); - break; - case ccui.ListView.GRAVITY_RIGHT: - defaultLp.setGravity(ccui.LINEAR_GRAVITY_RIGHT); - break; - case ccui.ListView.GRAVITY_CENTER_HORIZONTAL: - defaultLp.setGravity(ccui.LINEAR_GRAVITY_CENTER_HORIZONTAL); - break; - default: - break; - } - if (this.getIndex(item) == 0) { - defaultLp.setMargin(ccui.MarginZero()); - } - else { - defaultLp.setMargin(new ccui.Margin(0.0, this._itemsMargin, 0.0, 0.0)); - } - item.setLayoutParameter(defaultLp); - } - else { - if (this.getIndex(item) == 0) { - llp.setMargin(ccui.MarginZero()); - } - else { - llp.setMargin(new ccui.Margin(0, this._itemsMargin, 0, 0)); - } - switch (this._gravity) { - case ccui.ListView.GRAVITY_LEFT: - llp.setGravity(ccui.LINEAR_GRAVITY_LEFT); - break; - case ccui.ListView.GRAVITY_RIGHT: - llp.setGravity(ccui.LINEAR_GRAVITY_RIGHT); - break; - case ccui.ListView.GRAVITY_CENTER_HORIZONTAL: - llp.setGravity(ccui.LINEAR_GRAVITY_CENTER_HORIZONTAL); - break; - default: - break; - } - } + this._remedyVerticalLayoutParameter(linearLayoutParameter, itemIndex); break; case ccui.ScrollView.DIR_HORIZONTAL: - var llp = item.getLayoutParameter(ccui.LayoutParameter.LINEAR); - if (!llp) { - var defaultLp = ccui.LinearLayoutParameter.create(); - switch (this._gravity) { - case ccui.ListView.GRAVITY_TOP: - defaultLp.setGravity(ccui.LINEAR_GRAVITY_TOP); - break; - case ccui.ListView.GRAVITY_BOTTOM: - defaultLp.setGravity(ccui.LINEAR_GRAVITY_BOTTOM); - break; - case ccui.ListView.GRAVITY_CENTER_VERTICAL: - defaultLp.setGravity(ccui.LINEAR_GRAVITY_CENTER_VERTICAL); - break; - default: - break; - } - if (this.getIndex(item) == 0) { - defaultLp.setMargin(ccui.MarginZero()); - } - else { - defaultLp.setMargin(new ccui.Margin(this._itemsMargin, 0.0, 0.0, 0.0)); - } - item.setLayoutParameter(defaultLp); - } - else { - if (this.getIndex(item) == 0) { - llp.setMargin(ccui.MarginZero()); - } - else { - llp.setMargin(new ccui.Margin(this._itemsMargin, 0.0, 0.0, 0.0)); - } - switch (this._gravity) { - case ccui.ListView.GRAVITY_TOP: - llp.setGravity(ccui.LINEAR_GRAVITY_TOP); - break; - case ccui.ListView.GRAVITY_BOTTOM: - llp.setGravity(ccui.LINEAR_GRAVITY_BOTTOM); - break; - case ccui.ListView.GRAVITY_CENTER_VERTICAL: - llp.setGravity(ccui.LINEAR_GRAVITY_CENTER_VERTICAL); - break; - default: - break; - } - } + this._remedyHorizontalLayoutParameter(linearLayoutParameter, itemIndex); + break; + default: + break; + } + if (!isLayoutParameterExists) + item.setLayoutParameter(linearLayoutParameter); + }, + + //@since v3.3 + _remedyVerticalLayoutParameter: function (layoutParameter, itemIndex) { + cc.assert(null != layoutParameter, "Layout parameter can't be nil!"); + + switch (this._gravity) { + case ccui.ListView.GRAVITY_LEFT: + layoutParameter.setGravity(ccui.LinearLayoutParameter.LEFT); + break; + case ccui.ListView.GRAVITY_RIGHT: + layoutParameter.setGravity(ccui.LinearLayoutParameter.RIGHT); + break; + case ccui.ListView.GRAVITY_CENTER_HORIZONTAL: + layoutParameter.setGravity(ccui.LinearLayoutParameter.CENTER_HORIZONTAL); + break; + default: + break; + } + if (0 === itemIndex) + layoutParameter.setMargin(ccui.MarginZero()); + else + layoutParameter.setMargin(new ccui.Margin(0.0, this._itemsMargin, 0.0, 0.0)); + }, + + //@since v3.3 + _remedyHorizontalLayoutParameter: function (layoutParameter, itemIndex) { + cc.assert(null != layoutParameter, "Layout parameter can't be nil!"); + + switch (this._gravity) { + case ccui.ListView.GRAVITY_TOP: + layoutParameter.setGravity(ccui.LinearLayoutParameter.TOP); + break; + case ccui.ListView.GRAVITY_BOTTOM: + layoutParameter.setGravity(ccui.LinearLayoutParameter.BOTTOM); + break; + case ccui.ListView.GRAVITY_CENTER_VERTICAL: + layoutParameter.setGravity(ccui.LinearLayoutParameter.CENTER_VERTICAL); break; default: break; } + if (0 === itemIndex) + layoutParameter.setMargin(ccui.MarginZero()); + else + layoutParameter.setMargin(new ccui.Margin(this._itemsMargin, 0.0, 0.0, 0.0)); }, /** - * Push back a default item(create by a cloned model) into listview. + * Push back a default item(create by a cloned model) into ListView. */ pushBackDefaultItem: function () { - if (!this._model) { + if (this._model == null) return; - } var newItem = this._model.clone(); - this._items.push(newItem); - this.remedyLayoutParameter(newItem); + this._remedyLayoutParameter(newItem); this.addChild(newItem); this._refreshViewDirty = true; }, /** - * Insert a default item(create by a cloned model) into listview. + * Insert a default item(create by a cloned model) into ListView. * @param {Number} index */ insertDefaultItem: function (index) { - if (!this._model) { + if (this._model == null) return; - } var newItem = this._model.clone(); this._items.splice(index, 0, newItem); - this.remedyLayoutParameter(newItem); - this.addChild(newItem); + ccui.ScrollView.prototype.addChild.call(this, newItem); + this._remedyLayoutParameter(newItem); + this._refreshViewDirty = true; }, /** - * Push back custom item into listview. + * Push back custom item into ListView. * @param {ccui.Widget} item */ pushBackCustomItem: function (item) { - this._items.push(item); - this.remedyLayoutParameter(item); + this._remedyLayoutParameter(item); this.addChild(item); this._refreshViewDirty = true; }, /** - * Push back custom item into listview. + * add child to ListView + * @override + * @param {cc.Node} widget + * @param {Number} [zOrder] + * @param {Number|String} [tag] tag or name + */ + addChild: function (widget, zOrder, tag) { + if (widget) { + zOrder = zOrder || widget.getLocalZOrder(); + tag = tag || widget.getName(); + ccui.ScrollView.prototype.addChild.call(this, widget, zOrder, tag); + if(widget instanceof ccui.Widget) + this._items.push(widget); + } + }, + + /** + * remove child from ListView + * @override + * @param {cc.Node} widget + * @param {Boolean} [cleanup=true] + */ + removeChild: function(widget, cleanup){ + if (widget) { + var index = this._items.indexOf(widget); + if(index > -1) + this._items.splice(index, 1); + ccui.ScrollView.prototype.removeChild.call(this, widget, cleanup); + } + }, + + /** + * Removes all children from ccui.ListView. + */ + removeAllChildren: function(){ + this.removeAllChildrenWithCleanup(true); + }, + + /** + * Removes all children from ccui.ListView and do a cleanup all running actions depending on the cleanup parameter. + * @param {Boolean} cleanup + */ + removeAllChildrenWithCleanup: function(cleanup){ + ccui.ScrollView.prototype.removeAllChildrenWithCleanup.call(this, cleanup); + this._items = []; + }, + + /** + * Push back custom item into ccui.ListView. * @param {ccui.Widget} item * @param {Number} index */ insertCustomItem: function (item, index) { this._items.splice(index, 0, item); - this.remedyLayoutParameter(item); - this.addChild(item); + ccui.ScrollView.prototype.addChild.call(this, item); + this._remedyLayoutParameter(item); this._refreshViewDirty = true; }, @@ -260,30 +288,34 @@ ccui.ListView = ccui.ScrollView.extend(/** @lends ccui.ListView# */{ */ removeItem: function (index) { var item = this.getItem(index); - if (!item) { + if (item == null) return; - } - cc.arrayRemoveObject(this._items, item); - this.removeChild(item); + this.removeChild(item, true); this._refreshViewDirty = true; }, /** - * Removes the last item of listview. + * Removes the last item of ccui.ListView. */ removeLastItem: function () { this.removeItem(this._items.length - 1); }, + /** + * Removes all items from ccui.ListView. + */ + removeAllItems: function(){ + this.removeAllChildren(); + }, + /** * Returns a item whose index is same as the parameter. * @param {Number} index - * @returns {cc.Widget} + * @returns {ccui.Widget} */ getItem: function (index) { - if (index < 0 || index >= this._items.length) { + if (index < 0 || index >= this._items.length) return null; - } return this._items[index]; }, @@ -297,21 +329,22 @@ ccui.ListView = ccui.ScrollView.extend(/** @lends ccui.ListView# */{ /** * Returns the index of item. - * @param {ccui.Widget} item - * @returns {Number} + * @param {ccui.Widget} item the item which need to be checked. + * @returns {Number} the index of item. */ getIndex: function (item) { + if(item == null) + return -1; return this._items.indexOf(item); }, /** - * Changes the gravity of listview. + * Changes the gravity of ListView. * @param {ccui.ListView.GRAVITY_LEFT|ccui.ListView.GRAVITY_RIGHT|ccui.ListView.GRAVITY_CENTER_HORIZONTAL|ccui.ListView.GRAVITY_BOTTOM|ccui.ListView.GRAVITY_CENTER_VERTICAL} gravity */ setGravity: function (gravity) { - if (this._gravity == gravity) { + if (this._gravity === gravity) return; - } this._gravity = gravity; this._refreshViewDirty = true; }, @@ -321,15 +354,14 @@ ccui.ListView = ccui.ScrollView.extend(/** @lends ccui.ListView# */{ * @param {Number} margin */ setItemsMargin: function (margin) { - if (this._itemsMargin == margin) { + if (this._itemsMargin === margin) return; - } this._itemsMargin = margin; this._refreshViewDirty = true; }, /** - * Get the margin between each item. + * Returns the margin between each item. * @returns {Number} */ getItemsMargin:function(){ @@ -337,7 +369,7 @@ ccui.ListView = ccui.ScrollView.extend(/** @lends ccui.ListView# */{ }, /** - * Changes scroll direction of scrollview. + * Changes scroll direction of ccui.ListView. * @param {ccui.ScrollView.DIR_NONE | ccui.ScrollView.DIR_VERTICAL | ccui.ScrollView.DIR_HORIZONTAL | ccui.ScrollView.DIR_BOTH} dir */ setDirection: function (dir) { @@ -355,90 +387,123 @@ ccui.ListView = ccui.ScrollView.extend(/** @lends ccui.ListView# */{ break; } ccui.ScrollView.prototype.setDirection.call(this, dir); + }, + /** + * Requests refresh list view. + */ + requestRefreshView: function () { + this._refreshViewDirty = true; + }, + + /** + * Refreshes list view. + */ + refreshView: function () { + var locItems = this._items; + for (var i = 0; i < locItems.length; i++) { + var item = locItems[i]; + item.setLocalZOrder(i); + this._remedyLayoutParameter(item); + } + this._updateInnerContainerSize(); + }, + + /** + * provides a public _doLayout function for Editor. it calls _doLayout. + */ + doLayout: function(){ + this._doLayout(); + }, + + _doLayout: function(){ + ccui.Layout.prototype._doLayout.call(this); + if (this._refreshViewDirty) { + this.refreshView(); + this._refreshViewDirty = false; + } }, /** - * add event listener + * Adds event listener to ccui.ListView. * @param {Function} selector - * @param {Object} target + * @param {Object} [target=] + * @deprecated since v3.0, please use addEventListener instead. */ addEventListenerListView: function (selector, target) { + this.addEventListener(selector, target); + }, + + /** + * Adds event listener to ccui.ListView. + * @param {Function} selector + * @param {Object} [target=] + */ + addEventListener: function(selector, target){ this._listViewEventListener = target; this._listViewEventSelector = selector; }, - selectedItemEvent: function () { - if(this._listViewEventSelector&&this._listViewEventListener){ - this._listViewEventSelector.call(this._listViewEventListener, this, ccui.ListView.EVENT_SELECTED_ITEM); + _selectedItemEvent: function (event) { + var eventEnum = (event === ccui.Widget.TOUCH_BEGAN) ? ccui.ListView.ON_SELECTED_ITEM_START : ccui.ListView.ON_SELECTED_ITEM_END; + if(this._listViewEventSelector){ + if (this._listViewEventListener) + this._listViewEventSelector.call(this._listViewEventListener, this, eventEnum); + else + this._listViewEventSelector(this, eventEnum); } + if(this._ccEventCallback) + this._ccEventCallback(this, eventEnum); }, - interceptTouchEvent: function (handleState, sender, touchPoint) { - ccui.ScrollView.prototype.interceptTouchEvent.call(this, handleState, sender, touchPoint); - if (handleState != 1) { + /** + * Intercept touch event, handle its child's touch event. + * @param {Number} eventType + * @param {ccui.Widget} sender + * @param {cc.Touch} touch + */ + interceptTouchEvent: function (eventType, sender, touch) { + ccui.ScrollView.prototype.interceptTouchEvent.call(this, eventType, sender, touch); + if (eventType !== ccui.Widget.TOUCH_MOVED) { var parent = sender; while (parent) { - if (parent && parent.getParent() == this._innerContainer) { + if (parent && parent.getParent() === this._innerContainer) { this._curSelectedIndex = this.getIndex(parent); break; } parent = parent.getParent(); } - this.selectedItemEvent(); + if (sender.isHighlighted()) + this._selectedItemEvent(eventType); } }, /** - * get current selected index + * Returns current selected index * @returns {number} */ getCurSelectedIndex: function () { return this._curSelectedIndex; }, - /** - * request refresh view - */ - requestRefreshView: function () { - this._refreshViewDirty = true; - }, - - refreshView: function () { - for (var i = 0; i < this._items.length; i++) { - var item = this._items[i]; - item.setLocalZOrder(i); - this.remedyLayoutParameter(item); - } - this.updateInnerContainerSize(); - }, - - sortAllChildren: function () { - ccui.ScrollView.prototype.sortAllChildren.call(this); - if (this._refreshViewDirty) { - this.refreshView(); - this._refreshViewDirty = false; - } - }, - - onSizeChanged: function () { - ccui.ScrollView.prototype.onSizeChanged.call(this); + _onSizeChanged: function () { + ccui.ScrollView.prototype._onSizeChanged.call(this); this._refreshViewDirty = true; }, /** - * Returns the "class name" of widget. + * Returns the "class name" of ccui.ListView. * @returns {string} */ getDescription: function () { return "ListView"; }, - createCloneInstance: function () { - return ccui.ListView.create(); + _createCloneInstance: function () { + return new ccui.ListView(); }, - copyClonedWidgetChildren: function (model) { + _copyClonedWidgetChildren: function (model) { var arrayItems = model.getItems(); for (var i = 0; i < arrayItems.length; i++) { var item = arrayItems[i]; @@ -446,30 +511,92 @@ ccui.ListView = ccui.ScrollView.extend(/** @lends ccui.ListView# */{ } }, - copySpecialProperties: function (listView) { - ccui.ScrollView.prototype.copySpecialProperties.call(this, listView); - this.setItemModel(listView._model); - this.setItemsMargin(listView._itemsMargin); - this.setGravity(listView._gravity); + _copySpecialProperties: function (listView) { + if(listView instanceof ccui.ListView){ + ccui.ScrollView.prototype._copySpecialProperties.call(this, listView); + this.setItemModel(listView._model); + this.setItemsMargin(listView._itemsMargin); + this.setGravity(listView._gravity); + + this._listViewEventListener = listView._listViewEventListener; + this._listViewEventSelector = listView._listViewEventSelector; + } + }, + + //v3.3 + forceDoLayout: function(){ + if (this._refreshViewDirty) { + this.refreshView(); + this._refreshViewDirty = false; + } + this._innerContainer.forceDoLayout(); } }); +/** + * allocates and initializes a UIListView. + * @deprecated since v3.0, please use new ccui.ListView() instead. + */ ccui.ListView.create = function () { - var uiListView = new ccui.ListView(); - if (uiListView && uiListView.init()) { - return uiListView; - } - return null; + return new ccui.ListView(); }; // Constants //listView event type +/** + * The flag selected item of ccui.ListView's event. + * @constant + * @type {number} + */ ccui.ListView.EVENT_SELECTED_ITEM = 0; +/** + * The flag selected item start of ccui.ListView's event. + * @constant + * @type {number} + */ +ccui.ListView.ON_SELECTED_ITEM_START = 0; +/** + * The flag selected item end of ccui.ListView's event. + * @constant + * @type {number} + */ +ccui.ListView.ON_SELECTED_ITEM_END = 1; + //listView gravity +/** + * The left flag of ccui.ListView's gravity. + * @constant + * @type {number} + */ ccui.ListView.GRAVITY_LEFT = 0; +/** + * The right flag of ccui.ListView's gravity. + * @constant + * @type {number} + */ ccui.ListView.GRAVITY_RIGHT = 1; +/** + * The center horizontal flag of ccui.ListView's gravity. + * @constant + * @type {number} + */ ccui.ListView.GRAVITY_CENTER_HORIZONTAL = 2; +/** + * The top flag of ccui.ListView's gravity. + * @constant + * @type {number} + */ ccui.ListView.GRAVITY_TOP = 3; +/** + * The bottom flag of ccui.ListView's gravity. + * @constant + * @type {number} + */ ccui.ListView.GRAVITY_BOTTOM = 4; +/** + * The center vertical flag of ccui.ListView's gravity. + * @constant + * @type {number} + */ ccui.ListView.GRAVITY_CENTER_VERTICAL = 5; \ No newline at end of file diff --git a/extensions/ccui/uiwidgets/scroll-widget/UIPageView.js b/extensions/ccui/uiwidgets/scroll-widget/UIPageView.js index ff0b8e2543..49210ef9b2 100644 --- a/extensions/ccui/uiwidgets/scroll-widget/UIPageView.js +++ b/extensions/ccui/uiwidgets/scroll-widget/UIPageView.js @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,212 +24,196 @@ ****************************************************************************/ /** - * Base class for ccui.PageView + * The PageView control of Cocos UI. * @class * @extends ccui.Layout + * @exmaple + * var pageView = new ccui.PageView(); + * pageView.setTouchEnabled(true); + * pageView.addPage(new ccui.Layout()); + * this.addChild(pageView); */ ccui.PageView = ccui.Layout.extend(/** @lends ccui.PageView# */{ _curPageIdx: 0, _pages: null, - _touchMoveDir: null, + _touchMoveDirection: null, _touchStartLocation: 0, _touchMoveStartLocation: 0, _movePagePoint: null, - _leftChild: null, - _rightChild: null, + _leftBoundaryChild: null, + _rightBoundaryChild: null, _leftBoundary: 0, _rightBoundary: 0, + _isAutoScrolling: false, _autoScrollDistance: 0, _autoScrollSpeed: 0, - _autoScrollDir: 0, + _autoScrollDirection: 0, + _childFocusCancelOffset: 0, _pageViewEventListener: null, _pageViewEventSelector: null, _className:"PageView", + //v3.2 + _customScrollThreshold: 0, + _usingCustomScrollThreshold: false, + + /** + * Allocates and initializes a UIPageView. + * Constructor of ccui.PageView. please do not call this function by yourself, you should pass the parameters to constructor to initialize it . + * @example + * // example + * var uiPageView = new ccui.PageView(); + */ ctor: function () { ccui.Layout.prototype.ctor.call(this); - this._curPageIdx = 0; this._pages = []; - this._touchMoveDir = ccui.PageView.TOUCH_DIR_LEFT; - this._touchStartLocation = 0; - this._touchMoveStartLocation = 0; + this._touchMoveDirection = ccui.PageView.TOUCH_DIR_LEFT; + this._movePagePoint = null; - this._leftChild = null; - this._rightChild = null; - this._leftBoundary = 0; - this._rightBoundary = 0; - this._isAutoScrolling = false; - this._autoScrollDistance = 0; - this._autoScrollSpeed = 0; - this._autoScrollDir = 0; + this._leftBoundaryChild = null; + this._rightBoundaryChild = null; + this._childFocusCancelOffset = 5; this._pageViewEventListener = null; this._pageViewEventSelector = null; + this.setTouchEnabled(true); }, + /** + * Initializes a ccui.PageView. Please do not call this function by yourself, you should pass the parameters to constructor to initialize it. + * @returns {boolean} + */ init: function () { if (ccui.Layout.prototype.init.call(this)) { - this._pages = []; this.setClippingEnabled(true); - this.setTouchEnabled(true); return true; } return false; }, + /** + * Calls the parent class' onEnter and schedules update function. + * @override + */ onEnter:function(){ ccui.Layout.prototype.onEnter.call(this); - this.setUpdateEnabled(true); + this.scheduleUpdate(true); }, /** - * Add a widget to a page of pageview. - * @param {ccui.Widget} widget - * @param {number} pageIdx - * @param {Boolean} forceCreate + * Add a widget to a page of PageView. + * @param {ccui.Widget} widget widget to be added to PageView. + * @param {number} pageIdx index of page. + * @param {Boolean} forceCreate if force create and there is no page exist, PageView would create a default page for adding widget. */ addWidgetToPage: function (widget, pageIdx, forceCreate) { - if (!widget) { - return; - } - if(pageIdx<0){ + if (!widget || pageIdx < 0) return; - } - var pageCount = this._pages.length; - if (pageIdx >= pageCount) { + + var pageCount = this._getPageCount(); + if (pageIdx < 0 || pageIdx >= pageCount) { if (forceCreate) { - if (pageIdx > pageCount) { + if (pageIdx > pageCount) cc.log("pageIdx is %d, it will be added as page id [%d]", pageIdx, pageCount); - } - var newPage = this.createPage(); + var newPage = this._createPage(); newPage.addChild(widget); this.addPage(newPage); } - } - else { + } else { var page = this._pages[pageIdx]; - if (page) { + if (page) page.addChild(widget); - } } }, - /** - * create page - * @returns {ccui.Layout} - */ - createPage: function () { - var newPage = ccui.Layout.create(); - newPage.setSize(this.getSize()); + _createPage: function () { + var newPage = new ccui.Layout(); + newPage.setContentSize(this.getContentSize()); return newPage; }, /** - * Push back a page to pageview. + * Adds a page to ccui.PageView. * @param {ccui.Layout} page */ addPage: function (page) { - if (!page) { - return; - } - if (page.getWidgetType() != ccui.Widget.TYPE_CONTAINER) { + if (!page || this._pages.indexOf(page) !== -1) return; - } - if (this._pages.indexOf(page) != -1) { - return; - } - var pSize = page.getSize(); - var pvSize = this.getSize(); - if (!(pSize.width==pvSize.width&&pSize.height==pvSize.height)) { - cc.log("page size does not match pageview size, it will be force sized!"); - page.setSize(pvSize); - } - page.setPosition(this.getPositionXByIndex(this._pages.length), 0); - this._pages.push(page); + this.addChild(page); - this.updateBoundaryPages(); + this._pages.push(page); + this._doLayoutDirty = true; }, /** - * Inert a page to pageview. - * @param {ccui.Layout} page - * @param {Number} idx + * Inserts a page in the specified location. + * @param {ccui.Layout} page page to be added to PageView. + * @param {Number} idx index */ insertPage: function (page, idx) { - if (idx < 0) { + if (idx < 0 || !page || this._pages.indexOf(page) !== -1) return; - } - if (!page) { - return; - } - if (page.getWidgetType() != ccui.Widget.TYPE_CONTAINER) { - return; - } - if (this._pages.indexOf(page) != -1) { - return; - } - var pageCount = this._pages.length; - if (idx >= pageCount) { + var pageCount = this._getPageCount(); + if (idx >= pageCount) this.addPage(page); - } else { - this._pages.splice(idx, 0, page); - page.setPosition(this.getPositionXByIndex(idx), 0); + this._pages[idx] = page; this.addChild(page); - var pSize = page.getSize(); - var pvSize = this.getSize(); - if (!pSize.equals(pvSize)) { - cc.log("page size does not match pageview size, it will be force sized!"); - page.setSize(pvSize); - } - var arrayPages = this._pages; - var length = arrayPages.length; - for (var i = (idx + 1); i < length; i++) { - var behindPage = arrayPages[i]; - var formerPos = behindPage.getPosition(); - behindPage.setPosition(formerPos.x + this.getSize().width, 0); - } - this.updateBoundaryPages(); } + this._doLayoutDirty = true; }, /** - * Remove a page of pageview. + * Removes a page from PageView. * @param {ccui.Layout} page */ removePage: function (page) { - if (!page) { + if (!page) return; - } this.removeChild(page); - this.updateChildrenPosition(); - this.updateBoundaryPages(); + var index = this._pages.indexOf(page); + if(index > -1) + this._pages.splice(index, 1); + this._doLayoutDirty = true; }, /** - * Remove a page at index of pageview. + * Removes a page at index of PageView. * @param {number} index */ removePageAtIndex: function (index) { - if (index < 0 || index >= this._pages.length) { + if (index < 0 || index >= this._pages.length) return; - } var page = this._pages[index]; - if (page) { + if (page) this.removePage(page); - } }, - updateBoundaryPages: function () { - if (this._pages.length <= 0) { - this._leftChild = null; - this._rightChild = null; + /** + * Removes all pages from PageView + */ + removeAllPages: function(){ + var locPages = this._pages; + for(var i = 0, len = locPages.length; i < len; i++) + this.removeChild(locPages[i]); + this._pages.length = 0; + }, + + _updateBoundaryPages: function () { + var locPages = this._pages; + if (locPages.length <= 0) { + this._leftBoundaryChild = null; + this._rightBoundaryChild = null; return; } - this._leftChild = this._pages[0]; - this._rightChild = this._pages[this._pages.length-1]; + this._leftBoundaryChild = locPages[0]; + this._rightBoundaryChild = locPages[locPages.length - 1]; + }, + + _getPageCount: function(){ + return this._pages.length; }, /** @@ -236,203 +221,192 @@ ccui.PageView = ccui.Layout.extend(/** @lends ccui.PageView# */{ * @param {number} idx * @returns {number} */ - getPositionXByIndex: function (idx) { - return (this.getSize().width * (idx - this._curPageIdx)); - }, - - /** - * Add widget - * @param {ccui.Widget} widget - * @param {Number} zOrder - * @param {Number} tag - * @returns {boolean} - */ - addChild: function (widget, zOrder, tag) { - return ccui.Layout.prototype.addChild.call(this, widget, zOrder, tag); + _getPositionXByIndex: function (idx) { + return (this.getContentSize().width * (idx - this._curPageIdx)); }, - /** - * remove widget child override - * @param {ccui.Widget} child - * @param {Boolean} cleanup - */ - removeChild: function (child, cleanup) { - if(cleanup) - cc.arrayRemoveObject(this._pages, child); - ccui.Layout.prototype.removeChild.call(this, child, cleanup); + _onSizeChanged: function () { + ccui.Layout.prototype._onSizeChanged.call(this); + this._rightBoundary = this.getContentSize().width; + this._doLayoutDirty = true; }, - onSizeChanged: function () { - ccui.Layout.prototype.onSizeChanged.call(this); - this._rightBoundary = this.getSize().width; - this.updateChildrenSize(); - this.updateChildrenPosition(); + _updateAllPagesSize: function(){ + var selfSize = this.getContentSize(); + var locPages = this._pages; + for (var i = 0, len = locPages.length; i < len; i++) + locPages[i].setContentSize(selfSize); }, - updateChildrenSize: function () { - if (!this._pages.length <= 0) { - return; - } - - var selfSize = this.getSize(); - for (var i = 0; i < this._pages.length; i++) { - var page = this._pages[i]; - page.setSize(selfSize); - } - }, - - updateChildrenPosition: function () { - if (!this._pages) { - return; - } - - var pageCount = this._pages.length; + _updateAllPagesPosition: function(){ + var pageCount = this._getPageCount(); if (pageCount <= 0) { this._curPageIdx = 0; return; } - if (this._curPageIdx >= pageCount) { - this._curPageIdx = pageCount - 1; - } - var pageWidth = this.getSize().width; - var arrayPages = this._pages; - for (var i = 0; i < pageCount; i++) { - var page = arrayPages[i]; - page.setPosition((i - this._curPageIdx) * pageWidth, 0); - } - }, - removeAllChildren: function (cleanup) { - if(cleanup) - this._pages.length = 0; - ccui.Layout.prototype.removeAllChildren.call(this, cleanup); + if (this._curPageIdx >= pageCount) + this._curPageIdx = pageCount-1; + + var pageWidth = this.getContentSize().width; + var locPages = this._pages; + for (var i=0; i< pageCount; i++) + locPages[i].setPosition(cc.p((i - this._curPageIdx) * pageWidth, 0)); }, /** - * scroll pageview to index. - * @param {number} idx + * scroll PageView to index. + * @param {number} idx index of page. */ scrollToPage: function (idx) { - if (idx < 0 || idx >= this._pages.length) { + if (idx < 0 || idx >= this._pages.length) return; - } this._curPageIdx = idx; var curPage = this._pages[idx]; - this._autoScrollDistance = -(curPage.getPositionX()); + this._autoScrollDistance = -(curPage.getPosition().x); this._autoScrollSpeed = Math.abs(this._autoScrollDistance) / 0.2; - this._autoScrollDir = this._autoScrollDistance > 0 ? 1 : 0; + this._autoScrollDirection = this._autoScrollDistance > 0 ? ccui.PageView.DIRECTION_RIGHT : ccui.PageView.DIRECTION_LEFT; this._isAutoScrolling = true; }, + /** + * Called once per frame. Time is the number of seconds of a frame interval. + * @override + * @param {Number} dt + */ update: function (dt) { - if (this._isAutoScrolling) { - switch (this._autoScrollDir) { - case 0: - var step = this._autoScrollSpeed * dt; - if (this._autoScrollDistance + step >= 0.0) { - step = -this._autoScrollDistance; - this._autoScrollDistance = 0.0; - this._isAutoScrolling = false; - } - else { - this._autoScrollDistance += step; - } - this.scrollPages(-step); - if(!this._isAutoScrolling){ - this.pageTurningEvent(); - } - break; - break; - case 1: - var step = this._autoScrollSpeed * dt; - if (this._autoScrollDistance - step <= 0.0) { - step = this._autoScrollDistance; - this._autoScrollDistance = 0.0; - this._isAutoScrolling = false; - } - else { - this._autoScrollDistance -= step; - } - this.scrollPages(step); - if(!this._isAutoScrolling){ - this.pageTurningEvent(); - } - break; - default: - break; - } - } + if (this._isAutoScrolling) + this._autoScroll(dt); }, - onTouchBegan: function (touch,event) { - var pass = ccui.Layout.prototype.onTouchBegan.call(this, touch,event); - if (this._hitted){ - this.handlePressLogic(touch.getLocation()); - } - return pass; + /** + * Does nothing. ccui.PageView's layout type is ccui.Layout.ABSOLUTE. + * @override + * @param {Number} type + */ + setLayoutType:function(type){ }, - onTouchMoved: function (touch,event) { - var touchPoint = touch.getLocation(); - this._touchMovePos.x = touchPoint.x; - this._touchMovePos.y = touchPoint.y; - this.handleMoveLogic(touchPoint); - var widgetParent = this.getWidgetParent(); - if (widgetParent) { - widgetParent.checkChildInfo(1, this, touchPoint); - } - this.moveEvent(); - if (!this.hitTest(touchPoint)) { - this.setFocused(false); - this.onTouchEnded(touch,event); + /** + * Returns the layout type of ccui.PageView. it's always ccui.Layout.ABSOLUTE. + * @returns {number} + */ + getLayoutType: function(){ + return ccui.Layout.ABSOLUTE; + }, + + _autoScroll: function(dt){ + var step; + switch (this._autoScrollDirection) { + case ccui.PageView.DIRECTION_LEFT: + step = this._autoScrollSpeed * dt; + if (this._autoScrollDistance + step >= 0.0) { + step = -this._autoScrollDistance; + this._autoScrollDistance = 0.0; + this._isAutoScrolling = false; + } else + this._autoScrollDistance += step; + this._scrollPages(-step); + if(!this._isAutoScrolling) + this._pageTurningEvent(); + break; + break; + case ccui.PageView.DIRECTION_RIGHT: + step = this._autoScrollSpeed * dt; + if (this._autoScrollDistance - step <= 0.0) { + step = this._autoScrollDistance; + this._autoScrollDistance = 0.0; + this._isAutoScrolling = false; + } else + this._autoScrollDistance -= step; + this._scrollPages(step); + if(!this._isAutoScrolling) + this._pageTurningEvent(); + break; + default: + break; } }, + /** + * The touch moved event callback handler of ccui.PageView. + * @override + * @param {cc.Touch} touch + * @param {cc.Event} event + */ + onTouchMoved: function (touch, event) { + ccui.Layout.prototype.onTouchMoved.call(this, touch, event); + if (!this._isInterceptTouch) + this._handleMoveLogic(touch); + }, + + /** + * The touch ended event callback handler of ccui.PageView. + * @override + * @param {cc.Touch} touch + * @param {cc.Event} event + */ onTouchEnded: function (touch, event) { ccui.Layout.prototype.onTouchEnded.call(this, touch, event); - this.handleReleaseLogic(this._touchEndPos); + if (!this._isInterceptTouch) + this._handleReleaseLogic(touch); + this._isInterceptTouch = false; }, + /** + * The touch canceled event callback handler of ccui.PageView. + * @param {cc.Touch} touch + * @param {cc.Event} event + */ onTouchCancelled: function (touch, event) { - var touchPoint = touch.getLocation(); ccui.Layout.prototype.onTouchCancelled.call(this, touch, event); - this.handleReleaseLogic(touchPoint); + if (!this._isInterceptTouch) + this._handleReleaseLogic(touch); + this._isInterceptTouch = false; }, - movePages: function (offset) { + _doLayout: function(){ + if (!this._doLayoutDirty) + return; + + this._updateAllPagesPosition(); + this._updateAllPagesSize(); + this._updateBoundaryPages(); + this._doLayoutDirty = false; + }, + + _movePages: function (offset) { var arrayPages = this._pages; var length = arrayPages.length; for (var i = 0; i < length; i++) { var child = arrayPages[i]; - var pos = child.getPosition(); - child.setPosition(pos.x + offset, pos.y); + //var pos = child.getPosition(); + //child.setPosition(pos.x + offset, pos.y); + child.setPositionX(child.getPositionX() + offset); } }, - scrollPages: function (touchOffset) { - if (this._pages.length <= 0) { + _scrollPages: function (touchOffset) { + if (this._pages.length <= 0) return false; - } - - if (!this._leftChild || !this._rightChild) { + if (!this._leftBoundaryChild || !this._rightBoundaryChild) return false; - } var realOffset = touchOffset; - - switch (this._touchMoveDir) { + switch (this._touchMoveDirection) { case ccui.PageView.TOUCH_DIR_LEFT: // left - if (this._rightChild.getRightInParent() + touchOffset <= this._rightBoundary) { - realOffset = this._rightBoundary - this._rightChild.getRightInParent(); - this.movePages(realOffset); + var rightBoundary = this._rightBoundaryChild.getRightBoundary(); + if (rightBoundary + touchOffset <= this._rightBoundary) { + realOffset = this._rightBoundary - rightBoundary; + this._movePages(realOffset); return false; } break; - case ccui.PageView.TOUCH_DIR_RIGHT: // right - if (this._leftChild.getLeftInParent() + touchOffset >= this._leftBoundary) { - realOffset = this._leftBoundary - this._leftChild.getLeftInParent(); - this.movePages(realOffset); + var leftBoundary = this._leftBoundaryChild.getLeftBoundary(); + if (leftBoundary + touchOffset >= this._leftBoundary) { + realOffset = this._leftBoundary - leftBoundary; + this._movePages(realOffset); return false; } break; @@ -440,104 +414,156 @@ ccui.PageView = ccui.Layout.extend(/** @lends ccui.PageView# */{ break; } - this.movePages(realOffset); + this._movePages(realOffset); return true; }, - handlePressLogic: function (touchPoint) { - var nsp = this.convertToNodeSpace(touchPoint); - this._touchMoveStartLocation = nsp.x; - this._touchStartLocation = nsp.x; + _handleMoveLogic: function (touch) { + var offset = touch.getLocation().x - touch.getPreviousLocation().x; + if (offset < 0) + this._touchMoveDirection = ccui.PageView.TOUCH_DIR_LEFT; + else if (offset > 0) + this._touchMoveDirection = ccui.PageView.TOUCH_DIR_RIGHT; + this._scrollPages(offset); }, - handleMoveLogic: function (touchPoint) { - var nsp = this.convertToNodeSpace(touchPoint); - var offset = 0.0; - var moveX = nsp.x; - offset = moveX - this._touchMoveStartLocation; - this._touchMoveStartLocation = moveX; - if (offset < 0) { - this._touchMoveDir = ccui.PageView.TOUCH_DIR_LEFT; - } - else if (offset > 0) { - this._touchMoveDir = ccui.PageView.TOUCH_DIR_RIGHT; - } - this.scrollPages(offset); + /** + * Set custom scroll threshold to page view. If you don't specify the value, the pageView will scroll when half page view width reached. + * @since v3.2 + * @param threshold + */ + setCustomScrollThreshold: function(threshold){ + cc.assert(threshold>0, "Invalid threshold!"); + this._customScrollThreshold = threshold; + this.setUsingCustomScrollThreshold(true); + }, + + /** + * Returns user defined scroll page threshold. + * @since v3.2 + */ + getCustomScrollThreshold: function(){ + return this._customScrollThreshold; }, - handleReleaseLogic: function (touchPoint) { - if (this._pages.length <= 0) { + /** + * Set using user defined scroll page threshold or not. If you set it to false, then the default scroll threshold is pageView.width / 2. + * @since v3.2 + */ + setUsingCustomScrollThreshold: function(flag){ + this._usingCustomScrollThreshold = flag; + }, + + /** + * Queries whether we are using user defined scroll page threshold or not + */ + isUsingCustomScrollThreshold: function(){ + return this._usingCustomScrollThreshold; + }, + + _handleReleaseLogic: function (touchPoint) { + if (this._pages.length <= 0) return; - } var curPage = this._pages[this._curPageIdx]; if (curPage) { var curPagePos = curPage.getPosition(); var pageCount = this._pages.length; var curPageLocation = curPagePos.x; var pageWidth = this.getSize().width; - var boundary = pageWidth / 2.0; + if (!this._usingCustomScrollThreshold) + this._customScrollThreshold = pageWidth / 2.0; + var boundary = this._customScrollThreshold; if (curPageLocation <= -boundary) { if (this._curPageIdx >= pageCount - 1) - this.scrollPages(-curPageLocation); + this._scrollPages(-curPageLocation); else this.scrollToPage(this._curPageIdx + 1); - } - else if (curPageLocation >= boundary) { + } else if (curPageLocation >= boundary) { if (this._curPageIdx <= 0) - this.scrollPages(-curPageLocation); + this._scrollPages(-curPageLocation); else this.scrollToPage(this._curPageIdx - 1); - } - else { + } else this.scrollToPage(this._curPageIdx); - } } }, - checkChildInfo: function (handleState, sender, touchPoint) { - if(this._enabled && this._touchEnabled) - this.interceptTouchEvent(handleState, sender, touchPoint); - }, - - interceptTouchEvent: function (handleState, sender, touchPoint) { - switch (handleState) { - case 0: - this.handlePressLogic(touchPoint); + /** + * Intercept touch event, handle its child's touch event. + * @param {Number} eventType event type + * @param {ccui.Widget} sender + * @param {cc.Touch} touch + */ + interceptTouchEvent: function (eventType, sender, touch) { + var touchPoint = touch.getLocation(); + switch (eventType) { + case ccui.Widget.TOUCH_BEGAN: + this._touchBeganPosition.x = touchPoint.x; + this._touchBeganPosition.y = touchPoint.y; + this._isInterceptTouch = true; break; - case 1: + case ccui.Widget.TOUCH_MOVED: + this._touchMovePosition.x = touchPoint.x; + this._touchMovePosition.y = touchPoint.y; var offset = 0; - offset = Math.abs(sender.getTouchStartPos().x - touchPoint.x); + offset = Math.abs(sender.getTouchBeganPosition().x - touchPoint.x); if (offset > this._childFocusCancelOffset) { - sender.setFocused(false); - this.handleMoveLogic(touchPoint); + sender.setHighlighted(false); + this._handleMoveLogic(touch); } break; - case 2: - this.handleReleaseLogic(touchPoint); - break; - - case 3: + case ccui.Widget.TOUCH_ENDED: + case ccui.Widget.TOUCH_CANCELED: + this._touchEndPosition.x = touchPoint.x; + this._touchEndPosition.y = touchPoint.y; + this._handleReleaseLogic(touch); + if (sender.isSwallowTouches()) + this._isInterceptTouch = false; break; } }, - pageTurningEvent: function () { - if (this._pageViewEventListener && this._pageViewEventSelector) { - this._pageViewEventSelector.call(this._pageViewEventListener, this, ccui.PageView.EVENT_TURNING); + _pageTurningEvent: function () { + if(this._pageViewEventSelector){ + if (this._pageViewEventListener) + this._pageViewEventSelector.call(this._pageViewEventListener, this, ccui.PageView.EVENT_TURNING); + else + this._pageViewEventSelector(this, ccui.PageView.EVENT_TURNING); } + if(this._ccEventCallback) + this._ccEventCallback(this, ccui.PageView.EVENT_TURNING); }, /** + * Adds event listener to ccui.PageView. * @param {Function} selector - * @param {Object} target + * @param {Object} [target=] + * @deprecated since v3.0, please use addEventListener instead. */ addEventListenerPageView: function (selector, target) { + this.addEventListener(selector, target); + }, + + /** + * Adds event listener to ccui.PageView. + * @param {Function} selector + * @param {Object} [target=] + */ + addEventListener: function(selector, target){ this._pageViewEventSelector = selector; this._pageViewEventListener = target; }, /** - * get pages + * Returns current page index + * @returns {number} + */ + getCurPageIndex: function () { + return this._curPageIdx; + }, + + /** + * Returns all pages of PageView * @returns {Array} */ getPages:function(){ @@ -545,26 +571,29 @@ ccui.PageView = ccui.Layout.extend(/** @lends ccui.PageView# */{ }, /** - * get cur page index - * @returns {number} + * Returns a page from PageView by index + * @param {Number} index + * @returns {ccui.Layout} */ - getCurPageIndex: function () { - return this._curPageIdx; + getPage: function(index){ + if (index < 0 || index >= this._pages.length) + return null; + return this._pages[index]; }, /** - * Returns the "class name" of widget. + * Returns the "class name" of ccui.PageView. * @returns {string} */ getDescription: function () { return "PageView"; }, - createCloneInstance: function () { - return ccui.PageView.create(); + _createCloneInstance: function () { + return new ccui.PageView(); }, - copyClonedWidgetChildren: function (model) { + _copyClonedWidgetChildren: function (model) { var arrayPages = model.getPages(); for (var i = 0; i < arrayPages.length; i++) { var page = arrayPages[i]; @@ -572,36 +601,57 @@ ccui.PageView = ccui.Layout.extend(/** @lends ccui.PageView# */{ } }, - copySpecialProperties: function (pageView) { - ccui.Layout.prototype.copySpecialProperties.call(this, pageView); - }, - - _doLayout: function () { - if (!this._doLayoutDirty) - return; - this._doLayoutDirty = false; + _copySpecialProperties: function (pageView) { + ccui.Layout.prototype._copySpecialProperties.call(this, pageView); + this._ccEventCallback = pageView._ccEventCallback; + this._pageViewEventListener = pageView._pageViewEventListener; + this._pageViewEventSelector = pageView._pageViewEventSelector; + this._usingCustomScrollThreshold = pageView._usingCustomScrollThreshold; + this._customScrollThreshold = pageView._customScrollThreshold; } }); /** * allocates and initializes a UIPageView. - * @constructs + * @deprecated since v3.0, please use new ccui.PageView() instead. * @return {ccui.PageView} - * @example - * // example - * var uiPageView = ccui.PageView.create(); */ ccui.PageView.create = function () { - var uiPageView = new ccui.PageView(); - if (uiPageView && uiPageView.init()) { - return uiPageView; - } - return null; + return new ccui.PageView(); }; // Constants //PageView event +/** + * The turning flag of ccui.PageView's event. + * @constant + * @type {number} + */ ccui.PageView.EVENT_TURNING = 0; //PageView touch direction +/** + * The left flag of ccui.PageView's touch direction. + * @constant + * @type {number} + */ ccui.PageView.TOUCH_DIR_LEFT = 0; -ccui.PageView.TOUCH_DIR_RIGHT = 1; \ No newline at end of file +/** + * The right flag of ccui.PageView's touch direction. + * @constant + * @type {number} + */ +ccui.PageView.TOUCH_DIR_RIGHT = 1; + +//PageView auto scroll direction +/** + * The right flag of ccui.PageView's auto scroll direction. + * @constant + * @type {number} + */ +ccui.PageView.DIRECTION_LEFT = 0; +/** + * The right flag of ccui.PageView's auto scroll direction. + * @constant + * @type {number} + */ +ccui.PageView.DIRECTION_RIGHT = 1; diff --git a/extensions/ccui/uiwidgets/scroll-widget/UIScrollView.js b/extensions/ccui/uiwidgets/scroll-widget/UIScrollView.js index 293dbe3873..db3227ffbc 100644 --- a/extensions/ccui/uiwidgets/scroll-widget/UIScrollView.js +++ b/extensions/ccui/uiwidgets/scroll-widget/UIScrollView.js @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,7 +24,7 @@ ****************************************************************************/ /** - * Base class for ccui.ScrollView + * The ScrollView control of Cocos UI * @class * @extends ccui.Layout * @@ -36,86 +37,76 @@ ccui.ScrollView = ccui.Layout.extend(/** @lends ccui.ScrollView# */{ _innerContainer: null, direction: null, - _touchBeganPoint: null, - _touchMovedPoint: null, - _touchEndedPoint: null, - _touchMovingPoint: null, _autoScrollDir: null, - _topBoundary: 0,//test - _bottomBoundary: 0,//test + + _topBoundary: 0, + _bottomBoundary: 0, _leftBoundary: 0, _rightBoundary: 0, + _bounceTopBoundary: 0, _bounceBottomBoundary: 0, _bounceLeftBoundary: 0, _bounceRightBoundary: 0, + _autoScroll: false, _autoScrollAddUpTime: 0, + _autoScrollOriginalSpeed: 0, _autoScrollAcceleration: 0, _isAutoScrollSpeedAttenuated: false, _needCheckAutoScrollDestination: false, _autoScrollDestination: null, + _bePressed: false, _slidTime: 0, _moveChildPoint: null, _childFocusCancelOffset: 0, + _leftBounceNeeded: false, _topBounceNeeded: false, _rightBounceNeeded: false, _bottomBounceNeeded: false, + bounceEnabled: false, _bouncing: false, _bounceDir: null, _bounceOriginalSpeed: 0, inertiaScrollEnabled: false, + _scrollViewEventListener: null, _scrollViewEventSelector: null, - _className:"ScrollView", + _className: "ScrollView", + + /** + * Allocates and initializes a UIScrollView. + * Constructor of ccui.ScrollView. override it to extend the construction behavior, remember to call "this._super()" in the extended "ctor" function. + * @example + * // example + * var uiScrollView = new ccui.ScrollView(); + */ ctor: function () { ccui.Layout.prototype.ctor.call(this); - this._innerContainer = null; this.direction = ccui.ScrollView.DIR_NONE; - this._touchBeganPoint = cc.p(0, 0); - this._touchMovedPoint = cc.p(0, 0); - this._touchEndedPoint = cc.p(0, 0); - this._touchMovingPoint = cc.p(0, 0); this._autoScrollDir = cc.p(0, 0); - this._topBoundary = 0;//test - this._bottomBoundary = 0;//test - this._leftBoundary = 0; - this._rightBoundary = 0; - this._bounceTopBoundary = 0; - this._bounceBottomBoundary = 0; - this._bounceLeftBoundary = 0; - this._bounceRightBoundary = 0; - this._autoScroll = false; - this._autoScrollAddUpTime = 0; - this._autoScrollOriginalSpeed = 0; + this._autoScrollAcceleration = -1000; - this._isAutoScrollSpeedAttenuated = false; - this._needCheckAutoScrollDestination = false; this._autoScrollDestination = cc.p(0, 0); - this._bePressed = false; this._slidTime = 0; this._moveChildPoint = cc.p(0, 0); this._childFocusCancelOffset = 5; - this._leftBounceNeeded = false; - this._topBounceNeeded = false; - this._rightBounceNeeded = false; - this._bottomBounceNeeded = false; - this.bounceEnabled = false; - this._bouncing = false; this._bounceDir = cc.p(0, 0); this._bounceOriginalSpeed = 0; this.inertiaScrollEnabled = true; - this._scrollViewEventListener = null; - this._scrollViewEventSelector = null; + this.setTouchEnabled(true); }, + /** + * Initializes a ccui.ScrollView. Please do not call this function by yourself, you should pass the parameters to constructor to initialize it. + * @returns {boolean} + */ init: function () { if (ccui.Layout.prototype.init.call(this)) { - this.setTouchEnabled(true); this.setClippingEnabled(true); this._innerContainer.setTouchEnabled(false); return true; @@ -123,20 +114,46 @@ ccui.ScrollView = ccui.Layout.extend(/** @lends ccui.ScrollView# */{ return false; }, - onEnter:function(){ + /** + * Calls the parent class' onEnter and schedules update function. + * @override + */ + onEnter: function () { ccui.Layout.prototype.onEnter.call(this); - this.setUpdateEnabled(true); + this.scheduleUpdate(true); + }, + + /** + * When a widget is in a layout, you could call this method to get the next focused widget within a specified direction.
+ * If the widget is not in a layout, it will return itself + * + * @param {Number} direction the direction to look for the next focused widget in a layout + * @param {ccui.Widget} current the current focused widget + * @returns {ccui.Widget} + */ + findNextFocusedWidget: function(direction, current){ + if (this.getLayoutType() === ccui.Layout.LINEAR_VERTICAL + || this.getLayoutType() === ccui.Layout.LINEAR_HORIZONTAL) { + return this._innerContainer.findNextFocusedWidget(direction, current); + } else + return ccui.Widget.prototype.findNextFocusedWidget.call(this, direction, current); }, - initRenderer: function () { - ccui.Layout.prototype.initRenderer.call(this); - this._innerContainer = ccui.Layout.create(); - ccui.Layout.prototype.addChild.call(this, this._innerContainer); + _initRenderer: function () { + ccui.Layout.prototype._initRenderer.call(this); + + this._innerContainer = new ccui.Layout(); + this._innerContainer.setColor(cc.color(255,255,255)); + this._innerContainer.setOpacity(255); + this._innerContainer.setCascadeColorEnabled(true); + this._innerContainer.setCascadeOpacityEnabled(true); + + this.addProtectedChild(this._innerContainer, 1, 1); }, - onSizeChanged: function () { - ccui.Layout.prototype.onSizeChanged.call(this); - var locSize = this._size; + _onSizeChanged: function () { + ccui.Layout.prototype._onSizeChanged.call(this); + var locSize = this._contentSize; this._topBoundary = locSize.height; this._rightBoundary = locSize.width; var bounceBoundaryParameterX = locSize.width / 3; @@ -144,170 +161,183 @@ ccui.ScrollView = ccui.Layout.extend(/** @lends ccui.ScrollView# */{ this._bounceTopBoundary = locSize.height - bounceBoundaryParameterY; this._bounceBottomBoundary = bounceBoundaryParameterY; this._bounceLeftBoundary = bounceBoundaryParameterX; - this._bounceRightBoundary = this._size.width - bounceBoundaryParameterX; - var innerSize = this._innerContainer.getSize(); - var orginInnerSizeWidth = innerSize.width; - var orginInnerSizeHeight = innerSize.height; - var innerSizeWidth = Math.max(orginInnerSizeWidth, locSize.width); - var innerSizeHeight = Math.max(orginInnerSizeHeight, locSize.height); - this._innerContainer.setSize(cc.size(innerSizeWidth, innerSizeHeight)); - this._innerContainer.setPosition(0, locSize.height - this._innerContainer.getSize().height); + this._bounceRightBoundary = locSize.width - bounceBoundaryParameterX; + var innerSize = this._innerContainer.getContentSize(); + this._innerContainer.setContentSize(cc.size(Math.max(innerSize.width, locSize.width), Math.max(innerSize.height, locSize.height))); + this._innerContainer.setPosition(0, locSize.height - this._innerContainer.getContentSize().height); }, + /** + * Changes inner container size of ScrollView.
+ * Inner container size must be larger than or equal the size of ScrollView. + * @param {cc.Size} size inner container size. + */ setInnerContainerSize: function (size) { - var locSize = this._size; - var innerSizeWidth = locSize.width; - var innerSizeHeight = locSize.height; - var originalInnerSize = this._innerContainer.getSize(); - if (size.width < locSize.width) { - cc.log("Inner width <= scrollview width, it will be force sized!"); - } - else { + var innerContainer = this._innerContainer; + var locSize = this._contentSize; + var innerSizeWidth = locSize.width, innerSizeHeight = locSize.height; + var originalInnerSize = innerContainer.getContentSize(); + if (size.width < locSize.width) + cc.log("Inner width <= ScrollView width, it will be force sized!"); + else innerSizeWidth = size.width; - } - if (size.height < locSize.height) { - cc.log("Inner height <= scrollview height, it will be force sized!"); - } - else { + + if (size.height < locSize.height) + cc.log("Inner height <= ScrollView height, it will be force sized!"); + else innerSizeHeight = size.height; - } - this._innerContainer.setSize(cc.size(innerSizeWidth, innerSizeHeight)); + + innerContainer.setContentSize(cc.size(innerSizeWidth, innerSizeHeight)); + var newInnerSize, offset; switch (this.direction) { case ccui.ScrollView.DIR_VERTICAL: - var newInnerSize = this._innerContainer.getSize(); - var offset = originalInnerSize.height - newInnerSize.height; - this.scrollChildren(0, offset); + newInnerSize = innerContainer.getContentSize(); + offset = originalInnerSize.height - newInnerSize.height; + this._scrollChildren(0, offset); break; case ccui.ScrollView.DIR_HORIZONTAL: - if (this._innerContainer.getRightInParent() <= locSize.width) { - var newInnerSize = this._innerContainer.getSize(); - var offset = originalInnerSize.width - newInnerSize.width; - this.scrollChildren(offset, 0); + if (innerContainer.getRightBoundary() <= locSize.width) { + newInnerSize = innerContainer.getContentSize(); + offset = originalInnerSize.width - newInnerSize.width; + this._scrollChildren(offset, 0); } break; case ccui.ScrollView.DIR_BOTH: - var newInnerSize = this._innerContainer.getSize(); + newInnerSize = innerContainer.getContentSize(); var offsetY = originalInnerSize.height - newInnerSize.height; - var offsetX = 0; - if (this._innerContainer.getRightInParent() <= locSize.width) { - offsetX = originalInnerSize.width - newInnerSize.width; - } - this.scrollChildren(offsetX, offsetY); + var offsetX = (innerContainer.getRightBoundary() <= locSize.width) ? originalInnerSize.width - newInnerSize.width : 0; + this._scrollChildren(offsetX, offsetY); break; default: break; } - var innerContainer = this._innerContainer; - var innerSize = innerContainer.getSize(); + + var innerSize = innerContainer.getContentSize(); var innerPos = innerContainer.getPosition(); var innerAP = innerContainer.getAnchorPoint(); - if (innerContainer.getLeftInParent() > 0.0) { + if (innerContainer.getLeftBoundary() > 0.0) innerContainer.setPosition(innerAP.x * innerSize.width, innerPos.y); - } - if (innerContainer.getRightInParent() < locSize.width) { + if (innerContainer.getRightBoundary() < locSize.width) innerContainer.setPosition(locSize.width - ((1.0 - innerAP.x) * innerSize.width), innerPos.y); - } - if (innerPos.y > 0.0) { + if (innerPos.y > 0.0) innerContainer.setPosition(innerPos.x, innerAP.y * innerSize.height); - } - if (innerContainer.getTopInParent() < locSize.height) { + if (innerContainer.getTopBoundary() < locSize.height) innerContainer.setPosition(innerPos.x, locSize.height - (1.0 - innerAP.y) * innerSize.height); + }, + + _setInnerWidth: function (width) { + var locW = this._contentSize.width, + innerWidth = locW, + container = this._innerContainer, + oldInnerWidth = container.width; + if (width < locW) + cc.log("Inner width <= scrollview width, it will be force sized!"); + else + innerWidth = width; + container.width = innerWidth; + + switch (this.direction) { + case ccui.ScrollView.DIR_HORIZONTAL: + case ccui.ScrollView.DIR_BOTH: + if (container.getRightBoundary() <= locW) { + var newInnerWidth = container.width; + var offset = oldInnerWidth - newInnerWidth; + this._scrollChildren(offset, 0); + } + break; + } + var innerAX = container.anchorX; + if (container.getLeftBoundary() > 0.0) + container.x = innerAX * innerWidth; + if (container.getRightBoundary() < locW) + container.x = locW - ((1.0 - innerAX) * innerWidth); + }, + + _setInnerHeight: function (height) { + var locH = this._contentSize.height, + innerHeight = locH, + container = this._innerContainer, + oldInnerHeight = container.height; + if (height < locH) + cc.log("Inner height <= scrollview height, it will be force sized!"); + else + innerHeight = height; + container.height = innerHeight; + + switch (this.direction) { + case ccui.ScrollView.DIR_VERTICAL: + case ccui.ScrollView.DIR_BOTH: + var newInnerHeight = innerHeight; + var offset = oldInnerHeight - newInnerHeight; + this._scrollChildren(0, offset); + break; } + var innerAY = container.anchorY; + if (container.getLeftBoundary() > 0.0) + container.y = innerAY * innerHeight; + if (container.getRightBoundary() < locH) + container.y = locH - ((1.0 - innerAY) * innerHeight); }, - _setInnerWidth: function (width) { - var locW = this._size.width, - innerWidth = locW, - container = this._innerContainer, - oldInnerWidth = container.width; - if (width < locW) - cc.log("Inner width <= scrollview width, it will be force sized!"); - else - innerWidth = width; - container.width = innerWidth; - - switch (this.direction) { - case ccui.ScrollView.DIR_HORIZONTAL: - case ccui.ScrollView.DIR_BOTH: - if (container.getRightInParent() <= locW) { - var newInnerWidth = container.width; - var offset = oldInnerWidth - newInnerWidth; - this.scrollChildren(offset, 0); - } - break; - } - var innerAX = container.anchorX; - if (container.getLeftInParent() > 0.0) { - container.x = innerAX * innerWidth; - } - if (container.getRightInParent() < locW) { - container.x = locW - ((1.0 - innerAX) * innerWidth); - } - }, - _setInnerHeight: function (height) { - var locH = this._size.height, - innerHeight = locH, - container = this._innerContainer, - oldInnerHeight = container.height; - if (height < locH) - cc.log("Inner height <= scrollview height, it will be force sized!"); - else - innerHeight = height; - container.height = innerHeight; - - switch (this.direction) { - case ccui.ScrollView.DIR_VERTICAL: - case ccui.ScrollView.DIR_BOTH: - var newInnerHeight = innerHeight; - var offset = oldInnerHeight - newInnerHeight; - this.scrollChildren(0, offset); - break; - } - var innerAY = container.anchorY; - if (container.getLeftInParent() > 0.0) { - container.y = innerAY * innerHeight; - } - if (container.getRightInParent() < locH) { - container.y = locH - ((1.0 - innerAY) * innerHeight); - } - }, + /** + * Returns inner container size of ScrollView.
+ * Inner container size must be larger than or equal ScrollView's size. + * + * @return {cc.Size} inner container size. + */ getInnerContainerSize: function () { - return this._innerContainer.getSize(); + return this._innerContainer.getContentSize(); + }, + _getInnerWidth: function () { + return this._innerContainer.width; + }, + _getInnerHeight: function () { + return this._innerContainer.height; }, - _getInnerWidth: function () { - return this._innerContainer.width; - }, - _getInnerHeight: function () { - return this._innerContainer.height; - }, /** - * Add widget - * @param {ccui.Widget} widget - * @param {Number} zOrder - * @param {Number} tag + * Add child to ccui.ScrollView. + * @param {cc.Node} widget + * @param {Number} [zOrder] + * @param {Number|string} [tag] tag or name * @returns {boolean} */ addChild: function (widget, zOrder, tag) { + if(!widget) + return false; + zOrder = zOrder || widget.getLocalZOrder(); + tag = tag || widget.getTag(); return this._innerContainer.addChild(widget, zOrder, tag); }, - removeAllChildren: function (cleanup) { - this._innerContainer.removeAllChildren(cleanup); + /** + * Removes all children. + */ + removeAllChildren: function () { + this.removeAllChildrenWithCleanup(true); }, /** - * remove widget child override + * Removes all children. + * @param {Boolean} cleanup + */ + removeAllChildrenWithCleanup: function(cleanup){ + this._innerContainer.removeAllChildrenWithCleanup(cleanup); + }, + + /** + * Removes widget child + * @override * @param {ccui.Widget} child * @param {Boolean} cleanup * @returns {boolean} */ removeChild: function (child, cleanup) { - return this._innerContainer.removeChild(child,cleanup); + return this._innerContainer.removeChild(child, cleanup); }, /** - * get inner children + * Returns inner container's children * @returns {Array} */ getChildren: function () { @@ -315,7 +345,7 @@ ccui.ScrollView = ccui.Layout.extend(/** @lends ccui.ScrollView# */{ }, /** - * get the count of inner children + * Gets the count of inner container's children * @returns {Number} */ getChildrenCount: function () { @@ -340,213 +370,154 @@ ccui.ScrollView = ccui.Layout.extend(/** @lends ccui.ScrollView# */{ return this._innerContainer.getChildByName(name); }, - /** - * Add node for scrollView - * @param {cc.Node}node - * @param {Number} zOrder - * @param {Number} tag - */ - addNode: function (node, zOrder, tag) { - this._innerContainer.addNode(node, zOrder, tag); - }, - - /** - * Get node by tag - * @param {Number} tag - * @returns {cc.Node} - */ - getNodeByTag: function (tag) { - return this._innerContainer.getNodeByTag(tag); - }, - - /** - * Get all node - * @returns {Array} - */ - getNodes: function () { - return this._innerContainer.getNodes(); - }, - - /** - * Remove a node - * @param {cc.Node} node - */ - removeNode: function (node) { - this._innerContainer.removeNode(node); - }, - - /** - * Remove a node by tag - * @param {Number} tag - */ - removeNodeByTag: function (tag) { - this._innerContainer.removeNodeByTag(tag); - }, - - /** - * Remove all node - */ - removeAllNodes: function () { - this._innerContainer.removeAllNodes(); - }, - - moveChildren: function (offsetX, offsetY) { - var pos = this._innerContainer.getPosition(); - this._moveChildPoint.x = pos.x + offsetX; - this._moveChildPoint.y = pos.y + offsetY; + _moveChildren: function (offsetX, offsetY) { + var locContainer = this._innerContainer; + //var pos = this._innerContainer.getPosition(); + this._moveChildPoint.x = locContainer.x + offsetX; + this._moveChildPoint.y = locContainer.y + offsetY; this._innerContainer.setPosition(this._moveChildPoint); }, - autoScrollChildren: function (dt) { + _autoScrollChildren: function (dt) { var lastTime = this._autoScrollAddUpTime; this._autoScrollAddUpTime += dt; if (this._isAutoScrollSpeedAttenuated) { var nowSpeed = this._autoScrollOriginalSpeed + this._autoScrollAcceleration * this._autoScrollAddUpTime; if (nowSpeed <= 0) { - this.stopAutoScrollChildren(); - this.checkNeedBounce(); + this._stopAutoScrollChildren(); + this._checkNeedBounce(); } else { var timeParam = lastTime * 2 + dt; var offset = (this._autoScrollOriginalSpeed + this._autoScrollAcceleration * timeParam * 0.5) * dt; var offsetX = offset * this._autoScrollDir.x; var offsetY = offset * this._autoScrollDir.y; - if (!this.scrollChildren(offsetX, offsetY)) { - this.stopAutoScrollChildren(); - this.checkNeedBounce(); + if (!this._scrollChildren(offsetX, offsetY)) { + this._stopAutoScrollChildren(); + this._checkNeedBounce(); } } - } - else { + } else { if (this._needCheckAutoScrollDestination) { var xOffset = this._autoScrollDir.x * dt * this._autoScrollOriginalSpeed; var yOffset = this._autoScrollDir.y * dt * this._autoScrollOriginalSpeed; - var notDone = this.checkCustomScrollDestination(xOffset, yOffset); - var scrollCheck = this.scrollChildren(xOffset, yOffset); + var notDone = this._checkCustomScrollDestination(xOffset, yOffset); + var scrollCheck = this._scrollChildren(xOffset, yOffset); if (!notDone || !scrollCheck) { - this.stopAutoScrollChildren(); - this.checkNeedBounce(); + this._stopAutoScrollChildren(); + this._checkNeedBounce(); } - } - else { - if (!this.scrollChildren(this._autoScrollDir.x * dt * this._autoScrollOriginalSpeed, this._autoScrollDir.y * dt * this._autoScrollOriginalSpeed)) { - this.stopAutoScrollChildren(); - this.checkNeedBounce(); + } else { + if (!this._scrollChildren(this._autoScrollDir.x * dt * this._autoScrollOriginalSpeed, + this._autoScrollDir.y * dt * this._autoScrollOriginalSpeed)) { + this._stopAutoScrollChildren(); + this._checkNeedBounce(); } } } }, - bounceChildren: function (dt) { + _bounceChildren: function (dt) { var locSpeed = this._bounceOriginalSpeed; var locBounceDir = this._bounceDir; - if (locSpeed <= 0.0) { - this.stopBounceChildren(); - } - if (!this.bounceScrollChildren(locBounceDir.x * dt * locSpeed, locBounceDir.y * dt * locSpeed)) { - this.stopBounceChildren(); - } + if (locSpeed <= 0.0) + this._stopBounceChildren(); + if (!this._bounceScrollChildren(locBounceDir.x * dt * locSpeed, locBounceDir.y * dt * locSpeed)) + this._stopBounceChildren(); }, - checkNeedBounce: function () { - if (!this.bounceEnabled) { + _checkNeedBounce: function () { + if (!this.bounceEnabled) return false; - } - this.checkBounceBoundary(); - if (this._topBounceNeeded || this._bottomBounceNeeded || this._leftBounceNeeded || this._rightBounceNeeded) { - if (this._topBounceNeeded && this._leftBounceNeeded) { - var scrollVector = cc.pSub(cc.p(0.0, this._size.height), cc.p(this._innerContainer.getLeftInParent(), this._innerContainer.getTopInParent())); - var orSpeed = cc.pLength(scrollVector) / 0.2; + this._checkBounceBoundary(); + var locTopBounceNeeded = this._topBounceNeeded, locBottomBounceNeeded = this._bottomBounceNeeded, + locLeftBounceNeeded = this._leftBounceNeeded, locRightBounceNeeded = this._rightBounceNeeded; + + if (locTopBounceNeeded || locBottomBounceNeeded || locLeftBounceNeeded || locRightBounceNeeded) { + var scrollVector, orSpeed; + var locContentSize = this._contentSize, locInnerContainer = this._innerContainer; + if (locTopBounceNeeded && locLeftBounceNeeded) { + scrollVector = cc.pSub(cc.p(0.0, locContentSize.height), cc.p(locInnerContainer.getLeftBoundary(), locInnerContainer.getTopBoundary())); + orSpeed = cc.pLength(scrollVector) / 0.2; this._bounceDir = cc.pNormalize(scrollVector); - this.startBounceChildren(orSpeed); - } - else if (this._topBounceNeeded && this._rightBounceNeeded) { - var scrollVector = cc.pSub(cc.p(this._size.width, this._size.height), cc.p(this._innerContainer.getRightInParent(), this._innerContainer.getTopInParent())); - var orSpeed = cc.pLength(scrollVector) / 0.2; + this._startBounceChildren(orSpeed); + } else if (locTopBounceNeeded && locRightBounceNeeded) { + scrollVector = cc.pSub(cc.p(locContentSize.width, locContentSize.height), cc.p(locInnerContainer.getRightBoundary(), locInnerContainer.getTopBoundary())); + orSpeed = cc.pLength(scrollVector) / 0.2; this._bounceDir = cc.pNormalize(scrollVector); - this.startBounceChildren(orSpeed); - } - else if (this._bottomBounceNeeded && this._leftBounceNeeded) { - var scrollVector = cc.pSub(cc.p(0, 0), cc.p(this._innerContainer.getLeftInParent(), this._innerContainer.getBottomInParent())); - var orSpeed = cc.pLength(scrollVector) / 0.2; + this._startBounceChildren(orSpeed); + } else if (locBottomBounceNeeded && locLeftBounceNeeded) { + scrollVector = cc.pSub(cc.p(0, 0), cc.p(locInnerContainer.getLeftBoundary(), locInnerContainer.getBottomBoundary())); + orSpeed = cc.pLength(scrollVector) / 0.2; this._bounceDir = cc.pNormalize(scrollVector); - this.startBounceChildren(orSpeed); - } - else if (this._bottomBounceNeeded && this._rightBounceNeeded) { - var scrollVector = cc.pSub(cc.p(this._size.width, 0.0), cc.p(this._innerContainer.getRightInParent(), this._innerContainer.getBottomInParent())); - var orSpeed = cc.pLength(scrollVector) / 0.2; + this._startBounceChildren(orSpeed); + } else if (locBottomBounceNeeded && locRightBounceNeeded) { + scrollVector = cc.pSub(cc.p(locContentSize.width, 0.0), cc.p(locInnerContainer.getRightBoundary(), locInnerContainer.getBottomBoundary())); + orSpeed = cc.pLength(scrollVector) / 0.2; this._bounceDir = cc.pNormalize(scrollVector); - this.startBounceChildren(orSpeed); - } - else if (this._topBounceNeeded) { - var scrollVector = cc.pSub(cc.p(0, this._size.height), cc.p(0.0, this._innerContainer.getTopInParent())); - var orSpeed = cc.pLength(scrollVector) / 0.2; + this._startBounceChildren(orSpeed); + } else if (locTopBounceNeeded) { + scrollVector = cc.pSub(cc.p(0, locContentSize.height), cc.p(0.0, locInnerContainer.getTopBoundary())); + orSpeed = cc.pLength(scrollVector) / 0.2; this._bounceDir = cc.pNormalize(scrollVector); - this.startBounceChildren(orSpeed); - } - else if (this._bottomBounceNeeded) { - var scrollVector = cc.pSub(cc.p(0, 0), cc.p(0.0, this._innerContainer.getBottomInParent())); - var orSpeed = cc.pLength(scrollVector) / 0.2; + this._startBounceChildren(orSpeed); + } else if (locBottomBounceNeeded) { + scrollVector = cc.pSub(cc.p(0, 0), cc.p(0.0, locInnerContainer.getBottomBoundary())); + orSpeed = cc.pLength(scrollVector) / 0.2; this._bounceDir = cc.pNormalize(scrollVector); - this.startBounceChildren(orSpeed); - } - else if (this._leftBounceNeeded) { - var scrollVector = cc.pSub(cc.p(0, 0), cc.p(this._innerContainer.getLeftInParent(), 0.0)); - var orSpeed = cc.pLength(scrollVector) / 0.2; + this._startBounceChildren(orSpeed); + } else if (locLeftBounceNeeded) { + scrollVector = cc.pSub(cc.p(0, 0), cc.p(locInnerContainer.getLeftBoundary(), 0.0)); + orSpeed = cc.pLength(scrollVector) / 0.2; this._bounceDir = cc.pNormalize(scrollVector); - this.startBounceChildren(orSpeed); - } - else if (this._rightBounceNeeded) { - var scrollVector = cc.pSub(cc.p(this._size.width, 0), cc.p(this._innerContainer.getRightInParent(), 0.0)); - var orSpeed = cc.pLength(scrollVector) / 0.2; + this._startBounceChildren(orSpeed); + } else if (locRightBounceNeeded) { + scrollVector = cc.pSub(cc.p(locContentSize.width, 0), cc.p(locInnerContainer.getRightBoundary(), 0.0)); + orSpeed = cc.pLength(scrollVector) / 0.2; this._bounceDir = cc.pNormalize(scrollVector); - this.startBounceChildren(orSpeed); + this._startBounceChildren(orSpeed); } return true; } return false; }, - checkBounceBoundary: function () { - var icBottomPos = this._innerContainer.getBottomInParent(); + _checkBounceBoundary: function () { + var locContainer = this._innerContainer; + var icBottomPos = locContainer.getBottomBoundary(); if (icBottomPos > this._bottomBoundary) { - this.scrollToBottomEvent(); + this._scrollToBottomEvent(); this._bottomBounceNeeded = true; - } - else { + } else this._bottomBounceNeeded = false; - } - var icTopPos = this._innerContainer.getTopInParent(); + + var icTopPos = locContainer.getTopBoundary(); if (icTopPos < this._topBoundary) { - this.scrollToTopEvent(); + this._scrollToTopEvent(); this._topBounceNeeded = true; - } - else { + } else this._topBounceNeeded = false; - } - var icRightPos = this._innerContainer.getRightInParent(); + + var icRightPos = locContainer.getRightBoundary(); if (icRightPos < this._rightBoundary) { - this.scrollToRightEvent(); + this._scrollToRightEvent(); this._rightBounceNeeded = true; - } - else { + } else this._rightBounceNeeded = false; - } - var icLeftPos = this._innerContainer.getLeftInParent(); + + var icLeftPos = locContainer.getLeftBoundary(); if (icLeftPos > this._leftBoundary) { - this.scrollToLeftEvent(); + this._scrollToLeftEvent(); this._leftBounceNeeded = true; - } - else { + } else this._leftBounceNeeded = false; - } }, - startBounceChildren: function (v) { + _startBounceChildren: function (v) { this._bounceOriginalSpeed = v; this._bouncing = true; }, - stopBounceChildren: function () { + _stopBounceChildren: function () { this._bouncing = false; this._bounceOriginalSpeed = 0.0; this._leftBounceNeeded = false; @@ -555,16 +526,17 @@ ccui.ScrollView = ccui.Layout.extend(/** @lends ccui.ScrollView# */{ this._bottomBounceNeeded = false; }, - startAutoScrollChildrenWithOriginalSpeed: function (dir, v, attenuated, acceleration) { - this.stopAutoScrollChildren(); - this._autoScrollDir = dir; + _startAutoScrollChildrenWithOriginalSpeed: function (dir, v, attenuated, acceleration) { + this._stopAutoScrollChildren(); + this._autoScrollDir.x = dir.x; + this._autoScrollDir.y = dir.y; this._isAutoScrollSpeedAttenuated = attenuated; this._autoScrollOriginalSpeed = v; this._autoScroll = true; this._autoScrollAcceleration = acceleration; }, - startAutoScrollChildrenWithDestination: function (des, time, attenuated) { + _startAutoScrollChildrenWithDestination: function (des, time, attenuated) { this._needCheckAutoScrollDestination = false; this._autoScrollDestination = des; var dis = cc.pSub(des, this._innerContainer.getPosition()); @@ -575,39 +547,34 @@ ccui.ScrollView = ccui.Layout.extend(/** @lends ccui.ScrollView# */{ if (attenuated) { acceleration = -(2 * disLength) / (time * time); orSpeed = 2 * disLength / time; - } - else { + } else { this._needCheckAutoScrollDestination = true; orSpeed = disLength / time; } - this.startAutoScrollChildrenWithOriginalSpeed(dir, orSpeed, attenuated, acceleration); + this._startAutoScrollChildrenWithOriginalSpeed(dir, orSpeed, attenuated, acceleration); }, - jumpToDestination: function (dstX, dstY) { - if(dstX.x !== undefined) { - dstY = dstX.y; - dstX = dstX.x; - } + _jumpToDestination: function (dstX, dstY) { + if (dstX.x !== undefined) { + dstY = dstX.y; + dstX = dstX.x; + } var finalOffsetX = dstX; var finalOffsetY = dstY; switch (this.direction) { case ccui.ScrollView.DIR_VERTICAL: - if (dstY <= 0) { - finalOffsetY = Math.max(dstY, this._size.height - this._innerContainer.getSize().height); - } + if (dstY <= 0) + finalOffsetY = Math.max(dstY, this._contentSize.height - this._innerContainer.getContentSize().height); break; case ccui.ScrollView.DIR_HORIZONTAL: - if (dstX <= 0) { - finalOffsetX = Math.max(dstX, this._size.width - this._innerContainer.getSize().width); - } + if (dstX <= 0) + finalOffsetX = Math.max(dstX, this._contentSize.width - this._innerContainer.getContentSize().width); break; case ccui.ScrollView.DIR_BOTH: - if (dstY <= 0) { - finalOffsetY = Math.max(dstY, this._size.height - this._innerContainer.getSize().height); - } - if (dstX <= 0) { - finalOffsetX = Math.max(dstX, this._size.width - this._innerContainer.getSize().width); - } + if (dstY <= 0) + finalOffsetY = Math.max(dstY, this._contentSize.height - this._innerContainer.getContentSize().height); + if (dstX <= 0) + finalOffsetX = Math.max(dstX, this._contentSize.width - this._innerContainer.getContentSize().width); break; default: break; @@ -615,251 +582,222 @@ ccui.ScrollView = ccui.Layout.extend(/** @lends ccui.ScrollView# */{ this._innerContainer.setPosition(finalOffsetX, finalOffsetY); }, - - stopAutoScrollChildren: function () { + _stopAutoScrollChildren: function () { this._autoScroll = false; this._autoScrollOriginalSpeed = 0; this._autoScrollAddUpTime = 0; }, - bounceScrollChildren: function (touchOffsetX, touchOffsetY) { + _bounceScrollChildren: function (touchOffsetX, touchOffsetY) { var scrollEnabled = true; - if (touchOffsetX > 0.0 && touchOffsetY > 0.0) //first quadrant //bounce to top-right - { - var realOffsetX = touchOffsetX; - var realOffsetY = touchOffsetY; - var icRightPos = this._innerContainer.getRightInParent(); + var realOffsetX, realOffsetY, icRightPos, icTopPos, icBottomPos; + var locContainer = this._innerContainer; + if (touchOffsetX > 0.0 && touchOffsetY > 0.0){ //first quadrant //bounce to top-right + realOffsetX = touchOffsetX; + realOffsetY = touchOffsetY; + icRightPos = locContainer.getRightBoundary(); if (icRightPos + realOffsetX >= this._rightBoundary) { realOffsetX = this._rightBoundary - icRightPos; - this.bounceRightEvent(); + this._bounceRightEvent(); scrollEnabled = false; } - var icTopPos = this._innerContainer.getTopInParent(); + icTopPos = locContainer.getTopBoundary(); if (icTopPos + touchOffsetY >= this._topBoundary) { realOffsetY = this._topBoundary - icTopPos; - this.bounceTopEvent(); + this._bounceTopEvent(); scrollEnabled = false; } - this.moveChildren(realOffsetX, realOffsetY); - } - else if (touchOffsetX < 0.0 && touchOffsetY > 0.0) //second quadrant //bounce to top-left - { - var realOffsetX = touchOffsetX; - var realOffsetY = touchOffsetY; - var icLefrPos = this._innerContainer.getLeftInParent(); + this._moveChildren(realOffsetX, realOffsetY); + } else if (touchOffsetX < 0.0 && touchOffsetY > 0.0){ //second quadrant //bounce to top-left + realOffsetX = touchOffsetX; + realOffsetY = touchOffsetY; + icLefrPos = locContainer.getLeftBoundary(); if (icLefrPos + realOffsetX <= this._leftBoundary) { realOffsetX = this._leftBoundary - icLefrPos; - this.bounceLeftEvent(); + this._bounceLeftEvent(); scrollEnabled = false; } - var icTopPos = this._innerContainer.getTopInParent(); + icTopPos = locContainer.getTopBoundary(); if (icTopPos + touchOffsetY >= this._topBoundary) { realOffsetY = this._topBoundary - icTopPos; - this.bounceTopEvent(); + this._bounceTopEvent(); scrollEnabled = false; } - this.moveChildren(realOffsetX, realOffsetY); - } - else if (touchOffsetX < 0.0 && touchOffsetY < 0.0) //third quadrant //bounce to bottom-left - { - var realOffsetX = touchOffsetX; - var realOffsetY = touchOffsetY; - var icLefrPos = this._innerContainer.getLeftInParent(); + this._moveChildren(realOffsetX, realOffsetY); + }else if (touchOffsetX < 0.0 && touchOffsetY < 0.0){ //third quadrant //bounce to bottom-left + realOffsetX = touchOffsetX; + realOffsetY = touchOffsetY; + var icLefrPos = locContainer.getLeftBoundary(); if (icLefrPos + realOffsetX <= this._leftBoundary) { realOffsetX = this._leftBoundary - icLefrPos; - this.bounceLeftEvent(); + this._bounceLeftEvent(); scrollEnabled = false; } - var icBottomPos = this._innerContainer.getBottomInParent(); + icBottomPos = locContainer.getBottomBoundary(); if (icBottomPos + touchOffsetY <= this._bottomBoundary) { realOffsetY = this._bottomBoundary - icBottomPos; - this.bounceBottomEvent(); + this._bounceBottomEvent(); scrollEnabled = false; } - this.moveChildren(realOffsetX, realOffsetY); - } - else if (touchOffsetX > 0.0 && touchOffsetY < 0.0) //forth quadrant //bounce to bottom-right - { - var realOffsetX = touchOffsetX; - var realOffsetY = touchOffsetY; - var icRightPos = this._innerContainer.getRightInParent(); + this._moveChildren(realOffsetX, realOffsetY); + } else if (touchOffsetX > 0.0 && touchOffsetY < 0.0){ //forth quadrant //bounce to bottom-right + realOffsetX = touchOffsetX; + realOffsetY = touchOffsetY; + icRightPos = locContainer.getRightBoundary(); if (icRightPos + realOffsetX >= this._rightBoundary) { realOffsetX = this._rightBoundary - icRightPos; - this.bounceRightEvent(); + this._bounceRightEvent(); scrollEnabled = false; } - var icBottomPos = this._innerContainer.getBottomInParent(); + icBottomPos = locContainer.getBottomBoundary(); if (icBottomPos + touchOffsetY <= this._bottomBoundary) { realOffsetY = this._bottomBoundary - icBottomPos; - this.bounceBottomEvent(); + this._bounceBottomEvent(); scrollEnabled = false; } - this.moveChildren(realOffsetX, realOffsetY); - } - else if (touchOffsetX == 0.0 && touchOffsetY > 0.0) // bounce to top - { - var realOffsetY = touchOffsetY; - var icTopPos = this._innerContainer.getTopInParent(); + this._moveChildren(realOffsetX, realOffsetY); + } else if (touchOffsetX === 0.0 && touchOffsetY > 0.0){ // bounce to top + realOffsetY = touchOffsetY; + icTopPos = locContainer.getTopBoundary(); if (icTopPos + touchOffsetY >= this._topBoundary) { realOffsetY = this._topBoundary - icTopPos; - this.bounceTopEvent(); + this._bounceTopEvent(); scrollEnabled = false; } - this.moveChildren(0.0, realOffsetY); - } - else if (touchOffsetX == 0.0 && touchOffsetY < 0.0) //bounce to bottom - { - var realOffsetY = touchOffsetY; - var icBottomPos = this._innerContainer.getBottomInParent(); + this._moveChildren(0.0, realOffsetY); + } else if (touchOffsetX === 0.0 && touchOffsetY < 0.0) {//bounce to bottom + realOffsetY = touchOffsetY; + icBottomPos = locContainer.getBottomBoundary(); if (icBottomPos + touchOffsetY <= this._bottomBoundary) { realOffsetY = this._bottomBoundary - icBottomPos; - this.bounceBottomEvent(); + this._bounceBottomEvent(); scrollEnabled = false; } - this.moveChildren(0.0, realOffsetY); - } - else if (touchOffsetX > 0.0 && touchOffsetY == 0.0) //bounce to right - { - var realOffsetX = touchOffsetX; - var icRightPos = this._innerContainer.getRightInParent(); + this._moveChildren(0.0, realOffsetY); + } else if (touchOffsetX > 0.0 && touchOffsetY === 0.0){ //bounce to right + realOffsetX = touchOffsetX; + icRightPos = locContainer.getRightBoundary(); if (icRightPos + realOffsetX >= this._rightBoundary) { realOffsetX = this._rightBoundary - icRightPos; - this.bounceRightEvent(); + this._bounceRightEvent(); scrollEnabled = false; } - this.moveChildren(realOffsetX, 0.0); - } - else if (touchOffsetX < 0.0 && touchOffsetY == 0.0) //bounce to left - { - var realOffsetX = touchOffsetX; - var icLeftPos = this._innerContainer.getLeftInParent(); + this._moveChildren(realOffsetX, 0.0); + }else if (touchOffsetX < 0.0 && touchOffsetY === 0.0){ //bounce to left + realOffsetX = touchOffsetX; + var icLeftPos = locContainer.getLeftBoundary(); if (icLeftPos + realOffsetX <= this._leftBoundary) { realOffsetX = this._leftBoundary - icLeftPos; - this.bounceLeftEvent(); + this._bounceLeftEvent(); scrollEnabled = false; } - this.moveChildren(realOffsetX, 0.0); + this._moveChildren(realOffsetX, 0.0); } return scrollEnabled; }, - checkCustomScrollDestination: function (touchOffsetX, touchOffsetY) { + _checkCustomScrollDestination: function (touchOffsetX, touchOffsetY) { var scrollEnabled = true; + var icBottomPos, icLeftPos, icRightPos, icTopPos; + var locContainer = this._innerContainer, locDestination = this._autoScrollDestination; switch (this.direction) { - case ccui.ScrollView.DIR_VERTICAL: // vertical + case ccui.ScrollView.DIR_VERTICAL: if (this._autoScrollDir.y > 0) { - var icBottomPos = this._innerContainer.getBottomInParent(); - if (icBottomPos + touchOffsetY >= this._autoScrollDestination.y) { - touchOffsetY = this._autoScrollDestination.y - icBottomPos; + icBottomPos = locContainer.getBottomBoundary(); + if (icBottomPos + touchOffsetY >= locDestination.y) { + touchOffsetY = locDestination.y - icBottomPos; scrollEnabled = false; } - } - else { - var icBottomPos = this._innerContainer.getBottomInParent(); - if (icBottomPos + touchOffsetY <= this._autoScrollDestination.y) { - touchOffsetY = this._autoScrollDestination.y - icBottomPos; + } else { + icBottomPos = locContainer.getBottomBoundary(); + if (icBottomPos + touchOffsetY <= locDestination.y) { + touchOffsetY = locDestination.y - icBottomPos; scrollEnabled = false; } } break; - case ccui.ScrollView.DIR_HORIZONTAL: // horizontal + case ccui.ScrollView.DIR_HORIZONTAL: if (this._autoScrollDir.x > 0) { - var icLeftPos = this._innerContainer.getLeftInParent(); - if (icLeftPos + touchOffsetX >= this._autoScrollDestination.x) { - touchOffsetX = this._autoScrollDestination.x - icLeftPos; + icLeftPos = locContainer.getLeftBoundary(); + if (icLeftPos + touchOffsetX >= locDestination.x) { + touchOffsetX = locDestination.x - icLeftPos; scrollEnabled = false; } - } - else { - var icLeftPos = this._innerContainer.getLeftInParent(); - if (icLeftPos + touchOffsetX <= this._autoScrollDestination.x) { - touchOffsetX = this._autoScrollDestination.x - icLeftPos; + } else { + icLeftPos = locContainer.getLeftBoundary(); + if (icLeftPos + touchOffsetX <= locDestination.x) { + touchOffsetX = locDestination.x - icLeftPos; scrollEnabled = false; } } break; case ccui.ScrollView.DIR_BOTH: - if (touchOffsetX > 0.0 && touchOffsetY > 0.0) // up right - { - var icLeftPos = this._innerContainer.getLeftInParent(); - if (icLeftPos + touchOffsetX >= this._autoScrollDestination.x) { - touchOffsetX = this._autoScrollDestination.x - icLeftPos; + if (touchOffsetX > 0.0 && touchOffsetY > 0.0){ // up right + icLeftPos = locContainer.getLeftBoundary(); + if (icLeftPos + touchOffsetX >= locDestination.x) { + touchOffsetX = locDestination.x - icLeftPos; scrollEnabled = false; } - var icBottomPos = this._innerContainer.getBottomInParent(); - if (icBottomPos + touchOffsetY >= this._autoScrollDestination.y) { - touchOffsetY = this._autoScrollDestination.y - icBottomPos; + icBottomPos = locContainer.getBottomBoundary(); + if (icBottomPos + touchOffsetY >= locDestination.y) { + touchOffsetY = locDestination.y - icBottomPos; scrollEnabled = false; } - } - else if (touchOffsetX < 0.0 && touchOffsetY > 0.0) // up left - { - var icRightPos = this._innerContainer.getRightInParent(); - if (icRightPos + touchOffsetX <= this._autoScrollDestination.x) { - touchOffsetX = this._autoScrollDestination.x - icRightPos; + } else if (touchOffsetX < 0.0 && touchOffsetY > 0.0){ // up left + icRightPos = locContainer.getRightBoundary(); + if (icRightPos + touchOffsetX <= locDestination.x) { + touchOffsetX = locDestination.x - icRightPos; scrollEnabled = false; } - var icBottomPos = this._innerContainer.getBottomInParent(); - if (icBottomPos + touchOffsetY >= this._autoScrollDestination.y) { - touchOffsetY = this._autoScrollDestination.y - icBottomPos; + icBottomPos = locContainer.getBottomBoundary(); + if (icBottomPos + touchOffsetY >= locDestination.y) { + touchOffsetY = locDestination.y - icBottomPos; scrollEnabled = false; } - } - else if (touchOffsetX < 0.0 && touchOffsetY < 0.0) // down left - { - var icRightPos = this._innerContainer.getRightInParent(); - if (icRightPos + touchOffsetX <= this._autoScrollDestination.x) { - touchOffsetX = this._autoScrollDestination.x - icRightPos; + } else if (touchOffsetX < 0.0 && touchOffsetY < 0.0){ // down left + icRightPos = locContainer.getRightBoundary(); + if (icRightPos + touchOffsetX <= locDestination.x) { + touchOffsetX = locDestination.x - icRightPos; scrollEnabled = false; } - var icTopPos = this._innerContainer.getTopInParent(); - if (icTopPos + touchOffsetY <= this._autoScrollDestination.y) { - touchOffsetY = this._autoScrollDestination.y - icTopPos; + icTopPos = locContainer.getTopBoundary(); + if (icTopPos + touchOffsetY <= locDestination.y) { + touchOffsetY = locDestination.y - icTopPos; scrollEnabled = false; } - } - else if (touchOffsetX > 0.0 && touchOffsetY < 0.0) // down right - { - var icLeftPos = this._innerContainer.getLeftInParent(); - if (icLeftPos + touchOffsetX >= this._autoScrollDestination.x) { - touchOffsetX = this._autoScrollDestination.x - icLeftPos; + } else if (touchOffsetX > 0.0 && touchOffsetY < 0.0){ // down right + icLeftPos = locContainer.getLeftBoundary(); + if (icLeftPos + touchOffsetX >= locDestination.x) { + touchOffsetX = locDestination.x - icLeftPos; scrollEnabled = false; } - var icTopPos = this._innerContainer.getTopInParent(); - if (icTopPos + touchOffsetY <= this._autoScrollDestination.y) { - touchOffsetY = this._autoScrollDestination.y - icTopPos; + icTopPos = locContainer.getTopBoundary(); + if (icTopPos + touchOffsetY <= locDestination.y) { + touchOffsetY = locDestination.y - icTopPos; scrollEnabled = false; } - } - else if (touchOffsetX == 0.0 && touchOffsetY > 0.0) // up - { - var icBottomPos = this._innerContainer.getBottomInParent(); - if (icBottomPos + touchOffsetY >= this._autoScrollDestination.y) { - touchOffsetY = this._autoScrollDestination.y - icBottomPos; + } else if (touchOffsetX === 0.0 && touchOffsetY > 0.0){ // up + icBottomPos = locContainer.getBottomBoundary(); + if (icBottomPos + touchOffsetY >= locDestination.y) { + touchOffsetY = locDestination.y - icBottomPos; scrollEnabled = false; } - } - else if (touchOffsetX < 0.0 && touchOffsetY == 0.0) // left - { - var icRightPos = this._innerContainer.getRightInParent(); - if (icRightPos + touchOffsetX <= this._autoScrollDestination.x) { - touchOffsetX = this._autoScrollDestination.x - icRightPos; + } else if (touchOffsetX < 0.0 && touchOffsetY === 0.0){ // left + icRightPos = locContainer.getRightBoundary(); + if (icRightPos + touchOffsetX <= locDestination.x) { + touchOffsetX = locDestination.x - icRightPos; scrollEnabled = false; } - } - else if (touchOffsetX == 0.0 && touchOffsetY < 0.0) // down - { - var icTopPos = this._innerContainer.getTopInParent(); - if (icTopPos + touchOffsetY <= this._autoScrollDestination.y) { - touchOffsetY = this._autoScrollDestination.y - icTopPos; + } else if (touchOffsetX === 0.0 && touchOffsetY < 0.0){ // down + icTopPos = locContainer.getTopBoundary(); + if (icTopPos + touchOffsetY <= locDestination.y) { + touchOffsetY = locDestination.y - icTopPos; scrollEnabled = false; } - } - else if (touchOffsetX > 0.0 && touchOffsetY == 0.0) // right - { - var icLeftPos = this._innerContainer.getLeftInParent(); - if (icLeftPos + touchOffsetX >= this._autoScrollDestination.x) { - touchOffsetX = this._autoScrollDestination.x - icLeftPos; + } else if (touchOffsetX > 0.0 && touchOffsetY === 0.0){ // right + icLeftPos = locContainer.getLeftBoundary(); + if (icLeftPos + touchOffsetX >= locDestination.x) { + touchOffsetX = locDestination.x - icLeftPos; scrollEnabled = false; } } @@ -870,280 +808,18 @@ ccui.ScrollView = ccui.Layout.extend(/** @lends ccui.ScrollView# */{ return scrollEnabled; }, - - getCurAutoScrollDistance: function (dt) { - this._autoScrollOriginalSpeed -= this._autoScrollAcceleration * dt; - return this._autoScrollOriginalSpeed * dt; - }, - - scrollChildren: function (touchOffsetX, touchOffsetY) { + _scrollChildren: function (touchOffsetX, touchOffsetY) { var scrollEnabled = true; - this.scrollingEvent(); + this._scrollingEvent(); switch (this.direction) { case ccui.ScrollView.DIR_VERTICAL: // vertical - var realOffset = touchOffsetY; - if (this.bounceEnabled) { - var icBottomPos = this._innerContainer.getBottomInParent(); - if (icBottomPos + touchOffsetY >= this._bounceBottomBoundary) { - realOffset = this._bounceBottomBoundary - icBottomPos; - this.scrollToBottomEvent(); - scrollEnabled = false; - } - var icTopPos = this._innerContainer.getTopInParent(); - if (icTopPos + touchOffsetY <= this._bounceTopBoundary) { - realOffset = this._bounceTopBoundary - icTopPos; - this.scrollToTopEvent(); - scrollEnabled = false; - } - } - else { - var icBottomPos = this._innerContainer.getBottomInParent(); - if (icBottomPos + touchOffsetY >= this._bottomBoundary) { - realOffset = this._bottomBoundary - icBottomPos; - this.scrollToBottomEvent(); - scrollEnabled = false; - } - var icTopPos = this._innerContainer.getTopInParent(); - if (icTopPos + touchOffsetY <= this._topBoundary) { - realOffset = this._topBoundary - icTopPos; - this.scrollToTopEvent(); - scrollEnabled = false; - } - } - this.moveChildren(0.0, realOffset); + scrollEnabled = this._scrollChildrenVertical(touchOffsetX, touchOffsetY); break; case ccui.ScrollView.DIR_HORIZONTAL: // horizontal - var realOffset = touchOffsetX; - if (this.bounceEnabled) { - var icRightPos = this._innerContainer.getRightInParent(); - if (icRightPos + touchOffsetX <= this._bounceRightBoundary) { - realOffset = this._bounceRightBoundary - icRightPos; - this.scrollToRightEvent(); - scrollEnabled = false; - } - var icLeftPos = this._innerContainer.getLeftInParent(); - if (icLeftPos + touchOffsetX >= this._bounceLeftBoundary) { - realOffset = this._bounceLeftBoundary - icLeftPos; - this.scrollToLeftEvent(); - scrollEnabled = false; - } - } - else { - var icRightPos = this._innerContainer.getRightInParent(); - if (icRightPos + touchOffsetX <= this._rightBoundary) { - realOffset = this._rightBoundary - icRightPos; - this.scrollToRightEvent(); - scrollEnabled = false; - } - var icLeftPos = this._innerContainer.getLeftInParent(); - if (icLeftPos + touchOffsetX >= this._leftBoundary) { - realOffset = this._leftBoundary - icLeftPos; - this.scrollToLeftEvent(); - scrollEnabled = false; - } - } - this.moveChildren(realOffset, 0.0); + scrollEnabled = this._scrollChildrenHorizontal(touchOffsetX, touchOffsetY); break; case ccui.ScrollView.DIR_BOTH: - var realOffsetX = touchOffsetX; - var realOffsetY = touchOffsetY; - if (this.bounceEnabled) { - if (touchOffsetX > 0.0 && touchOffsetY > 0.0) // up right - { - var icLeftPos = this._innerContainer.getLeftInParent(); - if (icLeftPos + touchOffsetX >= this._bounceLeftBoundary) { - realOffsetX = this._bounceLeftBoundary - icLeftPos; - this.scrollToLeftEvent(); - scrollEnabled = false; - } - var icBottomPos = this._innerContainer.getBottomInParent(); - if (icBottomPos + touchOffsetY >= this._bounceBottomBoundary) { - realOffsetY = this._bounceBottomBoundary - icBottomPos; - this.scrollToBottomEvent(); - scrollEnabled = false; - } - } - else if (touchOffsetX < 0.0 && touchOffsetY > 0.0) // up left - { - var icRightPos = this._innerContainer.getRightInParent(); - if (icRightPos + touchOffsetX <= this._bounceRightBoundary) { - realOffsetX = this._bounceRightBoundary - icRightPos; - this.scrollToRightEvent(); - scrollEnabled = false; - } - var icBottomPos = this._innerContainer.getBottomInParent(); - if (icBottomPos + touchOffsetY >= this._bounceBottomBoundary) { - realOffsetY = this._bounceBottomBoundary - icBottomPos; - this.scrollToBottomEvent(); - scrollEnabled = false; - } - } - else if (touchOffsetX < 0.0 && touchOffsetY < 0.0) // down left - { - var icRightPos = this._innerContainer.getRightInParent(); - if (icRightPos + touchOffsetX <= this._bounceRightBoundary) { - realOffsetX = this._bounceRightBoundary - icRightPos; - this.scrollToRightEvent(); - scrollEnabled = false; - } - var icTopPos = this._innerContainer.getTopInParent(); - if (icTopPos + touchOffsetY <= this._bounceTopBoundary) { - realOffsetY = this._bounceTopBoundary - icTopPos; - this.scrollToTopEvent(); - scrollEnabled = false; - } - } - else if (touchOffsetX > 0.0 && touchOffsetY < 0.0) // down right - { - var icLeftPos = this._innerContainer.getLeftInParent(); - if (icLeftPos + touchOffsetX >= this._bounceLeftBoundary) { - realOffsetX = this._bounceLeftBoundary - icLeftPos; - this.scrollToLeftEvent(); - scrollEnabled = false; - } - var icTopPos = this._innerContainer.getTopInParent(); - if (icTopPos + touchOffsetY <= this._bounceTopBoundary) { - realOffsetY = this._bounceTopBoundary - icTopPos; - this.scrollToTopEvent(); - scrollEnabled = false; - } - } - else if (touchOffsetX == 0.0 && touchOffsetY > 0.0) // up - { - var icBottomPos = this._innerContainer.getBottomInParent(); - if (icBottomPos + touchOffsetY >= this._bounceBottomBoundary) { - realOffsetY = this._bounceBottomBoundary - icBottomPos; - this.scrollToBottomEvent(); - scrollEnabled = false; - } - } - else if (touchOffsetX < 0.0 && touchOffsetY == 0.0) // left - { - var icRightPos = this._innerContainer.getRightInParent(); - if (icRightPos + touchOffsetX <= this._bounceRightBoundary) { - realOffsetX = this._bounceRightBoundary - icRightPos; - this.scrollToRightEvent(); - scrollEnabled = false; - } - } - else if (touchOffsetX == 0.0 && touchOffsetY < 0.0) // down - { - var icTopPos = this._innerContainer.getTopInParent(); - if (icTopPos + touchOffsetY <= this._bounceTopBoundary) { - realOffsetY = this._bounceTopBoundary - icTopPos; - this.scrollToTopEvent(); - scrollEnabled = false; - } - } - else if (touchOffsetX > 0.0 && touchOffsetY == 0.0) // right - { - var icLeftPos = this._innerContainer.getLeftInParent(); - if (icLeftPos + touchOffsetX >= this._bounceLeftBoundary) { - realOffsetX = this._bounceLeftBoundary - icLeftPos; - this.scrollToLeftEvent(); - scrollEnabled = false; - } - } - } - else { - if (touchOffsetX > 0.0 && touchOffsetY > 0.0) // up right - { - var icLeftPos = this._innerContainer.getLeftInParent(); - if (icLeftPos + touchOffsetX >= this._leftBoundary) { - realOffsetX = this._leftBoundary - icLeftPos; - this.scrollToLeftEvent(); - scrollEnabled = false; - } - var icBottomPos = this._innerContainer.getBottomInParent(); - if (icBottomPos + touchOffsetY >= this._bottomBoundary) { - realOffsetY = this._bottomBoundary - icBottomPos; - this.scrollToBottomEvent(); - scrollEnabled = false; - } - } - else if (touchOffsetX < 0.0 && touchOffsetY > 0.0) // up left - { - var icRightPos = this._innerContainer.getRightInParent(); - if (icRightPos + touchOffsetX <= this._rightBoundary) { - realOffsetX = this._rightBoundary - icRightPos; - this.scrollToRightEvent(); - scrollEnabled = false; - } - var icBottomPos = this._innerContainer.getBottomInParent(); - if (icBottomPos + touchOffsetY >= this._bottomBoundary) { - realOffsetY = this._bottomBoundary - icBottomPos; - this.scrollToBottomEvent(); - scrollEnabled = false; - } - } - else if (touchOffsetX < 0 && touchOffsetY < 0) // down left - { - var icRightPos = this._innerContainer.getRightInParent(); - if (icRightPos + touchOffsetX <= this._rightBoundary) { - realOffsetX = this._rightBoundary - icRightPos; - this.scrollToRightEvent(); - scrollEnabled = false; - } - var icTopPos = this._innerContainer.getTopInParent(); - if (icTopPos + touchOffsetY <= this._topBoundary) { - realOffsetY = this._topBoundary - icTopPos; - this.scrollToTopEvent(); - scrollEnabled = false; - } - } - else if (touchOffsetX > 0 && touchOffsetY < 0) // down right - { - var icLeftPos = this._innerContainer.getLeftInParent(); - if (icLeftPos + touchOffsetX >= this._leftBoundary) { - realOffsetX = this._leftBoundary - icLeftPos; - this.scrollToLeftEvent(); - scrollEnabled = false; - } - var icTopPos = this._innerContainer.getTopInParent(); - if (icTopPos + touchOffsetY <= this._topBoundary) { - realOffsetY = this._topBoundary - icTopPos; - this.scrollToTopEvent(); - scrollEnabled = false; - } - } - else if (touchOffsetX == 0.0 && touchOffsetY > 0.0) // up - { - var icBottomPos = this._innerContainer.getBottomInParent(); - if (icBottomPos + touchOffsetY >= this._bottomBoundary) { - realOffsetY = this._bottomBoundary - icBottomPos; - this.scrollToBottomEvent(); - scrollEnabled = false; - } - } - else if (touchOffsetX < 0.0 && touchOffsetY == 0.0) // left - { - var icRightPos = this._innerContainer.getRightInParent(); - if (icRightPos + touchOffsetX <= this._rightBoundary) { - realOffsetX = this._rightBoundary - icRightPos; - this.scrollToRightEvent(); - scrollEnabled = false; - } - } - else if (touchOffsetX == 0.0 && touchOffsetY < 0) // down - { - var icTopPos = this._innerContainer.getTopInParent(); - if (icTopPos + touchOffsetY <= this._topBoundary) { - realOffsetY = this._topBoundary - icTopPos; - this.scrollToTopEvent(); - scrollEnabled = false; - } - } - else if (touchOffsetX > 0 && touchOffsetY == 0) // right - { - var icLeftPos = this._innerContainer.getLeftInParent(); - if (icLeftPos + touchOffsetX >= this._leftBoundary) { - realOffsetX = this._leftBoundary - icLeftPos; - this.scrollToLeftEvent(); - scrollEnabled = false; - } - } - } - this.moveChildren(realOffsetX, realOffsetY); + scrollEnabled = this._scrollChildrenBoth(touchOffsetX, touchOffsetY); break; default: break; @@ -1151,379 +827,789 @@ ccui.ScrollView = ccui.Layout.extend(/** @lends ccui.ScrollView# */{ return scrollEnabled; }, + _scrollChildrenVertical: function(touchOffsetX, touchOffsetY){ + var realOffset = touchOffsetY; + var scrollEnabled = true; + var icBottomPos, icTopPos, locContainer = this._innerContainer; + if (this.bounceEnabled) { + icBottomPos = locContainer.getBottomBoundary(); + if (icBottomPos + touchOffsetY >= this._bounceBottomBoundary) { + realOffset = this._bounceBottomBoundary - icBottomPos; + this._scrollToBottomEvent(); + scrollEnabled = false; + } + icTopPos = locContainer.getTopBoundary(); + if (icTopPos + touchOffsetY <= this._bounceTopBoundary) { + realOffset = this._bounceTopBoundary - icTopPos; + this._scrollToTopEvent(); + scrollEnabled = false; + + } + } else { + icBottomPos = locContainer.getBottomBoundary(); + if (icBottomPos + touchOffsetY >= this._bottomBoundary){ + realOffset = this._bottomBoundary - icBottomPos; + this._scrollToBottomEvent(); + scrollEnabled = false; + } + icTopPos = locContainer.getTopBoundary(); + if (icTopPos + touchOffsetY <= this._topBoundary) { + realOffset = this._topBoundary - icTopPos; + this._scrollToTopEvent(); + scrollEnabled = false; + } + } + this._moveChildren(0.0, realOffset); + return scrollEnabled; + }, + + _scrollChildrenHorizontal: function(touchOffsetX, touchOffestY){ + var scrollEnabled = true; + var realOffset = touchOffsetX; + var icRightPos, icLeftPos, locContainer = this._innerContainer; + if (this.bounceEnabled){ + icRightPos = locContainer.getRightBoundary(); + if (icRightPos + touchOffsetX <= this._bounceRightBoundary) { + realOffset = this._bounceRightBoundary - icRightPos; + this._scrollToRightEvent(); + scrollEnabled = false; + } + icLeftPos = locContainer.getLeftBoundary(); + if (icLeftPos + touchOffsetX >= this._bounceLeftBoundary) { + realOffset = this._bounceLeftBoundary - icLeftPos; + this._scrollToLeftEvent(); + scrollEnabled = false; + } + } else { + icRightPos = locContainer.getRightBoundary(); + if (icRightPos + touchOffsetX <= this._rightBoundary) { + realOffset = this._rightBoundary - icRightPos; + this._scrollToRightEvent(); + scrollEnabled = false; + } + icLeftPos = locContainer.getLeftBoundary(); + if (icLeftPos + touchOffsetX >= this._leftBoundary) { + realOffset = this._leftBoundary - icLeftPos; + this._scrollToLeftEvent(); + scrollEnabled = false; + } + } + this._moveChildren(realOffset, 0.0); + return scrollEnabled; + }, + + _scrollChildrenBoth: function (touchOffsetX, touchOffsetY) { + var scrollEnabled = true; + var realOffsetX = touchOffsetX; + var realOffsetY = touchOffsetY; + var icLeftPos, icBottomPos, icRightPos, icTopPos; + var locContainer = this._innerContainer; + if (this.bounceEnabled) { + if (touchOffsetX > 0.0 && touchOffsetY > 0.0) { // up right + icLeftPos = locContainer.getLeftBoundary(); + if (icLeftPos + touchOffsetX >= this._bounceLeftBoundary) { + realOffsetX = this._bounceLeftBoundary - icLeftPos; + this._scrollToLeftEvent(); + scrollEnabled = false; + } + icBottomPos = locContainer.getBottomBoundary(); + if (icBottomPos + touchOffsetY >= this._bounceBottomBoundary) { + realOffsetY = this._bounceBottomBoundary - icBottomPos; + this._scrollToBottomEvent(); + scrollEnabled = false; + } + } else if (touchOffsetX < 0.0 && touchOffsetY > 0.0) { // up left + icRightPos = locContainer.getRightBoundary(); + if (icRightPos + touchOffsetX <= this._bounceRightBoundary) { + realOffsetX = this._bounceRightBoundary - icRightPos; + this._scrollToRightEvent(); + scrollEnabled = false; + } + icBottomPos = locContainer.getBottomBoundary(); + if (icBottomPos + touchOffsetY >= this._bounceBottomBoundary) { + realOffsetY = this._bounceBottomBoundary - icBottomPos; + this._scrollToBottomEvent(); + scrollEnabled = false; + } + } else if (touchOffsetX < 0.0 && touchOffsetY < 0.0) { // down left + icRightPos = locContainer.getRightBoundary(); + if (icRightPos + touchOffsetX <= this._bounceRightBoundary) { + realOffsetX = this._bounceRightBoundary - icRightPos; + this._scrollToRightEvent(); + scrollEnabled = false; + } + icTopPos = locContainer.getTopBoundary(); + if (icTopPos + touchOffsetY <= this._bounceTopBoundary) { + realOffsetY = this._bounceTopBoundary - icTopPos; + this._scrollToTopEvent(); + scrollEnabled = false; + } + } else if (touchOffsetX > 0.0 && touchOffsetY < 0.0){ // down right + icLeftPos = locContainer.getLeftBoundary(); + if (icLeftPos + touchOffsetX >= this._bounceLeftBoundary) { + realOffsetX = this._bounceLeftBoundary - icLeftPos; + this._scrollToLeftEvent(); + scrollEnabled = false; + } + icTopPos = locContainer.getTopBoundary(); + if (icTopPos + touchOffsetY <= this._bounceTopBoundary) { + realOffsetY = this._bounceTopBoundary - icTopPos; + this._scrollToTopEvent(); + scrollEnabled = false; + } + } else if (touchOffsetX === 0.0 && touchOffsetY > 0.0){ // up + icBottomPos = locContainer.getBottomBoundary(); + if (icBottomPos + touchOffsetY >= this._bounceBottomBoundary) { + realOffsetY = this._bounceBottomBoundary - icBottomPos; + this._scrollToBottomEvent(); + scrollEnabled = false; + } + } else if (touchOffsetX < 0.0 && touchOffsetY === 0.0){ // left + icRightPos = locContainer.getRightBoundary(); + if (icRightPos + touchOffsetX <= this._bounceRightBoundary) { + realOffsetX = this._bounceRightBoundary - icRightPos; + this._scrollToRightEvent(); + scrollEnabled = false; + } + } else if (touchOffsetX === 0.0 && touchOffsetY < 0.0){ // down + icTopPos = locContainer.getTopBoundary(); + if (icTopPos + touchOffsetY <= this._bounceTopBoundary) { + realOffsetY = this._bounceTopBoundary - icTopPos; + this._scrollToTopEvent(); + scrollEnabled = false; + } + } else if (touchOffsetX > 0.0 && touchOffsetY === 0.0){ // right + icLeftPos = locContainer.getLeftBoundary(); + if (icLeftPos + touchOffsetX >= this._bounceLeftBoundary) { + realOffsetX = this._bounceLeftBoundary - icLeftPos; + this._scrollToLeftEvent(); + scrollEnabled = false; + } + } + } else { + if (touchOffsetX > 0.0 && touchOffsetY > 0.0){ // up right + icLeftPos = locContainer.getLeftBoundary(); + if (icLeftPos + touchOffsetX >= this._leftBoundary) { + realOffsetX = this._leftBoundary - icLeftPos; + this._scrollToLeftEvent(); + scrollEnabled = false; + } + icBottomPos = locContainer.getBottomBoundary(); + if (icBottomPos + touchOffsetY >= this._bottomBoundary) { + realOffsetY = this._bottomBoundary - icBottomPos; + this._scrollToBottomEvent(); + scrollEnabled = false; + } + } else if (touchOffsetX < 0.0 && touchOffsetY > 0.0){ // up left + icRightPos = locContainer.getRightBoundary(); + if (icRightPos + touchOffsetX <= this._rightBoundary) { + realOffsetX = this._rightBoundary - icRightPos; + this._scrollToRightEvent(); + scrollEnabled = false; + } + icBottomPos = locContainer.getBottomBoundary(); + if (icBottomPos + touchOffsetY >= this._bottomBoundary) { + realOffsetY = this._bottomBoundary - icBottomPos; + this._scrollToBottomEvent(); + scrollEnabled = false; + } + } else if (touchOffsetX < 0.0 && touchOffsetY < 0.0){ // down left + icRightPos = locContainer.getRightBoundary(); + if (icRightPos + touchOffsetX <= this._rightBoundary) { + realOffsetX = this._rightBoundary - icRightPos; + this._scrollToRightEvent(); + scrollEnabled = false; + } + icTopPos = locContainer.getTopBoundary(); + if (icTopPos + touchOffsetY <= this._topBoundary) { + realOffsetY = this._topBoundary - icTopPos; + this._scrollToTopEvent(); + scrollEnabled = false; + } + } else if (touchOffsetX > 0.0 && touchOffsetY < 0.0){ // down right + icLeftPos = locContainer.getLeftBoundary(); + if (icLeftPos + touchOffsetX >= this._leftBoundary) { + realOffsetX = this._leftBoundary - icLeftPos; + this._scrollToLeftEvent(); + scrollEnabled = false; + } + icTopPos = this._innerContainer.getTopBoundary(); + if (icTopPos + touchOffsetY <= this._topBoundary) { + realOffsetY = this._topBoundary - icTopPos; + this._scrollToTopEvent(); + scrollEnabled = false; + } + } else if (touchOffsetX === 0.0 && touchOffsetY > 0.0) { // up + icBottomPos = this._innerContainer.getBottomBoundary(); + if (icBottomPos + touchOffsetY >= this._bottomBoundary) { + realOffsetY = this._bottomBoundary - icBottomPos; + this._scrollToBottomEvent(); + scrollEnabled = false; + } + } else if (touchOffsetX < 0.0 && touchOffsetY === 0.0){ // left + icRightPos = this._innerContainer.getRightBoundary(); + if (icRightPos + touchOffsetX <= this._rightBoundary) { + realOffsetX = this._rightBoundary - icRightPos; + this._scrollToRightEvent(); + scrollEnabled = false; + } + } else if (touchOffsetX === 0.0 && touchOffsetY < 0.0){ // down + icTopPos = this._innerContainer.getTopBoundary(); + if (icTopPos + touchOffsetY <= this._topBoundary) { + realOffsetY = this._topBoundary - icTopPos; + this._scrollToTopEvent(); + scrollEnabled = false; + } + } else if (touchOffsetX > 0.0 && touchOffsetY === 0.0){ // right + icLeftPos = this._innerContainer.getLeftBoundary(); + if (icLeftPos + touchOffsetX >= this._leftBoundary) { + realOffsetX = this._leftBoundary - icLeftPos; + this._scrollToLeftEvent(); + scrollEnabled = false; + } + } + } + this._moveChildren(realOffsetX, realOffsetY); + return scrollEnabled; + }, + + /** + * Scroll inner container to bottom boundary of ScrollView. + * @param {Number} time + * @param {Boolean} attenuated + */ scrollToBottom: function (time, attenuated) { - this.startAutoScrollChildrenWithDestination(cc.p(this._innerContainer.getPositionX(), 0), time, attenuated); + this._startAutoScrollChildrenWithDestination(cc.p(this._innerContainer.getPositionX(), 0), time, attenuated); }, + /** + * Scroll inner container to top boundary of ScrollView. + * @param {Number} time + * @param {Boolean} attenuated + */ scrollToTop: function (time, attenuated) { - this.startAutoScrollChildrenWithDestination(cc.p(this._innerContainer.getPositionX(), this._size.height - this._innerContainer.getSize().height), time, attenuated); + this._startAutoScrollChildrenWithDestination( + cc.p(this._innerContainer.getPositionX(), this._contentSize.height - this._innerContainer.getContentSize().height), time, attenuated); }, + /** + * Scroll inner container to left boundary of ScrollView. + * @param {Number} time + * @param {Boolean} attenuated + */ scrollToLeft: function (time, attenuated) { - this.startAutoScrollChildrenWithDestination(cc.p(0, this._innerContainer.getPositionY()), time, attenuated); + this._startAutoScrollChildrenWithDestination(cc.p(0, this._innerContainer.getPositionY()), time, attenuated); }, + /** + * Scroll inner container to right boundary of ScrollView. + * @param {Number} time + * @param {Boolean} attenuated + */ scrollToRight: function (time, attenuated) { - this.startAutoScrollChildrenWithDestination(cc.p(this._size.width - this._innerContainer.getSize().width, this._innerContainer.getPositionY()), time, attenuated); + this._startAutoScrollChildrenWithDestination( + cc.p(this._contentSize.width - this._innerContainer.getContentSize().width, this._innerContainer.getPositionY()), time, attenuated); }, + /** + * Scroll inner container to top and left boundary of ScrollView. + * @param {Number} time + * @param {Boolean} attenuated + */ scrollToTopLeft: function (time, attenuated) { - if (this.direction != ccui.ScrollView.DIR_BOTH) { - cc.log("Scroll diretion is not both!"); + if (this.direction !== ccui.ScrollView.DIR_BOTH) { + cc.log("Scroll direction is not both!"); return; } - this.startAutoScrollChildrenWithDestination(cc.p(0, this._size.height - this._innerContainer.getSize().height), time, attenuated); + this._startAutoScrollChildrenWithDestination(cc.p(0, this._contentSize.height - this._innerContainer.getContentSize().height), time, attenuated); }, + /** + * Scroll inner container to top and right boundary of ScrollView. + * @param {Number} time + * @param {Boolean} attenuated + */ scrollToTopRight: function (time, attenuated) { - if (this.direction != ccui.ScrollView.DIR_BOTH) { - cc.log("Scroll diretion is not both!"); + if (this.direction !== ccui.ScrollView.DIR_BOTH) { + cc.log("Scroll direction is not both!"); return; } - this.startAutoScrollChildrenWithDestination(cc.p(this._size.width - this._innerContainer.getSize().width, this._size.height - this._innerContainer.getSize().height), time, attenuated); + var inSize = this._innerContainer.getContentSize(); + this._startAutoScrollChildrenWithDestination(cc.p(this._contentSize.width - inSize.width, + this._contentSize.height - inSize.height), time, attenuated); }, + /** + * Scroll inner container to bottom and left boundary of ScrollView. + * @param {Number} time + * @param {Boolean} attenuated + */ scrollToBottomLeft: function (time, attenuated) { - if (this.direction != ccui.ScrollView.DIR_BOTH) { - cc.log("Scroll diretion is not both!"); + if (this.direction !== ccui.ScrollView.DIR_BOTH) { + cc.log("Scroll direction is not both!"); return; } - this.startAutoScrollChildrenWithDestination(cc.p(0, 0), time, attenuated); + this._startAutoScrollChildrenWithDestination(cc.p(0, 0), time, attenuated); }, + /** + * Scroll inner container to bottom and right boundary of ScrollView. + * @param {Number} time + * @param {Boolean} attenuated + */ scrollToBottomRight: function (time, attenuated) { - if (this.direction != ccui.ScrollView.DIR_BOTH) { - cc.log("Scroll diretion is not both!"); + if (this.direction !== ccui.ScrollView.DIR_BOTH) { + cc.log("Scroll direction is not both!"); return; } - this.startAutoScrollChildrenWithDestination(cc.p(this._size.width - this._innerContainer.getSize().width, 0), time, attenuated); + this._startAutoScrollChildrenWithDestination(cc.p(this._contentSize.width - this._innerContainer.getContentSize().width, 0), time, attenuated); }, + /** + * Scroll inner container to vertical percent position of ScrollView. + * @param {Number} percent + * @param {Number} time + * @param {Boolean} attenuated + */ scrollToPercentVertical: function (percent, time, attenuated) { - var minY = this._size.height - this._innerContainer.getSize().height; + var minY = this._contentSize.height - this._innerContainer.getContentSize().height; var h = -minY; - this.startAutoScrollChildrenWithDestination(cc.p(this._innerContainer.getPositionX(), minY + percent * h / 100), time, attenuated); + this._startAutoScrollChildrenWithDestination(cc.p(this._innerContainer.getPositionX(), minY + percent * h / 100), time, attenuated); }, + /** + * Scroll inner container to horizontal percent position of ScrollView. + * @param {Number} percent + * @param {Number} time + * @param {Boolean} attenuated + */ scrollToPercentHorizontal: function (percent, time, attenuated) { - var w = this._innerContainer.getSize().width - this._size.width; - this.startAutoScrollChildrenWithDestination(cc.p(-(percent * w / 100), this._innerContainer.getPositionY()), time, attenuated); + var w = this._innerContainer.getContentSize().width - this._contentSize.width; + this._startAutoScrollChildrenWithDestination(cc.p(-(percent * w / 100), this._innerContainer.getPositionY()), time, attenuated); }, + /** + * Scroll inner container to both direction percent position of ScrollView. + * @param {cc.Point} percent + * @param {Number} time + * @param {Boolean} attenuated + */ scrollToPercentBothDirection: function (percent, time, attenuated) { - if (this.direction != ccui.ScrollView.DIR_BOTH) { + if (this.direction !== ccui.ScrollView.DIR_BOTH) return; - } - var minY = this._size.height - this._innerContainer.getSize().height; + var minY = this._contentSize.height - this._innerContainer.getContentSize().height; var h = -minY; - var w = this._innerContainer.getSize().width - this._size.width; - this.startAutoScrollChildrenWithDestination(cc.p(-(percent.x * w / 100), minY + percent.y * h / 100), time, attenuated); + var w = this._innerContainer.getContentSize().width - this._contentSize.width; + this._startAutoScrollChildrenWithDestination(cc.p(-(percent.x * w / 100), minY + percent.y * h / 100), time, attenuated); }, + /** + * Move inner container to bottom boundary of ScrollView. + */ jumpToBottom: function () { - this.jumpToDestination(this._innerContainer.getPositionX(), 0); + this._jumpToDestination(this._innerContainer.getPositionX(), 0); }, + /** + * Move inner container to top boundary of ScrollView. + */ jumpToTop: function () { - this.jumpToDestination(this._innerContainer.getPositionX(), this._size.height - this._innerContainer.getSize().height); + this._jumpToDestination(this._innerContainer.getPositionX(), this._contentSize.height - this._innerContainer.getContentSize().height); }, + /** + * Move inner container to left boundary of ScrollView. + */ jumpToLeft: function () { - this.jumpToDestination(0, this._innerContainer.getPositionY()); + this._jumpToDestination(0, this._innerContainer.getPositionY()); }, + /** + * Move inner container to right boundary of ScrollView. + */ jumpToRight: function () { - this.jumpToDestination(this._size.width - this._innerContainer.getSize().width, this._innerContainer.getPositionY()); + this._jumpToDestination(this._contentSize.width - this._innerContainer.getContentSize().width, this._innerContainer.getPositionY()); }, + /** + * Move inner container to top and left boundary of ScrollView. + */ jumpToTopLeft: function () { - if (this.direction != ccui.ScrollView.DIR_BOTH) { - cc.log("Scroll diretion is not both!"); + if (this.direction !== ccui.ScrollView.DIR_BOTH) { + cc.log("Scroll direction is not both!"); return; } - this.jumpToDestination(0, this._size.height - this._innerContainer.getSize().height); + this._jumpToDestination(0, this._contentSize.height - this._innerContainer.getContentSize().height); }, + /** + * Move inner container to top and right boundary of ScrollView. + */ jumpToTopRight: function () { - if (this.direction != ccui.ScrollView.DIR_BOTH) { - cc.log("Scroll diretion is not both!"); + if (this.direction !== ccui.ScrollView.DIR_BOTH) { + cc.log("Scroll direction is not both!"); return; } - this.jumpToDestination(this._size.width - this._innerContainer.getSize().width, this._size.height - this._innerContainer.getSize().height); + var inSize = this._innerContainer.getContentSize(); + this._jumpToDestination(this._contentSize.width - inSize.width, this._contentSize.height - inSize.height); }, + /** + * Move inner container to bottom and left boundary of ScrollView. + */ jumpToBottomLeft: function () { - if (this.direction != ccui.ScrollView.DIR_BOTH) { - cc.log("Scroll diretion is not both!"); + if (this.direction !== ccui.ScrollView.DIR_BOTH) { + cc.log("Scroll direction is not both!"); return; } - this.jumpToDestination(0, 0); + this._jumpToDestination(0, 0); }, + /** + * Move inner container to bottom and right boundary of ScrollView. + */ jumpToBottomRight: function () { - if (this.direction != ccui.ScrollView.DIR_BOTH) { - cc.log("Scroll diretion is not both!"); + if (this.direction !== ccui.ScrollView.DIR_BOTH) { + cc.log("Scroll direction is not both!"); return; } - this.jumpToDestination(this._size.width - this._innerContainer.getSize().width, 0); + this._jumpToDestination(this._contentSize.width - this._innerContainer.getContentSize().width, 0); }, + /** + * Move inner container to vertical percent position of ScrollView. + * @param {Number} percent The destination vertical percent, accept value between 0 - 100 + */ jumpToPercentVertical: function (percent) { - var minY = this._size.height - this._innerContainer.getSize().height; + var minY = this._contentSize.height - this._innerContainer.getContentSize().height; var h = -minY; - this.jumpToDestination(this._innerContainer.getPositionX(), minY + percent * h / 100); + this._jumpToDestination(this._innerContainer.getPositionX(), minY + percent * h / 100); }, + /** + * Move inner container to horizontal percent position of ScrollView. + * @param {Number} percent The destination vertical percent, accept value between 0 - 100 + */ jumpToPercentHorizontal: function (percent) { - var w = this._innerContainer.getSize().width - this._size.width; - this.jumpToDestination(-(percent * w / 100), this._innerContainer.getPositionY()); + var w = this._innerContainer.getContentSize().width - this._contentSize.width; + this._jumpToDestination(-(percent * w / 100), this._innerContainer.getPositionY()); }, + /** + * Move inner container to both direction percent position of ScrollView. + * @param {cc.Point} percent The destination vertical percent, accept value between 0 - 100 + */ jumpToPercentBothDirection: function (percent) { - if (this.direction != ccui.ScrollView.DIR_BOTH) { + if (this.direction !== ccui.ScrollView.DIR_BOTH) return; - } - var minY = this._size.height - this._innerContainer.getSize().height; + var inSize = this._innerContainer.getContentSize(); + var minY = this._contentSize.height - inSize.height; var h = -minY; - var w = this._innerContainer.getSize().width - this._size.width; - this.jumpToDestination(-(percent.x * w / 100), minY + percent.y * h / 100); + var w = inSize.width - this._contentSize.width; + this._jumpToDestination(-(percent.x * w / 100), minY + percent.y * h / 100); }, - startRecordSlidAction: function () { - if (this._autoScroll) { - this.stopAutoScrollChildren(); - } - if (this._bouncing) { - this.stopBounceChildren(); - } + _startRecordSlidAction: function () { + if (this._autoScroll) + this._stopAutoScrollChildren(); + if (this._bouncing) + this._stopBounceChildren(); this._slidTime = 0.0; }, - endRecordSlidAction: function () { - if (!this.checkNeedBounce() && this.inertiaScrollEnabled) { - if (this._slidTime <= 0.016) { + _endRecordSlidAction: function () { + if (!this._checkNeedBounce() && this.inertiaScrollEnabled) { + if (this._slidTime <= 0.016) return; - } - var totalDis = 0; - var dir; + var totalDis = 0, dir; + var touchEndPositionInNodeSpace = this.convertToNodeSpace(this._touchEndPosition); + var touchBeganPositionInNodeSpace = this.convertToNodeSpace(this._touchBeganPosition); switch (this.direction) { case ccui.ScrollView.DIR_VERTICAL : - totalDis = this._touchEndedPoint.y - this._touchBeganPoint.y; - if (totalDis < 0) { - dir = ccui.ScrollView.SCROLLDIR_DOWN; - } - else { - dir = ccui.ScrollView.SCROLLDIR_UP; - } + totalDis = touchEndPositionInNodeSpace.y - touchBeganPositionInNodeSpace.y; + dir = (totalDis < 0) ? ccui.ScrollView.SCROLLDIR_DOWN : ccui.ScrollView.SCROLLDIR_UP; break; case ccui.ScrollView.DIR_HORIZONTAL: - totalDis = this._touchEndedPoint.x - this._touchBeganPoint.x; - if (totalDis < 0) { - dir = ccui.ScrollView.SCROLLDIR_LEFT; - } - else { - dir = ccui.ScrollView.SCROLLDIR_RIGHT; - } + totalDis = touchEndPositionInNodeSpace.x - touchBeganPositionInNodeSpace.x; + dir = totalDis < 0 ? ccui.ScrollView.SCROLLDIR_LEFT : ccui.ScrollView.SCROLLDIR_RIGHT; break; case ccui.ScrollView.DIR_BOTH : - var subVector = cc.pSub(this._touchEndedPoint, this._touchBeganPoint); + var subVector = cc.pSub(touchEndPositionInNodeSpace, touchBeganPositionInNodeSpace); totalDis = cc.pLength(subVector); dir = cc.pNormalize(subVector); break; default: + dir = cc.p(0,0); break; } var orSpeed = Math.min(Math.abs(totalDis) / (this._slidTime), ccui.ScrollView.AUTO_SCROLL_MAX_SPEED); - this.startAutoScrollChildrenWithOriginalSpeed(dir, orSpeed, true, -1000); + this._startAutoScrollChildrenWithOriginalSpeed(dir, orSpeed, true, -1000); this._slidTime = 0; } }, - handlePressLogic: function (touchPoint) { - this._touchBeganPoint = this.convertToNodeSpace(touchPoint); - this._touchMovingPoint = this._touchBeganPoint; - this.startRecordSlidAction(); + _handlePressLogic: function (touch) { + this._startRecordSlidAction(); this._bePressed = true; }, - handleMoveLogic: function (touchPoint) { - this._touchMovedPoint = this.convertToNodeSpace(touchPoint); - var delta = cc.pSub(this._touchMovedPoint, this._touchMovingPoint); - this._touchMovingPoint = this._touchMovedPoint; + _handleMoveLogic: function (touch) { + var touchPositionInNodeSpace = this.convertToNodeSpace(touch.getLocation()), + previousTouchPositionInNodeSpace = this.convertToNodeSpace(touch.getPreviousLocation()); + var delta = cc.pSub(touchPositionInNodeSpace, previousTouchPositionInNodeSpace); switch (this.direction) { case ccui.ScrollView.DIR_VERTICAL: // vertical - this.scrollChildren(0.0, delta.y); + this._scrollChildren(0.0, delta.y); break; case ccui.ScrollView.DIR_HORIZONTAL: // horizontal - this.scrollChildren(delta.x, 0); + this._scrollChildren(delta.x, 0); break; case ccui.ScrollView.DIR_BOTH: // both - this.scrollChildren(delta.x, delta.y); + this._scrollChildren(delta.x, delta.y); break; default: break; } }, - handleReleaseLogic: function (touchPoint) { - this._touchEndedPoint = this.convertToNodeSpace(touchPoint); - this.endRecordSlidAction(); + _handleReleaseLogic: function (touch) { + this._endRecordSlidAction(); this._bePressed = false; }, - onTouchBegan: function (touch , event) { - var pass = ccui.Layout.prototype.onTouchBegan.call(this, touch , event); - if (this._hitted) { - this.handlePressLogic(this._touchStartPos); + /** + * The touch began event callback handler of ccui.ScrollView. + * @param {cc.Touch} touch + * @param {cc.Event} event + * @returns {boolean} + */ + onTouchBegan: function (touch, event) { + var pass = ccui.Layout.prototype.onTouchBegan.call(this, touch, event); + if(!this._isInterceptTouch){ + if (this._hit) + this._handlePressLogic(touch); } return pass; }, - onTouchMoved: function (touch , event) { - ccui.Layout.prototype.onTouchMoved.call(this, touch , event); - this.handleMoveLogic(this._touchMovePos); - }, - - onTouchEnded: function (touch , event) { - ccui.Layout.prototype.onTouchEnded.call(this, touch , event); - this.handleReleaseLogic(this._touchEndPos); + /** + * The touch moved event callback handler of ccui.ScrollView. + * @param {cc.Touch} touch + * @param {cc.Event} event + */ + onTouchMoved: function (touch, event) { + ccui.Layout.prototype.onTouchMoved.call(this, touch, event); + if(!this._isInterceptTouch) + this._handleMoveLogic(touch); }, - onTouchCancelled: function (touch , event) { - ccui.Layout.prototype.onTouchCancelled.call(this, touch , event); + /** + * The touch ended event callback handler of ccui.ScrollView. + * @param {cc.Touch} touch + * @param {cc.Event} event + */ + onTouchEnded: function (touch, event) { + ccui.Layout.prototype.onTouchEnded.call(this, touch, event); + if(!this._isInterceptTouch) + this._handleReleaseLogic(touch); + this._isInterceptTouch = false; }, - onTouchLongClicked: function (touchPoint) { - + /** + * The touch canceled event callback of ccui.ScrollView. + * @param {cc.Touch} touch + * @param {cc.Event} event + */ + onTouchCancelled: function (touch, event) { + ccui.Layout.prototype.onTouchCancelled.call(this, touch, event); + if (!this._isInterceptTouch) + this.handleReleaseLogic(touch); + this._isInterceptTouch = false; }, + /** + * The update callback handler. + * @param {Number} dt + */ update: function (dt) { - if (this._autoScroll) { - this.autoScrollChildren(dt); - } - if (this._bouncing) { - this.bounceChildren(dt); - } - this.recordSlidTime(dt); + if (this._autoScroll) + this._autoScrollChildren(dt); + if (this._bouncing) + this._bounceChildren(dt); + this._recordSlidTime(dt); }, - recordSlidTime: function (dt) { - if (this._bePressed) { + _recordSlidTime: function (dt) { + if (this._bePressed) this._slidTime += dt; - } }, /** - * Intercept touch event - * @param {number} handleState + * Intercept touch event, handle its child's touch event. + * @override + * @param {number} event event type * @param {ccui.Widget} sender - * @param {cc.Point} touchPoint + * @param {cc.Touch} touch */ - interceptTouchEvent: function (handleState, sender, touchPoint) { - switch (handleState) { - case 0: - this.handlePressLogic(touchPoint); + interceptTouchEvent: function (event, sender, touch) { + var touchPoint = touch.getLocation(); + switch (event) { + case ccui.Widget.TOUCH_BEGAN: + this._isInterceptTouch = true; + this._touchBeganPosition.x = touchPoint.x; + this._touchBeganPosition.y = touchPoint.y; + this._handlePressLogic(touch); break; - case 1: - var offset = cc.pSub(sender.getTouchStartPos(), touchPoint); - if (cc.pLength(offset) > this._childFocusCancelOffset) { - sender.setFocused(false); - this.handleMoveLogic(touchPoint); + case ccui.Widget.TOUCH_MOVED: + var offset = cc.pLength(cc.pSub(sender.getTouchBeganPosition(), touchPoint)); + this._touchMovePosition.x = touchPoint.x; + this._touchMovePosition.y = touchPoint.y; + if (offset > this._childFocusCancelOffset) { + sender.setHighlighted(false); + this._handleMoveLogic(touch); } break; - case 2: - this.handleReleaseLogic(touchPoint); - break; - case 3: - this.handleReleaseLogic(touchPoint); + case ccui.Widget.TOUCH_CANCELED: + case ccui.Widget.TOUCH_ENDED: + this._touchEndPosition.x = touchPoint.x; + this._touchEndPosition.y = touchPoint.y; + this._handleReleaseLogic(touch); + if (sender.isSwallowTouches()) + this._isInterceptTouch = false; break; } }, - /** - * - * @param {number} handleState - * @param {ccui.Widget} sender - * @param {cc.Point} touchPoint - */ - checkChildInfo: function (handleState, sender, touchPoint) { - if(this._enabled && this._touchEnabled) - this.interceptTouchEvent(handleState, sender, touchPoint); - }, - - scrollToTopEvent: function () { - if (this._scrollViewEventListener && this._scrollViewEventSelector) { - this._scrollViewEventSelector.call(this._scrollViewEventListener, this, ccui.ScrollView.EVENT_SCROLL_TO_TOP); + _scrollToTopEvent: function () { + if(this._scrollViewEventSelector){ + if (this._scrollViewEventListener) + this._scrollViewEventSelector.call(this._scrollViewEventListener, this, ccui.ScrollView.EVENT_SCROLL_TO_TOP); + else + this._scrollViewEventSelector(this, ccui.ScrollView.EVENT_SCROLL_TO_TOP); } + if(this._ccEventCallback) + this._ccEventCallback(this, ccui.ScrollView.EVENT_SCROLL_TO_TOP); }, - scrollToBottomEvent: function () { - if (this._scrollViewEventListener && this._scrollViewEventSelector) { - this._scrollViewEventSelector.call(this._scrollViewEventListener, this, ccui.ScrollView.EVENT_SCROLL_TO_BOTTOM); + _scrollToBottomEvent: function () { + if(this._scrollViewEventSelector){ + if (this._scrollViewEventListener) + this._scrollViewEventSelector.call(this._scrollViewEventListener, this, ccui.ScrollView.EVENT_SCROLL_TO_BOTTOM); + else + this._scrollViewEventSelector(this, ccui.ScrollView.EVENT_SCROLL_TO_BOTTOM); } + if(this._ccEventCallback) + this._ccEventCallback(this, ccui.ScrollView.EVENT_SCROLL_TO_BOTTOM); }, - scrollToLeftEvent: function () { - if (this._scrollViewEventListener && this._scrollViewEventSelector) { - this._scrollViewEventSelector.call(this._scrollViewEventListener, this, ccui.ScrollView.EVENT_SCROLL_TO_LEFT); + _scrollToLeftEvent: function () { + if(this._scrollViewEventSelector){ + if (this._scrollViewEventListener) + this._scrollViewEventSelector.call(this._scrollViewEventListener, this, ccui.ScrollView.EVENT_SCROLL_TO_LEFT); + else + this._scrollViewEventSelector(this, ccui.ScrollView.EVENT_SCROLL_TO_LEFT); } + if(this._ccEventCallback) + this._ccEventCallback(this, ccui.ScrollView.EVENT_SCROLL_TO_LEFT); }, - scrollToRightEvent: function () { - if (this._scrollViewEventListener && this._scrollViewEventSelector) { - this._scrollViewEventSelector.call(this._scrollViewEventListener, this, ccui.ScrollView.EVENT_SCROLL_TO_RIGHT); + _scrollToRightEvent: function () { + if(this._scrollViewEventSelector){ + if (this._scrollViewEventListener) + this._scrollViewEventSelector.call(this._scrollViewEventListener, this, ccui.ScrollView.EVENT_SCROLL_TO_RIGHT); + else + this._scrollViewEventSelector(this, ccui.ScrollView.EVENT_SCROLL_TO_RIGHT); } + if(this._ccEventCallback) + this._ccEventCallback(this, ccui.ScrollView.EVENT_SCROLL_TO_RIGHT); }, - scrollingEvent: function () { - if (this._scrollViewEventListener && this._scrollViewEventSelector) { - this._scrollViewEventSelector.call(this._scrollViewEventListener, this, ccui.ScrollView.EVENT_SCROLLING); + _scrollingEvent: function () { + if(this._scrollViewEventSelector){ + if (this._scrollViewEventListener) + this._scrollViewEventSelector.call(this._scrollViewEventListener, this, ccui.ScrollView.EVENT_SCROLLING); + else + this._scrollViewEventSelector(this, ccui.ScrollView.EVENT_SCROLLING); } + if(this._ccEventCallback) + this._ccEventCallback(this, ccui.ScrollView.EVENT_SCROLLING); }, - bounceTopEvent: function () { - if (this._scrollViewEventListener && this._scrollViewEventSelector) { - this._scrollViewEventSelector.call(this._scrollViewEventListener, this, ccui.ScrollView.EVENT_BOUNCE_TOP); + _bounceTopEvent: function () { + if(this._scrollViewEventSelector){ + if (this._scrollViewEventListener) + this._scrollViewEventSelector.call(this._scrollViewEventListener, this, ccui.ScrollView.EVENT_BOUNCE_TOP); + else + this._scrollViewEventSelector(this, ccui.ScrollView.EVENT_BOUNCE_TOP); } + if(this._ccEventCallback) + this._ccEventCallback(this, ccui.ScrollView.EVENT_BOUNCE_TOP); }, - bounceBottomEvent: function () { - if (this._scrollViewEventListener && this._scrollViewEventSelector) { - this._scrollViewEventSelector.call(this._scrollViewEventListener, this, ccui.ScrollView.EVENT_BOUNCE_BOTTOM); + _bounceBottomEvent: function () { + if(this._scrollViewEventSelector){ + if (this._scrollViewEventListener) + this._scrollViewEventSelector.call(this._scrollViewEventListener, this, ccui.ScrollView.EVENT_BOUNCE_BOTTOM); + else + this._scrollViewEventSelector(this, ccui.ScrollView.EVENT_BOUNCE_BOTTOM); } + if(this._ccEventCallback) + this._ccEventCallback(this, ccui.ScrollView.EVENT_BOUNCE_BOTTOM); }, - bounceLeftEvent: function () { - if (this._scrollViewEventListener && this._scrollViewEventSelector) { - this._scrollViewEventSelector.call(this._scrollViewEventListener, this, ccui.ScrollView.EVENT_BOUNCE_LEFT); + _bounceLeftEvent: function () { + if(this._scrollViewEventSelector){ + if (this._scrollViewEventListener) + this._scrollViewEventSelector.call(this._scrollViewEventListener, this, ccui.ScrollView.EVENT_BOUNCE_LEFT); + else + this._scrollViewEventSelector(this, ccui.ScrollView.EVENT_BOUNCE_LEFT); } + if(this._ccEventCallback) + this._ccEventCallback(this, ccui.ScrollView.EVENT_BOUNCE_LEFT); }, - bounceRightEvent: function () { - if (this._scrollViewEventListener && this._scrollViewEventSelector) { - this._scrollViewEventSelector.call(this._scrollViewEventListener, this, ccui.ScrollView.EVENT_BOUNCE_RIGHT); + _bounceRightEvent: function () { + if(this._scrollViewEventSelector){ + if (this._scrollViewEventListener) + this._scrollViewEventSelector.call(this._scrollViewEventListener, this, ccui.ScrollView.EVENT_BOUNCE_RIGHT); + else + this._scrollViewEventSelector(this, ccui.ScrollView.EVENT_BOUNCE_RIGHT); } + if(this._ccEventCallback) + this._ccEventCallback(this, ccui.ScrollView.EVENT_BOUNCE_RIGHT); }, /** + * Adds callback function called ScrollView event triggered * @param {Function} selector - * @param {Object} target + * @param {Object} [target=] + * @deprecated since v3.0, please use addEventListener instead. */ addEventListenerScrollView: function (selector, target) { + this.addEventListener(selector, target); + }, + + /** + * Adds callback function called ScrollView event triggered + * @param {Function} selector + * @param {Object} [target=] + */ + addEventListener: function(selector, target){ this._scrollViewEventSelector = selector; this._scrollViewEventListener = target; }, /** - * set direction + * Changes scroll direction of ScrollView. * @param {ccui.ScrollView.DIR_NONE | ccui.ScrollView.DIR_VERTICAL | ccui.ScrollView.DIR_HORIZONTAL | ccui.ScrollView.DIR_BOTH} dir + * Direction::VERTICAL means vertical scroll, Direction::HORIZONTAL means horizontal scroll */ setDirection: function (dir) { this.direction = dir; }, /** - * get direction + * Returns scroll direction of ScrollView. * @returns {ccui.ScrollView.DIR_NONE | ccui.ScrollView.DIR_VERTICAL | ccui.ScrollView.DIR_HORIZONTAL | ccui.ScrollView.DIR_BOTH} */ getDirection: function () { @@ -1531,7 +1617,7 @@ ccui.ScrollView = ccui.Layout.extend(/** @lends ccui.ScrollView# */{ }, /** - * set bounce enabled + * Sets bounce enabled * @param {Boolean} enabled */ setBounceEnabled: function (enabled) { @@ -1539,7 +1625,7 @@ ccui.ScrollView = ccui.Layout.extend(/** @lends ccui.ScrollView# */{ }, /** - * get whether bounce is enabled + * Returns whether bounce is enabled * @returns {boolean} */ isBounceEnabled: function () { @@ -1547,7 +1633,7 @@ ccui.ScrollView = ccui.Layout.extend(/** @lends ccui.ScrollView# */{ }, /** - * set inertiaScroll enabled + * Sets inertiaScroll enabled * @param {boolean} enabled */ setInertiaScrollEnabled: function (enabled) { @@ -1555,7 +1641,7 @@ ccui.ScrollView = ccui.Layout.extend(/** @lends ccui.ScrollView# */{ }, /** - * get whether inertiaScroll is enabled + * Returns whether inertiaScroll is enabled * @returns {boolean} */ isInertiaScrollEnabled: function () { @@ -1563,7 +1649,7 @@ ccui.ScrollView = ccui.Layout.extend(/** @lends ccui.ScrollView# */{ }, /** - * get inner container + * Gets inner container of ScrollView. Inner container is the container of ScrollView's children. * @returns {ccui.Layout} */ getInnerContainer: function () { @@ -1571,7 +1657,7 @@ ccui.ScrollView = ccui.Layout.extend(/** @lends ccui.ScrollView# */{ }, /** - * Sets LayoutType. + * Sets LayoutType of ccui.ScrollView. * @param {ccui.Layout.ABSOLUTE|ccui.Layout.LINEAR_VERTICAL|ccui.Layout.LINEAR_HORIZONTAL|ccui.Layout.RELATIVE} type */ setLayoutType: function (type) { @@ -1579,7 +1665,7 @@ ccui.ScrollView = ccui.Layout.extend(/** @lends ccui.ScrollView# */{ }, /** - * Gets LayoutType. + * Returns the layout type of ccui.ScrollView. * @returns {ccui.Layout.ABSOLUTE|ccui.Layout.LINEAR_VERTICAL|ccui.Layout.LINEAR_HORIZONTAL|ccui.Layout.RELATIVE} */ getLayoutType: function () { @@ -1593,27 +1679,92 @@ ccui.ScrollView = ccui.Layout.extend(/** @lends ccui.ScrollView# */{ }, /** - * Returns the "class name" of widget. + * Returns the "class name" of ccui.ScrollView. * @returns {string} */ getDescription: function () { return "ScrollView"; }, - copyClonedWidgetChildren: function (model) { - ccui.Layout.prototype.copyClonedWidgetChildren.call(this, model); + _createCloneInstance: function(){ + return new ccui.ScrollView(); + }, + + _copyClonedWidgetChildren: function (model) { + ccui.Layout.prototype._copyClonedWidgetChildren.call(this, model); + }, + + _copySpecialProperties: function (scrollView) { + if(scrollView instanceof ccui.ScrollView) { + ccui.Layout.prototype._copySpecialProperties.call(this, scrollView); + this.setInnerContainerSize(scrollView.getInnerContainerSize()); + this.setDirection(scrollView.direction); + this.setBounceEnabled(scrollView.bounceEnabled); + this.setInertiaScrollEnabled(scrollView.inertiaScrollEnabled); + this._scrollViewEventListener = scrollView._scrollViewEventListener; + this._scrollViewEventSelector = scrollView._scrollViewEventSelector; + this._ccEventCallback = scrollView._ccEventCallback; + } + }, + + /** + * Returns a node by tag + * @param {Number} tag + * @returns {cc.Node} + * @deprecated since v3.0, please use getChildByTag instead. + */ + getNodeByTag: function (tag) { + return this._innerContainer.getNodeByTag(tag); + }, + + /** + * Returns all nodes of inner container + * @returns {Array} + * @deprecated since v3.0, please use getChildren instead. + */ + getNodes: function () { + return this._innerContainer.getNodes(); + }, + + /** + * Removes a node from ccui.ScrollView. + * @param {cc.Node} node + * @deprecated since v3.0, please use removeChild instead. + */ + removeNode: function (node) { + this._innerContainer.removeNode(node); + }, + + /** + * Removes a node by tag + * @param {Number} tag + * @deprecated since v3.0, please use removeChildByTag instead. + */ + removeNodeByTag: function (tag) { + this._innerContainer.removeNodeByTag(tag); + }, + + /** + * Remove all node from ccui.ScrollView. + * @deprecated since v3.0, please use removeAllChildren instead. + */ + removeAllNodes: function () { + this._innerContainer.removeAllNodes(); }, - copySpecialProperties: function (scrollView) { - ccui.Layout.prototype.copySpecialProperties.call(this, scrollView); - this.setInnerContainerSize(scrollView.getInnerContainerSize()); - this.setDirection(scrollView.direction); - this.setBounceEnabled(scrollView.bounceEnabled); - this.setInertiaScrollEnabled(scrollView.inertiaScrollEnabled); + /** + * Add node for scrollView + * @param {cc.Node} node + * @param {Number} zOrder + * @param {Number} tag + * @deprecated since v3.0, please use addChild instead. + */ + addNode: function (node, zOrder, tag) { + this._innerContainer.addNode(node, zOrder, tag); } }); -window._p = ccui.ScrollView.prototype; +var _p = ccui.ScrollView.prototype; // Extended properties /** @expose */ @@ -1623,44 +1774,110 @@ cc.defineGetterSetter(_p, "innerWidth", _p._getInnerWidth, _p._setInnerWidth); _p.innerHeight; cc.defineGetterSetter(_p, "innerHeight", _p._getInnerHeight, _p._setInnerHeight); -delete window._p; +_p = null; /** * allocates and initializes a UIScrollView. - * @constructs + * @deprecated since v3.0, please use new ccui.ScrollView() instead. * @return {ccui.ScrollView} - * @example - * // example - * var uiScrollView = ccui.ScrollView.create(); */ ccui.ScrollView.create = function () { - var uiScrollView = new ccui.ScrollView(); - if (uiScrollView && uiScrollView.init()) { - return uiScrollView; - } - return null; + return new ccui.ScrollView(); }; // Constants //ScrollView direction +/** + * The none flag of ccui.ScrollView's direction. + * @constant + * @type {number} + */ ccui.ScrollView.DIR_NONE = 0; +/** + * The vertical flag of ccui.ScrollView's direction. + * @constant + * @type {number} + */ ccui.ScrollView.DIR_VERTICAL = 1; +/** + * The horizontal flag of ccui.ScrollView's direction. + * @constant + * @type {number} + */ ccui.ScrollView.DIR_HORIZONTAL = 2; +/** + * The both flag of ccui.ScrollView's direction. + * @constant + * @type {number} + */ ccui.ScrollView.DIR_BOTH = 3; //ScrollView event +/** + * The flag scroll to top of ccui.ScrollView's event. + * @constant + * @type {number} + */ ccui.ScrollView.EVENT_SCROLL_TO_TOP = 0; +/** + * The flag scroll to bottom of ccui.ScrollView's event. + * @constant + * @type {number} + */ ccui.ScrollView.EVENT_SCROLL_TO_BOTTOM = 1; +/** + * The flag scroll to left of ccui.ScrollView's event. + * @constant + * @type {number} + */ ccui.ScrollView.EVENT_SCROLL_TO_LEFT = 2; +/** + * The flag scroll to right of ccui.ScrollView's event. + * @constant + * @type {number} + */ ccui.ScrollView.EVENT_SCROLL_TO_RIGHT = 3; +/** + * The scrolling flag of ccui.ScrollView's event. + * @constant + * @type {number} + */ ccui.ScrollView.EVENT_SCROLLING = 4; +/** + * The flag bounce top of ccui.ScrollView's event. + * @constant + * @type {number} + */ ccui.ScrollView.EVENT_BOUNCE_TOP = 5; +/** + * The flag bounce bottom of ccui.ScrollView's event. + * @constant + * @type {number} + */ ccui.ScrollView.EVENT_BOUNCE_BOTTOM = 6; +/** + * The flag bounce left of ccui.ScrollView's event. + * @constant + * @type {number} + */ ccui.ScrollView.EVENT_BOUNCE_LEFT = 7; +/** + * The flag bounce right of ccui.ScrollView's event. + * @constant + * @type {number} + */ ccui.ScrollView.EVENT_BOUNCE_RIGHT = 8; - +/** + * The auto scroll max speed of ccui.ScrollView. + * @constant + * @type {number} + */ ccui.ScrollView.AUTO_SCROLL_MAX_SPEED = 1000; + +/** + * @ignore + */ ccui.ScrollView.SCROLLDIR_UP = cc.p(0, 1); ccui.ScrollView.SCROLLDIR_DOWN = cc.p(0, -1); ccui.ScrollView.SCROLLDIR_LEFT = cc.p(-1, 0); diff --git a/extensions/cocostudio/CocoStudio.js b/extensions/cocostudio/CocoStudio.js index 74ba3c0751..fdb2ddcea8 100644 --- a/extensions/cocostudio/CocoStudio.js +++ b/extensions/cocostudio/CocoStudio.js @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -22,7 +23,8 @@ THE SOFTWARE. ****************************************************************************/ /** - * @namespace Base namespace of cocostuidio + * The main namespace of Cocostudio, all classes, functions, properties and constants of Spine are defined in this namespace + * @namespace * @name ccs */ var ccs = ccs || {}; @@ -42,14 +44,6 @@ ccs.Class.extend = ccs.Class.extend || cc.Class.extend; ccs.Node = ccs.Node || cc.Node; ccs.Node.extend = ccs.Node.extend || cc.Node.extend; -/** - * The same as cc.RBGA - * @class - * @extends ccs.Class - */ -ccs.NodeRGBA = ccs.NodeRGBA || cc.NodeRGBA; -ccs.NodeRGBA.extend = ccs.NodeRGBA.extend || cc.NodeRGBA.extend; - /** * The same as cc.Sprite * @class @@ -68,6 +62,7 @@ ccs.Component.extend = ccs.Component.extend || cc.Component.extend; /** * CocoStudio version + * @constant * @type {string} */ ccs.cocostudioVersion = "v1.3.0.0"; \ No newline at end of file diff --git a/extensions/cocostudio/action/CCActionFrame.js b/extensions/cocostudio/action/CCActionFrame.js index e26f347538..2571031de9 100644 --- a/extensions/cocostudio/action/CCActionFrame.js +++ b/extensions/cocostudio/action/CCActionFrame.js @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -24,49 +25,271 @@ //Action frame type /** - * @ignore + * The flag move action type of Cocostudio frame. + * @constant + * @type {number} */ ccs.FRAME_TYPE_MOVE = 0; +/** + * The flag scale action type of Cocostudio frame. + * @constant + * @type {number} + */ ccs.FRAME_TYPE_SCALE = 1; +/** + * The flag rotate action type of Cocostudio frame. + * @constant + * @type {number} + */ ccs.FRAME_TYPE_ROTATE = 2; +/** + * The flag tint action type of Cocostudio frame. + * @constant + * @type {number} + */ ccs.FRAME_TYPE_TINT = 3; +/** + * The flag fade action type of Cocostudio frame. + * @constant + * @type {number} + */ ccs.FRAME_TYPE_FADE = 4; +/** + * The max flag of Cocostudio frame. + * @constant + * @type {number} + */ ccs.FRAME_TYPE_MAX = 5; /** - * Base class for ccs.ActionFrame + * The ease type of Cocostudio frame. + * @constant + * @type {Object} + */ +ccs.FrameEaseType = { + CUSTOM : -1, + + LINEAR : 0, + + SINE_EASEIN : 1, + SINE_EASEOUT : 2, + SINE_EASEINOUT : 3, + + QUAD_EASEIN : 4, + QUAD_EASEOUT : 5, + QUAD_EASEINOUT : 6, + + CUBIC_EASEIN : 7, + CUBIC_EASEOUT : 8, + CUBIC_EASEINOUT : 9, + + QUART_EASEIN : 10, + QUART_EASEOUT : 11, + QUART_EASEINOUT : 12, + + QUINT_EASEIN : 13, + QUINT_EASEOUT : 14, + QUINT_EASEINOUT : 15, + + EXPO_EASEIN : 16, + EXPO_EASEOUT : 17, + EXPO_EASEINOUT : 18, + + CIRC_EASEIN : 19, + CIRC_EASEOUT : 20, + CIRC_EASEINOUT : 21, + + ELASTIC_EASEIN : 22, + ELASTIC_EASEOUT : 23, + ELASTIC_EASEINOUT : 24, + + BACK_EASEIN : 25, + BACK_EASEOUT : 26, + BACK_EASEINOUT : 27, + + BOUNCE_EASEIN : 28, + BOUNCE_EASEOUT : 29, + BOUNCE_EASEINOUT : 30, + + TWEEN_EASING_MAX: 1000 +}; + + +/** + * The action frame of Cocostudio. It's the base class of ccs.ActionMoveFrame, ccs.ActionScaleFrame etc. * @class * @extends ccs.Class + * + * @property {Number} frameType - frame type of ccs.ActionFrame + * @property {Number} easingType - easing type of ccs.ActionFrame + * @property {Number} frameIndex - frame index of ccs.ActionFrame + * @property {Number} time - time of ccs.ActionFrame */ ccs.ActionFrame = ccs.Class.extend(/** @lends ccs.ActionFrame# */{ frameType: 0, easingType: 0, frameIndex: 0, + _Parameter: null, time: 0, + + /** + * The constructor of cc.ActionFrame. + */ ctor: function () { this.frameType = 0; - this.easingType = 0; + this.easingType = ccs.FrameEaseType.LINEAR; this.frameIndex = 0; this.time = 0; }, /** - * Gets the action of ActionFrame. - * @param {number} duration + * Returns the action of ActionFrame. its subClass need override it. + * @param {number} duration the duration time of ActionFrame + * @param {ccs.ActionFrame} srcFrame source frame. * @returns {null} */ - getAction: function (duration) { + getAction: function (duration, srcFrame) { + cc.log("Need a definition of
+ * Goes to specified frame and plays current movement.
+ * You need first switch to the movement you want to play, then call this function.
+ *
+ * example : playByIndex(0);
+ * gotoAndPlay(0);
+ * playByIndex(1);
+ * gotoAndPlay(0);
+ * gotoAndPlay(15);
+ *
+ * The base data class for Armature. it contains position, zOrder, skew, scale, color datas.
+ * x y skewX skewY scaleX scaleY used to calculate transform matrix
+ * skewX, skewY can have rotation effect
+ * To get more matrix information, you can have a look at this pape : http://www.senocular.com/flash/tutorials/transformmatrix/
+ *
+ * BoneData used to init a Bone.
+ * BoneData keeps a DisplayData list, a Bone can have many display to change.
+ * The display information saved in the DisplayData
+ *
+ * ArmatureData saved the Armature name and BoneData needed for the CCBones in this Armature
+ * When we create a Armature, we need to get each Bone's BoneData as it's init information.
+ * So we can get a BoneData from the Dictionary saved in the ArmatureData.
+ *
+ * The struct is AnimationData -> MovementData -> MovementBoneData -> FrameData
+ * -> MovementFrameData
+ * + * @class ccs.AnimationData * @extends ccs.Class */ -ccs.AnimationData = ccs.Class.extend(/** @lends ccs.AnimationData# */{ - moveDataDic:null, - movementNames:null, - name:"", - ctor:function () { - this.moveDataDic = {}; - this.movementNames = []; - }, - /** - * add movement data - * @param {ccs.MovementData} moveData - */ - addMovement:function (moveData) { - this.moveDataDic[moveData.name] = moveData; - this.movementNames.push(moveData.name); - }, - /** - * get movement data - * @param {String} moveName - * @returns {ccs.MovementData} - */ - getMovement:function (moveName) { - return this.moveDataDic[moveName]; - }, - /** - * - * @returns {Number} - */ - getMovementCount:function () { - return Object.keys(this.moveDataDic).length; - } -}); +ccs.AnimationData = function(){ + this.movementDataDic = {}; + this.movementNames = []; + this.name = ""; +}; + +/** + * adds movement data to the movement data dictionary + * @param {ccs.MovementData} moveData + */ +ccs.AnimationData.prototype.addMovement = function(moveData){ + this.movementDataDic[moveData.name] = moveData; + this.movementNames.push(moveData.name); +}; + +/** + * gets movement data from movement data dictionary + * @param {String} moveName + * @returns {ccs.MovementData} + */ +ccs.AnimationData.prototype.getMovement = function(moveName){ + return this.movementDataDic[moveName]; +}; + +/** + * gets the count of movement data dictionary + * @returns {Number} + */ +ccs.AnimationData.prototype.getMovementCount = function(){ + return Object.keys(this.movementDataDic).length; +}; /** * contour vertex + * @class ccs.ContourVertex2 * @param {Number} x * @param {Number} y * @constructor @@ -603,70 +750,58 @@ ccs.ContourVertex2 = function (x, y) { }; /** - * Base class for ccs.ContourData objects. - * @class - * @extends ccs.Class + * The Contour data information of Cocos Armature. + * @class ccs.ContourData + * @constructor */ -ccs.ContourData = ccs.Class.extend({ - vertexList:null, - ctor:function () { - this.vertexList = []; - }, +ccs.ContourData = function(){ + this.vertexList = []; +}; - init:function () { - this.vertexList = []; - return true; - }, +ccs.ContourData.prototype.init = function(){ + this.vertexList.length = 0; + return true; +}; - /** - * add vertex - * @param {cc.Point} p - */ - addVertex: function (p) { - var v = ccs.ContourVertex2(p.x, p.y); - this.vertexList.push(v); - } -}); +/** + * add a vertex object to vertex list + * @param {cc.Point} p + */ +ccs.ContourData.prototype.addVertex = function(p){ + //var v = new ccs.ContourVertex2(p.x, p.y); //ccs.ContourVertex2 is same as cc.Point, so we needn't create a ccs.ContourVertex2 object + this.vertexList.push(p); +}; /** - * Base class for ccs.TextureData objects. - * @class - * @extends ccs.Class + * The texture data information of Cocos Armature + * @class ccs.TextureData */ -ccs.TextureData = ccs.Class.extend(/** @lends ccs.TextureData# */{ - height:0, - width:0, - pivotX:0, - pivotY:0, - name:"", - contourDataList:null, - ctor:function () { - this.height = 0; - this.width = 0; - this.pivotX = 0.5; - this.pivotY = 0.5; - this.name = ""; - this.contourDataList = []; - }, +ccs.TextureData = function(){ + this.height = 0; + this.width = 0; + this.pivotX = 0.5; + this.pivotY = 0.5; + this.name = ""; + this.contourDataList = []; +}; - init:function () { - this.contourDataList = []; - }, +ccs.TextureData.prototype.init = function(){ + this.contourDataList.length = 0; +}; - /** - * set contourData - * @param {ccs.ContourData} contourData - */ - addContourData:function (contourData) { - this.contourDataList.push(contourData); - }, +/** + * Adds a contourData to contourDataList + * @param {ccs.ContourData} contourData + */ +ccs.TextureData.prototype.addContourData = function(contourData){ + this.contourDataList.push(contourData); +}; - /** - * get contourData - * @param {Number} index - * @returns {ccs.ContourData} - */ - getContourData:function (index) { - return this.contourDataList[index]; - } -}); +/** + * gets a contourData from contourDataList by index + * @param {Number} index + * @returns {ccs.ContourData} + */ +ccs.TextureData.prototype.getContourData = function(index){ + return this.contourDataList[index]; +}; diff --git a/extensions/cocostudio/armature/display/CCBatchNode.js b/extensions/cocostudio/armature/display/CCBatchNode.js index ad8307b5f7..f20c238850 100644 --- a/extensions/cocostudio/armature/display/CCBatchNode.js +++ b/extensions/cocostudio/armature/display/CCBatchNode.js @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -22,12 +23,21 @@ THE SOFTWARE. ****************************************************************************/ -cc.BatchNode = cc.Node.extend({ +/** + * A batchNode to Armature + * @class ccs.BatchNode + * @extends cc.Node + */ +ccs.BatchNode = cc.Node.extend(/** @lends ccs.BatchNode# */{ _atlas:null, _className:"BatchNode", + ctor:function () { this._atlas = null; + + ccs.BatchNode.prototype.init.call(this); }, + init:function () { var ret = cc.Node.prototype.init.call(this); this.setShaderProgram(cc.shaderCache.programForKey(cc.SHADER_POSITION_TEXTURE_UCOLOR)); @@ -36,36 +46,52 @@ cc.BatchNode = cc.Node.extend({ addChild:function (child, zOrder, tag) { cc.Node.prototype.addChild.call(this, child, zOrder, tag); - if (child instanceof cc.Armature) { + if (child instanceof cc.Armature){ child.setBatchNode(this); } }, - visit:function () { + removeChild: function(child, cleanup){ + if (child instanceof cc.Armature) + child.setBatchNode(null); + cc.Node.prototype.removeChild.call(this, child, cleanup); + }, + + visit:function (renderer, parentTransform, parentTransformUpdated) { // quick return if not visible. children won't be drawn. - if (!this._visible) { + if (!this._visible) return; - } - this.kmGLPushMatrix(); - if (this.grid && this.grid.isActive()) { + + var dirty = parentTransformUpdated || this._transformUpdated; + if(dirty) + this._modelViewTransform = this.transform(parentTransform); + this._transformUpdated = false; + + // IMPORTANT: + // To ease the migration to v3.0, we still support the kmGL stack, + // but it is deprecated and your code should not rely on it + cc.kmGLPushMatrixWitMat4(this._stackMatrix); + + if (this.grid && this.grid.isActive()) this.grid.beforeDraw(); - } - this.transform(); + this.sortAllChildren(); - this.draw(); - // reset for next frame - this.arrivalOrder = 0; - if (this.grid && this.grid.isActive()) { + this.draw(renderer, this._modelViewTransform, dirty); + + if (this.grid && this.grid.isActive()) this.grid.afterDraw(this); - } - this.kmGLPopMatrix(); + + cc.kmGLPopMatrix(); }, - draw:function (ctx) { - cc.nodeDrawSetup(this); + draw:function (renderer, transform, transformUpdated) { + var locChildren = this._children; + if(locChildren.length === 0) + return; + var child = null; - for (var i = 0; i < this._children.length; i++) { - child = this._children[i]; + for (var i = 0, len = locChildren.length; i < len; i++) { + child = locChildren[i]; child.visit(); if (child instanceof cc.Armature) { this._atlas = child.getTextureAtlas(); @@ -77,10 +103,12 @@ cc.BatchNode = cc.Node.extend({ } } }); -cc.BatchNode.create = function () { - var batchNode = new cc.BatchNode(); - if (batchNode && batchNode.init()) { - return batchNode; - } - return null; + +/** + * + * @returns {ccs.BatchNode} + * @deprecated since v3.1, please use new construction instead + */ +ccs.BatchNode.create = function () { + return new ccs.BatchNode(); }; \ No newline at end of file diff --git a/extensions/cocostudio/armature/display/CCDecorativeDisplay.js b/extensions/cocostudio/armature/display/CCDecorativeDisplay.js index 2a537eccda..f7a7c3d4bf 100644 --- a/extensions/cocostudio/armature/display/CCDecorativeDisplay.js +++ b/extensions/cocostudio/armature/display/CCDecorativeDisplay.js @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,35 +24,45 @@ ****************************************************************************/ /** - * Base class for ccs.DecorativeDisplay + * Decorative a display node for Cocos Armature * @class * @extends ccs.Class */ ccs.DecorativeDisplay = ccs.Class.extend(/** @lends ccs.DecorativeDisplay# */{ - _display:null, - _colliderDetector:null, - _displayData:null, + _display: null, + _colliderDetector: null, + _displayData: null, ctor:function () { this._display = null; this._colliderDetector = null; this._displayData = null; + + //ccs.DecorativeDisplay.prototype.init.call(this); }, + /** + * Initializes a ccs.DecorativeDisplay + * @returns {boolean} + */ init:function () { return true; }, /** - * display setter + * Sets display node to decorative * @param {cc.Node} display */ setDisplay:function (display) { + if(display._parent){ + display._parent.removeChild(display); + delete display._parent; + } this._display = display; }, /** - * display getter + * Returns the display node * @returns {cc.Node} */ getDisplay:function () { @@ -59,7 +70,7 @@ ccs.DecorativeDisplay = ccs.Class.extend(/** @lends ccs.DecorativeDisplay# */{ }, /** - * colliderDetector setter + * Sets collide detector * @param {ccs.ColliderDetector} colliderDetector */ setColliderDetector:function (colliderDetector) { @@ -67,7 +78,7 @@ ccs.DecorativeDisplay = ccs.Class.extend(/** @lends ccs.DecorativeDisplay# */{ }, /** - * colliderDetector getter + * Returns collide detector * @returns {ccs.ColliderDetector} */ getColliderDetector:function () { @@ -75,7 +86,7 @@ ccs.DecorativeDisplay = ccs.Class.extend(/** @lends ccs.DecorativeDisplay# */{ }, /** - * display data setter + * Sets display data * @param {ccs.DisplayData} displayData */ setDisplayData:function (displayData) { @@ -83,35 +94,25 @@ ccs.DecorativeDisplay = ccs.Class.extend(/** @lends ccs.DecorativeDisplay# */{ }, /** - * display data getter + * Returns display data * @returns {ccs.DisplayData} */ getDisplayData:function () { return this._displayData; }, + release:function () { - CC_SAFE_RELEASE(this._display); this._display = null; - CC_SAFE_RELEASE(this._displayData); this._displayData = null; - CC_SAFE_RELEASE(this._colliderDetector); this._colliderDetector = null; } - }); /** - * allocates and initializes a decorative display. - * @constructs + * Allocates and initializes a decorative display. * @return {ccs.DecorativeDisplay} - * @example - * // example - * var display = ccs.DecorativeDisplay.create(); + * @deprecated since v3.1, please use new construction instead */ ccs.DecorativeDisplay.create = function () { - var decorativeDisplay = new ccs.DecorativeDisplay(); - if (decorativeDisplay && decorativeDisplay.init()) { - return decorativeDisplay; - } - return null; + return new ccs.DecorativeDisplay(); }; \ No newline at end of file diff --git a/extensions/cocostudio/armature/display/CCDisplayFactory.js b/extensions/cocostudio/armature/display/CCDisplayFactory.js index a898315dc8..da8f8601df 100644 --- a/extensions/cocostudio/armature/display/CCDisplayFactory.js +++ b/extensions/cocostudio/armature/display/CCDisplayFactory.js @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,181 +26,192 @@ /** * @ignore */ -ccs.DisplayFactory = ccs.DisplayFactory || ccs.Class.extend({}); -ccs.DisplayFactory.addDisplay = function (bone, decoDisplay, displayData) { - switch (displayData.displayType) { - case ccs.DISPLAY_TYPE_SPRITE: - this.addSpriteDisplay(bone, decoDisplay, displayData); - break; - case ccs.DISPLAY_TYPE_PARTICLE: - this.addParticleDisplay(bone, decoDisplay, displayData); - break; - case ccs.DISPLAY_TYPE_ARMATURE: - this.addArmatureDisplay(bone, decoDisplay, displayData); - break; - default: - break; - } -}; -ccs.DisplayFactory.createDisplay = function (bone, decoDisplay) { - switch (decoDisplay.getDisplayData().displayType) { - case ccs.DISPLAY_TYPE_SPRITE: - this.createSpriteDisplay(bone, decoDisplay); - break; - case ccs.DISPLAY_TYPE_PARTICLE: - this.createParticleDisplay(bone, decoDisplay); - break; - case ccs.DISPLAY_TYPE_ARMATURE: - this.createArmatureDisplay(bone, decoDisplay); - break; - default: - break; - } -}; -ccs.DisplayFactory._helpTransform = {a:1, b:0, c:0, d:1, tx:0, ty:0}; -ccs.DisplayFactory.updateDisplay = function (bone,dt, dirty) { - var display = bone.getDisplayRenderNode(); - if(!display) - return; - - switch (bone.getDisplayRenderNodeType()) { - case ccs.DISPLAY_TYPE_SPRITE: - if (dirty){ - display.updateArmatureTransform(); - } - break; - case ccs.DISPLAY_TYPE_PARTICLE: - this.updateParticleDisplay(bone, display, dt); - break; - case ccs.DISPLAY_TYPE_ARMATURE: - this.updateArmatureDisplay(bone, display, dt); - break; - default: - display.setAdditionalTransform(bone.nodeToArmatureTransform()); - break; - } +ccs.displayFactory = { + addDisplay: function (bone, decoDisplay, displayData) { + switch (displayData.displayType) { + case ccs.DISPLAY_TYPE_SPRITE: + this.addSpriteDisplay(bone, decoDisplay, displayData); + break; + case ccs.DISPLAY_TYPE_PARTICLE: + this.addParticleDisplay(bone, decoDisplay, displayData); + break; + case ccs.DISPLAY_TYPE_ARMATURE: + this.addArmatureDisplay(bone, decoDisplay, displayData); + break; + default: + break; + } + }, - if (ccs.ENABLE_PHYSICS_CHIPMUNK_DETECT || ccs.ENABLE_PHYSICS_SAVE_CALCULATED_VERTEX) { - if (dirty) { - var decoDisplay = bone.getDisplayManager().getCurrentDecorativeDisplay(); - var detector = decoDisplay.getColliderDetector(); - if (detector) { - var node = decoDisplay.getDisplay(); - var displayTransform = node.nodeToParentTransform(); - var helpTransform = this._helpTransform; - helpTransform.a = displayTransform.a; - helpTransform.b = displayTransform.b; - helpTransform.c = displayTransform.c; - helpTransform.d = displayTransform.d; - helpTransform.tx = displayTransform.tx; - helpTransform.ty = displayTransform.ty; - var anchorPoint = node.getAnchorPointInPoints(); - anchorPoint = cc.PointApplyAffineTransform(anchorPoint, helpTransform); - helpTransform.tx = anchorPoint.x; - helpTransform.ty = anchorPoint.y; - var t = cc.AffineTransformConcat(helpTransform, bone.getArmature().nodeToParentTransform()); - detector.updateTransform(t); + createDisplay: function (bone, decoDisplay) { + switch (decoDisplay.getDisplayData().displayType) { + case ccs.DISPLAY_TYPE_SPRITE: + this.createSpriteDisplay(bone, decoDisplay); + break; + case ccs.DISPLAY_TYPE_PARTICLE: + this.createParticleDisplay(bone, decoDisplay); + break; + case ccs.DISPLAY_TYPE_ARMATURE: + this.createArmatureDisplay(bone, decoDisplay); + break; + default: + break; + } + }, + + _helpTransform: {a:1, b:0, c:0, d:1, tx:0, ty:0}, + updateDisplay: function (bone,dt, dirty) { + var display = bone.getDisplayRenderNode(); + if(!display) + return; + + switch (bone.getDisplayRenderNodeType()) { + case ccs.DISPLAY_TYPE_SPRITE: + if (dirty) + display.updateArmatureTransform(); + break; + case ccs.DISPLAY_TYPE_PARTICLE: + this.updateParticleDisplay(bone, display, dt); + break; + case ccs.DISPLAY_TYPE_ARMATURE: + this.updateArmatureDisplay(bone, display, dt); + break; + default: + var transform = bone.getNodeToArmatureTransform(); + display.setAdditionalTransform(transform); + break; + } + if (ccs.ENABLE_PHYSICS_CHIPMUNK_DETECT || ccs.ENABLE_PHYSICS_SAVE_CALCULATED_VERTEX) { + if (dirty) { + var decoDisplay = bone.getDisplayManager().getCurrentDecorativeDisplay(); + var detector = decoDisplay.getColliderDetector(); + if (detector) { + var node = decoDisplay.getDisplay(); + var displayTransform = node.getNodeToParentTransform(); + var helpTransform = this._helpTransform; + helpTransform.a = displayTransform.a; + helpTransform.b = displayTransform.b; + helpTransform.c = displayTransform.c; + helpTransform.d = displayTransform.d; + helpTransform.tx = displayTransform.tx; + helpTransform.ty = displayTransform.ty; + var anchorPoint = cc.pointApplyAffineTransform(node.getAnchorPointInPoints(), helpTransform); + helpTransform.tx = anchorPoint.x; + helpTransform.ty = anchorPoint.y; + var t = cc.affineTransformConcat(helpTransform, bone.getArmature().getNodeToParentTransform()); + detector.updateTransform(t); + } } } - } + }, -}; -ccs.DisplayFactory.addSpriteDisplay = function (bone, decoDisplay, displayData) { - var sdp = new ccs.SpriteDisplayData(); - sdp.copy(displayData); - decoDisplay.setDisplayData(sdp); - this.createSpriteDisplay(bone, decoDisplay); -}; - -ccs.DisplayFactory.createSpriteDisplay = function (bone, decoDisplay) { - var skin = null; - var displayData = decoDisplay.getDisplayData(); - //! remove .xxx - var textureName = displayData.displayName; - var startPos = textureName.lastIndexOf("."); - if (startPos != -1) { - textureName = textureName.substring(0, startPos); - } - //! create display - if (textureName == "") { - skin = ccs.Skin.create(); - } - else { - skin = ccs.Skin.createWithSpriteFrameName(textureName + ".png"); - } - decoDisplay.setDisplay(skin); - skin.setBone(bone); - this.initSpriteDisplay(bone, decoDisplay, displayData.displayName, skin); - var armature = bone.getArmature(); - if (armature) { - if (armature.getArmatureData().dataVersion >= ccs.CONST_VERSION_COMBINED) - skin.setSkinData(displayData.skinData); + addSpriteDisplay: function (bone, decoDisplay, displayData) { + var sdp = new ccs.SpriteDisplayData(); + sdp.copy(displayData); + decoDisplay.setDisplayData(sdp); + this.createSpriteDisplay(bone, decoDisplay); + }, + + createSpriteDisplay: function (bone, decoDisplay) { + var skin = null; + var displayData = decoDisplay.getDisplayData(); + //! remove .xxx + var textureName = displayData.displayName; + var startPos = textureName.lastIndexOf("."); + if (startPos !== -1) + textureName = textureName.substring(0, startPos); + //! create display + if (textureName === "") + skin = new ccs.Skin(); else - skin.setSkinData(bone.getBoneData()); - } + skin = new ccs.Skin("#" + textureName + ".png"); + decoDisplay.setDisplay(skin); -}; + skin.setBone(bone); + this.initSpriteDisplay(bone, decoDisplay, displayData.displayName, skin); -ccs.DisplayFactory.initSpriteDisplay = function(bone, decoDisplay, displayName, skin){ - var textureName = displayName; - var startPos = textureName.lastIndexOf("."); - if (startPos != -1) { - textureName = textureName.substring(0, startPos); - } - var textureData = ccs.armatureDataManager.getTextureData(textureName); - if (textureData) { - //! Init display anchorPoint, every Texture have a anchor point - skin.setAnchorPoint(textureData.pivotX, textureData.pivotY); - } - if (ccs.ENABLE_PHYSICS_CHIPMUNK_DETECT || ccs.ENABLE_PHYSICS_SAVE_CALCULATED_VERTEX) { - if (textureData && textureData.contourDataList.length > 0) { - var colliderDetector = ccs.ColliderDetector.create(bone); - colliderDetector.addContourDataList(textureData.contourDataList); - decoDisplay.setColliderDetector(colliderDetector); + var armature = bone.getArmature(); + if (armature) { + if (armature.getArmatureData().dataVersion >= ccs.CONST_VERSION_COMBINED) + skin.setSkinData(displayData.skinData); + else + skin.setSkinData(bone.boneData); } + }, + + initSpriteDisplay: function (bone, decoDisplay, displayName, skin) { + //! remove .xxx + var textureName = displayName; + var startPos = textureName.lastIndexOf("."); + + if (startPos !== -1) + textureName = textureName.substring(0, startPos); + + var textureData = ccs.armatureDataManager.getTextureData(textureName); + if (textureData) { + //! Init display anchorPoint, every Texture have a anchor point + skin.setAnchorPoint(cc.p(textureData.pivotX, textureData.pivotY)); + } + + if (ccs.ENABLE_PHYSICS_CHIPMUNK_DETECT || ccs.ENABLE_PHYSICS_SAVE_CALCULATED_VERTEX) { + if (textureData && textureData.contourDataList.length > 0) { + //! create ContourSprite + var colliderDetector = new ccs.ColliderDetector(bone); + colliderDetector.addContourDataList(textureData.contourDataList); + decoDisplay.setColliderDetector(colliderDetector); + } + } + }, + + addArmatureDisplay: function (bone, decoDisplay, displayData) { + var adp = new ccs.ArmatureDisplayData(); + adp.copy(displayData); + decoDisplay.setDisplayData(adp); + + this.createArmatureDisplay(bone, decoDisplay); + }, + + createArmatureDisplay: function (bone, decoDisplay) { + var displayData = decoDisplay.getDisplayData(); + var armature = new ccs.Armature(displayData.displayName, bone); + decoDisplay.setDisplay(armature); + }, + + updateArmatureDisplay: function (bone, armature, dt) { + if (armature) { + armature.sortAllChildren(); + armature.update(dt); + } + }, + + addParticleDisplay: function (bone, decoDisplay, displayData) { + var adp = new ccs.ParticleDisplayData(); + adp.copy(displayData); + decoDisplay.setDisplayData(adp); + this.createParticleDisplay(bone, decoDisplay); + }, + + createParticleDisplay: function (bone, decoDisplay) { + var displayData = decoDisplay.getDisplayData(); + var system = new cc.ParticleSystem(displayData.displayName); + + system.removeFromParent(); + system.cleanup(); + + var armature = bone.getArmature(); + if (armature) + system.setParent(bone.getArmature()); + + decoDisplay.setDisplay(system); + }, + + updateParticleDisplay: function (bone, particleSystem, dt) { + var node = new ccs.BaseData(); + ccs.TransformHelp.matrixToNode(bone.nodeToArmatureTransform(), node); + particleSystem.setPosition(node.x, node.y); + particleSystem.setScaleX(node.scaleX); + particleSystem.setScaleY(node.scaleY); + particleSystem.update(dt); } -}; - -ccs.DisplayFactory.addArmatureDisplay = function (bone, decoDisplay, displayData) { - var adp = new ccs.ArmatureDisplayData(); - adp.copy(displayData); - decoDisplay.setDisplayData(adp); - - this.createArmatureDisplay(bone, decoDisplay); -}; -ccs.DisplayFactory.createArmatureDisplay = function (bone, decoDisplay) { - var displayData = decoDisplay.getDisplayData(); - var armature = ccs.Armature.create(displayData.displayName, bone); - decoDisplay.setDisplay(armature); -}; -ccs.DisplayFactory.updateArmatureDisplay = function (bone, armature, dt) { - if (armature) { - armature.sortAllChildren(); - armature.update(dt); - } -}; - -ccs.DisplayFactory.addParticleDisplay = function (bone, decoDisplay, displayData) { - var adp = new ccs.ParticleDisplayData(); - adp.copy(displayData); - decoDisplay.setDisplayData(adp); - this.createParticleDisplay(bone, decoDisplay); -}; -ccs.DisplayFactory.createParticleDisplay = function (bone, decoDisplay) { - var displayData = decoDisplay.getDisplayData(); - var system = cc.ParticleSystem.create(displayData.displayName); - var armature = bone.getArmature(); - if (armature) { - system.setParent(bone.getArmature()); - } - decoDisplay.setDisplay(system); -}; -ccs.DisplayFactory.updateParticleDisplay = function (bone, particleSystem, dt) { - var node = new ccs.BaseData(); - ccs.TransformHelp.matrixToNode(bone.nodeToArmatureTransform(), node); - particleSystem.setPosition(node.x, node.y); - particleSystem.setScaleX(node.scaleX); - particleSystem.setScaleY(node.scaleY); - particleSystem.update(dt); -}; +}; \ No newline at end of file diff --git a/extensions/cocostudio/armature/display/CCDisplayManager.js b/extensions/cocostudio/armature/display/CCDisplayManager.js index e49855c9e5..5ea12a0fe7 100644 --- a/extensions/cocostudio/armature/display/CCDisplayManager.js +++ b/extensions/cocostudio/armature/display/CCDisplayManager.js @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,54 +24,117 @@ ****************************************************************************/ /** - * The display manager of CocoStudio - * @Class + * The display manager for CocoStudio Armature bone. + * @Class ccs.DisplayManager * @extend cc.Class + * + * @param {ccs.Bone} bone The bone for the display manager */ -ccs.DisplayManager = ccs.Class.extend(/** @lends cc.DisplayManager */{ +ccs.DisplayManager = ccs.Class.extend(/** @lends ccs.DisplayManager */{ _decoDisplayList:null, _currentDecoDisplay:null, _displayRenderNode:null, - _displayIndex:-1, + _displayIndex: null, _forceChangeDisplay:false, _bone:null, _visible:true, _displayType: null, - ctor:function () { + + ctor:function (bone) { this._decoDisplayList = []; this._currentDecoDisplay = null; this._displayRenderNode = null; - this._displayIndex = -1; + this._displayIndex = null; this._forceChangeDisplay = false; this._bone = null; this._visible = true; this._displayType = ccs.DISPLAY_TYPE_MAX; + + bone && ccs.DisplayManager.prototype.init.call(this, bone); }, + /** + * Initializes a ccs.DisplayManager. + * @param bone + * @returns {boolean} + */ init:function (bone) { this._bone = bone; this.initDisplayList(bone.getBoneData()); return true; }, - addDisplay: function (displayData, index) { - var decoDisplay = null; - if (index >= 0 && index < this._decoDisplayList.length) { - decoDisplay = this._decoDisplayList[index]; - } - else { - decoDisplay = ccs.DecorativeDisplay.create(); - this._decoDisplayList.push(decoDisplay); + /** + *
+ * Add display and use _DisplayData init the display.
+ * If index already have a display, then replace it.
+ * If index is current display index, then also change display to _index
+ *
+ * Change display by index. You can just use this method to change display in the display list.
+ * The display list is just used for this bone, and it is the displays you may use in every frame.
+ * Note : if index is the same with prev index, the method will not effect
+ *
+ * Use BoneData to init the display list. + * If display is a sprite, and it have texture info in the TextureData, then use TextureData to init the display node's anchor point + * If the display is a Armature, then create a new Armature + *
+ * @param {ccs.BoneData} boneData + */ initDisplayList:function (boneData) { - this._decoDisplayList = []; - if (!boneData) { + this._decoDisplayList.length = 0; + if (!boneData) return; - } - var displayList = boneData.displayDataList; + var displayList = boneData.displayDataList, decoList = this._decoDisplayList, locBone = this._bone; for (var i = 0; i < displayList.length; i++) { var displayData = displayList[i]; - var decoDisplay = ccs.DecorativeDisplay.create(); + var decoDisplay = new ccs.DecorativeDisplay(); decoDisplay.setDisplayData(displayData); - - ccs.DisplayFactory.createDisplay(this._bone, decoDisplay); - - this._decoDisplayList.push(decoDisplay); + ccs.displayFactory.createDisplay(locBone, decoDisplay); + decoList.push(decoDisplay); } }, + /** + * Check if the position is inside the bone. + * @param {cc.Point|Number} point + * @param {Number} [y] + * @returns {boolean} + */ containPoint: function (point, y) { - var p = cc.p(0, 0); - if (y === undefined) { - p.x = point.x; - p.y = point.y; - } else { - p.x = point; - p.y = y; - } - if (!this._visible || this._displayIndex < 0) { + if (!this._visible || this._displayIndex < 0) return false; - } - var ret = false; - switch (this._currentDecoDisplay.getDisplayData().displayType) { - case ccs.DISPLAY_TYPE_SPRITE: - /* - * First we first check if the point is in the sprite content rect. If false, then we continue to check - * the contour point. If this step is also false, then we can say the bone not contain this point. - * - */ - var outPoint = cc.p(0, 0); - var sprite = this._currentDecoDisplay.getDisplay(); - sprite = sprite.getChildByTag(0); - ret = ccs.SPRITE_CONTAIN_POINT_WITH_RETURN(sprite, p, outPoint); - break; - default: - break; + if (y !== undefined) + point = cc.p(point, y); + + if(this._currentDecoDisplay.getDisplayData().displayType === ccs.DISPLAY_TYPE_SPRITE){ + /* + * First we first check if the point is in the sprite content rect. If false, then we continue to check + * the contour point. If this step is also false, then we can say the bone not contain this point. + * + */ + var sprite = this._currentDecoDisplay.getDisplay(); + sprite = sprite.getChildByTag(0); + return ccs.SPRITE_CONTAIN_POINT_WITH_RETURN(sprite, point); } - return ret; + return false; }, + /** + *
+ * Sets whether the display is visible
+ * The default value is true, a node is default to visible
+ *
- * The returned box is relative only to its parent. - * @return {cc.Rect} + + /** + * Sets the bone reference to ccs.Skin. + * @param bone */ - getBoundingBox:function () { - var rect = cc.rect(0, 0, this._contentSize.width, this._contentSize.height); - var transForm = this.nodeToParentTransform(); - return cc.RectApplyAffineTransform(rect, transForm); + setBone: function (bone) { + this.bone = bone; + var armature = this.bone.getArmature(); + if(armature) + this._armature = armature; + }, + + /** + * Returns the bone reference of ccs.Skin. + * @returns {null} + */ + getBone: function () { + return this.bone; }, /** * display name getter * @returns {String} */ - getDisplayName:function(){ + getDisplayName: function () { return this._displayName; }, - nodeToWorldTransform: function () { - return cc.AffineTransformConcat(this._transform, this.bone.getArmature().nodeToWorldTransform()); - }, - - - nodeToWorldTransformAR: function () { - var displayTransform = this._transform; - var anchorPoint = this._anchorPointInPoints; - - anchorPoint = cc.PointApplyAffineTransform(anchorPoint, displayTransform); - displayTransform.tx = anchorPoint.x; - displayTransform.ty = anchorPoint.y; - - return cc.AffineTransformConcat(displayTransform, this.bone.getArmature().nodeToWorldTransform()); + _createRenderCmd: function(){ + if(cc._renderType === cc._RENDER_TYPE_CANVAS) + return new ccs.Skin.CanvasRenderCmd(this); + else + return new ccs.Skin.WebGLRenderCmd(this); } }); -ccs.Skin.prototype.nodeToParentTransform = cc.Node.prototype._nodeToParentTransformForWebGL; -window._p = ccs.Skin.prototype; +var _p = ccs.Skin.prototype; // Extended properties /** @expose */ @@ -151,42 +191,25 @@ cc.defineGetterSetter(_p, "skinData", _p.getSkinData, _p.setSkinData); _p.displayName; cc.defineGetterSetter(_p, "displayName", _p.getDisplayName); -delete window._p; +_p = null; /** * allocates and initializes a skin. - * @param {String} fileName - * @param {cc.Rect} rect + * @param {String} [fileName] fileName or sprite frame name + * @param {cc.Rect} [rect] * @returns {ccs.Skin} - * @example - * // example - * var skin = ccs.Skin.create("res/test.png",cc.rect(0,0,50,50)); + * @deprecated since v3.1, please use new construction instead */ ccs.Skin.create = function (fileName, rect) { - var argnum = arguments.length; - var sprite = new ccs.Skin(); - if (argnum === 0) { - if (sprite.init()) - return sprite; - } else { - if (sprite && sprite.initWithFile(fileName, rect)) - return sprite; - } - return null; + return new ccs.Skin(fileName, rect); }; /** * allocates and initializes a skin. - * @param {String} pszSpriteFrameName + * @param {String} spriteFrameName * @returns {ccs.Skin} - * @example - * // example - * var skin = ccs.Skin.createWithSpriteFrameName("test.png"); + * @deprecated since v3.1, please use new construction instead */ -ccs.Skin.createWithSpriteFrameName = function (pszSpriteFrameName) { - var skin = new ccs.Skin(); - if (skin && skin.initWithSpriteFrameName(pszSpriteFrameName)) { - return skin; - } - return null; +ccs.Skin.createWithSpriteFrameName = function (spriteFrameName) { + return new ccs.Skin("#" + spriteFrameName); }; diff --git a/extensions/cocostudio/armature/display/CCSkinCanvasRenderCmd.js b/extensions/cocostudio/armature/display/CCSkinCanvasRenderCmd.js new file mode 100644 index 0000000000..83504f8b14 --- /dev/null +++ b/extensions/cocostudio/armature/display/CCSkinCanvasRenderCmd.js @@ -0,0 +1,58 @@ +/**************************************************************************** + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. + + http://www.cocos2d-x.org + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + ****************************************************************************/ + +(function(){ + ccs.Skin.RenderCmd = { + updateArmatureTransform: function () { + var node = this._node; + this._transform = cc.affineTransformConcat( + node._skinTransform, + node.bone.getNodeToArmatureTransform() + ); + this._dirtyFlag = this._dirtyFlag & cc.Node._dirtyFlags.transformDirty ^ this._dirtyFlag; + }, + + getNodeToWorldTransform: function () { + return cc.affineTransformConcat(this._transform, this._node.bone.getArmature().getNodeToWorldTransform()); + }, + + getNodeToWorldTransformAR: function () { + var displayTransform = this._transform, node = this._node; + this._anchorPointInPoints = cc.pointApplyAffineTransform(this._anchorPointInPoints, displayTransform); + displayTransform.tx = this._anchorPointInPoints.x; + displayTransform.ty = this._anchorPointInPoints.y; + return cc.affineTransformConcat(displayTransform, node.bone.getArmature().getNodeToWorldTransform()); + } + }; + + ccs.Skin.CanvasRenderCmd = function(renderable){ + cc.Sprite.CanvasRenderCmd.call(this, renderable); + this._needDraw = true; + }; + + var proto = ccs.Skin.CanvasRenderCmd.prototype = Object.create(cc.Sprite.CanvasRenderCmd.prototype); + cc.inject(ccs.Skin.RenderCmd, proto); + proto.constructor = ccs.Skin.CanvasRenderCmd; +})(); diff --git a/extensions/cocostudio/armature/display/CCSkinWebGLRenderCmd.js b/extensions/cocostudio/armature/display/CCSkinWebGLRenderCmd.js new file mode 100644 index 0000000000..f541aa1058 --- /dev/null +++ b/extensions/cocostudio/armature/display/CCSkinWebGLRenderCmd.js @@ -0,0 +1,146 @@ +/**************************************************************************** + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. + + http://www.cocos2d-x.org + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + ****************************************************************************/ + +(function(){ + ccs.Skin.WebGLRenderCmd = function(renderable){ + cc.Sprite.WebGLRenderCmd.call(this, renderable); + }; + + var proto = ccs.Skin.WebGLRenderCmd.prototype = Object.create(cc.Sprite.WebGLRenderCmd.prototype); + cc.inject(ccs.Skin.RenderCmd, proto); + proto.constructor = ccs.Skin.WebGLRenderCmd; + + proto.updateTransform = function(){ + var node = this._node; + var locQuad = this._quad; + // If it is not visible, or one of its ancestors is not visible, then do nothing: + if( !node._visible) + locQuad.br.vertices = locQuad.tl.vertices = locQuad.tr.vertices = locQuad.bl.vertices = {x: 0, y: 0, z: 0}; + else { + // + // calculate the Quad based on the Affine Matrix + // + var transform = this.getNodeToParentTransform(); //this._transform; + var size = node._rect; + + var x1 = node._offsetPosition.x, y1 = node._offsetPosition.y; + + var x2 = x1 + size.width, y2 = y1 + size.height; + var x = transform.tx, y = transform.ty; + + var cr = transform.a, sr = transform.b; + var cr2 = transform.d, sr2 = -transform.c; + var ax = x1 * cr - y1 * sr2 + x; + var ay = x1 * sr + y1 * cr2 + y; + + var bx = x2 * cr - y1 * sr2 + x; + var by = x2 * sr + y1 * cr2 + y; + + var cx = x2 * cr - y2 * sr2 + x; + var cy = x2 * sr + y2 * cr2 + y; + + var dx = x1 * cr - y2 * sr2 + x; + var dy = x1 * sr + y2 * cr2 + y; + + var locVertexZ = node._vertexZ; + if(!cc.SPRITEBATCHNODE_RENDER_SUBPIXEL) { + ax = 0 | ax; + ay = 0 | ay; + bx = 0 | bx; + by = 0 | by; + cx = 0 | cx; + cy = 0 | cy; + dx = 0 | dx; + dy = 0 | dy; + } + this.SET_VERTEX3F(locQuad.bl.vertices,ax, ay,locVertexZ); + this.SET_VERTEX3F(locQuad.br.vertices,bx, by,locVertexZ); + this.SET_VERTEX3F(locQuad.tl.vertices,dx, dy,locVertexZ); + this.SET_VERTEX3F(locQuad.tr.vertices,cx, cy,locVertexZ); + } + + // MARMALADE CHANGE: ADDED CHECK FOR nullptr, TO PERMIT SPRITES WITH NO BATCH NODE / TEXTURE ATLAS + if (node.textureAtlas) + node.textureAtlas.updateQuad(locQuad, node.textureAtlas.getTotalQuads()); + this._quadDirty = true; + }; + + proto.SET_VERTEX3F = function(_v_, _x_, _y_, _z_){ + (_v_).x = (_x_); + (_v_).y = (_y_); + (_v_).z = (_z_); + }; + + proto.rendering = function(ctx){ + var node = this._node; + if (!node._textureLoaded) + return; + + var gl = ctx || cc._renderContext, locTexture = node._texture; + if (locTexture && locTexture._textureLoaded) { + this._shaderProgram.use(); + this._shaderProgram.setUniformForModelViewAndProjectionMatrixWithMat4(); + + cc.glBlendFunc(node._blendFunc.src, node._blendFunc.dst); + //optimize performance for javascript + cc.glBindTexture2DN(0, locTexture); // = cc.glBindTexture2D(locTexture); + cc.glEnableVertexAttribs(cc.VERTEX_ATTRIB_FLAG_POS_COLOR_TEX); + + gl.bindBuffer(gl.ARRAY_BUFFER, this._quadWebBuffer); + if (this._quadDirty) { + gl.bufferData(gl.ARRAY_BUFFER, this._quad.arrayBuffer, gl.DYNAMIC_DRAW); + this._quadDirty = false; + } + gl.vertexAttribPointer(0, 3, gl.FLOAT, false, 24, 0); //cc.VERTEX_ATTRIB_POSITION + gl.vertexAttribPointer(1, 4, gl.UNSIGNED_BYTE, true, 24, 12); //cc.VERTEX_ATTRIB_COLOR + gl.vertexAttribPointer(2, 2, gl.FLOAT, false, 24, 16); //cc.VERTEX_ATTRIB_TEX_COORDS + + gl.drawArrays(gl.TRIANGLE_STRIP, 0, 4); + } + + cc.g_NumberOfDraws++; + if (cc.SPRITE_DEBUG_DRAW === 0 && !node._showNode) + return; + + if (cc.SPRITE_DEBUG_DRAW === 1 || node._showNode) { + // draw bounding box + var locQuad = this._quad; + var verticesG1 = [ + cc.p(locQuad.tl.vertices.x, locQuad.tl.vertices.y), + cc.p(locQuad.bl.vertices.x, locQuad.bl.vertices.y), + cc.p(locQuad.br.vertices.x, locQuad.br.vertices.y), + cc.p(locQuad.tr.vertices.x, locQuad.tr.vertices.y) + ]; + cc._drawingUtil.drawPoly(verticesG1, 4, true); + } else if (cc.SPRITE_DEBUG_DRAW === 2) { + // draw texture box + var drawRectG2 = node.getTextureRect(); + var offsetPixG2 = node.getOffsetPosition(); + var verticesG2 = [cc.p(offsetPixG2.x, offsetPixG2.y), cc.p(offsetPixG2.x + drawRectG2.width, offsetPixG2.y), + cc.p(offsetPixG2.x + drawRectG2.width, offsetPixG2.y + drawRectG2.height), cc.p(offsetPixG2.x, offsetPixG2.y + drawRectG2.height)]; + cc._drawingUtil.drawPoly(verticesG2, 4, true); + } // CC_SPRITE_DEBUG_DRAW + }; +})(); \ No newline at end of file diff --git a/extensions/cocostudio/armature/physics/CCColliderDetector.js b/extensions/cocostudio/armature/physics/CCColliderDetector.js index 1451482c34..dccbe5882d 100644 --- a/extensions/cocostudio/armature/physics/CCColliderDetector.js +++ b/extensions/cocostudio/armature/physics/CCColliderDetector.js @@ -1,5 +1,6 @@ /**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org + Copyright (c) 2011-2012 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -26,6 +27,7 @@ * @ignore */ ccs.PT_RATIO = 32; + /** * Base class for ccs.ColliderFilter * @class @@ -34,15 +36,30 @@ ccs.PT_RATIO = 32; ccs.ColliderFilter = ccs.Class.extend(/** @lends ccs.ColliderFilter# */{ _collisionType: 0, _group: 0, + _categoryBits: 0, + _groupIndex: 0, + _maskBits: 0, + ctor: function (collisionType, group) { this._collisionType = collisionType || 0; this._group = group || 0; }, + updateShape: function (shape) { - shape.collision_type = this._collisionType; - shape.group = this._group; + if(shape instanceof cp.Shape){ + shape.collision_type = this._collisionType; + shape.group = this._group; + }else if(shape instanceof Box2D.b2FilterData){ + var filter = new Box2D.b2FilterData(); + filter.categoryBits = this._categoryBits; + filter.groupIndex = this._groupIndex; + filter.maskBits = this._maskBits; + + shape.SetFilterData(filter); + } } }); + /** * Base class for ccs.ColliderBody * @class @@ -56,13 +73,13 @@ ccs.ColliderFilter = ccs.Class.extend(/** @lends ccs.ColliderFilter# */{ ccs.ColliderBody = ccs.Class.extend(/** @lends ccs.ColliderBody# */{ shape: null, coutourData: null, - colliderFilter:null, - _calculatedVertexList:null, + colliderFilter: null, + _calculatedVertexList: null, ctor: function (contourData) { this.shape = null; this.coutourData = contourData; this.colliderFilter = new ccs.ColliderFilter(); - if(ccs.ENABLE_PHYSICS_SAVE_CALCULATED_VERTEX){ + if (ccs.ENABLE_PHYSICS_SAVE_CALCULATED_VERTEX) { this._calculatedVertexList = []; } }, @@ -76,19 +93,27 @@ ccs.ColliderBody = ccs.Class.extend(/** @lends ccs.ColliderBody# */{ }, /** - * contourData setter - * @param {ccs.ContourData} contourData + * colliderFilter setter + * @param {ccs.ColliderFilter} colliderFilter */ - setContourData: function (contourData) { - this.coutourData = contourData; + setColliderFilter: function (colliderFilter) { + this.colliderFilter = colliderFilter; }, /** - * shape setter - * @return {ccs.Shape} + * get calculated vertex list + * @returns {Array} */ - getShape: function () { - return this.shape; + getCalculatedVertexList: function () { + return this._calculatedVertexList; + }, + + setB2Fixture: function(fixture){ + this._fixture = fixture; + }, + + getB2Fixture: function(){ + return this._fixture; }, /** @@ -100,27 +125,27 @@ ccs.ColliderBody = ccs.Class.extend(/** @lends ccs.ColliderBody# */{ }, /** - * colliderFilter getter - * @returns {ccs.ColliderFilter} + * shape setter + * @return {ccs.Shape} */ - getColliderFilter: function () { - return this.colliderFilter; + getShape: function () { + return this.shape; }, /** - * colliderFilter setter - * @param {ccs.ColliderFilter} colliderFilter + * contourData setter + * @param {ccs.ContourData} contourData */ - setColliderFilter: function (colliderFilter) { - this.colliderFilter = colliderFilter; + setContourData: function (contourData) { + this.coutourData = contourData; }, /** - * get calculated vertex list - * @returns {Array} + * colliderFilter getter + * @returns {ccs.ColliderFilter} */ - getCalculatedVertexList:function(){ - return this._calculatedVertexList; + getColliderFilter: function () { + return this.colliderFilter; } }); @@ -129,6 +154,8 @@ ccs.ColliderBody = ccs.Class.extend(/** @lends ccs.ColliderBody# */{ * @class * @extends ccs.Class * + * @param {ccs.Bone} [bone] + * * @property {ccs.ColliderFilter} colliderFilter - The collider filter of the collider detector * @property {Boolean} active - Indicate whether the collider detector is active * @property {Object} body - The collider body @@ -139,15 +166,19 @@ ccs.ColliderDetector = ccs.Class.extend(/** @lends ccs.ColliderDetector# */{ _body: null, _active: false, _filter: null, - ctor: function () { + helpPoint: cc.p(0, 0), + + ctor: function (bone) { this._colliderBodyList = []; this._bone = null; this._body = null; this._active = false; this._filter = null; + + ccs.ColliderDetector.prototype.init.call(this, bone); }, init: function (bone) { - this._colliderBodyList = []; + this._colliderBodyList.length = 0; if (bone) this._bone = bone; this._filter = new ccs.ColliderFilter(); @@ -161,6 +192,7 @@ ccs.ColliderDetector = ccs.Class.extend(/** @lends ccs.ColliderDetector# */{ addContourData: function (contourData) { var colliderBody = new ccs.ColliderBody(contourData); this._colliderBodyList.push(colliderBody); + if (ccs.ENABLE_PHYSICS_SAVE_CALCULATED_VERTEX) { var calculatedVertexList = colliderBody.getCalculatedVertexList(); var vertexList = contourData.vertexList; @@ -186,51 +218,29 @@ ccs.ColliderDetector = ccs.Class.extend(/** @lends ccs.ColliderDetector# */{ * @param contourData */ removeContourData: function (contourData) { - var locColliderBodyList = this._colliderBodyList; - for (var i = 0; i < locColliderBodyList.length; i++) { - if(locColliderBodyList[i].getContourData()==contourData){ - locColliderBodyList.splice(i, 1); - return; - } + var eraseList = [], i, locBodyList = this._colliderBodyList; + for (i = 0; i < locBodyList.length; i++) { + var body = locBodyList[i]; + if (body && body.getContourData() === contourData) + eraseList.push(body); } + + for (i=0; i
- * The sprite frame cache helper
+ * ccs.spriteFrameCacheHelper is a singleton object, it's a sprite frame cache helper
+ * @class
+ * @name ccs.spriteFrameCacheHelper
*/
-ccs.spriteFrameCacheHelper = /** @lends cc.spriteFrameCacheHelper# */ {
+ccs.spriteFrameCacheHelper = /** @lends ccs.spriteFrameCacheHelper# */ {
_textureAtlasDic:{},
_imagePaths:[],
+ /**
+ * Adds sprite frame from file
+ * @param plistPath
+ * @param imagePath
+ */
addSpriteFrameFromFile:function (plistPath, imagePath) {
cc.spriteFrameCache.addSpriteFrames(plistPath, imagePath);
},
- getTexureAtlasWithTexture:function (texture) {
+ /**
+ * Returns texture atlas with texture.
+ * @param texture
+ * @returns {*}
+ */
+ getTextureAtlasWithTexture:function (texture) {
//todo
return null;
var textureName = texture.getName();
var atlas = this._textureAtlasDic[textureName];
if (atlas == null) {
- atlas = cc.TextureAtlas.create(texture, 20);
+ atlas = new cc.TextureAtlas(texture, 20);
this._textureAtlasDic[textureName] = atlas;
}
return atlas;
},
+ /**
+ * Clear the sprite frame cache's data.
+ */
clear: function () {
this._textureAtlasDic = {};
this._imagePaths = [];
diff --git a/extensions/cocostudio/armature/utils/CCTransformHelp.js b/extensions/cocostudio/armature/utils/CCTransformHelp.js
index d2430c2b10..0d6228d5cd 100644
--- a/extensions/cocostudio/armature/utils/CCTransformHelp.js
+++ b/extensions/cocostudio/armature/utils/CCTransformHelp.js
@@ -1,5 +1,6 @@
/****************************************************************************
- Copyright (c) 2010-2012 cocos2d-x.org
+ Copyright (c) 2011-2012 cocos2d-x.org
+ Copyright (c) 2013-2014 Chukong Technologies Inc.
http://www.cocos2d-x.org
@@ -23,38 +24,86 @@
****************************************************************************/
/**
- * @ignore
+ * use to calculate the matrix of node from parent node
+ * @class ccs.TransformHelp
+ * @extend ccs.Class
*/
ccs.TransformHelp = ccs.TransformHelp || ccs.Class.extend({});
-ccs.TransformHelp.helpMatrix1 = cc.AffineTransformMake(1, 0, 0, 1, 0, 0);
-ccs.TransformHelp.helpMatrix2 = cc.AffineTransformMake(1, 0, 0, 1, 0, 0);
+ccs.TransformHelp.helpMatrix1 = cc.affineTransformMake(1, 0, 0, 1, 0, 0);
+ccs.TransformHelp.helpMatrix2 = cc.affineTransformMake(1, 0, 0, 1, 0, 0);
ccs.TransformHelp.helpPoint1 = cc.p(0, 0);
ccs.TransformHelp.helpPoint2 = cc.p(0, 0);
+ccs.TransformHelp.helpParentNode = {};
/**
+ * Calculate a BaseData's transform matrix from parent node.
* @function
+ * @static
* @param {ccs.BaseData} bone
- * @return {cc.AffineTransform}
* Constructor
*/
-ccs.TransformHelp.transformFromParent = function (bone, parentBone) {
+ccs.TransformHelp.transformFromParent = function (bone, parentNode) {
this.nodeToMatrix(bone, this.helpMatrix1);
- this.nodeToMatrix(parentBone, this.helpMatrix2);
+ this.nodeToMatrix(parentNode, this.helpMatrix2);
- this.helpMatrix2 = cc.AffineTransformInvert(this.helpMatrix2);
- this.helpMatrix1 = cc.AffineTransformConcat(this.helpMatrix1, this.helpMatrix2);
+ this.helpMatrix2 = cc.affineTransformInvert(this.helpMatrix2);
+ this.helpMatrix1 = cc.affineTransformConcat(this.helpMatrix1, this.helpMatrix2);
this.matrixToNode(this.helpMatrix1, bone);
};
+ccs.TransformHelp.transformToParent = function(node, parentNode){
+ this.nodeToMatrix(node, this.helpMatrix1);
+ this.nodeToMatrix(parentNode, this.helpMatrix2);
+
+ this.helpMatrix1 = cc.affineTransformConcat(this.helpMatrix1, this.helpMatrix2);
+
+ this.matrixToNode(this.helpMatrix1, node);
+};
+
+ccs.TransformHelp.transformFromParentWithoutScale = function(node, parentNode){
+// this.helpParentNode.copy(&parentNode);
+
+ for(var p in parentNode){
+ this.helpParentNode[p] = parentNode[p];
+ }
+ this.helpParentNode.scaleX = 1;
+ this.helpParentNode.scaleY = 1;
+
+ this.nodeToMatrix(node, this.helpMatrix1);
+ this.nodeToMatrix(this.helpParentNode, this.helpMatrix2);
+
+ this.helpMatrix2 = cc.affineTransformInvert(this.helpMatrix2);
+ this.helpMatrix1 = cc.affineTransformConcat(this.helpMatrix1, this.helpMatrix2);
+
+ this.matrixToNode(this.helpMatrix1, node);
+};
+
+ccs.TransformHelp.transformToParentWithoutScale = function(node, parentNode){
+ for(var p in parentNode){
+ this.helpParentNode[p] = parentNode[p];
+ }
+ this.helpParentNode.scaleX = 1;
+ this.helpParentNode.scaleY = 1;
+
+ this.nodeToMatrix(node, this.helpMatrix1);
+ this.nodeToMatrix(this.helpParentNode, this.helpMatrix2);
+
+ this.helpMatrix1 = cc.affineTransformConcat(this.helpMatrix1, this.helpMatrix2);
+
+ this.matrixToNode(this.helpMatrix1, node);
+
+};
+
/**
* @function
+ * @static
* @param {ccs.BaseData} node
* @param {cc.AffineTransform} matrix
*/
ccs.TransformHelp.nodeToMatrix = function (node, matrix) {
- if (node.skewX == -node.skewY) {
+ if (node.skewX === -node.skewY) {
var sine = Math.sin(node.skewX);
var cosine = Math.cos(node.skewX);
matrix.a = node.scaleX * cosine;
@@ -65,7 +114,7 @@ ccs.TransformHelp.nodeToMatrix = function (node, matrix) {
matrix.a = node.scaleX * Math.cos(node.skewY);
matrix.b = node.scaleX * Math.sin(node.skewY);
matrix.c = node.scaleY * Math.sin(node.skewX);
- matrix.d = node.scaleY * Math.cos(node.skewY);
+ matrix.d = node.scaleY * Math.cos(node.skewX);
}
matrix.tx = node.x;
matrix.ty = node.y;
@@ -73,6 +122,7 @@ ccs.TransformHelp.nodeToMatrix = function (node, matrix) {
/**
* @function
+ * @static
* @param {cc.AffineTransform} matrix
* @param {ccs.BaseData} node
*/
@@ -83,13 +133,13 @@ ccs.TransformHelp.matrixToNode = function (matrix, node) {
*/
this.helpPoint1.x = 0;
this.helpPoint1.y = 1;
- this.helpPoint1 = cc.PointApplyAffineTransform(this.helpPoint1, matrix);
+ this.helpPoint1 = cc.pointApplyAffineTransform(this.helpPoint1, matrix);
this.helpPoint1.x -= matrix.tx;
this.helpPoint1.y -= matrix.ty;
this.helpPoint2.x = 1;
this.helpPoint2.y = 0;
- this.helpPoint2 = cc.PointApplyAffineTransform(this.helpPoint2, matrix);
+ this.helpPoint2 = cc.pointApplyAffineTransform(this.helpPoint2, matrix);
this.helpPoint2.x -= matrix.tx;
this.helpPoint2.y -= matrix.ty;
@@ -104,6 +154,7 @@ ccs.TransformHelp.matrixToNode = function (matrix, node) {
/**
* @function
+ * @static
* @param {ccs.BaseData} target
* @param {ccs.BaseData} source
*/
@@ -118,6 +169,7 @@ ccs.TransformHelp.nodeConcat = function (target, source) {
/**
* @function
+ * @static
* @param {ccs.BaseData} target
* @param {ccs.BaseData} source
*/
diff --git a/extensions/cocostudio/armature/utils/CCTweenFunction.js b/extensions/cocostudio/armature/utils/CCTweenFunction.js
index 15a71cc16f..7ced7fad96 100644
--- a/extensions/cocostudio/armature/utils/CCTweenFunction.js
+++ b/extensions/cocostudio/armature/utils/CCTweenFunction.js
@@ -1,5 +1,6 @@
/****************************************************************************
- Copyright (c) 2010-2012 cocos2d-x.org
+ Copyright (c) 2011-2012 cocos2d-x.org
+ Copyright (c) 2013-2014 Chukong Technologies Inc.
http://www.cocos2d-x.org
@@ -27,165 +28,177 @@
* @type Object
*/
ccs.TweenType = {
- customEasing: -1,
- linear: 0,
+ CUSTOM_EASING: -1,
+ LINEAR: 0,
- sineEaseIn: 1,
- sineEaseOut: 2,
- sineEaseInOut: 3,
+ SINE_EASEIN: 1,
+ SINE_EASEOUT: 2,
+ SINE_EASEINOUT: 3,
- quadEaseIn: 4,
- quadEaseOut: 5,
- quadEaseInOut: 6,
+ QUAD_EASEIN: 4,
+ QUAD_EASEOUT: 5,
+ QUAD_EASEINOUT: 6,
- cubicEaseIn: 7,
- cubicEaseOut: 8,
- cubicEaseInOut: 9,
+ CUBIC_EASEIN: 7,
+ CUBIC_EASEOUT: 8,
+ CUBIC_EASEINOUT: 9,
- quartEaseIn: 10,
- quartEaseOut: 11,
- quartEaseInOut: 12,
+ QUART_EASEIN: 10,
+ QUART_EASEOUT: 11,
+ QUART_EASEINOUT: 12,
- quintEaseIn: 13,
- quintEaseOut: 14,
- quintEaseInOut: 15,
+ QUINT_EASEIN: 13,
+ QUINT_EASEOUT: 14,
+ QUINT_EASEINOUT: 15,
- expoEaseIn: 16,
- expoEaseOut: 17,
- expoEaseInOut: 18,
+ EXPO_EASEIN: 16,
+ EXPO_EASEOUT: 17,
+ EXPO_EASEINOUT: 18,
- circEaseIn: 19,
- eircEaseOut: 20,
- circEaseInOut: 21,
+ CIRC_EASEIN: 19,
+ CIRC_EASEOUT: 20,
+ CIRC_EASEINOUT: 21,
- elasticEaseIn: 22,
- elasticEaseOut: 23,
- elasticEaseInOut: 24,
+ ELASTIC_EASEIN: 22,
+ ELASTIC_EASEOUT: 23,
+ ELASTIC_EASEINOUT: 24,
- backEaseIn: 25,
- backEaseOut: 26,
- backEaseInOut: 27,
+ BACK_EASEIN: 25,
+ BACK_EASEOUT: 26,
+ BACK_EASEINOUT: 27,
- bounceEaseIn: 28,
- bounceEaseOut: 29,
- bounceEaseInOut: 30,
+ BOUNCE_EASEIN: 28,
+ BOUNCE_EASEOUT: 29,
+ BOUNCE_EASEINOUT: 30,
- tweenEasingMax: 10000
+ TWEEN_EASING_MAX: 10000
};
ccs.TweenFunction = ccs.TweenFunction || ccs.Class.extend({});
-ccs.M_PI_X_2 = Math.PI * 2;
-ccs.M_PI_2 = Math.PI / 2;
+ccs.DOUBLE_PI = ccs.M_PI_X_2 = Math.PI * 2;
+ccs.HALF_PI = ccs.M_PI_2 = Math.PI / 2;
ccs.M_PI = Math.PI;
ccs.TweenFunction.tweenTo = function (time, type, easingParam) {
var delta = 0;
switch (type) {
- case ccs.TweenType.customEasing:
+ case ccs.TweenType.CUSTOM_EASING:
delta = this.customEase(time, easingParam);
break;
- case ccs.TweenType.linear:
+ case ccs.TweenType.LINEAR:
delta = this.linear(time);
break;
- case ccs.TweenType.sineEaseIn:
+ case ccs.TweenType.SINE_EASEIN:
delta = this.sineEaseIn(time);
break;
- case ccs.TweenType.sineEaseOut:
+ case ccs.TweenType.SINE_EASEOUT:
delta = this.sineEaseOut(time);
break;
- case ccs.TweenType.sineEaseInOut:
+ case ccs.TweenType.SINE_EASEINOUT:
delta = this.sineEaseInOut(time);
break;
- case ccs.TweenType.quadEaseIn:
+ case ccs.TweenType.QUAD_EASEIN:
delta = this.quadEaseIn(time);
break;
- case ccs.TweenType.quadEaseOut:
+ case ccs.TweenType.QUAD_EASEOUT:
delta = this.quadEaseOut(time);
break;
- case ccs.TweenType.quadEaseInOut:
+ case ccs.TweenType.QUAD_EASEINOUT:
delta = this.quadEaseInOut(time);
break;
- case ccs.TweenType.cubicEaseIn:
+ case ccs.TweenType.CUBIC_EASEIN:
delta = this.cubicEaseIn(time);
break;
- case ccs.TweenType.cubicEaseOut:
+ case ccs.TweenType.CUBIC_EASEOUT:
delta = this.cubicEaseOut(time);
break;
- case ccs.TweenType.cubicEaseInOut:
+ case ccs.TweenType.CUBIC_EASEINOUT:
delta = this.cubicEaseInOut(time);
break;
- case ccs.TweenType.quartEaseIn:
+ case ccs.TweenType.QUART_EASEIN:
delta = this.quartEaseIn(time);
break;
- case ccs.TweenType.quartEaseOut:
+ case ccs.TweenType.QUART_EASEOUT:
delta = this.quartEaseOut(time);
break;
- case ccs.TweenType.quartEaseInOut:
+ case ccs.TweenType.QUART_EASEINOUT:
delta = this.quartEaseInOut(time);
break;
- case ccs.TweenType.quintEaseIn:
+ case ccs.TweenType.QUINT_EASEIN:
delta = this.quintEaseIn(time);
break;
- case ccs.TweenType.quintEaseOut:
+ case ccs.TweenType.QUINT_EASEOUT:
delta = this.quintEaseOut(time);
break;
- case ccs.TweenType.quintEaseInOut:
+ case ccs.TweenType.QUINT_EASEINOUT:
delta = this.quintEaseInOut(time);
break;
- case ccs.TweenType.expoEaseIn:
+ case ccs.TweenType.EXPO_EASEIN:
delta = this.expoEaseIn(time);
break;
- case ccs.TweenType.expoEaseOut:
+ case ccs.TweenType.EXPO_EASEOUT:
delta = this.expoEaseOut(time);
break;
- case ccs.TweenType.expoEaseInOut:
+ case ccs.TweenType.EXPO_EASEINOUT:
delta = this.expoEaseInOut(time);
break;
- case ccs.TweenType.circEaseIn:
+ case ccs.TweenType.CIRC_EASEIN:
delta = this.circEaseIn(time);
break;
- case ccs.TweenType.eircEaseOut:
+ case ccs.TweenType.CIRC_EASEOUT:
delta = this.circEaseOut(time);
break;
- case ccs.TweenType.circEaseInOut:
+ case ccs.TweenType.CIRC_EASEINOUT:
delta = this.circEaseInOut(time);
break;
- case ccs.TweenType.elasticEaseIn:
- delta = this.elasticEaseIn(time, easingParam);
+ case ccs.TweenType.ELASTIC_EASEIN:
+ var period = 0.3;
+ if(null != easingParam && easingParam.length > 0){
+ period = easingParam[0];
+ }
+ delta = this.elasticEaseIn(time, period);
break;
- case ccs.TweenType.elasticEaseOut:
- delta = this.elasticEaseOut(time, easingParam);
+ case ccs.TweenType.ELASTIC_EASEOUT:
+ var period = 0.3;
+ if(null != easingParam && easingParam.length > 0){
+ period = easingParam[0];
+ }
+ delta = this.elasticEaseOut(time, period);
break;
- case ccs.TweenType.elasticEaseInOut:
- delta = this.elasticEaseInOut(time, easingParam);
+ case ccs.TweenType.ELASTIC_EASEINOUT:
+ var period = 0.3;
+ if(null != easingParam && easingParam.length > 0){
+ period = easingParam[0];
+ }
+ delta = this.elasticEaseInOut(time, period);
break;
- case ccs.TweenType.backEaseIn:
+ case ccs.TweenType.BACK_EASEIN:
delta = this.backEaseIn(time);
break;
- case ccs.TweenType.backEaseOut:
+ case ccs.TweenType.BACK_EASEOUT:
delta = this.backEaseOut(time);
break;
- case ccs.TweenType.backEaseInOut:
+ case ccs.TweenType.BACK_EASEINOUT:
delta = this.backEaseInOut(time);
break;
- case ccs.TweenType.bounceEaseIn:
+ case ccs.TweenType.BOUNCE_EASEIN:
delta = this.bounceEaseIn(time);
break;
- case ccs.TweenType.bounceEaseOut:
+ case ccs.TweenType.BOUNCE_EASEOUT:
delta = this.bounceEaseOut(time);
break;
- case ccs.TweenType.bounceEaseInOut:
+ case ccs.TweenType.BOUNCE_EASEINOUT:
delta = this.bounceEaseInOut(time);
break;
@@ -206,10 +219,10 @@ ccs.TweenFunction.linear = function (time) {
// Sine Ease
ccs.TweenFunction.sineEaseIn = function (time) {
- return -1 * Math.cos(time * ccs.M_PI_2) + 1;
+ return -1 * Math.cos(time * ccs.HALF_PI) + 1;
};
ccs.TweenFunction.sineEaseOut = function (time) {
- return Math.sin(time * ccs.M_PI_2);
+ return Math.sin(time * ccs.HALF_PI);
};
ccs.TweenFunction.sineEaseInOut = function (time) {
return -0.5 * (Math.cos(ccs.M_PI * time) - 1);
@@ -285,10 +298,10 @@ ccs.TweenFunction.quintEaseInOut = function (time) {
// Expo Ease
ccs.TweenFunction.expoEaseIn = function (time) {
- return time == 0 ? 0 : Math.pow(2, 10 * (time - 1)) - 0.001;
+ return time === 0 ? 0 : Math.pow(2, 10 * (time - 1)) - 0.001;
};
ccs.TweenFunction.expoEaseOut = function (time) {
- return time == 1 ? 1 : (-Math.pow(2, -10 * time) + 1);
+ return time === 1 ? 1 : (-Math.pow(2, -10 * time) + 1);
};
ccs.TweenFunction.expoEaseInOut = function (time) {
time /= 0.5;
@@ -329,13 +342,13 @@ ccs.TweenFunction.elasticEaseIn = function (time, easingParam) {
}
var newT = 0;
- if (time == 0 || time == 1) {
+ if (time === 0 || time === 1) {
newT = time;
}
else {
var s = period / 4;
time = time - 1;
- newT = -Math.pow(2, 10 * time) * Math.sin((time - s) * ccs.M_PI_X_2 / period);
+ newT = -Math.pow(2, 10 * time) * Math.sin((time - s) * ccs.DOUBLE_PI / period);
}
return newT;
@@ -348,12 +361,12 @@ ccs.TweenFunction.elasticEaseOut = function (time, easingParam) {
}
var newT = 0;
- if (time == 0 || time == 1) {
+ if (time === 0 || time === 1) {
newT = time;
}
else {
var s = period / 4;
- newT = Math.pow(2, -10 * time) * Math.sin((time - s) * ccs.M_PI_X_2 / period) + 1;
+ newT = Math.pow(2, -10 * time) * Math.sin((time - s) * ccs.DOUBLE_PI / period) + 1;
}
return newT;
@@ -366,7 +379,7 @@ ccs.TweenFunction.elasticEaseInOut = function (time, easingParam) {
}
var newT = 0;
- if (time == 0 || time == 1) {
+ if (time === 0 || time === 1) {
newT = time;
}
else {
@@ -379,10 +392,9 @@ ccs.TweenFunction.elasticEaseInOut = function (time, easingParam) {
time = time - 1;
if (time < 0) {
- newT = -0.5 * Math.pow(2, 10 * time) * Math.sin((time - s) * ccs.M_PI_X_2 / period);
- }
- else {
- newT = Math.pow(2, -10 * time) * Math.sin((time - s) * ccs.M_PI_X_2 / period) * 0.5 + 1;
+ newT = -0.5 * Math.pow(2, 10 * time) * Math.sin((time - s) * ccs.DOUBLE_PI / period);
+ } else {
+ newT = Math.pow(2, -10 * time) * Math.sin((time - s) * ccs.DOUBLE_PI / period) * 0.5 + 1;
}
}
return newT;
@@ -442,8 +454,7 @@ ccs.TweenFunction.bounceEaseInOut = function (time) {
if (time < 0.5) {
time = time * 2;
newT = (1 - ccs.bounceTime(1 - time)) * 0.5;
- }
- else {
+ } else {
newT = ccs.bounceTime(time * 2 - 1) * 0.5 + 0.5;
}
@@ -458,4 +469,33 @@ ccs.TweenFunction.customEase = function (time, easingParam) {
return easingParam[1] * tt * tt * tt + 3 * easingParam[3] * time * tt * tt + 3 * easingParam[5] * time * time * tt + easingParam[7] * time * time * time;
}
return time;
+};
+
+ccs.TweenFunction.easeIn = function(time, rate){
+ return Math.pow(time, rate);
+};
+
+ccs.TweenFunction.easeOut = function(time, rate){
+ return Math.pow(time, 1 / rate);
+};
+
+ccs.TweenFunction.easeInOut = function(time, rate){
+ time *= 2;
+ if(time < 1){
+ return 0.5 * Math.pow(time, rate);
+ }else{
+ return 1 - 0.5 * Math.pow(2 - time, rate);
+ }
+};
+
+ccs.TweenFunction.quadraticIn = function(time){
+ return Math.pow(time, 2);
+};
+
+ccs.TweenFunction.quadraticOut = function(time){
+ return -time * (time - 2);
+};
+
+ccs.TweenFunction.bezieratFunction = function(a, b, c, d, t){
+ return (Math.pow(1-t,3) * a + 3*t*(Math.pow(1-t,2))*b + 3*Math.pow(t,2)*(1-t)*c + Math.pow(t,3)*d );
};
\ No newline at end of file
diff --git a/extensions/cocostudio/armature/utils/CCUtilMath.js b/extensions/cocostudio/armature/utils/CCUtilMath.js
index b960b05754..082ec35b12 100644
--- a/extensions/cocostudio/armature/utils/CCUtilMath.js
+++ b/extensions/cocostudio/armature/utils/CCUtilMath.js
@@ -1,5 +1,6 @@
/****************************************************************************
- Copyright (c) 2010-2012 cocos2d-x.org
+ Copyright (c) 2011-2012 cocos2d-x.org
+ Copyright (c) 2013-2014 Chukong Technologies Inc.
http://www.cocos2d-x.org
@@ -36,13 +37,13 @@ var CC_SAFE_RELEASE = function (obj) {
};
ccs.isSpriteContainPoint = function (sprite, point, outPoint) {
- var p = cc.p(0, 0);
+ var p = sprite.convertToNodeSpace(point);
if (outPoint) {
- p = sprite.convertToNodeSpace(point);
+ outPoint.x = p.x;
+ outPoint.y = p.y;
}
var s = sprite.getContentSize();
- var r = cc.rect(0, 0, s.width, s.height);
- return cc.rectContainsPoint(r, p);
+ return cc.rectContainsPoint(cc.rect(0, 0, s.width, s.height), p);
};
ccs.SPRITE_CONTAIN_POINT = ccs.isSpriteContainPoint;
ccs.SPRITE_CONTAIN_POINT_WITH_RETURN = ccs.isSpriteContainPoint;
diff --git a/extensions/cocostudio/components/CCComAttribute.js b/extensions/cocostudio/components/CCComAttribute.js
index 0b91d17cbe..0575b9334d 100644
--- a/extensions/cocostudio/components/CCComAttribute.js
+++ b/extensions/cocostudio/components/CCComAttribute.js
@@ -1,5 +1,6 @@
/****************************************************************************
- Copyright (c) 2010-2012 cocos2d-x.org
+ Copyright (c) 2011-2012 cocos2d-x.org
+ Copyright (c) 2013-2014 Chukong Technologies Inc.
http://www.cocos2d-x.org
@@ -23,26 +24,36 @@
****************************************************************************/
/**
- * Base class for ccs.ComAttribute
+ * The attribute component for Cocostudio.
* @class
* @extends ccs.Component
*/
ccs.ComAttribute = ccs.Component.extend(/** @lends ccs.ComAttribute# */{
_jsonDict: null,
_filePath: "",
+
+ /**
+ * Construction of ccs.ComAttribute
+ */
ctor: function () {
cc.Component.prototype.ctor.call(this);
this._jsonDict = {};
this._filePath = "";
this._name = "CCComAttribute";
+ ccs.ComAttribute.prototype.init.call(this);
},
+
+ /**
+ * Initializes a ccs.ComAttribute
+ * @returns {boolean}
+ */
init: function () {
this._jsonDict = {};
return true;
},
/**
- * Set int attribute
+ * Sets int attribute
* @param {String} key
* @param {number} value
*/
@@ -55,7 +66,7 @@ ccs.ComAttribute = ccs.Component.extend(/** @lends ccs.ComAttribute# */{
},
/**
- * Set double attribute
+ * Sets double attribute
* @param {String} key
* @param {number} value
*/
@@ -68,7 +79,7 @@ ccs.ComAttribute = ccs.Component.extend(/** @lends ccs.ComAttribute# */{
},
/**
- * Set float attribute
+ * Sets float attribute
* @param {String} key
* @param {number} value
*/
@@ -81,7 +92,7 @@ ccs.ComAttribute = ccs.Component.extend(/** @lends ccs.ComAttribute# */{
},
/**
- * Set boolean attribute
+ * Sets boolean attribute
* @param {String} key
* @param {Boolean} value
*/
@@ -94,7 +105,7 @@ ccs.ComAttribute = ccs.Component.extend(/** @lends ccs.ComAttribute# */{
},
/**
- * Set string attribute
+ * Sets string attribute
* @param {String} key
* @param {Boolean} value
*/
@@ -107,7 +118,7 @@ ccs.ComAttribute = ccs.Component.extend(/** @lends ccs.ComAttribute# */{
},
/**
- * Set object attribute
+ * Sets object attribute
* @param {String} key
* @param {Object} value
*/
@@ -120,7 +131,7 @@ ccs.ComAttribute = ccs.Component.extend(/** @lends ccs.ComAttribute# */{
},
/**
- * Get int value from attribute
+ * Returns int value from attribute
* @param {String} key
* @returns {Number}
*/
@@ -130,7 +141,7 @@ ccs.ComAttribute = ccs.Component.extend(/** @lends ccs.ComAttribute# */{
},
/**
- * Get double value from attribute
+ * Returns double value from attribute
* @param {String} key
* @returns {Number}
*/
@@ -140,7 +151,7 @@ ccs.ComAttribute = ccs.Component.extend(/** @lends ccs.ComAttribute# */{
},
/**
- * Get float value from attribute
+ * Returns float value from attribute
* @param {String} key
* @returns {Number}
*/
@@ -150,7 +161,7 @@ ccs.ComAttribute = ccs.Component.extend(/** @lends ccs.ComAttribute# */{
},
/**
- * Get boolean value from attribute
+ * Returns boolean value from attribute
* @param {String} key
* @returns {Boolean}
*/
@@ -160,7 +171,7 @@ ccs.ComAttribute = ccs.Component.extend(/** @lends ccs.ComAttribute# */{
},
/**
- * Get string value from attribute
+ * Returns string value from attribute
* @param {String} key
* @returns {String}
*/
@@ -170,7 +181,7 @@ ccs.ComAttribute = ccs.Component.extend(/** @lends ccs.ComAttribute# */{
},
/**
- * Get object value from attribute
+ * Returns object value from attribute
* @param {String} key
* @returns {Object}
*/
@@ -179,25 +190,21 @@ ccs.ComAttribute = ccs.Component.extend(/** @lends ccs.ComAttribute# */{
},
/**
- *
- * @param path
+ * Parses json file.
+ * @param filename
*/
- parse:function(path){
- this._jsonDict = cc.loader.getRes(path);
+ parse:function(filename){
+ this._jsonDict = cc.loader.getRes(filename);
}
});
/**
* allocates and initializes a ComAttribute.
- * @constructs
+ * @deprecated since v3.0, please use new construction instead.
* @return {ccs.ComAttribute}
* @example
* // example
* var com = ccs.ComAttribute.create();
*/
ccs.ComAttribute.create = function () {
- var com = new ccs.ComAttribute();
- if (com && com.init()) {
- return com;
- }
- return null;
+ return new ccs.ComAttribute();
};
\ No newline at end of file
diff --git a/extensions/cocostudio/components/CCComAudio.js b/extensions/cocostudio/components/CCComAudio.js
index a3868a7c78..0b15af0b9a 100644
--- a/extensions/cocostudio/components/CCComAudio.js
+++ b/extensions/cocostudio/components/CCComAudio.js
@@ -1,5 +1,6 @@
/****************************************************************************
- Copyright (c) 2010-2012 cocos2d-x.org
+ Copyright (c) 2011-2012 cocos2d-x.org
+ Copyright (c) 2013-2014 Chukong Technologies Inc.
http://www.cocos2d-x.org
@@ -23,29 +24,43 @@
****************************************************************************/
/**
- * Base class for ccs.ComAudio
+ * The audio component for Cocostudio.
* @class
* @extends ccs.Component
*/
ccs.ComAudio = ccs.Component.extend(/** @lends ccs.ComAudio# */{
_filePath: "",
_loop: false,
+
+ /**
+ * Construction of ccs.ComAudio
+ */
ctor: function () {
cc.Component.prototype.ctor.call(this);
this._name = "Audio";
+ ccs.ComAudio.prototype.init.call(this);
},
+
+ /**
+ * Initializes a ccs.ComAudio.
+ * @returns {boolean}
+ */
init: function () {
return true;
},
- onEnter: function () {
- },
-
+ /**
+ * The callback calls when a audio component enter stage.
+ * @override
+ */
onExit: function () {
this.stopBackgroundMusic(true);
this.stopAllEffects();
},
+ /**
+ * Stops all audios.
+ */
end: function () {
cc.audioEngine.end();
},
@@ -60,8 +75,8 @@ ccs.ComAudio = ccs.Component.extend(/** @lends ccs.ComAudio# */{
/**
* Play background music
- * @param {String} pszFilePath
- * @param {Boolean} loop
+ * @param {String} [pszFilePath]
+ * @param {Boolean} [loop]
*/
playBackgroundMusic: function (pszFilePath, loop) {
if(pszFilePath){
@@ -150,16 +165,15 @@ ccs.ComAudio = ccs.Component.extend(/** @lends ccs.ComAudio# */{
/**
* Play sound effect.
- * @param {String} pszFilePath
- * @param {Boolean} loop
+ * @param {String} [pszFilePath]
+ * @param {Boolean} [loop]
* @returns {Boolean}
*/
playEffect: function (pszFilePath, loop) {
- if (pszFilePath) {
+ if (pszFilePath)
return cc.audioEngine.playEffect(pszFilePath, loop);
- } else {
+ else
return cc.audioEngine.playEffect(this._filePath, this._loop);
- }
},
/**
@@ -234,7 +248,7 @@ ccs.ComAudio = ccs.Component.extend(/** @lends ccs.ComAudio# */{
},
/**
- * Set loop
+ * Sets audio component whether plays loop
* @param {Boolean} loop
*/
setLoop: function (loop) {
@@ -242,7 +256,7 @@ ccs.ComAudio = ccs.Component.extend(/** @lends ccs.ComAudio# */{
},
/**
- * File path Getter
+ * Returns the file path of audio component.
* @returns {string}
*/
getFile: function () {
@@ -250,25 +264,22 @@ ccs.ComAudio = ccs.Component.extend(/** @lends ccs.ComAudio# */{
},
/**
- * Whether is loop
+ * Returns audio component whether plays loop
* @returns {boolean}
*/
isLoop: function () {
return this._loop;
}
});
+
/**
* allocates and initializes a ComAudio.
- * @constructs
+ * @deprecated since v3.0, please use new construction instead.
* @return {ccs.ComAudio}
* @example
* // example
* var com = ccs.ComAudio.create();
*/
ccs.ComAudio.create = function () {
- var com = new ccs.ComAudio();
- if (com && com.init()) {
- return com;
- }
- return null;
+ return new ccs.ComAudio();
};
\ No newline at end of file
diff --git a/extensions/cocostudio/components/CCComController.js b/extensions/cocostudio/components/CCComController.js
index 1f2c7ead72..cdd85eeb94 100644
--- a/extensions/cocostudio/components/CCComController.js
+++ b/extensions/cocostudio/components/CCComController.js
@@ -1,5 +1,6 @@
/****************************************************************************
- Copyright (c) 2010-2012 cocos2d-x.org
+ Copyright (c) 2011-2012 cocos2d-x.org
+ Copyright (c) 2013-2014 Chukong Technologies Inc.
http://www.cocos2d-x.org
@@ -23,32 +24,31 @@
****************************************************************************/
/**
- * Base class for ccs.ComController
+ * The controller component for Cocostudio.
* @class
* @extends ccs.Component
*/
ccs.ComController = ccs.Component.extend(/** @lends ccs.ComController# */{
+ /**
+ * Construction of ccs.ComController.
+ */
ctor: function () {
cc.Component.prototype.ctor.call(this);
this._name = "ComController";
- },
- init: function () {
- return true;
+ ccs.ComController.prototype.init.call(this);
},
+ /**
+ * The callback calls when controller component enter stage.
+ * @override
+ */
onEnter: function () {
-
- },
-
- onExit: function () {
-
- },
-
- update: function (dt) {
+ if (this._owner !== null)
+ this._owner.scheduleUpdate();
},
/**
- * Enabled getter
+ * Returns controller component whether is enabled
* @returns {Boolean}
*/
isEnabled: function () {
@@ -56,25 +56,21 @@ ccs.ComController = ccs.Component.extend(/** @lends ccs.ComController# */{
},
/**
- * Enabled setter
+ * Sets controller component whether is enabled
* @param {Boolean} bool
*/
setEnabled: function (bool) {
- this._enabled = b;
+ this._enabled = bool;
}
});
/**
- * allocates and initializes a ComController.
- * @constructs
+ * Allocates and initializes a ComController.
+ * @deprecated since v3.0, please use new construction instead.
* @return {ccs.ComController}
* @example
* // example
* var com = ccs.ComController.create();
*/
ccs.ComController.create = function () {
- var com = new ccs.ComController();
- if (com && com.init()) {
- return com;
- }
- return null;
+ return new ccs.ComController();
};
\ No newline at end of file
diff --git a/extensions/cocostudio/components/CCComRender.js b/extensions/cocostudio/components/CCComRender.js
index 5626d03ba8..960e096a11 100644
--- a/extensions/cocostudio/components/CCComRender.js
+++ b/extensions/cocostudio/components/CCComRender.js
@@ -1,5 +1,6 @@
/****************************************************************************
- Copyright (c) 2010-2012 cocos2d-x.org
+ Copyright (c) 2011-2012 cocos2d-x.org
+ Copyright (c) 2013-2014 Chukong Technologies Inc.
http://www.cocos2d-x.org
@@ -23,24 +24,36 @@
****************************************************************************/
/**
- * Base class for ccs.ComRender
+ * The render component for Cocostudio.
* @class
* @extends ccs.Component
*/
ccs.ComRender = ccs.Component.extend(/** @lends ccs.ComRender# */{
_render: null,
+ /**
+ * Construction of ccs.ComRender
+ * @param {cc.Node} node
+ * @param {String} comName
+ */
ctor: function (node, comName) {
cc.Component.prototype.ctor.call(this);
this._render = node;
this._name = comName;
+ this.isRenderer = true;
+ ccs.ComRender.prototype.init.call(this);
},
+ /**
+ * The callback calls when a render component enter stage.
+ */
onEnter: function () {
- if (this._owner) {
+ if (this._owner)
this._owner.addChild(this._render);
- }
},
+ /**
+ * The callback calls when a render component exit stage.
+ */
onExit: function () {
if (this._owner) {
this._owner.removeChild(this._render, true);
@@ -49,7 +62,7 @@ ccs.ComRender = ccs.Component.extend(/** @lends ccs.ComRender# */{
},
/**
- * Node getter
+ * Returns a render node
* @returns {cc.Node}
*/
getNode: function () {
@@ -57,25 +70,22 @@ ccs.ComRender = ccs.Component.extend(/** @lends ccs.ComRender# */{
},
/**
- * Node setter
+ * Sets a render node to component.
* @param {cc.Node} node
*/
setNode: function (node) {
this._render = node;
}
});
+
/**
* allocates and initializes a ComRender.
- * @constructs
+ * @deprecated since v3.0, please use new construction instead.
* @return {ccs.ComRender}
* @example
* // example
* var com = ccs.ComRender.create();
*/
ccs.ComRender.create = function (node, comName) {
- var com = new ccs.ComRender(node, comName);
- if (com && com.init()) {
- return com;
- }
- return null;
+ return new ccs.ComRender(node, comName);
};
diff --git a/extensions/cocostudio/components/CCComponent.js b/extensions/cocostudio/components/CCComponent.js
index e444b2da0e..5084a9744a 100644
--- a/extensions/cocostudio/components/CCComponent.js
+++ b/extensions/cocostudio/components/CCComponent.js
@@ -1,5 +1,6 @@
/****************************************************************************
- Copyright (c) 2013 cocos2d-x.org
+ Copyright (c) 2011-2012 cocos2d-x.org
+ Copyright (c) 2013-2014 Chukong Technologies Inc.
http://www.cocos2d-x.org
@@ -32,57 +33,103 @@ cc.Component = cc.Class.extend(/** @lends cc.Component# */{
_name: "",
_enabled: true,
+ /**
+ * Construction of cc.Component
+ */
ctor:function(){
this._owner = null;
this._name = "";
this._enabled = true;
},
+ /**
+ * Initializes a cc.Component.
+ * @returns {boolean}
+ */
init:function(){
return true;
},
+ /**
+ * The callback when a component enter stage.
+ */
onEnter:function(){
-
},
+ /**
+ * The callback when a component exit stage.
+ */
onExit:function(){
-
},
+ /**
+ * The callback per every frame if it schedules update.
+ * @param delta
+ */
update:function(delta){
-
},
+ /**
+ * Serialize a component object.
+ * @param reader
+ */
serialize:function( reader){
-
},
+ /**
+ * Returns component whether is enabled.
+ * @returns {boolean}
+ */
isEnabled:function(){
return this._enabled;
},
+ /**
+ * Sets component whether is enabled.
+ * @param enable
+ */
setEnabled:function(enable){
this._enabled = enable;
},
+ /**
+ * Returns the name of cc.Component.
+ * @returns {string}
+ */
getName:function(){
return this._name;
} ,
+ /**
+ * Sets the name to cc.Component.
+ * @param {String} name
+ */
setName:function(name){
this._name = name;
} ,
+ /**
+ * Sets the owner to cc.Component.
+ * @param owner
+ */
setOwner:function(owner){
this._owner = owner;
},
+ /**
+ * Returns the owner of cc.Component.
+ * @returns {*}
+ */
getOwner:function(){
return this._owner;
}
});
+/**
+ * Allocates and initializes a component.
+ * @deprecated since v3.0, please use new construction instead.
+ * @return {cc.Component}
+ */
cc.Component.create = function(){
return new cc.Component();
};
diff --git a/extensions/cocostudio/components/CCComponentContainer.js b/extensions/cocostudio/components/CCComponentContainer.js
index 470561f3ed..c82103e7ee 100644
--- a/extensions/cocostudio/components/CCComponentContainer.js
+++ b/extensions/cocostudio/components/CCComponentContainer.js
@@ -1,5 +1,6 @@
/****************************************************************************
- Copyright (c) 2013 cocos2d-x.org
+ Copyright (c) 2011-2012 cocos2d-x.org
+ Copyright (c) 2013-2014 Chukong Technologies Inc.
http://www.cocos2d-x.org
@@ -23,7 +24,7 @@
****************************************************************************/
/**
- * The container of cc.Component
+ * The component container for Cocostudio, it has some components.
* @class
* @extends cc.Class
*/
@@ -31,18 +32,35 @@ cc.ComponentContainer = cc.Class.extend(/** @lends cc.ComponentContainer# */{
_components:null,
_owner:null,
+ /**
+ * Construction of cc.ComponentContainer
+ * @param node
+ */
ctor:function(node){
this._components = null;
this._owner = node;
},
+ /**
+ * Gets component by name.
+ * @param name
+ * @returns {*}
+ */
getComponent:function(name){
if(!name)
throw "cc.ComponentContainer.getComponent(): name should be non-null";
name = name.trim();
+ if(!this._components){
+ this._components = {};
+ }
return this._components[name];
},
+ /**
+ * Adds a component to container
+ * @param {cc.Component} component
+ * @returns {boolean}
+ */
add:function(component){
if(!component)
throw "cc.ComponentContainer.add(): component should be non-null";
@@ -67,8 +85,8 @@ cc.ComponentContainer = cc.Class.extend(/** @lends cc.ComponentContainer# */{
},
/**
- *
- * @param {String|cc.Component} name
+ * Removes component from container by name or component object.
+ * @param {String|cc.Component} name component name or component object.
* @returns {boolean}
*/
remove:function(name){
@@ -76,16 +94,16 @@ cc.ComponentContainer = cc.Class.extend(/** @lends cc.ComponentContainer# */{
throw "cc.ComponentContainer.remove(): name should be non-null";
if(!this._components)
return false;
- if(name instanceof cc.Component){
+ if(name instanceof cc.Component)
return this._removeByComponent(name);
- }else{
+ else {
name = name.trim();
return this._removeByComponent(this._components[name]);
}
},
_removeByComponent:function(component){
- if(component)
+ if(!component)
return false;
component.onExit();
component.setOwner(null);
@@ -93,10 +111,12 @@ cc.ComponentContainer = cc.Class.extend(/** @lends cc.ComponentContainer# */{
return true;
},
+ /**
+ * Removes all components of container.
+ */
removeAll:function(){
if(!this._components)
return;
-
var locComponents = this._components;
for(var selKey in locComponents){
var selComponent = locComponents[selKey];
@@ -112,24 +132,27 @@ cc.ComponentContainer = cc.Class.extend(/** @lends cc.ComponentContainer# */{
this._components = {};
},
+ /**
+ * Visit callback by director. it calls every frame.
+ * @param {Number} delta
+ */
visit:function(delta){
if(!this._components)
return;
var locComponents = this._components;
- for(var selKey in locComponents){
+ for(var selKey in locComponents)
locComponents[selKey].update(delta);
- }
},
- isEmpty:function(){
- if(!this._components)
+ /**
+ * Returns the container whether is empty.
+ * @returns {boolean}
+ */
+ isEmpty: function () {
+ if (!this._components)
return true;
-
- for(var selkey in this._components){
- return false;
- }
- return true;
+ return this._components.length === 0;
}
});
diff --git a/extensions/cocostudio/loader/load.js b/extensions/cocostudio/loader/load.js
new file mode 100644
index 0000000000..751ee53918
--- /dev/null
+++ b/extensions/cocostudio/loader/load.js
@@ -0,0 +1,223 @@
+/****************************************************************************
+ Copyright (c) 2013-2014 Chukong Technologies Inc.
+
+ http://www.cocos2d-x.org
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+ ****************************************************************************/
+
+ccs._load = (function(){
+
+ /**
+ * load file
+ * @param {String} file
+ * @param {String} [type=] - ccui|node|action
+ * @param {String} [path=] - Resource search path
+ * @returns {*}
+ */
+ var load = function(file, type, path){
+
+ var json = cc.loader.getRes(file);
+
+ if(!json)
+ return cc.log("%s does not exist", file);
+ var ext = extname(file).toLocaleLowerCase();
+ if(ext !== "json" && ext !== "exportjson")
+ return cc.log("%s load error, must be json file", file);
+
+ var parse;
+ if(!type){
+ if(json["widgetTree"])
+ parse = parser["ccui"];
+ else if(json["nodeTree"])
+ parse = parser["timeline"];
+ else if(json["Content"] && json["Content"]["Content"])
+ parse = parser["timeline"];
+ else if(json["gameobjects"])
+ parse = parser["scene"];
+ }else{
+ parse = parser[type];
+ }
+
+ if(!parse){
+ cc.log("Can't find the parser : %s", file);
+ return new cc.Node();
+ }
+ var version = json["version"] || json["Version"];
+ if(!version && json["armature_data"]){
+ cc.warn("%s is armature. please use:", file);
+ cc.warn(" ccs.armatureDataManager.addArmatureFileInfoAsync(%s);", file);
+ cc.warn(" var armature = new ccs.Armature('name');");
+ return new cc.Node();
+ }
+ var currentParser = getParser(parse, version);
+ if(!currentParser){
+ cc.log("Can't find the parser : %s", file);
+ return new cc.Node();
+ }
+
+ return currentParser.parse(file, json, path) || null;
+ };
+
+ var parser = {
+ "ccui": {},
+ "timeline": {},
+ "action": {},
+ "scene": {}
+ };
+
+ load.registerParser = function(name, version, target){
+ if(!name || !version || !target)
+ return cc.log("register parser error");
+ if(!parser[name])
+ parser[name] = {};
+ parser[name][version] = target;
+ };
+
+ load.getParser = function(name, version){
+ if(name && version)
+ return parser[name] ? parser[name][version] : undefined;
+ if(name)
+ return parser[name];
+ return parser;
+ };
+
+ //Gets the file extension
+ var extname = function(fileName){
+ var arr = fileName.match(extnameReg);
+ return ( arr && arr[1] ) ? arr[1] : null;
+ };
+ var extnameReg = /\.([^\.]+)$/;
+
+
+ var parserReg = /([^\.](\.\*)?)*$/;
+ var getParser = function(parser, version){
+ if(parser[version])
+ return parser[version];
+ else if(version === "*")
+ return null;
+ else
+ return getParser(parser, version.replace(parserReg, "*"));
+ };
+
+ return load;
+
+})();
+
+ccs._parser = cc.Class.extend({
+
+ ctor: function(){
+ this.parsers = {};
+ },
+
+ _dirnameReg: /\S*\//,
+ _dirname: function(path){
+ var arr = path.match(this._dirnameReg);
+ return (arr && arr[0]) ? arr[0] : "";
+ },
+
+ getClass: function(json){
+ return json["classname"];
+ },
+
+ getNodeJson: function(json){
+ return json["widgetTree"];
+ },
+
+ parse: function(file, json){
+ var resourcePath = this._dirname(file);
+ this.pretreatment(json, resourcePath);
+ var node = this.parseNode(this.getNodeJson(json), resourcePath, file);
+ node && this.deferred(json, resourcePath, node, file);
+ return node;
+ },
+
+ pretreatment: function(json, resourcePath, file){},
+
+ deferred: function(json, resourcePath, node, file){},
+
+ parseNode: function(json, resourcePath){
+ var parser = this.parsers[this.getClass(json)];
+ var widget = null;
+ if(parser)
+ widget = parser.call(this, json, resourcePath);
+ else
+ cc.log("Can't find the parser : %s", this.getClass(json));
+
+ return widget;
+ },
+
+ registerParser: function(widget, parse){
+ this.parsers[widget] = parse;
+ }
+});
+
+/**
+ * Analysis of studio JSON file
+ * The incoming file name, parse out the corresponding object
+ * Temporary support file list:
+ * ui 1.*
+ * node 1.* - 2.*
+ * action 1.* - 2.*
+ * scene 0.* - 1.*
+ * @param {String} file
+ * @param {String} [path=] Resource path
+ * @returns {{node: cc.Node, action: cc.Action}}
+ */
+ccs.load = function(file, path){
+ var object = {
+ node: null,
+ action: null
+ };
+
+ object.node = ccs._load(file, null, path);
+ object.action = ccs._load(file, "action", path);
+ if(object.action && object.action.tag === -1 && object.node)
+ object.action.tag = object.node.tag;
+ return object;
+};
+
+//Forward compatible interface
+
+ccs.actionTimelineCache = {
+
+
+ //@deprecated This function will be deprecated sooner or later please use ccs.load
+ /**
+ * Create Timeline Action
+ * @param file
+ * @returns {*}
+ */
+ createAction: function(file){
+ return ccs._load(file, "action");
+ }
+};
+
+ccs.csLoader = {
+
+ //@deprecated This function will be deprecated sooner or later please use ccs.load
+ /**
+ * Create Timeline Node
+ * @param file
+ * @returns {*}
+ */
+ createNode: function(file){
+ return ccs._load(file);
+ }
+};
diff --git a/extensions/cocostudio/loader/parsers/action-1.x.js b/extensions/cocostudio/loader/parsers/action-1.x.js
new file mode 100644
index 0000000000..6bcebf2734
--- /dev/null
+++ b/extensions/cocostudio/loader/parsers/action-1.x.js
@@ -0,0 +1,238 @@
+/****************************************************************************
+ Copyright (c) 2013-2014 Chukong Technologies Inc.
+
+ http://www.cocos2d-x.org
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+ ****************************************************************************/
+
+(function(load, baseParser){
+
+ var cache = {};
+
+ var Parser = baseParser.extend({
+
+ getNodeJson: function(json){
+ return json["action"];
+ },
+
+ parseNode: function(json, resourcePath, file){
+ if(!json)
+ return null;
+ if(cache[file])
+ return cache[file].clone();
+
+ var self = this,
+ action = new ccs.ActionTimeline();
+
+ action.setDuration(json["duration"]);
+ action.setTimeSpeed(json["speed"] || 1);
+ //The process of analysis
+ var timelines = json["timelines"];
+ timelines.forEach(function(timeline){
+ var parser = self.parsers[timeline["frameType"]];
+ var frame;
+ if(parser)
+ frame = parser.call(self, timeline, resourcePath);
+ else
+ cc.log("parser does not exist : %s", timeline["frameType"]);
+ if(frame)
+ action.addTimeline(frame);
+
+ if(timeline["frameType"] === "ColorFrame"){
+ action.addTimeline(
+ self.parsers["AlphaFrame"].call(self, timeline, resourcePath)
+ );
+ }
+ });
+
+ cache[file] = action;
+ cache[file].retain();
+ return action.clone();
+ }
+
+ });
+
+ var parser = new Parser();
+
+ var frameList = [
+ {
+ name: "PositionFrame",
+ handle: function(options){
+ var frame = new ccs.PositionFrame();
+ var x = options["x"];
+ var y = options["y"];
+ frame.setPosition(cc.p(x,y));
+ return frame;
+ }
+ },
+ {
+ name: "VisibleFrame",
+ handle: function(options){
+ var frame = new ccs.VisibleFrame();
+ var visible = options["value"];
+ frame.setVisible(visible);
+ return frame;
+ }
+ },
+ {
+ name: "ScaleFrame",
+ handle: function(options){
+ var frame = new ccs.ScaleFrame();
+ var scalex = options["x"];
+ var scaley = options["y"];
+ frame.setScaleX(scalex);
+ frame.setScaleY(scaley);
+ return frame;
+ }
+ },
+ {
+ name: "RotationFrame",
+ handle: function(options){
+ var frame = new ccs.RotationFrame();
+ var rotation = options["rotation"];
+ frame.setRotation(rotation);
+ return frame;
+ }
+ },
+ {
+ name: "SkewFrame",
+ handle: function(options){
+ var frame = new ccs.SkewFrame();
+ var skewx = options["x"];
+ var skewy = options["y"];
+ frame.setSkewX(skewx);
+ frame.setSkewY(skewy);
+ return frame;
+ }
+ },
+ {
+ name: "RotationSkewFrame",
+ handle: function(options){
+ var frame = new ccs.RotationSkewFrame();
+ var skewx = options["x"];
+ var skewy = options["y"];
+ frame.setSkewX(skewx);
+ frame.setSkewY(skewy);
+ return frame;
+ }
+ },
+ {
+ name: "AnchorFrame",
+ handle: function(options){
+ var frame = new ccs.AnchorPointFrame();
+ var anchorx = options["x"];
+ var anchory = options["y"];
+ frame.setAnchorPoint(cc.p(anchorx, anchory));
+ return frame;
+ }
+ },
+ {
+ name: "InnerActionFrame",
+ handle: function(options){
+ var frame = new ccs.InnerActionFrame();
+ var type = options["innerActionType"];
+ var startFrame = options["startFrame"];
+ frame.setInnerActionType(type);
+ frame.setStartFrameIndex(startFrame);
+ return frame;
+ }
+ },
+ {
+ name: "ColorFrame",
+ handle: function(options){
+ var frame = new ccs.ColorFrame();
+ var red = options["red"];
+ var green = options["green"];
+ var blue = options["blue"];
+ frame.setColor(cc.color(red, green, blue));
+ var alphaFrame = new ccs.AlphaFrame();
+ var alpha = options["alpha"];
+ alphaFrame.setAlpha(alpha);
+ return frame;
+ }
+ },
+ {
+ name: "AlphaFrame",
+ handle: function(options){
+ var frame = new ccs.AlphaFrame();
+ var alpha = options["alpha"];
+ frame.setAlpha(alpha);
+ return frame;
+ }
+ },
+ {
+ name: "TextureFrame",
+ handle: function(options){
+ var frame = new ccs.TextureFrame();
+ var texture = options["value"];
+ if(texture != null) {
+ var path = texture;
+ var spriteFrame = cc.spriteFrameCache.getSpriteFrame(path);
+ if(spriteFrame == null){
+ var jsonPath = ccs.csLoader.getJsonPath();
+ path = jsonPath + texture;
+ }
+ frame.setTextureName(path);
+ }
+ return frame;
+ }
+ },
+ {
+ name: "EventFrame",
+ handle: function(options){
+ var frame = new ccs.EventFrame();
+ var evnt = options["value"];
+ if(evnt != null)
+ frame.setEvent(evnt);
+ return frame;
+ }
+ },
+ {
+ name: "ZOrderFrame",
+ handle: function(options){
+ var frame = new ccs.ZOrderFrame();
+ var zorder = options["value"];
+ frame.setZOrder(zorder);
+ return frame;
+ }
+ }
+ ];
+
+ frameList.forEach(function(item){
+ parser.registerParser(item.name, function(options, resourcePath){
+ var timeline = new ccs.Timeline();
+ timeline.setActionTag(options["actionTag"]);
+
+ var frames = options["frames"];
+ if(frames && frames.length){
+ frames.forEach(function(frameData){
+ var frame = item.handle(frameData);
+ frame.setFrameIndex(frameData["frameIndex"]);
+ frame.setTween(frameData["tween"]);
+ timeline.addFrame(frame);
+ });
+ }
+ return timeline;
+ });
+ });
+
+ load.registerParser("action", "*", parser);
+
+})(ccs._load, ccs._parser);
diff --git a/extensions/cocostudio/loader/parsers/action-2.x.js b/extensions/cocostudio/loader/parsers/action-2.x.js
new file mode 100644
index 0000000000..3329106e25
--- /dev/null
+++ b/extensions/cocostudio/loader/parsers/action-2.x.js
@@ -0,0 +1,285 @@
+/****************************************************************************
+ Copyright (c) 2013-2014 Chukong Technologies Inc.
+
+ http://www.cocos2d-x.org
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+ ****************************************************************************/
+
+(function(load, baseParser){
+
+ var cache = {};
+
+ var Parser = baseParser.extend({
+
+ getNodeJson: function(json){
+ return json["Content"]["Content"]["Animation"];
+ },
+
+ parseNode: function(json, resourcePath, file){
+ if(!json)
+ return null;
+ if(cache[file])
+ return cache[file].clone();
+
+ var self = this,
+ action = new ccs.ActionTimeline();
+
+ action.setDuration(json["Duration"]);
+ action.setTimeSpeed(json["Speed"] || 1);
+
+ //The process of analysis
+ var timelines = json["Timelines"];
+ timelines.forEach(function(timeline){
+ var parser = self.parsers[timeline["Property"]];
+ var frame;
+ if(parser)
+ frame = parser.call(self, timeline, resourcePath);
+ else
+ cc.log("parser does not exist : %s", timeline["Property"]);
+ if(frame)
+ action.addTimeline(frame);
+ });
+
+ cache[file] = action;
+ cache[file].retain();
+ return action.clone();
+ },
+
+ deferred: function(json, resourcePath, action, file){
+ var animationlist = json["Content"]["Content"]["AnimationList"];
+ var length = animationlist ? animationlist.length : 0;
+ for (var i = 0; i < length; i++){
+ var animationdata = animationlist[i];
+ var info = { name: null, startIndex: null, endIndex: null };
+ info.name = animationdata["Name"];
+ info.startIndex = animationdata["StartIndex"];
+ info.endIndex = animationdata["EndIndex"];
+ action.addAnimationInfo(info);
+ }
+ }
+
+ });
+ var parser = new Parser();
+
+ var frameList = [
+ {
+ name: "Position",
+ handle: function(options){
+ var frame = new ccs.PositionFrame();
+ var x = options["X"];
+ var y = options["Y"];
+ frame.setPosition(cc.p(x,y));
+ return frame;
+ }
+ },
+ {
+ name: "VisibleForFrame",
+ handle: function(options){
+ var frame = new ccs.VisibleFrame();
+ var visible = options["Value"];
+ frame.setVisible(visible);
+ return frame;
+ }
+ },
+ {
+ name: "Scale",
+ handle: function(options){
+ var frame = new ccs.ScaleFrame();
+ var scalex = options["X"];
+ var scaley = options["Y"];
+ frame.setScaleX(scalex);
+ frame.setScaleY(scaley);
+ return frame;
+ }
+ },
+ {
+ name: "Rotation",
+ handle: function(options){
+ var frame = new ccs.RotationFrame();
+ var rotation = options["Rotation"];
+ frame.setRotation(rotation);
+ return frame;
+ }
+ },
+ {
+ name: "Skew",
+ handle: function(options){
+ var frame = new ccs.SkewFrame();
+ var skewx = options["X"];
+ var skewy = options["Y"];
+ frame.setSkewX(skewx);
+ frame.setSkewY(skewy);
+ return frame;
+ }
+ },
+ {
+ name: "RotationSkew",
+ handle: function(options){
+ var frame = new ccs.RotationSkewFrame();
+ var skewx = options["X"];
+ var skewy = options["Y"];
+ frame.setSkewX(skewx);
+ frame.setSkewY(skewy);
+ return frame;
+ }
+ },
+ {
+ name: "Anchor",
+ handle: function(options){
+ var frame = new ccs.AnchorPointFrame();
+ var anchorx = options["X"];
+ var anchory = options["Y"];
+ frame.setAnchorPoint(cc.p(anchorx, anchory));
+ return frame;
+ }
+ },
+ {
+ name: "InnerAction",
+ handle: function(options){
+ var frame = new ccs.InnerActionFrame();
+ var type = options["InnerActionType"];
+ var startFrame = options["StartFrame"];
+ frame.setInnerActionType(type);
+ frame.setStartFrameIndex(startFrame);
+ return frame;
+ }
+ },
+ {
+ name: "CColor",
+ handle: function(options){
+ var frame = new ccs.ColorFrame();
+ var color = options["Color"];
+ if(!color) color = {};
+ color["R"] = color["R"] || 255;
+ color["G"] = color["G"] || 255;
+ color["B"] = color["B"] || 255;
+ frame.setColor(cc.color(color["R"], color["G"], color["B"]));
+ return frame;
+ }
+ },
+ {
+ name: "Alpha",
+ handle: function(options){
+ var frame = new ccs.AlphaFrame();
+ var alpha = options["Value"];
+ frame.setAlpha(alpha);
+ return frame;
+ }
+ },
+ {
+ name: "FileData",
+ handle: function(options, resourcePath){
+ var frame = new ccs.TextureFrame();
+ var texture = options["TextureFile"];
+ if(texture != null) {
+ var path = texture["Path"];
+ var spriteFrame = cc.spriteFrameCache.getSpriteFrame(path);
+ if(spriteFrame == null){
+ path = resourcePath + path;
+ }
+ frame.setTextureName(path);
+ }
+ return frame;
+ }
+ },
+ {
+ name: "FrameEvent",
+ handle: function(options){
+ var frame = new ccs.EventFrame();
+ var evnt = options["Value"];
+ if(evnt != null)
+ frame.setEvent(evnt);
+ return frame;
+ }
+ },
+ {
+ name: "ZOrder",
+ handle: function(options){
+ var frame = new ccs.ZOrderFrame();
+ var zorder = options["Value"];
+ frame.setZOrder(zorder);
+ return frame;
+ }
+ },
+ {
+ name: "ActionValue",
+ handle: function (options) {
+
+ var frame = new ccs.InnerActionFrame();
+ var innerActionType = options["InnerActionType"];
+
+ var currentAnimationFrame = options["CurrentAniamtionName"];
+
+ var singleFrameIndex = options["SingleFrameIndex"];
+
+ var frameIndex = options["FrameIndex"];
+ if(frameIndex !== undefined)
+ frame.setFrameIndex(frameIndex);
+
+ frame.setInnerActionType(ccs.InnerActionType[innerActionType]);
+ frame.setSingleFrameIndex(singleFrameIndex);
+
+ frame.setEnterWithName(true);
+ if (currentAnimationFrame)
+ frame.setAnimationName(currentAnimationFrame);
+
+ return frame;
+ }
+ }
+ ];
+
+ var loadEasingDataWithFlatBuffers = function(frame, options){
+ var type = options["Type"];
+ frame.setTweenType(type);
+ var points = options["Points"];
+ if(points){
+ points = points.map(function(p){
+ return cc.p(p["X"], p["Y"]);
+ });
+ frame.setEasingParams(points);
+ }
+ };
+
+ frameList.forEach(function(item){
+ parser.registerParser(item.name, function(options, resourcePath){
+ var timeline = new ccs.Timeline();
+ timeline.setActionTag(options["ActionTag"]);
+
+ var frames = options["Frames"];
+ if(frames && frames.length){
+ frames.forEach(function(frameData){
+ var frame = item.handle(frameData, resourcePath);
+ frame.setFrameIndex(frameData["FrameIndex"]);
+ var tween = frameData["Tween"] != null ? frameData["Tween"] : true;
+ frame.setTween(tween);
+ //https://github.com/cocos2d/cocos2d-x/pull/11388/files
+ var easingData = frameData["EasingData"];
+ if(easingData)
+ loadEasingDataWithFlatBuffers(frame, easingData);
+ timeline.addFrame(frame);
+ });
+ }
+ return timeline;
+ });
+ });
+
+ load.registerParser("action", "2.*", parser);
+
+})(ccs._load, ccs._parser);
diff --git a/extensions/cocostudio/loader/parsers/compatible.js b/extensions/cocostudio/loader/parsers/compatible.js
new file mode 100644
index 0000000000..caa681d4fc
--- /dev/null
+++ b/extensions/cocostudio/loader/parsers/compatible.js
@@ -0,0 +1,251 @@
+/****************************************************************************
+ Copyright (c) 2013-2014 Chukong Technologies Inc.
+
+ http://www.cocos2d-x.org
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+ ****************************************************************************/
+
+
+/*
+ This file is for compatibility compatibility with older versions of GUIReader and SceneReader
+ todo: deprecated all
+ */
+
+(function(){
+
+ ccs.uiReader = {
+
+ _fileDesignSizes: {},
+
+ //@deprecated This function will be deprecated sooner or later please use ccs.load
+ /**
+ * Create CCUI Node
+ * @param file
+ * @returns {*}
+ */
+ widgetFromJsonFile: function(file){
+ var json = cc.loader.getRes(file);
+ if(json)
+ this._fileDesignSizes[file] = cc.size(json["designWidth"]||0, json["designHeight"]||0);
+
+ var version = json["Version"] || json["version"];
+ var versionNum = ccs.uiReader.getVersionInteger(version);
+ if(!version || versionNum >= 1700){
+ cc.warn("Not supported file types, Please try use the ccs.load");
+ return null;
+ }
+ return ccs._load(file, "ccui");
+ },
+
+ //@deprecated This function will be deprecated sooner or later please use parser.registerParser
+ /**
+ * Register a custom Widget reader
+ * @param classType
+ * @param ins
+ * @param object
+ * @param callback
+ * @deprecated This function will be deprecated sooner or later please use parser.registerParser
+ */
+ registerTypeAndCallBack: function(classType, ins, object, callback){
+ var parser = ccs._load.getParser("ccui")["*"];
+ var func = callback.bind(object);
+ parser.registerParser(classType, function(options, resourcePath){
+ var widget = new ins();
+ var uiOptions = options["options"];
+ object.setPropsFromJsonDictionary && object.setPropsFromJsonDictionary(widget, uiOptions);
+ this.generalAttributes(widget, uiOptions);
+ var customProperty = uiOptions["customProperty"];
+ if(customProperty)
+ customProperty = JSON.parse(customProperty);
+ else
+ customProperty = {};
+ func(classType, widget, customProperty);
+ this.colorAttributes(widget, uiOptions);
+ this.anchorPointAttributes(widget, uiOptions);
+ this.parseChild.call(this, widget, options, resourcePath);
+ return widget;
+ });
+ },
+
+ //@deprecated This function will be deprecated sooner or later
+ /**
+ * Gets the version number by version string.
+ * @param {String} version version string.
+ * @returns {Number}
+ */
+ getVersionInteger: function(version){
+ if(!version || typeof version !== "string") return 0;
+ var arr = version.split(".");
+ if (arr.length !== 4)
+ return 0;
+ var num = 0;
+ arr.forEach(function(n, i){
+ num += n * Math.pow(10, 3 - i);
+ });
+ return num;
+ },
+
+ //@deprecated This function will be deprecated sooner or later
+ /**
+ * stores the designSize of UI file.
+ * @param {String} fileName
+ * @param {cc.Size} size
+ */
+ storeFileDesignSize: function (fileName, size) {
+ this._fileDesignSizes[fileName] = size;
+ },
+
+ //@deprecated This function will be deprecated sooner or later
+ /**
+ * Gets the design size by filename.
+ * @param {String} fileName
+ * @returns {cc.Size}
+ */
+ getFileDesignSize: function (fileName) {
+ return this._fileDesignSizes[fileName];
+ },
+
+ //@deprecated This function will be deprecated sooner or later
+ /**
+ * Returns the file path
+ * @returns {string}
+ */
+ getFilePath: function(){
+ return this._filePath;
+ },
+
+ //@deprecated This function will be deprecated sooner or later
+ setFilePath: function(path){
+ this._filePath = path;
+ },
+
+ //@deprecated This function will be deprecated sooner or later
+ /**
+ * Returns the parsed object map. (analytic function)
+ * @returns {Object}
+ */
+ getParseObjectMap: function(){
+ return ccs._load.getParser("ccui")["*"]["parsers"];
+ },
+
+ //@deprecated This function will be deprecated sooner or later
+ /**
+ * Returns the parsed callback map. (analytic function)
+ * @returns {*}
+ */
+ getParseCallBackMap: function(){
+ return ccs._load.getParser("ccui")["*"]["parsers"];
+ },
+
+ //@deprecated This function will be deprecated sooner or later
+ clear: function(){}
+ };
+
+ var parser = ccs._load.getParser("ccui")["*"];
+ ccs.imageViewReader = {setPropsFromJsonDictionary: parser.ImageViewAttributes};
+ ccs.buttonReader = {setPropsFromJsonDictionary: parser.ButtonAttributes};
+ ccs.checkBoxReader = {setPropsFromJsonDictionary: parser.CheckBoxAttributes};
+ ccs.labelAtlasReader = {setPropsFromJsonDictionary: parser.TextAtlasAttributes};
+ ccs.labelBMFontReader= {setPropsFromJsonDictionary: parser.TextBMFontAttributes};
+ ccs.labelReader = {setPropsFromJsonDictionary: parser.TextAttributes};
+ ccs.layoutReader = {setPropsFromJsonDictionary: parser.LayoutAttributes};
+ ccs.listViewReader = {setPropsFromJsonDictionary: parser.ListViewAttributes};
+ ccs.loadingBarReader = {setPropsFromJsonDictionary: parser.LoadingBarAttributes};
+ ccs.pageViewReader = {setPropsFromJsonDictionary: parser.PageViewAttributes};
+ ccs.scrollViewReader = {setPropsFromJsonDictionary: parser.ScrollViewAttributes};
+ ccs.sliderReader = {setPropsFromJsonDictionary: parser.SliderAttributes};
+ ccs.textFieldReader = {setPropsFromJsonDictionary: parser.TextFieldAttributes};
+})();
+
+(function(){
+ ccs.sceneReader = {
+
+ _node: null,
+
+ //@deprecated This function will be deprecated sooner or later please use ccs.load
+ /**
+ * Create Scene Node
+ * @param file
+ * @returns {*}
+ */
+ createNodeWithSceneFile: function(file){
+ var node = ccs._load(file, "scene");
+ this._node = node;
+ return node;
+ },
+
+ /**
+ * Get a node by tag.
+ * @param {Number} tag
+ * @returns {cc.Node|null}
+ */
+ getNodeByTag: function(tag){
+ if (this._node == null)
+ return null;
+ if (this._node.getTag() === tag)
+ return this._node;
+ return this._nodeByTag(this._node, tag);
+ },
+
+ _nodeByTag: function (parent, tag) {
+ if (parent == null)
+ return null;
+ var retNode = null;
+ var children = parent.getChildren();
+ for (var i = 0; i < children.length; i++) {
+ var child = children[i];
+ if (child && child.getTag() === tag) {
+ retNode = child;
+ break;
+ } else {
+ retNode = this._nodeByTag(child, tag);
+ if (retNode)
+ break;
+ }
+ }
+ return retNode;
+ },
+
+ //@deprecated This function will be deprecated sooner or later
+ /**
+ * Returns the version of ccs.SceneReader.
+ * @returns {string}
+ */
+ version: function(){
+ return "*";
+ },
+
+ //@deprecated This function will be deprecated sooner or later
+ /**
+ * Sets the listener to reader.
+ * Cannot use
+ */
+ setTarget: function(){},
+
+ //@deprecated This function will be deprecated sooner or later
+ /**
+ * Clear all triggers and stops all sounds.
+ */
+ clear: function(){
+ ccs.triggerManager.removeAll();
+ cc.audioEngine.end();
+ }
+ };
+})();
\ No newline at end of file
diff --git a/extensions/cocostudio/loader/parsers/scene-1.x.js b/extensions/cocostudio/loader/parsers/scene-1.x.js
new file mode 100644
index 0000000000..04569cb17f
--- /dev/null
+++ b/extensions/cocostudio/loader/parsers/scene-1.x.js
@@ -0,0 +1,262 @@
+/****************************************************************************
+ Copyright (c) 2013-2014 Chukong Technologies Inc.
+
+ http://www.cocos2d-x.org
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+ ****************************************************************************/
+
+(function(load, baseParser){
+
+ var Parser = baseParser.extend({
+
+ getNodeJson: function(json){
+ return json;
+ },
+
+ parseNode: function(json, resourcePath){
+ var parser = this.parsers[this.getClass(json)];
+ var node = null;
+ if(parser)
+ node = parser.call(this, json, resourcePath);
+ else
+ cc.log("Can't find the parser : %s", this.getClass(json));
+
+ return node;
+ },
+
+ deferred: function(json, resourcePath, node, file){
+ ccs.triggerManager.parse(json["Triggers"]||[]);
+ if(ccs.sceneReader)
+ ccs.sceneReader._node = node;
+ },
+
+ setPropertyFromJsonDict: function(node, json){
+ var x = (cc.isUndefined(json["x"]))?0:json["x"];
+ var y = (cc.isUndefined(json["y"]))?0:json["y"];
+ node.setPosition(x, y);
+
+ var bVisible = Boolean((cc.isUndefined(json["visible"]))?1:json["visible"]);
+ node.setVisible(bVisible);
+
+ var nTag = (cc.isUndefined(json["objecttag"]))?-1:json["objecttag"];
+ node.setTag(nTag);
+
+ var nZorder = (cc.isUndefined(json["zorder"]))?0:json["zorder"];
+ node.setLocalZOrder(nZorder);
+
+ var fScaleX = (cc.isUndefined(json["scalex"]))?1:json["scalex"];
+ var fScaleY = (cc.isUndefined(json["scaley"]))?1:json["scaley"];
+ node.setScaleX(fScaleX);
+ node.setScaleY(fScaleY);
+
+ var fRotationZ = (cc.isUndefined(json["rotation"]))?0:json["rotation"];
+ node.setRotation(fRotationZ);
+
+ var sName = json["name"] || "";
+ node.setName(sName);
+ }
+
+ });
+
+ var parser = new Parser();
+
+ parser.parseChild = function(node, objects, resourcePath){
+ for (var i = 0; i < objects.length; i++) {
+ var child,
+ options = objects[i];
+ if(options)
+ child = this.parseNode(options, resourcePath);
+ if(child)
+ node.addChild(child);
+ }
+ };
+
+ var componentsParser = {
+ "CCSprite": function(node, component, resourcePath){
+ var child = new cc.Sprite();
+ loadTexture(component["fileData"], resourcePath, function(path, type){
+ if(type === 0)
+ child.setTexture(path);
+ else if(type === 1){
+ var spriteFrame = cc.spriteFrameCache.getSpriteFrame(path);
+ child.setSpriteFrame(spriteFrame);
+ }
+ });
+ var render = new ccs.ComRender(child, "CCSprite");
+ node.addComponent(render);
+ return render;
+ },
+ "CCTMXTiledMap": function(node, component, resourcePath){
+ var child = null;
+ loadTexture(component["fileData"], resourcePath, function(path, type){
+ if(type === 0)
+ child = new cc.TMXTiledMap(path);
+ });
+ var render = new ccs.ComRender(child, "CCTMXTiledMap");
+ node.addComponent(render);
+ return render;
+ },
+ "CCParticleSystemQuad": function(node, component, resourcePath){
+ var child = null;
+ loadTexture(component["fileData"], resourcePath, function(path, type){
+ if(type === 0)
+ child = new cc.ParticleSystem(path);
+ else
+ cc.log("unknown resourcetype on CCParticleSystemQuad!");
+ child.setPosition(0, 0);
+ });
+ var render = new ccs.ComRender(child, "CCParticleSystemQuad");
+ node.addComponent(render);
+ return render;
+ },
+ "CCArmature": function(node, component, resourcePath){
+ var child = null;
+ loadTexture(component["fileData"], resourcePath, function(path, type){
+ if(type === 0){
+ var jsonDict = cc.loader.getRes(path);
+ if (!jsonDict) cc.log("Please load the resource [%s] first!", path);
+ var armature_data = jsonDict["armature_data"];
+ var subData = armature_data[0];
+ var name = subData["name"];
+ ccs.armatureDataManager.addArmatureFileInfo(path);
+ child = new ccs.Armature(name);
+ }
+ });
+ if(child){
+ var render = new ccs.ComRender(child, "CCArmature");
+ node.addComponent(render);
+ var actionName = component["selectedactionname"];
+ if (actionName && child.getAnimation())
+ child.getAnimation().play(actionName);
+
+ return render;
+ }
+
+ },
+ "CCComAudio": function(node, component, resourcePath){
+ var audio = null;
+ loadTexture(component["fileData"], resourcePath, function(path, type){
+ if(type === 0){
+ audio = new ccs.ComAudio();
+ audio.preloadEffect(path);
+ var name = component["name"];
+ if(name)
+ audio.setName(name);
+ node.addComponent(audio);
+ }
+ });
+ },
+ "CCComAttribute": function(node, component, resourcePath){
+ var attribute = null;
+ loadTexture(component["fileData"], resourcePath, function(path, type){
+ if(type === 0){
+ attribute = new ccs.ComAttribute();
+ if (path !== "")
+ attribute.parse(path);
+ node.addComponent(attribute);
+ }else
+ cc.log("unknown resourcetype on CCComAttribute!");
+ });
+ return attribute;
+ },
+ "CCBackgroundAudio": function(node, component, resourcePath){
+ var audio = null;
+ loadTexture(component["fileData"], resourcePath, function(path, type){
+ if(type === 0){
+ audio = new ccs.ComAudio();
+ audio.preloadBackgroundMusic(path);
+ audio.setFile(path);var bLoop = Boolean(component["loop"] || 0);
+ audio.setLoop(bLoop);
+ var name = component["name"];
+ if(name)
+ audio.setName(name);
+ node.addComponent(audio);
+ audio.playBackgroundMusic(path, bLoop);
+ }
+ });
+ },
+ "GUIComponent": function(node, component, resourcePath){
+ var widget = null;
+ loadTexture(component["fileData"], resourcePath, function(path, type){
+ widget = ccs._load(path, "ccui");
+ });
+ var render = new ccs.ComRender(widget, "GUIComponent");
+ node.addComponent(render);
+ return render;
+ },
+ "CCScene": function(){}
+ };
+ var loadedPlist = {};
+ var loadTexture = function(json, resourcePath, cb){
+ if(json != null){
+ var path = json["path"];
+ var type = json["resourceType"];
+ var plist = json["plist"];
+ if(!path)
+ return;
+ if(plist){
+ if(cc.loader.getRes(resourcePath + plist)){
+ loadedPlist[resourcePath + plist] = true;
+ cc.spriteFrameCache.addSpriteFrames(resourcePath + plist);
+ }else{
+ if(!loadedPlist[resourcePath + plist])
+ cc.log("%s need to be preloaded", resourcePath + plist);
+ }
+ }
+ if(type !== 0)
+ cb(path, type);
+ else
+ cb(resourcePath + path, type);
+ }
+ };
+
+ parser.parseComponents = function(node, json, resourcePath){
+ if(!node || !json)
+ return;
+ json.forEach(function(component){
+ var parser = componentsParser[component["classname"]];
+ var render = null;
+ if(parser)
+ render = parser(node, component, resourcePath);
+ else
+ cc.log("Can't find the component parser : %s", component["classname"]);
+ var name = component["name"];
+ if(render && name){
+ render.setName(name);
+ }
+ });
+ };
+
+ parser.registerParser("CCNode", function(options, resourcePath){
+ var node = new cc.Node();
+ this.setPropertyFromJsonDict(node, options);
+ this.parseChild.call(this, node, options["gameobjects"], resourcePath);
+ this.parseComponents(node, options["components"], resourcePath);
+ var size = options["CanvasSize"];
+ if (size)
+ node.setContentSize(cc.size(size["_width"], size["_height"]));
+
+ return node;
+ });
+
+ load.registerParser("scene", "*", parser);
+
+
+})(ccs._load, ccs._parser);
diff --git a/extensions/cocostudio/loader/parsers/timelineParser-1.x.js b/extensions/cocostudio/loader/parsers/timelineParser-1.x.js
new file mode 100644
index 0000000000..c9c3efbab5
--- /dev/null
+++ b/extensions/cocostudio/loader/parsers/timelineParser-1.x.js
@@ -0,0 +1,292 @@
+/****************************************************************************
+ Copyright (c) 2013-2014 Chukong Technologies Inc.
+
+ http://www.cocos2d-x.org
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+ ****************************************************************************/
+
+(function(load, baseParser){
+
+ var loadedPlist = {};
+
+ var Parser = baseParser.extend({
+
+ getNodeJson: function(json){
+ return json["nodeTree"];
+ },
+
+ addSpriteFrame: function(plists, pngs, resourcePath){
+ if(!plists || !pngs || plists.length !== pngs.length)
+ return;
+ for (var i = 0; i < plists.length; i++) {
+ var plist = resourcePath + plists[i];
+ if(!cc.loader.getRes(plist) && !loadedPlist[plist])
+ cc.log("%s need to be preloaded", plist);
+ else
+ loadedPlist[plist] = true;
+ cc.spriteFrameCache.addSpriteFrames(
+ plist,
+ resourcePath + pngs[i]
+ );
+ }
+ },
+
+ pretreatment: function(json, resourcePath, file){
+ this.addSpriteFrame(json["textures"], json["texturesPng"], resourcePath);
+ }
+
+ });
+ var parser = new Parser();
+
+ parser.generalAttributes = function(node, options){
+ var width = options["width"] !=null ? options["width"] : 0;
+ var height = options["height"] !=null ? options["height"] : 0;
+ var x = options["x"] !=null ? options["x"] : 0;
+ var y = options["y"] !=null ? options["y"] : 0;
+ var scalex = options["scaleX"] !=null ? options["scaleX"] : 1;
+ var scaley = options["scaleY"] !=null ? options["scaleY"] : 1;
+ var rotation = options["rotation"] !=null ? options["rotation"] : 0;
+ var rotationSkewX = options["rotationSkewX"]!=null ? options["rotationSkewX"] : 0;
+ var rotationSkewY = options["rotationSkewY"]!=null ? options["rotationSkewY"] : 0;
+ var skewx = options["skewX"] !=null ? options["skewX"] : 0;
+ var skewy = options["skewY"] !=null ? options["skewY"] : 0;
+ var anchorx = options["anchorPointX"] !=null ? options["anchorPointX"] : 0.5;
+ var anchory = options["anchorPointY"] !=null ? options["anchorPointY"] : 0.5;
+ var alpha = options["opacity"] !=null ? options["opacity"] : 255;
+ var red = options["colorR"] !=null ? options["colorR"] : 255;
+ var green = options["colorG"] !=null ? options["colorG"] : 255;
+ var blue = options["colorB"] !=null ? options["colorB"] : 255;
+ var zorder = options["colorR"] !=null ? options["colorR"] : 0;
+ var tag = options["tag"] !=null ? options["tag"] : 0;
+ var actionTag = options["actionTag"] !=null ? options["actionTag"] : 0;
+ var visible = options["visible"] !=null ? options["visible"] : true;
+
+ if(x != 0 || y != 0)
+ node.setPosition(cc.p(x, y));
+ if(scalex != 1)
+ node.setScaleX(scalex);
+ if(scaley != 1)
+ node.setScaleY(scaley);
+ if (rotation != 0)
+ node.setRotation(rotation);
+ if(rotationSkewX != 0)
+ node.setRotationX(rotationSkewX);
+ if(rotationSkewY != 0)
+ node.setRotationY(rotationSkewY);
+ if(skewx != 0)
+ node.setSkewX(skewx);
+ if(skewy != 0)
+ node.setSkewY(skewy);
+ if(anchorx != 0.5 || anchory != 0.5)
+ node.setAnchorPoint(cc.p(anchorx, anchory));
+ if(width != 0 || height != 0)
+ node.setContentSize(cc.size(width, height));
+ if(zorder != 0)
+ node.setLocalZOrder(zorder);
+ if(visible != true)
+ node.setVisible(visible);
+
+ if(alpha != 255)
+ {
+ node.setOpacity(alpha);
+ }
+ if(red != 255 || green != 255 || blue != 255)
+ {
+ node.setColor(cc.color(red, green, blue));
+ }
+
+
+ node.setTag(tag);
+ node.setUserObject(new ccs.ActionTimelineData(actionTag));
+ };
+
+ parser.parseComponent = function(node, options){
+ if(!options) return;
+ for (var i = 0; i < options.length; ++i){
+ var dic = options[i];
+ var component = this.loadComponent(dic);
+ if (component){
+ node.addComponent(component);
+ }
+ }
+ };
+
+ parser.parseChild = function(parse, widget, options, resourcePath){
+ var children = options["children"];
+ for (var i = 0; i < children.length; i++) {
+ var child = this.parseNode(children[i], resourcePath);
+ if(child){
+ if(widget instanceof ccui.PageView){
+ if(child instanceof ccui.Layout)
+ widget.addPage(child);
+ } else {
+ if(widget instanceof ccui.ListView){
+ if(child instanceof ccui.Widget)
+ widget.pushBackCustomItem(child);
+ } else {
+ if(!(widget instanceof ccui.Layout) && child instanceof ccui.Widget) {
+ if(child.getPositionType() === ccui.Widget.POSITION_PERCENT) {
+ var position = child.getPositionPercent();
+ var anchor = widget.getAnchorPoint();
+ child.setPositionPercent(cc.p(position.x + anchor.x, position.y + anchor.y));
+ }
+ //To make up for the studio positioning error problem
+ var AnchorPointIn = widget.getAnchorPointInPoints();
+ child.setPosition(cc.p(child.getPositionX() + AnchorPointIn.x, child.getPositionY() + AnchorPointIn.y));
+ }
+ widget.addChild(child);
+ }
+ }
+ }
+ }
+ };
+
+ parser.initNode = function(options){
+ var node = new cc.Node();
+ this.generalAttributes(node, options);
+ return node;
+ };
+ parser.initSubGraph = function(options){
+ var filePath = options["fileName"];
+
+ var node;
+ if (filePath && "" !== filePath){
+ node = this.createNode(filePath);
+ }else{
+ node = new ccs.Node();
+ }
+ this.generalAttributes(node, options);
+ return node;
+ };
+ parser.initSprite = function(options, resourcePath){
+ var path = options["fileName"];
+ var sprite;
+ if(path != null){
+ var spriteFrame = cc.spriteFrameCache.getSpriteFrame(path);
+ if(!spriteFrame){
+ path = resourcePath + path;
+ sprite = new ccs.Sprite(path);
+ }else{
+ sprite = ccs.Sprite.createWithSpriteFrame(spriteFrame);
+ }
+
+ if(!sprite){
+ sprite = new cc.Sprite();
+ cc.log("filePath is empty. Create a sprite with no texture");
+ }
+ }else{
+ sprite = new ccs.Sprite();
+ }
+ this.generalAttributes(sprite, options);
+ var flipX = options["flipX"];
+ var flipY = options["flipY"];
+
+ if(flipX != false)
+ sprite.setFlippedX(flipX);
+ if(flipY != false)
+ sprite.setFlippedY(flipY);
+ return sprite;
+ };
+ parser.initParticle = function(options, resourcePath){
+ var filePath = options["plistFile"];
+ var num = options["tmxFile"];
+ var particle = new cc.ParticleSystemQuad(filePath);
+ particle.setTotalParticles(num);
+ this.generalAttributes(particle, options);
+ return particle;
+ };
+ parser.initTMXTiledMap = function(options, resourcePath){
+ var tmxFile = options["tmxFile"];
+ var tmxString = options["tmxString"];
+ //todo check path and resourcePath
+ var path = options["resourcePath"];
+
+ var tmx = null;
+ if (tmxFile && "" !== tmxFile){
+ tmx = new cc.TMXTiledMap(tmxFile);
+ }else if (tmxString && "" !== tmxString && path && "" !== path){
+ tmx = new cc.TMXTiledMap(tmxString, path);
+ }
+ return tmx;
+ };
+ var uiParser = load.getParser("ccui")["*"];
+ parser.initWidget = function(options, resourcePath){
+ var type = options["classname"];
+
+ var parser = uiParser.parsers[type];
+ if(!parser)
+ return cc.log("%s parser is not found", type);
+
+ var node = parser.call(uiParser, options, resourcePath);
+ if(node){
+ var rotationSkewX = options["rotationSkewX"];
+ var rotationSkewY = options["rotationSkewY"];
+ var skewx = options["skewX"];
+ var skewy = options["skewY"];
+ if(rotationSkewX != 0)
+ node.setRotationX(rotationSkewX);
+ if(rotationSkewY != 0)
+ node.setRotationY(rotationSkewY);
+ if(skewx != 0)
+ node.setSkewX(skewx);
+ if(skewy != 0)
+ node.setSkewY(skewy);
+
+ var actionTag = options["actionTag"];
+ node.setUserObject(new ccs.ActionTimelineData(actionTag));
+ }
+ return node;
+ };
+
+ var register = [
+ {name: "Node", handle: parser.initNode},
+ {name: "SubGraph", handle: parser.initSubGraph},
+ {name: "Sprite", handle: parser.initSprite},
+ {name: "Particle", handle: parser.initParticle},
+ {name: "TMXTiledMap", handle: parser.initTMXTiledMap},
+
+ {name: "Widget", handle: parser.initWidget},
+ {name: "Panel", handle: parser.initWidget},
+ {name: "Button", handle: parser.initWidget},
+ {name: "CheckBox", handle: parser.initWidget},
+ {name: "ImageView", handle: parser.initWidget},
+ {name: "LabelAtlas", handle: parser.initWidget},
+ {name: "LabelBMFont", handle: parser.initWidget},
+ {name: "Label", handle: parser.initWidget},
+ {name: "ListView", handle: parser.initWidget},
+ {name: "LoadingBar", handle: parser.initWidget},
+ {name: "PageView", handle: parser.initWidget},
+ {name: "ScrollView", handle: parser.initWidget},
+ {name: "Slider", handle: parser.initWidget},
+ {name: "TextField", handle: parser.initWidget}
+ ];
+
+ register.forEach(function(item){
+ parser.registerParser(item.name, function(options, parse, resourcePath){
+ var node = item.handle.call(this, options["options"]);
+ this.parseComponent(node, options["components"]);
+ this.parseChild(parse, node, options, resourcePath);
+ return node;
+ });
+ });
+
+ load.registerParser("timeline", "*", parser);
+
+})(ccs._load, ccs._parser);
diff --git a/extensions/cocostudio/loader/parsers/timelineParser-2.x.js b/extensions/cocostudio/loader/parsers/timelineParser-2.x.js
new file mode 100644
index 0000000000..e5644ccada
--- /dev/null
+++ b/extensions/cocostudio/loader/parsers/timelineParser-2.x.js
@@ -0,0 +1,1321 @@
+/****************************************************************************
+ Copyright (c) 2013-2014 Chukong Technologies Inc.
+
+ http://www.cocos2d-x.org
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+ ****************************************************************************/
+
+(function(load, baseParser){
+
+ var DEBUG = false;
+
+ var Parser = baseParser.extend({
+
+ parse: function(file, json, path){
+ var resourcePath;
+ if(path !== undefined)
+ resourcePath = path;
+ else
+ resourcePath = this._dirname(file);
+ this.pretreatment(json, resourcePath, file);
+ var node = this.parseNode(this.getNodeJson(json), resourcePath);
+ this.deferred(json, resourcePath, node, file);
+ return node;
+ },
+
+ getNodeJson: function(json){
+ return json["Content"]["Content"]["ObjectData"];
+ },
+
+ getClass: function(json){
+ return json["ctype"];
+ }
+
+ });
+ var parser = new Parser();
+
+
+ var getParam = function(value, dValue){
+ if(value === undefined)
+ return dValue;
+ else
+ return value;
+ };
+
+ //////////
+ // NODE //
+ //////////
+
+ parser.generalAttributes = function(node, json){
+ if(json["Name"] != null)
+ node.setName(json["Name"]);
+
+ var position = json["Position"];
+ if(position != null && (position["X"] != null || position["Y"] != null))
+ node.setPosition(cc.p(position["X"]||0, position["Y"]||0));
+
+ var scale = json["Scale"];
+ if(scale != null){
+ if(scale["ScaleX"] != null)
+ node.setScaleX(scale["ScaleX"]);
+ if(scale["ScaleY"] != null)
+ node.setScaleY(scale["ScaleY"]);
+ }
+
+ var rotationSkewX = json["RotationSkewX"];
+ if (rotationSkewX != null)
+ node.setRotationX(rotationSkewX);
+
+ var rotationSkewY = json["RotationSkewY"];
+ if (json["RotationSkewY"] != null)
+ node.setRotationY(rotationSkewY);
+
+
+ var anchor = json["AnchorPoint"];
+ if(anchor != null){
+ if(anchor["ScaleX"] == null)
+ anchor["ScaleX"] = 0;
+ if(anchor["ScaleY"] == null)
+ anchor["ScaleY"] = 0;
+ if(anchor["ScaleX"] != 0.5 || anchor["ScaleY"] != 0.5)
+ node.setAnchorPoint(cc.p(anchor["ScaleX"], anchor["ScaleY"]));
+ }
+
+ if (json["ZOrder"] != null)
+ node.setLocalZOrder(json["ZOrder"]);
+
+ var visible = getParam(json["VisibleForFrame"], true);
+ node.setVisible(visible);
+
+ setContentSize(node, json["Size"]);
+
+ if (json["Alpha"] != null)
+ node.setOpacity(json["Alpha"]);
+
+ node.setTag(json["Tag"] || 0);
+
+ var actionTag = json["ActionTag"] || 0;
+ var extensionData = new ccs.ObjectExtensionData();
+ var customProperty = json["UserData"];
+ if(customProperty !== undefined)
+ extensionData.setCustomProperty(customProperty);
+ extensionData.setActionTag(actionTag);
+ node.setUserObject(extensionData);
+
+ node.setCascadeColorEnabled(true);
+ node.setCascadeOpacityEnabled(true);
+ };
+
+ parser.parseChild = function(node, children, resourcePath){
+ if(!node || !children) return;
+ for (var i = 0; i < children.length; i++) {
+ var child = this.parseNode(children[i], resourcePath);
+ if(child){
+ if(node instanceof ccui.PageView){
+ if(child instanceof ccui.Layout)
+ node.addPage(child);
+ } else {
+ if(node instanceof ccui.ListView){
+ if(child instanceof ccui.Widget)
+ node.pushBackCustomItem(child);
+ } else {
+ if(!(node instanceof ccui.Layout) && child instanceof ccui.Widget) {
+ if(child.getPositionType() === ccui.Widget.POSITION_PERCENT) {
+ var position = child.getPositionPercent();
+ var anchor = node.getAnchorPoint();
+ child.setPositionPercent(cc.p(position.x + anchor.x, position.y + anchor.y));
+ }
+ }
+ node.addChild(child);
+ }
+ }
+ }
+ }
+ };
+
+ /**
+ * SingleNode
+ * @param json
+ * @returns {cc.Node}
+ */
+ parser.initSingleNode = function(json){
+ var node = new cc.Node();
+
+ this.generalAttributes(node, json);
+
+ return node;
+ };
+
+ /**
+ * Sprite
+ * @param json
+ * @param resourcePath
+ * @returns {cc.Sprite}
+ */
+ parser.initSprite = function(json, resourcePath){
+ var node = new cc.Sprite();
+
+ loadTexture(json["FileData"], resourcePath, function(path, type){
+ if(type === 0)
+ node.setTexture(path);
+ else if(type === 1){
+ var spriteFrame = cc.spriteFrameCache.getSpriteFrame(path);
+ node.setSpriteFrame(spriteFrame);
+ }
+ });
+
+ var blendData = json["BlendFunc"];
+ if(json["BlendFunc"]) {
+ var blendFunc = cc.BlendFunc.ALPHA_PREMULTIPLIED;
+ if (blendData["Src"] !== undefined)
+ blendFunc.src = blendData["Src"];
+ if (blendData["Dst"] !== undefined)
+ blendFunc.dst = blendData["Dst"];
+ node.setBlendFunc(blendFunc);
+ }
+
+ if(json["FlipX"])
+ node.setFlippedX(true);
+ if(json["FlipY"])
+ node.setFlippedY(true);
+
+ this.generalAttributes(node, json);
+ var color = json["CColor"];
+ if(color != null)
+ node.setColor(getColor(color));
+
+ return node;
+ };
+
+ /**
+ * Particle
+ * @param json
+ * @param resourcePath
+ * @returns {*}
+ */
+ parser.initParticle = function(json, resourcePath){
+ var node,
+ self = this;
+ loadTexture(json["FileData"], resourcePath, function(path, type){
+ if(!cc.loader.getRes(path))
+ cc.log("%s need to be preloaded", path);
+ node = new cc.ParticleSystem(path);
+ self.generalAttributes(node, json);
+ node.setPositionType(cc.ParticleSystem.TYPE_GROUPED);
+ !cc.sys.isNative && node.setDrawMode(cc.ParticleSystem.TEXTURE_MODE);
+
+ var blendData = json["BlendFunc"];
+ if(json["BlendFunc"]){
+ var blendFunc = cc.BlendFunc.ALPHA_PREMULTIPLIED;
+ if(blendData["Src"] !== undefined)
+ blendFunc.src = blendData["Src"];
+ if(blendData["Dst"] !== undefined)
+ blendFunc.dst = blendData["Dst"];
+ node.setBlendFunc(blendFunc);
+ }
+ });
+ return node;
+ };
+
+
+ ////////////
+ // WIDGET //
+ ////////////
+
+ parser.widgetAttributes = function (widget, json, enableContent) {
+ widget.setCascadeColorEnabled(true);
+ widget.setCascadeOpacityEnabled(true);
+
+ widget.setUnifySizeEnabled(false);
+ //widget.setLayoutComponentEnabled(true);
+ widget.ignoreContentAdaptWithSize(false);
+ !enableContent && setContentSize(widget, json["Size"]);
+
+ var name = json["Name"];
+ if (name)
+ widget.setName(name);
+
+ var actionTag = json["ActionTag"] || 0;
+ widget.setActionTag(actionTag);
+ var extensionData = new ccs.ObjectExtensionData();
+ var customProperty = json["UserData"];
+ if(customProperty !== undefined)
+ extensionData.setCustomProperty(customProperty);
+ extensionData.setActionTag(actionTag);
+ widget.setUserObject(extensionData);
+
+ var rotationSkewX = json["RotationSkewX"];
+ if (rotationSkewX)
+ widget.setRotationX(rotationSkewX);
+
+ var rotationSkewY = json["RotationSkewY"];
+ if (rotationSkewY)
+ widget.setRotationY(rotationSkewY);
+
+ //var rotation = json["Rotation"];
+
+ var flipX = json["FlipX"];
+ if (flipX)
+ widget.setFlippedX(true);
+
+ var flipY = json["FlipY"];
+ if (flipY)
+ widget.setFlippedY(true);
+
+ var zOrder = json["zOrder"];
+ if (zOrder != null)
+ widget.setLocalZOrder(zOrder);
+
+ //var visible = json["Visible"];
+
+ var visible = getParam(json["VisibleForFrame"], true);
+ widget.setVisible(visible);
+
+ var alpha = json["Alpha"];
+ if (alpha != null)
+ widget.setOpacity(alpha);
+
+ widget.setTag(json["Tag"] || 0);
+
+ var touchEnabled = json["TouchEnable"] || false;
+ widget.setTouchEnabled(touchEnabled);
+
+ // -- var frameEvent = json["FrameEvent"];
+
+ var callBackType = json["CallBackType"];
+ if (callBackType != null)
+ widget.setCallbackType(callBackType);
+
+ var callBackName = json["CallBackName"];
+ if (callBackName)
+ widget.setCallbackName(callBackName);
+
+ var position = json["Position"];
+ if (position != null)
+ widget.setPosition(position["X"] || 0, position["Y"] || 0);
+
+ var scale = json["Scale"];
+ if (scale != null) {
+ var scaleX = getParam(scale["ScaleX"], 1);
+ var scaleY = getParam(scale["ScaleY"], 1);
+ widget.setScaleX(scaleX);
+ widget.setScaleY(scaleY);
+ }
+
+ var anchorPoint = json["AnchorPoint"];
+ if (anchorPoint != null)
+ widget.setAnchorPoint(anchorPoint["ScaleX"] || 0, anchorPoint["ScaleY"] || 0);
+
+ var color = json["CColor"];
+ if (color != null)
+ widget.setColor(getColor(color));
+
+ var layoutComponent = ccui.LayoutComponent.bindLayoutComponent(widget);
+ if(!layoutComponent)
+ return;
+
+ var positionXPercentEnabled = json["PositionPercentXEnable"] || false;
+ var positionYPercentEnabled = json["PositionPercentYEnable"] || false;
+ var positionXPercent = 0,
+ positionYPercent = 0,
+ PrePosition = json["PrePosition"];
+ if (PrePosition != null) {
+ positionXPercent = PrePosition["X"] || 0;
+ positionYPercent = PrePosition["Y"] || 0;
+ }
+ var sizeXPercentEnable = json["PercentWidthEnable"] || false;
+ var sizeYPercentEnable = json["PercentHeightEnable"] || false;
+ var sizeXPercent = 0,
+ sizeYPercent = 0,
+ PreSize = json["PreSize"];
+ if (PrePosition != null) {
+ sizeXPercent = PreSize["X"] || 0;
+ sizeYPercent = PreSize["Y"] || 0;
+ }
+ var stretchHorizontalEnabled = json["StretchWidthEnable"] || false;
+ var stretchVerticalEnabled = json["StretchHeightEnable"] || false;
+ var horizontalEdge = json["HorizontalEdge"];// = ccui.LayoutComponent.horizontalEdge.LEFT;
+ var verticalEdge = json["VerticalEdge"]; // = ccui.LayoutComponent.verticalEdge.TOP;
+ var leftMargin = json["LeftMargin"] || 0;
+ var rightMargin = json["RightMargin"] || 0;
+ var topMargin = json["TopMargin"] || 0;
+ var bottomMargin = json["BottomMargin"] || 0;
+
+ layoutComponent.setPositionPercentXEnabled(positionXPercentEnabled);
+ layoutComponent.setPositionPercentYEnabled(positionYPercentEnabled);
+ layoutComponent.setPositionPercentX(positionXPercent);
+ layoutComponent.setPositionPercentY(positionYPercent);
+ layoutComponent.setPercentWidthEnabled(sizeXPercentEnable);
+ layoutComponent.setPercentHeightEnabled(sizeYPercentEnable);
+ layoutComponent.setPercentWidth(sizeXPercent);
+ layoutComponent.setPercentHeight(sizeYPercent);
+ layoutComponent.setStretchWidthEnabled(stretchHorizontalEnabled);
+ layoutComponent.setStretchHeightEnabled(stretchVerticalEnabled);
+
+ var horizontalEdgeType = ccui.LayoutComponent.horizontalEdge.NONE;
+ if (horizontalEdge === "LeftEdge") {
+ horizontalEdgeType = ccui.LayoutComponent.horizontalEdge.LEFT;
+ } else if (horizontalEdge === "RightEdge") {
+ horizontalEdgeType = ccui.LayoutComponent.horizontalEdge.RIGHT;
+ } else if (horizontalEdge === "BothEdge") {
+ horizontalEdgeType = ccui.LayoutComponent.horizontalEdge.CENTER;
+ }
+ layoutComponent.setHorizontalEdge(horizontalEdgeType);
+
+ var verticalEdgeType = ccui.LayoutComponent.verticalEdge.NONE;
+ if (verticalEdge === "TopEdge") {
+ verticalEdgeType = ccui.LayoutComponent.verticalEdge.TOP;
+ } else if (verticalEdge === "BottomEdge") {
+ verticalEdgeType = ccui.LayoutComponent.verticalEdge.BOTTOM;
+ } else if (verticalEdge === "BothEdge") {
+ verticalEdgeType = ccui.LayoutComponent.verticalEdge.CENTER;
+ }
+ layoutComponent.setVerticalEdge(verticalEdgeType);
+
+ layoutComponent.setTopMargin(topMargin);
+ layoutComponent.setBottomMargin(bottomMargin);
+ layoutComponent.setLeftMargin(leftMargin);
+ layoutComponent.setRightMargin(rightMargin);
+
+ layoutComponent.setVerticalEdge(verticalEdgeType);
+
+ layoutComponent.setTopMargin(topMargin);
+ layoutComponent.setBottomMargin(bottomMargin);
+ layoutComponent.setLeftMargin(leftMargin);
+ layoutComponent.setRightMargin(rightMargin);
+ };
+
+ var setLayoutBackground = function(layout, single, first, end){
+ if( layout.getBackGroundColorType() === 2 ){
+ first = first || {};
+ end = end || {};
+ layout.setBackGroundColor(getColor(first), getColor(end));
+ }else{
+ single = single || {};
+ layout.setBackGroundColor(getColor(single));
+ }
+ };
+
+ var setLayoutBackgroundVector = function(widget, vector){
+ var x = vector["ScaleX"] || 0;
+ var y = vector["ScaleY"] || 0;
+ widget.setBackGroundColorVector(cc.p(x, y));
+ };
+
+ /**
+ * Layout
+ * @param json
+ * @param resourcePath
+ * @returns {ccui.Layout}
+ */
+ parser.initPanel = function(json, resourcePath){
+ var widget = new ccui.Layout();
+
+ this.widgetAttributes(widget, json);
+
+ var clipEnabled = json["ClipAble"];
+ if(clipEnabled != null)
+ widget.setClippingEnabled(clipEnabled);
+
+ var colorType = getParam(json["ComboBoxIndex"], 0);
+ widget.setBackGroundColorType(colorType);
+
+ var bgColorOpacity = getParam(json["BackColorAlpha"], 255);
+ if(bgColorOpacity != null)
+ widget.setBackGroundColorOpacity(bgColorOpacity);
+
+ var backGroundScale9Enabled = json["Scale9Enable"];
+ if(backGroundScale9Enabled != null)
+ widget.setBackGroundImageScale9Enabled(backGroundScale9Enabled);
+
+ var opacity = getParam(json["Alpha"], 255);
+ widget.setOpacity(opacity);
+
+ loadTexture(json["FileData"], resourcePath, function(path, type){
+ widget.setBackGroundImage(path, type);
+ });
+
+ if(backGroundScale9Enabled){
+ var scale9OriginX = json["Scale9OriginX"] || 0;
+ var scale9OriginY = json["Scale9OriginY"] || 0;
+
+ var scale9Width = json["Scale9Width"] || 0;
+ var scale9Height = json["Scale9Height"] || 0;
+
+ widget.setBackGroundImageCapInsets(cc.rect(
+ scale9OriginX, scale9OriginY, scale9Width, scale9Height
+ ));
+
+ setContentSize(widget, json["Size"]);
+ }else{
+ if (!widget.isIgnoreContentAdaptWithSize()){
+ setContentSize(widget, json["Size"]);
+ }
+
+ }
+
+ setLayoutBackground(widget, json["SingleColor"], json["FirstColor"], json["EndColor"]);
+ setLayoutBackgroundVector(widget, json["ColorVector"]);
+
+ return widget;
+ };
+
+ /**
+ * Text
+ * @param json
+ * @param resourcePath
+ */
+ parser.initText = function(json, resourcePath){
+
+ var widget = new ccui.Text();
+
+ var touchScaleEnabled = json["TouchScaleChangeAble"];
+ if(touchScaleEnabled != null)
+ widget.setTouchScaleChangeEnabled(touchScaleEnabled);
+
+ var text = json["LabelText"];
+ if(text != null)
+ widget.setString(text);
+
+ var fontSize = json["FontSize"];
+ if(fontSize != null)
+ widget.setFontSize(fontSize);
+
+ var fontName = json["FontName"];
+ if(fontName != null)
+ widget.setFontName(fontName);
+
+ var areaWidth = json["AreaWidth"];
+ var areaHeight = json["areaHeight"];
+ if(areaWidth && areaHeight)
+ widget.setTextAreaSize(cc.size(areaWidth, areaHeight));
+
+ var h_alignment = json["HorizontalAlignmentType"] || "HT_Left";
+ switch(h_alignment){
+ case "HT_Right":
+ h_alignment = 2; break;
+ case "HT_Center":
+ h_alignment = 1; break;
+ case "HT_Left":
+ default:
+ h_alignment = 0;
+ }
+ widget.setTextHorizontalAlignment(h_alignment);
+
+ var v_alignment = json["VerticalAlignmentType"] || "VT_Top";
+ switch(v_alignment){
+ case "VT_Bottom":
+ v_alignment = 2; break;
+ case "VT_Center":
+ v_alignment = 1; break;
+ case "VT_Top":
+ default:
+ v_alignment = 0;
+ }
+ widget.setTextVerticalAlignment(v_alignment);
+
+ var fontResource = json["FontResource"];
+ if(fontResource != null){
+ var path = fontResource["Path"];
+ //resoutceType = fontResource["Type"];
+ if(path != null){
+ if (cc.sys.isNative) {
+ fontName = cc.path.join(cc.loader.resPath, resourcePath, path);
+ } else {
+ fontName = path.match(/([^\/]+)\.ttf/);
+ fontName = fontName ? fontName[1] : "";
+ }
+ widget.setFontName(fontName);
+ }
+ }
+
+ if(json["OutlineEnabled"] && json["OutlineColor"] && widget.enableOutline)
+ widget.enableOutline(getColor(json["OutlineColor"]), getParam(json["OutlineSize"], 1));
+
+ if(json["ShadowEnabled"] && json["ShadowColor"] && widget.enableShadow)
+ widget.enableShadow(
+ getColor(json["ShadowColor"]),
+ cc.size(getParam(json["ShadowOffsetX"], 2), getParam(json["ShadowOffsetY"], -2)),
+ json["ShadowBlurRadius"] || 0
+ );
+
+ var isCustomSize = json["IsCustomSize"];
+ if(isCustomSize != null)
+ widget.ignoreContentAdaptWithSize(!isCustomSize);
+
+ widget.setUnifySizeEnabled(false);
+
+ this.widgetAttributes(widget, json, widget.isIgnoreContentAdaptWithSize());
+
+ return widget;
+
+ };
+
+ /**
+ * Button
+ * @param json
+ * @param resourcePath
+ */
+ parser.initButton = function(json, resourcePath){
+
+ var widget = new ccui.Button();
+
+ loadTexture(json["NormalFileData"], resourcePath, function(path, type){
+ widget.loadTextureNormal(path, type);
+ });
+ loadTexture(json["PressedFileData"], resourcePath, function(path, type){
+ widget.loadTexturePressed(path, type);
+ });
+ loadTexture(json["DisabledFileData"], resourcePath, function(path, type){
+ widget.loadTextureDisabled(path, type);
+ });
+
+ var scale9Enabled = getParam(json["Scale9Enable"], false);
+ if(scale9Enabled) {
+ widget.setScale9Enabled(scale9Enabled);
+ }
+
+ var text = json["ButtonText"];
+ if(text != null)
+ widget.setTitleText(text);
+
+ var fontSize = json["FontSize"];
+ if(fontSize != null)
+ widget.setTitleFontSize(fontSize);
+
+ var fontName = json["FontName"];
+ if(fontName != null)
+ widget.setTitleFontName(fontName);
+
+ var textColor = json["TextColor"];
+ if(textColor != null)
+ widget.setTitleColor(getColor(textColor));
+
+ var displaystate = getParam(json["DisplayState"], true);
+ widget.setBright(displaystate);
+ widget.setEnabled(displaystate);
+
+ var fontResource = json["FontResource"];
+ if(fontResource != null){
+ var path = fontResource["Path"];
+ //resoutceType = fontResource["Type"];
+ if(path != null){
+ if (cc.sys.isNative) {
+ fontName = cc.path.join(cc.loader.resPath, resourcePath, path);
+ } else {
+ fontName = path.match(/([^\/]+)\.ttf/);
+ fontName = fontName ? fontName[1] : "";
+ }
+ widget.setTitleFontName(fontName);
+ }
+ }
+
+ var label = widget.getTitleRenderer();
+ if(label && json["ShadowEnabled"] && json["ShadowColor"] && label.enableShadow){
+ label.enableShadow(
+ getColor(json["ShadowColor"]),
+ cc.size(getParam(json["ShadowOffsetX"], 2), getParam(json["ShadowOffsetY"], -2)),
+ json["ShadowBlurRadius"] || 0
+ );
+ }
+ if(label && json["OutlineEnabled"] && json["OutlineColor"] && label.enableStroke)
+ label.enableStroke(getColor(json["OutlineColor"]), getParam(json["OutlineSize"], 1));
+
+ this.widgetAttributes(widget, json);
+
+ if(scale9Enabled) {
+ widget.setUnifySizeEnabled(false);
+ widget.ignoreContentAdaptWithSize(false);
+ var capInsets = cc.rect(
+ json["Scale9OriginX"] || 0,
+ json["Scale9OriginY"] || 0,
+ json["Scale9Width"] || 0,
+ json["Scale9Height"] || 0
+ );
+ widget.setCapInsets(capInsets);
+
+ }
+
+ setContentSize(widget, json["Size"]);
+
+ return widget;
+
+ };
+
+ /**
+ * CheckBox
+ * @param json
+ * @param resourcePath
+ */
+ parser.initCheckBox = function(json, resourcePath){
+
+ var widget = new ccui.CheckBox();
+
+ this.widgetAttributes(widget, json);
+
+ var dataList = [
+ {name: "NormalBackFileData", handle: widget.loadTextureBackGround},
+ {name: "PressedBackFileData", handle: widget.loadTextureBackGroundSelected},
+ {name: "NodeNormalFileData", handle: widget.loadTextureFrontCross},
+ {name: "DisableBackFileData", handle: widget.loadTextureBackGroundDisabled},
+ {name: "NodeDisableFileData", handle: widget.loadTextureFrontCrossDisabled}
+ ];
+
+ dataList.forEach(function(item){
+ loadTexture(json[item.name], resourcePath, function(path, type){
+ item.handle.call(widget, path, type);
+ });
+ });
+
+ var selectedState = getParam(json["CheckedState"], false);
+ widget.setSelected(selectedState);
+
+ var displaystate = getParam(json["DisplayState"], true);
+ widget.setBright(displaystate);
+ widget.setEnabled(displaystate);
+
+ return widget;
+ };
+
+ /**
+ * ScrollView
+ * @param json
+ * @param resourcePath
+ */
+ parser.initScrollView = function(json, resourcePath){
+ var widget = new ccui.ScrollView();
+
+ this.widgetAttributes(widget, json);
+
+ loadTexture(json["FileData"], resourcePath, function(path, type){
+ widget.setBackGroundImage(path, type);
+ });
+
+ var clipEnabled = json["ClipAble"];
+ widget.setClippingEnabled(clipEnabled);
+
+ var colorType = getParam(json["ComboBoxIndex"], 0);
+ widget.setBackGroundColorType(colorType);
+
+ var bgColorOpacity = json["BackColorAlpha"];
+ if(bgColorOpacity != null)
+ widget.setBackGroundColorOpacity(bgColorOpacity);
+
+ var backGroundScale9Enabled = json["Scale9Enable"];
+ if(backGroundScale9Enabled){
+ widget.setBackGroundImageScale9Enabled(true);
+
+
+ var scale9OriginX = json["Scale9OriginX"] || 0;
+ var scale9OriginY = json["Scale9OriginY"] || 0;
+ var scale9Width = json["Scale9Width"] || 0;
+ var scale9Height = json["Scale9Height"] || 0;
+ widget.setBackGroundImageCapInsets(cc.rect(
+ scale9OriginX, scale9OriginY, scale9Width, scale9Height
+ ));
+ setContentSize(widget, json["Size"]);
+ }else if(!widget.isIgnoreContentAdaptWithSize()){
+ setContentSize(widget, json["Size"]);
+ }
+
+ setLayoutBackground(widget, json["SingleColor"], json["FirstColor"], json["EndColor"]);
+ setLayoutBackgroundVector(widget, json["ColorVector"]);
+
+ var innerNodeSize = json["InnerNodeSize"];
+ var innerSize = cc.size(
+ innerNodeSize["Width"] || 0,
+ innerNodeSize["Height"] || 0
+ );
+ widget.setInnerContainerSize(innerSize);
+
+ var direction = 0;
+ if(json["ScrollDirectionType"] === "Vertical") direction = 1;
+ if(json["ScrollDirectionType"] === "Horizontal") direction = 2;
+ if(json["ScrollDirectionType"] === "Vertical_Horizontal") direction = 3;
+ widget.setDirection(direction);
+
+ var bounceEnabled = getParam(json["IsBounceEnabled"], false);
+ widget.setBounceEnabled(bounceEnabled);
+
+ return widget;
+ };
+
+ /**
+ * ImageView
+ * @param json
+ * @param resourcePath
+ */
+ parser.initImageView = function(json, resourcePath){
+
+ var widget = new ccui.ImageView();
+
+ loadTexture(json["FileData"], resourcePath, function(path, type){
+ widget.loadTexture(path, type);
+ });
+ loadTexture(json["ImageFileData"], resourcePath, function(path, type){
+ widget.loadTexture(path, type);
+ });
+
+ var scale9Enabled = json["Scale9Enable"];
+ if(scale9Enabled){
+ widget.setScale9Enabled(true);
+ widget.setUnifySizeEnabled(false);
+ widget.ignoreContentAdaptWithSize(false);
+
+ var scale9OriginX = json["Scale9OriginX"] || 0;
+ var scale9OriginY = json["Scale9OriginY"] || 0;
+ var scale9Width = json["Scale9Width"] || 0;
+ var scale9Height = json["Scale9Height"] || 0;
+ widget.setCapInsets(cc.rect(
+ scale9OriginX ,
+ scale9OriginY,
+ scale9Width,
+ scale9Height
+ ));
+ } else
+ setContentSize(widget, json["Size"]);
+
+ this.widgetAttributes(widget, json);
+
+ return widget;
+ };
+
+ /**
+ * LoadingBar
+ * @param json
+ * @param resourcePath
+ * @returns {ccui.LoadingBar}
+ */
+ parser.initLoadingBar = function(json, resourcePath){
+
+ var widget = new ccui.LoadingBar();
+
+ this.widgetAttributes(widget, json);
+
+ loadTexture(json["ImageFileData"], resourcePath, function(path, type){
+ widget.loadTexture(path, type);
+ });
+
+ var direction = json["ProgressType"] === "Right_To_Left" ? 1 : 0;
+ widget.setDirection(direction);
+
+ var percent = getParam(json["ProgressInfo"], 80);
+ if(percent != null)
+ widget.setPercent(percent);
+
+ return widget;
+
+ };
+
+ /**
+ * Slider
+ * @param json
+ * @param resourcePath
+ */
+ parser.initSlider = function(json, resourcePath){
+
+ var widget = new ccui.Slider();
+ var loader = cc.loader;
+
+ this.widgetAttributes(widget, json);
+
+ var textureList = [
+ {name: "BackGroundData", handle: widget.loadBarTexture},
+ {name: "BallNormalData", handle: widget.loadSlidBallTextureNormal},
+ {name: "BallPressedData", handle: widget.loadSlidBallTexturePressed},
+ {name: "BallDisabledData", handle: widget.loadSlidBallTextureDisabled},
+ {name: "ProgressBarData", handle: widget.loadProgressBarTexture}
+ ];
+ textureList.forEach(function(item){
+ loadTexture(json[item.name], resourcePath, function(path, type){
+ if(type === 0 && !loader.getRes(path))
+ cc.log("%s need to be preloaded", path);
+ item.handle.call(widget, path, type);
+ });
+ });
+
+ var percent = json["PercentInfo"] || 0;
+ widget.setPercent(percent);
+
+ var displaystate = getParam(json["DisplayState"], true);
+ widget.setBright(displaystate);
+ widget.setEnabled(displaystate);
+
+ return widget;
+ };
+
+ /**
+ * PageView
+ * @param json
+ * @param resourcePath
+ */
+ parser.initPageView = function(json, resourcePath){
+
+ var widget = new ccui.PageView();
+
+ this.widgetAttributes(widget, json);
+
+ loadTexture(json["FileData"], resourcePath, function(path, type){
+ widget.setBackGroundImage(path, type);
+ });
+
+ var clipEnabled = json["ClipAble"] || false;
+ widget.setClippingEnabled(clipEnabled);
+
+ var backGroundScale9Enabled = json["Scale9Enable"];
+ if(backGroundScale9Enabled){
+ widget.setBackGroundImageScale9Enabled(true);
+
+ var scale9OriginX = json["Scale9OriginX"] || 0;
+ var scale9OriginY = json["Scale9OriginY"] || 0;
+ var scale9Width = json["Scale9Width"] || 0;
+ var scale9Height = json["Scale9Height"] || 0;
+ widget.setBackGroundImageCapInsets(cc.rect(
+ scale9OriginX,
+ scale9OriginY,
+ scale9Width,
+ scale9Height
+ ));
+ }
+
+ var colorType = getParam(json["ComboBoxIndex"], 0);
+ widget.setBackGroundColorType(colorType);
+
+ setLayoutBackground(widget, json["SingleColor"], json["FirstColor"], json["EndColor"]);
+ setLayoutBackgroundVector(widget, json["ColorVector"]);
+
+ var bgColorOpacity = json["BackColorAlpha"];
+ if(bgColorOpacity != null)
+ widget.setBackGroundColorOpacity(bgColorOpacity);
+
+ setContentSize(widget, json["Size"]);
+
+ return widget;
+
+ };
+
+ /**
+ * ListView
+ * @param json
+ * @param resourcePath
+ * @returns {ccui.ListView}
+ */
+ parser.initListView = function(json, resourcePath){
+
+ var widget = new ccui.ListView();
+
+ this.widgetAttributes(widget, json);
+
+ loadTexture(json["FileData"], resourcePath, function(path, type){
+ widget.setBackGroundImage(path, type);
+ });
+
+ var clipEnabled = json["ClipAble"] || false;
+ widget.setClippingEnabled(clipEnabled);
+
+ var colorType = getParam(json["ComboBoxIndex"], 0);
+ widget.setBackGroundColorType(colorType);
+
+ var bgColorOpacity = getParam(json["BackColorAlpha"], 255);
+ var backGroundScale9Enabled = json["Scale9Enable"];
+ if(backGroundScale9Enabled){
+ widget.setBackGroundImageScale9Enabled(true);
+
+ var scale9OriginX = json["Scale9OriginX"] || 0;
+ var scale9OriginY = json["Scale9OriginY"] || 0;
+ var scale9Width = json["Scale9Width"] || 0;
+ var scale9Height = json["Scale9Height"] || 0;
+ widget.setBackGroundImageCapInsets(cc.rect(
+ scale9OriginX,
+ scale9OriginY,
+ scale9Width,
+ scale9Height
+ ));
+ }
+
+ var directionType = getParam(json["DirectionType"], ccui.ListView.DIR_HORIZONTAL);
+ var verticalType = getParam(json["VerticalType"], "Align_Left");
+ var horizontalType = getParam(json["HorizontalType"], "Align_Top");
+ if(!directionType){
+ widget.setDirection(ccui.ScrollView.DIR_HORIZONTAL);
+ if(verticalType === "Align_Bottom")
+ widget.setGravity(ccui.ListView.GRAVITY_BOTTOM);
+ else if(verticalType === "Align_VerticalCenter")
+ widget.setGravity(ccui.ListView.GRAVITY_CENTER_VERTICAL);
+ else
+ widget.setGravity(ccui.ListView.GRAVITY_TOP);
+ }else if(directionType === "Vertical"){
+ widget.setDirection(ccui.ScrollView.DIR_VERTICAL);
+ if (horizontalType === "")
+ widget.setGravity(ccui.ListView.GRAVITY_LEFT);
+ else if (horizontalType === "Align_Right")
+ widget.setGravity(ccui.ListView.GRAVITY_RIGHT);
+ else if (horizontalType === "Align_HorizontalCenter")
+ widget.setGravity(ccui.ListView.GRAVITY_CENTER_HORIZONTAL);
+ }
+
+
+ var bounceEnabled = getParam(json["IsBounceEnabled"], false);
+ widget.setBounceEnabled(bounceEnabled);
+
+ var itemMargin = json["ItemMargin"] || 0;
+ widget.setItemsMargin(itemMargin);
+
+ var innerSize = json["InnerNodeSize"];
+ //Width
+ if(innerSize != null)
+ widget.setInnerContainerSize(cc.size(innerSize["Widget"]||0, innerSize["Height"]||0));
+
+ setLayoutBackground(widget, json["SingleColor"], json["FirstColor"], json["EndColor"]);
+ setLayoutBackgroundVector(widget, json["ColorVector"]);
+
+ if(bgColorOpacity != null)
+ widget.setBackGroundColorOpacity(bgColorOpacity);
+
+ setContentSize(widget, json["Size"]);
+
+ return widget;
+ };
+
+ /**
+ * TextAtlas
+ * @param json
+ * @param resourcePath
+ * @returns {ccui.TextAtlas}
+ */
+ parser.initTextAtlas = function(json, resourcePath){
+
+ var widget = new ccui.TextAtlas();
+
+ var stringValue = json["LabelText"];
+ var itemWidth = json["CharWidth"];
+ var itemHeight = json["CharHeight"];
+
+ var startCharMap = json["StartChar"];
+
+ loadTexture(json["LabelAtlasFileImage_CNB"], resourcePath, function(path, type){
+ if(!cc.loader.getRes(path))
+ cc.log("%s need to be preloaded", path);
+ if(type === 0){
+ widget.setProperty(stringValue, path, itemWidth, itemHeight, startCharMap);
+ }
+ });
+ this.widgetAttributes(widget, json);
+
+ return widget;
+ };
+
+ /**
+ * TextBMFont
+ * @param json
+ * @param resourcePath
+ * @returns {ccui.TextBMFont}
+ */
+ parser.initTextBMFont = function(json, resourcePath){
+
+ var widget = new ccui.TextBMFont();
+ this.widgetAttributes(widget, json);
+
+ var text = json["LabelText"];
+ widget.setString(text);
+
+ loadTexture(json["LabelBMFontFile_CNB"], resourcePath, function(path, type){
+ if(!cc.loader.getRes(path))
+ cc.log("%s need to be pre loaded", path);
+ widget.setFntFile(path);
+ });
+ widget.ignoreContentAdaptWithSize(true);
+ return widget;
+ };
+
+ /**
+ * TextField
+ * @param json
+ * @param resourcePath
+ * @returns {ccui.TextField}
+ */
+ parser.initTextField = function(json, resourcePath){
+ var widget = new ccui.TextField();
+
+ var passwordEnabled = json["PasswordEnable"];
+ if(passwordEnabled){
+ widget.setPasswordEnabled(true);
+ var passwordStyleText = json["PasswordStyleText"] || "*";
+ widget.setPasswordStyleText(passwordStyleText);
+ }
+
+ var placeHolder = json["PlaceHolderText"];
+ if(placeHolder != null)
+ widget.setPlaceHolder(placeHolder);
+
+ var fontSize = json["FontSize"];
+ if(fontSize != null)
+ widget.setFontSize(fontSize);
+
+ var fontName = json["FontName"];
+ if(fontName != null)
+ widget.setFontName(fontName);
+
+ var maxLengthEnabled = json["MaxLengthEnable"];
+ if(maxLengthEnabled){
+ widget.setMaxLengthEnabled(true);
+ var maxLength = json["MaxLengthText"] || 0;
+ widget.setMaxLength(maxLength);
+ }
+
+ //var isCustomSize = json["IsCustomSize"];
+ this.widgetAttributes(widget, json);
+
+ var text = json["LabelText"];
+ if(text != null)
+ widget.setString(text);
+
+ var fontResource = json["FontResource"];
+ if(fontResource != null){
+ var path = fontResource["Path"];
+ //resoutceType = fontResource["Type"];
+ if(path != null){
+ if (cc.sys.isNative) {
+ fontName = cc.path.join(cc.loader.resPath, resourcePath, path);
+ } else {
+ fontName = path.match(/([^\/]+)\.ttf/);
+ fontName = fontName ? fontName[1] : "";
+ }
+ widget.setFontName(fontName);
+ }
+ }
+
+ widget.setUnifySizeEnabled(false);
+ widget.ignoreContentAdaptWithSize(false);
+
+ var color = json["CColor"];
+ if(color != null)
+ widget.setTextColor(getColor(color));
+
+ if (!widget.isIgnoreContentAdaptWithSize()){
+ setContentSize(widget, json["Size"]);
+ if (cc.sys.isNative)
+ widget.getVirtualRenderer().setLineBreakWithoutSpace(true);
+ }
+
+
+ return widget;
+
+ };
+
+ /**
+ * SimpleAudio
+ * @param json
+ * @param resourcePath
+ */
+ parser.initSimpleAudio = function(json, resourcePath){
+
+ var loop = json["Loop"] || false;
+ var volume = json["Volume"] || 0;
+ cc.audioEngine.setMusicVolume(volume);
+ //var name = json["Name"];
+ var resPath = "";
+ if(cc.loader.resPath)
+ resPath = (cc.loader.resPath + "/").replace(/\/\/$/, "/");
+
+ loadTexture(json["FileData"], resourcePath, function(path, type){
+ cc.loader.load(path, function(){
+ cc.audioEngine.playMusic(resPath + path, loop);
+ });
+ });
+
+ };
+
+ /**
+ * GameMap
+ * @param json
+ * @param resourcePath
+ * @returns {*}
+ */
+ parser.initGameMap = function(json, resourcePath){
+
+ var node = null;
+
+ loadTexture(json["FileData"], resourcePath, function(path, type){
+ if(type === 0)
+ node = new cc.TMXTiledMap(path);
+
+ parser.generalAttributes(node, json);
+ });
+
+ return node;
+ };
+
+ /**
+ * ProjectNode
+ * @param json
+ * @param resourcePath
+ * @returns {*}
+ */
+ parser.initProjectNode = function(json, resourcePath){
+ var projectFile = json["FileData"];
+ if(projectFile != null && projectFile["Path"]){
+ var file = resourcePath + projectFile["Path"];
+ if(cc.loader.getRes(file)){
+ var obj = ccs.load(file, resourcePath);
+ parser.generalAttributes(obj.node, json);
+ if(obj.action && obj.node){
+ obj.action.tag = obj.node.tag;
+ var InnerActionSpeed = json["InnerActionSpeed"];
+ if(InnerActionSpeed !== undefined)
+ obj.action.setTimeSpeed(InnerActionSpeed);
+ obj.node.runAction(obj.action);
+ obj.action.gotoFrameAndPause(0);
+ }
+ return obj.node;
+ } else
+ cc.log("%s need to be preloaded", file);
+ }
+ };
+
+ var getFileName = function(name){
+ if(!name) return "";
+ var arr = name.match(/([^\/]+)\.[^\/]+$/);
+ if(arr && arr[1])
+ return arr[1];
+ else
+ return "";
+ };
+
+ /**
+ * Armature
+ * @param json
+ * @param resourcePath
+ */
+ parser.initArmature = function(json, resourcePath){
+
+ var node = new ccs.Armature();
+
+ var isLoop = json["IsLoop"];
+
+ var isAutoPlay = json["IsAutoPlay"];
+
+ var currentAnimationName = json["CurrentAnimationName"];
+
+ parser.generalAttributes(node, json);
+
+ loadTexture(json["FileData"], resourcePath, function(path, type){
+ var plists, pngs;
+ var armJson = cc.loader.getRes(path);
+ if(!armJson)
+ cc.log("%s need to be preloaded", path);
+ else{
+ plists = armJson["config_file_path"];
+ pngs = armJson["config_png_path"];
+ plists.forEach(function(plist, index){
+ if(pngs[index])
+ cc.spriteFrameCache.addSpriteFrames(plist, pngs[index]);
+ });
+ }
+ ccs.armatureDataManager.addArmatureFileInfo(path);
+ node.init(getFileName(path));
+ if(isAutoPlay)
+ node.getAnimation().play(currentAnimationName, -1, isLoop);
+
+ });
+ return node;
+ };
+
+ var loadedPlist = {};
+ var loadTexture = function(json, resourcePath, cb){
+ if(json != null){
+ var path = json["Path"];
+ var type;
+ if(json["Type"] === "Default" || json["Type"] === "Normal")
+ type = 0;
+ else
+ type = 1;
+ var plist = json["Plist"];
+ if(plist){
+ if(cc.loader.getRes(resourcePath + plist)){
+ loadedPlist[resourcePath + plist] = true;
+ cc.spriteFrameCache.addSpriteFrames(resourcePath + plist);
+ }else{
+ if(!loadedPlist[resourcePath + plist])
+ cc.log("%s need to be preloaded", resourcePath + plist);
+ }
+ }
+ if(type !== 0)
+ cb(path, type);
+ else
+ cb(resourcePath + path, type);
+ }
+ };
+
+ var getColor = function(json){
+ if(!json) return;
+ var r = json["R"] != null ? json["R"] : 255;
+ var g = json["G"] != null ? json["G"] : 255;
+ var b = json["B"] != null ? json["B"] : 255;
+ var a = json["A"] != null ? json["A"] : 255;
+ return cc.color(r, g, b, a);
+ };
+
+ var setContentSize = function(node, size){
+ var x = size["X"] || 0;
+ var y = size["Y"] || 0;
+ if(size)
+ node.setContentSize(cc.size(x, y));
+ };
+
+ var register = [
+ {name: "SingleNodeObjectData", handle: parser.initSingleNode},
+ {name: "NodeObjectData", handle: parser.initSingleNode},
+ {name: "LayerObjectData", handle: parser.initSingleNode},
+ {name: "SpriteObjectData", handle: parser.initSprite},
+ {name: "ParticleObjectData", handle: parser.initParticle},
+ {name: "PanelObjectData", handle: parser.initPanel},
+ {name: "TextObjectData", handle: parser.initText},
+ {name: "ButtonObjectData", handle: parser.initButton},
+ {name: "CheckBoxObjectData", handle: parser.initCheckBox},
+ {name: "ScrollViewObjectData", handle: parser.initScrollView},
+ {name: "ImageViewObjectData", handle: parser.initImageView},
+ {name: "LoadingBarObjectData", handle: parser.initLoadingBar},
+ {name: "SliderObjectData", handle: parser.initSlider},
+ {name: "PageViewObjectData", handle: parser.initPageView},
+ {name: "ListViewObjectData", handle: parser.initListView},
+ {name: "TextAtlasObjectData", handle: parser.initTextAtlas},
+ {name: "TextBMFontObjectData", handle: parser.initTextBMFont},
+ {name: "TextFieldObjectData", handle: parser.initTextField},
+ {name: "SimpleAudioObjectData", handle: parser.initSimpleAudio},
+ {name: "GameMapObjectData", handle: parser.initGameMap},
+ {name: "ProjectNodeObjectData", handle: parser.initProjectNode},
+ {name: "ArmatureNodeObjectData", handle: parser.initArmature}
+ ];
+
+ register.forEach(function(item){
+ parser.registerParser(item.name, function(options, resourcePath){
+ var node = item.handle.call(this, options, resourcePath);
+ this.parseChild(node, options["Children"], resourcePath);
+ DEBUG && node && (node.__parserName = item.name);
+ return node;
+ });
+ });
+
+
+ load.registerParser("timeline", "2.*", parser);
+
+
+})(ccs._load, ccs._parser);
diff --git a/extensions/cocostudio/loader/parsers/uiParser-1.x.js b/extensions/cocostudio/loader/parsers/uiParser-1.x.js
new file mode 100644
index 0000000000..c14763e875
--- /dev/null
+++ b/extensions/cocostudio/loader/parsers/uiParser-1.x.js
@@ -0,0 +1,698 @@
+/****************************************************************************
+ Copyright (c) 2013-2014 Chukong Technologies Inc.
+
+ http://www.cocos2d-x.org
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+ ****************************************************************************/
+
+(function(load, baseParser){
+
+ var Parser = baseParser.extend({
+
+ addSpriteFrame: function(textures, resourcePath){
+ if(!textures) return;
+ for (var i = 0; i < textures.length; i++) {
+ cc.spriteFrameCache.addSpriteFrames(resourcePath + textures[i]);
+ }
+ },
+
+ pretreatment: function(json, resourcePath){
+ this.addSpriteFrame(json["textures"], resourcePath);
+ },
+
+ deferred: function(json, resourcePath, node, file){
+ if(node){
+ ccs.actionManager.initWithDictionary(file, json["animation"], node);
+ node.setContentSize(cc.size(json["designWidth"], json["designHeight"]));
+ }
+ }
+
+ });
+ var parser = new Parser();
+
+
+ parser.generalAttributes = function(widget, options){
+ var ignoreSizeExsit = options["ignoreSize"];
+ if(ignoreSizeExsit != null)
+ widget.ignoreContentAdaptWithSize(ignoreSizeExsit);
+
+ if (options["sizeType"])
+ {
+ widget.setSizeType(options["sizeType"]);
+ }
+
+ if (options["positionType"])
+ {
+ widget.setPositionType(options["positionType"]);
+ }
+
+ widget.setSizePercent(cc.p(options["sizePercentX"], options["sizePercentY"]));
+ widget.setPositionPercent(cc.p(options["positionPercentX"], options["positionPercentY"]));
+
+ /* adapt screen */
+ var w = 0, h = 0;
+ var adaptScreen = options["adaptScreen"];
+ if (adaptScreen) {
+ var screenSize = cc.director.getWinSize();
+ w = screenSize.width;
+ h = screenSize.height;
+ } else {
+ w = options["width"];
+ h = options["height"];
+ }
+ widget.setContentSize(w, h);
+
+ widget.setTag(options["tag"]);
+ widget.setActionTag(options["actiontag"]);
+ widget.setTouchEnabled(options["touchAble"]);
+ var name = options["name"];
+ var widgetName = name ? name : "default";
+ widget.setName(widgetName);
+
+ var x = options["x"];
+ var y = options["y"];
+ widget.setPosition(x, y);
+
+ var sx = options["scaleX"]!=null ? options["scaleX"] : 1;
+ widget.setScaleX(sx);
+
+ var sy = options["scaleY"]!=null ? options["scaleY"] : 1;
+ widget.setScaleY(sy);
+
+ var rt = options["rotation"] || 0;
+ widget.setRotation(rt);
+
+ var vb = options["visible"] || false;
+ if(vb != null)
+ widget.setVisible(vb);
+ widget.setLocalZOrder(options["ZOrder"]);
+
+ var layout = options["layoutParameter"];
+ if(layout != null){
+ var layoutParameterDic = options["layoutParameter"];
+ var paramType = layoutParameterDic["type"];
+ var parameter = null;
+
+ switch(paramType){
+ case 0:
+ break;
+ case 1:
+ parameter = new ccui.LinearLayoutParameter();
+ var gravity = layoutParameterDic["gravity"];
+ parameter.setGravity(gravity);
+ break;
+ case 2:
+ parameter = new ccui.RelativeLayoutParameter();
+ var rParameter = parameter;
+ var relativeName = layoutParameterDic["relativeName"];
+ rParameter.setRelativeName(relativeName);
+ var relativeToName = layoutParameterDic["relativeToName"];
+ rParameter.setRelativeToWidgetName(relativeToName);
+ var align = layoutParameterDic["align"];
+ rParameter.setAlign(align);
+ break;
+ default:
+ break;
+ }
+ if(parameter != null){
+ var mgl = layoutParameterDic["marginLeft"]||0;
+ var mgt = layoutParameterDic["marginTop"]||0;
+ var mgr = layoutParameterDic["marginRight"]||0;
+ var mgb = layoutParameterDic["marginDown"]||0;
+ parameter.setMargin(mgl, mgt, mgr, mgb);
+ widget.setLayoutParameter(parameter);
+ }
+ }
+ };
+
+ parser.colorAttributes = function(widget, options){
+ var op = options["opacity"];
+ if(op != null)
+ widget.setOpacity(op);
+ var colorR = options["colorR"];
+ var colorG = options["colorG"];
+ var colorB = options["colorB"];
+ widget.setColor(cc.color((colorR == null) ? 255 : colorR, (colorG == null) ? 255 : colorG, (colorB == null) ? 255 : colorB));
+
+ widget.setFlippedX(options["flipX"]);
+ widget.setFlippedY(options["flipY"]);
+ };
+
+ parser.anchorPointAttributes = function(widget, options){
+ var isAnchorPointXExists = options["anchorPointX"];
+ var anchorPointXInFile;
+ if (isAnchorPointXExists != null)
+ anchorPointXInFile = options["anchorPointX"];
+ else
+ anchorPointXInFile = widget.getAnchorPoint().x;
+
+ var isAnchorPointYExists = options["anchorPointY"];
+ var anchorPointYInFile;
+ if (isAnchorPointYExists != null)
+ anchorPointYInFile = options["anchorPointY"];
+ else
+ anchorPointYInFile = widget.getAnchorPoint().y;
+
+ if (isAnchorPointXExists != null || isAnchorPointYExists != null)
+ widget.setAnchorPoint(cc.p(anchorPointXInFile, anchorPointYInFile));
+ };
+
+ parser.parseChild = function(widget, options, resourcePath){
+ var children = options["children"];
+ for (var i = 0; i < children.length; i++) {
+ var child = this.parseNode(children[i], resourcePath);
+ if(child){
+ if(widget instanceof ccui.PageView)
+ widget.addPage(child);
+ else {
+ if(widget instanceof ccui.ListView){
+ widget.pushBackCustomItem(child);
+ } else {
+ if(!(widget instanceof ccui.Layout)) {
+ if(child.getPositionType() === ccui.Widget.POSITION_PERCENT) {
+ var position = child.getPositionPercent();
+ var anchor = widget.getAnchorPoint();
+ child.setPositionPercent(cc.p(position.x + anchor.x, position.y + anchor.y));
+ }
+ var AnchorPointIn = widget.getAnchorPointInPoints();
+ child.setPosition(cc.p(child.getPositionX() + AnchorPointIn.x, child.getPositionY() + AnchorPointIn.y));
+ }
+ widget.addChild(child);
+ }
+ }
+ }
+ }
+ };
+
+ var getPath = function(res, type, path, cb){
+ if(path){
+ if(type === 0)
+ cb(res + path, type);
+ else
+ cb(path, type);
+ }
+ };
+
+ /**
+ * Panel parser (UILayout)
+ */
+ parser.LayoutAttributes = function(widget, options, resourcePath){
+ var w = 0, h = 0;
+ var adaptScreen = options["adaptScreen"];
+ if (adaptScreen){
+ var screenSize = cc.director.getWinSize();
+ w = screenSize.width;
+ h = screenSize.height;
+ }else{
+ w = options["width"];
+ h = options["height"];
+ }
+ widget.setSize(cc.size(w, h));
+
+ widget.setClippingEnabled(options["clipAble"]);
+
+ var backGroundScale9Enable = options["backGroundScale9Enable"];
+ widget.setBackGroundImageScale9Enabled(backGroundScale9Enable);
+ var cr = options["bgColorR"];
+ var cg = options["bgColorG"];
+ var cb = options["bgColorB"];
+
+ var scr = options["bgStartColorR"];
+ var scg = options["bgStartColorG"];
+ var scb = options["bgStartColorB"];
+
+ var ecr = options["bgEndColorR"];
+ var ecg = options["bgEndColorG"];
+ var ecb = options["bgEndColorB"];
+
+ var bgcv1 = options["vectorX"];
+ var bgcv2 = options["vectorY"];
+ widget.setBackGroundColorVector(cc.p(bgcv1, bgcv2));
+
+ var co = options["bgColorOpacity"];
+
+ var colorType = options["colorType"];
+ widget.setBackGroundColorType(colorType/*ui.LayoutBackGroundColorType(colorType)*/);
+ widget.setBackGroundColor(cc.color(scr, scg, scb), cc.color(ecr, ecg, ecb));
+ widget.setBackGroundColor(cc.color(cr, cg, cb));
+ widget.setBackGroundColorOpacity(co);
+
+
+ var imageFileNameDic = options["backGroundImageData"];
+ if(imageFileNameDic){
+ getPath(resourcePath, imageFileNameDic["resourceType"], imageFileNameDic["path"], function(path, type){
+ widget.setBackGroundImage(path, type);
+ });
+ }
+
+ if (backGroundScale9Enable){
+ var cx = options["capInsetsX"];
+ var cy = options["capInsetsY"];
+ var cw = options["capInsetsWidth"];
+ var ch = options["capInsetsHeight"];
+ widget.setBackGroundImageCapInsets(cc.rect(cx, cy, cw, ch));
+ }
+ if (options["layoutType"])
+ {
+ widget.setLayoutType(options["layoutType"]);
+ }
+ };
+ /**
+ * Button parser (UIButton)
+ */
+ parser.ButtonAttributes = function(widget, options, resourcePath){
+ var button = widget;
+ var scale9Enable = options["scale9Enable"];
+ button.setScale9Enabled(scale9Enable);
+
+ var normalDic = options["normalData"];
+ getPath(resourcePath, normalDic["resourceType"], normalDic["path"], function(path, type){
+ button.loadTextureNormal(path, type);
+ });
+ var pressedDic = options["pressedData"];
+ getPath(resourcePath, pressedDic["resourceType"], pressedDic["path"], function(path, type){
+ button.loadTexturePressed(path, type);
+ });
+ var disabledDic = options["disabledData"];
+ getPath(resourcePath, disabledDic["resourceType"], disabledDic["path"], function(path, type){
+ button.loadTextureDisabled(path, type);
+ });
+ if (scale9Enable) {
+ var cx = options["capInsetsX"];
+ var cy = options["capInsetsY"];
+ var cw = options["capInsetsWidth"];
+ var ch = options["capInsetsHeight"];
+
+ button.setCapInsets(cc.rect(cx, cy, cw, ch));
+ var sw = options["scale9Width"];
+ var sh = options["scale9Height"];
+ if (sw != null && sh != null)
+ button.setSize(cc.size(sw, sh));
+ }
+ var text = options["text"];
+ if (text != null)
+ button.setTitleText(text);
+
+ var cr = options["textColorR"];
+ var cg = options["textColorG"];
+ var cb = options["textColorB"];
+ var cri = cr!==null?options["textColorR"]:255;
+ var cgi = cg!==null?options["textColorG"]:255;
+ var cbi = cb!==null?options["textColorB"]:255;
+
+ button.setTitleColor(cc.color(cri,cgi,cbi));
+ var fs = options["fontSize"];
+ if (fs != null)
+ button.setTitleFontSize(options["fontSize"]);
+ var fn = options["fontName"];
+ if (fn)
+ button.setTitleFontName(options["fontName"]);
+ };
+ /**
+ * CheckBox parser (UICheckBox)
+ */
+ parser.CheckBoxAttributes = function(widget, options, resourcePath){
+ //load background image
+ var backGroundDic = options["backGroundBoxData"];
+ getPath(resourcePath, backGroundDic["resourceType"], backGroundDic["path"], function(path, type){
+ widget.loadTextureBackGround(path, type);
+ });
+
+ //load background selected image
+ var backGroundSelectedDic = options["backGroundBoxSelectedData"];
+ getPath(
+ resourcePath,
+ backGroundSelectedDic["resourceType"] || backGroundDic["resourceType"],
+ backGroundSelectedDic["path"] || backGroundDic["path"],
+ function(path, type){
+ widget.loadTextureBackGroundSelected(path, type);
+ });
+
+ //load frontCross image
+ var frontCrossDic = options["frontCrossData"];
+ getPath(resourcePath, frontCrossDic["resourceType"], frontCrossDic["path"], function(path, type){
+ widget.loadTextureFrontCross(path, type);
+ });
+
+ //load backGroundBoxDisabledData
+ var backGroundDisabledDic = options["backGroundBoxDisabledData"];
+ getPath(
+ resourcePath,
+ backGroundDisabledDic["resourceType"] || frontCrossDic["resourceType"],
+ backGroundDisabledDic["path"] || frontCrossDic["path"],
+ function(path, type){
+ widget.loadTextureBackGroundDisabled(path, type);
+ });
+
+ ///load frontCrossDisabledData
+ var frontCrossDisabledDic = options["frontCrossDisabledData"];
+ getPath(resourcePath, frontCrossDisabledDic["resourceType"], frontCrossDisabledDic["path"], function(path, type){
+ widget.loadTextureFrontCrossDisabled(path, type);
+ });
+
+ if (options["selectedState"])
+ widget.setSelected(options["selectedState"]);
+ };
+ /**
+ * ImageView parser (UIImageView)
+ */
+ parser.ImageViewAttributes = function(widget, options, resourcePath){
+ var imageFileNameDic = options["fileNameData"]
+ getPath(resourcePath, imageFileNameDic["resourceType"], imageFileNameDic["path"], function(path, type){
+ widget.loadTexture(path, type);
+ });
+
+ var scale9EnableExist = options["scale9Enable"];
+ var scale9Enable = false;
+ if (scale9EnableExist){
+ scale9Enable = options["scale9Enable"];
+ }
+ widget.setScale9Enabled(scale9Enable);
+
+ if (scale9Enable){
+ var sw = options["scale9Width"];
+ var sh = options["scale9Height"];
+ if (sw && sh)
+ {
+ var swf = options["scale9Width"];
+ var shf = options["scale9Height"];
+ widget.setSize(cc.size(swf, shf));
+ }
+
+ var cx = options["capInsetsX"];
+ var cy = options["capInsetsY"];
+ var cw = options["capInsetsWidth"];
+ var ch = options["capInsetsHeight"];
+
+ widget.setCapInsets(cc.rect(cx, cy, cw, ch));
+
+ }
+ };
+ /**
+ * TextAtlas parser (UITextAtlas)
+ */
+ parser.TextAtlasAttributes = function(widget, options, resourcePath){
+ var sv = options["stringValue"];
+ var cmf = options["charMapFileData"]; // || options["charMapFile"];
+ var iw = options["itemWidth"];
+ var ih = options["itemHeight"];
+ var scm = options["startCharMap"];
+ if (sv != null && cmf && iw != null && ih != null && scm != null){
+ var cmftDic = options["charMapFileData"];
+ var cmfType = cmftDic["resourceType"];
+ switch (cmfType){
+ case 0:
+ var tp_c = resourcePath;
+ var cmfPath = cmftDic["path"];
+ var cmf_tp = tp_c + cmfPath;
+ widget.setProperty(sv, cmf_tp, iw, ih, scm);
+ break;
+ case 1:
+ cc.log("Wrong res type of LabelAtlas!");
+ break;
+ default:
+ break;
+ }
+ }
+ };
+ /**
+ * TextBMFont parser (UITextBMFont)
+ */
+ parser.TextBMFontAttributes = function(widget, options, resourcePath){
+ var cmftDic = options["fileNameData"];
+ var cmfType = cmftDic["resourceType"];
+ switch (cmfType) {
+ case 0:
+ var tp_c = resourcePath;
+ var cmfPath = cmftDic["path"];
+ var cmf_tp = tp_c + cmfPath;
+ widget.setFntFile(cmf_tp);
+ break;
+ case 1:
+ cc.log("Wrong res type of LabelAtlas!");
+ break;
+ default:
+ break;
+ }
+
+ var text = options["text"];
+ widget.setString(text);
+ };
+ /**
+ * Text parser (UIText)
+ */
+ var regTTF = /\.ttf$/;
+ parser.TextAttributes = function(widget, options, resourcePath){
+ var touchScaleChangeAble = options["touchScaleEnable"];
+ widget.setTouchScaleChangeEnabled(touchScaleChangeAble);
+ var text = options["text"];
+ widget.setString(text);
+ var fs = options["fontSize"];
+ if (fs != null){
+ widget.setFontSize(options["fontSize"]);
+ }
+ var fn = options["fontName"];
+ if (fn != null){
+ if(cc.sys.isNative){
+ if(regTTF.test(fn)){
+ widget.setFontName(cc.path.join(cc.loader.resPath, resourcePath, fn));
+ }else{
+ widget.setFontName(fn);
+ }
+ }else{
+ widget.setFontName(fn.replace(regTTF, ''));
+ }
+ }
+ var aw = options["areaWidth"];
+ var ah = options["areaHeight"];
+ if (aw != null && ah != null){
+ var size = cc.size(options["areaWidth"], options["areaHeight"]);
+ widget.setTextAreaSize(size);
+ }
+ var ha = options["hAlignment"];
+ if (ha != null){
+ widget.setTextHorizontalAlignment(options["hAlignment"]);
+ }
+ var va = options["vAlignment"];
+ if (va != null){
+ widget.setTextVerticalAlignment(options["vAlignment"]);
+ }
+ };
+ /**
+ * ListView parser (UIListView)
+ */
+ parser.ListViewAttributes = function(widget, options, resoutcePath){
+ parser.ScrollViewAttributes(widget, options,resoutcePath);
+ var direction = options["direction"];
+ widget.setDirection(direction);
+ var gravity = options["gravity"];
+ widget.setGravity(gravity);
+ var itemMargin = options["itemMargin"];
+ widget.setItemsMargin(itemMargin);
+ };
+ /**
+ * LoadingBar parser (UILoadingBar)
+ */
+ parser.LoadingBarAttributes = function(widget, options, resourcePath){
+ var imageFileNameDic = options["textureData"];
+ getPath(resourcePath, imageFileNameDic["resourceType"], imageFileNameDic["path"], function(path, type){
+ widget.loadTexture(path, type);
+ });
+
+ var scale9Enable = options["scale9Enable"];
+ widget.setScale9Enabled(scale9Enable);
+
+ if (scale9Enable){
+ var cx = options["capInsetsX"];
+ var cy = options["capInsetsY"];
+ var cw = options["capInsetsWidth"];
+ var ch = options["capInsetsHeight"];
+
+ widget.setCapInsets(cc.rect(cx, cy, cw, ch));
+
+ var width = options["width"];
+ var height = options["height"];
+ widget.setSize(cc.size(width, height));
+ }
+
+ widget.setDirection(options["direction"]);
+ widget.setPercent(options["percent"]);
+ };
+ /**
+ * PageView parser (UIPageView)
+ */
+ parser.PageViewAttributes = parser.LayoutAttributes;
+ /**
+ * ScrollView parser (UIScrollView)
+ */
+ parser.ScrollViewAttributes = function(widget, options, resoutcePath){
+ parser.LayoutAttributes(widget, options,resoutcePath);
+ var innerWidth = options["innerWidth"]!=null ? options["innerWidth"] : 200;
+ var innerHeight = options["innerHeight"]!=null ? options["innerHeight"] : 200;
+ widget.setInnerContainerSize(cc.size(innerWidth, innerHeight));
+
+ var direction = options["direction"]!=null ? options["direction"] : 1;
+ widget.setDirection(direction);
+ widget.setBounceEnabled(options["bounceEnable"]);
+ };
+ /**
+ * Slider parser (UISlider)
+ */
+ parser.SliderAttributes = function(widget, options, resourcePath){
+
+ var slider = widget;
+
+ var barTextureScale9Enable = options["scale9Enable"];
+ slider.setScale9Enabled(barTextureScale9Enable);
+ var bt = options["barFileName"];
+ var barLength = options["length"];
+
+ var imageFileNameDic = options["barFileNameData"];
+ var imageFileType = imageFileNameDic["resourceType"];
+ var imageFileName = imageFileNameDic["path"];
+
+ if(bt != null){
+ if(barTextureScale9Enable){
+ getPath(resourcePath, imageFileType, imageFileName, function(path, type){
+ slider.loadBarTexture(path, type);
+ });
+ slider.setSize(cc.size(barLength, slider.getContentSize().height));
+ }
+ }else{
+ getPath(resourcePath, imageFileType, imageFileName, function(path, type){
+ slider.loadBarTexture(path, type);
+ });
+ }
+
+ var normalDic = options["ballNormalData"];
+ getPath(resourcePath, normalDic["resourceType"], normalDic["path"], function(path, type){
+ slider.loadSlidBallTextureNormal(path, type);
+ });
+
+ var pressedDic = options["ballPressedData"];
+ getPath(
+ resourcePath,
+ pressedDic["resourceType"] || normalDic["resourceType"],
+ pressedDic["path"] || normalDic["path"],
+ function(path, type){
+ slider.loadSlidBallTexturePressed(path, type);
+ });
+
+ var disabledDic = options["ballDisabledData"];
+ getPath(resourcePath, disabledDic["resourceType"], disabledDic["path"], function(path, type){
+ slider.loadSlidBallTextureDisabled(path, type);
+ });
+
+ var progressBarDic = options["progressBarData"];
+ getPath(resourcePath, progressBarDic["resourceType"], progressBarDic["path"], function(path, type){
+ slider.loadProgressBarTexture(path, type);
+ });
+ };
+ /**
+ * TextField parser (UITextField)
+ */
+ parser.TextFieldAttributes = function(widget, options, resourcePath){
+ var ph = options["placeHolder"];
+ if(ph)
+ widget.setPlaceHolder(ph);
+ widget.setString(options["text"]||"");
+ var fs = options["fontSize1"];
+ if(fs)
+ widget.setFontSize(fs);
+ var fn = options["fontName"];
+ if (fn != null){
+ if(cc.sys.isNative){
+ if(regTTF.test(fn)){
+ widget.setFontName(cc.path.join(cc.loader.resPath, resourcePath, fn));
+ }else{
+ widget.setFontName(fn);
+ }
+ }else{
+ widget.setFontName(fn.replace(regTTF, ''));
+ }
+ }
+ var tsw = options["touchSizeWidth"];
+ var tsh = options["touchSizeHeight"];
+ if(tsw!=null && tsh!=null)
+ widget.setTouchSize(tsw, tsh);
+
+ var dw = options["width"];
+ var dh = options["height"];
+ if(dw > 0 || dh > 0){
+ //textField.setSize(cc.size(dw, dh));
+ }
+ var maxLengthEnable = options["maxLengthEnable"];
+ widget.setMaxLengthEnabled(maxLengthEnable);
+
+ if(maxLengthEnable){
+ var maxLength = options["maxLength"];
+ widget.setMaxLength(maxLength);
+ }
+ var passwordEnable = options["passwordEnable"];
+ widget.setPasswordEnabled(passwordEnable);
+ if(passwordEnable)
+ widget.setPasswordStyleText(options["passwordStyleText"]);
+
+ var aw = options["areaWidth"];
+ var ah = options["areaHeight"];
+ if(aw && ah){
+ var size = cc.size(aw, ah);
+ widget.setTextAreaSize(size);
+ }
+ var ha = options["hAlignment"];
+ if(ha)
+ widget.setTextHorizontalAlignment(ha);
+ var va = options["vAlignment"];
+ if(va)
+ widget.setTextVerticalAlignment(va);
+ };
+
+ var register = [
+ {name: "Panel", object: ccui.Layout, handle: parser.LayoutAttributes},
+ {name: "Button", object: ccui.Button, handle: parser.ButtonAttributes},
+ {name: "CheckBox", object: ccui.CheckBox, handle: parser.CheckBoxAttributes},
+ {name: "ImageView", object: ccui.ImageView, handle: parser.ImageViewAttributes},
+ {name: "LabelAtlas", object: ccui.TextAtlas, handle: parser.TextAtlasAttributes},
+ {name: "LabelBMFont", object: ccui.TextBMFont, handle: parser.TextBMFontAttributes},
+ {name: "Label", object: ccui.Text, handle: parser.TextAttributes},
+ {name: "ListView", object: ccui.ListView, handle: parser.ListViewAttributes},
+ {name: "LoadingBar", object: ccui.LoadingBar, handle: parser.LoadingBarAttributes},
+ {name: "PageView", object: ccui.PageView, handle: parser.PageViewAttributes},
+ {name: "ScrollView", object: ccui.ScrollView, handle: parser.ScrollViewAttributes},
+ {name: "Slider", object: ccui.Slider, handle: parser.SliderAttributes},
+ {name: "TextField", object: ccui.TextField, handle: parser.TextFieldAttributes}
+ ];
+
+ register.forEach(function(item){
+ parser.registerParser(item.name, function(options, resourcePath){
+ var widget = new item.object;
+ var uiOptions = options["options"];
+ parser.generalAttributes(widget, uiOptions);
+ item.handle(widget, uiOptions, resourcePath);
+ parser.colorAttributes(widget, uiOptions);
+ parser.anchorPointAttributes(widget, uiOptions);
+ parser.parseChild.call(this, widget, options, resourcePath);
+ return widget;
+ });
+ });
+
+ load.registerParser("ccui", "*", parser);
+
+})(ccs._load, ccs._parser);
\ No newline at end of file
diff --git a/extensions/cocostudio/reader/GUIReader.js b/extensions/cocostudio/reader/GUIReader.js
deleted file mode 100644
index 37e4847d48..0000000000
--- a/extensions/cocostudio/reader/GUIReader.js
+++ /dev/null
@@ -1,1594 +0,0 @@
-/****************************************************************************
- Copyright (c) 2010-2012 cocos2d-x.org
-
- http://www.cocos2d-x.org
-
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- THE SOFTWARE.
- ****************************************************************************/
-/**
- * @namespace Base object for ccs.uiReader
- */
-ccs.uiReader = /** @lends ccs.uiReader# */{
- _filePath: "",
- _olderVersion: false,
- _fileDesignSizes: {},
-
- /**
- * get version
- * @param {String} str
- * @returns {Number}
- */
- getVersionInteger: function (str) {
- if(!str)
- return 0;
- var strVersion = str;
- var versionLength = strVersion.length;
- if (versionLength < 7) {
- return 0;
- }
- var pos = strVersion.indexOf(".");
- var t = strVersion.substr(0, pos);
- strVersion = strVersion.substr(pos + 1, versionLength - 1);
-
- pos = strVersion.indexOf(".");
- var h = strVersion.substr(0, pos);
- strVersion = strVersion.substr(pos + 1, versionLength - 1);
-
- pos = strVersion.indexOf(".");
- var te = strVersion.substr(0, pos);
- strVersion = strVersion.substr(pos + 1, versionLength - 1);
-
- pos = strVersion.indexOf(".");
- var s;
- if (pos == -1) {
- s = strVersion;
- } else {
- s = strVersion.substr(0, pos);
- }
-
- var it = parseInt(t);
- var ih = parseInt(h);
- var ite = parseInt(te);
- var is = parseInt(s);
-
- var version = it * 1000 + ih * 100 + ite * 10 + is;
- return version;
- },
-
- /**
- * store file designSize
- * @param {String} fileName
- * @param {cc.Size} size
- */
- storeFileDesignSize: function (fileName, size) {
- this._fileDesignSizes[fileName] = size;
- },
-
- /**
- *
- * @param {String} fileName
- * @returns {cc.Size}
- */
- getFileDesignSize: function (fileName) {
- return this._fileDesignSizes[fileName];
- },
-
- /**
- * create uiWidget from a josn file that exported by cocostudio UI editor
- * @param {String} fileName
- * @returns {ccui.Widget}
- */
- widgetFromJsonFile: function (fileName) {
- var jsonDict = cc.loader.getRes(fileName);
- if(!jsonDict) throw "Please load the resource first : " + fileName;
-
- var tempFilePath = cc.path.dirname(fileName);
- this._filePath = tempFilePath == "" ? tempFilePath : tempFilePath + "/";
-
- var fileVersion = jsonDict["version"];
- var pReader, widget;
- var versionInteger = this.getVersionInteger(fileVersion);
- if (fileVersion) {
- if (versionInteger < 250) {
- pReader = new ccs.WidgetPropertiesReader0250();
- widget = pReader.createWidget(jsonDict, this._filePath, fileName);
- } else {
- pReader = new ccs.WidgetPropertiesReader0300();
- widget = pReader.createWidget(jsonDict, this._filePath, fileName);
- }
- } else {
- pReader = new ccs.WidgetPropertiesReader0250();
- widget = pReader.createWidget(jsonDict, this._filePath, fileName);
- }
-
- if (!fileVersion || versionInteger < 250) {
- this._olderVersion = true;
- }
- jsonDict = null;
- return widget;
- },
-
- /**
- * Clear data: Release all actions.
- */
- clear: function () {
- this._filePath = "";
- this._olderVersion = false;
- this._fileDesignSizes = {};
- }
-};
-
-
-ccs.WidgetPropertiesReader = ccs.Class.extend({
- _filePath: "",
- createWidget: function (jsonDict, fullPath, fileName) {
- },
- widgetFromJsonDictionary: function (data) {
- }
-});
-ccs.WidgetPropertiesReader0250 = ccs.WidgetPropertiesReader.extend({
- createWidget: function (jsonDict, fullPath, fileName) {
- this._filePath = fullPath == "" ? fullPath : cc.path.join(fullPath, "/");
- var textures = jsonDict["textures"];
- for (var i = 0; i < textures.length; i++) {
- var file = textures[i];
- var tp = fullPath;
- tp += file;
- cc.spriteFrameCache.addSpriteFrames(tp);
- }
- var fileDesignWidth = jsonDict["designWidth"];
- var fileDesignHeight = jsonDict["designHeight"];
- if (fileDesignWidth <= 0 || fileDesignHeight <= 0) {
- cc.log("Read design size error!");
- var winSize = cc.director.getWinSize();
- ccs.uiReader.storeFileDesignSize(fileName, winSize);
- }
- else {
- ccs.uiReader.storeFileDesignSize(fileName, cc.size(fileDesignWidth, fileDesignHeight));
- }
- var widgetTree = jsonDict["widgetTree"];
- var widget = this.widgetFromJsonDictionary(widgetTree);
-
- var size = widget.getContentSize();
- if (size.width == 0 && size.height == 0) {
- widget.setSize(cc.size(fileDesignWidth, fileDesignHeight));
- }
-
- var actions = jsonDict["animation"];
- var rootWidget = widget;
- ccs.actionManager.initWithDictionary(fileName, actions, rootWidget);
-
- widgetTree = null;
- actions = null;
- return widget;
- },
- widgetFromJsonDictionary: function (data) {
- var widget = null;
- var classname = data["classname"];
- var uiOptions = data["options"];
- if (classname == "Button") {
- widget = ccui.Button.create();
- this.setPropsForButtonFromJsonDictionary(widget, uiOptions);
- }
- else if (classname == "CheckBox") {
- widget = ccui.CheckBox.create();
- this.setPropsForCheckBoxFromJsonDictionary(widget, uiOptions);
- }
- else if (classname == "Label") {
- widget = ccui.Text.create();
- this.setPropsForLabelFromJsonDictionary(widget, uiOptions);
- }
- else if (classname == "LabelAtlas") {
- widget = ccui.TextAtlas.create();
- this.setPropsForLabelAtlasFromJsonDictionary(widget, uiOptions);
- }
- else if (classname == "LoadingBar") {
- widget = ccui.LoadingBar.create();
- this.setPropsForLoadingBarFromJsonDictionary(widget, uiOptions);
- } else if (classname == "ScrollView") {
- widget = ccui.ScrollView.create();
- this.setPropsForScrollViewFromJsonDictionary(widget, uiOptions);
- }
- else if (classname == "TextArea") {
- widget = ccui.Text.create();
- this.setPropsForLabelFromJsonDictionary(widget, uiOptions);
- }
- else if (classname == "TextButton") {
- widget = ccui.Button.create();
- this.setPropsForButtonFromJsonDictionary(widget, uiOptions);
- }
- else if (classname == "TextField") {
- widget = ccui.TextField.create();
- this.setPropsForTextFieldFromJsonDictionary(widget, uiOptions);
- }
- else if (classname == "ImageView") {
- widget = ccui.ImageView.create();
- this.setPropsForImageViewFromJsonDictionary(widget, uiOptions);
- }
- else if (classname == "Panel") {
- widget = ccui.Layout.create();
- this.setPropsForLayoutFromJsonDictionary(widget, uiOptions);
- }
- else if (classname == "Slider") {
- widget = ccui.Slider.create();
- this.setPropsForSliderFromJsonDictionary(widget, uiOptions);
- }
- else if (classname == "LabelBMFont") {
- widget = ccui.TextBMFont.create();
- this.setPropsForLabelBMFontFromJsonDictionary(widget, uiOptions);
- }
- else if (classname == "DragPanel") {
- widget = ccui.ScrollView.create();
- this.setPropsForScrollViewFromJsonDictionary(widget, uiOptions);
- }
- var children = data["children"];
- for (var i = 0; i < children.length; i++) {
- var subData = children[i];
- var child = this.widgetFromJsonDictionary(subData);
- if (child) {
- widget.addChild(child);
- }
- subData = null;
- }
-
- uiOptions = null;
- return widget;
- },
-
-
- setPropsForWidgetFromJsonDictionary: function (widget, options) {
- if (options["ignoreSize"] !== undefined) {
- widget.ignoreContentAdaptWithSize(options["ignoreSize"]);
- }
-
- var w = options["width"];
- var h = options["height"];
- widget.setSize(cc.size(w, h));
-
- widget.setTag(options["tag"]);
- widget.setActionTag(options["actiontag"]);
- widget.setTouchEnabled(options["touchAble"]);
- var name = options["name"];
- var widgetName = name ? name : "default";
- widget.setName(widgetName);
- var x = options["x"];
- var y = options["y"];
- widget.setPosition(x, y);
- if (options["scaleX"] !== undefined) {
- widget.setScaleX(options["scaleX"]);
- }
- if (options["scaleY"] !== undefined) {
- widget.setScaleY(options["scaleY"]);
- }
- if (options["rotation"] !== undefined) {
- widget.setRotation(options["rotation"]);
- }
- if (options["visible"] !== undefined) {
- widget.setVisible(options["visible"]);
- }
-
- var z = options["ZOrder"];
- widget.setLocalZOrder(z);
- },
-
- setColorPropsForWidgetFromJsonDictionary: function (widget, options) {
- if (options["opacity"] !== undefined) {
- widget.setOpacity(options["opacity"]);
- }
- var colorR = options["colorR"] !== undefined ? options["colorR"] : 255;
- var colorG = options["colorG"] !== undefined ? options["colorG"] : 255;
- var colorB = options["colorB"] !== undefined ? options["colorB"] : 255;
- widget.setColor(cc.color(colorR, colorG, colorB));
- var apx = options["anchorPointX"] !== undefined ? options["anchorPointX"] : ((widget.getWidgetType() == ccui.Widget.TYPE_WIDGET) ? 0.5 : 0);
- var apy = options["anchorPointY"] !== undefined ? options["anchorPointY"] : ((widget.getWidgetType() == ccui.Widget.TYPE_WIDGET) ? 0.5 : 0);
- widget.setAnchorPoint(apx, apy);
- var flipX = options["flipX"];
- var flipY = options["flipY"];
- widget.setFlippedX(flipX);
- widget.setFlippedY(flipY);
- },
-
- setPropsForButtonFromJsonDictionary: function (widget, options) {
- this.setPropsForWidgetFromJsonDictionary(widget, options);
- var button = widget;
- var scale9Enable = options["scale9Enable"];
- button.setScale9Enabled(scale9Enable);
-
- var normalFileName = options["normal"];
- var pressedFileName = options["pressed"];
- var disabledFileName = options["disabled"];
-
- var normalFileName_tp = normalFileName ? this._filePath + normalFileName : null;
- var pressedFileName_tp = pressedFileName ? this._filePath + pressedFileName : null;
- var disabledFileName_tp = disabledFileName ? this._filePath + disabledFileName : null;
- var useMergedTexture = options["useMergedTexture"];
- if (scale9Enable) {
- var cx = options["capInsetsX"];
- var cy = options["capInsetsY"];
- var cw = options["capInsetsWidth"];
- var ch = options["capInsetsHeight"];
-
- if (useMergedTexture) {
- button.loadTextures(normalFileName, pressedFileName, disabledFileName, ccui.Widget.PLIST_TEXTURE);
- }
- else {
- button.loadTextures(normalFileName_tp, pressedFileName_tp, disabledFileName_tp);
- }
- //button.setCapInsets(cc.rect(cx, cy, cw, ch));
- if (options["scale9Width"] !== undefined && options["scale9Height"] !== undefined) {
- var swf = options["scale9Width"];
- var shf = options["scale9Height"];
- button.setSize(cc.size(swf, shf));
- }
- }
- else {
- if (useMergedTexture) {
- button.loadTextures(normalFileName, pressedFileName, disabledFileName, ccui.Widget.PLIST_TEXTURE);
- }
- else {
- button.loadTextures(normalFileName_tp, pressedFileName_tp, disabledFileName_tp);
- }
- }
- if (options["text"] !== undefined) {
- var text = options["text"] || "";
- if (text)
- button.setTitleText(text);
- }
- if (options["fontSize"] !== undefined) {
- button.setTitleFontSize(options["fontSize"]);
- }
- if (options["fontName"] !== undefined) {
- button.setTitleFontName(options["fontName"]);
- }
- var cr = options["textColorR"] !== undefined ? options["textColorR"] : 255;
- var cg = options["textColorG"] !== undefined ? options["textColorG"] : 255;
- var cb = options["textColorB"] !== undefined ? options["textColorB"] : 255;
- var tc = cc.color(cr, cg, cb);
- button.setTitleColor(tc);
- this.setColorPropsForWidgetFromJsonDictionary(widget, options);
- },
-
- setPropsForCheckBoxFromJsonDictionary: function (widget, options) {
- this.setPropsForWidgetFromJsonDictionary(widget, options);
- var checkBox = widget;
- var backGroundFileName = options["backGroundBox"];
- var backGroundSelectedFileName = options["backGroundBoxSelected"];
- var frontCrossFileName = options["frontCross"];
- var backGroundDisabledFileName = options["backGroundBoxDisabled"];
- var frontCrossDisabledFileName = options["frontCrossDisabled"];
-
- var locFilePath = this._filePath;
-
- var backGroundFileName_tp = backGroundFileName ? locFilePath + backGroundFileName : null;
- var backGroundSelectedFileName_tp = backGroundSelectedFileName ? locFilePath + backGroundSelectedFileName : null;
- var frontCrossFileName_tp = frontCrossFileName ? locFilePath + frontCrossFileName : null;
- var backGroundDisabledFileName_tp = backGroundDisabledFileName ? locFilePath + backGroundDisabledFileName : null;
- var frontCrossDisabledFileName_tp = frontCrossDisabledFileName ? locFilePath + frontCrossDisabledFileName : null;
- var useMergedTexture = options["useMergedTexture"];
-
- if (useMergedTexture) {
- checkBox.loadTextures(backGroundFileName, backGroundSelectedFileName, frontCrossFileName, backGroundDisabledFileName, frontCrossDisabledFileName, ccui.Widget.PLIST_TEXTURE);
- }
- else {
- checkBox.loadTextures(backGroundFileName_tp, backGroundSelectedFileName_tp, frontCrossFileName_tp, backGroundDisabledFileName_tp, frontCrossDisabledFileName_tp);
- }
-
- checkBox.setSelectedState(options["selectedState"] || false);
- this.setColorPropsForWidgetFromJsonDictionary(widget, options);
- },
-
- setPropsForImageViewFromJsonDictionary: function (widget, options) {
- this.setPropsForWidgetFromJsonDictionary(widget, options);
-
- var imageView = widget;
- var imageFileName = options["fileName"];
- var scale9Enable = options["scale9Enable"] || false;
- imageView.setScale9Enabled(scale9Enable);
-
- var tp_i = this._filePath;
- var imageFileName_tp = null;
- if (imageFileName) {
- imageFileName_tp = tp_i + imageFileName;
- }
-
- var useMergedTexture = options["useMergedTexture"];
- if (scale9Enable) {
- if (useMergedTexture) {
- imageView.loadTexture(imageFileName, ccui.Widget.PLIST_TEXTURE);
- }
- else {
- imageView.loadTexture(imageFileName_tp);
- }
-
- if (options["scale9Width"] !== undefined && options["scale9Height"] !== undefined) {
- var swf = options["scale9Width"];
- var shf = options["scale9Height"];
- imageView.setSize(cc.size(swf, shf));
- }
-
- var cx = options["capInsetsX"];
- var cy = options["capInsetsY"];
- var cw = options["capInsetsWidth"];
- var ch = options["capInsetsHeight"];
- imageView.setCapInsets(cc.rect(cx, cy, cw, ch));
-
- }
- else {
- if (useMergedTexture) {
- imageView.loadTexture(imageFileName, ccui.Widget.PLIST_TEXTURE);
- }
- else {
- imageView.loadTexture(imageFileName_tp);
- }
- }
- this.setColorPropsForWidgetFromJsonDictionary(widget, options);
- },
-
- setPropsForLabelFromJsonDictionary: function (widget, options) {
- this.setPropsForWidgetFromJsonDictionary(widget, options);
- var label = widget;
- var touchScaleChangeAble = options["touchScaleEnable"];
- label.setTouchScaleChangeEnabled(touchScaleChangeAble);
- var text = options["text"];
- label.setText(text);
- if (options["fontSize"] !== undefined) {
- label.setFontSize(options["fontSize"]);
- }
- if (options["fontName"] !== undefined) {
- label.setFontName(options["fontName"]);
- }
- if (options["areaWidth"] !== undefined && options["areaHeight"] !== undefined) {
- var size = cc.size(options["areaWidth"], options["areaHeight"]);
- label.setTextAreaSize(size);
- }
- if (options["hAlignment"]) {
- label.setTextHorizontalAlignment(options["hAlignment"]);
- }
- if (options["vAlignment"]) {
- label.setTextVerticalAlignment(options["vAlignment"]);
- }
- this.setColorPropsForWidgetFromJsonDictionary(widget, options);
- },
-
- setPropsForLabelAtlasFromJsonDictionary: function (widget, options) {
- this.setPropsForWidgetFromJsonDictionary(widget, options);
- var labelAtlas = widget;
- var sv = (options["stringValue"] !== undefined);
- var cmf = (options["charMapFile"] !== undefined);
- var iw = (options["itemWidth"] !== undefined);
- var ih = (options["itemHeight"] !== undefined);
- var scm = (options["startCharMap"] !== undefined);
- if (sv && cmf && iw && ih && scm && options["charMapFile"]) {
- var cmft = options["charMapFile"];
- var cmf_tp = this._filePath + cmft;
-
- labelAtlas.setProperty(options["stringValue"], cmf_tp, options["itemWidth"], options["itemHeight"], options["startCharMap"]);
- }
- this.setColorPropsForWidgetFromJsonDictionary(widget, options);
- },
-
- setPropsForLayoutFromJsonDictionary: function (widget, options) {
- this.setPropsForWidgetFromJsonDictionary(widget, options);
- var containerWidget = widget;
- if (!(containerWidget instanceof ccui.ScrollView) && !(containerWidget instanceof ccui.ListView)) {
- containerWidget.setClippingEnabled(options["clipAble"]);
- }
- var panel = widget;
- var backGroundScale9Enable = options["backGroundScale9Enable"];
- panel.setBackGroundImageScale9Enabled(backGroundScale9Enable);
- var cr = options["bgColorR"];
- var cg = options["bgColorG"];
- var cb = options["bgColorB"];
-
- var scr = options["bgStartColorR"];
- var scg = options["bgStartColorG"];
- var scb = options["bgStartColorB"];
-
- var ecr = options["bgEndColorR"];
- var ecg = options["bgEndColorG"];
- var ecb = options["bgEndColorB"];
-
- var bgcv1 = options["vectorX"];
- var bgcv2 = options["vectorY"];
- panel.setBackGroundColorVector(cc.p(bgcv1, bgcv2));
-
- var co = options["bgColorOpacity"];
-
- var colorType = options["colorType"];
- panel.setBackGroundColorType(colorType);
- panel.setBackGroundColor(cc.color(scr, scg, scb), cc.color(ecr, ecg, ecb));
- panel.setBackGroundColor(cc.color(cr, cg, cb));
- panel.setBackGroundColorOpacity(co);
-
- var imageFileName = options["backGroundImage"];
- var imageFileName_tp = imageFileName ? this._filePath + imageFileName : null;
- var useMergedTexture = options["useMergedTexture"];
- if (useMergedTexture) {
- panel.setBackGroundImage(imageFileName, ccui.Widget.PLIST_TEXTURE);
- }
- else {
- panel.setBackGroundImage(imageFileName_tp);
- }
- if (backGroundScale9Enable) {
- var cx = options["capInsetsX"];
- var cy = options["capInsetsY"];
- var cw = options["capInsetsWidth"];
- var ch = options["capInsetsHeight"];
- panel.setBackGroundImageCapInsets(cc.rect(cx, cy, cw, ch));
- }
- this.setColorPropsForWidgetFromJsonDictionary(widget, options);
- },
-
-
- setPropsForScrollViewFromJsonDictionary: function (widget, options) {
- this.setPropsForLayoutFromJsonDictionary(widget, options);
- var scrollView = widget;
- var innerWidth = options["innerWidth"];
- var innerHeight = options["innerHeight"];
- scrollView.setInnerContainerSize(cc.size(innerWidth, innerHeight));
- var direction = options["direction"];
- scrollView.setDirection(direction);
- scrollView.setBounceEnabled(options["bounceEnable"]);
- this.setColorPropsForWidgetFromJsonDictionary(widget, options);
- },
-
- setPropsForContainerWidgetFromJsonDictionary: function (widget, options) {
- this.setPropsForWidgetFromJsonDictionary(widget, options);
- var containerWidget = widget;
- if (containerWidget instanceof ccui.ScrollView ||
- containerWidget instanceof ccui.ListView) {
- containerWidget.setClippingEnabled(options["clipAble"]);
- }
- this.setColorPropsForWidgetFromJsonDictionary(widget, options);
- },
-
- setPropsForSliderFromJsonDictionary: function (widget, options) {
-
- this.setPropsForWidgetFromJsonDictionary(widget, options);
- var slider = widget;
-
- var barTextureScale9Enable = options["barTextureScale9Enable"] || false;
- slider.setScale9Enabled(barTextureScale9Enable);
- var barLength = options["length"];
- var useMergedTexture = options["useMergedTexture"];
- var bt = (options["barFileName"] !== undefined);
- if (bt) {
- if (barTextureScale9Enable) {
- var imageFileName = options["barFileName"];
- var imageFileName_tp = imageFileName ? this._filePath + imageFileName : null;
- if (useMergedTexture) {
- slider.loadBarTexture(imageFileName, ccui.Widget.PLIST_TEXTURE);
- }
- else {
- slider.loadBarTexture(imageFileName_tp);
- }
- slider.setSize(cc.size(barLength, slider.getContentSize().height));
- }
- else {
- var imageFileName = options["barFileName"];
- var imageFileName_tp = imageFileName ? this._filePath + imageFileName : null;
- if (useMergedTexture) {
- slider.loadBarTexture(imageFileName, ccui.Widget.PLIST_TEXTURE);
- }
- else {
- slider.loadBarTexture(imageFileName_tp);
- }
- }
- }
-
- var normalFileName = options["ballNormal"];
- var pressedFileName = options["ballPressed"];
- var disabledFileName = options["ballDisabled"];
-
- var normalFileName_tp = normalFileName ? this._filePath + normalFileName : null;
- var pressedFileName_tp = pressedFileName ? this._filePath + pressedFileName : null;
- var disabledFileName_tp = disabledFileName ? this._filePath + disabledFileName : null;
- if (useMergedTexture) {
- slider.loadSlidBallTextures(normalFileName, pressedFileName, disabledFileName, ccui.Widget.PLIST_TEXTURE);
- }
- else {
- slider.loadSlidBallTextures(normalFileName_tp, pressedFileName_tp, disabledFileName_tp);
- }
- slider.setPercent(options["percent"]);
-
- var imageFileName = options["progressBarFileName"];
- var imageFileName_tp = imageFileName ? this._filePath + imageFileName : null;
- if (useMergedTexture) {
- slider.loadProgressBarTexture(imageFileName, ccui.Widget.PLIST_TEXTURE);
- }
- else {
- slider.loadProgressBarTexture(imageFileName_tp);
- }
- this.setColorPropsForWidgetFromJsonDictionary(widget, options);
- },
-
- setPropsForTextAreaFromJsonDictionary: function (widget, options) {
- this.setPropsForWidgetFromJsonDictionary(widget, options);
- var textArea = widget;
- textArea.setText(options["text"]);
- if (options["fontSize"] !== undefined) {
- textArea.setFontSize(options["fontSize"]);
- }
- var cr = options["colorR"]
- var cg = options["colorG"];
- var cb = options["colorB"];
- textArea.setColor(cc.color(cr, cg, cb));
- textArea.setFontName(options["fontName"]);
- if (options["areaWidth"] !== undefined && options["areaHeight"] !== undefined) {
- var size = cc.size(options["areaWidth"], options["areaHeight"]);
- textArea.setTextAreaSize(size);
- }
- if (options["hAlignment"]) {
- textArea.setTextHorizontalAlignment(options["hAlignment"]);
- }
- if (options["vAlignment"]) {
- textArea.setTextVerticalAlignment(options["vAlignment"]);
- }
- this.setColorPropsForWidgetFromJsonDictionary(widget, options);
- },
-
- setPropsForTextButtonFromJsonDictionary: function (widget, options) {
- this.setPropsForButtonFromJsonDictionary(widget, options);
-
- var textButton = widget;
- textButton.setTitleText(options["text"] || "");
- var cri = options["textColorR"] !== undefined ? options["textColorR"] : 255;
- var cgi = options["textColorG"] !== undefined ? options["textColorG"] : 255;
- var cbi = options["textColorB"] !== undefined ? options["textColorB"] : 255;
- textButton.setTitleColor(cc.color(cri, cgi, cbi));
- if (options["fontSize"] !== undefined) {
- textButton.setTitleFontSize(options["fontSize"]);
- }
- if (options["fontName"] !== undefined) {
- textButton.setTitleFontName(options["fontName"]);
- }
- this.setColorPropsForWidgetFromJsonDictionary(widget, options);
- },
-
- setPropsForTextFieldFromJsonDictionary: function (widget, options) {
- this.setPropsForWidgetFromJsonDictionary(widget, options);
- var textField = widget;
- if (options["placeHolder"] !== undefined) {
- textField.setPlaceHolder(options["placeHolder"]);
- }
- textField.setText(options["text"]);
- if (options["fontSize"] !== undefined) {
- textField.setFontSize(options["fontSize"]);
- }
- if (options["fontName"] !== undefined) {
- textField.setFontName(options["fontName"]);
- }
- if (options["touchSizeWidth"] !== undefined && options["touchSizeHeight"] !== undefined) {
- textField.setTouchSize(cc.size(options["touchSizeWidth"], options["touchSizeHeight"]));
- }
-
- var dw = options["width"];
- var dh = options["height"];
- if (dw > 0.0 || dh > 0.0) {
- //textField.setSize(CCSizeMake(dw, dh));
- }
- var maxLengthEnable = options["maxLengthEnable"];
- textField.setMaxLengthEnabled(maxLengthEnable);
-
- if (maxLengthEnable) {
- var maxLength = options["maxLength"];
- textField.setMaxLength(maxLength);
- }
- var passwordEnable = options["passwordEnable"];
- textField.setPasswordEnabled(passwordEnable);
- if (passwordEnable) {
- textField.setPasswordStyleText(options["passwordStyleText"]);
- }
- this.setColorPropsForWidgetFromJsonDictionary(widget, options);
- },
-
- setPropsForLoadingBarFromJsonDictionary: function (widget, options) {
-
- this.setPropsForWidgetFromJsonDictionary(widget, options);
- var loadingBar = widget;
- var useMergedTexture = options["useMergedTexture"];
- var imageFileName = options["texture"];
- var imageFileName_tp = imageFileName ? this._filePath + imageFileName : null;
- if (useMergedTexture) {
- loadingBar.loadTexture(imageFileName, ccui.Widget.PLIST_TEXTURE);
- }
- else {
- loadingBar.loadTexture(imageFileName_tp);
- }
- loadingBar.setDirection(options["direction"]);
- loadingBar.setPercent(options["percent"]);
- this.setColorPropsForWidgetFromJsonDictionary(widget, options);
- },
-
- setPropsForListViewFromJsonDictionary: function (widget, options) {
- this.setPropsForLayoutFromJsonDictionary(widget, options);
- },
-
- setPropsForPageViewFromJsonDictionary: function (widget, options) {
- this.setPropsForLayoutFromJsonDictionary(widget, options);
- },
-
- setPropsForLabelBMFontFromJsonDictionary: function (widget, options) {
- this.setPropsForWidgetFromJsonDictionary(widget, options);
- var labelBMFont = widget;
- var cmft = options["fileName"];
- var cmf_tp = this._filePath + cmft;
- labelBMFont.setFntFile(cmf_tp);
- var text = options["text"];
- labelBMFont.setText(text);
- this.setColorPropsForWidgetFromJsonDictionary(widget, options);
- }
-});
-
-ccs.WidgetPropertiesReader0300 = ccs.WidgetPropertiesReader.extend({
- createWidget: function (jsonDict, fullPath, fileName) {
- this._filePath = fullPath == "" ? fullPath : cc.path.join(fullPath, "/");
- var textures = jsonDict["textures"];
- for (var i = 0; i < textures.length; i++) {
- var file = textures[i];
- var tp = fullPath;
- tp += file;
- cc.spriteFrameCache.addSpriteFrames(tp);
- }
- var fileDesignWidth = jsonDict["designWidth"];
- var fileDesignHeight = jsonDict["designHeight"];
- if (fileDesignWidth <= 0 || fileDesignHeight <= 0) {
- cc.log("Read design size error!");
- var winSize = cc.director.getWinSize();
- ccs.uiReader.storeFileDesignSize(fileName, winSize);
- }
- else {
- ccs.uiReader.storeFileDesignSize(fileName, cc.size(fileDesignWidth, fileDesignHeight));
- }
- var widgetTree = jsonDict["widgetTree"];
- var widget = this.widgetFromJsonDictionary(widgetTree);
-
- var size = widget.getContentSize();
- if (size.width == 0 && size.height == 0) {
- widget.setSize(cc.size(fileDesignWidth, fileDesignHeight));
- }
-
- var actions = jsonDict["animation"];
- var rootWidget = widget;
- ccs.actionManager.initWithDictionary(fileName, actions, rootWidget);
-
- widgetTree = null;
- actions = null;
- return widget;
- },
- widgetFromJsonDictionary: function (data) {
- var widget = null;
- var classname = data["classname"];
- var uiOptions = data["options"];
- if (classname == "Button") {
- widget = ccui.Button.create();
- this.setPropsForButtonFromJsonDictionary(widget, uiOptions);
- }
- else if (classname == "CheckBox") {
- widget = ccui.CheckBox.create();
- this.setPropsForCheckBoxFromJsonDictionary(widget, uiOptions);
- }
- else if (classname == "Label") {
- widget = ccui.Text.create();
- this.setPropsForLabelFromJsonDictionary(widget, uiOptions);
- }
- else if (classname == "LabelAtlas") {
- widget = ccui.TextAtlas.create();
- this.setPropsForLabelAtlasFromJsonDictionary(widget, uiOptions);
- }
- else if (classname == "LoadingBar") {
- widget = ccui.LoadingBar.create();
- this.setPropsForLoadingBarFromJsonDictionary(widget, uiOptions);
- } else if (classname == "ScrollView") {
- widget = ccui.ScrollView.create();
- this.setPropsForScrollViewFromJsonDictionary(widget, uiOptions);
- }
- else if (classname == "TextArea") {
- widget = ccui.Text.create();
- this.setPropsForLabelFromJsonDictionary(widget, uiOptions);
- }
- else if (classname == "TextButton") {
- widget = ccui.Button.create();
- this.setPropsForButtonFromJsonDictionary(widget, uiOptions);
- }
- else if (classname == "TextField") {
- widget = ccui.TextField.create();
- this.setPropsForTextFieldFromJsonDictionary(widget, uiOptions);
- }
- else if (classname == "ImageView") {
- widget = ccui.ImageView.create();
- this.setPropsForImageViewFromJsonDictionary(widget, uiOptions);
- }
- else if (classname == "Panel") {
- widget = ccui.Layout.create();
- this.setPropsForLayoutFromJsonDictionary(widget, uiOptions);
- }
- else if (classname == "Slider") {
- widget = ccui.Slider.create();
- this.setPropsForSliderFromJsonDictionary(widget, uiOptions);
- }
- else if (classname == "LabelBMFont") {
- widget = ccui.TextBMFont.create();
- this.setPropsForLabelBMFontFromJsonDictionary(widget, uiOptions);
- }
- else if (classname == "DragPanel") {
- widget = ccui.ScrollView.create();
- this.setPropsForScrollViewFromJsonDictionary(widget, uiOptions);
- }
- else if (classname == "ListView") {
- widget = ccui.ListView.create();
- this.setPropsForListViewFromJsonDictionary(widget, uiOptions);
- }
- else if (classname == "PageView") {
- widget = ccui.PageView.create();
- this.setPropsForPageViewFromJsonDictionary(widget, uiOptions);
- }
- var children = data["children"];
- for (var i = 0; i < children.length; i++) {
- var subData = children[i];
- var child = this.widgetFromJsonDictionary(subData);
- if (child) {
- if (widget instanceof ccui.PageView && child instanceof ccui.Layout) {
- widget.addPage(child);
- } else if (widget instanceof ccui.ListView) {
- widget.pushBackCustomItem(child);
- } else {
- widget.addChild(child);
- }
- }
- subData = null;
- }
-
- uiOptions = null;
- return widget;
- },
-
-
- setPropsForWidgetFromJsonDictionary: function (widget, options) {
- var name = options["name"];
- var widgetName = name ? name : "default";
- widget.setName(widgetName);
-
- if (options["ignoreSize"] !== undefined) {
- widget.ignoreContentAdaptWithSize(options["ignoreSize"]);
- }
- widget.setSizeType(options["sizeType"]);
- widget.setPositionType(options["positionType"]);
-
- widget.setSizePercent(cc.p(options["sizePercentX"], options["sizePercentY"]));
- widget.setPositionPercent(cc.p(options["positionPercentX"], options["positionPercentY"]));
-
- var w = options["width"];
- var h = options["height"];
- widget.setSize(cc.size(w, h));
-
- widget.setTag(options["tag"]);
- widget.setActionTag(options["actiontag"]);
- widget.setTouchEnabled(options["touchAble"]);
-
- var x = options["x"];
- var y = options["y"];
- widget.setPosition(x, y);
- if (options["scaleX"] !== undefined) {
- widget.setScaleX(options["scaleX"]);
- }
- if (options["scaleY"] !== undefined) {
- widget.setScaleY(options["scaleY"]);
- }
- if (options["rotation"] !== undefined) {
- widget.setRotation(options["rotation"]);
- }
- if (options["visible"] !== undefined) {
- widget.setVisible(options["visible"]);
- }
-
- widget.setLocalZOrder(options["ZOrder"]);
- var layoutParameterDic = options["layoutParameter"];
- if (layoutParameterDic) {
- var paramType = layoutParameterDic["type"];
- var parameter;
- switch (paramType) {
- case 0:
- break;
- case 1:
- parameter = ccui.LinearLayoutParameter.create();
- var gravity = layoutParameterDic["gravity"];
- parameter.setGravity(gravity);
- break;
- case 2:
- parameter = ccui.RelativeLayoutParameter.create();
- var relativeName = layoutParameterDic["relativeName"];
- parameter.setRelativeName(relativeName);
- var relativeToName = layoutParameterDic["relativeToName"];
- parameter.setRelativeToWidgetName(relativeToName);
- parameter.setAlign(layoutParameterDic["align"]);
- break;
- default:
- break;
- }
- var mgl = layoutParameterDic["marginLeft"];
- var mgt = layoutParameterDic["marginTop"];
- var mgr = layoutParameterDic["marginRight"];
- var mgb = layoutParameterDic["marginDown"];
- parameter.setMargin(new ccui.Margin(mgl, mgt, mgr, mgb));
- widget.setLayoutParameter(parameter);
- }
- },
-
- setColorPropsForWidgetFromJsonDictionary: function (widget, options) {
- if (options["opacity"] !== undefined) {
- widget.setOpacity(options["opacity"]);
- }
- var colorR = options["colorR"] !== undefined ? options["colorR"] : 255;
- var colorG = options["colorG"] !== undefined ? options["colorG"] : 255;
- var colorB = options["colorB"] !== undefined ? options["colorB"] : 255;
- widget.setColor(cc.color(colorR, colorG, colorB));
- var apx = options["anchorPointX"] !== undefined ? options["anchorPointX"] : ((widget.getWidgetType() == ccui.Widget.TYPE_WIDGET) ? 0.5 : 0);
- var apy = options["anchorPointY"] !== undefined ? options["anchorPointY"] : ((widget.getWidgetType() == ccui.Widget.TYPE_WIDGET) ? 0.5 : 0);
- widget.setAnchorPoint(apx, apy);
- var flipX = options["flipX"];
- var flipY = options["flipY"];
- widget.setFlippedX(flipX);
- widget.setFlippedY(flipY);
- },
-
- setPropsForButtonFromJsonDictionary: function (widget, options) {
-
-
- this.setPropsForWidgetFromJsonDictionary(widget, options);
- var button = widget;
- var scale9Enable = options["scale9Enable"];
- button.setScale9Enabled(scale9Enable);
-
- var normalDic = options["normalData"];
- var normalType = normalDic["resourceType"];
- switch (normalType) {
- case 0:
- var normalFileName = normalDic["path"];
- var normalFileName_tp = normalFileName ? this._filePath + normalFileName : null;
- button.loadTextureNormal(normalFileName_tp);
- break;
- case 1:
- var normalFileName = normalDic["path"];
- button.loadTextureNormal(normalFileName, ccui.Widget.PLIST_TEXTURE);
- break;
- default:
- break;
- }
- normalDic = null;
- var pressedDic = options["pressedData"];
- var pressedType = pressedDic["resourceType"];
- switch (pressedType) {
- case 0:
- var pressedFileName = pressedDic["path"];
- var pressedFileName_tp = pressedFileName ? this._filePath + pressedFileName : null;
- button.loadTexturePressed(pressedFileName_tp);
- break;
- case 1:
- var pressedFileName = pressedDic["path"];
- button.loadTexturePressed(pressedFileName, ccui.Widget.PLIST_TEXTURE);
- break;
- default:
- break;
- }
- pressedDic = null;
- var disabledDic = options["disabledData"];
- var disabledType = disabledDic["resourceType"];
- switch (disabledType) {
- case 0:
- var disabledFileName = disabledDic["path"];
- var disabledFileName_tp = disabledFileName ? this._filePath + disabledFileName : null;
- button.loadTextureDisabled(disabledFileName_tp);
- break;
- case 1:
- var disabledFileName = disabledDic["path"];
- button.loadTextureDisabled(disabledFileName, ccui.Widget.PLIST_TEXTURE);
- break;
- default:
- break;
- }
- disabledDic = null;
- if (scale9Enable) {
- var cx = options["capInsetsX"];
- var cy = options["capInsetsY"];
- var cw = options["capInsetsWidth"];
- var ch = options["capInsetsHeight"];
-
- button.setCapInsets(cc.rect(cx, cy, cw, ch));
- if (options["scale9Width"] !== undefined && options["scale9Height"] !== undefined) {
- var swf = options["scale9Width"];
- var shf = options["scale9Height"];
- button.setSize(cc.size(swf, shf));
- }
- }
- if (options["text"] !== undefined) {
- var text = options["text"] || "";
- if (text)
- button.setTitleText(text);
- }
- if (options["fontSize"] !== undefined) {
- button.setTitleFontSize(options["fontSize"]);
- }
- if (options["fontName"] !== undefined) {
- button.setTitleFontName(options["fontName"]);
- }
- var cr = options["textColorR"] !== undefined ? options["textColorR"] : 255;
- var cg = options["textColorG"] !== undefined ? options["textColorG"] : 255;
- var cb = options["textColorB"] !== undefined ? options["textColorB"] : 255;
- var tc = cc.color(cr, cg, cb);
- button.setTitleColor(tc);
- this.setColorPropsForWidgetFromJsonDictionary(widget, options);
- },
-
- setPropsForCheckBoxFromJsonDictionary: function (widget, options) {
- this.setPropsForWidgetFromJsonDictionary(widget, options);
- var checkBox = widget;
- var backGroundDic = options["backGroundBoxData"];
- var backGroundType = backGroundDic["resourceType"];
- switch (backGroundType) {
- case 0:
- var backGroundFileName = backGroundDic["path"];
- var backGroundFileName_tp = backGroundFileName ? this._filePath + backGroundFileName : null;
- checkBox.loadTextureBackGround(backGroundFileName_tp);
- break;
- case 1:
- var backGroundFileName = backGroundDic["path"];
- checkBox.loadTextureBackGround(backGroundFileName, ccui.Widget.PLIST_TEXTURE);
- break;
- default:
- break;
- }
- backGroundDic = null;
- var backGroundSelectedDic = options["backGroundBoxSelectedData"];
- var backGroundSelectedType = backGroundSelectedDic["resourceType"];
- switch (backGroundSelectedType) {
- case 0:
- var backGroundSelectedFileName = backGroundSelectedDic["path"];
- var backGroundSelectedFileName_tp = backGroundSelectedFileName ? this._filePath + backGroundSelectedFileName : null;
- checkBox.loadTextureBackGroundSelected(backGroundSelectedFileName_tp);
- break;
- case 1:
- var backGroundSelectedFileName = backGroundSelectedDic["path"];
- checkBox.loadTextureBackGroundSelected(backGroundSelectedFileName, ccui.Widget.PLIST_TEXTURE);
- break;
- default:
- break;
- }
- backGroundSelectedDic = null;
-
- var frontCrossDic = options["frontCrossData"];
- var frontCrossType = frontCrossDic["resourceType"];
- switch (frontCrossType) {
- case 0:
- var frontCrossFileName = frontCrossDic["path"];
- var frontCrossFileName_tp = frontCrossFileName ? this._filePath + frontCrossFileName : null;
- checkBox.loadTextureFrontCross(frontCrossFileName_tp);
- break;
- case 1:
- var frontCrossFileName = frontCrossDic["path"];
- checkBox.loadTextureFrontCross(frontCrossFileName, ccui.Widget.PLIST_TEXTURE);
- break;
- default:
- break;
- }
- frontCrossDic = null;
-
- var backGroundDisabledDic = options["backGroundBoxDisabledData"];
- var backGroundDisabledType = backGroundDisabledDic["resourceType"];
- switch (backGroundDisabledType) {
- case 0:
- var backGroundDisabledFileName = backGroundDisabledDic["path"];
- var backGroundDisabledFileName_tp = backGroundDisabledFileName ? this._filePath + backGroundDisabledFileName : null;
- checkBox.loadTextureBackGroundDisabled(backGroundDisabledFileName_tp);
- break;
- case 1:
- var backGroundDisabledFileName = backGroundDisabledDic["path"];
- checkBox.loadTextureBackGroundDisabled(backGroundDisabledFileName, ccui.Widget.PLIST_TEXTURE);
- break;
- default:
- break;
- }
- backGroundDisabledDic = null;
-
- var frontCrossDisabledDic = options["frontCrossDisabledData"];
- var frontCrossDisabledType = frontCrossDisabledDic["resourceType"];
- switch (frontCrossDisabledType) {
- case 0:
- var frontCrossDisabledFileName = options["path"];
- var frontCrossDisabledFileName_tp = frontCrossDisabledFileName ? this._filePath + frontCrossDisabledFileName : null;
- checkBox.loadTextureFrontCrossDisabled(frontCrossDisabledFileName_tp);
- break;
- case 1:
- var frontCrossDisabledFileName = options["path"];
- checkBox.loadTextureFrontCrossDisabled(frontCrossDisabledFileName, ccui.Widget.PLIST_TEXTURE);
- break;
- default:
- break;
- }
- frontCrossDisabledDic = null;
-
- var selectedState = options["selectedState"] || false;
- widget.setSelectedState(selectedState);
- this.setColorPropsForWidgetFromJsonDictionary(widget, options);
- },
-
- setPropsForImageViewFromJsonDictionary: function (widget, options) {
- this.setPropsForWidgetFromJsonDictionary(widget, options);
-
- var imageView = widget;
-
- var imageFileNameDic = options["fileNameData"];
- var imageFileNameType = imageFileNameDic["resourceType"];
- switch (imageFileNameType) {
- case 0:
- var tp_i = this._filePath;
- var imageFileName = imageFileNameDic["path"];
- var imageFileName_tp = null;
- if (imageFileName) {
- imageFileName_tp = tp_i + imageFileName;
- imageView.loadTexture(imageFileName_tp);
- }
- break;
- case 1:
- var imageFileName = imageFileNameDic["path"];
- imageView.loadTexture(imageFileName, ccui.Widget.PLIST_TEXTURE);
- break;
- default:
- break;
- }
- imageFileNameDic = null;
-
- var scale9Enable = options["scale9Enable"] || false;
- imageView.setScale9Enabled(scale9Enable);
-
- if (scale9Enable) {
- if (options["scale9Width"] !== undefined && options["scale9Height"] !== undefined) {
- var swf = options["scale9Width"];
- var shf = options["scale9Height"];
- imageView.setSize(cc.size(swf, shf));
- }
-
- var cx = options["capInsetsX"];
- var cy = options["capInsetsY"];
- var cw = options["capInsetsWidth"];
- var ch = options["capInsetsHeight"];
-
- imageView.setCapInsets(cc.rect(cx, cy, cw, ch));
-
- }
- this.setColorPropsForWidgetFromJsonDictionary(widget, options);
- },
-
- setPropsForLabelFromJsonDictionary: function (widget, options) {
- this.setPropsForWidgetFromJsonDictionary(widget, options);
- var label = widget;
- var touchScaleChangeAble = options["touchScaleEnable"];
- label.setTouchScaleChangeEnabled(touchScaleChangeAble);
- var text = options["text"];
- label.setText(text);
- if (options["fontSize"] !== undefined) {
- label.setFontSize(options["fontSize"]);
- }
- if (options["fontName"] !== undefined) {
- label.setFontName(options["fontName"]);
- }
- if (options["areaWidth"] !== undefined && options["areaHeight"] !== undefined) {
- var size = cc.size(options["areaWidth"], options["areaHeight"]);
- label.setTextAreaSize(size);
- }
- if (options["hAlignment"]) {
- label.setTextHorizontalAlignment(options["hAlignment"]);
- }
- if (options["vAlignment"]) {
- label.setTextVerticalAlignment(options["vAlignment"]);
- }
- this.setColorPropsForWidgetFromJsonDictionary(widget, options);
- },
-
- setPropsForLabelAtlasFromJsonDictionary: function (widget, options) {
- this.setPropsForWidgetFromJsonDictionary(widget, options);
- var labelAtlas = widget;
- var sv = (options["stringValue"] !== undefined);
- var cmf = (options["charMapFile"] !== undefined);
- var iw = (options["itemWidth"] !== undefined);
- var ih = (options["itemHeight"] !== undefined);
- var scm = (options["startCharMap"] !== undefined);
- if (sv && cmf && iw && ih && scm) {
-
- var cmftDic = options["charMapFileData"];
- var cmfType = cmftDic["resourceType"];
- switch (cmfType) {
- case 0:
- var cmfPath = cmftDic["path"];
- var cmf_tp = this._filePath + cmfPath;
- labelAtlas.setProperty(options["stringValue"], cmf_tp, options["itemWidth"], options["itemHeight"], options["startCharMap"]);
- break;
- case 1:
- cc.log("Wrong res type of LabelAtlas!");
- break;
- default:
- break;
- }
- cmftDic = null;
- }
- this.setColorPropsForWidgetFromJsonDictionary(widget, options);
- },
-
- setPropsForLayoutFromJsonDictionary: function (widget, options) {
- this.setPropsForWidgetFromJsonDictionary(widget, options);
- var panel = widget;
- if (!(panel instanceof ccui.ScrollView) && !(panel instanceof ccui.ListView)) {
- panel.setClippingEnabled(options["clipAble"]);
- }
- var backGroundScale9Enable = options["backGroundScale9Enable"];
- panel.setBackGroundImageScale9Enabled(backGroundScale9Enable);
- var cr = options["bgColorR"];
- var cg = options["bgColorG"];
- var cb = options["bgColorB"];
-
- var scr = options["bgStartColorR"];
- var scg = options["bgStartColorG"]
- var scb = options["bgStartColorB"];
-
- var ecr = options["bgEndColorR"];
- var ecg = options["bgEndColorG"];
- var ecb = options["bgEndColorB"];
-
- var bgcv1 = options["vectorX"];
- var bgcv2 = options["vectorY"];
- panel.setBackGroundColorVector(cc.p(bgcv1, bgcv2));
-
- var co = options["bgColorOpacity"];
-
- var colorType = options["colorType"];
- panel.setBackGroundColorType(colorType);
- panel.setBackGroundColor(cc.color(scr, scg, scb), cc.color(ecr, ecg, ecb));
- panel.setBackGroundColor(cc.color(cr, cg, cb));
- panel.setBackGroundColorOpacity(co);
-
-
- var imageFileNameDic = options["backGroundImageData"] || {};
- var imageFileNameType = imageFileNameDic["resourceType"];
- switch (imageFileNameType) {
- case 0:
- var imageFileName = imageFileNameDic["path"];
- var imageFileName_tp = imageFileName ? this._filePath + imageFileName : null;
- panel.setBackGroundImage(imageFileName_tp);
- break;
- case 1:
- var imageFileName = imageFileNameDic["path"];
- panel.setBackGroundImage(imageFileName, ccui.Widget.PLIST_TEXTURE);
- break;
- default:
- break;
- }
- imageFileNameDic = null;
-
- if (backGroundScale9Enable) {
- var cx = options["capInsetsX"];
- var cy = options["capInsetsY"];
- var cw = options["capInsetsWidth"];
- var ch = options["capInsetsHeight"];
- panel.setBackGroundImageCapInsets(cc.rect(cx, cy, cw, ch));
- }
- panel.setLayoutType(options["layoutType"]);
- this.setColorPropsForWidgetFromJsonDictionary(widget, options);
- },
-
-
- setPropsForScrollViewFromJsonDictionary: function (widget, options) {
- this.setPropsForLayoutFromJsonDictionary(widget, options);
- var scrollView = widget;
- var innerWidth = options["innerWidth"];
- var innerHeight = options["innerHeight"];
- scrollView.setInnerContainerSize(cc.size(innerWidth, innerHeight));
- var direction = options["direction"];
- scrollView.setDirection(direction);
- scrollView.setBounceEnabled(options["bounceEnable"]);
- this.setColorPropsForWidgetFromJsonDictionary(widget, options);
- },
-
- setPropsForSliderFromJsonDictionary: function (widget, options) {
- this.setPropsForWidgetFromJsonDictionary(widget, options);
- var slider = widget;
-
- var barTextureScale9Enable = options["barTextureScale9Enable"] || false;
- slider.setScale9Enabled(barTextureScale9Enable);
- var barLength = options["length"];
- var bt = (options["barFileName"] !== undefined);
- if (bt) {
- if (barTextureScale9Enable) {
- var imageFileNameDic = options["barFileNameData"];
- var imageFileType = imageFileNameDic["resourceType"];
- switch (imageFileType) {
- case 0:
- var imageFileName = imageFileNameDic["path"];
- var imageFileName_tp = imageFileName ? this._filePath + imageFileName : null;
- slider.loadBarTexture(imageFileName_tp);
- break;
- case 1:
- var imageFileName = imageFileNameDic["path"];
- slider.loadBarTexture(imageFileName, ccui.Widget.PLIST_TEXTURE);
- break;
- default:
- break;
- }
-
- slider.setSize(cc.size(barLength, slider.getContentSize().height));
- imageFileNameDic = null;
- }
- else {
- var imageFileNameDic = options["barFileNameData"];
- var imageFileType = imageFileNameDic["resourceType"];
- switch (imageFileType) {
- case 0:
- var imageFileName = imageFileNameDic["path"];
- var imageFileName_tp = imageFileName ? this._filePath + imageFileName : null;
- slider.loadBarTexture(imageFileName_tp);
- break;
- case 1:
- var imageFileName = imageFileNameDic["path"];
- slider.loadBarTexture(imageFileName, ccui.Widget.PLIST_TEXTURE);
- break;
- default:
- break;
- }
- imageFileNameDic = null;
- }
- }
-
- var normalDic = options["ballNormalData"];
- var normalType = normalDic["resourceType"];
- switch (normalType) {
- case 0:
- var normalFileName = normalDic["path"];
- var normalFileName_tp = normalFileName ? this._filePath + normalFileName : null;
- slider.loadSlidBallTextureNormal(normalFileName_tp);
- break;
- case 1:
- var normalFileName = normalDic["path"];
- slider.loadSlidBallTextureNormal(normalFileName, ccui.Widget.PLIST_TEXTURE);
- break;
- default:
- break;
- }
- normalDic = null;
-
- var pressedDic = options["ballPressedData"];
- var pressedType = pressedDic["resourceType"];
- switch (pressedType) {
- case 0:
- var pressedFileName = pressedDic["path"];
- var pressedFileName_tp = pressedFileName ? this._filePath + pressedFileName : null;
- slider.loadSlidBallTexturePressed(pressedFileName_tp);
- break;
- case 1:
- var pressedFileName = pressedDic["path"];
- slider.loadSlidBallTexturePressed(pressedFileName, ccui.Widget.PLIST_TEXTURE);
- break;
- default:
- break;
- }
- pressedDic = null;
-
- var disabledDic = options["ballDisabledData"];
- var disabledType = disabledDic["resourceType"];
- switch (disabledType) {
- case 0:
- var disabledFileName = disabledDic["path"];
- var disabledFileName_tp = disabledFileName ? this._filePath + disabledFileName : null;
- slider.loadSlidBallTextureDisabled(disabledFileName_tp);
- break;
- case 1:
- var disabledFileName = disabledDic["path"];
- slider.loadSlidBallTextureDisabled(disabledFileName, ccui.Widget.PLIST_TEXTURE);
- break;
- default:
- break;
- }
- disabledDic = null;
-
- var progressBarDic = options["progressBarData"];
- var progressBarType = progressBarDic["resourceType"];
- switch (progressBarType) {
- case 0:
- var imageFileName = progressBarDic["path"];
- var imageFileName_tp = imageFileName ? this._filePath + imageFileName : null;
- slider.loadProgressBarTexture(imageFileName_tp);
- break;
- case 1:
- var imageFileName = progressBarDic["path"];
- slider.loadProgressBarTexture(imageFileName, ccui.Widget.PLIST_TEXTURE);
- break;
- default:
- break;
- }
- this.setColorPropsForWidgetFromJsonDictionary(widget, options);
-
- slider.setPercent(options["percent"]);
- },
-
- setPropsForTextAreaFromJsonDictionary: function (widget, options) {
- this.setPropsForWidgetFromJsonDictionary(widget, options);
- var textArea = widget;
- textArea.setText(options["text"]);
- if (options["fontSize"] !== undefined) {
- textArea.setFontSize(options["fontSize"]);
- }
- var cr = options["colorR"]
- var cg = options["colorG"];
- var cb = options["colorB"];
- textArea.setColor(cc.color(cr, cg, cb));
- textArea.setFontName(options["fontName"]);
- if (options["areaWidth"] !== undefined && options["areaHeight"] !== undefined) {
- var size = cc.size(options["areaWidth"], options["areaHeight"]);
- textArea.setTextAreaSize(size);
- }
- if (options["hAlignment"]) {
- textArea.setTextHorizontalAlignment(options["hAlignment"]);
- }
- if (options["vAlignment"]) {
- textArea.setTextVerticalAlignment(options["vAlignment"]);
- }
- this.setColorPropsForWidgetFromJsonDictionary(widget, options);
- },
-
- setPropsForTextButtonFromJsonDictionary: function (widget, options) {
- this.setPropsForButtonFromJsonDictionary(widget, options);
-
- var textButton = widget;
- textButton.setTitleText(options["text"] || "");
- var cri = options["textColorR"] !== undefined ? options["textColorR"] : 255;
- var cgi = options["textColorG"] !== undefined ? options["textColorG"] : 255;
- var cbi = options["textColorB"] !== undefined ? options["textColorB"] : 255;
- textButton.setTitleColor(cc.color(cri, cgi, cbi));
- if (options["fontSize"] !== undefined) {
- textButton.setTitleFontSize(options["fontSize"]);
- }
- if (options["fontName"] !== undefined) {
- textButton.setTitleFontName(options["fontName"]);
- }
- this.setColorPropsForWidgetFromJsonDictionary(widget, options);
- },
-
- setPropsForTextFieldFromJsonDictionary: function (widget, options) {
- this.setPropsForWidgetFromJsonDictionary(widget, options);
- var textField = widget;
- if (options["placeHolder"] !== undefined) {
- textField.setPlaceHolder(options["placeHolder"]);
- }
- textField.setText(options["text"]);
- if (options["fontSize"] !== undefined) {
- textField.setFontSize(options["fontSize"]);
- }
- if (options["fontName"] !== undefined) {
- textField.setFontName(options["fontName"]);
- }
- if (options["touchSizeWidth"] !== undefined && options["touchSizeHeight"] !== undefined) {
- textField.setTouchSize(cc.size(options["touchSizeWidth"], options["touchSizeHeight"]));
- }
-
- var dw = options["width"];
- var dh = options["height"];
- if (dw > 0.0 || dh > 0.0) {
- //textField.setSize(CCSizeMake(dw, dh));
- }
- var maxLengthEnable = options["maxLengthEnable"];
- textField.setMaxLengthEnabled(maxLengthEnable);
-
- if (maxLengthEnable) {
- var maxLength = options["maxLength"];
- textField.setMaxLength(maxLength);
- }
- var passwordEnable = options["passwordEnable"];
- textField.setPasswordEnabled(passwordEnable);
- if (passwordEnable) {
- textField.setPasswordStyleText(options["passwordStyleText"]);
- }
- this.setColorPropsForWidgetFromJsonDictionary(widget, options);
- },
-
- setPropsForLoadingBarFromJsonDictionary: function (widget, options) {
- this.setPropsForWidgetFromJsonDictionary(widget, options);
- var loadingBar = widget;
-
- var imageFileNameDic = options["textureData"];
- var imageFileNameType = imageFileNameDic["resourceType"];
- switch (imageFileNameType) {
- case 0:
- var tp_i = this._filePath;
- var imageFileName = imageFileNameDic["path"];
- var imageFileName_tp = null;
- if (imageFileName) {
- imageFileName_tp = tp_i + imageFileName;
- loadingBar.loadTexture(imageFileName_tp);
- }
- break;
- case 1:
- var imageFileName = imageFileNameDic["path"];
- loadingBar.loadTexture(imageFileName, ccui.Widget.PLIST_TEXTURE);
- break;
- default:
- break;
- }
- imageFileNameDic = null;
-
- var scale9Enable = options["scale9Enable"];
- loadingBar.setScale9Enabled(scale9Enable);
-
- if (scale9Enable) {
- var cx = options["capInsetsX"];
- var cy = options["capInsetsY"];
- var cw = options["capInsetsWidth"];
- var ch = options["capInsetsHeight"];
-
- loadingBar.setCapInsets(cc.rect(cx, cy, cw, ch));
-
- var width = options["width"];
- var height = options["height"];
- loadingBar.setSize(cc.size(width, height));
- }
-
- loadingBar.setDirection(options["direction"]);
- loadingBar.setPercent(options["percent"]);
- this.setColorPropsForWidgetFromJsonDictionary(widget, options);
-
- },
-
- setPropsForListViewFromJsonDictionary: function (widget, options) {
- this.setPropsForLayoutFromJsonDictionary(widget, options);
- var innerWidth = options["innerWidth"] || 0;
- var innerHeight = options["innerHeight"] || 0;
- widget.setInnerContainerSize(cc.size(innerWidth, innerHeight));
- widget.setDirection(options["direction"] || 0);
- widget.setGravity(options["gravity"] || 0);
- widget.setItemsMargin(options["itemMargin"] || 0);
- },
-
- setPropsForPageViewFromJsonDictionary: function (widget, options) {
- this.setPropsForLayoutFromJsonDictionary(widget, options);
- },
-
- setPropsForLabelBMFontFromJsonDictionary: function (widget, options) {
- this.setPropsForWidgetFromJsonDictionary(widget, options);
-
- var labelBMFont = widget;
-
- var cmftDic = options["fileNameData"];
- var cmfType = cmftDic["resourceType"];
- switch (cmfType) {
- case 0:
- var cmfPath = cmftDic["path"];
- var cmf_tp = this._filePath + cmfPath;
- labelBMFont.setFntFile(cmf_tp);
- break;
- case 1:
- cc.log("Wrong res type of LabelAtlas!");
- break;
- default:
- break;
- }
- cmftDic = null;
-
- var text = options["text"];
- labelBMFont.setText(text);
-
- this.setColorPropsForWidgetFromJsonDictionary(widget, options);
- }
-});
diff --git a/extensions/cocostudio/reader/SceneReader.js b/extensions/cocostudio/reader/SceneReader.js
deleted file mode 100644
index 2d73b83801..0000000000
--- a/extensions/cocostudio/reader/SceneReader.js
+++ /dev/null
@@ -1,342 +0,0 @@
-/****************************************************************************
- Copyright (c) 2010-2012 cocos2d-x.org
-
- http://www.cocos2d-x.org
-
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- THE SOFTWARE.
- ****************************************************************************/
-
-/**
- * @namespace Base singleton object for ccs.sceneReader
- */
-ccs.sceneReader = /** @lends ccs.sceneReader# */{
- _baseBath:"",
- _listener:null,
- _selector:null,
- _node: null,
-
- /**
- * create node with json file that exported by CocoStudio scene editor
- * @param pszFileName
- * @returns {cc.Node}
- */
- createNodeWithSceneFile: function (pszFileName) {
- this._baseBath = cc.path.dirname(pszFileName);
- var jsonDict = cc.loader.getRes(pszFileName);
-
- if (!jsonDict) throw "Please load the resource first : " + pszFileName;
-
- this._node = this.createObject(jsonDict, null);
- ccs.triggerManager.parse(jsonDict["Triggers"]||[]);
- return this._node;
- },
-
- /**
- * create object from data
- * @param {Object} inputFiles
- * @param {cc.Node} parenet
- * @returns {cc.Node}
- */
- createObject: function (inputFiles, parenet) {
- var className = inputFiles["classname"];
- if (className == "CCNode") {
- var gb = null;
- if (!parenet) {
- gb = cc.Node.create();
- }
- else {
- gb = cc.Node.create();
- parenet.addChild(gb);
- }
-
- this.setPropertyFromJsonDict(gb, inputFiles);
-
- var components = inputFiles["components"];
- for (var i = 0; i < components.length; i++) {
- var subDict = components[i];
- if (!subDict) {
- break;
- }
- var className = subDict["classname"];
- var comName = subDict["name"];
-
- var fileData = subDict["fileData"];
- var path = "", plistFile = "";
- var resType = 0;
- if (fileData != null) {
- if(fileData["resourceType"] !== undefined){
- resType = fileData["resourceType"]
- }else{
- resType =-1;
- }
-
- path = cc.path.join(this._baseBath, fileData["path"]);
- plistFile = fileData["plistFile"];
- }
-
- var pathExtname = cc.path.extname(path);
-
- if (className == "CCSprite") {
- var sprite = null;
-
- if (resType == 0) {
- if (pathExtname != ".png") continue;
- sprite = cc.Sprite.create(path);
- }
- else if (resType == 1) {
- if (pathExtname != ".plist") continue;
-
- plistFile = cc.path.join(this._baseBath, plistFile);
- var pngFile = cc.path.changeExtname(plistFile, ".png");
- cc.spriteFrameCache.addSpriteFrames(plistFile, pngFile);
- sprite = cc.Sprite.create("#" + fileData["path"]);
- }
- else {
- continue;
- }
-
- var render = ccs.ComRender.create(sprite, "CCSprite");
- if (comName != null) {
- render.setName(comName);
- }
-
- gb.addComponent(render);
- this._callSelector(sprite, subDict);
- }
- else if (className == "CCTMXTiledMap") {
- var tmx = null;
- if (resType == 0) {
- if (pathExtname != ".tmx") continue;
- tmx = cc.TMXTiledMap.create(path);
- }
- else {
- continue;
- }
-
- var render = ccs.ComRender.create(tmx, "CCTMXTiledMap");
- if (comName != null) {
- render.setName(comName);
- }
- gb.addComponent(render);
- this._callSelector(tmx, subDict);
- }
- else if (className == "CCParticleSystemQuad") {
- if (pathExtname != ".plist") continue;
-
- var particle = null;
- if (resType == 0) {
- particle = cc.ParticleSystem.create(path);
- }
- else {
- cc.log("unknown resourcetype on CCParticleSystemQuad!");
- continue;
- }
-
- particle.setPosition(0, 0);
- var render = ccs.ComRender.create(particle, "CCParticleSystemQuad");
- if (comName != null) {
- render.setName(comName);
- }
- gb.addComponent(render);
- this._callSelector(particle, subDict);
- }
- else if (className == "CCArmature") {
- if (resType != 0) {
- continue;
- }
- var jsonDict = cc.loader.getRes(path);
- if (!jsonDict) cc.log("Please load the resource [%s] first!", path);
- var armature_data = jsonDict["armature_data"];
- var subData = armature_data[0];
- var name = subData["name"];
-
- ccs.armatureDataManager.addArmatureFileInfo(path);
-
- var armature = ccs.Armature.create(name);
- var render = ccs.ComRender.create(armature, "CCArmature");
- if (comName != null) {
- render.setName(comName);
- }
- gb.addComponent(render);
-
- var actionName = subDict["selectedactionname"];
- if (actionName && armature.getAnimation()) {
- armature.getAnimation().play(actionName);
- }
- jsonDict = null;
- subData = null;
- this._callSelector(armature, subDict);
- }
- else if (className == "CCComAudio") {
- var audio = null;
- if (resType == 0) {
- audio = ccs.ComAudio.create();
- }
- else {
- continue;
- }
- audio.preloadEffect(path);
- if (comName) {
- audio.setName(comName);
- }
- gb.addComponent(audio);
- this._callSelector(audio, subDict);
- }
- else if (className == "CCComAttribute") {
- var attribute = null;
- if (resType == 0) {
- attribute = ccs.ComAttribute.create();
- if (path != "") attribute.parse(path);
- }
- else {
- cc.log("unknown resourcetype on CCComAttribute!");
- continue;
- }
- if (comName) {
- attribute.setName(comName);
- }
- gb.addComponent(attribute);
- this._callSelector(attribute, subDict);
- }
- else if (className == "CCBackgroundAudio") {
- if(!pathExtname) continue;
- if(resType!=0) continue;
-
- var audio = ccs.ComAudio.create();
- audio.preloadBackgroundMusic(path);
- audio.setFile(path);
- var bLoop = Boolean(subDict["loop"] || 0);
- audio.setLoop(bLoop);
- if (comName) {
- audio.setName(comName);
- }
- gb.addComponent(audio);
- audio.playBackgroundMusic(path, bLoop);
- this._callSelector(audio, subDict);
- }
- else if (className == "GUIComponent") {
- var widget = ccs.uiReader.widgetFromJsonFile(path);
- var render = ccs.ComRender.create(widget, "GUIComponent");
- if (comName != null) {
- render.setName(comName);
- }
- gb.addComponent(render);
- this._callSelector(audio, subDict);
- }
- subDict = null;
- }
- var gameobjects = inputFiles["gameobjects"];
- for (var i = 0; i < gameobjects.length; i++) {
- var subDict = gameobjects[i];
- if (!subDict) {
- break;
- }
- this.createObject(subDict, gb);
- subDict = null;
- }
-
- return gb;
- }
-
- return null;
- },
-
-
- nodeByTag: function (parent, tag) {
- if (parent == null) {
- return null;
- }
- var retNode = null;
- var children = parent.getChildren();
-
- for (var i = 0; i < children.length; i++) {
- var child = children[i];
- if (child && child.getTag() == tag) {
- retNode = child;
- break;
- }
- else {
- retNode = this.nodeByTag(child, tag);
- if (retNode) {
- break;
- }
- }
- }
- return retNode;
- },
-
- getNodeByTag: function (tag) {
- if (this._node == null) {
- return null;
- }
- if (this._node.getTag() == tag) {
- return this._node;
- }
- return this.nodeByTag(this._node, tag);
- },
-
- /**
- * set property
- * @param {cc.Node} node
- * @param {Object} dict
- */
- setPropertyFromJsonDict: function (node, dict) {
- var x = (typeof dict["x"] === 'undefined')?0:dict["x"];
- var y = (typeof dict["y"] === 'undefined')?0:dict["y"];
- node.setPosition(x, y);
-
- var bVisible = Boolean((typeof dict["visible"] === 'undefined')?1:dict["visible"]);
- node.setVisible(bVisible);
-
- var nTag = (typeof dict["objecttag"] === 'undefined')?-1:dict["objecttag"];
- node.setTag(nTag);
-
- var nZorder = (typeof dict["zorder"] === 'undefined')?0:dict["zorder"];
- node.setLocalZOrder(nZorder);
-
- var fScaleX = (typeof dict["scalex"] === 'undefined')?1:dict["scalex"];
- var fScaleY = (typeof dict["scaley"] === 'undefined')?1:dict["scaley"];
- node.setScaleX(fScaleX);
- node.setScaleY(fScaleY);
-
- var fRotationZ = (typeof dict["rotation"] === 'undefined')?0:dict["rotation"];
- node.setRotation(fRotationZ);
- },
- setTarget : function(selector,listener){
- this._listener = listener;
- this._selector = selector;
- },
- _callSelector:function(obj,subDict){
- if(this._selector){
- this._selector.call(this._listener,obj,subDict);
- }
- },
-
- version: function () {
- return "1.2.0.0";
- },
-
- /**
- * Clear data
- */
- clear: function () {
- ccs.triggerManager.removeAll();
- cc.audioEngine.end();
- }
-};
\ No newline at end of file
diff --git a/extensions/cocostudio/timeline/ActionTimeline.js b/extensions/cocostudio/timeline/ActionTimeline.js
new file mode 100644
index 0000000000..d458bb958b
--- /dev/null
+++ b/extensions/cocostudio/timeline/ActionTimeline.js
@@ -0,0 +1,509 @@
+/****************************************************************************
+ Copyright (c) 2013-2014 Chukong Technologies Inc.
+
+ http://www.cocos2d-x.org
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+ ****************************************************************************/
+
+
+/**
+ * ActionTimelineData
+ * @name ccs.ActionTimelineData
+ * @extend ccs.Class
+ * @class
+ *
+ */
+ccs.ActionTimelineData = ccs.Class.extend({
+
+ _actionTag: 0,
+
+ ctor: function(actionTag){
+ this._init(actionTag);
+ },
+
+ _init: function(actionTag){
+ this._actionTag = actionTag;
+ return true;
+ },
+
+ /**
+ * Set the action tag.
+ * @param {number} actionTag
+ */
+ setActionTag: function(actionTag){
+ this._actionTag = actionTag;
+ },
+
+ /**
+ * Gets the action tag.
+ */
+ getActionTag: function(){
+ return this._actionTag;
+ }
+
+});
+
+ccs.ObjectExtensionData = ccs.Class.extend({
+
+ _customProperty: null,
+ _timelineData: null,
+
+ ctor: function(){
+ this._timelineData = new ccs.ActionTimelineData(0);
+ return true;
+ },
+
+ setActionTag: function(actionTag){
+ this._timelineData.setActionTag(actionTag);
+ },
+
+ getActionTag: function(){
+ return this._timelineData.getActionTag();
+ }
+});
+
+ccs.ObjectExtensionData.create = function(){
+ return new ccs.ObjectExtensionData();
+};
+
+/**
+ * Create new ActionTimelineData.
+ *
+ * @deprecated v3.0, please use new ccs.ActionTimelineData() instead.
+ *
+ * @name ccs.ActionTimelineData.create
+ * @function
+ * @param actionTag
+ * @returns {ccs.ActionTimelineData}
+ */
+ccs.ActionTimelineData.create = function(actionTag){
+ return new ccs.ActionTimelineData(actionTag);
+};
+
+
+/**
+ * ActionTimeline
+ * @class
+ * @extend cc.Action
+ *
+ * @property gotoFrameAndPlay
+ * @property gotoFrameAndPause
+ */
+ccs.ActionTimeline = cc.Action.extend({
+
+ _timelineMap: null,
+ _timelineList: null,
+ _duration: 0,
+ _time: null,
+ _timeSpeed: 1,
+ _frameInternal: 1/60,
+ _playing: false,
+ _currentFrame: 0,
+ _startFrame: 0,
+ _endFrame: 0,
+ _loop: null,
+ _frameEventListener: null,
+ _animationInfos: null,
+
+ ctor: function(){
+ cc.Action.prototype.ctor.call(this);
+ this._timelineMap = {};
+ this._timelineList = [];
+ this._animationInfos = {};
+ this.init();
+ },
+
+ _gotoFrame: function(frameIndex){
+ var size = this._timelineList.length;
+ for(var i = 0; i < size; i++)
+ {
+ this._timelineList[i]._gotoFrame(frameIndex);
+ }
+ },
+
+ _stepToFrame: function(frameIndex){
+ var size = this._timelineList.length;
+ for(var i = 0; i < size; i++){
+ this._timelineList[i]._stepToFrame(frameIndex);
+ }
+ },
+
+ //emit frame event, call it when enter a frame
+ _emitFrameEvent: function(frame){
+ if(this._frameEventListener){
+ this._frameEventListener(frame);
+ }
+ },
+
+ init: function(){
+ return true;
+ },
+
+ /**
+ * Goto the specified frame index, and start playing from this index.
+ * @param startIndex The animation will play from this index.
+ * @param [endIndex=] The animation will end at this index.
+ * @param [currentFrameIndex=] set current frame index.
+ * @param [loop=] Whether or not the animation need loop.
+ */
+ gotoFrameAndPlay: function(startIndex, endIndex, currentFrameIndex, loop){
+ //Consolidation parameters
+ var i = 0,
+ argLen = arguments.length;
+ var num = [],
+ bool;
+ for(i; i
+ * Returns the flag which indicates whether the widget is flipped horizontally or not.
+ * Return the flag which indicates whether the widget is flipped vertically or not. Google Chrome is a browser that combines a minimal design with sophisticated technology to make the web faster, safer, and easier.Click the logo to download.
+ * The skeleton of Spine.
+ *
+ * It only flips the texture of the widget, and not the texture of the widget's children.
+ * Also, flipping the texture doesn't alter the anchorPoint.
+ * If you want to flip the anchorPoint too, and/or to flip the children too use:
+ * widget->setScaleX(sprite->getScaleX() * -1);
+ *
+ *
+ * It only flips the texture of the widget, and not the texture of the widget's children.
+ * Also, flipping the texture doesn't alter the anchorPoint.
+ * If you want to flip the anchorPoint too, and/or to flip the children too use:
+ * widget->setScaleY(widget->getScaleY() * -1);
+ * Your browser does not support HTML5 canvas!
' +
- '
';
- var p = d.getElementById(c.tag).parentNode;
- p.style.background = 'none';
- p.style.border = 'none';
- p.insertBefore(s);
-
- d.body.style.background = '#ffffff';
- return;
- }
-
- var fn;
- window.addEventListener('DOMContentLoaded', fn = function() {
- this.removeEventListener('DOMContentLoaded', fn, false);
- //first load engine file if specified
- var s = d.createElement('script');
- /*********Delete this section if you have packed all files into one*******/
- if (c.SingleEngineFile && !c.engineDir) {
- s.src = c.SingleEngineFile;
- }
- else if (c.engineDir && !c.SingleEngineFile) {
- s.src = c.engineDir + 'jsloader.js';
- }
- else {
- alert('You must specify either the single engine file OR the engine directory in "cocos2d.js"');
- }
- /*********Delete this section if you have packed all files into one*******/
-
- //s.src = 'myTemplate.js'; //IMPORTANT: Un-comment this line if you have packed all files into one
-
- d.body.appendChild(s);
- document.ccConfig = c;
- s.id = 'cocos2d-html5';
- //else if single file specified, load singlefile
- });
-})();
diff --git a/extensions/pluginx/samples/HelloSocial/index.html b/extensions/pluginx/samples/HelloSocial/index.html
deleted file mode 100644
index 6b4cece82c..0000000000
--- a/extensions/pluginx/samples/HelloSocial/index.html
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-
-
+ * Skeleton has a reference to a SkeletonData and stores the state for skeleton instance,
+ * which consists of the current pose's bone SRT, slot colors, and which slot attachments are visible.
+ * Multiple skeletons can use the same SkeletonData (which includes all animations, skins, and attachments).
+ *
+ * @param {String} fromAnimation
+ * @param {String} toAnimation
+ * @param {Number} duration
+ */
+ setMix: function (fromAnimation, toAnimation, duration) {
+ this._state.data.setMixByName(fromAnimation, toAnimation, duration);
+ },
+
+ /**
+ * Sets event listener of sp.SkeletonAnimation.
+ * @param {Object} target
+ * @param {Function} callback
+ */
+ setAnimationListener: function (target, callback) {
+ this._target = target;
+ this._callback = callback;
+ },
+
+ /**
+ * Set the current animation. Any queued animations are cleared.
+ * @param {Number} trackIndex
+ * @param {String} name
+ * @param {Boolean} loop
+ * @returns {spine.TrackEntry|null}
+ */
+ setAnimation: function (trackIndex, name, loop) {
+ var animation = this._skeleton.data.findAnimation(name);
+ if (!animation) {
+ cc.log("Spine: Animation not found: " + name);
+ return null;
+ }
+ return this._state.setAnimation(trackIndex, animation, loop);
+ },
+
+ /**
+ * Adds an animation to be played delay seconds after the current or last queued animation.
+ * @param {Number} trackIndex
+ * @param {String} name
+ * @param {Boolean} loop
+ * @param {Number} [delay=0]
+ * @returns {spine.TrackEntry|null}
+ */
+ addAnimation: function (trackIndex, name, loop, delay) {
+ delay = delay == null ? 0 : delay;
+ var animation = this._skeleton.data.findAnimation(name);
+ if (!animation) {
+ cc.log("Spine: Animation not found:" + name);
+ return null;
+ }
+ return this._state.addAnimation(trackIndex, animation, loop, delay);
+ },
+
+ /**
+ * Returns track entry by trackIndex.
+ * @param trackIndex
+ * @returns {spine.TrackEntry|null}
+ */
+ getCurrent: function (trackIndex) {
+ return this._state.getCurrent(trackIndex);
+ },
+
+ /**
+ * Clears all tracks of animation state.
+ */
+ clearTracks: function () {
+ this._state.clearTracks();
+ },
+
+ /**
+ * Clears track of animation state by trackIndex.
+ * @param {Number} trackIndex
+ */
+ clearTrack: function (trackIndex) {
+ this._state.clearTrack(trackIndex);
+ },
+
+ /**
+ * Update will be called automatically every frame if "scheduleUpdate" is called when the node is "live".
+ * It updates animation's state and skeleton's world transform.
+ * @param {Number} dt Delta time since last update
+ * @override
+ */
+ update: function (dt) {
+ this._super(dt);
+ dt *= this._timeScale;
+ this._state.update(dt);
+ this._state.apply(this._skeleton);
+ this._skeleton.updateWorldTransform();
+ this._renderCmd._updateChild();
+ },
+
+ /**
+ * Set the start event listener.
+ * @param {function} listener
+ */
+ setStartListener: function(listener){
+ this._startListener = listener;
+ },
+
+ /**
+ * Set the end event listener.
+ * @param {function} listener
+ */
+ setEndListener: function(listener) {
+ this._endListener = listener;
+ },
+
+ setCompleteListener: function(listener) {
+ this._completeListener = listener;
+ },
+
+ setEventListener: function(listener){
+ this._eventListener = listener;
+ },
+
+ setTrackStartListener: function(entry, listener){
+ sp.TrackEntryListeners.getListeners(entry).startListener = listener;
+ },
+
+ setTrackEndListener: function(entry, listener){
+ sp.TrackEntryListeners.getListeners(entry).endListener = listener;
+ },
+
+ setTrackCompleteListener: function(entry, listener){
+ sp.TrackEntryListeners.getListeners(entry).completeListener = listener;
+ },
+
+ setTrackEventListener: function(entry, listener){
+ sp.TrackEntryListeners.getListeners(entry).eventListener = listener;
+ },
+
+ onTrackEntryEvent: function(traceIndex, type, event, loopCount){
+ var entry = this._state.getCurrent(traceIndex);
+ if(!entry.rendererObject)
+ return;
+ var listeners = entry.rendererObject;
+ switch (type){
+ case sp.ANIMATION_EVENT_TYPE.START:
+ if(listeners.startListener)
+ listeners.startListener(traceIndex);
+ break;
+ case sp.ANIMATION_EVENT_TYPE.END:
+ if(listeners.endListener)
+ listeners.endListener(traceIndex);
+ break;
+ case sp.ANIMATION_EVENT_TYPE.COMPLETE:
+ if(listeners.completeListener)
+ listeners.completeListener(traceIndex, loopCount);
+ break;
+ case sp.ANIMATION_EVENT_TYPE.EVENT:
+ if(listeners.eventListener)
+ listeners.eventListener(traceIndex, event);
+ break;
+ }
+ },
+
+ onAnimationStateEvent: function(trackIndex, type, event, loopCount) {
+ switch(type){
+ case sp.ANIMATION_EVENT_TYPE.START:
+ if(this._startListener)
+ this._startListener(trackIndex);
+ break;
+ case sp.ANIMATION_EVENT_TYPE.END:
+ if(this._endListener)
+ this._endListener(trackIndex);
+ break;
+ case sp.ANIMATION_EVENT_TYPE.COMPLETE:
+ if(this._completeListener)
+ this._completeListener(trackIndex, loopCount);
+ break;
+ case sp.ANIMATION_EVENT_TYPE.EVENT:
+ if(this._eventListener)
+ this._eventListener(trackIndex, event);
+ break;
+ }
+ },
+
+ getState: function(){
+ return this._state;
+ },
+
+ _onAnimationStateStart: function (trackIndex) {
+ this._animationStateCallback(trackIndex, sp.ANIMATION_EVENT_TYPE.START, null, 0);
+ },
+ _onAnimationStateEnd: function (trackIndex) {
+ this._animationStateCallback(trackIndex, sp.ANIMATION_EVENT_TYPE.END, null, 0);
+ },
+ _onAnimationStateComplete: function (trackIndex, count) {
+ this._animationStateCallback(trackIndex, sp.ANIMATION_EVENT_TYPE.COMPLETE, null, count);
+ },
+ _onAnimationStateEvent: function (trackIndex, event) {
+ this._animationStateCallback(trackIndex, sp.ANIMATION_EVENT_TYPE.EVENT, event, 0);
+ },
+ _animationStateCallback: function (trackIndex, type, event, loopCount) {
+ this.onAnimationStateEvent(trackIndex, type, event, loopCount);
+ if (this._target && this._callback) {
+ this._callback.call(this._target, this, trackIndex, type, event, loopCount)
+ }
+ }
+});
+
+/**
+ * Creates a skeleton animation object.
+ * @deprecated since v3.0, please use new sp.SkeletonAnimation(skeletonDataFile, atlasFile, scale) instead.
+ * @param {spine.SkeletonData|String} skeletonDataFile
+ * @param {String|spine.Atlas|spine.SkeletonData} atlasFile atlas filename or atlas data or owns SkeletonData
+ * @param {Number} [scale] scale can be specified on the JSON or binary loader which will scale the bone positions, image sizes, and animation translations.
+ * @returns {sp.Skeleton}
+ */
+sp.SkeletonAnimation.create = function (skeletonDataFile, atlasFile/* or atlas*/, scale) {
+ return new sp.SkeletonAnimation(skeletonDataFile, atlasFile, scale);
+};
\ No newline at end of file
diff --git a/extensions/spine/CCSkeletonCanvasRenderCmd.js b/extensions/spine/CCSkeletonCanvasRenderCmd.js
new file mode 100644
index 0000000000..1b4f873cd1
--- /dev/null
+++ b/extensions/spine/CCSkeletonCanvasRenderCmd.js
@@ -0,0 +1,213 @@
+/****************************************************************************
+ Copyright (c) 2013-2014 Chukong Technologies Inc.
+
+ http://www.cocos2d-x.org
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+ ****************************************************************************/
+
+(function(){
+ sp.Skeleton.CanvasRenderCmd = function(renderableObject){
+ cc.Node.CanvasRenderCmd.call(this, renderableObject);
+ this._needDraw = true;
+ };
+
+ var proto = sp.Skeleton.CanvasRenderCmd.prototype = Object.create(cc.Node.CanvasRenderCmd.prototype);
+ proto.constructor = sp.Skeleton.CanvasRenderCmd;
+
+ proto.rendering = function (wrapper, scaleX, scaleY) {
+ var node = this._node, i, n, slot, slotNode;
+ wrapper = wrapper || cc._renderContext;
+
+ var locSkeleton = node._skeleton, drawOrder = locSkeleton.drawOrder;
+ for(i = 0, n = drawOrder.length; i < n; i++){
+ slot = drawOrder[i];
+ slotNode = slot._slotNode;
+ if(slotNode._visible && slotNode._renderCmd && slot.currentSprite){
+ slotNode._renderCmd.transform(this, true);
+ slot.currentSprite._renderCmd.rendering(wrapper, scaleX, scaleY);
+ slotNode._renderCmd._dirtyFlag = slot.currentSprite._renderCmd._dirtyFlag = 0;
+ }
+ }
+
+ if (!node._debugSlots && !node._debugBones)
+ return;
+
+ wrapper.setTransform(this._worldTransform, scaleX, scaleY);
+ wrapper.setGlobalAlpha(1);
+ var attachment, drawingUtil = cc._drawingUtil;
+ if (node._debugSlots) {
+ // Slots.
+ drawingUtil.setDrawColor(0, 0, 255, 255);
+ drawingUtil.setLineWidth(1);
+
+ var points = [];
+ for (i = 0, n = locSkeleton.slots.length; i < n; i++) {
+ slot = locSkeleton.drawOrder[i];
+ if (!slot.attachment || slot.attachment.type != sp.ATTACHMENT_TYPE.REGION)
+ continue;
+ attachment = slot.attachment;
+ this._updateRegionAttachmentSlot(attachment, slot, points);
+ drawingUtil.drawPoly(points, 4, true);
+ }
+ }
+
+ if (node._debugBones) {
+ // Bone lengths.
+ var bone;
+ drawingUtil.setLineWidth(2);
+ drawingUtil.setDrawColor(255, 0, 0, 255);
+
+ for (i = 0, n = locSkeleton.bones.length; i < n; i++) {
+ bone = locSkeleton.bones[i];
+ var x = bone.data.length * bone.m00 + bone.worldX;
+ var y = bone.data.length * bone.m10 + bone.worldY;
+ drawingUtil.drawLine(
+ {x: bone.worldX, y: bone.worldY},
+ {x: x, y: y});
+ }
+
+ // Bone origins.
+ drawingUtil.setPointSize(4);
+ drawingUtil.setDrawColor(0, 0, 255, 255); // Root bone is blue.
+
+ for (i = 0, n = locSkeleton.bones.length; i < n; i++) {
+ bone = locSkeleton.bones[i];
+ drawingUtil.drawPoint({x: bone.worldX, y: bone.worldY});
+ if (i === 0)
+ drawingUtil.setDrawColor(0, 255, 0, 255);
+ }
+ }
+ };
+
+ proto._updateRegionAttachmentSlot = function(attachment, slot, points) {
+ if(!points)
+ return;
+
+ var vertices = {}, VERTEX = sp.VERTEX_INDEX, bone = slot.bone;
+ attachment.computeVertices(bone.skeleton.x, bone.skeleton.y, bone, vertices);
+ points.length = 0;
+ points.push(cc.p(vertices[VERTEX.X1], vertices[VERTEX.Y1]));
+ points.push(cc.p(vertices[VERTEX.X4], vertices[VERTEX.Y4]));
+ points.push(cc.p(vertices[VERTEX.X3], vertices[VERTEX.Y3]));
+ points.push(cc.p(vertices[VERTEX.X2], vertices[VERTEX.Y2]));
+ };
+
+ proto._createChildFormSkeletonData = function(){
+ var node = this._node;
+ var locSkeleton = node._skeleton, spriteName, sprite;
+ for (var i = 0, n = locSkeleton.slots.length; i < n; i++) {
+ var slot = locSkeleton.slots[i], attachment = slot.attachment;
+ var slotNode = new cc.Node();
+ slot._slotNode = slotNode;
+
+ if(attachment instanceof spine.RegionAttachment){
+ spriteName = attachment.rendererObject.name;
+ sprite = this._createSprite(slot, attachment);
+ slot.currentSprite = sprite;
+ slot.currentSpriteName = spriteName;
+ slotNode.addChild(sprite);
+ } else if(attachment instanceof spine.MeshAttachment){
+ //todo for mesh
+ }
+ }
+ };
+
+ proto._createSprite = function(slot, attachment){
+ var rendererObject = attachment.rendererObject;
+ var texture = rendererObject.page._texture;
+ var rect = new cc.Rect(rendererObject.x, rendererObject.y, rendererObject.width, rendererObject.height);
+ var sprite = new cc.Sprite();
+ sprite.initWithTexture(rendererObject.page._texture, rect, rendererObject.rotate, false);
+ sprite._rect.width = attachment.width;
+ sprite._rect.height = attachment.height;
+ sprite.setContentSize(attachment.width, attachment.height);
+ sprite.setRotation(-attachment.rotation);
+ sprite.setScale(rendererObject.width / rendererObject.originalWidth * attachment.scaleX,
+ rendererObject.height / rendererObject.originalHeight * attachment.scaleY);
+
+ slot.sprites = slot.sprites || {};
+ slot.sprites[rendererObject.name] = sprite;
+
+ return sprite;
+ };
+
+ proto._updateChild = function(){
+ var locSkeleton = this._node._skeleton, slots = locSkeleton.slots;
+ var i, n, selSprite;
+
+ var slot, attachment, slotNode;
+ for(i = 0, n = slots.length; i < n; i++){
+ slot = slots[i];
+ attachment = slot.attachment;
+ slotNode = slot._slotNode;
+ if(!attachment){
+ slotNode.setVisible(false);
+ continue;
+ }
+ var type = attachment.type;
+ if (type === spine.AttachmentType.region){
+ if(attachment.rendererObject){
+ if(!slot.currentSpriteName || slot.currentSpriteName !== attachment.name){
+ var spriteName = attachment.rendererObject.name;
+ if(slot.currentSprite !== undefined)
+ slot.currentSprite.setVisible(false);
+ slot.sprites = slot.sprites ||{};
+ if(slot.sprites[spriteName] !== undefined)
+ slot.sprites[spriteName].setVisible(true);
+ else{
+ var sprite = this._createSprite(slot, attachment);
+ slotNode.addChild(sprite);
+ }
+ slot.currentSprite = slot.sprites[spriteName];
+ slot.currentSpriteName = spriteName;
+ }
+ }
+ var bone = slot.bone;
+ slotNode.setPosition(bone.worldX + attachment.x * bone.m00 + attachment.y * bone.m01,
+ bone.worldY + attachment.x * bone.m10 + attachment.y * bone.m11);
+ slotNode.setScale(bone.worldScaleX, bone.worldScaleY);
+
+ //set the color and opacity
+ selSprite = slot.currentSprite;
+ selSprite._flippedX = bone.worldFlipX;
+ selSprite._flippedY = bone.worldFlipY;
+ if(selSprite._flippedY || selSprite._flippedX){
+ slotNode.setRotation(bone.worldRotation);
+ selSprite.setRotation(attachment.rotation);
+ }else{
+ slotNode.setRotation(-bone.worldRotation);
+ selSprite.setRotation(-attachment.rotation);
+ }
+
+ //hack for sprite
+ selSprite._renderCmd._displayedOpacity = 0 | (locSkeleton.a * slot.a * 255);
+ var r = 0 | (locSkeleton.r * slot.r * 255), g = 0 | (locSkeleton.g * slot.g * 255), b = 0 | (locSkeleton.b * slot.b * 255);
+ selSprite.setColor(cc.color(r,g,b));
+ selSprite._renderCmd._updateColor();
+ } else if (type === spine.AttachmentType.skinnedmesh) {
+ //todo for mesh
+ } else {
+ slotNode.setVisible(false);
+ continue;
+ }
+ slotNode.setVisible(true);
+ }
+ };
+})();
\ No newline at end of file
diff --git a/extensions/spine/CCSkeletonWebGLRenderCmd.js b/extensions/spine/CCSkeletonWebGLRenderCmd.js
new file mode 100644
index 0000000000..ca0f14b613
--- /dev/null
+++ b/extensions/spine/CCSkeletonWebGLRenderCmd.js
@@ -0,0 +1,246 @@
+/****************************************************************************
+ Copyright (c) 2013-2014 Chukong Technologies Inc.
+
+ http://www.cocos2d-x.org
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+ ****************************************************************************/
+
+(function(){
+ sp.Skeleton.WebGLRenderCmd = function (renderableObject) {
+ cc.Node.WebGLRenderCmd.call(this, renderableObject);
+ this._needDraw = true;
+ this.setShaderProgram(cc.shaderCache.programForKey(cc.SHADER_POSITION_TEXTURECOLOR));
+ this._tmpQuad = new cc.V3F_C4B_T2F_Quad();
+ };
+
+ var proto = sp.Skeleton.WebGLRenderCmd.prototype = Object.create(cc.Node.WebGLRenderCmd.prototype);
+ proto.constructor = sp.Skeleton.WebGLRenderCmd;
+
+ proto.rendering = function (ctx) {
+ var node = this._node, tmpQuad = this._tmpQuad;
+ this._shaderProgram.use();
+ this._shaderProgram._setUniformForMVPMatrixWithMat4(this._stackMatrix);
+// cc.glBlendFunc(this._blendFunc.src, this._blendFunc.dst);
+ var color = node.getColor(), locSkeleton = node._skeleton;
+ locSkeleton.r = color.r / 255;
+ locSkeleton.g = color.g / 255;
+ locSkeleton.b = color.b / 255;
+ locSkeleton.a = node.getOpacity() / 255;
+ if (node._premultipliedAlpha) {
+ locSkeleton.r *= locSkeleton.a;
+ locSkeleton.g *= locSkeleton.a;
+ locSkeleton.b *= locSkeleton.a;
+ }
+
+ var additive, textureAtlas, attachment, slot, i, n;
+ var locBlendFunc = node._blendFunc;
+
+ //for (i = 0, n = locSkeleton.slots.length; i < n; i++) {
+ for (i = 0, n = locSkeleton.drawOrder.length; i < n; i++) {
+ slot = locSkeleton.drawOrder[i];
+ if (!slot.attachment)
+ continue;
+ attachment = slot.attachment;
+
+ switch(slot.attachment.type) {
+ case sp.ATTACHMENT_TYPE.REGION:
+ this._updateRegionAttachmentQuad(attachment, slot, tmpQuad, node._premultipliedAlpha);
+ break;
+ case sp.ATTACHMENT_TYPE.MESH:
+ this._updateMeshAttachmentQuad(attachment, slot, tmpQuad, node._premultipliedAlpha);
+ break;
+ case sp.ATTACHMENT_TYPE.SKINNED_MESH:
+ break;
+ default:
+ continue;
+ }
+
+ var regionTextureAtlas = node.getTextureAtlas(attachment);
+
+ if (slot.data.additiveBlending != additive) {
+ if (textureAtlas) {
+ textureAtlas.drawQuads();
+ textureAtlas.removeAllQuads();
+ }
+ additive = !additive;
+ cc.glBlendFunc(locBlendFunc.src, additive ? cc.ONE : locBlendFunc.dst);
+ } else if (regionTextureAtlas != textureAtlas && textureAtlas) {
+ textureAtlas.drawQuads();
+ textureAtlas.removeAllQuads();
+ }
+ textureAtlas = regionTextureAtlas;
+
+ var quadCount = textureAtlas.getTotalQuads();
+ if (textureAtlas.getCapacity() == quadCount) {
+ textureAtlas.drawQuads();
+ textureAtlas.removeAllQuads();
+ if (!textureAtlas.resizeCapacity(textureAtlas.getCapacity() * 2))
+ return;
+ }
+
+ textureAtlas.updateQuad(tmpQuad, quadCount);
+ }
+
+ if (textureAtlas) {
+ textureAtlas.drawQuads();
+ textureAtlas.removeAllQuads();
+ }
+
+ if (node._debugBones || node._debugSlots) {
+ cc.kmGLMatrixMode(cc.KM_GL_MODELVIEW);
+ //cc.kmGLPushMatrixWitMat4(this._stackMatrix);
+ cc.current_stack.stack.push(cc.current_stack.top);
+ cc.current_stack.top = this._stackMatrix;
+ var drawingUtil = cc._drawingUtil;
+
+ if (node._debugSlots) {
+ // Slots.
+ drawingUtil.setDrawColor(0, 0, 255, 255);
+ drawingUtil.setLineWidth(1);
+
+ for (i = 0, n = locSkeleton.slots.length; i < n; i++) {
+ slot = locSkeleton.drawOrder[i];
+ if (!slot.attachment || slot.attachment.type != sp.ATTACHMENT_TYPE.REGION)
+ continue;
+ attachment = slot.attachment;
+ this._updateRegionAttachmentQuad(attachment, slot, tmpQuad);
+
+ var points = [];
+ points.push(cc.p(tmpQuad.bl.vertices.x, tmpQuad.bl.vertices.y));
+ points.push(cc.p(tmpQuad.br.vertices.x, tmpQuad.br.vertices.y));
+ points.push(cc.p(tmpQuad.tr.vertices.x, tmpQuad.tr.vertices.y));
+ points.push(cc.p(tmpQuad.tl.vertices.x, tmpQuad.tl.vertices.y));
+
+ drawingUtil.drawPoly(points, 4, true);
+ }
+ }
+
+ if (node._debugBones) {
+ // Bone lengths.
+ var bone;
+ drawingUtil.setLineWidth(2);
+ drawingUtil.setDrawColor(255, 0, 0, 255);
+
+ for (i = 0, n = locSkeleton.bones.length; i < n; i++) {
+ bone = locSkeleton.bones[i];
+ var x = bone.data.length * bone.m00 + bone.worldX;
+ var y = bone.data.length * bone.m10 + bone.worldY;
+ drawingUtil.drawLine(cc.p(bone.worldX, bone.worldY), cc.p(x, y));
+ }
+
+ // Bone origins.
+ drawingUtil.setPointSize(4);
+ drawingUtil.setDrawColor(0, 0, 255, 255); // Root bone is blue.
+
+ for (i = 0, n = locSkeleton.bones.length; i < n; i++) {
+ bone = locSkeleton.bones[i];
+ drawingUtil.drawPoint(cc.p(bone.worldX, bone.worldY));
+ if (i == 0) {
+ drawingUtil.setDrawColor(0, 255, 0, 255);
+ }
+ }
+ }
+ cc.kmGLPopMatrix();
+ }
+ };
+
+ proto._createChildFormSkeletonData = function(){};
+
+ proto._updateChild = function(){};
+
+ proto._updateRegionAttachmentQuad = function(self, slot, quad, premultipliedAlpha) {
+ var vertices = {};
+ self.computeVertices(slot.bone.skeleton.x, slot.bone.skeleton.y, slot.bone, vertices);
+ var r = slot.bone.skeleton.r * slot.r * 255;
+ var g = slot.bone.skeleton.g * slot.g * 255;
+ var b = slot.bone.skeleton.b * slot.b * 255;
+ var normalizedAlpha = slot.bone.skeleton.a * slot.a;
+
+ if (premultipliedAlpha) {
+ r *= normalizedAlpha;
+ g *= normalizedAlpha;
+ b *= normalizedAlpha;
+ }
+ var a = normalizedAlpha * 255;
+
+ quad.bl.colors.r = quad.tl.colors.r = quad.tr.colors.r = quad.br.colors.r = r;
+ quad.bl.colors.g = quad.tl.colors.g = quad.tr.colors.g = quad.br.colors.g = g;
+ quad.bl.colors.b = quad.tl.colors.b = quad.tr.colors.b = quad.br.colors.b = b;
+ quad.bl.colors.a = quad.tl.colors.a = quad.tr.colors.a = quad.br.colors.a = a;
+
+ var VERTEX = sp.VERTEX_INDEX;
+ quad.bl.vertices.x = vertices[VERTEX.X1];
+ quad.bl.vertices.y = vertices[VERTEX.Y1];
+ quad.tl.vertices.x = vertices[VERTEX.X2];
+ quad.tl.vertices.y = vertices[VERTEX.Y2];
+ quad.tr.vertices.x = vertices[VERTEX.X3];
+ quad.tr.vertices.y = vertices[VERTEX.Y3];
+ quad.br.vertices.x = vertices[VERTEX.X4];
+ quad.br.vertices.y = vertices[VERTEX.Y4];
+
+ quad.bl.texCoords.u = self.uvs[VERTEX.X1];
+ quad.bl.texCoords.v = self.uvs[VERTEX.Y1];
+ quad.tl.texCoords.u = self.uvs[VERTEX.X2];
+ quad.tl.texCoords.v = self.uvs[VERTEX.Y2];
+ quad.tr.texCoords.u = self.uvs[VERTEX.X3];
+ quad.tr.texCoords.v = self.uvs[VERTEX.Y3];
+ quad.br.texCoords.u = self.uvs[VERTEX.X4];
+ quad.br.texCoords.v = self.uvs[VERTEX.Y4];
+ };
+
+ proto._updateMeshAttachmentQuad = function(self, slot, quad, premultipliedAlpha) {
+ var vertices = {};
+ self.computeWorldVertices(slot.bone.x, slot.bone.y, slot, vertices);
+ var r = slot.bone.skeleton.r * slot.r * 255;
+ var g = slot.bone.skeleton.g * slot.g * 255;
+ var b = slot.bone.skeleton.b * slot.b * 255;
+ var normalizedAlpha = slot.bone.skeleton.a * slot.a;
+ if (premultipliedAlpha) {
+ r *= normalizedAlpha;
+ g *= normalizedAlpha;
+ b *= normalizedAlpha;
+ }
+ var a = normalizedAlpha * 255;
+
+ quad.bl.colors.r = quad.tl.colors.r = quad.tr.colors.r = quad.br.colors.r = r;
+ quad.bl.colors.g = quad.tl.colors.g = quad.tr.colors.g = quad.br.colors.g = g;
+ quad.bl.colors.b = quad.tl.colors.b = quad.tr.colors.b = quad.br.colors.b = b;
+ quad.bl.colors.a = quad.tl.colors.a = quad.tr.colors.a = quad.br.colors.a = a;
+
+ var VERTEX = sp.VERTEX_INDEX;
+ quad.bl.vertices.x = vertices[VERTEX.X1];
+ quad.bl.vertices.y = vertices[VERTEX.Y1];
+ quad.tl.vertices.x = vertices[VERTEX.X2];
+ quad.tl.vertices.y = vertices[VERTEX.Y2];
+ quad.tr.vertices.x = vertices[VERTEX.X3];
+ quad.tr.vertices.y = vertices[VERTEX.Y3];
+ quad.br.vertices.x = vertices[VERTEX.X4];
+ quad.br.vertices.y = vertices[VERTEX.Y4];
+
+ quad.bl.texCoords.u = self.uvs[VERTEX.X1];
+ quad.bl.texCoords.v = self.uvs[VERTEX.Y1];
+ quad.tl.texCoords.u = self.uvs[VERTEX.X2];
+ quad.tl.texCoords.v = self.uvs[VERTEX.Y2];
+ quad.tr.texCoords.u = self.uvs[VERTEX.X3];
+ quad.tr.texCoords.v = self.uvs[VERTEX.Y3];
+ quad.br.texCoords.u = self.uvs[VERTEX.X4];
+ quad.br.texCoords.v = self.uvs[VERTEX.Y4];
+ };
+})();
\ No newline at end of file
diff --git a/extensions/spine/Spine.js b/extensions/spine/Spine.js
new file mode 100644
index 0000000000..7a25bab80e
--- /dev/null
+++ b/extensions/spine/Spine.js
@@ -0,0 +1,2628 @@
+/******************************************************************************
+ * Spine Runtimes Software License
+ * Version 2.1
+ *
+ * Copyright (c) 2013, Esoteric Software
+ * All rights reserved.
+ *
+ * You are granted a perpetual, non-exclusive, non-sublicensable and
+ * non-transferable license to install, execute and perform the Spine Runtimes
+ * Software (the "Software") solely for internal use. Without the written
+ * permission of Esoteric Software (typically granted by licensing Spine), you
+ * may not (a) modify, translate, adapt or otherwise create derivative works,
+ * improvements of the Software or develop new applications using the Software
+ * or (b) remove, delete, alter or obscure any trademarks or any copyright,
+ * trademark, patent or other intellectual property or proprietary rights
+ * notices on or in the Software, including any copy thereof. Redistributions
+ * in binary or source form must include this license and terms.
+ *
+ * THIS SOFTWARE IS PROVIDED BY ESOTERIC SOFTWARE "AS IS" AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+ * EVENT SHALL ESOTERIC SOFTARE BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *****************************************************************************/
+
+var spine = {
+ radDeg: 180 / Math.PI,
+ degRad: Math.PI / 180,
+ temp: [],
+ Float32Array: (typeof(Float32Array) === 'undefined') ? Array : Float32Array,
+ Uint16Array: (typeof(Uint16Array) === 'undefined') ? Array : Uint16Array
+};
+
+spine.BoneData = function (name, parent) {
+ this.name = name;
+ this.parent = parent;
+};
+spine.BoneData.prototype = {
+ length: 0,
+ x: 0, y: 0,
+ rotation: 0,
+ scaleX: 1, scaleY: 1,
+ inheritScale: true,
+ inheritRotation: true,
+ flipX: false, flipY: false
+};
+
+spine.SlotData = function (name, boneData) {
+ this.name = name;
+ this.boneData = boneData;
+};
+spine.SlotData.prototype = {
+ r: 1, g: 1, b: 1, a: 1,
+ attachmentName: null,
+ additiveBlending: false
+};
+
+spine.IkConstraintData = function (name) {
+ this.name = name;
+ this.bones = [];
+};
+spine.IkConstraintData.prototype = {
+ target: null,
+ bendDirection: 1,
+ mix: 1
+};
+
+spine.Bone = function (boneData, skeleton, parent) {
+ this.data = boneData;
+ this.skeleton = skeleton;
+ this.parent = parent;
+ this.setToSetupPose();
+};
+spine.Bone.yDown = false;
+spine.Bone.prototype = {
+ x: 0, y: 0,
+ rotation: 0, rotationIK: 0,
+ scaleX: 1, scaleY: 1,
+ flipX: false, flipY: false,
+ m00: 0, m01: 0, worldX: 0, // a b x
+ m10: 0, m11: 0, worldY: 0, // c d y
+ worldRotation: 0,
+ worldScaleX: 1, worldScaleY: 1,
+ worldFlipX: false, worldFlipY: false,
+ updateWorldTransform: function () {
+ var parent = this.parent;
+ if (parent) {
+ this.worldX = this.x * parent.m00 + this.y * parent.m01 + parent.worldX;
+ this.worldY = this.x * parent.m10 + this.y * parent.m11 + parent.worldY;
+ if (this.data.inheritScale) {
+ this.worldScaleX = parent.worldScaleX * this.scaleX;
+ this.worldScaleY = parent.worldScaleY * this.scaleY;
+ } else {
+ this.worldScaleX = this.scaleX;
+ this.worldScaleY = this.scaleY;
+ }
+ this.worldRotation = this.data.inheritRotation ? (parent.worldRotation + this.rotationIK) : this.rotationIK;
+ this.worldFlipX = parent.worldFlipX != this.flipX;
+ this.worldFlipY = parent.worldFlipY != this.flipY;
+ } else {
+ var skeletonFlipX = this.skeleton.flipX, skeletonFlipY = this.skeleton.flipY;
+ this.worldX = skeletonFlipX ? -this.x : this.x;
+ this.worldY = (skeletonFlipY != spine.Bone.yDown) ? -this.y : this.y;
+ this.worldScaleX = this.scaleX;
+ this.worldScaleY = this.scaleY;
+ this.worldRotation = this.rotationIK;
+ this.worldFlipX = skeletonFlipX != this.flipX;
+ this.worldFlipY = skeletonFlipY != this.flipY;
+ }
+ var radians = this.worldRotation * spine.degRad;
+ var cos = Math.cos(radians);
+ var sin = Math.sin(radians);
+ if (this.worldFlipX) {
+ this.m00 = -cos * this.worldScaleX;
+ this.m01 = sin * this.worldScaleY;
+ } else {
+ this.m00 = cos * this.worldScaleX;
+ this.m01 = -sin * this.worldScaleY;
+ }
+ if (this.worldFlipY != spine.Bone.yDown) {
+ this.m10 = -sin * this.worldScaleX;
+ this.m11 = -cos * this.worldScaleY;
+ } else {
+ this.m10 = sin * this.worldScaleX;
+ this.m11 = cos * this.worldScaleY;
+ }
+ },
+ setToSetupPose: function () {
+ var data = this.data;
+ this.x = data.x;
+ this.y = data.y;
+ this.rotation = data.rotation;
+ this.rotationIK = this.rotation;
+ this.scaleX = data.scaleX;
+ this.scaleY = data.scaleY;
+ this.flipX = data.flipX;
+ this.flipY = data.flipY;
+ },
+ worldToLocal: function (world) {
+ var dx = world[0] - this.worldX, dy = world[1] - this.worldY;
+ var m00 = this.m00, m10 = this.m10, m01 = this.m01, m11 = this.m11;
+ if (this.worldFlipX != (this.worldFlipY != spine.Bone.yDown)) {
+ m00 = -m00;
+ m11 = -m11;
+ }
+ var invDet = 1 / (m00 * m11 - m01 * m10);
+ world[0] = dx * m00 * invDet - dy * m01 * invDet;
+ world[1] = dy * m11 * invDet - dx * m10 * invDet;
+ },
+ localToWorld: function (local) {
+ var localX = local[0], localY = local[1];
+ local[0] = localX * this.m00 + localY * this.m01 + this.worldX;
+ local[1] = localX * this.m10 + localY * this.m11 + this.worldY;
+ }
+};
+
+spine.Slot = function (slotData, bone) {
+ this.data = slotData;
+ this.bone = bone;
+ this.setToSetupPose();
+};
+spine.Slot.prototype = {
+ r: 1, g: 1, b: 1, a: 1,
+ _attachmentTime: 0,
+ attachment: null,
+ attachmentVertices: [],
+ setAttachment: function (attachment) {
+ this.attachment = attachment;
+ this._attachmentTime = this.bone.skeleton.time;
+ this.attachmentVertices.length = 0;
+ },
+ setAttachmentTime: function (time) {
+ this._attachmentTime = this.bone.skeleton.time - time;
+ },
+ getAttachmentTime: function () {
+ return this.bone.skeleton.time - this._attachmentTime;
+ },
+ setToSetupPose: function () {
+ var data = this.data;
+ this.r = data.r;
+ this.g = data.g;
+ this.b = data.b;
+ this.a = data.a;
+
+ var slotDatas = this.bone.skeleton.data.slots;
+ for (var i = 0, n = slotDatas.length; i < n; i++) {
+ if (slotDatas[i] == data) {
+ this.setAttachment(!data.attachmentName ? null : this.bone.skeleton.getAttachmentBySlotIndex(i, data.attachmentName));
+ break;
+ }
+ }
+ }
+};
+
+spine.IkConstraint = function (data, skeleton) {
+ this.data = data;
+ this.mix = data.mix;
+ this.bendDirection = data.bendDirection;
+
+ this.bones = [];
+ for (var i = 0, n = data.bones.length; i < n; i++)
+ this.bones.push(skeleton.findBone(data.bones[i].name));
+ this.target = skeleton.findBone(data.target.name);
+};
+spine.IkConstraint.prototype = {
+ apply: function () {
+ var target = this.target;
+ var bones = this.bones;
+ switch (bones.length) {
+ case 1:
+ spine.IkConstraint.apply1(bones[0], target.worldX, target.worldY, this.mix);
+ break;
+ case 2:
+ spine.IkConstraint.apply2(bones[0], bones[1], target.worldX, target.worldY, this.bendDirection, this.mix);
+ break;
+ }
+ }
+};
+/** Adjusts the bone rotation so the tip is as close to the target position as possible. The target is specified in the world
+ * coordinate system. */
+spine.IkConstraint.apply1 = function (bone, targetX, targetY, alpha) {
+ var parentRotation = (!bone.data.inheritRotation || !bone.parent) ? 0 : bone.parent.worldRotation;
+ var rotation = bone.rotation;
+ var rotationIK = Math.atan2(targetY - bone.worldY, targetX - bone.worldX) * spine.radDeg;
+ if (bone.worldFlipX != (bone.worldFlipY != spine.Bone.yDown)) rotationIK = -rotationIK;
+ rotationIK -= parentRotation;
+ bone.rotationIK = rotation + (rotationIK - rotation) * alpha;
+};
+/** Adjusts the parent and child bone rotations so the tip of the child is as close to the target position as possible. The
+ * target is specified in the world coordinate system.
+ * @param child Any descendant bone of the parent. */
+spine.IkConstraint.apply2 = function (parent, child, targetX, targetY, bendDirection, alpha) {
+ var childRotation = child.rotation, parentRotation = parent.rotation;
+ if (!alpha) {
+ child.rotationIK = childRotation;
+ parent.rotationIK = parentRotation;
+ return;
+ }
+ var positionX, positionY, tempPosition = spine.temp;
+ var parentParent = parent.parent;
+ if (parentParent) {
+ tempPosition[0] = targetX;
+ tempPosition[1] = targetY;
+ parentParent.worldToLocal(tempPosition);
+ targetX = (tempPosition[0] - parent.x) * parentParent.worldScaleX;
+ targetY = (tempPosition[1] - parent.y) * parentParent.worldScaleY;
+ } else {
+ targetX -= parent.x;
+ targetY -= parent.y;
+ }
+ if (child.parent == parent) {
+ positionX = child.x;
+ positionY = child.y;
+ } else {
+ tempPosition[0] = child.x;
+ tempPosition[1] = child.y;
+ child.parent.localToWorld(tempPosition);
+ parent.worldToLocal(tempPosition);
+ positionX = tempPosition[0];
+ positionY = tempPosition[1];
+ }
+ var childX = positionX * parent.worldScaleX, childY = positionY * parent.worldScaleY;
+ var offset = Math.atan2(childY, childX);
+ var len1 = Math.sqrt(childX * childX + childY * childY), len2 = child.data.length * child.worldScaleX;
+ // Based on code by Ryan Juckett with permission: Copyright (c) 2008-2009 Ryan Juckett, http://www.ryanjuckett.com/
+ var cosDenom = 2 * len1 * len2;
+ if (cosDenom < 0.0001) {
+ child.rotationIK = childRotation + (Math.atan2(targetY, targetX) * spine.radDeg - parentRotation - childRotation) * alpha;
+ return;
+ }
+ var cos = (targetX * targetX + targetY * targetY - len1 * len1 - len2 * len2) / cosDenom;
+ if (cos < -1)
+ cos = -1;
+ else if (cos > 1)
+ cos = 1;
+ var childAngle = Math.acos(cos) * bendDirection;
+ var adjacent = len1 + len2 * cos, opposite = len2 * Math.sin(childAngle);
+ var parentAngle = Math.atan2(targetY * adjacent - targetX * opposite, targetX * adjacent + targetY * opposite);
+ var rotation = (parentAngle - offset) * spine.radDeg - parentRotation;
+ if (rotation > 180)
+ rotation -= 360;
+ else if (rotation < -180) //
+ rotation += 360;
+ parent.rotationIK = parentRotation + rotation * alpha;
+ rotation = (childAngle + offset) * spine.radDeg - childRotation;
+ if (rotation > 180)
+ rotation -= 360;
+ else if (rotation < -180) //
+ rotation += 360;
+ child.rotationIK = childRotation + (rotation + parent.worldRotation - child.parent.worldRotation) * alpha;
+};
+
+spine.Skin = function (name) {
+ this.name = name;
+ this.attachments = {};
+};
+spine.Skin.prototype = {
+ addAttachment: function (slotIndex, name, attachment) {
+ this.attachments[slotIndex + ":" + name] = attachment;
+ },
+ getAttachment: function (slotIndex, name) {
+ return this.attachments[slotIndex + ":" + name];
+ },
+ _attachAll: function (skeleton, oldSkin) {
+ for (var key in oldSkin.attachments) {
+ var colon = key.indexOf(":");
+ var slotIndex = parseInt(key.substring(0, colon));
+ var name = key.substring(colon + 1);
+ var slot = skeleton.slots[slotIndex];
+ if (slot.attachment && slot.attachment.name == name) {
+ var attachment = this.getAttachment(slotIndex, name);
+ if (attachment) slot.setAttachment(attachment);
+ }
+ }
+ }
+};
+
+spine.Animation = function (name, timelines, duration) {
+ this.name = name;
+ this.timelines = timelines;
+ this.duration = duration;
+};
+spine.Animation.prototype = {
+ apply: function (skeleton, lastTime, time, loop, events) {
+ if (loop && this.duration != 0) {
+ time %= this.duration;
+ lastTime %= this.duration;
+ }
+ var timelines = this.timelines;
+ for (var i = 0, n = timelines.length; i < n; i++)
+ timelines[i].apply(skeleton, lastTime, time, events, 1);
+ },
+ mix: function (skeleton, lastTime, time, loop, events, alpha) {
+ if (loop && this.duration != 0) {
+ time %= this.duration;
+ lastTime %= this.duration;
+ }
+ var timelines = this.timelines;
+ for (var i = 0, n = timelines.length; i < n; i++)
+ timelines[i].apply(skeleton, lastTime, time, events, alpha);
+ }
+};
+spine.Animation.binarySearch = function (values, target, step) {
+ var low = 0;
+ var high = Math.floor(values.length / step) - 2;
+ if (!high) return step;
+ var current = high >>> 1;
+ while (true) {
+ if (values[(current + 1) * step] <= target)
+ low = current + 1;
+ else
+ high = current;
+ if (low == high) return (low + 1) * step;
+ current = (low + high) >>> 1;
+ }
+};
+spine.Animation.binarySearch1 = function (values, target) {
+ var low = 0;
+ var high = values.length - 2;
+ if (!high) return 1;
+ var current = high >>> 1;
+ while (true) {
+ if (values[current + 1] <= target)
+ low = current + 1;
+ else
+ high = current;
+ if (low == high) return low + 1;
+ current = (low + high) >>> 1;
+ }
+};
+spine.Animation.linearSearch = function (values, target, step) {
+ for (var i = 0, last = values.length - step; i <= last; i += step)
+ if (values[i] > target) return i;
+ return -1;
+};
+
+spine.Curves = function (frameCount) {
+ this.curves = []; // type, x, y, ...
+ //this.curves.length = (frameCount - 1) * 19/*BEZIER_SIZE*/;
+};
+spine.Curves.prototype = {
+ setLinear: function (frameIndex) {
+ this.curves[frameIndex * 19/*BEZIER_SIZE*/] = 0/*LINEAR*/;
+ },
+ setStepped: function (frameIndex) {
+ this.curves[frameIndex * 19/*BEZIER_SIZE*/] = 1/*STEPPED*/;
+ },
+ /** Sets the control handle positions for an interpolation bezier curve used to transition from this keyframe to the next.
+ * cx1 and cx2 are from 0 to 1, representing the percent of time between the two keyframes. cy1 and cy2 are the percent of
+ * the difference between the keyframe's values. */
+ setCurve: function (frameIndex, cx1, cy1, cx2, cy2) {
+ var subdiv1 = 1 / 10/*BEZIER_SEGMENTS*/, subdiv2 = subdiv1 * subdiv1, subdiv3 = subdiv2 * subdiv1;
+ var pre1 = 3 * subdiv1, pre2 = 3 * subdiv2, pre4 = 6 * subdiv2, pre5 = 6 * subdiv3;
+ var tmp1x = -cx1 * 2 + cx2, tmp1y = -cy1 * 2 + cy2, tmp2x = (cx1 - cx2) * 3 + 1, tmp2y = (cy1 - cy2) * 3 + 1;
+ var dfx = cx1 * pre1 + tmp1x * pre2 + tmp2x * subdiv3, dfy = cy1 * pre1 + tmp1y * pre2 + tmp2y * subdiv3;
+ var ddfx = tmp1x * pre4 + tmp2x * pre5, ddfy = tmp1y * pre4 + tmp2y * pre5;
+ var dddfx = tmp2x * pre5, dddfy = tmp2y * pre5;
+
+ var i = frameIndex * 19/*BEZIER_SIZE*/;
+ var curves = this.curves;
+ curves[i++] = 2/*BEZIER*/;
+
+ var x = dfx, y = dfy;
+ for (var n = i + 19/*BEZIER_SIZE*/ - 1; i < n; i += 2) {
+ curves[i] = x;
+ curves[i + 1] = y;
+ dfx += ddfx;
+ dfy += ddfy;
+ ddfx += dddfx;
+ ddfy += dddfy;
+ x += dfx;
+ y += dfy;
+ }
+ },
+ getCurvePercent: function (frameIndex, percent) {
+ percent = percent < 0 ? 0 : (percent > 1 ? 1 : percent);
+ var curves = this.curves;
+ var i = frameIndex * 19/*BEZIER_SIZE*/;
+ var type = curves[i];
+ if (type === 0/*LINEAR*/) return percent;
+ if (type == 1/*STEPPED*/) return 0;
+ i++;
+ var x = 0;
+ for (var start = i, n = i + 19/*BEZIER_SIZE*/ - 1; i < n; i += 2) {
+ x = curves[i];
+ if (x >= percent) {
+ var prevX, prevY;
+ if (i == start) {
+ prevX = 0;
+ prevY = 0;
+ } else {
+ prevX = curves[i - 2];
+ prevY = curves[i - 1];
+ }
+ return prevY + (curves[i + 1] - prevY) * (percent - prevX) / (x - prevX);
+ }
+ }
+ var y = curves[i - 1];
+ return y + (1 - y) * (percent - x) / (1 - x); // Last point is 1,1.
+ }
+};
+
+spine.RotateTimeline = function (frameCount) {
+ this.curves = new spine.Curves(frameCount);
+ this.frames = []; // time, angle, ...
+ this.frames.length = frameCount * 2;
+};
+spine.RotateTimeline.prototype = {
+ boneIndex: 0,
+ getFrameCount: function () {
+ return this.frames.length / 2;
+ },
+ setFrame: function (frameIndex, time, angle) {
+ frameIndex *= 2;
+ this.frames[frameIndex] = time;
+ this.frames[frameIndex + 1] = angle;
+ },
+ apply: function (skeleton, lastTime, time, firedEvents, alpha) {
+ var frames = this.frames;
+ if (time < frames[0]) return; // Time is before first frame.
+
+ var bone = skeleton.bones[this.boneIndex];
+
+ if (time >= frames[frames.length - 2]) { // Time is after last frame.
+ var amount = bone.data.rotation + frames[frames.length - 1] - bone.rotation;
+ while (amount > 180)
+ amount -= 360;
+ while (amount < -180)
+ amount += 360;
+ bone.rotation += amount * alpha;
+ return;
+ }
+
+ // Interpolate between the previous frame and the current frame.
+ var frameIndex = spine.Animation.binarySearch(frames, time, 2);
+ var prevFrameValue = frames[frameIndex - 1];
+ var frameTime = frames[frameIndex];
+ var percent = 1 - (time - frameTime) / (frames[frameIndex - 2/*PREV_FRAME_TIME*/] - frameTime);
+ percent = this.curves.getCurvePercent(frameIndex / 2 - 1, percent);
+
+ var amount = frames[frameIndex + 1/*FRAME_VALUE*/] - prevFrameValue;
+ while (amount > 180)
+ amount -= 360;
+ while (amount < -180)
+ amount += 360;
+ amount = bone.data.rotation + (prevFrameValue + amount * percent) - bone.rotation;
+ while (amount > 180)
+ amount -= 360;
+ while (amount < -180)
+ amount += 360;
+ bone.rotation += amount * alpha;
+ }
+};
+
+spine.TranslateTimeline = function (frameCount) {
+ this.curves = new spine.Curves(frameCount);
+ this.frames = []; // time, x, y, ...
+ this.frames.length = frameCount * 3;
+};
+spine.TranslateTimeline.prototype = {
+ boneIndex: 0,
+ getFrameCount: function () {
+ return this.frames.length / 3;
+ },
+ setFrame: function (frameIndex, time, x, y) {
+ frameIndex *= 3;
+ this.frames[frameIndex] = time;
+ this.frames[frameIndex + 1] = x;
+ this.frames[frameIndex + 2] = y;
+ },
+ apply: function (skeleton, lastTime, time, firedEvents, alpha) {
+ var frames = this.frames;
+ if (time < frames[0]) return; // Time is before first frame.
+
+ var bone = skeleton.bones[this.boneIndex];
+
+ if (time >= frames[frames.length - 3]) { // Time is after last frame.
+ bone.x += (bone.data.x + frames[frames.length - 2] - bone.x) * alpha;
+ bone.y += (bone.data.y + frames[frames.length - 1] - bone.y) * alpha;
+ return;
+ }
+
+ // Interpolate between the previous frame and the current frame.
+ var frameIndex = spine.Animation.binarySearch(frames, time, 3);
+ var prevFrameX = frames[frameIndex - 2];
+ var prevFrameY = frames[frameIndex - 1];
+ var frameTime = frames[frameIndex];
+ var percent = 1 - (time - frameTime) / (frames[frameIndex + -3/*PREV_FRAME_TIME*/] - frameTime);
+ percent = this.curves.getCurvePercent(frameIndex / 3 - 1, percent);
+
+ bone.x += (bone.data.x + prevFrameX + (frames[frameIndex + 1/*FRAME_X*/] - prevFrameX) * percent - bone.x) * alpha;
+ bone.y += (bone.data.y + prevFrameY + (frames[frameIndex + 2/*FRAME_Y*/] - prevFrameY) * percent - bone.y) * alpha;
+ }
+};
+
+spine.ScaleTimeline = function (frameCount) {
+ this.curves = new spine.Curves(frameCount);
+ this.frames = []; // time, x, y, ...
+ this.frames.length = frameCount * 3;
+};
+spine.ScaleTimeline.prototype = {
+ boneIndex: 0,
+ getFrameCount: function () {
+ return this.frames.length / 3;
+ },
+ setFrame: function (frameIndex, time, x, y) {
+ frameIndex *= 3;
+ this.frames[frameIndex] = time;
+ this.frames[frameIndex + 1] = x;
+ this.frames[frameIndex + 2] = y;
+ },
+ apply: function (skeleton, lastTime, time, firedEvents, alpha) {
+ var frames = this.frames;
+ if (time < frames[0]) return; // Time is before first frame.
+
+ var bone = skeleton.bones[this.boneIndex];
+
+ if (time >= frames[frames.length - 3]) { // Time is after last frame.
+ bone.scaleX += (bone.data.scaleX * frames[frames.length - 2] - bone.scaleX) * alpha;
+ bone.scaleY += (bone.data.scaleY * frames[frames.length - 1] - bone.scaleY) * alpha;
+ return;
+ }
+
+ // Interpolate between the previous frame and the current frame.
+ var frameIndex = spine.Animation.binarySearch(frames, time, 3);
+ var prevFrameX = frames[frameIndex - 2];
+ var prevFrameY = frames[frameIndex - 1];
+ var frameTime = frames[frameIndex];
+ var percent = 1 - (time - frameTime) / (frames[frameIndex + -3/*PREV_FRAME_TIME*/] - frameTime);
+ percent = this.curves.getCurvePercent(frameIndex / 3 - 1, percent);
+
+ bone.scaleX += (bone.data.scaleX * (prevFrameX + (frames[frameIndex + 1/*FRAME_X*/] - prevFrameX) * percent) - bone.scaleX) * alpha;
+ bone.scaleY += (bone.data.scaleY * (prevFrameY + (frames[frameIndex + 2/*FRAME_Y*/] - prevFrameY) * percent) - bone.scaleY) * alpha;
+ }
+};
+
+spine.ColorTimeline = function (frameCount) {
+ this.curves = new spine.Curves(frameCount);
+ this.frames = []; // time, r, g, b, a, ...
+ this.frames.length = frameCount * 5;
+};
+spine.ColorTimeline.prototype = {
+ slotIndex: 0,
+ getFrameCount: function () {
+ return this.frames.length / 5;
+ },
+ setFrame: function (frameIndex, time, r, g, b, a) {
+ frameIndex *= 5;
+ this.frames[frameIndex] = time;
+ this.frames[frameIndex + 1] = r;
+ this.frames[frameIndex + 2] = g;
+ this.frames[frameIndex + 3] = b;
+ this.frames[frameIndex + 4] = a;
+ },
+ apply: function (skeleton, lastTime, time, firedEvents, alpha) {
+ var frames = this.frames;
+ if (time < frames[0]) return; // Time is before first frame.
+
+ var r, g, b, a;
+ if (time >= frames[frames.length - 5]) {
+ // Time is after last frame.
+ var i = frames.length - 1;
+ r = frames[i - 3];
+ g = frames[i - 2];
+ b = frames[i - 1];
+ a = frames[i];
+ } else {
+ // Interpolate between the previous frame and the current frame.
+ var frameIndex = spine.Animation.binarySearch(frames, time, 5);
+ var prevFrameR = frames[frameIndex - 4];
+ var prevFrameG = frames[frameIndex - 3];
+ var prevFrameB = frames[frameIndex - 2];
+ var prevFrameA = frames[frameIndex - 1];
+ var frameTime = frames[frameIndex];
+ var percent = 1 - (time - frameTime) / (frames[frameIndex - 5/*PREV_FRAME_TIME*/] - frameTime);
+ percent = this.curves.getCurvePercent(frameIndex / 5 - 1, percent);
+
+ r = prevFrameR + (frames[frameIndex + 1/*FRAME_R*/] - prevFrameR) * percent;
+ g = prevFrameG + (frames[frameIndex + 2/*FRAME_G*/] - prevFrameG) * percent;
+ b = prevFrameB + (frames[frameIndex + 3/*FRAME_B*/] - prevFrameB) * percent;
+ a = prevFrameA + (frames[frameIndex + 4/*FRAME_A*/] - prevFrameA) * percent;
+ }
+ var slot = skeleton.slots[this.slotIndex];
+ if (alpha < 1) {
+ slot.r += (r - slot.r) * alpha;
+ slot.g += (g - slot.g) * alpha;
+ slot.b += (b - slot.b) * alpha;
+ slot.a += (a - slot.a) * alpha;
+ } else {
+ slot.r = r;
+ slot.g = g;
+ slot.b = b;
+ slot.a = a;
+ }
+ }
+};
+
+spine.AttachmentTimeline = function (frameCount) {
+ this.curves = new spine.Curves(frameCount);
+ this.frames = []; // time, ...
+ this.frames.length = frameCount;
+ this.attachmentNames = [];
+ this.attachmentNames.length = frameCount;
+};
+spine.AttachmentTimeline.prototype = {
+ slotIndex: 0,
+ getFrameCount: function () {
+ return this.frames.length;
+ },
+ setFrame: function (frameIndex, time, attachmentName) {
+ this.frames[frameIndex] = time;
+ this.attachmentNames[frameIndex] = attachmentName;
+ },
+ apply: function (skeleton, lastTime, time, firedEvents, alpha) {
+ var frames = this.frames;
+ if (time < frames[0]) {
+ if (lastTime > time) this.apply(skeleton, lastTime, Number.MAX_VALUE, null, 0);
+ return;
+ } else if (lastTime > time) //
+ lastTime = -1;
+
+ var frameIndex = time >= frames[frames.length - 1] ? frames.length - 1 : spine.Animation.binarySearch1(frames, time) - 1;
+ if (frames[frameIndex] < lastTime) return;
+
+ var attachmentName = this.attachmentNames[frameIndex];
+ skeleton.slots[this.slotIndex].setAttachment(
+ !attachmentName ? null : skeleton.getAttachmentBySlotIndex(this.slotIndex, attachmentName));
+ }
+};
+
+spine.EventTimeline = function (frameCount) {
+ this.frames = []; // time, ...
+ this.frames.length = frameCount;
+ this.events = [];
+ this.events.length = frameCount;
+};
+spine.EventTimeline.prototype = {
+ getFrameCount: function () {
+ return this.frames.length;
+ },
+ setFrame: function (frameIndex, time, event) {
+ this.frames[frameIndex] = time;
+ this.events[frameIndex] = event;
+ },
+ /** Fires events for frames > lastTime and <= time. */
+ apply: function (skeleton, lastTime, time, firedEvents, alpha) {
+ if (!firedEvents) return;
+
+ var frames = this.frames;
+ var frameCount = frames.length;
+
+ if (lastTime > time) { // Fire events after last time for looped animations.
+ this.apply(skeleton, lastTime, Number.MAX_VALUE, firedEvents, alpha);
+ lastTime = -1;
+ } else if (lastTime >= frames[frameCount - 1]) // Last time is after last frame.
+ return;
+ if (time < frames[0]) return; // Time is before first frame.
+
+ var frameIndex;
+ if (lastTime < frames[0])
+ frameIndex = 0;
+ else {
+ frameIndex = spine.Animation.binarySearch1(frames, lastTime);
+ var frame = frames[frameIndex];
+ while (frameIndex > 0) { // Fire multiple events with the same frame.
+ if (frames[frameIndex - 1] != frame) break;
+ frameIndex--;
+ }
+ }
+ var events = this.events;
+ for (; frameIndex < frameCount && time >= frames[frameIndex]; frameIndex++)
+ firedEvents.push(events[frameIndex]);
+ }
+};
+
+spine.DrawOrderTimeline = function (frameCount) {
+ this.frames = []; // time, ...
+ this.frames.length = frameCount;
+ this.drawOrders = [];
+ this.drawOrders.length = frameCount;
+};
+spine.DrawOrderTimeline.prototype = {
+ getFrameCount: function () {
+ return this.frames.length;
+ },
+ setFrame: function (frameIndex, time, drawOrder) {
+ this.frames[frameIndex] = time;
+ this.drawOrders[frameIndex] = drawOrder;
+ },
+ apply: function (skeleton, lastTime, time, firedEvents, alpha) {
+ var frames = this.frames;
+ if (time < frames[0]) return; // Time is before first frame.
+
+ var frameIndex;
+ if (time >= frames[frames.length - 1]) // Time is after last frame.
+ frameIndex = frames.length - 1;
+ else
+ frameIndex = spine.Animation.binarySearch1(frames, time) - 1;
+
+ var drawOrder = skeleton.drawOrder;
+ var slots = skeleton.slots;
+ var drawOrderToSetupIndex = this.drawOrders[frameIndex];
+ if (!drawOrderToSetupIndex) {
+ for (var i = 0, n = slots.length; i < n; i++)
+ drawOrder[i] = slots[i];
+ } else {
+ for (var i = 0, n = drawOrderToSetupIndex.length; i < n; i++)
+ drawOrder[i] = skeleton.slots[drawOrderToSetupIndex[i]];
+ }
+
+ }
+};
+
+spine.FfdTimeline = function (frameCount) {
+ this.curves = new spine.Curves(frameCount);
+ this.frames = [];
+ this.frames.length = frameCount;
+ this.frameVertices = [];
+ this.frameVertices.length = frameCount;
+};
+spine.FfdTimeline.prototype = {
+ slotIndex: 0,
+ attachment: 0,
+ getFrameCount: function () {
+ return this.frames.length;
+ },
+ setFrame: function (frameIndex, time, vertices) {
+ this.frames[frameIndex] = time;
+ this.frameVertices[frameIndex] = vertices;
+ },
+ apply: function (skeleton, lastTime, time, firedEvents, alpha) {
+ var slot = skeleton.slots[this.slotIndex];
+ if (slot.attachment != this.attachment) return;
+
+ var frames = this.frames;
+ if (time < frames[0]) return; // Time is before first frame.
+
+ var frameVertices = this.frameVertices;
+ var vertexCount = frameVertices[0].length;
+
+ var vertices = slot.attachmentVertices;
+ if (vertices.length != vertexCount) alpha = 1;
+ vertices.length = vertexCount;
+
+ if (time >= frames[frames.length - 1]) { // Time is after last frame.
+ var lastVertices = frameVertices[frames.length - 1];
+ if (alpha < 1) {
+ for (var i = 0; i < vertexCount; i++)
+ vertices[i] += (lastVertices[i] - vertices[i]) * alpha;
+ } else {
+ for (var i = 0; i < vertexCount; i++)
+ vertices[i] = lastVertices[i];
+ }
+ return;
+ }
+
+ // Interpolate between the previous frame and the current frame.
+ var frameIndex = spine.Animation.binarySearch1(frames, time);
+ var frameTime = frames[frameIndex];
+ var percent = 1 - (time - frameTime) / (frames[frameIndex - 1] - frameTime);
+ percent = this.curves.getCurvePercent(frameIndex - 1, percent < 0 ? 0 : (percent > 1 ? 1 : percent));
+
+ var prevVertices = frameVertices[frameIndex - 1];
+ var nextVertices = frameVertices[frameIndex];
+
+ if (alpha < 1) {
+ for (var i = 0; i < vertexCount; i++) {
+ var prev = prevVertices[i];
+ vertices[i] += (prev + (nextVertices[i] - prev) * percent - vertices[i]) * alpha;
+ }
+ } else {
+ for (var i = 0; i < vertexCount; i++) {
+ var prev = prevVertices[i];
+ vertices[i] = prev + (nextVertices[i] - prev) * percent;
+ }
+ }
+ }
+};
+
+spine.IkConstraintTimeline = function (frameCount) {
+ this.curves = new spine.Curves(frameCount);
+ this.frames = []; // time, mix, bendDirection, ...
+ this.frames.length = frameCount * 3;
+};
+spine.IkConstraintTimeline.prototype = {
+ ikConstraintIndex: 0,
+ getFrameCount: function () {
+ return this.frames.length / 3;
+ },
+ setFrame: function (frameIndex, time, mix, bendDirection) {
+ frameIndex *= 3;
+ this.frames[frameIndex] = time;
+ this.frames[frameIndex + 1] = mix;
+ this.frames[frameIndex + 2] = bendDirection;
+ },
+ apply: function (skeleton, lastTime, time, firedEvents, alpha) {
+ var frames = this.frames;
+ if (time < frames[0]) return; // Time is before first frame.
+
+ var ikConstraint = skeleton.ikConstraints[this.ikConstraintIndex];
+
+ if (time >= frames[frames.length - 3]) { // Time is after last frame.
+ ikConstraint.mix += (frames[frames.length - 2] - ikConstraint.mix) * alpha;
+ ikConstraint.bendDirection = frames[frames.length - 1];
+ return;
+ }
+
+ // Interpolate between the previous frame and the current frame.
+ var frameIndex = spine.Animation.binarySearch(frames, time, 3);
+ var prevFrameMix = frames[frameIndex + -2/*PREV_FRAME_MIX*/];
+ var frameTime = frames[frameIndex];
+ var percent = 1 - (time - frameTime) / (frames[frameIndex + -3/*PREV_FRAME_TIME*/] - frameTime);
+ percent = this.curves.getCurvePercent(frameIndex / 3 - 1, percent);
+
+ var mix = prevFrameMix + (frames[frameIndex + 1/*FRAME_MIX*/] - prevFrameMix) * percent;
+ ikConstraint.mix += (mix - ikConstraint.mix) * alpha;
+ ikConstraint.bendDirection = frames[frameIndex + -1/*PREV_FRAME_BEND_DIRECTION*/];
+ }
+};
+
+spine.FlipXTimeline = function (frameCount) {
+ this.curves = new spine.Curves(frameCount);
+ this.frames = []; // time, flip, ...
+ this.frames.length = frameCount * 2;
+};
+spine.FlipXTimeline.prototype = {
+ boneIndex: 0,
+ getFrameCount: function () {
+ return this.frames.length / 2;
+ },
+ setFrame: function (frameIndex, time, flip) {
+ frameIndex *= 2;
+ this.frames[frameIndex] = time;
+ this.frames[frameIndex + 1] = flip ? 1 : 0;
+ },
+ apply: function (skeleton, lastTime, time, firedEvents, alpha) {
+ var frames = this.frames;
+ if (time < frames[0]) {
+ if (lastTime > time) this.apply(skeleton, lastTime, Number.MAX_VALUE, null, 0);
+ return;
+ } else if (lastTime > time) //
+ lastTime = -1;
+ var frameIndex = (time >= frames[frames.length - 2] ? frames.length : spine.Animation.binarySearch(frames, time, 2)) - 2;
+ if (frames[frameIndex] < lastTime) return;
+ skeleton.bones[this.boneIndex].flipX = frames[frameIndex + 1] != 0;
+ }
+};
+
+spine.FlipYTimeline = function (frameCount) {
+ this.curves = new spine.Curves(frameCount);
+ this.frames = []; // time, flip, ...
+ this.frames.length = frameCount * 2;
+};
+spine.FlipYTimeline.prototype = {
+ boneIndex: 0,
+ getFrameCount: function () {
+ return this.frames.length / 2;
+ },
+ setFrame: function (frameIndex, time, flip) {
+ frameIndex *= 2;
+ this.frames[frameIndex] = time;
+ this.frames[frameIndex + 1] = flip ? 1 : 0;
+ },
+ apply: function (skeleton, lastTime, time, firedEvents, alpha) {
+ var frames = this.frames;
+ if (time < frames[0]) {
+ if (lastTime > time) this.apply(skeleton, lastTime, Number.MAX_VALUE, null, 0);
+ return;
+ } else if (lastTime > time) //
+ lastTime = -1;
+ var frameIndex = (time >= frames[frames.length - 2] ? frames.length : spine.Animation.binarySearch(frames, time, 2)) - 2;
+ if (frames[frameIndex] < lastTime) return;
+ skeleton.bones[this.boneIndex].flipY = frames[frameIndex + 1] != 0;
+ }
+};
+
+spine.SkeletonData = function () {
+ this.bones = [];
+ this.slots = [];
+ this.skins = [];
+ this.events = [];
+ this.animations = [];
+ this.ikConstraints = [];
+};
+spine.SkeletonData.prototype = {
+ name: null,
+ defaultSkin: null,
+ width: 0, height: 0,
+ version: null, hash: null,
+ /** @return May be null. */
+ findBone: function (boneName) {
+ var bones = this.bones;
+ for (var i = 0, n = bones.length; i < n; i++)
+ if (bones[i].name == boneName) return bones[i];
+ return null;
+ },
+ /** @return -1 if the bone was not found. */
+ findBoneIndex: function (boneName) {
+ var bones = this.bones;
+ for (var i = 0, n = bones.length; i < n; i++)
+ if (bones[i].name == boneName) return i;
+ return -1;
+ },
+ /** @return May be null. */
+ findSlot: function (slotName) {
+ var slots = this.slots;
+ for (var i = 0, n = slots.length; i < n; i++) {
+ if (slots[i].name == slotName) return slot[i];
+ }
+ return null;
+ },
+ /** @return -1 if the bone was not found. */
+ findSlotIndex: function (slotName) {
+ var slots = this.slots;
+ for (var i = 0, n = slots.length; i < n; i++)
+ if (slots[i].name == slotName) return i;
+ return -1;
+ },
+ /** @return May be null. */
+ findSkin: function (skinName) {
+ var skins = this.skins;
+ for (var i = 0, n = skins.length; i < n; i++)
+ if (skins[i].name == skinName) return skins[i];
+ return null;
+ },
+ /** @return May be null. */
+ findEvent: function (eventName) {
+ var events = this.events;
+ for (var i = 0, n = events.length; i < n; i++)
+ if (events[i].name == eventName) return events[i];
+ return null;
+ },
+ /** @return May be null. */
+ findAnimation: function (animationName) {
+ var animations = this.animations;
+ for (var i = 0, n = animations.length; i < n; i++)
+ if (animations[i].name == animationName) return animations[i];
+ return null;
+ },
+ /** @return May be null. */
+ findIkConstraint: function (ikConstraintName) {
+ var ikConstraints = this.ikConstraints;
+ for (var i = 0, n = ikConstraints.length; i < n; i++)
+ if (ikConstraints[i].name == ikConstraintName) return ikConstraints[i];
+ return null;
+ }
+};
+
+spine.Skeleton = function (skeletonData) {
+ this.data = skeletonData;
+
+ this.bones = [];
+ for (var i = 0, n = skeletonData.bones.length; i < n; i++) {
+ var boneData = skeletonData.bones[i];
+ var parent = !boneData.parent ? null : this.bones[skeletonData.bones.indexOf(boneData.parent)];
+ this.bones.push(new spine.Bone(boneData, this, parent));
+ }
+
+ this.slots = [];
+ this.drawOrder = [];
+ for (var i = 0, n = skeletonData.slots.length; i < n; i++) {
+ var slotData = skeletonData.slots[i];
+ var bone = this.bones[skeletonData.bones.indexOf(slotData.boneData)];
+ var slot = new spine.Slot(slotData, bone);
+ this.slots.push(slot);
+ this.drawOrder.push(slot);
+ }
+
+ this.ikConstraints = [];
+ for (var i = 0, n = skeletonData.ikConstraints.length; i < n; i++)
+ this.ikConstraints.push(new spine.IkConstraint(skeletonData.ikConstraints[i], this));
+
+ this.boneCache = [];
+ this.updateCache();
+};
+spine.Skeleton.prototype = {
+ x: 0, y: 0,
+ skin: null,
+ r: 1, g: 1, b: 1, a: 1,
+ time: 0,
+ flipX: false, flipY: false,
+ /** Caches information about bones and IK constraints. Must be called if bones or IK constraints are added or removed. */
+ updateCache: function () {
+ var ikConstraints = this.ikConstraints;
+ var ikConstraintsCount = ikConstraints.length;
+
+ var arrayCount = ikConstraintsCount + 1;
+ var boneCache = this.boneCache;
+ if (boneCache.length > arrayCount) boneCache.length = arrayCount;
+ for (var i = 0, n = boneCache.length; i < n; i++)
+ boneCache[i].length = 0;
+ while (boneCache.length < arrayCount)
+ boneCache[boneCache.length] = [];
+
+ var nonIkBones = boneCache[0];
+ var bones = this.bones;
+
+ outer:
+ for (var i = 0, n = bones.length; i < n; i++) {
+ var bone = bones[i];
+ var current = bone;
+ do {
+ for (var ii = 0; ii < ikConstraintsCount; ii++) {
+ var ikConstraint = ikConstraints[ii];
+ var parent = ikConstraint.bones[0];
+ var child= ikConstraint.bones[ikConstraint.bones.length - 1];
+ while (true) {
+ if (current == child) {
+ boneCache[ii].push(bone);
+ boneCache[ii + 1].push(bone);
+ continue outer;
+ }
+ if (child == parent) break;
+ child = child.parent;
+ }
+ }
+ current = current.parent;
+ } while (current);
+ nonIkBones[nonIkBones.length] = bone;
+ }
+ },
+ /** Updates the world transform for each bone. */
+ updateWorldTransform: function () {
+ var bones = this.bones;
+ for (var i = 0, n = bones.length; i < n; i++) {
+ var bone = bones[i];
+ bone.rotationIK = bone.rotation;
+ }
+ var i = 0, last = this.boneCache.length - 1;
+ while (true) {
+ var cacheBones = this.boneCache[i];
+ for (var ii = 0, nn = cacheBones.length; ii < nn; ii++)
+ cacheBones[ii].updateWorldTransform();
+ if (i == last) break;
+ this.ikConstraints[i].apply();
+ i++;
+ }
+ },
+ /** Sets the bones and slots to their setup pose values. */
+ setToSetupPose: function () {
+ this.setBonesToSetupPose();
+ this.setSlotsToSetupPose();
+ },
+ setBonesToSetupPose: function () {
+ var bones = this.bones;
+ for (var i = 0, n = bones.length; i < n; i++)
+ bones[i].setToSetupPose();
+
+ var ikConstraints = this.ikConstraints;
+ for (var i = 0, n = ikConstraints.length; i < n; i++) {
+ var ikConstraint = ikConstraints[i];
+ ikConstraint.bendDirection = ikConstraint.data.bendDirection;
+ ikConstraint.mix = ikConstraint.data.mix;
+ }
+ },
+ setSlotsToSetupPose: function () {
+ var slots = this.slots;
+ var drawOrder = this.drawOrder;
+ for (var i = 0, n = slots.length; i < n; i++) {
+ drawOrder[i] = slots[i];
+ slots[i].setToSetupPose(i);
+ }
+ },
+ /** @return May return null. */
+ getRootBone: function () {
+ return this.bones.length ? this.bones[0] : null;
+ },
+ /** @return May be null. */
+ findBone: function (boneName) {
+ var bones = this.bones;
+ for (var i = 0, n = bones.length; i < n; i++)
+ if (bones[i].data.name == boneName) return bones[i];
+ return null;
+ },
+ /** @return -1 if the bone was not found. */
+ findBoneIndex: function (boneName) {
+ var bones = this.bones;
+ for (var i = 0, n = bones.length; i < n; i++)
+ if (bones[i].data.name == boneName) return i;
+ return -1;
+ },
+ /** @return May be null. */
+ findSlot: function (slotName) {
+ var slots = this.slots;
+ for (var i = 0, n = slots.length; i < n; i++)
+ if (slots[i].data.name == slotName) return slots[i];
+ return null;
+ },
+ /** @return -1 if the bone was not found. */
+ findSlotIndex: function (slotName) {
+ var slots = this.slots;
+ for (var i = 0, n = slots.length; i < n; i++)
+ if (slots[i].data.name == slotName) return i;
+ return -1;
+ },
+ setSkinByName: function (skinName) {
+ var skin = this.data.findSkin(skinName);
+ if (!skin) throw "Skin not found: " + skinName;
+ this.setSkin(skin);
+ },
+ /** Sets the skin used to look up attachments before looking in the {@link SkeletonData#getDefaultSkin() default skin}.
+ * Attachments from the new skin are attached if the corresponding attachment from the old skin was attached. If there was
+ * no old skin, each slot's setup mode attachment is attached from the new skin.
+ * @param newSkin May be null. */
+ setSkin: function (newSkin) {
+ if (newSkin) {
+ if (this.skin)
+ newSkin._attachAll(this, this.skin);
+ else {
+ var slots = this.slots;
+ for (var i = 0, n = slots.length; i < n; i++) {
+ var slot = slots[i];
+ var name = slot.data.attachmentName;
+ if (name) {
+ var attachment = newSkin.getAttachment(i, name);
+ if (attachment) slot.setAttachment(attachment);
+ }
+ }
+ }
+ }
+ this.skin = newSkin;
+ },
+ /** @return May be null. */
+ getAttachmentBySlotName: function (slotName, attachmentName) {
+ return this.getAttachmentBySlotIndex(this.data.findSlotIndex(slotName), attachmentName);
+ },
+ /** @return May be null. */
+ getAttachmentBySlotIndex: function (slotIndex, attachmentName) {
+ if (this.skin) {
+ var attachment = this.skin.getAttachment(slotIndex, attachmentName);
+ if (attachment) return attachment;
+ }
+ if (this.data.defaultSkin) return this.data.defaultSkin.getAttachment(slotIndex, attachmentName);
+ return null;
+ },
+ /** @param attachmentName May be null. */
+ setAttachment: function (slotName, attachmentName) {
+ var slots = this.slots;
+ for (var i = 0, n = slots.length; i < n; i++) {
+ var slot = slots[i];
+ if (slot.data.name == slotName) {
+ var attachment = null;
+ if (attachmentName) {
+ attachment = this.getAttachmentBySlotIndex(i, attachmentName);
+ if (!attachment) throw "Attachment not found: " + attachmentName + ", for slot: " + slotName;
+ }
+ slot.setAttachment(attachment);
+ return;
+ }
+ }
+ throw "Slot not found: " + slotName;
+ },
+ /** @return May be null. */
+ findIkConstraint: function (ikConstraintName) {
+ var ikConstraints = this.ikConstraints;
+ for (var i = 0, n = ikConstraints.length; i < n; i++)
+ if (ikConstraints[i].data.name == ikConstraintName) return ikConstraints[i];
+ return null;
+ },
+ update: function (delta) {
+ this.time += delta;
+ }
+};
+
+spine.EventData = function (name) {
+ this.name = name;
+};
+spine.EventData.prototype = {
+ intValue: 0,
+ floatValue: 0,
+ stringValue: null
+};
+
+spine.Event = function (data) {
+ this.data = data;
+};
+spine.Event.prototype = {
+ intValue: 0,
+ floatValue: 0,
+ stringValue: null
+};
+
+spine.AttachmentType = {
+ region: 0,
+ boundingbox: 1,
+ mesh: 2,
+ skinnedmesh: 3
+};
+
+spine.RegionAttachment = function (name) {
+ this.name = name;
+ this.offset = [];
+ this.offset.length = 8;
+ this.uvs = [];
+ this.uvs.length = 8;
+};
+spine.RegionAttachment.prototype = {
+ type: spine.AttachmentType.region,
+ x: 0, y: 0,
+ rotation: 0,
+ scaleX: 1, scaleY: 1,
+ width: 0, height: 0,
+ r: 1, g: 1, b: 1, a: 1,
+ path: null,
+ rendererObject: null,
+ regionOffsetX: 0, regionOffsetY: 0,
+ regionWidth: 0, regionHeight: 0,
+ regionOriginalWidth: 0, regionOriginalHeight: 0,
+ setUVs: function (u, v, u2, v2, rotate) {
+ var uvs = this.uvs;
+ if (rotate) {
+ uvs[2/*X2*/] = u;
+ uvs[3/*Y2*/] = v2;
+ uvs[4/*X3*/] = u;
+ uvs[5/*Y3*/] = v;
+ uvs[6/*X4*/] = u2;
+ uvs[7/*Y4*/] = v;
+ uvs[0/*X1*/] = u2;
+ uvs[1/*Y1*/] = v2;
+ } else {
+ uvs[0/*X1*/] = u;
+ uvs[1/*Y1*/] = v2;
+ uvs[2/*X2*/] = u;
+ uvs[3/*Y2*/] = v;
+ uvs[4/*X3*/] = u2;
+ uvs[5/*Y3*/] = v;
+ uvs[6/*X4*/] = u2;
+ uvs[7/*Y4*/] = v2;
+ }
+ },
+ updateOffset: function () {
+ var regionScaleX = this.width / this.regionOriginalWidth * this.scaleX;
+ var regionScaleY = this.height / this.regionOriginalHeight * this.scaleY;
+ var localX = -this.width / 2 * this.scaleX + this.regionOffsetX * regionScaleX;
+ var localY = -this.height / 2 * this.scaleY + this.regionOffsetY * regionScaleY;
+ var localX2 = localX + this.regionWidth * regionScaleX;
+ var localY2 = localY + this.regionHeight * regionScaleY;
+ var radians = this.rotation * spine.degRad;
+ var cos = Math.cos(radians);
+ var sin = Math.sin(radians);
+ var localXCos = localX * cos + this.x;
+ var localXSin = localX * sin;
+ var localYCos = localY * cos + this.y;
+ var localYSin = localY * sin;
+ var localX2Cos = localX2 * cos + this.x;
+ var localX2Sin = localX2 * sin;
+ var localY2Cos = localY2 * cos + this.y;
+ var localY2Sin = localY2 * sin;
+ var offset = this.offset;
+ offset[0/*X1*/] = localXCos - localYSin;
+ offset[1/*Y1*/] = localYCos + localXSin;
+ offset[2/*X2*/] = localXCos - localY2Sin;
+ offset[3/*Y2*/] = localY2Cos + localXSin;
+ offset[4/*X3*/] = localX2Cos - localY2Sin;
+ offset[5/*Y3*/] = localY2Cos + localX2Sin;
+ offset[6/*X4*/] = localX2Cos - localYSin;
+ offset[7/*Y4*/] = localYCos + localX2Sin;
+ },
+ computeVertices: function (x, y, bone, vertices) {
+ x += bone.worldX;
+ y += bone.worldY;
+ var m00 = bone.m00, m01 = bone.m01, m10 = bone.m10, m11 = bone.m11;
+ var offset = this.offset;
+ vertices[0/*X1*/] = offset[0/*X1*/] * m00 + offset[1/*Y1*/] * m01 + x;
+ vertices[1/*Y1*/] = offset[0/*X1*/] * m10 + offset[1/*Y1*/] * m11 + y;
+ vertices[2/*X2*/] = offset[2/*X2*/] * m00 + offset[3/*Y2*/] * m01 + x;
+ vertices[3/*Y2*/] = offset[2/*X2*/] * m10 + offset[3/*Y2*/] * m11 + y;
+ vertices[4/*X3*/] = offset[4/*X3*/] * m00 + offset[5/*X3*/] * m01 + x;
+ vertices[5/*X3*/] = offset[4/*X3*/] * m10 + offset[5/*X3*/] * m11 + y;
+ vertices[6/*X4*/] = offset[6/*X4*/] * m00 + offset[7/*Y4*/] * m01 + x;
+ vertices[7/*Y4*/] = offset[6/*X4*/] * m10 + offset[7/*Y4*/] * m11 + y;
+ }
+};
+
+spine.MeshAttachment = function (name) {
+ this.name = name;
+};
+spine.MeshAttachment.prototype = {
+ type: spine.AttachmentType.mesh,
+ vertices: null,
+ uvs: null,
+ regionUVs: null,
+ triangles: null,
+ hullLength: 0,
+ r: 1, g: 1, b: 1, a: 1,
+ path: null,
+ rendererObject: null,
+ regionU: 0, regionV: 0, regionU2: 0, regionV2: 0, regionRotate: false,
+ regionOffsetX: 0, regionOffsetY: 0,
+ regionWidth: 0, regionHeight: 0,
+ regionOriginalWidth: 0, regionOriginalHeight: 0,
+ edges: null,
+ width: 0, height: 0,
+ updateUVs: function () {
+ var width = this.regionU2 - this.regionU, height = this.regionV2 - this.regionV;
+ var n = this.regionUVs.length;
+ if (!this.uvs || this.uvs.length != n) {
+ this.uvs = new spine.Float32Array(n);
+ }
+ if (this.regionRotate) {
+ for (var i = 0; i < n; i += 2) {
+ this.uvs[i] = this.regionU + this.regionUVs[i + 1] * width;
+ this.uvs[i + 1] = this.regionV + height - this.regionUVs[i] * height;
+ }
+ } else {
+ for (var i = 0; i < n; i += 2) {
+ this.uvs[i] = this.regionU + this.regionUVs[i] * width;
+ this.uvs[i + 1] = this.regionV + this.regionUVs[i + 1] * height;
+ }
+ }
+ },
+ computeWorldVertices: function (x, y, slot, worldVertices) {
+ var bone = slot.bone;
+ x += bone.worldX;
+ y += bone.worldY;
+ var m00 = bone.m00, m01 = bone.m01, m10 = bone.m10, m11 = bone.m11;
+ var vertices = this.vertices;
+ var verticesCount = vertices.length;
+ if (slot.attachmentVertices.length == verticesCount) vertices = slot.attachmentVertices;
+ for (var i = 0; i < verticesCount; i += 2) {
+ var vx = vertices[i];
+ var vy = vertices[i + 1];
+ worldVertices[i] = vx * m00 + vy * m01 + x;
+ worldVertices[i + 1] = vx * m10 + vy * m11 + y;
+ }
+ }
+};
+
+spine.SkinnedMeshAttachment = function (name) {
+ this.name = name;
+};
+spine.SkinnedMeshAttachment.prototype = {
+ type: spine.AttachmentType.skinnedmesh,
+ bones: null,
+ weights: null,
+ uvs: null,
+ regionUVs: null,
+ triangles: null,
+ hullLength: 0,
+ r: 1, g: 1, b: 1, a: 1,
+ path: null,
+ rendererObject: null,
+ regionU: 0, regionV: 0, regionU2: 0, regionV2: 0, regionRotate: false,
+ regionOffsetX: 0, regionOffsetY: 0,
+ regionWidth: 0, regionHeight: 0,
+ regionOriginalWidth: 0, regionOriginalHeight: 0,
+ edges: null,
+ width: 0, height: 0,
+ updateUVs: function (u, v, u2, v2, rotate) {
+ var width = this.regionU2 - this.regionU, height = this.regionV2 - this.regionV;
+ var n = this.regionUVs.length;
+ if (!this.uvs || this.uvs.length != n) {
+ this.uvs = new spine.Float32Array(n);
+ }
+ if (this.regionRotate) {
+ for (var i = 0; i < n; i += 2) {
+ this.uvs[i] = this.regionU + this.regionUVs[i + 1] * width;
+ this.uvs[i + 1] = this.regionV + height - this.regionUVs[i] * height;
+ }
+ } else {
+ for (var i = 0; i < n; i += 2) {
+ this.uvs[i] = this.regionU + this.regionUVs[i] * width;
+ this.uvs[i + 1] = this.regionV + this.regionUVs[i + 1] * height;
+ }
+ }
+ },
+ computeWorldVertices: function (x, y, slot, worldVertices) {
+ var skeletonBones = slot.bone.skeleton.bones;
+ var weights = this.weights;
+ var bones = this.bones;
+
+ var w = 0, v = 0, b = 0, f = 0, n = bones.length, nn;
+ var wx, wy, bone, vx, vy, weight;
+ if (!slot.attachmentVertices.length) {
+ for (; v < n; w += 2) {
+ wx = 0;
+ wy = 0;
+ nn = bones[v++] + v;
+ for (; v < nn; v++, b += 3) {
+ bone = skeletonBones[bones[v]];
+ vx = weights[b];
+ vy = weights[b + 1];
+ weight = weights[b + 2];
+ wx += (vx * bone.m00 + vy * bone.m01 + bone.worldX) * weight;
+ wy += (vx * bone.m10 + vy * bone.m11 + bone.worldY) * weight;
+ }
+ worldVertices[w] = wx + x;
+ worldVertices[w + 1] = wy + y;
+ }
+ } else {
+ var ffd = slot.attachmentVertices;
+ for (; v < n; w += 2) {
+ wx = 0;
+ wy = 0;
+ nn = bones[v++] + v;
+ for (; v < nn; v++, b += 3, f += 2) {
+ bone = skeletonBones[bones[v]];
+ vx = weights[b] + ffd[f];
+ vy = weights[b + 1] + ffd[f + 1];
+ weight = weights[b + 2];
+ wx += (vx * bone.m00 + vy * bone.m01 + bone.worldX) * weight;
+ wy += (vx * bone.m10 + vy * bone.m11 + bone.worldY) * weight;
+ }
+ worldVertices[w] = wx + x;
+ worldVertices[w + 1] = wy + y;
+ }
+ }
+ }
+};
+
+spine.BoundingBoxAttachment = function (name) {
+ this.name = name;
+ this.vertices = [];
+};
+spine.BoundingBoxAttachment.prototype = {
+ type: spine.AttachmentType.boundingbox,
+ computeWorldVertices: function (x, y, bone, worldVertices) {
+ x += bone.worldX;
+ y += bone.worldY;
+ var m00 = bone.m00, m01 = bone.m01, m10 = bone.m10, m11 = bone.m11;
+ var vertices = this.vertices;
+ for (var i = 0, n = vertices.length; i < n; i += 2) {
+ var px = vertices[i];
+ var py = vertices[i + 1];
+ worldVertices[i] = px * m00 + py * m01 + x;
+ worldVertices[i + 1] = px * m10 + py * m11 + y;
+ }
+ }
+};
+
+spine.AnimationStateData = function (skeletonData) {
+ this.skeletonData = skeletonData;
+ this.animationToMixTime = {};
+};
+spine.AnimationStateData.prototype = {
+ defaultMix: 0,
+ setMixByName: function (fromName, toName, duration) {
+ var from = this.skeletonData.findAnimation(fromName);
+ if (!from) throw "Animation not found: " + fromName;
+ var to = this.skeletonData.findAnimation(toName);
+ if (!to) throw "Animation not found: " + toName;
+ this.setMix(from, to, duration);
+ },
+ setMix: function (from, to, duration) {
+ this.animationToMixTime[from.name + ":" + to.name] = duration;
+ },
+ getMix: function (from, to) {
+ var key = from.name + ":" + to.name;
+ return this.animationToMixTime.hasOwnProperty(key) ? this.animationToMixTime[key] : this.defaultMix;
+ }
+};
+
+spine.TrackEntry = function () {};
+spine.TrackEntry.prototype = {
+ next: null, previous: null,
+ animation: null,
+ loop: false,
+ delay: 0, time: 0, lastTime: -1, endTime: 0,
+ timeScale: 1,
+ mixTime: 0, mixDuration: 0, mix: 1,
+ onStart: null, onEnd: null, onComplete: null, onEvent: null
+};
+
+spine.AnimationState = function (stateData) {
+ this.data = stateData;
+ this.tracks = [];
+ this.events = [];
+};
+spine.AnimationState.prototype = {
+ onStart: null,
+ onEnd: null,
+ onComplete: null,
+ onEvent: null,
+ timeScale: 1,
+ update: function (delta) {
+ delta *= this.timeScale;
+ for (var i = 0; i < this.tracks.length; i++) {
+ var current = this.tracks[i];
+ if (!current) continue;
+
+ current.time += delta * current.timeScale;
+ if (current.previous) {
+ var previousDelta = delta * current.previous.timeScale;
+ current.previous.time += previousDelta;
+ current.mixTime += previousDelta;
+ }
+
+ var next = current.next;
+ if (next) {
+ next.time = current.lastTime - next.delay;
+ if (next.time >= 0) this.setCurrent(i, next);
+ } else {
+ // End non-looping animation when it reaches its end time and there is no next entry.
+ if (!current.loop && current.lastTime >= current.endTime) this.clearTrack(i);
+ }
+ }
+ },
+ apply: function (skeleton) {
+ for (var i = 0; i < this.tracks.length; i++) {
+ var current = this.tracks[i];
+ if (!current) continue;
+
+ this.events.length = 0;
+
+ var time = current.time;
+ var lastTime = current.lastTime;
+ var endTime = current.endTime;
+ var loop = current.loop;
+ if (!loop && time > endTime) time = endTime;
+
+ var previous = current.previous;
+ if (!previous) {
+ if (current.mix == 1)
+ current.animation.apply(skeleton, current.lastTime, time, loop, this.events);
+ else
+ current.animation.mix(skeleton, current.lastTime, time, loop, this.events, current.mix);
+ } else {
+ var previousTime = previous.time;
+ if (!previous.loop && previousTime > previous.endTime) previousTime = previous.endTime;
+ previous.animation.apply(skeleton, previousTime, previousTime, previous.loop, null);
+
+ var alpha = current.mixTime / current.mixDuration * current.mix;
+ if (alpha >= 1) {
+ alpha = 1;
+ current.previous = null;
+ }
+ current.animation.mix(skeleton, current.lastTime, time, loop, this.events, alpha);
+ }
+
+ for (var ii = 0, nn = this.events.length; ii < nn; ii++) {
+ var event = this.events[ii];
+ if (current.onEvent) current.onEvent(i, event);
+ if (this.onEvent) this.onEvent(i, event);
+ }
+
+ // Check if completed the animation or a loop iteration.
+ if (loop ? (lastTime % endTime > time % endTime) : (lastTime < endTime && time >= endTime)) {
+ var count = Math.floor(time / endTime);
+ if (current.onComplete) current.onComplete(i, count);
+ if (this.onComplete) this.onComplete(i, count);
+ }
+
+ current.lastTime = current.time;
+ }
+ },
+ clearTracks: function () {
+ for (var i = 0, n = this.tracks.length; i < n; i++)
+ this.clearTrack(i);
+ this.tracks.length = 0;
+ },
+ clearTrack: function (trackIndex) {
+ if (trackIndex >= this.tracks.length) return;
+ var current = this.tracks[trackIndex];
+ if (!current) return;
+
+ if (current.onEnd) current.onEnd(trackIndex);
+ if (this.onEnd) this.onEnd(trackIndex);
+
+ this.tracks[trackIndex] = null;
+ },
+ _expandToIndex: function (index) {
+ if (index < this.tracks.length) return this.tracks[index];
+ while (index >= this.tracks.length)
+ this.tracks.push(null);
+ return null;
+ },
+ setCurrent: function (index, entry) {
+ var current = this._expandToIndex(index);
+ if (current) {
+ var previous = current.previous;
+ current.previous = null;
+
+ if (current.onEnd) current.onEnd(index);
+ if (this.onEnd) this.onEnd(index);
+
+ entry.mixDuration = this.data.getMix(current.animation, entry.animation);
+ if (entry.mixDuration > 0) {
+ entry.mixTime = 0;
+ // If a mix is in progress, mix from the closest animation.
+ if (previous && current.mixTime / current.mixDuration < 0.5)
+ entry.previous = previous;
+ else
+ entry.previous = current;
+ }
+ }
+
+ this.tracks[index] = entry;
+
+ if (entry.onStart) entry.onStart(index);
+ if (this.onStart) this.onStart(index);
+ },
+ setAnimationByName: function (trackIndex, animationName, loop) {
+ var animation = this.data.skeletonData.findAnimation(animationName);
+ if (!animation) throw "Animation not found: " + animationName;
+ return this.setAnimation(trackIndex, animation, loop);
+ },
+ /** Set the current animation. Any queued animations are cleared. */
+ setAnimation: function (trackIndex, animation, loop) {
+ var entry = new spine.TrackEntry();
+ entry.animation = animation;
+ entry.loop = loop;
+ entry.endTime = animation.duration;
+ this.setCurrent(trackIndex, entry);
+ return entry;
+ },
+ addAnimationByName: function (trackIndex, animationName, loop, delay) {
+ var animation = this.data.skeletonData.findAnimation(animationName);
+ if (!animation) throw "Animation not found: " + animationName;
+ return this.addAnimation(trackIndex, animation, loop, delay);
+ },
+ /** Adds an animation to be played delay seconds after the current or last queued animation.
+ * @param delay May be <= 0 to use duration of previous animation minus any mix duration plus the negative delay. */
+ addAnimation: function (trackIndex, animation, loop, delay) {
+ var entry = new spine.TrackEntry();
+ entry.animation = animation;
+ entry.loop = loop;
+ entry.endTime = animation.duration;
+
+ var last = this._expandToIndex(trackIndex);
+ if (last) {
+ while (last.next)
+ last = last.next;
+ last.next = entry;
+ } else
+ this.tracks[trackIndex] = entry;
+
+ if (delay <= 0) {
+ if (last)
+ delay += last.endTime - this.data.getMix(last.animation, animation);
+ else
+ delay = 0;
+ }
+ entry.delay = delay;
+
+ return entry;
+ },
+ /** May be null. */
+ getCurrent: function (trackIndex) {
+ if (trackIndex >= this.tracks.length) return null;
+ return this.tracks[trackIndex];
+ }
+};
+
+spine.SkeletonJson = function (attachmentLoader) {
+ this.attachmentLoader = attachmentLoader;
+};
+spine.SkeletonJson.prototype = {
+ scale: 1,
+ readSkeletonData: function (root, name) {
+ var skeletonData = new spine.SkeletonData();
+ skeletonData.name = name;
+
+ // Skeleton.
+ var skeletonMap = root["skeleton"];
+ if (skeletonMap) {
+ skeletonData.hash = skeletonMap["hash"];
+ skeletonData.version = skeletonMap["spine"];
+ skeletonData.width = skeletonMap["width"] || 0;
+ skeletonData.height = skeletonMap["height"] || 0;
+ }
+
+ // Bones.
+ var bones = root["bones"];
+ for (var i = 0, n = bones.length; i < n; i++) {
+ var boneMap = bones[i];
+ var parent = null;
+ if (boneMap["parent"]) {
+ parent = skeletonData.findBone(boneMap["parent"]);
+ if (!parent) throw "Parent bone not found: " + boneMap["parent"];
+ }
+ var boneData = new spine.BoneData(boneMap["name"], parent);
+ boneData.length = (boneMap["length"] || 0) * this.scale;
+ boneData.x = (boneMap["x"] || 0) * this.scale;
+ boneData.y = (boneMap["y"] || 0) * this.scale;
+ boneData.rotation = (boneMap["rotation"] || 0);
+ boneData.scaleX = boneMap.hasOwnProperty("scaleX") ? boneMap["scaleX"] : 1;
+ boneData.scaleY = boneMap.hasOwnProperty("scaleY") ? boneMap["scaleY"] : 1;
+ boneData.inheritScale = boneMap.hasOwnProperty("inheritScale") ? boneMap["inheritScale"] : true;
+ boneData.inheritRotation = boneMap.hasOwnProperty("inheritRotation") ? boneMap["inheritRotation"] : true;
+ skeletonData.bones.push(boneData);
+ }
+
+ // IK constraints.
+ var ik = root["ik"];
+ if (ik) {
+ for (var i = 0, n = ik.length; i < n; i++) {
+ var ikMap = ik[i];
+ var ikConstraintData = new spine.IkConstraintData(ikMap["name"]);
+
+ var bones = ikMap["bones"];
+ for (var ii = 0, nn = bones.length; ii < nn; ii++) {
+ var bone = skeletonData.findBone(bones[ii]);
+ if (!bone) throw "IK bone not found: " + bones[ii];
+ ikConstraintData.bones.push(bone);
+ }
+
+ ikConstraintData.target = skeletonData.findBone(ikMap["target"]);
+ if (!ikConstraintData.target) throw "Target bone not found: " + ikMap["target"];
+
+ ikConstraintData.bendDirection = (!ikMap.hasOwnProperty("bendPositive") || ikMap["bendPositive"]) ? 1 : -1;
+ ikConstraintData.mix = ikMap.hasOwnProperty("mix") ? ikMap["mix"] : 1;
+
+ skeletonData.ikConstraints.push(ikConstraintData);
+ }
+ }
+
+ // Slots.
+ var slots = root["slots"];
+ for (var i = 0, n = slots.length; i < n; i++) {
+ var slotMap = slots[i];
+ var boneData = skeletonData.findBone(slotMap["bone"]);
+ if (!boneData) throw "Slot bone not found: " + slotMap["bone"];
+ var slotData = new spine.SlotData(slotMap["name"], boneData);
+
+ var color = slotMap["color"];
+ if (color) {
+ slotData.r = this.toColor(color, 0);
+ slotData.g = this.toColor(color, 1);
+ slotData.b = this.toColor(color, 2);
+ slotData.a = this.toColor(color, 3);
+ }
+
+ slotData.attachmentName = slotMap["attachment"];
+ slotData.additiveBlending = slotMap["additive"] && slotMap["additive"] == "true";
+
+ skeletonData.slots.push(slotData);
+ }
+
+ // Skins.
+ var skins = root["skins"];
+ for (var skinName in skins) {
+ if (!skins.hasOwnProperty(skinName)) continue;
+ var skinMap = skins[skinName];
+ var skin = new spine.Skin(skinName);
+ for (var slotName in skinMap) {
+ if (!skinMap.hasOwnProperty(slotName)) continue;
+ var slotIndex = skeletonData.findSlotIndex(slotName);
+ var slotEntry = skinMap[slotName];
+ for (var attachmentName in slotEntry) {
+ if (!slotEntry.hasOwnProperty(attachmentName)) continue;
+ var attachment = this.readAttachment(skin, attachmentName, slotEntry[attachmentName]);
+ if (attachment) skin.addAttachment(slotIndex, attachmentName, attachment);
+ }
+ }
+ skeletonData.skins.push(skin);
+ if (skin.name == "default") skeletonData.defaultSkin = skin;
+ }
+
+ // Events.
+ var events = root["events"];
+ for (var eventName in events) {
+ if (!events.hasOwnProperty(eventName)) continue;
+ var eventMap = events[eventName];
+ var eventData = new spine.EventData(eventName);
+ eventData.intValue = eventMap["int"] || 0;
+ eventData.floatValue = eventMap["float"] || 0;
+ eventData.stringValue = eventMap["string"] || null;
+ skeletonData.events.push(eventData);
+ }
+
+ // Animations.
+ var animations = root["animations"];
+ for (var animationName in animations) {
+ if (!animations.hasOwnProperty(animationName)) continue;
+ this.readAnimation(animationName, animations[animationName], skeletonData);
+ }
+
+ return skeletonData;
+ },
+ readAttachment: function (skin, name, map) {
+ name = map["name"] || name;
+
+ var type = spine.AttachmentType[map["type"] || "region"];
+ var path = map["path"] || name;
+
+ var scale = this.scale;
+ if (type == spine.AttachmentType.region) {
+ var region = this.attachmentLoader.newRegionAttachment(skin, name, path);
+ if (!region) return null;
+ region.path = path;
+ region.x = (map["x"] || 0) * scale;
+ region.y = (map["y"] || 0) * scale;
+ region.scaleX = map.hasOwnProperty("scaleX") ? map["scaleX"] : 1;
+ region.scaleY = map.hasOwnProperty("scaleY") ? map["scaleY"] : 1;
+ region.rotation = map["rotation"] || 0;
+ region.width = (map["width"] || 0) * scale;
+ region.height = (map["height"] || 0) * scale;
+
+ var color = map["color"];
+ if (color) {
+ region.r = this.toColor(color, 0);
+ region.g = this.toColor(color, 1);
+ region.b = this.toColor(color, 2);
+ region.a = this.toColor(color, 3);
+ }
+
+ region.updateOffset();
+ return region;
+ } else if (type == spine.AttachmentType.mesh) {
+ var mesh = this.attachmentLoader.newMeshAttachment(skin, name, path);
+ if (!mesh) return null;
+ mesh.path = path;
+ mesh.vertices = this.getFloatArray(map, "vertices", scale);
+ mesh.triangles = this.getIntArray(map, "triangles");
+ mesh.regionUVs = this.getFloatArray(map, "uvs", 1);
+ mesh.updateUVs();
+
+ color = map["color"];
+ if (color) {
+ mesh.r = this.toColor(color, 0);
+ mesh.g = this.toColor(color, 1);
+ mesh.b = this.toColor(color, 2);
+ mesh.a = this.toColor(color, 3);
+ }
+
+ mesh.hullLength = (map["hull"] || 0) * 2;
+ if (map["edges"]) mesh.edges = this.getIntArray(map, "edges");
+ mesh.width = (map["width"] || 0) * scale;
+ mesh.height = (map["height"] || 0) * scale;
+ return mesh;
+ } else if (type == spine.AttachmentType.skinnedmesh) {
+ var mesh = this.attachmentLoader.newSkinnedMeshAttachment(skin, name, path);
+ if (!mesh) return null;
+ mesh.path = path;
+
+ var uvs = this.getFloatArray(map, "uvs", 1);
+ var vertices = this.getFloatArray(map, "vertices", 1);
+ var weights = [];
+ var bones = [];
+ for (var i = 0, n = vertices.length; i < n; ) {
+ var boneCount = vertices[i++] | 0;
+ bones[bones.length] = boneCount;
+ for (var nn = i + boneCount * 4; i < nn; ) {
+ bones[bones.length] = vertices[i];
+ weights[weights.length] = vertices[i + 1] * scale;
+ weights[weights.length] = vertices[i + 2] * scale;
+ weights[weights.length] = vertices[i + 3];
+ i += 4;
+ }
+ }
+ mesh.bones = bones;
+ mesh.weights = weights;
+ mesh.triangles = this.getIntArray(map, "triangles");
+ mesh.regionUVs = uvs;
+ mesh.updateUVs();
+
+ color = map["color"];
+ if (color) {
+ mesh.r = this.toColor(color, 0);
+ mesh.g = this.toColor(color, 1);
+ mesh.b = this.toColor(color, 2);
+ mesh.a = this.toColor(color, 3);
+ }
+
+ mesh.hullLength = (map["hull"] || 0) * 2;
+ if (map["edges"]) mesh.edges = this.getIntArray(map, "edges");
+ mesh.width = (map["width"] || 0) * scale;
+ mesh.height = (map["height"] || 0) * scale;
+ return mesh;
+ } else if (type == spine.AttachmentType.boundingbox) {
+ var attachment = this.attachmentLoader.newBoundingBoxAttachment(skin, name);
+ var vertices = map["vertices"];
+ for (var i = 0, n = vertices.length; i < n; i++)
+ attachment.vertices.push(vertices[i] * scale);
+ return attachment;
+ }
+ throw "Unknown attachment type: " + type;
+ },
+ readAnimation: function (name, map, skeletonData) {
+ var timelines = [];
+ var duration = 0;
+
+ var slots = map["slots"];
+ for (var slotName in slots) {
+ if (!slots.hasOwnProperty(slotName)) continue;
+ var slotMap = slots[slotName];
+ var slotIndex = skeletonData.findSlotIndex(slotName);
+
+ for (var timelineName in slotMap) {
+ if (!slotMap.hasOwnProperty(timelineName)) continue;
+ var values = slotMap[timelineName];
+ if (timelineName == "color") {
+ var timeline = new spine.ColorTimeline(values.length);
+ timeline.slotIndex = slotIndex;
+
+ var frameIndex = 0;
+ for (var i = 0, n = values.length; i < n; i++) {
+ var valueMap = values[i];
+ var color = valueMap["color"];
+ var r = this.toColor(color, 0);
+ var g = this.toColor(color, 1);
+ var b = this.toColor(color, 2);
+ var a = this.toColor(color, 3);
+ timeline.setFrame(frameIndex, valueMap["time"], r, g, b, a);
+ this.readCurve(timeline, frameIndex, valueMap);
+ frameIndex++;
+ }
+ timelines.push(timeline);
+ duration = Math.max(duration, timeline.frames[timeline.getFrameCount() * 5 - 5]);
+
+ } else if (timelineName == "attachment") {
+ var timeline = new spine.AttachmentTimeline(values.length);
+ timeline.slotIndex = slotIndex;
+
+ var frameIndex = 0;
+ for (var i = 0, n = values.length; i < n; i++) {
+ var valueMap = values[i];
+ timeline.setFrame(frameIndex++, valueMap["time"], valueMap["name"]);
+ }
+ timelines.push(timeline);
+ duration = Math.max(duration, timeline.frames[timeline.getFrameCount() - 1]);
+
+ } else
+ throw "Invalid timeline type for a slot: " + timelineName + " (" + slotName + ")";
+ }
+ }
+
+ var bones = map["bones"];
+ for (var boneName in bones) {
+ if (!bones.hasOwnProperty(boneName)) continue;
+ var boneIndex = skeletonData.findBoneIndex(boneName);
+ if (boneIndex == -1) throw "Bone not found: " + boneName;
+ var boneMap = bones[boneName];
+
+ for (var timelineName in boneMap) {
+ if (!boneMap.hasOwnProperty(timelineName)) continue;
+ var values = boneMap[timelineName];
+ if (timelineName == "rotate") {
+ var timeline = new spine.RotateTimeline(values.length);
+ timeline.boneIndex = boneIndex;
+
+ var frameIndex = 0;
+ for (var i = 0, n = values.length; i < n; i++) {
+ var valueMap = values[i];
+ timeline.setFrame(frameIndex, valueMap["time"], valueMap["angle"]);
+ this.readCurve(timeline, frameIndex, valueMap);
+ frameIndex++;
+ }
+ timelines.push(timeline);
+ duration = Math.max(duration, timeline.frames[timeline.getFrameCount() * 2 - 2]);
+
+ } else if (timelineName == "translate" || timelineName == "scale") {
+ var timeline;
+ var timelineScale = 1;
+ if (timelineName == "scale")
+ timeline = new spine.ScaleTimeline(values.length);
+ else {
+ timeline = new spine.TranslateTimeline(values.length);
+ timelineScale = this.scale;
+ }
+ timeline.boneIndex = boneIndex;
+
+ var frameIndex = 0;
+ for (var i = 0, n = values.length; i < n; i++) {
+ var valueMap = values[i];
+ var x = (valueMap["x"] || 0) * timelineScale;
+ var y = (valueMap["y"] || 0) * timelineScale;
+ timeline.setFrame(frameIndex, valueMap["time"], x, y);
+ this.readCurve(timeline, frameIndex, valueMap);
+ frameIndex++;
+ }
+ timelines.push(timeline);
+ duration = Math.max(duration, timeline.frames[timeline.getFrameCount() * 3 - 3]);
+
+ } else if (timelineName == "flipX" || timelineName == "flipY") {
+ var x = timelineName == "flipX";
+ var timeline = x ? new spine.FlipXTimeline(values.length) : new spine.FlipYTimeline(values.length);
+ timeline.boneIndex = boneIndex;
+
+ var field = x ? "x" : "y";
+ var frameIndex = 0;
+ for (var i = 0, n = values.length; i < n; i++) {
+ var valueMap = values[i];
+ timeline.setFrame(frameIndex, valueMap["time"], valueMap[field] || false);
+ frameIndex++;
+ }
+ timelines.push(timeline);
+ duration = Math.max(duration, timeline.frames[timeline.getFrameCount() * 2 - 2]);
+ } else
+ throw "Invalid timeline type for a bone: " + timelineName + " (" + boneName + ")";
+ }
+ }
+
+ var ikMap = map["ik"];
+ for (var ikConstraintName in ikMap) {
+ if (!ikMap.hasOwnProperty(ikConstraintName)) continue;
+ var ikConstraint = skeletonData.findIkConstraint(ikConstraintName);
+ var values = ikMap[ikConstraintName];
+ var timeline = new spine.IkConstraintTimeline(values.length);
+ timeline.ikConstraintIndex = skeletonData.ikConstraints.indexOf(ikConstraint);
+ var frameIndex = 0;
+ for (var i = 0, n = values.length; i < n; i++) {
+ var valueMap = values[i];
+ var mix = valueMap.hasOwnProperty("mix") ? valueMap["mix"] : 1;
+ var bendDirection = (!valueMap.hasOwnProperty("bendPositive") || valueMap["bendPositive"]) ? 1 : -1;
+ timeline.setFrame(frameIndex, valueMap["time"], mix, bendDirection);
+ this.readCurve(timeline, frameIndex, valueMap);
+ frameIndex++;
+ }
+ timelines.push(timeline);
+ duration = Math.max(duration, timeline.frames[timeline.frameCount * 3 - 3]);
+ }
+
+ var ffd = map["ffd"];
+ for (var skinName in ffd) {
+ var skin = skeletonData.findSkin(skinName);
+ var slotMap = ffd[skinName];
+ for (slotName in slotMap) {
+ var slotIndex = skeletonData.findSlotIndex(slotName);
+ var meshMap = slotMap[slotName];
+ for (var meshName in meshMap) {
+ var values = meshMap[meshName];
+ var timeline = new spine.FfdTimeline(values.length);
+ var attachment = skin.getAttachment(slotIndex, meshName);
+ if (!attachment) throw "FFD attachment not found: " + meshName;
+ timeline.slotIndex = slotIndex;
+ timeline.attachment = attachment;
+
+ var isMesh = attachment.type == spine.AttachmentType.mesh;
+ var vertexCount;
+ if (isMesh)
+ vertexCount = attachment.vertices.length;
+ else
+ vertexCount = attachment.weights.length / 3 * 2;
+
+ var frameIndex = 0;
+ for (var i = 0, n = values.length; i < n; i++) {
+ var valueMap = values[i];
+ var vertices;
+ if (!valueMap["vertices"]) {
+ if (isMesh)
+ vertices = attachment.vertices;
+ else {
+ vertices = [];
+ vertices.length = vertexCount;
+ }
+ } else {
+ var verticesValue = valueMap["vertices"];
+ var vertices = [];
+ vertices.length = vertexCount;
+ var start = valueMap["offset"] || 0;
+ var nn = verticesValue.length;
+ if (this.scale == 1) {
+ for (var ii = 0; ii < nn; ii++)
+ vertices[ii + start] = verticesValue[ii];
+ } else {
+ for (var ii = 0; ii < nn; ii++)
+ vertices[ii + start] = verticesValue[ii] * this.scale;
+ }
+ if (isMesh) {
+ var meshVertices = attachment.vertices;
+ for (var ii = 0, nn = vertices.length; ii < nn; ii++)
+ vertices[ii] += meshVertices[ii];
+ }
+ }
+
+ timeline.setFrame(frameIndex, valueMap["time"], vertices);
+ this.readCurve(timeline, frameIndex, valueMap);
+ frameIndex++;
+ }
+ timelines[timelines.length] = timeline;
+ duration = Math.max(duration, timeline.frames[timeline.frameCount - 1]);
+ }
+ }
+ }
+
+ var drawOrderValues = map["drawOrder"];
+ if (!drawOrderValues) drawOrderValues = map["draworder"];
+ if (drawOrderValues) {
+ var timeline = new spine.DrawOrderTimeline(drawOrderValues.length);
+ var slotCount = skeletonData.slots.length;
+ var frameIndex = 0;
+ for (var i = 0, n = drawOrderValues.length; i < n; i++) {
+ var drawOrderMap = drawOrderValues[i];
+ var drawOrder = null;
+ if (drawOrderMap["offsets"]) {
+ drawOrder = [];
+ drawOrder.length = slotCount;
+ for (var ii = slotCount - 1; ii >= 0; ii--)
+ drawOrder[ii] = -1;
+ var offsets = drawOrderMap["offsets"];
+ var unchanged = [];
+ unchanged.length = slotCount - offsets.length;
+ var originalIndex = 0, unchangedIndex = 0;
+ for (var ii = 0, nn = offsets.length; ii < nn; ii++) {
+ var offsetMap = offsets[ii];
+ var slotIndex = skeletonData.findSlotIndex(offsetMap["slot"]);
+ if (slotIndex == -1) throw "Slot not found: " + offsetMap["slot"];
+ // Collect unchanged items.
+ while (originalIndex != slotIndex)
+ unchanged[unchangedIndex++] = originalIndex++;
+ // Set changed items.
+ drawOrder[originalIndex + offsetMap["offset"]] = originalIndex++;
+ }
+ // Collect remaining unchanged items.
+ while (originalIndex < slotCount)
+ unchanged[unchangedIndex++] = originalIndex++;
+ // Fill in unchanged items.
+ for (var ii = slotCount - 1; ii >= 0; ii--)
+ if (drawOrder[ii] == -1) drawOrder[ii] = unchanged[--unchangedIndex];
+ }
+ timeline.setFrame(frameIndex++, drawOrderMap["time"], drawOrder);
+ }
+ timelines.push(timeline);
+ duration = Math.max(duration, timeline.frames[timeline.getFrameCount() - 1]);
+ }
+
+ var events = map["events"];
+ if (events) {
+ var timeline = new spine.EventTimeline(events.length);
+ var frameIndex = 0;
+ for (var i = 0, n = events.length; i < n; i++) {
+ var eventMap = events[i];
+ var eventData = skeletonData.findEvent(eventMap["name"]);
+ if (!eventData) throw "Event not found: " + eventMap["name"];
+ var event = new spine.Event(eventData);
+ event.intValue = eventMap.hasOwnProperty("int") ? eventMap["int"] : eventData.intValue;
+ event.floatValue = eventMap.hasOwnProperty("float") ? eventMap["float"] : eventData.floatValue;
+ event.stringValue = eventMap.hasOwnProperty("string") ? eventMap["string"] : eventData.stringValue;
+ timeline.setFrame(frameIndex++, eventMap["time"], event);
+ }
+ timelines.push(timeline);
+ duration = Math.max(duration, timeline.frames[timeline.getFrameCount() - 1]);
+ }
+
+ skeletonData.animations.push(new spine.Animation(name, timelines, duration));
+ },
+ readCurve: function (timeline, frameIndex, valueMap) {
+ var curve = valueMap["curve"];
+ if (!curve)
+ timeline.curves.setLinear(frameIndex);
+ else if (curve == "stepped")
+ timeline.curves.setStepped(frameIndex);
+ else if (curve instanceof Array)
+ timeline.curves.setCurve(frameIndex, curve[0], curve[1], curve[2], curve[3]);
+ },
+ toColor: function (hexString, colorIndex) {
+ if (hexString.length != 8) throw "Color hexidecimal length must be 8, recieved: " + hexString;
+ return parseInt(hexString.substring(colorIndex * 2, (colorIndex * 2) + 2), 16) / 255;
+ },
+ getFloatArray: function (map, name, scale) {
+ var list = map[name];
+ var values = new spine.Float32Array(list.length);
+ var i = 0, n = list.length;
+ if (scale == 1) {
+ for (; i < n; i++)
+ values[i] = list[i];
+ } else {
+ for (; i < n; i++)
+ values[i] = list[i] * scale;
+ }
+ return values;
+ },
+ getIntArray: function (map, name) {
+ var list = map[name];
+ var values = new spine.Uint16Array(list.length);
+ for (var i = 0, n = list.length; i < n; i++)
+ values[i] = list[i] | 0;
+ return values;
+ }
+};
+
+spine.Atlas = function (atlasText, textureLoader) {
+ this.textureLoader = textureLoader;
+ this.pages = [];
+ this.regions = [];
+
+ var reader = new spine.AtlasReader(atlasText);
+ var tuple = [];
+ tuple.length = 4;
+ var page = null;
+ while (true) {
+ var line = reader.readLine();
+ if (line === null) break;
+ line = reader.trim(line);
+ if (!line.length)
+ page = null;
+ else if (!page) {
+ page = new spine.AtlasPage();
+ page.name = line;
+
+ if (reader.readTuple(tuple) == 2) { // size is only optional for an atlas packed with an old TexturePacker.
+ page.width = parseInt(tuple[0]);
+ page.height = parseInt(tuple[1]);
+ reader.readTuple(tuple);
+ }
+ page.format = spine.Atlas.Format[tuple[0]];
+
+ reader.readTuple(tuple);
+ page.minFilter = spine.Atlas.TextureFilter[tuple[0]];
+ page.magFilter = spine.Atlas.TextureFilter[tuple[1]];
+
+ var direction = reader.readValue();
+ page.uWrap = spine.Atlas.TextureWrap.clampToEdge;
+ page.vWrap = spine.Atlas.TextureWrap.clampToEdge;
+ if (direction == "x")
+ page.uWrap = spine.Atlas.TextureWrap.repeat;
+ else if (direction == "y")
+ page.vWrap = spine.Atlas.TextureWrap.repeat;
+ else if (direction == "xy")
+ page.uWrap = page.vWrap = spine.Atlas.TextureWrap.repeat;
+
+ textureLoader.load(page, line, this);
+
+ this.pages.push(page);
+
+ } else {
+ var region = new spine.AtlasRegion();
+ region.name = line;
+ region.page = page;
+
+ region.rotate = reader.readValue() == "true";
+
+ reader.readTuple(tuple);
+ var x = parseInt(tuple[0]);
+ var y = parseInt(tuple[1]);
+
+ reader.readTuple(tuple);
+ var width = parseInt(tuple[0]);
+ var height = parseInt(tuple[1]);
+
+ region.u = x / page.width;
+ region.v = y / page.height;
+ if (region.rotate) {
+ region.u2 = (x + height) / page.width;
+ region.v2 = (y + width) / page.height;
+ } else {
+ region.u2 = (x + width) / page.width;
+ region.v2 = (y + height) / page.height;
+ }
+ region.x = x;
+ region.y = y;
+ region.width = Math.abs(width);
+ region.height = Math.abs(height);
+
+ if (reader.readTuple(tuple) == 4) { // split is optional
+ region.splits = [parseInt(tuple[0]), parseInt(tuple[1]), parseInt(tuple[2]), parseInt(tuple[3])];
+
+ if (reader.readTuple(tuple) == 4) { // pad is optional, but only present with splits
+ region.pads = [parseInt(tuple[0]), parseInt(tuple[1]), parseInt(tuple[2]), parseInt(tuple[3])];
+
+ reader.readTuple(tuple);
+ }
+ }
+
+ region.originalWidth = parseInt(tuple[0]);
+ region.originalHeight = parseInt(tuple[1]);
+
+ reader.readTuple(tuple);
+ region.offsetX = parseInt(tuple[0]);
+ region.offsetY = parseInt(tuple[1]);
+
+ region.index = parseInt(reader.readValue());
+
+ this.regions.push(region);
+ }
+ }
+};
+spine.Atlas.prototype = {
+ findRegion: function (name) {
+ var regions = this.regions;
+ for (var i = 0, n = regions.length; i < n; i++)
+ if (regions[i].name == name) return regions[i];
+ return null;
+ },
+ dispose: function () {
+ var pages = this.pages;
+ for (var i = 0, n = pages.length; i < n; i++)
+ this.textureLoader.unload(pages[i].rendererObject);
+ },
+ updateUVs: function (page) {
+ var regions = this.regions;
+ for (var i = 0, n = regions.length; i < n; i++) {
+ var region = regions[i];
+ if (region.page != page) continue;
+ region.u = region.x / page.width;
+ region.v = region.y / page.height;
+ if (region.rotate) {
+ region.u2 = (region.x + region.height) / page.width;
+ region.v2 = (region.y + region.width) / page.height;
+ } else {
+ region.u2 = (region.x + region.width) / page.width;
+ region.v2 = (region.y + region.height) / page.height;
+ }
+ }
+ }
+};
+
+spine.Atlas.Format = {
+ alpha: 0,
+ intensity: 1,
+ luminanceAlpha: 2,
+ rgb565: 3,
+ rgba4444: 4,
+ rgb888: 5,
+ rgba8888: 6
+};
+
+spine.Atlas.TextureFilter = {
+ nearest: 0,
+ linear: 1,
+ mipMap: 2,
+ mipMapNearestNearest: 3,
+ mipMapLinearNearest: 4,
+ mipMapNearestLinear: 5,
+ mipMapLinearLinear: 6
+};
+
+spine.Atlas.TextureWrap = {
+ mirroredRepeat: 0,
+ clampToEdge: 1,
+ repeat: 2
+};
+
+spine.AtlasPage = function () {};
+spine.AtlasPage.prototype = {
+ name: null,
+ format: null,
+ minFilter: null,
+ magFilter: null,
+ uWrap: null,
+ vWrap: null,
+ rendererObject: null,
+ width: 0,
+ height: 0
+};
+
+spine.AtlasRegion = function () {};
+spine.AtlasRegion.prototype = {
+ page: null,
+ name: null,
+ x: 0, y: 0,
+ width: 0, height: 0,
+ u: 0, v: 0, u2: 0, v2: 0,
+ offsetX: 0, offsetY: 0,
+ originalWidth: 0, originalHeight: 0,
+ index: 0,
+ rotate: false,
+ splits: null,
+ pads: null
+};
+
+spine.AtlasReader = function (text) {
+ this.lines = text.split(/\r\n|\r|\n/);
+};
+spine.AtlasReader.prototype = {
+ index: 0,
+ trim: function (value) {
+ return value.replace(/^\s+|\s+$/g, "");
+ },
+ readLine: function () {
+ if (this.index >= this.lines.length) return null;
+ return this.lines[this.index++];
+ },
+ readValue: function () {
+ var line = this.readLine();
+ var colon = line.indexOf(":");
+ if (colon == -1) throw "Invalid line: " + line;
+ return this.trim(line.substring(colon + 1));
+ },
+ /** Returns the number of tuple values read (1, 2 or 4). */
+ readTuple: function (tuple) {
+ var line = this.readLine();
+ var colon = line.indexOf(":");
+ if (colon == -1) throw "Invalid line: " + line;
+ var i = 0, lastMatch = colon + 1;
+ for (; i < 3; i++) {
+ var comma = line.indexOf(",", lastMatch);
+ if (comma == -1) break;
+ tuple[i] = this.trim(line.substr(lastMatch, comma - lastMatch));
+ lastMatch = comma + 1;
+ }
+ tuple[i] = this.trim(line.substring(lastMatch));
+ return i + 1;
+ }
+};
+
+spine.AtlasAttachmentLoader = function (atlas) {
+ this.atlas = atlas;
+};
+spine.AtlasAttachmentLoader.prototype = {
+ newRegionAttachment: function (skin, name, path) {
+ var region = this.atlas.findRegion(path);
+ if (!region) throw "Region not found in atlas: " + path + " (region attachment: " + name + ")";
+ var attachment = new spine.RegionAttachment(name);
+ attachment.rendererObject = region;
+ attachment.setUVs(region.u, region.v, region.u2, region.v2, region.rotate);
+ attachment.regionOffsetX = region.offsetX;
+ attachment.regionOffsetY = region.offsetY;
+ attachment.regionWidth = region.width;
+ attachment.regionHeight = region.height;
+ attachment.regionOriginalWidth = region.originalWidth;
+ attachment.regionOriginalHeight = region.originalHeight;
+ return attachment;
+ },
+ newMeshAttachment: function (skin, name, path) {
+ var region = this.atlas.findRegion(path);
+ if (!region) throw "Region not found in atlas: " + path + " (mesh attachment: " + name + ")";
+ var attachment = new spine.MeshAttachment(name);
+ attachment.rendererObject = region;
+ attachment.regionU = region.u;
+ attachment.regionV = region.v;
+ attachment.regionU2 = region.u2;
+ attachment.regionV2 = region.v2;
+ attachment.regionRotate = region.rotate;
+ attachment.regionOffsetX = region.offsetX;
+ attachment.regionOffsetY = region.offsetY;
+ attachment.regionWidth = region.width;
+ attachment.regionHeight = region.height;
+ attachment.regionOriginalWidth = region.originalWidth;
+ attachment.regionOriginalHeight = region.originalHeight;
+ return attachment;
+ },
+ newSkinnedMeshAttachment: function (skin, name, path) {
+ var region = this.atlas.findRegion(path);
+ if (!region) throw "Region not found in atlas: " + path + " (skinned mesh attachment: " + name + ")";
+ var attachment = new spine.SkinnedMeshAttachment(name);
+ attachment.rendererObject = region;
+ attachment.regionU = region.u;
+ attachment.regionV = region.v;
+ attachment.regionU2 = region.u2;
+ attachment.regionV2 = region.v2;
+ attachment.regionRotate = region.rotate;
+ attachment.regionOffsetX = region.offsetX;
+ attachment.regionOffsetY = region.offsetY;
+ attachment.regionWidth = region.width;
+ attachment.regionHeight = region.height;
+ attachment.regionOriginalWidth = region.originalWidth;
+ attachment.regionOriginalHeight = region.originalHeight;
+ return attachment;
+ },
+ newBoundingBoxAttachment: function (skin, name) {
+ return new spine.BoundingBoxAttachment(name);
+ }
+};
+
+spine.SkeletonBounds = function () {
+ this.polygonPool = [];
+ this.polygons = [];
+ this.boundingBoxes = [];
+};
+spine.SkeletonBounds.prototype = {
+ minX: 0, minY: 0, maxX: 0, maxY: 0,
+ update: function (skeleton, updateAabb) {
+ var slots = skeleton.slots;
+ var slotCount = slots.length;
+ var x = skeleton.x, y = skeleton.y;
+ var boundingBoxes = this.boundingBoxes;
+ var polygonPool = this.polygonPool;
+ var polygons = this.polygons;
+
+ boundingBoxes.length = 0;
+ for (var i = 0, n = polygons.length; i < n; i++)
+ polygonPool.push(polygons[i]);
+ polygons.length = 0;
+
+ for (var i = 0; i < slotCount; i++) {
+ var slot = slots[i];
+ var boundingBox = slot.attachment;
+ if (boundingBox.type != spine.AttachmentType.boundingbox) continue;
+ boundingBoxes.push(boundingBox);
+
+ var poolCount = polygonPool.length, polygon;
+ if (poolCount > 0) {
+ polygon = polygonPool[poolCount - 1];
+ polygonPool.splice(poolCount - 1, 1);
+ } else
+ polygon = [];
+ polygons.push(polygon);
+
+ polygon.length = boundingBox.vertices.length;
+ boundingBox.computeWorldVertices(x, y, slot.bone, polygon);
+ }
+
+ if (updateAabb) this.aabbCompute();
+ },
+ aabbCompute: function () {
+ var polygons = this.polygons;
+ var minX = Number.MAX_VALUE, minY = Number.MAX_VALUE, maxX = Number.MIN_VALUE, maxY = Number.MIN_VALUE;
+ for (var i = 0, n = polygons.length; i < n; i++) {
+ var vertices = polygons[i];
+ for (var ii = 0, nn = vertices.length; ii < nn; ii += 2) {
+ var x = vertices[ii];
+ var y = vertices[ii + 1];
+ minX = Math.min(minX, x);
+ minY = Math.min(minY, y);
+ maxX = Math.max(maxX, x);
+ maxY = Math.max(maxY, y);
+ }
+ }
+ this.minX = minX;
+ this.minY = minY;
+ this.maxX = maxX;
+ this.maxY = maxY;
+ },
+ /** Returns true if the axis aligned bounding box contains the point. */
+ aabbContainsPoint: function (x, y) {
+ return x >= this.minX && x <= this.maxX && y >= this.minY && y <= this.maxY;
+ },
+ /** Returns true if the axis aligned bounding box intersects the line segment. */
+ aabbIntersectsSegment: function (x1, y1, x2, y2) {
+ var minX = this.minX, minY = this.minY, maxX = this.maxX, maxY = this.maxY;
+ if ((x1 <= minX && x2 <= minX) || (y1 <= minY && y2 <= minY) || (x1 >= maxX && x2 >= maxX) || (y1 >= maxY && y2 >= maxY))
+ return false;
+ var m = (y2 - y1) / (x2 - x1);
+ var y = m * (minX - x1) + y1;
+ if (y > minY && y < maxY) return true;
+ y = m * (maxX - x1) + y1;
+ if (y > minY && y < maxY) return true;
+ var x = (minY - y1) / m + x1;
+ if (x > minX && x < maxX) return true;
+ x = (maxY - y1) / m + x1;
+ if (x > minX && x < maxX) return true;
+ return false;
+ },
+ /** Returns true if the axis aligned bounding box intersects the axis aligned bounding box of the specified bounds. */
+ aabbIntersectsSkeleton: function (bounds) {
+ return this.minX < bounds.maxX && this.maxX > bounds.minX && this.minY < bounds.maxY && this.maxY > bounds.minY;
+ },
+ /** Returns the first bounding box attachment that contains the point, or null. When doing many checks, it is usually more
+ * efficient to only call this method if {@link #aabbContainsPoint(float, float)} returns true. */
+ containsPoint: function (x, y) {
+ var polygons = this.polygons;
+ for (var i = 0, n = polygons.length; i < n; i++)
+ if (this.polygonContainsPoint(polygons[i], x, y)) return this.boundingBoxes[i];
+ return null;
+ },
+ /** Returns the first bounding box attachment that contains the line segment, or null. When doing many checks, it is usually
+ * more efficient to only call this method if {@link #aabbIntersectsSegment(float, float, float, float)} returns true. */
+ intersectsSegment: function (x1, y1, x2, y2) {
+ var polygons = this.polygons;
+ for (var i = 0, n = polygons.length; i < n; i++)
+ if (polygons[i].intersectsSegment(x1, y1, x2, y2)) return this.boundingBoxes[i];
+ return null;
+ },
+ /** Returns true if the polygon contains the point. */
+ polygonContainsPoint: function (polygon, x, y) {
+ var nn = polygon.length;
+ var prevIndex = nn - 2;
+ var inside = false;
+ for (var ii = 0; ii < nn; ii += 2) {
+ var vertexY = polygon[ii + 1];
+ var prevY = polygon[prevIndex + 1];
+ if ((vertexY < y && prevY >= y) || (prevY < y && vertexY >= y)) {
+ var vertexX = polygon[ii];
+ if (vertexX + (y - vertexY) / (prevY - vertexY) * (polygon[prevIndex] - vertexX) < x) inside = !inside;
+ }
+ prevIndex = ii;
+ }
+ return inside;
+ },
+ /** Returns true if the polygon contains the line segment. */
+ polygonIntersectsSegment: function (polygon, x1, y1, x2, y2) {
+ var nn = polygon.length;
+ var width12 = x1 - x2, height12 = y1 - y2;
+ var det1 = x1 * y2 - y1 * x2;
+ var x3 = polygon[nn - 2], y3 = polygon[nn - 1];
+ for (var ii = 0; ii < nn; ii += 2) {
+ var x4 = polygon[ii], y4 = polygon[ii + 1];
+ var det2 = x3 * y4 - y3 * x4;
+ var width34 = x3 - x4, height34 = y3 - y4;
+ var det3 = width12 * height34 - height12 * width34;
+ var x = (det1 * width34 - width12 * det2) / det3;
+ if (((x >= x3 && x <= x4) || (x >= x4 && x <= x3)) && ((x >= x1 && x <= x2) || (x >= x2 && x <= x1))) {
+ var y = (det1 * height34 - height12 * det2) / det3;
+ if (((y >= y3 && y <= y4) || (y >= y4 && y <= y3)) && ((y >= y1 && y <= y2) || (y >= y2 && y <= y1))) return true;
+ }
+ x3 = x4;
+ y3 = y4;
+ }
+ return false;
+ },
+ getPolygon: function (attachment) {
+ var index = this.boundingBoxes.indexOf(attachment);
+ return index == -1 ? null : this.polygons[index];
+ },
+ getWidth: function () {
+ return this.maxX - this.minX;
+ },
+ getHeight: function () {
+ return this.maxY - this.minY;
+ }
+};
\ No newline at end of file
diff --git a/external/chipmunk/chipmunk.js b/external/chipmunk/chipmunk.js
old mode 100755
new mode 100644
index 38d0d8c191..3be84bfc61
--- a/external/chipmunk/chipmunk.js
+++ b/external/chipmunk/chipmunk.js
@@ -1,1318 +1,1502 @@
(function(){
- /* Copyright (c) 2007 Scott Lembcke
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
- Object.create = Object.create || function(o) {
- function F() {}
- F.prototype = o;
- return new F();
- };
-
+/* Copyright (c) 2007 Scott Lembcke
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+Object.create = Object.create || function(o) {
+ function F() {}
+ F.prototype = o;
+ return new F();
+};
+
//var VERSION = CP_VERSION_MAJOR + "." + CP_VERSION_MINOR + "." + CP_VERSION_RELEASE;
- var cp;
- if(typeof exports === 'undefined'){
- cp = {};
- if(typeof window === 'object'){
- window["cp"] = cp;
- }
- } else {
- cp = exports;
- }
-
- var assert = function(value, message)
- {
- if (!value) {
- throw new Error('Assertion failed: ' + message);
- }
- };
-
- var assertSoft = function(value, message)
- {
- if(!value && console && console.warn) {
- console.warn("ASSERTION FAILED: " + message);
- if(console.trace) {
- console.trace();
- }
- }
- };
-
- var mymin = function(a, b)
- {
- return a < b ? a : b;
- };
- var mymax = function(a, b)
- {
- return a > b ? a : b;
- };
-
- var min, max;
- if (typeof window === 'object' && window.navigator.userAgent.indexOf('Firefox') > -1){
- // On firefox, Math.min and Math.max are really fast:
- // http://jsperf.com/math-vs-greater-than/8
- min = Math.min;
- max = Math.max;
- } else {
- // On chrome and safari, Math.min / max are slooow. The ternery operator above is faster
- // than the builtins because we only have to deal with 2 arguments that are always numbers.
- min = mymin;
- max = mymax;
- }
-
- /* The hashpair function takes two numbers and returns a hash code for them.
- * Required that hashPair(a, b) === hashPair(b, a).
- * Chipmunk's hashPair function is defined as:
- * #define CP_HASH_COEF (3344921057ul)
- * #define CP_HASH_PAIR(A, B) ((cpHashValue)(A)*CP_HASH_COEF ^ (cpHashValue)(B)*CP_HASH_COEF)
- * But thats not suitable in javascript because multiplying by a large number will make the number
- * a large float.
- *
- * The result of hashPair is used as the key in objects, so it returns a string.
- */
- var hashPair = function(a, b)
- {
- //assert(typeof(a) === 'number', "HashPair used on something not a number");
- return a < b ? a + ' ' + b : b + ' ' + a;
- };
-
- var deleteObjFromList = function(arr, obj)
- {
- for(var i=0; i
+ * FacebookAgent...
+ *
+ * @property {String} name - plugin name
+ * @property {String} version - API version
+ */
+plugin.extend('facebook', {
+ name: "",
+ version: "",
+ _userInfo: null,
+ _isLoggedIn: false,
+
+ /**
+ * HTTP methods constants
+ * @constant
+ * @type {Object}
+ */
+ HttpMethod: {
+ 'GET': 'get',
+ 'POST': 'post',
+ 'DELETE': 'delete'
+ },
+
+ /**
+ * Succeed code returned in callbacks
+ * @constant
+ * @type {Number}
+ */
+ CODE_SUCCEED: 0,
+
+ /**
+ * App event names constants
+ * @constant
+ * @type {Object}
+ */
+ AppEvent: {
+ 'ACTIVATED_APP': FB.AppEvents.EventNames.ACTIVATED_APP,
+ 'COMPLETED_REGISTRATION': FB.AppEvents.EventNames.COMPLETED_REGISTRATION,
+ 'VIEWED_CONTENT': FB.AppEvents.EventNames.VIEWED_CONTENT,
+ 'SEARCHED': FB.AppEvents.EventNames.SEARCHED,
+ 'RATED': FB.AppEvents.EventNames.RATED,
+ 'COMPLETED_TUTORIAL': FB.AppEvents.EventNames.COMPLETED_TUTORIAL,
+ 'ADDED_TO_CART': FB.AppEvents.EventNames.ADDED_TO_CART,
+ 'ADDED_TO_WISHLIST': FB.AppEvents.EventNames.ADDED_TO_WISHLIST,
+ 'INITIATED_CHECKOUT': FB.AppEvents.EventNames.INITIATED_CHECKOUT,
+ 'ADDED_PAYMENT_INFO': FB.AppEvents.EventNames.ADDED_PAYMENT_INFO,
+ 'PURCHASED': FB.AppEvents.EventNames.PURCHASED,
+ 'ACHIEVED_LEVEL': FB.AppEvents.EventNames.ACHIEVED_LEVEL,
+ 'UNLOCKED_ACHIEVEMENT': FB.AppEvents.EventNames.UNLOCKED_ACHIEVEMENT,
+ 'SPENT_CREDITS': FB.AppEvents.EventNames.SPENT_CREDITS
+ },
+
+ /**
+ * App event parameter names constants
+ * @constant
+ * @type {Object}
+ */
+ AppEventParam: {
+ 'CURRENCY': FB.AppEvents.ParameterNames.CURRENCY,
+ 'REGISTRATION_METHOD': FB.AppEvents.ParameterNames.REGISTRATION_METHOD,
+ 'CONTENT_TYPE': FB.AppEvents.ParameterNames.CONTENT_TYPE,
+ 'CONTENT_ID': FB.AppEvents.ParameterNames.CONTENT_ID,
+ 'SEARCH_STRING': FB.AppEvents.ParameterNames.SEARCH_STRING,
+ 'SUCCESS': FB.AppEvents.ParameterNames.SUCCESS,
+ 'MAX_RATING_VALUE': FB.AppEvents.ParameterNames.MAX_RATING_VALUE,
+ 'PAYMENT_INFO_AVAILABLE': FB.AppEvents.ParameterNames.PAYMENT_INFO_AVAILABLE,
+ 'NUM_ITEMS': FB.AppEvents.ParameterNames.NUM_ITEMS,
+ 'LEVEL': FB.AppEvents.ParameterNames.LEVEL,
+ 'DESCRIPTION': FB.AppEvents.ParameterNames.DESCRIPTION
+ },
+
+ /**
+ * App event parameter values constants
+ * @constant
+ * @type {Object}
+ */
+ AppEventParamValue: {
+ 'VALUE_YES': "1",
+ 'VALUE_NO': "0"
+ },
+
+ _checkLoginStatus: function() {
+ var self = this;
+ FB.getLoginStatus(function (response) {
+ if (response && response.status === 'connected') {
+ //login
+ self._isLoggedIn = true;
+ //save user info
+ self._userInfo = response['authResponse'];
+ } else {
+ // Reset cached status
+ self._isLoggedIn = false;
+ self._userInfo = {};
+ }
+ });
+ },
+
+ ctor: function (config) {
+ this.name = "facebook";
+ this.version = "1.0";
+ this._userInfo = {};
+ this._isLoggedIn = false;
+
+ if (!FB) {
+ return;
+ }
+
+ //This configuration will be read from the project.json.
+ FB.init(config);
+ this._checkLoginStatus();
+
+ plugin.FacebookAgent = this;
+ },
+ /**
+ * Gets the current object
+ * @returns {FacebookAgent}
+ */
+ getInstance: function () {
+ return this;
+ },
+ /**
+ * Login to facebook
+ * @param {Function} callback
+ * @param {Array} permissions
+ * @example
+ * //example
+ * plugin.FacebookAgent.login();
+ */
+ login: function (permissions, callback) {
+ var self = this;
+ if (typeof permissions == 'function') {
+ callback = permissions;
+ permissions = [];
+ }
+ if (permissions.every(function (item) {
+ if (item != 'public_profile')
+ return true;
+ })) {
+ permissions.push("public_profile");
+ }
+ var permissionsStr = permissions.join(',');
+ FB.login(function (response) {
+ if (response['authResponse']) {
+ //save user info
+ self._isLoggedIn = true;
+ self._userInfo = response['authResponse'];
+ var permissList = response['authResponse']['grantedScopes'].split(",");
+ typeof callback === 'function' && callback(0, {
+ accessToken: response['authResponse']['accessToken'],
+ permissions: permissList
+ });
+ } else {
+ self._isLoggedIn = false;
+ self._userInfo = {};
+ typeof callback === 'function' && callback(response['error_code'] || 1, {
+ error_message: response['error_message'] || "Unknown error"
+ });
+ }
+ }, {
+ scope: permissionsStr,
+ return_scopes: true
+ });
+ },
+ /**
+ * Checking login status
+ * @return {Bool} Whether user is logged in
+ * @example
+ * //example
+ * plugin.FacebookAgent.isLoggedIn(type, msg);
+ */
+ isLoggedIn: function () {
+ //this._checkLoginStatus();
+ return this._isLoggedIn;
+ },
+
+ /**
+ * Logout of facebook
+ * @param {Function} callback
+ * @example
+ * //example
+ * plugin.FacebookAgent.logout(callback);
+ */
+ logout: function (callback) {
+ var self = this;
+ FB.logout(function (response) {
+ if (response['authResponse']) {
+ // user is now logged out
+ self._isLoggedIn = false;
+ self._userInfo = {};
+ typeof callback === 'function' && callback(0, {"isLoggedIn": false});
+ } else {
+ typeof callback === 'function' && callback(response['error_code'] || 1, {
+ error_message: response['error_message'] || "Unknown error"
+ });
+ }
+ });
+ },
+
+ /**
+ * Acquiring new permissions
+ * @deprecated since v3.0
+ * @param permissions
+ * @param callback
+ * @example
+ * //example
+ * plugin.FacebookAgent.requestPermissions(["manage_pages"], callback);
+ */
+ _requestPermissions: function (permissions, callback) {
+ var permissionsStr = permissions.join(',');
+ var self = this;
+ FB.login(function (response) {
+ if (response['authResponse']) {
+ var permissList = response['authResponse']['grantedScopes'].split(",");
+ //save user info
+ self._isLoggedIn = true;
+ self._userInfo = response['authResponse'];
+ typeof callback === 'function' && callback(0, {
+ permissions: permissList
+ });
+ } else {
+ self._isLoggedIn = false;
+ self._userInfo = {};
+ typeof callback === 'function' && callback(response['error_code'] || 1, {
+ error_message: response['error_message'] || "Unknown error"
+ });
+ }
+ }, {
+ scope: permissionsStr,
+ return_scopes: true
+ });
+ },
+
+ /**
+ * Acquiring AccessToken
+ * @return {String}
+ * @example
+ * //example
+ * var accessToken = plugin.FacebookAgent.getAccessToken();
+ */
+ getAccessToken: function () {
+ return this._userInfo ? this._userInfo['accessToken'] : null;
+ },
+
+ /**
+ * Acquiring User ID
+ * @return {String}
+ * @example
+ * //example
+ * var userID = plugin.FacebookAgent.getUserID();
+ */
+ getUserID: function () {
+ return this._userInfo ? this._userInfo['userID'] : null;
+ },
+
+ _share: function (info, callback) {
+ FB.ui({
+ method: 'share',
+ name: info['title'],
+ caption: info['caption'],
+ description: info['text'],
+ href: info['link'],
+ picture: info['imageUrl']
+ },
+ function (response) {
+ if (response) {
+ if (response['post_id'])
+ typeof callback === 'function' && callback(0, {
+ didComplete: true,
+ post_id: response['post_id']
+ });
+ else
+ typeof callback === 'function' && callback(response['error_code'] || 1, {
+ error_message: response['error_message'] || "Unknown error"
+ });
+ } else {
+ typeof callback === 'function' && callback(1, {
+ error_message: "Unknown error"
+ });
+ }
+ });
+ },
+
+ /**
+ * Request a web dialog for Facebook sharing
+ * @param info
+ * @param callback
+ */
+ dialog: function (info, callback) {
+ if (!info) {
+ typeof callback === 'function' && callback(1, {
+ error_message: "No info parameter provided"
+ });
+ return;
+ }
+ if (!this.canPresentDialog(info)) {
+ typeof callback === 'function' && callback(1, {
+ error_message: "The requested dialog: " + info['dialog'] + " can not be presented on Web"
+ });
+ return;
+ }
+
+ // Preprocess properties
+ info['name'] = info['name'] || info['site'];
+ delete info['site'];
+
+ info['href'] = info['href'] || info['link'] || info['siteUrl'];
+ delete info['siteUrl'];
+ delete info['link'];
+
+ info['picture'] = info['picture'] || info['image'] || info['photo'] || info['imageUrl'] || info['imagePath'];
+ delete info['imageUrl'];
+ delete info['imagePath'];
+ delete info['photo'];
+ delete info['image'];
+
+ info['caption'] = info['title'] || info['caption'];
+ delete info['title'];
+
+ info['description'] = info['text'] || info['description'];
+ delete info['text'];
+
+ var method = info['dialog'];
+ delete info['dialog'];
+
+ if (method === 'shareLink' || method == 'feedDialog') {
+ info['method'] = 'share';
+ } else if (method == 'messageLink') {
+ info['method'] = 'send';
+ info['link'] = info['href'];
+ } else if (method == 'shareOpenGraph') {
+ info['method'] = 'share_open_graph';
+
+ if (info['url']) {
+ var obj = {};
+ if (info["preview_property_name"])
+ obj[info["preview_property_name"]] = info["url"];
+ else
+ obj["object"] = info["url"];
+
+ for (var p in info) {
+ if (p != "method" && p != "action_type" && p != "action_properties") {
+ info[p] && (obj[p] = info[p]);
+ delete info[p];
+ }
+ }
+
+ info['action_properties'] = JSON.stringify(obj);
+ }
+ }
+
+ FB.ui(info,
+ function (response) {
+ if (response && typeof callback === 'function') {
+ if (response['post_id'] || response['success']) {
+ callback(0, {
+ didComplete: true,
+ post_id: response['post_id'] || ""
+ });
+ }
+ else {
+ if (response['error_code']) {
+ callback(response['error_code'], {
+ error_message : response['error_message'] || 'Unknown error'
+ });
+ }
+ else callback(0, response);
+ }
+ } else if (response == undefined && typeof callback === 'function') {
+ callback(1, {
+ error_message: "Unknown error"
+ });
+ }
+ });
+ },
+
+ /**
+ * Check whether the share request can be achieved
+ * @param info
+ */
+ canPresentDialog: function (info) {
+ if (info && info['dialog'] && (
+ info['dialog'] === 'shareLink' ||
+ info['dialog'] === 'feedDialog' ||
+ info['dialog'] === 'shareOpenGraph' ||
+ info['dialog'] === 'messageLink'))
+ return true;
+ else
+ return false;
+ },
+ /**
+ * FB.api
+ * @param {String} path
+ * @param {Number} httpmethod
+ * @param {Object} params
+ * @param {Function} callback
+ */
+ api: function (path, httpmethod, params, callback) {
+ if (typeof params === 'function') {
+ callback = params;
+ params = {};
+ }
+ FB.api(path, httpmethod, params, function (response) {
+ if (response.error) {
+ typeof callback === 'function' && callback(response['error']['code'], {
+ error_message: response['error']['message'] || 'Unknown error'
+ })
+ } else {
+ typeof callback === 'function' && callback(0, response);
+ }
+ });
+ },
+
+ _getPermissionList: function (callback) {
+ FB.api("/me/permissions", function (response) {
+ if (response['data']) {
+ var permissionList = [];
+ for (var i = 0; i < response['data'].length; i++) {
+ if (response['data'][i]["status"] == "granted") {
+ permissionList.push(response['data'][i]['permission']);
+ }
+ }
+ typeof callback == 'function' && callback(0, {
+ permissions: permissionList
+ });
+ } else {
+ if (!response['error'])
+ response['error'] = {};
+ typeof callback == 'function' && callback(response['error']['code'] || 1, {
+ error_message: response['error']['message'] || 'Unknown error'
+ });
+ }
+ })
+ },
+
+ destroyInstance: function () {
+ },
+ canvas:{
+ /**
+ * Payment request
+ * @param {Object} info
+ * @param {Function} callback
+ */
+ pay: function (info, callback) {
+ /*
+ * Reference document
+ * https://developers.facebook.com/docs/payments/reference/paydialog
+ */
+ info['method'] = 'pay';
+ info['action'] = 'purchaseitem';
+
+ FB.ui(info, function (response) {
+ if (response['error_code']) {
+ callback(response['error_code'] || 1, {
+ error_message: response['error_message'] || response['error_msg'] || 'Unknown error'
+ });
+ } else {
+ callback(0, response);
+ }
+ })
+ }
+ },
+
+ /**
+ * Send an app requests to friends
+ * @param {Object} info
+ * @param {Function} callback
+ */
+ appRequest: function (info, callback) {
+ if (!info) {
+ typeof callback === 'function' && callback(1, {
+ error_message: "No info parameter provided"
+ });
+ return;
+ }
+
+ info['method'] = "apprequests";
+
+ FB.ui(info,
+ function (response) {
+ if (response) {
+ if (response['error_code']) {
+ typeof callback === 'function' && callback(response['error_code'], {
+ error_message : response['error_message'] || 'Unknown error'
+ });
+ }
+ else {
+ typeof callback === 'function' && callback(0, response);
+ }
+ } else {
+ typeof callback === 'function' && callback(1, {
+ error_message: "Unknown error"
+ });
+ }
+ });
+ },
+
+ /**
+ * Log an event
+ * @param {String} eventName
+ * @param {Number} valueToSum
+ * @param {Object} parameters
+ */
+ logEvent: function (eventName, valueToSum, parameters) {
+ if (eventName == undefined) return;
+ if (valueToSum === undefined && parameters === undefined) {
+ FB.AppEvents.logEvent(eventName, null, null);
+ } else if (typeof valueToSum === "number" && parameters === undefined) {
+ FB.AppEvents.logEvent(eventName, valueToSum);
+ } else if (typeof valueToSum === "object" && parameters === undefined) {
+ FB.AppEvents.logEvent(eventName, null, valueToSum);
+ } else {
+ FB.AppEvents.logEvent(eventName, valueToSum, parameters);
+ }
+ },
+
+ /**
+ * Activate App
+ */
+ activateApp: function () {
+ FB.AppEvents.activateApp();
+ },
+
+ /**
+ * Log a purchase
+ * @param {Number} amount Amount of the purchase
+ * @param {String} currency The currency
+ * @param {Object} param Supplemental parameters
+ */
+ logPurchase:function(amount, currency, param){
+ FB.AppEvents.logPurchase(amount, currency, param);
+ }
+});
diff --git a/external/pluginx/platform/facebook_sdk.js b/external/pluginx/platform/facebook_sdk.js
new file mode 100644
index 0000000000..bc05068323
--- /dev/null
+++ b/external/pluginx/platform/facebook_sdk.js
@@ -0,0 +1,151 @@
+
+/*1411456395,,JIT Construction: v1425205,zh_CN*/
+
+/**
+ * Copyright Facebook Inc.
+ *
+ * Licensed under the Apache License, Version 2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ */
+try {window.FB || (function(window) {
+ var self = window, document = window.document;
+ var setTimeout = window.setTimeout, setInterval = window.setInterval,clearTimeout = window.clearTimeout,clearInterval = window.clearInterval;var __DEV__ = 0;
+ function emptyFunction() {};
+ var __w, __t;
+ __t=function(a){return a[0];};__w=function(a){return a;};
+ var require,__d;(function(a){var b={},c={},d=['global','require','requireDynamic','requireLazy','module','exports'];require=function(e,f){if(c.hasOwnProperty(e))return c[e];if(!b.hasOwnProperty(e)){if(f)return null;throw new Error('Module '+e+' has not been defined');}var g=b[e],h=g.deps,i=g.factory.length,j,k=[];for(var l=0;l'+' '+'
');return x.create({classes:'loading'+(u()?' centered':''),content:(''+' '+' '+''+' '+' '+' '+' '+' '+' '+'
+ * please refer to Cocos2d-x's API to know how to use it.
+ * Only available in JSB
+ * @class
+ * @name jsb.fileUtils
+ * @extend cc.Class
+ */
+jsb.fileUtils = /** @lends jsb.fileUtils# */{
+
+ /**
+ * @function fullPathForFilename
+ * @param {String} arg0
+ * @return {String}
+ */
+ fullPathForFilename : function (str)
+ {
+ return ;
+ },
+
+ /**
+ * @function getStringFromFile
+ * @param {String} arg0
+ * @return {String}
+ */
+ getStringFromFile : function (str)
+ {
+ return ;
+ },
+
+ /**
+ * @function removeFile
+ * @param {String} arg0
+ * @return {bool}
+ */
+ removeFile : function (str)
+ {
+ return false;
+ },
+
+ /**
+ * @function isAbsolutePath
+ * @param {String} arg0
+ * @return {bool}
+ */
+ isAbsolutePath : function (str)
+ {
+ return false;
+ },
+
+ /**
+ * @function renameFile
+ * @param {String} arg0
+ * @param {String} arg1
+ * @param {String} arg2
+ * @return {bool}
+ */
+ renameFile : function (str, str, str)
+ {
+ return false;
+ },
+
+ /**
+ * @function loadFilenameLookupDictionaryFromFile
+ * @param {String} arg0
+ */
+ loadFilenameLookupDictionaryFromFile : function (str)
+ {
+ },
+
+ /**
+ * @function isPopupNotify
+ * @return {bool}
+ */
+ isPopupNotify : function ()
+ {
+ return false;
+ },
+
+ /**
+ * @function getValueVectorFromFile
+ * @param {String} arg0
+ * @return {Array}
+ */
+ getValueVectorFromFile : function (str)
+ {
+ return new Array();
+ },
+
+ /**
+ * @function getSearchPaths
+ * @return {Array}
+ */
+ getSearchPaths : function ()
+ {
+ return new Array();
+ },
+
+ /**
+ * @function writeToFile
+ * @param {map_object} arg0
+ * @param {String} arg1
+ * @return {bool}
+ */
+ writeToFile : function (map, str)
+ {
+ return false;
+ },
+
+ /**
+ * @function getValueMapFromFile
+ * @param {String} arg0
+ * @return {map_object}
+ */
+ getValueMapFromFile : function (str)
+ {
+ return map_object;
+ },
+
+ /**
+ * @function getFileSize
+ * @param {String} arg0
+ * @return {long}
+ */
+ getFileSize : function (str)
+ {
+ return 0;
+ },
+
+ /**
+ * @function removeDirectory
+ * @param {String} arg0
+ * @return {bool}
+ */
+ removeDirectory : function (str)
+ {
+ return false;
+ },
+
+ /**
+ * @function setSearchPaths
+ * @param {Array} arg0
+ */
+ setSearchPaths : function (array)
+ {
+ },
+
+ /**
+ * @function writeStringToFile
+ * @param {String} arg0
+ * @param {String} arg1
+ * @return {bool}
+ */
+ writeStringToFile : function (str, str)
+ {
+ return false;
+ },
+
+ /**
+ * @function setSearchResolutionsOrder
+ * @param {Array} arg0
+ */
+ setSearchResolutionsOrder : function (array)
+ {
+ },
+
+ /**
+ * @function addSearchResolutionsOrder
+ * @param {String} arg0
+ */
+ addSearchResolutionsOrder : function (str)
+ {
+ },
+
+ /**
+ * @function addSearchPath
+ * @param {String} arg0
+ */
+ addSearchPath : function (str)
+ {
+ },
+
+ /**
+ * @function isFileExist
+ * @param {String} arg0
+ * @return {bool}
+ */
+ isFileExist : function (str)
+ {
+ return false;
+ },
+
+ /**
+ * @function purgeCachedEntries
+ */
+ purgeCachedEntries : function ()
+ {
+ },
+
+ /**
+ * @function fullPathFromRelativeFile
+ * @param {String} arg0
+ * @param {String} arg1
+ * @return {String}
+ */
+ fullPathFromRelativeFile : function (str, str)
+ {
+ return ;
+ },
+
+ /**
+ * @function isDirectoryExist
+ * @param {String} arg0
+ * @return {bool}
+ */
+ isDirectoryExist : function (str)
+ {
+ return false;
+ },
+
+ /**
+ * @function getSearchResolutionsOrder
+ * @return {Array}
+ */
+ getSearchResolutionsOrder : function ()
+ {
+ return new Array();
+ },
+
+ /**
+ * @function createDirectory
+ * @param {String} arg0
+ * @return {bool}
+ */
+ createDirectory : function (str)
+ {
+ return false;
+ },
+
+ /**
+ * @function createDirectories
+ * @param {String} arg0
+ * @return {bool}
+ */
+ createDirectories : function (str)
+ {
+ return false;
+ },
+
+ /**
+ * @function getWritablePath
+ * @return {String}
+ */
+ getWritablePath : function ()
+ {
+ return ;
+ }
+
+};
+
+/**
+ * @class
+ */
+jsb.EventAssetsManager = cc.Class.extend(/** @lends jsb.EventAssetsManager# */{
+
+ /**
+ * @function getAssetsManager
+ * @return {cc.AssetsManager}
+ */
+ getAssetsManager : function (
+ )
+ {
+ return cc.AssetsManager;
+ },
+
+ /**
+ * @function getAssetId
+ * @return {String}
+ */
+ getAssetId : function (
+ )
+ {
+ return ;
+ },
+
+ /**
+ * @function getCURLECode
+ * @return {int}
+ */
+ getCURLECode : function (
+ )
+ {
+ return 0;
+ },
+
+ /**
+ * @function getMessage
+ * @return {String}
+ */
+ getMessage : function (
+ )
+ {
+ return ;
+ },
+
+ /**
+ * @function getCURLMCode
+ * @return {int}
+ */
+ getCURLMCode : function (
+ )
+ {
+ return 0;
+ },
+
+ /**
+ * @function getPercentByFile
+ * @return {float}
+ */
+ getPercentByFile : function (
+ )
+ {
+ return 0;
+ },
+
+ /**
+ * @function getEventCode
+ * @return {cc.EventAssetsManager::EventCode}
+ */
+ getEventCode : function (
+ )
+ {
+ return 0;
+ },
+
+ /**
+ * @function getPercent
+ * @return {float}
+ */
+ getPercent : function (
+ )
+ {
+ return 0;
+ },
+
+ /**
+ * @function EventAssetsManager
+ * @constructor
+ * @param {String} arg0
+ * @param {cc.AssetsManager} arg1
+ * @param {cc.EventAssetsManager::EventCode} arg2
+ * @param {float} arg3
+ * @param {float} arg4
+ * @param {String} arg5
+ * @param {String} arg6
+ * @param {int} arg7
+ * @param {int} arg8
+ */
+ EventAssetsManager : function (
+ str,
+ assetsmanager,
+ eventcode,
+ float,
+ float,
+ str,
+ str,
+ int,
+ int
+ )
+ {
+ }
+});
+
+
+/**
+ * @class
+ */
+jsb.EventListenerAssetsManager = cc.Class.extend(/** @lends jsb.EventListenerAssetsManager# */{
+
+ /**
+ * @function init
+ * @param {cc.AssetsManager} arg0
+ * @param {function} arg1
+ * @return {bool}
+ */
+ init : function (
+ assetsmanager,
+ func
+ )
+ {
+ return false;
+ },
+
+ /**
+ * @function create
+ * @param {cc.AssetsManager} arg0
+ * @param {function} arg1
+ * @return {cc.EventListenerAssetsManager}
+ */
+ create : function (
+ assetsmanager,
+ func
+ )
+ {
+ return cc.EventListenerAssetsManager;
+ },
+
+ /**
+ * @function EventListenerAssetsManager
+ * @constructor
+ */
+ EventListenerAssetsManager : function (
+ )
+ {
+ }
+
+});
+
+/**
+ * @class
+ * jsb.AssetsManager is the native AssetsManager for your game resources or scripts.
+ * please refer to this document to know how to use it: http://www.cocos2d-x.org/docs/manual/framework/html5/v3/assets-manager/en
+ * Only available in JSB
+ */
+jsb.AssetsManager = cc.Class.extend(/** @lends jsb.AssetsManager# */{
+
+ /**
+ * @function getState
+ * @return {jsb.AssetsManager::State}
+ */
+ getState : function ()
+ {
+ return 0;
+ },
+
+ /**
+ * @function checkUpdate
+ */
+ checkUpdate : function ()
+ {
+ },
+
+ /**
+ * @function getStoragePath
+ * @return {String}
+ */
+ getStoragePath : function ()
+ {
+ return ;
+ },
+
+ /**
+ * @function update
+ */
+ update : function ()
+ {
+ },
+
+ /**
+ * @function getLocalManifest
+ * @return {jsb.Manifest}
+ */
+ getLocalManifest : function ()
+ {
+ return cc.Manifest;
+ },
+
+ /**
+ * @function getRemoteManifest
+ * @return {jsb.Manifest}
+ */
+ getRemoteManifest : function ()
+ {
+ return cc.Manifest;
+ },
+
+ /**
+ * @function downloadFailedAssets
+ */
+ downloadFailedAssets : function ()
+ {
+ },
+
+ /**
+ * @function create
+ * @param {String} arg0
+ * @param {String} arg1
+ * @return {jsb.AssetsManager}
+ */
+ create : function (str, str)
+ {
+ return cc.AssetsManager;
+ },
+
+ /**
+ * @function AssetsManager
+ * @constructor
+ * @param {String} arg0
+ * @param {String} arg1
+ */
+ ctor : function (str, str)
+ {
+ }
+
+});
+
+/**
+ * @class
+ */
+jsb.Manifest = cc.Class.extend(/** @lends jsb.Manifest# */{
+
+ /**
+ * @function getManifestFileUrl
+ * @return {String}
+ */
+ getManifestFileUrl : function ()
+ {
+ return ;
+ },
+
+ /**
+ * @function isVersionLoaded
+ * @return {bool}
+ */
+ isVersionLoaded : function ()
+ {
+ return false;
+ },
+
+ /**
+ * @function isLoaded
+ * @return {bool}
+ */
+ isLoaded : function ()
+ {
+ return false;
+ },
+
+ /**
+ * @function getPackageUrl
+ * @return {String}
+ */
+ getPackageUrl : function ()
+ {
+ return ;
+ },
+
+ /**
+ * @function getVersion
+ * @return {String}
+ */
+ getVersion : function ()
+ {
+ return ;
+ },
+
+ /**
+ * @function getVersionFileUrl
+ * @return {String}
+ */
+ getVersionFileUrl : function ()
+ {
+ return ;
+ }
+});
+
+/**
+ * jsb.reflection is a bridge to let you invoke Java static functions.
+ * please refer to this document to know how to use it: http://www.cocos2d-x.org/docs/manual/framework/html5/v3/reflection/en
+ * Only available on iOS/Mac/Android platform
+ * @class
+ * @name jsb.reflection
+ */
+jsb.reflection = /** @lends jsb.reflection# */{
+ /**
+ * @function
+ */
+ callStaticMethod : function(){
+ }
+};
\ No newline at end of file
diff --git a/moduleConfig.json b/moduleConfig.json
index 20cdaaefdb..a089e198d8 100644
--- a/moduleConfig.json
+++ b/moduleConfig.json
@@ -27,7 +27,9 @@
"clipping-nodes" : [
"core", "shape-nodes",
- "cocos2d/clipping-nodes/CCClippingNode.js"
+ "cocos2d/clipping-nodes/CCClippingNode.js",
+ "cocos2d/clipping-nodes/CCClippingNodeCanvasRenderCmd.js",
+ "cocos2d/clipping-nodes/CCClippingNodeWebGLRenderCmd.js"
],
"compression" : [
"core",
@@ -70,10 +72,16 @@
"cocos2d/core/event-manager/CCEventManager.js",
"cocos2d/core/event-manager/CCEventExtension.js",
- "cocos2d/core/base-nodes/BaseNodesWebGL.js",
+ "cocos2d/core/renderer/RendererCanvas.js",
+ "cocos2d/core/renderer/RendererWebGL.js",
+
"cocos2d/core/base-nodes/BaseNodesPropertyDefine.js",
"cocos2d/core/base-nodes/CCNode.js",
+ "cocos2d/core/base-nodes/CCNodeCanvasRenderCmd.js",
+ "cocos2d/core/base-nodes/CCNodeWebGLRenderCmd.js",
"cocos2d/core/base-nodes/CCAtlasNode.js",
+ "cocos2d/core/base-nodes/CCAtlasNodeCanvasRenderCmd.js",
+ "cocos2d/core/base-nodes/CCAtlasNodeWebGLRenderCmd.js",
"cocos2d/core/textures/TexturesWebGL.js",
"cocos2d/core/textures/TexturesPropertyDefine.js",
@@ -84,14 +92,18 @@
"cocos2d/core/scenes/CCScene.js",
"cocos2d/core/scenes/CCLoaderScene.js",
- "cocos2d/core/layers/CCLayerWebGL.js",
- "cocos2d/core/layers/CCLayerPropertyDefine.js",
"cocos2d/core/layers/CCLayer.js",
+ "cocos2d/core/layers/CCLayerCanvasRenderCmd.js",
+ "cocos2d/core/layers/CCLayerWebGLRenderCmd.js",
- "cocos2d/core/sprites/SpritesWebGL.js",
"cocos2d/core/sprites/SpritesPropertyDefine.js",
"cocos2d/core/sprites/CCSprite.js",
+ "cocos2d/core/sprites/CCSpriteCanvasRenderCmd.js",
+ "cocos2d/core/sprites/CCSpriteWebGLRenderCmd.js",
"cocos2d/core/sprites/CCSpriteBatchNode.js",
+ "cocos2d/core/sprites/CCSpriteBatchNodeCanvasRenderCmd.js",
+ "cocos2d/core/sprites/CCSpriteBatchNodeWebGLRenderCmd.js",
+ "cocos2d/core/sprites/CCBakeSprite.js",
"cocos2d/core/sprites/CCAnimation.js",
"cocos2d/core/sprites/CCAnimationCache.js",
"cocos2d/core/sprites/CCSpriteFrame.js",
@@ -106,9 +118,10 @@
"cocos2d/core/CCDrawingPrimitivesCanvas.js",
"cocos2d/core/CCDrawingPrimitivesWebGL.js",
- "cocos2d/core/labelttf/LabelTTFWebGL.js",
"cocos2d/core/labelttf/LabelTTFPropertyDefine.js",
"cocos2d/core/labelttf/CCLabelTTF.js",
+ "cocos2d/core/labelttf/CCLabelTTFCanvasRenderCmd.js",
+ "cocos2d/core/labelttf/CCLabelTTFWebGLRenderCmd.js",
"cocos2d/core/CCActionManager.js"
],
@@ -138,7 +151,11 @@
"core",
"cocos2d/labels/CCLabelAtlas.js",
- "cocos2d/labels/CCLabelBMFont.js"
+ "cocos2d/labels/CCLabelAtlasCanvasRenderCmd.js",
+ "cocos2d/labels/CCLabelAtlasWebGLRenderCmd.js",
+ "cocos2d/labels/CCLabelBMFont.js",
+ "cocos2d/labels/CCLabelBMFontCanvasRenderCmd.js",
+ "cocos2d/labels/CCLabelBMFontWebGLRenderCmd.js"
],
"menus" : [
"core", "actions",
@@ -149,17 +166,20 @@
"motion-streak" : [
"core", "shaders", "kazmath", "labels",
- "cocos2d/motion-streak/CCMotionStreak.js"
+ "cocos2d/motion-streak/CCMotionStreak.js",
+ "cocos2d/motion-streak/CCMotionStreakWebGLRenderCmd.js"
],
"node-grid" : [
"core",
- "cocos2d/node-grid/CCNodeGrid.js"
+ "cocos2d/node-grid/CCNodeGrid.js",
+ "cocos2d/node-grid/CCNodeGridWebGLRenderCmd.js"
],
"parallax" : [
"core",
- "cocos2d/parallax/CCParallaxNode.js"
+ "cocos2d/parallax/CCParallaxNode.js",
+ "cocos2d/parallax/CCParallaxNodeRenderCmd.js"
],
"particle" : [
"core", "compression",
@@ -167,25 +187,37 @@
"cocos2d/particle/CCPNGReader.js",
"cocos2d/particle/CCTIFFReader.js",
"cocos2d/particle/CCParticleSystem.js",
+ "cocos2d/particle/CCParticleSystemCanvasRenderCmd.js",
+ "cocos2d/particle/CCParticleSystemWebGLRenderCmd.js",
"cocos2d/particle/CCParticleExamples.js",
- "cocos2d/particle/CCParticleBatchNode.js"
+ "cocos2d/particle/CCParticleBatchNode.js",
+ "cocos2d/particle/CCParticleBatchNodeCanvasRenderCmd.js",
+ "cocos2d/particle/CCParticleBatchNodeWebGLRenderCmd.js"
],
"physics" : [
"core", "shape-nodes",
"cocos2d/physics/CCPhysicsSprite.js",
- "cocos2d/physics/CCPhysicsDebugNode.js"
+ "cocos2d/physics/CCPhysicsDebugNode.js",
+ "cocos2d/physics/CCPhysicsDebugNodeCanvasRenderCmd.js",
+ "cocos2d/physics/CCPhysicsDebugNodeWebGLRenderCmd.js",
+ "cocos2d/physics/CCPhysicsSpriteCanvasRenderCmd.js",
+ "cocos2d/physics/CCPhysicsSpriteWebGLRenderCmd.js"
],
"progress-timer" : [
"core", "actions",
"cocos2d/progress-timer/CCProgressTimer.js",
- "cocos2d/progress-timer/CCActionProgressTimer.js"
+ "cocos2d/progress-timer/CCActionProgressTimer.js",
+ "cocos2d/progress-timer/CCProgressTimerCanvasRenderCmd.js",
+ "cocos2d/progress-timer/CCProgressTimerWebGLRenderCmd.js"
],
"render-texture" : [
"core",
- "cocos2d/render-texture/CCRenderTexture.js"
+ "cocos2d/render-texture/CCRenderTexture.js",
+ "cocos2d/render-texture/CCRenderTextureCanvasRenderCmd.js",
+ "cocos2d/render-texture/CCRenderTextureWebGLRenderCmd.js"
],
"shaders" : [
"core", "kazmath",
@@ -198,7 +230,9 @@
"shape-nodes" : [
"core",
- "cocos2d/shape-nodes/CCDrawNode.js"
+ "cocos2d/shape-nodes/CCDrawNode.js",
+ "cocos2d/shape-nodes/CCDrawNodeCanvasRenderCmd.js",
+ "cocos2d/shape-nodes/CCDrawNodeWebGLRenderCmd.js"
],
"text-input" : [
"core",
@@ -213,7 +247,9 @@
"cocos2d/tilemap/CCTMXTiledMap.js",
"cocos2d/tilemap/CCTMXXMLParser.js",
"cocos2d/tilemap/CCTMXObjectGroup.js",
- "cocos2d/tilemap/CCTMXLayer.js"
+ "cocos2d/tilemap/CCTMXLayer.js",
+ "cocos2d/tilemap/CCTMXLayerCanvasRenderCmd.js",
+ "cocos2d/tilemap/CCTMXLayerWebGLRenderCmd.js"
],
"transitions" : [
"core", "actions", "render-texture", "progress-timer",
@@ -231,8 +267,6 @@
"text-input", "menus", "tilemap", "parallax", "audio"
],
-
-
"ccbreader" : [
"core", "audio", "gui", "menus", "particle", "actions", "labels",
@@ -254,13 +288,30 @@
"extensions/editbox/CCdomNode.js",
"extensions/editbox/CCEditBox.js"
],
+ "ccpool" : [
+ "core",
+
+ "extensions/ccpool/CCPool.js"
+ ],
"ccui" : [
- "core", "gui", "actions", "labels", "text-input","clipping-nodes",
+ "core", "actions", "labels", "text-input","clipping-nodes",
+ "extensions/ccui/base-classes/CCProtectedNode.js",
+ "extensions/ccui/base-classes/CCProtectedNodeCanvasRenderCmd.js",
+ "extensions/ccui/base-classes/CCProtectedNodeWebGLRenderCmd.js",
"extensions/ccui/system/CocosGUI.js",
"extensions/ccui/base-classes/UIWidget.js",
+ "extensions/ccui/base-classes/UIWidgetRenderCmd.js",
+ "extensions/ccui/base-classes/UIScale9Sprite.js",
+ "extensions/ccui/base-classes/UIScale9SpriteCanvasRenderCmd.js",
+ "extensions/ccui/base-classes/UIScale9SpriteWebGLRenderCmd.js",
"extensions/ccui/layouts/UILayout.js",
+ "extensions/ccui/layouts/UILayoutCanvasRenderCmd.js",
+ "extensions/ccui/layouts/UILayoutWebGLRenderCmd.js",
"extensions/ccui/layouts/UILayoutParameter.js",
- "extensions/ccui/layouts/UILayoutDefine.js",
+ "extensions/ccui/layouts/UILayoutManager.js",
+ "extensions/ccui/layouts/UIHBox.js",
+ "extensions/ccui/layouts/UIRelativeBox.js",
+ "extensions/ccui/layouts/UIVBox.js",
"extensions/ccui/system/UIHelper.js",
"extensions/ccui/uiwidgets/UIButton.js",
"extensions/ccui/uiwidgets/UICheckBox.js",
@@ -281,6 +332,7 @@
"extensions/cocostudio/components/CCComponent.js",
"extensions/cocostudio/components/CCComponentContainer.js",
+ "extensions/ccui/layouts/UILayoutComponent.js",
"extensions/cocostudio/CocoStudio.js",
"extensions/cocostudio/armature/utils/CCArmatureDefine.js",
@@ -295,11 +347,15 @@
"extensions/cocostudio/armature/display/CCDisplayFactory.js",
"extensions/cocostudio/armature/display/CCDisplayManager.js",
"extensions/cocostudio/armature/display/CCSkin.js",
+ "extensions/cocostudio/armature/display/CCSkinCanvasRenderCmd.js",
+ "extensions/cocostudio/armature/display/CCSkinWebGLRenderCmd.js",
"extensions/cocostudio/armature/animation/CCProcessBase.js",
"extensions/cocostudio/armature/animation/CCArmatureAnimation.js",
"extensions/cocostudio/armature/animation/CCTween.js",
"extensions/cocostudio/armature/physics/CCColliderDetector.js",
"extensions/cocostudio/armature/CCArmature.js",
+ "extensions/cocostudio/armature/CCArmatureCanvasRenderCmd.js",
+ "extensions/cocostudio/armature/CCArmatureWebGLRenderCmd.js",
"extensions/cocostudio/armature/CCBone.js",
"extensions/cocostudio/action/CCActionFrame.js",
@@ -317,8 +373,20 @@
"extensions/cocostudio/trigger/TriggerMng.js",
"extensions/cocostudio/trigger/TriggerObj.js",
- "extensions/cocostudio/reader/GUIReader.js",
- "extensions/cocostudio/reader/SceneReader.js"
+ "extensions/cocostudio/timeline/ActionTimeline.js",
+ "extensions/cocostudio/timeline/Frame.js",
+ "extensions/cocostudio/timeline/Timeline.js",
+
+ "extensions/cocostudio/loader/load.js",
+ "extensions/cocostudio/loader/parsers/scene-1.x.js",
+ "extensions/cocostudio/loader/parsers/uiParser-1.x.js",
+ "extensions/cocostudio/loader/parsers/action-1.x.js",
+ "extensions/cocostudio/loader/parsers/action-2.x.js",
+ "extensions/cocostudio/loader/parsers/timelineParser-1.x.js",
+ "extensions/cocostudio/loader/parsers/timelineParser-2.x.js",
+ "extensions/cocostudio/loader/parsers/compatible.js"
+
+
],
"gui" : [
"core", "clipping-nodes", "render-texture", "actions", "progress-timer",
@@ -328,6 +396,8 @@
"extensions/gui/control-extension/CCControlUtils.js",
"extensions/gui/control-extension/CCInvocation.js",
"extensions/gui/control-extension/CCScale9Sprite.js",
+ "extensions/gui/control-extension/CCScale9SpriteCanvasRenderCmd.js",
+ "extensions/gui/control-extension/CCScale9SpriteWebGLRenderCmd.js",
"extensions/gui/control-extension/CCMenuPassive.js",
"extensions/gui/control-extension/CCControlSaturationBrightnessPicker.js",
"extensions/gui/control-extension/CCControlHuePicker.js",
@@ -337,6 +407,8 @@
"extensions/gui/control-extension/CCControlStepper.js",
"extensions/gui/control-extension/CCControlPotentiometer.js",
"extensions/gui/scrollview/CCScrollView.js",
+ "extensions/gui/scrollview/CCScrollViewCanvasRenderCmd.js",
+ "extensions/gui/scrollview/CCScrollViewWebGLRenderCmd.js",
"extensions/gui/scrollview/CCSorting.js",
"extensions/gui/scrollview/CCTableView.js"
],
@@ -344,27 +416,47 @@
"pluginx" : [
"core",
- "extensions/pluginx/protocols/Config.js",
- "extensions/pluginx/protocols/PluginUtils.js",
- "extensions/pluginx/protocols/PluginProtocol.js",
- "extensions/pluginx/protocols/ProtocolSocial.js",
- "extensions/pluginx/protocols/ProtocolAds.js",
- "extensions/pluginx/protocols/ProtocolAnalytics.js",
-
- "extensions/pluginx/protocols/PluginFactory.js",
- "extensions/pluginx/protocols/PluginManager.js",
-
+ "external/pluginx/Plugin.js"
+ ],
+ "plugin-facebook" : [
+ "external/pluginx/platform/facebook_sdk.js",
+ "external/pluginx/platform/facebook.js"
+ ],
- "extensions/pluginx/plugins/SocialWeibo.js",
- "extensions/pluginx/plugins/SocialQQWeibo.js",
- "extensions/pluginx/plugins/SocialQzone.js",
- "extensions/pluginx/plugins/SocialTwitter.js",
- "extensions/pluginx/plugins/SocialFacebook.js",
+ "spine":[
+ "core",
- "extensions/pluginx/plugins/AnalyticsFlurry.js"
+ "extensions/spine/Spine.js",
+ "extensions/spine/CCSkeleton.js",
+ "extensions/spine/CCSkeletonAnimation.js",
+ "extensions/spine/CCSkeletonCanvasRenderCmd.js",
+ "extensions/spine/CCSkeletonWebGLRenderCmd.js"
],
- "extensions" : ["gui", "ccbreader", "editbox", "cocostudio", "pluginx"],
+ "gaf":[
+ "core",
+ "external/gaf/GAFMacros.js",
+ "external/gaf/GAFBoot.js",
+ "external/gaf/Library/GAFAssetPreload.js",
+ "external/gaf/Library/GAFAsset.js",
+ "external/gaf/Library/GAFObject.js",
+ "external/gaf/Library/GAFTimeLine.js",
+ "external/gaf/Library/GAFTextField.js",
+ "external/gaf/Library/GAFSprite.js",
+ "external/gaf/Library/GAFMask.js",
+ "external/gaf/Library/GAFSpriteCanvasRenderCmd.js",
+ "external/gaf/Library/GAFSpriteWebGLRenderCmd.js",
+ "external/gaf/Library/GAFTimeLineProto.js",
+ "external/gaf/Library/GAFSpriteProto.js",
+ "external/gaf/Library/GAFMaskProto.js",
+ "external/gaf/Library/GAFTags.js",
+ "external/gaf/Library/GAFLoader.js",
+ "external/gaf/Library/GAFDataReader.js",
+ "external/gaf/Library/GAFShaders.js",
+ "external/gaf/Library/GAFShaderManager.js",
+ "external/gaf/Library/GAFAtlasLoader.js"
+ ],
+ "extensions" : ["gui", "ccbreader", "editbox", "cocostudio", "spine", "ccpool"],
"box2d" : [
"core", "physics",
@@ -377,10 +469,9 @@
"external/chipmunk/chipmunk.js"
],
"socketio" : [
-
"external/socketio/socket.io.min.js"
],
- "external" : ["box2d", "chipmunk", "socketio"]
+ "external" : ["box2d", "chipmunk", "socketio", "pluginx", "gaf"]
},
"bootFile" : "CCBoot.js"
}
\ No newline at end of file
diff --git a/template/index.html b/template/index.html
index 1e314249d6..e0f577b927 100644
--- a/template/index.html
+++ b/template/index.html
@@ -19,10 +19,11 @@
-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
}
+
+
+
-
-