@es3d/es3d 1.1.0 → 1.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@es3d/es3d",
-  "version": "1.1.0",
+  "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",

package/src/io/threejs.js

@@ -44,7 +44,11 @@ export function exportThree(model) {
   const tally = new Map();
   const add = (key, k = 1) => tally.set(key, (tally.get(key) || 0) + k);
   const lines = [];
+  // Geometries and materials are declared once, at the top of createScene(), so a
+  // repeat factory and the code after it can both use them.
+  const defs = [];
   const geos = new Map();
+  const bakedGeos = new Map();
   const mats = new Map();
   let seq = 0;
   const fresh = (p) => `${p}${seq++}`;
@@ -59,10 +63,10 @@ export function exportThree(model) {
     const c = m.baseColorSrgb;
     const side = (m.doubleSided || forceDouble) ? ', side: THREE.DoubleSide' : '';
     if (m.unlit) {
-      lines.push(`  const ${id} = new THREE.MeshBasicMaterial({ color: new THREE.Color(${n(c[0])}, ${n(c[1])}, ${n(c[2])}), transparent: ${m.opacity < 0.999}, opacity: ${n(m.opacity)}${side} });`);
+      defs.push(`  const ${id} = new THREE.MeshBasicMaterial({ color: new THREE.Color(${n(c[0])}, ${n(c[1])}, ${n(c[2])}), transparent: ${m.opacity < 0.999}, opacity: ${n(m.opacity)}${side} });`);
       return id;
     }
-    lines.push(`  const ${id} = new THREE.MeshStandardMaterial({ color: new THREE.Color(${n(c[0])}, ${n(c[1])}, ${n(c[2])}), metalness: ${n(m.metallic)}, roughness: ${n(m.roughness)}, transparent: ${m.opacity < 0.999}, opacity: ${n(m.opacity)}${side} });`);
+    defs.push(`  const ${id} = new THREE.MeshStandardMaterial({ color: new THREE.Color(${n(c[0])}, ${n(c[1])}, ${n(c[2])}), metalness: ${n(m.metallic)}, roughness: ${n(m.roughness)}, transparent: ${m.opacity < 0.999}, opacity: ${n(m.opacity)}${side} });`);
     return id;
   };
 
@@ -71,7 +75,7 @@ export function exportThree(model) {
     if (geos.has(key)) return geos.get(key);
     const id = fresh('g');
     geos.set(key, id);
-    lines.push(`  const ${id} = ${geometryExpr(solid)};`);
+    defs.push(`  const ${id} = ${geometryExpr(solid)};`);
     return id;
   };
 
@@ -116,12 +120,17 @@ export function exportThree(model) {
   const baked = (node) => {
     const mesh = node.solid.kind === 'mesh' || node.solid.kind === 'lines' ? node.solid : model.bakedMesh(node.entry);
     add(node.solid.kind === 'mesh' || node.solid.kind === 'lines' ? 'mesh' : node.solid.kind);
-    const g = fresh('g');
-    const positions = `new Float32Array([${nums(mesh.positions)}])`;
-    lines.push(`  const ${g} = new THREE.BufferGeometry();`);
-    lines.push(`  ${g}.setAttribute('position', new THREE.BufferAttribute(${positions}, 3));`);
-    if (mesh.normals) lines.push(`  ${g}.setAttribute('normal', new THREE.BufferAttribute(new Float32Array([${nums(mesh.normals)}]), 3));`);
-    lines.push(`  ${g}.setIndex([${Array.from(mesh.indices).join(', ')}]);`);
+    const geoKey = mesh.key || mesh;
+    let g = bakedGeos.get(geoKey);
+    if (!g) {
+      g = fresh('g');
+      bakedGeos.set(geoKey, g);
+      const positions = `new Float32Array([${nums(mesh.positions)}])`;
+      defs.push(`  const ${g} = new THREE.BufferGeometry();`);
+      defs.push(`  ${g}.setAttribute('position', new THREE.BufferAttribute(${positions}, 3));`);
+      if (mesh.normals) defs.push(`  ${g}.setAttribute('normal', new THREE.BufferAttribute(new Float32Array([${nums(mesh.normals)}]), 3));`);
+      defs.push(`  ${g}.setIndex([${Array.from(mesh.indices).join(', ')}]);`);
+    }
     const m = material(node.material, node.doubleSided);
     const id = fresh('o');
     const kind = mesh.kind === 'lines' ? 'LineSegments' : 'Mesh';
@@ -289,6 +298,7 @@ export function exportThree(model) {
 ${helper}
 export function createScene() {
   const root = new THREE.Group();
+${defs.join('\n')}
 ${lines.join('\n')}
   return root;
 }

package/src/io/usd.js

@@ -220,7 +220,7 @@ export function exportUSD(model) {
     const inst = g.matrix || matrix;
     if ((uses.get(key) || 0) > 1) {
       const id = ensureProto(shape);
-      return `        def Xform "${name}" (\n            prepend references = </World/Prototypes/${id}>\n        ) {\n            token visibility = "inherited"\n${indent(xformBlock(inst, ''), 12)}${indent(bind, 12)}        }`;
+      return `        def "${name}" (\n            prepend references = </World/Prototypes/${id}>\n        ) {\n            token visibility = "inherited"\n${indent(xformBlock(inst, ''), 12)}${indent(bind, 12)}        }`;
     }
     const combined = g.matrix ? inst : combine(matrix, g.local);
     return `        def ${g.type} "${name}" {\n${indent(g.body, 12)}${indent(xformBlock(combined, ''), 12)}${indent(bind, 12)}        }`;
@@ -439,6 +439,27 @@ function blockNamed(text, type, name) {
   return sliceBlock(text, open);
 }
 
+/** The text of a prim's body without the bodies of the prims defined inside it. */
+function ownText(body) {
+  let out = '';
+  let i = 0;
+  while (i < body.length) {
+    const at = body.indexOf('def ', i);
+    if (at < 0) { out += body.slice(i); break; }
+    out += body.slice(i, at);
+    const open = body.indexOf('{', at);
+    if (open < 0) break;
+    let depth = 0;
+    let j = open;
+    for (; j < body.length; j++) {
+      if (body[j] === '{') depth++;
+      else if (body[j] === '}' && --depth === 0) break;
+    }
+    i = j + 1;
+  }
+  return out;
+}
+
 function listPrims(text) {
   const out = [];
   let i = 0;
@@ -447,22 +468,25 @@ function listPrims(text) {
     if (at < 0) break;
     const before = text.slice(i, at);
     if ((before.match(/\{/g) || []).length !== (before.match(/\}/g) || []).length) { i = at + 4; continue; }
-    const head = /^def\s+([A-Za-z0-9_]+)\s+"([^"]+)"\s*(\([^)]*\))?/.exec(text.slice(at));
+    const head = /^def\s+(?:([A-Za-z0-9_]+)\s+)?"([^"]+)"\s*(\([^)]*\))?/.exec(text.slice(at));
     if (!head) { i = at + 4; continue; }
     const open = text.indexOf('{', at + head[0].length - 1);
     if (open < 0) break;
     const body = sliceBlock(text, open);
-    out.push({ type: head[1], name: head[2], meta: head[3] || '', body });
+    out.push({ type: head[1] || '', name: head[2], meta: head[3] || '', body });
     i = open + body.length + 2;
   }
   return out;
 }
 
 function emitPrim(prim, lib, materials, paint, notes, parent, inherited) {
-  const local = readXform(prim.body);
+  // A prim's own transform and binding, not those of the prims nested in it.
+  const own = ownText(prim.body);
+  const local = readXform(own);
   const matrix = combine(parent, local);
-  const style = paint(prim.body, materials) || inherited || '';
-  if (prim.type === 'Xform') {
+  const style = paint(own, materials) || inherited || '';
+  // A typeless def takes its type from the prototype it references.
+  if (prim.type === 'Xform' || prim.type === '') {
     const ref = /references\s*=\s*<([^>]+)>/.exec(prim.meta);
     const target = ref ? lib.get(ref[1].split('/').pop()) : null;
     if (target) return emitPrim(target, lib, materials, paint, notes, matrix, style);

package/src/io/x3d.js

@@ -592,7 +592,7 @@ export function importX3D(text) {
     i = step.i;
   }
   materialAttrs.materials = [];
-  const parts = nodes.map((node) => emitEs3d(node, notes)).filter(Boolean);
+  const parts = nodes.map((node) => emitEs3d(node, notes, defs)).filter(Boolean);
   const mats = materialAttrs.materials;
   materialAttrs.materials = [];
   const markup = `<es3d version="1">\n${mats.join('\n')}${mats.length ? '\n' : ''}${parts.join('\n')}\n</es3d>\n`;
@@ -734,7 +734,7 @@ function numAttr(list, count) {
   return nums.slice(0, count);
 }
 
-function emitEs3d(node, notes) {
+function emitEs3d(node, notes, defs) {
   if (!node) return '';
   if (node.use) return `<use ref="${esc(node.use)}"/>`;
   const f = node.fields || {};
@@ -743,11 +743,13 @@ function emitEs3d(node, notes) {
   if (node.name === 'Transform' || node.name === 'Group' || node.name === 'Anchor' || node.name === 'Collision' || node.name === 'Switch' || node.name === 'Billboard') {
     if (node.name !== 'Transform' && node.name !== 'Group') notes.push(`<${node.name}> was written as a group.`);
     const tr = x3dTransform(f);
-    const body = kids.map((c) => emitEs3d(c, notes)).filter(Boolean).join('\n');
+    const body = kids.map((c) => emitEs3d(c, notes, defs)).filter(Boolean).join('\n');
     return `<group${id}${tr}>\n${body}\n</group>`;
   }
   if (node.name === 'Shape') {
-    const geom = f.geometry && f.geometry.name ? f.geometry : null;
+    // geometry USE G names a node defined earlier; draw that geometry here too.
+    const used = f.geometry && f.geometry.use && defs ? defs.get(f.geometry.use) : null;
+    const geom = f.geometry && f.geometry.name ? f.geometry : (used && used.name ? used : null);
     const style = materialAttrs(f.appearance, notes);
     if (!geom) return '';
     return emitGeom(geom, id, style, notes);