@plasius/gpu-demo-viewer 0.1.11 → 0.2.1

package/model-library/controller.js

@@ -20,7 +20,7 @@ export function createReviewController({ load, onState }) {
       const id = ++generation;
       abort?.abort(); active?.destroy(); active = undefined;
       abort = new AbortController();
-      if (!asset.entry) { onState({kind:'missing', asset, message:'Download deferred. This model is not installed.'}); return; }
+      if (!asset.entry && !asset.models?.length) { onState({kind:'missing', asset, message:'Download deferred. This model is not installed.'}); return; }
       onState({kind:'loading',asset});
       try {
         const runtime = await load(asset, abort.signal);

package/model-library/index.html

@@ -16,8 +16,8 @@
 </script></head>
 <body><header><a href="https://plasius.co.uk/" target="_blank" rel="noopener">PLASIUS</a><span>Renderer workshop · Local review</span></header>
 <main><div class="intro"><p class="eyebrow">From source to scene</p><h1>Model studies</h1><p>Original assets. One renderer. Explore the surfaces, silhouettes and details that will shape our next improvements.</p></div>
-<div class="workspace"><aside><label for="model">Choose a model</label><select id="model" disabled></select><p id="category" class="muted"></p><h2 id="name"></h2><p id="target"></p><p id="note"></p><div id="metrics" class="metrics"></div>
-<details><summary>Source and licence</summary><p id="credits"></p><p><a id="source" target="_blank" rel="noopener">Original model</a> · <a id="licence" target="_blank" rel="noopener"></a></p><p>Original files retained. Framing is normalized for inspection. Powered by Poly Haven for its asset metadata.</p></details>
+<div class="workspace"><aside><label for="model">Choose a model or study</label><select id="model" disabled></select><p id="category" class="muted"></p><h2 id="name"></h2><p id="target"></p><p id="note"></p><div id="metrics" class="metrics"></div>
+<details><summary>Source and licence</summary><p id="credits"></p><p id="source-line"><a id="source" target="_blank" rel="noopener">Original model</a> · <a id="licence" target="_blank" rel="noopener"></a></p><ul id="composite-credits" hidden></ul><p>Original files retained. Framing is normalized for inspection. Powered by Poly Haven for its asset metadata.</p></details>
 <details><summary>Camera help</summary><p id="help">Drag to orbit. Shift-drag or right-drag to truck. Alt-drag to pan. Scroll to move closer; Shift-scroll changes the lens. Touch: one finger orbits; two fingers move and pinch. Keyboard: arrows orbit, Shift-arrows truck, + / − move closer or further, Home resets. Keys 1–5 choose orbit, truck, pan, dolly or zoom. Press ? for a brief reminder.</p></details>
 <details open><summary>Review focus</summary><p id="review"></p><p>This is an inspection pass, not a visual-quality approval. Source animations are retained on disk; this view displays static geometry.</p></details></aside>
 <section class="stage" aria-label="Model inspection">

package/model-library/main.js

@@ -1,4 +1,5 @@
 import { createReviewController, fixtureRequest, reviewEnabled } from './controller.js';
+import { compositeStudies, compositeRequest, renderCompositeCredits } from './scenes.js';
 
 export async function mountLibrary({document:doc=globalThis.document,window:win=globalThis.window,
   fetch:request=globalThis.fetch,importRuntime=()=>import('@plasius/gpu-shared/model-inspection')}={}) {
@@ -10,11 +11,12 @@ export async function mountLibrary({document:doc=globalThis.document,window:win=
   const response=await request(new URL('./catalogue.json',win.location.href));
   if (!response.ok) throw new Error('Model catalogue could not be loaded.');
   const {assets}=await response.json();
-  for(const asset of assets) {
+  const studies=compositeStudies(assets), selections=[...assets,...studies];
+  for(const asset of selections) {
     const option=doc.createElement('option');option.value=asset.key;
-    option.textContent=asset.name+(asset.entry?'':' — deferred');el('model').append(option);
+    option.textContent=asset.name+(asset.models?' — composite study':asset.entry?'':' — deferred');el('model').append(option);
   }
-  const {createModelInspection}=await importRuntime();
+  const {createModelInspection,createSceneInspection}=await importRuntime();
   el('samples').value='64';el('bounces').value='6';el('resolution').value='800';el('denoise').checked=true;
   const quality=()=>{
     const [width,fixedHeight]=el('resolution').value.split('x').map(Number);
@@ -28,9 +30,11 @@ export async function mountLibrary({document:doc=globalThis.document,window:win=
   };
   const controller=createReviewController({
     load:async(asset,signal)=>{
-      const request=fixtureRequest(asset,new URL('./',win.location.href));
+      const base=new URL('./',win.location.href);
+      const request=asset.models?compositeRequest(asset,base):fixtureRequest(asset,base);
       el('canvas').hidden=false;
-      return createModelInspection({canvas:el('canvas'),...request,signal,enabled:true,
+      const inspect=asset.models?createSceneInspection:createModelInspection;
+      return inspect({canvas:el('canvas'),...request,signal,enabled:true,
         ...quality(),quality:quality(),
         onProgress:p=>{if(!signal.aborted)refinement(p);},
         onHintChange:visible=>{el('hint').hidden=!visible;},
@@ -42,23 +46,27 @@ export async function mountLibrary({document:doc=globalThis.document,window:win=
       if(state.kind==='loading')status.textContent=`Loading ${state.asset.name} and checking its files…`;
       else if(state.kind==='ready') {
         status.textContent=`${state.asset.review_status==='needs-fix'?'Rendered — visual defect recorded':'Ready'} · ${state.asset.name} · ${state.runtime.triangleCount.toLocaleString()} triangles · ${state.runtime.primitiveCount} mesh primitives`;
-        el('metrics').textContent=`${state.runtime.triangleCount.toLocaleString()} triangles · ${state.asset.inspection.materials} source materials`;
+        el('metrics').textContent=`${state.runtime.triangleCount.toLocaleString()} triangles · ${state.asset.inspection.materials} source materials${state.asset.models?` · ${state.asset.models.length} models + shared ground`:''}`;
       } else {status.textContent=state.message;el('canvas').hidden=true;el('refinement').textContent='Refinement unavailable';}
     },
   });
   const change=()=>{
-    const asset=assets.find(a=>a.key===el('model').value);
+    const asset=selections.find(a=>a.key===el('model').value);
     el('category').textContent=asset.category;el('name').textContent=asset.name;
     el('target').textContent=asset.renderer_target;el('review').textContent=asset.observed_issue??asset.preparation;
-    el('credits').textContent=asset.authors;el('source').href=asset.source_url;
-    el('licence').href=asset.licence_url;el('licence').textContent=asset.licence;
+    el('source-line').hidden=!!asset.models;el('composite-credits').hidden=!asset.models;
+    el('credits').textContent=asset.models?'Sources in this study':asset.authors;
+    renderCompositeCredits(doc,el('composite-credits'),asset.models??[]);
+    if(!asset.models){el('source').href=asset.source_url;el('licence').href=asset.licence_url;el('licence').textContent=asset.licence;}
     el('metrics').textContent=asset.entry?`${(asset.files.reduce((n,f)=>n+f.bytes,0)/1048576).toFixed(1)} MiB on disk`:'';
     const clips=asset.inspection?.animations??[];
-    el('note').textContent=clips.length?`Static pose only. ${clips.length} source clips are present: ${clips.join(', ')}. Animation playback needs importer work.`:
+    el('note').textContent=asset.models?`${asset.models.length} original models share one camera, ground and lighting. Geometry counts include the ground.`:
+      clips.length?`Static pose only. ${clips.length} source clips are present: ${clips.join(', ')}. Animation playback needs importer work.`:
       asset.inspection?.extensions.length?`Material features to inspect: ${asset.inspection.extensions.join(', ')}.`:'Source materials under the same inspection lighting.';
     return controller.select(asset);
   };
-  el('model').value=assets.find(a=>a.entry).key;
+  const requested=new URL(win.location.href).searchParams.get('model');
+  el('model').value=selections.find(a=>a.key===requested&&(a.entry||a.models))?.key??assets.find(a=>a.entry).key;
   el('model').addEventListener('change',change);
   el('model').disabled=false;
   const qualityChange=async()=>{

package/model-library/rollout.json

@@ -243,110 +243,110 @@
     {
       "key": "SheenWoodLeatherSofa",
       "batch": 4,
-      "status": "qualified",
-      "note": "Original source fixed64, camera/refinement, denoising off/on and native UHD1 passed on registry renderer0.2.54/shared1.1.12. Site production verification pending."
+      "status": "production",
+      "note": "Verified in the 40-model production release on 2026-10-21; site commit a23291758540e97d13b347c8521daac5be0d3c82. All 263 resources and nine additions passed live checks."
     },
     {
       "key": "SpecularSilkPouf",
       "batch": 4,
-      "status": "qualified",
-      "note": "Original source fixed64, camera/refinement, denoising off/on and native UHD1 passed on registry renderer0.2.54/shared1.1.12. Site production verification pending."
+      "status": "production",
+      "note": "Verified in the 40-model production release on 2026-10-21; site commit a23291758540e97d13b347c8521daac5be0d3c82. All 263 resources and nine additions passed live checks."
     },
     {
       "key": "spinning_wheel_01",
       "batch": 4,
-      "status": "qualified",
-      "note": "Original source fixed64, camera/refinement, denoising off/on and native UHD1 passed on registry renderer0.2.54/shared1.1.12. Site production verification pending."
+      "status": "production",
+      "note": "Verified in the 40-model production release on 2026-10-21; site commit a23291758540e97d13b347c8521daac5be0d3c82. All 263 resources and nine additions passed live checks."
     },
     {
       "key": "vintage_cabinet_01",
       "batch": 4,
-      "status": "qualified",
-      "note": "Original source fixed64, camera/refinement, denoising off/on and native UHD1 passed on registry renderer0.2.54/shared1.1.12. Site production verification pending."
+      "status": "production",
+      "note": "Verified in the 40-model production release on 2026-10-21; site commit a23291758540e97d13b347c8521daac5be0d3c82. All 263 resources and nine additions passed live checks."
     },
     {
       "key": "wicker_basket_01",
       "batch": 4,
-      "status": "qualified",
-      "note": "Original source fixed64, camera/refinement, denoising off/on and native UHD1 passed on registry renderer0.2.54/shared1.1.12. Site production verification pending."
+      "status": "production",
+      "note": "Verified in the 40-model production release on 2026-10-21; site commit a23291758540e97d13b347c8521daac5be0d3c82. All 263 resources and nine additions passed live checks."
     },
     {
       "key": "wine_barrel_01",
       "batch": 4,
-      "status": "qualified",
-      "note": "Original source fixed64, camera/refinement, denoising off/on and native UHD1 passed on registry renderer0.2.54/shared1.1.12. Site production verification pending."
+      "status": "production",
+      "note": "Verified in the 40-model production release on 2026-10-21; site commit a23291758540e97d13b347c8521daac5be0d3c82. All 263 resources and nine additions passed live checks."
     },
     {
       "key": "bench_vice_01",
       "batch": 4,
-      "status": "qualified",
-      "note": "Original source fixed64, camera/refinement, denoising off/on and native UHD1 passed on registry renderer0.2.54/shared1.1.12. Site production verification pending."
+      "status": "production",
+      "note": "Verified in the 40-model production release on 2026-10-21; site commit a23291758540e97d13b347c8521daac5be0d3c82. All 263 resources and nine additions passed live checks."
     },
     {
       "key": "brass_blowtorch",
       "batch": 4,
-      "status": "qualified",
-      "note": "Original source fixed64, camera/refinement, denoising off/on and native UHD1 passed on registry renderer0.2.54/shared1.1.12. Site production verification pending."
+      "status": "production",
+      "note": "Verified in the 40-model production release on 2026-10-21; site commit a23291758540e97d13b347c8521daac5be0d3c82. All 263 resources and nine additions passed live checks."
     },
     {
       "key": "Camera_01",
       "batch": 4,
-      "status": "qualified",
-      "note": "Original source fixed64, camera/refinement, denoising off/on and native UHD1 passed on registry renderer0.2.54/shared1.1.12. Site production verification pending."
+      "status": "production",
+      "note": "Verified in the 40-model production release on 2026-10-21; site commit a23291758540e97d13b347c8521daac5be0d3c82. All 263 resources and nine additions passed live checks."
     },
     {
       "key": "can_rusted",
       "batch": 5,
-      "status": "researched",
-      "note": "Awaiting acquisition and Plasius visual qualification."
+      "status": "qualified",
+      "note": "Original-source fixed64, camera/refinement, denoising off/on and native UHD1 passed with registry renderer0.2.54/shared1.2.0. Site production verification pending; Flight Helmet quality transitions retain the recorded timing limitation."
     },
     {
       "key": "circuit_board",
       "batch": 5,
-      "status": "researched",
-      "note": "Awaiting acquisition and Plasius visual qualification."
+      "status": "qualified",
+      "note": "Original-source fixed64, camera/refinement, denoising off/on and native UHD1 passed with registry renderer0.2.54/shared1.2.0. Site production verification pending; Flight Helmet quality transitions retain the recorded timing limitation."
     },
     {
       "key": "FlightHelmet",
       "batch": 5,
-      "status": "researched",
-      "note": "Awaiting acquisition and Plasius visual qualification."
+      "status": "qualified",
+      "note": "Original-source fixed64, camera/refinement, denoising off/on and native UHD1 passed with registry renderer0.2.54/shared1.2.0. Site production verification pending; Flight Helmet quality transitions retain the recorded timing limitation."
     },
     {
       "key": "hand_plane_no4",
       "batch": 5,
-      "status": "researched",
-      "note": "Awaiting acquisition and Plasius visual qualification."
+      "status": "qualified",
+      "note": "Original-source fixed64, camera/refinement, denoising off/on and native UHD1 passed with registry renderer0.2.54/shared1.2.0. Site production verification pending; Flight Helmet quality transitions retain the recorded timing limitation."
     },
     {
       "key": "metal_tool_chest",
       "batch": 5,
-      "status": "researched",
-      "note": "Awaiting acquisition and Plasius visual qualification."
+      "status": "qualified",
+      "note": "Original-source fixed64, camera/refinement, denoising off/on and native UHD1 passed with registry renderer0.2.54/shared1.2.0. Site production verification pending; Flight Helmet quality transitions retain the recorded timing limitation."
     },
     {
       "key": "rusted_spade_01",
       "batch": 5,
-      "status": "researched",
-      "note": "Awaiting acquisition and Plasius visual qualification."
+      "status": "qualified",
+      "note": "Original-source fixed64, camera/refinement, denoising off/on and native UHD1 passed with registry renderer0.2.54/shared1.2.0. Site production verification pending; Flight Helmet quality transitions retain the recorded timing limitation."
     },
     {
       "key": "vintage_hand_drill",
       "batch": 5,
-      "status": "researched",
-      "note": "Awaiting acquisition and Plasius visual qualification."
+      "status": "qualified",
+      "note": "Original-source fixed64, camera/refinement, denoising off/on and native UHD1 passed with registry renderer0.2.54/shared1.2.0. Site production verification pending; Flight Helmet quality transitions retain the recorded timing limitation."
     },
     {
       "key": "WaterBottle",
       "batch": 5,
-      "status": "researched",
-      "note": "Awaiting acquisition and Plasius visual qualification."
+      "status": "qualified",
+      "note": "Original-source fixed64, camera/refinement, denoising off/on and native UHD1 passed with registry renderer0.2.54/shared1.2.0. Site production verification pending; Flight Helmet quality transitions retain the recorded timing limitation."
     },
     {
       "key": "antique_estoc",
       "batch": 5,
-      "status": "researched",
-      "note": "Awaiting acquisition and Plasius visual qualification."
+      "status": "qualified",
+      "note": "Original-source fixed64, camera/refinement, denoising off/on and native UHD1 passed with registry renderer0.2.54/shared1.2.0. Site production verification pending; Flight Helmet quality transitions retain the recorded timing limitation."
     },
     {
       "key": "chess_set",

package/model-library/scenes.js

@@ -0,0 +1,54 @@
+import { fixtureRequest } from './controller.js';
+
+const definitions = [
+  { key: 'study-furnished-interior', name: 'Furnished interior',
+    renderer_target: 'Compare woven fabric, silk, leather, wicker and aged wood in one arrangement.',
+    preparation: 'Inspect relative scale, fabric response and contact shadows. Sizes are chosen scene units, not verified physical dimensions.',
+    placements: [
+      ['SheenWoodLeatherSofa', [0, 0, -.8], 2.4, 0],
+      ['vintage_cabinet_01', [-2.15, 0, -.8], 1.7, 0],
+      ['SpecularSilkPouf', [.55, 0, .85], .7, 0],
+      ['wicker_basket_01', [1.6, 0, -.3], .6, 0],
+    ] },
+  { key: 'study-workshop', name: 'Workshop still life',
+    renderer_target: 'Compare worked metal, rough timber and worn surfaces under shared light.',
+    preparation: 'Inspect object contact and the contrast between brass, painted metal and timber. These are static review arrangements.',
+    placements: [
+      ['spinning_wheel_01', [-1.1, 0, -.65], 1.8, 0],
+      ['wine_barrel_01', [1.15, 0, -.7], 1.25, 0],
+      ['wooden_crate_02', [0, 0, .7], 1.2, 0],
+      ['bench_vice_01', [-1.3, 0, 1.05], .55, .3],
+      // Crate lid height from the original accessor bounds and lid translation,
+      // uniformly scaled to its chosen 1.2-unit longest dimension.
+      ['brass_blowtorch', [0, .47735, .7], .55, 0],
+    ] },
+];
+
+export function compositeStudies(assets) {
+  return definitions.flatMap(({ placements, ...definition }) => {
+    const models = placements.map(([key, anchor, size, yaw]) => ({
+      asset: assets.find(a => a.key === key), anchor: [...anchor], size, yaw,
+    }));
+    if (models.some(model => !model.asset?.entry)) return [];
+    return [{ ...definition, category: 'Composite study', models,
+      inspection: { materials: models.reduce((sum, model) => sum + model.asset.inspection.materials, 0) } }];
+  });
+}
+
+export function compositeRequest(study, base) {
+  return { models: study.models.map(({ asset, anchor, size, yaw }) => ({
+    ...fixtureRequest(asset, base), anchor, size, yaw,
+  })) };
+}
+
+export function renderCompositeCredits(doc, container, models) {
+  container.replaceChildren();
+  for (const { asset, size } of models) {
+    const item = doc.createElement('li'), source = doc.createElement('a'), licence = doc.createElement('a');
+    source.textContent = `${asset.name} — ${asset.authors}`; source.href = asset.source_url;
+    licence.textContent = asset.licence; licence.href = asset.licence_url;
+    for (const link of [source, licence]) { link.target = '_blank'; link.rel = 'noopener'; }
+    item.append(source, ' · ', licence, ` · longest dimension ${size} scene units`);
+    container.append(item);
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plasius/gpu-demo-viewer",
-  "version": "0.1.11",
+  "version": "0.2.1",
   "type": "module",
   "description": "Root validation viewer for Plasius gpu-* demos.",
   "license": "Apache-2.0",
@@ -47,7 +47,7 @@
     "lint": "npm run typecheck",
     "pack:check": "node scripts/verify-public-package.cjs",
     "prepublishOnly": "npm run build && npm run pack:check",
-    "typecheck": "node --check index.js && node --check main.js && node --check viewer-manifest.js && node --check showcase/index.js && node --check showcase/main.js && node --check wavefront/main.js && node --check model-library/main.js && node --check model-library/controller.js && node --check model-library/acquire.js && node --check model-library/rollout.js",
+    "typecheck": "node --check index.js && node --check main.js && node --check viewer-manifest.js && node --check showcase/index.js && node --check showcase/main.js && node --check wavefront/main.js && node --check model-library/main.js && node --check model-library/controller.js && node --check model-library/scenes.js && node --check model-library/acquire.js && node --check model-library/rollout.js",
     "test": "node --test",
     "models:download": "node scripts/acquire-model-library.mjs",
     "models:dev": "vite --config model-library/vite.config.js",
@@ -55,10 +55,10 @@
   },
   "dependencies": {
     "@plasius/gpu-renderer": "^0.2.54",
-    "@plasius/gpu-shared": "^1.1.12"
+    "@plasius/gpu-shared": "^1.2.0"
   },
   "devDependencies": {
     "c8": "^11.0.0",
-    "vite": "^8.1.4"
+    "vite": "^8.3.5"
   }
 }