Shader hooks for dev-2.0#7267
Merged
Merged
Conversation
This reverts commit 286fc2f.
Co-authored-by: Perminder Singh <127239756+perminder-17@users.noreply.github.com>
Member
|
@davepagurek Since it's not breaking anything, that approach is fine overall. Although one thing to note around the difference between the main branch and the dev-2.0 branch is that the dev-2.0 branch not mostly uses the new module syntax (WebGL still yet to be converted) and whenever we need to merge from main to dev-2.0 any file that is changed on main will show up as merge conflict in dev-2.0, but not sure how relevant this is for here. |
Contributor
Author
|
Sounds good, I'll keep tabs on WebGL updates to main and help resolve those in dev-2.0. |
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
2 participants
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.
This branches off of #7149 and resolves its merge conflicts with the
dev-2.0branch so that we can use shader hooks in examples for things like stroke shaders in @perminder-17 and @Garima3110's project, and for custom attributes in @lukeplowden's project.@limzykenneth I think my plan will be to merge both the PR into the main branch and this PR in (it's labelled as
@betain the JSDoc, which will show up on the site like this processing/p5.js-website#544), continue to collect feedback, and keep both main and dev-2.0 up to date with further changes. Then when we release 2.0 at the end of the year, we'll take out the@betaflag. In the mean time, it feels like the core of this feature is stable enough that we can build off of it for other 2.0 features. Does that sound OK to you?