@tscircuit/3d-viewer 0.0.373 → 0.0.375

package/dist/index.js

@@ -14416,7 +14416,28 @@ var ContainerWithTooltip_default = ContainerWithTooltip;
 
 // src/hooks/use-global-obj-loader.ts
 import { useState as useState2, useEffect as useEffect3 } from "react";
-import { MTLLoader, OBJLoader, VRMLLoader } from "three-stdlib";
+import { MTLLoader, OBJLoader } from "three-stdlib";
+
+// src/utils/vrml.ts
+import { VRMLLoader } from "three-stdlib";
+function sanitizeVrmlIdentifiers(text) {
+  return text.replace(/(DEF|USE)\s+([^\s]+)/g, (match, type, name) => {
+    return `${type} ${name.replace(/-/g, "_")}`;
+  });
+}
+async function loadVrml(url) {
+  const response = await fetch(url);
+  if (!response.ok) {
+    throw new Error(
+      `Failed to fetch "${url}": ${response.status} ${response.statusText}`
+    );
+  }
+  const text = await response.text();
+  const loader = new VRMLLoader();
+  return loader.parse(sanitizeVrmlIdentifiers(text), url);
+}
+
+// src/hooks/use-global-obj-loader.ts
 if (typeof window !== "undefined" && !window.TSCIRCUIT_OBJ_LOADER_CACHE) {
   window.TSCIRCUIT_OBJ_LOADER_CACHE = /* @__PURE__ */ new Map();
 }
