From eccce6fa84e5612dac568f90f46f2be015da5121 Mon Sep 17 00:00:00 2001 From: Felix Roos Date: Thu, 8 Jun 2023 17:48:54 +0200 Subject: [PATCH] remove dirt samples + load a small selection for workshop instead --- .../src/pages/de/workshop/first-sounds.mdx | 31 +++++----- website/src/pages/de/workshop/recap.mdx | 30 ---------- website/src/pages/workshop/first-sounds.mdx | 35 ++++++----- website/src/pages/workshop/recap.mdx | 29 --------- website/src/repl/prebake.mjs | 59 ++++++++++++++++++- 5 files changed, 94 insertions(+), 90 deletions(-) diff --git a/website/src/pages/de/workshop/first-sounds.mdx b/website/src/pages/de/workshop/first-sounds.mdx index d272bb30..8fa2ddaa 100644 --- a/website/src/pages/de/workshop/first-sounds.mdx +++ b/website/src/pages/de/workshop/first-sounds.mdx @@ -13,13 +13,13 @@ Dies ist das erste Kapitel im Strudel Workshop, schön dich an Bord zu haben! Los geht's mit ein paar Sounds: - + 1. ⬆️ Klicke in das obige Textfeld ⬆️ 2. Drücke `Strg`+`Enter` zum Abspielen -3. Ändere `house` in `casio` +3. Ändere `casio` in `metal` 4. Drücke `Strg`+`Enter` zum Aktualisieren 5. Drücke `Strg`+`.` zum Stoppen @@ -27,27 +27,30 @@ Los geht's mit ein paar Sounds: Glückwunsch, du bist nun am live coden! +Die ganze Seite ist voller interaktiver Textfelder. +In jedes kannst du hineinklicken und mit `Strg`+`Enter` starten / aktualisieren und mit `Strg+.` stoppen. + **Probiere mehr Sounds aus** Mit ":" kannst du einen anderen Sound aus dem Set wählen: - + -Ändere `east:1` in `east:2` um einen anderen Sound aus dem Set `east` zu hören. - -Du kannst auch andere Zahlen ausprobieren! Es kann sein dass du kurz nichts hörst während ein neuer Sound lädt. - - +Ändere `casio:0` in `casio:1` um einen anderen Sound aus dem Set `casio` zu hören. +Ohne Zahl ist gleichbedeutend mit `:0` Hier sind ein paar mehr Sounds zum ausprobieren: ``` -casio control crow techno house jazz -metal east jvbass juno insect space wind +insect wind jazz metal east crow casio ``` +Probier verschiedene Kombinationen von Sounds und Nummern! Es kann sein dass du kurz nichts hörst während ein neuer Sound lädt. + + + Jetzt weißt du wie man verschiedene Sounds benutzt. Vorerst bleiben wir bei den voreingestellten Sounds, später erfahren wir noch wie man eigene benutzt. @@ -103,13 +106,13 @@ Versuch noch mehr Sounds hinzuzfügen! **Je länger die Sequence, desto schneller** - + Der Inhalt einer Sequence wird in einen sogenannten Cycle (=Zyklus) zusammengequetscht. **Tempo ändern mit `cpm`** - + @@ -127,7 +130,7 @@ Wir werden später noch mehr Möglichkeiten kennen lernen wie man das Tempo ver **Unter-Sequenzen mit [Klammern]** - + @@ -157,7 +160,7 @@ Tonhöhe = sehr schneller Rhythmus **Unter-Unter-Sequenzen mit [[Klammern]]** - + diff --git a/website/src/pages/de/workshop/recap.mdx b/website/src/pages/de/workshop/recap.mdx index 8341c937..db392b8b 100644 --- a/website/src/pages/de/workshop/recap.mdx +++ b/website/src/pages/de/workshop/recap.mdx @@ -66,33 +66,3 @@ Diese Seite ist eine Auflistung aller im Workshop enthaltenen Funktionen. | add | addiert zahlen oder noten | ")).scale("C:minor")`} /> | | ply | jedes element schneller machen | ")`} /> | | off | verzögert eine modifizierte kopie | x.speed(2))`} /> | - -## Samples - -``` -casio control crow techno house jazz -metal east jvbass juno insect space wind -bd sd sn cp hh -piano -``` - -## Synths - -``` -gm_electric_guitar_muted gm_acoustic_bass -gm_voice_oohs gm_blown_bottle sawtooth square triangle -gm_xylophone gm_synth_bass_1 gm_synth_strings_1 -``` - -## Banks - -``` -RolandTR909 -``` - -## Scales - -``` -major minor dorian mixolydian -minor:pentatonic major:pentatonic -``` diff --git a/website/src/pages/workshop/first-sounds.mdx b/website/src/pages/workshop/first-sounds.mdx index 6cd55283..e7badb12 100644 --- a/website/src/pages/workshop/first-sounds.mdx +++ b/website/src/pages/workshop/first-sounds.mdx @@ -15,13 +15,13 @@ This is the first chapter of the Strudel Workshop, nice to have you on board! Let's start by making some noise: - + 1. ⬆️ click into the text field above ⬆️ 2. press `ctrl`+`enter` to play -3. change `house` to `casio` +3. change `casio` to `metal` 4. press `ctrl`+`enter` to update 5. press `ctrl`+`.` to stop @@ -29,27 +29,30 @@ Let's start by making some noise: Congratulations, you are now live coding! +The whole page is filled with these text fields to interact with. +You can always click inside and hit `ctrl`+`enter` to start / update and `ctrl+.` to stop. + **Try more Sounds** You can pick a different sample from the same set, with ':' - + -Try changing `east:1` to `east:2` to hear a different sound in the `east` set. - -You can try other numbers too! You might hear a little pause while the sound is loading - - +Try changing `casio:0` to `casio:1` to hear a different sound in the `casio` set. +Not using a number is like doing `:0` Here are some more sound sets to try: ``` -casio control crow techno house jazz -metal east jvbass juno insect space wind +insect wind jazz metal east crow casio ``` +Try out different Combinations of sounds and numbers! You might hear a little pause while the sound is loading + + + Now you know how to use different sounds. For now we'll stick to this little selection of sounds, but we'll find out how to load your own sounds later. @@ -105,13 +108,13 @@ Try adding more sounds to the sequence! **The longer the sequence, the faster it runs** - + The content of a sequence will be squished into what's called a cycle. **One way to change the tempo is using `cpm`** - + @@ -141,15 +144,15 @@ Similar to the whole sequence, the content of a sub-sequence will be squished to **Multiplication: Speed things up** - + **Multiplication: Speed up sequences** - + **Multiplication: Speeeeeeeeed things up** - + @@ -159,7 +162,7 @@ Pitch = really fast rhythm **Sub-Sub-Sequences with [[brackets]]** - + diff --git a/website/src/pages/workshop/recap.mdx b/website/src/pages/workshop/recap.mdx index 6ebbd3f9..fc1fb602 100644 --- a/website/src/pages/workshop/recap.mdx +++ b/website/src/pages/workshop/recap.mdx @@ -67,32 +67,3 @@ This page is just a listing of all functions covered in the workshop! | ply | speed up each event n times | ")`} /> | | off | copy, shift time & modify | x.speed(2))`} /> | -## Samples - -``` -casio control crow techno house jazz -metal east jvbass juno insect space wind -bd sd sn cp hh -piano -``` - -## Synths - -``` -gm_electric_guitar_muted gm_acoustic_bass -gm_voice_oohs gm_blown_bottle sawtooth square triangle -gm_xylophone gm_synth_bass_1 gm_synth_strings_1 -``` - -## Banks - -``` -RolandTR909 -``` - -## Scales - -``` -major minor dorian mixolydian -minor:pentatonic major:pentatonic -``` diff --git a/website/src/repl/prebake.mjs b/website/src/repl/prebake.mjs index a534ba7c..5b31ff42 100644 --- a/website/src/repl/prebake.mjs +++ b/website/src/repl/prebake.mjs @@ -22,8 +22,65 @@ export async function prebake() { tag: 'drum-machines', }), samples(`./EmuSP12.json`, `./EmuSP12/`, { prebake: true, tag: 'drum-machines' }), + samples( + { + casio: ['casio/high.wav', 'casio/low.wav', 'casio/noise.wav'], + crow: ['crow/000_crow.wav', 'crow/001_crow2.wav', 'crow/002_crow3.wav', 'crow/003_crow4.wav'], + insect: [ + 'insect/000_everglades_conehead.wav', + 'insect/001_robust_shieldback.wav', + 'insect/002_seashore_meadow_katydid.wav', + ], + wind: [ + 'wind/000_wind1.wav', + 'wind/001_wind10.wav', + 'wind/002_wind2.wav', + 'wind/003_wind3.wav', + 'wind/004_wind4.wav', + 'wind/005_wind5.wav', + 'wind/006_wind6.wav', + 'wind/007_wind7.wav', + 'wind/008_wind8.wav', + 'wind/009_wind9.wav', + ], + jazz: [ + 'jazz/000_BD.wav', + 'jazz/001_CB.wav', + 'jazz/002_FX.wav', + 'jazz/003_HH.wav', + 'jazz/004_OH.wav', + 'jazz/005_P1.wav', + 'jazz/006_P2.wav', + 'jazz/007_SN.wav', + ], + metal: [ + 'metal/000_0.wav', + 'metal/001_1.wav', + 'metal/002_2.wav', + 'metal/003_3.wav', + 'metal/004_4.wav', + 'metal/005_5.wav', + 'metal/006_6.wav', + 'metal/007_7.wav', + 'metal/008_8.wav', + 'metal/009_9.wav', + ], + east: [ + 'east/000_nipon_wood_block.wav', + 'east/001_ohkawa_mute.wav', + 'east/002_ohkawa_open.wav', + 'east/003_shime_hi.wav', + 'east/004_shime_hi_2.wav', + 'east/005_shime_mute.wav', + 'east/006_taiko_1.wav', + 'east/007_taiko_2.wav', + 'east/008_taiko_3.wav', + ], + }, + 'github:tidalcycles/Dirt-Samples/master/', + ), ]); - await samples('github:tidalcycles/Dirt-Samples/master'); // TODO: remove + // await samples('github:tidalcycles/Dirt-Samples/master'); } const maxPan = noteToMidi('C8');