commit 9db81bb9f228f30eca3b9f9d49d6ff66f224ec84
parent 787998642975529d20335ffa1fad88b2f4ff7f4f
Author: Adam M <[email protected]>
Date: Fri, 5 Jul 2019 18:20:37 -0500
Cookies works with v1
Diffstat:
6 files changed, 371 insertions(+), 256 deletions(-)
diff --git a/Makefile b/Makefile
@@ -20,6 +20,7 @@ SOURCES += $(wildcard src/ComputerscareKnolyPobs.cpp)
SOURCES += $(wildcard src/ComputerscareBolyPuttons.cpp)
SOURCES += $(wildcard src/ComputerscarePatchSequencer.cpp)
SOURCES += $(wildcard src/ComputerscareLaundrySoup.cpp)
+SOURCES += $(wildcard src/ComputerscareILoveCookies.cpp)
SOURCES += $(wildcard src/ComputerscareDebug.cpp)
SOURCES += $(wildcard src/ComputerscareOhPeas.cpp)
diff --git a/plugin.json b/plugin.json
@@ -13,33 +13,39 @@
{"slug":"computerscare-knolypobs",
"name":"Knoly Pobs",
"description":"16 knobs with polyphonic output",
- "tags":["Poly","Utility"]
+ "tags":["Polyphonic","Utility"]
},
{"slug":"computerscare-bolyputtons",
"name":"Boly Puttons",
"description":"16 momentary or latch buttons with polyphonic output and optional input",
- "tags":["Poly","Utility"]
+ "tags":["Polyphonic","Utility"]
},
{"slug":"computerscare-debug",
"name":"Debug",
"description":"Debugger, poly sample & hold, poly volt meter",
- "tags":["Poly","Utility"]
+ "tags":["Polyphonic","Utility","Random","Sample and hold"]
},
{"slug":"computerscare-ohpeas",
"name":"Oh Peas!",
"description":"Quad Quantenuverter. Attenuverter, Offsetter, Microtonal Quantizer",
- "tags":["Poly","Quantizer","Utility"]
+ "tags":["Polyphonic","Quantizer","Utility","Quad"]
},
{"slug":"computerscare-fatherandson",
"name":"Father and Son Patch Sequencer",
"description":"Patch Sequencer - 10 in, 10 out patch matrix with 16 scenes",
- "tags":["Poly","Utility"]
+ "tags":["Polyphonic","Utility","Sequencer"]
},
{"slug":"computerscare-laundry-soup",
"name":"Laundry Soup",
"description":"Rhythm sequencer, pulse generator, text-based",
- "tags":["Sequencer"]
+ "tags":["Sequencer","Clock modulator","Random"]
+ },
+
+ {"slug":"computerscare-i-love-cookies",
+ "name":"I Love Cookies",
+ "description":"Text-based CV and signal sequencer",
+ "tags":["Sequencer","Utility","Random"]
}
]
}
\ No newline at end of file
diff --git a/src/Computerscare.cpp b/src/Computerscare.cpp
@@ -10,7 +10,7 @@ void init(Plugin *p) {
p->addModel(modelComputerscarePatchSequencer);
p->addModel(modelComputerscareLaundrySoup);
- //p->addModel(modelComputerscareILoveCookies);
+ p->addModel(modelComputerscareILoveCookies);
p->addModel(modelComputerscareOhPeas);
//p->addModel(modelComputerscareIso);
p->addModel(modelComputerscareKnolyPobs);
diff --git a/src/Computerscare.hpp b/src/Computerscare.hpp
@@ -28,7 +28,7 @@ extern Model *modelComputerscareDebug;
extern Model *modelComputerscarePatchSequencer;
extern Model *modelComputerscareLaundrySoup;
-//extern Model *modelComputerscareILoveCookies;
+extern Model *modelComputerscareILoveCookies;
extern Model *modelComputerscareOhPeas;
//extern Model *modelComputerscareIso;
extern Model *modelComputerscareKnolyPobs;
@@ -359,9 +359,11 @@ struct SmallLetterDisplay : Widget {
bool doubleblink = false;
SmallLetterDisplay() {
+ value = "";
font = APP->window->loadFont(asset::plugin(pluginInstance, defaultFontPath));
};
SmallLetterDisplay(std::string fontPath) {
+ value = "";
font = APP->window->loadFont(asset::plugin(pluginInstance, fontPath));
};
diff --git a/src/ComputerscareILoveCookies.cpp b/src/ComputerscareILoveCookies.cpp
@@ -9,6 +9,9 @@
#include <iomanip>
struct ComputerscareILoveCookies;
+struct CookiesTF2;
+struct CookiesSmallDisplay;
+struct CookiesCurrentStepDisplay;
const int numFields = 6;
const int numKnobRows = 13;
@@ -16,20 +19,16 @@ const int numKnobColumns = 2;
const int numInputRows = 13;
const int numInputColumns = 2;
-const int LG_FONT_SIZE = 18;
-const int MED_FONT_SIZE = 12;
-const int SM_FONT_SIZE = 8;
-
const int numKnobs = numKnobRows * numKnobColumns;
const int numInputs = numInputRows * numInputColumns;
-const std::vector<NVGcolor> outlineColorMap = {COLOR_COMPUTERSCARE_RED,COLOR_COMPUTERSCARE_YELLOW,COLOR_COMPUTERSCARE_BLUE};
+const std::vector<NVGcolor> outlineColorMap = {COLOR_COMPUTERSCARE_RED, COLOR_COMPUTERSCARE_YELLOW, COLOR_COMPUTERSCARE_BLUE};
-class MyTextFieldCookie : public LedDisplayTextField {
+/*class MyTextFieldCookie : public LedDisplayTextField {
public:
int fontSize = LG_FONT_SIZE;
- int rowIndex=0;
+ int rowIndex = 0;
bool inError = false;
MyTextFieldCookie() : LedDisplayTextField() {}
void setModule(ComputerscareILoveCookies* _module) {
@@ -39,8 +38,8 @@ public:
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);
+ 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;
}
@@ -51,7 +50,7 @@ public:
nvgFontSize(args.vg, fontSize);
nvgBeginPath(args.vg);
nvgRoundedRect(args.vg, 0, 0, box.size.x, box.size.y, 5.0);
- if(inError) {
+ if (inError) {
nvgFillColor(args.vg, COLOR_COMPUTERSCARE_PINK);
}
else {
@@ -69,8 +68,8 @@ public:
int end = (this == gFocusedWidget) ? max(cursor, selection) : -1;
//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);
+ box.size.x - 2 * textOffset.x, box.size.y - 2 * textOffset.y,
+ -1, color, fontSize, text.c_str(), highlightColor, begin, end);
bndSetFont(gGuiFont->handle);
}
@@ -80,135 +79,124 @@ public:
private:
ComputerscareILoveCookies* module;
-};
+};*/
struct ComputerscareILoveCookies : Module {
- enum ParamIds {
- KNOB_PARAM,
- MANUAL_CLOCK_PARAM = KNOB_PARAM + numKnobs,
- MANUAL_RESET_PARAM,
- INDIVIDUAL_RESET_PARAM,
- NUM_PARAMS = INDIVIDUAL_RESET_PARAM + numFields
- };
- enum InputIds {
+ enum ParamIds {
+ KNOB_PARAM,
+ MANUAL_CLOCK_PARAM = KNOB_PARAM + numKnobs,
+ MANUAL_RESET_PARAM,
+ INDIVIDUAL_RESET_PARAM,
+ NUM_PARAMS = INDIVIDUAL_RESET_PARAM + numFields
+ };
+ enum InputIds {
GLOBAL_CLOCK_INPUT,
GLOBAL_RESET_INPUT,
CLOCK_INPUT,
RESET_INPUT = CLOCK_INPUT + numFields,
SIGNAL_INPUT = RESET_INPUT + numFields ,
- NUM_INPUTS = SIGNAL_INPUT + numInputs
- };
- enum OutputIds {
+ NUM_INPUTS = SIGNAL_INPUT + numInputs
+ };
+ enum OutputIds {
TRG_OUTPUT,
FIRST_STEP_OUTPUT = TRG_OUTPUT + numFields,
- NUM_OUTPUTS = FIRST_STEP_OUTPUT + numFields
- };
+ NUM_OUTPUTS = FIRST_STEP_OUTPUT + numFields
+ };
enum LightIds {
- SWITCH_LIGHTS,
- NUM_LIGHTS = SWITCH_LIGHTS + (numKnobs + numInputs)*numFields
- };
+ SWITCH_LIGHTS,
+ NUM_LIGHTS = SWITCH_LIGHTS + (numKnobs + numInputs) * numFields
+ };
- SchmittTrigger globalClockTrigger;
- SchmittTrigger globalResetTriggerInput;
+ rack::dsp::SchmittTrigger globalClockTrigger;
+ rack::dsp::SchmittTrigger globalResetTriggerInput;
- SchmittTrigger globalManualClockTrigger;
- SchmittTrigger globalManualResetTrigger;
+ rack::dsp::SchmittTrigger globalManualClockTrigger;
+ rack::dsp::SchmittTrigger globalManualResetTrigger;
- SchmittTrigger clockTriggers[numFields];
- SchmittTrigger resetTriggers[numFields];
+ rack::dsp::SchmittTrigger clockTriggers[numFields];
+ rack::dsp::SchmittTrigger resetTriggers[numFields];
- SchmittTrigger manualResetTriggers[numFields];
+ rack::dsp::SchmittTrigger manualResetTriggers[numFields];
- MyTextFieldCookie* textFields[numFields];
SmallLetterDisplay* smallLetterDisplays[numFields];
SmallLetterDisplay* currentWorkingStepDisplays[numFields];
AbsoluteSequence newABS[numFields];
AbsoluteSequence newABSQueue[numFields];
-
+
+ std::string currentFormula[numFields];
+ std::string lastValue[numFields];
+
+
+ bool manualSet[numFields] = {false};
bool shouldChange[numFields] = {false};
bool changeImminent[numFields] = {false};
int activeKnobIndex[numFields] = {0};
-
- std::vector<ParamWidget*> smallLetterKnobs;
-ComputerscareILoveCookies() {
- config(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS);}
- void process(const ProcessArgs &args) override;
+ std::vector<ParamWidget*> smallLetterKnobs;
- json_t *toJson() override
- {
- json_t *rootJ = json_object();
-
- json_t *sequencesJ = json_array();
+ ComputerscareILoveCookies() {
+ config(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS);
for (int i = 0; i < numFields; i++) {
- json_t *sequenceJ = json_string(textFields[i]->text.c_str());
- json_array_append_new(sequencesJ, sequenceJ);
- }
- json_object_set_new(rootJ, "sequences", sequencesJ);
-
- return rootJ;
- }
-
- void fromJson(json_t *rootJ) override
- {
- json_t *sequencesJ = json_object_get(rootJ, "sequences");
- if (sequencesJ) {
- for (int i = 0; i < numFields; i++) {
- json_t *sequenceJ = json_array_get(sequencesJ, i);
- if (sequenceJ)
- textFields[i]->text = json_string_value(sequenceJ);
- }
+ currentFormula[i] = "";
+ lastValue[i] = "";
+ setNextAbsoluteSequence(i);
+ checkIfShouldChange(i);
+ resetOneOfThem(i);
}
- onCreate();
}
-
+ void process(const ProcessArgs &args) override;
+
+
+
void onRandomize() override {
}
void randomizeShuffle() {
}
void wiggleKnobs() {
- for(int i = 0; i < numKnobs; i++) {
- float prev = params[KNOB_PARAM+i].getValue();
- if(random::uniform() < 0.7) {
- float rv = (10*random::uniform()+2*prev)/3;
+ /*for (int i = 0; i < numKnobs; i++) {
+ float prev = params[KNOB_PARAM + i].getValue();
+ if (random::uniform() < 0.7) {
+ float rv = (10 * random::uniform() + 2 * prev) / 3;
this->smallLetterKnobs[i]->setValue(rv);
- params[KNOB_PARAM+i].getValue() = rv;
+ params[KNOB_PARAM + i].getValue() = rv;
}
- }
+ }*/
}
void randomizeTextFields() {
std::string mainlookup = knoblookup;
std::string str = "";
std::string randchar = "";
-
+
float ru;
int length = 0;
for (int i = 0; i < numFields; i++) {
-
- length = floor(random::uniform()*12) + 2;
+
+ length = floor(random::uniform() * 12) + 2;
str = "";
- for(int j = 0; j < length; j++) {
- randchar = mainlookup[floor(random::uniform()*mainlookup.size())];
+ for (int j = 0; j < length; j++) {
+ randchar = mainlookup[floor(random::uniform() * mainlookup.size())];
str = str + randchar;
ru = random::uniform();
- if(ru < 0.1) {
+ if (ru < 0.1) {
str = "(" + str + ")";
}
}
- textFields[i]->text = str;
+ currentFormula[i] = str;
+ manualSet[i] = true;
+
setNextAbsoluteSequence(i);
}
}
- void checkLength(int index) {
- std::string value=textFields[index]->text;
+ /*void checkLength(int index) {
+ std::string value = textFields[index]->text;
int length = value.length();
- textFields[index]->fontSize = length > 17 ? (length > 30 ? SM_FONT_SIZE : MED_FONT_SIZE) : LG_FONT_SIZE;
- }
+ textFields[index]->fontSize = length > 17 ? (length > 30 ? SM_FONT_SIZE : MED_FONT_SIZE) : LG_FONT_SIZE;
+ }*/
void setNextAbsoluteSequence(int index) {
- newABSQueue[index] = AbsoluteSequence(textFields[index]->text,knobandinputlookup);
+ newABSQueue[index] = AbsoluteSequence(currentFormula[index], knobandinputlookup);
shouldChange[index] = true;
}
void setAbsoluteSequenceFromQueue(int index) {
@@ -216,84 +204,65 @@ ComputerscareILoveCookies() {
newABS[index].incrementAndCheck();
}
void checkIfShouldChange(int index) {
- if(shouldChange[index]) {
+ if (shouldChange[index]) {
setAbsoluteSequenceFromQueue(index);
shouldChange[index] = false;
- updateDisplayBlink(index);
}
}
- void updateDisplayBlink(int index) {
- smallLetterDisplays[index]->blink = shouldChange[index];
- }
-void onCreate () override
- {
- for(int i = 0; i < numFields; i++) {
- setNextAbsoluteSequence(i);
- checkIfShouldChange(i);
- resetOneOfThem(i);
- }
- }
-
- void onReset () override
- {
- onCreate();
- }
void incrementInternalStep(int i) {
newABS[i].incrementAndCheck();
- if(newABS[i].readHead == 0) {
- this->setChangeImminent(i,false);
+ if (newABS[i].readHead == 0) {
+ setChangeImminent(i, false);
checkIfShouldChange(i);
}
- this->smallLetterDisplays[i]->value = this->getDisplayString(i);
- this->currentWorkingStepDisplays[i]->value = this->newABS[i].getWorkingStepDisplay();
}
void resetOneOfThem(int i) {
newABS[i].readHead = -1;
}
- void setChangeImminent(int i,bool value) {
- this->smallLetterDisplays[i]->doubleblink = value;
+ void setChangeImminent(int i, bool value) {
+ changeImminent[i] = value;
}
std::string getDisplayString(int index) {
std::string lhs = std::to_string(this->newABS[index].readHead + 1);
std::string rhs = std::to_string(this->newABS[index].numTokens);
- padTo(lhs, 3,' ');
- padTo(rhs, 3,' ');
-
+ padTo(lhs, 3, ' ');
+ padTo(rhs, 3, ' ');
+
std::string val = lhs + "\n" + rhs;
return val;
}
- float mapKnobValue(float rawValue, int rowIndex) {
- // raw value is between 0 and +10
- /*
- 0: -10,10
- 1: -5,5
- 2: 0,10
- 3: 0,5
- 4: 0,1
+ float mapKnobValue(float rawValue, int rowIndex) {
+ // raw value is between 0 and +10
+ /*
+ 0: -10,10
+ 1: -5,5
+ 2: 0,10
+ 3: 0,5
+ 4: 0,1
5: -1,1
6: 0,2
7: 0,3
8: -2,2
- */
- float mappedValue = 0.f;
- int mapEnum = 2;
- switch(mapEnum) {
- case 0: mappedValue = mapValue(rawValue,-5.f,2.f); break;
- case 1: mappedValue = mapValue(rawValue,-5.f,1.f); break;
- case 2: mappedValue = rawValue; break;
- case 3: mappedValue = mapValue(rawValue,0.f,0.5); break;
- case 4: mappedValue = mapValue(rawValue,0.f,0.1); break;
- case 5: mappedValue = mapValue(rawValue,-5,0.2); break;
- case 6: mappedValue = mapValue(rawValue,0.f,0.2); break;
- case 7: mappedValue = mapValue(rawValue,0.f,1/3); break;
- case 8: mappedValue = mapValue(rawValue,-5.f,0.4); break;
- }
- return mappedValue;
- }
+ */
+ float mappedValue = 0.f;
+ int mapEnum = 2;
+ switch (mapEnum) {
+ case 0: mappedValue = mapValue(rawValue, -5.f, 2.f); break;
+ case 1: mappedValue = mapValue(rawValue, -5.f, 1.f); break;
+ case 2: mappedValue = rawValue; break;
+ case 3: mappedValue = mapValue(rawValue, 0.f, 0.5); break;
+ case 4: mappedValue = mapValue(rawValue, 0.f, 0.1); break;
+ case 5: mappedValue = mapValue(rawValue, -5, 0.2); break;
+ case 6: mappedValue = mapValue(rawValue, 0.f, 0.2); break;
+ case 7: mappedValue = mapValue(rawValue, 0.f, 1 / 3); break;
+ case 8: mappedValue = mapValue(rawValue, -5.f, 0.4); break;
+ }
+ return mappedValue;
+ }
float mapValue(float input, float offset, float multiplier) {
return (input + offset) * multiplier;
}
@@ -316,19 +285,19 @@ void ComputerscareILoveCookies::process(const ProcessArgs &args) {
bool currentResetActive;
bool currentResetTriggered;
bool currentManualResetClicked;
- float knobRawValue = 0.f;
- for(int i = 0; i < numFields; i++) {
+ float knobRawValue = 0.f;
+ for (int i = 0; i < numFields; i++) {
activeStep = false;
currentResetActive = inputs[RESET_INPUT + i].isConnected();
- currentResetTriggered = resetTriggers[i].process(inputs[RESET_INPUT+i].getVoltage() / 2.f);
+ currentResetTriggered = resetTriggers[i].process(inputs[RESET_INPUT + i].getVoltage() / 2.f);
currentManualResetClicked = manualResetTriggers[i].process(params[INDIVIDUAL_RESET_PARAM + i].getValue());
currentTriggerIsHigh = clockTriggers[i].isHigh();
currentTriggerClocked = clockTriggers[i].process(inputs[CLOCK_INPUT + i].getVoltage());
- if(true) {
+ if (true) {
if (inputs[CLOCK_INPUT + i].isConnected()) {
- if(currentTriggerClocked) {
+ if (currentTriggerClocked) {
incrementInternalStep(i);
activeKnobIndex[i] = newABS[i].peekWorkingStep();
}
@@ -339,47 +308,47 @@ void ComputerscareILoveCookies::process(const ProcessArgs &args) {
activeKnobIndex[i] = newABS[i].peekWorkingStep();
}
}
- if((currentResetActive && currentResetTriggered) || (!currentResetActive && globalResetTriggered)) {
+ if ((currentResetActive && currentResetTriggered) || (!currentResetActive && globalResetTriggered)) {
resetOneOfThem(i);
}
atFirstStep = (newABS[i].readHead == 0);
- if(globalManualResetClicked || currentManualResetClicked) {
- setChangeImminent(i,true);
+ if (globalManualResetClicked || currentManualResetClicked) {
+ setChangeImminent(i, true);
resetOneOfThem(i);
}
- if( (currentResetActive && currentResetTriggered) || (!currentResetActive && globalResetTriggered)) {
+ if ( (currentResetActive && currentResetTriggered) || (!currentResetActive && globalResetTriggered)) {
resetOneOfThem(i);
- setChangeImminent(i,false);
+ setChangeImminent(i, false);
}
else {
- if(atFirstStep && !currentResetActive && !inputs[GLOBAL_RESET_INPUT].isConnected()) {
+ if (atFirstStep && !currentResetActive && !inputs[GLOBAL_RESET_INPUT].isConnected()) {
//checkIfShouldChange(i);
}
}
}
- if(activeKnobIndex[i] < 0) {
- outputs[TRG_OUTPUT + i].setVoltage(0.f);
- }
- else if(activeKnobIndex[i] < 26) {
+ if (activeKnobIndex[i] < 0) {
+ outputs[TRG_OUTPUT + i].setVoltage(0.f);
+ }
+ else if (activeKnobIndex[i] < 26) {
knobRawValue = params[activeKnobIndex[i]].getValue();
- outputs[TRG_OUTPUT + i].setVoltage(mapKnobValue(knobRawValue,i));
+ outputs[TRG_OUTPUT + i].setVoltage(mapKnobValue(knobRawValue, i));
}
- else if(activeKnobIndex[i] < 52) {
+ else if (activeKnobIndex[i] < 52) {
knobRawValue = inputs[SIGNAL_INPUT + activeKnobIndex[i] - 26].getVoltage();
outputs[TRG_OUTPUT + i].setVoltage(knobRawValue);
}
- else if(activeKnobIndex[i] < 78) {
+ else if (activeKnobIndex[i] < 78) {
outputs[TRG_OUTPUT + i].setVoltage(newABS[i].exactFloats[activeKnobIndex[i] - 52]);
}
- else if(activeKnobIndex[i] < 104) {
+ else if (activeKnobIndex[i] < 104) {
outputs[TRG_OUTPUT + i].setVoltage(2.22);
}
else {
- outputs[TRG_OUTPUT+i].setVoltage(0.f);
+ outputs[TRG_OUTPUT + i].setVoltage(0.f);
}
- if(inputs[CLOCK_INPUT + i].isConnected()) {
+ if (inputs[CLOCK_INPUT + i].isConnected()) {
outputs[FIRST_STEP_OUTPUT + i].setVoltage((currentTriggerIsHigh && atFirstStep) ? 10.f : 0.0f);
}
else {
@@ -388,44 +357,136 @@ void ComputerscareILoveCookies::process(const ProcessArgs &args) {
}
}
-void MyTextFieldCookie::onTextChange() {
- module->checkLength(this->rowIndex);
- std::string value = module->textFields[this->rowIndex]->text;
- AbsoluteSequence abs = AbsoluteSequence(value,knobandinputlookup);
- if((!abs.inError) && matchParens(value)) {
- module->setNextAbsoluteSequence(this->rowIndex);
- module->updateDisplayBlink(this->rowIndex);
- module->textFields[this->rowIndex]->inError=false;
- }
- else {
- module->textFields[this->rowIndex]->inError=true;
- }
-}
+
struct WiggleKnobsMenuItem : MenuItem {
ComputerscareILoveCookies *cookies;
- void onAction(EventAction &e) override {
- cookies->wiggleKnobs();
+ void onAction(const event::Action &e) override {
+ cookies->wiggleKnobs();
}
};
struct RandomizeTextFieldsMenuItem : MenuItem {
ComputerscareILoveCookies *cookies;
- void onAction(EventAction &e) override {
- srand(time(0));
- cookies->randomizeTextFields();
+ void onAction(const event::Action &e) override {
+ srand(time(0));
+ cookies->randomizeTextFields();
+
+ }
+};
+struct CookiesTF2 : ComputerscareTextField
+{
+ ComputerscareILoveCookies *module;
+ //int fontSize = 16;
+ int rowIndex = 0;
+
+ CookiesTF2(int i)
+ {
+ rowIndex = i;
+ ComputerscareTextField();
+ };
+ void draw(const DrawArgs &args) override
+ {
+ if (module)
+ {
+ if (module->manualSet[rowIndex]) {
+ text = module->currentFormula[rowIndex];
+ module->manualSet[rowIndex] = false;
+ }
+ std::string value = text.c_str();
+ if (value != module->lastValue[rowIndex])
+ {
+ //LaundrySoupSequence lss = LaundrySoupSequence(value);
+
+ module->lastValue[rowIndex] = value;
+ AbsoluteSequence abs = AbsoluteSequence(value, knobandinputlookup);
+ if ((!abs.inError) && matchParens(value)) {
+ module->currentFormula[rowIndex] = value;
+ inError = false;
+ module->setNextAbsoluteSequence(this->rowIndex);
+ }
+ else {
+ inError = true;
+ }
+ }
+ }
+ ComputerscareTextField::draw(args);
}
+ /*void MyTextFieldCookie::onTextChange() {
+ module->checkLength(this->rowIndex);
+ std::string value = module->textFields[this->rowIndex]->text;
+ AbsoluteSequence abs = AbsoluteSequence(value,knobandinputlookup);
+ if((!abs.inError) && matchParens(value)) {
+ module->setNextAbsoluteSequence(this->rowIndex);
+ module->updateDisplayBlink(this->rowIndex);
+ module->textFields[this->rowIndex]->inError=false;
+ }
+ else {
+ module->textFields[this->rowIndex]->inError=true;
+ }
+ }*/
+ //void draw(const DrawArgs &args) override;
+ //int getTextPosition(math::Vec mousePos) override;
};
+struct CookiesSmallDisplay : SmallLetterDisplay
+{
+ ComputerscareILoveCookies *module;
+ int type;
+ int index;
+ CookiesSmallDisplay(int i)
+ {
+ index = i;
+ SmallLetterDisplay();
+ };
+ void draw(const DrawArgs &args)
+ {
+ //this->setNumDivisionsString();
+ if (module)
+ {
+ value = module->getDisplayString(index);
+ blink = module->shouldChange[index];
+ doubleblink = module->changeImminent[index];
+ SmallLetterDisplay::draw(args);
+ }
+ }
+
+};
+struct CookiesCurrentStepDisplay : SmallLetterDisplay
+{
+ ComputerscareILoveCookies *module;
+ int type;
+ int index;
+ CookiesCurrentStepDisplay(int i)
+ {
+ index = i;
+ fontSize = 26;
+ textAlign = 4;
+ SmallLetterDisplay();
+ };
+ void draw(const DrawArgs &args)
+ {
+ //this->setNumDivisionsString();
+ if (module)
+ {
+ //this->currentWorkingStepDisplays[i]->value = this->newABS[i].getWorkingStepDisplay();
+
+ value = module->newABS[index].getWorkingStepDisplay();
+
+ SmallLetterDisplay::draw(args);
+ }
+ }
+
+};
struct ComputerscareILoveCookiesWidget : ModuleWidget {
double verticalSpacing = 18.4;
int verticalStart = 24;
double xStart = 41;
- int index=0;
- int inputindex=0;
- double knobPosX=0.0;
- double knobPosY=0.0;
+ int index = 0;
+ int inputindex = 0;
+ double knobPosX = 0.0;
+ double knobPosY = 0.0;
double knobXStart = 20;
double knobYStart = 2;
double knobRowWidth = 11;
@@ -439,43 +500,47 @@ struct ComputerscareILoveCookiesWidget : ModuleWidget {
double inputColumnHeight = 9.7;
ComputerscareILoveCookiesWidget(ComputerscareILoveCookies *module) {
- setModule(module);
- setPanel(APP->window->loadSvg(asset::plugin(plugin, "res/ComputerscareILoveCookiesPanel.svg")));
+ setModule(module);
+ setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/ComputerscareILoveCookiesPanel.svg")));
+
+ for (int i = 0; i < numKnobRows; i++) {
+ for (int j = 0; j < numKnobColumns; j++) {
+ knobPosX = knobXStart + j * knobRowWidth;
+ knobPosY = knobYStart + i * knobColumnHeight + j * 2.0;
+ index = numKnobColumns * i + j;
- for(int i = 0; i < numKnobRows; i++) {
- for(int j = 0; j < numKnobColumns; j++) {
- knobPosX = knobXStart + j*knobRowWidth;
- knobPosY = knobYStart + i*knobColumnHeight + j*2.0;
- index = numKnobColumns*i + j;
+ //label for knob a-z
smallLetterDisplay = new SmallLetterDisplay();
- smallLetterDisplay->box.pos = mm2px(Vec(knobPosX+6,knobPosY-2));
+ smallLetterDisplay->box.pos = mm2px(Vec(knobPosX + 6, knobPosY - 2));
smallLetterDisplay->box.size = Vec(20, 20);
smallLetterDisplay->value = knoblookup[index];
addChild(smallLetterDisplay);
- ParamWidget* knob = ParamWidget::create<SmoothKnob>(mm2px(Vec(knobPosX,knobPosY)), module, ComputerscareILoveCookies::KNOB_PARAM +index, 0.f, 10.0f, 0.0f);
+ ParamWidget* knob = createParam<SmoothKnob>(mm2px(Vec(knobPosX, knobPosY)), module, ComputerscareILoveCookies::KNOB_PARAM + index);
- module->smallLetterKnobs.push_back(knob);
+ //module->smallLetterKnobs.push_back(knob);
addParam(knob);
-
+
}
}
- for(int k = 0; k < numInputRows; k++) {
- for(int m=0; m<numInputColumns; m++) {
- inputPosX = inputXStart + m*inputRowWidth;
- inputPosY = inputYStart + k*inputColumnHeight + m * 2.0;
- inputindex = numInputColumns*k + m;
-
- if(m%2) {
- addInput(Port::create<InPort>(mm2px(Vec(inputPosX , inputPosY)), Port::INPUT, module, ComputerscareILoveCookies::SIGNAL_INPUT + inputindex));
+ for (int k = 0; k < numInputRows; k++) {
+ for (int m = 0; m < numInputColumns; m++) {
+ inputPosX = inputXStart + m * inputRowWidth;
+ inputPosY = inputYStart + k * inputColumnHeight + m * 2.0;
+ inputindex = numInputColumns * k + m;
+
+ if (m % 2) {
+ addInput(createInput<InPort>(mm2px(Vec(inputPosX , inputPosY)), module, ComputerscareILoveCookies::SIGNAL_INPUT + inputindex));
}
else {
- addInput(Port::create<PointingUpPentagonPort>(mm2px(Vec(inputPosX , inputPosY)), Port::INPUT, module, ComputerscareILoveCookies::SIGNAL_INPUT + inputindex));
+ addInput(createInput<PointingUpPentagonPort>(mm2px(Vec(inputPosX , inputPosY)), module, ComputerscareILoveCookies::SIGNAL_INPUT + inputindex));
}
+
+ //label for input A-Z
smallLetterDisplay = new SmallLetterDisplay();
- smallLetterDisplay->box.pos = mm2px(Vec(inputPosX+6,inputPosY-1));
+ smallLetterDisplay->box.pos = mm2px(Vec(inputPosX + 6, inputPosY - 1));
smallLetterDisplay->box.size = Vec(20, 20);
smallLetterDisplay->value = inputlookup[inputindex];
@@ -485,89 +550,131 @@ struct ComputerscareILoveCookiesWidget : ModuleWidget {
}
//global clock input
- addInput(Port::create<InPort>(mm2px(Vec(2+xStart , 0)), Port::INPUT, module, ComputerscareILoveCookies::GLOBAL_CLOCK_INPUT));
+ addInput(createInput<InPort>(mm2px(Vec(2 + xStart , 0)), module, ComputerscareILoveCookies::GLOBAL_CLOCK_INPUT));
//global reset input
- addInput(Port::create<InPort>(mm2px(Vec(12+xStart , 0)), Port::INPUT, module, ComputerscareILoveCookies::GLOBAL_RESET_INPUT));
- addParam(ParamWidget::create<ComputerscareResetButton>(mm2px(Vec(12+xStart , 9)), module, ComputerscareILoveCookies::MANUAL_RESET_PARAM, 0.0, 1.0, 0.0));
- addParam(ParamWidget::create<ComputerscareClockButton>(mm2px(Vec(2+xStart , 9)), module, ComputerscareILoveCookies::MANUAL_CLOCK_PARAM, 0.0, 1.0, 0.0));
-
+ addInput(createInput<InPort>(mm2px(Vec(12 + xStart , 0)), module, ComputerscareILoveCookies::GLOBAL_RESET_INPUT));
+ addParam(createParam<ComputerscareResetButton>(mm2px(Vec(12 + xStart , 9)), module, ComputerscareILoveCookies::MANUAL_RESET_PARAM));
+ addParam(createParam<ComputerscareClockButton>(mm2px(Vec(2 + xStart , 9)), module, ComputerscareILoveCookies::MANUAL_CLOCK_PARAM));
- for(int i = 0; i < numFields; i++) {
+
+ for (int i = 0; i < numFields; i++) {
//first-step output
- addOutput(Port::create<OutPort>(mm2px(Vec(42+xStart , verticalStart + verticalSpacing*i - 11)), Port::OUTPUT, module, ComputerscareILoveCookies::FIRST_STEP_OUTPUT + i));
+ addOutput(createOutput<OutPort>(mm2px(Vec(42 + xStart , verticalStart + verticalSpacing * i - 11)), module, ComputerscareILoveCookies::FIRST_STEP_OUTPUT + i));
//individual output
- addOutput(Port::create<OutPort>(mm2px(Vec(54+xStart , verticalStart + verticalSpacing*i - 11)), Port::OUTPUT, module, ComputerscareILoveCookies::TRG_OUTPUT + i));
+ addOutput(createOutput<OutPort>(mm2px(Vec(54 + xStart , verticalStart + verticalSpacing * i - 11)), module, ComputerscareILoveCookies::TRG_OUTPUT + i));
//individual clock input
- addInput(Port::create<InPort>(mm2px(Vec(2+xStart, verticalStart + verticalSpacing*i-10)), Port::INPUT, module, ComputerscareILoveCookies::CLOCK_INPUT + i));
+ addInput(createInput<InPort>(mm2px(Vec(2 + xStart, verticalStart + verticalSpacing * i - 10)), module, ComputerscareILoveCookies::CLOCK_INPUT + i));
//individual reset input
- addInput(Port::create<InPort>(mm2px(Vec(12+xStart, verticalStart + verticalSpacing*i-10)), Port::INPUT, module, ComputerscareILoveCookies::RESET_INPUT + i));
-
+ addInput(createInput<InPort>(mm2px(Vec(12 + xStart, verticalStart + verticalSpacing * i - 10)), module, ComputerscareILoveCookies::RESET_INPUT + i));
+
//sequence input field
- textField = Widget::create<MyTextFieldCookie>(mm2px(Vec(1+xStart, verticalStart + verticalSpacing*i)));
- textField->setModule(module);
- textField->box.size = mm2px(Vec(63, 7));
+ textField = new CookiesTF2(i);
+ textField->box.pos = mm2px(Vec(1 + xStart, verticalStart + verticalSpacing * i));
+ textField->box.size = mm2px(Vec(63, 7));
textField->multiline = false;
textField->color = nvgRGB(0xC0, 0xE7, 0xDE);
- textField->rowIndex = i;
+ textField->module = module;
addChild(textField);
- module->textFields[i] = textField;
+ cookiesTextFields[i] = textField;
+ //module->textFields[i] = textField;
//active/total steps display
- smallLetterDisplay = new SmallLetterDisplay();
- smallLetterDisplay->box.pos = mm2px(Vec(21+xStart,verticalStart - 9.2 +verticalSpacing*i));
- smallLetterDisplay->box.size = Vec(60, 30);
- smallLetterDisplay->baseColor = COLOR_COMPUTERSCARE_LIGHT_GREEN;
- smallLetterDisplay->value = "?\n?";
- addChild(smallLetterDisplay);
- module->smallLetterDisplays[i] = smallLetterDisplay;
+ cookiesSmallDisplay = new CookiesSmallDisplay(i);
+ cookiesSmallDisplay->box.pos = mm2px(Vec(21 + xStart, verticalStart - 9.2 + verticalSpacing * i));
+ cookiesSmallDisplay->box.size = Vec(60, 30);
+ cookiesSmallDisplay->baseColor = COLOR_COMPUTERSCARE_LIGHT_GREEN;
+ cookiesSmallDisplay->value = "?\n?";
+ addChild(cookiesSmallDisplay);
+ cookiesSmallDisplay->module = module;
+ cookiesSmallDisplays[i] = cookiesSmallDisplay;
//active/total steps display
- currentWorkingStepDisplay = new SmallLetterDisplay();
- currentWorkingStepDisplay->box.pos = mm2px(Vec(11+xStart,verticalStart - 7.0 +verticalSpacing*i));
- currentWorkingStepDisplay->box.size = mm2px(Vec(2,10));
- currentWorkingStepDisplay->fontSize = 26;
- currentWorkingStepDisplay->textAlign = 4;
+ currentWorkingStepDisplay = new CookiesCurrentStepDisplay(i);
+ currentWorkingStepDisplay->box.pos = mm2px(Vec(11 + xStart, verticalStart - 7.0 + verticalSpacing * i));
+ currentWorkingStepDisplay->box.size = mm2px(Vec(2, 10));
+
currentWorkingStepDisplay->value = "?";
+ currentWorkingStepDisplay->module = module;
addChild(currentWorkingStepDisplay);
- module->currentWorkingStepDisplays[i] = currentWorkingStepDisplay;
+ currentWorkingStepDisplays[i] = currentWorkingStepDisplay;
+
+ // module->currentWorkingStepDisplays[i] = currentWorkingStepDisplay;
+
+ addParam(createParam<ComputerscareInvisibleButton>(mm2px(Vec(21 + xStart, verticalStart - 9.9 + verticalSpacing * i)), module, ComputerscareILoveCookies::INDIVIDUAL_RESET_PARAM + i));
+ }
+ cookies = module;
+ }
+ json_t *toJson() override
+ {
+ json_t *rootJ = ModuleWidget::toJson();
+
+ json_t *sequencesJ = json_array();
+ for (int i = 0; i < numFields; i++) {
+ json_t *sequenceJ = json_string(cookiesTextFields[i]->text.c_str());
+ json_array_append_new(sequencesJ, sequenceJ);
+ }
+ json_object_set_new(rootJ, "sequences", sequencesJ);
- addParam(ParamWidget::create<ComputerscareInvisibleButton>(mm2px(Vec(21+xStart,verticalStart - 9.9 +verticalSpacing*i)), module, ComputerscareILoveCookies::INDIVIDUAL_RESET_PARAM + i, 0.0, 1.0, 0.0));
+ return rootJ;
+ }
+
+ void fromJson(json_t *rootJ) override
+ { std::string val;
+ ModuleWidget::fromJson(rootJ);
+ json_t *sequencesJ = json_object_get(rootJ, "sequences");
+ if (sequencesJ) {
+ for (int i = 0; i < numFields; i++) {
+ json_t *sequenceJ = json_array_get(sequencesJ, i);
+ if (sequenceJ)
+ val = json_string_value(sequenceJ);
+ cookiesTextFields[i]->text = val;
+ cookies->currentFormula[i] = val;
+ }
}
- module->onCreate();
}
- MyTextFieldCookie* textField;
+
+ ComputerscareILoveCookies *cookies;
+
+ CookiesTF2 *textField;
+ CookiesTF2 *cookiesTextFields[numFields];
+
+
+
+ CookiesSmallDisplay* cookiesSmallDisplay;
+ CookiesSmallDisplay* cookiesSmallDisplays[numFields];
+
SmallLetterDisplay* smallLetterDisplay;
- SmallLetterDisplay* currentWorkingStepDisplay;
- Menu *createContextMenu() override;
+
+ CookiesCurrentStepDisplay* currentWorkingStepDisplay;
+ CookiesCurrentStepDisplay* currentWorkingStepDisplays[numFields];
+
+
+ void appendContextMenu(Menu *menu) override;
};
-Menu *ComputerscareILoveCookiesWidget::createContextMenu() {
- Menu *menu = ModuleWidget::createContextMenu();
- ComputerscareILoveCookies *cookies = dynamic_cast<ComputerscareILoveCookies*>(module);
- assert(cookies);
+
+void ComputerscareILoveCookiesWidget::appendContextMenu(Menu *menu) {
+ ComputerscareILoveCookies *cookiesModule = dynamic_cast<ComputerscareILoveCookies *>(this->module);
MenuLabel *spacerLabel = new MenuLabel();
menu->addChild(spacerLabel);
-
+
MenuLabel *modeLabel = new MenuLabel();
modeLabel->text = "Premium Randomizations";
menu->addChild(modeLabel);
-
+
WiggleKnobsMenuItem *wiggleKnobsMenuItem = new WiggleKnobsMenuItem();
wiggleKnobsMenuItem->text = "Wiggle Knobs";
- wiggleKnobsMenuItem->cookies = cookies;
+ wiggleKnobsMenuItem->cookies = cookiesModule;
menu->addChild(wiggleKnobsMenuItem);
RandomizeTextFieldsMenuItem *randomizeTextFieldsMenuItem = new RandomizeTextFieldsMenuItem();
randomizeTextFieldsMenuItem->text = "Randomize Text Fields";
- randomizeTextFieldsMenuItem->cookies = cookies;
+ randomizeTextFieldsMenuItem->cookies = cookiesModule;
menu->addChild(randomizeTextFieldsMenuItem);
-
-
- return menu;
-}
-Model *modelComputerscareILoveCookies = Model::create<ComputerscareILoveCookies, ComputerscareILoveCookiesWidget>("computerscare", "computerscare-i-love-cookies", "I Love Cookies", SEQUENCER_TAG, UTILITY_TAG);
+};
+Model *modelComputerscareILoveCookies = createModel<ComputerscareILoveCookies, ComputerscareILoveCookiesWidget>("computerscare-i-love-cookies");
diff --git a/src/ComputerscareLaundrySoup.cpp b/src/ComputerscareLaundrySoup.cpp
@@ -132,7 +132,6 @@ struct ComputerscareLaundrySoup : Module {
randchar = mainlookup[floor(random::uniform() * mainlookup.size())];
string = string + randchar;
}
- printf("new sequence:%s\n", string.c_str());
currentFormula[i] = string;
manualSet[i] = true;
setNextAbsoluteSequence(i);
