[refactor]: formatting
This commit is contained in:
165
src/Renderer.cpp
165
src/Renderer.cpp
@@ -1,55 +1,51 @@
|
||||
#include "Renderer.h"
|
||||
#define RAYGUI_IMPLEMENTATION
|
||||
#include "raygui.h"
|
||||
#include "Settings.h"
|
||||
#include "Logger.h"
|
||||
#include "Settings.h"
|
||||
#include "raygui.h"
|
||||
|
||||
Renderer::Renderer(/* args */)
|
||||
{
|
||||
Renderer::Renderer(/* args */) {
|
||||
InitWindow(WINDOW_WIDTH, WINDOW_HEIGHT, "SeeSynth - v0.2");
|
||||
SetTargetFPS(60);
|
||||
}
|
||||
|
||||
Renderer::~Renderer()
|
||||
{
|
||||
}
|
||||
Renderer::~Renderer() {}
|
||||
|
||||
void Renderer::Draw(Synth& synth, SynthGuiState& synthGui)
|
||||
{
|
||||
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);
|
||||
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);
|
||||
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++)
|
||||
{
|
||||
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);
|
||||
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"
|
||||
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)
|
||||
{
|
||||
for (int i = 0; i < oscillators.size(); i += 1) {
|
||||
OscillatorGuiState* ui_osc = guiOscillators[i];
|
||||
assert(ui_osc);
|
||||
|
||||
@@ -58,31 +54,28 @@ void Renderer::DrawOscillatorsShapeInputs(const std::vector<Oscillator*>& oscill
|
||||
|
||||
// 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)
|
||||
{
|
||||
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;
|
||||
if (ui_osc->is_dropdown_open)
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
void Renderer::DrawOscillatorsPanels(const std::vector<Oscillator*>& oscillators,
|
||||
void Renderer::DrawOscillatorsPanels(
|
||||
const std::vector<Oscillator*>& oscillators,
|
||||
const std::vector<OscillatorGuiState*>& guiOscillators,
|
||||
const Rectangle& panel_bounds)
|
||||
{
|
||||
const Rectangle& panel_bounds) {
|
||||
float panel_y_offset = 0;
|
||||
for (int i = 0; i < oscillators.size(); i++)
|
||||
{
|
||||
for (int i = 0; i < oscillators.size(); i++) {
|
||||
OscillatorGuiState* ui_osc = guiOscillators[i];
|
||||
assert(ui_osc);
|
||||
|
||||
@@ -90,46 +83,36 @@ void Renderer::DrawOscillatorsPanels(const std::vector<Oscillator*>& oscillators
|
||||
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
|
||||
},
|
||||
"");
|
||||
|
||||
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
|
||||
};
|
||||
|
||||
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));
|
||||
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;
|
||||
@@ -142,49 +125,49 @@ void Renderer::DrawOscillatorsPanels(const std::vector<Oscillator*>& oscillators
|
||||
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 + 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)
|
||||
{
|
||||
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)
|
||||
{
|
||||
void Renderer::DrawAddOscillatorButton(Synth& synth, SynthGuiState& synthGui,
|
||||
Rectangle panel_bounds) {
|
||||
//clang-format off
|
||||
bool click_add_oscillator =
|
||||
GuiButton((Rectangle){panel_bounds.x + 10, panel_bounds.y + 10,
|
||||
panel_bounds.width - 20, 25.f},
|
||||
"Add Oscillator");
|
||||
//clang-format on
|
||||
|
||||
if (click_add_oscillator) {
|
||||
synth.AddOscillator();
|
||||
Oscillator* osc = synth.GetOscillators().back();
|
||||
|
||||
OscillatorGuiState* ui = new OscillatorGuiState {
|
||||
.freq = osc->GetFreq(),
|
||||
.waveshape = osc->GetType(),
|
||||
.volume = osc->GetVolume()
|
||||
};
|
||||
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 };
|
||||
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
|
||||
|
||||
Reference in New Issue
Block a user