mirror of
https://github.com/cocos/cocos4.git
synced 2026-11-21 16:12:40 +08:00
working on fixing memleak in JSB
This commit is contained in:
+7
-1
@@ -543,7 +543,13 @@ cc._initDebugSetting = function (mode) {
|
||||
}
|
||||
}
|
||||
cc._throw = CC_EDITOR ? Editor.error : function (error) {
|
||||
cc.error(error.stack || error);
|
||||
var stack = error.stack;
|
||||
if (stack) {
|
||||
cc.error(CC_JSB ? (error + '\n' + stack) : stack);
|
||||
}
|
||||
else {
|
||||
cc.error(error);
|
||||
}
|
||||
};
|
||||
};
|
||||
//+++++++++++++++++++++++++something about log end+++++++++++++++++++++++++++++
|
||||
|
||||
@@ -23,6 +23,8 @@
|
||||
THE SOFTWARE.
|
||||
****************************************************************************/
|
||||
|
||||
var Base = cc._RendererInSG;
|
||||
|
||||
/**
|
||||
* @class Mask
|
||||
* @extends _RendererInSG
|
||||
@@ -51,7 +53,7 @@ var MaskType = cc.Enum({
|
||||
|
||||
var Mask = cc.Class({
|
||||
name: 'cc.Mask',
|
||||
extends: cc._RendererInSG,
|
||||
extends: Base,
|
||||
|
||||
editor: CC_EDITOR && {
|
||||
menu: 'i18n:MAIN_MENU.component.renderers/Mask',
|
||||
@@ -167,12 +169,6 @@ var Mask = cc.Class({
|
||||
this.node.off('anchor-changed', this._refreshStencil, this);
|
||||
},
|
||||
|
||||
onDestroy: CC_JSB && function () {
|
||||
this._super();
|
||||
this._clippingStencil.release();
|
||||
this._clippingStencil = null;
|
||||
},
|
||||
|
||||
_calculateCircle: function(center, radius, segements) {
|
||||
var polies =[];
|
||||
var anglePerStep = Math.PI * 2 / segements;
|
||||
@@ -208,4 +204,14 @@ var Mask = cc.Class({
|
||||
}
|
||||
});
|
||||
|
||||
if (CC_JSB) {
|
||||
// override onDestroy
|
||||
Mask.prototype.__superOnDestroy = Base.prototype.onDestroy;
|
||||
Mask.prototype.onDestroy = function () {
|
||||
this.__superOnDestroy();
|
||||
this._clippingStencil.release();
|
||||
this._clippingStencil = null;
|
||||
};
|
||||
}
|
||||
|
||||
cc.Mask = module.exports = Mask;
|
||||
|
||||
@@ -33,6 +33,7 @@
|
||||
*/
|
||||
var RendererInSG = cc.Class({
|
||||
extends: require('./CCSGComponent'),
|
||||
name: 'cc._RendererInSG',
|
||||
|
||||
ctor: function () {
|
||||
/**
|
||||
|
||||
@@ -32,6 +32,7 @@
|
||||
*/
|
||||
var RendererUnderSG = cc.Class({
|
||||
extends: require('./CCSGComponent'),
|
||||
name: 'cc._RendererUnderSG',
|
||||
|
||||
ctor: function () {
|
||||
/**
|
||||
|
||||
@@ -38,6 +38,7 @@ var SceneGraphHelper = require('../utils/scene-graph-helper');
|
||||
*/
|
||||
var SGComponent = cc.Class({
|
||||
extends: require('./CCComponent'),
|
||||
name: 'cc._SGComponent',
|
||||
|
||||
editor: CC_EDITOR && {
|
||||
executeInEditMode: true,
|
||||
|
||||
@@ -23,6 +23,8 @@
|
||||
THE SOFTWARE.
|
||||
****************************************************************************/
|
||||
|
||||
var Base = require('./CCRendererUnderSG');
|
||||
|
||||
/**
|
||||
* !#en Enum for sprite type.
|
||||
* !#zh Sprite 类型
|
||||
@@ -113,7 +115,7 @@ var SizeMode = cc.Enum({
|
||||
*/
|
||||
var Sprite = cc.Class({
|
||||
name: 'cc.Sprite',
|
||||
extends: require('./CCRendererUnderSG'),
|
||||
extends: Base,
|
||||
|
||||
editor: CC_EDITOR && {
|
||||
menu: 'i18n:MAIN_MENU.component.renderers/Sprite',
|
||||
@@ -483,11 +485,6 @@ var Sprite = cc.Class({
|
||||
return this._sgNode.getInsetBottom();
|
||||
},
|
||||
|
||||
__preload: CC_EDITOR && function () {
|
||||
this._super();
|
||||
this.node.on('size-changed', this._resized, this);
|
||||
},
|
||||
|
||||
onEnable: function () {
|
||||
if (this._sgNode) {
|
||||
if (this._spriteFrame && this._spriteFrame.textureLoaded()) {
|
||||
@@ -496,11 +493,6 @@ var Sprite = cc.Class({
|
||||
}
|
||||
},
|
||||
|
||||
onDestroy: CC_EDITOR && function () {
|
||||
this._super();
|
||||
this.node.off('size-changed', this._resized, this);
|
||||
},
|
||||
|
||||
_applyAtlas: CC_EDITOR && function (spriteFrame) {
|
||||
// Set atlas
|
||||
if (spriteFrame && spriteFrame._atlasUuid) {
|
||||
@@ -623,6 +615,21 @@ var Sprite = cc.Class({
|
||||
},
|
||||
});
|
||||
|
||||
if (CC_EDITOR) {
|
||||
// override __preload
|
||||
Sprite.prototype.__superPreload = Base.prototype.__preload;
|
||||
Sprite.prototype.__preload = function () {
|
||||
this.__superPreload();
|
||||
this.node.on('size-changed', this._resized, this);
|
||||
};
|
||||
// override onDestroy
|
||||
Sprite.prototype.__superOnDestroy = Base.prototype.onDestroy;
|
||||
Sprite.prototype.onDestroy = function () {
|
||||
this.__superOnDestroy();
|
||||
this.node.off('size-changed', this._resized, this);
|
||||
};
|
||||
}
|
||||
|
||||
var misc = require('../utils/misc');
|
||||
var SameNameGetSets = ['atlas', 'capInsets', 'insetLeft', 'insetTop', 'insetRight', 'insetBottom'];
|
||||
var DiffNameGetSets = {
|
||||
|
||||
@@ -22,9 +22,17 @@ function release (loader, key, nextSceneAssets) {
|
||||
loader.removeItem(key);
|
||||
console.log('auto release: ' + key);
|
||||
// TODO: Audio
|
||||
if (item.content instanceof cc.Texture2D) {
|
||||
var asset = item.content;
|
||||
if (asset instanceof cc.Texture2D) {
|
||||
cc.textureCache.removeTextureForKey(item.url);
|
||||
}
|
||||
//else if (asset instanceof cc.SpriteFrame) {
|
||||
// // for the "Temporary solution" in deserialize.js
|
||||
// console.log('release sprite frame: ' + key);
|
||||
// if (CC_JSB) {
|
||||
// asset.release();
|
||||
// }
|
||||
//}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -215,7 +215,8 @@ function loadUuid (item, callback) {
|
||||
});
|
||||
}
|
||||
catch (e) {
|
||||
callback( new Error('Uuid Loader: Deserialize asset [' + item.id + '] failed : ' + e.stack) );
|
||||
var err = CC_JSB ? (e + '\n' + e.stack) : e.stack;
|
||||
callback( new Error('Uuid Loader: Deserialize asset [' + item.id + '] failed : ' + err) );
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@@ -906,6 +906,15 @@ function CCClass (options) {
|
||||
});
|
||||
}
|
||||
else if (CC_DEV) {
|
||||
if (func === false && base && base.prototype) {
|
||||
// check override
|
||||
var overrided = base.prototype[funcName];
|
||||
if (typeof overrided === 'function') {
|
||||
var baseFuc = JS.getClassName(base) + '.' + funcName;
|
||||
var subFuc = name + '.' + funcName;
|
||||
cc.warn('"%s" overrided "%s" but "%s" is defined as "false" so the super method will not be called. You can set "%s" to null to disable this warning.', subFuc, baseFuc, subFuc, subFuc);
|
||||
}
|
||||
}
|
||||
var correct = TYPO_TO_CORRECT[funcName];
|
||||
if (correct) {
|
||||
cc.warn('Unknown type of %s.%s, maybe you want is "%s".', name, funcName, correct);
|
||||
|
||||
Reference in New Issue
Block a user