dan
/
TIC-80-guile
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

#732 stereo works in the Instruments

This commit is contained in:
nesbox 2018-09-18 17:47:35 +03:00
parent aa8d2e3856
commit 50e12a53b0
3 changed files with 71 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/sfx.c
View File

@ -123,6 +123,43 @@ static void setSpeed(Sfx* sfx, s32 delta)
history_add(sfx->history); history_add(sfx->history);
} }
static void drawStereoSwitch(Sfx* sfx, s32 x, s32 y)
{
tic_sample* effect = getEffect(sfx);
{
tic_rect rect = {x, y, TIC_FONT_WIDTH, TIC_FONT_HEIGHT};
if(checkMousePos(&rect))
{
setCursor(tic_cursor_hand);
showTooltip("left stereo");
if(checkMouseClick(&rect, tic_mouse_left))
effect->stereo_left = !effect->stereo_left;
}
sfx->tic->api.text(sfx->tic, "L", x, y, effect->stereo_left ? tic_color_dark_gray : tic_color_white, false);
}
{
tic_rect rect = {x += TIC_FONT_WIDTH, y, TIC_FONT_WIDTH, TIC_FONT_HEIGHT};
if(checkMousePos(&rect))
{
setCursor(tic_cursor_hand);
showTooltip("right stereo");
if(checkMouseClick(&rect, tic_mouse_left))
effect->stereo_right = !effect->stereo_right;
}
sfx->tic->api.text(sfx->tic, "R", x, y, effect->stereo_right ? tic_color_dark_gray : tic_color_white, false);
}
}
static void drawTopPanel(Sfx* sfx, s32 x, s32 y) static void drawTopPanel(Sfx* sfx, s32 x, s32 y)
{ {
const s32 Gap = 8*TIC_FONT_WIDTH; const s32 Gap = 8*TIC_FONT_WIDTH;
@ -132,6 +169,8 @@ static void drawTopPanel(Sfx* sfx, s32 x, s32 y)
tic_sample* effect = getEffect(sfx); tic_sample* effect = getEffect(sfx);
drawSwitch(sfx, x += Gap, y, "SPD", effect->speed, setSpeed); drawSwitch(sfx, x += Gap, y, "SPD", effect->speed, setSpeed);
drawStereoSwitch(sfx, x += Gap, y);
} }
static void setLoopStart(Sfx* sfx, s32 delta) static void setLoopStart(Sfx* sfx, s32 delta)
@ -825,11 +864,11 @@ static void envelopesTick(Sfx* sfx)
enum{ Gap = 3, Start = 40}; enum{ Gap = 3, Start = 40};
drawPiano(sfx, Start, TIC80_HEIGHT - PIANO_HEIGHT - Gap); drawPiano(sfx, Start, TIC80_HEIGHT - PIANO_HEIGHT - Gap);
drawTopPanel(sfx, Start, TOOLBAR_SIZE + Gap);
drawSfxToolbar(sfx); drawSfxToolbar(sfx);
drawToolbar(sfx->tic, TIC_COLOR_BG, false); drawToolbar(sfx->tic, TIC_COLOR_BG, false);
drawTopPanel(sfx, Start, TOOLBAR_SIZE + Gap);
drawCanvasTabs(sfx, Start-Gap, TOOLBAR_SIZE + Gap + TIC_FONT_HEIGHT+2); drawCanvasTabs(sfx, Start-Gap, TOOLBAR_SIZE + Gap + TIC_FONT_HEIGHT+2);
if(sfx->canvasTab == SFX_WAVE_TAB) if(sfx->canvasTab == SFX_WAVE_TAB)
drawWaveButtons(sfx, Start + CANVAS_WIDTH + Gap-1, TOOLBAR_SIZE + Gap + TIC_FONT_HEIGHT+2); drawWaveButtons(sfx, Start + CANVAS_WIDTH + Gap-1, TOOLBAR_SIZE + Gap + TIC_FONT_HEIGHT+2);

31
src/tic.c
View File

