Merge pull request #163 from alexbol99/159-cut-polygon-with-multiline

Cut polygon with multiline
alexbol99 · Mar 29, 2024 · 565ae09 · 565ae09
2 parents b89e303 + 4f967d4
commit 565ae09
Show file tree

Hide file tree

Showing 67 changed files with 1,387 additions and 1,200 deletions.
diff --git a/dist/main.cjs b/dist/main.cjs
diff --git a/dist/main.mjs b/dist/main.mjs
diff --git a/dist/main.umd.js b/dist/main.umd.js
diff --git a/docs/Arc.html b/docs/Arc.html
diff --git a/docs/Box.html b/docs/Box.html
diff --git a/docs/Circle.html b/docs/Circle.html
diff --git a/docs/CircularLinkedList.html b/docs/CircularLinkedList.html
diff --git a/docs/DE9IM.html b/docs/DE9IM.html
diff --git a/docs/Edge.html b/docs/Edge.html
diff --git a/docs/Errors.html b/docs/Errors.html
diff --git a/docs/Face.html b/docs/Face.html
diff --git a/docs/Inversion.html b/docs/Inversion.html
diff --git a/docs/Line.html b/docs/Line.html
diff --git a/docs/LinkedList.html b/docs/LinkedList.html
diff --git a/docs/Matrix.html b/docs/Matrix.html
diff --git a/docs/Multiline.html b/docs/Multiline.html
diff --git a/docs/PlanarSet.html b/docs/PlanarSet.html
diff --git a/docs/Point.html b/docs/Point.html
diff --git a/docs/Polygon.html b/docs/Polygon.html
diff --git a/docs/Ray.html b/docs/Ray.html
diff --git a/docs/Segment.html b/docs/Segment.html
diff --git a/docs/Shape.html b/docs/Shape.html
diff --git a/docs/Vector.html b/docs/Vector.html
diff --git a/docs/algorithms_boolean_op.js.html b/docs/algorithms_boolean_op.js.html
diff --git a/docs/algorithms_distance.js.html b/docs/algorithms_distance.js.html
diff --git a/docs/algorithms_ray_shooting.js.html b/docs/algorithms_ray_shooting.js.html
diff --git a/docs/algorithms_relation.js.html b/docs/algorithms_relation.js.html
diff --git a/docs/classes_arc.js.html b/docs/classes_arc.js.html
diff --git a/docs/classes_box.js.html b/docs/classes_box.js.html
diff --git a/docs/classes_circle.js.html b/docs/classes_circle.js.html
diff --git a/docs/classes_edge.js.html b/docs/classes_edge.js.html
diff --git a/docs/classes_face.js.html b/docs/classes_face.js.html
diff --git a/docs/classes_inversion.js.html b/docs/classes_inversion.js.html
diff --git a/docs/classes_line.js.html b/docs/classes_line.js.html
diff --git a/docs/classes_matrix.js.html b/docs/classes_matrix.js.html
diff --git a/docs/classes_multiline.js.html b/docs/classes_multiline.js.html
diff --git a/docs/classes_point.js.html b/docs/classes_point.js.html
diff --git a/docs/classes_polygon.js.html b/docs/classes_polygon.js.html
diff --git a/docs/classes_ray.js.html b/docs/classes_ray.js.html
diff --git a/docs/classes_segment.js.html b/docs/classes_segment.js.html
diff --git a/docs/classes_shape.js.html b/docs/classes_shape.js.html
diff --git a/docs/classes_vector.js.html b/docs/classes_vector.js.html
diff --git a/docs/data_structures_circular_linked_list.js.html b/docs/data_structures_circular_linked_list.js.html
diff --git a/docs/data_structures_de9im.js.html b/docs/data_structures_de9im.js.html
diff --git a/docs/data_structures_linked_list.js.html b/docs/data_structures_linked_list.js.html
diff --git a/docs/data_structures_planar_set.js.html b/docs/data_structures_planar_set.js.html
diff --git a/docs/global.html b/docs/global.html
diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/module-BooleanOperations.html b/docs/module-BooleanOperations.html
diff --git a/docs/module-RayShoot.html b/docs/module-RayShoot.html
diff --git a/docs/module-Relation.html b/docs/module-Relation.html
diff --git a/docs/utils_constants.js.html b/docs/utils_constants.js.html
diff --git a/docs/utils_errors.js.html b/docs/utils_errors.js.html
diff --git a/docs/utils_utils.js.html b/docs/utils_utils.js.html
diff --git a/index.d.ts b/index.d.ts
@@ -461,10 +461,12 @@ declare namespace Flatten {
         readonly end: Point;
         readonly length: number;
         readonly box: Box;
+        readonly isSegment: boolean;
+        readonly isArc: boolean;
+        readonly isLine: boolean;
+        readonly isRay: boolean
 
         // public methods
-        isSegment() : boolean;
-        isArc() : boolean;
         contains(pt: Point): boolean;
         middle(): Point;
         pointAtLength(length: number): Point|null;
@@ -536,7 +538,6 @@ declare namespace Flatten {
         addVertex(pt: Point, edge: PolygonEdge): PolygonEdge;
         removeEndVertex(edge: Edge): void;
         cut(multiline: Multiline): Polygon[];
-        cutFace(pt1: Point, pt2: Point): [Polygon, Polygon];
         cutWithLine(line: Line): Polygon;
         findEdgeByPoint(pt: Point): PolygonEdge;
         splitToIslands() : Polygon[];

diff --git a/index.js b/index.js
@@ -34,6 +34,6 @@ export {SmartIntersections};
 Flatten.BooleanOperations = BooleanOperations;
 Flatten.Relations = Relations;
 
-export {CCW, CW, ORIENTATION, INSIDE, OUTSIDE, BOUNDARY} from './src/utils/constants';
+export {CCW, CW, ORIENTATION, INSIDE, OUTSIDE, BOUNDARY, OVERLAP_SAME, OVERLAP_OPPOSITE} from './src/utils/constants';
 
 export default Flatten;
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@flatten-js/core",
-  "version": "1.4.8",
+  "version": "1.5.0",
   "description": "Javascript library for 2d geometry",
   "main": "dist/main.cjs",
   "umd:main": "dist/main.umd.js",

diff --git a/src/algorithms/intersection.js b/src/algorithms/intersection.js
@@ -424,19 +424,23 @@ export function intersectArc2Box(arc, box) {
 }
 
 export function intersectEdge2Segment(edge, segment) {
-    return edge.isSegment() ? intersectSegment2Segment(edge.shape, segment) : intersectSegment2Arc(segment, edge.shape);
+    return edge.isSegment ? intersectSegment2Segment(edge.shape, segment) : intersectSegment2Arc(segment, edge.shape);
 }
 
 export function intersectEdge2Arc(edge, arc) {
-    return edge.isSegment() ? intersectSegment2Arc(edge.shape, arc) : intersectArc2Arc(edge.shape, arc);
+    return edge.isSegment ? intersectSegment2Arc(edge.shape, arc) : intersectArc2Arc(edge.shape, arc);
 }
 
 export function intersectEdge2Line(edge, line) {
-    return edge.isSegment() ? intersectSegment2Line(edge.shape, line) : intersectLine2Arc(line, edge.shape);
+    return edge.isSegment ? intersectSegment2Line(edge.shape, line) : intersectLine2Arc(line, edge.shape);
+}
+
+export function intersectEdge2Ray(edge, ray) {
+    return edge.isSegment ? intersectRay2Segment(ray, edge.shape) : intersectRay2Arc(ray, edge.shape);
 }
 
 export function intersectEdge2Circle(edge, circle) {
-    return edge.isSegment() ? intersectSegment2Circle(edge.shape, circle) : intersectArc2Circle(edge.shape, circle);
+    return edge.isSegment ? intersectSegment2Circle(edge.shape, circle) : intersectArc2Circle(edge.shape, circle);
 }
 
 export function intersectSegment2Polygon(segment, polygon) {
@@ -498,11 +502,19 @@ export function intersectCircle2Polygon(circle, polygon) {
 }
 
 export function intersectEdge2Edge(edge1, edge2) {
-    const shape1 = edge1.shape;
-    const shape2 = edge2.shape;
-    return edge1.isSegment() ?
-        (edge2.isSegment() ? intersectSegment2Segment(shape1, shape2) : intersectSegment2Arc(shape1, shape2)) :
-        (edge2.isSegment() ? intersectSegment2Arc(shape2, shape1) : intersectArc2Arc(shape1, shape2));
+    if (edge1.isSegment) {
+        return intersectEdge2Segment(edge2, edge1.shape)
+    }
+    else if (edge1.isArc) {
+        return intersectEdge2Arc(edge2, edge1.shape)
+    }
+    else if (edge1.isLine) {
+        return intersectEdge2Line(edge2, edge1.shape)
+    }
+    else if (edge1.isRay) {
+        return intersectEdge2Ray(edge2, edge1.shape)
+    }
+    return []
 }
 
 export function intersectEdge2Polygon(edge, polygon) {
@@ -515,8 +527,17 @@ export function intersectEdge2Polygon(edge, polygon) {
     let resp_edges = polygon.edges.search(edge.shape.box);
 
     for (let resp_edge of resp_edges) {
-        for (let pt of intersectEdge2Edge(edge, resp_edge)) {
-            ip.push(pt);
+        if (resp_edge.isSegment) {
+            ip = [...ip, ...intersectSegment2Polygon(resp_edge, polygon)]
+        }
+        else if (resp_edge.isArc) {
+            ip = [...ip, ...intersectArc2Polygon(resp_edge, polygon)]
+        }
+        else if (resp_edge.isLine) {
+            ip = [...ip, ...intersectLine2Polygon(resp_edge, polygon)]
+        }
+        else if (resp_edge.isRay) {
+            ip = [...ip, ...intersectRay2Polygon(resp_edge, polygon)]
         }
     }
 

diff --git a/src/algorithms/relation.js b/src/algorithms/relation.js
@@ -203,7 +203,7 @@ function relateLine2Circle(line,circle) {
         denim.I2B = ip_sorted;
         denim.I2E = [splitShapes[0], splitShapes[2]];
 
-        denim.E2I = new Flatten.Polygon([circle.toArc()]).cut(multiline);
+        denim.E2I = new Flatten.Polygon([circle.toArc()]).cutWithLine(line);
     }
 
     return denim;
@@ -245,7 +245,7 @@ function relateLine2Box(line, box) {
             denim.I2B = ip_sorted;
             denim.I2E = [splitShapes[0], splitShapes[2]];
 
-            denim.E2I = new Flatten.Polygon(box.toSegments()).cut(multiline);
+            denim.E2I = new Flatten.Polygon(box.toSegments()).cutWithLine(line);
         }
     }
     return denim;
@@ -265,7 +265,7 @@ function relateLine2Polygon(line, polygon) {
     denim.I2B = [...multiline].slice(1).map( (edge) => edge.bv === Flatten.BOUNDARY ? edge.shape : edge.shape.start );
     denim.I2E = [...multiline].filter(edge => edge.bv === Flatten.OUTSIDE).map(edge => edge.shape);
 
-    denim.E2I = polygon.cut(multiline);
+    denim.E2I = polygon.cutWithLine(line);
 
     return denim;
 }

diff --git a/src/classes/edge.js b/src/classes/edge.js
@@ -93,14 +93,22 @@ export class Edge {
         return this.shape.box;
     }
 
-    isSegment() {
+    get isSegment() {
         return this.shape instanceof Flatten.Segment;
     }
 
-    isArc() {
+    get isArc() {
         return this.shape instanceof Flatten.Arc;
     }
 
+    get isLine() {
+        return this.shape instanceof Flatten.Line;
+    }
+
+    get isRay() {
+        return this.shape instanceof Flatten.Ray
+    }
+
     /**
      * Get middle point of the edge
      * @returns {Point}

diff --git a/src/classes/line.js b/src/classes/line.js
@@ -283,7 +283,7 @@ export class Line extends Shape {
      */
     split(pt) {
         if (pt instanceof Flatten.Point) {
-            return [new Flatten.Ray(pt, this.norm.invert()), new Flatten.Ray(pt, this.norm)]
+            return [new Flatten.Ray(pt, this.norm), new Flatten.Ray(pt, this.norm)]
         }
         else {
             let multiline = new Flatten.Multiline([this]);

diff --git a/src/classes/multiline.js b/src/classes/multiline.js
@@ -2,7 +2,6 @@
 
 import Flatten from '../flatten';
 import LinkedList from '../data_structures/linked_list';
-import {END_VERTEX, NOT_VERTEX, START_VERTEX} from "../utils/constants";
 import {convertToString} from "../utils/attributes";
 
 /**
@@ -17,10 +16,10 @@ export class Multiline extends LinkedList {
             return;
         }
 
-        if (args.length == 1) {
+        if (args.length === 1) {
             if (args[0] instanceof Array) {
                 let shapes = args[0];
-                if (shapes.length == 0)
+                if (shapes.length === 0)
                     return;
 
                 // TODO: more strict validation:
@@ -37,6 +36,8 @@ export class Multiline extends LinkedList {
                     let edge = new Flatten.Edge(shape);
                     this.append(edge);
                 }
+
+                this.setArcLength()
             }
         }
     }
@@ -54,7 +55,7 @@ export class Multiline extends LinkedList {
      * @returns {Box}
      */
     get box() {
-        return this.edges.reduce( (acc,edge) => acc = acc.merge(edge.box), new Flatten.Box() );
+        return this.edges.reduce( (acc,edge) => acc.merge(edge.box), new Flatten.Box() );
     }
 
     /**
@@ -75,6 +76,24 @@ export class Multiline extends LinkedList {
         return new Multiline(this.toShapes());
     }
 
+    /**
+     * Set arc_length property for each of the edges in the face.
+     * Arc_length of the edge it the arc length from the first edge of the face
+     */
+    setArcLength() {
+        for (let edge of this) {
+            this.setOneEdgeArcLength(edge);
+        }
+    }
+
+    setOneEdgeArcLength(edge) {
+        if (edge === this.first) {
+            edge.arc_length = 0.0;
+        } else {
+            edge.arc_length = edge.prev.arc_length + edge.prev.length;
+        }
+    }
+
     /**
      * Split edge and add new vertex, return new edge inserted
      * @param {Point} pt - point on edge that will be added as new vertex
@@ -103,6 +122,14 @@ export class Multiline extends LinkedList {
         return newEdge;
     }
 
+    getChain(edgeFrom, edgeTo) {
+        let edges = []
+        for (let edge = edgeFrom; edge !== edgeTo.next; edge = edge.next) {
+            edges.push(edge)
+        }
+        return edges
+    }
+
     /**
      * Split edges of multiline with intersection points and return mutated multiline
      * @param {Point[]} ip - array of points to be added as new vertices