[refactor]: c++ implementation (#13)
implemented in c++ to improve readability and simplify maintenance Co-authored-by: HiveBeats <e1lama@protonmail.com> Reviewed-on: #13
This commit is contained in:
184
src/Application.cpp
Normal file
184
src/Application.cpp
Normal file
@@ -0,0 +1,184 @@
|
||||
#include "Application.h"
|
||||
#include "Settings.h"
|
||||
#include "Logger.h"
|
||||
#include <string>
|
||||
|
||||
Application::Application(/* args */)
|
||||
{
|
||||
m_ring_buffer = new RingBuffer<float>((std::size_t)STREAM_BUFFER_SIZE);
|
||||
m_temp_buffer = new float[STREAM_BUFFER_SIZE];
|
||||
init_synth();
|
||||
init_audio();
|
||||
}
|
||||
|
||||
Application::~Application()
|
||||
{
|
||||
StopAudioStream(m_synth_stream);
|
||||
UnloadAudioStream(m_synth_stream);
|
||||
CloseAudioDevice();
|
||||
CloseWindow();
|
||||
delete m_ring_buffer;
|
||||
delete[] m_temp_buffer;
|
||||
// todo: move to gui state class destructor (make it a class)
|
||||
for(int i = 0; i < m_synth_gui_state.oscillators.size(); i++) {
|
||||
delete m_synth_gui_state.oscillators[i];
|
||||
}
|
||||
}
|
||||
|
||||
void Application::init_audio()
|
||||
{
|
||||
m_sound_played_count = 0;
|
||||
|
||||
InitAudioDevice();
|
||||
SetMasterVolume(SYNTH_VOLUME);
|
||||
SetAudioStreamBufferSizeDefault(STREAM_BUFFER_SIZE);
|
||||
m_synth_stream = LoadAudioStream(SAMPLE_RATE, sizeof(float) * 8, 1);
|
||||
SetAudioStreamVolume(m_synth_stream, 0.5f);
|
||||
|
||||
PlayAudioStream(m_synth_stream);
|
||||
}
|
||||
|
||||
void Application::init_synth()
|
||||
{
|
||||
//todo: move that variables to Synth declaration
|
||||
std::string* nameString = new std::string(std::string(new char[3]));
|
||||
m_current_note = new Note
|
||||
{
|
||||
.length = 1,
|
||||
.name = (*nameString)
|
||||
};
|
||||
|
||||
//todo: move somewhere in initialization
|
||||
std::vector<Oscillator*> oscillators = m_synth.GetOscillators();
|
||||
m_synth_gui_state.oscillators.reserve(oscillators.size());
|
||||
for (size_t i = 0; i < oscillators.size(); i++)
|
||||
{
|
||||
Oscillator* osc = oscillators[i];
|
||||
assert(osc);
|
||||
|
||||
OscillatorGuiState* ui = new OscillatorGuiState {
|
||||
.freq = osc->GetFreq(),
|
||||
.waveshape = osc->GetType(),
|
||||
.volume = osc->GetVolume()
|
||||
};
|
||||
m_synth_gui_state.oscillators.push_back(ui);
|
||||
}
|
||||
}
|
||||
|
||||
std::size_t Application::detect_note_pressed(Note* note)
|
||||
{
|
||||
std::size_t is_pressed = 0;
|
||||
note->length = 8;
|
||||
if (IsKeyPressed(KEY_A))
|
||||
{
|
||||
note->name.assign("A4");
|
||||
is_pressed = 1;
|
||||
}
|
||||
if (IsKeyPressed(KEY_B))
|
||||
{
|
||||
note->name.assign("B4");
|
||||
is_pressed = 1;
|
||||
}
|
||||
if (IsKeyPressed(KEY_C))
|
||||
{
|
||||
note->name.assign("C4");
|
||||
is_pressed = 1;
|
||||
}
|
||||
if (IsKeyPressed(KEY_D))
|
||||
{
|
||||
note->name.assign("D4");
|
||||
is_pressed = 1;
|
||||
}
|
||||
if (IsKeyPressed(KEY_E))
|
||||
{
|
||||
note->name.assign("E4");
|
||||
is_pressed = 1;
|
||||
}
|
||||
if (IsKeyPressed(KEY_F))
|
||||
{
|
||||
note->name.assign("F4");
|
||||
is_pressed = 1;
|
||||
}
|
||||
if (IsKeyPressed(KEY_G))
|
||||
{
|
||||
note->name.assign("G4");
|
||||
is_pressed = 1;
|
||||
}
|
||||
return is_pressed;
|
||||
}
|
||||
|
||||
// Update On Input
|
||||
void Application::update_on_note_input()
|
||||
{
|
||||
if (detect_note_pressed(m_current_note))
|
||||
{
|
||||
m_synth.ProduceNoteSound((*m_current_note));
|
||||
m_sound_played_count = 0;
|
||||
write_log("Note played: %s\n", m_current_note->name.c_str());
|
||||
}
|
||||
}
|
||||
|
||||
// Play ring-buffered audio
|
||||
void Application::play_buffered_audio()
|
||||
{
|
||||
if (IsAudioStreamProcessed(m_synth_stream) && !m_ring_buffer->IsEmpty())
|
||||
{
|
||||
std::size_t size_to_read = m_ring_buffer->GetSize();
|
||||
|
||||
write_log("Samples to play:%zu \n", size_to_read);
|
||||
//todo: try to start reading directly from ring buffer, avoiding temp_buffer
|
||||
m_ring_buffer->Read(m_temp_buffer, size_to_read);
|
||||
// can try the SetAudioStreamCallback
|
||||
UpdateAudioStream(m_synth_stream, m_temp_buffer, size_to_read);
|
||||
// can overwrite the ring buffer to avoid that
|
||||
if (m_synth.GetOutSignal().size() == m_sound_played_count)
|
||||
{
|
||||
m_ring_buffer->Reset();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Fill ring buffer from current sound
|
||||
void Application::fill_audio_buffer()
|
||||
{
|
||||
if (!m_ring_buffer->IsFull() && m_synth.GetOutSignal().size() != m_sound_played_count)
|
||||
{
|
||||
write_log("[INFO] IsFull:%d Samples:%zu Played:%d\n",
|
||||
m_ring_buffer->IsFull(),
|
||||
m_synth.GetOutSignal().size(),
|
||||
m_sound_played_count);
|
||||
|
||||
// how many samples need write
|
||||
std::size_t size_to_fill = 0;
|
||||
|
||||
if ((m_synth.GetOutSignal().size() - m_sound_played_count) > m_ring_buffer->GetCapacity())
|
||||
{
|
||||
size_to_fill = m_ring_buffer->GetCapacity();
|
||||
} else
|
||||
{
|
||||
size_to_fill = m_synth.GetOutSignal().size() - m_sound_played_count;
|
||||
}
|
||||
|
||||
write_log("[INFO] SizeToFill:%zu\n", size_to_fill);
|
||||
for (size_t i = 0; i < size_to_fill; i++)
|
||||
{
|
||||
m_temp_buffer[i] = m_synth.GetOutSignal()[i];
|
||||
}
|
||||
|
||||
m_ring_buffer->Write(m_temp_buffer, size_to_fill);
|
||||
m_sound_played_count += size_to_fill;
|
||||
}
|
||||
}
|
||||
|
||||
void Application::Run()
|
||||
{
|
||||
// Main game loop
|
||||
while (!WindowShouldClose()) // Detect window close button or ESC key
|
||||
{
|
||||
fill_audio_buffer();
|
||||
play_buffered_audio();
|
||||
update_on_note_input();
|
||||
|
||||
m_renderer.Draw(m_synth, m_synth_gui_state);
|
||||
}
|
||||
}
|
||||
112
src/Oscillator.cpp
Normal file
112
src/Oscillator.cpp
Normal file
@@ -0,0 +1,112 @@
|
||||
#include "Oscillator.h"
|
||||
#include "Settings.h"
|
||||
|
||||
#define TWO_PI 2*SYNTH_PI
|
||||
|
||||
Oscillator::Oscillator(OscillatorType osc, float freq, float volume)
|
||||
{
|
||||
SetType(osc);
|
||||
m_freq = freq;
|
||||
m_volume = volume;
|
||||
}
|
||||
|
||||
Oscillator::~Oscillator()
|
||||
{
|
||||
}
|
||||
|
||||
void Oscillator::Reset()
|
||||
{
|
||||
m_volume = 0;
|
||||
m_phase = 0;
|
||||
m_phase_dt = 0;
|
||||
}
|
||||
|
||||
void Oscillator::SetType(OscillatorType osc)
|
||||
{
|
||||
m_osc = osc;
|
||||
switch (m_osc) {
|
||||
case Sine:
|
||||
m_osc_function = &Oscillator::sineosc;
|
||||
m_dt_function = &Oscillator::calc_sine_phase_delta;
|
||||
break;
|
||||
case Triangle:
|
||||
m_osc_function = &Oscillator::triangleosc;
|
||||
m_dt_function = &Oscillator::calc_saw_phase_delta;
|
||||
break;
|
||||
case Square:
|
||||
m_osc_function = &Oscillator::squareosc;
|
||||
m_dt_function = &Oscillator::calc_sine_phase_delta;
|
||||
break;
|
||||
case Saw:
|
||||
m_osc_function = &Oscillator::sawosc;
|
||||
m_dt_function = &Oscillator::calc_saw_phase_delta;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
void Oscillator::SetFreq(float freq)
|
||||
{
|
||||
m_freq = freq;
|
||||
m_phase = 0;
|
||||
m_phase_dt = (this->*m_dt_function)(freq);
|
||||
}
|
||||
|
||||
float Oscillator::GenerateSample(float duration)
|
||||
{
|
||||
return (this->*m_osc_function)() * m_volume;
|
||||
}
|
||||
|
||||
void Oscillator::sine_osc_phase_incr()
|
||||
{
|
||||
m_phase += m_phase_dt;
|
||||
if (m_phase >= TWO_PI)
|
||||
m_phase -= TWO_PI;
|
||||
}
|
||||
|
||||
void Oscillator::saw_osc_phase_incr()
|
||||
{
|
||||
m_phase += m_phase_dt;
|
||||
if (m_phase >= 1.0f)
|
||||
m_phase -= 1.0f;
|
||||
}
|
||||
|
||||
float Oscillator::calc_saw_phase_delta(float freq)
|
||||
{
|
||||
return freq / SAMPLE_RATE;
|
||||
}
|
||||
|
||||
float Oscillator::calc_sine_phase_delta(float freq)
|
||||
{
|
||||
return (TWO_PI * freq) / SAMPLE_RATE;
|
||||
}
|
||||
|
||||
float Oscillator::sineosc()
|
||||
{
|
||||
float result = sinf(m_phase);
|
||||
sine_osc_phase_incr();
|
||||
return result;
|
||||
}
|
||||
|
||||
float Oscillator::sign(float v)
|
||||
{
|
||||
return (v > 0.0) ? 1.f : -1.f;
|
||||
}
|
||||
|
||||
float Oscillator::squareosc()
|
||||
{
|
||||
return sign(sineosc());
|
||||
}
|
||||
|
||||
float Oscillator::triangleosc()
|
||||
{
|
||||
float result = 1.f - fabsf(m_phase - 0.5f) * 4.f;
|
||||
saw_osc_phase_incr();
|
||||
return result;
|
||||
}
|
||||
|
||||
float Oscillator::sawosc()
|
||||
{
|
||||
float result = m_phase * 2.f - 1.f;
|
||||
saw_osc_phase_incr();
|
||||
return result;
|
||||
}
|
||||
196
src/Renderer.cpp
Normal file
196
src/Renderer.cpp
Normal file
@@ -0,0 +1,196 @@
|
||||
#include "Renderer.h"
|
||||
#define RAYGUI_IMPLEMENTATION
|
||||
#include "raygui.h"
|
||||
#include "Settings.h"
|
||||
#include "Logger.h"
|
||||
|
||||
Renderer::Renderer(/* args */)
|
||||
{
|
||||
InitWindow(WINDOW_WIDTH, WINDOW_HEIGHT, "SeeSynth - v0.2");
|
||||
SetTargetFPS(60);
|
||||
}
|
||||
|
||||
Renderer::~Renderer()
|
||||
{
|
||||
}
|
||||
|
||||
void Renderer::Draw(Synth& synth, SynthGuiState& synthGui)
|
||||
{
|
||||
BeginDrawing();
|
||||
|
||||
ClearBackground(RAYWHITE);
|
||||
//todo: implement renderer
|
||||
DrawUi(synth, synthGui);
|
||||
DrawSignal(synth, synthGui);
|
||||
//DrawText("Congrats! You created your first window!", 190, 200, 20, LIGHTGRAY);
|
||||
//DrawFPS(0,0);
|
||||
|
||||
EndDrawing();
|
||||
}
|
||||
|
||||
void Renderer::DrawSignal(Synth & synth, SynthGuiState & synthGui)
|
||||
{
|
||||
GuiGrid((Rectangle){0, 0, WINDOW_WIDTH, WINDOW_HEIGHT}, "", WINDOW_HEIGHT / 8, 2);
|
||||
auto signal = synth.GetOutSignal();
|
||||
Vector2* signal_points = new Vector2[signal.size()];
|
||||
const float screen_vertical_midpoint = (WINDOW_HEIGHT/2);
|
||||
for (int point_idx = 0; point_idx < signal.size(); point_idx++)
|
||||
{
|
||||
signal_points[point_idx].x = (float)point_idx + OSCILLATOR_PANEL_WIDTH;
|
||||
signal_points[point_idx].y = screen_vertical_midpoint + (int)(signal[point_idx] * 300);
|
||||
}
|
||||
DrawLineStrip(signal_points, signal.size(), RED);
|
||||
delete[] signal_points;
|
||||
}
|
||||
|
||||
void Renderer::DrawOscillatorsShapeInputs(const std::vector<Oscillator*>& oscillators, const std::vector<OscillatorGuiState*>& guiOscillators)
|
||||
{
|
||||
#define WAVE_SHAPE_OPTIONS "Sine;Triangle;Sawtooth;Square"
|
||||
|
||||
// DRAW OSCILLATOR SHAPE INPUTS
|
||||
for (int i = 0; i < oscillators.size(); i += 1)
|
||||
{
|
||||
OscillatorGuiState* ui_osc = guiOscillators[i];
|
||||
assert(ui_osc);
|
||||
|
||||
Oscillator* osc = oscillators[i];
|
||||
assert(osc);
|
||||
|
||||
// Shape select
|
||||
int shape_index = (int)(ui_osc->waveshape);
|
||||
bool is_dropdown_click = GuiDropdownBox(ui_osc->shape_dropdown_rect,
|
||||
WAVE_SHAPE_OPTIONS,
|
||||
&shape_index,
|
||||
ui_osc->is_dropdown_open
|
||||
);
|
||||
|
||||
if (is_dropdown_click)
|
||||
{
|
||||
write_log("Dropdown clicked!\n");
|
||||
ui_osc->is_dropdown_open = !ui_osc->is_dropdown_open;
|
||||
ui_osc->waveshape = (OscillatorType)(shape_index);
|
||||
// APPLY STATE TO REAL OSC
|
||||
osc->SetType(ui_osc->waveshape);
|
||||
}
|
||||
if (ui_osc->is_dropdown_open) break;
|
||||
}
|
||||
}
|
||||
|
||||
void Renderer::DrawOscillatorsPanels(const std::vector<Oscillator*>& oscillators,
|
||||
const std::vector<OscillatorGuiState*>& guiOscillators,
|
||||
const Rectangle& panel_bounds)
|
||||
{
|
||||
float panel_y_offset = 0;
|
||||
for (int i = 0; i < oscillators.size(); i++)
|
||||
{
|
||||
OscillatorGuiState* ui_osc = guiOscillators[i];
|
||||
assert(ui_osc);
|
||||
|
||||
Oscillator* osc = oscillators[i];
|
||||
assert(osc);
|
||||
|
||||
const bool has_shape_param = (ui_osc->waveshape == Square);
|
||||
|
||||
// Draw Oscillator Panel
|
||||
const int osc_panel_width = panel_bounds.width - 20;
|
||||
const int osc_panel_height = has_shape_param ? 130 : 100;
|
||||
const int osc_panel_x = panel_bounds.x + 10;
|
||||
const int osc_panel_y = panel_bounds.y + 50 + panel_y_offset;
|
||||
panel_y_offset += osc_panel_height + 5;
|
||||
GuiPanel((Rectangle){
|
||||
(float)osc_panel_x,
|
||||
(float)osc_panel_y,
|
||||
(float)osc_panel_width,
|
||||
(float)osc_panel_height
|
||||
},
|
||||
"");
|
||||
|
||||
const float slider_padding = 50.f;
|
||||
const float el_spacing = 5.f;
|
||||
Rectangle el_rect = {
|
||||
.x = (float)osc_panel_x + slider_padding + 30,
|
||||
.y = (float)osc_panel_y + 10,
|
||||
.width = (float)osc_panel_width - (slider_padding * 2),
|
||||
.height = 25.f
|
||||
};
|
||||
|
||||
// Volume slider
|
||||
float decibels = (20.f * log10f(osc->GetVolume()));
|
||||
char amp_slider_label[32];
|
||||
sprintf(amp_slider_label, "%.1f dB", decibels);
|
||||
decibels = GuiSlider(el_rect,
|
||||
amp_slider_label,
|
||||
"",
|
||||
decibels,
|
||||
-60.0f,
|
||||
0.0f
|
||||
);
|
||||
ui_osc->volume = powf(10.f, decibels * (1.f/20.f));
|
||||
osc->SetVolume(ui_osc->volume);
|
||||
|
||||
el_rect.y += el_rect.height + el_spacing;
|
||||
|
||||
// Defer shape drop-down box.
|
||||
ui_osc->shape_dropdown_rect = el_rect;
|
||||
el_rect.y += el_rect.height + el_spacing;
|
||||
/*
|
||||
Rectangle delete_button_rect = el_rect;
|
||||
delete_button_rect.x = osc_panel_x + 5;
|
||||
delete_button_rect.y -= el_rect.height + el_spacing;
|
||||
delete_button_rect.width = 30;
|
||||
bool is_delete_button_pressed = GuiButton(delete_button_rect, "X");
|
||||
if (is_delete_button_pressed)
|
||||
{
|
||||
memmove(
|
||||
synth->ui_oscillator + ui_osc_i,
|
||||
synth->ui_oscillator + ui_osc_i + 1,
|
||||
(synth->ui_oscillator_count - ui_osc_i) * sizeof(UiOscillator)
|
||||
);
|
||||
synth->ui_oscillator_count -= 1;
|
||||
}
|
||||
*/
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
void Renderer::DrawMainPanel(const Rectangle& panel_bounds)
|
||||
{
|
||||
bool is_shape_dropdown_open = false;
|
||||
int shape_index = 0;
|
||||
GuiPanel(panel_bounds, "");
|
||||
}
|
||||
|
||||
void Renderer::DrawAddOscillatorButton(Synth & synth, SynthGuiState & synthGui, Rectangle panel_bounds)
|
||||
{
|
||||
bool click_add_oscillator = GuiButton((Rectangle){
|
||||
panel_bounds.x + 10,
|
||||
panel_bounds.y + 10,
|
||||
panel_bounds.width - 20,
|
||||
25.f
|
||||
}, "Add Oscillator");
|
||||
if (click_add_oscillator)
|
||||
{
|
||||
synth.AddOscillator();
|
||||
Oscillator* osc = synth.GetOscillators().back();
|
||||
|
||||
OscillatorGuiState* ui = new OscillatorGuiState {
|
||||
.freq = osc->GetFreq(),
|
||||
.waveshape = osc->GetType(),
|
||||
.volume = osc->GetVolume()
|
||||
};
|
||||
synthGui.oscillators.push_back(ui);
|
||||
}
|
||||
}
|
||||
|
||||
void Renderer::DrawUi(Synth & synth, SynthGuiState & synthGui)
|
||||
{
|
||||
Rectangle panel_bounds = {.x = 0, .y = 0, .width = OSCILLATOR_PANEL_WIDTH, .height = WINDOW_HEIGHT };
|
||||
DrawMainPanel(panel_bounds);
|
||||
DrawAddOscillatorButton(synth, synthGui, panel_bounds);
|
||||
// Draw Oscillators
|
||||
std::vector<Oscillator*> oscillators = synth.GetOscillators();
|
||||
std::vector<OscillatorGuiState*> guiOscillators = synthGui.oscillators;
|
||||
|
||||
DrawOscillatorsPanels(oscillators, guiOscillators, panel_bounds);
|
||||
DrawOscillatorsShapeInputs(oscillators, guiOscillators);
|
||||
}
|
||||
8
src/SeeSynth.cpp
Normal file
8
src/SeeSynth.cpp
Normal file
@@ -0,0 +1,8 @@
|
||||
#include "Application.h"
|
||||
|
||||
int main() {
|
||||
Application* app = new Application();
|
||||
app->Run();
|
||||
|
||||
delete app;
|
||||
}
|
||||
39
src/Synth.cpp
Normal file
39
src/Synth.cpp
Normal file
@@ -0,0 +1,39 @@
|
||||
#include "Synth.h"
|
||||
#include "Settings.h"
|
||||
#include "KeyBoard.h"
|
||||
#include "OscillatorType.h"
|
||||
|
||||
Synth::Synth(/* args */)
|
||||
{
|
||||
AddOscillator();
|
||||
}
|
||||
|
||||
Synth::~Synth()
|
||||
{
|
||||
}
|
||||
|
||||
std::vector<float> & Synth::get_note(int semitone, float beats)
|
||||
{
|
||||
float hz = KeyBoard::GetHzBySemitone(semitone);
|
||||
float duration = beats * BEAT_DURATION;
|
||||
|
||||
// will change after oscillator starts to be more autonomous
|
||||
for (Oscillator* osc : m_oscillators)
|
||||
{
|
||||
osc->SetFreq(hz);
|
||||
}
|
||||
|
||||
return m_adder.SumOscillators(m_oscillators, duration); //todo: add other pipeline steps (e.g ADSR, Filters, FX);
|
||||
}
|
||||
|
||||
void Synth::ProduceNoteSound(Note input)
|
||||
{
|
||||
float length = 1.f / input.length;
|
||||
int semitone_shift = KeyBoard::GetSemitoneShift(input.name);
|
||||
m_out_signal = get_note(semitone_shift, length);
|
||||
}
|
||||
|
||||
void Synth::AddOscillator()
|
||||
{
|
||||
m_oscillators.push_back(new Oscillator(OscillatorType::Sine, 440.f, VOLUME));
|
||||
}
|
||||
Reference in New Issue
Block a user