@jbroll/jscad-modeling 2.12.7

package/src/primitives/roundedCuboid.test.js

@@ -0,0 +1,248 @@
+const test = require('ava')
+
+const { roundedCuboid } = require('./index')
+
+const geom3 = require('../geometries/geom3')
+
+const comparePolygonsAsPoints = require('../../test/helpers/comparePolygonsAsPoints')
+
+test('roundedCuboid (defaults)', (t) => {
+  const obs = roundedCuboid()
+  const pts = geom3.toPoints(obs)
+
+  t.notThrows(() => geom3.validate(obs))
+  t.deepEqual(pts.length, 614)
+})
+
+test('roundedCuboid (zero size)', (t) => {
+  const obs = roundedCuboid({ size: [1, 1, 0] })
+  const pts = geom3.toPoints(obs)
+  t.notThrows(() => geom3.validate(obs))
+  t.is(pts.length, 0)
+})
+
+test('roundedCuboid (zero radius)', (t) => {
+  const obs = roundedCuboid({ roundRadius: 0 })
+  const pts = geom3.toPoints(obs)
+  t.notThrows(() => geom3.validate(obs))
+  t.deepEqual(pts.length, 6)
+})
+
+test('roundedCuboid (options)', (t) => {
+  // test segments
+  let obs = roundedCuboid({ segments: 8 })
+  let pts = geom3.toPoints(obs)
+  let exp = []
+
+  t.notThrows(() => geom3.validate(obs))
+  t.is(pts.length, 62)
+
+  // test center
+  obs = roundedCuboid({ center: [4, 5, 6], segments: 8 })
+  pts = geom3.toPoints(obs)
+  exp = [
+  ]
+
+  t.notThrows(() => geom3.validate(obs))
+  t.is(pts.length, 62)
+
+  // test size
+  obs = roundedCuboid({ size: [8, 10, 12], segments: 8 })
+  pts = geom3.toPoints(obs)
+  exp = [
+    [[4, 4.8, -5.8], [3.9414213562373095, 4.941421356237309, -5.8],
+      [3.9414213562373095, 4.941421356237309, 5.8], [4, 4.8, 5.8]],
+    [[3.9414213562373095, 4.941421356237309, -5.8], [3.8, 5, -5.8],
+      [3.8, 5, 5.8], [3.9414213562373095, 4.941421356237309, 5.8]],
+    [[3.8, 5, -5.8], [-3.8, 5, -5.8],
+      [-3.8, 5, 5.8], [3.8, 5, 5.8]],
+    [[-3.8, 5, -5.8], [-3.9414213562373095, 4.941421356237309, -5.8],
+      [-3.9414213562373095, 4.941421356237309, 5.8], [-3.8, 5, 5.8]],
+    [[-3.9414213562373095, 4.941421356237309, -5.8], [-4, 4.8, -5.8],
+      [-4, 4.8, 5.8], [-3.9414213562373095, 4.941421356237309, 5.8]],
+    [[-4, 4.8, -5.8], [-4, -4.8, -5.8],
+      [-4, -4.8, 5.8], [-4, 4.8, 5.8]],
+    [[-4, -4.8, -5.8], [-3.9414213562373095, -4.941421356237309, -5.8],
+      [-3.9414213562373095, -4.941421356237309, 5.8], [-4, -4.8, 5.8]],
+    [[-3.9414213562373095, -4.941421356237309, -5.8], [-3.8, -5, -5.8],
+      [-3.8, -5, 5.8], [-3.9414213562373095, -4.941421356237309, 5.8]],
+    [[-3.8, -5, -5.8], [3.8, -5, -5.8],
+      [3.8, -5, 5.8], [-3.8, -5, 5.8]],
+    [[3.8, -5, -5.8], [3.9414213562373095, -4.941421356237309, -5.8],
+      [3.9414213562373095, -4.941421356237309, 5.8], [3.8, -5, 5.8]],
+    [[3.9414213562373095, -4.941421356237309, -5.8], [4, -4.8, -5.8],
+      [4, -4.8, 5.8], [3.9414213562373095, -4.941421356237309, 5.8]],
+    [[4, -4.8, -5.8], [4, 4.8, -5.8],
+      [4, 4.8, 5.8], [4, -4.8, 5.8]],
+    [[4, 4.8, 5.8], [3.9414213562373095, 4.941421356237309, 5.8], [3.9414213562373095, 4.8, 5.94142135623731]],
+    [[3.9414213562373095, 4.8, 5.94142135623731], [3.9414213562373095, 4.941421356237309, 5.8], [3.8, 4.941421356237309, 5.94142135623731]],
+    [[3.9414213562373095, 4.941421356237309, 5.8], [3.8, 5, 5.8], [3.8, 4.941421356237309, 5.94142135623731]],
+    [[-3.8, 5, 5.8], [-3.9414213562373095, 4.941421356237309, 5.8], [-3.8, 4.941421356237309, 5.94142135623731]],
+    [[-3.8, 4.941421356237309, 5.94142135623731], [-3.9414213562373095, 4.941421356237309, 5.8], [-3.9414213562373095, 4.8, 5.94142135623731]],
+    [[-3.9414213562373095, 4.941421356237309, 5.8], [-4, 4.8, 5.8], [-3.9414213562373095, 4.8, 5.94142135623731]],
+    [[-4, -4.8, 5.8], [-3.9414213562373095, -4.941421356237309, 5.8], [-3.9414213562373095, -4.8, 5.94142135623731]],
+    [[-3.9414213562373095, -4.8, 5.94142135623731], [-3.9414213562373095, -4.941421356237309, 5.8], [-3.8, -4.941421356237309, 5.94142135623731]],
+    [[-3.9414213562373095, -4.941421356237309, 5.8], [-3.8, -5, 5.8], [-3.8, -4.941421356237309, 5.94142135623731]],
+    [[3.8, -5, 5.8], [3.9414213562373095, -4.941421356237309, 5.8], [3.8, -4.941421356237309, 5.94142135623731]],
+    [[3.8, -4.941421356237309, 5.94142135623731], [3.9414213562373095, -4.941421356237309, 5.8], [3.9414213562373095, -4.8, 5.94142135623731]],
+    [[3.9414213562373095, -4.941421356237309, 5.8], [4, -4.8, 5.8], [3.9414213562373095, -4.8, 5.94142135623731]],
+    [[3.8, 5, 5.8], [-3.8, 5, 5.8],
+      [-3.8, 4.941421356237309, 5.94142135623731], [3.8, 4.941421356237309, 5.94142135623731]],
+    [[-4, 4.8, 5.8], [-4, -4.8, 5.8],
+      [-3.9414213562373095, -4.8, 5.94142135623731], [-3.9414213562373095, 4.8, 5.94142135623731]],
+    [[-3.8, -5, 5.8], [3.8, -5, 5.8],
+      [3.8, -4.941421356237309, 5.94142135623731], [-3.8, -4.941421356237309, 5.94142135623731]],
+    [[4, -4.8, 5.8], [4, 4.8, 5.8],
+      [3.9414213562373095, 4.8, 5.94142135623731], [3.9414213562373095, -4.8, 5.94142135623731]],
+    [[4, -4.8, -5.8], [3.9414213562373095, -4.941421356237309, -5.8], [3.9414213562373095, -4.8, -5.94142135623731]],
+    [[3.9414213562373095, -4.8, -5.94142135623731], [3.9414213562373095, -4.941421356237309, -5.8], [3.8, -4.941421356237309, -5.94142135623731]],
+    [[3.9414213562373095, -4.941421356237309, -5.8], [3.8, -5, -5.8], [3.8, -4.941421356237309, -5.94142135623731]],
+    [[-3.8, -5, -5.8], [-3.9414213562373095, -4.941421356237309, -5.8], [-3.8, -4.941421356237309, -5.94142135623731]],
+    [[-3.8, -4.941421356237309, -5.94142135623731], [-3.9414213562373095, -4.941421356237309, -5.8], [-3.9414213562373095, -4.8, -5.94142135623731]],
+    [[-3.9414213562373095, -4.941421356237309, -5.8], [-4, -4.8, -5.8], [-3.9414213562373095, -4.8, -5.94142135623731]],
+    [[-4, 4.8, -5.8], [-3.9414213562373095, 4.941421356237309, -5.8], [-3.9414213562373095, 4.8, -5.94142135623731]],
+    [[-3.9414213562373095, 4.8, -5.94142135623731], [-3.9414213562373095, 4.941421356237309, -5.8], [-3.8, 4.941421356237309, -5.94142135623731]],
+    [[-3.9414213562373095, 4.941421356237309, -5.8], [-3.8, 5, -5.8], [-3.8, 4.941421356237309, -5.94142135623731]],
+    [[3.8, 5, -5.8], [3.9414213562373095, 4.941421356237309, -5.8], [3.8, 4.941421356237309, -5.94142135623731]],
+    [[3.8, 4.941421356237309, -5.94142135623731], [3.9414213562373095, 4.941421356237309, -5.8], [3.9414213562373095, 4.8, -5.94142135623731]],
+    [[3.9414213562373095, 4.941421356237309, -5.8], [4, 4.8, -5.8], [3.9414213562373095, 4.8, -5.94142135623731]],
+    [[3.8, -5, -5.8], [-3.8, -5, -5.8],
+      [-3.8, -4.941421356237309, -5.94142135623731], [3.8, -4.941421356237309, -5.94142135623731]],
+    [[-4, -4.8, -5.8], [-4, 4.8, -5.8],
+      [-3.9414213562373095, 4.8, -5.94142135623731], [-3.9414213562373095, -4.8, -5.94142135623731]],
+    [[-3.8, 5, -5.8], [3.8, 5, -5.8],
+      [3.8, 4.941421356237309, -5.94142135623731], [-3.8, 4.941421356237309, -5.94142135623731]],
+    [[4, 4.8, -5.8], [4, -4.8, -5.8],
+      [3.9414213562373095, -4.8, -5.94142135623731], [3.9414213562373095, 4.8, -5.94142135623731]],
+    [[3.9414213562373095, 4.8, 5.94142135623731], [3.8, 4.941421356237309, 5.94142135623731], [3.8, 4.8, 6]],
+    [[-3.8, 4.941421356237309, 5.94142135623731], [-3.9414213562373095, 4.8, 5.94142135623731], [-3.8, 4.8, 6]],
+    [[-3.9414213562373095, -4.8, 5.94142135623731], [-3.8, -4.941421356237309, 5.94142135623731], [-3.8, -4.8, 6]],
+    [[3.8, -4.941421356237309, 5.94142135623731], [3.9414213562373095, -4.8, 5.94142135623731], [3.8, -4.8, 6]],
+    [[3.8, 4.941421356237309, 5.94142135623731], [-3.8, 4.941421356237309, 5.94142135623731],
+      [-3.8, 4.8, 6], [3.8, 4.8, 6]],
+    [[-3.9414213562373095, 4.8, 5.94142135623731], [-3.9414213562373095, -4.8, 5.94142135623731],
+      [-3.8, -4.8, 6], [-3.8, 4.8, 6]],
+    [[-3.8, -4.941421356237309, 5.94142135623731], [3.8, -4.941421356237309, 5.94142135623731],
+      [3.8, -4.8, 6], [-3.8, -4.8, 6]],
+    [[3.9414213562373095, -4.8, 5.94142135623731], [3.9414213562373095, 4.8, 5.94142135623731],
+      [3.8, 4.8, 6], [3.8, -4.8, 6]],
+    [[3.9414213562373095, -4.8, -5.94142135623731], [3.8, -4.941421356237309, -5.94142135623731], [3.8, -4.8, -6]],
+    [[-3.8, -4.941421356237309, -5.94142135623731], [-3.9414213562373095, -4.8, -5.94142135623731], [-3.8, -4.8, -6]],
+    [[-3.9414213562373095, 4.8, -5.94142135623731], [-3.8, 4.941421356237309, -5.94142135623731], [-3.8, 4.8, -6]],
+    [[3.8, 4.941421356237309, -5.94142135623731], [3.9414213562373095, 4.8, -5.94142135623731], [3.8, 4.8, -6]],
+    [[3.8, -4.941421356237309, -5.94142135623731], [-3.8, -4.941421356237309, -5.94142135623731],
+      [-3.8, -4.8, -6], [3.8, -4.8, -6]],
+    [[-3.9414213562373095, -4.8, -5.94142135623731], [-3.9414213562373095, 4.8, -5.94142135623731],
+      [-3.8, 4.8, -6], [-3.8, -4.8, -6]],
+    [[-3.8, 4.941421356237309, -5.94142135623731], [3.8, 4.941421356237309, -5.94142135623731],
+      [3.8, 4.8, -6], [-3.8, 4.8, -6]],
+    [[3.9414213562373095, 4.8, -5.94142135623731], [3.9414213562373095, -4.8, -5.94142135623731],
+      [3.8, -4.8, -6], [3.8, 4.8, -6]],
+    [[3.8, 4.8, 6], [-3.8, 4.8, 6],
+      [-3.8, -4.8, 6], [3.8, -4.8, 6]],
+    [[3.8, -4.8, -6], [-3.8, -4.8, -6],
+      [-3.8, 4.8, -6], [3.8, 4.8, -6]]
+  ]
+  t.notThrows(() => geom3.validate(obs))
+  t.deepEqual(pts.length, 62)
+  t.true(comparePolygonsAsPoints(pts, exp))
+
+  // test roundRadius
+  obs = roundedCuboid({ size: [8, 10, 12], roundRadius: 2, segments: 8 })
+  pts = geom3.toPoints(obs)
+  exp = [
+    [[4, 3, -4], [3.414213562373095, 4.414213562373095, -4],
+      [3.414213562373095, 4.414213562373095, 4], [4, 3, 4]],
+    [[3.414213562373095, 4.414213562373095, -4], [2, 5, -4],
+      [2, 5, 4], [3.414213562373095, 4.414213562373095, 4]],
+    [[2, 5, -4], [-1.9999999999999998, 5, -4],
+      [-1.9999999999999998, 5, 4], [2, 5, 4]],
+    [[-1.9999999999999998, 5, -4], [-3.414213562373095, 4.414213562373095, -4],
+      [-3.414213562373095, 4.414213562373095, 4], [-1.9999999999999998, 5, 4]],
+    [[-3.414213562373095, 4.414213562373095, -4], [-4, 3.0000000000000004, -4],
+      [-4, 3.0000000000000004, 4], [-3.414213562373095, 4.414213562373095, 4]],
+    [[-4, 3.0000000000000004, -4], [-4, -2.9999999999999996, -4],
+      [-4, -2.9999999999999996, 4], [-4, 3.0000000000000004, 4]],
+    [[-4, -2.9999999999999996, -4], [-3.414213562373095, -4.414213562373095, -4],
+      [-3.414213562373095, -4.414213562373095, 4], [-4, -2.9999999999999996, 4]],
+    [[-3.414213562373095, -4.414213562373095, -4], [-2.0000000000000004, -5, -4],
+      [-2.0000000000000004, -5, 4], [-3.414213562373095, -4.414213562373095, 4]],
+    [[-2.0000000000000004, -5, -4], [1.9999999999999996, -5, -4],
+      [1.9999999999999996, -5, 4], [-2.0000000000000004, -5, 4]],
+    [[1.9999999999999996, -5, -4], [3.414213562373095, -4.414213562373095, -4],
+      [3.414213562373095, -4.414213562373095, 4], [1.9999999999999996, -5, 4]],
+    [[3.414213562373095, -4.414213562373095, -4], [4, -3.0000000000000004, -4],
+      [4, -3.0000000000000004, 4], [3.414213562373095, -4.414213562373095, 4]],
+    [[4, -3.0000000000000004, -4], [4, 3, -4],
+      [4, 3, 4], [4, -3.0000000000000004, 4]],
+    [[4, 3, 4], [3.414213562373095, 4.414213562373095, 4], [3.414213562373095, 3, 5.414213562373095]],
+    [[3.414213562373095, 3, 5.414213562373095], [3.414213562373095, 4.414213562373095, 4], [2, 4.414213562373095, 5.414213562373095]],
+    [[3.414213562373095, 4.414213562373095, 4], [2, 5, 4], [2, 4.414213562373095, 5.414213562373095]],
+    [[-1.9999999999999998, 5, 4], [-3.414213562373095, 4.414213562373095, 4], [-2, 4.414213562373095, 5.414213562373095]],
+    [[-2, 4.414213562373095, 5.414213562373095], [-3.414213562373095, 4.414213562373095, 4], [-3.414213562373095, 3, 5.414213562373095]],
+    [[-3.414213562373095, 4.414213562373095, 4], [-4, 3.0000000000000004, 4], [-3.414213562373095, 3, 5.414213562373095]],
+    [[-4, -2.9999999999999996, 4], [-3.414213562373095, -4.414213562373095, 4], [-3.414213562373095, -3, 5.414213562373095]],
+    [[-3.414213562373095, -3, 5.414213562373095], [-3.414213562373095, -4.414213562373095, 4], [-2.0000000000000004, -4.414213562373095, 5.414213562373095]],
+    [[-3.414213562373095, -4.414213562373095, 4], [-2.0000000000000004, -5, 4], [-2.0000000000000004, -4.414213562373095, 5.414213562373095]],
+    [[1.9999999999999996, -5, 4], [3.414213562373095, -4.414213562373095, 4], [1.9999999999999998, -4.414213562373095, 5.414213562373095]],
+    [[1.9999999999999998, -4.414213562373095, 5.414213562373095], [3.414213562373095, -4.414213562373095, 4], [3.414213562373095, -3.0000000000000004, 5.414213562373095]],
+    [[3.414213562373095, -4.414213562373095, 4], [4, -3.0000000000000004, 4], [3.414213562373095, -3.0000000000000004, 5.414213562373095]],
+    [[2, 5, 4], [-1.9999999999999998, 5, 4],
+      [-2, 4.414213562373095, 5.414213562373095], [2, 4.414213562373095, 5.414213562373095]],
+    [[-4, 3.0000000000000004, 4], [-4, -2.9999999999999996, 4],
+      [-3.414213562373095, -3, 5.414213562373095], [-3.414213562373095, 3, 5.414213562373095]],
+    [[-2.0000000000000004, -5, 4], [1.9999999999999996, -5, 4],
+      [1.9999999999999998, -4.414213562373095, 5.414213562373095], [-2.0000000000000004, -4.414213562373095, 5.414213562373095]],
+    [[4, -3.0000000000000004, 4], [4, 3, 4],
+      [3.414213562373095, 3, 5.414213562373095], [3.414213562373095, -3.0000000000000004, 5.414213562373095]],
+    [[4, -3.0000000000000004, -4], [3.414213562373095, -4.414213562373095, -4], [3.414213562373095, -3.0000000000000004, -5.414213562373095]],
+    [[3.414213562373095, -3.0000000000000004, -5.414213562373095], [3.414213562373095, -4.414213562373095, -4], [1.9999999999999998, -4.414213562373095, -5.414213562373095]],
+    [[3.414213562373095, -4.414213562373095, -4], [1.9999999999999996, -5, -4], [1.9999999999999998, -4.414213562373095, -5.414213562373095]],
+    [[-2.0000000000000004, -5, -4], [-3.414213562373095, -4.414213562373095, -4], [-2.0000000000000004, -4.414213562373095, -5.414213562373095]],
+    [[-2.0000000000000004, -4.414213562373095, -5.414213562373095], [-3.414213562373095, -4.414213562373095, -4], [-3.414213562373095, -3, -5.414213562373095]],
+    [[-3.414213562373095, -4.414213562373095, -4], [-4, -2.9999999999999996, -4], [-3.414213562373095, -3, -5.414213562373095]],
+    [[-4, 3.0000000000000004, -4], [-3.414213562373095, 4.414213562373095, -4], [-3.414213562373095, 3, -5.414213562373095]],
+    [[-3.414213562373095, 3, -5.414213562373095], [-3.414213562373095, 4.414213562373095, -4], [-2, 4.414213562373095, -5.414213562373095]],
+    [[-3.414213562373095, 4.414213562373095, -4], [-1.9999999999999998, 5, -4], [-2, 4.414213562373095, -5.414213562373095]],
+    [[2, 5, -4], [3.414213562373095, 4.414213562373095, -4], [2, 4.414213562373095, -5.414213562373095]],
+    [[2, 4.414213562373095, -5.414213562373095], [3.414213562373095, 4.414213562373095, -4], [3.414213562373095, 3, -5.414213562373095]],
+    [[3.414213562373095, 4.414213562373095, -4], [4, 3, -4], [3.414213562373095, 3, -5.414213562373095]],
+    [[1.9999999999999996, -5, -4], [-2.0000000000000004, -5, -4],
+      [-2.0000000000000004, -4.414213562373095, -5.414213562373095], [1.9999999999999998, -4.414213562373095, -5.414213562373095]],
+    [[-4, -2.9999999999999996, -4], [-4, 3.0000000000000004, -4],
+      [-3.414213562373095, 3, -5.414213562373095], [-3.414213562373095, -3, -5.414213562373095]],
+    [[-1.9999999999999998, 5, -4], [2, 5, -4],
+      [2, 4.414213562373095, -5.414213562373095], [-2, 4.414213562373095, -5.414213562373095]],
+    [[4, 3, -4], [4, -3.0000000000000004, -4],
+      [3.414213562373095, -3.0000000000000004, -5.414213562373095], [3.414213562373095, 3, -5.414213562373095]],
+    [[3.414213562373095, 3, 5.414213562373095], [2, 4.414213562373095, 5.414213562373095], [2, 3, 6]],
+    [[-2, 4.414213562373095, 5.414213562373095], [-3.414213562373095, 3, 5.414213562373095], [-2, 3, 6]],
+    [[-3.414213562373095, -3, 5.414213562373095], [-2.0000000000000004, -4.414213562373095, 5.414213562373095], [-2, -3, 6]],
+    [[1.9999999999999998, -4.414213562373095, 5.414213562373095], [3.414213562373095, -3.0000000000000004, 5.414213562373095], [2, -3, 6]],
+    [[2, 4.414213562373095, 5.414213562373095], [-2, 4.414213562373095, 5.414213562373095],
+      [-2, 3, 6], [2, 3, 6]],
+    [[-3.414213562373095, 3, 5.414213562373095], [-3.414213562373095, -3, 5.414213562373095],
+      [-2, -3, 6], [-2, 3, 6]],
+    [[-2.0000000000000004, -4.414213562373095, 5.414213562373095], [1.9999999999999998, -4.414213562373095, 5.414213562373095],
+      [2, -3, 6], [-2, -3, 6]],
+    [[3.414213562373095, -3.0000000000000004, 5.414213562373095], [3.414213562373095, 3, 5.414213562373095],
+      [2, 3, 6], [2, -3, 6]],
+    [[3.414213562373095, -3.0000000000000004, -5.414213562373095], [1.9999999999999998, -4.414213562373095, -5.414213562373095], [2, -3, -6]],
+    [[-2.0000000000000004, -4.414213562373095, -5.414213562373095], [-3.414213562373095, -3, -5.414213562373095], [-2, -3, -6]],
+    [[-3.414213562373095, 3, -5.414213562373095], [-2, 4.414213562373095, -5.414213562373095], [-2, 3, -6]],
+    [[2, 4.414213562373095, -5.414213562373095], [3.414213562373095, 3, -5.414213562373095], [2, 3, -6]],
+    [[1.9999999999999998, -4.414213562373095, -5.414213562373095], [-2.0000000000000004, -4.414213562373095, -5.414213562373095],
+      [-2, -3, -6], [2, -3, -6]],
+    [[-3.414213562373095, -3, -5.414213562373095], [-3.414213562373095, 3, -5.414213562373095],
+      [-2, 3, -6], [-2, -3, -6]],
+    [[-2, 4.414213562373095, -5.414213562373095], [2, 4.414213562373095, -5.414213562373095],
+      [2, 3, -6], [-2, 3, -6]],
+    [[3.414213562373095, 3, -5.414213562373095], [3.414213562373095, -3.0000000000000004, -5.414213562373095],
+      [2, -3, -6], [2, 3, -6]],
+    [[2, 3, 6], [-2, 3, 6], [-2, -3, 6], [2, -3, 6]],
+    [[2, -3, -6], [-2, -3, -6], [-2, 3, -6], [2, 3, -6]]
+  ]
+  t.notThrows(() => geom3.validate(obs))
+  t.deepEqual(pts.length, 62)
+  t.true(comparePolygonsAsPoints(pts, exp))
+})

