Skip to content

Commit

Permalink
random is sample-hold, randomLine is ramp
Browse files Browse the repository at this point in the history
  • Loading branch information
tmhglnd committed Oct 29, 2023
1 parent dc23c66 commit cc61513
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 39 deletions.
2 changes: 1 addition & 1 deletion docs/02-instrument.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 <waveform-type> name(<name>) range(<lo> <hi> <exp>) time(<division>)
Expand Down
19 changes: 10 additions & 9 deletions mercury_ide/patchers/fxLFO.maxpat
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -1179,7 +1178,8 @@
}

}
]
],
"autosave" : 0
}
,
"patching_rect" : [ 211.0, 405.0, 78.0, 22.0 ],
Expand Down Expand Up @@ -1547,7 +1547,8 @@
}

}
]
],
"autosave" : 0
}
,
"patching_rect" : [ 211.0, 450.0, 197.5, 22.0 ],
Expand Down
32 changes: 3 additions & 29 deletions mercury_ide/patchers/modulatorObject~.maxpat
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}

}
Expand Down

0 comments on commit cc61513

Please sign in to comment.