Finish Random and repanel.

Makefile

@@ -12,8 +12,8 @@ OBJECTS += $(libsamplerate)
 DEPS += $(libsamplerate)
 
 $(libsamplerate):
-	cd dep && $(WGET) http://www.mega-nerd.com/SRC/libsamplerate-0.1.9.tar.gz
-	cd dep && $(UNTAR) libsamplerate-0.1.9.tar.gz
+	$(WGET) http://www.mega-nerd.com/SRC/libsamplerate-0.1.9.tar.gz
+	cd dep && $(UNTAR) ../libsamplerate-0.1.9.tar.gz
 	cd dep/libsamplerate-0.1.9 && $(CONFIGURE)
 	cd dep/libsamplerate-0.1.9/src && $(MAKE)
 	cd dep/libsamplerate-0.1.9/src && $(MAKE) install

plugin.json

@@ -1,6 +1,6 @@
 {
   "slug": "Fundamental",
-  "version": "1.2.1",
+  "version": "1.dev",
   "license": "GPL-3.0-only",
   "name": "Fundamental",
   "brand": "VCV",

src/Random.cpp

@@ -6,7 +6,7 @@ struct Random : Module {
 		RATE_PARAM,
 		SHAPE_PARAM,
 		OFFSET_PARAM,
-		RELATIVE_PARAM,
+		MODE_PARAM,
 		NUM_PARAMS
 	};
 	enum InputIds {
@@ -29,61 +29,84 @@ struct Random : Module {
 		NUM_LIGHTS
 	};
 
+	dsp::SchmittTrigger trigTrigger;
 	float lastValue = 0.f;
 	float value = 0.f;
 	float clockPhase = 0.f;
+	int trigFrame = 0;
+	int lastTrigFrames = INT_MAX;
 
 	Random() {
 		config(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS);
-		configParam(RATE_PARAM, std::log2(0.001f), std::log2(1000.f), std::log2(2.f), "Rate", " Hz", 2);
-		configParam(SHAPE_PARAM, 0.f, 1.f, 0.f, "Shape", "%", 0, 100);
-		configParam(OFFSET_PARAM, 0.f, 1.f, 0.f, "Offset");
-		configParam(RELATIVE_PARAM, 0.f, 1.f, 0.f, "Quantize");
+		configParam(RATE_PARAM, std::log2(0.002f), std::log2(2000.f), std::log2(2.f), "Rate", " Hz", 2);
+		configParam(SHAPE_PARAM, 0.f, 1.f, 0.5f, "Shape", "%", 0, 100);
+		configParam(OFFSET_PARAM, 0.f, 1.f, 1.f, "Offset");
+		configParam(MODE_PARAM, 0.f, 1.f, 1.f, "Mode");
 	}
 
-	void process(const ProcessArgs& args) override {
-		// TODO TRIG input
-
-		// Clock
-		float rate = params[RATE_PARAM].getValue();
-		rate += inputs[RATE_PARAM].getVoltage();
-		float clockFreq = std::pow(2.f, rate);
-		float deltaPhase = std::fmin(clockFreq * args.sampleTime, 0.5f);
-		clockPhase += deltaPhase;
-		if (clockPhase >= 1.f) {
-			clockPhase -= 1.f;
-			lastValue = value;
-			if (inputs[EXTERNAL_INPUT].isConnected()) {
-				value = inputs[EXTERNAL_INPUT].getVoltage() / 10.f;
+	void trigger() {
+		lastValue = value;
+		if (inputs[EXTERNAL_INPUT].isConnected()) {
+			value = inputs[EXTERNAL_INPUT].getVoltage() / 10.f;
+		}
+		else {
+			// Choose a new random value
+			bool absolute = params[MODE_PARAM].getValue() > 0.f;
+			bool uni = params[OFFSET_PARAM].getValue() > 0.f;
+			if (absolute) {
+				value = random::uniform();
+				if (!uni)
+					value -= 0.5f;
 			}
 			else {
-				// Choose a new random value
-				bool relative = params[RELATIVE_PARAM].getValue() > 0.f;
-				bool uni = params[OFFSET_PARAM].getValue() > 0.f;
-				if (relative) {
-					// Switch to uni if bi
-					if (!uni)
-						value += 0.5f;
-					float deltaValue = random::normal();
-					// Bias based on value
-					deltaValue -= (value - 0.5f) * 2.f;
-					// Scale delta and accumulate value
-					const float stdDev = 1 / 10.f;
-					deltaValue *= stdDev;
-					value += deltaValue;
-					value = clamp(value, 0.f, 1.f);
-					// Switch back to bi
-					if (!uni)
-						value -= 0.5f;
-				}
-				else {
-					value = random::uniform();
-					if (!uni)
-						value -= 0.5f;
-				}
+				// Switch to uni if bi
+				if (!uni)
+					value += 0.5f;
+				float deltaValue = random::normal();
+				// Bias based on value
+				deltaValue -= (value - 0.5f) * 2.f;
+				// Scale delta and accumulate value
+				const float stdDev = 1 / 10.f;
+				deltaValue *= stdDev;
+				value += deltaValue;
+				value = clamp(value, 0.f, 1.f);
+				// Switch back to bi
+				if (!uni)
+					value -= 0.5f;
+			}
+		}
+		lights[RATE_LIGHT].setBrightness(1.f);
+	}
+
+	void process(const ProcessArgs& args) override {
+		if (inputs[TRIGGER_INPUT].isConnected()) {
+			// Advance clock phase based on tempo estimate
+			trigFrame++;
+			float deltaPhase = 1.f / lastTrigFrames;
+			clockPhase += deltaPhase;
+			clockPhase = std::min(clockPhase, 1.f);
+			// Trigger
+			if (trigTrigger.process(rescale(inputs[TRIGGER_INPUT].getVoltage(), 0.1f, 2.f, 0.f, 1.f))) {
+				clockPhase = 0.f;
+				lastTrigFrames = trigFrame;
+				trigFrame = 0;
+				trigger();
 			}
-			lights[RATE_LIGHT].setBrightness(1.f);
 		}
+		else {
+			// Advance clock phase by rate
+			float rate = params[RATE_PARAM].getValue();
+			rate += inputs[RATE_PARAM].getVoltage();
+			float clockFreq = std::pow(2.f, rate);
+			float deltaPhase = std::fmin(clockFreq * args.sampleTime, 0.5f);
+			clockPhase += deltaPhase;
+			// Trigger
+			if (clockPhase >= 1.f) {
+				clockPhase -= 1.f;
+				trigger();
+			}
+		}
+
 
 		// Shape
 		float shape = params[SHAPE_PARAM].getValue();
@@ -92,7 +115,7 @@ struct Random : Module {
 
 		// Stepped
 		if (outputs[STEPPED_OUTPUT].isConnected()) {
-			float steps = std::floor(std::pow(shape + 1, 4));
+			float steps = std::ceil(std::pow(shape, 2) * 15 + 1);
 			float v = std::ceil(clockPhase * steps) / steps;
 			v = rescale(v, 0.f, 1.f, lastValue, value);
 			outputs[STEPPED_OUTPUT].setVoltage(v * 10.f);
@@ -100,7 +123,7 @@ struct Random : Module {
 
 		// Linear
 		if (outputs[LINEAR_OUTPUT].isConnected()) {
-			float slope = 1 / (1 - shape);
+			float slope = 1 / shape;
 			float v;
 			if (slope < 1e6f) {
 				v = std::fmin(clockPhase * slope, 1.f);
@@ -112,9 +135,24 @@ struct Random : Module {
 			outputs[LINEAR_OUTPUT].setVoltage(v * 10.f);
 		}
 
+		// Smooth
+		if (outputs[SMOOTH_OUTPUT].isConnected()) {
+			float p = 1 / shape;
+			float v;
+			if (p < 1e6f) {
+				v = std::fmin(clockPhase * p, 1.f);
+				v = std::cos(M_PI * v);
+			}
+			else {
+				v = -1.f;
+			}
+			v = rescale(v, 1.f, -1.f, lastValue, value);
+			outputs[SMOOTH_OUTPUT].setVoltage(v * 10.f);
+		}
+
 		// Exp
 		if (outputs[EXPONENTIAL_OUTPUT].isConnected()) {
-			float b = std::pow(1.f - shape, 4);
+			float b = std::pow(shape, 4);
 			float v;
 			if (0.999f < b) {
 				v = clockPhase;
@@ -129,21 +167,6 @@ struct Random : Module {
 			outputs[EXPONENTIAL_OUTPUT].setVoltage(v * 10.f);
 		}
 
-		// Smooth
-		if (outputs[SMOOTH_OUTPUT].isConnected()) {
-			float p = 1 / (1 - shape);
-			float v;
-			if (p < 1e6f) {
-				v = std::fmin(clockPhase * p, 1.f);
-				v = std::cos(M_PI * v);
-			}
-			else {
-				v = -1.f;
-			}
-			v = rescale(v, 1.f, -1.f, lastValue, value);
-			outputs[SMOOTH_OUTPUT].setVoltage(v * 10.f);
-		}
-
 		// Lights
 		lights[RATE_LIGHT].setSmoothBrightness(0.f, args.sampleTime);
 		lights[SHAPE_LIGHT].setBrightness(shape);
@@ -161,15 +184,15 @@ struct RandomWidget : ModuleWidget {
 		addChild(createWidget<ScrewSilver>(Vec(RACK_GRID_WIDTH, RACK_GRID_HEIGHT - RACK_GRID_WIDTH)));
 		addChild(createWidget<ScrewSilver>(Vec(box.size.x - 2 * RACK_GRID_WIDTH, RACK_GRID_HEIGHT - RACK_GRID_WIDTH)));
 
-		addParam(createLightParamCentered<LEDLightSlider<GreenLight>>(mm2px(Vec(7.215, 31.358)), module, Random::RATE_PARAM, Random::RATE_LIGHT));
-		addParam(createLightParamCentered<LEDLightSlider<GreenLight>>(mm2px(Vec(18.214, 31.358)), module, Random::SHAPE_PARAM, Random::SHAPE_LIGHT));
-		addParam(createParamCentered<CKSS>(mm2px(Vec(7.214, 78.498)), module, Random::OFFSET_PARAM));
-		addParam(createParamCentered<CKSS>(mm2px(Vec(18.214, 78.498)), module, Random::RELATIVE_PARAM));
+		addParam(createLightParamCentered<LEDLightSlider<GreenLight>>(mm2px(Vec(7.215, 30.858)), module, Random::RATE_PARAM, Random::RATE_LIGHT));
+		addParam(createLightParamCentered<LEDLightSlider<GreenLight>>(mm2px(Vec(18.214, 30.858)), module, Random::SHAPE_PARAM, Random::SHAPE_LIGHT));
+		addParam(createParamCentered<CKSS>(mm2px(Vec(7.214, 78.259)), module, Random::OFFSET_PARAM));
+		addParam(createParamCentered<CKSS>(mm2px(Vec(18.214, 78.259)), module, Random::MODE_PARAM));
 
-		addInput(createInputCentered<PJ301MPort>(mm2px(Vec(7.214, 51.227)), module, Random::RATE_INPUT));
-		addInput(createInputCentered<PJ301MPort>(mm2px(Vec(18.214, 51.227)), module, Random::SHAPE_INPUT));
-		addInput(createInputCentered<PJ301MPort>(mm2px(Vec(7.214, 64.763)), module, Random::TRIGGER_INPUT));
-		addInput(createInputCentered<PJ301MPort>(mm2px(Vec(18.214, 64.763)), module, Random::EXTERNAL_INPUT));
+		addInput(createInputCentered<PJ301MPort>(mm2px(Vec(7.214, 50.726)), module, Random::RATE_INPUT));
+		addInput(createInputCentered<PJ301MPort>(mm2px(Vec(18.214, 50.726)), module, Random::SHAPE_INPUT));
+		addInput(createInputCentered<PJ301MPort>(mm2px(Vec(7.214, 64.513)), module, Random::TRIGGER_INPUT));
+		addInput(createInputCentered<PJ301MPort>(mm2px(Vec(18.214, 64.513)), module, Random::EXTERNAL_INPUT));
 
 		addOutput(createOutputCentered<PJ301MPort>(mm2px(Vec(7.214, 96.727)), module, Random::STEPPED_OUTPUT));
 		addOutput(createOutputCentered<PJ301MPort>(mm2px(Vec(18.214, 96.727)), module, Random::LINEAR_OUTPUT));