@jscad/modeling 2.7.2 → 2.9.1

package/src/operations/booleans/scission.test.js

@@ -20,9 +20,9 @@ test('scission: scission of one or more geom3 objects produces expected geometry
   t.is(result2.length, 3)
   t.is(result2[0].length, 0)
   t.is(result2[1].length, 1)
-  t.true(geom3.isA(result2[1][0]))
+  t.notThrows(() => geom3.validate(result2[1][0]))
   t.is(result2[2].length, 1)
-  t.true(geom3.isA(result2[2][0]))
+  t.notThrows(() => geom3.validate(result2[2][0]))
 })
 
 test('scission: scission of complex geom3 produces expected geometry', (t) => {
@@ -40,8 +40,8 @@ test('scission: scission of complex geom3 produces expected geometry', (t) => {
 
   const result1 = scission(geometry3)
   t.is(result1.length, 2)
-  t.true(geom3.isA(result1[0]))
-  t.true(geom3.isA(result1[1]))
+  t.notThrows.skip(() => geom3.validate(result1[0]))
+  t.notThrows.skip(() => geom3.validate(result1[1]))
 
   const rc1 = geom3.toPolygons(result1[0]).length
   const rc2 = geom3.toPolygons(result1[1]).length

package/src/operations/booleans/subtract.js

@@ -17,7 +17,7 @@ const subtractGeom3 = require('./subtractGeom3')
  * @alias module:modeling/booleans.subtract
  *
  * @example
- * let myshape = subtract(cubiod({size: [5,5,5]}), cubiod({size: [5,5,5], center: [5,5,5]}))
+ * let myshape = subtract(cuboid({size: [5,5,5]}), cuboid({size: [5,5,5], center: [5,5,5]}))
  *
  * @example
  * +-------+            +-------+

package/src/operations/booleans/subtract.test.js

@@ -36,6 +36,7 @@ test('subtract: subtract of one or more geom2 objects produces expected geometry
     [0, -2],
     [1.4142000000000001, -1.4142000000000001]
   ]
+  t.notThrows(() => geom2.validate(result1))
   t.is(obs.length, 8)
   t.true(comparePoints(obs, exp))
 
@@ -54,6 +55,7 @@ test('subtract: subtract of one or more geom2 objects produces expected geometry
     [0, -2],
     [1.4142000000000001, -1.4142000000000001]
   ]
+  t.notThrows(() => geom2.validate(result2))
   t.is(obs.length, 8)
   t.true(comparePoints(obs, exp))
 
@@ -65,6 +67,7 @@ test('subtract: subtract of one or more geom2 objects produces expected geometry
   exp = [
     [12, 12], [9, 9], [8, 9], [8, 12], [9, 8], [12, 8]
   ]
+  t.notThrows(() => geom2.validate(result3))
   t.is(obs.length, 6)
   t.true(comparePoints(obs, exp))
 
@@ -73,6 +76,7 @@ test('subtract: subtract of one or more geom2 objects produces expected geometry
   obs = geom2.toPoints(result4)
   exp = [
   ]
+  t.notThrows(() => geom2.validate(result4))
   t.is(obs.length, 0)
   t.deepEqual(obs, exp)
 })
@@ -133,6 +137,7 @@ test('subtract: subtract of one or more geom3 objects produces expected geometry
     [[0.9999999999999998, 1.0000000000000002, -1.414213562373095], [1.4142135623730951, 3.4638242249419736e-16, -1.414213562373095], [8.65956056235493e-17, 8.659560562354935e-17, -2]],
     [[8.65956056235493e-17, 8.659560562354935e-17, 2], [1.4142135623730951, 3.4638242249419736e-16, 1.414213562373095], [0.9999999999999998, 1.0000000000000002, 1.414213562373095]]
   ]
+  t.notThrows.skip(() => geom3.validate(result1))
   t.is(obs.length, 32)
   t.true(comparePolygonsAsPoints(obs, exp))
 
@@ -141,6 +146,7 @@ test('subtract: subtract of one or more geom3 objects produces expected geometry
 
   const result2 = subtract(geometry1, geometry2)
   obs = geom3.toPoints(result2)
+  t.notThrows.skip(() => geom3.validate(result2))
   t.is(obs.length, 32)
 
   // subtract of two partially overlapping objects
@@ -162,11 +168,13 @@ test('subtract: subtract of one or more geom3 objects produces expected geometry
     [[12, 12, 8], [12, 9, 8], [8, 9, 8], [8, 12, 8]],
     [[12, 9, 8], [12, 8, 8], [9, 8, 8], [9, 9, 8]]
   ]
+  t.notThrows.skip(() => geom3.validate(result3))
   t.is(obs.length, 12)
   t.true(comparePolygonsAsPoints(obs, exp))
 
   // subtract of two completely overlapping objects
   const result4 = subtract(geometry1, geometry3)
   obs = geom3.toPoints(result4)
+  t.notThrows(() => geom3.validate(result4))
   t.is(obs.length, 0)
 })

package/src/operations/booleans/trees/Node.js

@@ -42,28 +42,32 @@ class Node {
       node = current.node
       polygontreenodes = current.polygontreenodes
 
-      // begin "function"
       if (node.plane) {
+        const plane = node.plane
+
         const backnodes = []
         const frontnodes = []
         const coplanarfrontnodes = alsoRemovecoplanarFront ? backnodes : frontnodes
-        const plane = node.plane
         const numpolygontreenodes = polygontreenodes.length
         for (let i = 0; i < numpolygontreenodes; i++) {
-          const node1 = polygontreenodes[i]
-          if (!node1.isRemoved()) {
-            node1.splitByPlane(plane, coplanarfrontnodes, backnodes, frontnodes, backnodes)
+          const treenode = polygontreenodes[i]
+          if (!treenode.isRemoved()) {
+            // split this polygon tree node using the plane
+            // NOTE: children are added to the tree if there are spanning polygons
+            treenode.splitByPlane(plane, coplanarfrontnodes, backnodes, frontnodes, backnodes)
           }
         }
 
         if (node.front && (frontnodes.length > 0)) {
+          // add front node for further splitting
           stack.push({ node: node.front, polygontreenodes: frontnodes })
         }
         const numbacknodes = backnodes.length
         if (node.back && (numbacknodes > 0)) {
+          // add back node for further splitting
           stack.push({ node: node.back, polygontreenodes: backnodes })
         } else {
-          // there's nothing behind this plane. Delete the nodes behind this plane:
+          // remove all back nodes from processing
           for (let i = 0; i < numbacknodes; i++) {
             backnodes[i].remove()
           }
@@ -135,16 +139,6 @@ class Node {
       current = stack.pop()
     } while (current !== undefined)
   }
-
-  // TODO is this still used?
-  getParentPlaneNormals (normals, maxdepth) {
-    if (maxdepth > 0) {
-      if (this.parent) {
-        normals.push(this.parent.plane.normal)
-        this.parent.getParentPlaneNormals(normals, maxdepth - 1)
-      }
-    }
-  }
 }
 
 module.exports = Node

package/src/operations/booleans/trees/PolygonTreeNode.js

@@ -21,11 +21,11 @@ const splitPolygonByPlane = require('./splitPolygonByPlane')
 // since they are no longer intact.
 class PolygonTreeNode {
   // constructor creates the root node
-  constructor () {
-    this.parent = null
+  constructor (parent, polygon) {
+    this.parent = parent
     this.children = []
-    this.polygon = null
-    this.removed = false
+    this.polygon = polygon
+    this.removed = false  // state of branch or leaf
   }
 
   // fill the tree with polygons. Should be called on the root node only; child nodes must
@@ -47,6 +47,7 @@ class PolygonTreeNode {
   remove () {
     if (!this.removed) {
       this.removed = true
+      this.polygon = null
 
       // remove ourselves from the parent's children list:
       const parentschildren = this.parent.children
@@ -183,9 +184,7 @@ class PolygonTreeNode {
   // a child should be created for every fragment of the split polygon
   // returns the newly created child
   addChild (polygon) {
-    const newchild = new PolygonTreeNode()
-    newchild.parent = this
-    newchild.polygon = polygon
+    const newchild = new PolygonTreeNode(this, polygon)
     this.children.push(newchild)
     return newchild
   }
@@ -206,13 +205,13 @@ class PolygonTreeNode {
     }
   }
 
+  // private method
+  // remove the polygon from the node, and all parent nodes above it
+  // called to invalidate parents of removed nodes
   recursivelyInvalidatePolygon () {
-    let node = this
-    while (node.polygon) {
-      node.polygon = null
-      if (node.parent) {
-        node = node.parent
-      }
+    this.polygon = null
+    if (this.parent) {
+      this.parent.recursivelyInvalidatePolygon()
     }
   }
 
@@ -248,7 +247,7 @@ class PolygonTreeNode {
         node = children[j]
         result += `${prefix}PolygonTreeNode (${node.isRootNode()}): ${node.children.length}`
         if (node.polygon) {
-          result += `\n ${prefix}poly3\n`
+          result += `\n ${prefix}polygon: ${node.polygon.vertices}\n`
         } else {
           result += '\n'
         }

package/src/operations/booleans/trees/Tree.js

@@ -19,8 +19,7 @@ class Tree {
 
   // Remove all polygons in this BSP tree that are inside the other BSP tree
   // `tree`.
-  clipTo (tree, alsoRemovecoplanarFront) {
-    alsoRemovecoplanarFront = !!alsoRemovecoplanarFront
+  clipTo (tree, alsoRemovecoplanarFront = false) {
     this.rootnode.clipTo(tree, alsoRemovecoplanarFront)
   }
 

package/src/operations/booleans/trees/splitPolygonByPlane.js

@@ -36,7 +36,7 @@ const splitPolygonByPlane = (splane, polygon) => {
     const MINEPS = -EPS
     for (let i = 0; i < numvertices; i++) {
       const t = vec3.dot(splane, vertices[i]) - splane[3]
-      const isback = (t < 0)
+      const isback = (t < MINEPS)
       vertexIsBack.push(isback)
       if (t > EPS) hasfront = true
       if (t < MINEPS) hasback = true
@@ -69,9 +69,8 @@ const splitPolygonByPlane = (splane, polygon) => {
           }
         } else {
           // line segment intersects plane:
-          const point = vertex
           const nextpoint = vertices[nextvertexindex]
-          const intersectionpoint = splitLineSegmentByPlane(splane, point, nextpoint)
+          const intersectionpoint = splitLineSegmentByPlane(splane, vertex, nextpoint)
           if (isback) {
             backvertices.push(vertex)
             backvertices.push(intersectionpoint)

package/src/operations/booleans/union.test.js

@@ -9,6 +9,7 @@ const { circle, rectangle, sphere, cuboid } = require('../../primitives')
 const { union } = require('./index')
 
 const { center } = require('../transforms/center')
+const { translate } = require('../transforms/translate')
 
 // test('union: union of a path produces expected changes to points', (t) => {
 //   let geometry = path.fromPoints({}, [[0, 1, 0], [1, 0, 0]])
@@ -36,6 +37,7 @@ test('union of one or more geom2 objects produces expected geometry', (t) => {
     [0, -2],
     [1.4142000000000001, -1.4142000000000001]
   ]
+  t.notThrows(() => geom2.validate(result1))
   t.true(comparePoints(obs, exp))
 
   // union of two non-overlapping objects
@@ -57,6 +59,7 @@ test('union of one or more geom2 objects produces expected geometry', (t) => {
     [12, 12],
     [1.4142000000000001, -1.4142000000000001]
   ]
+  t.notThrows(() => geom2.validate(result2))
   t.true(comparePoints(obs, exp))
 
   // union of two partially overlapping objects
@@ -74,6 +77,7 @@ test('union of one or more geom2 objects produces expected geometry', (t) => {
     [7.999933333333333, 9.000053333333334],
     [11.999973333333333, 7.999933333333333]
   ]
+  t.notThrows(() => geom2.validate(result3))
   t.true(comparePoints(obs, exp))
 
   // union of two completely overlapping objects
@@ -85,7 +89,24 @@ test('union of one or more geom2 objects produces expected geometry', (t) => {
     [9.000046666666666, 9.000046666666666],
     [-9.000046666666666, 9.000046666666666]
   ]
+  t.notThrows(() => geom2.validate(result4))
   t.true(comparePoints(obs, exp))
+
+  // union of unions of non-overlapping objects (BSP gap from #907)
+  const circ = circle({ radius: 1, segments: 32 })
+  const result5 = union(
+    union(
+      translate([17, 21], circ),
+      translate([7, 0], circ),
+    ),
+    union(
+      translate([3, 21], circ),
+      translate([17, 21], circ),
+    )
+  )
+  obs = geom2.toPoints(result5)
+  t.notThrows.skip(() => geom2.validate(result5))
+  t.is(obs.length, 112)
 })
 
 test('union of one or more geom3 objects produces expected geometry', (t) => {
@@ -144,6 +165,7 @@ test('union of one or more geom3 objects produces expected geometry', (t) => {
     [[0.9999999999999998, 1.0000000000000002, -1.414213562373095], [1.4142135623730951, 3.4638242249419736e-16, -1.414213562373095], [8.65956056235493e-17, 8.659560562354935e-17, -2]],
     [[8.65956056235493e-17, 8.659560562354935e-17, 2], [1.4142135623730951, 3.4638242249419736e-16, 1.414213562373095], [0.9999999999999998, 1.0000000000000002, 1.414213562373095]]
   ]
+  t.notThrows.skip(() => geom3.validate(result1))
   t.true(comparePolygonsAsPoints(obs, exp))
 
   // union of two non-overlapping objects
@@ -151,6 +173,7 @@ test('union of one or more geom3 objects produces expected geometry', (t) => {
 
   const result2 = union(geometry1, geometry2)
   obs = geom3.toPoints(result2)
+  t.notThrows.skip(() => geom3.validate(result2))
   t.is(obs.length, 38)
 
   // union of two partially overlapping objects
@@ -178,6 +201,7 @@ test('union of one or more geom3 objects produces expected geometry', (t) => {
     [[-9, 9, 9], [-9, 8, 9], [8, 8, 9], [8, 9, 9]],
     [[-9, 8, 9], [-9, -9, 9], [9, -9, 9], [9, 8, 9]]
   ]
+  t.notThrows.skip(() => geom3.validate(result3))
   t.is(obs.length, 18)
   t.true(comparePolygonsAsPoints(obs, exp))
 
@@ -192,16 +216,18 @@ test('union of one or more geom3 objects produces expected geometry', (t) => {
     [[-9, -9, -9], [-9, 9, -9], [9, 9, -9], [9, -9, -9]],
     [[-9, -9, 9], [9, -9, 9], [9, 9, 9], [-9, 9, 9]]
   ]
+  t.notThrows(() => geom3.validate(result4))
   t.is(obs.length, 6)
   t.true(comparePolygonsAsPoints(obs, exp))
 })
 
 test('union of geom3 with rounding issues #137', (t) => {
   const geometry1 = center({ relativeTo: [0, 0, -1] }, cuboid({ size: [44, 26, 5] }))
-  const geometry2 = center({ relativeTo: [0, 0, -4.400001] }, cuboid({ size: [44, 26, 1.8] })) // introduce percision error
+  const geometry2 = center({ relativeTo: [0, 0, -4.400001] }, cuboid({ size: [44, 26, 1.8] })) // introduce precision error
 
   const obs = union(geometry1, geometry2)
   const pts = geom3.toPoints(obs)
+  t.notThrows(() => geom3.validate(obs))
   t.is(pts.length, 6) // number of polygons in union
 })
 
@@ -266,6 +292,7 @@ test('union of geom2 with closing issues #15', (t) => {
     [-49.34040695243976, -15.797284338334542],
     [-45.82121705016925, -16.857333163105647]
   ]
+  t.notThrows(() => geom2.validate(obs))
   t.is(pts.length, 20) // number of sides in union
   t.true(comparePoints(pts, exp))
 })

package/src/operations/booleans/unionGeom3Sub.js

@@ -7,7 +7,7 @@ const { Tree } = require('./trees')
  * Return a new 3D geometry representing the space in the given geometries.
  * @param {geom3} geometry1 - geometry to union
  * @param {geom3} geometry2 - geometry to union
- * @returns {goem3} new 3D geometry
+ * @returns {geom3} new 3D geometry
  */
 const unionSub = (geometry1, geometry2) => {
   if (!mayOverlap(geometry1, geometry2)) {

package/src/operations/expansions/expand.js

@@ -10,14 +10,14 @@ const expandPath2 = require('./expandPath2')
 
 /**
  * Expand the given geometry using the given options.
- * Both interal and external space is expanded for 2D and 3D shapes.
+ * Both internal and external space is expanded for 2D and 3D shapes.
  *
  * Note: Contract is expand using a negative delta.
  * @param {Object} options - options for expand
  * @param {Number} [options.delta=1] - delta (+/-) of expansion
  * @param {String} [options.corners='edge'] - type of corner to create after expanding; edge, chamfer, round
  * @param {Integer} [options.segments=16] - number of segments when creating round corners
- * @param {...Objects} geometry - the list of geometry to expand
+ * @param {...Objects} objects - the geometries to expand
  * @return {Object|Array} new geometry, or list of new geometries
  * @alias module:modeling/expansions.expand
  *

package/src/operations/expansions/expand.test.js

@@ -14,6 +14,7 @@ test('expand: edge-expanding a straight line produces rectangle', (t) => {
   const expandedPathGeom2 = expand({ delta: 2, corners: 'edge', segments: 8 }, linePath2)
   const expandedPoints = geom2.toPoints(expandedPathGeom2)
 
+  t.notThrows(() => geom2.validate(expandedPathGeom2))
   t.is(area(expandedPoints), 40)
   t.true(comparePoints(measureBoundingBox(expandedPathGeom2), [[-2, 0, 0], [2, 10, 0]]))
 })
@@ -24,6 +25,7 @@ test('expand: edge-expanding a bent line produces expected geometry', (t) => {
   const expandedPathGeom2 = expand({ delta: 2, corners: 'edge', segments: 8 }, linePath2)
   const expandedPoints = geom2.toPoints(expandedPathGeom2)
 
+  t.notThrows(() => geom2.validate(expandedPathGeom2))
   t.is(area(expandedPoints), 60)
   const boundingBox = measureBoundingBox(expandedPathGeom2)
   t.true(comparePoints(boundingBox, [[-5, 0, 0], [2, 12, 0]]), 'Unexpected bounding box: ' + JSON.stringify(boundingBox))
@@ -35,6 +37,7 @@ test('expand: edge-expanding a bent line, reversed points, produces expected geo
   const expandedPathGeom2 = expand({ delta: 2, corners: 'edge', segments: 8 }, linePath2)
   const expandedPoints = geom2.toPoints(expandedPathGeom2)
 
+  t.notThrows(() => geom2.validate(expandedPathGeom2))
   t.is(area(expandedPoints), 60)
   const boundingBox = measureBoundingBox(expandedPathGeom2)
   t.true(comparePoints(boundingBox, [[-5, 0, 0], [2, 12, 0]]), 'Unexpected bounding box: ' + JSON.stringify(boundingBox))
@@ -47,6 +50,7 @@ test('expand: round-expanding a bent line produces expected geometry', (t) => {
   const expandedPathGeom2 = expand({ delta, corners: 'round', segments: 128 }, linePath2)
   const expandedPoints = geom2.toPoints(expandedPathGeom2)
 
+  t.notThrows(() => geom2.validate(expandedPathGeom2))
   const expectedArea = 56 + 2 * Math.PI * delta * 1.25 // shape will have 1 and 1/4 circles
   nearlyEqual(t, area(expandedPoints), expectedArea, 0.01, 'Measured area should be pretty close')
   const boundingBox = measureBoundingBox(expandedPathGeom2)
@@ -60,6 +64,7 @@ test('expand: chamfer-expanding a bent line produces expected geometry', (t) =>
   const expandedPathGeom2 = expand({ delta, corners: 'chamfer', segments: 8 }, linePath2)
   const expandedPoints = geom2.toPoints(expandedPathGeom2)
 
+  t.notThrows(() => geom2.validate(expandedPathGeom2))
   t.is(area(expandedPoints), 58)
   const boundingBox = measureBoundingBox(expandedPathGeom2)
   t.true(comparePoints(boundingBox, [[-5, 0, 0], [2, 12, 0]]), 'Unexpected bounding box: ' + JSON.stringify(boundingBox))
@@ -84,6 +89,7 @@ test('expand: expanding of a geom2 produces expected changes to points', (t) =>
     [-10, 8],
     [-10, -8]
   ]
+  t.notThrows(() => geom2.validate(obs))
   t.is(pts.length, 12)
   t.true(comparePoints(pts, exp))
 })
@@ -113,6 +119,7 @@ test('expand: expanding of a geom3 produces expected changes to polygons', (t) =
     [16, -6.414213562373095, 16]
   ]
 
+  t.notThrows.skip(() => geom3.validate(obs))
   t.is(pts.length, 62)
   t.true(comparePoints(pts[0], exp0))
   t.true(comparePoints(pts[61], exp61))
@@ -120,90 +127,60 @@ test('expand: expanding of a geom3 produces expected changes to polygons', (t) =
   const geometry2 = sphere({ radius: 5, segments: 8 })
   const obs2 = expand({ delta: 5 }, geometry2)
   const pts2 = geom3.toPoints(obs2)
-  t.is(pts2.length, 2065)
+  t.notThrows.skip(() => geom3.validate(obs2))
+  t.is(pts2.length, 864)
 })
 
 test('expand (options): offsetting of a complex geom2 produces expected offset geom2', (t) => {
   const geometry = geom2.create([
-    [[-75.00000, 75.00000], [-75.00000, -75.00000]],
-    [[-75.00000, -75.00000], [75.00000, -75.00000]],
-    [[75.00000, -75.00000], [75.00000, 75.00000]],
-    [[-40.00000, 75.00000], [-75.00000, 75.00000]],
-    [[75.00000, 75.00000], [40.00000, 75.00000]],
-    [[40.00000, 75.00000], [40.00000, 0.00000]],
-    [[40.00000, 0.00000], [-40.00000, 0.00000]],
-    [[-40.00000, 0.00000], [-40.00000, 75.00000]],
-    [[15.00000, -10.00000], [15.00000, -40.00000]],
-    [[-15.00000, -10.00000], [15.00000, -10.00000]],
-    [[-15.00000, -40.00000], [-15.00000, -10.00000]],
-    [[-8.00000, -40.00000], [-15.00000, -40.00000]],
-    [[15.00000, -40.00000], [8.00000, -40.00000]],
-    [[-8.00000, -25.00000], [-8.00000, -40.00000]],
-    [[8.00000, -25.00000], [-8.00000, -25.00000]],
-    [[8.00000, -40.00000], [8.00000, -25.00000]],
-    [[-2.00000, -15.00000], [-2.00000, -19.00000]],
-    [[-2.00000, -19.00000], [2.00000, -19.00000]],
-    [[2.00000, -19.00000], [2.00000, -15.00000]],
-    [[2.00000, -15.00000], [-2.00000, -15.00000]]
+    [[-75, 75], [-75, -75]],
+    [[-75, -75], [75, -75]],
+    [[75, -75], [75, 75]],
+    [[-40, 75], [-75, 75]],
+    [[75, 75], [40, 75]],
+    [[40, 75], [40, 0]],
+    [[40, 0], [-40, 0]],
+    [[-40, 0], [-40, 75]],
+    [[15, -10], [15, -40]],
+    [[-15, -10], [15, -10]],
+    [[-15, -40], [-15, -10]],
+    [[-8, -40], [-15, -40]],
+    [[15, -40], [8, -40]],
+    [[-8, -25], [-8, -40]],
+    [[8, -25], [-8, -25]],
+    [[8, -40], [8, -25]],
+    [[-2, -15], [-2, -19]],
+    [[-2, -19], [2, -19]],
+    [[2, -19], [2, -15]],
+    [[2, -15], [-2, -15]]
   ])
 
   // expand +
   const obs = expand({ delta: 2, corners: 'edge' }, geometry)
   const pts = geom2.toPoints(obs)
   const exp = [
-    [-77, -77],
-    [-75, -77],
-    [75, -77],
     [77, -77],
-    [77, -75],
-    [77, 75],
     [77, 77],
-    [75, 77],
-    [40, 77],
     [38, 77],
-    [38, 75],
     [38, 2],
     [-38, 2],
-    [-38, 75],
     [-37.99999999999999, 77],
-    [-40, 77],
-    [-75, 77],
     [-77, 77],
-    [-77, 75],
-    [17, -40],
     [16.999999999999996, -42],
-    [15, -42],
-    [8, -42],
     [6, -42],
-    [6, -40],
     [6, -27],
     [-6, -27],
-    [-6, -40],
     [-6.000000000000001, -42],
-    [-8, -42],
-    [-15, -42],
     [-17, -42],
-    [-17, -40],
-    [-17, -10],
     [-16.999999999999996, -8],
-    [-15, -8],
-    [15, -8],
     [17, -8.000000000000004],
-    [17, -10],
-    [-4, -19],
     [-4, -21],
-    [-2, -21],
-    [1.9999999999999998, -21],
     [3.9999999999999996, -21],
-    [4, -19],
-    [4, -15],
     [4, -13],
-    [2, -13],
-    [-1.9999999999999998, -13],
     [-4, -13],
-    [-4, -15],
-    [-77, -75]
+    [-77, -77]
   ]
-  t.is(pts.length, 52)
+  t.notThrows(() => geom2.validate(obs))
+  t.is(pts.length, 20)
   t.true(comparePoints(pts, exp))
 })

package/src/operations/expansions/expandShell.js

@@ -15,37 +15,43 @@ const unionGeom3Sub = require('../booleans/unionGeom3Sub')
 
 const extrudePolygon = require('./extrudePolygon')
 
+/*
+ * Collect all planes adjacent to each vertex
+ */
 const mapPlaneToVertex = (map, vertex, plane) => {
-  const i = map.findIndex((item) => vec3.equals(item[0], vertex))
-  if (i < 0) {
+  const key = vertex.toString()
+  if (!map.has(key)) {
     const entry = [vertex, [plane]]
-    map.push(entry)
-    return map.length
+    map.set(key, entry)
+  } else {
+    const planes = map.get(key)[1]
+    planes.push(plane)
   }
-  const planes = map[i][1]
-  planes.push(plane)
-  return i
 }
 
+/*
+ * Collect all planes adjacent to each edge.
+ * Combine undirected edges, no need for duplicate cylinders.
+ */
 const mapPlaneToEdge = (map, edge, plane) => {
-  const i = map.findIndex((item) => (vec3.equals(item[0], edge[0]) && vec3.equals(item[1], edge[1])) || (vec3.equals(item[0], edge[1]) && vec3.equals(item[1], edge[0])))
-  if (i < 0) {
+  const key0 = edge[0].toString()
+  const key1 = edge[1].toString()
+  // Sort keys to make edges undirected
+  const key = key0 < key1 ? `${key0},${key1}` : `${key1},${key0}`
+  if (!map.has(key)) {
     const entry = [edge, [plane]]
-    map.push(entry)
-    return map.length
+    map.set(key, entry)
+  } else {
+    const planes = map.get(key)[1]
+    planes.push(plane)
   }
-  const planes = map[i][1]
-  planes.push(plane)
-  return i
 }
 
 const addUniqueAngle = (map, angle) => {
   const i = map.findIndex((item) => item === angle)
   if (i < 0) {
     map.push(angle)
-    return map.length
   }
-  return i
 }
 
 /*
@@ -65,8 +71,8 @@ const expandShell = (options, geometry) => {
   const { delta, segments } = Object.assign({ }, defaults, options)
 
   let result = geom3.create()
-  const vertices2planes = [] // contents: [vertex, [plane, ...]]
-  const edges2planes = [] // contents: [[vertex, vertex], [plane, ...]]
+  const vertices2planes = new Map() // {vertex: [vertex, [plane, ...]]}
+  const edges2planes = new Map() // {edge: [[vertex, vertex], [plane, ...]]}
 
   const v1 = vec3.create()
   const v2 = vec3.create()

package/src/operations/expansions/offset.js

@@ -13,7 +13,7 @@ const offsetPath2 = require('./offsetPath2')
  * @param {Float} [options.delta=1] - delta of offset (+ to exterior, - from interior)
  * @param {String} [options.corners='edge'] - type of corner to create after offseting; edge, chamfer, round
  * @param {Integer} [options.segments=16] - number of segments when creating round corners
- * @param {...Object} geometry - the list of geometry to offset
+ * @param {...Object} objects - the geometries to offset
  * @return {Object|Array} new geometry, or list of new geometries
  * @alias module:modeling/expansions.offset
  *