circuit-json-to-gltf 0.0.12 → 0.0.13

package/dist/index.js

@@ -742,6 +742,95 @@ function clearGLBCache() {
   glbCache.clear();
 }
 
+// lib/loaders/gltf.ts
+async function fetchAsArrayBuffer(url) {
+  const response = await fetch(url);
+  if (!response.ok) {
+    throw new Error(`Failed to fetch ${url}: ${response.statusText}`);
+  }
+  return response.arrayBuffer();
+}
+function dataUriToArrayBuffer(uri) {
+  const a = uri.split(",");
+  const byteString = atob(a[1]);
+  const ab = new ArrayBuffer(byteString.length);
+  const ia = new Uint8Array(ab);
+  for (let i = 0; i < byteString.length; i++) {
+    ia[i] = byteString.charCodeAt(i);
+  }
+  return ab;
+}
+async function fetchGltfAndConvertToGlb(url) {
+  const gltfResponse = await fetch(url);
+  if (!gltfResponse.ok) {
+    throw new Error(`Failed to fetch glTF file: ${gltfResponse.statusText}`);
+  }
+  const gltf = await gltfResponse.json();
+  const bufferPromises = [];
+  if (gltf.buffers) {
+    for (const buffer of gltf.buffers) {
+      if (buffer.uri) {
+        if (buffer.uri.startsWith("data:")) {
+          bufferPromises.push(Promise.resolve(dataUriToArrayBuffer(buffer.uri)));
+        } else {
+          const bufferUrl = new URL(buffer.uri, url).toString();
+          bufferPromises.push(fetchAsArrayBuffer(bufferUrl));
+        }
+      }
+    }
+  }
+  const buffers = await Promise.all(bufferPromises);
+  let binaryBuffer = new ArrayBuffer(0);
+  if (buffers.length > 0 && buffers[0]) {
+    binaryBuffer = buffers[0];
+  }
+  if (gltf.buffers && gltf.buffers.length > 0) {
+    delete gltf.buffers[0].uri;
+    gltf.buffers[0].byteLength = binaryBuffer.byteLength;
+  }
+  const jsonString = JSON.stringify(gltf);
+  const jsonBuffer = new TextEncoder().encode(jsonString);
+  const jsonPadding = (4 - jsonBuffer.length % 4) % 4;
+  const binaryPadding = (4 - binaryBuffer.byteLength % 4) % 4;
+  const totalLength = 12 + // header
+  (8 + jsonBuffer.length + jsonPadding) + // json chunk
+  (binaryBuffer.byteLength > 0 ? 8 + binaryBuffer.byteLength + binaryPadding : 0);
+  const glbBuffer = new ArrayBuffer(totalLength);
+  const dataView = new DataView(glbBuffer);
+  let offset = 0;
+  dataView.setUint32(offset, 1179937895, true);
+  offset += 4;
+  dataView.setUint32(offset, 2, true);
+  offset += 4;
+  dataView.setUint32(offset, totalLength, true);
+  offset += 4;
+  dataView.setUint32(offset, jsonBuffer.length + jsonPadding, true);
+  offset += 4;
+  dataView.setUint32(offset, 1313821514, true);
+  offset += 4;
+  new Uint8Array(glbBuffer, offset).set(jsonBuffer);
+  offset += jsonBuffer.length;
+  for (let i = 0; i < jsonPadding; i++) {
+    dataView.setUint8(offset++, 32);
+  }
+  if (binaryBuffer.byteLength > 0) {
+    dataView.setUint32(offset, binaryBuffer.byteLength + binaryPadding, true);
+    offset += 4;
+    dataView.setUint32(offset, 5130562, true);
+    offset += 4;
+    new Uint8Array(glbBuffer, offset).set(new Uint8Array(binaryBuffer));
+    offset += binaryBuffer.byteLength;
+    for (let i = 0; i < binaryPadding; i++) {
+      dataView.setUint8(offset++, 0);
+    }
+  }
+  return glbBuffer;
+}
+async function loadGLTF(url, transform) {
+  const glb_buffer = await fetchGltfAndConvertToGlb(url);
+  return parseGLB(glb_buffer, transform);
+}
+
 // lib/converters/board-renderer.ts
 import { convertCircuitJsonToPcbSvg } from "circuit-to-svg";
 async function renderBoardLayer(circuitJson, options) {
@@ -900,12 +989,15 @@ async function convertCircuitJsonTo3D(circuitJson, options = {}) {
   const cadComponents = db.cad_component?.list?.() ?? [];
   const pcbComponentIdsWith3D = /* @__PURE__ */ new Set();
   for (const cad of cadComponents) {
-    let { model_stl_url, model_obj_url, model_glb_url } = cad;
-    const hasModelUrl = Boolean(model_stl_url || model_obj_url || model_glb_url);
+    let { model_stl_url, model_obj_url, model_glb_url, model_gltf_url } = cad;
+    const hasModelUrl = Boolean(
+      model_stl_url || model_obj_url || model_glb_url || model_gltf_url
+    );
     if (!hasModelUrl && cad.footprinter_string) {
       model_glb_url = `https://modelcdn.tscircuit.com/jscad_models/${cad.footprinter_string}.glb`;
     }
-    if (!model_stl_url && !model_obj_url && !model_glb_url) continue;
+    if (!model_stl_url && !model_obj_url && !model_glb_url && !model_gltf_url)
+      continue;
     pcbComponentIdsWith3D.add(cad.pcb_component_id);
     const pcbComponent = db.pcb_component.get(cad.pcb_component_id);
     const size = cad.size ?? {
@@ -918,26 +1010,25 @@ async function convertCircuitJsonTo3D(circuitJson, options = {}) {
       y: boardThickness / 2 + size.y / 2,
       z: pcbComponent?.center.y ?? 0
     };
+    const meshType = model_stl_url ? "stl" : model_obj_url ? "obj" : model_gltf_url ? "gltf" : "glb";
     const box = {
       center,
       size,
-      meshUrl: model_stl_url || model_obj_url || model_glb_url,
-      meshType: model_stl_url ? "stl" : model_obj_url ? "obj" : "glb"
+      meshUrl: model_stl_url || model_obj_url || model_glb_url || model_gltf_url,
+      meshType
     };
     if (cad.rotation) {
       box.rotation = convertRotationFromCadRotation(cad.rotation);
     }
-    const defaultTransform = coordinateTransform ?? (model_glb_url ? void 0 : COORDINATE_TRANSFORMS.Z_UP_TO_Y_UP_USB_FIX);
-    try {
-      if (model_stl_url) {
-        box.mesh = await loadSTL(model_stl_url, defaultTransform);
-      } else if (model_obj_url) {
-        box.mesh = await loadOBJ(model_obj_url, defaultTransform);
-      } else if (model_glb_url) {
-        box.mesh = await loadGLB(model_glb_url, defaultTransform);
-      }
-    } catch (error) {
-      console.warn(`Failed to load 3D model: ${error}`);
+    const defaultTransform = coordinateTransform ?? (model_glb_url || model_gltf_url ? void 0 : COORDINATE_TRANSFORMS.Z_UP_TO_Y_UP_USB_FIX);
+    if (model_stl_url) {
+      box.mesh = await loadSTL(model_stl_url, defaultTransform);
+    } else if (model_obj_url) {
+      box.mesh = await loadOBJ(model_obj_url, defaultTransform);
+    } else if (model_glb_url) {
+      box.mesh = await loadGLB(model_glb_url, defaultTransform);
+    } else if (model_gltf_url) {
+      box.mesh = await loadGLTF(model_gltf_url, defaultTransform);
     }
     if (!box.mesh) {
       box.color = componentColor;

package/package.json

@@ -2,7 +2,7 @@
   "name": "circuit-json-to-gltf",
   "main": "dist/index.js",
   "type": "module",
-  "version": "0.0.12",
+  "version": "0.0.13",
   "scripts": {
     "test": "bun test tests/",
     "format": "biome format --write .",