@jscad/regl-renderer 2.6.7 → 3.0.0-alpha.0

package/package.json

@@ -1,21 +1,44 @@
 {
   "name": "@jscad/regl-renderer",
-  "version": "2.6.7",
+  "version": "3.0.0-alpha.0",
   "description": "Renderer for JSCAD Geometries",
   "homepage": "https://openjscad.xyz/",
   "repository": "https://github.com/jscad/OpenJSCAD.org",
+  "type": "module",
   "main": "src/index.js",
+  "types": "types",
   "unpkg": "dist/jscad-regl-renderer.min.js",
+  "module": "dist/jscad-regl-renderer.es.js",
   "scripts": {
-    "build": "browserify src/index.js -o dist/jscad-regl-renderer.min.js -g uglifyify --standalone jscadReglRenderer",
-    "version": "npm run build && git add dist",
-    "dev": "budo ./demo-web.js --title regl-renderer --live",
+    "build": "rollup --config",
+    "coverage": "c8 --all --reporter=html --reporter=text pnpm test",
+    "dev": "http-server",
     "demo-cli": "node ./demo-cli.js",
-    "demo-web": "budo ./demo-web.js --title regl-renderer --live",
     "test": "ava 'src/**/*.test.js' --verbose --timeout 2m",
-    "coverage": "nyc --all --reporter=html --reporter=text npm test"
+    "test:tsd": "tsd",
+    "version": "pnpm run build && git add dist"
   },
-  "author": "Mark 'kaosat-dev' Moissette",
+  "contributors": [
+    {
+      "name": "z3dev",
+      "url": "https://github.com/z3dev"
+    },
+    {
+      "name": "Davor Hrg",
+      "url": "https://github.com/hrgdavor"
+    },
+    {
+      "name": "Kenny",
+      "url": "https://github.com/platypil"
+    },
+    {
+      "name": "Timothy Johnson"
+    },
+    {
+      "name": "Mark 'kaosat-dev' Moissette",
+      "url": "https://github.com/kaosat-dev"
+    }
+  ],
   "keywords": [
     "openjscad",
     "jscad",
@@ -26,9 +49,8 @@
   "publishConfig": {
     "access": "public"
   },
-  "types": "types",
   "dependencies": {
-    "@jscad/array-utils": "2.1.4",
+    "@jscad/array-utils": "3.0.0-alpha.0",
     "camera-unproject": "1.0.1",
     "gl-mat4": "1.2.0",
     "gl-vec3": "1.1.3",
@@ -36,12 +58,15 @@
   },
   "devDependencies": {
     "@jscad/img-utils": "2.0.5",
-    "@jscad/modeling": "2.12.0",
-    "ava": "3.15.0",
-    "browserify": "16.5.1",
-    "budo": "11.6.4",
-    "nyc": "15.1.0",
-    "uglifyify": "5.0.2"
+    "@jscad/modeling": "3.0.0-alpha.0",
+    "@rollup/plugin-commonjs": "^23.0.4",
+    "@rollup/plugin-node-resolve": "^15.0.1",
+    "@rollup/plugin-terser": "^0.4.3",
+    "ava": "^4.3.3",
+    "c8": "^8.0.0",
+    "http-server": "^14.1.1",
+    "rollup": "^2.79.1",
+    "rollup-plugin-banner": "^0.2.1"
   },
-  "gitHead": "e269f212db5a00cda740d2f7ad3e5206d1eb839f"
+  "gitHead": "3656d36ed9cd738ab884e86aae5a2ce08d52adf7"
 }

package/rollup.config.js

@@ -0,0 +1,27 @@
+import banner from 'rollup-plugin-banner'
+import commonjs from '@rollup/plugin-commonjs'
+import { nodeResolve } from '@rollup/plugin-node-resolve'
+import terser from '@rollup/plugin-terser'
+
+export default {
+  input: 'src/index.js',
+
+  output: [
+    {
+      file: 'dist/jscad-regl-renderer.min.js',
+      format: 'umd',
+      name: 'jscadReglRenderer'
+    },
+    {
+      file: 'dist/jscad-regl-renderer.es.js',
+      format: 'es'
+    }
+  ],
+
+  plugins: [
+    nodeResolve(),
+    commonjs(),
+    banner('<%= pkg.description %>\n@module <%= pkg.name %>\n@version <%= pkg.version %>\n@license <%= pkg.license %>'),
+    terser({ compress: { module: true }, mangle: false, format: { comments: 'some'} })
+  ]
+}

package/src/bound-utils/boundingBox.js

@@ -1,5 +1,5 @@
 // modified version of https://github.com/thibauts/vertices-bounding-box that also works with non nested positions
-const boundingBox = (positions) => {
+export const boundingBox = (positions) => {
   if (positions.length === 0) {
     return [[0, 0, 0], [0, 0, 0]]
   }
@@ -35,4 +35,3 @@ const boundingBox = (positions) => {
 
   return [min, max]
 }
-module.exports = boundingBox

package/src/bound-utils/boundingSphere.js

@@ -1,5 +1,6 @@
-const { squaredDistance, vec3 } = require('gl-vec3')
-const boundingBox = require('./boundingBox')
+import { squaredDistance, vec3 } from 'gl-vec3'
+
+import { boundingBox } from './boundingBox.js'
 
 /*
  * compute diameter of the bounding sphere for the given (geometry) positions
@@ -7,7 +8,7 @@ const boundingBox = require('./boundingBox')
  * @param {array} positions - the array/typed array of positions.
  * for now loosely based on three.js implementation
  */
-const boundingSphere = (center, positions) => {
+export const boundingSphere = (center, positions) => {
   if (positions.length === 0) {
     return null
   }
@@ -33,5 +34,3 @@ const boundingSphere = (center, positions) => {
   }
   return Math.sqrt(maxRadiusSq)
 }
-
-module.exports = boundingSphere

package/src/bound-utils/computeBounds.js

@@ -1,8 +1,8 @@
-const vec3 = require('gl-vec3')
+import vec3 from 'gl-vec3'
 
-const { flatten } = require('@jscad/array-utils')
+import { flatten } from '@jscad/array-utils'
 
-const boundingBox = require('./boundingBox')
+import { boundingBox } from './boundingBox.js'
 
 /*
  * Compute the bounds of the given geometries.
@@ -17,7 +17,7 @@ const boundingBox = require('./boundingBox')
  *   size: [6,20,4]
  * }
  */
-const computeBounds = (...geometries) => {
+export const computeBounds = (...geometries) => {
   geometries = flatten(geometries)
 
   let bbox // min and max
@@ -50,5 +50,3 @@ const computeBounds = (...geometries) => {
   }
   return bounds
 }
-
-module.exports = computeBounds

package/src/bound-utils/computeBounds.test.js

@@ -1,6 +1,6 @@
-const test = require('ava')
+import test from 'ava'
 
-const computeBounds = require('./computeBounds')
+import { computeBounds } from './computeBounds.js'
 
 test('computeBounds (geometry only)', (t) => {
   const input = {

package/src/cameras/camera.js

@@ -1,16 +1,19 @@
-const vec3 = require('gl-vec3')
-const mat4 = require('gl-mat4')
+import * as vec3 from 'gl-vec3'
+import * as mat4 from 'gl-mat4'
 
-const fromOrthographicToPerspective = (orthographicCamera) => {
-  const { near, far, fov, zoom } = orthographicCamera
+import * as orthographicCamera from './orthographicCamera.js'
+import * as perspectiveCamera from './perspectiveCamera.js'
+
+export const fromOrthographicToPerspective = (orthographicCamera) => {
+  const { near, far, fov } = orthographicCamera
   // recompute projection matrix to use perspective camera projection matrix
   const { viewport } = orthographicCamera
-  const projection = require('./perspectiveCamera').setProjection(orthographicCamera, { width: viewport[2], height: viewport[3] })
-  const { projectionType } = require('./perspectiveCamera').cameraState
+  const projection = perspectiveCamera.setProjection(orthographicCamera, { width: viewport[2], height: viewport[3] })
+  const { projectionType } = perspectiveCamera.cameraState
   return Object.assign({}, orthographicCamera, projection, { projectionType }, { near, far, fov })
 }
 
-const fromPerspectiveToOrthographic = (perspectiveCamera) => {
+export const fromPerspectiveToOrthographic = (perspectiveCamera) => {
   const { fov, aspect } = perspectiveCamera
 
   // set the orthographic view rectangle to 0,0,width,height
@@ -23,12 +26,12 @@ const fromPerspectiveToOrthographic = (perspectiveCamera) => {
   // we re-use near, far, & projection matrix of orthographicCamera
   const { near, far, viewport } = perspectiveCamera
   const fCam = { zoom: 1, near, far }
-  const orthographicCamera = require('./orthographicCamera').cameraState
-  const projection = require('./orthographicCamera').setProjection(fCam, { width, height })
-  return Object.assign({}, orthographicCamera, perspectiveCamera, projection, { projectionType: orthographicCamera.projectionType, viewport })
+  const projectionType = orthographicCamera.cameraState.projectionType
+  const projection = orthographicCamera.setProjection(fCam, { width, height })
+  return Object.assign({}, orthographicCamera, perspectiveCamera, projection, { projectionType, viewport })
 }
 
-const toPerspectiveView = ({ camera }) => {
+export const toPerspectiveView = ({ camera }) => {
   const offsetToTarget = vec3.distance(camera.position, camera.target)
   const distance = offsetToTarget
   const position = [distance, distance, distance]
@@ -40,7 +43,7 @@ const toPerspectiveView = ({ camera }) => {
 /**
  * Calculate the camera view and position for acheiving the given preset view.
  */
-const toPresetView = (viewName, { camera }) => {
+export const toPresetView = (viewName, { camera }) => {
   const presets = {
     top: [0, -0.000001, 1],
     bottom: [0, 0, -1],
@@ -57,10 +60,3 @@ const toPresetView = (viewName, { camera }) => {
 
   return { view, position }
 }
-
-module.exports = {
-  toPerspectiveView,
-  toPresetView,
-  fromOrthographicToPerspective,
-  fromPerspectiveToOrthographic
-}

package/src/cameras/index.js

@@ -1,5 +1,9 @@
-module.exports = {
-  camera: require('./camera'),
-  orthographic: require('./orthographicCamera'),
-  perspective: require('./perspectiveCamera')
+import * as camera from './camera.js'
+import * as orthographic from './orthographicCamera.js'
+import * as perspective from './perspectiveCamera.js'
+
+export {
+  camera,
+  orthographic,
+  perspective
 }

package/src/cameras/orthographicCamera.js

@@ -1,6 +1,6 @@
-const mat4 = require('gl-mat4')
+import * as mat4 from 'gl-mat4'
 
-const cameraState = {
+export const cameraState = {
   view: mat4.identity(new Float32Array(16)),
   projection: mat4.identity(new Float32Array(16)),
   matrix: mat4.identity(new Float32Array(16)), // not sure if needed
@@ -18,9 +18,9 @@ const cameraState = {
   projectionType: 'orthographic'
 }
 
-const cameraProps = {}
+export const cameraProps = {}
 
-const setProjection = (camera, input) => {
+export const setProjection = (camera, input) => {
   const { width, height } = input
   // context.viewportWidth / context.viewportHeight,
   const aspect = width / height
@@ -35,5 +35,3 @@ const setProjection = (camera, input) => {
   const projection = mat4.ortho([], left, right, bottom, top, camera.near, camera.far)
   return { projection, aspect, viewport }
 }
-
-module.exports = { cameraState, cameraProps, setProjection }

package/src/cameras/perspectiveCamera.js

@@ -1,7 +1,7 @@
-const mat4 = require('gl-mat4')
-const vec3 = require('gl-vec3')
+import * as mat4 from 'gl-mat4'
+import * as vec3 from 'gl-vec3'
 
-const cameraState = {
+export const cameraState = {
   view: mat4.identity(new Float32Array(16)),
   projection: mat4.identity(new Float32Array(16)),
   matrix: mat4.identity(new Float32Array(16)), // not sure if needed
@@ -18,10 +18,10 @@ const cameraState = {
   projectionType: 'perspective'
 }
 
-const cameraProps = {}
-const defaults = Object.assign({}, cameraState, cameraProps)
+export const cameraProps = {}
+export const defaults = Object.assign({}, cameraState, cameraProps)
 
-const setProjection = (output, camera, input) => {
+export const setProjection = (output, camera, input) => {
   // context.viewportWidth / context.viewportHeight,
   const aspect = input.width / input.height
 
@@ -39,7 +39,7 @@ const setProjection = (output, camera, input) => {
   return out
 }
 
-const update = (output, camera) => {
+export const update = (output, camera) => {
   if (!camera) {
     camera = output
   }
@@ -54,5 +54,3 @@ const update = (output, camera) => {
   out.view = newView
   return out
 }
-
-module.exports = { cameraState, cameraProps, defaults, setProjection, update }

package/src/controls/index.js

@@ -0,0 +1,6 @@
+import * as orbit from './orbitControls.js'
+
+// export all known controls
+export {
+  orbit
+}

package/src/controls/orbitControls.js

@@ -1,8 +1,12 @@
-const vec3 = require('gl-vec3')
-const mat4 = require('gl-mat4')
-const { max, min, sqrt, PI, sin, cos, atan2 } = Math
+import * as vec3 from 'gl-vec3'
+import * as mat4 from 'gl-mat4'
+
+import { unproject } from 'camera-unproject'
+
+import { computeBounds } from '../bound-utils/computeBounds.js'
+import { setProjection } from '../cameras/orthographicCamera.js'
 
-const computeBounds = require('../bound-utils/computeBounds')
+const { max, min, sqrt, PI, sin, cos, atan2 } = Math
 
 // TODO: make it more data driven ?
 /*
@@ -29,7 +33,7 @@ rotate => modify the angle input
 
 */
 
-const controlsProps = {
+export const controlsProps = {
   limits: {
     minDistance: 0.01,
     maxDistance: 10000
@@ -57,16 +61,16 @@ const controlsProps = {
   autoAdjustPlanes: true // adjust near & far planes when zooming in &out
 }
 
-const controlsState = {
+export const controlsState = {
   // orbit controls state
   thetaDelta: 0,
   phiDelta: 0,
   scale: 1
 }
 
-const defaults = Object.assign({}, controlsState, controlsProps)
+export const defaults = Object.assign({}, controlsState, controlsProps)
 
-const update = ({ controls, camera }, output) => {
+export const update = ({ controls, camera }, output) => {
   // custom z up is settable, with inverted Y and Z (since we use camera[2] => up)
   const { EPS, drag } = controls
   const { position, target } = camera
@@ -158,7 +162,7 @@ const update = ({ controls, camera }, output) => {
   * @param {Float} angle value of the angle to rotate
   * @return {Object} the updated camera data/state
 */
-const rotate = ({ controls, camera, speed = 1 }, angle) => {
+export const rotate = ({ controls, camera, speed = 1 }, angle) => {
   let {
     thetaDelta,
     phiDelta
@@ -185,7 +189,7 @@ const rotate = ({ controls, camera, speed = 1 }, angle) => {
   * @param {Float} zoomDelta value of the zoom
   * @return {Object} the updated camera data/state
 */
-const zoom = ({ controls, camera, speed = 1 }, zoomDelta = 0) => {
+export const zoom = ({ controls, camera, speed = 1 }, zoomDelta = 0) => {
   let { scale } = controls
 
   if (controls.userControl.zoom && camera && zoomDelta !== undefined && zoomDelta !== 0 && !isNaN(zoomDelta)) {
@@ -207,7 +211,7 @@ const zoom = ({ controls, camera, speed = 1 }, zoomDelta = 0) => {
       const width = Math.tan(camera.fov) * distance * camera.aspect
       const height = Math.tan(camera.fov) * distance
 
-      const projection = require('../cameras/orthographicCamera').setProjection(camera, { width, height })
+      const projection = setProjection(camera, { width, height })
       camera = projection
     }
 
@@ -227,8 +231,7 @@ const zoom = ({ controls, camera, speed = 1 }, zoomDelta = 0) => {
   * @param {Float} delta value of the raw pan delta
   * @return {Object} the updated camera data/state
 */
-const pan = ({ controls, camera, speed = 1 }, delta) => {
-  const unproject = require('camera-unproject')
+export const pan = ({ controls, camera, speed = 1 }, delta) => {
   const { projection, view, viewport } = camera
   const combinedProjView = mat4.multiply([], projection, view)
   const invProjView = mat4.invert([], combinedProjView)
@@ -266,7 +269,7 @@ const pan = ({ controls, camera, speed = 1 }, delta) => {
   * @param {Array} entities - an array of entities (see entitiesFromSolids)
   * @return {Object} the updated camera data/state
 */
-const zoomToFit = ({ controls, camera, entities }) => {
+export const zoomToFit = ({ controls, camera, entities }) => {
   // our camera.fov is already in radian, no need to convert
   const { zoomToFit } = controls
   if (zoomToFit.targets !== 'all') {
@@ -307,7 +310,7 @@ const zoomToFit = ({ controls, camera, entities }) => {
   * @param {Object} desiredState the state to reset the camera to: defaults to default values
   * @return {Object} the updated camera data/state
 */
-const reset = ({ controls, camera }, desiredState) => {
+export const reset = ({ controls, camera }, desiredState) => {
   const options = {
     camera: {
       position: desiredState.camera.position,
@@ -323,15 +326,3 @@ const reset = ({ controls, camera }, desiredState) => {
   }
   return options
 }
-
-module.exports = {
-  controlsProps,
-  controlsState,
-  defaults,
-  update,
-  rotate,
-  zoom,
-  pan,
-  zoomToFit,
-  reset
-}

package/src/{geometry-utils-V2 → geometry-utils-V3}/entitiesFromSolids.js

@@ -1,10 +1,10 @@
-const { flatten, toArray } = require('@jscad/array-utils')
+import { flatten, toArray } from '@jscad/array-utils'
 
-const { meshColor } = require('../rendering/renderDefaults')
+import { meshColor } from '../rendering/renderDefaults.js'
 
-const geom2ToGeometries = require('./geom2ToGeometries')
-const geom3ToGeometries = require('./geom3ToGeometries')
-const path2ToGeometries = require('./path2ToGeometries')
+import { geom2ToGeometries } from './geom2ToGeometries.js'
+import { geom3ToGeometries } from './geom3ToGeometries.js'
+import { path2ToGeometries } from './path2ToGeometries.js'
 
 /*
  * Assemble a set of renderable entities from the given geometries.
@@ -35,7 +35,7 @@ const assembleEntities = (geometries) => {
  * @param {Boolean} [options.smoothNormals=true] - smooth the normals of 3d solids, rendering a smooth surface
  * @returns {Array} an array of renderable entities
  */
-const entitiesFromSolids = (options, ...solids) => {
+export const entitiesFromSolids = (options, ...solids) => {
   const defaults = {
     color: meshColor,
     smoothNormals: true
@@ -48,7 +48,7 @@ const entitiesFromSolids = (options, ...solids) => {
   const entities = []
   solids.forEach((solid) => {
     let geometries = []
-    if ('sides' in solid) {
+    if ('outlines' in solid) {
       geometries = geom2ToGeometries({ color }, solid)
     } else if ('points' in solid) {
       geometries = path2ToGeometries({ color }, solid)
@@ -63,5 +63,3 @@ const entitiesFromSolids = (options, ...solids) => {
   })
   return entities
 }
-
-module.exports = entitiesFromSolids

package/src/{geometry-utils-V2 → geometry-utils-V3}/entitiesFromSolids.test.js

@@ -1,11 +1,11 @@
-const test = require('ava')
+import test from 'ava'
 
-const entitiesFromSolids = require('./entitiesFromSolids')
+import { entitiesFromSolids } from './entitiesFromSolids.js'
 
 test('entitiesFromSolids (various solids)', (t) => {
   const solids = [
     null,
-    { sides: [[[0, 0], [1, 0]], [[1, 0], [1, 1]], [[1, 1], [0, 0]]], color: [1, 0, 0, 0.5] },
+    { outlines: [[[0, 0], [1, 0], [1, 1]]], color: [1, 0, 0, 0.5] },
     { points: [[0, 0], [1, 0], [1, 1]], transforms: [5, 0, 0, 0, 0, 4, 0, 0, 0, 0, 3, 0, 0, 0, 0, 2] },
     {
       polygons: [
@@ -18,7 +18,7 @@ test('entitiesFromSolids (various solids)', (t) => {
       ]
     },
     'hi',
-    { sides: [] },
+    { outlines: [] },
     { points: [] },
     { polygons: [] }
   ]

package/src/geometry-utils-V3/geom2ToGeometries.js

@@ -0,0 +1,57 @@
+import mat4 from 'gl-mat4'
+
+const maxIndex = Math.floor(65535 / 2) // two vertices per segment
+
+/*
+ * Convert the given solid into one or more geometries for rendering.
+ * @param {Object} options - options for conversion
+ * @param {Array} options.color - RGBA of solid
+ * @param {geom2} solid - the V3 geom3 object to convert
+ * @return {Array} list of new geometries
+ */
+export const geom2ToGeometries = (options, solid) => {
+  let { color } = options
+
+  const outlines = solid.outlines
+  if (outlines.length === 0) return []
+
+  if ('color' in solid) color = solid.color
+  const isTransparent = (color[3] < 1.0)
+
+  const geometries = []
+  for (let i = 0; i < outlines.length; i++) {
+    const points = outlines[i]
+    const numgeometries = Math.floor(points.length / (maxIndex)) + 1
+
+    for (let g = 0; g < numgeometries; g++) {
+      const offset = g * maxIndex
+      const endset = Math.min(offset + maxIndex, points.length)
+      const positions = []
+      let prevvertice
+      for (let j = offset; j < endset; j++) {
+        const point = points[j]
+        if (prevvertice) {
+          positions.push([prevvertice[0], prevvertice[1], 0])
+          positions.push([point[0], point[1], 0])
+        }
+        prevvertice = point
+      }
+      // add the last segment if necessary
+      if ((g + 1) === numgeometries && prevvertice) {
+        const point = points[0]
+        positions.push([prevvertice[0], prevvertice[1], 0])
+        positions.push([point[0], point[1], 0])
+      }
+      // assemble the geometry
+      const normal = [0, 0, -1]
+      const normals = positions.map((x) => normal)
+      const indices = positions.map((x, i) => i) // FIXME: temporary, not really needed, need to change drawLines
+      const transforms = solid.transforms ? mat4.clone(solid.transforms) : mat4.create()
+      // FIXME positions should be Float32Array buffers to eliminate another conversion
+      // FIXME normals should be Float32Array buffers to eliminate another conversion
+      // FIXME indices should be Uint16Array buffers to eliminate another conversion
+      geometries.push({ type: '2d', positions, normals, indices, transforms, color, isTransparent })
+    }
+  }
+  return geometries
+}

package/src/{geometry-utils-V2 → geometry-utils-V3}/geom2ToGeometries.test.js

@@ -1,6 +1,6 @@
-const test = require('ava')
+import test from 'ava'
 
-const geom2ToGeometries = require('./geom2ToGeometries')
+import { geom2ToGeometries } from './geom2ToGeometries.js'
 
 const defaultTransforms = Float32Array.from([
   1, 0, 0, 0,
@@ -11,7 +11,8 @@ const defaultTransforms = Float32Array.from([
 
 test('geom2ToGeometries (empty solid)', (t) => {
   const solid = {
-    sides: []
+    outlines: [],
+    transforms: [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1]
   }
   const expected = []
   let geometries = geom2ToGeometries({ color: [1, 2, 3, 4] }, solid)
@@ -33,13 +34,15 @@ test('geom2ToGeometries (empty solid)', (t) => {
   t.deepEqual(geometries, expected)
 })
 
-test('geom2ToGeometries (solid with sides)', (t) => {
+test('geom2ToGeometries (solid with outlines)', (t) => {
   const solid = {
-    sides: [[[0, 0], [1, 0]], [[1, 0], [1, 1]], [[1, 1], [0, 0]]]
+    outlines: [
+      [[0, 0], [1, 0], [1, 1]]
+    ],
+    transforms: [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1]
   }
   const expected = [{
     color: [1, 2, 3, 0.8],
-    colors: [],
     indices: [0, 1, 2, 3, 4, 5],
     normals: [[0, 0, -1], [0, 0, -1], [0, 0, -1], [0, 0, -1], [0, 0, -1], [0, 0, -1]],
     positions: [[0, 0, 0], [1, 0, 0], [1, 0, 0], [1, 1, 0], [1, 1, 0], [0, 0, 0]],
@@ -51,14 +54,15 @@ test('geom2ToGeometries (solid with sides)', (t) => {
   t.deepEqual(geometries, expected)
 })
 
-test('geom2ToGeometries (solid with > 65000 sides)', (t) => {
-  const solid = { sides: [] }
+test('geom2ToGeometries (solid with > 65000 outlines)', (t) => {
+  const outline = []
   for (let i = 0; i < 70000; i++) {
-    solid.sides.push([[i, i], [i + 1, i + 1]])
+    outline.push([i, i])
+  }
+  const solid = {
+    outlines: [outline],
+    transforms: [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1]
   }
-  const start = solid.sides[0]
-  const end = solid.sides[solid.sides.length - 1]
-  solid.sides.push([end[1], start[0]])
 
   const geometries = geom2ToGeometries({ color: [1, 2, 3, 0.8] }, solid)
   t.is(geometries.length, 3)

package/src/{geometry-utils-V2 → geometry-utils-V3}/geom3ToGeometries.js

@@ -1,5 +1,5 @@
-const vec3 = require('gl-vec3')
-const mat4 = require('gl-mat4')
+import vec3 from 'gl-vec3'
+import mat4 from 'gl-mat4'
 
 const maxIndex = 65535
 
@@ -12,7 +12,7 @@ const maxIndex = 65535
  * @param {geom3} solid - the solid to convert
  * @return {Array} list of new geometries
  */
-const geom3ToGeometries = (options, solid) => {
+export const geom3ToGeometries = (options, solid) => {
   let { color, smoothLighting } = options
 
   if ('color' in solid) color = solid.color
@@ -213,5 +213,3 @@ const fuzyNormalAndPositionLookup = (normalPositionLookup, toCompare, normalThre
   }
   return undefined
 }
-
-module.exports = geom3ToGeometries