mirror of
https://github.com/cocos/cocos4.git
synced 2026-11-20 23:52:40 +08:00
Merge pull request #676 from jareguo/master
support minimized serialization
This commit is contained in:
@@ -109,7 +109,7 @@ cc.Asset = cc.Class({
|
||||
* @default null
|
||||
* @private
|
||||
*/
|
||||
_rawFiles: undefined
|
||||
_rawFiles: null
|
||||
},
|
||||
|
||||
statics: {
|
||||
@@ -160,7 +160,7 @@ cc.Asset = cc.Class({
|
||||
* @private
|
||||
*/
|
||||
_setRawFiles: function (rawFiles) {
|
||||
this._rawFiles = rawFiles.length > 0 ? rawFiles : undefined;
|
||||
this._rawFiles = rawFiles.length > 0 ? rawFiles : null;
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
@@ -138,9 +138,9 @@ function refreshScene () {
|
||||
visitNode(scene);
|
||||
widgetManager._nodesOrderDirty = false;
|
||||
} else {
|
||||
var totalLength = widgetManager._nodesWithWidget.length;
|
||||
for(var i = 0; i < totalLength; i++) {
|
||||
var node = widgetManager._nodesWithWidget[i];
|
||||
var nodes = widgetManager._nodesWithWidget;
|
||||
for (var i = 0, len = nodes.length; i < len; i++) {
|
||||
var node = nodes[i];
|
||||
alignToParent(node, node._widget);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -928,14 +928,17 @@ CCClass._isCCClass = function (constructor) {
|
||||
// @method _fastDefine
|
||||
// @param {String} className
|
||||
// @param {Function} constructor
|
||||
// @param {string[]} serializableFields
|
||||
// @param {Object} serializableFields
|
||||
// @private
|
||||
//
|
||||
CCClass._fastDefine = function (className, constructor, serializableFields) {
|
||||
JS.setClassName(className, constructor);
|
||||
constructor.__props__ = serializableFields;
|
||||
for (var i = 0; i < serializableFields.length; i++) {
|
||||
Attr.attr(constructor, serializableFields[i], { visible: false });
|
||||
//constructor.__ctors__ = constructor.__ctors__ || null;
|
||||
var props = constructor.__props__ = Object.keys(serializableFields);
|
||||
for (var i = 0; i < props.length; i++) {
|
||||
var key = props[i];
|
||||
var val = serializableFields[key];
|
||||
Attr.attr(constructor, key, { visible: false, default: val });
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
@@ -146,7 +146,7 @@ CCObject.Flags = {
|
||||
IsSizeLocked: IsSizeLocked,
|
||||
};
|
||||
|
||||
require('./CCClass').fastDefine('cc.Object', CCObject, ['_name', '_objFlags']);
|
||||
require('./CCClass').fastDefine('cc.Object', CCObject, { _name: '', _objFlags: 0 });
|
||||
|
||||
// internal static
|
||||
|
||||
|
||||
@@ -419,7 +419,7 @@ cc.SpriteFrame = cc.Class(/** @lends cc.SpriteFrame# */{
|
||||
rect: rect ? [rect.x, rect.y, rect.width, rect.height] : undefined,
|
||||
offset: offset ? [offset.x, offset.y] : undefined,
|
||||
originalSize: size ? [size.width, size.height] : undefined,
|
||||
rotated: this._rotated ? 1 : 0,
|
||||
rotated: this._rotated ? 1 : undefined,
|
||||
capInsets: capInsets
|
||||
};
|
||||
},
|
||||
|
||||
@@ -67,7 +67,7 @@ var Color = (function () {
|
||||
this.a = typeof a === 'number' ? a : 255;
|
||||
}
|
||||
JS.extend(Color, ValueType);
|
||||
require('../platform/CCClass').fastDefine('cc.Color', Color, ['r', 'g', 'b', 'a']);
|
||||
require('../platform/CCClass').fastDefine('cc.Color', Color, { r: 0, g: 0, b: 0, a: 255 });
|
||||
|
||||
var DefaultColors = {
|
||||
// color: [r, g, b, a]
|
||||
|
||||
@@ -59,7 +59,7 @@ function Rect (x, y, w, h) {
|
||||
this.height = h || 0;
|
||||
}
|
||||
JS.extend(Rect, ValueType);
|
||||
require('../platform/CCClass').fastDefine('cc.Rect', Rect, ['x', 'y', 'width', 'height']);
|
||||
require('../platform/CCClass').fastDefine('cc.Rect', Rect, { x: 0, y: 0, width: 0, height: 0 });
|
||||
|
||||
/**
|
||||
* !#en Creates a rectangle from two coordinate values.
|
||||
|
||||
@@ -56,7 +56,7 @@ function Size (width, height) {
|
||||
this.height = height || 0;
|
||||
}
|
||||
JS.extend(Size, ValueType);
|
||||
require('../platform/CCClass').fastDefine('cc.Size', Size, ['width', 'height']);
|
||||
require('../platform/CCClass').fastDefine('cc.Size', Size, { width: 0, height: 0});
|
||||
|
||||
/**
|
||||
* !#en return a Size object with width = 0 and height = 0.
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
|
||||
var ValueType = require('./CCValueType');
|
||||
var JS = require('../platform/js');
|
||||
var FireClass = require('../platform/CCClass');
|
||||
var CCClass = require('../platform/CCClass');
|
||||
|
||||
/**
|
||||
* !#en Representation of 2D vectors and points.
|
||||
@@ -56,7 +56,7 @@ function Vec2 (x, y) {
|
||||
this.y = y || 0;
|
||||
}
|
||||
JS.extend(Vec2, ValueType);
|
||||
FireClass.fastDefine('cc.Vec2', Vec2, ['x', 'y']);
|
||||
CCClass.fastDefine('cc.Vec2', Vec2, { x: 0, y: 0 });
|
||||
|
||||
JS.mixin(Vec2.prototype, {
|
||||
|
||||
|
||||
@@ -179,17 +179,18 @@ if (TestEditorExtends) {
|
||||
});
|
||||
|
||||
testWithTarget('circular reference by object', function (useTarget) {
|
||||
var MyAsset = (function () {
|
||||
var _super = cc.Asset;
|
||||
function MyAsset () {
|
||||
_super.call(this);
|
||||
var MyAsset = cc.Class({
|
||||
name: 'MyAsset',
|
||||
extends: cc.Asset,
|
||||
ctor: function () {
|
||||
this.refSelf = this;
|
||||
this.refToMain = null;
|
||||
},
|
||||
properties: {
|
||||
refSelf: null,
|
||||
refToMain: null
|
||||
}
|
||||
cc.js.extend(MyAsset, cc.Asset);
|
||||
cc.js.setClassName('MyAsset', MyAsset);
|
||||
return MyAsset;
|
||||
})();
|
||||
});
|
||||
|
||||
var asset = new MyAsset();
|
||||
var mainAsset = { myAsset: asset };
|
||||
|
||||
Reference in New Issue
Block a user