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

Update UsdPreviewSurface to version 2.6 #2084

Merged
merged 22 commits into from
Jan 7, 2025
Merged

Update UsdPreviewSurface to version 2.6 #2084

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
a6b1bac
This PR fixes the cutout issue described in gitIssue #2044. It also u…
klucknav Oct 21, 2024
ed3ad99
Additional changes to the PreviewSurface Nodegraph
klucknav Oct 23, 2024
198bb74
Update to the Preview Surface Glass example to have a slight opacity.
klucknav Oct 24, 2024
c814530
Merge branch 'main' into klucknav-updatePreviewSurfaceGraph
jstone-lucasfilm Oct 24, 2024
fdde173
Update type from integer to float
jstone-lucasfilm Oct 24, 2024
ad8c52c
Merge branch 'main' into klucknav-updatePreviewSurfaceGraph
jstone-lucasfilm Oct 24, 2024
baa8861
Additional nodegraph updates
klucknav Oct 25, 2024
501d52a
Re order node inputs
klucknav Oct 25, 2024
65e8320
Merge branch 'main' into klucknav-updatePreviewSurfaceGraph
jstone-lucasfilm Oct 29, 2024
2637cb2
Incorporate the fix for the cutout issue described in gitIssue #2044.
klucknav Oct 29, 2024
16b7878
Merge branch 'main' into klucknav-updatePreviewSurfaceGraph
jstone-lucasfilm Oct 29, 2024
a19dff3
Merge branch 'main' into klucknav-updatePreviewSurfaceGraph
jstone-lucasfilm Oct 31, 2024
62accb3
Merge branch 'main' into klucknav-updatePreviewSurfaceGraph
jstone-lucasfilm Nov 4, 2024
8c4f45e
Merge branch 'main' into klucknav-updatePreviewSurfaceGraph
jstone-lucasfilm Dec 5, 2024
706c31e
Update version string to 2.6
jstone-lucasfilm Dec 5, 2024
632c7d1
Update nodegraph to use new 'opacityMode' input.
klucknav Dec 20, 2024
5b03d02
Merge branch 'main' into klucknav-updatePreviewSurfaceGraph
jstone-lucasfilm Dec 20, 2024
fc98a54
Restore original usd_preview_surface_glass
jstone-lucasfilm Dec 20, 2024
4fd0a47
Add opacityMode to the default Preview Surface example
klucknav Dec 20, 2024
3ee7722
Merge branch 'main' into klucknav-updatePreviewSurfaceGraph
jstone-lucasfilm Dec 20, 2024
5ef0f59
Merge branch 'main' into klucknav-updatePreviewSurfaceGraph
jstone-lucasfilm Jan 3, 2025
5e0694e
Merge branch 'main' into klucknav-updatePreviewSurfaceGraph
jstone-lucasfilm Jan 6, 2025
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
24 changes: 21 additions & 3 deletions libraries/bxdf/usd_preview_surface.mtlx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<!-- ======================================================================== -->

<!-- Node: UsdPreviewSurface -->
<nodedef name="ND_UsdPreviewSurface_surfaceshader" node="UsdPreviewSurface" nodegroup="pbr" doc="UsdPreviewSurface shader" version="2.5" isdefaultversion="true">
<nodedef name="ND_UsdPreviewSurface_surfaceshader" node="UsdPreviewSurface" nodegroup="pbr" doc="UsdPreviewSurface shader" version="2.6" isdefaultversion="true">
<input name="diffuseColor" type="color3" value="0.18, 0.18, 0.18" uimin="0,0,0" uimax="1,1,1" uiname="Diffuse Color" />
<input name="emissiveColor" type="color3" value="0, 0, 0" uimin="0,0,0" uisoftmax="1,1,1" uiname="Emissive Color" />
<input name="useSpecularWorkflow" type="integer" value="0" uimin="0" uimax="1" uistep="1" uiname="Use Specular Workflow" />
Expand All @@ -16,6 +16,7 @@
<input name="clearcoat" type="float" value="0" uimin="0.0" uimax="1.0" uiname="Clearcoat" />
<input name="clearcoatRoughness" type="float" value="0.01" uimin="0.0" uimax="1.0" uiname="Clearcoat Roughness" />
<input name="opacity" type="float" value="1" uimin="0.0" uimax="1.0" uiname="Opacity" />
<input name="opacityMode" type="integer" enum="transparent,presence" enumvalues="0,1" value="0" uiname="Opacity Mode" />
<input name="opacityThreshold" type="float" value="0" uimin="0.0" uimax="1.0" uiname="Opacity Threshold" />
<input name="ior" type="float" value="1.5" uimin="0.0" uisoftmin="1.0" uisoftmax="3.0" uiname="Index of Refraction" />
<input name="normal" type="vector3" value="0, 0, 1" uimin="-1.0,-1.0,-1.0" uimax="1.0,1.0,1.0" uistep="0.01" uiname="Normal" />
Expand Down Expand Up @@ -157,10 +158,16 @@
<input name="normal" type="vector3" nodename="surface_normal" />
<input name="scatter_mode" type="string" value="T" />
</dielectric_bsdf>
<ifgreater name="transmission_mix_amount" type="float">
<input name="value1" type="float" interfacename="opacityThreshold" />
<input name="value2" type="float" value="0" />
<input name="in1" type="float" value="1" />
<input name="in2" type="float" interfacename="opacity" />
</ifgreater>
<mix name="transmission_mix" type="BSDF">
<input name="fg" type="BSDF" nodename="diffuse_bsdf" />
<input name="bg" type="BSDF" nodename="transmission_bsdf" />
<input name="mix" type="float" interfacename="opacity" />
<input name="mix" type="float" nodename="transmission_mix_amount" />
</mix>

<!-- Specular Workflow -->
Expand Down Expand Up @@ -278,10 +285,21 @@
<input name="in1" type="float" value="1" />
<input name="in2" type="float" value="0" />
</ifgreatereq>
<ifequal name="opacity_presence" type="float">
<input name="value1" type="float" interfacename="opacity" />
<input name="value2" type="float" value="0.0" />
<input name="in1" type="float" value="0.0" />
<input name="in2" type="float" nodename="cutout_opacity" />
</ifequal>
<switch name="opacity_switch" type="float">
<input name="in1" type="float" nodename="cutout_opacity" />
<input name="in2" type="float" nodename="opacity_presence" />
<input name="which" type="integer" interfacename="opacityMode" />
</switch>
<surface name="surface_constructor" type="surfaceshader">
<input name="bsdf" type="BSDF" nodename="coat_bsdf" />
<input name="edf" type="EDF" nodename="emission_edf" />
<input name="opacity" type="float" nodename="cutout_opacity" />
<input name="opacity" type="float" nodename="opacity_switch" />
</surface>

<!-- Output -->
Expand Down
1 change: 1 addition & 0 deletions resources/Materials/Examples/UsdPreviewSurface/usd_preview_surface_default.mtlx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
<input name="clearcoat" type="float" value="0" />
<input name="clearcoatRoughness" type="float" value="0.01" />
<input name="opacity" type="float" value="1" />
<input name="opacityMode" type="integer" value="0" />
<input name="opacityThreshold" type="float" value="0" />
<input name="ior" type="float" value="1.5" />
<input name="normal" type="vector3" value="0, 0, 1" />
Expand Down