#20: Refactor cc.Layer s to support serialization

Author: pandamicro

cocos2d/core/layers/CCLayer.js

@@ -30,6 +30,7 @@
  * @extends cc.Node
  */
 cc.Layer = cc.Node.extend(/** @lends cc.Layer# */{
+    __type: "cc.Layer",
     _isBaked: false,
     _bakeSprite: null,
     _bakeRenderCmd: null,
@@ -65,15 +66,15 @@ cc.Layer = cc.Node.extend(/** @lends cc.Layer# */{
      * @function
      * @see cc.Layer#unbake
      */
-    bake: null,
+    //bake: null,
 
     /**
      * Cancel the layer to cache all of children to a bake sprite.<br/>
      * This is useful only in html5 engine
      * @function
      * @see cc.Layer#bake
      */
-    unbake: null,
+    //unbake: null,
 
     _bakeRendering: null,
 
@@ -85,9 +86,9 @@ cc.Layer = cc.Node.extend(/** @lends cc.Layer# */{
      */
     isBaked: function(){
         return this._isBaked;
-    },
+    }
 
-    visit: null
+    //visit: null
 });
 
 /**
@@ -248,6 +249,7 @@ if (cc._renderType === cc._RENDER_TYPE_CANVAS) {
  * var yellowBox = new cc.LayerColor(cc.color(255,255,0,255), 200, 200);
  */
 cc.LayerColor = cc.Layer.extend(/** @lends cc.LayerColor# */{
+    __type: "cc.LayerColor",
     _blendFunc: null,
     _className: "LayerColor",
 
@@ -317,7 +319,7 @@ cc.LayerColor = cc.Layer.extend(/** @lends cc.LayerColor# */{
      * @param {Number} [width=]
      * @param {Number} [height=]
      */
-    ctor: null,
+    //ctor: null,
 
     /**
      * Initialization of the layer, please do not call this function by yourself, you should pass the parameters to constructor to initialize a layer
@@ -388,7 +390,7 @@ cc.LayerColor = cc.Layer.extend(/** @lends cc.LayerColor# */{
         this._updateColor();
     },
 
-    draw: null
+    //draw: null
 });
 
 /**
@@ -585,6 +587,7 @@ delete cc._tmp.PrototypeLayerColor;
  * @property {Number}   compresseInterpolation  - Indicate whether or not the interpolation will be compressed
  */
 cc.LayerGradient = cc.LayerColor.extend(/** @lends cc.LayerGradient# */{
+    __type: "cc.LayerGradient",
     _endColor: null,
     _startOpacity: 255,
     _endOpacity: 255,
@@ -835,6 +838,7 @@ delete cc._tmp.PrototypeLayerGradient;
  * var multiLayer = new cc.LayerMultiple(layer1, layer2, layer3);//any number of layers
  */
 cc.LayerMultiplex = cc.Layer.extend(/** @lends cc.LayerMultiplex# */{
+    __type: "cc.LayerMultiplex",
     _enabledLayer: 0,
     _layers: null,
     _className: "LayerMultiplex",

cocos2d/core/layers/CCLayerPropertyDefine.js

@@ -27,8 +27,8 @@
 cc._tmp.PrototypeLayerColor = function () {
     var _p = cc.LayerColor.prototype;
     // Override properties
-    cc.addProperty(_p, "width", _p._getWidth, _p._setWidth);
-    cc.addProperty(_p, "height", _p._getHeight, _p._setHeight);
+    cc.defineGetterSetter(_p, "width", _p._getWidth, _p._setWidth);
+    cc.defineGetterSetter(_p, "height", _p._getHeight, _p._setHeight);
 };
 
 cc._tmp.PrototypeLayerGradient = function () {
@@ -42,11 +42,16 @@ cc._tmp.PrototypeLayerGradient = function () {
     cc.addProperty(_p, "endColor", _p.getEndColor, _p.setEndColor);
     /** @expose */
     _p.startOpacity;
-    cc.addProperty(_p, "startOpacity", _p.getStartOpacity, _p.setStartOpacity);
+    cc.addProperty(_p, "startOpacity", 255, _p.getStartOpacity, _p.setStartOpacity);
     /** @expose */
     _p.endOpacity;
-    cc.addProperty(_p, "endOpacity", _p.getEndOpacity, _p.setEndOpacity);
+    cc.addProperty(_p, "endOpacity", 255, _p.getEndOpacity, _p.setEndOpacity);
     /** @expose */
     _p.vector;
     cc.addProperty(_p, "vector", _p.getVector, _p.setVector);
+
+    _p.__delegators = {
+        startColor : cc.__delegators.color,
+        endColor :  cc.__delegators.color
+    }
 };