@twick/2d 0.14.0 → 1.14.3

package/src/lib/curves/getPathProfile.ts

@@ -1,178 +1,178 @@
-import {Vector2, clamp} from '@twick/core';
-import type {PathCommand} from 'parse-svg-path';
-import parse from 'parse-svg-path';
-import {ArcSegment} from './ArcSegment';
-import {CubicBezierSegment} from './CubicBezierSegment';
-import type {CurveProfile} from './CurveProfile';
-import {LineSegment} from './LineSegment';
-import {QuadBezierSegment} from './QuadBezierSegment';
-import type {Segment} from './Segment';
-
-function addSegmentToProfile(profile: CurveProfile, segment: Segment) {
-  profile.segments.push(segment);
-  profile.arcLength += segment.arcLength;
-}
-
-function getArg(command: PathCommand, argumentIndex: number) {
-  return command[argumentIndex + 1] as number;
-}
-
-function getVector2(command: PathCommand, argumentIndex: number) {
-  return new Vector2(
-    command[argumentIndex + 1] as number,
-    command[argumentIndex + 2] as number,
-  );
-}
-
-function getPoint(
-  command: PathCommand,
-  argumentIndex: number,
-  isRelative: boolean,
-  currentPoint: Vector2,
-) {
-  const point = getVector2(command, argumentIndex);
-  return isRelative ? currentPoint.add(point) : point;
-}
-
-function reflectControlPoint(control: Vector2, currentPoint: Vector2) {
-  return currentPoint.add(currentPoint.sub(control));
-}
-
-function updateMinSin(profile: CurveProfile) {
-  for (let i = 0; i < profile.segments.length; i++) {
-    const segmentA = profile.segments[i];
-    const segmentB = profile.segments[(i + 1) % profile.segments.length];
-
-    // In cubic bezier this equal p2.sub(p3)
-    const startVector = segmentA.getPoint(1).tangent.scale(-1);
-    // In cubic bezier this equal p1.sub(p0)
-    const endVector = segmentB.getPoint(0).tangent;
-    const dot = startVector.dot(endVector);
-
-    const angleBetween = Math.acos(clamp(-1, 1, dot));
-    const angleSin = Math.sin(angleBetween / 2);
-
-    profile.minSin = Math.min(profile.minSin, Math.abs(angleSin));
-  }
-}
-
-export function getPathProfile(data: string): CurveProfile {
-  const profile: CurveProfile = {
-    segments: [],
-    arcLength: 0,
-    minSin: 1,
-  };
-
-  const segments = parse(data);
-  let currentPoint = new Vector2(0, 0);
-  let firstPoint: Vector2 | null = null;
-
-  for (const segment of segments) {
-    const command = segment[0].toLowerCase();
-    const isRelative = segment[0] === command;
-
-    if (command === 'm') {
-      currentPoint = getPoint(segment, 0, isRelative, currentPoint);
-      firstPoint = currentPoint;
-    } else if (command === 'l') {
-      const nextPoint = getPoint(segment, 0, isRelative, currentPoint);
-      addSegmentToProfile(profile, new LineSegment(currentPoint, nextPoint));
-      currentPoint = nextPoint;
-    } else if (command === 'h') {
-      const x = getArg(segment, 0);
-      const nextPoint = isRelative
-        ? currentPoint.addX(x)
-        : new Vector2(x, currentPoint.y);
-      addSegmentToProfile(profile, new LineSegment(currentPoint, nextPoint));
-      currentPoint = nextPoint;
-    } else if (command === 'v') {
-      const y = getArg(segment, 0);
-      const nextPoint = isRelative
-        ? currentPoint.addY(y)
-        : new Vector2(currentPoint.x, y);
-      addSegmentToProfile(profile, new LineSegment(currentPoint, nextPoint));
-      currentPoint = nextPoint;
-    } else if (command === 'q') {
-      const controlPoint = getPoint(segment, 0, isRelative, currentPoint);
-      const nextPoint = getPoint(segment, 2, isRelative, currentPoint);
-      addSegmentToProfile(
-        profile,
-        new QuadBezierSegment(currentPoint, controlPoint, nextPoint),
-      );
-      currentPoint = nextPoint;
-    } else if (command === 't') {
-      const lastSegment = profile.segments.at(-1);
-      const controlPoint =
-        lastSegment instanceof QuadBezierSegment
-          ? reflectControlPoint(lastSegment.p1, currentPoint)
-          : currentPoint;
-
-      const nextPoint = getPoint(segment, 0, isRelative, currentPoint);
-      addSegmentToProfile(
-        profile,
-        new QuadBezierSegment(currentPoint, controlPoint, nextPoint),
-      );
-      currentPoint = nextPoint;
-    } else if (command === 'c') {
-      const startControlPoint = getPoint(segment, 0, isRelative, currentPoint);
-      const endControlPoint = getPoint(segment, 2, isRelative, currentPoint);
-      const nextPoint = getPoint(segment, 4, isRelative, currentPoint);
-      addSegmentToProfile(
-        profile,
-        new CubicBezierSegment(
-          currentPoint,
-          startControlPoint,
-          endControlPoint,
-          nextPoint,
-        ),
-      );
-      currentPoint = nextPoint;
-    } else if (command === 's') {
-      const lastSegment = profile.segments.at(-1);
-      const startControlPoint =
-        lastSegment instanceof CubicBezierSegment
-          ? reflectControlPoint(lastSegment.p2, currentPoint)
-          : currentPoint;
-
-      const endControlPoint = getPoint(segment, 0, isRelative, currentPoint);
-      const nextPoint = getPoint(segment, 2, isRelative, currentPoint);
-      addSegmentToProfile(
-        profile,
-        new CubicBezierSegment(
-          currentPoint,
-          startControlPoint,
-          endControlPoint,
-          nextPoint,
-        ),
-      );
-      currentPoint = nextPoint;
-    } else if (command === 'a') {
-      const radius = getVector2(segment, 0);
-      const angle = getArg(segment, 2);
-      const largeArcFlag = getArg(segment, 3);
-      const sweepFlag = getArg(segment, 4);
-      const nextPoint = getPoint(segment, 5, isRelative, currentPoint);
-      addSegmentToProfile(
-        profile,
-        new ArcSegment(
-          currentPoint,
-          radius,
-          angle,
-          largeArcFlag,
-          sweepFlag,
-          nextPoint,
-        ),
-      );
-      currentPoint = nextPoint;
-    } else if (command === 'z') {
-      if (!firstPoint) continue;
-      if (currentPoint.equals(firstPoint)) continue;
-
-      addSegmentToProfile(profile, new LineSegment(currentPoint, firstPoint));
-      currentPoint = firstPoint;
-    }
-  }
-  updateMinSin(profile);
-
-  return profile;
-}
+import {Vector2, clamp} from '@twick/core';
+import type {PathCommand} from 'parse-svg-path';
+import parse from 'parse-svg-path';
+import {ArcSegment} from './ArcSegment';
+import {CubicBezierSegment} from './CubicBezierSegment';
+import type {CurveProfile} from './CurveProfile';
+import {LineSegment} from './LineSegment';
+import {QuadBezierSegment} from './QuadBezierSegment';
+import type {Segment} from './Segment';
+
+function addSegmentToProfile(profile: CurveProfile, segment: Segment) {
+  profile.segments.push(segment);
+  profile.arcLength += segment.arcLength;
+}
+
+function getArg(command: PathCommand, argumentIndex: number) {
+  return command[argumentIndex + 1] as number;
+}
+
+function getVector2(command: PathCommand, argumentIndex: number) {
+  return new Vector2(
+    command[argumentIndex + 1] as number,
+    command[argumentIndex + 2] as number,
+  );
+}
+
+function getPoint(
+  command: PathCommand,
+  argumentIndex: number,
+  isRelative: boolean,
+  currentPoint: Vector2,
+) {
+  const point = getVector2(command, argumentIndex);
+  return isRelative ? currentPoint.add(point) : point;
+}
+
+function reflectControlPoint(control: Vector2, currentPoint: Vector2) {
+  return currentPoint.add(currentPoint.sub(control));
+}
+
+function updateMinSin(profile: CurveProfile) {
+  for (let i = 0; i < profile.segments.length; i++) {
+    const segmentA = profile.segments[i];
+    const segmentB = profile.segments[(i + 1) % profile.segments.length];
+
+    // In cubic bezier this equal p2.sub(p3)
+    const startVector = segmentA.getPoint(1).tangent.scale(-1);
+    // In cubic bezier this equal p1.sub(p0)
+    const endVector = segmentB.getPoint(0).tangent;
+    const dot = startVector.dot(endVector);
+
+    const angleBetween = Math.acos(clamp(-1, 1, dot));
+    const angleSin = Math.sin(angleBetween / 2);
+
+    profile.minSin = Math.min(profile.minSin, Math.abs(angleSin));
+  }
+}
+
+export function getPathProfile(data: string): CurveProfile {
+  const profile: CurveProfile = {
+    segments: [],
+    arcLength: 0,
+    minSin: 1,
+  };
+
+  const segments = parse(data);
+  let currentPoint = new Vector2(0, 0);
+  let firstPoint: Vector2 | null = null;
+
+  for (const segment of segments) {
+    const command = segment[0].toLowerCase();
+    const isRelative = segment[0] === command;
+
+    if (command === 'm') {
+      currentPoint = getPoint(segment, 0, isRelative, currentPoint);
+      firstPoint = currentPoint;
+    } else if (command === 'l') {
+      const nextPoint = getPoint(segment, 0, isRelative, currentPoint);
+      addSegmentToProfile(profile, new LineSegment(currentPoint, nextPoint));
+      currentPoint = nextPoint;
+    } else if (command === 'h') {
+      const x = getArg(segment, 0);
+      const nextPoint = isRelative
+        ? currentPoint.addX(x)
+        : new Vector2(x, currentPoint.y);
+      addSegmentToProfile(profile, new LineSegment(currentPoint, nextPoint));
+      currentPoint = nextPoint;
+    } else if (command === 'v') {
+      const y = getArg(segment, 0);
+      const nextPoint = isRelative
+        ? currentPoint.addY(y)
+        : new Vector2(currentPoint.x, y);
+      addSegmentToProfile(profile, new LineSegment(currentPoint, nextPoint));
+      currentPoint = nextPoint;
+    } else if (command === 'q') {
+      const controlPoint = getPoint(segment, 0, isRelative, currentPoint);
+      const nextPoint = getPoint(segment, 2, isRelative, currentPoint);
+      addSegmentToProfile(
+        profile,
+        new QuadBezierSegment(currentPoint, controlPoint, nextPoint),
+      );
+      currentPoint = nextPoint;
+    } else if (command === 't') {
+      const lastSegment = profile.segments.at(-1);
+      const controlPoint =
+        lastSegment instanceof QuadBezierSegment
+          ? reflectControlPoint(lastSegment.p1, currentPoint)
+          : currentPoint;
+
+      const nextPoint = getPoint(segment, 0, isRelative, currentPoint);
+      addSegmentToProfile(
+        profile,
+        new QuadBezierSegment(currentPoint, controlPoint, nextPoint),
+      );
+      currentPoint = nextPoint;
+    } else if (command === 'c') {
+      const startControlPoint = getPoint(segment, 0, isRelative, currentPoint);
+      const endControlPoint = getPoint(segment, 2, isRelative, currentPoint);
+      const nextPoint = getPoint(segment, 4, isRelative, currentPoint);
+      addSegmentToProfile(
+        profile,
+        new CubicBezierSegment(
+          currentPoint,
+          startControlPoint,
+          endControlPoint,
+          nextPoint,
+        ),
+      );
+      currentPoint = nextPoint;
+    } else if (command === 's') {
+      const lastSegment = profile.segments.at(-1);
+      const startControlPoint =
+        lastSegment instanceof CubicBezierSegment
+          ? reflectControlPoint(lastSegment.p2, currentPoint)
+          : currentPoint;
+
+      const endControlPoint = getPoint(segment, 0, isRelative, currentPoint);
+      const nextPoint = getPoint(segment, 2, isRelative, currentPoint);
+      addSegmentToProfile(
+        profile,
+        new CubicBezierSegment(
+          currentPoint,
+          startControlPoint,
+          endControlPoint,
+          nextPoint,
+        ),
+      );
+      currentPoint = nextPoint;
+    } else if (command === 'a') {
+      const radius = getVector2(segment, 0);
+      const angle = getArg(segment, 2);
+      const largeArcFlag = getArg(segment, 3);
+      const sweepFlag = getArg(segment, 4);
+      const nextPoint = getPoint(segment, 5, isRelative, currentPoint);
+      addSegmentToProfile(
+        profile,
+        new ArcSegment(
+          currentPoint,
+          radius,
+          angle,
+          largeArcFlag,
+          sweepFlag,
+          nextPoint,
+        ),
+      );
+      currentPoint = nextPoint;
+    } else if (command === 'z') {
+      if (!firstPoint) continue;
+      if (currentPoint.equals(firstPoint)) continue;
+
+      addSegmentToProfile(profile, new LineSegment(currentPoint, firstPoint));
+      currentPoint = firstPoint;
+    }
+  }
+  updateMinSin(profile);
+
+  return profile;
+}

