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

Add uisoftmin and uisoftmax to mix nodes #1168

Merged
merged 2 commits into from
Dec 31, 2022
Merged

Add uisoftmin and uisoftmax to mix nodes #1168

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d97bb2a
uisoftmin + uisoftmax added to ND_mix nodes
BrianSharpe Dec 15, 2022
c71b471
Merge branch 'main' into mix_uiminmax
jstone-lucasfilm Dec 31, 2022
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
28 changes: 14 additions & 14 deletions libraries/stdlib/stdlib_defs.mtlx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3261,85 +3261,85 @@
<nodedef name="ND_mix_float" node="mix" nodegroup="compositing">
<input name="fg" type="float" value="0.0" />
<input name="bg" type="float" value="0.0" />
<input name="mix" type="float" value="0.0" />
<input name="mix" type="float" value="0.0" uisoftmin="0.0" uisoftmax="1.0" />
<output name="out" type="float" defaultinput="bg" />
</nodedef>
<nodedef name="ND_mix_color3" node="mix" nodegroup="compositing">
<input name="fg" type="color3" value="0.0, 0.0, 0.0" />
<input name="bg" type="color3" value="0.0, 0.0, 0.0" />
<input name="mix" type="float" value="0.0" />
<input name="mix" type="float" value="0.0" uisoftmin="0.0" uisoftmax="1.0" />
<output name="out" type="color3" defaultinput="bg" />
</nodedef>
<nodedef name="ND_mix_color3_color3" node="mix" nodegroup="compositing">
<input name="fg" type="color3" value="0.0, 0.0, 0.0" />
<input name="bg" type="color3" value="0.0, 0.0, 0.0" />
<input name="mix" type="color3" value="0.0, 0.0, 0.0" />
<input name="mix" type="color3" value="0.0, 0.0, 0.0" uisoftmin="0,0,0" uisoftmax="1,1,1" />
<output name="out" type="color3" defaultinput="bg" />
</nodedef>
<nodedef name="ND_mix_color4" node="mix" nodegroup="compositing">
<input name="fg" type="color4" value="0.0, 0.0, 0.0, 0.0" />
<input name="bg" type="color4" value="0.0, 0.0, 0.0, 0.0" />
<input name="mix" type="float" value="0.0" />
<input name="mix" type="float" value="0.0" uisoftmin="0.0" uisoftmax="1.0" />
<output name="out" type="color4" defaultinput="bg" />
</nodedef>
<nodedef name="ND_mix_color4_color4" node="mix" nodegroup="compositing">
<input name="fg" type="color4" value="0.0, 0.0, 0.0, 0.0" />
<input name="bg" type="color4" value="0.0, 0.0, 0.0, 0.0" />
<input name="mix" type="color4" value="0.0, 0.0, 0.0, 0.0" />
<input name="mix" type="color4" value="0.0, 0.0, 0.0, 0.0" uisoftmin="0,0,0,0" uisoftmax="1,1,1,1" />
<output name="out" type="color4" defaultinput="bg" />
</nodedef>
<nodedef name="ND_mix_vector2" node="mix" nodegroup="compositing">
<input name="fg" type="vector2" value="0.0, 0.0" />
<input name="bg" type="vector2" value="0.0, 0.0" />
<input name="mix" type="float" value="0.0" />
<input name="mix" type="float" value="0.0" uisoftmin="0.0" uisoftmax="1.0" />
<output name="out" type="vector2" defaultinput="bg" />
</nodedef>
<nodedef name="ND_mix_vector2_vector2" node="mix" nodegroup="compositing">
<input name="fg" type="vector2" value="0.0, 0.0" />
<input name="bg" type="vector2" value="0.0, 0.0" />
<input name="mix" type="vector2" value="0.0, 0.0" />
<input name="mix" type="vector2" value="0.0, 0.0" uisoftmin="0,0" uisoftmax="1,1" />
<output name="out" type="vector2" defaultinput="bg" />
</nodedef>
<nodedef name="ND_mix_vector3" node="mix" nodegroup="compositing">
<input name="fg" type="vector3" value="0.0, 0.0, 0.0" />
<input name="bg" type="vector3" value="0.0, 0.0, 0.0" />
<input name="mix" type="float" value="0.0" />
<input name="mix" type="float" value="0.0" uisoftmin="0.0" uisoftmax="1.0" />
<output name="out" type="vector3" defaultinput="bg" />
</nodedef>
<nodedef name="ND_mix_vector3_vector3" node="mix" nodegroup="compositing">
<input name="fg" type="vector3" value="0.0, 0.0, 0.0" />
<input name="bg" type="vector3" value="0.0, 0.0, 0.0" />
<input name="mix" type="vector3" value="0.0, 0.0, 0.0" />
<input name="mix" type="vector3" value="0.0, 0.0, 0.0" uisoftmin="0,0,0" uisoftmax="1,1,1" />
<output name="out" type="vector3" defaultinput="bg" />
</nodedef>
<nodedef name="ND_mix_vector4" node="mix" nodegroup="compositing">
<input name="fg" type="vector4" value="0.0, 0.0, 0.0, 0.0" />
<input name="bg" type="vector4" value="0.0, 0.0, 0.0, 0.0" />
<input name="mix" type="float" value="0.0" />
<input name="mix" type="float" value="0.0" uisoftmin="0.0" uisoftmax="1.0" />
<output name="out" type="vector4" defaultinput="bg" />
</nodedef>
<nodedef name="ND_mix_vector4_vector4" node="mix" nodegroup="compositing">
<input name="fg" type="vector4" value="0.0, 0.0, 0.0, 0.0" />
<input name="bg" type="vector4" value="0.0, 0.0, 0.0, 0.0" />
<input name="mix" type="vector4" value="0.0, 0.0, 0.0, 0.0" />
<input name="mix" type="vector4" value="0.0, 0.0, 0.0, 0.0" uisoftmin="0,0,0,0" uisoftmax="1,1,1,1" />
<output name="out" type="vector4" defaultinput="bg" />
</nodedef>
<nodedef name="ND_mix_surfaceshader" node="mix" nodegroup="compositing">
<input name="fg" type="surfaceshader" value="" />
<input name="bg" type="surfaceshader" value="" />
<input name="mix" type="float" value="0.0" />
<input name="mix" type="float" value="0.0" uisoftmin="0.0" uisoftmax="1.0" />
<output name="out" type="surfaceshader" defaultinput="bg" />
</nodedef>
<nodedef name="ND_mix_displacementshader" node="mix" nodegroup="compositing">
<input name="fg" type="displacementshader" value="" />
<input name="bg" type="displacementshader" value="" />
<input name="mix" type="float" value="0.0" />
<input name="mix" type="float" value="0.0" uisoftmin="0.0" uisoftmax="1.0" />
<output name="out" type="displacementshader" defaultinput="bg" />
</nodedef>
<nodedef name="ND_mix_volumeshader" node="mix" nodegroup="compositing">
<input name="fg" type="volumeshader" value="" />
<input name="bg" type="volumeshader" value="" />
<input name="mix" type="float" value="0.0" />
<input name="mix" type="float" value="0.0" uisoftmin="0.0" uisoftmax="1.0" />
<output name="out" type="volumeshader" defaultinput="bg" />
</nodedef>

Expand Down