Skip to content

Commit 84989eb

Browse files
pandamicropandamicro
committed
cocos2d#20: Revert panda version serialization
1 parent c86601f commit 84989eb

File tree

5 files changed

+50
-90
lines changed

5 files changed

+50
-90
lines changed

‎cocos2d/core/base-nodes/BaseNodesPropertyDefine.js‎

Lines changed: 23 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -28,44 +28,44 @@ cc._tmp.PrototypeCCNode = function () {
2828

2929
var _p = cc.Node.prototype;
3030

31-
cc.addProperty(_p, "x", 0, _p.getPositionX, _p.setPositionX);
32-
cc.addProperty(_p, "y", 0, _p.getPositionY, _p.setPositionY);
31+
cc.defineGetterSetter(_p, "x", _p.getPositionX, _p.setPositionX);
32+
cc.defineGetterSetter(_p, "y", _p.getPositionY, _p.setPositionY);
3333
/** @expose */
3434
//_p.pos;
35-
//cc.addProperty(_p, "pos", _p.getPosition, _p.setPosition);
35+
//cc.defineGetterSetter(_p, "pos", _p.getPosition, _p.setPosition);
3636
/** @expose */
3737
_p.width;
38-
cc.addProperty(_p, "width", 0, _p._getWidth, _p._setWidth);
38+
cc.defineGetterSetter(_p, "width", _p._getWidth, _p._setWidth);
3939
/** @expose */
4040
_p.height;
41-
cc.addProperty(_p, "height", 0, _p._getHeight, _p._setHeight);
41+
cc.defineGetterSetter(_p, "height", _p._getHeight, _p._setHeight);
4242
/** @expose */
4343
//_p.size;
44-
//cc.addProperty(_p, "size", _p.getContentSize, _p.setContentSize);
44+
//cc.defineGetterSetter(_p, "size", _p.getContentSize, _p.setContentSize);
4545
/** @expose */
4646
//_p.anchor;
47-
//cc.addProperty(_p, "anchor", _p._getAnchor, _p._setAnchor);
47+
//cc.defineGetterSetter(_p, "anchor", _p._getAnchor, _p._setAnchor);
4848
/** @expose */
4949
_p.anchorX;
50-
cc.addProperty(_p, "anchorX", 0, _p._getAnchorX, _p._setAnchorX);
50+
cc.defineGetterSetter(_p, "anchorX", _p._getAnchorX, _p._setAnchorX);
5151
/** @expose */
5252
_p.anchorY;
53-
cc.addProperty(_p, "anchorY", 0, _p._getAnchorY, _p._setAnchorY);
53+
cc.defineGetterSetter(_p, "anchorY", _p._getAnchorY, _p._setAnchorY);
5454
/** @expose */
5555
_p.skewX;
56-
cc.addProperty(_p, "skewX", 0, _p.getSkewX, _p.setSkewX);
56+
cc.defineGetterSetter(_p, "skewX", _p.getSkewX, _p.setSkewX);
5757
/** @expose */
5858
_p.skewY;
59-
cc.addProperty(_p, "skewY", 0, _p.getSkewY, _p.setSkewY);
59+
cc.defineGetterSetter(_p, "skewY", _p.getSkewY, _p.setSkewY);
6060
/** @expose */
6161
_p.zIndex;
62-
cc.addProperty(_p, "zIndex", 0, _p.getLocalZOrder, _p.setLocalZOrder);
62+
cc.defineGetterSetter(_p, "zIndex", _p.getLocalZOrder, _p.setLocalZOrder);
6363
/** @expose */
6464
_p.vertexZ;
6565
cc.defineGetterSetter(_p, "vertexZ", _p.getVertexZ, _p.setVertexZ);
6666
/** @expose */
6767
_p.rotation;
68-
cc.addProperty(_p, "rotation", 0, _p.getRotation, _p.setRotation);
68+
cc.defineGetterSetter(_p, "rotation", _p.getRotation, _p.setRotation);
6969
/** @expose */
7070
_p.rotationX;
7171
cc.defineGetterSetter(_p, "rotationX", _p.getRotationX, _p.setRotationX);
@@ -77,13 +77,13 @@ cc._tmp.PrototypeCCNode = function () {
7777
cc.defineGetterSetter(_p, "scale", _p.getScale, _p.setScale);
7878
/** @expose */
7979
_p.scaleX;
80-
cc.addProperty(_p, "scaleX", 1, _p.getScaleX, _p.setScaleX);
80+
cc.defineGetterSetter(_p, "scaleX", _p.getScaleX, _p.setScaleX);
8181
/** @expose */
8282
_p.scaleY;
83-
cc.addProperty(_p, "scaleY", 1, _p.getScaleY, _p.setScaleY);
83+
cc.defineGetterSetter(_p, "scaleY", _p.getScaleY, _p.setScaleY);
8484
/** @expose */
8585
_p.children;
86-
cc.addProperty(_p, "children", _p.getChildren, _p.setChildren);
86+
cc.defineGetterSetter(_p, "children", _p.getChildren, _p.setChildren);
8787
/** @expose */
8888
_p.childrenCount;
8989
cc.defineGetterSetter(_p, "childrenCount", _p.getChildrenCount);
@@ -92,13 +92,13 @@ cc._tmp.PrototypeCCNode = function () {
9292
cc.defineGetterSetter(_p, "parent", _p.getParent, _p.setParent);
9393
/** @expose */
9494
_p.visible;
95-
cc.addProperty(_p, "visible", true, _p.isVisible, _p.setVisible);
95+
cc.defineGetterSetter(_p, "visible", _p.isVisible, _p.setVisible);
9696
/** @expose */
9797
_p.running;
9898
cc.defineGetterSetter(_p, "running", _p.isRunning);
9999
/** @expose */
100100
_p.ignoreAnchor;
101-
cc.addProperty(_p, "ignoreAnchor", false, _p.isIgnoreAnchorPointForPosition, _p.ignoreAnchorPointForPosition);
101+
cc.defineGetterSetter(_p, "ignoreAnchor", _p.isIgnoreAnchorPointForPosition, _p.ignoreAnchorPointForPosition);
102102
/** @expose */
103103
_p.tag;
104104
/** @expose */
@@ -119,41 +119,19 @@ cc._tmp.PrototypeCCNode = function () {
119119

120120
/** @expose */
121121
_p.opacity;
122-
cc.addProperty(_p, "opacity", 255, _p.getOpacity, _p.setOpacity);
122+
cc.defineGetterSetter(_p, "opacity", _p.getOpacity, _p.setOpacity);
123123
/** @expose */
124124
_p.opacityModifyRGB;
125-
cc.addProperty(_p, "opacityModifyRGB", false, _p.isOpacityModifyRGB, _p.setOpacityModifyRGB);
125+
cc.defineGetterSetter(_p, "opacityModifyRGB", _p.isOpacityModifyRGB, _p.setOpacityModifyRGB);
126126
/** @expose */
127127
_p.cascadeOpacity;
128-
cc.addProperty(_p, "cascadeOpacity", false, _p.isCascadeOpacityEnabled, _p.setCascadeOpacityEnabled);
128+
cc.defineGetterSetter(_p, "cascadeOpacity", _p.isCascadeOpacityEnabled, _p.setCascadeOpacityEnabled);
129129
/** @expose */
130130
_p.color;
131-
cc.addProperty(_p, "color", null, _p.getColor, _p.setColor);
131+
cc.defineGetterSetter(_p, "color", _p.getColor, _p.setColor);
132132
/** @expose */
133133
_p.cascadeColor;
134-
cc.addProperty(_p, "cascadeColor", false, _p.isCascadeColorEnabled, _p.setCascadeColorEnabled);
135-
136-
_p.__delegators = {
137-
color : cc.__delegators.color,
138-
children : {
139-
parser : function(json) {
140-
var children = [];
141-
for (var i in json) {
142-
// Generate one child
143-
children.push( cc.deserialize(json[i]) );
144-
}
145-
return children;
146-
},
147-
stringifier : function(children) {
148-
var json = [];
149-
for (var i in children) {
150-
// Generate one child
151-
json.push( cc.serialize(children[i]) );
152-
}
153-
return JSON.stringify(json);
154-
}
155-
}
156-
}
134+
cc.defineGetterSetter(_p, "cascadeColor", _p.isCascadeColorEnabled, _p.setCascadeColorEnabled);
157135

158136
};
159137

‎cocos2d/core/labelttf/LabelTTFPropertyDefine.js‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -35,53 +35,53 @@ cc._tmp.PrototypeLabelTTF = function () {
3535
// Extended properties
3636
/** @expose */
3737
_p.string;
38-
cc.addProperty(_p, "string", "", _p.getString, _p.setString);
38+
cc.defineGetterSetter(_p, "string", _p.getString, _p.setString);
3939
/** @expose */
4040
_p.textAlign;
41-
cc.addProperty(_p, "textAlign", 1, _p.getHorizontalAlignment, _p.setHorizontalAlignment);
41+
cc.defineGetterSetter(_p, "textAlign", _p.getHorizontalAlignment, _p.setHorizontalAlignment);
4242
/** @expose */
4343
_p.verticalAlign;
44-
cc.addProperty(_p, "verticalAlign", 0, _p.getVerticalAlignment, _p.setVerticalAlignment);
44+
cc.defineGetterSetter(_p, "verticalAlign", _p.getVerticalAlignment, _p.setVerticalAlignment);
4545
/** @expose */
4646
_p.fontSize;
47-
cc.addProperty(_p, "fontSize", 0, _p.getFontSize, _p.setFontSize);
47+
cc.defineGetterSetter(_p, "fontSize", _p.getFontSize, _p.setFontSize);
4848
/** @expose */
4949
_p.fontName;
50-
cc.addProperty(_p, "fontName", "Arial", _p.getFontName, _p.setFontName);
50+
cc.defineGetterSetter(_p, "fontName", _p.getFontName, _p.setFontName);
5151
/** @expose */
5252
_p.font;
5353
cc.defineGetterSetter(_p, "font", _p._getFont, _p._setFont);
5454
/** @expose */
5555
_p.boundingSize;
56-
//cc.addProperty(_p, "boundingSize", _p.getDimensions, _p.setDimensions);
56+
//cc.defineGetterSetter(_p, "boundingSize", _p.getDimensions, _p.setDimensions);
5757
/** @expose */
5858
_p.boundingWidth;
59-
cc.addProperty(_p, "boundingWidth", 0, _p._getBoundingWidth, _p._setBoundingWidth);
59+
cc.defineGetterSetter(_p, "boundingWidth", _p._getBoundingWidth, _p._setBoundingWidth);
6060
/** @expose */
6161
_p.boundingHeight;
62-
cc.addProperty(_p, "boundingHeight", 0, _p._getBoundingHeight, _p._setBoundingHeight);
62+
cc.defineGetterSetter(_p, "boundingHeight", _p._getBoundingHeight, _p._setBoundingHeight);
6363
/** @expose */
6464
_p.fillStyle;
65-
cc.addProperty(_p, "fillStyle", _p._getFillStyle, _p.setFontFillColor);
65+
cc.defineGetterSetter(_p, "fillStyle", _p._getFillStyle, _p.setFontFillColor);
6666
/** @expose */
6767
_p.strokeStyle;
68-
cc.addProperty(_p, "strokeStyle", _p._getStrokeStyle, _p._setStrokeStyle);
68+
cc.defineGetterSetter(_p, "strokeStyle", _p._getStrokeStyle, _p._setStrokeStyle);
6969
/** @expose */
7070
_p.lineWidth;
71-
cc.addProperty(_p, "lineWidth", 0, _p._getLineWidth, _p._setLineWidth);
71+
cc.defineGetterSetter(_p, "lineWidth", _p._getLineWidth, _p._setLineWidth);
7272
/** @expose */
7373
_p.shadowOffset;
74-
//cc.addProperty(_p, "shadowOffset", _p._getShadowOffset, _p._setShadowOffset);
74+
//cc.defineGetterSetter(_p, "shadowOffset", _p._getShadowOffset, _p._setShadowOffset);
7575
/** @expose */
7676
_p.shadowOffsetX;
77-
cc.addProperty(_p, "shadowOffsetX", 0, _p._getShadowOffsetX, _p._setShadowOffsetX);
77+
cc.defineGetterSetter(_p, "shadowOffsetX", _p._getShadowOffsetX, _p._setShadowOffsetX);
7878
/** @expose */
7979
_p.shadowOffsetY;
80-
cc.addProperty(_p, "shadowOffsetY", 0, _p._getShadowOffsetY, _p._setShadowOffsetY);
80+
cc.defineGetterSetter(_p, "shadowOffsetY", _p._getShadowOffsetY, _p._setShadowOffsetY);
8181
/** @expose */
8282
_p.shadowOpacity;
83-
cc.addProperty(_p, "shadowOpacity", 0, _p._getShadowOpacity, _p._setShadowOpacity);
83+
cc.defineGetterSetter(_p, "shadowOpacity", _p._getShadowOpacity, _p._setShadowOpacity);
8484
/** @expose */
8585
_p.shadowBlur;
86-
cc.addProperty(_p, "shadowBlur", 0, _p._getShadowBlur, _p._setShadowBlur);
86+
cc.defineGetterSetter(_p, "shadowBlur", _p._getShadowBlur, _p._setShadowBlur);
8787
};

‎cocos2d/core/layers/CCLayerPropertyDefine.js‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,22 +36,17 @@ cc._tmp.PrototypeLayerGradient = function () {
3636
// Extended properties
3737
/** @expose */
3838
_p.startColor;
39-
cc.addProperty(_p, "startColor", _p.getStartColor, _p.setStartColor);
39+
cc.defineGetterSetter(_p, "startColor", _p.getStartColor, _p.setStartColor);
4040
/** @expose */
4141
_p.endColor;
42-
cc.addProperty(_p, "endColor", _p.getEndColor, _p.setEndColor);
42+
cc.defineGetterSetter(_p, "endColor", _p.getEndColor, _p.setEndColor);
4343
/** @expose */
4444
_p.startOpacity;
45-
cc.addProperty(_p, "startOpacity", 255, _p.getStartOpacity, _p.setStartOpacity);
45+
cc.defineGetterSetter(_p, "startOpacity", _p.getStartOpacity, _p.setStartOpacity);
4646
/** @expose */
4747
_p.endOpacity;
48-
cc.addProperty(_p, "endOpacity", 255, _p.getEndOpacity, _p.setEndOpacity);
48+
cc.defineGetterSetter(_p, "endOpacity", _p.getEndOpacity, _p.setEndOpacity);
4949
/** @expose */
5050
_p.vector;
51-
cc.addProperty(_p, "vector", _p.getVector, _p.setVector);
52-
53-
_p.__delegators = {
54-
startColor : cc.__delegators.color,
55-
endColor : cc.__delegators.color
56-
}
51+
cc.defineGetterSetter(_p, "vector", _p.getVector, _p.setVector);
5752
};

‎cocos2d/core/sprites/SpritesPropertyDefine.js‎

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ cc._tmp.PrototypeSprite = function () {
3737
_p.dirty;
3838
/** @expose */
3939
_p.flippedX;
40-
cc.addProperty(_p, "flippedX", false, _p.isFlippedX, _p.setFlippedX);
40+
cc.defineGetterSetter(_p, "flippedX", _p.isFlippedX, _p.setFlippedX);
4141
/** @expose */
4242
_p.flippedY;
43-
cc.addProperty(_p, "flippedY", false, _p.isFlippedY, _p.setFlippedY);
43+
cc.defineGetterSetter(_p, "flippedY", _p.isFlippedY, _p.setFlippedY);
4444
/** @expose */
4545
_p.offsetX;
4646
cc.defineGetterSetter(_p, "offsetX", _p._getOffsetX);
@@ -51,7 +51,7 @@ cc._tmp.PrototypeSprite = function () {
5151
_p.atlasIndex;
5252
/** @expose */
5353
_p.texture;
54-
cc.addProperty(_p, "texture", null, _p.getTexture, _p.setTexture);
54+
cc.defineGetterSetter(_p, "texture", _p.getTexture, _p.setTexture);
5555
/** @expose */
5656
_p.textureRectRotated;
5757
cc.defineGetterSetter(_p, "textureRectRotated", _p.isTextureRectRotated);
@@ -64,17 +64,4 @@ cc._tmp.PrototypeSprite = function () {
6464
_p.quad;
6565
cc.defineGetterSetter(_p, "quad", _p.getQuad);
6666

67-
_p.__type = "cc.Sprite";
68-
69-
_p.__delegators = {
70-
"texture" : {
71-
parser : function(json) {
72-
return cc.textureCache.addImage(json);
73-
},
74-
stringifier : function(texture) {
75-
return cc.textureCache.getKeyByTexture(texture);
76-
}
77-
}
78-
}
79-
8067
};

‎cocos2d/core/textures/CCTextureAtlas.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -616,13 +616,13 @@ var _p = cc.TextureAtlas.prototype;
616616
// Extended properties
617617
/** @expose */
618618
_p.totalQuads;
619-
cc.addProperty(_p, "totalQuads", _p.getTotalQuads);
619+
cc.defineGetterSetter(_p, "totalQuads", _p.getTotalQuads);
620620
/** @expose */
621621
_p.capacity;
622-
cc.addProperty(_p, "capacity", _p.getCapacity);
622+
cc.defineGetterSetter(_p, "capacity", _p.getCapacity);
623623
/** @expose */
624624
_p.quads;
625-
cc.addProperty(_p, "quads", _p.getQuads, _p.setQuads);
625+
cc.defineGetterSetter(_p, "quads", _p.getQuads, _p.setQuads);
626626

627627
/**
628628
* <p>Creates a TextureAtlas with an filename and with an initial capacity for Quads. <br />

0 commit comments

Comments
 (0)