WebGLRenderer: Refactored vertex color alpha code #21530
Merged
+39
−63
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
mrdoob
commented
Mar 26, 2021
mrdoob
commented
Mar 26, 2021
|
|
||
| varying vec4 vColor; | ||
| #elif defined( USE_COLOR ) || defined( USE_INSTANCING_COLOR ) |
There was a problem hiding this comment.
This is kind of ugly. Sure needs another clean up pass in the future.
mrdoob
commented
Mar 26, 2021
mrdoob
commented
Mar 27, 2021
| @@ -1466,7 +1466,7 @@ function WebGLRenderer( parameters ) { | |||
| const environment = material.isMeshStandardMaterial ? scene.environment : null; | |||
| const encoding = ( _currentRenderTarget === null ) ? _this.outputEncoding : _currentRenderTarget.texture.encoding; | |||
| const envMap = cubemaps.get( material.envMap || environment ); | |||
| const vertexAlpha = ( ( object.isMesh || object.isLine || object.isPoints ) && object.geometry.attributes.color && object.geometry.attributes.color.itemSize === 4 ); | |||
| const vertexAlphas = material.vertexColors === true && object.geometry.attributes.color && object.geometry.attributes.color.itemSize === 4; | |||
There was a problem hiding this comment.
@Mugen87 This should work then, right?
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.
Related issue: #20975
Description
Refactored some of the logic and glsl defines in the vertex color alpha code.
@chubei @Mugen87 What do you guys think?