Skip to content
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.

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

Fix the problem when the MeshBuffer is switched on the native platform. #1935

Merged

Conversation

caryliu1999
Copy link
Contributor

@caryliu1999 caryliu1999 commented Nov 15, 2019

问题反馈:

https://forum.cocos.org/t/v2-20-mask/85523/13?u=cary

由于Graphics绘制顶点数量过多导致MeshBuffer切换,之前MeshBuffer切换时在原生平台存在一些问题,导致新的数据不会被绘制。

修改说明:

当MeshBuffer顶点数据超过65535时,原生层没有同步提交并切换顶点索引数据缓冲,这里更新同步Js层的处理。

关联PR: cocos-creator-packages/jsb-adapter#206

@holycanvas
Copy link
Contributor

@holycanvas holycanvas commented Nov 18, 2019

要不下个版本吧,看起来改动不下呀

@sunnylanwanjun
Copy link
Contributor

@sunnylanwanjun sunnylanwanjun commented Nov 18, 2019

嗯,我也觉得最好下个版本,这个改动需要做挺多边界测试的,有点慌

@holycanvas holycanvas changed the base branch from v2.2.1-release to v2.3.0 Nov 29, 2019
@holycanvas
Copy link
Contributor

@holycanvas holycanvas commented Jan 10, 2020

冲突了,另外这个最好测试下

@cocos-robot cocos-robot changed the base branch from v2.3.0 to v2.3.0-release Jan 13, 2020
Copy link
Contributor

@cocos-robot cocos-robot left a comment

@caryliu1999, v2.3.0 branch will be deleted, so we edited the base branch to v2.3.0-release, or this PR will be killed by GitHub.
Please review the commits history to ensure that the PR does not polluted by unneeded commits from your origin branch.
If you need to merge to other branch, you can first click the Edit button on the right side of the PR title, then switch the base branch.
If necessary, welcome to resubmit a new PR. Thanks!

@cocos-robot cocos-robot changed the base branch from v2.3.0-release to v2.3.1 Feb 17, 2020
Copy link
Contributor

@cocos-robot cocos-robot left a comment

@caryliu1999, v2.3.0-release branch will be deleted, so we edited the base branch to v2.3.1, or this PR will be killed by GitHub.
Please review the commits history to ensure that the PR does not polluted by unneeded commits from your origin branch.
If you need to merge to other branch, you can first click the Edit button on the right side of the PR title, then switch the base branch.
If necessary, welcome to resubmit a new PR. Thanks!

@cocos-robot cocos-robot changed the base branch from v2.3.1 to v2.3.1-release Feb 24, 2020
Copy link
Contributor

@cocos-robot cocos-robot left a comment

@caryliu1999, v2.3.1 branch will be deleted, so we edited the base branch to v2.3.1-release, or this PR will be killed by GitHub.
Please review the commits history to ensure that the PR does not polluted by unneeded commits from your origin branch.
If you need to merge to other branch, you can first click the Edit button on the right side of the PR title, then switch the base branch.
If necessary, welcome to resubmit a new PR. Thanks!

…lease-fix-buffer

# Conflicts:
#	cocos/renderer/scene/MeshBuffer.cpp
@cocos-robot cocos-robot changed the base branch from v2.3.1-release to v2.3.2 Mar 6, 2020
Copy link
Contributor

@cocos-robot cocos-robot left a comment

@caryliu1999, v2.3.1-release branch will be deleted, so we edited the base branch to v2.3.2, or this PR will be killed by GitHub.
Please review the commits history to ensure that the PR does not polluted by unneeded commits from your origin branch.
If you need to merge to other branch, you can first click the Edit button on the right side of the PR title, then switch the base branch.
If necessary, welcome to resubmit a new PR. Thanks!

@cocos-robot cocos-robot changed the base branch from v2.3.2 to v2.3.3-release Mar 9, 2020
Copy link
Contributor

@cocos-robot cocos-robot left a comment

@caryliu1999, v2.3.2 branch will be deleted, so we edited the base branch to v2.3.3-release, or this PR will be killed by GitHub.
Please review the commits history to ensure that the PR does not polluted by unneeded commits from your origin branch.
If you need to merge to other branch, you can first click the Edit button on the right side of the PR title, then switch the base branch.
If necessary, welcome to resubmit a new PR. Thanks!

@holycanvas holycanvas merged commit 67fa0dc into cocos:v2.3.3-release Mar 20, 2020
1 check passed
@caryliu1999 caryliu1999 deleted the v2.2.1-release-fix-buffer branch Jun 22, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants