From b4d803d73a0087e2b60c14941520ed33e6be4f19 Mon Sep 17 00:00:00 2001
From: Andrew Belt <andrewpbelt@gmail.com>
Date: Wed, 9 Aug 2023 00:47:06 -0400
Subject: [PATCH] Rescale: Implement cyclic reflection of min and max.

---
 src/Rescale.cpp | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/Rescale.cpp b/src/Rescale.cpp
index 8576fb3..e2b7842 100644
--- a/src/Rescale.cpp
+++ b/src/Rescale.cpp
@@ -51,6 +51,13 @@ struct Rescale : Module {
 		configBypass(IN_INPUT, OUT_OUTPUT);
 	}
 
+	void onReset(const ResetEvent& e) override {
+		Module::onReset(e);
+		multiplier = 1.f;
+		reflectMin = false;
+		reflectMax = false;
+	}
+
 	void process(const ProcessArgs& args) override {
 		using simd::float_4;
 
@@ -65,8 +72,16 @@ struct Rescale : Module {
 			float_4 x = inputs[IN_INPUT].getPolyVoltageSimd<float_4>(c);
 			x = x * gain + offset;
 
-			if (reflectMin && reflectMax) {
-				// TODO find a pen to work this out
+			if (max <= min) {
+				x = min;
+			}
+			else if (reflectMin && reflectMax) {
+				// Cyclically reflect value between min and max
+				float range = max - min;
+				x = (x - min) / range;
+				x = simd::fmod(x + 1.f, 2.f) - 1.f;
+				x = simd::fabs(x);
+				x = x * range + min;
 			}
 			else if (reflectMin) {
 				x = simd::fabs(x - min) + min;
@@ -77,7 +92,8 @@ struct Rescale : Module {
 				x = simd::fmax(x, min);
 			}
 			else {
-				x = simd::clamp(x, min, max);
+				x = simd::fmin(x, max);
+				x = simd::fmax(x, min);
 			}
 
 			outputs[OUT_OUTPUT].setVoltageSimd(x, c);
@@ -101,11 +117,11 @@ struct Rescale : Module {
 
 		json_t* reflectMinJ = json_object_get(rootJ, "reflectMin");
 		if (reflectMinJ)
-			reflectMin = json_number_value(reflectMinJ);
+			reflectMin = json_boolean_value(reflectMinJ);
 
 		json_t* reflectMaxJ = json_object_get(rootJ, "reflectMax");
 		if (reflectMaxJ)
-			reflectMax = json_number_value(reflectMaxJ);
+			reflectMax = json_boolean_value(reflectMaxJ);
 	}
 };
 
@@ -144,8 +160,8 @@ struct RescaleWidget : ModuleWidget {
 			}
 		));
 
-		menu->addChild(createBoolPtrMenuItem("Reflect at minimum", "", &module->reflectMin));
 		menu->addChild(createBoolPtrMenuItem("Reflect at maximum", "", &module->reflectMax));
+		menu->addChild(createBoolPtrMenuItem("Reflect at minimum", "", &module->reflectMin));
 	}
 };