From 3eac07eea47a5b89ac0b6cc76c47b19a51eeb16f Mon Sep 17 00:00:00 2001 From: Michael Gogins Date: Tue, 21 Apr 2020 22:11:24 -0400 Subject: [PATCH] Trying to rationalize and fill out Scrims (#133). --- WebAssembly/examples/scrims-v2.html | 975 ++++++++++++++++++++++++++++ silencio/patches/BarModel.inc | 6 +- silencio/patches/FMModerate2.inc | 12 +- silencio/patches/Sweeper.inc | 4 +- 4 files changed, 988 insertions(+), 9 deletions(-) create mode 100644 WebAssembly/examples/scrims-v2.html diff --git a/WebAssembly/examples/scrims-v2.html b/WebAssembly/examples/scrims-v2.html new file mode 100644 index 0000000000..b0b590abee --- /dev/null +++ b/WebAssembly/examples/scrims-v2.html @@ -0,0 +1,975 @@ + + + + Scrims-v2 + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Scrims v2, for Csound+HTML5Michael Gogins
Time:0
Subset:
Point:
X:
Y:
Chord:
Notes:
+ + + + + diff --git a/silencio/patches/BarModel.inc b/silencio/patches/BarModel.inc index 961b2c6ebd..f1612ce498 100644 --- a/silencio/patches/BarModel.inc +++ b/silencio/patches/BarModel.inc @@ -2,14 +2,14 @@ gk_BarModel_midi_dynamic_range init 127 gk_BarModel_level init 0 gk_BarModel_kbcL init 1 gk_BarModel_kbcR init 1 -gi_BarModel_iK init 0 -3 +gi_BarModel_iK init 0 gi_BarModel_ib init .001 gk_BarModel_kscan init .23 gi_BarModel_iT30 init 5 gi_BarModel_ipos init 0.3 gi_BarModel_ivel init 1000 gi_BarModel_iwid init 0.05 -gi_BarModel_sine ftgen 0, 0, 65536, 10, 1, 0, 1 +gi_BarModel_sine ftgen 0, 0, 65537, 10, 1, 0, 1 instr BarModel i_instrument = p1 i_time = p2 @@ -23,7 +23,7 @@ k_space_bottom_to_top = p8 i_phase = p9 i_frequency = cpsmidinn(i_midi_key) ; Adjust the following value until "overall amps" at the end of performance is about -6 dB. -i_level_correction = 84.75 +i_level_correction = 120 i_normalization = ampdb(-i_level_correction) / 2 i_amplitude = ampdb(i_midi_velocity) * i_normalization k_gain = ampdb(gk_BarModel_level) diff --git a/silencio/patches/FMModerate2.inc b/silencio/patches/FMModerate2.inc index 26a241fd59..1d011ee8eb 100644 --- a/silencio/patches/FMModerate2.inc +++ b/silencio/patches/FMModerate2.inc @@ -1,4 +1,8 @@ gk_FMModerate2_level init 0 +gi_FMModerate2_carrier init 1 +gi_FMModerate2_modulator init 4 +gi_FMModerate2_fmamplitude init 9 +gi_FMModerate2_index init 2 instr FMModerate2 ; Author: Michael Gogins i_instrument = p1 @@ -20,10 +24,10 @@ isustain = p3 idecay = 1.5 irelease = 0.05 xtratim iattack + irelease -icarrier = 1 -imodulator = 4 -ifmamplitude = 9 -index = 2 +icarrier = gi_FMModerate2_carrier +imodulator = gi_FMModerate2_modulator +ifmamplitude = gi_FMModerate2_fmamplitude +index = gi_FMModerate2_index ifrequencyb = i_frequency * 1.003 icarrierb = icarrier * 1.004 aindenv transegr 0.0, iattack, -8.0, 1.0, idecay, -8.0, 0.025, isustain, 0.0, 0.025, irelease, 7.0, 0.0 diff --git a/silencio/patches/Sweeper.inc b/silencio/patches/Sweeper.inc index 8680a8818d..1fc8dbb703 100644 --- a/silencio/patches/Sweeper.inc +++ b/silencio/patches/Sweeper.inc @@ -6,8 +6,8 @@ gk_Sweeper_briteh init 2.9 gk_Sweeper_britels init 2 gk_Sweeper_britehs init 1 gk_Sweeper_level init 0 -gi_Sweeper_sine ftgen 0, 0, 65536, 10, 1 -gi_Sweeper_octfn ftgen 0, 0, 65536, -19, 1, 0.5, 270, 0.5 +gi_Sweeper_sine ftgen 0, 0, 65537, 10, 1 +gi_Sweeper_octfn ftgen 0, 0, 65537, -19, 1, 0.5, 270, 0.5 instr Sweeper ////////////////////////////////////////////// // Original by Iain McCurdy.