@immugio/three-math-extensions 0.2.36 → 0.2.38

package/CHANGELOG.md

@@ -7,7 +7,19 @@ 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.36](https://github.com/Immugio/three-math-extensions/compare/0.2.35...0.2.36)
+## [0.2.38](https://github.com/Immugio/three-math-extensions/compare/0.2.37...0.2.38)
+
+### Commits
+
+- Improve Polygon.offsetContour algorithm [`60a28f8`](https://github.com/Immugio/three-math-extensions/commit/60a28f84bd5561b9bb5934561b7bb92f06861a53)
+
+## [0.2.37](https://github.com/Immugio/three-math-extensions/compare/0.2.36...0.2.37) - 2024-12-05
+
+### Commits
+
+- Line3D.joinLines should preserve the order where possible [`af1c417`](https://github.com/Immugio/three-math-extensions/commit/af1c41757cbe0a4a7f804587dfca3c771023d587)
+
+## [0.2.36](https://github.com/Immugio/three-math-extensions/compare/0.2.35...0.2.36) - 2024-10-24
 
 ### Commits
 

package/cjs/Line3D.js

@@ -135,25 +135,27 @@ class Line3D extends three_1.Line3 {
         if (lines.length < 2) {
             return lines.map(x => x.clone());
         }
-        const toProcess = lines.slice();
+        const toProcess = lines.map((line, index) => ({ line: line.clone(), index }));
         const result = [];
         while (toProcess.length > 0) {
             const current = toProcess.pop();
             let joinedLine;
             for (let i = 0; i < result.length; i++) {
                 const other = result[i];
-                joinedLine = current.joinLine(other, distanceTolerance, parallelTolerance);
+                joinedLine = current.line.joinLine(other.line, distanceTolerance, parallelTolerance);
                 if (joinedLine) {
                     result.splice(i, 1);
-                    toProcess.push(joinedLine);
+                    toProcess.push({ line: joinedLine, index: current.index });
                     break;
                 }
             }
             if (!joinedLine) {
-                result.push(current.clone());
+                result.push(current);
             }
         }
-        return result;
+        // Sort the result based on the original indices
+        result.sort((a, b) => a.index - b.index);
+        return result.map(item => item.line);
     }
     /**
      * Returns true if this line section completely overlaps the @other line section.

package/cjs/Polygon.js

@@ -152,8 +152,17 @@ class Polygon {
             console.error("The contour should be closed");
             return this;
         }
-        for (let i = 0; i < this.contour.length - 1; i++) {
-            this.translateContourLine(i, offset);
+        const lines = Line2D_1.Line2D
+            .fromPolygon(this.contour)
+            .map(line => line.translateLeft(offset));
+        for (let i = 0; i < lines.length; i++) {
+            const line = lines[i];
+            const next = lines[(i + 1) % lines.length];
+            line.extendToOrTrimAtIntersection(next);
+            next.extendToOrTrimAtIntersection(line);
+        }
+        for (let i = 0; i < this.contour.length; i++) {
+            this.contour[i].copy(lines[i % lines.length].start);
         }
         return this;
     }

package/esm/Line3D.js

@@ -132,25 +132,27 @@ export class Line3D extends Line3 {
         if (lines.length < 2) {
             return lines.map(x => x.clone());
         }
-        const toProcess = lines.slice();
+        const toProcess = lines.map((line, index) => ({ line: line.clone(), index }));
         const result = [];
         while (toProcess.length > 0) {
             const current = toProcess.pop();
             let joinedLine;
             for (let i = 0; i < result.length; i++) {
                 const other = result[i];
-                joinedLine = current.joinLine(other, distanceTolerance, parallelTolerance);
+                joinedLine = current.line.joinLine(other.line, distanceTolerance, parallelTolerance);
                 if (joinedLine) {
                     result.splice(i, 1);
-                    toProcess.push(joinedLine);
+                    toProcess.push({ line: joinedLine, index: current.index });
                     break;
                 }
             }
             if (!joinedLine) {
-                result.push(current.clone());
+                result.push(current);
             }
         }
-        return result;
+        // Sort the result based on the original indices
+        result.sort((a, b) => a.index - b.index);
+        return result.map(item => item.line);
     }
     /**
      * Returns true if this line section completely overlaps the @other line section.

package/esm/Polygon.js

@@ -149,8 +149,17 @@ export class Polygon {
             console.error("The contour should be closed");
             return this;
         }
-        for (let i = 0; i < this.contour.length - 1; i++) {
-            this.translateContourLine(i, offset);
+        const lines = Line2D
+            .fromPolygon(this.contour)
+            .map(line => line.translateLeft(offset));
+        for (let i = 0; i < lines.length; i++) {
+            const line = lines[i];
+            const next = lines[(i + 1) % lines.length];
+            line.extendToOrTrimAtIntersection(next);
+            next.extendToOrTrimAtIntersection(line);
+        }
+        for (let i = 0; i < this.contour.length; i++) {
+            this.contour[i].copy(lines[i % lines.length].start);
         }
         return this;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@immugio/three-math-extensions",
-  "version": "0.2.36",
+  "version": "0.2.38",
   "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

@@ -167,8 +167,8 @@ export class Line3D extends Line3 {
             return lines.map(x => x.clone());
         }
 
-        const toProcess = lines.slice();
-        const result: Line3D[] = [];
+        const toProcess = lines.map((line, index) => ({ line: line.clone(), index }));
+        const result: { line: Line3D, index: number }[] = [];
 
         while (toProcess.length > 0) {
             const current = toProcess.pop();
@@ -176,20 +176,23 @@ export class Line3D extends Line3 {
 
             for (let i = 0; i < result.length; i++) {
                 const other = result[i];
-                joinedLine = current.joinLine(other, distanceTolerance, parallelTolerance);
+                joinedLine = current.line.joinLine(other.line, distanceTolerance, parallelTolerance);
                 if (joinedLine) {
                     result.splice(i, 1);
-                    toProcess.push(joinedLine);
+                    toProcess.push({ line: joinedLine, index: current.index });
                     break;
                 }
             }
 
             if (!joinedLine) {
-                result.push(current.clone());
+                result.push(current);
             }
         }
 
-        return result;
+        // Sort the result based on the original indices
+        result.sort((a, b) => a.index - b.index);
+
+        return result.map(item => item.line);
     }
 
     /**

package/src/Polygon.ts

@@ -180,9 +180,21 @@ export class Polygon {
             return this;
         }
 
-        for (let i = 0; i < this.contour.length - 1; i++) {
-            this.translateContourLine(i, offset);
+        const lines = Line2D
+            .fromPolygon(this.contour)
+            .map(line => line.translateLeft(offset));
+
+        for (let i = 0; i < lines.length; i++) {
+            const line = lines[i];
+            const next = lines[(i + 1) % lines.length];
+            line.extendToOrTrimAtIntersection(next);
+            next.extendToOrTrimAtIntersection(line);
         }
+
+        for (let i = 0; i < this.contour.length; i++) {
+            this.contour[i].copy(lines[i % lines.length].start);
+        }
+
         return this;
     }