forgecad 0.9.16 → 0.10.1

package/dist/assets/cli/{render-C5pcIISc.js → render-DPf4AYJK.js}

@@ -1,8 +1,8 @@
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-import { D as DoubleSide, cC as initSolverWasm, cB as initKernel, S as Scene, cD as BoxGeometry, bU as MeshStandardMaterial, a4 as BackSide, b7 as PointLight, M as Mesh, aa as MeshBasicMaterial, cE as localAabbPlaneRelation, h as Vector2, cF as ShapeUtils, cG as analyzePhysicalConnectivity, g as Vector3, $ as Matrix4, cH as Frustum, G as Box3, a0 as MathUtils, cI as meshContactDataFor, cJ as AabbSpatialIndex, cK as detectPhysicalContact, cL as resolveThicknessInspectionOptions, R as Raycaster, cM as thicknessColor, cN as thicknessClass, a$ as BufferAttribute, cO as roughnessClassForAngle, cP as resolveRoughnessInspectionOptions, cQ as roughnessColorForAngle, cR as roughnessScoreForAngle, cS as activateBackend, e as Color, ba as COMPARISON_COLORS, ay as resolveForgeRenderStyle, by as getRenderStylePreset, ax as setParamOverrides, bl as runScript, cl as scanProxyGridForBounds, cT as Group, be as shapeToGeometry, bm as MeshPhysicalMaterial, bA as NormalBlending, cU as createScanProxyGeometry, bw as AdditiveBlending, aO as LineBasicMaterial, bn as LineSegments, aN as BufferGeometry, P as PerspectiveCamera, ci as DEFAULT_VIEW_CONFIG, bs as worldAuthorPlaneToLocal, cV as resolveSectionHatchMetrics, ct as buildGeometryComparisonPointCloud, cr as triangleSoupFromMeshes, O as OrthographicCamera, k as ShaderMaterial, bG as ZEBRA_STRIPE_FRAGMENT_SHADER, bH as ZEBRA_STRIPE_VERTEX_SHADER, bB as ZEBRA_STRIPE_SOFTNESS, bC as ZEBRA_STRIPE_SCALE, bD as ZEBRA_LIGHT_COLOR, bE as ZEBRA_DARK_COLOR, bF as ZEBRA_ACCENT_COLOR, bx as geometryWithVisibleVertexColors, cW as intersectWithPlane, cX as setActiveBackend, W as WebGLRenderer, A as ACESFilmicToneMapping, c as SRGBColorSpace, cY as parseCameraCliSpec, cZ as PMREMGenerator, b0 as CanvasTexture, b1 as Object3D, b2 as FogExp2, b3 as Fog, b4 as AmbientLight, b8 as DirectionalLight, b5 as HemisphereLight, aI as findJointAnimationClip, p as Plane, bJ as SURFACE_FIELD_FRAGMENT_SHADER, bK as SURFACE_FIELD_VERTEX_SHADER, bI as SCAN_PROXY_LAYER_STYLES, Y as Vector4, bX as SDF_RAYMARCH_PROXY_VERTEX_SHADER, bW as buildSdfRaymarchFragmentShader, aJ as resolveJointAnimation, aK as resolveJointViewValues, bP as ROUGHNESS_COLORS, c_ as PointsMaterial, c$ as Points, b9 as heatPointsForSide, d0 as analyzeCollisionIntersections, d1 as serializeCollisionFinding, d2 as summarizeThicknessSamples, bO as THICKNESS_GRADIENT_COLORS, d3 as THICKNESS_COLORS, b6 as SpotLight, b$ as CylinderGeometry, d4 as TorusGeometry, bM as CatmullRomCurve3, bN as TubeGeometry, cx as resolveScalarSceneSampleBudget, bf as buildComparisonHeatPatchGeometry, bg as EdgesGeometry, d5 as SphereGeometry, d6 as ConeGeometry, bb as comparisonHeatDepthTest, bc as comparisonHeatEdgeOpacity, bd as comparisonHeatPatchOpacity, cz as comparisonCandidateContextOpacity, d7 as DEFAULT_COMPARISON_CANDIDATE_OPACITY } from "../scalar-sampling-budget-J5cuzxT1.js";
-import { m as mergeViewportRenderSceneStates, v as validateJointOverrides, b as buildBaseJointValues, p as parseRenderSceneCliSpec, g as getSceneObjectTreePath } from "../jointPose-B_Cgedn9.js";
+import { D as DoubleSide, cE as initSolverWasm, cD as initKernel, S as Scene, cF as BoxGeometry, bW as MeshStandardMaterial, a4 as BackSide, b7 as PointLight, M as Mesh, aa as MeshBasicMaterial, cG as localAabbPlaneRelation, h as Vector2, cH as ShapeUtils, cI as analyzePhysicalConnectivity, g as Vector3, $ as Matrix4, cJ as Frustum, G as Box3, a0 as MathUtils, cK as meshContactDataFor, cL as AabbSpatialIndex, cM as detectPhysicalContact, cN as resolveThicknessInspectionOptions, R as Raycaster, cO as thicknessColor, cP as thicknessClass, a$ as BufferAttribute, cQ as roughnessClassForAngle, cR as resolveRoughnessInspectionOptions, cS as roughnessColorForAngle, cT as roughnessScoreForAngle, cU as activateBackend, e as Color, ba as COMPARISON_COLORS, ay as resolveForgeRenderStyle, by as getRenderStylePreset, ax as setParamOverrides, bl as runScript, cn as scanProxyGridForBounds, cV as Group, be as shapeToGeometry, bm as MeshPhysicalMaterial, bw as AdditiveBlending, bB as scanMaterialShellColor, cW as createScanProxyGeometry, aO as LineBasicMaterial, bA as NormalBlending, bn as LineSegments, aN as BufferGeometry, P as PerspectiveCamera, ck as DEFAULT_VIEW_CONFIG, bs as worldAuthorPlaneToLocal, cX as resolveSectionHatchMetrics, cv as buildGeometryComparisonPointCloud, ct as triangleSoupFromMeshes, O as OrthographicCamera, k as ShaderMaterial, bH as ZEBRA_STRIPE_FRAGMENT_SHADER, bI as ZEBRA_STRIPE_VERTEX_SHADER, bC as ZEBRA_STRIPE_SOFTNESS, bD as ZEBRA_STRIPE_SCALE, bE as ZEBRA_LIGHT_COLOR, bF as ZEBRA_DARK_COLOR, bG as ZEBRA_ACCENT_COLOR, bx as geometryWithVisibleVertexColors, cY as intersectWithPlane, cZ as setActiveBackend, W as WebGLRenderer, A as ACESFilmicToneMapping, c as SRGBColorSpace, c_ as parseCameraCliSpec, c$ as PMREMGenerator, b0 as CanvasTexture, b1 as Object3D, b2 as FogExp2, b3 as Fog, b4 as AmbientLight, b8 as DirectionalLight, b5 as HemisphereLight, aI as findJointAnimationClip, p as Plane, bL as SURFACE_FIELD_FRAGMENT_SHADER, bM as SURFACE_FIELD_VERTEX_SHADER, bK as scanMaterialLayerStyles, bJ as SCAN_PROXY_LAYER_STYLES, Y as Vector4, bZ as SDF_RAYMARCH_PROXY_VERTEX_SHADER, bY as buildSdfRaymarchFragmentShader, aJ as resolveJointAnimation, aK as resolveJointViewValues, bR as ROUGHNESS_COLORS, d0 as PointsMaterial, d1 as Points, b9 as heatPointsForSide, d2 as analyzeCollisionIntersections, d3 as serializeCollisionFinding, d4 as summarizeThicknessSamples, bQ as THICKNESS_GRADIENT_COLORS, d5 as THICKNESS_COLORS, b6 as SpotLight, c1 as CylinderGeometry, d6 as TorusGeometry, bO as CatmullRomCurve3, bP as TubeGeometry, cz as resolveScalarSceneSampleBudget, bf as buildComparisonHeatPatchGeometry, bg as EdgesGeometry, d7 as SphereGeometry, d8 as ConeGeometry, bb as comparisonHeatDepthTest, bc as comparisonHeatEdgeOpacity, bd as comparisonHeatPatchOpacity, cB as comparisonCandidateContextOpacity, d9 as DEFAULT_COMPARISON_CANDIDATE_OPACITY } from "../scalar-sampling-budget-prBw_s8t.js";
+import { m as mergeViewportRenderSceneStates, v as validateJointOverrides, b as buildBaseJointValues, p as parseRenderSceneCliSpec, g as getSceneObjectTreePath } from "../jointPose-DzQOViQH.js";
 const CAD_MATERIAL_PROPS = {
   color: 6003669,
   metalness: 0.05,
@@ -754,6 +754,9 @@ function analyzeCameraFraming(camera, objects) {
     fullyOutOfFrame
   };
 }
