From 761e15a17f3dc56091142712de91e3a1bb73573d Mon Sep 17 00:00:00 2001
From: Ashwin <ashwin.bhat@autodesk.com>
Date: Wed, 24 Jan 2024 12:02:16 -0800
Subject: [PATCH] Update example material

---
 libraries/nprlib/nprlib_defs.mtlx             |  6 +--
 .../Materials/Examples/gooch_material.mtlx    | 13 -----
 .../Examples/npr/gooch_material.mtlx          | 53 +++++++++++++++++++
 3 files changed, 56 insertions(+), 16 deletions(-)
 delete mode 100644 resources/Materials/Examples/gooch_material.mtlx
 create mode 100644 resources/Materials/Examples/npr/gooch_material.mtlx

diff --git a/libraries/nprlib/nprlib_defs.mtlx b/libraries/nprlib/nprlib_defs.mtlx
index fa9423ab93..acbd818432 100644
--- a/libraries/nprlib/nprlib_defs.mtlx
+++ b/libraries/nprlib/nprlib_defs.mtlx
@@ -47,9 +47,9 @@
     <input name="Warm" type="color3" value="0.6, 0, 0" uiname="Warm Color" doc="Warm diffuse color"/>
     <input name="Cool" type="color3" value="0, 0, 0.6" uiname="Cool Color" doc="Cool diffuse color"/>
     <input name="Shininess" type="float" value="8" uimin="1" uimax="64" doc="Specular shininess"/>
-      <input name="SpecularColor" type="color3" value="0.6, 0.6, 0.6" uiname="Specular Color" doc="Specular color"/>
-      <input name="LightDirection" type="vector3" value="1, 0.5, 0.5" uiname="Light Direction" doc="Light vector"/>
-      <output name="out" type="color3" />
+    <input name="SpecularColor" type="color3" value="0.6, 0.6, 0.6" uiname="Specular Color" doc="Specular color"/>
+    <input name="LightDirection" type="vector3" value="1, 0.5, 0.5" uiname="Light Direction" doc="Light vector"/>
+    <output name="out" type="color3" />
   </nodedef>
 
 
diff --git a/resources/Materials/Examples/gooch_material.mtlx b/resources/Materials/Examples/gooch_material.mtlx
deleted file mode 100644
index b366d42b28..0000000000
--- a/resources/Materials/Examples/gooch_material.mtlx
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<materialx version="1.38">
-
-  <gooch name="SR_Gooch_Material" type="surfaceshader">
-    <input name="warm_color" type="color3" value="0.6, 0, 0"/>
-    <input name="cool_color" type="color3"  value="0, 0, 0.6"/>
-    <input name="light_dir" type="vector3" value="0, 1, 1"/>
-  </gooch>
-  <surfacematerial name="Gooch_Material" type="material">
-    <input name="surfaceshader" type="surfaceshader" nodename="SR_Gooch_Material" />
-  </surfacematerial>
-  
-</materialx>
diff --git a/resources/Materials/Examples/npr/gooch_material.mtlx b/resources/Materials/Examples/npr/gooch_material.mtlx
new file mode 100644
index 0000000000..c50c9334f1
--- /dev/null
+++ b/resources/Materials/Examples/npr/gooch_material.mtlx
@@ -0,0 +1,53 @@
+<?xml version="1.0"?>
+<materialx version="1.38" colorspace="lin_rec709" fileprefix="../../../Images/">
+  <nodegraph name="NG_brass1">
+    <tiledimage name="image_color" type="color3">
+      <input name="file" type="filename" value="brass_color.jpg" colorspace="srgb_texture" />
+      <input name="uvtiling" type="vector2" value="1.0, 1.0" />
+    </tiledimage>
+    <tiledimage name="image_roughness" type="float">
+      <input name="file" type="filename" value="brass_roughness.jpg" />
+      <input name="uvtiling" type="vector2" value="1.0, 1.0" />
+    </tiledimage>
+
+    <gooch name="gooch1" type="color3">
+     <input name="Warm" type="color3" value="0.6, 0, 0"/>
+     <input name="Cool" type="color3"  value="0, 0, 0.6"/>
+     <input name="LightDirection" type="vector3" value="0, 1, 1"/>
+     <input name="SpecularColor" type="color3" value="0.8, 0.8, 0.8"/>
+   </gooch>
+
+    <output name="out_basecolor" type="color3" nodename="gooch1" />
+    <output name="out_color" type="color3" nodename="image_color" />
+    <output name="out_roughness" type="float" nodename="image_roughness" />
+  </nodegraph>
+  
+  <standard_surface name="SR_brass1" type="surfaceshader">
+    <input name="base" type="float" value="1" />
+    <input name="base_color" type="color3" nodegraph="NG_brass1" output="out_basecolor" />
+    <input name="specular" type="float" value="0" />
+    <input name="specular_roughness" type="float" nodegraph="NG_brass1" output="out_roughness" />
+    <input name="metalness" type="float" value="1" />
+    <input name="coat" type="float" value="1" />
+    <input name="coat_color" type="color3" nodegraph="NG_brass1" output="out_color" />
+    <input name="coat_roughness" type="float" nodegraph="NG_brass1" output="out_roughness" />
+  </standard_surface>
+  <surfacematerial name="Tiled_Brass" type="material">
+    <input name="surfaceshader" type="surfaceshader" nodename="SR_brass1" />
+  </surfacematerial>
+
+  <gooch name="gooch_color" type="color3">
+    <input name="Warm" type="color3" value="0.6, 0, 0" />
+    <input name="Cool" type="color3" value="0, 0, 0.6" />
+    <input name="LightDirection" type="vector3" value="0, 1, 1"/>
+    <input name="SpecularColor" type="color3" value="0.8, 0.8, 0.8"/>
+  </gooch>
+  <surface_unlit name="unlit_surface" type="surfaceshader">
+    <input name="emission_color" type="color3" nodename="gooch_color" />
+    <input name="opacity" type="float" value="1.0" />
+  </surface_unlit>
+  <surfacematerial name="goochmaterial" type="material">
+    <input name="surfaceshader" type="surfaceshader" nodename="unlit_surface" />
+    <input name="displacementshader" type="displacementshader" value="" />
+  </surfacematerial>
+</materialx>