Fix build*Shader methods to pass context parameter for instance mode#8537
Closed
esca-A wants to merge 1 commit intoprocessing:dev-2.0from
Closed
Fix build*Shader methods to pass context parameter for instance mode#8537esca-A wants to merge 1 commit intoprocessing:dev-2.0from
esca-A wants to merge 1 commit intoprocessing:dev-2.0from
Conversation
This file contains hidden or 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
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.
Resolves #8520
Changes
Updated the following shader builder methods in
src/webgl/material.jsto accept and forward acontextparameter to.modify():buildMaterialShaderbuildNormalShaderbuildColorShaderbuildStrokeShaderEach method now accepts
(cb, context)and forwardscontextto the correspondingbase*Shader().modify(cb, context)call.Additionally, the related
load*Shadermethods were updated to correctly passthisas the context when invoking the builder methods.Why This Fix Is Needed
In the case of callback shaders, in order for the callbacks to operate in an instance (i.e., to have access to instance-specific functions), they need a reference to the correct p5 instance. This is lost if
contextisn't passed as an argument when callingbuild*Shadersince it breaks instance-mode operation, so callbacks cannot be made to work with the same level of instance-specific functionality.Therefore, by propagating the
contextargument throughout the build methods and their associated load functions, we restore the proper behavior for the build methods in instance mode.Testing
.modify()