mirror of
https://github.com/AquaMorph/Droplets.git
synced 2025-07-05 03:32:02 +00:00
Cleaned code
This commit is contained in:
@ -14,7 +14,7 @@ using namespace daisy;
|
||||
enum class DropletState {kFull, kLeft, kRight};
|
||||
|
||||
class Droplet {
|
||||
public:
|
||||
public:
|
||||
DaisyPatch* patch;
|
||||
DropletState state;
|
||||
Droplet(DaisyPatch*, DropletState);
|
||||
|
@ -1,12 +1,10 @@
|
||||
#include "noise_droplet.h"
|
||||
|
||||
NoiseDroplet::NoiseDroplet(DaisyPatch* m_patch,
|
||||
float sample_rate,
|
||||
DropletState m_state) :
|
||||
Droplet(m_patch,
|
||||
m_state) {
|
||||
noise.Init();
|
||||
filter.Init();
|
||||
}
|
||||
|
||||
void NoiseDroplet::Control() {}
|
||||
|
@ -10,11 +10,10 @@
|
||||
#include "../util.h"
|
||||
|
||||
class NoiseDroplet: public Droplet {
|
||||
private:
|
||||
private:
|
||||
daisysp::WhiteNoise noise;
|
||||
daisysp::NlFilt filter;
|
||||
public:
|
||||
NoiseDroplet(DaisyPatch*, float, DropletState);
|
||||
public:
|
||||
NoiseDroplet(DaisyPatch*, DropletState);
|
||||
void Control();
|
||||
void Process(float**, float**, size_t);
|
||||
void Draw();
|
||||
|
@ -1,8 +1,8 @@
|
||||
#include "vco_droplet.h"
|
||||
|
||||
VCODroplet::VCODroplet(DaisyPatch* m_patch,
|
||||
float sample_rate,
|
||||
DropletState m_state) :
|
||||
DropletState m_state,
|
||||
float sample_rate) :
|
||||
Droplet(m_patch,
|
||||
m_state){
|
||||
int num_waves = Oscillator::WAVE_LAST;
|
||||
@ -46,7 +46,8 @@ void VCODroplet::Process(float** in, float** out, size_t size) {
|
||||
|
||||
void VCODroplet::Draw() {
|
||||
DrawName(patch, "VCO");
|
||||
WriteString(*patch, 0, 54, Font_6x8, WaveToString(wavectrl.Process()));
|
||||
WriteString(*patch, 0, 54, Font_6x8,
|
||||
WaveToString(wavectrl.Process()));
|
||||
}
|
||||
|
||||
std::string VCODroplet::WaveToString(uint8_t wf) {
|
||||
|
@ -13,12 +13,12 @@ using namespace daisy;
|
||||
using namespace daisysp;
|
||||
|
||||
class VCODroplet: public Droplet {
|
||||
private:
|
||||
private:
|
||||
Oscillator osc;
|
||||
Parameter freqctrl, wavectrl, ampctrl, finectrl;
|
||||
std::string WaveToString(uint8_t);
|
||||
public:
|
||||
VCODroplet(DaisyPatch*, float, DropletState);
|
||||
public:
|
||||
VCODroplet(DaisyPatch*, DropletState, float);
|
||||
void Control();
|
||||
void Process(float**, float**, size_t);
|
||||
void Draw();
|
||||
|
Reference in New Issue
Block a user