package/src/primitives/roundedCylinder.d.ts

@@ -0,0 +1,14 @@
+import Vec3 from '../maths/vec3/type'
+import Geom3 from '../geometries/geom3/type'
+
+export default roundedCylinder
+
+export interface RoundedCylinderOptions {
+  center?: Vec3
+  height?: number
+  radius?: number
+  roundRadius?: number
+  segments?: number
+}
+
+declare function roundedCylinder(options?: RoundedCylinderOptions): Geom3

package/src/primitives/roundedCylinder.js

@@ -0,0 +1,147 @@
+const { EPS, TAU } = require('../maths/constants')
+
+const vec3 = require('../maths/vec3')
+
+const geom3 = require('../geometries/geom3')
+const poly3 = require('../geometries/poly3')
+
+const { sin, cos } = require('../maths/utils/trigonometry')
+
+const { isGTE, isNumberArray } = require('./commonChecks')
+const cylinder = require('./cylinder')
+
+/**
+ * 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 {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
+ * @returns {geom3} new 3D geometry
+ * @alias module:modeling/primitives.roundedCylinder
+ *
+ * @example
+ * let myshape = roundedCylinder({ height: 10, radius: 2, roundRadius: 0.5 })
+ */
+const roundedCylinder = (options) => {
+  const defaults = {
+    center: [0, 0, 0],
+    height: 2,
+    radius: 1,
+    roundRadius: 0.2,
+    segments: 32
+  }
+  const { center, height, radius, roundRadius, segments } = Object.assign({}, defaults, options)
+
+  if (!isNumberArray(center, 3)) throw new Error('center must be an array of X, Y and Z values')
+  if (!isGTE(height, 0)) throw new Error('height must be positive')
+  if (!isGTE(radius, 0)) throw new Error('radius must be positive')
+  if (!isGTE(roundRadius, 0)) throw new Error('roundRadius must be positive')
+  if (roundRadius > radius) throw new Error('roundRadius must be smaller than the radius')
+  if (!isGTE(segments, 4)) throw new Error('segments must be four or more')
+
+  // if size is zero return empty geometry
+  if (height === 0 || radius === 0) return geom3.create()
+
+  // if roundRadius is zero, return cylinder
+  if (roundRadius === 0) return cylinder({ center, height, radius })
+
+  const start = [0, 0, -(height / 2)]
+  const end = [0, 0, height / 2]
+  const direction = vec3.subtract(vec3.create(), end, start)
+  const length = vec3.length(direction)
+
+  if ((2 * roundRadius) > (length - EPS)) throw new Error('height must be larger than twice roundRadius')
+
+  let defaultnormal
+  if (Math.abs(direction[0]) > Math.abs(direction[1])) {
+    defaultnormal = vec3.fromValues(0, 1, 0)
+  } else {
+    defaultnormal = vec3.fromValues(1, 0, 0)
+  }
+
+  const zvector = vec3.scale(vec3.create(), vec3.normalize(vec3.create(), direction), roundRadius)
+  const xvector = vec3.scale(vec3.create(), vec3.normalize(vec3.create(), vec3.cross(vec3.create(), zvector, defaultnormal)), radius)
+  const yvector = vec3.scale(vec3.create(), vec3.normalize(vec3.create(), vec3.cross(vec3.create(), xvector, zvector)), radius)
+
+  vec3.add(start, start, zvector)
+  vec3.subtract(end, end, zvector)
+
+  const qsegments = Math.floor(0.25 * segments)
+
+  const fromPoints = (points) => {
+    // adjust the points to center
+    const newpoints = points.map((point) => vec3.add(point, point, center))
+    return poly3.create(newpoints)
+  }
+
+  const polygons = []
+  const v1 = vec3.create()
+  const v2 = vec3.create()
+  let prevcylinderpoint
+  for (let slice1 = 0; slice1 <= segments; slice1++) {
+    const angle = TAU * slice1 / segments
+    const cylinderpoint = vec3.add(vec3.create(), vec3.scale(v1, xvector, cos(angle)), vec3.scale(v2, yvector, sin(angle)))
+    if (slice1 > 0) {
+      // cylinder wall
+      let points = []
+      points.push(vec3.add(vec3.create(), start, cylinderpoint))
+      points.push(vec3.add(vec3.create(), start, prevcylinderpoint))
+      points.push(vec3.add(vec3.create(), end, prevcylinderpoint))
+      points.push(vec3.add(vec3.create(), end, cylinderpoint))
+      polygons.push(fromPoints(points))
+
+      let prevcospitch, prevsinpitch
+      for (let slice2 = 0; slice2 <= qsegments; slice2++) {
+        const pitch = TAU / 4 * slice2 / qsegments
+        const cospitch = cos(pitch)
+        const sinpitch = sin(pitch)
+        if (slice2 > 0) {
+          // cylinder rounding, start
+          points = []
+          let point
+          point = vec3.add(vec3.create(), start, vec3.subtract(v1, vec3.scale(v1, prevcylinderpoint, prevcospitch), vec3.scale(v2, zvector, prevsinpitch)))
+          points.push(point)
+          point = vec3.add(vec3.create(), start, vec3.subtract(v1, vec3.scale(v1, cylinderpoint, prevcospitch), vec3.scale(v2, zvector, prevsinpitch)))
+          points.push(point)
+          if (slice2 < qsegments) {
+            point = vec3.add(vec3.create(), start, vec3.subtract(v1, vec3.scale(v1, cylinderpoint, cospitch), vec3.scale(v2, zvector, sinpitch)))
+            points.push(point)
+          }
+          point = vec3.add(vec3.create(), start, vec3.subtract(v1, vec3.scale(v1, prevcylinderpoint, cospitch), vec3.scale(v2, zvector, sinpitch)))
+          points.push(point)
+
+          polygons.push(fromPoints(points))
+
+          // cylinder rounding, end
+          points = []
+          point = vec3.add(vec3.create(), vec3.scale(v1, prevcylinderpoint, prevcospitch), vec3.scale(v2, zvector, prevsinpitch))
+          vec3.add(point, point, end)
+          points.push(point)
+          point = vec3.add(vec3.create(), vec3.scale(v1, cylinderpoint, prevcospitch), vec3.scale(v2, zvector, prevsinpitch))
+          vec3.add(point, point, end)
+          points.push(point)
+          if (slice2 < qsegments) {
+            point = vec3.add(vec3.create(), vec3.scale(v1, cylinderpoint, cospitch), vec3.scale(v2, zvector, sinpitch))
+            vec3.add(point, point, end)
+            points.push(point)
+          }
+          point = vec3.add(vec3.create(), vec3.scale(v1, prevcylinderpoint, cospitch), vec3.scale(v2, zvector, sinpitch))
+          vec3.add(point, point, end)
+          points.push(point)
+          points.reverse()
+
+          polygons.push(fromPoints(points))
+        }
+        prevcospitch = cospitch
+        prevsinpitch = sinpitch
+      }
+    }
+    prevcylinderpoint = cylinderpoint
+  }
+  const result = geom3.create(polygons)
+  return result
+}
+
+module.exports = roundedCylinder

