Improve variant of Noam's algorithm in radius-expansion.html

Author: Loirooriol

css-backgrounds-3/radius-expansion.html

@@ -371,35 +371,35 @@
 		};
 	}
 	else if (algorithm === "spectrum2") {
-		const axial_spread_factor = (radius, dim) => {
-			// If there's no radius, there's no spread to apply.
-			if (radius === 0) {
-				return 0;
-			}
+		for (let corner in radii) {
+			// Calculate the min diameter's ratio to the overall dimension, clamping at 1.
+			const dimRatio = Math.min(
+				1,
+				(2 * radii[corner][0]) / testCase.width,
+				(2 * radii[corner][1]) / testCase.height,
+			);
+
+			r[corner] = radii[corner].map(radius => {
+				// If there's no radius, there's no spread to apply.
+				if (radius === 0) {
+					return 0;
+				}
 
-			// Calculate the radius's ratio to the spread, clamping at 1.
-			const spreadRatio = 1 - Math.min(1, radius / testCase.spread);
+				// Calculate the radius's ratio to the spread, clamping at 1.
+				const spreadRatio = 1 - Math.min(1, radius / testCase.spread);
 
-			// Calculate the diameter's ratio to the overall dimension, clamping at 1.
-			const dimRatio = Math.min(1, (2 * radius) / dim);
+				// These factors determine the amount of easing. They both approach 0
+				// as their respective ratios approach 1, which reduces the easing effect.
+				const spreadEasingFactor = spreadRatio ** 3;
+				const dimEasingFactor = 1 - dimRatio ** 3;
 
-			// These factors determine the amount of easing. They both approach 0
-			// as their respective ratios approach 1, which reduces the easing effect.
-			const spreadEasingFactor = spreadRatio ** 3;
-			const dimEasingFactor = 1 - dimRatio ** 3;
+				// The total reduction in spread is the product of the two easing factors.
+				const totalReduction = dimEasingFactor * spreadEasingFactor;
 
-			// The total reduction in spread is the product of the two easing factors.
-			const totalReduction = dimEasingFactor * spreadEasingFactor;
-			return 1 - totalReduction;
-		}
+				// Apply the reduction to the spread and add it to the original radius.
+				const easedSpread = testCase.spread * (1 - totalReduction);
 
-		for (let corner in radii) {
-			let spread_factor = Math.min(
-				axial_spread_factor(radii[corner][0], testCase.width),
-				axial_spread_factor(radii[corner][1], testCase.height),
-			);
-			r[corner] = radii[corner].map(radius => {
-				return radius + testCase.spread * spread_factor;
+				return radius + easedSpread;
 			});
 		}
 	}