@jscad/modeling 2.12.5 → 3.0.1-alpha.0

package/src/measurements/measureBoundingBox.test.js

@@ -1,12 +1,12 @@
-const test = require('ava')
+import test from 'ava'
 
-const { geom2, geom3, path2 } = require('../geometries')
+import { geom2, geom3, path2, slice } from '../geometries/index.js'
 
-const { line, rectangle, cuboid } = require('../primitives')
+import { line, rectangle, cuboid } from '../primitives/index.js'
 
-const { mirror } = require('../operations/transforms')
+import { mirror, scale } from '../operations/transforms/index.js'
 
-const { measureBoundingBox } = require('./index')
+import { measureBoundingBox } from './index.js'
 
 test('measureBoundingBox (single objects)', (t) => {
   const aline = line([[10, 10], [15, 15]])
@@ -16,6 +16,7 @@ test('measureBoundingBox (single objects)', (t) => {
   const apath2 = path2.create()
   const ageom2 = geom2.create()
   const ageom3 = geom3.create()
+  const aslice = slice.create()
 
   const n = null
   const o = {}
@@ -28,6 +29,7 @@ test('measureBoundingBox (single objects)', (t) => {
   const p2bounds = measureBoundingBox(apath2)
   const g2bounds = measureBoundingBox(ageom2)
   const g3bounds = measureBoundingBox(ageom3)
+  const slbounds = measureBoundingBox(aslice)
 
   const nbounds = measureBoundingBox(n)
   const obounds = measureBoundingBox(o)
@@ -40,6 +42,7 @@ test('measureBoundingBox (single objects)', (t) => {
   t.deepEqual(p2bounds, [[0, 0, 0], [0, 0, 0]])
   t.deepEqual(g2bounds, [[0, 0, 0], [0, 0, 0]])
   t.deepEqual(g3bounds, [[0, 0, 0], [0, 0, 0]])
+  t.deepEqual(slbounds, [[0, 0, 0], [0, 0, 0]])
 
   t.deepEqual(nbounds, [[0, 0, 0], [0, 0, 0]])
   t.deepEqual(obounds, [[0, 0, 0], [0, 0, 0]])
@@ -64,3 +67,21 @@ test('measureBoundingBox invert', (t) => {
   const cbounds = measureBoundingBox(acube)
   t.deepEqual(cbounds, [[-1, -1, -1], [1, 1, 1]])
 })
+
+test('measureBoundingBox empty', (t) => {
+  const empty = [[0, 0, 0], [0, 0, 0]]
+  t.deepEqual(measureBoundingBox(geom2.create()), empty)
+  t.deepEqual(measureBoundingBox(geom3.create()), empty)
+  t.deepEqual(measureBoundingBox(path2.create()), empty)
+  t.deepEqual(measureBoundingBox(slice.create()), empty)
+})
+
+test('measureBoundingBox scaled', (t) => {
+  const arect = scale([2, 2, 2], rectangle())
+  const rbounds = measureBoundingBox(arect)
+  t.deepEqual(rbounds, [[-2, -2, 0], [2, 2, 0]])
+
+  const acube = scale([2, 2, 2], cuboid())
+  const cbounds = measureBoundingBox(acube)
+  t.deepEqual(cbounds, [[-2, -2, -2], [2, 2, 2]])
+})

package/src/measurements/measureBoundingSphere.d.ts

@@ -1,9 +1,6 @@
-import { Geometry } from '../geometries/types'
-import RecursiveArray from '../utils/recursiveArray'
+import type { Geometry } from '../geometries/types.d.ts'
+import type { RecursiveArray } from '../utils/recursiveArray.d.ts'
 
-type Centroid = [number, number, number]
+import type { BoundingSphere } from './types.d.ts'
 
-export default measureBoundingSphere
-
-declare function measureBoundingSphere(geometry: Geometry): [Centroid, number]
-declare function measureBoundingSphere(...geometries: RecursiveArray<Geometry>): [Centroid, number][]
+export function measureBoundingSphere(...geometries: RecursiveArray<Geometry>): BoundingSphere

package/src/measurements/measureBoundingSphere.js

@@ -1,28 +1,45 @@
-const flatten = require('../utils/flatten')
+import { flatten } from '../utils/flatten.js'
 
-const vec2 = require('../maths/vec2')
-const vec3 = require('../maths/vec3')
+import * as vec2 from '../maths/vec2/index.js'
+import * as vec3 from '../maths/vec3/index.js'
 
-const geom2 = require('../geometries/geom2')
-const geom3 = require('../geometries/geom3')
-const path2 = require('../geometries/path2')
-const poly3 = require('../geometries/poly3')
+import * as geom2 from '../geometries/geom2/index.js'
+import * as geom3 from '../geometries/geom3/index.js'
+import * as path2 from '../geometries/path2/index.js'
+import * as poly3 from '../geometries/poly3/index.js'
+import * as slice from '../geometries/slice/index.js'
 
-const cacheOfBoundingSpheres = new WeakMap()
+const cache = new WeakMap()
 
 /*
- * Measure the bounding sphere of the given (path2) geometry.
- * @return {[[x, y, z], radius]} the bounding sphere for the geometry
+ * Measure a geometry using a given measure function.
+ * Uses cached if available. Otherwise, compute bounding sphere and save to cache.
+ *
+ * @param {Geometry} geometry - the geometry to measure
+ * @param {Function} measureFn - the function to measure the bounding sphere
+ * @return {Array[]} the centroid and radius for the geometry
  */
-const measureBoundingSphereOfPath2 = (geometry) => {
-  let boundingSphere = cacheOfBoundingSpheres.get(geometry)
-  if (boundingSphere !== undefined) return boundingSphere
+const measureCached = (geometry, measureFn) => {
+  let boundingSphere = cache.get(geometry)
+  if (boundingSphere) return boundingSphere
+  boundingSphere = measureFn(geometry)
+  // if bounding sphere is undefined, default to [0,0,0] and 0
+  if (boundingSphere.length === 0) {
+    boundingSphere[0] = vec3.create()
+    boundingSphere[1] = 0
+  }
+  cache.set(geometry, boundingSphere)
+  return boundingSphere
+}
 
+/*
+ * Measure the bounding sphere of the given 2D points.
+ * @return {[[x, y, z], radius]} the bounding sphere for the points
+ */
+const measureBoundingSphereOfPoints = (points) => {
   const centroid = vec3.create()
   let radius = 0
 
-  const points = path2.toPoints(geometry)
-
   if (points.length > 0) {
     // calculate the centroid of the geometry
     let numPoints = 0
@@ -40,10 +57,15 @@ const measureBoundingSphereOfPath2 = (geometry) => {
     radius = Math.sqrt(radius)
   }
 
-  boundingSphere = [centroid, radius]
-  cacheOfBoundingSpheres.set(geometry, boundingSphere)
+  return [centroid, radius]
+}
 
-  return boundingSphere
+/*
+ * Measure the bounding sphere of the given (path2) geometry.
+ * @return {[[x, y, z], radius]} the bounding sphere for the geometry
+ */
+const measureBoundingSphereOfPath2 = (points) => {
+  return measureBoundingSphereOfPoints(path2.toPoints(points))
 }
 
 /*
@@ -51,74 +73,72 @@ const measureBoundingSphereOfPath2 = (geometry) => {
  * @return {[[x, y, z], radius]} the bounding sphere for the geometry
  */
 const measureBoundingSphereOfGeom2 = (geometry) => {
-  let boundingSphere = cacheOfBoundingSpheres.get(geometry)
-  if (boundingSphere !== undefined) return boundingSphere
+  return measureBoundingSphereOfPoints(geom2.toPoints(geometry))
+}
 
+/*
+ * Measure the bounding sphere of the given (geom3) geometry.
+ * @return {[[x, y, z], radius]} the bounding sphere for the geometry
+ */
+const measureBoundingSphereOfGeom3 = (geometry) => {
   const centroid = vec3.create()
   let radius = 0
 
-  const sides = geom2.toSides(geometry)
+  const polygons = geom3.toPolygons(geometry)
 
-  if (sides.length > 0) {
+  if (polygons.length > 0) {
     // calculate the centroid of the geometry
-    let numPoints = 0
-    const temp = vec3.create()
-    sides.forEach((side) => {
-      vec3.add(centroid, centroid, vec3.fromVec2(temp, side[0], 0))
-      numPoints++
+    let numVertices = 0
+    polygons.forEach((polygon) => {
+      poly3.toVertices(polygon).forEach((vertex) => {
+        vec3.add(centroid, centroid, vertex)
+        numVertices++
+      })
     })
-    vec3.scale(centroid, centroid, 1 / numPoints)
+    vec3.scale(centroid, centroid, 1 / numVertices)
 
-    // find the farthest point from the centroid
-    sides.forEach((side) => {
-      radius = Math.max(radius, vec2.squaredDistance(centroid, side[0]))
+    // find the farthest vertex from the centroid
+    polygons.forEach((polygon) => {
+      poly3.toVertices(polygon).forEach((vertex) => {
+        radius = Math.max(radius, vec3.squaredDistance(centroid, vertex))
+      })
     })
     radius = Math.sqrt(radius)
   }
 
-  boundingSphere = [centroid, radius]
-  cacheOfBoundingSpheres.set(geometry, boundingSphere)
-
-  return boundingSphere
+  return [centroid, radius]
 }
 
 /*
  * Measure the bounding sphere of the given (geom3) geometry.
  * @return {[[x, y, z], radius]} the bounding sphere for the geometry
  */
-const measureBoundingSphereOfGeom3 = (geometry) => {
-  let boundingSphere = cacheOfBoundingSpheres.get(geometry)
-  if (boundingSphere !== undefined) return boundingSphere
-
+const measureBoundingSphereOfSlice = (geometry) => {
   const centroid = vec3.create()
   let radius = 0
+  let numVertices = 0
 
-  const polygons = geom3.toPolygons(geometry)
-
-  if (polygons.length > 0) {
-    // calculate the centroid of the geometry
-    let numPoints = 0
-    polygons.forEach((polygon) => {
-      poly3.toPoints(polygon).forEach((point) => {
-        vec3.add(centroid, centroid, point)
-        numPoints++
-      })
+  // calculate the centroid of the geometry
+  geometry.contours.forEach((contour) => {
+    contour.forEach((vertex) => {
+      vec3.add(centroid, centroid, vertex)
+      numVertices++
     })
-    vec3.scale(centroid, centroid, 1 / numPoints)
+  })
 
-    // find the farthest point from the centroid
-    polygons.forEach((polygon) => {
-      poly3.toPoints(polygon).forEach((point) => {
-        radius = Math.max(radius, vec3.squaredDistance(centroid, point))
+  if (numVertices > 0) {
+    vec3.scale(centroid, centroid, 1 / numVertices)
+
+    // find the farthest vertex from the centroid
+    geometry.contours.forEach((contour) => {
+      contour.forEach((vertex) => {
+        radius = Math.max(radius, vec3.squaredDistance(centroid, vertex))
       })
     })
     radius = Math.sqrt(radius)
   }
 
-  boundingSphere = [centroid, radius]
-  cacheOfBoundingSpheres.set(geometry, boundingSphere)
-
-  return boundingSphere
+  return [centroid, radius]
 }
 
 /**
@@ -131,16 +151,15 @@ const measureBoundingSphereOfGeom3 = (geometry) => {
  * @example
  * let bounds = measureBoundingSphere(cube())
  */
-const measureBoundingSphere = (...geometries) => {
+export const measureBoundingSphere = (...geometries) => {
   geometries = flatten(geometries)
 
   const results = geometries.map((geometry) => {
-    if (path2.isA(geometry)) return measureBoundingSphereOfPath2(geometry)
-    if (geom2.isA(geometry)) return measureBoundingSphereOfGeom2(geometry)
-    if (geom3.isA(geometry)) return measureBoundingSphereOfGeom3(geometry)
+    if (path2.isA(geometry)) return measureCached(geometry, measureBoundingSphereOfPath2)
+    if (geom2.isA(geometry)) return measureCached(geometry, measureBoundingSphereOfGeom2)
+    if (geom3.isA(geometry)) return measureCached(geometry, measureBoundingSphereOfGeom3)
+    if (slice.isA(geometry)) return measureCached(geometry, measureBoundingSphereOfSlice)
     return [[0, 0, 0], 0]
   })
   return results.length === 1 ? results[0] : results
 }
-
-module.exports = measureBoundingSphere

package/src/measurements/measureBoundingSphere.test.js

@@ -1,10 +1,10 @@
-const test = require('ava')
+import test from 'ava'
 
-const { geom2, geom3, path2 } = require('../geometries')
+import { geom2, geom3, path2, slice } from '../geometries/index.js'
 
-const { line, rectangle, ellipsoid } = require('../primitives')
+import { line, rectangle, ellipsoid } from '../primitives/index.js'
 
-const { measureBoundingSphere } = require('./index')
+import { measureBoundingSphere } from './measureBoundingSphere.js'
 
 test('measureBoundingSphere (single objects)', (t) => {
   const aline = line([[10, 10], [15, 15]])
@@ -14,6 +14,7 @@ test('measureBoundingSphere (single objects)', (t) => {
   const apath2 = path2.create()
   const ageom2 = geom2.create()
   const ageom3 = geom3.create()
+  const aslice = slice.create()
 
   const n = null
   const o = {}
@@ -26,6 +27,7 @@ test('measureBoundingSphere (single objects)', (t) => {
   const p2bounds = measureBoundingSphere(apath2)
   const g2bounds = measureBoundingSphere(ageom2)
   const g3bounds = measureBoundingSphere(ageom3)
+  const slbounds = measureBoundingSphere(aslice)
 
   const nbounds = measureBoundingSphere(n)
   const obounds = measureBoundingSphere(o)
@@ -38,6 +40,7 @@ test('measureBoundingSphere (single objects)', (t) => {
   t.deepEqual(p2bounds, [[0, 0, 0], 0])
   t.deepEqual(g2bounds, [[0, 0, 0], 0])
   t.deepEqual(g3bounds, [[0, 0, 0], 0])
+  t.deepEqual(slbounds, [[0, 0, 0], 0])
 
   t.deepEqual(nbounds, [[0, 0, 0], 0])
   t.deepEqual(obounds, [[0, 0, 0], 0])

package/src/measurements/measureCenter.d.ts

@@ -1,7 +1,5 @@
-import { Geometry } from '../geometries/types'
-import RecursiveArray from '../utils/recursiveArray'
+import type { Geometry } from '../geometries/types.d.ts'
+import type { RecursiveArray } from '../utils/recursiveArray.d.ts'
 
-export default measureCenter
-
-declare function measureCenter(geometry: Geometry): [number, number, number]
-declare function measureCenter(...geometries: RecursiveArray<Geometry>): [number, number, number][]
+export function measureCenter(geometry: Geometry): [number, number, number]
+export function measureCenter(...geometries: RecursiveArray<Geometry>): [number, number, number][]

package/src/measurements/measureCenter.js

@@ -1,17 +1,17 @@
-const flatten = require('../utils/flatten')
+import { flatten } from '../utils/flatten.js'
 
-const measureBoundingBox = require('./measureBoundingBox')
+import { measureBoundingBox } from './measureBoundingBox.js'
 
 /**
  * Measure the center of the given geometries.
  * @param {...Object} geometries - the geometries to measure
- * @return {Array} the center point for each geometry, i.e. [X, Y, Z]
+ * @return {Array} the center vertex for each geometry, i.e. [X, Y, Z]
  * @alias module:modeling/measurements.measureCenter
  *
  * @example
  * let center = measureCenter(sphere())
  */
-const measureCenter = (...geometries) => {
+export const measureCenter = (...geometries) => {
   geometries = flatten(geometries)
 
   const results = geometries.map((geometry) => {
@@ -24,5 +24,3 @@ const measureCenter = (...geometries) => {
   })
   return results.length === 1 ? results[0] : results
 }
-
-module.exports = measureCenter

package/src/measurements/measureCenter.test.js

@@ -1,10 +1,10 @@
-const test = require('ava')
+import test from 'ava'
 
-const { geom2, geom3, path2 } = require('../geometries')
+import { geom2, geom3, path2, slice } from '../geometries/index.js'
 
-const { line, rectangle, cuboid } = require('../primitives')
+import { line, rectangle, cuboid } from '../primitives/index.js'
 
-const { measureCenter } = require('./index')
+import { measureCenter } from './index.js'
 
 test('measureCenter (single objects)', (t) => {
   const aline = line([[10, 10], [15, 15]])
@@ -14,6 +14,7 @@ test('measureCenter (single objects)', (t) => {
   const apath2 = path2.create()
   const ageom2 = geom2.create()
   const ageom3 = geom3.create()
+  const aslice = slice.create()
 
   const n = null
   const o = {}
@@ -26,6 +27,7 @@ test('measureCenter (single objects)', (t) => {
   const p2center = measureCenter(apath2)
   const g2center = measureCenter(ageom2)
   const g3center = measureCenter(ageom3)
+  const slcenter = measureCenter(aslice)
 
   const ncenter = measureCenter(n)
   const ocenter = measureCenter(o)
@@ -38,6 +40,7 @@ test('measureCenter (single objects)', (t) => {
   t.deepEqual(p2center, [0, 0, 0])
   t.deepEqual(g2center, [0, 0, 0])
   t.deepEqual(g3center, [0, 0, 0])
+  t.deepEqual(slcenter, [0, 0, 0])
 
   t.deepEqual(ncenter, [0, 0, 0])
   t.deepEqual(ocenter, [0, 0, 0])

package/src/measurements/measureCenterOfMass.d.ts

@@ -1,7 +1,5 @@
-import { Geometry } from '../geometries/types'
-import RecursiveArray from '../utils/recursiveArray'
+import type { Geometry } from '../geometries/types.d.ts'
+import type { RecursiveArray } from '../utils/recursiveArray.d.ts'
 
-export default measureCenterOfMass
-
-declare function measureCenterOfMass(geometry: Geometry): [number, number, number]
-declare function measureCenterOfMass(...geometries: RecursiveArray<Geometry>): [number, number, number][]
+export function measureCenterOfMass(geometry: Geometry): [number, number, number]
+export function measureCenterOfMass(...geometries: RecursiveArray<Geometry>): [number, number, number][]

package/src/measurements/measureCenterOfMass.js

@@ -1,16 +1,16 @@
-const flatten = require('../utils/flatten')
+import { flatten } from '../utils/flatten.js'
 
-const vec3 = require('../maths/vec3')
+import * as vec3 from '../maths/vec3/index.js'
 
-const geom2 = require('../geometries/geom2')
-const geom3 = require('../geometries/geom3')
+import * as geom2 from '../geometries/geom2/index.js'
+import * as geom3 from '../geometries/geom3/index.js'
 
 const cacheOfCenterOfMass = new WeakMap()
 
 /*
  * Measure the center of mass for the given geometry.
  *
- * @see http://paulbourke.net/geometry/polygonmesh/
+ * @see https://paulbourke.net/geometry/polygonmesh/
  * @return {Array} the center of mass for the geometry
  */
 const measureCenterOfMassGeom2 = (geometry) => {
@@ -91,7 +91,7 @@ const measureCenterOfMassGeom3 = (geometry) => {
  * @example
  * let center = measureCenterOfMass(sphere())
  */
-const measureCenterOfMass = (...geometries) => {
+export const measureCenterOfMass = (...geometries) => {
   geometries = flatten(geometries)
 
   const results = geometries.map((geometry) => {
@@ -102,5 +102,3 @@ const measureCenterOfMass = (...geometries) => {
   })
   return results.length === 1 ? results[0] : results
 }
-
-module.exports = measureCenterOfMass

package/src/measurements/measureCenterOfMass.test.js

@@ -1,10 +1,10 @@
-const test = require('ava')
+import test from 'ava'
 
-const { geom2, geom3, path2 } = require('../geometries')
+import { geom2, geom3, path2, slice } from '../geometries/index.js'
 
-const { ellipsoid, line, rectangle, cuboid } = require('../primitives')
+import { ellipsoid, line, rectangle, cuboid } from '../primitives/index.js'
 
-const { measureCenterOfMass } = require('./index')
+import { measureCenterOfMass } from './measureCenterOfMass.js'
 
 test('measureCenterOfMass (single objects)', (t) => {
   const aline = line([[10, 10], [15, 15]])
@@ -14,6 +14,7 @@ test('measureCenterOfMass (single objects)', (t) => {
   const apath2 = path2.create()
   const ageom2 = geom2.create()
   const ageom3 = geom3.create()
+  const aslice = slice.create()
 
   const n = null
   const o = {}
@@ -26,6 +27,7 @@ test('measureCenterOfMass (single objects)', (t) => {
   const p2center = measureCenterOfMass(apath2)
   const g2center = measureCenterOfMass(ageom2)
   const g3center = measureCenterOfMass(ageom3)
+  const slcenter = measureCenterOfMass(aslice)
 
   const ncenter = measureCenterOfMass(n)
   const ocenter = measureCenterOfMass(o)
@@ -38,6 +40,7 @@ test('measureCenterOfMass (single objects)', (t) => {
   t.deepEqual(p2center, [0, 0, 0])
   t.deepEqual(g2center, [0, 0, 0])
   t.deepEqual(g3center, [0, 0, 0])
+  t.deepEqual(slcenter, [0, 0, 0])
 
   t.deepEqual(ncenter, [0, 0, 0])
   t.deepEqual(ocenter, [0, 0, 0])

package/src/measurements/measureDimensions.d.ts

@@ -1,7 +1,5 @@
-import { Geometry } from '../geometries/types'
-import RecursiveArray from '../utils/recursiveArray'
+import type { Geometry } from '../geometries/types.d.ts'
+import type { RecursiveArray } from '../utils/recursiveArray.d.ts'
 
-export default measureDimensions
-
-declare function measureDimensions(geometry: Geometry): [number, number, number]
-declare function measureDimensions(...geometries: RecursiveArray<Geometry>): [number, number, number][]
+export function measureDimensions(geometry: Geometry): [number, number, number]
+export function measureDimensions(...geometries: RecursiveArray<Geometry>): [number, number, number][]

package/src/measurements/measureDimensions.js

@@ -1,6 +1,6 @@
-const flatten = require('../utils/flatten')
+import { flatten } from '../utils/flatten.js'
 
-const measureBoundingBox = require('./measureBoundingBox')
+import { measureBoundingBox } from './measureBoundingBox.js'
 
 /**
  * Measure the dimensions of the given geometries.
@@ -11,7 +11,7 @@ const measureBoundingBox = require('./measureBoundingBox')
  * @example
  * let dimensions = measureDimensions(sphere())
  */
-const measureDimensions = (...geometries) => {
+export const measureDimensions = (...geometries) => {
   geometries = flatten(geometries)
 
   const results = geometries.map((geometry) => {
@@ -24,5 +24,3 @@ const measureDimensions = (...geometries) => {
   })
   return results.length === 1 ? results[0] : results
 }
-
-module.exports = measureDimensions

package/src/measurements/measureDimensions.test.js

@@ -1,10 +1,10 @@
-const test = require('ava')
+import test from 'ava'
 
-const { geom2, geom3, path2 } = require('../geometries')
+import { geom2, geom3, path2, slice } from '../geometries/index.js'
 
-const { line, rectangle, cuboid } = require('../primitives')
+import { line, rectangle, cuboid } from '../primitives/index.js'
 
-const { measureDimensions } = require('./index')
+import { measureDimensions } from './measureDimensions.js'
 
 test('measureDimensions (single objects)', (t) => {
   const aline = line([[10, 10], [15, 15]])
@@ -14,6 +14,7 @@ test('measureDimensions (single objects)', (t) => {
   const apath2 = path2.create()
   const ageom2 = geom2.create()
   const ageom3 = geom3.create()
+  const aslice = slice.create()
 
   const n = null
   const o = {}
@@ -26,6 +27,7 @@ test('measureDimensions (single objects)', (t) => {
   const p2bounds = measureDimensions(apath2)
   const g2bounds = measureDimensions(ageom2)
   const g3bounds = measureDimensions(ageom3)
+  const slbounds = measureDimensions(aslice)
 
   const nbounds = measureDimensions(n)
   const obounds = measureDimensions(o)
@@ -38,6 +40,7 @@ test('measureDimensions (single objects)', (t) => {
   t.deepEqual(p2bounds, [0, 0, 0])
   t.deepEqual(g2bounds, [0, 0, 0])
   t.deepEqual(g3bounds, [0, 0, 0])
+  t.deepEqual(slbounds, [0, 0, 0])
 
   t.deepEqual(nbounds, [0, 0, 0])
   t.deepEqual(obounds, [0, 0, 0])

package/src/measurements/measureEpsilon.d.ts

@@ -1,8 +1,6 @@
-import { Geometry } from '../geometries/types'
-import RecursiveArray from '../utils/recursiveArray'
+import type { Geometry } from '../geometries/types.d.ts'
+import type { RecursiveArray } from '../utils/recursiveArray.d.ts'
 
-export default measureEpsilon
-
-declare function measureEpsilon(geometry: Geometry): number
-declare function measureEpsilon(geometry: any): 0
-declare function measureEpsilon(...geometries: RecursiveArray<Geometry | any>): Array<number>
+export function measureEpsilon(geometry: Geometry): number
+export function measureEpsilon(geometry: any): 0
+export function measureEpsilon(...geometries: RecursiveArray<Geometry | any>): Array<number>

package/src/measurements/measureEpsilon.js

@@ -1,48 +1,32 @@
-const flatten = require('../utils/flatten')
-const { geom2, geom3, path2 } = require('../geometries')
+import { flatten } from '../utils/flatten.js'
 
-const calculateEpsilonFromBounds = require('./calculateEpsilonFromBounds')
-const measureBoundingBox = require('./measureBoundingBox')
+import * as geom2 from '../geometries/geom2/index.js'
+import * as geom3 from '../geometries/geom3/index.js'
+import * as path2 from '../geometries/path2/index.js'
+import * as slice from '../geometries/slice/index.js'
 
-/*
- * Measure the epsilon of the given (path2) geometry.
- * @return {Number} the epsilon (precision) of the geometry
- */
-const measureEpsilonOfPath2 = (geometry) => calculateEpsilonFromBounds(measureBoundingBox(geometry), 2)
-
-/*
- * Measure the epsilon of the given (geom2) geometry.
- * @return {Number} the epsilon (precision) of the geometry
- */
-const measureEpsilonOfGeom2 = (geometry) => calculateEpsilonFromBounds(measureBoundingBox(geometry), 2)
-
-/*
- * Measure the epsilon of the given (geom3) geometry.
- * @return {Float} the epsilon (precision) of the geometry
- */
-const measureEpsilonOfGeom3 = (geometry) => calculateEpsilonFromBounds(measureBoundingBox(geometry), 3)
+import { calculateEpsilonFromBounds } from './calculateEpsilonFromBounds.js'
+import { measureBoundingBox } from './measureBoundingBox.js'
 
 /**
  * Measure the epsilon of the given geometries.
- * Epsilon values are used in various functions to determine minimum distances between points, planes, etc.
+ * Epsilon values are used in various functions to determine minimum distances between vertices, planes, etc.
  * @param {...Object} geometries - the geometries to measure
- * @return {Number|Array} the epsilon, or a list of epsilons for each geometry
+ * @return {number|Array} the epsilon, or a list of epsilons for each geometry
  * @alias module:modeling/measurements.measureEpsilon
  *
  * @example
  * let epsilon = measureEpsilon(sphere())
  */
-const measureEpsilon = (...geometries) => {
+export const measureEpsilon = (...geometries) => {
   geometries = flatten(geometries)
-  if (geometries.length === 0) throw new Error('wrong number of arguments')
 
   const results = geometries.map((geometry) => {
-    if (path2.isA(geometry)) return measureEpsilonOfPath2(geometry)
-    if (geom2.isA(geometry)) return measureEpsilonOfGeom2(geometry)
-    if (geom3.isA(geometry)) return measureEpsilonOfGeom3(geometry)
+    if (path2.isA(geometry)) return calculateEpsilonFromBounds(measureBoundingBox(geometry), 2)
+    if (geom2.isA(geometry)) return calculateEpsilonFromBounds(measureBoundingBox(geometry), 2)
+    if (geom3.isA(geometry)) return calculateEpsilonFromBounds(measureBoundingBox(geometry), 3)
+    if (slice.isA(geometry)) return calculateEpsilonFromBounds(measureBoundingBox(geometry), 3)
     return 0
   })
   return results.length === 1 ? results[0] : results
 }
-
-module.exports = measureEpsilon