[1.0] Fix v0 compatible render queue parsing #995
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
The new procedure lists all used render queues and generate new render queue offsets in the same order See: https://github.com/vrm-c/vrm-specification/blob/master/specification/VRMC_materials_mtoon-1.0-beta/README.ja.md#render-queue
nyamadan
reviewed
Jun 23, 2022
| Array.from(renderQueuesTransparent) | ||
| .sort() | ||
| .forEach((queue, i) => { | ||
| const newQueueOffset = Math.min(Math.max(i - renderQueuesTransparent.size + 1, -9), 0); |
There was a problem hiding this comment.
renderQueuesTransparent.sizeが10より大きい時は警告が出るが処理は継続する。
そのためnewQueueOffset-9が複数回セットされることはありあえる。
nyamadan
reviewed
Jun 23, 2022
| @@ -328,21 +344,88 @@ export class VRMMaterialsV0CompatPlugin implements GLTFLoaderPlugin { | |||
|
|
|||
| /** | |||
| * Convert v0 render order into v1 render order. | |||
| * This uses a map from v0 render queue to v1 compliant render queue offset which is generated in {@link _populateRenderQueueMap}. | |||
| */ | |||
| private _v0ParseRenderQueue(materialProperties: V0Material): number { | |||
| const isTransparent = materialProperties.keywordMap?.['_ALPHABLEND_ON'] ?? false; | |||
| const enabledZWrite = materialProperties.floatProperties?.['_ZWrite'] === 1; | |||
|
|
|||
| let offset = 0; | |||
There was a problem hiding this comment.
OPAQUEやMASKの場合はoffsetは0となる
nyamadan
reviewed
Jun 23, 2022
|
|
||
| if (v0Queue != null) { | ||
| if (enabledZWrite) { | ||
| offset = this._renderQueueMapTransparentZWrite.get(v0Queue)!; |
There was a problem hiding this comment.
isTransparent が true で、renderQueが存在するときのみ_renderQueueMapTransparent(ZWrite)にaddされる。
getは成功すると期待してよさそう。
nyamadan
reviewed
Jun 23, 2022
|
|
||
| // create a map from v0 render queue to v1 render queue offset | ||
| Array.from(renderQueuesTransparent) | ||
| .sort() |
There was a problem hiding this comment.
sortが入ってるのでrenderQueueの大小関係は維持される
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.
Description
This PR will make this parse v0 render queues properly.
It lists all render queues used in the VRM 0.0 model and creates a map to v1 compliant render queue offset in the same order.
See: https://github.com/vrm-c/vrm-specification/blob/master/specification/VRMC_materials_mtoon-1.0-beta/README.ja.md#render-queue
Points need review