From f0fd134dfdc88d63bed0a5a98e031791201268d4 Mon Sep 17 00:00:00 2001
From: Jonathan Feldstein <jonathan.feldstein@autodesk.com>
Date: Fri, 18 Oct 2024 13:56:18 -0400
Subject: [PATCH] Add defaultgeomprop support for nodegraph inputs.

---
 .../defaultgeomprop/defaultgeomprop.mtlx      | 41 +++++++++++++++++++
 source/MaterialXCore/Interface.cpp            |  2 +-
 source/MaterialXGenShader/ShaderGraph.cpp     | 18 ++++++++
 3 files changed, 60 insertions(+), 1 deletion(-)
 create mode 100644 resources/Materials/TestSuite/stdlib/defaultgeomprop/defaultgeomprop.mtlx

diff --git a/resources/Materials/TestSuite/stdlib/defaultgeomprop/defaultgeomprop.mtlx b/resources/Materials/TestSuite/stdlib/defaultgeomprop/defaultgeomprop.mtlx
new file mode 100644
index 0000000000..86bddc9650
--- /dev/null
+++ b/resources/Materials/TestSuite/stdlib/defaultgeomprop/defaultgeomprop.mtlx
@@ -0,0 +1,41 @@
+<?xml version="1.0"?>
+<materialx version="1.39">
+  <surfacematerial name="defaultgeomprop" type="material" nodedef="ND_surfacematerial">
+    <input name="surfaceshader" type="surfaceshader" nodename="standard_surface1" />
+  </surfacematerial>
+  <standard_surface name="standard_surface1" type="surfaceshader" nodedef="ND_standard_surface_surfaceshader">
+    <input name="base_color" type="color3" output="out" nodegraph="checkerboard1" />
+  </standard_surface>
+  <nodegraph name="checkerboard1">
+    <input name="color1" type="color3" uiname="Color 1" value="1, 1, 1" 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="uvtiling" type="vector2" uiname="UV Tiling" value="8, 8" doc="The tiling of the checkerboard pattern along each axis, with higher values producing smaller squares. Default is (8, 8)." />
+    <input name="uvoffset" type="vector2" uiname="UV Offset" value="0, 0" doc="The offset of the checkerboard pattern along each axis. Default is (0, 0)." />
+    <input name="texcoord" type="vector2" defaultgeomprop="UV0" uiname="Texture Coordinates" doc="The input 2d space. Default is the first texture coordinates." />
+    <multiply name="N_mtlxmult" type="vector2">
+      <input name="in1" type="vector2" interfacename="texcoord" />
+      <input name="in2" type="vector2" interfacename="uvtiling" />
+    </multiply>
+    <subtract name="N_mtlxsubtract" type="vector2">
+      <input name="in1" type="vector2" nodename="N_mtlxmult" />
+      <input name="in2" type="vector2" interfacename="uvoffset" />
+    </subtract>
+    <floor name="N_mtlxfloor" type="vector2">
+      <input name="in" type="vector2" nodename="N_mtlxsubtract" />
+    </floor>
+    <dotproduct name="N_mtlxdotproduct" type="float">
+      <input name="in1" type="vector2" nodename="N_mtlxfloor" />
+      <input name="in2" type="vector2" value="1, 1" />
+    </dotproduct>
+    <modulo name="N_modulo" type="float">
+      <input name="in1" type="float" nodename="N_mtlxdotproduct" />
+      <input name="in2" type="float" value="2" />
+    </modulo>
+    <mix name="N_mtlxmix" type="color3">
+      <input name="bg" type="color3" interfacename="color2" />
+      <input name="fg" type="color3" interfacename="color1" />
+      <input name="mix" type="float" nodename="N_modulo" />
+    </mix>
+    <output name="out" type="color3" nodename="N_mtlxmix" />
+  </nodegraph>
+</materialx>
diff --git a/source/MaterialXCore/Interface.cpp b/source/MaterialXCore/Interface.cpp
index 24d3ccfe0d..1c12e38ded 100644
--- a/source/MaterialXCore/Interface.cpp
+++ b/source/MaterialXCore/Interface.cpp
@@ -295,7 +295,7 @@ bool Input::validate(string* message) const
 
     if (hasDefaultGeomPropString())
     {
-        validateRequire(parent->isA<NodeDef>(), res, message, "Invalid defaultgeomprop on non-definition input");
+        validateRequire(parent->isA<NodeDef>() || parent->isA<NodeGraph>(), res, message, "Invalid defaultgeomprop on non-definition and non-nodegraph input");
         validateRequire(getDefaultGeomProp() != nullptr, res, message, "Invalid defaultgeomprop string");
     }
     if (parent->isA<Node>())
diff --git a/source/MaterialXGenShader/ShaderGraph.cpp b/source/MaterialXGenShader/ShaderGraph.cpp
index 0f39b46c32..2857138e11 100644
--- a/source/MaterialXGenShader/ShaderGraph.cpp
+++ b/source/MaterialXGenShader/ShaderGraph.cpp
@@ -95,6 +95,24 @@ void ShaderGraph::createConnectedNodes(const ElementPtr& downstreamElement,
         newNode = createNode(upstreamNode, context);
     }
 
+    //
+    // Handle defaultgeomprops
+    //
+
+    const vector<InputPtr> activeInputs = upstreamNode->getActiveInputs();
+    for (const InputPtr& activeInput : activeInputs)
+    {
+        if (!activeInput->hasInterfaceName() || activeInput->getConnectedNode()) {
+            continue;
+        }
+        const auto graphInput = activeInput->getInterfaceInput();
+        // We have an input connected to an interface. See if it has defaultgeomprop
+        if (graphInput && graphInput->hasDefaultGeomPropString()) {
+            ShaderInput* shaderInput = getNode(upstreamNode->getName())->getInput(activeInput->getName());
+            addDefaultGeomNode(shaderInput, *graphInput->getDefaultGeomProp(), context);
+        }
+    }
+
     //
     // Make connections
     //