@jscad/modeling 3.0.4-alpha.0 → 3.0.6-alpha.0

package/src/primitives/torus.js

@@ -10,6 +10,7 @@ import { isGT, isGTE } from './commonChecks.js'
 
 /**
  * Construct a torus by revolving a small circle (inner) about the circumference of a large (outer) circle.
+ *
  * @param {object} [options] - options for construction
  * @param {number} [options.innerRadius=1] - radius of small (inner) circle
  * @param {number} [options.outerRadius=4] - radius of large (outer) circle
@@ -24,17 +25,16 @@ import { isGT, isGTE } from './commonChecks.js'
  * @example
  * let myshape = torus({ innerRadius: 10, outerRadius: 100 })
  */
-export const torus = (options) => {
-  const defaults = {
-    innerRadius: 1,
-    innerSegments: 32,
-    outerRadius: 4,
-    outerSegments: 32,
-    innerRotation: 0,
-    startAngle: 0,
-    outerRotation: TAU
-  }
-  const { innerRadius, innerSegments, outerRadius, outerSegments, innerRotation, startAngle, outerRotation } = Object.assign({}, defaults, options)
+export const torus = (options = {}) => {
+  const {
+    innerRadius = 1,
+    innerSegments = 32,
+    outerRadius = 4,
+    outerSegments = 32,
+    innerRotation = 0,
+    startAngle = 0,
+    outerRotation = TAU
+  } = options
 
   if (!isGT(innerRadius, 0)) throw new Error('innerRadius must be greater than zero')
   if (!isGTE(innerSegments, 3)) throw new Error('innerSegments must be three or more')

package/src/primitives/triangle.js

@@ -115,7 +115,9 @@ const createTriangle = (A, B, C, a, b, c) => {
 
 /**
  * Construct a triangle in two dimensional space from the given options.
+ *
  * 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
@@ -126,12 +128,11 @@ const createTriangle = (A, B, C, a, b, c) => {
  * @example
  * let myshape = triangle({type: 'AAS', values: [degToRad(62), degToRad(35), 7]})
  */
-export const triangle = (options) => {
-  const defaults = {
-    type: 'SSS',
-    values: [1, 1, 1]
-  }
-  let { type, values } = Object.assign({}, defaults, options)
+export const triangle = (options = {}) => {
+  let {
+    type = 'SSS',
+    values = [1, 1, 1]
+  } = options
 
   if (typeof (type) !== 'string') throw new Error('triangle type must be a string')
   type = type.toUpperCase()

package/src/utils/areAllShapesTheSameType.js

@@ -2,6 +2,8 @@
 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 path3 from '../geometries/path3/index.js'
+import * as slice from '../geometries/slice/index.js'
 
 /**
  * @param {Array} shapes - list of shapes to compare
@@ -15,6 +17,8 @@ export const areAllShapesTheSameType = (shapes) => {
     if (geom2.isA(shape)) currentType = 1
     if (geom3.isA(shape)) currentType = 2
     if (path2.isA(shape)) currentType = 3
+    if (path3.isA(shape)) currentType = 4
+    if (slice.isA(shape)) currentType = 5
 
     if (previousType && currentType !== previousType) return false
     previousType = currentType

package/test/helpers/nearlyEqual.js

@@ -29,4 +29,5 @@ export const nearlyEqual = (t, a, b, epsilon, failMessage) => {
     failMessage = failMessage === undefined ? 'Numbers outside of epsilon' : failMessage
     t.fail(failMessage + '(' + a + ',' + b + ')')
   }
+  return true
 }

package/src/geometries/slice/fromGeom2.d.ts

@@ -1,5 +0,0 @@
-import type { Geom2 } from '../geom2/type.d.ts'
-
-import type { Slice } from './type.d.ts'
-
-export function fromGeom2(geometry: Geom2): Slice

package/src/geometries/slice/fromGeom2.js

@@ -1,17 +0,0 @@
-import * as vec3 from '../../maths/vec3/index.js'
-import { toOutlines } from '../geom2/index.js'
-
-import { create } from './create.js'
-
-/**
- * Create a slice from a geom2.
- *
- * @param {object} geometry - the 2D geometry to create a slice from
- * @returns {Slice} a new slice
- * @alias module:modeling/slice.fromGeom2
- */
-export const fromGeom2 = (geometry) => {
-  // Convert from 2D points to 3D vertices
-  const contours = toOutlines(geometry).map((outline) => outline.map((point) => vec3.fromVec2(vec3.create(), point)))
-  return create(contours)
-}