mirror of
https://github.com/cocos/cocos4.git
synced 2026-11-21 16:12:40 +08:00
minor tweaks
This commit is contained in:
@@ -166,9 +166,6 @@ var Sprite = cc.Class({
|
||||
var lastSprite = this._spriteFrame;
|
||||
this._spriteFrame = value;
|
||||
this._applySpriteFrame(lastSprite);
|
||||
// color cleared after reset texture, should re-apply color
|
||||
// this._sgNode.setColor(this.node._color);
|
||||
// this._sgNode.setOpacity(this.node._opacity);
|
||||
},
|
||||
type: cc.SpriteFrame,
|
||||
},
|
||||
|
||||
@@ -367,7 +367,7 @@ var View = cc._Class.extend({
|
||||
* @param {Boolean} enabled - Enable or disable retina display
|
||||
*/
|
||||
enableRetina: function(enabled) {
|
||||
this._retinaEnabled = enabled ? true : false;
|
||||
this._retinaEnabled = !!enabled;
|
||||
},
|
||||
|
||||
/**
|
||||
|
||||
@@ -731,9 +731,9 @@ var TiledMap = cc.Class({
|
||||
} else {
|
||||
// tmx file is cleared
|
||||
// 1. hide the tmx layers in _sgNode
|
||||
var layers = self._sgNode.allLayers();
|
||||
var layers = sgNode.allLayers();
|
||||
for (var i = 0, n = layers.length; i < n; i++) {
|
||||
self._sgNode.removeChild(layers);
|
||||
sgNode.removeChild(layers[i]);
|
||||
}
|
||||
|
||||
// 2. if the component is enabled,
|
||||
|
||||
@@ -294,8 +294,11 @@ sp.Skeleton = cc.Class({
|
||||
// IMPLEMENT
|
||||
|
||||
onLoad: function () {
|
||||
// sgNode 的尺寸不是很可靠 同时 Node 的框框也没办法和渲染匹配 只好强制尺寸为零
|
||||
var Flags = cc.Object.Flags;
|
||||
this._objFlags |= (Flags.IsAnchorLocked | Flags.IsSizeLocked);
|
||||
this.node.setContentSize(0, 0);
|
||||
//
|
||||
this._refresh();
|
||||
},
|
||||
|
||||
@@ -736,6 +739,7 @@ sp.Skeleton = cc.Class({
|
||||
var sgNode = self._sgNode = self._createSgNode();
|
||||
if (sgNode) {
|
||||
sgNode.retain();
|
||||
sgNode.setContentSize(0, 0); // restore content size
|
||||
self._initSgNode();
|
||||
self._appendSgNode(sgNode);
|
||||
if ( !self.node._sizeProvider ) {
|
||||
@@ -743,9 +747,6 @@ sp.Skeleton = cc.Class({
|
||||
}
|
||||
}
|
||||
|
||||
// sgNode 的尺寸不是很可靠 同时 Node 的框框也没办法和渲染匹配 只好先强制尺寸为零
|
||||
self.node.setContentSize(0, 0);
|
||||
|
||||
if (CC_EDITOR) {
|
||||
// update inspector
|
||||
self._updateAnimEnum();
|
||||
|
||||
Reference in New Issue
Block a user