Merge pull request #1158 from dingpinglv/Iss2833_ReturnNewObjectForFunciton

dingpinglv · dingpinglv · commit f8789ea160c3 · 2013-09-24T23:53:28.000-07:00
Closed #2833: Returning a new object instead returning an object's reference for some Engine class to avoid some mistake.
diff --git a/cocos2d/CCDirector.js b/cocos2d/CCDirector.js
@@ -435,7 +435,7 @@ cc.Director = cc.Class.extend(/** @lends cc.Director# */{
      * @return {cc.Size}
      */
     getWinSize:function () {
-        return this._winSizeInPoints;
+        return cc.size(this._winSizeInPoints.width, this._winSizeInPoints.height);
     },
 
     /**
@@ -453,17 +453,15 @@ cc.Director = cc.Class.extend(/** @lends cc.Director# */{
     getVisibleSize:function () {
         if (this._openGLView) {
             return this._openGLView.getVisibleSize();
-        }
-        else {
+        } else {
             return cc.size(0,0);
         }
     },
 
     getVisibleOrigin:function () {
         if (this._openGLView) {
             return this._openGLView.getVisibleOrigin();
-        }
-        else {
+        } else {
             return cc.p(0, 0);
         }
     },
@@ -939,6 +937,7 @@ cc.Director = cc.Class.extend(/** @lends cc.Director# */{
 
     /**
      * seconds per frame
+     * @return {Number}
      */
     getSecondsPerFrame:function () {
         return this._secondsPerFrame;
diff --git a/cocos2d/actions/CCActionGrid3D.js b/cocos2d/actions/CCActionGrid3D.js
@@ -366,7 +366,7 @@ cc.Lens3D = cc.Grid3DAction.extend(/** @lends cc.Lens3D# */{
      * @return {cc.Point}
      */
     getPosition:function () {
-        return this._position;
+        return cc.p(this._position.x,this._position.y);
     },
 
     /**
@@ -487,7 +487,7 @@ cc.Ripple3D = cc.Grid3DAction.extend(/** @lends cc.Ripple3D# */{
      * @return {cc.Point}
      */
     getPosition:function () {
-        return this._position;
+        return cc.p(this._position.x, this._position.y);
     },
 
     /**
@@ -899,7 +899,7 @@ cc.Twirl = cc.Grid3DAction.extend({
      * @return {cc.Point}
      */
     getPosition:function () {
-        return this._position;
+        return cc.p(this._position.x, this._position.y);
     },
 
     /**
diff --git a/cocos2d/effects/CCGrid.js b/cocos2d/effects/CCGrid.js
@@ -97,7 +97,7 @@ cc.GridBase = cc.Class.extend(/** @lends cc.GridBase# */{
      * @return {cc.Size}
      */
     getGridSize:function () {
-        return this._gridSize;
+        return cc.size(this._gridSize.width, this._gridSize.height);
     },
 
     /**
@@ -114,15 +114,16 @@ cc.GridBase = cc.Class.extend(/** @lends cc.GridBase# */{
      * @return {cc.Point}
      */
     getStep:function () {
-        return this._step;
+        return cc.p(this._step.x, this._step.y);
     },
 
     /**
      * set pixels between the grids
      * @param {cc.Point} step
      */
     setStep:function (step) {
-        this._step = step;
+        this._step.x = step.x;
+        this._step.y = step.y;
     },
 
     /**
diff --git a/cocos2d/label_nodes/CCLabelTTF.js b/cocos2d/label_nodes/CCLabelTTF.js
@@ -172,7 +172,7 @@ cc.LabelTTF = cc.Sprite.extend(/** @lends cc.LabelTTF# */{
      * @return {cc.Size}
      */
     getDimensions:function () {
-        return this._dimensions;
+        return cc.size(this._dimensions.width, this._dimensions.height);
     },
 
     /**
diff --git a/cocos2d/layers_scenes_transitions_nodes/CCLayer.js b/cocos2d/layers_scenes_transitions_nodes/CCLayer.js
@@ -635,7 +635,7 @@ cc.LayerRGBA = cc.Layer.extend(/** @lends cc.LayerRGBA# */{
      * @param {Number} parentOpacity
      */
     updateDisplayedOpacity: function (parentOpacity) {
-        this._displayedOpacity = this._realOpacity * parentOpacity/255.0;
+        this._displayedOpacity = 0|(this._realOpacity * parentOpacity/255.0);
 
         if (this._cascadeOpacityEnabled){
             var locChildren = this._children;
@@ -656,37 +656,44 @@ cc.LayerRGBA = cc.Layer.extend(/** @lends cc.LayerRGBA# */{
     },
 
     getColor: function () {
-        return this._realColor;
+        var locRealColor = this._realColor;
+        return cc.c3b(locRealColor.r, locRealColor.g, locRealColor.b);
     },
 
     getDisplayedColor: function () {
-        return this._displayedColor;
+        var locDisplayedColor = this._displayedColor;
+        return cc.c3b(locDisplayedColor.r, locDisplayedColor.g, locDisplayedColor.b);
     },
 
     setColor: function (color) {
-        this._displayedColor = cc.c3b(color.r, color.g, color.b);
-        this._realColor = cc.c3b(color.r,color.g, color.b);
+        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;
 
         if (this._cascadeColorEnabled){
-            var parentColor = cc.white();
+            var parentColor;
             var locParent = this._parent;
             if (locParent && locParent.RGBAProtocol && locParent.isCascadeColorEnabled())
                 parentColor = locParent.getDisplayedColor();
+            else
+                parentColor = cc.white();
             this.updateDisplayedColor(parentColor);
         }
     },
 
     updateDisplayedColor: function (parentColor) {
-        this._displayedColor.r = this._realColor.r * parentColor.r/255.0;
-        this._displayedColor.g = this._realColor.g * parentColor.g/255.0;
-        this._displayedColor.b = this._realColor.b * parentColor.b/255.0;
+        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;
             for(var i = 0; i < locChildren.length; i++){
                 var selItem = locChildren[i];
                 if(selItem && selItem.RGBAProtocol)
-                    selItem.updateDisplayedColor(this._displayedColor);
+                    selItem.updateDisplayedColor(locDisplayedColor);
             }
         }
     },
@@ -786,15 +793,9 @@ cc.LayerColor = cc.LayerRGBA.extend(/** @lends cc.LayerColor# */{
     _squareVerticesAB:null,
     _squareColorsAB:null,
 
-    /**
-     * Constructor
-     */
-    ctor: null,
-
     _ctorForCanvas: function () {
         cc.LayerRGBA.prototype.ctor.call(this);
         this._blendFunc = new cc.BlendFunc(cc.BLEND_SRC, cc.BLEND_DST);
-        this._color = new cc.Color4B(0, 0, 0, 0);
     },
 
     _ctorForWebGL: function () {
@@ -1038,7 +1039,6 @@ cc.LayerGradient = cc.LayerColor.extend(/** @lends cc.LayerGradient# */{
     ctor:function () {
         cc.LayerColor.prototype.ctor.call(this);
 
-        this._color = new cc.Color3B(0, 0, 0);
         this._startColor = new cc.Color3B(0, 0, 0);
         this._endColor = new cc.Color3B(0, 0, 0);
         this._alongVector = cc.p(0, -1);
@@ -1053,7 +1053,7 @@ cc.LayerGradient = cc.LayerColor.extend(/** @lends cc.LayerGradient# */{
      * @return {cc.Color3B}
      */
     getStartColor:function () {
-        return this._color;
+        return this._realColor;
     },
 
     /**
@@ -1128,15 +1128,16 @@ cc.LayerGradient = cc.LayerColor.extend(/** @lends cc.LayerGradient# */{
      * @param {cc.Point} Var
      */
     setVector:function (Var) {
-        this._alongVector = Var;
+        this._alongVector.x = Var.x;
+        this._alongVector.y = Var.y;
         this._updateColor();
     },
 
     /**
      * @return {cc.Point}
      */
     getVector:function () {
-        return this._alongVector;
+        return cc.p(this._alongVector.x, this._alongVector.y);
     },
 
     /** is Compressed Interpolation
diff --git a/cocos2d/misc_nodes/CCProgressTimer.js b/cocos2d/misc_nodes/CCProgressTimer.js
@@ -77,7 +77,7 @@ cc.ProgressTimer = cc.NodeRGBA.extend(/** @lends cc.ProgressTimer# */{
      *  @return {cc.Point}
      */
     getMidpoint:function () {
-        return this._midPoint;
+        return cc.p(this._midPoint.x, this._midPoint);
     },
 
     /**
@@ -96,7 +96,7 @@ cc.ProgressTimer = cc.NodeRGBA.extend(/** @lends cc.ProgressTimer# */{
      *  @return {cc.Point}
      */
     getBarChangeRate:function () {
-        return this._barChangeRate;
+        return cc.p(this._barChangeRate.x, this._barChangeRate.y);
     },
 
     /**
diff --git a/cocos2d/particle_nodes/CCParticleSystem.js b/cocos2d/particle_nodes/CCParticleSystem.js
@@ -727,7 +727,8 @@ cc.ParticleSystem = cc.Node.extend(/** @lends cc.ParticleSystem# */{
      */
     getGravity:function () {
         cc.Assert(this._emitterMode == cc.PARTICLE_MODE_GRAVITY, "Particle Mode should be Gravity");
-        return this.modeA.gravity;
+        var locGravity = this.modeA.gravity;
+        return cc.p(locGravity.x, locGravity.y);
     },
 
     /**
diff --git a/cocos2d/platform/CCEGLView.js b/cocos2d/platform/CCEGLView.js
@@ -227,7 +227,7 @@ cc.EGLView = cc.Class.extend(/** @lends cc.EGLView# */{
      * @return {cc.Size}
      */
     getFrameSize:function () {
-        return this._screenSize;
+        return cc.size(this._screenSize.width, this._screenSize.height);
     },
 
     /**
@@ -257,7 +257,7 @@ cc.EGLView = cc.Class.extend(/** @lends cc.EGLView# */{
         if (this._resolutionPolicy === cc.RESOLUTION_POLICY.NOBORDER) {
             return cc.size(this._screenSize.width / this._scaleX, this._screenSize.height / this._scaleY);
         } else {
-            return this._designResolutionSize;
+            return cc.size(this._designResolutionSize.width, this._designResolutionSize.height);
         }
     },
 
@@ -363,7 +363,7 @@ cc.EGLView = cc.Class.extend(/** @lends cc.EGLView# */{
      * @return {cc.Size}
      */
     getDesignResolutionSize:function () {
-        return this._designResolutionSize;
+        return cc.size(this._designResolutionSize.width, this._designResolutionSize.height);
     },
 
     /**
diff --git a/cocos2d/sprite_nodes/CCSprite.js b/cocos2d/sprite_nodes/CCSprite.js
@@ -521,10 +521,13 @@ cc.Sprite = cc.NodeRGBA.extend(/** @lends cc.Sprite# */{
      *    Do not call it manually. Use setTextureRect instead.  <br/>
      *    (override this method to generate "double scale" sprites)
      * </p>
-     * @param rect
+     * @param {cc.Rect} rect
      */
     setVertexRect:function (rect) {
-        this._rect = rect;
+        this._rect.x = rect.x;
+        this._rect.y = rect.y;
+        this._rect.width = rect.width;
+        this._rect.height = rect.height;
     },
 
     sortAllChildren:function () {
diff --git a/cocos2d/sprite_nodes/CCSpriteFrame.js b/cocos2d/sprite_nodes/CCSpriteFrame.js
@@ -88,14 +88,18 @@ cc.SpriteFrame = cc.Class.extend(/** @lends cc.SpriteFrame# */{
      * @return {cc.Rect}
      */
     getRectInPixels:function () {
-        return this._rectInPixels;
+        var locRectInPixels = this._rectInPixels;
+        return cc.rect(locRectInPixels.x, locRectInPixels.y, locRectInPixels.width, locRectInPixels.height);
     },
 
     /**
      * @param {cc.Rect} rectInPixels
      */
     setRectInPixels:function (rectInPixels) {
-        this._rectInPixels = rectInPixels;
+        this._rectInPixels.x = rectInPixels.x;
+        this._rectInPixels.y = rectInPixels.y;
+        this._rectInPixels.width = rectInPixels.width;
+        this._rectInPixels.height = rectInPixels.height;
         this._rect = cc.RECT_PIXELS_TO_POINTS(rectInPixels);
     },
 
@@ -122,15 +126,19 @@ cc.SpriteFrame = cc.Class.extend(/** @lends cc.SpriteFrame# */{
      * @return {cc.Rect}
      */
     getRect:function () {
-        return this._rect;
+        var locRect = this._rect;
+        return cc.rect(locRect.x, locRect.y, locRect.width, locRect.height);
     },
 
     /**
      * set rect of the frame
      * @param {cc.Rect} rect
      */
     setRect:function (rect) {
-        this._rect = rect;
+        this._rect.x = rect.x;
+        this._rect.y = rect.y;
+        this._rect.width = rect.width;
+        this._rect.height = rect.height;
         this._rectInPixels = cc.RECT_POINTS_TO_PIXELS(this._rect);
     },
 
@@ -147,7 +155,8 @@ cc.SpriteFrame = cc.Class.extend(/** @lends cc.SpriteFrame# */{
      * @param {cc.Point} offsetInPixels
      */
     setOffsetInPixels:function (offsetInPixels) {
-        this._offsetInPixels = offsetInPixels;
+        this._offsetInPixels.x = offsetInPixels.x;
+        this._offsetInPixels.y = offsetInPixels.y;
         this._offset = cc.POINT_PIXELS_TO_POINTS(this._offsetInPixels);
     },
 
@@ -157,15 +166,16 @@ cc.SpriteFrame = cc.Class.extend(/** @lends cc.SpriteFrame# */{
      * @return {cc.Size}
      */
     getOriginalSizeInPixels:function () {
-        return this._originalSizeInPixels;
+        return cc.size(this._originalSizeInPixels.width, this._originalSizeInPixels.height);
     },
 
     /**
      * set original size of the trimmed image
      * @param {cc.Size} sizeInPixels
      */
     setOriginalSizeInPixels:function (sizeInPixels) {
-        this._originalSizeInPixels = sizeInPixels;
+        this._originalSizeInPixels.width = sizeInPixels.width;
+        this._originalSizeInPixels.height = sizeInPixels.height;
     },
 
     /**
@@ -182,7 +192,8 @@ cc.SpriteFrame = cc.Class.extend(/** @lends cc.SpriteFrame# */{
      * @param {cc.Size} sizeInPixels
      */
     setOriginalSize:function (sizeInPixels) {
-        this._originalSize = sizeInPixels;
+        this._originalSize.width = sizeInPixels.width;
+        this._originalSize.height = sizeInPixels.height;
     },
 
     /**
diff --git a/cocos2d/tileMap_parallax_nodes/CCTMXLayer.js b/cocos2d/tileMap_parallax_nodes/CCTMXLayer.js
diff --git a/cocos2d/tileMap_parallax_nodes/CCTMXObjectGroup.js b/cocos2d/tileMap_parallax_nodes/CCTMXObjectGroup.js
diff --git a/cocos2d/tileMap_parallax_nodes/CCTMXTiledMap.js b/cocos2d/tileMap_parallax_nodes/CCTMXTiledMap.js
diff --git a/cocos2d/tileMap_parallax_nodes/CCTMXXMLParser.js b/cocos2d/tileMap_parallax_nodes/CCTMXXMLParser.js
