combine utils

Author: g-harel

index.ts

@@ -1,10 +1,9 @@
 // https://www.blobmaker.app/
 
-import {rand} from "./internal/math/rand";
+import {rand} from "./internal/rand";
 import {Shape} from "./internal/types";
-import {rad} from "./internal/math/unit";
-import {smooth} from "./internal/svg/smooth";
-import {renderEditable} from "./internal/svg/render";
+import {smooth, rad} from "./internal/util";
+import {renderEditable} from "./internal/render/svg";
 import {XmlElement} from "./editable";
 
 export interface PathOptions {

internal/shape/interpolate.ts renamed to internal/animate/interpolate.ts

@@ -1,5 +1,5 @@
 import {Shape} from "../types";
-import {split, splitLine} from "../math/geometry";
+import {split, splitLine} from "../util";
 
 const interpolateAngle = (percentage: number, a: number, b: number): number => {
     const tau = Math.PI * 2;

internal/shape/prepare.ts renamed to internal/animate/prepare.ts

@@ -1,6 +1,5 @@
-import {copyPoint, length, reverse, shift, split} from "./util";
+import {copyPoint, length, reverse, shift, insertCount, distance} from "../util";
 import {Point, Shape} from "../types";
-import {distance} from "../math/geometry";
 
 const optimizeOrder = (a: Shape, b: Shape): Shape => {
     const count = a.length;
@@ -45,7 +44,7 @@ export const divideShape = (count: number, points: Shape): Shape => {
         const curr: Point = out[out.length - 1] || points[i];
         const next = points[(i + 1) % points.length];
         out.pop();
-        out.push(...splitCurveBy(divisors[i], curr, next));
+        out.push(...insertCount(divisors[i], curr, next));
     }
     const last = out.pop();
     out[0].handleIn = last!.handleIn;
@@ -91,14 +90,6 @@ const divideLengths = (lengths: number[], add: number): number[] => {
     return divisors;
 };
 
-export const splitCurveBy = (count: number, a: Point, b: Point): Shape => {
-    if (count < 2) return [a, b];
-    const percentage = 1 / count;
-    const [c, d, e] = split(percentage, a, b);
-    if (count === 2) return [c, d, e];
-    return [c, ...splitCurveBy(count - 1, d, e)];
-};
-
 export const prepShapes = (a: Shape, b: Shape): [Shape, Shape] => {
     const points = Math.max(a.length, b.length);
     const aNorm = divideShape(points, a);

internal/math/geometry.ts

@@ -1,5 +1,5 @@
 import {Coord, Shape} from "../types";
-import {expandHandle} from "../shape/util";
+import {expandHandle} from "../util";
 
 const pointSize = 2;
 const infoSpacing = 20;

internal/math/unit.ts

@@ -1,7 +1,6 @@
-import {loopAccess} from "./util";
 import {xml, XmlElement} from "../../editable";
 import {Shape} from "../types";
-import {expandHandle} from "../shape/util";
+import {expandHandle} from "../util";
 
 export interface RenderOptions {
     // Viewport size.
@@ -31,8 +30,8 @@ export const renderEditable = (points: Shape, opt: RenderOptions): XmlElement =>
     // Render path data attribute from points and handles.
     let path = `M${points[0].x},${points[0].y}`;
     for (let i = 0; i < points.length; i++) {
-        const curr = loopAccess(points)(i);
-        const next = loopAccess(points)(i + 1);
+        const curr = points[i];
+        const next = points[(i + 1) % points.length];
         const currControl = expandHandle(curr, curr.handleOut);
         const nextControl = expandHandle(next, next.handleIn);
         path += `C${currControl.x},${currControl.y},${nextControl.x},${nextControl.y},${next.x},${next.y}`;
@@ -80,8 +79,8 @@ export const renderEditable = (points: Shape, opt: RenderOptions): XmlElement =>
 
         // Points and handles.
         for (let i = 0; i < points.length; i++) {
-            const curr = loopAccess(points)(i);
-            const next = loopAccess(points)(i + 1);
+            const curr = points[i];
+            const next = points[(i + 1) % points.length];
             const currControl = expandHandle(curr, curr.handleOut);
             const nextControl = expandHandle(next, next.handleIn);