commit 10bbb3b3026268888baee2c45f3bbdd446e0e562
parent aff2b77fb3667b2e9955d98b2d9caa00533a0233
Author: Adam M <aemalone@gmail.com>
Date: Wed, 20 Mar 2019 01:14:27 -0500
auto format, add a few scales
Diffstat:
1 file changed, 454 insertions(+), 401 deletions(-)
diff --git a/src/ComputerscareOhPeas.cpp b/src/ComputerscareOhPeas.cpp
@@ -10,163 +10,178 @@
struct ComputerscareOhPeas;
-const int numChannels= 4;
+const int numChannels = 4;
struct PeasTextField;
struct ComputerscareOhPeas;
-struct PeasTextField : LedDisplayTextField {
- std::shared_ptr<Font> font;
- math::Vec textOffset;
- NVGcolor color;
- int fontSize = 16;
- int rowIndex=0;
- bool inError = false;
- ComputerscareOhPeas* module;
- PeasTextField();
- //void draw(const DrawArgs &args) override;
- //int getTextPosition(math::Vec mousePos) ;
-
-
- void setModule(ComputerscareOhPeas* _module) {
- module = _module;
- }
- void onEnter(const widget::EnterEvent &e) override;
-
- /*int getTextPosition(Vec mousePos) override {
- bndSetFont(font->handle);
- int textPos = bndIconLabelTextPosition(gVg, textOffset.x, textOffset.y,
- box.size.x - 2*textOffset.x, box.size.y - 2*textOffset.y,
- -1, fontSize, text.c_str(), mousePos.x, mousePos.y);
- bndSetFont(gGuiFont->handle);
- return textPos;
- }*/
- int getTextPosition(math::Vec mousePos) override {
- bndSetFont(font->handle);
- int textPos = bndIconLabelTextPosition(APP->window->vg, textOffset.x, textOffset.y,
- box.size.x - 2*textOffset.x, box.size.y - 2*textOffset.y,
- -1, 12, text.c_str(), mousePos.x, mousePos.y);
- bndSetFont(APP->window->uiFont->handle);
- return textPos;
-}
- void draw(const DrawArgs &args) override {
- if(module) {
- nvgScissor(args.vg, 0, 0, box.size.x, box.size.y);
-
- // Background
- nvgFontSize(args.vg, fontSize);
- nvgBeginPath(args.vg);
- nvgRoundedRect(args.vg, 0, 0, box.size.x, box.size.y, 10.0);
-
- if(inError) {
- nvgFillColor(args.vg, COLOR_COMPUTERSCARE_PINK);
- }
- else {
- nvgFillColor(args.vg, nvgRGB(0x00, 0x00, 0x00));
+struct PeasTextField : LedDisplayTextField
+{
+ std::shared_ptr<Font> font;
+ math::Vec textOffset;
+ NVGcolor color;
+ int fontSize = 16;
+ int rowIndex = 0;
+ bool inError = false;
+ ComputerscareOhPeas *module;
+ PeasTextField();
+ //void draw(const DrawArgs &args) override;
+ //int getTextPosition(math::Vec mousePos) ;
+
+
+ void setModule(ComputerscareOhPeas *_module)
+ {
+ module = _module;
}
- nvgFill(args.vg);
+ void onEnter(const widget::EnterEvent &e) override;
- // Text
- if (font->handle >= 0) {
+ /*int getTextPosition(Vec mousePos) override {
bndSetFont(font->handle);
-
- NVGcolor highlightColor = color;
- highlightColor.a = 0.5;
- int begin = fmin(cursor, selection);
- // int end = (this == gFocusedWidget) ? fmax(cursor, selection) : -1;
-
- int end = fmax(cursor,selection);
- //bndTextField(args.vg,textOffset.x,textOffset.y+2, box.size.x, box.size.y, -1, 0, 0, const char *text, int cbegin, int cend);
- bndIconLabelCaret(args.vg, textOffset.x, textOffset.y - 3,
+ int textPos = bndIconLabelTextPosition(gVg, textOffset.x, textOffset.y,
box.size.x - 2*textOffset.x, box.size.y - 2*textOffset.y,
- -1, color, fontSize, text.c_str(), highlightColor, begin, end);
+ -1, fontSize, text.c_str(), mousePos.x, mousePos.y);
+ bndSetFont(gGuiFont->handle);
+ return textPos;
+ }*/
+ int getTextPosition(math::Vec mousePos) override
+ {
+ bndSetFont(font->handle);
+ int textPos = bndIconLabelTextPosition(APP->window->vg, textOffset.x, textOffset.y,
+ box.size.x - 2 * textOffset.x, box.size.y - 2 * textOffset.y,
+ -1, 12, text.c_str(), mousePos.x, mousePos.y);
+ bndSetFont(APP->window->uiFont->handle);
+ return textPos;
+ }
+ void draw(const DrawArgs &args) override
+ {
+ if(module)
+ {
+ nvgScissor(args.vg, 0, 0, box.size.x, box.size.y);
+
+ // Background
+ nvgFontSize(args.vg, fontSize);
+ nvgBeginPath(args.vg);
+ nvgRoundedRect(args.vg, 0, 0, box.size.x, box.size.y, 10.0);
+
+ if(inError)
+ {
+ nvgFillColor(args.vg, COLOR_COMPUTERSCARE_PINK);
+ }
+ else
+ {
+ nvgFillColor(args.vg, nvgRGB(0x00, 0x00, 0x00));
+ }
+ nvgFill(args.vg);
+
+ // Text
+ if (font->handle >= 0)
+ {
+ bndSetFont(font->handle);
+
+ NVGcolor highlightColor = color;
+ highlightColor.a = 0.5;
+ int begin = fmin(cursor, selection);
+ // int end = (this == gFocusedWidget) ? fmax(cursor, selection) : -1;
+
+ int end = fmax(cursor, selection);
+ //bndTextField(args.vg,textOffset.x,textOffset.y+2, box.size.x, box.size.y, -1, 0, 0, const char *text, int cbegin, int cend);
+ bndIconLabelCaret(args.vg, textOffset.x, textOffset.y - 3,
+ box.size.x - 2 * textOffset.x, box.size.y - 2 * textOffset.y,
+ -1, color, fontSize, text.c_str(), highlightColor, begin, end);
+
+ bndSetFont(font->handle);
+ }
+
+ nvgResetScissor(args.vg);
+ };
- bndSetFont(font->handle);
}
+};
- nvgResetScissor(args.vg);
- };
-}
-};
+struct ComputerscareOhPeas : Module
+{
+ enum ParamIds
+ {
+ GLOBAL_TRANSPOSE,
+ NUM_DIVISIONS,
+ SCALE_TRIM,
+ SCALE_VAL = SCALE_TRIM + numChannels,
+ OFFSET_TRIM = SCALE_VAL + numChannels,
+ OFFSET_VAL = OFFSET_TRIM + numChannels,
+ NUM_PARAMS = OFFSET_VAL + numChannels
+
+ };
+ enum InputIds
+ {
+ CHANNEL_INPUT,
+ SCALE_CV = CHANNEL_INPUT + numChannels,
+ OFFSET_CV = SCALE_CV + numChannels,
+ NUM_INPUTS = OFFSET_CV + numChannels
+ };
+ enum OutputIds
+ {
+ SCALED_OUTPUT,
+ QUANTIZED_OUTPUT = SCALED_OUTPUT + numChannels,
+ NUM_OUTPUTS = QUANTIZED_OUTPUT + numChannels
+ };
+ enum LightIds
+ {
+ BLINK_LIGHT,
+ NUM_LIGHTS
+ };
-struct ComputerscareOhPeas : Module {
- enum ParamIds {
- GLOBAL_TRANSPOSE,
- NUM_DIVISIONS,
- SCALE_TRIM,
- SCALE_VAL = SCALE_TRIM+numChannels,
- OFFSET_TRIM = SCALE_VAL+numChannels,
- OFFSET_VAL = OFFSET_TRIM+numChannels,
- NUM_PARAMS=OFFSET_VAL+numChannels
-
- };
- enum InputIds {
- CHANNEL_INPUT,
- SCALE_CV=CHANNEL_INPUT+numChannels,
- OFFSET_CV=SCALE_CV+numChannels,
- NUM_INPUTS=OFFSET_CV+numChannels
- };
- enum OutputIds {
- SCALED_OUTPUT,
- QUANTIZED_OUTPUT=SCALED_OUTPUT+numChannels,
- NUM_OUTPUTS=QUANTIZED_OUTPUT+numChannels
- };
- enum LightIds {
- BLINK_LIGHT,
- NUM_LIGHTS
- };
-
-
-
- int numDivisions = 12;
- int globalTranspose = 0;
- bool evenQuantizeMode = true;
- std::string currentFormula = "221222";
- std::string numDivisionsString = "";
- SmallLetterDisplay* numDivisionsDisplay;
- SmallLetterDisplay* globalTransposeDisplay;
-
- PeasTextField *textField;
- // this one throws an error I think
- Quantizer quant;
-
- ComputerscareOhPeas() {
- config(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS);
- params[GLOBAL_TRANSPOSE].config(-1.f, 1.f, 0.0f, "Global Transpose");
- params[NUM_DIVISIONS].config(1.f, 24.f, 12.0f, "Number of Divisions");
- for(int i = 0; i < numChannels; i++) {
- std::string chi = "Ch. "+std::to_string(i+1);
- params[ SCALE_TRIM +i].config(-1.f, 1.f, 0.0f, chi+" Scale CV Amount");
- params[ SCALE_VAL +i].config(-5.f, 5.f, 0.0f, chi+" Scale Value");
- params[ OFFSET_TRIM +i].config(-1.f, 1.f, 0.0f, chi+" Offset CV Amount");
- params[ OFFSET_VAL +i].config(-5.f, 5.f, 0.0f, chi+" Offset Value");
-
- }
- /*
- SCALE_TRIM +i, -1.f, 1.f, 0.0f));
-
+ int numDivisions = 12;
+ int globalTranspose = 0;
+ bool evenQuantizeMode = true;
+ std::string currentFormula = "221222";
+ std::string numDivisionsString = "";
+ SmallLetterDisplay *numDivisionsDisplay;
+ SmallLetterDisplay *globalTransposeDisplay;
- SCALE_VAL +i, -1.f, 1.f, 0.0f));
+ PeasTextField *textField;
+ // this one throws an error I think
+ Quantizer quant;
- OFFSET_TRIM +i, -1.f, 1.f, 0.0f));
-
+ ComputerscareOhPeas()
+ {
+ config(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS);
+ params[GLOBAL_TRANSPOSE].config(-1.f, 1.f, 0.0f, "Global Transpose");
+ params[NUM_DIVISIONS].config(1.f, 24.f, 12.0f, "Number of Divisions");
+ for(int i = 0; i < numChannels; i++)
+ {
+ std::string chi = "Ch. " + std::to_string(i + 1);
+ params[ SCALE_TRIM + i].config(-1.f, 1.f, 0.0f, chi + " Scale CV Amount");
+ params[ SCALE_VAL + i].config(-5.f, 5.f, 0.0f, chi + " Scale Value");
+ params[ OFFSET_TRIM + i].config(-1.f, 1.f, 0.0f, chi + " Offset CV Amount");
+ params[ OFFSET_VAL + i].config(-5.f, 5.f, 0.0f, chi + " Offset Value");
- OFFSET_VAL +i, -5.f, 5.f, 0.0f));
- */
- //, 1.f, 24.f, 12.0f NUM_DIVISIONS
- //ComputerscareOhPeas::GLOBAL_TRANSPOSE , -1.f, 1.f, 0.0f
+ }
+ /*
- quant = Quantizer(currentFormula,12,0);
+ SCALE_TRIM +i, -1.f, 1.f, 0.0f));
+
+
+ SCALE_VAL +i, -1.f, 1.f, 0.0f));
+
+ OFFSET_TRIM +i, -1.f, 1.f, 0.0f));
+
+
+ OFFSET_VAL +i, -5.f, 5.f, 0.0f));
+ */
+ //, 1.f, 24.f, 12.0f NUM_DIVISIONS
+ //ComputerscareOhPeas::GLOBAL_TRANSPOSE , -1.f, 1.f, 0.0f
+
+ quant = Quantizer(currentFormula, 12, 0);
+
+ }
+ void process(const ProcessArgs &args) override;
+ /* json_t *toJson() override
+ {
+ json_t *rootJ = json_object();
- }
- void process(const ProcessArgs &args) override;
- /* json_t *toJson() override
- {
- json_t *rootJ = json_object();
-
json_t *sequencesJ = json_array();
for (int i = 0; i < 1; i++) {
json_t *sequenceJ = json_string(textField->text.c_str());
@@ -175,10 +190,10 @@ struct ComputerscareOhPeas : Module {
json_object_set_new(rootJ, "sequences", sequencesJ);
return rootJ;
- }
-
- void fromJson(json_t *rootJ) override
- {
+ }
+
+ void fromJson(json_t *rootJ) override
+ {
json_t *sequencesJ = json_object_get(rootJ, "sequences");
if (sequencesJ) {
for (int i = 0; i < 1; i++) {
@@ -188,224 +203,251 @@ struct ComputerscareOhPeas : Module {
}
}
setQuant();
- }*/
+ }*/
- void setQuant() {
- //std::string value = "23";//this->textField->text;
- printf("delta %s\n",this->currentFormula.c_str());
- this->quant = Quantizer(this->currentFormula.c_str(),this->numDivisions,this->globalTranspose);
- printf("echo \n");
- }
- // For more advanced Module features, read Rack's engine.hpp header file
- // - toJson, fromJson: serialization of internal data
- // - onSampleRateChange: event triggered by a change of sample rate
- // - onReset, onRandomize, onCreate, onDelete: implements special behavior when user clicks these from the context menu
+ void setQuant()
+ {
+ //std::string value = "23";//this->textField->text;
+ printf("delta %s\n", this->currentFormula.c_str());
+ this->quant = Quantizer(this->currentFormula.c_str(), this->numDivisions, this->globalTranspose);
+ printf("echo \n");
+ }
+ // For more advanced Module features, read Rack's engine.hpp header file
+ // - toJson, fromJson: serialization of internal data
+ // - onSampleRateChange: event triggered by a change of sample rate
+ // - onReset, onRandomize, onCreate, onDelete: implements special behavior when user clicks these from the context menu
};
-void PeasTextField::onEnter(const widget::EnterEvent &e) {
- module->setQuant();
- }
+void PeasTextField::onEnter(const widget::EnterEvent &e)
+{
+ module->setQuant();
+}
+
+void ComputerscareOhPeas::process(const ProcessArgs &args)
+{
+ float A, B, C, D, Q, a, b, c, d;
-void ComputerscareOhPeas::process(const ProcessArgs &args) {
- float A,B,C,D,Q,a,b,c,d;
+ int numDivisionsKnobValue = floor(params[NUM_DIVISIONS].getValue());
+ int iTranspose = floor(numDivisionsKnobValue * params[GLOBAL_TRANSPOSE].getValue());
- int numDivisionsKnobValue = floor(params[NUM_DIVISIONS].getValue());
- int iTranspose = floor(numDivisionsKnobValue * params[GLOBAL_TRANSPOSE].getValue());
+ //int globalTransposeKnobValue = (int) clamp(roundf(params[GLOBAL_TRANSPOSE].getValue()), -fNumDiv, fNumDiv);
+
+ if(numDivisionsKnobValue != numDivisions)
+ {
+ //printf("%i, %i, %i, %i\n",numDivisionsKnobValue,numDivisions,iTranspose,globalTranspose);
- //int globalTransposeKnobValue = (int) clamp(roundf(params[GLOBAL_TRANSPOSE].getValue()), -fNumDiv, fNumDiv);
+ //what a hack!!!
+ if(numDivisionsKnobValue != 0)
+ {
+ numDivisions = numDivisionsKnobValue;
+ setQuant();
+ }
- if(numDivisionsKnobValue != numDivisions) {
- //printf("%i, %i, %i, %i\n",numDivisionsKnobValue,numDivisions,iTranspose,globalTranspose);
-
- //what a hack!!!
- if(numDivisionsKnobValue != 0){
- numDivisions = numDivisionsKnobValue;
- setQuant();
}
-
- }
- if(iTranspose != globalTranspose) {
+ if(iTranspose != globalTranspose)
+ {
//printf("%i, %i, %i, %i\n",numDivisionsKnobValue,numDivisions,iTranspose,globalTranspose);
- globalTranspose = iTranspose;
- setQuant();
- }
- for(int i = 0; i < numChannels; i++) {
-
- a = params[SCALE_VAL+i].getValue();
-
- b = params[SCALE_TRIM+i].getValue();
- B = inputs[SCALE_CV+i].getVoltage();
- A = inputs[CHANNEL_INPUT+i].getVoltage();
-
- c = params[OFFSET_TRIM+i].getValue();
- C = inputs[OFFSET_CV+i].getVoltage();
- d = params[OFFSET_VAL+i].getValue();
-
- D = (b*B + a)*A + (c*C + d);
-
- Q = quant.quantizeEven(D,iTranspose);
-
- outputs[SCALED_OUTPUT + i].setVoltage(D);
- outputs[QUANTIZED_OUTPUT + i].setVoltage(Q);
- }
+ globalTranspose = iTranspose;
+ setQuant();
+ }
+ for(int i = 0; i < numChannels; i++)
+ {
+
+ a = params[SCALE_VAL + i].getValue();
+
+ b = params[SCALE_TRIM + i].getValue();
+ B = inputs[SCALE_CV + i].getVoltage();
+ A = inputs[CHANNEL_INPUT + i].getVoltage();
+
+ c = params[OFFSET_TRIM + i].getValue();
+ C = inputs[OFFSET_CV + i].getVoltage();
+ d = params[OFFSET_VAL + i].getValue();
+
+ D = (b * B + a) * A + (c * C + d);
+
+ Q = quant.quantizeEven(D, iTranspose);
+
+ outputs[SCALED_OUTPUT + i].setVoltage(D);
+ outputs[QUANTIZED_OUTPUT + i].setVoltage(Q);
+ }
}
////////////////////////////////////
-struct StringDisplayWidget3 : TransparentWidget {
-
- std::string *value;
- std::shared_ptr<Font> font;
-
- StringDisplayWidget3() {
- font = APP->window->loadFont(asset::plugin(pluginInstance, "res/Oswald-Regular.ttf"));
- };
-
- void draw(const DrawArgs &args) override
- {
- // Background
- NVGcolor backgroundColor = nvgRGB(0x10, 0x00, 0x10);
- NVGcolor StrokeColor = nvgRGB(0xC0, 0xC7, 0xDE);
- nvgBeginPath(args.vg);
- nvgRoundedRect(args.vg, -1.0, -1.0, box.size.x+2, box.size.y+2, 4.0);
- nvgFillColor(args.vg, StrokeColor);
- nvgFill(args.vg);
- nvgBeginPath(args.vg);
- nvgRoundedRect(args.vg, 0.0, 0.0, box.size.x, box.size.y, 4.0);
- nvgFillColor(args.vg, backgroundColor);
- nvgFill(args.vg);
-
- // text
- nvgFontSize(args.vg, 15);
- nvgFontFaceId(args.vg, font->handle);
- nvgTextLetterSpacing(args.vg, 2.5);
+struct StringDisplayWidget3 : TransparentWidget
+{
- std::stringstream to_display;
- to_display << std::setw(8) << *value;
+ std::string *value;
+ std::shared_ptr<Font> font;
- Vec textPos = Vec(6.0f, 12.0f);
- NVGcolor textColor = nvgRGB(0xC0, 0xE7, 0xDE);
- nvgFillColor(args.vg, textColor);
- nvgTextBox(args.vg, textPos.x, textPos.y,80,to_display.str().c_str(), NULL);
+ StringDisplayWidget3()
+ {
+ font = APP->window->loadFont(asset::plugin(pluginInstance, "res/Oswald-Regular.ttf"));
+ };
- }
+ void draw(const DrawArgs &args) override
+ {
+ // Background
+ NVGcolor backgroundColor = nvgRGB(0x10, 0x00, 0x10);
+ NVGcolor StrokeColor = nvgRGB(0xC0, 0xC7, 0xDE);
+ nvgBeginPath(args.vg);
+ nvgRoundedRect(args.vg, -1.0, -1.0, box.size.x + 2, box.size.y + 2, 4.0);
+ nvgFillColor(args.vg, StrokeColor);
+ nvgFill(args.vg);
+ nvgBeginPath(args.vg);
+ nvgRoundedRect(args.vg, 0.0, 0.0, box.size.x, box.size.y, 4.0);
+ nvgFillColor(args.vg, backgroundColor);
+ nvgFill(args.vg);
+
+ // text
+ nvgFontSize(args.vg, 15);
+ nvgFontFaceId(args.vg, font->handle);
+ nvgTextLetterSpacing(args.vg, 2.5);
+
+ std::stringstream to_display;
+ to_display << std::setw(8) << *value;
+
+ Vec textPos = Vec(6.0f, 12.0f);
+ NVGcolor textColor = nvgRGB(0xC0, 0xE7, 0xDE);
+ nvgFillColor(args.vg, textColor);
+ nvgTextBox(args.vg, textPos.x, textPos.y, 80, to_display.str().c_str(), NULL);
+
+ }
};
-struct SetQuantizationModeMenuItem : MenuItem {
- ComputerscareOhPeas *peas;
+struct SetQuantizationModeMenuItem : MenuItem
+{
+ ComputerscareOhPeas *peas;
- bool mode = true;
- SetQuantizationModeMenuItem(bool evenMode) {
- mode=evenMode;
- }
- void doAction() {
- peas->evenQuantizeMode = mode;
- }
- void step() override {
- rightText = CHECKMARK(peas->evenQuantizeMode == mode);
- MenuItem::step();
- }
+ bool mode = true;
+ SetQuantizationModeMenuItem(bool evenMode)
+ {
+ mode = evenMode;
+ }
+ void doAction()
+ {
+ peas->evenQuantizeMode = mode;
+ }
+ void step() override
+ {
+ rightText = CHECKMARK(peas->evenQuantizeMode == mode);
+ MenuItem::step();
+ }
};
-struct PeasTF2 : ComputerscareTextField {
- ComputerscareOhPeas *module;
- int fontSize = 16;
- int rowIndex=0;
- bool inError = false;
-
- PeasTF2() {
- ComputerscareTextField();
- };
- void draw(const DrawArgs &args) override {
- if(module) {
- if(text.c_str()!=module->currentFormula) {
- module->currentFormula = text.c_str();
- module->setQuant();
- }
+struct PeasTF2 : ComputerscareTextField
+{
+ ComputerscareOhPeas *module;
+ int fontSize = 16;
+ int rowIndex = 0;
+ bool inError = false;
+
+ PeasTF2()
+ {
+ ComputerscareTextField();
+ };
+ void draw(const DrawArgs &args) override
+ {
+ if(module)
+ {
+ if(text.c_str() != module->currentFormula)
+ {
+ module->currentFormula = text.c_str();
+ module->setQuant();
+ }
+ }
+ ComputerscareTextField::draw(args);
}
- ComputerscareTextField::draw(args);
- }
- //void draw(const DrawArgs &args) override;
- //int getTextPosition(math::Vec mousePos) override;
+ //void draw(const DrawArgs &args) override;
+ //int getTextPosition(math::Vec mousePos) override;
};
-struct PeasSmallDisplay : SmallLetterDisplay {
- ComputerscareOhPeas *module;
- int type;
- PeasSmallDisplay(int t) {
- type = t;
- SmallLetterDisplay();
- };
- void draw(const DrawArgs &args) {
- //this->setNumDivisionsString();
- if(module) {
- if(type==0) {
-
- std::string transposeString = (module->globalTranspose > 0 ? "+" : "" ) + std::to_string(module->globalTranspose);
- value = transposeString;
- }
- else {
- std::string numDivisionsDisplay = std::to_string(module->numDivisions);
- value = numDivisionsDisplay;
- }
-
+struct PeasSmallDisplay : SmallLetterDisplay
+{
+ ComputerscareOhPeas *module;
+ int type;
+ PeasSmallDisplay(int t)
+ {
+ type = t;
+ SmallLetterDisplay();
+ };
+ void draw(const DrawArgs &args)
+ {
+ //this->setNumDivisionsString();
+ if(module)
+ {
+ if(type == 0)
+ {
+
+ std::string transposeString = (module->globalTranspose > 0 ? "+" : "" ) + std::to_string(module->globalTranspose);
+ value = transposeString;
+ }
+ else
+ {
+ std::string numDivisionsDisplay = std::to_string(module->numDivisions);
+ value = numDivisionsDisplay;
+ }
+
+ }
+ SmallLetterDisplay::draw(args);
}
- SmallLetterDisplay::draw(args);
- }
};
-void quantizationModeMenuItemAdd(ComputerscareOhPeas* peas, Menu* menu, bool evenMode, std::string label) {
- SetQuantizationModeMenuItem *menuItem = new SetQuantizationModeMenuItem(evenMode);
- menuItem->text = label;
- menuItem->peas = peas;
- menu->addChild(menuItem);
+void quantizationModeMenuItemAdd(ComputerscareOhPeas *peas, Menu *menu, bool evenMode, std::string label)
+{
+ SetQuantizationModeMenuItem *menuItem = new SetQuantizationModeMenuItem(evenMode);
+ menuItem->text = label;
+ menuItem->peas = peas;
+ menu->addChild(menuItem);
}
//this->numDivisions,this->globalTranspose
-struct ComputerscareOhPeasWidget : ModuleWidget {
- float randAmt = 0.f;
- //PeasTextField* textFieldTemp;
-
- //TextField *textFieldTemp;
- ComputerscareOhPeasWidget(ComputerscareOhPeas *module) {
- setModule(module);
- //setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/ComputerscareOhPeasPanel.svg")));
- box.size = Vec(9*15, 380);
- {
- ComputerscareSVGPanel *panel = new ComputerscareSVGPanel();
- panel->box.size = box.size;
- panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance,"res/ComputerscareOhPeasPanel.svg")));
-
- //module->panelRef = panel;
+struct ComputerscareOhPeasWidget : ModuleWidget
+{
+ float randAmt = 0.f;
+ //PeasTextField* textFieldTemp;
- addChild(panel);
-
- }
- double x = 1;
- double y = 7;
- //double dy = 18.4;
- double dx = 9.95;
- double xx;
- double yy=18;
- addParam(createParam<MediumSnapKnob>(mm2px(Vec(11,yy-2)), module, ComputerscareOhPeas::NUM_DIVISIONS ));
-
- addParam(createParam<SmoothKnob>(mm2px(Vec(21,yy-2)), module, ComputerscareOhPeas::GLOBAL_TRANSPOSE));
-
- textFieldTemp = createWidget<PeasTF2>(mm2px(Vec(x,y+24)));
+ //TextField *textFieldTemp;
+ ComputerscareOhPeasWidget(ComputerscareOhPeas *module)
+ {
+ setModule(module);
+ //setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/ComputerscareOhPeasPanel.svg")));
+ box.size = Vec(9 * 15, 380);
+ {
+ ComputerscareSVGPanel *panel = new ComputerscareSVGPanel();
+ panel->box.size = box.size;
+ panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/ComputerscareOhPeasPanel.svg")));
+
+ //module->panelRef = panel;
+
+ addChild(panel);
+
+ }
+ double x = 1;
+ double y = 7;
+ //double dy = 18.4;
+ double dx = 9.95;
+ double xx;
+ double yy = 18;
+ addParam(createParam<MediumSnapKnob>(mm2px(Vec(11, yy - 2)), module, ComputerscareOhPeas::NUM_DIVISIONS ));
+
+ addParam(createParam<SmoothKnob>(mm2px(Vec(21, yy - 2)), module, ComputerscareOhPeas::GLOBAL_TRANSPOSE));
+
+ textFieldTemp = createWidget<PeasTF2>(mm2px(Vec(x, y + 24)));
textFieldTemp->module = module;
- textFieldTemp->box.size = mm2px(Vec(44, 7));
- textFieldTemp->multiline = false;
- textFieldTemp->color = nvgRGB(0xC0, 0xE7, 0xDE);
+ textFieldTemp->box.size = mm2px(Vec(44, 7));
+ textFieldTemp->multiline = false;
+ textFieldTemp->color = nvgRGB(0xC0, 0xE7, 0xDE);
textFieldTemp->text = "221222";
- addChild(textFieldTemp);
+ addChild(textFieldTemp);
- ndd = new PeasSmallDisplay(1);
+ ndd = new PeasSmallDisplay(1);
ndd->module = module;
- ndd->box.pos = mm2px(Vec(2,yy));
+ ndd->box.pos = mm2px(Vec(2, yy));
ndd->box.size = mm2px(Vec(9, 7));
ndd->value = "";
ndd->baseColor = COLOR_COMPUTERSCARE_LIGHT_GREEN;
@@ -414,112 +456,123 @@ struct ComputerscareOhPeasWidget : ModuleWidget {
transposeDisplay = new PeasSmallDisplay(0);
transposeDisplay->module = module;
- transposeDisplay->box.pos = mm2px(Vec(30,yy));
+ transposeDisplay->box.pos = mm2px(Vec(30, yy));
transposeDisplay->box.size = mm2px(Vec(11, 7));
transposeDisplay->letterSpacing = 2.f;
transposeDisplay->value = "";
transposeDisplay->baseColor = COLOR_COMPUTERSCARE_LIGHT_GREEN;
addChild(transposeDisplay);
- for(int i = 0; i < numChannels; i++) {
+ for(int i = 0; i < numChannels; i++)
+ {
- xx = x + dx*i+randAmt*(2*random::uniform()-.5);
- y+=randAmt*(random::uniform()-.5);
- addInput(createInput<InPort>(mm2px(Vec(xx, y-0.8)), module, ComputerscareOhPeas::CHANNEL_INPUT+i));
+ xx = x + dx * i + randAmt * (2 * random::uniform() - .5);
+ y += randAmt * (random::uniform() - .5);
+ addInput(createInput<InPort>(mm2px(Vec(xx, y - 0.8)), module, ComputerscareOhPeas::CHANNEL_INPUT + i));
- addParam(createParam<SmallKnob>(mm2px(Vec(xx+2,y+34)), module, ComputerscareOhPeas::SCALE_TRIM +i));
-
- addInput(createInput<InPort>(mm2px(Vec(xx, y+40)), module, ComputerscareOhPeas::SCALE_CV+i));
+ addParam(createParam<SmallKnob>(mm2px(Vec(xx + 2, y + 34)), module, ComputerscareOhPeas::SCALE_TRIM + i));
- addParam(createParam<SmoothKnob>(mm2px(Vec(xx,y+50)), module, ComputerscareOhPeas::SCALE_VAL +i));
+ addInput(createInput<InPort>(mm2px(Vec(xx, y + 40)), module, ComputerscareOhPeas::SCALE_CV + i));
- addParam(createParam<ComputerscareDotKnob>(mm2px(Vec(xx+2,y+64)), module, ComputerscareOhPeas::OFFSET_TRIM +i));
-
- addInput(createInput<InPort>(mm2px(Vec(xx, y+70)), module, ComputerscareOhPeas::OFFSET_CV+i));
+ addParam(createParam<SmoothKnob>(mm2px(Vec(xx, y + 50)), module, ComputerscareOhPeas::SCALE_VAL + i));
+ addParam(createParam<ComputerscareDotKnob>(mm2px(Vec(xx + 2, y + 64)), module, ComputerscareOhPeas::OFFSET_TRIM + i));
- addParam(createParam<SmoothKnob>(mm2px(Vec(xx,y+80)), module, ComputerscareOhPeas::OFFSET_VAL +i));
+ addInput(createInput<InPort>(mm2px(Vec(xx, y + 70)), module, ComputerscareOhPeas::OFFSET_CV + i));
- addOutput(createOutput<OutPort>(mm2px(Vec(xx , y+93)), module, ComputerscareOhPeas::SCALED_OUTPUT + i));
- addOutput(createOutput<InPort>(mm2px(Vec(xx+1 , y+108)), module, ComputerscareOhPeas::QUANTIZED_OUTPUT + i));
+ addParam(createParam<SmoothKnob>(mm2px(Vec(xx, y + 80)), module, ComputerscareOhPeas::OFFSET_VAL + i));
- }
- }
- json_t *toJson() override {
- json_t *rootJ = ModuleWidget::toJson();
+ addOutput(createOutput<OutPort>(mm2px(Vec(xx, y + 93)), module, ComputerscareOhPeas::SCALED_OUTPUT + i));
- // text
- json_object_set_new(rootJ, "sequences", json_string(textFieldTemp->text.c_str()));
+ addOutput(createOutput<InPort>(mm2px(Vec(xx + 1, y + 108)), module, ComputerscareOhPeas::QUANTIZED_OUTPUT + i));
- return rootJ;
- }
+ }
+ }
+ json_t *toJson() override
+ {
+ json_t *rootJ = ModuleWidget::toJson();
- void fromJson(json_t *rootJ) override {
- ModuleWidget::fromJson(rootJ);
+ // text
+ json_object_set_new(rootJ, "sequences", json_string(textFieldTemp->text.c_str()));
- // text
- json_t *textJ = json_object_get(rootJ, "sequences");
- if (textJ)
- textFieldTemp->text = json_string_value(textJ);
+ return rootJ;
+ }
- //module->setQuant();
- }
-
+ void fromJson(json_t *rootJ) override
+ {
+ ModuleWidget::fromJson(rootJ);
- PeasTF2 *textFieldTemp;
- SmallLetterDisplay* trimPlusMinus;
- PeasSmallDisplay* ndd;
- PeasSmallDisplay* transposeDisplay;
- void scaleItemAdd(ComputerscareOhPeas* peas, Menu* menu, std::string scale, std::string label);
- void appendContextMenu(Menu *menu) override;
+ // text
+ json_t *textJ = json_object_get(rootJ, "sequences");
+ if (textJ)
+ textFieldTemp->text = json_string_value(textJ);
+
+ //module->setQuant();
+ }
+
+
+ PeasTF2 *textFieldTemp;
+ SmallLetterDisplay *trimPlusMinus;
+ PeasSmallDisplay *ndd;
+ PeasSmallDisplay *transposeDisplay;
+ void scaleItemAdd(ComputerscareOhPeas *peas, Menu *menu, std::string scale, std::string label);
+ void appendContextMenu(Menu *menu) override;
};
-struct SetScaleMenuItem : MenuItem {
- ComputerscareOhPeas *peas;
- ComputerscareOhPeasWidget *peasWidget;
- std::string scale="221222";
- SetScaleMenuItem(std::string scaleInput) {
- scale=scaleInput;
- }
-
- void onAction(const widget::ActionEvent &e) override {
- peasWidget->textFieldTemp->text = scale;
- peas->setQuant();
- }
+struct SetScaleMenuItem : MenuItem
+{
+ ComputerscareOhPeas *peas;
+ ComputerscareOhPeasWidget *peasWidget;
+ std::string scale = "221222";
+ SetScaleMenuItem(std::string scaleInput)
+ {
+ scale = scaleInput;
+ }
+
+ void onAction(const widget::ActionEvent &e) override
+ {
+ peasWidget->textFieldTemp->text = scale;
+ peas->setQuant();
+ }
};
-void ComputerscareOhPeasWidget::scaleItemAdd(ComputerscareOhPeas* peas, Menu* menu, std::string scale, std::string label) {
- SetScaleMenuItem *menuItem = new SetScaleMenuItem(scale);
- menuItem->text = label;
- menuItem->peas = peas;
- menuItem->peasWidget = this;
- menu->addChild(menuItem);
+void ComputerscareOhPeasWidget::scaleItemAdd(ComputerscareOhPeas *peas, Menu *menu, std::string scale, std::string label)
+{
+ SetScaleMenuItem *menuItem = new SetScaleMenuItem(scale);
+ menuItem->text = label;
+ menuItem->peas = peas;
+ menuItem->peasWidget = this;
+ menu->addChild(menuItem);
}
-void ComputerscareOhPeasWidget::appendContextMenu(Menu *menu) {
- ComputerscareOhPeas *peas = dynamic_cast<ComputerscareOhPeas*>(this->module);
-
- MenuLabel *spacerLabel = new MenuLabel();
- menu->addChild(spacerLabel);
-
-
- MenuLabel *modeLabel = new MenuLabel();
- modeLabel->text = "Scale Presets";
- menu->addChild(modeLabel);
-
- scaleItemAdd(peas,menu,"221222","Major");
- scaleItemAdd(peas,menu,"212212","Natural Minor");
- scaleItemAdd(peas,menu,"2232","Major Pentatonic");
- scaleItemAdd(peas,menu,"3223","Minor Pentatonic");
- scaleItemAdd(peas,menu,"32113","Blues");
- scaleItemAdd(peas,menu,"11111111111","Chromatic");
- scaleItemAdd(peas,menu,"212213","Harmonic Minor");
- scaleItemAdd(peas,menu,"43","Major Triad");
- scaleItemAdd(peas,menu,"34","Minor Triad");
- scaleItemAdd(peas,menu,"33","Diminished Triad");
- scaleItemAdd(peas,menu,"434","Major 7 Tetrachord");
- scaleItemAdd(peas,menu,"433","Dominant 7 Tetrachord");
- scaleItemAdd(peas,menu,"343","Minor 7 Tetrachord");
- scaleItemAdd(peas,menu,"334","Minor 7 b5 Tetrachord");
+void ComputerscareOhPeasWidget::appendContextMenu(Menu *menu)
+{
+ ComputerscareOhPeas *peas = dynamic_cast<ComputerscareOhPeas *>(this->module);
+
+ MenuLabel *spacerLabel = new MenuLabel();
+ menu->addChild(spacerLabel);
+
+
+ MenuLabel *modeLabel = new MenuLabel();
+ modeLabel->text = "Scale Presets";
+ menu->addChild(modeLabel);
+
+ scaleItemAdd(peas, menu, "221222", "Major");
+ scaleItemAdd(peas, menu, "212212", "Natural Minor");
+ scaleItemAdd(peas, menu, "2232", "Major Pentatonic");
+ scaleItemAdd(peas, menu, "3223", "Minor Pentatonic");
+ scaleItemAdd(peas, menu, "32113", "Blues");
+ scaleItemAdd(peas, menu, "11111111111", "Chromatic");
+ scaleItemAdd(peas, menu, "212213", "Harmonic Minor");
+ scaleItemAdd(peas,menu,"22222","Whole-Tone");
+ scaleItemAdd(peas,menu,"2121212","Whole-Half Diminished");
+
+ scaleItemAdd(peas, menu, "43", "Major Triad");
+ scaleItemAdd(peas, menu, "34", "Minor Triad");
+ scaleItemAdd(peas, menu, "33", "Diminished Triad");
+ scaleItemAdd(peas, menu, "434", "Major 7 Tetrachord");
+ scaleItemAdd(peas, menu, "433", "Dominant 7 Tetrachord");
+ scaleItemAdd(peas, menu, "343", "Minor 7 Tetrachord");
+ scaleItemAdd(peas, menu, "334", "Minor 7 b5 Tetrachord");
}
// Specify the Module and ModuleWidget subclass, human-readable
