@jscad/modeling 2.9.2 → 2.9.5

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))

package/src/operations/modifiers/mergePolygons.js

@@ -1,3 +1,4 @@
+const aboutEqualNormals = require('../../maths/utils/aboutEqualNormals')
 const vec3 = require('../../maths/vec3')
 
 const poly3 = require('../../geometries/poly3')
@@ -53,9 +54,12 @@ const calculateAnglesBetween = (current, opposite, normal) => {
   return [angle1, angle2]
 }
 
+const v1 = vec3.create()
+const v2 = vec3.create()
+
 const calculateAngle = (prevpoint, point, nextpoint, normal) => {
-  const d0 = vec3.subtract(vec3.create(), point, prevpoint)
-  const d1 = vec3.subtract(vec3.create(), nextpoint, point)
+  const d0 = vec3.subtract(v1, point, prevpoint)
+  const d1 = vec3.subtract(v2, nextpoint, point)
   vec3.cross(d0, d0, d1)
   return vec3.dot(d0, normal)
 }
@@ -76,7 +80,7 @@ const createPolygonAnd = (edge) => {
 
     edge = next
   }
-  if (points.length > 0) polygon = poly3.fromPoints(points)
+  if (points.length > 0) polygon = poly3.create(points)
   return polygon
 }
 
