feat: filter type input

This commit is contained in:
2023-09-10 01:02:22 +04:00
parent 576cf8e3b5
commit de37b814bf
10 changed files with 73 additions and 6 deletions

View File

@@ -190,8 +190,10 @@ void Renderer::draw_second_panel(Rectangle& bounds) {
GuiPanel(bounds, "");
}
float Renderer::draw_filter_panel(Filter* filter, FilterGuiState& gui_filter,
float Renderer::draw_filter_panel(Synth& synth, FilterGuiState& gui_filter,
const Rectangle& panel_bounds) {
#define FILTER_TYPE_OPTIONS "LP;BP;HP"
Filter* filter = synth.GetFilter();
float panel_y_offset = 0;
// Draw Filter Panel
@@ -228,6 +230,24 @@ float Renderer::draw_filter_panel(Filter* filter, FilterGuiState& gui_filter,
el_rect.y += el_rect.height + el_spacing;
// todo: filter type
// Shape select
int shape_index = (int)(gui_filter.type);
bool is_dropdown_click =
GuiDropdownBox(el_rect, FILTER_TYPE_OPTIONS,
&shape_index, gui_filter.is_dropdown_open);
if (is_dropdown_click) {
write_log("Dropdown clicked!\n");
gui_filter.is_dropdown_open = !gui_filter.is_dropdown_open;
gui_filter.type = (FilterType)(shape_index);
// APPLY STATE TO REAL SYNTH
if (!filter->IsSameFilterType(gui_filter.type)) {
synth.SetFilter(gui_filter.type);
}
//filter.SetType(ui_osc->waveshape);
}
// if (gui_filter.is_dropdown_open)
// break;
// apply values to real one
// todo: thrid (order) parameter
@@ -254,5 +274,5 @@ void Renderer::draw_ui(Synth& synth, SynthGuiState& synth_gui) {
draw_oscillators_shape_inputs(oscillators, gui_oscillators);
draw_second_panel(panel_bounds);
draw_filter_panel(synth.GetFilter(), synth_gui.filter, panel_bounds);
draw_filter_panel(synth, synth_gui.filter, panel_bounds);
}

View File

@@ -4,6 +4,7 @@
#include "OscillatorType.h"
#include "Settings.h"
#include "LowPassFilter.h"
#include "FilterFactory.h"
Synth::Synth(/* args */) {
m_lfo = new Oscillator(OscillatorType::Sine, 5.f, VOLUME);
@@ -70,6 +71,7 @@ void Synth::Trigger(Note input) {
trigger_note_on_effects();
}
// todo: fix this
void Synth::apply_filter_lfo() {
float dt = m_lfo->Process();
Filter* filter = (Filter*)m_effects[1];
@@ -93,3 +95,10 @@ void Synth::Release() {
}
void Synth::AddEffect(Effect* fx) { m_effects.push_back(fx); }
void Synth::SetFilter(FilterType type) {
Filter* oldFilter = this->GetFilter();
Filter* newFilter = FilterFactory::CreateFilter(oldFilter, type);
delete oldFilter;
m_effects[1] = newFilter;
}