Skip to content

Commit

Permalink
Merge pull request #135 from jstone-lucasfilm/dev_1.36
Browse files Browse the repository at this point in the history 
Additional data updates for v1.36
  • Loading branch information
@jstone-lucasfilm
jstone-lucasfilm authored Jul 22, 2018
2 parents cdcb04b + 67a1c31 commit 2853636
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 40 deletions.
10 changes: 5 additions & 5 deletions documents/Examples/PostShaderComposite.mtlx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,24 +20,24 @@
</nodedef>
<nodegraph name="NG_twolayersurface_srf" nodedef="ND_twolayersurface_srf">
<image name="i_diff1" type="color3">
<parameter name="file" type="filename" value="txt/[color1]/[color1].UDIM.tif"/>
<parameter name="file" type="filename" value="txt/[color1]/[color1].<UDIM>.tif"/>
</image>
<multiply name="mult1" type="color3">
<input name="in1" type="color3" nodename="i_diff1"/>
<input name="in2" type="color3" interfacename="diffmult1"/>
</multiply>
<image name="i_diff2" type="color3">
<parameter name="file" type="filename" value="txt/[color2]/[color2].UDIM.tif"/>
<parameter name="file" type="filename" value="txt/[color2]/[color2].<UDIM>.tif"/>
</image>
<multiply name="mult2" type="color3">
<input name="in1" type="color3" nodename="i_diff2"/>
<input name="in2" type="color3" interfacename="diffmult2"/>
</multiply>
<image name="i_spec1" type="color3">
<parameter name="file" type="filename" value="txt/[spec1]/[spec1].UDIM.tif"/>
<parameter name="file" type="filename" value="txt/[spec1]/[spec1].<UDIM>.tif"/>
</image>
<image name="i_spec2" type="color3">
<parameter name="file" type="filename" value="txt/[spec2]/[spec2].UDIM.tif"/>
<parameter name="file" type="filename" value="txt/[spec2]/[spec2].<UDIM>.tif"/>
</image>

<alSurface name="als1" type="surfaceshader">
Expand All @@ -59,7 +59,7 @@
</nodegraph>

<image name="i_mixamt" type="float">
<parameter name="file" type="filename" value="txt/rustmix/rustmix.UDIM.tif"/>
<parameter name="file" type="filename" value="txt/rustmix/rustmix.<UDIM>.tif"/>
</image>
<output name="o_mixamt" type="float" nodename="i_mixamt"/>

Expand Down
49 changes: 14 additions & 35 deletions documents/Libraries/stdlib_ng.mtlx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -950,15 +950,12 @@
A 4-corner bilinear value ramp.
-->
<nodegraph name="NG_ramp4_float" nodedef="ND_ramp4_float">
<clamp name="N_txclamp_float" type="vector2">
<input name="in" type="vector2" interfacename="texcoord"/>
</clamp>
<extract name="N_s_float" type="float">
<input name="in" type="vector2" nodename="N_txclamp_float"/>
<input name="in" type="vector2" interfacename="texcoord"/>
<parameter name="index" type="integer" value="0"/>
</extract>
<extract name="N_t_float" type="float">
<input name="in" type="vector2" nodename="N_txclamp_float"/>
<input name="in" type="vector2" interfacename="texcoord"/>
<parameter name="index" type="integer" value="1"/>
</extract>
<mix name="N_mixtop_float" type="float">
Expand All @@ -980,15 +977,12 @@
</nodegraph>

<nodegraph name="NG_ramp4_color2" nodedef="ND_ramp4_color2">
<clamp name="N_txclamp_color2" type="vector2">
<input name="in" type="vector2" interfacename="texcoord"/>
</clamp>
<extract name="N_s_color2" type="float">
<input name="in" type="vector2" nodename="N_txclamp_color2"/>
<input name="in" type="vector2" interfacename="texcoord"/>
<parameter name="index" type="integer" value="0"/>
</extract>
<extract name="N_t_color2" type="float">
<input name="in" type="vector2" nodename="N_txclamp_color2"/>
<input name="in" type="vector2" interfacename="texcoord"/>
<parameter name="index" type="integer" value="1"/>
</extract>
<mix name="N_mixtop_color2" type="color2">
Expand All @@ -1010,15 +1004,12 @@
</nodegraph>

