Release JSDrumpad v1.1 (#333)

Change rbj filters to svf for smooth interpolation
ReaTeam · Nov 25, 2023 · 16ddf15 · 16ddf15
1 parent 72270f4
commit 16ddf15
Show file tree

Hide file tree

Showing 4 changed files with 1,307 additions and 483 deletions.
diff --git a/Synth/tilr_JSDrumpad.jsfx b/Synth/tilr_JSDrumpad.jsfx
@@ -1,12 +1,13 @@
 desc: JSDrumpad
 author: tilr
-version: 1.0
+version: 1.1
+changelog: Change rbj filters to svf for smooth interpolation
 provides:
   tilr_JSDrumpad.jsfx.rpl
   tilr_JSDrumpad/dp.envlib.jsfx-inc
   tilr_JSDrumpad/dp.gfxlib.jsfx-inc
   tilr_JSDrumpad/dp.mouselib.jsfx-inc
-  tilr_JSDrumpad/dp.rbj_filter.jsfx-inc
+  tilr_JSDrumpad/dp.svf_filter.jsfx-inc
 screenshot: https://raw.githubusercontent.com/tiagolr/JSDrumpad/master/doc/ss.png
 about:
   # JSDrumpad
@@ -27,8 +28,8 @@ author: TiagoLr
 
 import dp.envlib.jsfx-inc
 import dp.mouselib.jsfx-inc
-import dp.rbj_filter.jsfx-inc
 import dp.gfxlib.jsfx-inc
+import dp.svf_filter.jsfx-inc
 
 slider1:mix=-1<-1, 1, .01>-Mix (Osc - Noise)
 slider2:vol=-12<-90, 0, .01>-Volume
@@ -55,16 +56,16 @@ slider19:noise_shape=0<-1, 1, 0.01>-Noise shape
 
 slider20:filter_shape=0<0,3,1{Low Pass, Band Pass, High Pass}>-Filter shape
 slider21:filter_freq=22050<20, 22050, 1:log>-Filter frequency
-slider22:filter_q=0.5<0.01, 100, 0.01:log>-Filter Q
+slider22:filter_q=0.70<0.01, 40, 0.01:log>-Filter Q
 slider23:filter_sel=0<1, 0, 1{Noise,Osc,Both}>-Filter target
 
 slider24:eq_freq=440<20, 22050, 1:log>-EQ frequency
 slider25:eq_gain=0<0, -18, 18>-EQ gain
-slider26:eq_q=0.5<0.01, 100, 0.01:log>-EQ Q
+slider26:eq_q=0.70<0.01, 40, 0.01:log>-EQ Q
 
 slider27:vel_vol=0<0, 1, 0.01>-Velocity volume
 
-options:gfx_hz=60;
+options:gfx_hz=60 no_meter
 
 @init
 
@@ -131,23 +132,6 @@ local (shape, att_shape, dec_shape)
   noise_envelope.zen_update(0, noise_att, noise_dec, -90, 0, att_shape, dec_shape, 1, 100, 0, 100);
 );
 