@@ -85,7 +89,7 @@ const createPolygonAnd = (edge) => {
  * @param {poly3[]} sourcepolygons - list of polygons
  * @returns {poly3[]} new set of polygons
  */
-const mergeCoplanarPolygons = (epsilon, sourcepolygons) => {
+const mergeCoplanarPolygons = (sourcepolygons) => {
   if (sourcepolygons.length < 2) return sourcepolygons
 
   const normal = sourcepolygons[0].plane
@@ -167,18 +171,11 @@ const mergeCoplanarPolygons = (epsilon, sourcepolygons) => {
     if (polygon) destpolygons.push(polygon)
   })
 
+  edgeList.clear()
+
   return destpolygons
 }
 
-// Normals are directional vectors with component values from 0 to 1.0, requiring specialized comparision
-// This EPS is derived from a serieas of tests to determine the optimal precision for comparing coplanar polygons,
-// as provided by the sphere primitive at high segmentation
-// This EPS is for 64 bit Number values
-const NEPS = 1e-13
-
-// Compare two normals (unit vectors) for equality.
-const aboutEqualNormals = (a, b) => (Math.abs(a[0] - b[0]) <= NEPS && Math.abs(a[1] - b[1]) <= NEPS && Math.abs(a[2] - b[2]) <= NEPS)
-
 const coplanar = (plane1, plane2) => {
   // expect the same distance from the origin, within tolerance
   if (Math.abs(plane1[3] - plane2[3]) < 0.00000015) {
@@ -202,7 +199,7 @@ const mergePolygons = (epsilon, polygons) => {
   let destpolygons = []
   polygonsPerPlane.forEach((mapping) => {
     const sourcepolygons = mapping[1]
-    const retesselayedpolygons = mergeCoplanarPolygons(epsilon, sourcepolygons)
+    const retesselayedpolygons = mergeCoplanarPolygons(sourcepolygons)
     destpolygons = destpolygons.concat(retesselayedpolygons)
   })
   return destpolygons

package/src/operations/{booleans → modifiers}/reTesselateCoplanarPolygons.js

@@ -23,15 +23,14 @@ const reTesselateCoplanarPolygons = (sourcepolygons) => {
   const orthobasis = new OrthoNormalBasis(plane)
   const polygonvertices2d = [] // array of array of Vector2D
   const polygontopvertexindexes = [] // array of indexes of topmost vertex per polygon
-  const topy2polygonindexes = {}
-  const ycoordinatetopolygonindexes = {}
-
-  const ycoordinatebins = {}
+  const topy2polygonindexes = new Map()
+  const ycoordinatetopolygonindexes = new Map()
 
   // convert all polygon vertices to 2D
   // Make a list of all encountered y coordinates
   // And build a map of all polygons that have a vertex at a certain y coordinate:
-  const ycoordinateBinningFactor = 1.0 / EPS * 10
+  const ycoordinatebins = new Map()
+  const ycoordinateBinningFactor = 10 / EPS
   for (let polygonindex = 0; polygonindex < numpolygons; polygonindex++) {
     const poly3d = sourcepolygons[polygonindex]
     let vertices2d = []
@@ -46,15 +45,15 @@ const reTesselateCoplanarPolygons = (sourcepolygons) => {
         // close to each other, give them the same y coordinate:
         const ycoordinatebin = Math.floor(pos2d[1] * ycoordinateBinningFactor)
         let newy
-        if (ycoordinatebin in ycoordinatebins) {
-          newy = ycoordinatebins[ycoordinatebin]
-        } else if (ycoordinatebin + 1 in ycoordinatebins) {
-          newy = ycoordinatebins[ycoordinatebin + 1]
-        } else if (ycoordinatebin - 1 in ycoordinatebins) {
-          newy = ycoordinatebins[ycoordinatebin - 1]
+        if (ycoordinatebins.has(ycoordinatebin)) {
+          newy = ycoordinatebins.get(ycoordinatebin)
+        } else if (ycoordinatebins.has(ycoordinatebin + 1)) {
+          newy = ycoordinatebins.get(ycoordinatebin + 1)
+        } else if (ycoordinatebins.has(ycoordinatebin - 1)) {
+          newy = ycoordinatebins.get(ycoordinatebin - 1)
         } else {
           newy = pos2d[1]
-          ycoordinatebins[ycoordinatebin] = pos2d[1]
+          ycoordinatebins.set(ycoordinatebin, pos2d[1])
         }
         pos2d = vec2.fromValues(pos2d[0], newy)
         vertices2d.push(pos2d)
@@ -66,10 +65,12 @@ const reTesselateCoplanarPolygons = (sourcepolygons) => {
         if ((i === 0) || (y > maxy)) {
           maxy = y
         }
-        if (!(y in ycoordinatetopolygonindexes)) {
-          ycoordinatetopolygonindexes[y] = {}
+        let polygonindexes = ycoordinatetopolygonindexes.get(y)
+        if (!polygonindexes) {
+          polygonindexes = {} // PERF
+          ycoordinatetopolygonindexes.set(y, polygonindexes)
         }
-        ycoordinatetopolygonindexes[y][polygonindex] = true
+        polygonindexes[polygonindex] = true
       }
       if (miny >= maxy) {
         // degenerate polygon, all vertices have same y coordinate. Just ignore it from now:
@@ -77,10 +78,12 @@ const reTesselateCoplanarPolygons = (sourcepolygons) => {
         numvertices = 0
         minindex = -1
       } else {
-        if (!(miny in topy2polygonindexes)) {
-          topy2polygonindexes[miny] = []
+        let polygonindexes = topy2polygonindexes.get(miny)
+        if (!polygonindexes) {
+          polygonindexes = []
+          topy2polygonindexes.set(miny, polygonindexes)
         }
-        topy2polygonindexes[miny].push(polygonindex)
+        polygonindexes.push(polygonindex)
       }
     } // if(numvertices > 0)
     // reverse the vertex order:
@@ -89,8 +92,9 @@ const reTesselateCoplanarPolygons = (sourcepolygons) => {
     polygonvertices2d.push(vertices2d)
     polygontopvertexindexes.push(minindex)
   }
+
   const ycoordinates = []
-  for (const ycoordinate in ycoordinatetopolygonindexes) ycoordinates.push(ycoordinate)
+  ycoordinatetopolygonindexes.forEach((polylist, y) => ycoordinates.push(y))
   ycoordinates.sort(fnNumberSort)
 
   // Now we will iterate over all y coordinates, from lowest to highest y coordinate
@@ -108,15 +112,14 @@ const reTesselateCoplanarPolygons = (sourcepolygons) => {
   let prevoutpolygonrow = []
   for (let yindex = 0; yindex < ycoordinates.length; yindex++) {
     const newoutpolygonrow = []
-    const ycoordinateasstring = ycoordinates[yindex]
-    const ycoordinate = Number(ycoordinateasstring)
+    const ycoordinate = ycoordinates[yindex]
 
     // update activepolygons for this y coordinate:
     // - Remove any polygons that end at this y coordinate
     // - update leftvertexindex and rightvertexindex (which point to the current vertex index
     //   at the the left and right side of the polygon
     // Iterate over all polygons that have a corner at this y coordinate:
-    const polygonindexeswithcorner = ycoordinatetopolygonindexes[ycoordinateasstring]
+    const polygonindexeswithcorner = ycoordinatetopolygonindexes.get(ycoordinate)
     for (let activepolygonindex = 0; activepolygonindex < activepolygons.length; ++activepolygonindex) {
       const activepolygon = activepolygons[activepolygonindex]
       const polygonindex = activepolygon.polygonindex
@@ -166,7 +169,7 @@ const reTesselateCoplanarPolygons = (sourcepolygons) => {
       nextycoordinate = Number(ycoordinates[yindex + 1])
       const middleycoordinate = 0.5 * (ycoordinate + nextycoordinate)
       // update activepolygons by adding any polygons that start here:
-      const startingpolygonindexes = topy2polygonindexes[ycoordinateasstring]
+      const startingpolygonindexes = topy2polygonindexes.get(ycoordinate)
       for (const polygonindexKey in startingpolygonindexes) {
         const polygonindex = startingpolygonindexes[polygonindexKey]
         const vertices2d = polygonvertices2d[polygonindex]
@@ -212,8 +215,6 @@ const reTesselateCoplanarPolygons = (sourcepolygons) => {
         })
       } // for(let polygonindex in startingpolygonindexes)
     } //  yindex < ycoordinates.length-1
-    // if( (yindex === ycoordinates.length-1) || (nextycoordinate - ycoordinate > EPS) )
-    // FIXME : what ???
 
     // Now activepolygons is up to date
     // Build the output polygons for the next row in newoutpolygonrow:
@@ -252,19 +253,19 @@ const reTesselateCoplanarPolygons = (sourcepolygons) => {
     } // for(activepolygon in activepolygons)
     if (yindex > 0) {
       // try to match the new polygons against the previous row:
-      const prevcontinuedindexes = {}
-      const matchedindexes = {}
+      const prevcontinuedindexes = new Set()
+      const matchedindexes = new Set()
       for (let i = 0; i < newoutpolygonrow.length; i++) {
         const thispolygon = newoutpolygonrow[i]
         for (let ii = 0; ii < prevoutpolygonrow.length; ii++) {
-          if (!matchedindexes[ii]) { // not already processed?
+          if (!matchedindexes.has(ii)) { // not already processed?
             // We have a match if the sidelines are equal or if the top coordinates
             // are on the sidelines of the previous polygon
             const prevpolygon = prevoutpolygonrow[ii]
             if (vec2.distance(prevpolygon.bottomleft, thispolygon.topleft) < EPS) {
               if (vec2.distance(prevpolygon.bottomright, thispolygon.topright) < EPS) {
                 // Yes, the top of this polygon matches the bottom of the previous:
-                matchedindexes[ii] = true
+                matchedindexes.add(ii)
                 // Now check if the joined polygon would remain convex:
                 const v1 = line2.direction(thispolygon.leftline)
                 const v2 = line2.direction(prevpolygon.leftline)
@@ -284,16 +285,16 @@ const reTesselateCoplanarPolygons = (sourcepolygons) => {
                   thispolygon.outpolygon = prevpolygon.outpolygon
                   thispolygon.leftlinecontinues = leftlinecontinues
                   thispolygon.rightlinecontinues = rightlinecontinues
-                  prevcontinuedindexes[ii] = true
+                  prevcontinuedindexes.add(ii)
                 }
                 break
               }
             }
-          } // if(!prevcontinuedindexes[ii])
+          } // if(!prevcontinuedindexes.has(ii))
         } // for ii
       } // for i
       for (let ii = 0; ii < prevoutpolygonrow.length; ii++) {
-        if (!prevcontinuedindexes[ii]) {
+        if (!prevcontinuedindexes.has(ii)) {
           // polygon ends here
           // Finish the polygon with the last point(s):
           const prevpolygon = prevoutpolygonrow[ii]

package/src/operations/{booleans → modifiers}/reTesselateCoplanarPolygons.test.js

@@ -17,11 +17,11 @@ const rotatePoly3 = (angles, polygon) => {
 }
 
 test.only('retessellateCoplanarPolygons: should merge coplanar polygons', (t) => {
-  const polyA = poly3.fromPoints([[-5, -5, 0], [5, -5, 0], [5, 5, 0], [-5, 5, 0]])
-  const polyB = poly3.fromPoints([[5, -5, 0], [8, 0, 0], [5, 5, 0]])
-  const polyC = poly3.fromPoints([[-5, 5, 0], [-8, 0, 0], [-5, -5, 0]])
-  const polyD = poly3.fromPoints([[-5, 5, 0], [5, 5, 0], [0, 8, 0]])
-  const polyE = poly3.fromPoints([[5, -5, 0], [-5, -5, 0], [0, -8, 0]])
+  const polyA = poly3.create([[-5, -5, 0], [5, -5, 0], [5, 5, 0], [-5, 5, 0]])
+  const polyB = poly3.create([[5, -5, 0], [8, 0, 0], [5, 5, 0]])
+  const polyC = poly3.create([[-5, 5, 0], [-8, 0, 0], [-5, -5, 0]])
+  const polyD = poly3.create([[-5, 5, 0], [5, 5, 0], [0, 8, 0]])
+  const polyE = poly3.create([[5, -5, 0], [-5, -5, 0], [0, -8, 0]])
 
   // combine polygons in each direction
   let obs = reTesselateCoplanarPolygons([polyA, polyB])

package/src/operations/{booleans → modifiers}/retessellate.js

@@ -1,16 +1,9 @@
 const geom3 = require('../../geometries/geom3')
 const poly3 = require('../../geometries/poly3')
 
-const reTesselateCoplanarPolygons = require('./reTesselateCoplanarPolygons')
-
-// Normals are directional vectors with component values from 0 to 1.0, requiring specialized comparison
-// This EPS is derived from a series of tests to determine the optimal precision for comparing coplanar polygons,
-// as provided by the sphere primitive at high segmentation
-// This EPS is for 64 bit Number values
-const NEPS = 1e-13
+const aboutEqualNormals = require('../../maths/utils/aboutEqualNormals')
 
-// Compare two normals (unit vectors) for equality.
-const aboutEqualNormals = (a, b) => (Math.abs(a[0] - b[0]) <= NEPS && Math.abs(a[1] - b[1]) <= NEPS && Math.abs(a[2] - b[2]) <= NEPS)
+const reTesselateCoplanarPolygons = require('./reTesselateCoplanarPolygons')
 
 const coplanar = (plane1, plane2) => {
   // expect the same distance from the origin, within tolerance