Skip to content

Fix dirty flags not send down to invisible child nodes issue #3477

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 12, 2017
Merged

Fix dirty flags not send down to invisible child nodes issue #3477

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f807921
Fix dirty flags not send down to invisible child nodes issue
pandamicro Apr 12, 2017
f336066
Init cc.Color with default alpha value as 255
pandamicro Apr 12, 2017
cb5f827
Fix LabelTTF reset dirty flag during updateStatus
pandamicro Apr 12, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions cocos2d/clipping-nodes/CCClippingNode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,9 +128,6 @@ cc.ClippingNode = cc.Node.extend(/** @lends cc.ClippingNode# */{
},

visit: function (parent) {
if (!this._visible)
return;

this._renderCmd.clippingVisit(parent && parent._renderCmd);
},

Expand Down
10 changes: 7 additions & 3 deletions cocos2d/core/base-nodes/CCNode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2102,12 +2102,16 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{
* @param {cc.Node} parent
*/
visit: function (parent) {
var cmd = this._renderCmd, parentCmd = parent ? parent._renderCmd : null;

// quick return if not visible
if (!this._visible)
if (!this._visible) {
cmd._propagateFlagsDown(parentCmd);
return;
}

var renderer = cc.renderer, cmd = this._renderCmd;
cmd.visit(parent && parent._renderCmd);
var renderer = cc.renderer;
cmd.visit(parentCmd);

var i, children = this._children, len = children.length, child;
if (len > 0) {
Expand Down
16 changes: 16 additions & 0 deletions cocos2d/core/base-nodes/CCNodeCanvasRenderCmd.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,6 +442,22 @@ cc.Node.RenderCmd.prototype = {
_updateColor: function () {
},

_propagateFlagsDown: function (parentCmd) {
var locFlag = this._dirtyFlag;
var parentNode = parentCmd ? parentCmd._node : null;

if(parentNode && parentNode._cascadeColorEnabled && (parentCmd._dirtyFlag & dirtyFlags.colorDirty))
locFlag |= dirtyFlags.colorDirty;

if(parentNode && parentNode._cascadeOpacityEnabled && (parentCmd._dirtyFlag & dirtyFlags.opacityDirty))
locFlag |= dirtyFlags.opacityDirty;

if(parentCmd && (parentCmd._dirtyFlag & dirtyFlags.transformDirty))
locFlag |= dirtyFlags.transformDirty;

this._dirtyFlag = locFlag;
},

updateStatus: function () {
var locFlag = this._dirtyFlag;
var colorDirty = locFlag & dirtyFlags.colorDirty,
Expand Down
7 changes: 5 additions & 2 deletions cocos2d/core/labelttf/CCLabelTTF.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -826,15 +826,18 @@ cc.LabelTTF = cc.Sprite.extend(/** @lends cc.LabelTTF# */{
_t._rectRotated = rotated || false;
_t.setContentSize(untrimmedSize || rect);

_t.setVertexRect(rect);
var locRect = _t._rect;
locRect.x = rect.x;
locRect.y = rect.y;
locRect.width = rect.width;
locRect.height = rect.height;
_t._renderCmd._setTextureCoords(rect, false);

var relativeOffsetX = _t._unflippedOffsetPositionFromCenter.x, relativeOffsetY = _t._unflippedOffsetPositionFromCenter.y;
if (_t._flippedX)
relativeOffsetX = -relativeOffsetX;
if (_t._flippedY)
relativeOffsetY = -relativeOffsetY;
var locRect = _t._rect;
_t._offsetPosition.x = relativeOffsetX + (rect.width - locRect.width) / 2;
_t._offsetPosition.y = relativeOffsetY + (rect.height - locRect.height) / 2;
},
Expand Down
20 changes: 14 additions & 6 deletions cocos2d/core/layers/CCLayer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,16 @@ cc.Layer = cc.Node.extend(/** @lends cc.Layer# */{
},

visit: function (parent) {
var cmd = this._renderCmd, parentCmd = parent ? parent._renderCmd : null;

// quick return if not visible
if (!this._visible)
if (!this._visible) {
cmd._propagateFlagsDown(parentCmd);
return;
}

var renderer = cc.renderer, cmd = this._renderCmd;
cmd.visit(parent && parent._renderCmd);
var renderer = cc.renderer;
cmd.visit(parentCmd);

if (cmd._isBaked) {
renderer.pushRenderCommand(cmd);
Expand Down Expand Up @@ -248,12 +252,16 @@ cc.LayerColor = cc.Layer.extend(/** @lends cc.LayerColor# */{
},

visit: function (parent) {
var cmd = this._renderCmd, parentCmd = parent ? parent._renderCmd : null;

// quick return if not visible
if (!this._visible)
if (!this._visible) {
cmd._propagateFlagsDown(parentCmd);
return;
}

var renderer = cc.renderer, cmd = this._renderCmd;
cmd.visit(parent && parent._renderCmd);
var renderer = cc.renderer;
cmd.visit(parentCmd);

if (cmd._isBaked) {
renderer.pushRenderCommand(cmd._bakeRenderCmd);
Expand Down
2 changes: 1 addition & 1 deletion cocos2d/core/platform/CCTypes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ cc.Color = function (r, g, b, a) {
r = r || 0;
g = g || 0;
b = b || 0;
a = a || 0;
a = typeof a === 'number' ? a : 255;
this._val = ((r << 24) >>> 0) + (g << 16) + (b << 8) + a;
};

Expand Down
9 changes: 6 additions & 3 deletions cocos2d/particle/CCParticleBatchNode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,12 +148,15 @@ cc.ParticleBatchNode = cc.Node.extend(/** @lends cc.ParticleBatchNode# */{
},

visit: function (parent) {
var cmd = this._renderCmd, parentCmd = parent ? parent._renderCmd : null;

// quick return if not visible
if (!this._visible)
if (!this._visible) {
cmd._propagateFlagsDown(parentCmd);
return;
}

var cmd = this._renderCmd;
cmd.visit(parent && parent._renderCmd);
cmd.visit(parentCmd);
cc.renderer.pushRenderCommand(cmd);
cmd._dirtyFlag = 0;
},
Expand Down
10 changes: 7 additions & 3 deletions cocos2d/render-texture/CCRenderTexture.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,13 +133,17 @@ cc.RenderTexture = cc.Node.extend(/** @lends cc.RenderTexture# */{
},

visit: function (parent) {
var cmd = this._renderCmd, parentCmd = parent ? parent._renderCmd : null;

// quick return if not visible
if (!this._visible)
if (!this._visible) {
cmd._propagateFlagsDown(parentCmd);
return;
}

var renderer = cc.renderer, cmd = this._renderCmd;
var renderer = cc.renderer;

cmd.visit(parent && parent._renderCmd);
cmd.visit(parentCmd);
renderer.pushRenderCommand(cmd);
this.sprite.visit(this);
cmd._dirtyFlag = 0;
Expand Down
10 changes: 7 additions & 3 deletions extensions/ccui/base-classes/CCProtectedNode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,19 @@ cc.ProtectedNode = cc.Node.extend(/** @lends cc.ProtectedNode# */{
},

visit: function (parent) {
var cmd = this._renderCmd, parentCmd = parent ? parent._renderCmd : null;

// quick return if not visible
if (!this._visible)
if (!this._visible) {
cmd._propagateFlagsDown(parentCmd);
return;
}

var renderer = cc.renderer, cmd = this._renderCmd;
var renderer = cc.renderer;
var i, children = this._children, len = children.length, child;
var j, pChildren = this._protectedChildren, pLen = pChildren.length, pChild;

cmd.visit(parent && parent._renderCmd);
cmd.visit(parentCmd);

var locGrid = this.grid;
if (locGrid && locGrid._active)
Expand Down
10 changes: 7 additions & 3 deletions extensions/ccui/layouts/UILayout.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,14 +134,18 @@ ccui.Layout = ccui.Widget.extend(/** @lends ccui.Layout# */{
* @param {cc.Node} [parent]
*/
visit: function (parent) {
if (!this._visible)
var cmd = this._renderCmd, parentCmd = parent ? parent._renderCmd : null;

// quick return if not visible
if (!this._visible) {
cmd._propagateFlagsDown(parentCmd);
return;
}

this._adaptRenderers();
this._doLayout();

var renderer = cc.renderer, cmd = this._renderCmd;
var parentCmd = parent && parent._renderCmd;
var renderer = cc.renderer;
cmd.visit(parentCmd);

var stencilClipping = this._clippingEnabled && this._clippingType === ccui.Layout.CLIPPING_STENCIL;
Expand Down
10 changes: 7 additions & 3 deletions extensions/ccui/uiwidgets/scroll-widget/UIScrollView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,14 +124,18 @@ ccui.ScrollView = ccui.Layout.extend(/** @lends ccui.ScrollView# */{
},

visit: function (parent) {
if (!this._visible)
var cmd = this._renderCmd, parentCmd = parent ? parent._renderCmd : null;

// quick return if not visible
if (!this._visible) {
cmd._propagateFlagsDown(parentCmd);
return;
}

this._adaptRenderers();
this._doLayout();

var renderer = cc.renderer, cmd = this._renderCmd;
var parentCmd = parent && parent._renderCmd;
var renderer = cc.renderer;
cmd.visit(parentCmd);

renderer.pushRenderCommand(cmd);
Expand Down
10 changes: 7 additions & 3 deletions extensions/cocostudio/armature/CCArmature.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,12 +151,16 @@ ccs.Armature = ccs.Node.extend(/** @lends ccs.Armature# */{
},

visit: function (parent) {
var cmd = this._renderCmd, parentCmd = parent ? parent._renderCmd : null;

// quick return if not visible
if (!this._visible)
if (!this._visible) {
cmd._propagateFlagsDown(parentCmd);
return;
}

this._renderCmd.visit(parent && parent._renderCmd);
this._renderCmd._dirtyFlag = 0;
cmd.visit(parentCmd);
cmd._dirtyFlag = 0;
},

addChild: function (child, localZOrder, tag) {
Expand Down
8 changes: 6 additions & 2 deletions extensions/cocostudio/timeline/CCSkeletonNode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,10 +145,14 @@ ccs.SkeletonNode = (function () {
},

_visit: function (parentCmd) {
if (!this._visible)
return;
var cmd = this._renderCmd;
parentCmd = parentCmd || cmd.getParentRenderCmd();

// quick return if not visible
if (!this._visible) {
cmd._propagateFlagsDown(parentCmd);
return;
}
cmd._syncStatus(parentCmd);

var i, node;
Expand Down
8 changes: 6 additions & 2 deletions extensions/gui/scrollview/CCScrollView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,12 +166,16 @@ cc.ScrollView = cc.Layer.extend(/** @lends cc.ScrollView# */{
},

visit: function (parent) {
var cmd = this._renderCmd, parentCmd = parent ? parent._renderCmd : null;

// quick return if not visible
if (!this._visible) {
cmd._propagateFlagsDown(parentCmd);
return;
}

var renderer = cc.renderer, cmd = this._renderCmd;
cmd.visit(parent && parent._renderCmd);
var renderer = cc.renderer;
cmd.visit(parentCmd);

if (this._clippingToBounds) {
renderer.pushRenderCommand(cmd.startCmd);
Expand Down