Merge pull request #1086 from vorth/bom-defect

Fixed defect in Zometool parts list

Author: vorth

online/serve/app/test/cases/zometool-model/index.html

@@ -27,9 +27,9 @@ <h1>Zometool Model Demo</h1>
       <div class="zometool-model-difficulty" data-difficulty="medium">
       </div>
 
-      <!-- <zometool-instructions src="https://raw.githubusercontent.com/vorth/vzome-sharing/main/2024/09/25/23-37-59-596Z-standard-colors-and-lengths-instructions/standard-colors-and-lengths-instructions.vZome"> -->
+      <zometool-instructions src="https://raw.githubusercontent.com/vorth/vzome-sharing/main/2024/09/25/23-37-59-596Z-standard-colors-and-lengths-instructions/standard-colors-and-lengths-instructions.vZome">
       <!-- <zometool-instructions src="https://raw.githubusercontent.com/lucosmic/vzome-sharing/main/2025/01/12/01-29-12-PRJ-DNA-kit/PRJ-DNA-kit.vZome"> -->
-      <zometool-instructions src="https://zometool.github.io/vzome-sharing/2025/03/25/05-15-03-815Z-PRJ-BUB-5-Flower/PRJ-BUB-5-Flower.vZome      ">
+      <!-- <zometool-instructions src="https://zometool.github.io/vzome-sharing/2025/03/25/05-15-03-815Z-PRJ-BUB-5-Flower/PRJ-BUB-5-Flower.vZome      "> -->
       <!-- <zometool-instructions src="https://raw.githubusercontent.com/vorth/vzome-sharing/main/2024/09/01/21-01-21-623Z-standard-colors-and-lengths/standard-colors-and-lengths.vZome"> -->
       <!-- <zometool-instructions src="https://raw.githubusercontent.com/vorth/vzome-sharing/main/2024/09/24/02-42-34-519Z-hyperdo-steps-correct-scale/hyperdo-steps-correct-scale.vZome"> -->
       </zometool-instructions>      

online/src/viewer/context/viewer.jsx

@@ -96,7 +96,7 @@ const ViewerProvider = ( props ) =>
     resetScenes: () => setScenes( [] ),
     setProblem,
     clearProblem: () => setProblem( '' ),
-    requestBOM: () => postMessage( { type: 'BOM_REQUESTED' } ),
+    requestBOM: ( scenes ) => postMessage( { type: 'BOM_REQUESTED', payload: scenes } ),
     setTweenDuration,
     useWorker: useWorkerClient,
     exportAs, indexResources,

online/src/wc/zometool/index.jsx

@@ -1,6 +1,7 @@
 
 import { createEffect, createSignal, mergeProps } from 'solid-js';
 import { render } from 'solid-js/web';
+import { unwrap } from 'solid-js/store';
 
 import { Button } from "@kobalte/core/button";
 import { Switch } from "@kobalte/core/switch";
@@ -105,7 +106,8 @@ export const ZometoolInstructions = props =>
     setIndex( minIndex );
     setMaxIndex( maxIndex );
     setHasScenes( scenes?.length > 1 );
-    requestBOM();
+    if ( scenes?.length > 1 )
+      requestBOM( unwrap(scenes) );
   });
 
   createEffect( () => {

online/src/worker/legacy/partslist.js

@@ -19,11 +19,11 @@ const countPartsForSnapshot = ( instances, shapes, colors ) =>
 }
 
 // For the Zometool component
-export const assemblePartsList = ( rendered, colors ) =>
+export const assemblePartsList = ( rendered, colors, scenes ) =>
 {
   const bom = {};
   // union the BOMs for all scenes
-  const { shapes, scenes, snapshots } = rendered;
+  const { shapes, snapshots } = rendered;
   for ( const { snapshot } of scenes .slice( 1 ) ) {
     const snapshotBom = countPartsForSnapshot( snapshots[ snapshot ], shapes, colors );
     for ( const [ row, bins ] of Object.entries( snapshotBom ) ) {

online/src/worker/vzome-worker-static.js

@@ -427,10 +427,8 @@ onmessage = ({ data }) =>
     }
 
     case 'BOM_REQUESTED': {
-      if ( !design?.rendered?.scenes )
-        break;
       partsPromise .then( ({ colors }) => {
-        const bom = assemblePartsList( design.rendered, colors );
+        const bom = assemblePartsList( design.rendered, colors, payload );
         sendToClient( { type: 'BOM_CHANGED', payload: bom } );
       });
       break;