-function on_slider() (
-  tube = db2gain(distortion);
-  gain = db2gain(vol);
-  noise_lowpass.rbj_lp(noise_cutoff, 0.5);
-  filter_shape == 0 ? (
-    noise_filter.rbj_lp(filter_freq, filter_q);
-  );
-  filter_shape == 1 ? (
-    noise_filter.rbj_bp(filter_freq, filter_q);
-  );
-  filter_shape == 2 ? (
-    noise_filter.rbj_hp(filter_freq, filter_q);
-  );
-  eq.rbj_eq(eq_freq, eq_q, db2gain(eq_gain));
-  envelope_refresh();
-);
-
 // Parameter smoothing
 function rc_set(rc)
   instance(a) (
@@ -166,7 +150,7 @@ function smooth()
 tube.rc_set(0.0033);
 tube.smooth = db2gain(distortion);
 vel_mult.rc_set(0.0066);
-vel_mult.smooth = 0;
+vel_mult.smooth = 1;
 
 // Distortion
 function tanh(x) (
@@ -179,6 +163,28 @@ function amp(x) (
   tanh(this.smooth * x + dc) - tanh_dc;
 );
 
+//
+function on_slider() (
+  tube = db2gain(distortion);
+  gain = db2gain(vol);
+  noise_lowpass.svf_lp(noise_cutoff, 0.70, 12);
+  filter_shape == 0 ? (
+    noise_filter.svf_lp(filter_freq, filter_q, 1);
+  );
+  filter_shape == 1 ? (
+    noise_filter.svf_bp2(filter_freq, filter_q);
+  );
+  filter_shape == 2 ? (
+    noise_filter.svf_hp(filter_freq, filter_q, 1);
+  );
+  eq.svf_eq(eq_freq, eq_q, db2gain(eq_gain));
+  envelope_refresh();
+);
+
+noise_filter.svf_set_sample_rate(srate);
+noise_lowpass.svf_set_sample_rate(srate);
+eq.svf_set_sample_rate(srate);
+
 @slider
 
 on_slider();
@@ -204,6 +210,13 @@ while (midirecv(offset, msg1, note, vel)) (
 
 @sample
 
+last_play_state == 0 && play_state ? (
+  eq.svf_single_set_to_target();
+  noise_lowpass.svf_single_set_to_target();
+  noise_filter.svf_single_set_to_target();
+);
+last_play_state = play_state;
+
 note_on ? (
   note_counter += 1 / srate * 1000;
   note_counter > osc_att + osc_dec && note_counter > noise_att + noise_dec ? (
@@ -223,9 +236,11 @@ note_on ? (
   wave_r = wave_l;
   noise_l = make_noise() * noise_envelope.env;
   noise_r = noise_stereo ? make_noise() * noise_envelope.env : noise_l;
+
   noise_cutoff < 22000 ? (
-    noise_l = noise_lowpass.rbj_df1_0(noise_l);
-    noise_r = noise_lowpass.rbj_df1_1(noise_r);
+    noise_lowpass.svf_tick();
+    noise_l = noise_lowpass.svf_svf0(noise_l);
+    noise_r = noise_lowpass.svf_svf1(noise_r);
   );
 
   mix < 0 ? (
@@ -250,18 +265,20 @@ note_on ? (
   (filter_shape == 1) ||
   (filter_shape == 2 && filter_freq > 20) ?
   (
+    noise_filter.svf_tick();
+    mult = filter_shape == 1 ? filter_q : 1;
     filter_sel == 0 ? (
-      noise_l = noise_filter.rbj_df1_0(noise_l);
-      noise_r = noise_filter.rbj_df1_1(noise_r);
+      noise_l = noise_filter.svf_svf0(noise_l) * mult;
+      noise_r = noise_filter.svf_svf1(noise_r) * mult;
       1;
     );
     filter_sel == 1 ? (
-      wave_l = noise_filter.rbj_df1_0(wave_l);
-      wave_r = noise_filter.rbj_df1_1(wave_r);
+      wave_l = noise_filter.svf_svf0(wave_l) * mult;
+      wave_r = noise_filter.svf_svf1(wave_r) * mult;
     );
     filter_sel == 2 ? (
-      outl = noise_filter.rbj_df1_0(wave_l + noise_l);
-      outr = noise_filter.rbj_df1_1(wave_r + noise_r);
+      outl = noise_filter.svf_svf0(wave_l + noise_l) * mult;
+      outr = noise_filter.svf_svf1(wave_r + noise_r) * mult;
       signal_merged = 1;
     );
   );
@@ -271,14 +288,17 @@ note_on ? (
     outr = noise_r + wave_r;
   );
 
-  distortion > 0 ? (
+  distortion ? (
     tube.smooth();
     outl = tube.amp(outl);
     outr = tube.amp(outr);
   );
 
-  outl = eq.rbj_df1_0(outl);
-  outr = eq.rbj_df1_1(outr);
+  eq_gain ? (
+    eq.svf_tick();
+    outl = eq.svf_svf0(outl);
+    outr = eq.svf_svf1(outr);
+  );
 
   vel_mult = min(note_vel + (1 - vel_vol), 1);
   spl0 += outl * gain * vel_mult.smooth();
@@ -314,7 +334,7 @@ draw_button(220, 20, 40, shape_name, 0);
 mouse.left_click && mouse_in_rect(220, 20 - 2, 40, 10 + 2) ? (
   gfx_x = 220; gfx_y = 30;
   choice = gfx_showmenu("Sine|Triangle|Saw|Square");
-  slider(6) = max(choice - 1, 0);
+  choice > 0 ? slider(6) = choice - 1;
 );
 
 set_color(0x666666);
@@ -353,14 +373,14 @@ gfx_x = 560; gfx_y = 20;
 gfx_drawstr("FILTER");
 
 draw_knob(580, 40, 21, "Freq", 22050, 20, 22050, 1, 0, sprintf(#, "%i Hz", slider(21)));
-draw_knob(640, 40, 22, "Q", 0.5, 0.01, 100, 1, 0, sprintf(#, "%.2f", slider(22)));
+draw_knob(640, 40, 22, "Q", 0.70, 0.01, 40, 1, 0, sprintf(#, "%.2f", slider(22)));
 
 shape_name = filter_shape == 0 ? "LP" : filter_shape == 1 ? "BP" : "HP";
 draw_button(640, 20, 40, shape_name, 0);
 mouse.left_click && mouse_in_rect(640, 20 - 2, 40, 10 + 2) ? (
   gfx_x = 640; gfx_y = 30;
   choice = gfx_showmenu("LP|BP|HP");
-  slider(20) = max(choice - 1, 0);
+  choice > 0 ? slider(20) = choice - 1;
   on_slider();
 );
 
@@ -369,7 +389,7 @@ draw_button(630, 110, 50, filter_name, 0);
 mouse.left_click && mouse_in_rect(630, 110, 50, 10+2) ? (
   gfx_x = 630; gfx_y = 120;
   choice = gfx_showmenu("Filter noise|Filter osc|Filter both");
-  slider(23) = max(choice - 1, 0);
+  choice > 0 ? slider(23) = choice - 1;
 );
 
 set_color(0x666666);
@@ -384,7 +404,7 @@ gfx_drawstr("EQ");
 
 draw_knob(160, 200, 24, "Freq", 440, 20, 22050, 1, 0, sprintf(#, "%i Hz", slider(24)));
 draw_knob(220, 200, 25, "Gain", 0, -18, 18, 0, 1, sprintf(#, "%.2f Db", slider(25)));
-draw_knob(280, 200, 26, "Q", 0.5, 0.01, 100, 1, 0, sprintf(#, "%.2f", slider(26)));
+draw_knob(280, 200, 26, "Q", 0.70, 0.01, 40, 1, 0, sprintf(#, "%.2f", slider(26)));
 
 function on_knob_move (nslider, slider_min, slider_max, slider_is_log, factor) (
   factor *= mouse.control ? 0.05 : 1;

diff --git a/Synth/tilr_JSDrumpad.jsfx.rpl b/Synth/tilr_JSDrumpad.jsfx.rpl
@@ -15,45 +15,45 @@
   >
   <PRESET `RimShot`
     LTEgLTEyIDAgMTIuNDggNjYuNTk2Njk1IDMgMSAyNTQuMTU0NjM4IDEgMSAxIDcwIDAuNjQgMCAwIDM4MzEuODUwODI3IDE5LjA1NDYwNyA3MCAwIDIgNjM1LjkyODk0
-    NiAyLjYyNDAzNyAyIDEzOS4xNDAyMTcgLTkuMzYgMjYuMjQwMzczIDAgLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0g
-    LSAtIC0gLSAtIC0gLSAtIC0gLSBSaW1TaG90
+    NiAwLjY5MDE5MiAyIDEzOS4xNDAyMTcgLTkuMzYgMi41MDU5MzYgMCAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAt
+    IC0gLSAtIC0gLSAtIC0gLSAtIFJpbVNob3Q=
   >
   <PRESET `Clap`
-    MSAtNS43IDAgMCA2Ni41OTY2OTUgMyAxIDEyNy4zNzkwNiAxIDEgMSA3MCAwLjY0IDAgMSA2MDczLjA3NDI5MSAxIDEwMTEuODA3ODM0IDEgMSA2NjUuODk5MzU0IDAu
-    NSAyIDY5Ny4zNTMwMDQgNS40IDAuNSAwIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAt
-    IC0gQ2xhcA==
+    MSAtNS43IDAgMCA2Ni41OTY2OTUgMyAxIDEyNy4zNzkwNiAxIDEgMSA3MCAwLjY0IDAgMSAxMTU3Mi4wMDQ0OTkgMSAxMDExLjgwNzgzNCAxIDEgNjY1Ljg5OTM1NCAw
+    LjU3NDA3NyAyIDY5Ny4zNTMwMDQgNS40IDAuNSAwIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAt
+    IC0gLSAtIC0gQ2xhcA==
   >
   <PRESET `Clap2`
-    MCAtMjIuOCAwIDAgNTIuNjA1MzYgMyAxIDguNDE1ODUxIC0wLjE0IDEgMSAxOS4yNzk2MDEgMC42NCAwIDAgNjA3My4wNzQyOTEgMSA5NjYuMjY4OTgxIDEgMSAxMzI4
-    LjY0Mzg4NyA2LjAxMTMyMiAwIDY5Ny4zNTMwMDQgNS40IDAuNSAwIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0g
-    LSAtIC0gLSAtIC0gLSAtIC0gQ2xhcDI=
+    MCAtMjIuOCAwIDAgNTIuNjA1MzYgMyAxIDguNDE1ODUxIC0wLjE0IDEgMSAxOS4yNzk2MDEgMC42NCAwIDAgODc3OC4yNjMxMTEgMSAxMDU5LjQ5Mjg2OSAxIDEgMTM5
+    MS4yNjA5NDQgMS40NDIwMTYgMCA2OTcuMzUzMDA0IDQuNjggMC41IDAgLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0g
+    LSAtIC0gLSAtIC0gLSAtIC0gLSBDbGFwMg==
   >
   <PRESET `Clap3`
-    LTAuNDQgLTE5LjIgMCAxNi44IDQ0MC4wMDAwMDMgMiAxIDI5LjE4MDg1NyAxIDEgMSAxNi43OTE4MyAwIDAgMCA1Nzk5Ljc0MDkyMiAxMC45NjQ3ODIgNzAwIDEgMiAx
+    LTAuNDQgLTE5LjIgMCAxNi44IDQ0MC4wMDAwMDMgMiAxIDI5LjE4MDg1NyAxIDEgMSAxNi43OTE4MyAwIDAgMCA5NjI1LjE3NDEwMSAxMC45NjQ3ODIgNzAwIDEgMiAx
     NTk3LjM4MTI5MiAxLjM3NzExNCAwIDM0OS41MDQ0MjMgOS43MiAwLjUgMCAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0g
     LSAtIC0gLSAtIC0gLSAtIC0gLSAtIENsYXAz
   >
   <PRESET `Snare`
-    LTAuMzggLTEyLjkgMCAxNi44IDQ0MC4wMDAwMDMgMiAxIDI5LjE4MDg1NyAxIDEgMSAxNi43OTE4MyAwIDAgMCA1Nzk5Ljc0MDkyMiAxIDIxMTMuOTY2MjA0IDEgMiAx
-    NTk3LjM4MTI5MiAxLjM3NzExNCAwIDM0OS41MDQ0MjMgMC4zNiAwLjUgMCAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0g
-    LSAtIC0gLSAtIC0gLSAtIC0gLSAtIFNuYXJl
+    LTAuMzggLTEyLjkgMCAxNi44IDQ0MC4wMDAwMDMgMiAxIDI5LjE4MDg1NyAxIDEgMSAxNi43OTE4MyAwIDAgMCA3MzAxLjQ0MTIyOSAxIDIxMTMuOTY2MjA0IDEgMiA5
+    MTkuMTk2OTkxIDEuMzc3MTE0IDAgMzQ5LjUwNDQyMyAwLjM2IDAuNSAwIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAt
+    IC0gLSAtIC0gLSAtIC0gLSAtIC0gU25hcmU=
   >
   <PRESET `Snare2`
-    MSAtMzMuNiAwIDUuNzYgNDQwIDAgMSA3MCAwIDAgMSA3MCAwIDAgMSA4Nzc4LjI2MzExMSAxIDUwMDAgMSAyIDkxOS4xOTY5OTEgMy40NTkxNTUgMCAxNTk3LjU0MzQ0
-    MSAxMi45NiAwLjUgMCAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIFNuYXJlMg==
+    MSAtMzMuNiAwIDUuNzYgNDQwIDAgMSA3MCAwIDAgMSA3MCAwIDAgMSAxMDU1My43OTM1MzYgMSA1MDAwIDEgMiA5MTkuMTk2OTkxIDMuNDU5MTU1IDAgMTU5Ny41NDM0
+    NDEgMTIuOTYgMC41IDAgLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSBTbmFyZTI=
   >
   <PRESET `HatClosed`
     MSAtMTIgMCAwIDQ0MCAwIDEgNzAgMCAwIDEgNzAgMCAwIDAgMjIwNTAgMSAyOTEuODA4NTcgMSAyIDEwNTUuMzc5MzU0IDAuNSAwIDM4MzIuMjM5Nzk2IDAgMC41IDAg
     LSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSBIYXRDbG9zZWQ=
   >
   <PRESET `HatClosed2`
-    LTAuMyAtMTYuNSAwIDAgMTgzLjQyMjUyOSAyIDEgMTkuMjc5NjAxIC0xIDEgMSA0NC4xNjcwMTQgMC42NCAwIDAgMzY1OS4zODkxMzEgMjMuOTg4MzI5IDExMC45NDI1
-    MjMgMC43IDIgNTUzOC43MDk1NzggMi42MjQwMzcgMiA0MjAuMTk2NzM4IC05LjM2IDI2LjI0MDM3MyAwIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAt
-    IC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gSGF0Q2xvc2VkMg==
+    LTAuMyAtMTYuNSAwIDAgMTgzLjQyMjUyOSAyIDEgMTkuMjc5NjAxIC0xIDEgMSA0NC4xNjcwMTQgMC42NCAwIDAgMTAwNzguNzk0NTgyIDIzLjk4ODMyOSAxMTAuOTQy
+    NTIzIDAuNyAyIDU1MzguNzA5NTc4IDIuNjI0MDM3IDIgNDIwLjE5NjczOCAtOS4zNiAyNi4yNDAzNzMgMCAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0g
+    LSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIEhhdENsb3NlZDI=
   >
   <PRESET `HatOpen`
-    MSAtMTYuNSAwIDAgNDQwIDAgMSA3MCAwIDAgMSA3MCAwIDAgMCAyMjA1MCAxIDUwNy4xMDUxNzQgMC43MiAxIDQzOTkuNTUzNDA1IDMuMzAzNDY3IDAgMzgzMi4yMzk3
-    OTYgMCAwLjUgMCAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIEhhdE9wZW4=
+    MSAtMTYuNSAwIDAgNDQwIDAgMSA3MCAwIDAgMSA3MCAwIDAgMCAyMjA1MCAxIDUwNy4xMDUxNzQgMC43MiAxIDQzOTkuNTUzNDA1IDE0LjQyMDE1NiAwIDM4MzIuMjM5
+    Nzk2IDAgMC41IDAgLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSAtIC0gLSBIYXRPcGVu
   >
   <PRESET `Tom`
     LTEgLTEyIDAgMCA2Ni41OTY2OTUgMCAxMCAxMTA5LjQyNTIzNSAwLjY4IDAuMjIgMSAyMi4xMzU5NDQgMCAxIDAgMjIwNTAgMSA3MCAwIDAgMjIwNTAgMC41IDAgNDQw