From de2bdc5b096fea110ac70e42c7d6b4f5eb2f4585 Mon Sep 17 00:00:00 2001
From: Chris Rydalch <crydalch@gmail.com>
Date: Mon, 17 Apr 2023 13:10:35 -0500
Subject: [PATCH 1/6] Add a 2d checkerboard pattern node

Add a 2d checkerboard pattern node.
---
 libraries/stdlib/stdlib_defs.mtlx | 11 ++++++++
 libraries/stdlib/stdlib_ng.mtlx   | 47 +++++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+)

diff --git a/libraries/stdlib/stdlib_defs.mtlx b/libraries/stdlib/stdlib_defs.mtlx
index 6922ab3317..e2c21e0381 100644
--- a/libraries/stdlib/stdlib_defs.mtlx
+++ b/libraries/stdlib/stdlib_defs.mtlx
@@ -1024,6 +1024,17 @@
     <output name="out" type="float" />
   </nodedef>
 
+  <!--
+    Node: <checkers2d>
+    A 2D checkerboard pattern.
+  -->
+  <nodedef name="ND_checkers2d_float" node="checkers2d" nodegroup="procedural2d">
+    <input name="freq" type="vector2" uiname="Frequency" value="8, 8" doc="The frequency of checkers, with higher values producing smaller squares. Default is (8, 8)." />
+    <input name="offset" type="vector2" uiname="Offset" value="0, 0"  doc="Shift the pattern in 2d space. Default is (0, 0)." />
+    <input name="texcoord" type="vector2" uiname="Texture Coordinates" defaultgeomprop="UV0" doc="The input 2d space. Default is the first texture coordinates." />
+    <output name="out" type="float" />
+  </nodedef>
+
   <!-- ======================================================================== -->
   <!-- Geometric nodes                                                          -->
   <!-- ======================================================================== -->
diff --git a/libraries/stdlib/stdlib_ng.mtlx b/libraries/stdlib/stdlib_ng.mtlx
index 8d4046f8ae..d123d8c0f5 100644
--- a/libraries/stdlib/stdlib_ng.mtlx
+++ b/libraries/stdlib/stdlib_ng.mtlx
@@ -1160,6 +1160,53 @@
     <output name="out" type="float" nodename="N_range" />
   </nodegraph>
 
+  <!--
+    <checkers2d>
+    A 2D checkerboard pattern.
+  -->
+
+  <nodegraph name="NG_checkers2d_float" nodedef="ND_checkers2d_float">
+    <separate2 name="N_mtlxseparate2" type="multioutput">
+      <input name="in" type="vector2" nodename="N_mtlxplace2d1" />
+    </separate2>
+    <modulo name="N_mtlxmodulo1" type="float">
+      <input name="in1" type="float" nodename="N_mtlxseparate2" output="outx" />
+      <input name="in2" type="float" value="2" />
+    </modulo>
+    <multiply name="N_mult" type="vector2">
+      <input name="in1" type="vector2" interfacename="texcoord" />
+      <input name="in2" type="vector2" interfacename="freq" />
+    </multiply>
+    <modulo name="N_mtlxmodulo2" type="float">
+      <input name="in1" type="float" nodename="N_mtlxseparate2" output="outy" />
+      <input name="in2" type="float" value="2" />
+    </modulo>
+    <floor name="N_mtlxfloor2" type="float">
+      <input name="in" type="float" nodename="N_mtlxmodulo1" />
+    </floor>
+    <floor name="N_mtlxfloor3" type="float">
+      <input name="in" type="float" nodename="N_mtlxmodulo2" />
+    </floor>
+    <add name="N_mtlxadd2" type="float">
+      <input name="in1" type="float" nodename="N_mtlxfloor2" />
+      <input name="in2" type="float" nodename="N_mtlxfloor3" />
+    </add>
+    <ifequal name="N_mtlxifequal2" type="float">
+      <input name="value1" type="float" nodename="N_mtlxadd2" />
+      <input name="value2" type="float" value="1" />
+      <input name="in1" type="float" value="1" />
+      <input name="in2" type="float" value="0" />
+    </ifequal>
+    <place2d name="N_mtlxplace2d1" type="vector2">
+      <input name="texcoord" type="vector2" nodename="N_mult" />
+      <input name="offset" type="vector2" interfacename="offset" />
+      <input name="pivot" type="vector2" value="0, 0" />
+      <input name="scale" type="vector2" value="1, 1" />
+      <input name="rotate" type="float" value="0" />
+    </place2d>
+    <output name="out" type="float" nodename="N_mtlxifequal2" />
+  </nodegraph>
+
   <!-- ======================================================================== -->
   <!-- Geometric nodes                                                          -->
   <!-- ======================================================================== -->

