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

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

@@ -1,6 +1,6 @@
-const test = require('ava')
+import test from 'ava'
 
-const geom3ToGeometries = require('./geom3ToGeometries')
+import { geom3ToGeometries } from './geom3ToGeometries.js'
 
 const defaultTransforms = Float32Array.from([
   1, 0, 0, 0,

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

@@ -1,4 +1,4 @@
-const mat4 = require('gl-mat4')
+import mat4 from 'gl-mat4'
 
 // The only data types accepted by WebGL (and OpenGL ES 2.0) for indices are unsigned bytes and unsigned shorts.
 // Since an unsigned short has a range of 0-65535, this means that gl.DrawElements can only reference 65k vertices per draw call.
@@ -11,7 +11,7 @@ const maxIndex = Math.floor(65535 / 2) - 2 // two vertices per segment, less clo
  * @param {path2} solid - the solid to convert
  * @return {Array} list of new geometries
  */
-const path2ToGeometries = (options, solid) => {
+export const path2ToGeometries = (options, solid) => {
   let { color } = options
 
   const points = solid.points
@@ -43,7 +43,8 @@ const path2ToGeometries = (options, solid) => {
       positions.push([point[0], point[1], 0])
     }
     // assemble the geometry
-    const normals = positions.map((x) => [0, 0, -1])
+    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()
 
@@ -54,5 +55,3 @@ const path2ToGeometries = (options, solid) => {
   }
   return geometries
 }
-
-module.exports = path2ToGeometries

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

@@ -1,6 +1,6 @@
-const test = require('ava')
+import test from 'ava'
 
-const path2ToGeometries = require('./path2ToGeometries')
+import { path2ToGeometries } from './path2ToGeometries.js'
 
 const defaultTransforms = Float32Array.from([
   1, 0, 0, 0,

package/src/index.js

@@ -1,20 +1,5 @@
-module.exports = {
-  prepareRender: require('./rendering/render'),
-  drawCommands: {
-    // draw commands should bootstrap themselves the first time they are run
-    drawGrid: require('./rendering/commands/drawGrid/multi.js'),
-    drawAxis: require('./rendering/commands/drawAxis'),
-    drawMesh: require('./rendering/commands/drawMesh'),
-    drawLines: require('./rendering/commands/drawLines')
-  },
-  cameras: {
-    camera: require('./cameras/camera'),
-    orthographic: require('./cameras/orthographicCamera'),
-    perspective: require('./cameras/perspectiveCamera')
-  },
-  controls: {
-    orbit: require('./controls/orbitControls')
-  },
-  entitiesFromSolids: require('./geometry-utils-V2/entitiesFromSolids')
-
-}
+export * as cameras from './cameras/index.js'
+export * as commands from './rendering/commands/index.js'
+export * as controls from './controls/index.js'
+export { entitiesFromSolids } from './geometry-utils-V3/entitiesFromSolids.js'
+export { prepareRender } from './rendering/render.js'

package/src/rendering/commands/drawAxis/index.js

@@ -1,6 +1,6 @@
-const mat4 = require('gl-mat4')
+import * as mat4 from 'gl-mat4'
 
-const drawAxis = (regl, params) => {
+export const drawAxis = (regl, params) => {
   const defaults = {
     xColor: [1, 0, 0, 1],
     yColor: [0, 1, 0, 1],
@@ -65,5 +65,3 @@ const drawAxis = (regl, params) => {
     ])
   }
 }
-
-module.exports = drawAxis

package/src/rendering/commands/drawExps/drawConnector/arcGeo.js

@@ -1,5 +1,5 @@
 
-const geoArc = (options) => {
+export const geoArc = (options) => {
   const geo = {
     positions: [],
     cells: [],
@@ -109,5 +109,3 @@ const createGeometry = (options, positions, cells, uvs) => {
     }
   }
 }
-
-module.exports = geoArc

package/src/rendering/commands/drawExps/drawConnector/index.js

@@ -1,10 +1,10 @@
-const makeDrawAxis = require('../drawAxis')
-const makeDrawMesh = require('../drawMeshNoNormals')
-const makeArcGeometry = require('./arcGeo')
+import mat4 from 'gl-mat4'
 
-const mat4 = require('gl-mat4')
+import { makeDrawAxis } from '../drawAxis.js'
+import { makeDrawMesh } from '../drawMeshNoNormals.js'
+import { makeArcGeometry } from './arcGeo.js'
 
-const drawConnector = (regl, params) => {
+export const drawConnector = (regl, params) => {
   const argGeometry = makeArcGeometry({ innerRadius: 9, outerRadius: 10, startRadian: 0, endRadian: Math.PI * 2 })
   const drawAxis = makeDrawAxis(regl, { alwaysVisible: false })
   const drawArc = makeDrawMesh(regl, { geometry: argGeometry })
@@ -27,5 +27,3 @@ const drawConnector = (regl, params) => {
     })
   }
 }
-
-module.exports = drawConnector

package/src/rendering/commands/drawExps/drawMesh.js

@@ -1,6 +1,6 @@
-const mat4 = require('gl-mat4')
+import mat4 from 'gl-mat4'
 
-const drawMesh = (regl, params) => {
+export const drawMesh = (regl, params) => {
   const mesh = params.geometry
   return regl({
     vert: `
@@ -58,5 +58,3 @@ const drawMesh = (regl, params) => {
     }
   })
 }
-
-module.exports = drawMesh

package/src/rendering/commands/drawExps/drawMeshNoNormals.js

@@ -1,6 +1,6 @@
-const mat4 = require('gl-mat4')
+import mat4 from 'gl-mat4'
 
-const drawMesh = (regl, params) => {
+export const drawMesh = (regl, params) => {
   const defaults = {
     geometry: undefined
   }
@@ -41,5 +41,3 @@ const drawMesh = (regl, params) => {
   }
   return regl(commandParams)
 }
-
-module.exports = drawMesh

package/src/rendering/commands/drawExps/drawNormals.js

@@ -1,6 +1,6 @@
-const mat4 = require('gl-mat4')
+import mat4 from 'gl-mat4'
 
-const drawNormals = (regl, params) => {
+export const drawNormals = (regl, params) => {
   const defaults = {
     size: 20,
     lineWidth: 5, // FIXME/ linewidth has been "deprecated" in multiple browsers etc, need a workaround,
@@ -72,5 +72,3 @@ const drawNormals = (regl, params) => {
   const singleNormal = regl(commandParams)
   return () => singleNormal(normaLines)
 }
-
-module.exports = drawNormals

package/src/rendering/commands/drawExps/drawNormals2.js

@@ -1,6 +1,6 @@
-const mat4 = require('gl-mat4')
+import mat4 from 'gl-mat4'
 
-const drawNormals = (regl, params) => {
+export const drawNormals = (regl, params) => {
   const defaults = {
     xColor: [1, 0, 0, 1],
     // yColor: [0, 1, 0, 1],
@@ -69,5 +69,3 @@ const drawNormals = (regl, params) => {
   const singleNormal = regl(commandParams)
   return () => singleNormal(foo)
 }
-
-module.exports = drawNormals

package/src/rendering/commands/drawGrid/{index.js → makeDrawGrid.js}

@@ -1,6 +1,6 @@
-const mat4 = require('gl-mat4')
+import * as mat4 from 'gl-mat4'
 
-const makeDrawGrid = (regl, params = {}) => {
+export const makeDrawGrid = (regl, params = {}) => {
   const positions = []
   const defaults = {
     visuals: {
@@ -138,5 +138,3 @@ const makeDrawGrid = (regl, params = {}) => {
 
   })
 }
-
-module.exports = makeDrawGrid

package/src/rendering/commands/drawGrid/{multi.js → makeDrawMultiGrid.js}

@@ -1,16 +1,16 @@
-const makeDrawMultiGrid = (regl, params) => {
+import { makeDrawGrid } from './makeDrawGrid.js'
+
+export const makeDrawMultiGrid = (regl, params) => {
   const defaults = {
     size: [50, 50],
     ticks: [10, 1]
   }
   const { size, ticks } = Object.assign({}, defaults, params)
-  const drawMainGrid = require('./index')(regl, { size, ticks: ticks[0] })
-  const drawSubGrid = require('./index')(regl, { size, ticks: ticks[1] })
+  const drawMainGrid = makeDrawGrid(regl, { size, ticks: ticks[0] })
+  const drawSubGrid = makeDrawGrid(regl, { size, ticks: ticks[1] })
   const drawGrid = (props) => {
     drawMainGrid(props)
     drawSubGrid({ color: props.subColor, fadeOut: props.fadeOut })
   }
   return drawGrid
 }
-
-module.exports = makeDrawMultiGrid

package/src/rendering/commands/drawLines/colorOnlyShaders.js

@@ -1,4 +1,4 @@
-const vColorFrag = `
+const frag = `
 precision mediump float;
 uniform vec4 ucolor;
 
@@ -6,4 +6,4 @@ void main () {
   gl_FragColor = ucolor;
 }
 `
-module.exports = { frag: vColorFrag }
+export { frag }

package/src/rendering/commands/drawLines/index.js

@@ -1,8 +1,12 @@
-const mat4 = require('gl-mat4')
+import * as mat4 from 'gl-mat4'
 
-const { meshColor } = require('../../renderDefaults')
+import * as vColorShaders from './vColorShaders.js'
+import * as meshShaders from './meshShaders.js'
+import * as colorOnlyShaders from './colorOnlyShaders.js'
 
-const drawLines = (regl, params = {}) => {
+import { meshColor } from '../../renderDefaults.js'
+
+export const drawLines = (regl, params = {}) => {
   const defaults = {
     color: meshColor,
     geometry: undefined
@@ -15,8 +19,8 @@ const drawLines = (regl, params = {}) => {
   const hasNormals = !!(geometry.normals && geometry.normals.length > 0)
   const hasVertexColors = !!(geometry.colors && geometry.colors.length > 0)
 
-  const vert = hasVertexColors ? require('./vColorShaders').vert : require('./meshShaders').vert
-  const frag = hasVertexColors ? require('./vColorShaders').frag : require('./colorOnlyShaders').frag
+  const vert = hasVertexColors ? vColorShaders.vert : meshShaders.vert
+  const frag = hasVertexColors ? vColorShaders.frag : colorOnlyShaders.frag
 
   const commandParams = {
     primitive: 'lines',
@@ -55,5 +59,3 @@ const drawLines = (regl, params = {}) => {
 
   return regl(commandParams)
 }
-
-module.exports = drawLines

package/src/rendering/commands/drawLines/meshShaders.js

@@ -1,4 +1,4 @@
-const meshVert = `
+const vert = `
 precision mediump float;
 
 uniform float camNear, camFar;
@@ -24,7 +24,7 @@ void main() {
 }
 `
 
-const meshFrag = `
+const frag = `
 precision mediump float;
 varying vec3 surfaceNormal;
 uniform float ambientLightAmount;
@@ -55,4 +55,4 @@ void main () {
   gl_FragColor = vec4((ambient + diffuse + diffuse2 * v), endColor.a);
 }`
 
-module.exports = { vert: meshVert, frag: meshFrag }
+export { vert, frag }

package/src/rendering/commands/drawLines/vColorShaders.js

@@ -1,4 +1,4 @@
-const vColorVert = `
+const vert = `
 precision mediump float;
 
 uniform float camNear, camFar;
@@ -24,7 +24,7 @@ void main() {
 }
 `
 
-const vColorFrag = `
+const frag = `
 precision mediump float;
 varying vec4 vColor;
 
@@ -32,4 +32,4 @@ void main () {
   gl_FragColor = vColor;
 }
 `
-module.exports = { frag: vColorFrag, vert: vColorVert }
+export { frag, vert }

package/src/rendering/commands/drawMesh/colorOnlyShaders.js

@@ -1,4 +1,4 @@
-const vColorFrag = `
+const frag = `
 precision mediump float;
 uniform vec4 ucolor;
 
@@ -6,4 +6,4 @@ void main () {
   gl_FragColor = ucolor;
 }
 `
-module.exports = { frag: vColorFrag }
+export { frag }

package/src/rendering/commands/drawMesh/index.js

@@ -1,8 +1,11 @@
-const mat4 = require('gl-mat4')
+import * as mat4 from 'gl-mat4'
 
-const { meshColor } = require('../../renderDefaults')
+import * as vColorShaders from './vColorShaders.js'
+import * as meshShaders from './meshShaders.js'
 
-const drawMesh = (regl, params = { extras: {} }) => {
+import { meshColor } from '../../renderDefaults.js'
+
+export const drawMesh = (regl, params = { extras: {} }) => {
   const defaults = {
     useVertexColors: true,
     dynamicCulling: true,
@@ -25,8 +28,8 @@ const drawMesh = (regl, params = { extras: {} }) => {
     ? (flip ? 'front' : 'back')
     : 'back'
 
-  const vert = hasVertexColors ? require('./vColorShaders').vert : require('./meshShaders').vert
-  const frag = hasVertexColors ? require('./vColorShaders').frag : require('./meshShaders').frag
+  const vert = hasVertexColors ? vColorShaders.vert : meshShaders.vert
+  const frag = hasVertexColors ? vColorShaders.frag : meshShaders.frag
   const modelMatrixInv = mat4.invert(mat4.create(), transforms)
 
   let commandParams = {
@@ -87,5 +90,3 @@ const drawMesh = (regl, params = { extras: {} }) => {
   commandParams = Object.assign({}, commandParams, params.extras)
   return regl(commandParams)
 }
-
-module.exports = drawMesh

package/src/rendering/commands/drawMesh/meshShaders.js

@@ -1,4 +1,4 @@
-const meshFrag = `
+const frag = `
 precision mediump float;
 varying vec3 surfaceNormal;
 uniform float ambientLightAmount;
@@ -29,7 +29,7 @@ void main () {
   gl_FragColor = vec4((ambient + diffuse + diffuse2 * v), endColor.a);
 }`
 
-const meshVert = `
+const vert = `
 precision mediump float;
 
 uniform float camNear, camFar;
@@ -51,4 +51,4 @@ void main() {
 }
 `
 
-module.exports = { vert: meshVert, frag: meshFrag }
+export { vert, frag }

package/src/rendering/commands/drawMesh/vColorShaders.js

@@ -1,4 +1,4 @@
-const vColorVert = `
+const vert = `
 precision mediump float;
 
 uniform float camNear, camFar;
@@ -30,7 +30,7 @@ void main() {
   //gl_Position = zBufferAdjust(glPosition, camNear, camFar);
 }
 `
-const vColorFrag = `
+const frag = `
 precision mediump float;
 varying vec3 surfaceNormal, surfacePosition;
 
@@ -73,4 +73,4 @@ void main () {
 }
 `
 
-module.exports = { frag: vColorFrag, vert: vColorVert }
+export { frag, vert }

package/src/rendering/commands/index.js

@@ -0,0 +1,11 @@
+import { makeDrawMultiGrid as drawGrid } from './drawGrid/makeDrawMultiGrid.js'
+import { drawAxis } from './drawAxis/index.js'
+import { drawMesh } from './drawMesh/index.js'
+import { drawLines } from './drawLines/index.js'
+
+export {
+  drawGrid,
+  drawAxis,
+  drawMesh,
+  drawLines
+}

package/src/rendering/render.js

@@ -1,7 +1,9 @@
-const renderContext = require('./renderContext')
-const renderDefaults = require('./renderDefaults')
+import regl from 'regl'
 
-const prepareRender = (params) => {
+import { renderContext } from './renderContext.js'
+import * as renderDefaults from './renderDefaults.js'
+
+export const prepareRender = (params) => {
   const defaults = {
   // extensions:['oes_element_index_uint']
   }
@@ -20,7 +22,7 @@ const prepareRender = (params) => {
     }
   )
   // setup regl
-  const regl = require('regl')(options)// , (width, height))
+  const base = regl(options) // , (width, height))
   // setup draw command cache
   // const drawCache = {}
   const drawCache2 = new Map()
@@ -30,8 +32,8 @@ const prepareRender = (params) => {
     props.rendering = Object.assign({}, renderDefaults, props.rendering)
 
     // props is the first parameter, the second one is a function, doing the actual rendering
-    renderContext(regl)(props, (context) => {
-      regl.clear({
+    renderContext(base)(props, (context) => {
+      base.clear({
         color: props.rendering.background,
         depth: 1
       })
@@ -54,7 +56,7 @@ const prepareRender = (params) => {
                 drawCmd = drawCache2.get(visuals.cacheId)
               } else {
                 visuals.cacheId = drawCache2.size
-                drawCmd = props.drawCommands[visuals.drawCmd](regl, entity)
+                drawCmd = props.drawCommands[visuals.drawCmd](base, entity)
                 drawCache2.set(visuals.cacheId, drawCmd)
               }
               const drawParams = { // FIXME: horrible, tidy up !!: what is needed/should be passed to render pass ?
@@ -71,10 +73,8 @@ const prepareRender = (params) => {
   // actual render function
   return function render (data) {
     // important for stats, correct resizing etc
-    regl.poll()
+    base.poll()
     command(data)// meh ??
     // tick += 0.01
   }
 }
-
-module.exports = prepareRender

package/src/rendering/renderContext.js

@@ -1,11 +1,11 @@
-const mat4 = require('gl-mat4')
+import * as mat4 from 'gl-mat4'
 
 /** function that injects most of the uniforms into the regl context:
  * ie keeps track of all regl global state.
  * @param  {} regl
  * @param  {} params={}
  */
-const renderWrapper = (regl, params = {}) => {
+export const renderContext = (regl, params = {}) => {
   const { fbo } = params
 
   const commandParams = {
@@ -44,5 +44,3 @@ const renderWrapper = (regl, params = {}) => {
   // it returns a function
   return regl(Object.assign({}, commandParams, params.extras))
 }
-
-module.exports = renderWrapper

package/src/rendering/renderDefaults.js

@@ -1,11 +1,9 @@
-module.exports = {
-  background: [1, 1, 1, 1],
-  meshColor: [0, 0.6, 1, 1], // default face color or line color
-  lightColor: [1, 1, 1, 1], // note: for now there is a single preset light, not an entity
-  lightDirection: [0.2, 0.2, 1],
-  lightPosition: [100, 200, 100],
-  ambientLightAmount: 0.3,
-  diffuseLightAmount: 0.89,
-  specularLightAmount: 0.16,
-  materialShininess: 8.0
-}
+export const background = [1, 1, 1, 1]
+export const meshColor = [0, 0.6, 1, 1] // default face color or line color
+export const lightColor = [1, 1, 1, 1] // note: for now there is a single preset light, not an entity
+export const lightDirection = [0.2, 0.2, 1]
+export const lightPosition = [100, 200, 100]
+export const ambientLightAmount = 0.3
+export const diffuseLightAmount = 0.89
+export const specularLightAmount = 0.16
+export const materialShininess = 8.0

package/src/utils.js

@@ -1,11 +1,12 @@
-/** kinda, sorta like a nested object.assign, so that nested object values
+/**
+ * kinda, sorta like a nested object.assign, so that nested object values
  * do not get lost
  * note : this is NOT actually making anything immutable !
  * @param  {} output={}
  * @param  {} currentState
  * @param  {} options
  */
-const merge = (output = {}, currentState, options) => {
+export const merge = (output = {}, currentState, options) => {
   output = currentState // JSON.parse(JSON.stringify(currentState))
   Object.keys(options).forEach((key) => {
     const item = options[key]
@@ -28,7 +29,3 @@ const merge = (output = {}, currentState, options) => {
 
   return output
 }
-
-module.exports = {
-  merge
-}

package/src/geometry-utils-V1/cagToGeometries.js

@@ -1,52 +0,0 @@
-const cagToGeometries = (cags, options) => {
-  const defaults = {
-    color: [1, 0.4, 0, 1]// default color
-  }
-  const { color } = Object.assign({}, defaults, options)
-  // flag for transparency
-  let isTransparent = false
-
-  const points = cagToPointsArray(cags).map((x) => [x[0], x[1], 0])
-  const normals = points.map((x) => [0, 0, -1])
-  const colors = points.map((x) => color)
-  const indices = points.map((x, i) => i) // FIXME: temporary, not really needed, need to change drawMesh
-
-  if (color[3] !== 1) {
-    isTransparent = true // FIXME should be analyzed for each vertex
-  }
-
-  return [
-    {
-    // indices,
-      positions: points,
-      normals: normals,
-      colors: colors,
-      indices,
-      isTransparent
-    }]
-}
-
-// FIXME same as in scad-api helpers...
-const cagToPointsArray = (input) => {
-  let points
-  if ('sides' in input) { // this is a cag
-    points = []
-    input.sides.forEach((side) => {
-      points.push([side.vertex0.pos.x, side.vertex0.pos.y])
-      points.push([side.vertex1.pos.x, side.vertex1.pos.y])
-    })
-    // cag.sides.map(side => [side.vertex0.pos.x, side.vertex0.pos.y])
-    //, side.vertex1.pos.x, side.vertex1.pos.y])
-    // due to the logic of CAG.fromPoints()
-    // move the first point to the last
-    /* if (points.length > 0) {
-      points.push(points.shift())
-    } */
-  } else if ('points' in input) {
-    points = input.points.map((p) => ([p.x, p.y]))
-  }
-
-  return points
-}
-
-module.exports = cagToGeometries