Allow texture() to work under specular in WEBGL mode #6138
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
Let material and texture coexist.
Allow texture() to use materials.
|
I'll prepare unit tests, later. |
texture Material coexisting unit test.
I made a mistake in the timing of setting the uniform in testcode. sorry.
|
Thank you for marging and reviewing! Thanks!!('ω') |
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.
The purpose is to make texture() and specular coexist.
Resolves #6137
Changes:
Since ambientMaterial(), emissiveMaterial(), specularMaterial() used to process _tex to null, this process has been removed.
Since texture() was setting _useSpecularMaterial etc. to false, that process was removed.
Screenshots of the change:
before/after
PR Checklist
npm run lintpasses