Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clarify COLOR and TEXTURE in CanvasItem shaders #10107

Merged

Conversation

tetrapod00
Copy link
Contributor

Clarifies how to read either the main texture, the vertex COLOR, or both in CanvasItem shaders.

With this PR, all three options available (only COLOR, only TEXTURE, or both) are cleanly listed with snippets. Also, the role of COLOR in fragment() and vertex() is also clearly listed. This is slightly redundant with the tables themselves but worth the increase in clarity.

I've seen a fair bit of confusion about this in help chats, also people looking for the old MODULATE value from 3.x. This should help with both issues.

While I was here I corrected one use of bold instead of CODE styling in one of the tables.

@mhilbrunner mhilbrunner added enhancement area:manual Issues and PRs related to the Manual/Tutorials section of the documentation topic:shaders cherrypick:4.3 labels Oct 18, 2024
@tetrapod00 tetrapod00 force-pushed the canvasitem-shader-color-texture branch from 3870c0b to be84df8 Compare October 18, 2024 17:56
@mhilbrunner mhilbrunner merged commit a31b251 into godotengine:master Oct 19, 2024
1 check passed
@mhilbrunner
Copy link
Member

Thank you!

@tetrapod00 tetrapod00 deleted the canvasitem-shader-color-texture branch October 19, 2024 03:37
@tetrapod00
Copy link
Contributor Author

This one would be nice to cherrypick, but as an (extensive) clarification, it's non-essential. Was the problem the table being reformatted?

@tetrapod00
Copy link
Contributor Author

Cherrypicked to 4.3 in #10356.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area:manual Issues and PRs related to the Manual/Tutorials section of the documentation enhancement topic:shaders
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants