veclavtalica/stfu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

windows build, separation of synth code, 3-op now, modulator feedback

Browse Source
This commit is contained in:
veclavtalica
2024-06-24 10:58:31 +03:00
parent ce5cfdd95b
commit 561dece028
11 changed files with 139 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Source/Maker/Build/stfu-maker.exe Normal file
View File

Binary file not shown.

1
Source/Maker/Build/windows-clang.bat Normal file
View File

@ -0,0 +1 @@
clang ../main.c -lkernel32 -luser32 -lshell32 -ld3d11 -ldxgi -lgdi32 -lole32 -DSOKOL_D3D11 -o stfu-maker.exe -O3

86
Source/Maker/main.c
View File

@ -3,45 +3,27 @@
#include <string.h>
#define SOKOL_IMPL
#define SOKOL_GLCORE
#include "sokol_app.h"
#include "sokol_audio.h"
#include "sokol_log.h"
#define STFU_MAIN
#include "../config.h"
#include "../envelope.c"
// #include "../interp.c"
#include "../oscillators.c"
#include "../phaser.c"
static struct stfu_sinewave sine0;
static struct stfu_phaser phaser0;
static struct stfu_phaser phaser1;
static struct stfu_phaser phaser2;
static struct stfu_envelope envelope;
#include "../Instruments/Trojka/trojka.c"
static float key_frequency = STFU_C4_FREQUENCY;
static struct stfu_trojka synth = {0};
// todo: Separate to playback.c, generic for Player and Maker
#define CROSSFADE_RING_RANGE \
(STFU_CROSSFADE_BUFFER_FRAMES * STFU_AUDIO_CHANNEL_COUNT)
static float crossfade_ring[CROSSFADE_RING_RANGE] = {0};
static size_t crossfade_ring_needle = 0;
static unsigned int crossfade_frames_left = 0;
static void sample(float buffer[static 2]) {
phaser0 = stfu_pump_phaser(phaser0);
phaser1 = stfu_pump_phaser(phaser1);
phaser2 = stfu_pump_phaser(phaser2);
envelope = stfu_pump_envelope(envelope);
float left = envelope.v * sinf(phaser2.v + sinf(phaser0.v + sinf(phaser1.v)));
float right =
envelope.v * sinf(phaser2.v + sinf(phaser0.v + sinf(phaser1.v)));
buffer[0] = left;
buffer[1] = right;
}
static void stream(float *buffer, int num_frames, int num_channels) {
/* Fade away */
for (size_t i = 0; crossfade_frames_left > 0;
@ -58,7 +40,7 @@ static void stream(float *buffer, int num_frames, int num_channels) {
buffer[0] = crossfade_ring[crossfade_ring_needle % CROSSFADE_RING_RANGE];
buffer[1] =
crossfade_ring[(crossfade_ring_needle + 1) % CROSSFADE_RING_RANGE];
sample(&crossfade_ring[crossfade_ring_needle % CROSSFADE_RING_RANGE]);
synth = stfu_sample_trojka(synth, &crossfade_ring[crossfade_ring_needle % CROSSFADE_RING_RANGE]);
buffer = &buffer[2];
crossfade_ring_needle += 2;
}
@ -71,15 +53,19 @@ static void init(void) {
// .stream_cb = stream,
});
// sine0 = stfu_init_sinewave(STFU_A4_FREQUENCY / 2.0f, 0.0f, 0.8f);
phaser0 = stfu_init_phaser(key_frequency);
phaser1 = stfu_init_phaser(key_frequency * 0.25);
phaser2 = stfu_init_phaser(key_frequency * 2.0);
envelope = stfu_init_envelope(
(struct stfu_envelope_point[]){[0] = {.dur = 0.02, .vol = 1.0},
[1] = {.dur = 0.5, .vol = 0.33},
[2] = {.dur = 1.0, .vol = 0}},
3);
synth.phasers[0] = stfu_init_phaser(220);
synth.phasers[1] = stfu_init_phaser(220 * 0.25);
synth.phasers[2] = stfu_init_phaser(220 * 2.0);
synth.feedback_gain = 0.25;
for (int i = 0; i < STFU_TROJKA_OP_COUNT; ++i) {
synth.envelopes[i] = stfu_init_envelope(
(struct stfu_envelope_point[]){[0] = {.dur = 0.02, .vol = 1.0},
[1] = {.dur = 0.5, .vol = 0.33},
[2] = {.dur = 1.0, .vol = 0}},
3);
synth.gains[i] = 1.0;
synth.freq_scales[i] = 1.0;
}
}
static void cleanup(void) { saudio_shutdown(); }
@ -92,53 +78,38 @@ static void event(const sapp_event *e) {
switch (e->key_code) {
case SAPP_KEYCODE_Z:
key_frequency = STFU_C4_FREQUENCY;
break;
synth = stfu_press_trojka(synth, STFU_SCALE[0]);
case SAPP_KEYCODE_X:
key_frequency = STFU_C4_FREQUENCY * STFU_NOTE_UPSCALE_FACTOR;
synth = stfu_press_trojka(synth, STFU_SCALE[1]);
break;
case SAPP_KEYCODE_C:
key_frequency = STFU_C4_FREQUENCY * STFU_NOTE_UPSCALE_FACTOR *
STFU_NOTE_UPSCALE_FACTOR;
synth = stfu_press_trojka(synth, STFU_SCALE[2]);
break;
case SAPP_KEYCODE_V:
key_frequency = STFU_C4_FREQUENCY * STFU_NOTE_UPSCALE_FACTOR *
STFU_NOTE_UPSCALE_FACTOR * STFU_NOTE_UPSCALE_FACTOR;
synth = stfu_press_trojka(synth, STFU_SCALE[3]);
break;
case SAPP_KEYCODE_B:
key_frequency = STFU_C4_FREQUENCY * STFU_NOTE_UPSCALE_FACTOR *
STFU_NOTE_UPSCALE_FACTOR * STFU_NOTE_UPSCALE_FACTOR *
STFU_NOTE_UPSCALE_FACTOR;
synth = stfu_press_trojka(synth, STFU_SCALE[4]);
break;
case SAPP_KEYCODE_N:
key_frequency = STFU_A4_FREQUENCY * STFU_NOTE_DOWNSCALE_FACTOR *
STFU_NOTE_DOWNSCALE_FACTOR * STFU_NOTE_DOWNSCALE_FACTOR *
STFU_NOTE_DOWNSCALE_FACTOR;
synth = stfu_press_trojka(synth, STFU_SCALE[5]);
break;
case SAPP_KEYCODE_M:
key_frequency = STFU_A4_FREQUENCY * STFU_NOTE_DOWNSCALE_FACTOR *
STFU_NOTE_DOWNSCALE_FACTOR * STFU_NOTE_DOWNSCALE_FACTOR;
synth = stfu_press_trojka(synth, STFU_SCALE[6]);
break;
case SAPP_KEYCODE_COMMA:
key_frequency = STFU_A4_FREQUENCY * STFU_NOTE_DOWNSCALE_FACTOR *
STFU_NOTE_DOWNSCALE_FACTOR;
synth = stfu_press_trojka(synth, STFU_SCALE[7]);
break;
case SAPP_KEYCODE_PERIOD:
key_frequency = STFU_A4_FREQUENCY * STFU_NOTE_DOWNSCALE_FACTOR;
synth = stfu_press_trojka(synth, STFU_SCALE[8]);
break;
case SAPP_KEYCODE_SLASH:
key_frequency = STFU_A4_FREQUENCY;
synth = stfu_press_trojka(synth, STFU_SCALE[9]);
break;
default:
break;
}
phaser0 = stfu_set_phaser_frequency(phaser0, key_frequency);
phaser1 = stfu_set_phaser_frequency(phaser1, key_frequency * 0.25);
phaser2 = stfu_set_phaser_frequency(phaser2, key_frequency * 2.0);
envelope = stfu_trigger_envelope(envelope);
crossfade_frames_left = STFU_CROSSFADE_BUFFER_FRAMES;
break;
}
default:
@ -172,5 +143,6 @@ sapp_desc sokol_main(int argc, char *argv[]) {
.gl_major_version = 2,
.gl_minor_version = 0,
// .swap_interval = 0,
.window_title = "stfu-maker",
};
}