package/src/lib/curves/getPointAtDistance.ts

@@ -1,21 +1,21 @@
-import {Vector2, clamp} from '@twick/core';
-import type {CurvePoint} from './CurvePoint';
-import type {CurveProfile} from './CurveProfile';
-
-export function getPointAtDistance(
-  profile: CurveProfile,
-  distance: number,
-): CurvePoint {
-  const clamped = clamp(0, profile.arcLength, distance);
-  let length = 0;
-  for (const segment of profile.segments) {
-    const previousLength = length;
-    length += segment.arcLength;
-    if (length >= clamped) {
-      const relative = (clamped - previousLength) / segment.arcLength;
-      return segment.getPoint(clamp(0, 1, relative));
-    }
-  }
-
-  return {position: Vector2.zero, tangent: Vector2.up, normal: Vector2.up};
-}
+import {Vector2, clamp} from '@twick/core';
+import type {CurvePoint} from './CurvePoint';
+import type {CurveProfile} from './CurveProfile';
+
+export function getPointAtDistance(
+  profile: CurveProfile,
+  distance: number,
+): CurvePoint {
+  const clamped = clamp(0, profile.arcLength, distance);
+  let length = 0;
+  for (const segment of profile.segments) {
+    const previousLength = length;
+    length += segment.arcLength;
+    if (length >= clamped) {
+      const relative = (clamped - previousLength) / segment.arcLength;
+      return segment.getPoint(clamp(0, 1, relative));
+    }
+  }
+
+  return {position: Vector2.zero, tangent: Vector2.up, normal: Vector2.up};
+}

