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

Rename hint_albedo, hint_white/black in shaders #60803

Merged
merged 1 commit into from
May 24, 2022

Conversation

Chaosus
Copy link
Member

@Chaosus Chaosus commented May 5, 2022

Approved changes from PR meeting (godotengine/godot-proposals#2323 (comment)):

  • hint_albedo/hint_black_albedo/hint_color → source_color
  • hint_black/hint_white → hint_default_black/hint_default_white

Closes godotengine/godot-proposals#2323

@Chaosus Chaosus requested review from a team as code owners May 5, 2022 18:28
@Chaosus Chaosus added this to the 4.0 milestone May 5, 2022
@Chaosus Chaosus requested a review from clayjohn May 5, 2022 18:29
@Chaosus Chaosus force-pushed the shader_hint_rename branch 2 times, most recently from 3254042 to 9f959dd Compare May 5, 2022 19:03
@clayjohn
Copy link
Member

clayjohn commented May 9, 2022

Although not mentioned in the comment, the plan was also to replace hint_color with source_color.

@Chaosus
Copy link
Member Author

Chaosus commented May 9, 2022

@clayjohn hint_albedo already has been renamed to source_color, to what rename of hint_color?

@clayjohn
Copy link
Member

clayjohn commented May 9, 2022

They should both be renamed to source_color

@Chaosus Chaosus force-pushed the shader_hint_rename branch from 9f959dd to 3d66021 Compare May 9, 2022 19:27
@Chaosus
Copy link
Member Author

Chaosus commented May 9, 2022

@clayjohn Done. Check if you want.

@akien-mga akien-mga merged commit 1314e6c into godotengine:master May 24, 2022
@akien-mga
Copy link
Member

Thanks!

@GiantBlargg
Copy link
Contributor

The replacement for hint_black_albedo, source_color, hint_default_black doesn't work, as the uniform only stores the most recent hint.

Hint is overwritten here: https://github.com/Chaosus/godot/blob/a8bbe570caadd0161a8db9c980296b111042a6b8/servers/rendering/shader_language.cpp#L8235-L8262

@Chaosus Chaosus mentioned this pull request May 31, 2022
@Chaosus
Copy link
Member Author

Chaosus commented May 31, 2022

@GiantBlargg Thanks for the notice - but next time create a new issue instead of posting to the closed PR. This should be fixed by #61554

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Rename hint_albedo for sRGB -> Linear color conversion in shaders
5 participants