+function selectRenderSceneBoundsEntries(entries) {
+  return entries.filter((entry) => entry.visible);
+}
 const DEFAULT_CONTACT_TOLERANCE = 0.05;
 const DEFAULT_BED_TOLERANCE = 0.05;
 const DEFAULT_GROUND_Z = 0;
@@ -2304,7 +2307,7 @@ function directCadKindForPath(path) {
   return null;
 }
 function directCadReferenceCode(path, kind) {
-  const fn = kind === "step" ? "importStep" : "importMesh";
+  const fn = kind === "step" ? "Import.step" : "Import.mesh";
   const name = pathBasename(path);
   return [`const imported = ${fn}(${JSON.stringify(path)});`, `return [{ name: ${JSON.stringify(name)}, shape: imported }];`].join("\n");
 }
@@ -4248,18 +4251,15 @@ function createSurfaceFieldMaterial({
 function createScanProxyMaterial({
   color,
   opacity,
-  clippingPlanes,
-  wireframe = false,
-  additiveWire = true
+  clippingPlanes
 }) {
   return new MeshBasicMaterial({
     color,
     transparent: true,
     opacity,
-    wireframe,
     side: DoubleSide,
     depthWrite: false,
-    blending: wireframe && additiveWire ? AdditiveBlending : NormalBlending,
+    blending: AdditiveBlending,
     toneMapped: false,
     clippingPlanes
   });
@@ -4267,32 +4267,20 @@ function createScanProxyMaterial({
 function createScanProxyGroup(proxy, clippingPlanes, objectColor) {
   const group = new Group();
   group.userData = { scanProxyTelemetry: proxy.telemetry };
-  const additiveWire = objectColor === void 0;
-  for (const layer of SCAN_PROXY_LAYER_STYLES) {
+  const layers = objectColor ? scanMaterialLayerStyles(objectColor) : SCAN_PROXY_LAYER_STYLES;
+  for (const layer of layers) {
     const geometry = proxy.geometries[layer.material];
     if (!geometry) continue;
     const fill = new Mesh(
       geometry,
       createScanProxyMaterial({
-        color: objectColor ?? layer.color,
-        opacity: layer.fillOpacity,
+        color: layer.color,
+        opacity: Math.min(0.1, layer.fillOpacity * 0.2),
         clippingPlanes
       })
     );
     fill.raycast = () => null;
     group.add(fill);
-    const wire = new Mesh(
-      geometry,
-      createScanProxyMaterial({
-        color: objectColor ?? layer.color,
-        opacity: layer.wireOpacity,
-        wireframe: true,
-        additiveWire,
-        clippingPlanes
-      })
-    );
-    wire.raycast = () => null;
-    group.add(wire);
   }
   return group;
 }
@@ -5108,7 +5096,7 @@ Available renderable objects: ${available}`;
   return "No visible renderable objects found.";
 }
 function createSession(code, opts) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u;
   const size = (opts == null ? void 0 : opts.size) ?? 1024;
   const pixelRatio = (opts == null ? void 0 : opts.pixelRatio) ?? 1;
   const debug = createCaptureDebugLogger(opts == null ? void 0 : opts.debug);
@@ -5181,7 +5169,7 @@ function createSession(code, opts) {
     shapeObjects: visibleObjs.filter((entry) => entry.shape != null).length,
     sdfObjects: visibleObjs.filter((entry) => entry.sdf != null).length
   });
-  const boundsObjs = visibleObjs.length > 0 ? visibleObjs : objs;
+  const boundsObjs = selectRenderSceneBoundsEntries(objs);
   const objectVisibility = new Map(objs.map((entry) => [entry.source.id, entry.visible]));
   const objectRenderability = new Set(objs.map((entry) => entry.source.id));
   const sceneObjects = result.objects.map((obj) => ({
@@ -5249,6 +5237,24 @@ function createSession(code, opts) {
   } else {
     addRenderStyleLights(scene, renderStyle);
   }
+  const sceneStyleIgnoredFeatures = [];
+  if (sceneConfig) {
+    if (!respectAuthoredSceneStyle) {
+      if (sceneConfig.background != null) sceneStyleIgnoredFeatures.push("background");
+      if (sceneConfig.lights != null) sceneStyleIgnoredFeatures.push("lights");
+      if (sceneConfig.environment != null) sceneStyleIgnoredFeatures.push("environment");
+      if (sceneConfig.fog != null) sceneStyleIgnoredFeatures.push("fog");
+      if (sceneConfig.postProcessing != null) sceneStyleIgnoredFeatures.push("post-processing");
+      if (sceneConfig.ground != null) sceneStyleIgnoredFeatures.push("ground");
+    } else {
+      if (sceneConfig.environment != null) sceneStyleIgnoredFeatures.push("environment");
+      if (sceneConfig.ground != null) sceneStyleIgnoredFeatures.push("ground");
+      if (((_c = sceneConfig.postProcessing) == null ? void 0 : _c.bloom) || ((_d = sceneConfig.postProcessing) == null ? void 0 : _d.vignette) || ((_e = sceneConfig.postProcessing) == null ? void 0 : _e.grain)) {
+        sceneStyleIgnoredFeatures.push("post-processing (except toneMappingExposure)");
+      }
+    }
+  }
+  const authoredSceneStyleIgnored = !respectAuthoredSceneStyle && sceneStyleIgnoredFeatures.length > 0;
   const sceneSummary = summarizeSceneGeometry(boundsObjs);
   debug("session:summary", {
     bbox: sceneSummary.bbox,
@@ -5267,7 +5273,7 @@ function createSession(code, opts) {
   const distance = perspectiveCameraDistanceForBounds(bbox, [DEFAULT_FIXED_DIR.x, DEFAULT_FIXED_DIR.y, DEFAULT_FIXED_DIR.z], {
     fovDeg: fov
   });
-  const cameraFov = ((_c = requestedSceneState == null ? void 0 : requestedSceneState.camera) == null ? void 0 : _c.fov) ?? ((_d = sceneConfig == null ? void 0 : sceneConfig.camera) == null ? void 0 : _d.fov) ?? fov;
+  const cameraFov = ((_f = requestedSceneState == null ? void 0 : requestedSceneState.camera) == null ? void 0 : _f.fov) ?? ((_g = sceneConfig == null ? void 0 : sceneConfig.camera) == null ? void 0 : _g.fov) ?? fov;
   try {
     if (opts == null ? void 0 : opts.cameraToken) {
       if (requestedSceneState == null ? void 0 : requestedSceneState.camera) {
@@ -5295,17 +5301,17 @@ function createSession(code, opts) {
   } catch (err) {
     return { ok: false, error: err instanceof Error ? err.message : String(err) };
   }
-  const joints = ((_e = result.jointsView) == null ? void 0 : _e.enabled) === false ? [] : ((_f = result.jointsView) == null ? void 0 : _f.joints) ?? [];
-  const jointCouplings = ((_g = result.jointsView) == null ? void 0 : _g.enabled) === false ? [] : ((_h = result.jointsView) == null ? void 0 : _h.couplings) ?? [];
+  const joints = ((_h = result.jointsView) == null ? void 0 : _h.enabled) === false ? [] : ((_i = result.jointsView) == null ? void 0 : _i.joints) ?? [];
+  const jointCouplings = ((_j = result.jointsView) == null ? void 0 : _j.enabled) === false ? [] : ((_k = result.jointsView) == null ? void 0 : _k.couplings) ?? [];
   try {
     validateJointOverrides(result.jointsView, (opts == null ? void 0 : opts.jointOverrides) ?? {});
   } catch (err) {
     return { ok: false, error: err instanceof Error ? err.message : String(err) };
   }
-  const transformJoints = ((_i = result.jointsView) == null ? void 0 : _i.motionSource) === "assembly" ? [] : joints;
-  const transformJointCouplings = ((_j = result.jointsView) == null ? void 0 : _j.motionSource) === "assembly" ? [] : jointCouplings;
-  const animationClips = ((_k = result.jointsView) == null ? void 0 : _k.enabled) === false ? [] : ((_l = result.jointsView) == null ? void 0 : _l.animations) ?? [];
-  const defaultAnimation = ((_m = result.jointsView) == null ? void 0 : _m.defaultAnimation) ?? null;
+  const transformJoints = ((_l = result.jointsView) == null ? void 0 : _l.motionSource) === "assembly" ? [] : joints;
+  const transformJointCouplings = ((_m = result.jointsView) == null ? void 0 : _m.motionSource) === "assembly" ? [] : jointCouplings;
+  const animationClips = ((_n = result.jointsView) == null ? void 0 : _n.enabled) === false ? [] : ((_o = result.jointsView) == null ? void 0 : _o.animations) ?? [];
+  const defaultAnimation = ((_p = result.jointsView) == null ? void 0 : _p.defaultAnimation) ?? null;
   let selectedAnimation;
   let sweep = null;
   let cutawayBase = null;
@@ -5381,8 +5387,8 @@ function createSession(code, opts) {
         id: obj.source.id,
         name: objectLabel,
         ms: Number((performance.now() - geometryStart).toFixed(1)),
-        triangles: Math.floor((((_n = geo.solid.getAttribute("position")) == null ? void 0 : _n.count) ?? 0) / 3),
-        edgeSegments: Math.floor((((_o = geo.edges.getAttribute("position")) == null ? void 0 : _o.count) ?? 0) / 2)
+        triangles: Math.floor((((_q = geo.solid.getAttribute("position")) == null ? void 0 : _q.count) ?? 0) / 3),
+        edgeSegments: Math.floor((((_r = geo.edges.getAttribute("position")) == null ? void 0 : _r.count) ?? 0) / 2)
       });
       const materialDefaults = renderStylePreset.material;
       const surfaceField = renderStylePreset.surfaceField;
@@ -5413,12 +5419,12 @@ function createSession(code, opts) {
         ...(mp == null ? void 0 : mp.wireframe) && { wireframe: true }
       };
       solidMaterial = isScanRenderStyle ? new MeshBasicMaterial({
-        color: objectColor,
+        color: scanMaterialShellColor(objectColor),
         transparent: true,
-        opacity: 0.16,
+        opacity: 0.08,
         side: DoubleSide,
         depthWrite: false,
-        blending: NormalBlending,
+        blending: AdditiveBlending,
         toneMapped: false,
         clippingPlanes: applicableCutPlanes
       }) : surfaceField.enabled ? createSurfaceFieldMaterial({
@@ -5456,22 +5462,7 @@ function createSession(code, opts) {
           });
         }
       }
-      if (isScanRenderStyle && !scanProxy) {
-        shell = new Mesh(
-          geo.solid,
-          new MeshBasicMaterial({
-            color: objectColor,
-            transparent: true,
-            opacity: 0.08,
-            side: BackSide,
-            depthWrite: false,
-            blending: NormalBlending,
-            clippingPlanes: applicableCutPlanes
-          })
-        );
-        shell.scale.setScalar(0.992);
-        shell.raycast = () => null;
-      } else if (hasAuthoredTransparency && renderStylePreset.glassShell.enabled) {
+      if (!isScanRenderStyle && hasAuthoredTransparency && renderStylePreset.glassShell.enabled) {
         shell = new Mesh(
           geo.solid,
           new MeshBasicMaterial({
@@ -5489,9 +5480,9 @@ function createSession(code, opts) {
       }
       wireMaterial = new LineBasicMaterial({
         ...EDGE_MATERIAL_PROPS,
-        color: isScanRenderStyle ? objectColor : parseColor(renderStylePreset.edge.color, EDGE_MATERIAL_PROPS.color),
+        color: parseColor(renderStylePreset.edge.color, EDGE_MATERIAL_PROPS.color),
         transparent: true,
-        opacity: isScanRenderStyle ? 0.62 : Math.min(1, renderStylePreset.edge.opacity * Math.max(0.35, obj.opacity) + 0.1),
+        opacity: isScanRenderStyle ? 0 : Math.min(1, renderStylePreset.edge.opacity * Math.max(0.35, obj.opacity) + 0.1),
         depthWrite: false,
         blending: NormalBlending,
         clippingPlanes: applicableCutPlanes
@@ -5557,7 +5548,7 @@ function createSession(code, opts) {
     { bodyShape: () => new EmptyInspectionShape() }
   ) : null;
   const connectivityEntries = (connectivityBodyInput == null ? void 0 : connectivityBodyInput.entries) ?? [];
-  const groundOffset = Number.isFinite((_p = sceneConfig == null ? void 0 : sceneConfig.ground) == null ? void 0 : _p.offset) ? sceneConfig.ground.offset : 0;
+  const groundOffset = Number.isFinite((_s = sceneConfig == null ? void 0 : sceneConfig.ground) == null ? void 0 : _s.offset) ? sceneConfig.ground.offset : 0;
   const floatingGroundZ = bbox.min[2] - groundOffset;
   let sceneConfigCameraState = null;
   if ((sceneConfig == null ? void 0 : sceneConfig.camera) && !(requestedSceneState == null ? void 0 : requestedSceneState.camera)) {
@@ -5586,7 +5577,7 @@ function createSession(code, opts) {
   } : null;
   const cameraSpec = sceneConfigCameraState && (opts == null ? void 0 : opts.capture) === "section-sweep" ? fitCameraStateToBounds(sceneConfigCameraState, bbox, cameraFov) : (requestedSceneState == null ? void 0 : requestedSceneState.camera) ?? cutawayCameraState ?? sceneConfigCameraState;
   const cameraRig = buildCameraRig(center, distance, maxDim, cameraSpec, cameraFov);
-  const explicitCameraFov = (cameraSpec == null ? void 0 : cameraSpec.fov) ?? ((_q = sceneConfig == null ? void 0 : sceneConfig.camera) == null ? void 0 : _q.fov);
+  const explicitCameraFov = (cameraSpec == null ? void 0 : cameraSpec.fov) ?? ((_t = sceneConfig == null ? void 0 : sceneConfig.camera) == null ? void 0 : _t.fov);
   if (explicitCameraFov && cameraRig.camera instanceof PerspectiveCamera) {
     cameraRig.camera.fov = explicitCameraFov;
     cameraRig.camera.updateProjectionMatrix();
@@ -5621,7 +5612,7 @@ function createSession(code, opts) {
     jointCouplings,
     transformJoints,
     transformJointCouplings,
-    jointOverlayConfig: ((_r = result.viewConfig) == null ? void 0 : _r.jointOverlay) ?? DEFAULT_VIEW_CONFIG.jointOverlay,
+    jointOverlayConfig: ((_u = result.viewConfig) == null ? void 0 : _u.jointOverlay) ?? DEFAULT_VIEW_CONFIG.jointOverlay,
     animationClips,
     defaultAnimation,
     selectedAnimation,
@@ -5635,7 +5626,9 @@ function createSession(code, opts) {
     sweep,
     cutaway,
     captureDefaults: (sceneConfig == null ? void 0 : sceneConfig.capture) ?? null,
-    renderStyle
+    renderStyle,
+    authoredSceneStyleIgnored,
+    sceneStyleIgnoredFeatures
   };
   debug("session:renderables:end", { renderables: renderables.length });
   setSessionMode(session, "solid");
@@ -6053,6 +6046,8 @@ window.__forgeRender = async (code, opts) => {
       method: "bbox-frustum-v1",
       views: framingViews
     },
+    authoredSceneStyleIgnored: session.authoredSceneStyleIgnored,
+    sceneStyleIgnoredFeatures: session.sceneStyleIgnoredFeatures,
     verifications: session.verifications
   };
 };