@ceale/util 1.10.0 → 1.11.1

package/dist/cjs/index.js

@@ -272,7 +272,11 @@ var quadraticCurve;
     const oneMinusT = 1 - t;
     return 2 * oneMinusT * t * p1y + t * t;
   };
-  quadraticCurve.solveTForX = (p1, x, iterations = 8) => {
+  quadraticCurve.solveTForX = (p1, x, iterations = 15) => {
+    if (x <= 0)
+      return 0;
+    if (x >= 1)
+      return 1;
     let tMin = 0;
     let tMax = 1;
     let tGuess;
@@ -287,6 +291,10 @@ var quadraticCurve;
     }
     return (tMin + tMax) / 2;
   };
+  quadraticCurve.solveYForX = (p1, x, iterations = 15) => {
+    const t = quadraticCurve.solveTForX(p1, x, iterations);
+    return quadraticCurve.solveY(p1, t);
+  };
 })(quadraticCurve ||= {});
 var cubicCurve;
 ((cubicCurve) => {
@@ -304,7 +312,11 @@ var cubicCurve;
     const t2 = t * t;
     return 3 * oneMinusT * oneMinusT * t * p1y + 3 * oneMinusT * t2 * p2y + t2 * t;
   };
-  cubicCurve.solveTForX = ([p1, p2], x, iterations = 12) => {
+  cubicCurve.solveTForX = ([p1, p2], x, iterations = 20) => {
+    if (x <= 0)
+      return 0;
+    if (x >= 1)
+      return 1;
     let tMin = 0;
     let tMax = 1;
     let tGuess;
@@ -319,15 +331,25 @@ var cubicCurve;
     }
     return (tMin + tMax) / 2;
   };
+  cubicCurve.solveYForX = ([p1, p2], x, iterations = 20) => {
+    const t = cubicCurve.solveTForX([p1, p2], x, iterations);
+    return cubicCurve.solveY([p1, p2], t);
+  };
 })(cubicCurve ||= {});
 
 class QuadraticBezier {
   p1;
-  constructor(p1) {
+  accuracy;
+  cache = new Map;
+  constructor(p1, accuracy = 4) {
     this.p1 = p1;
+    this.accuracy = accuracy;
     if (this.p1[0] < 0 || this.p1[0] > 1) {
       throw new BezierError("控制点P1的x坐标必须在[0, 1]之间");
     }
+    if (accuracy !== -1) {
+      this.accuracy = 10 ** accuracy;
+    }
   }
   solveX(t) {
     return quadraticCurve.solveX(this.p1, t);
@@ -336,23 +358,37 @@ class QuadraticBezier {
     return quadraticCurve.solveY(this.p1, t);
   }
   solveYForX(x) {
-    const t = quadraticCurve.solveTForX(this.p1, x);
-    return this.solveY(t);
+    if (this.accuracy === -1)
+      return quadraticCurve.solveYForX(this.p1, x);
+    else {
+      const roughX = Math.round(x * this.accuracy);
+      return this.cache.get(roughX) ?? (() => {
+        const y = quadraticCurve.solveYForX(this.p1, x);
+        this.cache.set(roughX, y);
+        return y;
+      })();
+    }
   }
 }
 
 class CubicBezier {
   p1;
   p2;
-  constructor(p1, p2) {
+  accuracy;
+  cache = new Map;
+  constructor(p1, p2, accuracy = 4) {
     this.p1 = p1;
     this.p2 = p2;
+    this.accuracy = accuracy;
     if (this.p1[0] < 0 || this.p1[0] > 1) {
       throw new BezierError("控制点P1的x坐标必须在[0, 1]之间");
     }
     if (this.p2[0] < 0 || this.p2[0] > 1) {
       throw new BezierError("控制点P2的x坐标必须在[0, 1]之间");
     }
+    if (accuracy !== -1) {
+      this.accuracy = 10 ** accuracy;
+    }
   }
   solveX(t) {
     return cubicCurve.solveX([this.p1, this.p2], t);
@@ -361,7 +397,15 @@ class CubicBezier {
     return cubicCurve.solveY([this.p1, this.p2], t);
   }
   solveYForX(x) {
-    const t = cubicCurve.solveTForX([this.p1, this.p2], x);
-    return this.solveY(t);
+    if (this.accuracy === -1)
+      return cubicCurve.solveYForX([this.p1, this.p2], x);
+    else {
+      const roughX = Math.round(x * this.accuracy);
+      return this.cache.get(roughX) ?? (() => {
+        const y = cubicCurve.solveYForX([this.p1, this.p2], x);
+        this.cache.set(roughX, y);
+        return y;
+      })();
+    }
   }
 }

package/dist/esm/index.js

@@ -226,7 +226,11 @@ var quadraticCurve;
     const oneMinusT = 1 - t;
     return 2 * oneMinusT * t * p1y + t * t;
   };
-  quadraticCurve.solveTForX = (p1, x, iterations = 8) => {
+  quadraticCurve.solveTForX = (p1, x, iterations = 15) => {
+    if (x <= 0)
+      return 0;
+    if (x >= 1)
+      return 1;
     let tMin = 0;
     let tMax = 1;
     let tGuess;
@@ -241,6 +245,10 @@ var quadraticCurve;
     }
     return (tMin + tMax) / 2;
   };
+  quadraticCurve.solveYForX = (p1, x, iterations = 15) => {
+    const t = quadraticCurve.solveTForX(p1, x, iterations);
+    return quadraticCurve.solveY(p1, t);
+  };
 })(quadraticCurve ||= {});
 var cubicCurve;
 ((cubicCurve) => {
@@ -258,7 +266,11 @@ var cubicCurve;
     const t2 = t * t;
     return 3 * oneMinusT * oneMinusT * t * p1y + 3 * oneMinusT * t2 * p2y + t2 * t;
   };
-  cubicCurve.solveTForX = ([p1, p2], x, iterations = 12) => {
+  cubicCurve.solveTForX = ([p1, p2], x, iterations = 20) => {
+    if (x <= 0)
+      return 0;
+    if (x >= 1)
+      return 1;
     let tMin = 0;
     let tMax = 1;
     let tGuess;
@@ -273,15 +285,25 @@ var cubicCurve;
     }
     return (tMin + tMax) / 2;
   };
+  cubicCurve.solveYForX = ([p1, p2], x, iterations = 20) => {
+    const t = cubicCurve.solveTForX([p1, p2], x, iterations);
+    return cubicCurve.solveY([p1, p2], t);
+  };
 })(cubicCurve ||= {});
 
 class QuadraticBezier {
   p1;
-  constructor(p1) {
+  accuracy;
+  cache = new Map;
+  constructor(p1, accuracy = 4) {
     this.p1 = p1;
+    this.accuracy = accuracy;
     if (this.p1[0] < 0 || this.p1[0] > 1) {
       throw new BezierError("控制点P1的x坐标必须在[0, 1]之间");
     }
+    if (accuracy !== -1) {
+      this.accuracy = 10 ** accuracy;
+    }
   }
   solveX(t) {
     return quadraticCurve.solveX(this.p1, t);
@@ -290,23 +312,37 @@ class QuadraticBezier {
     return quadraticCurve.solveY(this.p1, t);
   }
   solveYForX(x) {
-    const t = quadraticCurve.solveTForX(this.p1, x);
-    return this.solveY(t);
+    if (this.accuracy === -1)
+      return quadraticCurve.solveYForX(this.p1, x);
+    else {
+      const roughX = Math.round(x * this.accuracy);
+      return this.cache.get(roughX) ?? (() => {
+        const y = quadraticCurve.solveYForX(this.p1, x);
+        this.cache.set(roughX, y);
+        return y;
+      })();
+    }
   }
 }
 
 class CubicBezier {
   p1;
   p2;
-  constructor(p1, p2) {
+  accuracy;
+  cache = new Map;
+  constructor(p1, p2, accuracy = 4) {
     this.p1 = p1;
     this.p2 = p2;
+    this.accuracy = accuracy;
     if (this.p1[0] < 0 || this.p1[0] > 1) {
       throw new BezierError("控制点P1的x坐标必须在[0, 1]之间");
     }
     if (this.p2[0] < 0 || this.p2[0] > 1) {
       throw new BezierError("控制点P2的x坐标必须在[0, 1]之间");
     }
+    if (accuracy !== -1) {
+      this.accuracy = 10 ** accuracy;
+    }
   }
   solveX(t) {
     return cubicCurve.solveX([this.p1, this.p2], t);
@@ -315,8 +351,16 @@ class CubicBezier {
     return cubicCurve.solveY([this.p1, this.p2], t);
   }
   solveYForX(x) {
-    const t = cubicCurve.solveTForX([this.p1, this.p2], x);
-    return this.solveY(t);
+    if (this.accuracy === -1)
+      return cubicCurve.solveYForX([this.p1, this.p2], x);
+    else {
+      const roughX = Math.round(x * this.accuracy);
+      return this.cache.get(roughX) ?? (() => {
+        const y = cubicCurve.solveYForX([this.p1, this.p2], x);
+        this.cache.set(roughX, y);
+        return y;
+      })();
+    }
   }
 }
 export {

package/dist/types/bezier.d.ts

@@ -1,61 +1,84 @@
 type Point = [number, number];
 export declare namespace quadraticCurve {
     /**
-     * [二次] 给定控制点 P1 和 t (时间)，计算 x 坐标
+     * 给定控制点 P1 和 t (时间)，计算 x 坐标
      * @param p1 控制点1 的坐标
      * @param t 时间比例 [0, 1]
      * @returns x 坐标
      */
     const solveX: (p1: Point, t: number) => number;
     /**
-     * [二次] 给定控制点 P1 和 t (时间)，计算 y 坐标
+     * 给定控制点 P1 和 t (时间)，计算 y 坐标
      * @param p1 控制点1 坐标
      * @param t 时间比例 [0, 1]
      * @returns y 坐标
      */
     const solveY: (p1: Point, t: number) => number;
     /**
-     * [二次] 给定控制点 P1 和 x (坐标)，反向求解 t (时间)
+     * 给定控制点 P1 和 x (坐标)，求解 t (时间)
      * 使用二分查找法
      * @param p1 控制点1 坐标
      * @param x 目标 x 坐标 [0, 1]
+     * @param iterations 可选，二分法求值迭代次数，默认15次
      * @returns 对应的时间 t
      */
     const solveTForX: (p1: Point, x: number, iterations?: number) => number;
+    /**
+     * 给定控制点 P1 和 x (坐标)，求解 y (坐标)
+     * 使用二分查找法
+     * @param p1 控制点1 坐标
+     * @param x 目标 x 坐标 [0, 1]
+     * @returns 对应的时间 t
+     * @param iterations 可选，二分法求值迭代次数，默认15次
+     */
+    const solveYForX: (p1: Point, x: number, iterations?: number) => number;
 }
 export declare namespace cubicCurve {
     /**
-     * [三次] 给定控制点 P1, P2 和 t (时间)，计算 x 坐标
+     * 给定控制点 P1, P2 和 t (时间)，计算 x 坐标
      * @param \[p1, p2] 控制点1 控制点2 的坐标
      * @param t 时间比例 [0, 1]
      * @returns x 坐标
      */
     const solveX: ([p1, p2]: [Point, Point], t: number) => number;
     /**
-     * [三次] 给定控制点 P1, P2 和 t (时间)，计算 y 坐标
+     * 给定控制点 P1, P2 和 t (时间)，计算 y 坐标
      * @param \[p1, p2] 控制点1 控制点2 的坐标
      * @param t 时间比例 [0, 1]
      * @returns y 坐标
      */
     const solveY: ([p1, p2]: [Point, Point], t: number) => number;
     /**
-     * [三次] 给定控制点 P1, P2 和 x (坐标)，反向求解 t (时间)
+     * 给定控制点 P1, P2 和 x (坐标)，求解 t (时间)
      * 使用二分查找法
      * @param \[p1, p2] 控制点1 控制点2 的坐标
      * @param x 目标 x 坐标 [0, 1]
      * @returns 对应的时间 t
+     * @param iterations 可选，二分法求值迭代次数，默认20次
      */
     const solveTForX: ([p1, p2]: [Point, Point], x: number, iterations?: number) => number;
+    /**
+     * 给定控制点 P1 和 x (坐标)，求解 y (坐标)
+     * 使用二分查找法
+     * @param p1 控制点1 坐标
+     * @param x 目标 x 坐标 [0, 1]
+     * @returns 对应的时间 t
+     * @param iterations 可选，二分法求值迭代次数，默认20次
+     */
+    const solveYForX: ([p1, p2]: [Point, Point], x: number, iterations?: number) => number;
 }
 /**
  * 代表一个二次贝塞尔缓动曲线
  */
 export declare class QuadraticBezier {
     private readonly p1;
+    private accuracy;
+    cache: Map<number, number>;
     /**
      * @param p1 控制点 P1
+     * @param accuracy 缓存精度(`10^-accuracy`)，默认为`4`，`-1`则表示不缓存
      */
-    constructor(p1: Point);
+    constructor(p1: Point, accuracy?: number);
     /**
      * 根据时间 t [0, 1]，计算 x 坐标
      */
@@ -75,11 +98,14 @@ export declare class QuadraticBezier {
 export declare class CubicBezier {
     private readonly p1;
     private readonly p2;
+    private accuracy;
+    cache: Map<number, number>;
     /**
      * @param p1 控制点 P1
      * @param p2 控制点 P2
+     * @param accuracy 缓存精度(`10^-accuracy`)，默认为`4`，`-1`则表示不缓存
      */
-    constructor(p1: Point, p2: Point);
+    constructor(p1: Point, p2: Point, accuracy?: number);
     /**
      * 根据时间 t [0, 1]，计算 x 坐标
      */

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ceale/util",
   "author": "Ceale",
-  "version": "1.10.0",
+  "version": "1.11.1",
   "module": "index.ts",
   "type": "module",
   "main": "dist/esm/index.js",