Add environment light intensity in GLSL #1737
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
jstone-lucasfilm
changed the title
There was a problem hiding this comment.
This looks nearly ready to merge, @ashwinbhat, though I had one question about support in the Viewer on MacOS.
jstone-lucasfilm
approved these changes
Mar 21, 2024
jstone-lucasfilm
merged commit d58092e
into
AcademySoftwareFoundation:dev_1.39
31 checks passed
kwokcb
added a commit
to kwokcb/MaterialX
that referenced
this pull request
Mar 26, 2024
* Use framework linkage for OpenGL on macOS (AcademySoftwareFoundation#1741) This commit fixes the output of the MaterialXTargets.cmake to have proper system linkage for OpenGL in the cmake config. Without this change, downstream projects on a Mac like USD cannot build against MaterialX properly. * Static analysis fixes This changelist addresses a handful of static analysis warnings flagged by Cppcheck and MSVC. * Move dynamic analysis tests to MacOS (AcademySoftwareFoundation#1743) This changelist moves dynamic analysis tests to MacOS in GitHub Actions, allowing them to take advantage of more recent compiler environments and hardware. * Add environment light intensity in GLSL (AcademySoftwareFoundation#1737) Introduce a new uniform (u_envLightIntensity) that allows applications to control the light intensity directly in generated shaders. The uniform is a linear multiplier on environment lights. Applications can control the value of the uniform as needed. * Remove 'baked' suffix from TextureBaker names (AcademySoftwareFoundation#1744) The texturebaker appended a "_baked" token suffix to the generated material names that changed material name. Some pipelines get impacted by this rename, since the original material name is lost. Removing the suffix to retain original material name. * Update development build to 1.38.10 * Move prefilter functions to referencing GLSL files This changelist moves environment prefilter functions into the GLSL files that reference them, addressing shader compilation errors when GenOptions::hwDirectionalAlbedoMethod is set to DIRECTIONAL_ALBEDO_TABLE or DIRECTIONAL_ALBEDO_MONTE_CARLO by the client. * Move light uniforms into referencing GLSL files (AcademySoftwareFoundation#1750) This change moves the new environment light intensity uniforms into their referencing GLSL files, addressing shader compilation errors when GenOptions::hwDirectionalAlbedoMethod is set to DIRECTIONAL_ALBEDO_TABLE or DIRECTIONAL_ALBEDO_MONTE_CARLO by the client. Additionally, the change moves the environment light intensity option from the UI to the command line of the viewer, since isolated adjustments of the indirect lighting term are an unintuitive rendering control for most users. --------- Co-authored-by: Dhruv Govil <dgovil2@apple.com> Co-authored-by: Jonathan Stone <jstone@lucasfilm.com> Co-authored-by: Ashwin Bhat <1727158+ashwinbhat@users.noreply.github.com>
ashwinbhat
added a commit
to autodesk-forks/MaterialX
that referenced
this pull request
Apr 3, 2024
Introduce a new uniform (u_envLightIntensity) that allows applications to control the light intensity directly in generated shaders. The uniform is a linear multiplier on environment lights. Applications can control the value of the uniform as needed.
jstone-lucasfilm
pushed a commit
that referenced
this pull request
Apr 4, 2024
ehlenl
pushed a commit
to ehlenl/MaterialX
that referenced
this pull request
Apr 12, 2024
…n#1763) - Add environment light intensity in GLSL (AcademySoftwareFoundation#1737) - Remove 'baked' suffix from TextureBaker names (AcademySoftwareFoundation#1744) - Move light uniforms into referencing GLSL files (AcademySoftwareFoundation#1750)
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.
Introduce a new uniform (
u_envLightIntensity) that allows applications to control the light intensity directly in generated shaders. The uniform is a linear multiplier on environment lights. Applications can control the value of the uniform as needed.