computerscare-vcv-modules

commit 9d4cdff90e3741d71c44e28d426bf44896837b2c
parent 63aa338839c87fdcd34caf41e981eaaeb6f5cd1d
Author: Adam M <[email protected]>
Date:   Sat, 11 Jul 2020 14:59:26 -0500

patrix offsets, penerator fix display

Diffstat:
M
src/Computerscare.hpp
 | 
8
++++++--
M
src/ComputerscareGolyPenerator.cpp
 | 
6
+++---
M
src/ComputerscareMolyPatrix.cpp
 | 
24
++++++++++++++++++++----

3 files changed, 29 insertions(+), 9 deletions(-)
diff --git a/src/Computerscare.hpp b/src/Computerscare.hpp
@@ -362,9 +362,13 @@ struct SmoothKnob : RoundKnob {
 	SmoothKnob() {
 		setSvg(APP->window->loadSvg(asset::plugin(pluginInstance, "res/computerscare-medium-knob-effed.svg")));
 	}
-
 };
-
+struct SmoothKnobNoRandom : RoundKnob {
+	SmoothKnobNoRandom() {
+		setSvg(APP->window->loadSvg(asset::plugin(pluginInstance, "res/computerscare-medium-knob-effed.svg")));
+	}
+	void randomize() override { return; }
+};
 struct SmallKnob : RoundKnob {
 	SmallKnob() {
 		setSvg(APP->window->loadSvg(asset::plugin(pluginInstance, "res/computerscare-small-knob-effed.svg")));
diff --git a/src/ComputerscareGolyPenerator.cpp b/src/ComputerscareGolyPenerator.cpp
@@ -44,7 +44,7 @@ struct ComputerscareGolyPenerator : ComputerscarePolyModule {
 
 		config(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS);
 
-		configParam(ALGORITHM , 1.f, 16.f, 1.f, "Algorithm");
+		configParam(ALGORITHM , 1.f, 4.f, 1.f, "Algorithm");
 		configParam(IN_OFFSET, -1.f, 1.f, 0.f, "Input Offset");
 
 		configParam(IN_SCALE, -2.f, 2.f, 1.f, "Input Scale");
@@ -105,8 +105,8 @@ struct PeneratorDisplay : TransparentWidget {
 		DrawHelper draw = DrawHelper(args.vg);
 		Points pts = Points();
 
-		nvgTranslate(args.vg, box.size.x / 2, box.size.y/2);
-		pts.linear(ch, Vec(0, -box.size.y/2), Vec(0, 3*box.size.y/ch));
+		nvgTranslate(args.vg, box.size.x / 2, box.size.y/2+5);
+		pts.linear(ch, Vec(0, -box.size.y/2), Vec(0, 50));
 		std::vector<Vec> polyVals;
 		std::vector<NVGcolor> colors;
 		std::vector<Vec> thicknesses;
diff --git a/src/ComputerscareMolyPatrix.cpp b/src/ComputerscareMolyPatrix.cpp
@@ -83,10 +83,13 @@ struct ComputerscareMolyPatrix : ComputerscarePolyModule {
     float outTrim = params[OUTPUT_TRIM].getValue();
     float outOffset = params[OUTPUT_OFFSET].getValue();
 
+    float inOffset = params[INPUT_OFFSET].getValue();
+
+
     for (int outIndex = 0; outIndex < numRows; outIndex++) {
       float outVoltage = 0.f;
       for (int i = 0; i < numColumns; i++) {
-        outVoltage += params[KNOB + i * 16 + outIndex].getValue() * inputs[POLY_INPUT].getVoltage(i) * params[INPUT_ROW_TRIM + i].getValue() * params[INPUT_TRIM].getValue() + params[OUTPUT_OFFSET].getValue();
+        outVoltage += params[KNOB + i * 16 + outIndex].getValue() * (inputs[POLY_INPUT].getVoltage(i)+inOffset) * params[INPUT_ROW_TRIM + i].getValue() * params[INPUT_TRIM].getValue();
       }
       outputs[POLY_OUTPUT].setVoltage(params[OUTPUT_COLUMN_TRIM + outIndex].getValue()*outTrim * outVoltage + outOffset, outIndex);
     }
@@ -170,7 +173,14 @@ struct ComputerscareMolyPatrixWidget : ModuleWidget {
     float dy = 21;
 
     addInput(createInput<PointingUpPentagonPort>(Vec(9, 12), module, ComputerscareMolyPatrix::POLY_INPUT));
-    addKnob(36, 16, module, ComputerscareMolyPatrix::INPUT_TRIM, 0, 0,1,0);
+    addKnob(40, 12, module, ComputerscareMolyPatrix::INPUT_TRIM, 0, 0,1,0);
+    addInput(createInput<TinyJack>(Vec(53,25), module, ComputerscareMolyPatrix::INPUT_ATTENUATION_CV));
+
+    addParam(createParam<SmoothKnobNoRandom>(Vec(96,14), module, ComputerscareMolyPatrix::INPUT_OFFSET));
+
+        
+    //addKnob(60, 16, module, ComputerscareMolyPatrix::INPUT_TRIM, 0, 0,1,0);
+
 
     for (int i = 0; i < numRows; i++) {
       for (int j = 0; j < numColumns; j++) {
@@ -183,10 +193,16 @@ struct ComputerscareMolyPatrixWidget : ModuleWidget {
 
     }
 
-    channelWidget = new PolyOutputChannelsWidget(Vec(352, 5), module, ComputerscareMolyPatrix::POLY_CHANNELS);
+   
+
+    
+
+    addKnob(322, 1, module, ComputerscareMolyPatrix::OUTPUT_TRIM, 0, 0,1,0);
+    addInput(createInput<TinyJack>(Vec(332,15), module, ComputerscareMolyPatrix::OUTPUT_ATTENUATION_CV));
+     channelWidget = new PolyOutputChannelsWidget(Vec(337, 1), module, ComputerscareMolyPatrix::POLY_CHANNELS);
     addChild(channelWidget);
 
-    addKnob(372, 1, module, ComputerscareMolyPatrix::OUTPUT_TRIM, 0, 0,1,0);
+    addParam(createParam<SmoothKnobNoRandom>(Vec(362,4), module, ComputerscareMolyPatrix::OUTPUT_OFFSET));
     addOutput(createOutput<InPort>(Vec(390, 1), module, ComputerscareMolyPatrix::POLY_OUTPUT));