Skip to content

Issue fixes #3352

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
Aug 1, 2016
Merged

Issue fixes #3352

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
e28e125
Fix syncStatus transform dirty flag not resetting issue
pandamicro Aug 1, 2016
58c9a06
Use tile map parsed opacity in TMXLayer
pandamicro Aug 1, 2016
447c12a
Block webgl on mobile UC and other small fixes
pandamicro Aug 1, 2016
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
1 change: 1 addition & 0 deletions CCBoot.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1894,6 +1894,7 @@ var _initSys = function () {
case sys.BROWSER_TYPE_UNKNOWN:
case sys.BROWSER_TYPE_360:
case sys.BROWSER_TYPE_MIUI:
case sys.BROWSER_TYPE_UC:
_supportWebGL = false;
}
}
Expand Down
6 changes: 4 additions & 2 deletions cocos2d/core/base-nodes/CCNodeCanvasRenderCmd.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,9 +465,11 @@ cc.Node.RenderCmd.prototype = {
if (colorDirty || opacityDirty)
this._updateColor();

if (locFlag & flags.transformDirty)
//update the transform
if (locFlag & flags.transformDirty) {
//update the transform
this.transform(parentCmd);
this._dirtyFlag = this._dirtyFlag & flags.transformDirty ^ this._dirtyFlag;
}

if (locFlag & flags.orderDirty)
this._dirtyFlag = this._dirtyFlag & flags.orderDirty ^ this._dirtyFlag;
Expand Down
2 changes: 1 addition & 1 deletion cocos2d/tilemap/CCTMXLayerCanvasRenderCmd.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
var node = this._node, hasRotation = (node._rotationX || node._rotationY),
layerOrientation = node.layerOrientation,
tiles = node.tiles,
alpha = this._displayedOpacity / 255;
alpha = node._opacity / 255;

if (!tiles || alpha <= 0) {
return;
Expand Down
2 changes: 1 addition & 1 deletion cocos2d/tilemap/CCTMXLayerWebGLRenderCmd.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
mapx = ox * a + oy * c + tx,
mapy = ox * b + oy * d + ty;

var opacity = this._displayedOpacity,
var opacity = node._opacity,
cr = this._displayedColor.r,
cg = this._displayedColor.g,
cb = this._displayedColor.b;
Expand Down
2 changes: 1 addition & 1 deletion extensions/gui/scrollview/CCScrollViewWebGLRenderCmd.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
var node = this._node;
if (node._scissorRestored) { //restore the parent's scissor rect
var rect = node._parentScissorRect;
cc.view.setScissorInPoints(rect.x, rect.y, rect.width, rect.height)
cc.view.setScissorInPoints(rect.x, rect.y, rect.width, rect.height);
}else{
var ctx = cc._renderContext;
ctx.disable(ctx.SCISSOR_TEST);
Expand Down
2 changes: 2 additions & 0 deletions extensions/gui/scrollview/CCTableView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -520,6 +520,8 @@ cc.TableView = cc.ScrollView.extend(/** @lends cc.TableView# */{
this._updateContentSize();
if (this._dataSource.numberOfCellsInTableView(this) > 0)
this.scrollViewDidScroll(this);

this.setNodeDirty();
},

/**
Expand Down