Merge pull request #675 from zilongshanren/refactor-widget-manager

refactoring Widget, don't visit scene every frame
This commit is contained in:
Jare Guo
2016-05-16 11:48:24 +08:00
2 changed files with 20 additions and 1 deletions
+1
View File
@@ -986,6 +986,7 @@ var Node = cc.Class({
if (activeInHierarchyBefore !== shouldActiveNow) {
this._onActivatedInHierarchy(shouldActiveNow);
}
cc._widgetManager._nodesOrderDirty = true;
if (CC_DEV) {
var scene = cc.director.getScene();
var inCurrentSceneBefore = oldParent && oldParent.isChildOf(scene);
+19 -1
View File
@@ -115,6 +115,7 @@ function visitNode (node) {
var widget = node._widget;
if (widget) {
alignToParent(node, widget);
widgetManager._nodesWithWidget.push(node);
if (!CC_EDITOR && widget.isAlignOnce) {
widget.enabled = false;
}
@@ -132,7 +133,17 @@ function refreshScene () {
var scene = cc.director.getScene();
if (scene) {
widgetManager.isAligning = true;
visitNode(scene);
if (widgetManager._nodesOrderDirty) {
widgetManager._nodesWithWidget.length = 0;
visitNode(scene);
widgetManager._nodesOrderDirty = false;
} else {
var totalLength = widgetManager._nodesWithWidget.length;
for(var i = 0; i < totalLength; i++) {
var node = widgetManager._nodesWithWidget[i];
alignToParent(node, node._widget);
}
}
widgetManager.isAligning = false;
}
}
@@ -223,11 +234,14 @@ var adjustWidgetToAllowResizingInEditor = CC_EDITOR && function (event) {
var widgetManager = cc._widgetManager = {
isAligning: false,
_nodesOrderDirty: false,
_nodesWithWidget: [],
init: function (director) {
director.on(cc.Director.EVENT_BEFORE_VISIT, refreshScene);
},
add: function (widget) {
widget.node._widget = widget;
this._nodesOrderDirty = true;
if (CC_EDITOR && !cc.engine.isPlaying) {
widget.node.on('position-changed', adjustWidgetToAllowMovingInEditor, widget);
widget.node.on('size-changed', adjustWidgetToAllowResizingInEditor, widget);
@@ -235,6 +249,10 @@ var widgetManager = cc._widgetManager = {
},
remove: function (widget) {
widget.node._widget = null;
var index = this._nodesWithWidget.indexOf(widget.node);
if (index > -1) {
this._nodesWithWidget.splice(index, 1);
}
if (CC_EDITOR && !cc.engine.isPlaying) {
widget.node.off('position-changed', adjustWidgetToAllowMovingInEditor, widget);
widget.node.off('size-changed', adjustWidgetToAllowResizingInEditor, widget);