commit 238f2a98c79adb9462816682e8f80a7c7047662c
parent adfb6dcf34b92dc39fc0dd27919157474376e092
Author: Adam M <[email protected]>
Date: Sat, 16 Jan 2021 09:29:03 -0600
astyle format everything
Diffstat:
25 files changed, 649 insertions(+), 653 deletions(-)
diff --git a/src/Computerscare.cpp b/src/Computerscare.cpp
@@ -2,7 +2,6 @@
Plugin *pluginInstance;
-
void init(Plugin *p) {
pluginInstance = p;
@@ -11,13 +10,13 @@ void init(Plugin *p) {
p->addModel(modelComputerscareLaundrySoup);
p->addModel(modelComputerscareILoveCookies);
p->addModel(modelComputerscareOhPeas);
-
+
p->addModel(modelComputerscareKnolyPobs);
p->addModel(modelComputerscareBolyPuttons);
p->addModel(modelComputerscareRolyPouter);
p->addModel(modelComputerscareTolyPools);
p->addModel(modelComputerscareSolyPequencer);
-
+
p->addModel(modelComputerscareFolyPace);
p->addModel(modelComputerscareBlank);
p->addModel(modelComputerscareBlankExpander);
@@ -26,7 +25,4 @@ void init(Plugin *p) {
p->addModel(modelComputerscareGolyPenerator);
p->addModel(modelComputerscareMolyPatrix);
p->addModel(modelComputerscareHorseADoodleDoo);
-
-
-
}
diff --git a/src/ComputerscareBlankExpander.cpp b/src/ComputerscareBlankExpander.cpp
@@ -170,9 +170,9 @@ struct LogoWidget : SvgWidget {
SvgWidget();
}
void step() override {
- if(module) {
- if(module->motherConnected != motherConnected) {
- if(module->motherConnected) {
+ if (module) {
+ if (module->motherConnected != motherConnected) {
+ if (module->motherConnected) {
setSvg(APP->window->loadSvg(asset::plugin(pluginInstance, "res/computerscare-logo-normal.svg")));
} else {
setSvg(APP->window->loadSvg(asset::plugin(pluginInstance, "res/computerscare-logo-sad.svg")));
diff --git a/src/ComputerscareBolyPuttons.cpp b/src/ComputerscareBolyPuttons.cpp
@@ -129,13 +129,13 @@ struct ComputerscareBolyPuttons : ComputerscarePolyModule {
}
void toggleMomentary() {
momentary = !momentary;
- if(momentary) {
+ if (momentary) {
switchOffAllButtonsButOne(-1);
}
}
void toggleRadio() {
radioMode = !radioMode;
- if(radioMode) {
+ if (radioMode) {
switchOffAllButtonsButOne(-1);
}
}
@@ -156,20 +156,20 @@ struct ComputerscareBolyPuttons : ComputerscarePolyModule {
checkForParamChanges();
}
- if(numAChannels == 1) {
+ if (numAChannels == 1) {
min = inputs[A_INPUT].getVoltage(0);
}
- if(numBChannels == 1) {
+ if (numBChannels == 1) {
max = inputs[B_INPUT].getVoltage(0);
}
- for(int i = 0; i < polyChannels; i++) {
- if(numAChannels != 1) {
- min = i< numAChannels ? inputs[A_INPUT].getVoltage(i) : rangeMin;
+ for (int i = 0; i < polyChannels; i++) {
+ if (numAChannels != 1) {
+ min = i < numAChannels ? inputs[A_INPUT].getVoltage(i) : rangeMin;
}
- if(numBChannels != 1) {
- max = i< numBChannels ? inputs[B_INPUT].getVoltage(i) : rangeMax;
+ if (numBChannels != 1) {
+ max = i < numBChannels ? inputs[B_INPUT].getVoltage(i) : rangeMax;
}
- spread = max-min;
+ spread = max - min;
outputs[POLY_OUTPUT].setVoltage(params[TOGGLE + i].getValue()*spread + min, i);
}
}
@@ -180,7 +180,7 @@ struct DisableableParamWidget : SmallIsoButton {
ComputerscareBolyPuttons *module;
SmallLetterDisplay *smallLetterDisplay;
int channel;
- Vec labelOffset = Vec(0,0);
+ Vec labelOffset = Vec(0, 0);
DisableableParamWidget() {
@@ -204,7 +204,7 @@ struct DisableableParamWidget : SmallIsoButton {
//smallLetterDisplay
//smallLetterDisplay->box.pos=box.pos;//.plus(Vec(0,0/*disabled ? 5 : 0,0*/));
}
- smallLetterDisplay->value = std::to_string(channel+1);
+ smallLetterDisplay->value = std::to_string(channel + 1);
SmallIsoButton::step();
}
void draw(const DrawArgs &ctx) override {
diff --git a/src/ComputerscareDebug.cpp b/src/ComputerscareDebug.cpp
@@ -243,13 +243,13 @@ void ComputerscareDebug::process(const ProcessArgs &args) {
stepCounter = 0;
thisVal = "";
- std::string thisLine="";
+ std::string thisLine = "";
for ( unsigned int a = 0; a < NUM_LINES; a = a + 1 )
{
thisLine = logLines[a] >= 0 ? "+" : "";
thisLine += std::to_string(logLines[a]);
thisLine = thisLine.substr(0, 9);
- thisVal+= (a > 0 ? "\n" : "")+thisLine;
+ thisVal += (a > 0 ? "\n" : "") + thisLine;
outputs[POLY_OUTPUT].setVoltage(logLines[a], a);
}
diff --git a/src/ComputerscareFolyPace.cpp b/src/ComputerscareFolyPace.cpp
@@ -31,20 +31,20 @@ struct FolyPace : Module {
int bufferIndex = 0;
int frameIndex = 0;
float lastScramble = 0;
- int cnt=0;
+ int cnt = 0;
int cmap[16];
int A = 31;
- int B = 32;
+ int B = 32;
int C = 29;
int D = 2;
FolyPace() {
config(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS);
- const float timeBase = (float) BUFFER_SIZE / 6;
- for(int i = 0; i < 16; i++) {
- cmap[i]=i;
- }
+ const float timeBase = (float) BUFFER_SIZE / 6;
+ for (int i = 0; i < 16; i++) {
+ cmap[i] = i;
+ }
configParam(TIME_PARAM, 6.f, 16.f, 14.f, "Time", " ms/div", 1 / 2.f, 1000 * timeBase);
configParam(TRIM, -2.f, 2.f, 0.2f, "Input Trim");
@@ -52,21 +52,21 @@ struct FolyPace : Module {
configParam(SCRAMBLE, -10.f, 10.f, 0.f, "Scrambling");
-
+
}
void onReset() override {
//std::memset(bufferX, 0, sizeof(bufferX));
}
void updateScramble(float v) {
- for(int i = 0; i < 16; i++) {
- cmap[i] = (i*A+B+(int)std::floor(v*1010.1))%16;
+ for (int i = 0; i < 16; i++) {
+ cmap[i] = (i * A + B + (int)std::floor(v * 1010.1)) % 16;
}
}
void checkScramble() {
float xx = params[SCRAMBLE].getValue();
- if(lastScramble != xx) {
- lastScramble= xx;
+ if (lastScramble != xx) {
+ lastScramble = xx;
updateScramble(xx);
}
}
@@ -84,7 +84,7 @@ struct FolyPace : Module {
std::memset(bufferX, 0, sizeof(bufferX));
this->channelsX = channelsX;
}
- if(cnt > 4101) {
+ if (cnt > 4101) {
checkScramble();
cnt = 0;
@@ -96,20 +96,20 @@ struct FolyPace : Module {
frameIndex = 0;
float trimVal = params[TRIM].getValue();
float offsetVal = params[OFFSET].getValue();
-/*
+ /*
-if (inputs[X_INPUT].isConnected()) {
- for (int c = 0; c < 16; c++) {
- bufferX[c][bufferIndex] = inputs[X_INPUT].getVoltage(std::min(cmap[c], this->channelsX)) * trimVal + offsetVal + 99 + (1071 * cmap[c]) % 19;
- //bufferX[c][bufferIndex]=inputs[X_INPUT].getVoltage(cmap[c])
- }
- }
- else {
- for (int c = 0; c < 16; c++) {
- bufferX[c][bufferIndex] = offsetVal + 99 + (1071 * cmap[c]) % 19;
- }
- }
-*/
+ if (inputs[X_INPUT].isConnected()) {
+ for (int c = 0; c < 16; c++) {
+ bufferX[c][bufferIndex] = inputs[X_INPUT].getVoltage(std::min(cmap[c], this->channelsX)) * trimVal + offsetVal + 99 + (1071 * cmap[c]) % 19;
+ //bufferX[c][bufferIndex]=inputs[X_INPUT].getVoltage(cmap[c])
+ }
+ }
+ else {
+ for (int c = 0; c < 16; c++) {
+ bufferX[c][bufferIndex] = offsetVal + 99 + (1071 * cmap[c]) % 19;
+ }
+ }
+ */
if (inputs[X_INPUT].isConnected()) {
for (int c = 0; c < 16; c++) {
bufferX[c][bufferIndex] = inputs[X_INPUT].getVoltage(std::min(cmap[c], this->channelsX)) * trimVal + offsetVal + 99 + (1071 * cmap[c]) % 19;
diff --git a/src/ComputerscareGolyPenerator.cpp b/src/ComputerscareGolyPenerator.cpp
@@ -11,7 +11,7 @@ struct ComputerscareGolyPenerator;
knob2: algorithm
knob3: param 1
*/
-const std::string GolyPeneratorAvailableAlgorithmsArr[5] = {"Linear", "Sigmoid","Hump","Sinusoid","Pseudo-Random"};
+const std::string GolyPeneratorAvailableAlgorithmsArr[5] = {"Linear", "Sigmoid", "Hump", "Sinusoid", "Pseudo-Random"};
//template <const std::string& options>
diff --git a/src/ComputerscareILoveCookies.cpp b/src/ComputerscareILoveCookies.cpp
@@ -352,7 +352,7 @@ void ComputerscareILoveCookies::process(const ProcessArgs &args) {
for (int i = 0; i < numFields; i++) {
activeStep = false;
currentResetActive = inputs[RESET_INPUT + i].isConnected();
- outputConnected=outputs[TRG_OUTPUT+i].isConnected();
+ outputConnected = outputs[TRG_OUTPUT + i].isConnected();
currentResetTriggered = resetTriggers[i].process(inputs[RESET_INPUT + i].getVoltage() / 2.f);
currentManualResetClicked = manualResetTriggers[i].process(params[INDIVIDUAL_RESET_PARAM + i].getValue());
@@ -393,31 +393,31 @@ void ComputerscareILoveCookies::process(const ProcessArgs &args) {
}
}
}
- if(outputConnected) {
+ if (outputConnected) {
if (activeKnobIndex[i] < 0) {
- outputs[TRG_OUTPUT+i].setChannels(1);
+ outputs[TRG_OUTPUT + i].setChannels(1);
outputs[TRG_OUTPUT + i].setVoltage(0.f);
}
else if (activeKnobIndex[i] < 26) {
- outputs[TRG_OUTPUT+i].setChannels(1);
+ outputs[TRG_OUTPUT + i].setChannels(1);
knobRawValue = params[activeKnobIndex[i]].getValue();
outputs[TRG_OUTPUT + i].setVoltage(mapKnobValue(knobRawValue, i));
}
else if (activeKnobIndex[i] < 52) {
- outputs[TRG_OUTPUT+i].setChannels(inputs[SIGNAL_INPUT + activeKnobIndex[i] - 26].getChannels());
+ outputs[TRG_OUTPUT + i].setChannels(inputs[SIGNAL_INPUT + activeKnobIndex[i] - 26].getChannels());
inputs[SIGNAL_INPUT + activeKnobIndex[i] - 26].readVoltages(inV);
outputs[TRG_OUTPUT + i].writeVoltages(inV);
}
else if (activeKnobIndex[i] < 78) {
- outputs[TRG_OUTPUT+i].setChannels(1);
+ outputs[TRG_OUTPUT + i].setChannels(1);
outputs[TRG_OUTPUT + i].setVoltage(newABS[i].exactFloats[activeKnobIndex[i] - 52]);
}
else if (activeKnobIndex[i] < 104) {
- outputs[TRG_OUTPUT+i].setChannels(1);
+ outputs[TRG_OUTPUT + i].setChannels(1);
outputs[TRG_OUTPUT + i].setVoltage(2.22);
}
else {
- outputs[TRG_OUTPUT+i].setChannels(1);
+ outputs[TRG_OUTPUT + i].setChannels(1);
outputs[TRG_OUTPUT + i].setVoltage(0.f);
}
}
diff --git a/src/ComputerscareIso.cpp b/src/ComputerscareIso.cpp
@@ -13,8 +13,8 @@ struct ComputerscareIso : Module {
enum ParamIds {
KNOB,
TOGGLES = KNOB + numKnobs,
- NUM_PARAMS = TOGGLES+numToggles
-
+ NUM_PARAMS = TOGGLES + numToggles
+
};
enum InputIds {
CHANNEL_INPUT,
@@ -22,7 +22,7 @@ struct ComputerscareIso : Module {
};
enum OutputIds {
POLY_OUTPUT,
- NUM_OUTPUTS=POLY_OUTPUT + numOutputs
+ NUM_OUTPUTS = POLY_OUTPUT + numOutputs
};
enum LightIds {
NUM_LIGHTS
@@ -32,24 +32,24 @@ struct ComputerscareIso : Module {
ComputerscareIso() {
config(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS);
-
- for (int i = 0; i < numKnobs; i++) {
- configParam(KNOB + i, 0.0f, 10.0f, 0.0f);
- configParam(KNOB+i, 0.f, 10.f, 0.f, "Channel "+std::to_string(i+1) + " Voltage", " Volts");
+
+ for (int i = 0; i < numKnobs; i++) {
+ configParam(KNOB + i, 0.0f, 10.0f, 0.0f);
+ configParam(KNOB + i, 0.f, 10.f, 0.f, "Channel " + std::to_string(i + 1) + " Voltage", " Volts");
}
configParam(TOGGLES, 0.0f, 1.0f, 0.0f);
outputs[POLY_OUTPUT].setChannels(16);
}
void process(const ProcessArgs &args) override {
counter++;
- if(counter > 5012) {
+ if (counter > 5012) {
//printf("%f \n",random::uniform());
counter = 0;
//rect4032
//south facing high wall
}
for (int i = 0; i < numKnobs; i++) {
- outputs[POLY_OUTPUT].setVoltage(params[KNOB+i].getValue(),i);
+ outputs[POLY_OUTPUT].setVoltage(params[KNOB + i].getValue(), i);
}
}
@@ -57,84 +57,84 @@ struct ComputerscareIso : Module {
struct ComputerscareIsoWidget : ModuleWidget {
ComputerscareIsoWidget(ComputerscareIso *module) {
-
+
setModule(module);
//setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/ComputerscareIsoPanel.svg")));
float outputY = 334;
- box.size = Vec(15*10, 380);
+ box.size = Vec(15 * 10, 380);
{
ComputerscareSVGPanel *panel = new ComputerscareSVGPanel();
panel->box.size = box.size;
- panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance,"res/ComputerscareIsoPanel.svg")));
-
- //module->panelRef = panel;
+ panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/ComputerscareIsoPanel.svg")));
+
+ //module->panelRef = panel;
- addChild(panel);
+ addChild(panel);
}
- addLabeledKnob("1",100,30,module,0,2);
- addLabeledKnob("2",30,80,module,1,2);
-
- addLabeledKnob("3",30, 157,module,2,1);
- addLabeledKnob("4",62, 157, module, 3,1);
-
+ addLabeledKnob("1", 100, 30, module, 0, 2);
+ addLabeledKnob("2", 30, 80, module, 1, 2);
- addLabeledKnob("5",98, 107, module,4,0);
- addLabeledKnob("6",98, 140, module,5,0);
- addLabeledKnob("7",98, 176, module,6,0);
- addLabeledKnob("8",98, 205, module,7,0);
+ addLabeledKnob("3", 30, 157, module, 2, 1);
+ addLabeledKnob("4", 62, 157, module, 3, 1);
- addLabeledKnob("9",28, 197, module,8,2);
- addLabeledKnob("10",88, 277, module,9,2);
+ addLabeledKnob("5", 98, 107, module, 4, 0);
+ addLabeledKnob("6", 98, 140, module, 5, 0);
+ addLabeledKnob("7", 98, 176, module, 6, 0);
+ addLabeledKnob("8", 98, 205, module, 7, 0);
- addLabeledKnob("11",28, 237, module,10,1);
- addLabeledKnob("12",28, 277, module,11,1);
- addLabeledKnob("13",28, 317, module,12,1);
- addLabeledKnob("14",68, 237, module,13,1);
- addLabeledKnob("15",68, 277, module,14,1);
- addLabeledKnob("16",68, 317, module,15,1);
+
+ addLabeledKnob("9", 28, 197, module, 8, 2);
+ addLabeledKnob("10", 88, 277, module, 9, 2);
+
+ addLabeledKnob("11", 28, 237, module, 10, 1);
+ addLabeledKnob("12", 28, 277, module, 11, 1);
+ addLabeledKnob("13", 28, 317, module, 12, 1);
+ addLabeledKnob("14", 68, 237, module, 13, 1);
+ addLabeledKnob("15", 68, 277, module, 14, 1);
+ addLabeledKnob("16", 68, 317, module, 15, 1);
addOutput(createOutput<OutPort>(Vec(33, outputY), module, ComputerscareIso::POLY_OUTPUT));
- addOutput(createOutput<PointingUpPentagonPort>(Vec(63, outputY), module, ComputerscareIso::POLY_OUTPUT+1));
- addOutput(createOutput<InPort>(Vec(93, outputY), module, ComputerscareIso::POLY_OUTPUT+2));
-
-}
-void addLabeledKnob(std::string label,int x, int y, ComputerscareIso *module,int index,int type) {
- smallLetterDisplay = new SmallLetterDisplay();
- smallLetterDisplay->box.size = Vec(60, 30);
- smallLetterDisplay->value = label;
- if(type == 0) {
- addParam(createParam<SmoothKnob>(Vec(x,y),module,ComputerscareIso::KNOB+index));
- smallLetterDisplay->box.pos = Vec(x+22,y+2);
- }
- else if(type ==1) {
- addParam(createParam<SmallKnob>(Vec(x,y),module,ComputerscareIso::KNOB+index));
- smallLetterDisplay->box.pos = Vec(x+12,y-10);
- }
- else if(type==2) {
- addParam(createParam<BigSmoothKnob>(Vec(x,y),module,ComputerscareIso::KNOB+index));
- smallLetterDisplay->box.pos = Vec(x+22,y-12);
- }
- else if (type==3) {
- addParam(createParam<LrgKnob>(Vec(x,y),module,ComputerscareIso::KNOB+index));
- smallLetterDisplay->box.pos = Vec(x+22,y-12);
- }
- else if (type==4) {
- addParam(createParam<BigSmoothKnob>(Vec(x,y),module,ComputerscareIso::KNOB+index));
- smallLetterDisplay->box.pos = Vec(x+22,y-12);
- }
-
- else {
- addParam(createParam<MediumSnapKnob>(Vec(x,y),module,ComputerscareIso::KNOB+index));
- smallLetterDisplay->box.pos = Vec(x+12,y-10);
- }
- addChild(smallLetterDisplay);
-
-}
-SmallLetterDisplay* smallLetterDisplay;
+ addOutput(createOutput<PointingUpPentagonPort>(Vec(63, outputY), module, ComputerscareIso::POLY_OUTPUT + 1));
+ addOutput(createOutput<InPort>(Vec(93, outputY), module, ComputerscareIso::POLY_OUTPUT + 2));
+
+ }
+ void addLabeledKnob(std::string label, int x, int y, ComputerscareIso *module, int index, int type) {
+ smallLetterDisplay = new SmallLetterDisplay();
+ smallLetterDisplay->box.size = Vec(60, 30);
+ smallLetterDisplay->value = label;
+ if (type == 0) {
+ addParam(createParam<SmoothKnob>(Vec(x, y), module, ComputerscareIso::KNOB + index));
+ smallLetterDisplay->box.pos = Vec(x + 22, y + 2);
+ }
+ else if (type == 1) {
+ addParam(createParam<SmallKnob>(Vec(x, y), module, ComputerscareIso::KNOB + index));
+ smallLetterDisplay->box.pos = Vec(x + 12, y - 10);
+ }
+ else if (type == 2) {
+ addParam(createParam<BigSmoothKnob>(Vec(x, y), module, ComputerscareIso::KNOB + index));
+ smallLetterDisplay->box.pos = Vec(x + 22, y - 12);
+ }
+ else if (type == 3) {
+ addParam(createParam<LrgKnob>(Vec(x, y), module, ComputerscareIso::KNOB + index));
+ smallLetterDisplay->box.pos = Vec(x + 22, y - 12);
+ }
+ else if (type == 4) {
+ addParam(createParam<BigSmoothKnob>(Vec(x, y), module, ComputerscareIso::KNOB + index));
+ smallLetterDisplay->box.pos = Vec(x + 22, y - 12);
+ }
+
+ else {
+ addParam(createParam<MediumSnapKnob>(Vec(x, y), module, ComputerscareIso::KNOB + index));
+ smallLetterDisplay->box.pos = Vec(x + 12, y - 10);
+ }
+ addChild(smallLetterDisplay);
+
+ }
+ SmallLetterDisplay* smallLetterDisplay;
};
diff --git a/src/ComputerscareLaundrySoup.cpp b/src/ComputerscareLaundrySoup.cpp
@@ -238,7 +238,7 @@ struct ComputerscareLaundrySoup : Module {
channelCount[index] = 16;
} else {
size_t n = std::count(currentFormula[index].begin(), currentFormula[index].end(), ';');
- channelCount[index] = std::min((int)n+1,16);
+ channelCount[index] = std::min((int)n + 1, 16);
}
} else {
channelCount[index] = channelCountEnum[index];
diff --git a/src/ComputerscareOhPeas.cpp b/src/ComputerscareOhPeas.cpp
@@ -52,12 +52,12 @@ struct ComputerscareOhPeas : Module
int numDivisions = 12;
int globalTranspose = 0;
bool evenQuantizeMode = true;
- bool manualSet=true;
+ bool manualSet = true;
- int checkCounter=9999;
- int checkPeriod=1000;
+ int checkCounter = 9999;
+ int checkPeriod = 1000;
std::string currentFormula = "221222";
- std::string lastFormula="52";
+ std::string lastFormula = "52";
std::string numDivisionsString = "";
@@ -99,7 +99,7 @@ struct ComputerscareOhPeas : Module
json_t *textJ = json_object_get(rootJ, "sequences");
if (textJ) {
currentFormula = json_string_value(textJ);
- manualSet=true;
+ manualSet = true;
}
}
@@ -109,10 +109,10 @@ struct ComputerscareOhPeas : Module
this->quant = Quantizer(this->currentFormula.c_str(), this->numDivisions, this->globalTranspose);
}
void checkForChange() {
- if(lastFormula != currentFormula) {
+ if (lastFormula != currentFormula) {
setQuant();
}
- lastFormula=currentFormula;
+ lastFormula = currentFormula;
}
// For more advanced Module features, read Rack's engine.hpp header file
// - toJson, fromJson: serialization of internal data
@@ -123,9 +123,9 @@ struct ComputerscareOhPeas : Module
void ComputerscareOhPeas::process(const ProcessArgs &args)
{
- if(checkCounter > checkPeriod) {
+ if (checkCounter > checkPeriod) {
checkForChange();
- checkCounter=0;
+ checkCounter = 0;
}
checkCounter++;
@@ -218,10 +218,10 @@ struct PeasTF2 : ComputerscareTextField
{
if (module)
{
- if(module->manualSet) {
- text=module->currentFormula;
- printf("manualSet to %s\n",text.c_str());
- module->manualSet=false;
+ if (module->manualSet) {
+ text = module->currentFormula;
+ printf("manualSet to %s\n", text.c_str());
+ module->manualSet = false;
}
if (text.c_str() != module->currentFormula)
{
@@ -230,7 +230,7 @@ struct PeasTF2 : ComputerscareTextField
}
else {
- text="2212221";
+ text = "2212221";
}
ComputerscareTextField::draw(args);
}
@@ -359,7 +359,7 @@ struct ComputerscareOhPeasWidget : ModuleWidget
addOutput(createOutput<InPort>(mm2px(Vec(xx + 1, y + 108)), module, ComputerscareOhPeas::QUANTIZED_OUTPUT + i));
}
- peas=module;
+ peas = module;
}
void fromJson(json_t *rootJ) override
@@ -370,8 +370,8 @@ struct ComputerscareOhPeasWidget : ModuleWidget
// legacy
json_t *textJ = json_object_get(rootJ, "sequences");
if (textJ) {
- peas->currentFormula=json_string_value(textJ);
- peas->manualSet=true;
+ peas->currentFormula = json_string_value(textJ);
+ peas->manualSet = true;
}
}
diff --git a/src/ComputerscarePatchSequencer.cpp b/src/ComputerscarePatchSequencer.cpp
@@ -538,9 +538,9 @@ struct ComputerscarePatchSequencerWidget : ModuleWidget {
void fromJson(json_t *rootJ) override
{
ModuleWidget::fromJson(rootJ);
- json_t *button_statesJ = json_object_get(rootJ, "buttons");
- if (button_statesJ) {
- //there be legacy JSON
+ json_t *button_statesJ = json_object_get(rootJ, "buttons");
+ if (button_statesJ) {
+ //there be legacy JSON
fatherSon->dataFromJson(rootJ);
}
}
diff --git a/src/ComputerscarePolyModule.hpp b/src/ComputerscarePolyModule.hpp
@@ -11,7 +11,7 @@ struct AutoParamQuantity : ParamQuantity {
struct ComputerscarePolyModule : Module {
int polyChannels = 16;
- int polyChannelsKnobSetting=0;
+ int polyChannelsKnobSetting = 0;
int counterPeriod = 64;
int counter = counterPeriod + 1;
@@ -28,8 +28,8 @@ struct ComputerscarePolyModule : Module {
struct TinyChannelsSnapKnob: RoundBlackSnapKnob {
std::shared_ptr<Svg> manualChannelsSetSvg = APP->window->loadSvg(asset::plugin(pluginInstance, "res/computerscare-channels-empty-knob.svg"));
std::shared_ptr<Svg> autoChannelsSvg = APP->window->loadSvg(asset::plugin(pluginInstance, "res/computerscare-channels-empty-knob-auto-mode.svg"));
- int prevSetting=-1;
- int paramId=-1;
+ int prevSetting = -1;
+ int paramId = -1;
ComputerscarePolyModule *module;
@@ -57,9 +57,9 @@ struct TinyChannelsSnapKnob: RoundBlackSnapKnob {
struct PolyChannelsDisplay : SmallLetterDisplay
{
ComputerscarePolyModule *module;
- bool controlled=false;
- int prevChannels=-1;
- int paramId=-1;
+ bool controlled = false;
+ int prevChannels = -1;
+ int paramId = -1;
PolyChannelsDisplay(math::Vec pos)
{
@@ -76,12 +76,12 @@ struct PolyChannelsDisplay : SmallLetterDisplay
if (module)
{
int newChannels = module->polyChannels;
- if(newChannels != prevChannels) {
+ if (newChannels != prevChannels) {
std::string str = std::to_string(newChannels);
value = str;
- prevChannels=newChannels;
+ prevChannels = newChannels;
}
-
+
}
SmallLetterDisplay::draw(args);
}
@@ -90,15 +90,15 @@ struct PolyOutputChannelsWidget : Widget {
ComputerscarePolyModule *module;
PolyChannelsDisplay *channelCountDisplay;
TinyChannelsSnapKnob *channelsKnob;
- PolyOutputChannelsWidget(math::Vec pos,ComputerscarePolyModule *mod,int paramId) {
+ PolyOutputChannelsWidget(math::Vec pos, ComputerscarePolyModule *mod, int paramId) {
module = mod;
- channelsKnob = createParam<TinyChannelsSnapKnob>(pos.plus(Vec(7,3)),module,paramId);
- channelsKnob->module=module;
- channelsKnob->paramId=paramId;
+ channelsKnob = createParam<TinyChannelsSnapKnob>(pos.plus(Vec(7, 3)), module, paramId);
+ channelsKnob->module = module;
+ channelsKnob->paramId = paramId;
channelCountDisplay = new PolyChannelsDisplay(pos);
-
+
channelCountDisplay->module = module;
addChild(channelsKnob);
diff --git a/src/ComputerscareSolyPequencer.cpp b/src/ComputerscareSolyPequencer.cpp
@@ -92,8 +92,8 @@ struct ComputerscareSolyPequencer : ComputerscarePolyModule {
currentReset[i] = resetTriggers[i].process(inputs[RESET_INPUT].getVoltage(i));
isHigh[i] = clockTriggers[i].isHigh();
}
- for(int i =0; i < 16; i++) {
- eoc[i] = (currentClock[clockChannels[i]-1] && isHigh[clockChannels[i]-1]) || (currentReset[resetChannels[i]-1] && resetTriggers[resetChannels[i]-1].isHigh());
+ for (int i = 0; i < 16; i++) {
+ eoc[i] = (currentClock[clockChannels[i] - 1] && isHigh[clockChannels[i] - 1]) || (currentReset[resetChannels[i] - 1] && resetTriggers[resetChannels[i] - 1].isHigh());
}
for (int j = 0; j < polyChannels; j++) {
if (globalClocked || currentClock[clockChannels[j] - 1]) {
@@ -107,7 +107,7 @@ struct ComputerscareSolyPequencer : ComputerscarePolyModule {
}
- if(numReset == 1 && currentReset[0]) {
+ if (numReset == 1 && currentReset[0]) {
currentStep[j] = 0;
}
else if (j <= numReset && currentReset[j]) {
@@ -116,9 +116,9 @@ struct ComputerscareSolyPequencer : ComputerscarePolyModule {
}
for (int c = 0; c < polyChannels; c++) {
outputs[POLY_OUTPUT].setVoltage(inputs[POLY_INPUT].getVoltage(currentStep[c]), c);
- outputs[EOC_OUTPUT].setVoltage(currentStep[c]==0 && eoc[c] ? 10.f : 0.f,c);
+ outputs[EOC_OUTPUT].setVoltage(currentStep[c] == 0 && eoc[c] ? 10.f : 0.f, c);
}
-
+
}
if (manualReset) {
resetAll();
diff --git a/src/ComputerscareStolyFickPigure.cpp b/src/ComputerscareStolyFickPigure.cpp
@@ -36,18 +36,18 @@ struct StolyFickPigure : Module {
float lastScramble = 0;
int A = 31;
- int B = 32;
+ int B = 32;
int C = 29;
int D = 2;
StolyFickPigure() {
config(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS);
- const float timeBase = (float) BUFFER_SIZE / 6;
+ const float timeBase = (float) BUFFER_SIZE / 6;
- for(int i = 0; i < 16; i++) {
- cmap[i]=i;
- }
+ for (int i = 0; i < 16; i++) {
+ cmap[i] = i;
+ }
configParam(TIME_PARAM, 6.f, 16.f, 14.f, "Time", " ms/div", 1 / 2.f, 1000 * timeBase);
@@ -56,21 +56,21 @@ struct StolyFickPigure : Module {
configParam(SCRAMBLE, -10.f, 10.f, 0.f, "Scrambling");
-
+
}
void onReset() override {
//std::memset(bufferX, 0, sizeof(bufferX));
}
void updateScramble(float v) {
- for(int i = 0; i < 16; i++) {
- cmap[i] = (i*A+B+(int)std::floor(v*1010.1))%16;
+ for (int i = 0; i < 16; i++) {
+ cmap[i] = (i * A + B + (int)std::floor(v * 1010.1)) % 16;
}
}
void checkScramble() {
float xx = params[SCRAMBLE].getValue();
- if(lastScramble != xx) {
- lastScramble= xx;
+ if (lastScramble != xx) {
+ lastScramble = xx;
updateScramble(xx);
}
}
@@ -88,7 +88,7 @@ struct StolyFickPigure : Module {
this->channelsX = channelsX;
}
- if(cnt > 4101) {
+ if (cnt > 4101) {
checkScramble();
cnt = 0;
@@ -161,120 +161,120 @@ struct StolyFickPigureDisplay : TransparentWidget {
nvgFillColor(args.vg, faceColor);
nvgStrokeWidth(args.vg, 3.2);
- float size = 1+sin(O-29)/4;
+ float size = 1 + sin(O - 29) / 4;
//crotch
- float cx = 62*(1+(sin(E+F)-sin(P+O/2+50))/40000);
- float cy = 210*(1+(sin(A+G-12)-sin(P+H/2))/11000);
+ float cx = 62 * (1 + (sin(E + F) - sin(P + O / 2 + 50)) / 40000);
+ float cy = 210 * (1 + (sin(A + G - 12) - sin(P + H / 2)) / 11000);
//thigh spread, length, direction
- float thighSpread = (2+sin(J+I+K)-sin(A-N/2))/4;
- float thighLength = 50*(1+(sin(C-100+F+K*2)+sin(C+L-10))/6);
- float thighDirection = (sin(J+O-211)-sin(P*2+I)-sin(B+K))/2;
+ float thighSpread = (2 + sin(J + I + K) - sin(A - N / 2)) / 4;
+ float thighLength = 50 * (1 + (sin(C - 100 + F + K * 2) + sin(C + L - 10)) / 6);
+ float thighDirection = (sin(J + O - 211) - sin(P * 2 + I) - sin(B + K)) / 2;
//ankle spread,length,direction
- float ankleSpread = (2+sin(O-B)/2+sin(F+2)/2+sin(P-E-D+19.2))/13;
- float ankleLength = thighLength*(1+(sin(F+A+J-K/2+9))/9);
- float ankleDirection = 3*M_PI/2+(3+sin(J+M-L-101)-sin(P-B+22)-sin(H))/8;
+ float ankleSpread = (2 + sin(O - B) / 2 + sin(F + 2) / 2 + sin(P - E - D + 19.2)) / 13;
+ float ankleLength = thighLength * (1 + (sin(F + A + J - K / 2 + 9)) / 9);
+ float ankleDirection = 3 * M_PI / 2 + (3 + sin(J + M - L - 101) - sin(P - B + 22) - sin(H)) / 8;
- float leftKneeArg = 3*M_PI/2 +thighDirection + thighSpread;
- float rightKneeArg = 3*M_PI/2 +thighDirection - thighSpread;
-
+ float leftKneeArg = 3 * M_PI / 2 + thighDirection + thighSpread;
+ float rightKneeArg = 3 * M_PI / 2 + thighDirection - thighSpread;
- float leftAnkleArg = ankleDirection+ankleSpread;
- float rightAnkleArg = ankleDirection-ankleSpread;
+ float leftAnkleArg = ankleDirection + ankleSpread;
+ float rightAnkleArg = ankleDirection - ankleSpread;
- float leftKneeX=cx+thighLength*cos(leftKneeArg);
- float leftKneeY=cy-thighLength*sin(leftKneeArg);
- float leftAnkleX = leftKneeX+ankleLength*cos(leftAnkleArg);
- float leftAnkleY = leftKneeY-ankleLength*sin(leftAnkleArg);
+ float leftKneeX = cx + thighLength * cos(leftKneeArg);
+ float leftKneeY = cy - thighLength * sin(leftKneeArg);
- float rightKneeX=cx+thighLength*cos(rightKneeArg);
- float rightKneeY=cy-thighLength*sin(rightKneeArg);
+ float leftAnkleX = leftKneeX + ankleLength * cos(leftAnkleArg);
+ float leftAnkleY = leftKneeY - ankleLength * sin(leftAnkleArg);
- float rightAnkleX = rightKneeX+ankleLength*cos(rightAnkleArg);
- float rightAnkleY = rightKneeY-ankleLength*sin(rightAnkleArg);
+ float rightKneeX = cx + thighLength * cos(rightKneeArg);
+ float rightKneeY = cy - thighLength * sin(rightKneeArg);
+
+ float rightAnkleX = rightKneeX + ankleLength * cos(rightAnkleArg);
+ float rightAnkleY = rightKneeY - ankleLength * sin(rightAnkleArg);
nvgBeginPath(args.vg);
-
-
- nvgMoveTo(args.vg, leftAnkleX,leftAnkleY);
- nvgLineTo(args.vg, leftKneeX,leftKneeY);
- nvgLineTo(args.vg, cx,cy);
- nvgLineTo(args.vg, rightKneeX,rightKneeY);
- nvgLineTo(args.vg, rightAnkleX,rightAnkleY);
+
+
+ nvgMoveTo(args.vg, leftAnkleX, leftAnkleY);
+ nvgLineTo(args.vg, leftKneeX, leftKneeY);
+ nvgLineTo(args.vg, cx, cy);
+ nvgLineTo(args.vg, rightKneeX, rightKneeY);
+ nvgLineTo(args.vg, rightAnkleX, rightAnkleY);
//nvgClosePath(args.vg);
nvgStroke(args.vg);
//torso length,direction
- float torsoLength=thighLength*(1.4+(sin(A-12))/4);
- float torsoDirection=M_PI/2+sin(D)/2;
+ float torsoLength = thighLength * (1.4 + (sin(A - 12)) / 4);
+ float torsoDirection = M_PI / 2 + sin(D) / 2;
- float neckX = cx+torsoLength*cos(torsoDirection);
- float neckY = cy-torsoLength*sin(torsoDirection);
+ float neckX = cx + torsoLength * cos(torsoDirection);
+ float neckY = cy - torsoLength * sin(torsoDirection);
nvgBeginPath(args.vg);
- nvgMoveTo(args.vg,cx,cy);
- nvgLineTo(args.vg,neckX,neckY);
+ nvgMoveTo(args.vg, cx, cy);
+ nvgLineTo(args.vg, neckX, neckY);
nvgStroke(args.vg);
-
- float armLength=torsoLength*(2+(sin(N+14)-sin(P-L-3))/2)/4;
- float forearmLength=armLength*(1+(2+(sin(F+B+2)-sin(E)))/300);
- float armDirection=3*M_PI/2+0.2*(sin(C-M));
- float armSpread=sin(B+P-A)+sin(N-J);
-
- float leftElbowArg=armDirection+armSpread;
- float rightElbowArg=armDirection-armSpread;
-
- float leftHandArg=sin(E+22+A-4);
- float rightHandArg=sin(F+22-B);
-
- float leftElbowX = neckX+armLength*cos(leftElbowArg);
- float leftElbowY = neckY-armLength*sin(leftElbowArg);
-
- float leftHandX=leftElbowX+forearmLength*cos(leftHandArg);
- float leftHandY=leftElbowY-forearmLength*sin(leftHandArg);
-
- float rightElbowX = neckX+armLength*cos(rightElbowArg);
- float rightElbowY = neckY-armLength*sin(rightElbowArg);
-
- float rightHandX=rightElbowX+forearmLength*cos(rightHandArg);
- float rightHandY=rightElbowY-forearmLength*sin(rightHandArg);
+
+ float armLength = torsoLength * (2 + (sin(N + 14) - sin(P - L - 3)) / 2) / 4;
+ float forearmLength = armLength * (1 + (2 + (sin(F + B + 2) - sin(E))) / 300);
+ float armDirection = 3 * M_PI / 2 + 0.2 * (sin(C - M));
+ float armSpread = sin(B + P - A) + sin(N - J);
+
+ float leftElbowArg = armDirection + armSpread;
+ float rightElbowArg = armDirection - armSpread;
+
+ float leftHandArg = sin(E + 22 + A - 4);
+ float rightHandArg = sin(F + 22 - B);
+
+ float leftElbowX = neckX + armLength * cos(leftElbowArg);
+ float leftElbowY = neckY - armLength * sin(leftElbowArg);
+
+ float leftHandX = leftElbowX + forearmLength * cos(leftHandArg);
+ float leftHandY = leftElbowY - forearmLength * sin(leftHandArg);
+
+ float rightElbowX = neckX + armLength * cos(rightElbowArg);
+ float rightElbowY = neckY - armLength * sin(rightElbowArg);
+
+ float rightHandX = rightElbowX + forearmLength * cos(rightHandArg);
+ float rightHandY = rightElbowY - forearmLength * sin(rightHandArg);
nvgBeginPath(args.vg);
- nvgMoveTo(args.vg,neckX,neckY);
- nvgLineTo(args.vg,leftElbowX,leftElbowY);
- nvgLineTo(args.vg,leftHandX,leftHandY);
+ nvgMoveTo(args.vg, neckX, neckY);
+ nvgLineTo(args.vg, leftElbowX, leftElbowY);
+ nvgLineTo(args.vg, leftHandX, leftHandY);
nvgStroke(args.vg);
-
+
nvgBeginPath(args.vg);
- nvgMoveTo(args.vg,neckX,neckY);
- nvgLineTo(args.vg,rightElbowX,rightElbowY);
- nvgLineTo(args.vg,rightHandX,rightHandY);
+ nvgMoveTo(args.vg, neckX, neckY);
+ nvgLineTo(args.vg, rightElbowX, rightElbowY);
+ nvgLineTo(args.vg, rightHandX, rightHandY);
nvgStroke(args.vg);
-
- float headHeight = torsoLength*(0.5+sin(H-E-I-D)/9-sin(F+B-C+E)/7);
- float headWidth = headHeight*(0.6+sin(I+D-M/2)/7+sin(G/2+J-10)/6);
- float headAngle = M_PI/2 + (sin(C+A)/6+sin(D+G)/9);
- float headRotation=sin(C+A)/2+sin(M/2)/3;
-
+ float headHeight = torsoLength * (0.5 + sin(H - E - I - D) / 9 - sin(F + B - C + E) / 7);
+ float headWidth = headHeight * (0.6 + sin(I + D - M / 2) / 7 + sin(G / 2 + J - 10) / 6);
+ float headAngle = M_PI / 2 + (sin(C + A) / 6 + sin(D + G) / 9);
+
+ float headRotation = sin(C + A) / 2 + sin(M / 2) / 3;
+
nvgBeginPath(args.vg);
nvgTranslate(args.vg, neckX, neckY);
- nvgRotate(args.vg,headRotation);
- nvgEllipse(args.vg, 0,-headHeight,headWidth,headHeight);
+ nvgRotate(args.vg, headRotation);
+ nvgEllipse(args.vg, 0, -headHeight, headWidth, headHeight);
nvgFill(args.vg);
nvgStroke(args.vg);
-
+
nvgResetScissor(args.vg);
//nvgRestore(args.vg);
}
diff --git a/src/ComputerscareSvgPort.cpp b/src/ComputerscareSvgPort.cpp
@@ -13,7 +13,7 @@ ComputerscareSvgPort::ComputerscareSvgPort() {
fb->addChild(shadow);
// Avoid breakage if plugins fail to call setSvg()
// In that case, just disable the shadow.
- shadow->box.size = math::Vec(0,0);
+ shadow->box.size = math::Vec(0, 0);
sw = new widget::SvgWidget;
fb->addChild(sw);
@@ -23,7 +23,7 @@ void ComputerscareSvgPort::setSvg(std::shared_ptr<Svg> svg) {
sw->setSvg(svg);
fb->box.size = sw->box.size;
box.size = sw->box.size;
- shadow->box.size = math::Vec(0,0);
+ shadow->box.size = math::Vec(0, 0);
// Move shadow downward by 10%
shadow->box.pos = math::Vec(0, sw->box.size.y * 0.10);
// shadow->box = shadow->box.grow(math::Vec(2, 2));
diff --git a/src/ComputerscareTolyPools.cpp b/src/ComputerscareTolyPools.cpp
@@ -28,7 +28,7 @@ struct ComputerscareTolyPools : Module {
int counter = 83910;
int numChannels = 16;
int rotation = 0;
- int numInputChannels=1;
+ int numInputChannels = 1;
ComputerscareSVGPanel* panelRef;
enum ParamIds {
ROTATE_KNOB,
@@ -70,10 +70,10 @@ struct ComputerscareTolyPools : Module {
rotation = params[ROTATE_KNOB].getValue();
numInputChannels = inputs[POLY_INPUT].getChannels();
}
- if(inputs[NUM_CHANNELS_CV].isConnected()) {
+ if (inputs[NUM_CHANNELS_CV].isConnected()) {
numChannels = mapVoltageToChannelCount(inputs[NUM_CHANNELS_CV].getVoltage(0));
}
- if(inputs[ROTATE_CV].isConnected()) {
+ if (inputs[ROTATE_CV].isConnected()) {
rotation = mapVoltageToChannelCount(inputs[ROTATE_CV].getVoltage(0));
}
outputs[POLY_OUTPUT].setChannels(numChannels);
@@ -104,10 +104,10 @@ struct PoolsSmallDisplay : SmallLetterDisplay
if (type == 0) {
value = std::to_string(module->numChannels);
}
- else if(type == 1) {
+ else if (type == 1) {
value = std::to_string(module->rotation);
}
- else if(type==2) {
+ else if (type == 2) {
value = std::to_string(module->numInputChannels);
}
@@ -156,10 +156,10 @@ struct ComputerscareTolyPoolsWidget : ModuleWidget {
addLabeledKnob("Num Output Channels", 10, 156, module, ComputerscareTolyPools::NUM_CHANNELS_KNOB, -14, -24, 0);
addInput(createInput<InPort>(Vec(10, 186), module, ComputerscareTolyPools::NUM_CHANNELS_CV));
-
+
addLabeledKnob("Rotation", 10, 256, module, ComputerscareTolyPools::ROTATE_KNOB, -13, -5, 1);
- addInput(createInput<InPort>(Vec(10,286), module, ComputerscareTolyPools::ROTATE_CV));
-
+ addInput(createInput<InPort>(Vec(10, 286), module, ComputerscareTolyPools::ROTATE_CV));
+
addOutput(createOutput<OutPort>(Vec(28, 30), module, ComputerscareTolyPools::POLY_OUTPUT));
diff --git a/src/MenuParams.hpp b/src/MenuParams.hpp
@@ -119,28 +119,28 @@ struct MultiselectParamQuantity;
struct ComputerscareMenuParamModule : Module {
std::vector<ParamAndType*> paramList;
- std::map<int,ParamAndType*> pidMap;
+ std::map<int, ParamAndType*> pidMap;
ParamQuantity* pq;
void configMenuParam(int paramId, float minValue, float maxValue, float defaultValue, std::string label = "", int controlType = 2, std::string unit = "", float displayBase = 0.f, float displayMultiplier = 1.f, float displayOffset = 0.f) {
-
+
configParam(paramId, minValue, maxValue, defaultValue, label, unit, displayBase, displayMultiplier);
pq = paramQuantities[paramId];
ParamAndType* pt = new ParamAndType(pq, controlType);
paramList.push_back(pt);
}
- void configMenuParam(int paramId, float defaultValue,std::string label= "",std::vector<std::string> options = {}) {
+ void configMenuParam(int paramId, float defaultValue, std::string label = "", std::vector<std::string> options = {}) {
int size = (int) options.size();
- configParam<MultiselectParamQuantity>(paramId,0,size-1,defaultValue,label);
+ configParam<MultiselectParamQuantity>(paramId, 0, size - 1, defaultValue, label);
pq = paramQuantities[paramId];
ParamAndType* pt = new ParamAndType(pq, 2);
paramList.push_back(pt);
- pidMap.insert({paramId,pt});
+ pidMap.insert({paramId, pt});
}
std::vector<ParamAndType*> getParamList() {
return paramList;
}
- std::string getOptionValue(int paramId,int index) {
+ std::string getOptionValue(int paramId, int index) {
//std::vector<std::string> *options = pidMap.find(paramId);
//return pidMap.find(paramId).at(index);
return "charles";
@@ -150,7 +150,7 @@ struct MultiselectParamQuantity : ParamQuantity {
ComputerscareMenuParamModule* module;
std::string getDisplayValueString() override {
int index = Quantity::getValue();
- return module->getOptionValue(paramId,index);
+ return module->getOptionValue(paramId, index);
}
};
struct MenuParamModuleWidget : ModuleWidget {
@@ -173,9 +173,9 @@ struct MenuParamModuleWidget : ModuleWidget {
struct ParamSettingItem : MenuItem {
int myVal;
Param* myParam;
- ParamSettingItem(int val,Param *param) {
- myVal=val;
- myParam=param;
+ ParamSettingItem(int val, Param *param) {
+ myVal = val;
+ myParam = param;
}
void onAction(const event::Action &e) override {
myParam->setValue(myVal);
diff --git a/src/drawFunctions.hpp b/src/drawFunctions.hpp
@@ -7,7 +7,7 @@ struct DrawHelper {
DrawHelper(NVGcontext* ctx) {
vg = ctx;
}
- void drawShape(std::vector<Vec> points, NVGcolor fillColor=COLOR_COMPUTERSCARE_PINK) {
+ void drawShape(std::vector<Vec> points, NVGcolor fillColor = COLOR_COMPUTERSCARE_PINK) {
drawShape(points, fillColor, COLOR_COMPUTERSCARE_TRANSPARENT, 0.f);
}
void drawShape(std::vector<Vec> points, NVGcolor fillColor, NVGcolor strokeColor) {
@@ -22,7 +22,7 @@ struct DrawHelper {
nvgBeginPath(vg);
nvgStrokeColor(vg, strokeColor);
nvgStrokeWidth(vg, thickness);
- nvgFillColor(vg,fillColor);
+ nvgFillColor(vg, fillColor);
nvgMoveTo(vg, points[0].x, points[0].y);
for (unsigned int i = 1; i < n; i++) {
@@ -36,18 +36,18 @@ struct DrawHelper {
}
nvgRestore(vg);
}
- void drawDots(std::vector<Vec> points,NVGcolor fillColor=BLACK,float thickness=1.f) {
+ void drawDots(std::vector<Vec> points, NVGcolor fillColor = BLACK, float thickness = 1.f) {
unsigned int n = points.size();
//nvgSave(vg);
- // nvgBeginPath(vg);
+ // nvgBeginPath(vg);
nvgBeginPath(vg);
//nvgStrokeColor(vg, fillColor);
//nvgStrokeWidth(vg, thickness);
- nvgFillColor(vg,fillColor);
+ nvgFillColor(vg, fillColor);
//nvgMoveTo(vg, 0,0);
for (unsigned int i = 0; i < n; i++) {
- nvgCircle(vg, points[i].x, points[i].y,thickness);
+ nvgCircle(vg, points[i].x, points[i].y, thickness);
}
nvgClosePath(vg);
@@ -56,104 +56,104 @@ struct DrawHelper {
nvgStroke(vg);
}*/
//nvgStroke(vg);
- // nvgRestore(vg);
+ // nvgRestore(vg);
}
//void drawLines(std::vector<Vec> points, float length=)
- void drawLines(std::vector<Vec> points,float length=20,float angle=0.f,float thickness=5.f) {
+ void drawLines(std::vector<Vec> points, float length = 20, float angle = 0.f, float thickness = 5.f) {
std::vector<Vec> angles;
- for(unsigned int i = 0; i < points.size(); i++) {
- angles.push_back(Vec(length,angle));
+ for (unsigned int i = 0; i < points.size(); i++) {
+ angles.push_back(Vec(length, angle));
}
- drawLines(points,angles,COLOR_COMPUTERSCARE_RED,thickness);
+ drawLines(points, angles, COLOR_COMPUTERSCARE_RED, thickness);
}
- void drawLines(std::vector<Vec> points, std::vector<Vec> rTheta,std::vector<NVGcolor> strokeColors,std::vector<Vec> thicknesses) {
+ void drawLines(std::vector<Vec> points, std::vector<Vec> rTheta, std::vector<NVGcolor> strokeColors, std::vector<Vec> thicknesses) {
unsigned int n = points.size();
-
- // nvgBeginPath(vg);
-
+
+ // nvgBeginPath(vg);
+
//nvgMoveTo(vg, 0,0);
for (unsigned int i = 0; i < n; i++) {
- nvgSave(vg);
- nvgBeginPath(vg);
+ nvgSave(vg);
+ nvgBeginPath(vg);
nvgStrokeWidth(vg, thicknesses[i].x);
nvgStrokeColor(vg, strokeColors[i]);
- nvgMoveTo(vg,points[i].x,points[i].y);
- nvgLineTo(vg,points[i].x+rTheta[i].x*cos(rTheta[i].y),points[i].y+rTheta[i].x*sin(rTheta[i].y));
+ nvgMoveTo(vg, points[i].x, points[i].y);
+ nvgLineTo(vg, points[i].x + rTheta[i].x * cos(rTheta[i].y), points[i].y + rTheta[i].x * sin(rTheta[i].y));
nvgStroke(vg);
nvgRestore(vg);
//nvgClosePath(vg);
}
-
-
+
+
}
- void drawLines(std::vector<Vec> points, std::vector<Vec> rTheta,NVGcolor strokeColor=COLOR_COMPUTERSCARE_RED,float thickness=1.f) {
+ void drawLines(std::vector<Vec> points, std::vector<Vec> rTheta, NVGcolor strokeColor = COLOR_COMPUTERSCARE_RED, float thickness = 1.f) {
unsigned int n = points.size();
nvgSave(vg);
- // nvgBeginPath(vg);
+ // nvgBeginPath(vg);
nvgBeginPath(vg);
nvgStrokeColor(vg, strokeColor);
nvgStrokeWidth(vg, thickness);
//nvgMoveTo(vg, 0,0);
for (unsigned int i = 0; i < n; i++) {
- nvgMoveTo(vg,points[i].x,points[i].y);
- nvgLineTo(vg,points[i].x+rTheta[i].x*cos(rTheta[i].y),points[i].y+rTheta[i].x*sin(rTheta[i].y));
+ nvgMoveTo(vg, points[i].x, points[i].y);
+ nvgLineTo(vg, points[i].x + rTheta[i].x * cos(rTheta[i].y), points[i].y + rTheta[i].x * sin(rTheta[i].y));
//nvgClosePath(vg);
}
nvgStroke(vg);
nvgRestore(vg);
}
- void drawLines(int n, float dThickness,float dTheta,float dColor=0.1) {
+ void drawLines(int n, float dThickness, float dTheta, float dColor = 0.1) {
nvgSave(vg);
- // nvgBeginPath(vg);
-
+ // nvgBeginPath(vg);
+
//nvgMoveTo(vg, 0,0);
- float radius=100000;
- float thickness=10;
+ float radius = 100000;
+ float thickness = 10;
for (int i = 0; i < n; i++) {
-
- NVGcolor color = sincolor(dColor*i/n);
- float angle = dTheta*i/n*2*M_PI;
+
+ NVGcolor color = sincolor(dColor * i / n);
+ float angle = dTheta * i / n * 2 * M_PI;
nvgBeginPath(vg);
nvgStrokeColor(vg, color);
nvgStrokeWidth(vg, thickness);
-
- float x0=radius*cosf(angle);
- float y0 = radius*sinf(angle);
- float x1 = radius*cosf(angle+M_PI);
- float y1 = radius*sinf(angle+M_PI);
-
- nvgMoveTo(vg,x0,y0);
- nvgLineTo(vg,x1,y1);
+
+ float x0 = radius * cosf(angle);
+ float y0 = radius * sinf(angle);
+ float x1 = radius * cosf(angle + M_PI);
+ float y1 = radius * sinf(angle + M_PI);
+
+ nvgMoveTo(vg, x0, y0);
+ nvgLineTo(vg, x1, y1);
nvgClosePath(vg);
nvgStroke(vg);
- thickness*=expf(dThickness);
+ thickness *= expf(dThickness);
}
nvgRestore(vg);
}
- void drawField(std::vector<Vec> points, NVGcolor strokeColor=BLACK,float length=4,float thickness=1.f) {
+ void drawField(std::vector<Vec> points, NVGcolor strokeColor = BLACK, float length = 4, float thickness = 1.f) {
unsigned int n = points.size();
nvgSave(vg);
- // nvgBeginPath(vg);
+ // nvgBeginPath(vg);
nvgBeginPath(vg);
nvgStrokeColor(vg, strokeColor);
nvgStrokeWidth(vg, thickness);
//nvgMoveTo(vg, 0,0);
for (unsigned int i = 0; i < n; i++) {
- nvgMoveTo(vg,points[i].x,points[i].y);
- Vec end = points[i].plus(Vec(points[i].y,-points[i].x).normalize().mult(length));
- nvgLineTo(vg,end.x,end.y);
+ nvgMoveTo(vg, points[i].x, points[i].y);
+ Vec end = points[i].plus(Vec(points[i].y, -points[i].x).normalize().mult(length));
+ nvgLineTo(vg, end.x, end.y);
//nvgClosePath(vg);
}
nvgStroke(vg);
nvgRestore(vg);
}
- NVGcolor sincolor(float t,std::vector<float> omega={1,2,3},std::vector<float> phi={0.f,5.f,9.f}) {
- return nvgRGB(127*(1+sin(t*omega[0]+phi[0])),127*(1+sin(t*omega[1]+phi[1])),127*(1+sin(t*omega[2]+phi[2])));
+ NVGcolor sincolor(float t, std::vector<float> omega = {1, 2, 3}, std::vector<float> phi = {0.f, 5.f, 9.f}) {
+ return nvgRGB(127 * (1 + sin(t * omega[0] + phi[0])), 127 * (1 + sin(t * omega[1] + phi[1])), 127 * (1 + sin(t * omega[2] + phi[2])));
}
};
\ No newline at end of file
diff --git a/src/dtpulse.cpp b/src/dtpulse.cpp
@@ -368,8 +368,8 @@ bool matchParens(std::string value) {
}
void printVector(std::vector <int> intVector) {
//printf("int vector of size %i\n",intVector.size());
- for(unsigned int i= 0; i < intVector.size(); i++) {
- printf("%i ",intVector[i]);
+ for (unsigned int i = 0; i < intVector.size(); i++) {
+ printf("%i ", intVector[i]);
}
printf("\n");
}
@@ -393,24 +393,24 @@ void whoKnowsLaundryPoly(std::string input) {
}
LaundryPoly::LaundryPoly(std::string formula) {
std::string newFormula = "";
- bool myInError=false;
- maxSteps=-1;
- int ns;
- std::vector<std::string> semisep = split(formula,';');
- int semilen = semisep.size();
- for (int i = 0; i < 16; i++ ) {
+ bool myInError = false;
+ maxSteps = -1;
+ int ns;
+ std::vector<std::string> semisep = split(formula, ';');
+ int semilen = semisep.size();
+ for (int i = 0; i < 16; i++ ) {
//newFormula = formula;
- newFormula=semilen==0 ? formula : semisep[i%semilen];//i%semilen];
+ newFormula = semilen == 0 ? formula : semisep[i % semilen]; //i%semilen];
replaceAll(newFormula, "#", "<" + std::to_string(static_cast<long long>(i + 1)) + ">");
lss[i] = LaundrySoupSequence(newFormula);
ns = lss[i].numSteps;
- if(ns > maxSteps) {
+ if (ns > maxSteps) {
maxSteps = ns;
maxIndex = i;
}
myInError = myInError || lss[i].inError;
}
- inError=myInError;
+ inError = myInError;
}
LaundryPoly::LaundryPoly() {
LaundryPoly("");
@@ -473,10 +473,10 @@ void LaundrySoupSequence::Setup(std::vector<Token> tokens) {
workingPulseSequence = duplicateIntVector(pulseSequence);
numSteps = (int) pulseSequence.size();
readHead = -1;
- inError=false;
+ inError = false;
}
void LaundrySoupSequence::print() {
- printf(" LaundrySoupSequence inError:%d, tokenStack:\n",inError);
+ printf(" LaundrySoupSequence inError:%d, tokenStack:\n", inError);
//printTokenVector(tokenStack);
//printf(" Laundry pulseSequence:\n");
//printVector(pulseSequence);
@@ -488,14 +488,14 @@ std::vector<int> LaundrySoupSequence::makePulseSequence(std::vector<Token> token
int thisGate;
for (unsigned int i = 0; i < tokens.size(); i++) {
thisVal = tokens[i].duration;
-
+
//horrible hacky way to not crash Rack via entering a ridiculously long sequence
//mostly to protect the higher channels of 4^#. Laundry soup can still break Rack
//with something like this 1@999999999999
- thisVal = std::min(std::max(1,MAX_LENGTH-length),thisVal);
+ thisVal = std::min(std::max(1, MAX_LENGTH - length), thisVal);
thisGate = (tokens[i].type == "ChanceOfInteger" ? 2 : (tokens[i].value == "0" ? 0 : 1));
output.push_back(thisGate);
- length+=thisVal;
+ length += thisVal;
for (int j = 1; j < thisVal; j++) {
output.push_back(0);
}
@@ -650,16 +650,16 @@ Token::Token(std::string t, std::string v, int dex, int dur) {
duration = dur;
}
Token::Token(std::string t, int val) {
- type=t;
- value = std::to_string(static_cast<long long>(val));
- index=-1;
- duration=std::max(val,1);
+ type = t;
+ value = std::to_string(static_cast<long long>(val));
+ index = -1;
+ duration = std::max(val, 1);
}
Token::Token(const Token& source) {
- type=source.type;
- value=source.value;
- index=source.index;
- duration=source.duration;
+ type = source.type;
+ value = source.value;
+ index = source.index;
+ duration = source.duration;
}
Parser::Parser(std::string expr) {
tokens = tokenizeString(expr);
@@ -672,14 +672,14 @@ Parser::Parser() {
void Parser::setForLaundryPoly() {
Token t = tokens[0];
while (t.type != "NULL") {
- tokenStack.push_back(Token(t.type, t.value, t.index,t.duration ));
+ tokenStack.push_back(Token(t.type, t.value, t.index, t.duration ));
t = skipAndPeekToken();
}
printf("setForLaundryPoly\n");
printTokenVector(tokenStack);
}
void Parser::setForLaundry() {
- std::vector<std::string> laundryBinaryOp = {"Plus","Minus","Asterix","Backslash","Caret","Ampersand"};
+ std::vector<std::string> laundryBinaryOp = {"Plus", "Minus", "Asterix", "Backslash", "Caret", "Ampersand"};
std::vector<std::string> laundryInterleaveAny = {"Letter", "Integer", "ChanceOfInteger", "Digit", "LeftParen", "RightParen", "Channel"};
std::vector<std::string> laundryAtExpandAny = {"Letter", "Digit", "ChanceOfInteger", "Integer", "Channel"};
std::vector<std::string> laundrySquareAny = {"Letter", "Digit", "ChanceOfInteger", "Integer", "Comma", "Channel"};
@@ -693,42 +693,42 @@ void Parser::setForLaundry() {
tokenStack = {};
setForExactIntegers(tokens[0]);
- if(!inError) {
- currentIndex = 0;
- tokens=tokenStack;
- tokenStack={};
- setFormula(peekToken(),laundryBinaryOp,true);
if (!inError) {
currentIndex = 0;
tokens = tokenStack;
tokenStack = {};
- setForChanceOfIntegers(peekToken());
+ setFormula(peekToken(), laundryBinaryOp, true);
if (!inError) {
currentIndex = 0;
tokens = tokenStack;
tokenStack = {};
- setForInterleave(peekToken(), laundryInterleaveAny);
+ setForChanceOfIntegers(peekToken());
if (!inError) {
currentIndex = 0;
tokens = tokenStack;
tokenStack = {};
- setForAtExpand(peekToken(), laundryAtExpandAny, true);
-
+ setForInterleave(peekToken(), laundryInterleaveAny);
if (!inError) {
currentIndex = 0;
tokens = tokenStack;
tokenStack = {};
- setForSquareBrackets(peekToken(), laundrySquareAny, true);
+ setForAtExpand(peekToken(), laundryAtExpandAny, true);
if (!inError) {
currentIndex = 0;
tokens = tokenStack;
tokenStack = {};
- setFinal(peekToken(), laundryFinalAny);
+ setForSquareBrackets(peekToken(), laundrySquareAny, true);
+
+ if (!inError) {
+ currentIndex = 0;
+ tokens = tokenStack;
+ tokenStack = {};
+ setFinal(peekToken(), laundryFinalAny);
+ }
}
}
}
- }
}
}
}
@@ -857,9 +857,9 @@ void Parser::setForExactIntegers(Token t) {
t = skipAndPeekToken();
}
}
-void Parser::setFormula(Token t,std::vector<std::string> operatorWhitelist,bool laundryMode) {
+void Parser::setFormula(Token t, std::vector<std::string> operatorWhitelist, bool laundryMode) {
while (t.type != "NULL") {
- ParseFormula(t,operatorWhitelist,laundryMode);
+ ParseFormula(t, operatorWhitelist, laundryMode);
if (peekToken().type != "NULL") {
tokenStack.push_back(peekToken());
}
@@ -917,54 +917,54 @@ void Parser::ParseVariable(Token t) {
tokenStack.push_back(Token("ChannelVariable", "1", -1, std::stoi("5")));
}
}
-void Parser::ParseFormula(Token t,std::vector<std::string> operatorWhitelist, bool laundryMode) {
- std::vector<Token> terminalStack;
- std::vector<Token> operatorStack;
- std::vector<std::string> whitelist = operatorWhitelist;
- whitelist.push_back("Integer");
- whitelist.push_back("Digit");
- while(matchesAny(t.type,whitelist)) {
- if(t.type=="Integer" || t.type=="Digit") {
- if(operatorStack.size() > 0) {
- if(terminalStack.size() > 0) {
- //apply them
- std::string op = operatorStack.back().type;
- operatorStack.pop_back();
- int lhs = terminalStack.back().duration;
- int rhs = t.duration;
- int result =lhs;
- terminalStack.pop_back();
- if(op=="Asterix") {
- result=lhs*rhs;
- } else if(op=="Ampersand") {
- result=lhs%rhs;
- } else if(op=="Plus") {
- result=lhs+rhs;
- }
- else if(op=="Minus") {
- result=lhs-rhs;
- }
- else if(op=="Backslash") {
- result = lhs/rhs;
- }
- else if(op=="Caret") {
- result= myPow(lhs,rhs);
- }
- terminalStack.push_back(Token("Integer",result));
- }
- else {
- inError=true;
- }
- }
- else {
- terminalStack.push_back(t);
- }
- }
- else { //operator
- operatorStack.push_back(t);
- }
- t = skipAndPeekToken();
- }
+void Parser::ParseFormula(Token t, std::vector<std::string> operatorWhitelist, bool laundryMode) {
+ std::vector<Token> terminalStack;
+ std::vector<Token> operatorStack;
+ std::vector<std::string> whitelist = operatorWhitelist;
+ whitelist.push_back("Integer");
+ whitelist.push_back("Digit");
+ while (matchesAny(t.type, whitelist)) {
+ if (t.type == "Integer" || t.type == "Digit") {
+ if (operatorStack.size() > 0) {
+ if (terminalStack.size() > 0) {
+ //apply them
+ std::string op = operatorStack.back().type;
+ operatorStack.pop_back();
+ int lhs = terminalStack.back().duration;
+ int rhs = t.duration;
+ int result = lhs;
+ terminalStack.pop_back();
+ if (op == "Asterix") {
+ result = lhs * rhs;
+ } else if (op == "Ampersand") {
+ result = lhs % rhs;
+ } else if (op == "Plus") {
+ result = lhs + rhs;
+ }
+ else if (op == "Minus") {
+ result = lhs - rhs;
+ }
+ else if (op == "Backslash") {
+ result = lhs / rhs;
+ }
+ else if (op == "Caret") {
+ result = myPow(lhs, rhs);
+ }
+ terminalStack.push_back(Token("Integer", result));
+ }
+ else {
+ inError = true;
+ }
+ }
+ else {
+ terminalStack.push_back(t);
+ }
+ }
+ else { //operator
+ operatorStack.push_back(t);
+ }
+ t = skipAndPeekToken();
+ }
tokenStack.insert(tokenStack.end(), terminalStack.begin(), terminalStack.end());
}
void Parser::ParseExactInteger(Token t) {
@@ -1101,7 +1101,7 @@ void Parser::ParseAtExpand(Token t, std::vector<std::string> whitelist, bool lau
t = skipAndPeekToken();
}
atNum = ParseAtPart(t);
- atNum = std::min(atNum,MAX_LENGTH);
+ atNum = std::min(atNum, MAX_LENGTH);
if (laundryMode) {
proposedTokens = atExpandTokens(tokenVec, atNum);
}
@@ -1317,11 +1317,11 @@ void whoKnowsQuantize(std::string input) {
//float in = std::stof(input);
//printf("closest: %f\n",q.quantize(in));
//printf("even : %f\n",q.quantizeEven(in));
- Quantizer q = Quantizer(input,12,0);
- q.print();
- //float in = std::stof(input);
- //printf("closest: %f\n",q.quantize(in));
- //printf("even : %f\n",q.quantizeEven(in));
+ Quantizer q = Quantizer(input, 12, 0);
+ q.print();
+ //float in = std::stof(input);
+ //printf("closest: %f\n",q.quantize(in));
+ //printf("even : %f\n",q.quantizeEven(in));
}
Quantizer::Quantizer() {
Quantizer("2212221", 12, 0);
@@ -1394,7 +1394,7 @@ float Quantizer::quantizeEven(float input) {
}
void Quantizer::print() {
- printFloatVector(mappedValues);
+ printFloatVector(mappedValues);
}
std::string getByteString(float f) {
unsigned char const * p = reinterpret_cast<unsigned char const *>(&f);
@@ -1430,24 +1430,24 @@ int myPow(int x, int p)
if (p == 0) return 1;
if (p == 1) return x;
- int tmp = myPow(x, p/2);
- if (p%2 == 0) return tmp * tmp;
+ int tmp = myPow(x, p / 2);
+ if (p % 2 == 0) return tmp * tmp;
else return x * tmp * tmp;
}
std::vector<std::string> split(std::string strToSplit, char delimeter)
{
- std::stringstream ss(strToSplit);
- std::string item;
- std::vector<std::string> splittedStrings;
- while (std::getline(ss, item, delimeter))
- {
- splittedStrings.push_back(item);
- }
- return splittedStrings;
-}
-void swap (int *a, int *b)
-{
- int temp = *a;
- *a = *b;
- *b = temp;
+ std::stringstream ss(strToSplit);
+ std::string item;
+ std::vector<std::string> splittedStrings;
+ while (std::getline(ss, item, delimeter))
+ {
+ splittedStrings.push_back(item);
+ }
+ return splittedStrings;
+}
+void swap (int *a, int *b)
+{
+ int temp = *a;
+ *a = *b;
+ *b = temp;
}
diff --git a/src/dtpulse.hpp b/src/dtpulse.hpp
@@ -19,148 +19,148 @@ extern std::string knobandinputlookup;
#endif
class Token {
- public:
- std::string type;
- std::string value;
- int index;
- int duration;
- Token(std::string t, std::string v);
- Token(std::string t, std::string v, int dex, int dur);
- Token(std::string t, std::string v, int dex);
- Token(std::string t, int val);
- Token(const Token& source);
- void print();
+public:
+ std::string type;
+ std::string value;
+ int index;
+ int duration;
+ Token(std::string t, std::string v);
+ Token(std::string t, std::string v, int dex, int dur);
+ Token(std::string t, std::string v, int dex);
+ Token(std::string t, int val);
+ Token(const Token& source);
+ void print();
};
class Parser {
- public:
- Parser();
- Parser(std::string expr);
- std::string expression;
- std::vector<Token> tokens;
- char peekChar();
- char skipAndPeekChar();
- void skipChar();
+public:
+ Parser();
+ Parser(std::string expr);
+ std::string expression;
+ std::vector<Token> tokens;
+ char peekChar();
+ char skipAndPeekChar();
+ void skipChar();
- Token peekToken();
- Token skipAndPeekToken();
- void setForCookies();
- void setForLaundry();
- void setForLaundryPoly();
- void setForQuantizer();
- void skipToken();
- void setExactValue(Token t);
- void setForExactIntegers(Token t);
- void setFormula(Token t,std::vector<std::string> operatorWhitelist, bool laundryMode);
- void setForVariables(Token t);
- void setForChanceOfIntegers(Token t);
- void setForRandoms(Token t);
- void replaceLettersWithNumbers(Token t);
- void setForInterleave(Token t,std::vector<std::string> whitelist);
- void setForAtExpand(Token t, std::vector<std::string> whitelist, bool laundryMode);
- void setForSquareBrackets(Token t, std::vector<std::string> whitelist, bool laundryMode);
- void setFinal(Token t, std::vector<std::string> whitelist);
- bool inError;
- std::string parseFloat(Token t);
- std::vector<Token> tokenStack;
- std::vector<float> exactFloats;
- std::vector<std::vector<Token>> randomVector;
- std::vector<Token> atExpandTokens(std::vector<std::vector<Token>> tokenVecVec, int atNum);
- std::vector<Token> countExpandTokens(std::vector<std::vector<Token>> tokenVecVec, int atNum);
- private:
- int currentIndex;
- void ParseExactValue(Token t);
- void ParseExactInteger(Token t);
- void ParseFormula(Token t,std::vector<std::string> operatorWhitelist,bool laundryMode);
- void ParseVariable(Token t);
- void ParseRandomSequence(Token t);
- void ParseInterleave(Token t,std::vector<std::string> whitelist);
- void ParseAtExpand(Token t, std::vector<std::string> whitelist, bool laundryMode);
- void ParseSquareBrackets(Token t, std::vector<std::string> whitelist, bool laundryMode);
- void ParseChanceOfInteger(Token t);
- int ParseAtPart(Token t);
+ Token peekToken();
+ Token skipAndPeekToken();
+ void setForCookies();
+ void setForLaundry();
+ void setForLaundryPoly();
+ void setForQuantizer();
+ void skipToken();
+ void setExactValue(Token t);
+ void setForExactIntegers(Token t);
+ void setFormula(Token t, std::vector<std::string> operatorWhitelist, bool laundryMode);
+ void setForVariables(Token t);
+ void setForChanceOfIntegers(Token t);
+ void setForRandoms(Token t);
+ void replaceLettersWithNumbers(Token t);
+ void setForInterleave(Token t, std::vector<std::string> whitelist);
+ void setForAtExpand(Token t, std::vector<std::string> whitelist, bool laundryMode);
+ void setForSquareBrackets(Token t, std::vector<std::string> whitelist, bool laundryMode);
+ void setFinal(Token t, std::vector<std::string> whitelist);
+ bool inError;
+ std::string parseFloat(Token t);
+ std::vector<Token> tokenStack;
+ std::vector<float> exactFloats;
+ std::vector<std::vector<Token>> randomVector;
+ std::vector<Token> atExpandTokens(std::vector<std::vector<Token>> tokenVecVec, int atNum);
+ std::vector<Token> countExpandTokens(std::vector<std::vector<Token>> tokenVecVec, int atNum);
+private:
+ int currentIndex;
+ void ParseExactValue(Token t);
+ void ParseExactInteger(Token t);
+ void ParseFormula(Token t, std::vector<std::string> operatorWhitelist, bool laundryMode);
+ void ParseVariable(Token t);
+ void ParseRandomSequence(Token t);
+ void ParseInterleave(Token t, std::vector<std::string> whitelist);
+ void ParseAtExpand(Token t, std::vector<std::string> whitelist, bool laundryMode);
+ void ParseSquareBrackets(Token t, std::vector<std::string> whitelist, bool laundryMode);
+ void ParseChanceOfInteger(Token t);
+ int ParseAtPart(Token t);
};
class AbsoluteSequence {
- public:
- AbsoluteSequence(std::string expr, std::string lookup);
- AbsoluteSequence();
- void randomizeIndex(int index);
- std::vector<int> indexSequence;
- std::vector<int> workingIndexSequence;
- std::vector<float> exactFloats;
- std::vector<std::vector<int>> randomIndexes;
- std::vector<std::vector<Token>> randomTokens;
- std::vector<Token> tokenStack;
- int readHead;
- int numTokens;
- void print();
- bool inError;
- void skipStep();
- int peekStep();
- int peekWorkingStep();
- int skipAndPeek();
- void incrementAndCheck();
- int getReadHead();
- int getCurrentAddressAtReadHead();
- std::string getWorkingStepDisplay();
+public:
+ AbsoluteSequence(std::string expr, std::string lookup);
+ AbsoluteSequence();
+ void randomizeIndex(int index);
+ std::vector<int> indexSequence;
+ std::vector<int> workingIndexSequence;
+ std::vector<float> exactFloats;
+ std::vector<std::vector<int>> randomIndexes;
+ std::vector<std::vector<Token>> randomTokens;
+ std::vector<Token> tokenStack;
+ int readHead;
+ int numTokens;
+ void print();
+ bool inError;
+ void skipStep();
+ int peekStep();
+ int peekWorkingStep();
+ int skipAndPeek();
+ void incrementAndCheck();
+ int getReadHead();
+ int getCurrentAddressAtReadHead();
+ std::string getWorkingStepDisplay();
};
class LaundrySoupSequence {
- public:
- LaundrySoupSequence(std::string expr);
- LaundrySoupSequence(const std::vector<Token>& tokens);
- LaundrySoupSequence();
- void Tokenize(std::string formula);
- void Setup(std::vector<Token> tokens);
- std::vector<Token> tokenStack;
- std::vector<int> pulseSequence;
- std::vector<int> workingPulseSequence;
- std::vector<int> makePulseSequence(std::vector<Token> tokens);
- int readHead;
- int numSteps;
- bool inError;
- void print();
- int peekStep();
- void skipStep();
- int skipAndPeek();
- int peekWorkingStep();
- void incrementAndCheck();
- bool atLastStep();
- void randomizePulseValue(int index);
+public:
+ LaundrySoupSequence(std::string expr);
+ LaundrySoupSequence(const std::vector<Token>& tokens);
+ LaundrySoupSequence();
+ void Tokenize(std::string formula);
+ void Setup(std::vector<Token> tokens);
+ std::vector<Token> tokenStack;
+ std::vector<int> pulseSequence;
+ std::vector<int> workingPulseSequence;
+ std::vector<int> makePulseSequence(std::vector<Token> tokens);
+ int readHead;
+ int numSteps;
+ bool inError;
+ void print();
+ int peekStep();
+ void skipStep();
+ int skipAndPeek();
+ int peekWorkingStep();
+ void incrementAndCheck();
+ bool atLastStep();
+ void randomizePulseValue(int index);
};
class Quantizer {
- public:
- Quantizer(std::string intervals, int divisions, int trans);
- Quantizer();
- float quantize(float val);
- float quantizeEven(float val);
- float quantizeEven(float val, int iTranspose);
- float findEvenSpacingValue(float input, std::vector<float> allowedValues);
- float findEvenSpacingImpure(float input);
- float fNumDivisions;
- std::vector<float> mappedValues;
- int numDivisions;
- int transpose;
- bool parseError;
- int numSteps;
- float fTranspose;
- void print();
- private:
- Parser scaleParser;
- float findClosestValue(float input, std::vector<float> allowedValues);
+public:
+ Quantizer(std::string intervals, int divisions, int trans);
+ Quantizer();
+ float quantize(float val);
+ float quantizeEven(float val);
+ float quantizeEven(float val, int iTranspose);
+ float findEvenSpacingValue(float input, std::vector<float> allowedValues);
+ float findEvenSpacingImpure(float input);
+ float fNumDivisions;
+ std::vector<float> mappedValues;
+ int numDivisions;
+ int transpose;
+ bool parseError;
+ int numSteps;
+ float fTranspose;
+ void print();
+private:
+ Parser scaleParser;
+ float findClosestValue(float input, std::vector<float> allowedValues);
- std::vector<float> generateMappedValues();
+ std::vector<float> generateMappedValues();
};
class LaundryPoly {
- public:
- LaundrySoupSequence lss[16];
- int maxIndex;
- int maxSteps;
- LaundryPoly(std::string formula);
- LaundryPoly();
- bool maxChannelAtLastStep();
+public:
+ LaundrySoupSequence lss[16];
+ int maxIndex;
+ int maxSteps;
+ LaundryPoly(std::string formula);
+ LaundryPoly();
+ bool maxChannelAtLastStep();
- void print();
- bool inError;
+ void print();
+ bool inError;
};
bool matchesAny(std::string val, std::vector<std::string> whitelist);
bool is_digits(const std::string &str);
@@ -169,10 +169,10 @@ void padTo(std::string &str, const size_t num, const char paddingChar );
std::vector <int> parseString(std::string expr);
std::vector <int> parseDt(std::string input, int offset, std::string lookup);
std::vector <int> parseLookup(std::string input, int offset, std::string lookup);
-std::vector<int> parseEntireString(std::string input,std::string lookup, int type);
-std::vector<int> parseStringAsValues(std::string input,std::string lookup);
-std::vector<int> parseStringAsTimes(std::string input,std::string lookup);
-void printVector(std::vector <int> intVector);
+std::vector<int> parseEntireString(std::string input, std::string lookup, int type);
+std::vector<int> parseStringAsValues(std::string input, std::string lookup);
+std::vector<int> parseStringAsTimes(std::string input, std::string lookup);
+void printVector(std::vector <int> intVector);
void printFloatVector(std::vector<float> floatVector);
void printTokenVector(std::vector<std::vector<Token>> tokenVector);
void printTokenVector(std::vector<Token> tokenVector);
@@ -186,7 +186,7 @@ std::string countExpand(std::string input, int atnum);
std::string concatVectorFromLookup(std::vector<int> vector, std::string lookup);
std::vector<Token> tokenizeString(std::string input);
bool matchParens(std::string value);
-std::string evalToken(std::string input, std::string type,std::vector<Token> tStack);
+std::string evalToken(std::string input, std::string type, std::vector<Token> tStack);
void whoKnows(std::string input);
void whoKnowsLaundry(std::string input);
void whoKnowsLaundryPoly(std::string input);
diff --git a/src/golyFunctions.cpp b/src/golyFunctions.cpp
@@ -8,7 +8,7 @@ Goly::Goly() {
}
//[A,B,C,D]
/*
- std::vector<float> golyParams =
+ std::vector<float> golyParams =
{
gp[0]= params[IN_OFFSET].getValue(), //-1,1
gp[1]= params[IN_SCALE].getValue(), //-2,2
@@ -18,7 +18,7 @@ Goly::Goly() {
*/
void Goly::invoke(int algorithm, std::vector<float> gp, int num = 16) {
- float trigFactor = 2*M_PI / num;
+ float trigFactor = 2 * M_PI / num;
switch (algorithm)
{
case 0: // code to be executed if n = 1;
@@ -38,7 +38,7 @@ void Goly::invoke(int algorithm, std::vector<float> gp, int num = 16) {
for (int i = 0; i < num; i++) {
float ip = (float)i / num;
float d = ip - gp[0] - 0.5;
- currentValues[i] = gp[2] / (1 + exp(-d * exp(-4 * gp[1]+6))) + gp[3];
+ currentValues[i] = gp[2] / (1 + exp(-d * exp(-4 * gp[1] + 6))) + gp[3];
}
break;
case 2:
@@ -46,25 +46,25 @@ void Goly::invoke(int algorithm, std::vector<float> gp, int num = 16) {
for (int i = 0; i < num; i++) {
float ip = (float)i / num;
float d = ip - gp[0] - 0.5;
- currentValues[i] = gp[2] * exp(-d*d*exp(-5*gp[1]+7)) + gp[3];
+ currentValues[i] = gp[2] * exp(-d * d * exp(-5 * gp[1] + 7)) + gp[3];
}
break;
case 3:
//sine wave
for (int i = 0; i < num; i++) {
float ip = (float)i / num;
- float d = trigFactor*(ip - gp[0]);
- currentValues[i] = gp[2] * (1+sinf(d*exp(-1.5*(gp[1]-3))))/2 + gp[3];
+ float d = trigFactor * (ip - gp[0]);
+ currentValues[i] = gp[2] * (1 + sinf(d * exp(-1.5 * (gp[1] - 3)))) / 2 + gp[3];
}
break;
case 4:
//pseudo random
- for(int i = 0; i < num; i++) {
+ for (int i = 0; i < num; i++) {
float ip = (float) i / num;
- float d = trigFactor*(ip-gp[0]);
- currentValues[i] = gp[2]*(4 + sinf(d*29-3+16*gp[1]) + sinf(-d*24-2+39*gp[1]) + sinf(d*17-1-27*gp[1])+sinf(d*109+12.2-17*gp[1]))/8 + gp[3];
+ float d = trigFactor * (ip - gp[0]);
+ currentValues[i] = gp[2] * (4 + sinf(d * 29 - 3 + 16 * gp[1]) + sinf(-d * 24 - 2 + 39 * gp[1]) + sinf(d * 17 - 1 - 27 * gp[1]) + sinf(d * 109 + 12.2 - 17 * gp[1])) / 8 + gp[3];
}
-
+
default:
int k = 0;
diff --git a/src/golyFunctions.hpp b/src/golyFunctions.hpp
@@ -18,11 +18,11 @@ extern std::string knobandinputlookup;
#endif
class Goly {
- public:
- float currentValues[16];
-
- Goly();
- void invoke(int algorithm,std::vector<float> gp);
- void invoke(int algorithm,std::vector<float> gp,int num);
-
+public:
+ float currentValues[16];
+
+ Goly();
+ void invoke(int algorithm, std::vector<float> gp);
+ void invoke(int algorithm, std::vector<float> gp, int num);
+
};
diff --git a/src/pointFunctions.hpp b/src/pointFunctions.hpp
@@ -6,52 +6,52 @@ struct Points {
std::vector<Vec> points;
Points() {
-
+
}
- void linear(int num, Vec offset,Vec slope) {
+ void linear(int num, Vec offset, Vec slope) {
points.resize(num);
- for(int i = 0; i < num; i++) {
- points[i] = Vec(offset.x+slope.x*i/num,offset.y+slope.y*i/num);
+ for (int i = 0; i < num; i++) {
+ points[i] = Vec(offset.x + slope.x * i / num, offset.y + slope.y * i / num);
}
}
- void grid(int numx,int numy, Vec size) {
- int N = numx*numy;
+ void grid(int numx, int numy, Vec size) {
+ int N = numx * numy;
points.resize(N);
- for(int i = 0; i < N; i++) {
- points[i] = Vec((i%numx)*size.x,(i-i%numx)/numx*size.y);
+ for (int i = 0; i < N; i++) {
+ points[i] = Vec((i % numx) * size.x, (i - i % numx) / numx * size.y);
}
}
void triangle(Vec lengths, Vec angles) {
points.resize(3);
- points[0] = Vec(0,0);
- Vec b = Vec(lengths.x*cos(angles.x),lengths.x*sin(angles.x));
- Vec cMinusB = Vec(lengths.y*cos(angles.y),lengths.y*sin(angles.y));
+ points[0] = Vec(0, 0);
+ Vec b = Vec(lengths.x * cos(angles.x), lengths.x * sin(angles.x));
+ Vec cMinusB = Vec(lengths.y * cos(angles.y), lengths.y * sin(angles.y));
points[1] = b;
points[2] = b.plus(cMinusB);
}
- void spray(int n) {
+ void spray(int n) {
points.resize(n);
- for(int i =0; i < n; i++) {
- points[i] = Vec(random::normal(),random::normal());
+ for (int i = 0; i < n; i++) {
+ points[i] = Vec(random::normal(), random::normal());
}
}
void offset(Vec dz) {
- for(unsigned int i = 0; i < points.size(); i++) {
+ for (unsigned int i = 0; i < points.size(); i++) {
points[i] = points[i].plus(dz);
}
}
void scale(Vec s) {
- for(unsigned int i = 0; i < points.size(); i++) {
+ for (unsigned int i = 0; i < points.size(); i++) {
points[i] = points[i].mult(s);
}
}
void waveBlob() {
-
+
}
void wtf(float buf[16][512]) {
- int n = buf[0][0]*(1+buf[1][0]);
- for(int i = 0; i < n; i++) {
- points.push_back(Vec(i,i));
+ int n = buf[0][0] * (1 + buf[1][0]);
+ for (int i = 0; i < n; i++) {
+ points.push_back(Vec(i, i));
}
}
std::vector<Vec> get() {
diff --git a/src/test.cpp b/src/test.cpp
@@ -1,51 +1,51 @@
#include "dtpulse.hpp"
int main(int argc, char** argv)
{
- int type = 0;
- std::vector<int> output;
- std::string strResult = "";
- std::string strParens = "";
- std::vector <std::string> input;
- if(argv[2]) {
- type = std::stoi(argv[2]);
- }
- if(type == 0) {
- output = parseEntireString(argv[1],b64lookup,0);
- printVector(output);
- }
- else if(type==1) {
- output = parseEntireString(argv[1],knobandinputlookup,1);
- printVector(output);
- }
- else if(type==2) {
- strParens = splitRecur(argv[1]);
- printf("%s\n",strParens.c_str());
- }
- else if(type==3) {
- for(int i = 0; i < argc-3; i++) {
- input.push_back(argv[i+3]);
- }
- strResult = interleaveExpand(input);
- printf("%s\n",strResult.c_str());
- }
- else if(type==4) {
- output = parseEntireString(argv[1],knobandinputlookup,1);
- strResult = concatVectorFromLookup(output,knobandinputlookup);
- printf("%s\n",strResult.c_str());
- }
- else if(type==5) {
- whoKnows(argv[1]);
- }
- else if(type==6) {
- whoKnowsLaundry(argv[1]);
- }
- else if(type==7) {
- whoKnowsQuantize(argv[1]);
- }
-else if(type==8) {
- whoKnowsLaundryPoly(argv[1]);
- }
- return 0;
+ int type = 0;
+ std::vector<int> output;
+ std::string strResult = "";
+ std::string strParens = "";
+ std::vector <std::string> input;
+ if (argv[2]) {
+ type = std::stoi(argv[2]);
+ }
+ if (type == 0) {
+ output = parseEntireString(argv[1], b64lookup, 0);
+ printVector(output);
+ }
+ else if (type == 1) {
+ output = parseEntireString(argv[1], knobandinputlookup, 1);
+ printVector(output);
+ }
+ else if (type == 2) {
+ strParens = splitRecur(argv[1]);
+ printf("%s\n", strParens.c_str());
+ }
+ else if (type == 3) {
+ for (int i = 0; i < argc - 3; i++) {
+ input.push_back(argv[i + 3]);
+ }
+ strResult = interleaveExpand(input);
+ printf("%s\n", strResult.c_str());
+ }
+ else if (type == 4) {
+ output = parseEntireString(argv[1], knobandinputlookup, 1);
+ strResult = concatVectorFromLookup(output, knobandinputlookup);
+ printf("%s\n", strResult.c_str());
+ }
+ else if (type == 5) {
+ whoKnows(argv[1]);
+ }
+ else if (type == 6) {
+ whoKnowsLaundry(argv[1]);
+ }
+ else if (type == 7) {
+ whoKnowsQuantize(argv[1]);
+ }
+ else if (type == 8) {
+ whoKnowsLaundryPoly(argv[1]);
+ }
+ return 0;
}
/*void printVector(std::vector <int> intVector) {
for (std::vector<int>::const_iterator i = intVector.begin(); i != intVector.end(); ++i){
diff --git a/src/waveblob.hpp b/src/waveblob.hpp
@@ -7,22 +7,22 @@ struct Waveblob {
std::vector<Vec> trigs;
Points points;
int numPoints;
- Waveblob(int n=200) {
- numPoints=n;
+ Waveblob(int n = 200) {
+ numPoints = n;
makeTrigs();
}
void makeTrigs() {
trigs.resize(numPoints);
- float omega=2*M_PI/numPoints;
- for(int i = 0; i < numPoints) {
- numPoints.push_back(Vec(cos(omega*i),sin(omega*i)));
+ float omega = 2 * M_PI / numPoints;
+ for (int i = 0; i < numPoints) {
+ numPoints.push_back(Vec(cos(omega * i), sin(omega * i)));
}
}
Points eval(float time) {
//points.
}
-
+
};
}
}
\ No newline at end of file
