commit 78a8d5978abcac16c46b80b1a376d16b58d8bef3
parent 8157fbd9fbe3da8f9dbdc27c4ea45f34205a91ff
Author: Adam M <[email protected]>
Date: Tue, 9 Oct 2018 00:09:59 -0500
simplified sequence logic in LaundrySoup
Diffstat:
2 files changed, 53 insertions(+), 65 deletions(-)
diff --git a/src/ComputerscareLaundrySoup.cpp b/src/ComputerscareLaundrySoup.cpp
@@ -79,10 +79,9 @@ struct ComputerscareLaundrySoup : Module {
std::vector<int> sequences[numFields];
std::vector<int> sequenceSums[numFields];
+ std::vector<bool> absoluteSequences[numFields];
- int stepCity[numFields] = {0};
- int stepState[numFields] = {0};
- int stepCounty[numFields] = {0};
+ int absoluteStep[numFields] = {0};
int numStepStates[numFields] = {0};
int currentChar = 0;
int numStepBlocks[numFields] = {0};
@@ -123,42 +122,49 @@ ComputerscareLaundrySoup() : Module(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIG
void onRandomize() override {
}
- // For more advanced Module features, read Rack's engine.hpp header file
- // - toJson, fromJson: serialization of internal data
- // - onSampleRateChange: event triggered by a change of sample rate
- // - onReset, onRandomize, onCreate, onDelete: implements special behavior when user clicks these from the context menu
-
+ /*
+ 8-4
+ sequenceSums wants to be (0,8) -> (4, 4)
+ */
void parseFormula(std::string expr, int index) {
int numSteps = 0;
-
+ int mappedIndex = 0;
+
std::stringstream test(expr);
std::string segment;
std::vector<std::string> seglist;
- while(std::getline(test, segment, ','))
+ while(std::getline(test, segment, '-'))
{
seglist.push_back(segment);
}
+ if(seglist.size() > 1) {
+ offsets[index] = std::stoi( seglist[1] );
+ }
+ else {
+ offsets[index] = 0;
+ }
sequences[index].resize(0);
sequenceSums[index].resize(0);
sequenceSums[index].push_back(0);
+ absoluteSequences[index].resize(0);
- for(char& c : seglist[0]) {
-
- currentChar = c - '0';
- numSteps += currentChar;
- sequenceSums[index].push_back(numSteps);
- sequences[index].push_back(currentChar);
- if(seglist.size() > 1) {
- offsets[index] = std::stoi( seglist[1] );
- }
- else {
- offsets[index] = 0;
- }
- }
- numStepStates[index] = numSteps;
- numStepBlocks[index] = sequences[index].size();
+ for(char& c : seglist[0]) {
+ currentChar = c - '0';
+ numSteps += currentChar;
+ sequenceSums[index].push_back(numSteps);
+ sequences[index].push_back(currentChar);
+ }
+
+ numStepStates[index] = numSteps;
+ numStepBlocks[index] = sequences[index].size();
+
+ absoluteSequences[index].resize(numSteps);
+ for(unsigned i = 0; i < sequenceSums[index].size() - 1; i++) {
+ mappedIndex = (sequenceSums[index][i] + offsets[index] ) % numSteps;
+ absoluteSequences[index][mappedIndex] = true;
+ }
}
void onCreate () override
@@ -183,29 +189,23 @@ void onCreate () override
lets say the sequence "332" is entered in the 0th (first)
numStepBlocks[0] would then be 8 (3 + 3 + 2)
sequences[0] would be the vector (3,3,2)
- stepState[0] will go from 0 to 7
- stepCounty[0] will go from 0 to 2
- stepCity[0] will count for each "inner" step ie: 0 to 2, 0 to 2, and then 0 to 1
+ sequenceSums[0] would be the vector (0,3,6,8)
+ absoluteSequences[0] would be the vector (1,0,0,1,0,0,1,0)
+ absoluteStep[0] would run from 0 to 7
+
+ 332-4 (332 offset by 4)
+
*/
void incrementInternalStep(int i) {
- this->stepCity[i] += 1;
- this->stepState[i] += 1;
- if(this->stepCity[i] >= sequences[i][this->stepCounty[i]]) {
- this->stepCity[i] = 0;
- this->stepCounty[i] += 1;
- }
- if(this->stepCounty[i] >= this->numStepBlocks[i]) {
- this->stepCounty[i] = 0;
- this->stepCity[i] = 0;
- this->stepState[i] = 0;
+ this->absoluteStep[i] +=1;
+ if(this->absoluteStep[i] >= this->numStepStates[i]) {
+ this->absoluteStep[i] = 0;
}
}
void resetOneOfThem(int i) {
- this->stepCity[i] = 0;
- this->stepState[i] = 0;
- this->stepCounty[i] = 0;
+ this->absoluteStep[i] = 0;
}
};
@@ -244,7 +244,7 @@ void ComputerscareLaundrySoup::step() {
resetOneOfThem(i);
}
- activeStep = (sequenceSums[i][this->stepCounty[i]] == (this->stepState[i] + this->offsets[i]) % this->numStepStates[i]);
+ activeStep = absoluteSequences[i][this->absoluteStep[i]];
}
if(inputs[CLOCK_INPUT + i].active) {
outputs[TRG_OUTPUT + i].value = (currentTriggerIsHigh && activeStep) ? 10.0f : 0.0f;
@@ -302,10 +302,10 @@ struct ComputerscareLaundrySoupWidget : ModuleWidget {
setPanel(SVG::load(assetPlugin(plugin, "res/ComputerscareLaundrySoupPanel.svg")));
//clock input
- addInput(Port::create<InPort>(mm2px(Vec(2 , 2)), Port::INPUT, module, ComputerscareLaundrySoup::GLOBAL_CLOCK_INPUT));
+ addInput(Port::create<InPort>(mm2px(Vec(2 , 0)), Port::INPUT, module, ComputerscareLaundrySoup::GLOBAL_CLOCK_INPUT));
//reset input
- addInput(Port::create<InPort>(mm2px(Vec(12 , 2)), Port::INPUT, module, ComputerscareLaundrySoup::GLOBAL_RESET_INPUT));
+ addInput(Port::create<InPort>(mm2px(Vec(12 , 0)), Port::INPUT, module, ComputerscareLaundrySoup::GLOBAL_RESET_INPUT));
for(int i = 0; i < numFields; i++) {
addOutput(Port::create<InPort>(mm2px(Vec(55 , verticalStart + verticalSpacing*i - 10)), Port::OUTPUT, module, ComputerscareLaundrySoup::TRG_OUTPUT + i));
@@ -328,7 +328,7 @@ struct ComputerscareLaundrySoupWidget : ModuleWidget {
display->box.pos = mm2px(Vec(25,verticalStart - 9.2 +verticalSpacing*i));
display->box.size = Vec(50, 20);
if(&module->numStepBlocks[i]) {
- display->value = &module->stepState[i];
+ display->value = &module->absoluteStep[i];
}
else {
display->value = 0;
diff --git a/src/ComputerscarePatchSequencer.cpp b/src/ComputerscarePatchSequencer.cpp
@@ -54,15 +54,13 @@ struct ComputerscarePatchSequencer : Module {
int numAddresses = 2;
bool switch_states[maxSteps][10][10] = {};
- bool onlyRandomizeActive = false;
- bool neg5ToPos5 = false;
+ bool onlyRandomizeActive = true;
float input_values[numInputs] = {0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0};
float sums[numOutputs] = {0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0};
int randomizationStepEnum = 0; //0: edit step, 1: active step, 2: all steps
-
ComputerscarePatchSequencer() : Module(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS) {}
void step() override;
@@ -359,20 +357,19 @@ struct ComputerscarePatchSequencerWidget : ModuleWidget {
}
//clock input
- addInput(Port::create<InPort>(Vec(24, 37), Port::INPUT, module, ComputerscarePatchSequencer::TRG_INPUT));
+ addInput(Port::create<InPort>(Vec(24, 37), Port::INPUT, module, ComputerscarePatchSequencer::TRG_INPUT));
- //reset input
- addInput(Port::create<InPort>(Vec(24, 3), Port::INPUT, module, ComputerscarePatchSequencer::RESET_INPUT));
-
- //manual clock button
+ //reset input
+ addInput(Port::create<InPort>(Vec(24, 3), Port::INPUT, module, ComputerscarePatchSequencer::RESET_INPUT));
+
+ //manual clock button
addParam(ParamWidget::create<LEDButton>(Vec(7 , 37), module, ComputerscarePatchSequencer::MANUAL_CLOCK_PARAM, 0.0, 1.0, 0.0));
//reset button
addParam(ParamWidget::create<LEDButton>(Vec(7 , 3), module, ComputerscarePatchSequencer::RESET_PARAM, 0.0, 1.0, 0.0));
-
- //randomize input
- addInput(Port::create<InPort>(Vec(270, 0), Port::INPUT, module, ComputerscarePatchSequencer::RANDOMIZE_INPUT));
+ //randomize input
+ addInput(Port::create<InPort>(Vec(270, 0), Port::INPUT, module, ComputerscarePatchSequencer::RANDOMIZE_INPUT));
//active step display
NumberDisplayWidget3 *display = new NumberDisplayWidget3();
@@ -417,15 +414,6 @@ struct OnlyRandomizeActiveMenuItem : MenuItem {
}
};
-struct Neg5MenuItem : MenuItem {
- ComputerscarePatchSequencer *patchSequencer;
- void onAction(EventAction &e) override {
- patchSequencer->neg5ToPos5 = !patchSequencer->neg5ToPos5;
- }
- void step() override {
- rightText = patchSequencer->neg5ToPos5 ? "✔" : "";
- }
-};
struct WhichStepToRandomizeItem : MenuItem {
ComputerscarePatchSequencer *patchSequencer;
int stepEnum;
