Added time multiplyer

johnroper100 · Jul 29, 2017 · 7ea84cb · 7ea84cb
1 parent cdc510d
commit 7ea84cb
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/cm_bpyNodes.py b/cm_bpyNodes.py
@@ -199,6 +199,7 @@ class NewInputNode(LogicNode):
                                        ("SINWAVE", "Sine Wave", "", 3)])
 
     SineWaveAmplitude = FloatProperty(name="Amplitude", default=5.0)
+    SineWaveTimeMul = FloatProperty(name="Time Multiplier", default=1.0)
 
     PathName = StringProperty(name="Path Name")
     PathOptions = EnumProperty(name="Path Options",
@@ -285,7 +286,9 @@ def draw_buttons(self, context, layout):
         elif self.InputSource == "NOISE":
             layout.prop(self, "NoiseOptions")
             if self.NoiseOptions == "SINWAVE":
-                layout.prop(self, "SineWaveAmplitude")
+                row = layout.row(expand=True)
+                row.prop(self, "SineWaveAmplitude")
+                row.prop(self, "SineWaveTimeMul")
         elif self.InputSource == "PATH":
             layout.prop_search(
                 self, "PathName", context.scene.cm_paths, "coll")
@@ -343,6 +346,7 @@ def getSettings(self, node):
         elif self.InputSource == "NOISE":
             node.settings["NoiseOptions"] = self.NoiseOptions
             node.settings["SineWaveAmplitude"] = self.SineWaveAmplitude
+            node.settings["SineWaveTimeMul"] = self.SineWaveTimeMul
         elif self.InputSource == "PATH":
             node.settings["PathName"] = self.PathName
             node.settings["PathOptions"] = self.PathOptions

diff --git a/cm_channels/cm_noiseChannels.py b/cm_channels/cm_noiseChannels.py
@@ -51,6 +51,6 @@ def agentRandom(self, offset=0):
         return result
 
     @timeChannel("Noise")
-    def sinWave(self, swa=5):
+    def sinWave(self, swtm=1.0, swa=5):
         """Returns a sine wave section in range -1 - 1 based on the current frame"""
-        return np.cos(bpy.context.scene.frame_current * 3.14 / swa)
+        return np.cos((bpy.context.scene.frame_current * swtm) * 3.14 / swa)
diff --git a/cm_nodeFunctions.py b/cm_nodeFunctions.py
@@ -131,7 +131,7 @@ def core(self, inps, settings):
             elif settings["NoiseOptions"] == "AGENTRANDOM":
                 return {"None": noise.agentRandom(offset=hash(self))}
             elif settings["NoiseOptions"] == "SINWAVE":
-                return {"None": noise.sinWave(self.settings["SineWaveAplitude"])}
+                return {"None": noise.sinWave(self.settings["SineWaveTimeMul"], self.settings["SineWaveAplitude"])}
 
         elif settings["InputSource"] == "PATH":
             if settings["PathOptions"] == "RZ":