Skip to content

Commit

Permalink
add the new funtionality into place2d
Browse files Browse the repository at this point in the history
  • Loading branch information
@vernalchen
vernalchen committed Jul 26, 2022
1 parent e356b76 commit 13f319f
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 51 deletions.
11 changes: 3 additions & 8 deletions libraries/stdlib/stdlib_defs.mtlx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2333,24 +2333,19 @@
<!--
Node: <place2d> Supplemental Node
Transform incoming UV texture coordinates from one 2D frame of reference to another.
The order of transformation is: -pivot, scale, rotate, translate, pivot.
The order of transformation for SRT(0) is: -pivot, scale, rotate, translate, pivot.
The order of transformation for TRS(1) is: -pivot, translate, rotate, scale, pivot.
-->
<nodedef name="ND_place2d_vector2" node="place2d" nodegroup="math">
<input name="texcoord" type="vector2" value="0.0, 0.0" />
<input name="pivot" type="vector2" value="0.0,0.0" />
<input name="scale" type="vector2" value="1.0,1.0" />
<input name="rotate" type="float" value="0.0" unittype="angle" unit="degree" />
<input name="offset" type="vector2" value="0.0,0.0" />
<input name="operationorder" type="integer" value="0" enum="SRT, TRS" enumvalues="0, 1" />
<output name="out" type="vector2" defaultinput="texcoord" />
</nodedef>

<!--
Node: <place2dframe> Supplemental Node
Transform incoming UV texture coordinates from one 2D frame of reference to another.
The order of transformation is: -pivot, translate, rotate, scale, pivot.
-->
<nodedef name="ND_place2dframe_vector2" node="place2dframe" inherit="ND_place2d_vector2" />

<!--
Node: <arrayappend>
Creates a two-element array from two base types, or appends a base-type value to an array of
Expand Down
41 changes: 16 additions & 25 deletions libraries/stdlib/stdlib_ng.mtlx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1046,10 +1046,10 @@
<!--
Node: <place2d>
Transform incoming UV texture coordinates from one 2D frame of reference to another.
The order of transformation is: -pivot, scale, rotate, translate, pivot.
The order of transformation for SRT(0) is: -pivot, scale, rotate, translate, pivot.
The order of transformation for TRS(1) is: -pivot, translate, rotate, scale, pivot.
-->
<implementation name="IMPL_place2d_vector2" nodedef="ND_place2d_vector2" nodegraph="NG_place2d_vector2" />
<nodegraph name="NG_place2d_vector2">
<nodegraph name="NG_place2d_vector2" nodedef="ND_place2d_vector2">
<subtract name="N_subpivot" type="vector2">
<input name="in1" type="vector2" interfacename="texcoord" />
<input name="in2" type="vector2" interfacename="pivot" />
Expand All @@ -1070,37 +1070,28 @@
<input name="in1" type="vector2" nodename="N_applyoffset" />
<input name="in2" type="vector2" interfacename="pivot" />
</add>
<output name="out" type="vector2" nodename="N_addpivot" />
</nodegraph>

<!--
Node: <place2dframe>
Transform incoming UV texture coordinates from one 2D frame of reference to another.
The order of transformation is: -pivot, translate, rotate, scale, pivot.
-->
<implementation name="IMPL_place2dframe_vector2" nodedef="ND_place2dframe_vector2" nodegraph="NG_place2dframe_vector2" />
<nodegraph name="NG_place2dframe_vector2">
<subtract name="N_subpivot" type="vector2">
<input name="in1" type="vector2" interfacename="texcoord" />
<input name="in2" type="vector2" interfacename="pivot" />
</subtract>
<subtract name="N_applyoffset" type="vector2">
<subtract name="N_applyoffset2" type="vector2">
<input name="in1" type="vector2" nodename="N_subpivot" />
<input name="in2" type="vector2" interfacename="offset" />
</subtract>
<rotate2d name="N_applyrot" type="vector2">
<input name="in" type="vector2" nodename="N_applyoffset" />
<rotate2d name="N_applyrot2" type="vector2">
<input name="in" type="vector2" nodename="N_applyoffset2" />
<input name="amount" type="float" interfacename="rotate" />
</rotate2d>
<divide name="N_applyscale" type="vector2">
<input name="in1" type="vector2" nodename="N_applyrot" />
<divide name="N_applyscale2" type="vector2">
<input name="in1" type="vector2" nodename="N_applyrot2" />
<input name="in2" type="vector2" interfacename="scale" />
</divide>
<add name="N_addpivot" type="vector2">
<input name="in1" type="vector2" nodename="N_applyscale" />
<add name="N_addpivot2" type="vector2">
<input name="in1" type="vector2" nodename="N_applyscale2" />
<input name="in2" type="vector2" interfacename="pivot" />
</add>
<output name="out" type="vector2" nodename="N_addpivot" />
<switch name="N_switch_operationorder" type="vector2">
<input name="in1" type="vector2" nodename="N_addpivot" />
<input name="in2" type="vector2" nodename="N_addpivot2" />
<input name="which" type="integer" interfacename="operationorder" />
</switch>
<output name="out" type="vector2" nodename="N_switch_operationorder" />
</nodegraph>

