Merge branch 'main' into AcademySoftwareFoundation#342-markdown-changes

StefanHabel · Oct 1, 2024 · f9de866 · f9de866
2 parents db5cc09 + 210266b
commit f9de866
Showing 1 changed file with 25 additions and 4 deletions.
diff --git a/libraries/bxdf/translation/standard_surface_to_gltf_pbr.mtlx b/libraries/bxdf/translation/standard_surface_to_gltf_pbr.mtlx
@@ -76,12 +76,24 @@
     </dotproduct>
 
     <!-- Metallic roughness -->
-    <ifequal name="base_color" type="color3">
+    <ifequal name="baseColor" type="color3">
       <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="transmissionBaseColor" 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>
+    <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="transmissionBaseColor" />
+      <input name="in2" type="color3" nodename="baseColor" />
+    </ifgreater>
     <dot name="metallic" type="float">
       <input name="in" type="float" interfacename="metalness" />
     </dot>
@@ -96,9 +108,18 @@
     <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="transmissionAttenuationColor" 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="transmissionAttenuationColor" />
+      <input name="in2" type="color3" value="1, 1, 1" />
+    </ifgreater>
 
     <!-- Sheen -->
     <multiply name="sheen_color" type="color3">