@jscad/modeling 2.9.4 → 2.10.0

package/src/primitives/torus.test.js

@@ -2,6 +2,8 @@ const test = require('ava')
 
 const geom3 = require('../geometries/geom3')
 const measureBoundingBox = require('../measurements/measureBoundingBox')
+const { TAU } = require('../maths/constants')
+
 const comparePoints = require('../../test/helpers/comparePoints')
 
 const { torus } = require('./index')
@@ -15,7 +17,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,24 +28,29 @@ 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))
 })
 
 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 obs = torus({ innerRadius: 1, outerRadius: 5, innerSegments: 32, outerSegments: 72, startAngle: TAU / 4, outerRotation: TAU / 4 })
   const pts = geom3.toPoints(obs)
   t.notThrows(() => geom3.validate(obs))
   t.is(pts.length, 1212)
 
   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 + TAU })
+  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 })
+  const obs = torus({ innerSegments: 4, outerSegments: 4, innerRotation: TAU / 4 })
 
   const bounds = measureBoundingBox(obs)
   const expectedBounds = [[-5, -5, -1], [5, 5, 1]]

package/src/primitives/triangle.test.js

@@ -4,6 +4,7 @@ const { triangle } = require('./index')
 
 const degToRad = require('../utils/degToRad')
 const geom2 = require('../geometries/geom2')
+const { TAU } = require('../maths/constants')
 
 const comparePoints = require('../../test/helpers/comparePoints')
 
@@ -36,7 +37,7 @@ test('triangle (options)', (t) => {
   t.true(comparePoints(obs, exp))
 
   // test AAA
-  geometry = triangle({ type: 'AAA', values: [Math.PI / 2, Math.PI / 4, Math.PI / 4] })
+  geometry = triangle({ type: 'AAA', values: [TAU / 4, TAU / 8, TAU / 8] })
   obs = geom2.toPoints(geometry)
   exp = [
     [0, 0],

package/src/utils/degToRad.test.js

@@ -1,19 +1,19 @@
 const test = require('ava')
 
+const { TAU } = require('../maths/constants')
+
 const { degToRad } = require('./index')
 
 test('utils: degToRad() should return correct values', (t) => {
-  const radians = Math.PI / 180
-
   const obs1 = degToRad(0)
   t.true(obs1 === 0)
 
   const obs2 = degToRad(90)
-  t.true(obs2 === (90 * radians))
+  t.true(obs2 === (TAU / 4))
 
   const obs3 = degToRad(180)
-  t.true(obs3 === (180 * radians))
+  t.true(obs3 === (TAU / 2))
 
   const obs4 = degToRad(270)
-  t.true(obs4 === (270 * radians))
+  t.true(obs4 === (TAU * 0.75))
 })

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/utils/radToDeg.test.js

@@ -1,19 +1,19 @@
 const test = require('ava')
 
+const { TAU } = require('../maths/constants')
+
 const { radToDeg } = require('./index')
 
 test('utils: radToDeg() should return correct values', (t) => {
-  const radians = Math.PI / 180
-
-  const obs1 = radToDeg(radians * 0)
+  const obs1 = radToDeg(0)
   t.true(obs1 === 0)
 
-  const obs2 = radToDeg(radians * 90)
+  const obs2 = radToDeg(TAU / 4)
   t.true(obs2 === 90)
 
-  const obs3 = radToDeg(radians * 180)
+  const obs3 = radToDeg(TAU / 2)
   t.true(obs3 === 180)
 
-  const obs4 = radToDeg(radians * 270)
+  const obs4 = radToDeg(TAU * 0.75)
   t.true(obs4 === 270)
 })

package/src/utils/radiusToSegments.js

@@ -1,14 +1,16 @@
+const { TAU } = require('../maths/constants')
+
 /**
  * Calculate the number of segments from the given radius based on minimum length or angle.
  * @param {Number} radius - radius of the requested shape
- * @param {Number} minimumLength - minimum length of segments; 0 > length
- * @param {Number} minimumAngle - minimum angle (radians) between segments; 0 > angle < Math.PI * 2
+ * @param {Number} minimumLength - minimum length of segments; length > 0
+ * @param {Number} minimumAngle - minimum angle (radians) between segments; 0 > angle < TAU
  * @returns {Number} number of segments to complete the radius
  * @alias module:modeling/utils.radiusToSegments
  */
 const radiusToSegments = (radius, minimumLength, minimumAngle) => {
-  const ss = minimumLength > 0 ? radius * 2 * Math.PI / minimumLength : 0
-  const as = minimumAngle > 0 ? Math.PI * 2 / minimumAngle : 0
+  const ss = minimumLength > 0 ? radius * TAU / minimumLength : 0
+  const as = minimumAngle > 0 ? TAU / minimumAngle : 0
   // minimum segments is four(4) for round primitives
   return Math.ceil(Math.max(ss, as, 4))
 }

package/src/utils/radiusToSegments.test.js

@@ -1,5 +1,7 @@
 const test = require('ava')
 
+const { TAU } = require('../maths/constants')
+
 const { radiusToSegments } = require('./index')
 
 test('utils: radiusToSegments() should return correct values', (t) => {
@@ -14,13 +16,13 @@ test('utils: radiusToSegments() should return correct values', (t) => {
   segments = radiusToSegments(100.0, 2.0, 0)
   t.is(segments, 315)
 
-  segments = radiusToSegments(100.0, 0, Math.PI * 2 / 20.0)
+  segments = radiusToSegments(100.0, 0, TAU / 20.0)
   t.is(segments, 20.0)
 
   // test minimum length versus minimum angle
-  segments = radiusToSegments(100.0, 31, Math.PI * 2 / 20.0)
+  segments = radiusToSegments(100.0, 31, TAU / 20.0)
   t.is(segments, 21.0)
 
-  segments = radiusToSegments(100.0, 32, Math.PI * 2 / 20.0)
+  segments = radiusToSegments(100.0, 32, TAU / 20.0)
   t.is(segments, 20.0)
 })

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