Adds optionVars for controlling specular lighting options #2261
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
MaterialX has multiple options for specular environment sampling. They will be exposed as optionVars. string MxMayaEnvironmentMethod (none, prefiltered, fis) - Defaults to fis in V3, prefiltered otherwise int MxMayaEnvironmentSamples (any reasonable value, default 64) - only valid in FIS mode string MxMayaEnvironmentAlbedoMethod (analytic, montecarlo) - only valid in FIS mode
| @@ -223,7 +294,8 @@ std::string generateFragment( | |||
| // MaterialX fragment). | |||
| std::ostringstream nameStream; | |||
| const size_t sourceHash = std::hash<std::string> {}(fragmentSource); | |||
| nameStream << baseFragmentName << "__" << std::hex << sourceHash; | |||
| nameStream << baseFragmentName << "__" << std::hex << sourceHash | |||
| << OgsFragment::getSpecularEnvKey(); | |||
There was a problem hiding this comment.
Shader code depends on environment settings, so we must make sure we add the key everywhere we want to cache shaders.
| @@ -28,6 +18,10 @@ float mx_latlong_compute_lod(vec3 dir, float pdf, float maxMipLevel, int envSamp | |||
|
|
|||
| vec3 mx_environment_radiance(vec3 N, vec3 V, vec3 X, vec2 roughness, int distribution, FresnelData fd) | |||
| { | |||
| if (mayaGetSpecularEnvironmentNumLOD() == 0) { | |||
There was a problem hiding this comment.
Bail out early if there is no dome light.
| @@ -279,6 +279,8 @@ struct _MaterialXData | |||
| mx::loadLibraries({}, _mtlxSearchPath, _mtlxLibrary); | |||
|
|
|||
| _FixLibraryTangentInputs(_mtlxLibrary); | |||
|
|
|||
| mx::OgsXmlGenerator::setUseLightAPI(MAYA_LIGHTAPI_VERSION_2); | |||
There was a problem hiding this comment.
Moved from below. Only needs to be called once.
williamkrick
approved these changes
Apr 12, 2022
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.
MaterialX has multiple options for specular environment sampling. They
will be exposed as optionVars.
string MxMayaEnvironmentMethod (none, prefiltered, fis)
int MxMayaEnvironmentSamples (any reasonable value, default 64)
string MxMayaEnvironmentAlbedoMethod (analytic, montecarlo)