From 2590b037562ce4ce52e19b9f1e9c9958a9f5747e Mon Sep 17 00:00:00 2001 From: Blitblank Date: Sat, 18 Apr 2026 13:48:00 -0500 Subject: [PATCH] cleanup include paths --- CMakeLists.txt | 2 ++ README.md | 4 ++-- src/main.cpp | 1 + src/synth/Oscillator.h | 2 ++ src/synth/Voice.cpp | 2 +- src/ui/MainWindow.cpp | 2 +- src/ui/MainWindow.h | 6 +++--- 7 files changed, 12 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f3c4578..8bbe65a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -90,7 +90,9 @@ qt_add_executable(metabolus set_target_properties(metabolus PROPERTIES AUTOUIC ON) target_include_directories(metabolus PRIVATE + ${CMAKE_SOURCE_DIR}/src/ ${CMAKE_SOURCE_DIR}/src/ui + ${CMAKE_SOURCE_DIR}/src/synth ${CMAKE_SOURCE_DIR}/src/ui/widgets ) diff --git a/README.md b/README.md index ecbc8d3..a552625 100644 --- a/README.md +++ b/README.md @@ -48,11 +48,11 @@ Linux: GCC Clone repository ```PowerShell -git clone https://github.com/Blitblank/metabalus.git --recursive +git clone https://git.vxbard.net/homeburger/metabalus.git --recursive ``` or if you forgot to --recursive: ```PowerShell -git clone https://github.com/Blitblank/metabalus.git +git clone https://git.vxbard.net/homeburger/metabalus.git git submodule update --init --recursive ``` \ diff --git a/src/main.cpp b/src/main.cpp index ea71058..5200821 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -16,6 +16,7 @@ int main(int argc, char *argv[]) { window.show(); // TODO: logging + // TODO: separate app from the window // i made a good debug filtering setup in ouros so could probably improt that into this project int status = app.exec(); // app execution; blocks until window close diff --git a/src/synth/Oscillator.h b/src/synth/Oscillator.h index ba78c30..0ea3abe 100644 --- a/src/synth/Oscillator.h +++ b/src/synth/Oscillator.h @@ -11,6 +11,8 @@ #define M_PI 3.14159265358979323846 #endif +// TODO: if the amount of notes per octave is changed via config then this constant needs to be calculated at startup +// as SYNTH_Xth_ROOT_TWO #define SYNTH_TWELFTH_ROOT_TWO 1.05946309435929526463 // TODO: you get it, also in a yml config diff --git a/src/synth/Voice.cpp b/src/synth/Voice.cpp index 6c8d3e7..cac2880 100644 --- a/src/synth/Voice.cpp +++ b/src/synth/Voice.cpp @@ -101,7 +101,7 @@ float Voice::process(float* params, bool& scopeTrigger) { // TODO: implement controls for noise //float scale = static_cast(rand()) / static_cast(RAND_MAX); // Range [0.0, 1.0] - //float noise = -1.0f + 2.0f * scale; + //float noise = (-1.0f + 2.0f * scale) * 0.2f; // these values didn't sound good so I commented them out before I get controls for them // mix oscillators diff --git a/src/ui/MainWindow.cpp b/src/ui/MainWindow.cpp index 531f4bf..53171b3 100644 --- a/src/ui/MainWindow.cpp +++ b/src/ui/MainWindow.cpp @@ -59,7 +59,6 @@ MainWindow::MainWindow(QWidget *parent) : } } - // rogue sliders, TODO: clean these up in a package connect(ui_->sliderMasterOctave, &SmartSlider::valueChanged, this, [this](float value) { @@ -157,6 +156,7 @@ void MainWindow::onResetClicked() { // TODO: clean these up, maybe put them in a package like the envelope generators (it'll help encapsulate the int-snapping business) // what I might do is make a variable-length slider-package object + // TODO: the oscillator things also need an amplitude parameter too YAML::Node masterNode = configRoot["MasterPitchOffset"]; YAML::Node osc1Node = configRoot["Osc1PitchOffset"]; YAML::Node osc2Node = configRoot["Osc2PitchOffset"]; diff --git a/src/ui/MainWindow.h b/src/ui/MainWindow.h index 77d2ac1..6ebc053 100644 --- a/src/ui/MainWindow.h +++ b/src/ui/MainWindow.h @@ -4,9 +4,9 @@ #include #include -#include "../ConfigInterface.h" -#include "../synth/AudioEngine.h" -#include "../MidiController.h" +#include "ConfigInterface.h" +#include "synth/AudioEngine.h" +#include "MidiController.h" QT_BEGIN_NAMESPACE namespace Ui { class MainWindow; }