@immugio/three-math-extensions 0.2.12 → 0.2.14

package/CHANGELOG.md

@@ -7,7 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
-## [0.2.12](https://github.com/Immugio/three-math-extensions/compare/16.15.10...0.2.12)
+## [0.2.14](https://github.com/Immugio/three-math-extensions/compare/16.15.10...0.2.14)
 
 ### Commits
 
@@ -27,11 +27,13 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - Add Vec2.fromPoints to accept multiple points [`a261402`](https://github.com/Immugio/three-math-extensions/commit/a2614027cf5fb8263189b48f7e0bb9a23a552c15)
 - Add Vec2.parallelTo [`989874d`](https://github.com/Immugio/three-math-extensions/commit/989874dcfe122d3ee84d8d56d79cb88e4e441736)
 - Line2D.intersect - enable line segments intersection only [`1f1470e`](https://github.com/Immugio/three-math-extensions/commit/1f1470e1cf00118e643f5c44a135e0baf6b76d41)
+- Line3D.groupConnectedLines now supports line breaks [`417a9ea`](https://github.com/Immugio/three-math-extensions/commit/417a9ea471bf4c539f73f5fb170c962a78ee4ab4)
 - Add Line2D.projectOn [`4c52c5c`](https://github.com/Immugio/three-math-extensions/commit/4c52c5c2e649fbddb72ce3fca60cfd3f1319f72f)
 - Add Line3D.index [`7ed13d2`](https://github.com/Immugio/three-math-extensions/commit/7ed13d213748056c9dafd86288c3bcec9a28d1ba)
 - Polygon from bounding size [`eae6701`](https://github.com/Immugio/three-math-extensions/commit/eae67012f57f426f8b5259b765000447ce06d608)
 - Line2D and Line3D to return this instead of specific type [`761ef6a`](https://github.com/Immugio/three-math-extensions/commit/761ef6a9d8cc4e35120b666576794e521aa3b991)
 - Line2D.in3DSpace added [`a6ce0ec`](https://github.com/Immugio/three-math-extensions/commit/a6ce0ecb67f5c7b2a75fcc283c28af626153a4af)
+- Line3D.connectsTo added [`6d2cfa0`](https://github.com/Immugio/three-math-extensions/commit/6d2cfa0f5335c665f325a694a32c57b574ec326d)
 - Line2D.hasIntersectionWithAngle to support optional tolerance [`b313bbe`](https://github.com/Immugio/three-math-extensions/commit/b313bbe118d435d53750deefd9a9e29ba6ec5c71)
 - Line2D.hasIntersectionWithAngle - modulo all angles [`5409aa0`](https://github.com/Immugio/three-math-extensions/commit/5409aa0bc41510efa86d548e91837e44e5b6c343)
 - Use Vec2 instead of Vector2 [`7e6a6ea`](https://github.com/Immugio/three-math-extensions/commit/7e6a6ea272f4441ef4bc78b3fdec23fc783fa1db)
@@ -41,7 +43,23 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - Documentation update [`d5c7a07`](https://github.com/Immugio/three-math-extensions/commit/d5c7a0765f6097f5d3a3be01967d4059f19682fb)
 - Excluded files from build [`ec70614`](https://github.com/Immugio/three-math-extensions/commit/ec70614bc7df7a98f854c7a6693365118e04faf7)
 
-## [16.15.10](https://github.com/Immugio/three-math-extensions/compare/0.2.11...16.15.10) - 2023-01-02
+## [16.15.10](https://github.com/Immugio/three-math-extensions/compare/0.2.13...16.15.10) - 2023-01-02
+
+## [0.2.13](https://github.com/Immugio/three-math-extensions/compare/0.2.12...0.2.13) - 2023-08-31
+
+### Commits
+
+- Line3D.connectsTo added [`6d2cfa0`](https://github.com/Immugio/three-math-extensions/commit/6d2cfa0f5335c665f325a694a32c57b574ec326d)
+
+## [0.2.12](https://github.com/Immugio/three-math-extensions/compare/0.2.11...0.2.12) - 2023-08-30
+
+### Commits
+
+- Add eslint [`98e4912`](https://github.com/Immugio/three-math-extensions/commit/98e4912d637b42ba80e2f3267638b43296113019)
+- Update jest packages [`af23b4f`](https://github.com/Immugio/three-math-extensions/commit/af23b4f08154bba3407f05b773865215e7e1cba8)
+- Line3D.groupConnectedLines added [`29f372b`](https://github.com/Immugio/three-math-extensions/commit/29f372bc984c06b00c50fcd9428ce9a7b9cab799)
+- Dependencies update and remove now duplicate Vec2.angleTo implementation [`4774abb`](https://github.com/Immugio/three-math-extensions/commit/4774abb81d882082df0da606c79a3c7bd3aecc57)
+- Add Line3D.index [`7ed13d2`](https://github.com/Immugio/three-math-extensions/commit/7ed13d213748056c9dafd86288c3bcec9a28d1ba)
 
 ## [0.2.11](https://github.com/Immugio/three-math-extensions/compare/0.2.10...0.2.11) - 2023-08-24
 

package/cjs/Line3D.js

@@ -412,8 +412,9 @@ class Line3D extends three_1.Line3 {
      * Accepts an array of Line3D and groups them into arrays of connected lines
      * @param lines Lines to be grouped
      * @param tolerance Tolerance for considering lines as connected
+     * @param breakpoints
      */
-    static groupConnectedLines(lines, tolerance = 0) {
+    static groupConnectedLines(lines, tolerance = 0, breakpoints = []) {
         const visited = new Set();
         // Use graph-based approach. Each line can be considered as an edge in the graph, and the endpoints of the lines can be considered as vertices.
         // Then use Depth-First Search (DFS) to find connected components in the graph.
@@ -424,10 +425,7 @@ class Line3D extends three_1.Line3 {
             group.push(line);
             lines.forEach((neighbor) => {
                 if (!visited.has(neighbor)) {
-                    if ((line.start).isNear(neighbor.start, tolerance) ||
-                        (line.start).isNear(neighbor.end, tolerance) ||
-                        (line.end).isNear(neighbor.start, tolerance) ||
-                        (line.end).isNear(neighbor.end, tolerance)) {
+                    if (line.connectsTo(neighbor, tolerance, breakpoints)) {
                         dfs(neighbor, group);
                     }
                 }
@@ -443,6 +441,18 @@ class Line3D extends three_1.Line3 {
         });
         return connectedLines;
     }
+    /**
+     * Returns true if any endpoint of this line is within the tolerance of any @other line's endpoints.
+     * @param other
+     * @param tolerance
+     * @param breakpoints
+     */
+    connectsTo(other, tolerance = 0, breakpoints = []) {
+        return ((this.start.isNear(other.start, tolerance) && breakpoints.every(b => !b.isNear(this.start, tolerance))) ||
+            (this.start.isNear(other.end, tolerance) && breakpoints.every(b => !b.isNear(this.start, tolerance))) ||
+            (this.end.isNear(other.start, tolerance) && breakpoints.every(b => !b.isNear(this.end, tolerance))) ||
+            (this.end.isNear(other.end, tolerance) && breakpoints.every(b => !b.isNear(this.end, tolerance))));
+    }
     /**
      * Project the line to 2D space, Y value is dropped
      */

package/esm/Line3D.js

@@ -409,8 +409,9 @@ export class Line3D extends Line3 {
      * Accepts an array of Line3D and groups them into arrays of connected lines
      * @param lines Lines to be grouped
      * @param tolerance Tolerance for considering lines as connected
+     * @param breakpoints
      */
-    static groupConnectedLines(lines, tolerance = 0) {
+    static groupConnectedLines(lines, tolerance = 0, breakpoints = []) {
         const visited = new Set();
         // Use graph-based approach. Each line can be considered as an edge in the graph, and the endpoints of the lines can be considered as vertices.
         // Then use Depth-First Search (DFS) to find connected components in the graph.
@@ -421,10 +422,7 @@ export class Line3D extends Line3 {
             group.push(line);
             lines.forEach((neighbor) => {
                 if (!visited.has(neighbor)) {
-                    if ((line.start).isNear(neighbor.start, tolerance) ||
-                        (line.start).isNear(neighbor.end, tolerance) ||
-                        (line.end).isNear(neighbor.start, tolerance) ||
-                        (line.end).isNear(neighbor.end, tolerance)) {
+                    if (line.connectsTo(neighbor, tolerance, breakpoints)) {
                         dfs(neighbor, group);
                     }
                 }
@@ -440,6 +438,18 @@ export class Line3D extends Line3 {
         });
         return connectedLines;
     }
+    /**
+     * Returns true if any endpoint of this line is within the tolerance of any @other line's endpoints.
+     * @param other
+     * @param tolerance
+     * @param breakpoints
+     */
+    connectsTo(other, tolerance = 0, breakpoints = []) {
+        return ((this.start.isNear(other.start, tolerance) && breakpoints.every(b => !b.isNear(this.start, tolerance))) ||
+            (this.start.isNear(other.end, tolerance) && breakpoints.every(b => !b.isNear(this.start, tolerance))) ||
+            (this.end.isNear(other.start, tolerance) && breakpoints.every(b => !b.isNear(this.end, tolerance))) ||
+            (this.end.isNear(other.end, tolerance) && breakpoints.every(b => !b.isNear(this.end, tolerance))));
+    }
     /**
      * Project the line to 2D space, Y value is dropped
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@immugio/three-math-extensions",
-  "version": "0.2.12",
+  "version": "0.2.14",
   "description": "Set of utilities for 2d and 3d line math built on top of three.js",
   "author": "Jan Mikeska <janmikeska@gmail.com>",
   "license": "ISC",

package/src/Line3D.ts

@@ -506,8 +506,9 @@ export class Line3D extends Line3 {
      * Accepts an array of Line3D and groups them into arrays of connected lines
      * @param lines Lines to be grouped
      * @param tolerance Tolerance for considering lines as connected
+     * @param breakpoints
      */
-    public static groupConnectedLines(lines: Line3D[], tolerance: number = 0): Line3D[][] {
+    public static groupConnectedLines(lines: Line3D[], tolerance: number = 0, breakpoints: Vec3[] = []): Line3D[][] {
         const visited: Set<Line3D> = new Set();
 
         // Use graph-based approach. Each line can be considered as an edge in the graph, and the endpoints of the lines can be considered as vertices.
@@ -520,10 +521,7 @@ export class Line3D extends Line3 {
             lines.forEach((neighbor) => {
                 if (!visited.has(neighbor)) {
                     if (
-                        (line.start).isNear(neighbor.start, tolerance) ||
-                        (line.start).isNear(neighbor.end, tolerance) ||
-                        (line.end).isNear(neighbor.start, tolerance) ||
-                        (line.end).isNear(neighbor.end, tolerance)
+                        line.connectsTo(neighbor, tolerance, breakpoints)
                     ) {
                         dfs(neighbor, group);
                     }
@@ -544,6 +542,21 @@ export class Line3D extends Line3 {
         return connectedLines;
     }
 
+    /**
+     * Returns true if any endpoint of this line is within the tolerance of any @other line's endpoints.
+     * @param other
+     * @param tolerance
+     * @param breakpoints
+     */
+    public connectsTo(other: Line3D, tolerance: number = 0, breakpoints: Vec3[] = []): boolean {
+        return (
+            (this.start.isNear(other.start, tolerance) && breakpoints.every(b => !b.isNear(this.start, tolerance))) ||
+            (this.start.isNear(other.end, tolerance) && breakpoints.every(b => !b.isNear(this.start, tolerance))) ||
+            (this.end.isNear(other.start, tolerance) && breakpoints.every(b => !b.isNear(this.end, tolerance))) ||
+            (this.end.isNear(other.end, tolerance) && breakpoints.every(b => !b.isNear(this.end, tolerance)))
+        );
+    }
+
     /**
      * Project the line to 2D space, Y value is dropped
      */

package/types/Line3D.d.ts

@@ -150,8 +150,16 @@ export declare class Line3D extends Line3 {
      * Accepts an array of Line3D and groups them into arrays of connected lines
      * @param lines Lines to be grouped
      * @param tolerance Tolerance for considering lines as connected
+     * @param breakpoints
      */
-    static groupConnectedLines(lines: Line3D[], tolerance?: number): Line3D[][];
+    static groupConnectedLines(lines: Line3D[], tolerance?: number, breakpoints?: Vec3[]): Line3D[][];
+    /**
+     * Returns true if any endpoint of this line is within the tolerance of any @other line's endpoints.
+     * @param other
+     * @param tolerance
+     * @param breakpoints
+     */
+    connectsTo(other: Line3D, tolerance?: number, breakpoints?: Vec3[]): boolean;
     /**
      * Project the line to 2D space, Y value is dropped
      */