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.

Sign up for GitHub

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

Support transmission in translation from Standard Surface to glTF PBR #2027

Merged
merged 8 commits into from
Sep 29, 2024
+25 −4
Merged

Support transmission in translation from Standard Surface to glTF PBR #2027

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
975a52e
correct translation of transmission parameters from Standard Surface …
charo-m Sep 26, 2024
be8d624
Merge branch 'main' into support_transmission_in_SS_to_glTF_translati…
jstone-lucasfilm Sep 27, 2024
3b9f582
rename interior nodes, remove translation unit test, and add translat…
charo-m Sep 28, 2024
a6479ae
Omit unit test for now
jstone-lucasfilm Sep 29, 2024
dfa8420
Merge branch 'main' into support_transmission_in_SS_to_glTF_translati…
jstone-lucasfilm Sep 29, 2024
81c8911
Minor refactor for clarity
jstone-lucasfilm Sep 29, 2024
2780c87
Minor rename for clarity
jstone-lucasfilm Sep 29, 2024
fccb792
Minor rename for clarity
jstone-lucasfilm Sep 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 25 additions & 4 deletions libraries/bxdf/translation/standard_surface_to_gltf_pbr.mtlx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,18 @@
</dotproduct>

<!-- Metallic roughness -->
<ifequal name="base_color" type="color3">
<ifequal name="no_transmission_base_color" type="color3">
charo-m marked this conversation as resolved.
Show resolved Hide resolved
<input name="value1" type="float" nodename="hasCoatColor" />
<input name="value2" type="float" value="0" />
<input name="in1" type="color3" nodename="scaledBaseColor" />
<input name="in2" type="color3" nodename="mixedBaseColor" />
</ifequal>
<ifgreater name="base_color" type="color3">
<input name="value1" type="float" interfacename="transmission" />
<input name="value2" type="float" value="0" />
<input name="in1" type="color3" nodename="transmission_in_effect_base_color" />
<input name="in2" type="color3" nodename="no_transmission_base_color" />
</ifgreater>
<dot name="metallic" type="float">
<input name="in" type="float" interfacename="metalness" />
</dot>
Expand All @@ -96,9 +102,24 @@
<dot name="thickness" type="float">
<input name="in" type="float" interfacename="transmission_depth" />
</dot>
<dot name="attenuation_color" type="color3">
<input name="in" type="color3" interfacename="transmission_color" />
</dot>
<ifgreater name="transmission_in_effect_attenuation_color" type="color3">
<input name="value1" type="float" interfacename="transmission_depth" />
<input name="value2" type="float" value="0" />
<input name="in1" type="color3" interfacename="transmission_color" />
<input name="in2" type="color3" value="1, 1, 1" />
</ifgreater>
<ifgreater name="attenuation_color" type="color3">
<input name="value1" type="float" interfacename="transmission" />
<input name="value2" type="float" value="0" />
<input name="in1" type="color3" nodename="transmission_in_effect_attenuation_color" />
<input name="in2" type="color3" value="1, 1, 1" />
</ifgreater>
<ifgreater name="transmission_in_effect_base_color" type="color3">
<input name="value1" type="float" interfacename="transmission_depth" />
<input name="value2" type="float" value="0" />
<input name="in1" type="color3" value="1, 1, 1" />
<input name="in2" type="color3" interfacename="transmission_color" />
</ifgreater>

<!-- Sheen -->
<multiply name="sheen_color" type="color3">
Expand Down
37 changes: 37 additions & 0 deletions source/MaterialXTest/MaterialXGenShader/GenShader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,43 @@ TEST_CASE("GenShader: Shader Translation", "[translate]")
}
}

TEST_CASE("GenShader: Gltf Transmission Translation", "[translate]")
jstone-lucasfilm marked this conversation as resolved.
Show resolved Hide resolved
{
mx::FileSearchPath searchPath = mx::getDefaultDataSearchPath();
mx::ShaderTranslatorPtr shaderTranslator = mx::ShaderTranslator::create();

mx::FilePath testPath = searchPath.find("resources/Materials/Examples/StandardSurface");

mx::FilePath mtlxFile{"standard_surface_glass.mtlx"};
mx::DocumentPtr doc = mx::createDocument();
loadLibraries({ "libraries/targets", "libraries/stdlib", "libraries/pbrlib", "libraries/bxdf" }, searchPath, doc);

mx::readFromXmlFile(doc, testPath / mtlxFile, searchPath);
mtlxFile.removeExtension();

bool translated = false;
try
{
shaderTranslator->translateAllMaterials(doc, "gltf_pbr");
translated = true;
}
catch (mx::Exception &e)
{
std::cout << "Failed translating: " << (testPath / mtlxFile).asString() << ": " << e.what() << std::endl;
}
REQUIRE(translated);

std::string validationErrors;
bool valid = doc->validate(&validationErrors);
if (!doc->validate(&validationErrors))
{
std::cout << "Shader translation of " << (testPath / mtlxFile).asString() << " failed" << std::endl;
std::cout << "Validation errors: " << validationErrors << std::endl;
}
REQUIRE(valid);

}

TEST_CASE("GenShader: Transparency Regression Check", "[genshader]")
{
mx::FileSearchPath searchPath = mx::getDefaultDataSearchPath();
Expand Down