Skip to content

Consolidate glTF PBR graph and remove GLSL override #2850

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

Open
jstone-lucasfilm wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −348
Open

Consolidate glTF PBR graph and remove GLSL override #2850

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
330 changes: 0 additions & 330 deletions libraries/bxdf/genglsl/gltf_pbr.mtlx
View file
Open in desktop

This file was deleted.

28 changes: 10 additions & 18 deletions libraries/bxdf/gltf_pbr.mtlx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,13 +167,7 @@
<input name="mix" type="float" interfacename="transmission" />
</mix>

<layer name="dielectric_bsdf" type="BSDF">
<input name="top" type="BSDF" nodename="reflection_bsdf" />
<input name="base" type="BSDF" nodename="transmission_mix" />
</layer>

<!-- Thin-film + Dielectric
Note: Due to limitations in codegen, the base layer BSDF is duplicated (#1035). -->
<!-- Thin-film + Dielectric -->

<generalized_schlick_bsdf name="tf_reflection_bsdf" type="BSDF">
<input name="color0" type="color3" nodename="dielectric_f0" />
Expand All @@ -186,18 +180,17 @@
<input name="thinfilm_ior" type="float" interfacename="iridescence_ior" />
</generalized_schlick_bsdf>

<mix name="mix_iridescent_dielectric_reflection" type="BSDF">
<input name="bg" type="BSDF" nodename="reflection_bsdf" />
<input name="fg" type="BSDF" nodename="tf_reflection_bsdf" />
<input name="mix" type="float" interfacename="iridescence" />
</mix>

<layer name="tf_dielectric_bsdf" type="BSDF">
<input name="top" type="BSDF" nodename="tf_reflection_bsdf" />
<layer name="iridescent_dielectric_bsdf" type="BSDF">
<input name="top" type="BSDF" nodename="mix_iridescent_dielectric_reflection" />
<input name="base" type="BSDF" nodename="transmission_mix" />
</layer>

<mix name="mix_iridescent_dielectric_bsdf" type="BSDF">
<input name="bg" type="BSDF" nodename="dielectric_bsdf" />
<input name="fg" type="BSDF" nodename="tf_dielectric_bsdf" />
<input name="mix" type="float" interfacename="iridescence" />
</mix>

<!-- Metal -->

<generalized_schlick_bsdf name="metal_bsdf" type="BSDF">
Expand All @@ -208,8 +201,7 @@
<input name="tangent" type="vector3" nodename="selected_tangent" />
</generalized_schlick_bsdf>

<!-- Thin-film + Metal
Note: Due to limitations in codegen, the base layer BSDF is duplicated (#1035). -->
<!-- Thin-film + Metal -->

<generalized_schlick_bsdf name="tf_metal_bsdf" type="BSDF">
<input name="color0" type="color3" interfacename="base_color" />
Expand All @@ -230,7 +222,7 @@
<!-- Dielectric/metal mix -->

<mix name="base_mix" type="BSDF">
<input name="bg" type="BSDF" nodename="mix_iridescent_dielectric_bsdf" />
<input name="bg" type="BSDF" nodename="iridescent_dielectric_bsdf" />
<input name="fg" type="BSDF" nodename="mix_iridescent_metal_bsdf" />
<input name="mix" type="float" interfacename="metallic" />
</mix>
Expand Down
Loading