<!-- ======================================================================== -->
Expand Down
15 changes: 1 addition & 14 deletions resources/Materials/TestSuite/stdlib/math/transform.mtlx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,21 +175,8 @@
<input name="scale" type="vector2" value="2.0,2.0" />
<input name="rotate" type="float" value="1.0" unittype="angle" unit="radian" />
<input name="offset" type="vector2" value="0.2,0.2" />
<input name="operationorder" type="integer" value="0" />
</place2d>
<output name="out" type="vector2" nodename="place2d1_1" />
</nodegraph>
<!-- place2dframe -->
<nodegraph name="place2dframe_vector2">
<texcoord name="texcoord1" type="vector2">
<input name="index" type="integer" value="0" />
</texcoord>
<place2dframe name="place2d1_1" type="vector2">
<input name="texcoord" type="vector2" nodename="texcoord1" />
<input name="pivot" type="vector2" value="0.5,0.5" />
<input name="scale" type="vector2" value="2.0,1.0" />
<input name="rotate" type="float" value="1.0" unittype="angle" unit="radian" />
<input name="offset" type="vector2" value="0.2,0.2" />
</place2dframe>
<output name="out" type="vector2" nodename="place2d1_1" />
</nodegraph>
</materialx>
10 changes: 6 additions & 4 deletions resources/Materials/TestSuite/stdlib/texture/image_transform.mtlx
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<materialx version="1.38">
<nodegraph name="test_place2d">
<nodegraph name="test_place2d_SRT">
<image name="image_number_1" type="color3">
<input name="file" type="filename" value="resources/Images/grid.png" />
<input name="default" type="color3" value="1.0, 0.0, 0.0" />
Expand All @@ -14,22 +14,24 @@
<input name="rotate" type="float" value="30.0" unittype="angle" unit="degree" />
<input name="scale" type="vector2" value="2.0, 1.0" />
<input name="pivot" type="vector2" value="0.5, 0.5" />
<input name="operationorder" type="integer" value="0" />
</place2d>
</nodegraph>
<nodegraph name="test_place2dframe">
<nodegraph name="test_place2d_TRS">
<image name="image_number_1" type="color3">
<input name="file" type="filename" value="resources/Images/grid.png" />
<input name="default" type="color3" value="1.0, 0.0, 0.0" />
<input name="texcoord" type="vector2" nodename="a_place2d" />
</image>
<output name="out" type="color3" nodename="image_number_1" />
<texcoord name="texcoord1" type="vector2" />
<place2dframe name="a_place2d" type="vector2">
<place2d name="a_place2d" type="vector2">
<input name="texcoord" type="vector2" nodename="texcoord1" />
<input name="offset" type="vector2" value="0.2, 0.2" />
<input name="rotate" type="float" value="30.0" unittype="angle" unit="degree" />
<input name="scale" type="vector2" value="2.0, 1.0" />
<input name="pivot" type="vector2" value="0.5, 0.5" />
</place2dframe>
<input name="operationorder" type="integer" value="1" />
</place2d>
</nodegraph>
</materialx>

0 comments on commit 13f319f

Please sign in to comment.