From 10a4d123cd6a331dfe395a1247582fff953724e0 Mon Sep 17 00:00:00 2001
From: Jonathan Stone <jstone@lucasfilm.com>
Date: Mon, 24 Jul 2023 17:22:21 -0700
Subject: [PATCH] State grecian definition in processing order

---
 libraries/stdlib/stdlib_ng.mtlx | 114 +++++++++++++++-----------------
 1 file changed, 54 insertions(+), 60 deletions(-)

diff --git a/libraries/stdlib/stdlib_ng.mtlx b/libraries/stdlib/stdlib_ng.mtlx
index 247b2ddc92..6f53f7293f 100644
--- a/libraries/stdlib/stdlib_ng.mtlx
+++ b/libraries/stdlib/stdlib_ng.mtlx
@@ -1689,41 +1689,34 @@
     Pattern can be regular or staggered.
   -->
   <nodegraph name="NG_grecian_color3" nodedef="ND_grecian_color3">
-    <place2d name="place2d" type="vector2">
-      <input name="texcoord" type="vector2" nodename="coord_adj" />
-    </place2d>
     <multiply name="coord_adj" type="vector2">
       <input name="in1" type="vector2" interfacename="texcoord" />
       <input name="in2" type="vector2" nodename="invspc_vec" />
     </multiply>
-    <separate2 name="separate_coord" type="multioutput">
-      <input name="in" type="vector2" nodename="place2d" />
-    </separate2>
     <combine2 name="invspc_vec" type="vector2">
       <input name="in1" type="float" nodename="inv_spacing" />
       <input name="in2" type="float" nodename="inv_spacing" />
     </combine2>
-    <ifgreater name="Y_detect" type="float">
-      <input name="value1" type="float" nodename="abs_Y" />
-      <input name="value2" type="float" nodename="scale" />
-      <input name="in1" type="float" value="0" />
-      <input name="in2" type="float" value="1" />
-    </ifgreater>
-    <modulo name="mod_X" type="float">
-      <input name="in1" type="float" nodename="stagger_selection" />
-    </modulo>
     <modulo name="mod_Y" type="float">
-      <input name="in1" type="float" nodename="separate_coord" output="outy" />
+      <input name="in1" type="float" nodename="coord_adj" channels="y" />
     </modulo>
     <divide name="inv_spacing" type="float">
       <input name="in1" type="float" value="1" />
       <input name="in2" type="float" interfacename="spacing" />
     </divide>
-    <combine3 name="to_rgb" type="color3">
-      <input name="in1" type="float" nodename="max" />
-      <input name="in2" type="float" nodename="max" />
-      <input name="in3" type="float" nodename="max" />
-    </combine3>
+    <add name="shift_X" type="float">
+      <input name="in1" type="float" nodename="coord_adj" channels="x" />
+      <input name="in2" type="float" nodename="alt_rows_shift" />
+    </add>
+    <ifequal name="stagger_selection" type="float">
+      <input name="value1" type="boolean" interfacename="staggered" />
+      <input name="value2" type="boolean" value="true" />
+      <input name="in1" type="float" nodename="shift_X" />
+      <input name="in2" type="float" nodename="coord_adj" channels="x" />
+    </ifequal>
+    <modulo name="mod_X" type="float">
+      <input name="in1" type="float" nodename="stagger_selection" />
+    </modulo>
     <multiply name="modx_2" type="float">
       <input name="in1" type="float" nodename="mod_X" />
       <input name="in2" type="float" value="2" />
@@ -1752,57 +1745,33 @@
       <input name="in1" type="float" value="0" />
       <input name="in2" type="float" value="1" />
     </ifgreater>
+    <ifgreater name="Y_detect" type="float">
+      <input name="value1" type="float" nodename="abs_Y" />
+      <input name="value2" type="float" nodename="scale" />
+      <input name="in1" type="float" value="0" />
+      <input name="in2" type="float" value="1" />
+    </ifgreater>
     <min name="min" type="float">
       <input name="in1" type="float" nodename="X_detect" />
       <input name="in2" type="float" nodename="Y_detect" />
     </min>
-    <subtract name="inv_result" type="float">
-      <input name="in1" type="float" value="1" />
-      <input name="in2" type="float" nodename="min" />
-    </subtract>
     <modulo name="mod_Y_row" type="float">