@@ -14430,8 +14451,7 @@ function useGlobalObjLoader(url) {
     async function loadAndParseObj() {
       try {
         if (cleanUrl.endsWith(".wrl")) {
-          const loader = new VRMLLoader();
-          return await loader.loadAsync(cleanUrl);
+          return await loadVrml(cleanUrl);
         }
         const response = await fetch(cleanUrl);
         if (!response.ok) {
@@ -14508,7 +14528,8 @@ function MixedStlModel({
   rotation: rotation2,
   onHover,
   onUnhover,
-  isHovered
+  isHovered,
+  scale: scale2
 }) {
   const obj = useGlobalObjLoader(url);
   const { rootObject } = useThree();
@@ -14548,6 +14569,9 @@ function MixedStlModel({
         model.rotation.copy(rotation2);
       }
     }
+    if (scale2 !== void 0) {
+      model.scale.setScalar(scale2);
+    }
   }, [
     model,
     Array.isArray(position) ? position[0] : position?.x,
@@ -14555,7 +14579,8 @@ function MixedStlModel({
     Array.isArray(position) ? position[2] : position?.z,
     Array.isArray(rotation2) ? rotation2[0] : rotation2?.x,
     Array.isArray(rotation2) ? rotation2[1] : rotation2?.y,
-    Array.isArray(rotation2) ? rotation2[2] : rotation2?.z
+    Array.isArray(rotation2) ? rotation2[2] : rotation2?.z,
+    scale2
   ]);
   if (obj instanceof Error) {
     throw obj;
@@ -14582,7 +14607,8 @@ function GltfModel({
   rotation: rotation2,
   onHover,
   onUnhover,
-  isHovered
+  isHovered,
+  scale: scale2
 }) {
   const { rootObject } = useThree();
   const [model, setModel] = useState3(null);
@@ -14609,6 +14635,7 @@ function GltfModel({
     if (!model) return;
     if (position) model.position.fromArray(position);
     if (rotation2) model.rotation.fromArray(rotation2);
+    if (scale2 !== void 0) model.scale.setScalar(scale2);
   }, [
     model,
     position?.[0],
@@ -14616,7 +14643,8 @@ function GltfModel({
     position?.[2],
     rotation2?.[0],
     rotation2?.[1],
-    rotation2?.[2]
+    rotation2?.[2],
+    scale2
   ]);
   useEffect5(() => {
     if (!rootObject || !model) return;
@@ -16608,6 +16636,7 @@ var cad_component = z101.object({
   model_glb_url: z101.string().optional(),
   model_step_url: z101.string().optional(),
   model_wrl_url: z101.string().optional(),
+  model_unit_to_mm_scale_factor: z101.number().optional(),
   model_jscad: z101.any().optional()
 }).describe("Defines a component on the PCB");
 expectTypesMatch(true);
@@ -25644,7 +25673,8 @@ var JscadModel = ({
   rotationOffset,
   onHover,
   onUnhover,
-  isHovered
+  isHovered,
+  scale: scale2
 }) => {
   const { rootObject } = useThree();
   const { threeGeom, material } = useMemo4(() => {
@@ -25675,6 +25705,7 @@ var JscadModel = ({
     if (!mesh) return;
     if (positionOffset) mesh.position.fromArray(positionOffset);
     if (rotationOffset) mesh.rotation.fromArray(rotationOffset);
+    if (scale2 !== void 0) mesh.scale.setScalar(scale2);
   }, [
     mesh,
     positionOffset?.[0],
@@ -25682,7 +25713,8 @@ var JscadModel = ({
     positionOffset?.[2],
     rotationOffset?.[0],
     rotationOffset?.[1],
-    rotationOffset?.[2]
+    rotationOffset?.[2],
+    scale2
   ]);
   useMemo4(() => {
     if (!material) return;
@@ -25717,7 +25749,8 @@ var FootprinterModel = ({
   rotationOffset,
   onHover,
   onUnhover,
-  isHovered
+  isHovered,
+  scale: scale2
 }) => {
   const { rootObject } = useThree();
   const group = useMemo5(() => {
@@ -25753,6 +25786,7 @@ var FootprinterModel = ({
     if (!group) return;
     if (positionOffset) group.position.fromArray(positionOffset);
     if (rotationOffset) group.rotation.fromArray(rotationOffset);
+    if (scale2 !== void 0) group.scale.setScalar(scale2);
   }, [
     group,
     positionOffset?.[0],
@@ -25760,7 +25794,8 @@ var FootprinterModel = ({
     positionOffset?.[2],
     rotationOffset?.[0],
     rotationOffset?.[1],
-    rotationOffset?.[2]
+    rotationOffset?.[2],
+    scale2
   ]);
   useEffect7(() => {
     if (!group) return;
@@ -25872,6 +25907,7 @@ var AnyCadComponent = ({
           cad_component2.position.z
         ] : void 0,
         rotation: rotationOffset,
+        scale: cad_component2.model_unit_to_mm_scale_factor,
         onHover: handleHover,
         onUnhover: handleUnhover,
         isHovered
@@ -25889,6 +25925,7 @@ var AnyCadComponent = ({
           cad_component2.position.z
         ] : void 0,
         rotation: rotationOffset,
+        scale: cad_component2.model_unit_to_mm_scale_factor,
         onHover: handleHover,
         onUnhover: handleUnhover,
         isHovered
@@ -25901,6 +25938,7 @@ var AnyCadComponent = ({
       {
         jscadPlan: cad_component2.model_jscad,
         rotationOffset,
+        scale: cad_component2.model_unit_to_mm_scale_factor,
         onHover: handleHover,
         onUnhover: handleUnhover,
         isHovered
@@ -25918,6 +25956,7 @@ var AnyCadComponent = ({
         ] : void 0,
         rotationOffset,
         footprint: cad_component2.footprinter_string,
+        scale: cad_component2.model_unit_to_mm_scale_factor,
         onHover: handleHover,
         onUnhover: handleUnhover,
         isHovered
@@ -25959,7 +25998,7 @@ import * as THREE11 from "three";
 // package.json
 var package_default = {
   name: "@tscircuit/3d-viewer",
-  version: "0.0.372",
+  version: "0.0.374",
   main: "./dist/index.js",
   module: "./dist/index.js",
   type: "module",
@@ -26015,7 +26054,7 @@ var package_default = {
     "@vitejs/plugin-react": "^4.3.4",
     "bun-match-svg": "^0.0.9",
     "bun-types": "1.2.1",
-    "circuit-json": "0.0.248",
+    "circuit-json": "0.0.249",
     "circuit-to-svg": "^0.0.179",
     debug: "^4.4.0",
     "jscad-electronics": "^0.0.38",
@@ -30046,7 +30085,6 @@ import * as THREE25 from "three";
 import { GLTFLoader as GLTFLoader2 } from "three/examples/jsm/loaders/GLTFLoader.js";
 import { OBJLoader as OBJLoader2 } from "three/examples/jsm/loaders/OBJLoader.js";
 import { STLLoader as STLLoader2 } from "three/examples/jsm/loaders/STLLoader.js";
-import { VRMLLoader as VRMLLoader2 } from "three/examples/jsm/loaders/VRMLLoader.js";
 async function load3DModel(url) {
   if (url.endsWith(".stl")) {
     const loader = new STLLoader2();
@@ -30063,8 +30101,7 @@ async function load3DModel(url) {
     return await loader.loadAsync(url);
   }
   if (url.endsWith(".wrl")) {
-    const loader = new VRMLLoader2();
-    return await loader.loadAsync(url);
+    return await loadVrml(url);
   }
   if (url.endsWith(".gltf") || url.endsWith(".glb")) {
     const loader = new GLTFLoader2();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tscircuit/3d-viewer",
-  "version": "0.0.373",
+  "version": "0.0.375",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
   "type": "module",
@@ -56,7 +56,7 @@
     "@vitejs/plugin-react": "^4.3.4",
     "bun-match-svg": "^0.0.9",
     "bun-types": "1.2.1",
-    "circuit-json": "0.0.248",
+    "circuit-json": "0.0.249",
     "circuit-to-svg": "^0.0.179",
     "debug": "^4.4.0",
     "jscad-electronics": "^0.0.38",