update the node with period parameter

AcademySoftwareFoundation · Jul 12, 2023 · 9de2b4d · 9de2b4d
1 parent 70ec304
commit 9de2b4d
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 13 deletions.
diff --git a/libraries/stdlib/stdlib_defs.mtlx b/libraries/stdlib/stdlib_defs.mtlx
@@ -2553,6 +2553,7 @@
   -->
   <nodedef name="ND_trianglewave_float" node="trianglewave" nodegroup="math">
     <input name="in" type="float" value="0" />
+    <input name="period" type="float" uiname="Peroid" value="1"/>
     <output name="out" type="float" />
   </nodedef>
 

diff --git a/libraries/stdlib/stdlib_ng.mtlx b/libraries/stdlib/stdlib_ng.mtlx
@@ -1547,24 +1547,41 @@
     The generated wave ranges from zero to one and repeats on integer boundaries.
   -->
   <nodegraph name="NG_trianglewave_float" nodedef="ND_trianglewave_float">
-    <absval name="absval1" type="float">
-      <input name="in" type="float" interfacename="in" />
-    </absval>
-    <modulo name="modulo1" type="float">
-      <input name="in1" type="float" nodename="absval1" />
-    </modulo>
-    <subtract name="subtract1" type="float">
-      <input name="in1" type="float" nodename="modulo1" />
-      <input name="in2" type="float" value="0.5" />
+    <multiply name="multiply3" type="float">
+      <input name="in1" type="float" nodename="subtract2" />
+      <input name="in2" type="float" interfacename="period" />
+    </multiply>
+    <subtract name="subtract2" type="float">
+      <input name="in1" type="float" nodename="multiply2" />
+      <input name="in2" type="float" nodename="absval2" />
     </subtract>
+    <multiply name="multiply2" type="float">
+      <input name="in1" type="float" nodename="divide1" />
+      <input name="in2" type="float" value="0.5" />
+    </multiply>
     <absval name="absval2" type="float">
       <input name="in" type="float" nodename="subtract1" />
     </absval>
-    <subtract name="subtract2" type="float">
-      <input name="in1" type="float" value="0.5" />
-      <input name="in2" type="float" nodename="absval2" />
+    <divide name="divide1" type="float">
+      <input name="in2" type="float" interfacename="period" />
+      <input name="in1" type="float" value="1" />
+    </divide>
+    <subtract name="subtract1" type="float">
+      <input name="in1" type="float" nodename="modulo1" />
+      <input name="in2" type="float" nodename="multiply2" />
     </subtract>
-    <output name="out" type="float" nodename="subtract2" />
+    <modulo name="modulo1" type="float">
+      <input name="in1" type="float" nodename="absval1" />
+      <input name="in2" type="float" nodename="multiply1" />
+    </modulo>
+    <absval name="absval1" type="float">
+      <input name="in" type="float" interfacename="in" />
+    </absval>
+    <multiply name="multiply1" type="float">
+      <input name="in1" type="float" nodename="multiply2" />
+      <input name="in2" type="float" value="2" />
+    </multiply>
+    <output name="out" type="float" nodename="multiply3" />
   </nodegraph>
 
   <!-- ======================================================================== -->