@jscad/modeling 2.9.2 → 2.9.3

package/src/operations/extrusions/project.test.js

@@ -26,14 +26,14 @@ test('project (defaults)', (t) => {
   t.notThrows(() => geom2.validate(result))
   const pts = geom2.toPoints(result)
   const exp = [
-    [0, -2.9999933333333333],
     [0, -5.000013333333333],
-    [0, 5.000013333333333],
     [5.000013333333333, 0],
-    [0, 2.9999933333333333],
+    [-5.000013333333333, 0],
     [-2.9999933333333333, 0],
     [2.9999933333333333, 0],
-    [-5.000013333333333, 0]
+    [0, 2.9999933333333333],
+    [0, -2.9999933333333333],
+    [0, 5.000013333333333]
   ]
   t.true(comparePoints(pts, exp))
 })
@@ -43,40 +43,40 @@ test('project (X and Y axis)', (t) => {
   t.notThrows(() => geom2.validate(result))
   let pts = geom2.toPoints(result)
   let exp = [
-    [-1.0000200000000001, -3.999986666666667],
-    [-0.8314600000000001, 4.555553333333334],
-    [-0.9807933333333334, -4.1951],
-    [-0.7070933333333335, 4.707126666666667],
-    [-0.9238600000000001, -4.382700000000001],
-    [-0.5555666666666668, 4.831446666666667],
-    [-0.8314600000000001, -4.555553333333334],
-    [-0.3826666666666667, 4.923893333333334],
-    [-0.7070933333333335, -4.707126666666667],
-    [-0.19511333333333336, 4.98078],
-    [-0.5555666666666668, -4.831446666666667],
-    [0, 5.000006666666668],
-    [-0.3826666666666667, -4.923893333333334],
-    [0.19511333333333336, 4.98078],
     [-0.19511333333333336, -4.98078],
-    [0.3826666666666667, 4.923893333333334],
     [0, -5.000006666666668],
-    [0.5555666666666668, 4.831446666666667],
+    [0, 5.000006666666668],
+    [0.3826666666666667, 4.923893333333334],
+    [-0.3826666666666667, -4.923893333333334],
     [0.19511333333333336, -4.98078],
-    [0.7070933333333335, 4.707126666666667],
+    [-0.19511333333333336, 4.98078],
+    [-0.5555666666666668, -4.831446666666667],
+    [0.5555666666666668, 4.831446666666667],
+    [-0.3826666666666667, 4.923893333333334],
     [0.3826666666666667, -4.923893333333334],
-    [0.8314600000000001, 4.555553333333334],
+    [0.7070933333333335, 4.707126666666667],
+    [-0.7070933333333335, -4.707126666666667],
     [0.5555666666666668, -4.831446666666667],
-    [0.9238600000000001, 4.382700000000001],
+    [-0.5555666666666668, 4.831446666666667],
+    [0.8314600000000001, 4.555553333333334],
+    [-0.8314600000000001, -4.555553333333334],
     [0.7070933333333335, -4.707126666666667],
-    [0.9807933333333334, 4.1951],
+    [-0.7070933333333335, 4.707126666666667],
+    [-0.9238600000000001, -4.382700000000001],
+    [0.9238600000000001, 4.382700000000001],
+    [-0.8314600000000001, 4.555553333333334],
     [0.8314600000000001, -4.555553333333334],
+    [0.9807933333333334, 4.1951],
+    [-0.9807933333333334, -4.1951],
+    [0.9238600000000001, -4.382700000000001],
+    [-0.9238600000000001, 4.382700000000001],
     [1.0000200000000001, 3.999986666666667],
+    [-1.0000200000000001, -3.999986666666667],
     [1.0000200000000001, -3.999986666666667],
-    [0.9238600000000001, -4.382700000000001],
-    [0.9807933333333334, -4.1951],
     [-1.0000200000000001, 3.999986666666667],
     [-0.9807933333333334, 4.1951],
-    [-0.9238600000000001, 4.382700000000001]
+    [0.9807933333333334, -4.1951],
+    [0.19511333333333336, 4.98078]
   ]
   t.true(comparePoints(pts, exp))
 
@@ -84,40 +84,40 @@ test('project (X and Y axis)', (t) => {
   t.notThrows(() => geom2.validate(result))
   pts = geom2.toPoints(result)
   exp = [
-    [3.999986666666667, -1.0000200000000001],
-    [-4.555553333333334, -0.8314600000000001],
-    [4.1951, -0.9807933333333334],
-    [-4.707126666666667, -0.7070933333333335],
-    [4.382700000000001, -0.9238600000000001],
-    [-4.831446666666667, -0.5555666666666668],
-    [4.555553333333334, -0.8314600000000001],
-    [-4.923893333333334, -0.3826666666666667],
-    [4.707126666666667, -0.7070933333333335],
-    [-4.98078, -0.19511333333333336],
-    [4.831446666666667, -0.5555666666666668],
-    [-5.000006666666668, 0],
-    [4.923893333333334, -0.3826666666666667],
-    [-4.98078, 0.19511333333333336],
     [4.98078, -0.19511333333333336],
-    [-4.923893333333334, 0.3826666666666667],
     [5.000006666666668, 0],
-    [-4.831446666666667, 0.5555666666666668],
+    [-5.000006666666668, 0],
+    [-4.923893333333334, 0.3826666666666667],
+    [4.923893333333334, -0.3826666666666667],
     [4.98078, 0.19511333333333336],
-    [-4.707126666666667, 0.7070933333333335],
+    [-4.98078, -0.19511333333333336],
+    [4.831446666666667, -0.5555666666666668],
+    [-4.831446666666667, 0.5555666666666668],
+    [-4.923893333333334, -0.3826666666666667],
     [4.923893333333334, 0.3826666666666667],
-    [-4.555553333333334, 0.8314600000000001],
+    [-4.707126666666667, 0.7070933333333335],
+    [4.707126666666667, -0.7070933333333335],
     [4.831446666666667, 0.5555666666666668],
-    [-4.382700000000001, 0.9238600000000001],
+    [-4.831446666666667, -0.5555666666666668],
+    [4.555553333333334, -0.8314600000000001],
+    [-4.555553333333334, 0.8314600000000001],
     [4.707126666666667, 0.7070933333333335],
-    [-4.1951, 0.9807933333333334],
+    [-4.707126666666667, -0.7070933333333335],
+    [4.382700000000001, -0.9238600000000001],
+    [-4.382700000000001, 0.9238600000000001],
+    [-4.555553333333334, -0.8314600000000001],
     [4.555553333333334, 0.8314600000000001],
+    [-4.1951, 0.9807933333333334],
+    [4.1951, -0.9807933333333334],
+    [4.382700000000001, 0.9238600000000001],
+    [-4.382700000000001, -0.9238600000000001],
+    [3.999986666666667, -1.0000200000000001],
     [-3.999986666666667, 1.0000200000000001],
     [3.999986666666667, 1.0000200000000001],
-    [4.382700000000001, 0.9238600000000001],
-    [4.1951, 0.9807933333333334],
     [-3.999986666666667, -1.0000200000000001],
+    [4.1951, 0.9807933333333334],
     [-4.1951, -0.9807933333333334],
-    [-4.382700000000001, -0.9238600000000001]
+    [-4.98078, 0.19511333333333336]
   ]
   t.true(comparePoints(pts, exp))
 })

package/src/operations/hulls/hullChain.test.js

@@ -12,14 +12,14 @@ test('hullChain (two, geom2)', (t) => {
   let obs = hullChain(geometry1, geometry1)
   let pts = geom2.toPoints(obs)
 
-    t.notThrows(() => geom2.validate(obs))
+  t.notThrows(() => geom2.validate(obs))
   t.is(pts.length, 4)
 
   // different
   obs = hullChain(geometry1, geometry2)
   pts = geom2.toPoints(obs)
 
-    t.notThrows(() => geom2.validate(obs))
+  t.notThrows(() => geom2.validate(obs))
   t.is(pts.length, 6)
 })
 
@@ -33,7 +33,7 @@ test('hullChain (three, geom2)', (t) => {
   let pts = geom2.toPoints(obs)
 
   // the sides change based on the bestplane chosen in trees/Node.js
-    t.notThrows(() => geom2.validate(obs))
+  t.notThrows(() => geom2.validate(obs))
   t.is(pts.length, 10)
 
   // closed
@@ -41,7 +41,7 @@ test('hullChain (three, geom2)', (t) => {
   pts = geom2.toPoints(obs)
 
   // the sides change based on the bestplane chosen in trees/Node.js
-    t.notThrows(() => geom2.validate(obs))
+  t.notThrows(() => geom2.validate(obs))
   t.is(pts.length, 10)
 })
 

package/src/operations/hulls/hullGeom2.js

@@ -3,6 +3,7 @@ const flatten = require('../../utils/flatten')
 const geom2 = require('../../geometries/geom2')
 
 const hullPoints2 = require('./hullPoints2')
+const toUniquePoints = require('./toUniquePoints')
 
 /*
  * Create a convex hull of the given geom2 geometries.
@@ -13,28 +14,15 @@ const hullGeom2 = (...geometries) => {
   geometries = flatten(geometries)
 
   // extract the unique points from the geometries
-  const uniquepoints = []
-  const found = new Map()
-  for (let g = 0; g < geometries.length; g++) {
-    const sides = geom2.toSides(geometries[g])
-    for (let s = 0; s < sides.length; s++) {
-      const side = sides[s]
-      const point = side[0]
-      const id = `${point[0]},${point[1]}`
-      if (found.has(id)) continue
-      uniquepoints.push(point)
-      found.set(id, true)
-    }
-  }
-  found.clear()
-
-  const hullpoints = hullPoints2(uniquepoints)
+  const unique = toUniquePoints(geometries)
+
+  const hullPoints = hullPoints2(unique)
 
   // NOTE: more than three points are required to create a new geometry
-  if (hullpoints.length < 3) return geom2.create()
+  if (hullPoints.length < 3) return geom2.create()
 
   // assemble a new geometry from the list of points
-  return geom2.fromPoints(hullpoints)
+  return geom2.fromPoints(hullPoints)
 }
 
 module.exports = hullGeom2

package/src/operations/hulls/hullGeom3.js

@@ -4,6 +4,7 @@ const geom3 = require('../../geometries/geom3')
 const poly3 = require('../../geometries/poly3')
 
 const quickhull = require('./quickhull')
+const toUniquePoints = require('./toUniquePoints')
 
 /*
  * Create a convex hull of the given geometries (geom3).
@@ -16,26 +17,12 @@ const hullGeom3 = (...geometries) => {
   if (geometries.length === 1) return geometries[0]
 
   // extract the unique vertices from the geometries
-  const uniquevertices = []
-  const found = new Map()
-  for (let g = 0; g < geometries.length; ++g) {
-    const polygons = geom3.toPolygons(geometries[g])
-    for (let p = 0; p < polygons.length; ++p) {
-      const vertices = polygons[p].vertices
-      for (let v = 0; v < vertices.length; ++v) {
-        const id = `${vertices[v]}`
-        if (found.has(id)) continue
-        uniquevertices.push(vertices[v])
-        found.set(id, true)
-      }
-    }
-  }
-  found.clear()
-
-  const faces = quickhull(uniquevertices, { skipTriangulation: true })
+  const unique = toUniquePoints(geometries)
+
+  const faces = quickhull(unique, { skipTriangulation: true })
 
   const polygons = faces.map((face) => {
-    const vertices = face.map((index) => uniquevertices[index])
+    const vertices = face.map((index) => unique[index])
     return poly3.create(vertices)
   })
 

package/src/operations/hulls/hullPath2.js

@@ -3,6 +3,7 @@ const flatten = require('../../utils/flatten')
 const path2 = require('../../geometries/path2')
 
 const hullPoints2 = require('./hullPoints2')
+const toUniquePoints = require('./toUniquePoints')
 
 /*
  * Create a convex hull of the given geometries (path2).
@@ -13,23 +14,12 @@ const hullPath2 = (...geometries) => {
   geometries = flatten(geometries)
 
   // extract the unique points from the geometries
-  const uniquepoints = []
-  const found = new Set()
-  geometries.forEach((geometry) => {
-    const points = path2.toPoints(geometry)
-    points.forEach((point) => {
-      const key = point.toString()
-      if (!found.has(key)) {
-        uniquepoints.push(point)
-        found.add(key)
-      }
-    })
-  })
+  const unique = toUniquePoints(geometries)
 
-  const hullpoints = hullPoints2(uniquepoints)
+  const hullPoints = hullPoints2(unique)
 
   // assemble a new geometry from the list of points
-  return path2.fromPoints({ closed: true }, hullpoints)
+  return path2.fromPoints({ closed: true }, hullPoints)
 }
 
 module.exports = hullPath2

package/src/operations/hulls/hullPoints2.js

@@ -1,108 +1,59 @@
 const vec2 = require('../../maths/vec2')
 
-const angleBetweenPoints = (p0, p1) => Math.atan2((p1[1] - p0[1]), (p1[0] - p0[0]))
-
-const compareIndex = (index1, index2) => {
-  if (index1.angle < index2.angle) {
-    return -1
-  } else if (index1.angle > index2.angle) {
-    return 1
-  } else {
-    if (index1.distance < index2.distance) {
-      return -1
-    } else if (index1.distance > index2.distance) {
-      return 1
-    }
-  }
-  return 0
-}
-
-// Ported from https://github.com/bkiers/GrahamScan
-const compute = (points) => {
-  if (points.length < 3) {
-    return points
-  }
-
-  // Find the lowest point
-  let min = 0
-  points.forEach((point, i) => {
-    const minpoint = points[min]
-    if (point[1] === minpoint[1]) {
-      if (point[0] < minpoint[0]) {
-        min = i
-      }
-    } else if (point[1] < minpoint[1]) {
-      min = i
+/*
+ * Create a convex hull of the given set of points, where each point is an array of [x,y].
+ * Uses https://en.wikipedia.org/wiki/Graham_scan
+ * @param {Array} uniquePoints - list of UNIQUE points from which to create a hull
+ * @returns {Array} a list of points that form the hull
+ */
+const hullPoints2 = (uniquePoints) => {
+  // find min point
+  let min = vec2.fromValues(Infinity, Infinity)
+  uniquePoints.forEach((point) => {
+    if (point[1] < min[1] || (point[1] === min[1] && point[0] < min[0])) {
+      min = point
     }
   })
 
-  // Calculate angles and distances from the lowest point
-  const al = []
-  let angle = 0.0
-  let dist = 0.0
-  for (let i = 0; i < points.length; i++) {
-    if (i === min) {
-      continue
-    }
-    angle = angleBetweenPoints(points[min], points[i])
-    if (angle < 0) {
-      angle += Math.PI
-    }
-    dist = vec2.squaredDistance(points[min], points[i])
-    al.push({ index: i, angle: angle, distance: dist })
-  }
-
-  al.sort((a, b) => compareIndex(a, b))
-
-  // Wind around the points CCW, removing interior points
-  const stack = new Array(points.length + 1)
-  let j = 2
-  for (let i = 0; i < points.length; i++) {
-    if (i === min) {
-      continue
-    }
-    stack[j] = al[j - 2].index
-    j++
-  }
-  stack[0] = stack[points.length]
-  stack[1] = min
+  // gather information for sorting by polar coordinates (point, angle, distSq)
+  const points = []
+  uniquePoints.forEach((point) => {
+    // use faster fakeAtan2 instead of Math.atan2
+    const angle = fakeAtan2(point[1] - min[1], point[0] - min[0])
+    const distSq = vec2.squaredDistance(point, min)
+    points.push({ point, angle, distSq })
+  })
 
-  // clockwise < 0, colinear = 0, counter clockwise > 0
-  const ccw = (i1, i2, i3) => (points[i2][0] - points[i1][0]) * (points[i3][1] - points[i1][1]) - (points[i2][1] - points[i1][1]) * (points[i3][0] - points[i1][0])
+  // sort by polar coordinates
+  points.sort((pt1, pt2) => pt1.angle < pt2.angle ? -1 : pt1.angle > pt2.angle ? 1 :
+    pt1.distSq < pt2.distSq ? -1 : pt1.distSq > pt2.distSq ? 1 : 0)
 
-  let tmp
-  let M = 2
-  for (let i = 3; i <= points.length; i++) {
-    while (ccw(stack[M - 1], stack[M], stack[i]) < Number.EPSILON) {
-      M--
+  const stack = [] // start with empty stack
+  points.forEach((point) => {
+    let cnt = stack.length
+    while (cnt > 1 && ccw(stack[cnt - 2], stack[cnt - 1], point.point) <= Number.EPSILON) {
+      stack.pop() // get rid of colinear and interior (clockwise) points
+      cnt = stack.length
     }
-    M++
-    tmp = stack[i]
-    stack[i] = stack[M]
-    stack[M] = tmp
-  }
+    stack.push(point.point)
+  })
 
-  // Return the indices to the points
-  const indices = new Array(M)
-  for (let i = 0; i < M; i++) {
-    indices[i] = stack[i + 1]
-  }
-  return indices
+  return stack
 }
 
-/*
- * Create a convex hull of the given set of points,  where each point is an array of [x,y].
- * @param {Array} uniquepoints - list of UNIQUE points from which to create a hull
- * @returns {Array} a list of points that form the hull
- */
-const hullPoints2 = (uniquepoints) => {
-  const indices = compute(uniquepoints)
+// returns: < 0 clockwise, 0 colinear, > 0 counter-clockwise
+const ccw = (v1, v2, v3) => (v2[0] - v1[0]) * (v3[1] - v1[1]) - (v2[1] - v1[1]) * (v3[0] - v1[0])
 
-  let hullpoints = []
-  if (Array.isArray(indices)) {
-    hullpoints = indices.map((index) => uniquepoints[index])
+// Returned "angle" is really 1/tan (inverse of slope) made negative to increase with angle.
+// This function is strictly for sorting in this algorithm.
+const fakeAtan2 = (y, x) => {
+  // The "if" is a special case for when the minimum vector found in loop above is present.
+  // We need to ensure that it sorts as the minimum point. Otherwise, this becomes NaN.
+  if (y === 0 && x === 0) {
+    return -Infinity
+  } else {
+    return -x / y
   }
-  return hullpoints
 }
 
 module.exports = hullPoints2

package/src/operations/hulls/toUniquePoints.js

@@ -0,0 +1,34 @@
+const geom2 = require('../../geometries/geom2')
+const geom3 = require('../../geometries/geom3')
+const path2 = require('../../geometries/path2')
+
+/*
+ * Return the unique vertices of a geometry
+ */
+const toUniquePoints = (geometries) => {
+  const found = new Set()
+  const uniquePoints = []
+
+  const addPoint = (point) => {
+    const key = point.toString()
+    if (!found.has(key)) {
+      uniquePoints.push(point)
+      found.add(key)
+    }
+  }
+
+  geometries.forEach((geometry) => {
+    if (geom2.isA(geometry)) {
+      geom2.toPoints(geometry).forEach(addPoint)
+    } else if (geom3.isA(geometry)) {
+      // points are grouped by polygon
+      geom3.toPoints(geometry).forEach((points) => points.forEach(addPoint))
+    } else if (path2.isA(geometry)) {
+      path2.toPoints(geometry).forEach(addPoint)
+    }
+  })
+
+  return uniquePoints
+}
+
+module.exports = toUniquePoints

package/src/operations/modifiers/generalize.js

@@ -11,8 +11,6 @@ const mergePolygons = require('./mergePolygons')
 const insertTjunctions = require('./insertTjunctions')
 const triangulatePolygons = require('./triangulatePolygons')
 
-const repairTjunctions = require('./repairTjunctions')
-
 /*
  */
 const generalizePath2 = (options, geometry) => geometry
@@ -27,10 +25,9 @@ const generalizeGeom3 = (options, geometry) => {
   const defaults = {
     snap: false,
     simplify: false,
-    triangulate: false,
-    repair: false
+    triangulate: false
   }
-  const { snap, simplify, triangulate, repair } = Object.assign({}, defaults, options)
+  const { snap, simplify, triangulate } = Object.assign({}, defaults, options)
 
   const epsilon = measureEpsilon(geometry)
   let polygons = geom3.toPolygons(geometry)
@@ -52,13 +49,6 @@ const generalizeGeom3 = (options, geometry) => {
     polygons = triangulatePolygons(epsilon, polygons)
   }
 
-  // repair the polygons (possibly triangles) if requested
-  if (repair) {
-    // fix T junctions
-    polygons = repairTjunctions(epsilon, polygons)
-    // TODO fill holes
-  }
-
   // FIXME replace with geom3.cloneShallow() when available
   const clone = Object.assign({}, geometry)
   clone.polygons = polygons
@@ -72,7 +62,6 @@ const generalizeGeom3 = (options, geometry) => {
  * @param {Boolean} [options.snap=false] the geometries should be snapped to epsilons
  * @param {Boolean} [options.simplify=false] the geometries should be simplified
  * @param {Boolean} [options.triangulate=false] the geometries should be triangulated
- * @param {Boolean} [options.repair=false] the geometries should be repaired
  * @param {...Object} geometries - the geometries to generalize
  * @return {Object|Array} the modified geometry, or a list of modified geometries
  * @alias module:modeling/modifiers.generalize

package/src/operations/modifiers/generalize.test.js

@@ -104,38 +104,6 @@ test('generalize: generalize of a geom3 produces an expected geom3', (t) => {
   ]
   t.notThrows(() => geom3.validate(result))
   t.true(comparePolygonsAsPoints(pts, exp))
-
-  // apply repairs only (triangles)
-  result = generalize({ repair: true }, geometry2)
-  pts = geom3.toPoints(result)
-  exp = [
-    [[-1.5707963267948966, -0.7853981633974483, -3.141592653589793], [-1.5707963267948966, -0.7853981633974483, 3.141592653589793],
-      [-1.5707963267948966, 0.7853981633974483, 3.141592653589793]],
-    [[-1.5707963267948966, -0.7853981633974483, -3.141592653589793], [-1.5707963267948966, 0.7853981633974483, 3.141592653589793],
-      [-1.5707963267948966, 0.7853981633974483, -3.141592653589793]],
-    [[1.5707963267948966, -0.7853981633974483, -3.141592653589793], [1.5707963267948966, 0.7853981633974483, -3.141592653589793],
-      [1.5707963267948966, 0.7853981633974483, 3.141592653589793]],
-    [[1.5707963267948966, -0.7853981633974483, -3.141592653589793], [1.5707963267948966, 0.7853981633974483, 3.141592653589793],
-      [1.5707963267948966, -0.7853981633974483, 3.141592653589793]],
-    [[-1.5707963267948966, -0.7853981633974483, -3.141592653589793], [1.5707963267948966, -0.7853981633974483, -3.141592653589793],
-      [1.5707963267948966, -0.7853981633974483, 3.141592653589793]],
-    [[-1.5707963267948966, -0.7853981633974483, -3.141592653589793], [1.5707963267948966, -0.7853981633974483, 3.141592653589793],
-      [-1.5707963267948966, -0.7853981633974483, 3.141592653589793]],
-    [[-1.5707963267948966, 0.7853981633974483, -3.141592653589793], [-1.5707963267948966, 0.7853981633974483, 3.141592653589793],
-      [1.5707963267948966, 0.7853981633974483, 3.141592653589793]],
-    [[-1.5707963267948966, 0.7853981633974483, -3.141592653589793], [1.5707963267948966, 0.7853981633974483, 3.141592653589793],
-      [1.5707963267948966, 0.7853981633974483, -3.141592653589793]],
-    [[-1.5707963267948966, -0.7853981633974483, -3.141592653589793], [-1.5707963267948966, 0.7853981633974483, -3.141592653589793],
-      [1.5707963267948966, 0.7853981633974483, -3.141592653589793]],
-    [[-1.5707963267948966, -0.7853981633974483, -3.141592653589793], [1.5707963267948966, 0.7853981633974483, -3.141592653589793],
-      [1.5707963267948966, -0.7853981633974483, -3.141592653589793]],
-    [[-1.5707963267948966, -0.7853981633974483, 3.141592653589793], [1.5707963267948966, -0.7853981633974483, 3.141592653589793],
-      [1.5707963267948966, 0.7853981633974483, 3.141592653589793]],
-    [[-1.5707963267948966, -0.7853981633974483, 3.141592653589793], [1.5707963267948966, 0.7853981633974483, 3.141592653589793],
-      [-1.5707963267948966, 0.7853981633974483, 3.141592653589793]]
-  ]
-  t.notThrows(() => geom3.validate(result))
-  t.true(comparePolygonsAsPoints(pts, exp))
 })
 
 test('generalize: generalize of a geom3 with T junctions produces an expected geom3', (t) => {

package/src/operations/modifiers/insertTjunctions.js

@@ -259,7 +259,7 @@ const insertTjunctions = (polygons) => {
                     // split the side by inserting the vertex:
                     const newvertices = polygon.vertices.slice(0)
                     newvertices.splice(insertionvertextagindex, 0, endvertex)
-                    const newpolygon = poly3.fromPoints(newvertices)
+                    const newpolygon = poly3.create(newvertices)
 
                     newpolygons[polygonindex] = newpolygon
 

package/src/operations/modifiers/insertTjunctions.test.js

@@ -56,33 +56,33 @@ test('insertTjunctions: insertTjunctions produces expected polygons', (t) => {
 
   const result3 = insertTjunctions(geom3.toPolygons(geometry3))
   let exp = [
-    poly3.fromPoints([[-1, -1, -1], [-1, -1, 1], [-1, 1, 1], [-1, 1, -1]]),
-    poly3.fromPoints([[1, -1, -1], [1, 1, -1], [1, 1, 1], [1, -1, 1]]),
-    poly3.fromPoints([[-1, -1, -1], [1, -1, -1], [1, -1, 1], [-1, -1, 1]]),
-    poly3.fromPoints([[-1, 1, -1], [-1, 1, 1], [1, 1, 1], [1, 1, -1]]),
-    poly3.fromPoints([[-1, -1, -1], [-1, 1, -1], [1, 1, -1], [1, -1, -1]]),
-    poly3.fromPoints([[0, 0, 1], [-1, -1, 1], [1, -1, 1], [1, 1, 1]]),
-    poly3.fromPoints([[1, 1, 1], [-1, 1, 1], [0, 0, 1]]),
-    poly3.fromPoints([[-1, 1, 1], [-1, -1, 1], [0, 0, 1]])
+    poly3.create([[-1, -1, -1], [-1, -1, 1], [-1, 1, 1], [-1, 1, -1]]),
+    poly3.create([[1, -1, -1], [1, 1, -1], [1, 1, 1], [1, -1, 1]]),
+    poly3.create([[-1, -1, -1], [1, -1, -1], [1, -1, 1], [-1, -1, 1]]),
+    poly3.create([[-1, 1, -1], [-1, 1, 1], [1, 1, 1], [1, 1, -1]]),
+    poly3.create([[-1, -1, -1], [-1, 1, -1], [1, 1, -1], [1, -1, -1]]),
+    poly3.create([[0, 0, 1], [-1, -1, 1], [1, -1, 1], [1, 1, 1]]),
+    poly3.create([[1, 1, 1], [-1, 1, 1], [0, 0, 1]]),
+    poly3.create([[-1, 1, 1], [-1, -1, 1], [0, 0, 1]])
   ]
   t.not(result3, geom3.toPolygons(geometry3))
   t.true(comparePolygonLists(result3, exp))
 
   const result4 = insertTjunctions(geom3.toPolygons(geometry4))
   exp = [
-    poly3.fromPoints([[-1, -1, -1], [-1, -1, 1], [-1, 0, 1], [-1, 1, 1], [-1, 1, -1]]),
-    poly3.fromPoints([[1, -1, -1], [1, 1, -1], [1, 1, 1], [1, 0, 1], [1, -1, 1]]),
-    poly3.fromPoints([[-1, -1, -1], [1, -1, -1], [1, -1, 1], [0, -1, 1], [-1, -1, 1]]),
-    poly3.fromPoints([[-1, 1, -1], [-1, 1, 1], [0, 1, 1], [1, 1, 1], [1, 1, -1]]),
-    poly3.fromPoints([[-1, -1, -1], [-1, 1, -1], [1, 1, -1], [1, -1, -1]]),
-    poly3.fromPoints([[-1, -1, 1], [0, -1, 1], [0, 0, 1]]),
-    poly3.fromPoints([[-1, 0, 1], [-1, -1, 1], [0, 0, 1]]),
-    poly3.fromPoints([[0, -1, 1], [1, -1, 1], [0, 0, 1]]),
-    poly3.fromPoints([[1, -1, 1], [1, 0, 1], [0, 0, 1]]),
-    poly3.fromPoints([[1, 0, 1], [1, 1, 1], [0, 0, 1]]),
-    poly3.fromPoints([[1, 1, 1], [0, 1, 1], [0, 0, 1]]),
-    poly3.fromPoints([[0, 1, 1], [-1, 1, 1], [0, 0, 1]]),
-    poly3.fromPoints([[-1, 1, 1], [-1, 0, 1], [0, 0, 1]])
+    poly3.create([[-1, -1, -1], [-1, -1, 1], [-1, 0, 1], [-1, 1, 1], [-1, 1, -1]]),
+    poly3.create([[1, -1, -1], [1, 1, -1], [1, 1, 1], [1, 0, 1], [1, -1, 1]]),
+    poly3.create([[-1, -1, -1], [1, -1, -1], [1, -1, 1], [0, -1, 1], [-1, -1, 1]]),
+    poly3.create([[-1, 1, -1], [-1, 1, 1], [0, 1, 1], [1, 1, 1], [1, 1, -1]]),
+    poly3.create([[-1, -1, -1], [-1, 1, -1], [1, 1, -1], [1, -1, -1]]),
+    poly3.create([[-1, -1, 1], [0, -1, 1], [0, 0, 1]]),
+    poly3.create([[-1, 0, 1], [-1, -1, 1], [0, 0, 1]]),
+    poly3.create([[0, -1, 1], [1, -1, 1], [0, 0, 1]]),
+    poly3.create([[1, -1, 1], [1, 0, 1], [0, 0, 1]]),
+    poly3.create([[1, 0, 1], [1, 1, 1], [0, 0, 1]]),
+    poly3.create([[1, 1, 1], [0, 1, 1], [0, 0, 1]]),
+    poly3.create([[0, 1, 1], [-1, 1, 1], [0, 0, 1]]),
+    poly3.create([[-1, 1, 1], [-1, 0, 1], [0, 0, 1]])
   ]
   t.not(result4, geometry4)
   t.true(comparePolygonLists(result4, exp))