Merge remote-tracking branch 'upstream/main' into vibrato

website/src/docs/JsDoc.jsx

@@ -12,10 +12,11 @@ export function JsDoc({ name, h = 3, hideDescription, punchcard, canvasHeight })
   }
   const synonyms = getTag('synonyms', item)?.split(', ') || [];
   const CustomHeading = `h${h}`;
-  const description = item.description.replaceAll(/\{@link ([a-zA-Z\.]+)?#?([a-zA-Z]*)\}/g, (_, a, b) => {
-    // console.log(_, 'a', a, 'b', b);
-    return `<a href="#${a.replaceAll('.', '').toLowerCase()}${b ? `-${b}` : ''}">${a}${b ? `#${b}` : ''}</a>`;
-  });
+  const description =
+    item.description?.replaceAll(/\{@link ([a-zA-Z\.]+)?#?([a-zA-Z]*)\}/g, (_, a, b) => {
+      // console.log(_, 'a', a, 'b', b);
+      return `<a href="#${a.replaceAll('.', '').toLowerCase()}${b ? `-${b}` : ''}">${a}${b ? `#${b}` : ''}</a>`;
+    }) || '';
   return (
     <>
       {!!h && <CustomHeading>{item.longname}</CustomHeading>}

website/src/pages/learn/effects.mdx

@@ -49,6 +49,10 @@ Each filter has 2 parameters:
 
 <JsDoc client:idle name="bpq" h={0} />
 
+## ftype
+
+<JsDoc client:idle name="ftype" h={0} />
+
 ## vowel
 
 <JsDoc client:idle name="vowel" h={0} />
@@ -78,6 +82,58 @@ Strudel uses ADSR envelopes, which are probably the most common way to describe
 
 <JsDoc client:idle name="release" h={0} />
 
+# Filter Envelope
+
+Each filter can receive an additional filter envelope controlling the cutoff value dynamically. It uses an ADSR envelope similar to the one used for amplitude. There is an additional parameter to control the depth of the filter modulation: `lpenv`|`hpenv`|`bpenv`. This allows you to play subtle or huge filter modulations just the same by only increasing or decreasing the depth.
+
+<MiniRepl
+  client:idle
+  tune={`note("[c eb g <f bb>](3,8,<0 1>)".sub(12))
+  .s("<sawtooth>/64")
+  .lpf(sine.range(500,3000).slow(16))
+  .lpa(0.005)
+  .lpd(perlin.range(.02,.2))
+  .lps(perlin.range(0,.5).slow(3))
+  .lpq(sine.range(2,10).slow(32))
+  .release(.5)
+  .lpenv(perlin.range(1,8).slow(2))
+  .ftype('24db')
+  .room(1)
+  .juxBy(.5,rev)
+  .sometimes(add(note(12)))
+  .stack(s("bd*2").bank('RolandTR909'))
+  .gain(.5)`}
+/>
+
+There is one filter envelope for each filter type and thus one set of envelope filter parameters preceded either by `lp`, `hp` or `bp`:
+
+- `lpattack`, `lpdecay`, `lpsustain`, `lprelease`, `lpenv`: filter envelope for the lowpass filter.
+  - alternatively: `lpa`, `lpd`, `lps`, `lpr` and `lpe`.
+- `hpattack`, `hpdecay`, `hpsustain`, `hprelease`, `hpenv`: filter envelope for the highpass filter.
+  - alternatively: `hpa`, `hpd`, `hps`, `hpr` and `hpe`.
+- `bpattack`, `bpdecay`, `bpsustain`, `bprelease`, `bpenv`: filter envelope for the bandpass filter.
+  - alternatively: `bpa`, `bpd`, `bps`, `bpr` and `bpe`.
+
+## lpattack
+
+<JsDoc client:idle name="lpattack" h={0} />
+
+## lpdecay
+
+<JsDoc client:idle name="lpdecay" h={0} />
+
+## lpsustain
+
+<JsDoc client:idle name="lpsustain" h={0} />
+
+## lprelease
+
+<JsDoc client:idle name="lprelease" h={0} />
+
+## lpenv
+
+<JsDoc client:idle name="lpenv" h={0} />
+
 # Dynamics
 
 ## gain

website/src/pages/learn/samples.mdx

@@ -303,6 +303,18 @@ Sampler effects are functions that can be used to change the behaviour of sample
 
 <JsDoc client:idle name="Pattern.end" h={0} />
 
+### loop
+
+<JsDoc client:idle name="loop" h={0} />
+
+### loopBegin
+
+<JsDoc client:idle name="loopBegin" h={0} />
+
+### loopEnd
+
+<JsDoc client:idle name="loopEnd" h={0} />
+
 ### cut
 
 <JsDoc client:idle name="cut" h={0} />
@@ -315,6 +327,10 @@ Sampler effects are functions that can be used to change the behaviour of sample
 
 <JsDoc client:idle name="Pattern.loopAt" h={0} />
 
+### fit
+
+<JsDoc client:idle name="fit" h={0} />
+
 ### chop
 
 <JsDoc client:idle name="Pattern.chop" h={0} />
@@ -323,6 +339,10 @@ Sampler effects are functions that can be used to change the behaviour of sample
 
 <JsDoc client:idle name="Pattern.slice" h={0} />
 
+### splice
+
+<JsDoc client:idle name="splice" h={0} />
+
 ### speed
 
 <JsDoc client:idle name="speed" h={0} />

website/src/pages/learn/synths.mdx

@@ -88,6 +88,23 @@ You can use fm with any of the above waveforms, although the below examples all
 
 <JsDoc client:idle name="fmenv" h={0} />
 
+## Wavetable Synthesis
+
+Strudel can also use the sampler to load custom waveforms as a replacement of the default waveforms used by WebAudio for the base synth. A default set of more than 1000 wavetables is accessible by default (coming from the [AKWF](https://www.adventurekid.se/akrt/waveforms/adventure-kid-waveforms/) set). You can also import/use your own. A wavetable is a one-cycle waveform, which is then repeated to create a sound at the desired frequency. It is a classic but very effective synthesis technique.
+
+Any sample preceded by the `wt_` prefix will be loaded as a wavetable. This means that the `loop` argument will be set to `1` by defalt. You can scan over the wavetable by using `loopBegin` and `loopEnd` as well.
+
+<MiniRepl
+  client:idle
+  tune={`samples('github:Bubobubobubobubo/Dough-Waveforms/main/');
+
+note("<[g3,b3,e4]!2 [a3,c3,e4] [b3,d3,f#4]>")
+.n("<1 2 3 4 5 6 7 8 9 10>/2").room(0.5).size(0.9)
+.s('wt_flute').velocity(0.25).often(n => n.ply(2))
+.release(0.125).decay("<0.1 0.25 0.3 0.4>").sustain(0)
+.cutoff(2000).scope({}).cutoff("<1000 2000 4000>").fast(2)`}
+/>
+
 ## ZZFX
 
 The "Zuper Zmall Zound Zynth" [ZZFX](https://github.com/KilledByAPixel/ZzFX) is also integrated in strudel.

website/src/repl/Repl.jsx

@@ -37,14 +37,22 @@ const modules = [
   import('@strudel.cycles/core'),
   import('@strudel.cycles/tonal'),
   import('@strudel.cycles/mini'),
-  isTauri() ? import('@strudel/desktopbridge') : import('@strudel.cycles/midi'),
   import('@strudel.cycles/xen'),
   import('@strudel.cycles/webaudio'),
-  import('@strudel.cycles/osc'),
+
   import('@strudel.cycles/serial'),
   import('@strudel.cycles/soundfonts'),
   import('@strudel.cycles/csound'),
 ];
+if (isTauri()) {
+  modules.concat([
+    import('@strudel/desktopbridge/loggerbridge.mjs'),
+    import('@strudel/desktopbridge/midibridge.mjs'),
+    import('@strudel/desktopbridge/oscbridge.mjs'),
+  ]);
+} else {
+  modules.concat([import('@strudel.cycles/midi'), import('@strudel.cycles/osc')]);
+}
 
 const modulesLoading = evalScope(
   controls, // sadly, this cannot be exported from core direclty

website/src/repl/tunes.mjs

@@ -229,7 +229,9 @@ stack(
   .add("0,.02")
   .note().gain(.3)
   .clip("<1@3 [.3 1]>/2")
-  .s('sawtooth').cutoff(600).color('#F8E71C'),
+  .cutoff(600)
+  .lpa(.2).lpenv(-4)
+  .s('sawtooth').color('#F8E71C'),
 ).fast(3/2)
 //.pianoroll({fold:1})`;
 
@@ -468,7 +470,9 @@ stack(
   .note()
   .s("sawtooth,square")
   .gain(.3).attack(0.01).decay(0.1).sustain(.5)
-  .apply(filter1),
+  .apply(filter1)
+  .lpa(.1).lpenv(2).ftype('24db')
+  ,
   "~@3 [<2 3>,<4 5>]"
   .echo(4,1/16,.7)
   .scale(scales)
@@ -576,8 +580,8 @@ chord("<C^7 Am7 Dm7 G7>*2").dict('lefthand').anchor("G4").voicing()
   .s("gm_epiano1:1")
   .color('steelblue')
   .stack(
-   n("<-7 ~@2 [~@2 -7] -9 ~@2 [~@2 -9] -10!2 ~ [~@2 -10] -5 ~ [-3 -2 -10]@2>*2")
-    .scale('C3 major')
+   "<-7 ~@2 [~@2 -7] -9 ~@2 [~@2 -9] -10!2 ~ [~@2 -10] -5 ~ [-3 -2 -10]@2>*2"
+    .scale('C3 major').note()
     .s('sawtooth').color('brown')
   )
   .attack(0.05).decay(.1).sustain(.7)
@@ -803,14 +807,14 @@ stack(
   sine.add(saw.slow(4)).range(0,7).segment(8)
   .superimpose(x=>x.add(.1))
   .scale('G0 minor').note()
-  .s("sawtooth").decay(.1).sustain(0)
+  .s("sawtooth").decay(.1).sustain(0).lpa(.1).lpenv(4)
   .gain(.4).cutoff(perlin.range(300,3000).slow(8)).resonance(10)
   .degradeBy("0 0.1 .5 .1")
   .rarely(add(note("12")))
   ,
   // chord
   note("Bb3,D4".superimpose(x=>x.add(.2)))
-  .s('sawtooth').cutoff(1000).struct("<~@3 [~ x]>")
+  .s('sawtooth').lpf(1000).struct("<~@3 [~ x]>")
   .decay(.05).sustain(.0).delay(.8).delaytime(.125).room(.8)
   ,
   // alien