@es3d/es3d 1.0.2 → 1.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@es3d/es3d",
-  "version": "1.0.2",
+  "version": "1.1.1",
   "description": "ES3D (Extensible Scalable 3D): a declarative, SVG-inspired 3D scene format with a WebGPU/WebGL2 reference renderer, editor and converter.",
   "type": "module",
   "license": "Apache-2.0",
@@ -28,7 +28,8 @@
   ],
   "main": "src/index.js",
   "exports": {
-    ".": "./src/index.js"
+    ".": "./src/index.js",
+    "./stage": "./browser/es3d-stage.min.js"
   },
   "bin": {
     "es3d": "scripts/es3d-cli.mjs"
@@ -40,6 +41,7 @@
     "!src/bench/",
     "!src/main.js",
     "scripts/es3d-cli.mjs",
+    "browser/es3d-stage.min.js",
     "docs/SPEC.md",
     "docs/REFERENCE.md"
   ],

package/scripts/es3d-cli.mjs

@@ -19,7 +19,7 @@ import { compile } from '../src/pipeline.js';
 import { exportOBJ } from '../src/io/obj.js';
 import { exportSTL } from '../src/io/stl.js';
 import { exportSTEP } from '../src/io/step.js';
-import { detectKind, importFiles } from '../src/io/convert.js';
+import { detectKind, importFiles, exportFormat } from '../src/io/convert.js';
 import { exportableInstances } from '../src/io/external-scene.js';
 import { optimize, expandProcedural } from '../src/optimize/optimizer.js';
 
@@ -39,16 +39,22 @@ Commands
   glb        packed glTF binary                     (instances, LODs, lights, cameras, animation)
   stl        export STL for 3D printing, Z-up        (--lod <0-3>, --ascii)
   step       export tessellated STEP (AP242), Z-up  (--lod <0-3>)
-  import     convert SVG, OBJ (+MTL), STL, STEP or glTF (.gltf + .bin, .glb) to ES3D:
+  x3d        export X3D Classic (.x3dv)            (--lod <0-3>, --flatten)
+  usd        export USD ASCII (.usda)              (--lod <0-3>, --flatten)
+  scad       export an OpenSCAD program            (--lod <0-3>, --flatten)
+  js         export a three.js module              (--lod <0-3>, --flatten)
+  import     convert SVG, OBJ (+MTL), STL, STEP, glTF, X3D, USDA or OpenSCAD to ES3D:
              SVG shapes are extruded (--size, --depth, --bevel, --flat, --no-strokes, --plate),
              STEP solids become ES3D shapes (boxes, extrusions, revolves, paths; free-form faces a mesh),
-             meshes become <mesh> elements (--precision, --smooth, --up y for Y-up STL or STEP)
+             meshes become <mesh> elements (--precision, --smooth, --up y for Y-up STL or STEP),
+             OpenSCAD programs become shapes (difference and intersection are kept and noted, not evaluated)
   stats      sizes, element / instance / triangle counts and pipeline timings
 
 Options
   -o, --out <file>   output file (default: stdout for text)
   --precision <n>    round numbers to n decimals when writing text
-  --lod <n>          level of detail for obj, stl and step (default 0 = finest)
+  --lod <n>          level of detail for mesh export (default 0 = finest)
+  --flatten          x3d, usd, scad, js: write triangles instead of primitives
   --instancing       glb always writes EXT_mesh_gpu_instancing
   --quantize         glb always writes KHR_mesh_quantization
   --min / --pretty   force minified / pretty output
