@jscad/modeling 2.9.4 → 2.9.5

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

@@ -22,18 +22,18 @@ test('extrudeRotate: (angle) extruding of a geom2 produces an expected geom3', (
   let geometry3 = extrudeRotate({ segments: 4, angle: Math.PI / 4 }, geometry2)
   let pts = geom3.toPoints(geometry3)
   const exp = [
-    [[10, 4.898587196589413e-16, 8], [26, 4.898587196589413e-16, 8], [18.38477631085024, 18.384776310850235, 8]],
-    [[10, 4.898587196589413e-16, 8], [18.38477631085024, 18.384776310850235, 8], [7.0710678118654755, 7.071067811865475, 8]],
-    [[10, -4.898587196589413e-16, -8], [10, 4.898587196589413e-16, 8], [7.0710678118654755, 7.071067811865475, 8]],
-    [[10, -4.898587196589413e-16, -8], [7.0710678118654755, 7.071067811865475, 8], [7.0710678118654755, 7.071067811865475, -8]],
-    [[26, -4.898587196589413e-16, -8], [10, -4.898587196589413e-16, -8], [7.0710678118654755, 7.071067811865475, -8]],
-    [[26, -4.898587196589413e-16, -8], [7.0710678118654755, 7.071067811865475, -8], [18.38477631085024, 18.384776310850235, -8]],
-    [[26, 4.898587196589413e-16, 8], [26, -4.898587196589413e-16, -8], [18.38477631085024, 18.384776310850235, -8]],
-    [[26, 4.898587196589413e-16, 8], [18.38477631085024, 18.384776310850235, -8], [18.38477631085024, 18.384776310850235, 8]],
-    [[7.071067811865476, 7.0710678118654755, -8], [7.071067811865476, 7.0710678118654755, 8], [18.384776310850242, 18.384776310850235, 8]],
-    [[18.384776310850242, 18.384776310850235, 8], [18.384776310850242, 18.384776310850235, -8], [7.071067811865476, 7.0710678118654755, -8]],
-    [[26, 4.898587196589413e-16, 8], [10, 4.898587196589413e-16, 8], [10, -4.898587196589413e-16, -8]],
-    [[10, -4.898587196589413e-16, -8], [26, -4.898587196589413e-16, -8], [26, 4.898587196589413e-16, 8]]
+    [[10, 0, 8], [26, 0, 8], [18.38477631085024, 18.384776310850235, 8]],
+    [[10, 0, 8], [18.38477631085024, 18.384776310850235, 8], [7.0710678118654755, 7.071067811865475, 8]],
+    [[10, 0, -8], [10, 0, 8], [7.0710678118654755, 7.071067811865475, 8]],
+    [[10, 0, -8], [7.0710678118654755, 7.071067811865475, 8], [7.0710678118654755, 7.071067811865475, -8]],
+    [[26, 0, -8], [10, 0, -8], [7.0710678118654755, 7.071067811865475, -8]],
+    [[26, 0, -8], [7.0710678118654755, 7.071067811865475, -8], [18.38477631085024, 18.384776310850235, -8]],
+    [[26, 0, 8], [26, 0, -8], [18.38477631085024, 18.384776310850235, -8]],
+    [[26, 0, 8], [18.38477631085024, 18.384776310850235, -8], [18.38477631085024, 18.384776310850235, 8]],
+    [[7.0710678118654755, 7.071067811865475, -8], [7.0710678118654755, 7.071067811865475, 8], [18.38477631085024, 18.384776310850235, 8]],
+    [[18.38477631085024, 18.384776310850235, 8], [18.38477631085024, 18.384776310850235, -8], [7.0710678118654755, 7.071067811865475, -8]],
+    [[26, 0, 8], [10, 0, 8], [10, 0, -8]],
+    [[10, 0, -8], [26, 0, -8], [26, 0, 8]]
   ]
   t.notThrows(() => geom3.validate(geometry3))
   t.is(pts.length, 12)
@@ -95,14 +95,14 @@ test('extrudeRotate: (segments) extruding of a geom2 produces an expected geom3'
   geometry2 = geom2.fromPoints([[0, 0], [2, 1], [1, 2], [1, 3], [3, 4], [0, 5]])
   geometry3 = extrudeRotate({ segments: 8 }, geometry2)
   pts = geom3.toPoints(geometry3)
-  t.notThrows.skip(() => geom3.validate(geometry3))
+  t.notThrows(() => geom3.validate(geometry3))
   t.is(pts.length, 64)
 
   // test overlapping edges that produce hollow shape
   geometry2 = geom2.fromPoints([[30, 0], [30, 60], [0, 60], [0, 50], [10, 40], [10, 30], [0, 20], [0, 10], [10, 0]])
   geometry3 = extrudeRotate({ segments: 8 }, geometry2)
   pts = geom3.toPoints(geometry3)
-  t.notThrows.skip(() => geom3.validate(geometry3))
+  t.notThrows(() => geom3.validate(geometry3))
   t.is(pts.length, 80)
 })
 
@@ -113,16 +113,16 @@ test('extrudeRotate: (overlap +/-) extruding of a geom2 produces an expected geo
   let obs = extrudeRotate({ segments: 4, angle: Math.PI / 2 }, geometry)
   let pts = geom3.toPoints(obs)
   let exp = [
-    [[0, 4.898587196589413e-16, 8], [7, 4.898587196589413e-16, 8], [-6.123233995736767e-17, 7, 8]],
-    [[7, -4.898587196589413e-16, -8], [4.898587196589413e-16, -2.999519565323715e-32, -8], [9.184850993605148e-16, 7, -8]],
-    [[7, 4.898587196589413e-16, 8], [7, -4.898587196589413e-16, -8], [9.184850993605148e-16, 7, -8]],
-    [[7, 4.898587196589413e-16, 8], [9.184850993605148e-16, 7, -8], [-6.123233995736767e-17, 7, 8]],
-    [[4.898587196589413e-16, -2.999519565323715e-32, -8], [-4.898587196589413e-16, 2.999519565323715e-32, 8], [-6.123233995736767e-17, 7, 8]],
-    [[-6.123233995736767e-17, 7, 8], [9.184850993605148e-16, 7, -8], [4.898587196589413e-16, -2.999519565323715e-32, -8]],
-    [[7, 4.898587196589413e-16, 8], [0, 4.898587196589413e-16, 8], [0, -4.898587196589413e-16, -8]],
-    [[0, -4.898587196589413e-16, -8], [7, -4.898587196589413e-16, -8], [7, 4.898587196589413e-16, 8]]
+    [[0, 0, 8], [7, 0, 8], [0, 7, 8]],
+    [[7, 0, -8], [0, 0, -8], [0, 7, -8]],
+    [[7, 0, 8], [7, 0, -8], [0, 7, -8]],
+    [[7, 0, 8], [0, 7, -8], [0, 7, 8]],
+    [[0, 0, -8], [0, 0, 8], [0, 7, 8]],
+    [[0, 7, 8], [0, 7, -8], [0, 0, -8]],
+    [[7, 0, 8], [0, 0, 8], [0, 0, -8]],
+    [[0, 0, -8], [7, 0, -8], [7, 0, 8]]
   ]
-  t.notThrows.skip(() => geom3.validate(obs))
+  t.notThrows(() => geom3.validate(obs))
   t.is(pts.length, 8)
   t.true(comparePolygonsAsPoints(pts, exp))
 
@@ -132,26 +132,26 @@ test('extrudeRotate: (overlap +/-) extruding of a geom2 produces an expected geo
   obs = extrudeRotate({ segments: 8, angle: Math.PI / 2 }, geometry)
   pts = geom3.toPoints(obs)
   exp = [
-    [[1, -4.898587196589413e-16, -8], [3.4638242249419727e-16, -3.4638242249419736e-16, -8], [0.7071067811865479, 0.7071067811865471, -8]],
-    [[2, 2.4492935982947064e-16, 4], [1, -4.898587196589413e-16, -8], [0.7071067811865479, 0.7071067811865471, -8]],
-    [[2, 2.4492935982947064e-16, 4], [0.7071067811865479, 0.7071067811865471, -8], [1.414213562373095, 1.4142135623730951, 4]],
-    [[1, 4.898587196589413e-16, 8], [2, 2.4492935982947064e-16, 4], [1.414213562373095, 1.4142135623730951, 4]],
-    [[1, 4.898587196589413e-16, 8], [1.414213562373095, 1.4142135623730951, 4], [0.7071067811865472, 0.7071067811865478, 8]],
-    [[0, 4.898587196589413e-16, 8], [1, 4.898587196589413e-16, 8], [0.7071067811865472, 0.7071067811865478, 8]],
-    [[0.7071067811865479, 0.7071067811865471, -8], [4.898587196589413e-16, -2.999519565323715e-32, -8], [5.51091059616309e-16, 1, -8]],
-    [[1.414213562373095, 1.4142135623730951, 4], [0.7071067811865479, 0.7071067811865471, -8], [5.51091059616309e-16, 1, -8]],
-    [[1.414213562373095, 1.4142135623730951, 4], [5.51091059616309e-16, 1, -8], [-1.2246467991473532e-16, 2, 4]],
-    [[0.7071067811865472, 0.7071067811865478, 8], [1.414213562373095, 1.4142135623730951, 4], [-1.2246467991473532e-16, 2, 4]],
-    [[0.7071067811865472, 0.7071067811865478, 8], [-1.2246467991473532e-16, 2, 4], [-4.286263797015736e-16, 1, 8]],
-    [[-3.4638242249419727e-16, 3.4638242249419736e-16, 8], [0.7071067811865472, 0.7071067811865478, 8], [-4.286263797015736e-16, 1, 8]],
-    [[5.51091059616309e-16, 1, -8], [4.898587196589413e-16, -2.999519565323715e-32, -8], [-4.898587196589415e-16, 2.9995195653237163e-32, 8]],
-    [[-4.898587196589415e-16, 2.9995195653237163e-32, 8], [-4.286263797015738e-16, 1, 8], [-1.2246467991473544e-16, 2, 4]],
-    [[-1.2246467991473544e-16, 2, 4], [5.51091059616309e-16, 1, -8], [-4.898587196589415e-16, 2.9995195653237163e-32, 8]],
-    [[0, 4.898587196589413e-16, 8], [0, -4.898587196589413e-16, -8], [1, -4.898587196589413e-16, -8]],
-    [[2, 2.4492935982947064e-16, 4], [1, 4.898587196589413e-16, 8], [0, 4.898587196589413e-16, 8]],
-    [[0, 4.898587196589413e-16, 8], [1, -4.898587196589413e-16, -8], [2, 2.4492935982947064e-16, 4]]
+    [[1, 0, -8], [0, 0, -8], [0.7071067811865476, 0.7071067811865475, -8]],
+    [[2, 0, 4], [1, 0, -8], [0.7071067811865476, 0.7071067811865475, -8]],
+    [[2, 0, 4], [0.7071067811865476, 0.7071067811865475, -8], [1.4142135623730951, 1.414213562373095, 4]],
+    [[1, 0, 8], [2, 0, 4], [1.4142135623730951, 1.414213562373095, 4]],
+    [[1, 0, 8], [1.4142135623730951, 1.414213562373095, 4], [0.7071067811865476, 0.7071067811865475, 8]],
+    [[0, 0, 8], [1, 0, 8], [0.7071067811865476, 0.7071067811865475, 8]],
+    [[0.7071067811865476, 0.7071067811865475, -8], [0, 0, -8], [0, 1, -8]],
+    [[1.4142135623730951, 1.414213562373095, 4], [0.7071067811865476, 0.7071067811865475, -8], [0, 1, -8]],
+    [[1.4142135623730951, 1.414213562373095, 4], [0, 1, -8], [0, 2, 4]],
+    [[0.7071067811865476, 0.7071067811865475, 8], [1.4142135623730951, 1.414213562373095, 4], [0, 2, 4]],
+    [[0.7071067811865476, 0.7071067811865475, 8], [0, 2, 4], [0, 1, 8]],
+    [[0, 0, 8], [0.7071067811865476, 0.7071067811865475, 8], [0, 1, 8]],
+    [[0, 1, -8], [0, 0, -8], [0, 0, 8]],
+    [[0, 0, 8], [0, 1, 8], [0, 2, 4]],
+    [[0, 2, 4], [0, 1, -8], [0, 0, 8]],
+    [[0, 0, 8], [0, 0, -8], [1, 0, -8]],
+    [[2, 0, 4], [1, 0, 8], [0, 0, 8]],
+    [[0, 0, 8], [1, 0, -8], [2, 0, 4]]
   ]
-  t.notThrows.skip(() => geom3.validate(obs))
+  t.notThrows(() => geom3.validate(obs))
   t.is(pts.length, 18)
   t.true(comparePolygonsAsPoints(pts, exp))
 })

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

@@ -29,10 +29,10 @@ test('project (defaults)', (t) => {
     [0, -5.000013333333333],
     [5.000013333333333, 0],
     [-5.000013333333333, 0],
-    [-2.9999933333333333, 0],
-    [2.9999933333333333, 0],
     [0, 2.9999933333333333],
+    [-2.9999933333333333, 0],
     [0, -2.9999933333333333],
+    [2.9999933333333333, 0],
     [0, 5.000013333333333]
   ]
   t.true(comparePoints(pts, exp))

package/src/operations/extrusions/slice/repair.js

@@ -40,7 +40,7 @@ const repair = (slice) => {
     let bestReplacement
     missingOut.forEach((key2) => {
       const v2 = vertexMap.get(key2)
-      const distance = Math.hypot(v1[0] - v2[0], v1[1] - v2[1])
+      const distance = vec3.distance(v1, v2)
       if (distance < bestDistance) {
         bestDistance = distance
         bestReplacement = v2

package/src/primitives/circle.test.js

@@ -123,6 +123,13 @@ test('circle (options)', (t) => {
   t.deepEqual(pts.length, 6)
   t.true(comparePoints(pts, exp))
 
+  // test full rotation with non-zero startAngle
+  geometry = circle({ startAngle: 1, endAngle: 1 + 2 * Math.PI })
+  pts = geom2.toPoints(geometry)
+
+  t.notThrows(() => geom2.validate(geometry))
+  t.deepEqual(pts.length, 32)
+
   // test segments
   geometry = circle({ radius: 3.5, segments: 5 })
   pts = geom2.toPoints(geometry)

package/src/primitives/cylinderElliptic.js

@@ -5,7 +5,7 @@ const vec3 = require('../maths/vec3')
 const geom3 = require('../geometries/geom3')
 const poly3 = require('../geometries/poly3')
 
-const { sin, cos } = require('../utils/trigonometry')
+const { sin, cos } = require('../maths/utils/trigonometry')
 
 const { isGT, isGTE, isNumberArray } = require('./commonChecks')
 
@@ -96,7 +96,9 @@ const cylinderElliptic = (options) => {
   const polygons = []
   for (let i = 0; i < slices; i++) {
     const t0 = i / slices
-    const t1 = (i + 1) / slices
+    let t1 = (i + 1) / slices
+    // fix rounding error when rotating 2 * PI radians
+    if (rotation === 2 * Math.PI && i === slices - 1) t1 = 0
 
     if (endRadius[0] === startRadius[0] && endRadius[1] === startRadius[1]) {
       polygons.push(fromPoints(start, point(0, t1, endRadius), point(0, t0, endRadius)))

package/src/primitives/cylinderElliptic.test.js

@@ -137,7 +137,13 @@ test('cylinderElliptic (options)', (t) => {
 
   t.notThrows(() => geom3.validate(obs))
   t.is(pts.length, 28)
-  // t.true(comparePolygonsAsPoints(pts, exp))
+
+  // test startAngle and endAngle
+  obs = cylinderElliptic({ startAngle: 1, endAngle: 1 + 2 * Math.PI })
+  pts = geom3.toPoints(obs)
+
+  t.notThrows(() => geom3.validate(obs))
+  t.is(pts.length, 96)
 
   // test segments
   obs = cylinderElliptic({ segments: 8 })

package/src/primitives/ellipse.js

@@ -4,7 +4,7 @@ const vec2 = require('../maths/vec2')
 
 const geom2 = require('../geometries/geom2')
 
-const { sin, cos } = require('../utils/trigonometry')
+const { sin, cos } = require('../maths/utils/trigonometry')
 
 const { isGTE, isNumberArray } = require('./commonChecks')
 

package/src/primitives/ellipse.test.js

@@ -123,6 +123,13 @@ test('ellipse (options)', (t) => {
   t.deepEqual(obs.length, 6)
   t.true(comparePoints(obs, exp))
 
+  // test full rotation with non-zero startAngle
+  geometry = ellipse({ startAngle: 1, endAngle: 1 + 2 * Math.PI })
+  obs = geom2.toPoints(geometry)
+
+  t.notThrows(() => geom2.validate(geometry))
+  t.deepEqual(obs.length, 32)
+
   // test segments
   geometry = ellipse({ segments: 72 })
   obs = geom2.toPoints(geometry)

package/src/primitives/ellipsoid.js

@@ -3,7 +3,7 @@ const vec3 = require('../maths/vec3')
 const geom3 = require('../geometries/geom3')
 const poly3 = require('../geometries/poly3')
 
-const { sin, cos } = require('../utils/trigonometry')
+const { sin, cos } = require('../maths/utils/trigonometry')
 
 const { isGTE, isNumberArray } = require('./commonChecks')
 

package/src/primitives/geodesicSphere.js

@@ -1,4 +1,5 @@
 const mat4 = require('../maths/mat4')
+const vec3 = require('../maths/vec3')
 
 const geom3 = require('../geometries/geom3')
 
@@ -79,7 +80,7 @@ const geodesicSphere = (options) => {
 
         // -- normalize
         for (let k = 0; k < 3; k++) {
-          const r = Math.hypot(q[k][0], q[k][1], q[k][2])
+          const r = vec3.length(q[k])
           for (let l = 0; l < 3; l++) {
             q[k][l] /= r
           }
@@ -95,7 +96,7 @@ const geodesicSphere = (options) => {
 
           // -- normalize
           for (let k = 0; k < 3; k++) {
-            const r = Math.hypot(q[k][0], q[k][1], q[k][2])
+            const r = vec3.length(q[k])
             for (let l = 0; l < 3; l++) {
               q[k][l] /= r
             }

package/src/primitives/roundedCuboid.js

@@ -6,12 +6,14 @@ const vec3 = require('../maths/vec3')
 const geom3 = require('../geometries/geom3')
 const poly3 = require('../geometries/poly3')
 
+const { sin, cos } = require('../maths/utils/trigonometry')
+
 const { isGT, isGTE, isNumberArray } = require('./commonChecks')
 
 const createCorners = (center, size, radius, segments, slice, positive) => {
   const pitch = (Math.PI / 2) * slice / segments
-  const cospitch = Math.cos(pitch)
-  const sinpitch = Math.sin(pitch)
+  const cospitch = cos(pitch)
+  const sinpitch = sin(pitch)
 
   const layersegments = segments - slice
   let layerradius = radius * cospitch

package/src/primitives/roundedCylinder.js

@@ -5,7 +5,7 @@ const vec3 = require('../maths/vec3')
 const geom3 = require('../geometries/geom3')
 const poly3 = require('../geometries/poly3')
 
-const { sin, cos } = require('../utils/trigonometry')
+const { sin, cos } = require('../maths/utils/trigonometry')
 
 const { isGT, isGTE, isNumberArray } = require('./commonChecks')
 

package/src/primitives/torus.test.js

@@ -15,7 +15,6 @@ test('torus (defaults)', (t) => {
 
   const bounds = measureBoundingBox(obs)
   const expectedBounds = [[-5, -5, -1], [5, 5, 1]]
-  t.notThrows(() => geom3.validate(obs))
   t.true(comparePoints(bounds, expectedBounds), 'Bounding box was not as expected: ' + JSON.stringify(bounds))
 })
 
@@ -27,7 +26,6 @@ test('torus (simple options)', (t) => {
 
   const bounds = measureBoundingBox(obs)
   const expectedBounds = [[-5.5, -5.5, -0.5], [5.5, 5.5, 0.5]]
-  t.notThrows(() => geom3.validate(obs))
   t.true(comparePoints(bounds, expectedBounds), 'Bounding box was not as expected: ' + JSON.stringify(bounds))
 })
 
@@ -39,10 +37,16 @@ test('torus (complex options)', (t) => {
 
   const bounds = measureBoundingBox(obs)
   const expectedBounds = [[-6, 0, -1], [0, 6, 1]]
-  t.notThrows(() => geom3.validate(obs))
   t.true(comparePoints(bounds, expectedBounds), 'Bounding box was not as expected: ' + JSON.stringify(bounds))
 })
 
+test('torus (startAngle)', (t) => {
+  const obs = torus({ startAngle: 1, endAngle: 1 + 2 * Math.PI })
+  const pts = geom3.toPoints(obs)
+  t.notThrows(() => geom3.validate(obs))
+  t.is(pts.length, 2048)
+})
+
 test('torus (square by square)', (t) => {
   const obs = torus({ innerSegments: 4, outerSegments: 4, innerRotation: Math.PI / 2 })
 

package/src/utils/index.d.ts

@@ -5,6 +5,5 @@ export { default as fnNumberSort } from './fnNumberSort'
 export { default as insertSorted } from './insertSorted'
 export { default as radiusToSegments } from './radiusToSegments'
 export { default as radToDeg } from './radToDeg'
-export * from './trigonometry'
 
 export as namespace utils

package/src/utils/index.js

@@ -6,12 +6,10 @@
  */
 module.exports = {
   areAllShapesTheSameType: require('./areAllShapesTheSameType'),
-  cos: require('./trigonometry').cos,
   degToRad: require('./degToRad'),
   flatten: require('./flatten'),
   fnNumberSort: require('./fnNumberSort'),
   insertSorted: require('./insertSorted'),
   radiusToSegments: require('./radiusToSegments'),
-  radToDeg: require('./radToDeg'),
-  sin: require('./trigonometry').sin
+  radToDeg: require('./radToDeg')
 }

package/src/maths/mat4/constants.d.ts

@@ -1 +0,0 @@
-export const EPSILON: number

package/src/maths/mat4/constants.js

@@ -1,5 +0,0 @@
-const EPSILON = 0.000001
-
-module.exports = {
-  EPSILON
-}