Remove scale function from lineInterpolate

HarryStevens · Jun 6, 2023 · bf8c0cb · bf8c0cb
1 parent a8e314d
commit bf8c0cb
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 45 deletions.
diff --git a/build/geometric.js b/build/geometric.js
@@ -90,27 +90,17 @@
         x2 = _line$2[0],
         y2 = _line$2[1];
 
-    var x = scale([0, 1], [x1, x2]);
-    var y = scale([0, 1], [y1, y2]);
-    return function (t) {
-      var t0 = clamp ? t < 0 ? 0 : t > 1 ? 1 : t : t;
-      return [x(t0), y(t0)];
+    var x = function x(v) {
+      return (x2 - x1) * v + x1;
     };
-  } // A linear scale
-
-  function scale(_ref, _ref2) {
-    var _ref3 = _slicedToArray(_ref, 2),
-        d0 = _ref3[0],
-        d1 = _ref3[1];
 
-    var _ref4 = _slicedToArray(_ref2, 2),
-        r0 = _ref4[0],
-        r1 = _ref4[1];
+    var y = function y(v) {
+      return (y2 - y1) * v + y1;
+    };
 
-    var dx = d1 - d0;
-    var rx = r1 - r0;
-    return function (v) {
-      return rx * ((v - d0) / dx) + r0;
+    return function (t) {
+      var t0 = clamp ? t < 0 ? 0 : t > 1 ? 1 : t : t;
+      return [x(t0), y(t0)];
     };
   }
 

diff --git a/build/geometric.min.js b/build/geometric.min.js
diff --git a/build/geometric.zip b/build/geometric.zip
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/lines/lineInterpolate.js b/src/lines/lineInterpolate.js
@@ -7,17 +7,10 @@
 // even if t is greater than 1 or less then 0.
 export function lineInterpolate(line, clamp = false){
   const [[x1, y1], [x2, y2]] = line;
-  const x = scale([0, 1], [x1, x2]);
-  const y = scale([0, 1], [y1, y2]);
+  const x = v => (x2 - x1) * v + x1;
+  const y = v => (y2 - y1) * v + y1;
   return t => {
     const t0 = clamp ? t < 0 ? 0 : t > 1 ? 1 : t : t;
-    return [x(t0), y(t0)];
+    return [ x(t0), y(t0) ];
   }
-}
-
-// A linear scale
-function scale([d0, d1], [r0, r1]){
-  const dx = d1 - d0;
-  const rx = r1 - r0;
-  return v => rx * ((v - d0) / dx) + r0;
 }