@tscircuit/3d-viewer 0.0.570 → 0.0.571

package/dist/index.js

@@ -31205,12 +31205,15 @@ function GltfModel({
   useEffect7(() => {
     if (!model) return;
     model.traverse((child) => {
-      if (child instanceof THREE7.Mesh && child.material instanceof THREE7.MeshStandardMaterial) {
+      if (!(child instanceof THREE7.Mesh)) return;
+      const materials = Array.isArray(child.material) ? child.material : [child.material];
+      for (const material of materials) {
+        if (!(material instanceof THREE7.MeshStandardMaterial)) continue;
         if (isHovered) {
-          child.material.emissive.setHex(255);
-          child.material.emissiveIntensity = 0.2;
+          material.emissive.setHex(255);
+          material.emissiveIntensity = 0.2;
         } else {
-          child.material.emissiveIntensity = 0;
+          material.emissiveIntensity = 0;
         }
       }
     });
@@ -31486,6 +31489,9 @@ function MixedStlModel({
 
 // src/three-components/StepModel.tsx
 import { useEffect as useEffect10, useState as useState6 } from "react";
+import { GLTFExporter } from "three-stdlib";
+
+// src/three-components/step-mesh-to-group.ts
 import {
   BufferGeometry as BufferGeometry2,
   Color as Color3,
@@ -31494,7 +31500,88 @@ import {
   Mesh as Mesh6,
   MeshStandardMaterial as MeshStandardMaterial5
 } from "three";
-import { GLTFExporter } from "three-stdlib";
+var DEFAULT_COLOR = new Color3(0.82, 0.82, 0.82);
+var createMaterial = (color) => new MeshStandardMaterial5({
+  color: color ? new Color3(color[0], color[1], color[2]) : DEFAULT_COLOR
+});
+function applyFaceColorGroups(geometry, mesh) {
+  const defaultMaterial = createMaterial(mesh.color);
+  const brepFaces = mesh.brep_faces ?? [];
+  if (brepFaces.length === 0) {
+    return [defaultMaterial];
+  }
+  const sortedBrepFaces = brepFaces.length > 1 ? [...brepFaces].sort((a, b) => a.first - b.first) : brepFaces;
+  const materials = [defaultMaterial];
+  const materialIndexByColor = /* @__PURE__ */ new Map();
+  const triangleCount = mesh.index.array.length / 3;
+  let triangleIndex = 0;
+  let faceIndex = 0;
+  const getMaterialIndexForFace = (color) => {
+    if (!color) return 0;
+    const key = color.join(",");
+    const existingIndex = materialIndexByColor.get(key);
+    if (existingIndex !== void 0) {
+      return existingIndex;
+    }
+    const nextIndex = materials.length;
+    materials.push(createMaterial(color));
+    materialIndexByColor.set(key, nextIndex);
+    return nextIndex;
+  };
+  while (triangleIndex < triangleCount) {
+    const currentFace = sortedBrepFaces[faceIndex];
+    let lastTriangleExclusive = triangleCount;
+    let materialIndex = 0;
+    if (currentFace) {
+      if (triangleIndex < currentFace.first) {
+        lastTriangleExclusive = currentFace.first;
+      } else {
+        lastTriangleExclusive = currentFace.last + 1;
+        materialIndex = getMaterialIndexForFace(currentFace.color);
+        faceIndex += 1;
+      }
+    }
+    if (lastTriangleExclusive > triangleIndex) {
+      geometry.addGroup(
+        triangleIndex * 3,
+        (lastTriangleExclusive - triangleIndex) * 3,
+        materialIndex
+      );
+    }
+    triangleIndex = lastTriangleExclusive;
+  }
+  return materials;
+}
+function occtMeshesToGroup(meshes) {
+  const group = new Group3();
+  for (const mesh of meshes) {
+    const positions = mesh.attributes.position?.array ?? [];
+    const indices = mesh.index?.array ?? [];
+    if (!positions.length || !indices.length) {
+      continue;
+    }
+    const geometry = new BufferGeometry2();
+    geometry.setAttribute("position", new Float32BufferAttribute(positions, 3));
+    const normals = mesh.attributes.normal?.array ?? [];
+    if (normals.length) {
+      geometry.setAttribute("normal", new Float32BufferAttribute(normals, 3));
+    } else {
+      geometry.computeVertexNormals();
+    }
+    geometry.setIndex(indices);
+    geometry.clearGroups();
+    const materials = applyFaceColorGroups(geometry, mesh);
+    const threeMesh = new Mesh6(
+      geometry,
+      materials.length > 1 ? materials : materials[0]
+    );
+    threeMesh.name = mesh.name;
+    group.add(threeMesh);
+  }
+  return group;
+}
+
+// src/three-components/StepModel.tsx
 import { jsx as jsx9 } from "react/jsx-runtime";
 var occtImportPromise;
 var OCCT_CDN_BASE_URL = "https://cdn.jsdelivr.net/npm/occt-import-js@0.0.23/dist";
@@ -31520,32 +31607,6 @@ async function loadOcctImport() {
   }
   return occtImportPromise;
 }
-function occtMeshesToGroup(meshes) {
-  const group = new Group3();
-  for (const mesh of meshes) {
-    const positions = mesh.attributes.position?.array ?? [];
-    const indices = mesh.index?.array ?? [];
-    if (!positions.length || !indices.length) {
-      continue;
-    }
-    const geometry = new BufferGeometry2();
-    geometry.setAttribute("position", new Float32BufferAttribute(positions, 3));
-    const normals = mesh.attributes.normal?.array ?? [];
-    if (normals.length) {
-      geometry.setAttribute("normal", new Float32BufferAttribute(normals, 3));
-    } else {
-      geometry.computeVertexNormals();
-    }
-    geometry.setIndex(indices);
-    const material = new MeshStandardMaterial5({
-      color: mesh.color ? new Color3(mesh.color[0], mesh.color[1], mesh.color[2]) : new Color3(0.82, 0.82, 0.82)
-    });
-    const threeMesh = new Mesh6(geometry, material);
-    threeMesh.name = mesh.name;
-    group.add(threeMesh);
-  }
-  return group;
-}
 async function convertStepUrlToGlb(stepUrl) {
   const response = await fetch(stepUrl);
   if (!response.ok) {
@@ -31577,7 +31638,7 @@ async function convertStepUrlToGlb(stepUrl) {
   });
   return glb;
 }
-var CACHE_PREFIX = "step-glb-cache:";
+var CACHE_PREFIX = "step-glb-cache:v2:";
 function arrayBufferToBase64(buffer) {
   const bytes = new Uint8Array(buffer);
   const chunkSize = 32768;
@@ -32337,7 +32398,7 @@ import * as THREE20 from "three";
 // package.json
 var package_default = {
   name: "@tscircuit/3d-viewer",
-  version: "0.0.569",
+  version: "0.0.570",
   main: "./dist/index.js",
   module: "./dist/index.js",
   type: "module",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tscircuit/3d-viewer",
-  "version": "0.0.570",
+  "version": "0.0.571",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
   "type": "module",