From deb9c48fbd3dc5854de4ae3a04dc999029c10ae0 Mon Sep 17 00:00:00 2001 From: Bad Diode Date: Sat, 22 Apr 2023 21:12:14 +0200 Subject: Add new renderer and prepare for render overhaul --- src/sequencer.c | 94 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 47 insertions(+), 47 deletions(-) (limited to 'src/sequencer.c') diff --git a/src/sequencer.c b/src/sequencer.c index b582cf4..ff3904d 100644 --- a/src/sequencer.c +++ b/src/sequencer.c @@ -527,9 +527,9 @@ draw_channels(void) { } u8 clr = active ? COL_FG : COL_GREY; size_t y = CHAN_START_Y + i * CHAN_OFFSET_Y; - draw_tile(CHAN_START_X, y, channel_tiles + k++, clr, false); - draw_tile(CHAN_START_X + 8, y, channel_tiles + k++, clr, false); - draw_tile(CHAN_START_X + 16, y, channel_tiles + k++, clr, false); + // draw_tile(CHAN_START_X, y, channel_tiles + k++, clr, false); + // draw_tile(CHAN_START_X + 8, y, channel_tiles + k++, clr, false); + // draw_tile(CHAN_START_X + 16, y, channel_tiles + k++, clr, false); } } @@ -582,8 +582,8 @@ draw_trigger(size_t chan, size_t i) { size_t y = TRIG_START_Y + offset_y; Tile *tiles = ASSETS_NOTE_NAMES; tiles += 2 * trig.note; - draw_tile(x, y, tiles, COL_FG, true); - draw_tile(x + 8, y, tiles + 1, COL_FG, true); + // draw_tile(x, y, tiles, COL_FG, true); + // draw_tile(x + 8, y, tiles + 1, COL_FG, true); } else { clear_trigger(i); } @@ -658,7 +658,7 @@ void draw_bank_buttons() { size_t x = BANK_START_X; size_t y = BANK_START_Y; - txt_drawf_small("BANK", x - 2, y - 10, 4, COL_FG); + // txt_drawf_small("BANK", x - 2, y - 10, 4, COL_FG); char bank_names[] = { 'A', 'B', 'C', 'D', }; @@ -669,7 +669,7 @@ draw_bank_buttons() { } draw_filled_rect(x, y, x + PAT_W, y + PAT_H, COL_BG); draw_rect(x, y, x + PAT_W, y + PAT_H, color); - txt_drawc(bank_names[i], x + 4, y + 2, 6, color); + // txt_drawc(bank_names[i], x + 4, y + 2, 6, color); y += PAT_OFFSET_Y; } } @@ -678,7 +678,7 @@ void draw_pattern_buttons() { size_t x = PAT_START_X; size_t y = PAT_START_Y; - txt_drawf_small("PAT", x, y - 10, 4, COL_FG); + // txt_drawf_small("PAT", x, y - 10, 4, COL_FG); char pat_names[] = { 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', @@ -693,7 +693,7 @@ draw_pattern_buttons() { } draw_filled_rect(x, y, x + PAT_W, y + PAT_H, COL_BG); draw_rect(x, y, x + PAT_W, y + PAT_H, color); - txt_drawc(pat_names[i], x + 4, y + 2, 6, color); + // txt_drawc(pat_names[i], x + 4, y + 2, 6, color); y += PAT_OFFSET_Y; } } @@ -745,7 +745,7 @@ draw_bpm() { draw_filled_rect(x, y, x + R_COL_W, y + BPM_H, COL_BG); draw_rect(x, y, x + R_COL_W, y + BPM_H, COL_FG); draw_line(x + 5, y, x + 19, y, COL_BG); - txt_drawf_small("BPM", x + 5, y - 4, 4, COL_FG); + // txt_drawf_small("BPM", x + 5, y - 4, 4, COL_FG); // Make sure its horizontally centered if only 2 digits int bpm = patterns[pattern_selection_loc].bpm; @@ -1069,24 +1069,24 @@ draw_parameters_wave(void) { // Wave text. x -= 2; - txt_drawf_small("%02x%02x%02x%02x", x, y + 20, 4, COL_FG, - wave_a[0], wave_a[1], wave_a[2], wave_a[3]); - txt_drawf_small("%02x%02x%02x%02x", x + 34, y + 20, 4, COL_FG, - wave_a[4], wave_a[5], wave_a[6], wave_a[7]); - txt_drawf_small("%02x%02x%02x%02x", x, y + 28, 4, COL_FG, - wave_a[8], wave_a[9], wave_a[10], wave_a[11]); - txt_drawf_small("%02x%02x%02x%02x", x + 34, y + 28, 4, COL_FG, - wave_a[12], wave_a[13], wave_a[14], wave_a[15]); + // txt_drawf_small("%02x%02x%02x%02x", x, y + 20, 4, COL_FG, + // wave_a[0], wave_a[1], wave_a[2], wave_a[3]); + // txt_drawf_small("%02x%02x%02x%02x", x + 34, y + 20, 4, COL_FG, + // wave_a[4], wave_a[5], wave_a[6], wave_a[7]); + // txt_drawf_small("%02x%02x%02x%02x", x, y + 28, 4, COL_FG, + // wave_a[8], wave_a[9], wave_a[10], wave_a[11]); + // txt_drawf_small("%02x%02x%02x%02x", x + 34, y + 28, 4, COL_FG, + // wave_a[12], wave_a[13], wave_a[14], wave_a[15]); x += 70; - txt_drawf_small("%02x%02x%02x%02x", x, y + 20, 4, COL_FG, - wave_b[0], wave_b[1], wave_b[2], wave_b[3]); - txt_drawf_small("%02x%02x%02x%02x", x + 34, y + 20, 4, COL_FG, - wave_b[4], wave_b[5], wave_b[6], wave_b[7]); - txt_drawf_small("%02x%02x%02x%02x", x, y + 28, 4, COL_FG, - wave_b[8], wave_b[9], wave_b[10], wave_b[11]); - txt_drawf_small("%02x%02x%02x%02x", x + 34, y + 28, 4, COL_FG, - wave_b[12], wave_b[13], wave_b[14], wave_b[15]); + // txt_drawf_small("%02x%02x%02x%02x", x, y + 20, 4, COL_FG, + // wave_b[0], wave_b[1], wave_b[2], wave_b[3]); + // txt_drawf_small("%02x%02x%02x%02x", x + 34, y + 20, 4, COL_FG, + // wave_b[4], wave_b[5], wave_b[6], wave_b[7]); + // txt_drawf_small("%02x%02x%02x%02x", x, y + 28, 4, COL_FG, + // wave_b[8], wave_b[9], wave_b[10], wave_b[11]); + // txt_drawf_small("%02x%02x%02x%02x", x + 34, y + 28, 4, COL_FG, + // wave_b[12], wave_b[13], wave_b[14], wave_b[15]); } // Draw default wave buttons. @@ -1095,12 +1095,12 @@ draw_parameters_wave(void) { size_t x = PARAMS_START_X; size_t y = PARAMS_START_Y + PARAMS_H - 12; for (size_t i = 0, k = 0; i < 4 * 2; i += 2, k++) { - draw_tile(x + 17 * k, y, wave_tiles + i, COL_FG, true); - draw_tile(x + 17 * k + 8, y, wave_tiles + i + 1, COL_FG, true); + // draw_tile(x + 17 * k, y, wave_tiles + i, COL_FG, true); + // draw_tile(x + 17 * k + 8, y, wave_tiles + i + 1, COL_FG, true); } for (size_t i = 0, k = 0; i < 4 * 2; i += 2, k++) { - draw_tile(x + 17 * k + 70, y, wave_tiles + i, COL_FG, true); - draw_tile(x + 17 * k + 8 + 70, y, wave_tiles + i + 1, COL_FG, true); + // draw_tile(x + 17 * k + 70, y, wave_tiles + i, COL_FG, true); + // draw_tile(x + 17 * k + 8 + 70, y, wave_tiles + i + 1, COL_FG, true); } } @@ -1113,7 +1113,7 @@ draw_parameters_wave(void) { draw_line(x, y + 5, x, y + 16, COL_FG); draw_line(x + 30, y + 5, x + 30, y + 17, COL_FG); draw_line(x, y + 17, x + 30, y + 17, COL_FG); - txt_drawf_small("mode", x + 6, y, 4, COL_FG); + // txt_drawf_small("mode", x + 6, y, 4, COL_FG); switch (pat->ch3.params[trig_selection_loc].wave_mode) { case 0: { @@ -1137,7 +1137,7 @@ draw_parameters_wave(void) { draw_line(x, y + 8, x, y + 19, COL_FG); draw_line(x + 30, y + 8, x + 30, y + 19, COL_FG); draw_line(x, y + 20, x + 30, y + 20, COL_FG); - txt_drawf_small("vol", x + 8, y + 3, 4, COL_FG); + // txt_drawf_small("vol", x + 8, y + 3, 4, COL_FG); switch (pat->ch3.params[trig_selection_loc].wave_volume) { case 0: { @@ -1232,7 +1232,7 @@ draw_parameters_square(ChannelSquareParams *params, bool sweep) { draw_line(x, y + 8, x, y + 19, COL_FG); draw_line(x + 24, y + 8, x + 24, y + 19, COL_FG); draw_line(x, y + 20, x + 24, y + 20, COL_FG); - txt_drawf_small("duty", x + 3, y + 3, 4, COL_FG); + // txt_drawf_small("duty", x + 3, y + 3, 4, COL_FG); switch (params->duty_cycle) { case 0: { @@ -1291,7 +1291,7 @@ draw_parameters_square(ChannelSquareParams *params, bool sweep) { draw_line(x, y + 8, x, y + 19, COL_FG); draw_line(x + 24, y + 8, x + 24, y + 19, COL_FG); draw_line(x, y + 20, x + 24, y + 20, COL_FG); - txt_drawf_small("vol", x + 5, y + 3, 4, COL_FG); + // txt_drawf_small("vol", x + 5, y + 3, 4, COL_FG); switch (params->env_volume) { case 0: { @@ -1354,7 +1354,7 @@ draw_parameters_square(ChannelSquareParams *params, bool sweep) { draw_line(x, y + 8, x, y + 19, COL_FG); draw_line(x + 24, y + 8, x + 24, y + 19, COL_FG); draw_line(x, y + 20, x + 24, y + 20, COL_FG); - txt_drawf_small("dir", x + 5, y + 3, 4, COL_FG); + // txt_drawf_small("dir", x + 5, y + 3, 4, COL_FG); char arr_up[2] = { 0x19, 0 }; char arr_down[2] = { 0x18, 0 }; @@ -1377,7 +1377,7 @@ draw_parameters_square(ChannelSquareParams *params, bool sweep) { draw_line(x, y + 8, x, y + 19, COL_FG); draw_line(x + 24, y + 8, x + 24, y + 19, COL_FG); draw_line(x, y + 20, x + 24, y + 20, COL_FG); - txt_drawf_small("time", x + 3, y + 3, 4, COL_FG); + // txt_drawf_small("time", x + 3, y + 3, 4, COL_FG); switch (params->env_time) { case 0: { @@ -1417,7 +1417,7 @@ draw_parameters_square(ChannelSquareParams *params, bool sweep) { draw_line(x, y + 8, x, y + 19, COL_FG); draw_line(x + 24, y + 8, x + 24, y + 19, COL_FG); draw_line(x, y + 20, x + 24, y + 20, COL_FG); - txt_drawf_small("num", x + 5, y + 3, 4, COL_FG); + // txt_drawf_small("num", x + 5, y + 3, 4, COL_FG); switch (params->sweep_number) { case 0: { @@ -1456,7 +1456,7 @@ draw_parameters_square(ChannelSquareParams *params, bool sweep) { draw_line(x, y + 8, x, y + 19, COL_FG); draw_line(x + 24, y + 8, x + 24, y + 19, COL_FG); draw_line(x, y + 20, x + 24, y + 20, COL_FG); - txt_drawf_small("time", x + 3, y + 3, 4, COL_FG); + // txt_drawf_small("time", x + 3, y + 3, 4, COL_FG); switch (params->sweep_time) { case 0: { @@ -1495,7 +1495,7 @@ draw_parameters_square(ChannelSquareParams *params, bool sweep) { draw_line(x, y + 8, x, y + 19, COL_FG); draw_line(x + 24, y + 8, x + 24, y + 19, COL_FG); draw_line(x, y + 20, x + 24, y + 20, COL_FG); - txt_drawf_small("dir", x + 5, y + 3, 4, COL_FG); + // txt_drawf_small("dir", x + 5, y + 3, 4, COL_FG); char arr_up[2] = { 0x19, 0 }; char arr_down[2] = { 0x18, 0 }; @@ -1513,10 +1513,10 @@ draw_parameters_square(ChannelSquareParams *params, bool sweep) { { size_t x = PARAMS_START_X + x_offset; size_t y = PARAMS_START_Y + PARAMS_H - 45; - txt_drawf_small("shape", x + 1, y - 12, 4, COL_FG); - txt_drawf_small("envelope", x + 54, y - 12, 4, COL_FG); + // txt_drawf_small("shape", x + 1, y - 12, 4, COL_FG); + // txt_drawf_small("envelope", x + 54, y - 12, 4, COL_FG); if (sweep) { - txt_drawf_small("sweep", x + 133, y - 12, 4, COL_FG); + // txt_drawf_small("sweep", x + 133, y - 12, 4, COL_FG); } } } @@ -1538,7 +1538,7 @@ draw_parameters_noise(void) { draw_line(x, y + 8, x, y + 19, COL_FG); draw_line(x + 24, y + 8, x + 24, y + 19, COL_FG); draw_line(x, y + 20, x + 24, y + 20, COL_FG); - txt_drawf_small("mode", x + 3, y + 3, 4, COL_FG); + // txt_drawf_small("mode", x + 3, y + 3, 4, COL_FG); switch (params->bit_mode) { case 0: { @@ -1591,7 +1591,7 @@ draw_parameters_noise(void) { draw_line(x, y + 8, x, y + 19, COL_FG); draw_line(x + 24, y + 8, x + 24, y + 19, COL_FG); draw_line(x, y + 20, x + 24, y + 20, COL_FG); - txt_drawf_small("vol", x + 5, y + 3, 4, COL_FG); + // txt_drawf_small("vol", x + 5, y + 3, 4, COL_FG); switch (params->env_volume) { case 0: { @@ -1654,7 +1654,7 @@ draw_parameters_noise(void) { draw_line(x, y + 8, x, y + 19, COL_FG); draw_line(x + 24, y + 8, x + 24, y + 19, COL_FG); draw_line(x, y + 20, x + 24, y + 20, COL_FG); - txt_drawf_small("dir", x + 5, y + 3, 4, COL_FG); + // txt_drawf_small("dir", x + 5, y + 3, 4, COL_FG); char arr_up[2] = { 0x19, 0 }; char arr_down[2] = { 0x18, 0 }; @@ -1677,7 +1677,7 @@ draw_parameters_noise(void) { draw_line(x, y + 8, x, y + 19, COL_FG); draw_line(x + 24, y + 8, x + 24, y + 19, COL_FG); draw_line(x, y + 20, x + 24, y + 20, COL_FG); - txt_drawf_small("time", x + 3, y + 3, 4, COL_FG); + // txt_drawf_small("time", x + 3, y + 3, 4, COL_FG); switch (params->env_time) { case 0: { @@ -1712,7 +1712,7 @@ draw_parameters_noise(void) { { size_t x = PARAMS_START_X + x_offset; size_t y = PARAMS_START_Y + PARAMS_H - 45; - txt_drawf_small("envelope", x + 54, y - 12, 4, COL_FG); + // txt_drawf_small("envelope", x + 54, y - 12, 4, COL_FG); } } -- cgit v1.2.1