From 4d743634e7e543e2f109d051727c5022035b6946 Mon Sep 17 00:00:00 2001
From: Chris Rydalch <crydalch@gmail.com>
Date: Mon, 17 Apr 2023 18:57:46 -0500
Subject: [PATCH 2/6] Renamed from checkers2d to checkerboard.

---
 libraries/stdlib/stdlib_defs.mtlx | 4 ++--
 libraries/stdlib/stdlib_ng.mtlx   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libraries/stdlib/stdlib_defs.mtlx b/libraries/stdlib/stdlib_defs.mtlx
index e2c21e0381..d9aad57311 100644
--- a/libraries/stdlib/stdlib_defs.mtlx
+++ b/libraries/stdlib/stdlib_defs.mtlx
@@ -1025,10 +1025,10 @@
   </nodedef>
 
   <!--
-    Node: <checkers2d>
+    Node: <checkerboard>
     A 2D checkerboard pattern.
   -->
-  <nodedef name="ND_checkers2d_float" node="checkers2d" nodegroup="procedural2d">
+  <nodedef name="ND_checkerboard_float" node="checkerboard" nodegroup="procedural2d">
     <input name="freq" type="vector2" uiname="Frequency" value="8, 8" doc="The frequency of checkers, with higher values producing smaller squares. Default is (8, 8)." />
     <input name="offset" type="vector2" uiname="Offset" value="0, 0"  doc="Shift the pattern in 2d space. Default is (0, 0)." />
     <input name="texcoord" type="vector2" uiname="Texture Coordinates" defaultgeomprop="UV0" doc="The input 2d space. Default is the first texture coordinates." />
diff --git a/libraries/stdlib/stdlib_ng.mtlx b/libraries/stdlib/stdlib_ng.mtlx
index d123d8c0f5..acb59f3918 100644
--- a/libraries/stdlib/stdlib_ng.mtlx
+++ b/libraries/stdlib/stdlib_ng.mtlx
@@ -1161,11 +1161,11 @@
   </nodegraph>
 
   <!--
-    <checkers2d>
+    <checkerboard>
     A 2D checkerboard pattern.
   -->
 
-  <nodegraph name="NG_checkers2d_float" nodedef="ND_checkers2d_float">
+  <nodegraph name="NG_checkerboard_float" nodedef="ND_checkerboard_float">
     <separate2 name="N_mtlxseparate2" type="multioutput">
       <input name="in" type="vector2" nodename="N_mtlxplace2d1" />
     </separate2>

From 6cf78f993417efb49ea5dd8357ae17450d2831e4 Mon Sep 17 00:00:00 2001
From: Jonathan Stone <stonej212@gmail.com>
Date: Tue, 18 Apr 2023 16:32:59 -0700
Subject: [PATCH 3/6] Omit default inputs

---
 libraries/stdlib/stdlib_ng.mtlx | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/libraries/stdlib/stdlib_ng.mtlx b/libraries/stdlib/stdlib_ng.mtlx
index acb59f3918..a91c5d6a13 100644
--- a/libraries/stdlib/stdlib_ng.mtlx
+++ b/libraries/stdlib/stdlib_ng.mtlx
@@ -1200,9 +1200,6 @@
     <place2d name="N_mtlxplace2d1" type="vector2">
       <input name="texcoord" type="vector2" nodename="N_mult" />
       <input name="offset" type="vector2" interfacename="offset" />
-      <input name="pivot" type="vector2" value="0, 0" />
-      <input name="scale" type="vector2" value="1, 1" />
-      <input name="rotate" type="float" value="0" />
     </place2d>
     <output name="out" type="float" nodename="N_mtlxifequal2" />
   </nodegraph>

From acd4a215cd932c5d4c5f28f28a288a96753436ae Mon Sep 17 00:00:00 2001
From: Chris Rydalch <crydalch@gmail.com>
Date: Wed, 10 May 2023 23:53:40 -0500
Subject: [PATCH 4/6] Changed to color signature, added 2 color inputs.

---
 libraries/stdlib/stdlib_defs.mtlx | 6 ++++--
 libraries/stdlib/stdlib_ng.mtlx   | 9 +++++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/libraries/stdlib/stdlib_defs.mtlx b/libraries/stdlib/stdlib_defs.mtlx
index d9aad57311..47ac9501e6 100644
--- a/libraries/stdlib/stdlib_defs.mtlx
+++ b/libraries/stdlib/stdlib_defs.mtlx
@@ -1028,11 +1028,13 @@
     Node: <checkerboard>
     A 2D checkerboard pattern.
   -->