package/src/lib/curves/getPolylineProfile.test.ts

@@ -1,21 +1,21 @@
-import {Vector2} from '@twick/core';
-import {describe, expect, test} from 'vitest';
-import {getPolylineProfile} from './getPolylineProfile';
-
-describe('getPolylineProfile', () => {
-  test('Correct arc length', () => {
-    const profile = getPolylineProfile(
-      [
-        Vector2.zero,
-        Vector2.zero,
-        new Vector2(100, 0),
-        new Vector2(100, 100),
-        new Vector2(0, 100),
-      ],
-      0,
-      true,
-    );
-
-    expect(profile.arcLength).toBe(400);
-  });
-});
+import {Vector2} from '@twick/core';
+import {describe, expect, test} from 'vitest';
+import {getPolylineProfile} from './getPolylineProfile';
+
+describe('getPolylineProfile', () => {
+  test('Correct arc length', () => {
+    const profile = getPolylineProfile(
+      [
+        Vector2.zero,
+        Vector2.zero,
+        new Vector2(100, 0),
+        new Vector2(100, 100),
+        new Vector2(0, 100),
+      ],
+      0,
+      true,
+    );
+
+    expect(profile.arcLength).toBe(400);
+  });
+});

package/src/lib/curves/getPolylineProfile.ts