@@ -65,7 +71,7 @@ Options
   -h, --help         this text`;
 
 function parseArgs(argv) {
-  const o = { cmd: null, input: null, out: null, precision: null, lod: 0, instancing: false, quantize: 0, min: false, pretty: false, json: false, ascii: false, svg: {}, mesh: {}, stl: {} };
+  const o = { cmd: null, input: null, out: null, precision: null, lod: 0, instancing: false, quantize: 0, min: false, pretty: false, json: false, ascii: false, flatten: false, svg: {}, mesh: {}, stl: {} };
   for (let i = 0; i < argv.length; i++) {
     const a = argv[i];
     const val = () => {
@@ -82,6 +88,7 @@ function parseArgs(argv) {
     else if (a === '--pretty') o.pretty = true;
     else if (a === '--json') o.json = true;
     else if (a === '--ascii') o.ascii = true;
+    else if (a === '--flatten') o.flatten = true;
     else if (a === '--size') o.svg.size = Number(val());
     else if (a === '--depth') o.svg.depth = Number(val()) / 100;
     else if (a === '--bevel') o.svg.bevel = Number(val()) / 100;
@@ -356,6 +363,22 @@ async function main() {
       process.stderr.write(`${out.triangles.toLocaleString('en-US')} triangles\n`);
       break;
     }
+    case 'x3d':
+    case 'usd':
+    case 'scad':
+    case 'js': {
+      const format = { x3d: 'x3dv', usd: 'usda', scad: 'scad', js: 'js' }[opts.cmd];
+      const base = opts.out ? path.basename(opts.out).replace(/\.[^.]+$/, '') : 'scene';
+      let out;
+      try {
+        out = exportFormat(es3dInput(bytes), format, { baseName: base, lod: opts.lod, structure: opts.flatten ? 'flatten' : 'keep' });
+      } catch (e) {
+        fail(e.message, 1);
+      }
+      write(opts, out.files[0].data);
+      for (const note of out.notes || []) process.stderr.write(`${note}\n`);
+      break;
+    }
     case 'import': {
       const name = opts.input === '-' ? 'stdin' : path.basename(opts.input);
       const files = [{ name, bytes }];

package/src/index.js

@@ -9,8 +9,8 @@
 //   const camera = new Camera().frame(result.scene.bounds);
 //   renderer.render(camera, { width: canvas.clientWidth, height: canvas.clientHeight });
 //
-//   const svg = await importFiles([{ name: 'logo.svg', bytes }]);   // SVG, OBJ, STL, STEP, glTF → ES3D
-//   const { files } = exportFormat(svg.text, 'glb');                 // ES3D → glTF, OBJ, STL, STEP
+//   const svg = await importFiles([{ name: 'logo.svg', bytes }]);   // SVG, OBJ, STL, STEP, glTF, X3D, USDA, OpenSCAD → ES3D
+//   const { files } = exportFormat(svg.text, 'glb');                 // ES3D → glTF, OBJ, STL, STEP, X3D, USD, OpenSCAD, three.js
 //
 // The format, scene, geometry and I/O modules run in Node as well; only the
 // renderer and controls need a browser.
@@ -25,7 +25,9 @@ export { ELEMENTS, elementSpec, attrSpec } from './format/schema.js';
 // scene pipeline
 export { compile, generateGeometry, GeometryCache } from './pipeline.js';
 export { openGeometryStore, indexedDBStore, memoryStore, restoreGeometry, saveGeometry, persistGeometry, geometryKey, GEOMETRY_REVISION } from './cache/geometry-store.js';
-export { RenderScene, updateDynamic, FLAG_MIRRORED, FLAG_NO_COLLIDE } from './scene/flatten.js';
+export { RenderScene, updateDynamic, applyLocalMatrix, applyLocalMatrices, FLAG_MIRRORED, FLAG_NO_COLLIDE } from './scene/flatten.js';
+export { mulberry32 } from './math/random.js';
+export { es3dSin, es3dCos } from './math/trig.js';
 export { pick, raycast } from './scene/picking.js';
 export { applyLimits, sweepCamera, constrainCamera } from './scene/camera-constraints.js';
 
@@ -43,5 +45,10 @@ export { exportOBJ, parseOBJ, objToScene } from './io/obj.js';
 export { exportGLB, parseGLB, glbToScene, isGLB, parseGLTF, gltfToScene } from './io/gltf.js';
 export { exportSTL, parseSTL, stlToScene } from './io/stl.js';
 export { exportSTEP, parseSTEP, stepToScene, isSTEP } from './io/step.js';
+export { exportX3D, importX3D } from './io/x3d.js';
+export { exportUSD, importUSD } from './io/usd.js';
+export { exportOpenSCAD } from './io/openscad.js';
+export { importOpenSCAD } from './io/openscad-import.js';
+export { exportThree } from './io/threejs.js';
 export { sceneToMeshDocument } from './io/mesh-import.js';
 export { optimize, expandProcedural } from './optimize/optimizer.js';

package/src/io/convert.js

@@ -16,6 +16,12 @@ import { svgToES3D } from './svg-import.js';
 import { sceneToMeshDocument } from './mesh-import.js';
 import { compile } from '../pipeline.js';
 import { exportableInstances } from './external-scene.js';
+import { buildExportModel } from './export-model.js';
+import { exportX3D, importX3D } from './x3d.js';
+import { exportUSD, importUSD } from './usd.js';
+import { exportOpenSCAD } from './openscad.js';
+import { importOpenSCAD } from './openscad-import.js';
+import { exportThree } from './threejs.js';
 
 /** OBJ and STL repeat every copy's triangles; beyond this the file gets too large for a browser tab. */
 const OBJ_TRIANGLE_LIMIT = 4e6;
@@ -28,6 +34,12 @@ export const INPUT_KINDS = {
   gltf: 'glTF (JSON)',
   glb: 'glTF binary (GLB)',
   step: 'STEP',
+  x3dv: 'X3D Classic',
+  x3d: 'X3D XML',
+  usda: 'USD ASCII',
+  usdc: 'USD crate',
+  usdz: 'USDZ',
+  scad: 'OpenSCAD',
 };
 
 export const OUTPUT_FORMATS = {
@@ -38,6 +50,10 @@ export const OUTPUT_FORMATS = {
   obj: { label: 'Wavefront OBJ + MTL (.obj)', ext: '.obj', mime: 'model/obj', text: true },
   stl: { label: 'STL for 3D printing (.stl)', ext: '.stl', mime: 'model/stl' },
   step: { label: 'STEP, tessellated (.step)', ext: '.step', mime: 'model/step', text: true },
+  x3dv: { label: 'X3D Classic (.x3dv)', ext: '.x3dv', mime: 'model/x3d+vrml', text: true },
+  usda: { label: 'USD ASCII (.usda)', ext: '.usda', mime: 'model/vnd.usda', text: true },
+  scad: { label: 'OpenSCAD (.scad)', ext: '.scad', mime: 'text/x-openscad', text: true },
+  js: { label: 'three.js module (.js)', ext: '.js', mime: 'text/javascript', text: true },
 };
 
 /** Files that only accompany a main file (OBJ materials, glTF buffers and textures). */
@@ -61,6 +77,11 @@ export function detectKind(name, bytes) {
   if (ext === 'stl' || isAsciiSTL(bytes)) return 'stl';
   if (ext === 'gltf' || /^\s*\{[\s\S]*"asset"\s*:/.test(head)) return 'gltf';
   if (ext === 'obj' || /^\s*(#[^\n]*\n\s*)*(mtllib|o|g|v|vt|vn|f|usemtl|s)\s/.test(head)) return 'obj';
+  if (ext === 'x3dv' || /^#X3D\b/.test(head)) return 'x3dv';
+  if (ext === 'x3d' || /<X3D[\s>]/i.test(head)) return 'x3d';
+  if (ext === 'usda' || /^#usda\b/.test(head)) return 'usda';
+  if (ext === 'usdc' || ext === 'usdz') return ext;
+  if (ext === 'scad') return 'scad';
   if (ext === 'step' || ext === 'stp' || ext === 'p21') return 'step';
   return null;
 }
@@ -93,7 +114,7 @@ export async function importFiles(files, opts = {}) {
   const main = list.find((f) => !COMPANION.test(f.name)) || list[0];
   const companions = list.filter((f) => f !== main);
   const kind = detectKind(main.name, main.bytes);
-  if (!kind) throw new Error(`${main.name}: unknown file type. The converter reads SVG, OBJ, STL, STEP (.step, .stp) and glTF (.gltf, .glb) and ES3D (.es3d) files.`);
+  if (!kind) throw new Error(`${main.name}: unknown file type. The converter reads SVG, OBJ, STL, STEP (.step, .stp), glTF (.gltf, .glb), X3D (.x3d, .x3dv), USDA, OpenSCAD (.scad) and ES3D (.es3d) files.`);
   const title = main.name.replace(/\.[^.]+$/, '') || 'untitled';
   const svgOpts = { ...IMPORT_DEFAULTS.svg, ...(opts.svg || {}) };
   const meshOpts = { ...IMPORT_DEFAULTS.mesh, ...(opts.mesh || {}) };
@@ -165,6 +186,23 @@ export async function importFiles(files, opts = {}) {
       text = meshDocument(s, hasNormals);
       break;
     }
+    case 'x3dv':
+    case 'x3d':
+    case 'usda': {
+      const imported = kind === 'usda' ? importUSD(decode(main.bytes)) : importX3D(decode(main.bytes));
+      text = imported.text;
+      notes.push(...imported.notes);
+      break;
+    }
+    case 'usdc':
+    case 'usdz':
+      throw new Error('USDC and USDZ are not read here. This tool reads and writes USDA text; convert a crate with usdcat if you have the USD tools.');
+    case 'scad': {
+      const imported = importOpenSCAD(decode(main.bytes), { files: companions });
+      text = imported.text;
+      notes.push(...imported.notes);
+      break;
+    }
   }
   return { kind, name: main.name, title, text, warnings, notes };
 }
@@ -186,11 +224,13 @@ function describeErrors(diagnostics, lineIndex) {
  * Write an ES3D document in another format.
  * @param {string|Uint8Array} source ES3D text
  * @param {keyof OUTPUT_FORMATS} format
- * @param {{baseName?: string, lod?: number, compiled?: object, instancing?: boolean}} [opts]
- *        compiled: an existing compile() result for the same source (saves compiling twice)
- * @returns {{files: {name: string, data: Uint8Array|string, mime: string}[], triangles?: number}}
+ * @param {{baseName?: string, lod?: number, compiled?: object, instancing?: boolean, structure?: 'keep'|'flatten'}} [opts]
+ *        compiled: an existing compile() result for the same source (saves compiling twice).
+ *        structure applies to X3D, USD, OpenSCAD and three.js: keep (the default) writes
+ *        primitives and the target's own reuse; flatten writes the same triangles as glTF and OBJ.
+ * @returns {{files: {name: string, data: Uint8Array|string, mime: string}[], triangles?: number, notes?: string[]}}
  */
-export function exportFormat(source, format, { baseName = 'scene', lod = 0, compiled = null, instancing = true } = {}) {
+export function exportFormat(source, format, { baseName = 'scene', lod = 0, compiled = null, instancing = true, structure = 'keep' } = {}) {
   const spec = OUTPUT_FORMATS[format];
   if (!spec) throw new Error(`Unknown output format ${format}.`);
   const name = baseName + spec.ext;
@@ -206,6 +246,14 @@ export function exportFormat(source, format, { baseName = 'scene', lod = 0, comp
       const r = compiled || compile(source);
       if (!r.ok) throw new Error(describeErrors(r.diagnostics, r.doc && r.doc.lineIndex));
       const meshOf = (e, l) => r.cache.mesh(e, Math.min(l, e.lods - 1));
+      if (format === 'x3dv' || format === 'usda' || format === 'scad' || format === 'js') {
+        const model = buildExportModel(r, meshOf, { lod, structure: structure === 'flatten' ? 'flatten' : 'keep' });
+        if (model.meshTriangles > OBJ_TRIANGLE_LIMIT) {
+          throw new Error(`At this level of detail the scene has ${model.meshTriangles.toLocaleString('en-US')} triangles, too many for this file (limit ${OBJ_TRIANGLE_LIMIT.toLocaleString('en-US')}). Choose a coarser detail.`);
+        }
+        const written = format === 'x3dv' ? exportX3D(model) : format === 'usda' ? exportUSD(model) : format === 'scad' ? exportOpenSCAD(model) : exportThree(model);
+        return { ...one(written.text), notes: written.notes };
+      }
       if (format === 'glb') return one(exportGLB(r.scene, meshOf, { lod, instancing }));
       if (format === 'obj') {
         let triangles = 0;