ddan-js 2.8.12 → 2.8.14

package/bin/lib/modules/hook/modules/bezier.js

@@ -1,10 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.lerpAverage = void 0;
 const lerp = (start, end, t) => {
     // (1 - t) * p0.x + t * p1.x,
     return start * (1 - t) + end * t;
 };
+const proportion = (start, end, current) => {
+    if (start === end)
+        return 0;
+    return (current - start) / (end - start);
+};
 const bezier1 = (p0, p1, t) => {
     return {
         x: lerp(p0.x, p1.x, t),
@@ -72,8 +76,8 @@ const bezierCurve = (points, t) => {
     }
     return { x, y };
 };
-const lerpAverage = (points, step //
-) => {
+const lerpAverage = (points, step, //
+type = '') => {
     if (points.length <= 0)
         return 0;
     if (points.length === 1)
@@ -83,35 +87,35 @@ const lerpAverage = (points, step //
     const values = [];
     // 调整下排序
     const _points = points.slice().sort((a, b) => a.x - b.x);
+    const size = _points.length;
     const start = _points[0].x;
-    const end = _points[_points.length - 1].x;
+    const end = _points[size - 1].x;
     // 遍历每个插值点
     for (let axis = start; axis <= end; axis += step) {
         let value = 0;
         // 找到 t 所在区间 [t1, t2]
-        for (let i = 0; i < _points.length - 1; i++) {
+        for (let i = 0; i < size - 1; i++) {
             const p1 = _points[i];
             const p2 = _points[i + 1];
             if (axis >= p1.x && axis <= p2.x) {
-                if (p1.x === p2.x) {
-                    value = p1.y;
+                if (type === 'bezier') {
+                    const t = proportion(p1.x, p2.x, axis);
+                    value = bezier1(p1, p2, t).y;
                 }
                 else {
-                    const t = (axis - p1.x) / (p2.x - p1.x);
-                    value = bezier1(p1, p2, t).y;
+                    // 取左侧值
+                    value = p1.y;
                 }
-                // 线性插值公式
                 break;
             }
         }
         // 如果 t 超出范围，使用最后一个已知值
-        if (axis > _points[_points.length - 1].x) {
-            value = _points[_points.length - 1].y;
+        if (axis > _points[size - 1].x) {
+            value = _points[size - 1].y;
         }
         values.push(value);
     }
-    const sum = values.reduce((acc, val) => acc + val, 0) / values.length;
+    const sum = values.reduce((acc, val) => acc + val, 0);
     return sum / values.length;
 };
-exports.lerpAverage = lerpAverage;
-exports.default = { bezier1, bezier2, bezier3, bezier, bezierCurve, lerp, lerpAverage: exports.lerpAverage };
+exports.default = { bezier1, bezier2, bezier3, bezier, bezierCurve, lerp, lerpAverage, proportion };

package/bin/types/browser.d.ts

@@ -339,7 +339,8 @@ declare const dHook: {
     bezier3: (p0: import("./typings").Ddan.IPoint, p1: import("./typings").Ddan.IPoint, p2: import("./typings").Ddan.IPoint, p3: import("./typings").Ddan.IPoint, t: number) => import("./typings").Ddan.IPoint;
     bezier: (points: import("./typings").Ddan.IPoint[], t: number) => import("./typings").Ddan.IPoint;
     bezierCurve: (points: import("./typings").Ddan.IPoint[], t: number) => import("./typings").Ddan.IPoint;
-    lerpAverage: (points: import("./typings").Ddan.IPoint[], step: number) => number;
+    lerpAverage: (points: import("./typings").Ddan.IPoint[], step: number, type?: "" | "bezier") => number;
+    proportion: (start: number, end: number, current: number) => number;
     logString: (data: any) => string;
     logParse: (logStr: string) => string;
     logRString: (data: any) => Promise<string>;
@@ -697,7 +698,8 @@ declare const _default: {
         bezier: (points: import("./typings").Ddan.IPoint[], t: number) => import("./typings").Ddan.IPoint;
         bezierCurve: (points: import("./typings").Ddan.IPoint[], t: number) => import("./typings").Ddan.IPoint;
         lerp: (start: number, end: number, t: number) => number;
-        lerpAverage: (points: import("./typings").Ddan.IPoint[], step: number) => number;
+        lerpAverage: (points: import("./typings").Ddan.IPoint[], step: number, type?: "" | "bezier") => number;
+        proportion: (start: number, end: number, current: number) => number;
         logString: (data: any) => string;
         logParse: (logStr: string) => string;
         logRString: (data: any) => Promise<string>;

package/bin/types/index.d.ts

@@ -339,7 +339,8 @@ declare const dHook: {
     bezier3: (p0: import("./typings").Ddan.IPoint, p1: import("./typings").Ddan.IPoint, p2: import("./typings").Ddan.IPoint, p3: import("./typings").Ddan.IPoint, t: number) => import("./typings").Ddan.IPoint;
     bezier: (points: import("./typings").Ddan.IPoint[], t: number) => import("./typings").Ddan.IPoint;
     bezierCurve: (points: import("./typings").Ddan.IPoint[], t: number) => import("./typings").Ddan.IPoint;
-    lerpAverage: (points: import("./typings").Ddan.IPoint[], step: number) => number;
+    lerpAverage: (points: import("./typings").Ddan.IPoint[], step: number, type?: "" | "bezier") => number;
+    proportion: (start: number, end: number, current: number) => number;
     logString: (data: any) => string;
     logParse: (logStr: string) => string;
     logRString: (data: any) => Promise<string>;
@@ -733,7 +734,8 @@ declare const _default: {
         bezier: (points: import("./typings").Ddan.IPoint[], t: number) => import("./typings").Ddan.IPoint;
         bezierCurve: (points: import("./typings").Ddan.IPoint[], t: number) => import("./typings").Ddan.IPoint;
         lerp: (start: number, end: number, t: number) => number;
-        lerpAverage: (points: import("./typings").Ddan.IPoint[], step: number) => number;
+        lerpAverage: (points: import("./typings").Ddan.IPoint[], step: number, type?: "" | "bezier") => number;
+        proportion: (start: number, end: number, current: number) => number;
         logString: (data: any) => string;
         logParse: (logStr: string) => string;
         logRString: (data: any) => Promise<string>;

package/bin/types/modules/hook/index.d.ts

@@ -31,7 +31,8 @@ declare const _default: {
     bezier: (points: Ddan.IPoint[], t: number) => Ddan.IPoint;
     bezierCurve: (points: Ddan.IPoint[], t: number) => Ddan.IPoint;
     lerp: (start: number, end: number, t: number) => number;
-    lerpAverage: (points: Ddan.IPoint[], step: number) => number;
+    lerpAverage: (points: Ddan.IPoint[], step: number, type?: "" | "bezier") => number;
+    proportion: (start: number, end: number, current: number) => number;
     logString: (data: any) => string;
     logParse: (logStr: string) => string;
     logRString: (data: any) => Promise<string>;

package/bin/types/modules/hook/modules/bezier.d.ts

@@ -1,5 +1,4 @@
 import { Ddan } from '../../../typings';
-export declare const lerpAverage: (points: Ddan.IPoint[], step: number) => number;
 declare const _default: {
     bezier1: (p0: Ddan.IPoint, p1: Ddan.IPoint, t: number) => Ddan.IPoint;
     bezier2: (p0: Ddan.IPoint, p1: Ddan.IPoint, p2: Ddan.IPoint, t: number) => Ddan.IPoint;
@@ -7,6 +6,7 @@ declare const _default: {
     bezier: (points: Ddan.IPoint[], t: number) => Ddan.IPoint;
     bezierCurve: (points: Ddan.IPoint[], t: number) => Ddan.IPoint;
     lerp: (start: number, end: number, t: number) => number;
-    lerpAverage: (points: Ddan.IPoint[], step: number) => number;
+    lerpAverage: (points: Ddan.IPoint[], step: number, type?: "" | "bezier") => number;
+    proportion: (start: number, end: number, current: number) => number;
 };
 export default _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ddan-js",
-  "version": "2.8.12",
+  "version": "2.8.14",
   "description": "",
   "keywords": [
     "ddan-js",