diff --git a/docs/02-instrument.md b/docs/02-instrument.md index df516c88..ee3455f0 100644 --- a/docs/02-instrument.md +++ b/docs/02-instrument.md @@ -544,7 +544,7 @@ new voice Samantha speak("Hi Alex!") time(2 1) The modulator allows you to send a modulation signal as an argument to parameters from functions of other instruments. These parameters are continuously modulated at a specific rate with a specific waveform. The modulation rate is independent from the instruments `time()` (in comparison when using a list as an argument). **arguments** -- {Name} -> waveform type: `sine`|`sin`, `sawUp`|`phasor`, `sawDown`|`saw`, `square`|`rect`, `triangle`|`tri`, `random`|`rand`, `randomHold`|`randHold` +- {Name} -> waveform type: `sine`|`sin`, `sawUp`|`phasor`, `sawDown`|`saw`, `square`|`rect`, `triangle`|`tri`, `random`|`rand`, `randomLine`|`randL` ```java new modulator name() range( ) time() diff --git a/mercury_ide/patchers/fxLFO.maxpat b/mercury_ide/patchers/fxLFO.maxpat index 9be96123..48ebaf3c 100644 --- a/mercury_ide/patchers/fxLFO.maxpat +++ b/mercury_ide/patchers/fxLFO.maxpat @@ -888,13 +888,12 @@ "sqr" : 3, "triangle" : 4, "tri" : 4, - "noise" : 5, - "rand" : 5, - "random" : 5, - "randomHold" : 6, - "randomSah" : 6, - "randHold" : 6, - "randSah" : 6 + "randomLine" : 5, + "randLine" : 5, + "randL" : 5, + "noise" : 6, + "rand" : 6, + "random" : 6 } , "id" : "obj-10", @@ -1179,7 +1178,8 @@ } } - ] + ], + "autosave" : 0 } , "patching_rect" : [ 211.0, 405.0, 78.0, 22.0 ], @@ -1547,7 +1547,8 @@ } } - ] + ], + "autosave" : 0 } , "patching_rect" : [ 211.0, 450.0, 197.5, 22.0 ], diff --git a/mercury_ide/patchers/modulatorObject~.maxpat b/mercury_ide/patchers/modulatorObject~.maxpat index bd9d0725..ea44461d 100644 --- a/mercury_ide/patchers/modulatorObject~.maxpat +++ b/mercury_ide/patchers/modulatorObject~.maxpat @@ -876,45 +876,19 @@ } , { "box" : { - "data" : { - "default" : 0, - "sine" : 0, - "sin" : 0, - "saw" : 1, - "sawDown" : 1, - "rampDown" : 1, - "down" : 1, - "phasor" : 2, - "sawUp" : 2, - "rampUp" : 2, - "up" : 2, - "square" : 3, - "rect" : 3, - "sqr" : 3, - "triangle" : 4, - "tri" : 4, - "noise" : 5, - "rand" : 5, - "random" : 5, - "randomHold" : 6, - "randomSah" : 6, - "randHold" : 6, - "randSah" : 6 - } -, "id" : "obj-10", "maxclass" : "newobj", "numinlets" : 2, "numoutlets" : 4, "outlettype" : [ "dictionary", "", "", "" ], - "patching_rect" : [ 50.0, 255.0, 178.0, 22.0 ], + "patching_rect" : [ 87.666666666666657, 255.0, 65.0, 22.0 ], "saved_object_attributes" : { - "embed" : 1, + "embed" : 0, "parameter_enable" : 0, "parameter_mappable" : 0 } , - "text" : "dict waves @embed 1 @quiet 1" + "text" : "dict waves" } }