fixed the findCamera problem #3642
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ColinCollins
force-pushed
the
findCamera
branch
from
811493d
to
7016509
Compare
2youyou2
reviewed
Dec 17, 2018
cocos2d/core/camera/CCCamera.js
Outdated
| _getGroupIndex (node) { | ||
| let groupIndex = node.groupIndex; | ||
| if (groupIndex === 0 && node.parent) { | ||
| groupIndex = this._getGroupIndex(node.parent); |
There was a problem hiding this comment.
这样就是 node.hitTest 里性能消耗比较大，@pandamicro 有其他建议吗
There was a problem hiding this comment.
group 设置如果是一个非常低频的操作，建议直接在 group setter 中刷新子节点树
There was a problem hiding this comment.
还有修改 parent 的时候也要再计算，这样 render flow 中 culling mask 的计算可以去掉了
There was a problem hiding this comment.
可以啊，RenderFlow 的调用频率比 group setter, parent setter 高太多了
ColinCollins
force-pushed
the
findCamera
branch
from
7016509
to
490e7ce
Compare
|
二改，增加了 cullingMask 判断避免非 default 分组的多次重复遍历。 |
ColinCollins
force-pushed
the
findCamera
branch
from
490e7ce
to
baef257
Compare
|
2youyou2
reviewed
Dec 18, 2018
cocos2d/core/CCNode.js
Outdated
| this.groupIndex = cc.game.groupList.indexOf(value); | ||
| this.groupIndex = this._getParentCullingMask(this); |
There was a problem hiding this comment.
这个获取的包括父节点的信息，不要修改到当前节点。。
2youyou2
reviewed
Dec 18, 2018
cocos2d/core/CCNode.js
Outdated
| @@ -3053,6 +3059,15 @@ var Node = cc.Class({ | |||
| eventManager.pauseTarget(this); | |||
| } | |||
| }, | |||
|
|
|||
| // traversal the node tree, child cullingMask must keep the same with the parent. | |||
| _getParentCullingMask (node) { | |||
There was a problem hiding this comment.
这个函数获取的是 groupIndex，不是 cullingmask，叫 _getParentGroupIndex 吧
ColinCollins
force-pushed
the
findCamera
branch
from
baef257
to
fded43e
Compare
pandamicro
suggested changes
Dec 18, 2018
cocos2d/core/CCNode.js
Outdated
| @@ -1308,6 +1311,9 @@ var Node = cc.Class({ | |||
|
|
|||
| this._updateOrderOfArrival(); | |||
|
|
|||
| // synchronize _cullingMask | |||
| this._cullingMask = 1 << this._getParentGroupIndex(this);; | |||
There was a problem hiding this comment.
onBatchRestored 里面也需要做同样的逻辑
cocos2d/core/CCNode.js
Outdated
| @@ -3053,6 +3059,15 @@ var Node = cc.Class({ | |||
| eventManager.pauseTarget(this); | |||
| } | |||
| }, | |||
|
|
|||
| // traversal the node tree, child cullingMask must keep the same with the parent. | |||
| _getParentGroupIndex (node) { | |||
ColinCollins
force-pushed
the
findCamera
branch
from
fded43e
to
75237c5
Compare
pandamicro
approved these changes
Dec 18, 2018
jareguo
reviewed
Dec 19, 2018
| _getActualGroupIndex (node) { | ||
| let groupIndex = node.groupIndex; | ||
| if (groupIndex === 0 && node.parent) { | ||
| groupIndex = this._getActualGroupIndex(node.parent); |
There was a problem hiding this comment.
干嘛要传入参数啊，直接用 this 不就完事了吗？你都不用 this 的话，这个函数就改成局部函数呗
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
issue: https://github.com/cocos-creator/2d-tasks/issues/878
fixed the findCamera can't get the correct Camera target when node prop still not init.