Add nodegraph implementations for all non-float smoothstep nodes

AcademySoftwareFoundation · Aug 21, 2024 · 1b3a99e · 1b3a99e
1 parent 67d2e28
commit 1b3a99e
Show file tree

Hide file tree

Showing 10 changed files with 288 additions and 135 deletions.
diff --git a/libraries/stdlib/genglsl/mx_smoothstep_vector2.glsl b/libraries/stdlib/genglsl/mx_smoothstep_vector2.glsl
diff --git a/libraries/stdlib/genglsl/mx_smoothstep_vector3.glsl b/libraries/stdlib/genglsl/mx_smoothstep_vector3.glsl
diff --git a/libraries/stdlib/genglsl/mx_smoothstep_vector4.glsl b/libraries/stdlib/genglsl/mx_smoothstep_vector4.glsl
diff --git a/libraries/stdlib/genglsl/stdlib_genglsl_impl.mtlx b/libraries/stdlib/genglsl/stdlib_genglsl_impl.mtlx
@@ -488,9 +488,6 @@
 
   <!-- <smoothstep> -->
   <implementation name="IM_smoothstep_float_genglsl" nodedef="ND_smoothstep_float" file="mx_smoothstep_float.glsl" function="mx_smoothstep_float" target="genglsl" />
-  <implementation name="IM_smoothstep_vector2_genglsl" nodedef="ND_smoothstep_vector2" file="mx_smoothstep_vector2.glsl" function="mx_smoothstep_vector2" target="genglsl" />
-  <implementation name="IM_smoothstep_vector3_genglsl" nodedef="ND_smoothstep_vector3" file="mx_smoothstep_vector3.glsl" function="mx_smoothstep_vector3" target="genglsl" />
-  <implementation name="IM_smoothstep_vector4_genglsl" nodedef="ND_smoothstep_vector4" file="mx_smoothstep_vector4.glsl" function="mx_smoothstep_vector4" target="genglsl" />
 
   <!-- <luminance> -->
   <implementation name="IM_luminance_color3_genglsl" nodedef="ND_luminance_color3" file="mx_luminance_color3.glsl" function="mx_luminance_color3" target="genglsl" />

diff --git a/libraries/stdlib/genmsl/mx_smoothstep_vector2.metal b/libraries/stdlib/genmsl/mx_smoothstep_vector2.metal
diff --git a/libraries/stdlib/genmsl/mx_smoothstep_vector3.metal b/libraries/stdlib/genmsl/mx_smoothstep_vector3.metal
diff --git a/libraries/stdlib/genmsl/mx_smoothstep_vector4.metal b/libraries/stdlib/genmsl/mx_smoothstep_vector4.metal
diff --git a/libraries/stdlib/genmsl/stdlib_genmsl_impl.mtlx b/libraries/stdlib/genmsl/stdlib_genmsl_impl.mtlx
@@ -489,9 +489,6 @@
 
   <!-- <smoothstep> -->
   <implementation name="IM_smoothstep_float_genmsl" nodedef="ND_smoothstep_float" file="mx_smoothstep_float.metal" function="mx_smoothstep_float" target="genmsl" />
-  <implementation name="IM_smoothstep_vector2_genmsl" nodedef="ND_smoothstep_vector2" file="mx_smoothstep_vector2.metal" function="mx_smoothstep_vector2" target="genmsl" />
-  <implementation name="IM_smoothstep_vector3_genmsl" nodedef="ND_smoothstep_vector3" file="mx_smoothstep_vector3.metal" function="mx_smoothstep_vector3" target="genmsl" />
-  <implementation name="IM_smoothstep_vector4_genmsl" nodedef="ND_smoothstep_vector4" file="mx_smoothstep_vector4.metal" function="mx_smoothstep_vector4" target="genmsl" />
 
   <!-- <luminance> -->
   <implementation name="IM_luminance_color3_genmsl" nodedef="ND_luminance_color3" file="../genglsl/mx_luminance_color3.glsl" function="mx_luminance_color3" target="genmsl" />

diff --git a/libraries/stdlib/stdlib_ng.mtlx b/libraries/stdlib/stdlib_ng.mtlx
diff --git a/...urces/Materials/Examples/StandardSurface/standard_surface_marble_multiple_smoothstep.mtlx b/...urces/Materials/Examples/StandardSurface/standard_surface_marble_multiple_smoothstep.mtlx
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<materialx version="1.39" colorspace="lin_rec709">
+    <nodegraph name="NG_marble1">
+        <smoothstep name="smoothstep_float" type="float"/>
+        <smoothstep name="smoothstep_color3" type="color3">
+            <input name="low" type="float" nodename="smoothstep_float"/>
+        </smoothstep>
+        <output name="out_float" type="float" nodename="smoothstep_float"/>
+        <output name="out_color" type="color3" nodename="smoothstep_color3"/>
+    </nodegraph>
+    <standard_surface name="SR_marble1" type="surfaceshader">
+        <input name="base" type="float" nodegraph="NG_marble1" output="out_float"/>
+        <input name="base_color" type="color3" nodegraph="NG_marble1" output="out_color"/>
+    </standard_surface>
+    <surfacematerial name="Marble_3D" type="material">
+        <input name="surfaceshader" type="surfaceshader" nodename="SR_marble1"/>
+    </surfacematerial>
+</materialx>