-  <nodedef name="ND_checkerboard_float" node="checkerboard" nodegroup="procedural2d">
+  <nodedef name="ND_checkerboard_color3" node="checkerboard" nodegroup="procedural2d">
+    <input name="color1" type="color3" uiname="Color 1" value="1.0, 1.0, 1.0" doc="The first color used in the checkerboard pattern." />
+    <input name="color2" type="color3" uiname="Color 2" value="0.0, 0.0, 0.0" doc="The second color used in the checkerboard pattern." />
     <input name="freq" type="vector2" uiname="Frequency" value="8, 8" doc="The frequency of checkers, with higher values producing smaller squares. Default is (8, 8)." />
     <input name="offset" type="vector2" uiname="Offset" value="0, 0"  doc="Shift the pattern in 2d space. Default is (0, 0)." />
     <input name="texcoord" type="vector2" uiname="Texture Coordinates" defaultgeomprop="UV0" doc="The input 2d space. Default is the first texture coordinates." />
-    <output name="out" type="float" />
+    <output name="out" type="color3" />
   </nodedef>
 
   <!-- ======================================================================== -->
diff --git a/libraries/stdlib/stdlib_ng.mtlx b/libraries/stdlib/stdlib_ng.mtlx
index a91c5d6a13..c3aed3e6c4 100644
--- a/libraries/stdlib/stdlib_ng.mtlx
+++ b/libraries/stdlib/stdlib_ng.mtlx
@@ -1165,7 +1165,7 @@
     A 2D checkerboard pattern.
   -->
 
-  <nodegraph name="NG_checkerboard_float" nodedef="ND_checkerboard_float">
+  <nodegraph name="NG_checkerboard_color3" nodedef="ND_checkerboard_color3">
     <separate2 name="N_mtlxseparate2" type="multioutput">
       <input name="in" type="vector2" nodename="N_mtlxplace2d1" />
     </separate2>
@@ -1201,7 +1201,12 @@
       <input name="texcoord" type="vector2" nodename="N_mult" />
       <input name="offset" type="vector2" interfacename="offset" />
     </place2d>
-    <output name="out" type="float" nodename="N_mtlxifequal2" />
+    <mix name="N_mix_color3" type="color3">
+      <input name="bg" type="color3" interfacename="color2" />
+      <input name="fg" type="color3" interfacename="color1" />
+      <input name="mix" type="float" nodename="N_mtlxifequal2" />
+    </mix>
+    <output name="out" type="color3" nodename="N_mix_color3" />
   </nodegraph>
 
   <!-- ======================================================================== -->

From f8e11afda9596607104e962d41fe6181e5cdbc67 Mon Sep 17 00:00:00 2001
From: Jonathan Stone <stonej212@gmail.com>
Date: Thu, 11 May 2023 18:19:57 -0700
Subject: [PATCH 5/6] Minor newline fix

---
 libraries/stdlib/stdlib_ng.mtlx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/libraries/stdlib/stdlib_ng.mtlx b/libraries/stdlib/stdlib_ng.mtlx
index c3aed3e6c4..1e6b036aed 100644
--- a/libraries/stdlib/stdlib_ng.mtlx
+++ b/libraries/stdlib/stdlib_ng.mtlx
@@ -1164,7 +1164,6 @@
     <checkerboard>
     A 2D checkerboard pattern.
   -->
-
   <nodegraph name="NG_checkerboard_color3" nodedef="ND_checkerboard_color3">
     <separate2 name="N_mtlxseparate2" type="multioutput">
       <input name="in" type="vector2" nodename="N_mtlxplace2d1" />

From 4598a8a0a85b11c05ea2520f129c1db0e7b8aeb5 Mon Sep 17 00:00:00 2001
From: Jonathan Stone <jstone@lucasfilm.com>
Date: Fri, 12 May 2023 12:23:41 -0700
Subject: [PATCH 6/6] Minor whitespace fix

---
 libraries/stdlib/stdlib_defs.mtlx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/stdlib/stdlib_defs.mtlx b/libraries/stdlib/stdlib_defs.mtlx
index 47ac9501e6..70d9f75144 100644
--- a/libraries/stdlib/stdlib_defs.mtlx
+++ b/libraries/stdlib/stdlib_defs.mtlx
@@ -1032,7 +1032,7 @@
     <input name="color1" type="color3" uiname="Color 1" value="1.0, 1.0, 1.0" doc="The first color used in the checkerboard pattern." />
     <input name="color2" type="color3" uiname="Color 2" value="0.0, 0.0, 0.0" doc="The second color used in the checkerboard pattern." />
     <input name="freq" type="vector2" uiname="Frequency" value="8, 8" doc="The frequency of checkers, with higher values producing smaller squares. Default is (8, 8)." />
-    <input name="offset" type="vector2" uiname="Offset" value="0, 0"  doc="Shift the pattern in 2d space. Default is (0, 0)." />
+    <input name="offset" type="vector2" uiname="Offset" value="0, 0" doc="Shift the pattern in 2d space. Default is (0, 0)." />
     <input name="texcoord" type="vector2" uiname="Texture Coordinates" defaultgeomprop="UV0" doc="The input 2d space. Default is the first texture coordinates." />
     <output name="out" type="color3" />
   </nodedef>