@@ -1,89 +1,89 @@
-import type {Vector2} from '@twick/core';
-import {clamp} from '@twick/core';
-import {CircleSegment} from './CircleSegment';
-import type {CurveProfile} from './CurveProfile';
-import {LineSegment} from './LineSegment';
-
-export function getPolylineProfile(
-  points: readonly Vector2[],
-  radius: number,
-  closed: boolean,
-): CurveProfile {
-  const profile: CurveProfile = {
-    arcLength: 0,
-    segments: [],
-    minSin: 1,
-  };
-
-  if (points.length === 0) {
-    return profile;
-  }
-
-  if (closed) {
-    const middle = points[0].add(points[points.length - 1]).scale(0.5);
-    points = [middle, ...points, middle];
-  }
-
-  let last = points[0];
-  for (let i = 2; i < points.length; i++) {
-    const start = points[i - 2];
-    const center = points[i - 1];
-    const end = points[i];
-
-    const centerToStart = start.sub(center);
-    const centerToEnd = end.sub(center);
-    const startVector = centerToStart.normalized.safe;
-    const endVector = centerToEnd.normalized.safe;
-    const angleBetween = Math.acos(clamp(-1, 1, startVector.dot(endVector)));
-    const angleTan = Math.tan(angleBetween / 2);
-    const angleSin = Math.sin(angleBetween / 2);
-
-    const safeRadius = Math.min(
-      radius,
-      angleTan * centerToStart.magnitude * (i === 2 ? 1 : 0.5),
-      angleTan * centerToEnd.magnitude * (i === points.length - 1 ? 1 : 0.5),
-    );
-
-    const circleOffsetDistance = angleSin === 0 ? 0 : safeRadius / angleSin;
-    const pointOffsetDistance = angleTan === 0 ? 0 : safeRadius / angleTan;
-    const circleDistance = startVector
-      .add(endVector)
-      .scale(1 / 2)
-      .normalized.safe.scale(circleOffsetDistance)
-      .add(center);
-
-    const counter = startVector.perpendicular.dot(endVector) < 0;
-    const line = new LineSegment(
-      last,
-      center.add(startVector.scale(pointOffsetDistance)),
-    );
-    const circle = new CircleSegment(
-      circleDistance,
-      safeRadius,
-      startVector.perpendicular.scale(counter ? 1 : -1),
-      endVector.perpendicular.scale(counter ? -1 : 1),
-      counter,
-    );
-
-    if (line.arcLength > 0) {
-      profile.segments.push(line);
-      profile.arcLength += line.arcLength;
-    }
-    if (circle.arcLength > 0) {
-      profile.segments.push(circle);
-      profile.arcLength += circle.arcLength;
-    }
-
-    profile.minSin = Math.min(profile.minSin, Math.abs(angleSin));
-
-    last = center.add(endVector.scale(pointOffsetDistance));
-  }
-
-  const line = new LineSegment(last, points[points.length - 1]);
-  if (line.arcLength > 0) {
-    profile.segments.push(line);
-    profile.arcLength += line.arcLength;
-  }
-
-  return profile;
-}
+import type {Vector2} from '@twick/core';
+import {clamp} from '@twick/core';
+import {CircleSegment} from './CircleSegment';
+import type {CurveProfile} from './CurveProfile';
+import {LineSegment} from './LineSegment';
+
+export function getPolylineProfile(
+  points: readonly Vector2[],
+  radius: number,
+  closed: boolean,
+): CurveProfile {
+  const profile: CurveProfile = {
+    arcLength: 0,
+    segments: [],
+    minSin: 1,
+  };
+
+  if (points.length === 0) {
+    return profile;
+  }
+
+  if (closed) {
+    const middle = points[0].add(points[points.length - 1]).scale(0.5);
+    points = [middle, ...points, middle];
+  }
+
+  let last = points[0];
+  for (let i = 2; i < points.length; i++) {
+    const start = points[i - 2];
+    const center = points[i - 1];
+    const end = points[i];
+
+    const centerToStart = start.sub(center);
+    const centerToEnd = end.sub(center);
+    const startVector = centerToStart.normalized.safe;
+    const endVector = centerToEnd.normalized.safe;
+    const angleBetween = Math.acos(clamp(-1, 1, startVector.dot(endVector)));
+    const angleTan = Math.tan(angleBetween / 2);
+    const angleSin = Math.sin(angleBetween / 2);
+
+    const safeRadius = Math.min(
+      radius,
+      angleTan * centerToStart.magnitude * (i === 2 ? 1 : 0.5),
+      angleTan * centerToEnd.magnitude * (i === points.length - 1 ? 1 : 0.5),
+    );
+
+    const circleOffsetDistance = angleSin === 0 ? 0 : safeRadius / angleSin;
+    const pointOffsetDistance = angleTan === 0 ? 0 : safeRadius / angleTan;
+    const circleDistance = startVector
+      .add(endVector)
+      .scale(1 / 2)
+      .normalized.safe.scale(circleOffsetDistance)
+      .add(center);
+
+    const counter = startVector.perpendicular.dot(endVector) < 0;
+    const line = new LineSegment(
+      last,
+      center.add(startVector.scale(pointOffsetDistance)),
+    );
+    const circle = new CircleSegment(
+      circleDistance,
+      safeRadius,
+      startVector.perpendicular.scale(counter ? 1 : -1),
+      endVector.perpendicular.scale(counter ? -1 : 1),
+      counter,
+    );
+
+    if (line.arcLength > 0) {
+      profile.segments.push(line);
+      profile.arcLength += line.arcLength;
+    }
+    if (circle.arcLength > 0) {
+      profile.segments.push(circle);
+      profile.arcLength += circle.arcLength;
+    }
+
+    profile.minSin = Math.min(profile.minSin, Math.abs(angleSin));
+
+    last = center.add(endVector.scale(pointOffsetDistance));
+  }
+
+  const line = new LineSegment(last, points[points.length - 1]);
+  if (line.arcLength > 0) {
+    profile.segments.push(line);
+    profile.arcLength += line.arcLength;
+  }
+
+  return profile;
+}