@ -120,7 +120,7 @@ static inline s32 getAmp(const tic_sound_register* reg, s32 amp)
return amp * MaxAmp * reg->volume / MAX_VOLUME; return amp * MaxAmp * reg->volume / MAX_VOLUME;
} }
static void runEnvelope(blip_buffer_t* blip, tic_sound_register* reg, tic_sound_register_data* data, s32 end_time, bool mute) static void runEnvelope(blip_buffer_t* blip, tic_sound_register* reg, tic_sound_register_data* data, s32 end_time, u8 masterVolume)
{ {
s32 period = freq2period(reg->freq * ENVELOPE_FREQ_SCALE); s32 period = freq2period(reg->freq * ENVELOPE_FREQ_SCALE);
@ -128,11 +128,11 @@ static void runEnvelope(blip_buffer_t* blip, tic_sound_register* reg, tic_sound_
{ {
data->phase = (data->phase + 1) % ENVELOPE_VALUES; data->phase = (data->phase + 1) % ENVELOPE_VALUES;
update_amp(blip, data, mute ? 0 : getAmp(reg, tic_tool_peek4(reg->waveform.data, data->phase))); update_amp(blip, data, getAmp(reg, tic_tool_peek4(reg->waveform.data, data->phase) * masterVolume / MAX_VOLUME));
} }
} }
static void runNoise(blip_buffer_t* blip, tic_sound_register* reg, tic_sound_register_data* data, s32 end_time, bool mute) static void runNoise(blip_buffer_t* blip, tic_sound_register* reg, tic_sound_register_data* data, s32 end_time, u8 masterVolume)
{ {
// phase is noise LFSR, which must never be zero // phase is noise LFSR, which must never be zero
if ( data->phase == 0 ) if ( data->phase == 0 )
@ -143,7 +143,7 @@ static void runNoise(blip_buffer_t* blip, tic_sound_register* reg, tic_sound_reg
for ( ; data->time < end_time; data->time += period ) for ( ; data->time < end_time; data->time += period )
{ {
data->phase = ((data->phase & 1) * (0b11 << 13)) ^ (data->phase >> 1); data->phase = ((data->phase & 1) * (0b11 << 13)) ^ (data->phase >> 1);
update_amp(blip, data, mute ? 0 : getAmp(reg, (data->phase & 1) ? MAX_VOLUME : 0)); update_amp(blip, data, getAmp(reg, (data->phase & 1) ? masterVolume : 0));
} }
} }
@ -1170,7 +1170,7 @@ static s32 calcLoopPos(const tic_sound_loop* loop, s32 pos)
return offset; return offset;
} }
static void sfx(tic_mem* memory, s32 index, s32 freq, Channel* channel, tic_sound_register* reg) static void sfx(tic_mem* memory, s32 index, s32 freq, Channel* channel, tic_sound_register* reg, s32 channelIndex)
{ {
tic_machine* machine = (tic_machine*)memory; tic_machine* machine = (tic_machine*)memory;
@ -1213,6 +1213,9 @@ static void sfx(tic_mem* memory, s32 index, s32 freq, Channel* channel, tic_soun
u8 wave = effect->data[channel->pos.wave].wave; u8 wave = effect->data[channel->pos.wave].wave;
const tic_waveform* waveform = &machine->sound.sfx->waveform.envelopes[wave]; const tic_waveform* waveform = &machine->sound.sfx->waveform.envelopes[wave];
memcpy(reg->waveform.data, waveform->data, sizeof(tic_waveform)); memcpy(reg->waveform.data, waveform->data, sizeof(tic_waveform));
tic_tool_poke4(&memory->ram.stereo.data, channelIndex*2, MAX_VOLUME * effect->stereo_left);
tic_tool_poke4(&memory->ram.stereo.data, channelIndex*2+1, MAX_VOLUME * effect->stereo_right);
} }
} }
@ -1307,7 +1310,7 @@ static void processMusic(tic_mem* memory)
Channel* c = &machine->state.music.channels[i]; Channel* c = &machine->state.music.channels[i];
if(c->index >= 0) if(c->index >= 0)
sfx(memory, c->index, c->freq, c, &memory->ram.registers[i]); sfx(memory, c->index, c->freq, c, &memory->ram.registers[i], i);
} }
machine->state.music.ticks++; machine->state.music.ticks++;
@ -1339,7 +1342,7 @@ static void api_tick_start(tic_mem* memory, const tic_sfx* sfxsrc, const tic_mus
for (s32 i = 0; i < TIC_SOUND_CHANNELS; ++i ) for (s32 i = 0; i < TIC_SOUND_CHANNELS; ++i )
memset(&memory->ram.registers[i], 0, sizeof(tic_sound_register)); memset(&memory->ram.registers[i], 0, sizeof(tic_sound_register));
memory->ram.panning.data = 0; memory->ram.stereo.data = 0;
processMusic(memory); processMusic(memory);
@ -1348,7 +1351,7 @@ static void api_tick_start(tic_mem* memory, const tic_sfx* sfxsrc, const tic_mus
Channel* c = &machine->state.channels[i]; Channel* c = &machine->state.channels[i];
if(c->index >= 0) if(c->index >= 0)
sfx(memory, c->index, c->freq, c, &memory->ram.registers[i]); sfx(memory, c->index, c->freq, c, &memory->ram.registers[i], i);
} }
// process gamepad // process gamepad
@ -1381,19 +1384,19 @@ static void api_tick_start(tic_mem* memory, const tic_sfx* sfxsrc, const tic_mus
machine->state.drawhline = drawHLineDma; machine->state.drawhline = drawHLineDma;
} }
static void stereo_tick_end(tic_mem* memory, tic_sound_register_data* registers, blip_buffer_t* blip, u8 panningStart) static void stereo_tick_end(tic_mem* memory, tic_sound_register_data* registers, blip_buffer_t* blip, u8 stereoRight)
{ {
enum {EndTime = CLOCKRATE / TIC_FRAMERATE}; enum {EndTime = CLOCKRATE / TIC_FRAMERATE};
for (s32 i = 0; i < TIC_SOUND_CHANNELS; ++i ) for (s32 i = 0; i < TIC_SOUND_CHANNELS; ++i )
{ {
bool mute = memory->ram.panning.data & (panningStart << (i << 1)) ? true : false; u8 masterVol = MAX_VOLUME - tic_tool_peek4(&memory->ram.stereo.data, stereoRight + i*2);
tic_sound_register* reg = &memory->ram.registers[i]; tic_sound_register* reg = &memory->ram.registers[i];
tic_sound_register_data* data = registers + i; tic_sound_register_data* data = registers + i;
isNoiseWaveform(&reg->waveform) isNoiseWaveform(&reg->waveform)
? runNoise(blip, reg, data, EndTime, mute) ? runNoise(blip, reg, data, EndTime, masterVol)
: runEnvelope(blip, reg, data, EndTime, mute); : runEnvelope(blip, reg, data, EndTime, masterVol);
data->time -= EndTime; data->time -= EndTime;
} }
@ -1408,8 +1411,8 @@ static void api_tick_end(tic_mem* memory)
machine->state.gamepads.previous.data = machine->memory.ram.input.gamepads.data; machine->state.gamepads.previous.data = machine->memory.ram.input.gamepads.data;
machine->state.keyboard.previous.data = machine->memory.ram.input.keyboard.data; machine->state.keyboard.previous.data = machine->memory.ram.input.keyboard.data;
stereo_tick_end(memory, machine->state.registers.left, machine->blip.left, 1); stereo_tick_end(memory, machine->state.registers.left, machine->blip.left, 0);
stereo_tick_end(memory, machine->state.registers.right, machine->blip.right, 2); stereo_tick_end(memory, machine->state.registers.right, machine->blip.right, 1);
blip_read_samples(machine->blip.left, machine->memory.samples.buffer, machine->samplerate / TIC_FRAMERATE, TIC_STEREO_CHANNLES); blip_read_samples(machine->blip.left, machine->memory.samples.buffer, machine->samplerate / TIC_FRAMERATE, TIC_STEREO_CHANNLES);
blip_read_samples(machine->blip.right, machine->memory.samples.buffer + 1, machine->samplerate / TIC_FRAMERATE, TIC_STEREO_CHANNLES); blip_read_samples(machine->blip.right, machine->memory.samples.buffer + 1, machine->samplerate / TIC_FRAMERATE, TIC_STEREO_CHANNLES);

27
src/tic.h
View File

@ -186,7 +186,8 @@ typedef struct
s8 speed:3; s8 speed:3;
u8 reverse:1; // arpeggio reverse u8 reverse:1; // arpeggio reverse
u8 note:4; u8 note:4;
u8 panning:2; // 00 - center, 01 - left, 10 - right, 11 - mute u8 stereo_left:1;
u8 stereo_right:1;
u8 temp:2; u8 temp:2;
}; };
@ -296,21 +297,21 @@ typedef union
{ {
struct struct
{ {
u8 l1:1; u8 left1:4;
u8 r1:1; u8 right1:4;
u8 l2:1; u8 left2:4;
u8 r2:1; u8 right2:4;
u8 l3:1; u8 left3:4;
u8 r3:1; u8 right3:4;
u8 l4:1; u8 left4:4;
u8 r4:1; u8 right4:4;
}; };
u8 data; u32 data;
} tic_sound_panning; } tic_stereo_volume;
typedef struct typedef struct
{ {
@ -450,8 +451,8 @@ typedef union
tic_tiles sprites; tic_tiles sprites;
tic_map map; tic_map map;
tic80_input input; tic80_input input;
u8 unknown[15]; u8 unknown[12];
tic_sound_panning panning; tic_stereo_volume stereo;
tic_sound_register registers[TIC_SOUND_CHANNELS]; tic_sound_register registers[TIC_SOUND_CHANNELS];
tic_sfx sfx; tic_sfx sfx;
tic_music music; tic_music music;