Fix shader compilation if Oren-nayar render_mode is used #49418
Closed
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
|
Wasn't Oren-nayar removed with #45023? |
Chaosus
commented
Jun 8, 2021
| float t = mix(1.0, max(NdotL, NdotV), step(0.0, s)); | ||
|
|
||
| float sigma2 = roughness * roughness; // TODO: this needs checking | ||
| vec3 A = 1.0 + sigma2 * (-0.5 / (sigma2 + 0.33) + 0.17 * diffuse_light / (sigma2 + 0.13)); |
There was a problem hiding this comment.
I've changed diffuse_color to diffuse_light since diffuse_color is removed in 4.0, maybe this should be a specular_light? cc @clayjohn
|
Ah, this change slipped my mind... Then it needs to be removed from the shader and StandardMaterial3D.
|
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.
Without the fix, the shader will crash. This has been taken from the 3.x version of Godot.