package/src/primitives/roundedCylinder.test.js

@@ -0,0 +1,165 @@
+const test = require('ava')
+
+const geom3 = require('../geometries/geom3')
+
+const { roundedCylinder } = require('./index')
+
+const comparePolygonsAsPoints = require('../../test/helpers/comparePolygonsAsPoints')
+
+test('roundedCylinder (defaults)', (t) => {
+  const obs = roundedCylinder()
+  const pts = geom3.toPoints(obs)
+
+  t.notThrows(() => geom3.validate(obs))
+  t.is(pts.length, 544)
+})
+
+test('roundedCylinder (zero height)', (t) => {
+  const obs = roundedCylinder({ height: 0 })
+  const pts = geom3.toPoints(obs)
+  t.notThrows(() => geom3.validate(obs))
+  t.is(pts.length, 0)
+})
+
+test('roundedCylinder (zero radius)', (t) => {
+  const obs = roundedCylinder({ radius: 0, roundRadius: 0 })
+  const pts = geom3.toPoints(obs)
+  t.notThrows(() => geom3.validate(obs))
+  t.is(pts.length, 0)
+})
+
+test('roundedCylinder (zero roundRadius)', (t) => {
+  const obs = roundedCylinder({ roundRadius: 0 })
+  const pts = geom3.toPoints(obs)
+  t.notThrows(() => geom3.validate(obs))
+  t.is(pts.length, 96)
+})
+
+test('roundedCylinder (options)', (t) => {
+  // test segments
+  let obs = roundedCylinder({ segments: 5 })
+  let pts = geom3.toPoints(obs)
+  let exp = [
+  ]
+
+  t.notThrows(() => geom3.validate(obs))
+  t.is(pts.length, 15)
+
+  // test center
+  obs = roundedCylinder({ segments: 5, center: [-5, -5, -5] })
+  pts = geom3.toPoints(obs)
+  exp = [
+    [[-4.048943483704846, -4.6909830056250525, -5.8], [-5, -4, -5.8],
+      [-5, -4, -4.2], [-4.048943483704846, -4.6909830056250525, -4.2]],
+    [[-5, -4, -5.8], [-4.048943483704846, -4.6909830056250525, -5.8], [-5, -5, -6]],
+    [[-5, -5, -4], [-4.048943483704846, -4.6909830056250525, -4.2], [-5, -4, -4.2]],
+    [[-4.412214747707527, -5.8090169943749475, -5.8], [-4.048943483704846, -4.6909830056250525, -5.8],
+      [-4.048943483704846, -4.6909830056250525, -4.2], [-4.412214747707527, -5.8090169943749475, -4.2]],
+    [[-4.048943483704846, -4.6909830056250525, -5.8], [-4.412214747707527, -5.8090169943749475, -5.8], [-5, -5, -6]],
+    [[-5, -5, -4], [-4.412214747707527, -5.8090169943749475, -4.2], [-4.048943483704846, -4.6909830056250525, -4.2]],
+    [[-5.587785252292473, -5.8090169943749475, -5.8], [-4.412214747707527, -5.8090169943749475, -5.8],
+      [-4.412214747707527, -5.8090169943749475, -4.2], [-5.587785252292473, -5.8090169943749475, -4.2]],
+    [[-4.412214747707527, -5.8090169943749475, -5.8], [-5.587785252292473, -5.8090169943749475, -5.8], [-5, -5, -6]],
+    [[-5, -5, -4], [-5.587785252292473, -5.8090169943749475, -4.2], [-4.412214747707527, -5.8090169943749475, -4.2]],
+    [[-5.951056516295154, -4.6909830056250525, -5.8], [-5.587785252292473, -5.8090169943749475, -5.8],
+      [-5.587785252292473, -5.8090169943749475, -4.2], [-5.951056516295154, -4.6909830056250525, -4.2]],
+    [[-5.587785252292473, -5.8090169943749475, -5.8], [-5.951056516295154, -4.6909830056250525, -5.8], [-5, -5, -6]],
+    [[-5, -5, -4], [-5.951056516295154, -4.6909830056250525, -4.2], [-5.587785252292473, -5.8090169943749475, -4.2]],
+    [[-5, -4, -5.8], [-5.951056516295154, -4.6909830056250525, -5.8],
+      [-5.951056516295154, -4.6909830056250525, -4.2], [-5, -4, -4.2]],
+    [[-5.951056516295154, -4.6909830056250525, -5.8], [-5, -4, -5.8], [-5, -5, -6]],
+    [[-5, -5, -4], [-5, -4, -4.2], [-5.951056516295154, -4.6909830056250525, -4.2]]
+  ]
+
+  t.notThrows(() => geom3.validate(obs))
+  t.is(pts.length, 15)
+  t.true(comparePolygonsAsPoints(pts, exp))
+
+  // test height
+  obs = roundedCylinder({ segments: 5, height: 20 })
+  pts = geom3.toPoints(obs)
+  exp = [
+    [[0.9510565162951535, 0.30901699437494745, -9.8], [0, 1, -9.8],
+      [0, 1, 9.8], [0.9510565162951535, 0.30901699437494745, 9.8]],
+    [[0, 1, -9.8], [0.9510565162951535, 0.30901699437494745, -9.8], [0, 0, -10]],
+    [[0, 0, 10], [0.9510565162951535, 0.30901699437494745, 9.8], [0, 1, 9.8]],
+    [[0.5877852522924732, -0.8090169943749473, -9.8], [0.9510565162951535, 0.30901699437494745, -9.8],
+      [0.9510565162951535, 0.30901699437494745, 9.8], [0.5877852522924732, -0.8090169943749473, 9.8]],
+    [[0.9510565162951535, 0.30901699437494745, -9.8], [0.5877852522924732, -0.8090169943749473, -9.8], [0, 0, -10]],
+    [[0, 0, 10], [0.5877852522924732, -0.8090169943749473, 9.8], [0.9510565162951535, 0.30901699437494745, 9.8]],
+    [[-0.587785252292473, -0.8090169943749475, -9.8], [0.5877852522924732, -0.8090169943749473, -9.8],
+      [0.5877852522924732, -0.8090169943749473, 9.8], [-0.587785252292473, -0.8090169943749475, 9.8]],
+    [[0.5877852522924732, -0.8090169943749473, -9.8], [-0.587785252292473, -0.8090169943749475, -9.8], [0, 0, -10]],
+    [[0, 0, 10], [-0.587785252292473, -0.8090169943749475, 9.8], [0.5877852522924732, -0.8090169943749473, 9.8]],
+    [[-0.9510565162951536, 0.30901699437494723, -9.8], [-0.587785252292473, -0.8090169943749475, -9.8],
+      [-0.587785252292473, -0.8090169943749475, 9.8], [-0.9510565162951536, 0.30901699437494723, 9.8]],
+    [[-0.587785252292473, -0.8090169943749475, -9.8], [-0.9510565162951536, 0.30901699437494723, -9.8], [0, 0, -10]],
+    [[0, 0, 10], [-0.9510565162951536, 0.30901699437494723, 9.8], [-0.587785252292473, -0.8090169943749475, 9.8]],
+    [[0, 1, -9.8], [-0.9510565162951536, 0.30901699437494723, -9.8],
+      [-0.9510565162951536, 0.30901699437494723, 9.8], [0, 1, 9.8]],
+    [[-0.9510565162951536, 0.30901699437494723, -9.8], [0, 1, -9.8], [0, 0, -10]],
+    [[0, 0, 10], [0, 1, 9.8], [-0.9510565162951536, 0.30901699437494723, 9.8]]
+  ]
+
+  t.notThrows(() => geom3.validate(obs))
+  t.is(pts.length, 15)
+  t.true(comparePolygonsAsPoints(pts, exp))
+
+  // test radius
+  obs = roundedCylinder({ segments: 5, radius: 10 })
+  pts = geom3.toPoints(obs)
+  exp = [
+    [[9.510565162951535, 3.0901699437494745, -0.8], [0, 10, -0.8],
+      [0, 10, 0.8], [9.510565162951535, 3.0901699437494745, 0.8]],
+    [[0, 10, -0.8], [9.510565162951535, 3.0901699437494745, -0.8], [0, 0, -1]],
+    [[0, 0, 1], [9.510565162951535, 3.0901699437494745, 0.8], [0, 10, 0.8]],
+    [[5.877852522924733, -8.090169943749473, -0.8], [9.510565162951535, 3.0901699437494745, -0.8],
+      [9.510565162951535, 3.0901699437494745, 0.8], [5.877852522924733, -8.090169943749473, 0.8]],
+    [[9.510565162951535, 3.0901699437494745, -0.8], [5.877852522924733, -8.090169943749473, -0.8], [0, 0, -1]],
+    [[0, 0, 1], [5.877852522924733, -8.090169943749473, 0.8], [9.510565162951535, 3.0901699437494745, 0.8]],
+    [[-5.87785252292473, -8.090169943749475, -0.8], [5.877852522924733, -8.090169943749473, -0.8],
+      [5.877852522924733, -8.090169943749473, 0.8], [-5.87785252292473, -8.090169943749475, 0.8]],
+    [[5.877852522924733, -8.090169943749473, -0.8], [-5.87785252292473, -8.090169943749475, -0.8], [0, 0, -1]],
+    [[0, 0, 1], [-5.87785252292473, -8.090169943749475, 0.8], [5.877852522924733, -8.090169943749473, 0.8]],
+    [[-9.510565162951536, 3.0901699437494723, -0.8], [-5.87785252292473, -8.090169943749475, -0.8],
+      [-5.87785252292473, -8.090169943749475, 0.8], [-9.510565162951536, 3.0901699437494723, 0.8]],
+    [[-5.87785252292473, -8.090169943749475, -0.8], [-9.510565162951536, 3.0901699437494723, -0.8], [0, 0, -1]],
+    [[0, 0, 1], [-9.510565162951536, 3.0901699437494723, 0.8], [-5.87785252292473, -8.090169943749475, 0.8]],
+    [[0, 10, -0.8], [-9.510565162951536, 3.0901699437494723, -0.8], [-9.510565162951536, 3.0901699437494723, 0.8], [0, 10, 0.8]],
+    [[-9.510565162951536, 3.0901699437494723, -0.8], [0, 10, -0.8], [0, 0, -1]],
+    [[0, 0, 1], [0, 10, 0.8], [-9.510565162951536, 3.0901699437494723, 0.8]]
+  ]
+
+  t.notThrows(() => geom3.validate(obs))
+  t.is(pts.length, 15)
+  t.true(comparePolygonsAsPoints(pts, exp))
+
+  // test round radius
+  obs = roundedCylinder({ segments: 5, height: 20, radius: 5, roundRadius: 2 })
+  pts = geom3.toPoints(obs)
+  exp = [
+    [[4.755282581475767, 1.5450849718747373, -8], [0, 5, -8],
+      [0, 5, 8], [4.755282581475767, 1.5450849718747373, 8]],
+    [[0, 5, -8], [4.755282581475767, 1.5450849718747373, -8], [0, 0, -10]],
+    [[0, 0, 10], [4.755282581475767, 1.5450849718747373, 8], [0, 5, 8]],
+    [[2.9389262614623664, -4.045084971874736, -8], [4.755282581475767, 1.5450849718747373, -8],
+      [4.755282581475767, 1.5450849718747373, 8], [2.9389262614623664, -4.045084971874736, 8]],
+    [[4.755282581475767, 1.5450849718747373, -8], [2.9389262614623664, -4.045084971874736, -8], [0, 0, -10]],
+    [[0, 0, 10], [2.9389262614623664, -4.045084971874736, 8], [4.755282581475767, 1.5450849718747373, 8]],
+    [[-2.938926261462365, -4.045084971874737, -8], [2.9389262614623664, -4.045084971874736, -8],
+      [2.9389262614623664, -4.045084971874736, 8], [-2.938926261462365, -4.045084971874737, 8]],
+    [[2.9389262614623664, -4.045084971874736, -8], [-2.938926261462365, -4.045084971874737, -8], [0, 0, -10]],
+    [[0, 0, 10], [-2.938926261462365, -4.045084971874737, 8], [2.9389262614623664, -4.045084971874736, 8]],
+    [[-4.755282581475768, 1.5450849718747361, -8], [-2.938926261462365, -4.045084971874737, -8],
+      [-2.938926261462365, -4.045084971874737, 8], [-4.755282581475768, 1.5450849718747361, 8]],
+    [[-2.938926261462365, -4.045084971874737, -8], [-4.755282581475768, 1.5450849718747361, -8], [0, 0, -10]],
+    [[0, 0, 10], [-4.755282581475768, 1.5450849718747361, 8], [-2.938926261462365, -4.045084971874737, 8]],
+    [[0, 5, -8], [-4.755282581475768, 1.5450849718747361, -8], [-4.755282581475768, 1.5450849718747361, 8], [0, 5, 8]],
+    [[-4.755282581475768, 1.5450849718747361, -8], [0, 5, -8], [0, 0, -10]],
+    [[0, 0, 10], [0, 5, 8], [-4.755282581475768, 1.5450849718747361, 8]]
+  ]
+
+  t.notThrows(() => geom3.validate(obs))
+  t.is(pts.length, 15)
+  t.true(comparePolygonsAsPoints(pts, exp))
+})

package/src/primitives/roundedRectangle.d.ts

@@ -0,0 +1,13 @@
+import Vec2 from '../maths/vec2/type'
+import Geom2 from '../geometries/geom2/type'
+
+export default roundedRectangle
+
+export interface RoundedRectangleOptions {
+  center?: Vec2
+  size?: Vec2
+  roundRadius?: number
+  segments?: number
+}
+
+declare function roundedRectangle(options?: RoundedRectangleOptions): Geom2