<nodegraph name="NG_ramp4_color3" nodedef="ND_ramp4_color3">
<clamp name="N_txclamp_color3" type="vector2">
<input name="in" type="vector2" interfacename="texcoord"/>
</clamp>
<extract name="N_s_color3" type="float">
<input name="in" type="vector2" nodename="N_txclamp_color3"/>
<input name="in" type="vector2" interfacename="texcoord"/>
<parameter name="index" type="integer" value="0"/>
</extract>
<extract name="N_t_color3" type="float">
<input name="in" type="vector2" nodename="N_txclamp_color3"/>
<input name="in" type="vector2" interfacename="texcoord"/>
<parameter name="index" type="integer" value="1"/>
</extract>
<mix name="N_mixtop_color3" type="color3">
Expand All @@ -1040,15 +1031,12 @@
</nodegraph>

<nodegraph name="NG_ramp4_color4" nodedef="ND_ramp4_color4">
<clamp name="N_txclamp_color4" type="vector2">
<input name="in" type="vector2" interfacename="texcoord"/>
</clamp>
<extract name="N_s_color4" type="float">
<input name="in" type="vector2" nodename="N_txclamp_color4"/>
<input name="in" type="vector2" interfacename="texcoord"/>
<parameter name="index" type="integer" value="0"/>
</extract>
<extract name="N_t_color4" type="float">
<input name="in" type="vector2" nodename="N_txclamp_color4"/>
<input name="in" type="vector2" interfacename="texcoord"/>
<parameter name="index" type="integer" value="1"/>
</extract>
<mix name="N_mixtop_color4" type="color4">
Expand All @@ -1070,15 +1058,12 @@
</nodegraph>

<nodegraph name="NG_ramp4_vector2" nodedef="ND_ramp4_vector2">
<clamp name="N_txclamp_vector2" type="vector2">
<input name="in" type="vector2" interfacename="texcoord"/>
</clamp>
<extract name="N_s_vector2" type="float">
<input name="in" type="vector2" nodename="N_txclamp_vector2"/>
<input name="in" type="vector2" interfacename="texcoord"/>
<parameter name="index" type="integer" value="0"/>
</extract>
<extract name="N_t_vector2" type="float">
<input name="in" type="vector2" nodename="N_txclamp_vector2"/>
<input name="in" type="vector2" interfacename="texcoord"/>
<parameter name="index" type="integer" value="1"/>
</extract>
<mix name="N_mixtop_vector2" type="vector2">
Expand All @@ -1100,15 +1085,12 @@
</nodegraph>

<nodegraph name="NG_ramp4_vector3" nodedef="ND_ramp4_vector3">
<clamp name="N_txclamp_vector3" type="vector2">
<input name="in" type="vector2" interfacename="texcoord"/>
</clamp>
<extract name="N_s_vector3" type="float">
<input name="in" type="vector2" nodename="N_txclamp_vector3"/>
<input name="in" type="vector2" interfacename="texcoord"/>
<parameter name="index" type="integer" value="0"/>
</extract>
<extract name="N_t_vector3" type="float">
<input name="in" type="vector2" nodename="N_txclamp_vector3"/>
<input name="in" type="vector2" interfacename="texcoord"/>
<parameter name="index" type="integer" value="1"/>
</extract>
<mix name="N_mixtop_vector3" type="vector3">
Expand All @@ -1130,15 +1112,12 @@
</nodegraph>

<nodegraph name="NG_ramp4_vector4" nodedef="ND_ramp4_vector4">
<clamp name="N_txclamp_vector4" type="vector2">
<input name="in" type="vector2" interfacename="texcoord"/>
</clamp>
<extract name="N_s_vector4" type="float">
<input name="in" type="vector2" nodename="N_txclamp_vector4"/>
<input name="in" type="vector2" interfacename="texcoord"/>
<parameter name="index" type="integer" value="0"/>
</extract>
<extract name="N_t_vector4" type="float">
<input name="in" type="vector2" nodename="N_txclamp_vector4"/>
<input name="in" type="vector2" interfacename="texcoord"/>
<parameter name="index" type="integer" value="1"/>
</extract>
<mix name="N_mixtop_vector4" type="vector4">
Expand Down

0 comments on commit 2853636

Please sign in to comment.