EMSUSD-612 - Add support for MaterialX 1.38.8 #3323
Merged
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
Required lighting changes since some function disappeared. Required updated unit test due to improved blending of the triplanar projection node.
| vec3 comp = mx_ggx_energy_compensation(NdotV, avgAlpha, F); | ||
| vec3 Li = mix(g_specularI, g_diffuseI, avgAlpha); | ||
| return Li * F * G * comp; | ||
| } |
There was a problem hiding this comment.
This is a backup of the file one level above this and will work with MaterialX 1.38.4 to 1.38.7.
| { | ||
| return vec3(0); | ||
| return vec3(0.0); | ||
| } |
There was a problem hiding this comment.
Took the latest mx_environment_none.glsl from MaterialX.
| float phongExp = mayaRoughnessToPhongExp(sqrt(avgAlpha)); | ||
| vec3 Li = mayaGetSpecularEnvironment(N, V, phongExp); | ||
|
|
||
| return Li * F * G * comp; | ||
| return Li * FG; |
There was a problem hiding this comment.
Took the latest mx_environment_prefilter.glsl from MaterialX and adapted it for Maya lighting.
| vec3 Y = normalize(cross(N, X)); | ||
| X = cross(Y, N); | ||
| X = normalize(X - dot(X, N) * N); | ||
| vec3 Y = cross(N, X); |
There was a problem hiding this comment.
Took the latest mx_environment_fis.glsl from MaterialX and adapted it for Maya lighting.
JGamache-autodesk
added
the
ready-for-merge
|
@seando-adsk Ready for merge. |
seando-adsk
approved these changes
Sep 13, 2023
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.
Required lighting changes since some function disappeared. Required updated unit test due to improved blending of the triplanar projection node.