-      <input name="in1" type="float" nodename="separate_coord" output="outy" />
+      <input name="in1" type="float" nodename="coord_adj" channels="y" />
       <input name="in2" type="float" value="2" />
     </modulo>
-    <ifgreater name="alt_rows_shit" type="float">
+    <ifgreater name="alt_rows_shift" type="float">
       <input name="value1" type="float" nodename="mod_Y_row" />
       <input name="value2" type="float" value="1" />
       <input name="in1" type="float" value="0.5" />
     </ifgreater>
-    <add name="shift_X" type="float">
-      <input name="in1" type="float" nodename="separate_coord" output="outx" />
-      <input name="in2" type="float" nodename="alt_rows_shit" />
-    </add>
-    <ifequal name="stagger_selection" type="float">
-      <input name="value1" type="boolean" interfacename="staggered" />
-      <input name="value2" type="boolean" value="true" />
-      <input name="in1" type="float" nodename="shift_X" />
-      <input name="in2" type="float" nodename="separate_coord" output="outx" />
-    </ifequal>
+    <subtract name="thick_to_size" type="float">
+      <input name="in1" type="float" interfacename="spacing" />
+      <input name="in2" type="float" interfacename="thickness" />
+    </subtract>
     <divide name="scale" type="float">
       <input name="in1" type="float" nodename="thick_to_size" />
       <input name="in2" type="float" interfacename="spacing" />
     </divide>
-    <line name="line_diag1" type="float">
-      <input name="sample" type="vector2" nodename="sample_vec" />
-      <input name="radius" type="float" nodename="diag_thickness" />
-      <input name="point1" type="vector2" nodename="diag1_point1" />
-      <input name="point2" type="vector2" nodename="diag1_point2" />
-    </line>
-    <line name="line_diag2" type="float">
-      <input name="sample" type="vector2" nodename="sample_vec" />
-      <input name="radius" type="float" nodename="diag_thickness" />
-      <input name="point1" type="vector2" nodename="diag2_point1" />
-      <input name="point2" type="vector2" nodename="diag2_point2" />
-    </line>
-    <max name="composite_diags" type="float">
-      <input name="in1" type="float" nodename="line_diag1" />
-      <input name="in2" type="float" nodename="line_diag2" />
-    </max>
-    <max name="max" type="float">
-      <input name="in1" type="float" nodename="inv_result" />
-      <input name="in2" type="float" nodename="composite_diags" />
-    </max>
     <constant name="diag1_point1" type="vector2">
       <input name="value" type="vector2" value="1, 1" />
     </constant>
@@ -1823,10 +1792,35 @@
       <input name="in1" type="float" interfacename="thickness" />
       <input name="in2" type="float" interfacename="spacing" />
     </divide>
-    <subtract name="thick_to_size" type="float">
-      <input name="in1" type="float" interfacename="spacing" />
-      <input name="in2" type="float" interfacename="thickness" />
+    <subtract name="inv_result" type="float">
+      <input name="in1" type="float" value="1" />
+      <input name="in2" type="float" nodename="min" />
     </subtract>
+    <line name="line_diag1" type="float">
+      <input name="sample" type="vector2" nodename="sample_vec" />
+      <input name="radius" type="float" nodename="diag_thickness" />
+      <input name="point1" type="vector2" nodename="diag1_point1" />
+      <input name="point2" type="vector2" nodename="diag1_point2" />
+    </line>
+    <line name="line_diag2" type="float">
+      <input name="sample" type="vector2" nodename="sample_vec" />
+      <input name="radius" type="float" nodename="diag_thickness" />
+      <input name="point1" type="vector2" nodename="diag2_point1" />
+      <input name="point2" type="vector2" nodename="diag2_point2" />
+    </line>
+    <max name="composite_diags" type="float">
+      <input name="in1" type="float" nodename="line_diag1" />
+      <input name="in2" type="float" nodename="line_diag2" />
+    </max>
+    <max name="max" type="float">
+      <input name="in1" type="float" nodename="inv_result" />
+      <input name="in2" type="float" nodename="composite_diags" />
+    </max>
+    <combine3 name="to_rgb" type="color3">
+      <input name="in1" type="float" nodename="max" />
+      <input name="in2" type="float" nodename="max" />
+      <input name="in3" type="float" nodename="max" />
+    </combine3>
     <output name="out" type="color3" nodename="to_rgb" />
   </nodegraph>