@jscad/modeling 2.7.1 → 2.9.0

package/src/primitives/ellipsoid.test.js

@@ -145,8 +145,6 @@ test('ellipsoid (options)', (t) => {
   // test segments
   obs = ellipsoid({ segments: 8 })
   pts = geom3.toPoints(obs)
-  exp = [
-  ]
   t.is(pts.length, 32)
 
   obs = ellipsoid({ center: [-3, 5, 7], segments: 8 })

package/src/primitives/geodesicSphere.d.ts

@@ -1,4 +1,3 @@
-import Vec3 from '../maths/vec3/type'
 import Geom3 from '../geometries/geom3/type'
 
 export default geodesicSphere

package/src/primitives/geodesicSphere.js

@@ -79,7 +79,7 @@ const geodesicSphere = (options) => {
 
         // -- normalize
         for (let k = 0; k < 3; k++) {
-          const r = Math.sqrt(q[k][0] * q[k][0] + q[k][1] * q[k][1] + q[k][2] * q[k][2])
+          const r = Math.hypot(q[k][0], q[k][1], q[k][2])
           for (let l = 0; l < 3; l++) {
             q[k][l] /= r
           }
@@ -95,7 +95,7 @@ const geodesicSphere = (options) => {
 
           // -- normalize
           for (let k = 0; k < 3; k++) {
-            const r = Math.sqrt(q[k][0] * q[k][0] + q[k][1] * q[k][1] + q[k][2] * q[k][2])
+            const r = Math.hypot(q[k][0], q[k][1], q[k][2])
             for (let l = 0; l < 3; l++) {
               q[k][l] /= r
             }

package/src/primitives/polyhedron.js

@@ -11,7 +11,7 @@ const { isNumberArray } = require('./commonChecks')
  * @param {Array} options.points - list of points in 3D space
  * @param {Array} options.faces - list of faces, where each face is a set of indexes into the points
  * @param {Array} [options.colors=undefined] - list of RGBA colors to apply to each face
- * @param {Array} [options.orientation='outward'] - orientation of faces
+ * @param {String} [options.orientation='outward'] - orientation of faces
  * @returns {geom3} new 3D geometry
  * @alias module:modeling/primitives.polyhedron
  *

package/src/primitives/roundedCylinder.js

@@ -11,7 +11,7 @@ const { isGT, isGTE, isNumberArray } = require('./commonChecks')
  * Construct a Z axis-aligned solid cylinder in three dimensional space with rounded ends.
  * @param {Object} [options] - options for construction
  * @param {Array} [options.center=[0,0,0]] - center of cylinder
- * @param {Array} [options.height=2] - height of cylinder
+ * @param {Number} [options.height=2] - height of cylinder
  * @param {Number} [options.radius=1] - radius of cylinder
  * @param {Number} [options.roundRadius=0.2] - radius of rounded edges
  * @param {Number} [options.segments=32] - number of segments to create per full rotation

package/src/primitives/torus.d.ts

@@ -1,4 +1,3 @@
-import Vec3 from '../maths/vec3/type'
 import Geom3 from '../geometries/geom3/type'
 
 export default torus

package/src/primitives/torus.test.js

@@ -30,7 +30,7 @@ test('torus (Simple options)', (t) => {
 test('torus (complex options)', (t) => {
   const obs = torus({ innerRadius: 1, outerRadius: 5, innerSegments: 32, outerSegments: 72, startAngle: Math.PI / 2, outerRotation: Math.PI / 2 })
   const pts = geom3.toPoints(obs)
-  t.is(pts.length, 1154)
+  t.is(pts.length, 1212)
 
   const bounds = measureBoundingBox(obs)
   const expectedBounds = [[-6, 0, -1], [0, 6, 1]]

package/src/primitives/triangle.js

@@ -119,7 +119,7 @@ const createTriangle = (A, B, C, a, b, c) => {
  * The triangle is always constructed CCW from the origin, [0, 0, 0].
  * @see https://www.mathsisfun.com/algebra/trig-solving-triangles.html
  * @param {Object} [options] - options for construction
- * @param {String} [options.type='SSS' - type of triangle to construct; A ~ angle, S ~ side
+ * @param {String} [options.type='SSS'] - type of triangle to construct; A ~ angle, S ~ side
  * @param {Array} [options.values=[1,1,1]] - angle (radians) of corners or length of sides
  * @returns {geom2} new 2D geometry
  * @alias module:modeling/primitives.triangle

package/src/text/vectorText.js

@@ -26,7 +26,7 @@ const translateLine = (options, line) => {
  * @param {Float} [options.height=21] - font size (uppercase height)
  * @param {Float} [options.lineSpacing=1.4] - line spacing expressed as a percentage of font size
  * @param {Float} [options.letterSpacing=1] - extra letter spacing expressed as a percentage of font size
- * @param {String} [options.align='left'] - multi-line text alignement: left, center or right
+ * @param {String} [options.align='left'] - multi-line text alignment: left, center, right
  * @param {Float} [options.extrudeOffset=0] - width of the extrusion that will be applied (manually) after the creation of the character
  * @param {String} [options.input='?'] - ascii string (ignored/overwrited if provided as seconds parameter)
  * @param {String} [text='?'] - ascii string
@@ -47,7 +47,7 @@ const vectorText = (options, text) => {
     xOffset, yOffset, input, font, height, align, extrudeOffset, lineSpacing, letterSpacing
   } = vectorParams(options, text)
   let [x, y] = [xOffset, yOffset]
-  let [i, il, char, vect, width, diff] = []
+  let i, il, char, vect, width, diff
   let line = { width: 0, segments: [] }
   const lines = []
   let output = []

package/src/utils/padArrayToLength.js

@@ -3,7 +3,7 @@
  * @param {Array} anArray - the source array to copy into the result.
  * @param {*} padding - the value to add to the new array to reach the desired length.
  * @param {Number} targetLength - The desired length of the return array.
- * @returns {Array} an array of at least 'targetLength" length
+ * @returns {Array} an array of at least 'targetLength' length
  * @alias module:modeling/utils.padArrayToLength
  */
 const padArrayToLength = (anArray, padding, targetLength) => {

package/test/helpers/comparePolygons.js

@@ -8,9 +8,7 @@ const compareVectors = require('./compareVectors')
  */
 const comparePolygons = (poly1, poly2) => {
   if (poly1.vertices.length === poly2.vertices.length) {
-    return poly1.vertices.reduce((valid, vertex, index) => {
-      return valid && compareVectors(poly1.vertices[index], poly2.vertices[index])
-    }, true)
+    return poly1.vertices.reduce((valid, vertex, index) => valid && compareVectors(poly1.vertices[index], poly2.vertices[index]), true)
   }
   return false
 }

package/test/helpers/nearlyEqual.js

@@ -1,7 +1,6 @@
 // Compare two numeric values for near equality.
 // the given test is fails if the numeric values are outside the given epsilon
 const nearlyEqual = (t, a, b, epsilon, failMessage) => {
-// console.log('nearEqual(t,'+a+','+b+','+epsilon+')')
   if (a === b) { // shortcut, also handles infinities and NaNs
     return true
   }
@@ -10,11 +9,9 @@ const nearlyEqual = (t, a, b, epsilon, failMessage) => {
   const absB = Math.abs(b)
   const diff = Math.abs(a - b)
   if (Number.isNaN(diff)) {
-    return false
+    failMessage = failMessage === undefined ? 'difference is not a number' : failMessage
+    t.fail(failMessage + '(' + a + ',' + b + ')')
   }
-  // console.log(absA)
-  // console.log(absB)
-  // console.log(diff)
   if (a === 0 || b === 0 || diff < Number.EPSILON) {
   // a or b is zero or both are extremely close to it
   // relative error is less meaningful here
@@ -25,7 +22,6 @@ const nearlyEqual = (t, a, b, epsilon, failMessage) => {
   }
   // use relative error
   const relative = (diff / Math.min((absA + absB), Number.MAX_VALUE))
-  // console.log(relative)
   if (relative > epsilon) {
     failMessage = failMessage === undefined ? 'Numbers outside of epsilon' : failMessage
     t.fail(failMessage + '(' + a + ',' + b + ')')