← Commit history
v0.12.10
6 files changed
+125−50
VERSION+1−1@@ -1 +1 @@-0.12.10 +0.12.10
package-lock.json+2−2@@ -1,12 +1,12 @@ { "name": "adom-3d-viewer-babylon9",- "version": "0.12.9",+ "version": "0.12.10", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "adom-3d-viewer-babylon9",- "version": "0.12.9",+ "version": "0.12.10", "license": "MIT", "devDependencies": { "@babylonjs/addons": "9.5.0",
package.json+95−45@@ -1,45 +1,95 @@-{ - "name": "adom-3d-viewer-babylon9", - "version": "0.12.10", - "description": "The Babylon 9.5 engine behind every component page's 3D tab on wiki.adom.inc. Versioned ESM bundle with GLB loading, view cube, layers toolbar, ground shadows, and Z-up CAD framing.", - "type": "app", - "dependencies": {}, - "slug": "adom-3d-viewer", - "license": "MIT", - "tags": [ - "3d", - "viewer", - "babylon", - "glb", - "pcb", - "component-pages" - ], - "hero": { - "headline": "Adom 3D Viewer", - "subhead": "The Babylon 9 engine behind every component page", - "screenshot": "docs/viewer-screenshot.png" - }, - "discovery_triggers": [ - "embed a 3d viewer for a glb model", - "show a pcb or component in 3d", - "babylon viewer for adom pages", - "load the adom 3d viewer bundle", - "layers toolbar for a 3d board view" - ], - "discovery_pitch": "The Babylon 9.5 ESM viewer engine that renders every component page's 3D tab on wiki.adom.inc: GLB loading, view cube, layers toolbar, shadows, laser-etch text, Z-up CAD framing.", - "sample_prompts": [ - { - "label": "Embed the viewer", - "prompt": "Load the adom 3d viewer bundle into my page and show model.glb" - }, - { - "label": "Pin a version", - "prompt": "Download the 0.4.3 viewer bundle so my tool vendors a fixed build" - } - ], - "title": "Adom 3D Viewer", - "scripts": { - "install": "./install.sh", - "uninstall": "./uninstall.sh" - } -} +{+ "name": "adom-3d-viewer-babylon9",+ "version": "0.12.10",+ "description": "The Babylon 9.5 engine behind every component page's 3D tab on wiki.adom.inc. Versioned ESM bundle with GLB loading, view cube, layers toolbar, ground shadows, and Z-up CAD framing.",+ "type": "app",+ "main": "./dist/index.js",+ "module": "./dist/index.js",+ "types": "./dist/index.d.ts",+ "exports": {+ ".": {+ "import": "./dist/index.js",+ "types": "./dist/index.d.ts"+ }+ },+ "files": [+ "dist",+ "dist-standalone",+ "src",+ "standalone.ts"+ ],+ "scripts": {+ "build": "vite build",+ "build:standalone": "vite build --config vite.standalone.config.mts",+ "dev": "vite build --watch",+ "prepare": "npm run build",+ "test:sandbox": "node test/wiki-sandbox.test.mjs",+ "test:orbit": "node test/orbit.test.mjs",+ "test": "node test/run-all.mjs",+ "test:viewcube": "node test/viewcube.test.mjs",+ "test:help": "node test/help.test.mjs",+ "test:lights": "node test/lights.test.mjs",+ "test:replace": "node test/replace.test.mjs",+ "test:layers": "node test/layers.test.mjs",+ "test:bundle": "node test/bundle.test.mjs",+ "test:home": "node test/home-target.test.mjs",+ "test:intro": "node test/intro.test.mjs",+ "test:visibility": "node test/visibility.test.mjs"+ },+ "dependencies": {},+ "devDependencies": {+ "@babylonjs/addons": "9.5.0",+ "@babylonjs/core": "9.5.0",+ "@babylonjs/gui": "9.5.0",+ "@babylonjs/gui-editor": "9.5.0",+ "@babylonjs/inspector": "9.5.0",+ "@babylonjs/loaders": "9.5.0",+ "@babylonjs/materials": "9.5.0",+ "@babylonjs/serializers": "9.5.0",+ "@sveltejs/vite-plugin-svelte": "^3.1.2",+ "babylonjs-gltf2interface": "9.5.0",+ "puppeteer-core": "25.15.0",+ "svelte": "4.2.20",+ "svelte-check": "^3.8.6",+ "terser": "^5.46.2",+ "typescript": "^5.5.4",+ "vite": "^5.4.1"+ },+ "peerDependencies": {+ "svelte": "^4.0.0 || ^5.0.0"+ },+ "slug": "adom-3d-viewer",+ "license": "MIT",+ "tags": [+ "3d",+ "viewer",+ "babylon",+ "glb",+ "pcb",+ "component-pages"+ ],+ "hero": {+ "headline": "Adom 3D Viewer",+ "subhead": "The Babylon 9 engine behind every component page",+ "screenshot": "docs/viewer-screenshot.png"+ },+ "discovery_triggers": [+ "embed a 3d viewer for a glb model",+ "show a pcb or component in 3d",+ "babylon viewer for adom pages",+ "load the adom 3d viewer bundle",+ "layers toolbar for a 3d board view"+ ],+ "discovery_pitch": "The Babylon 9.5 ESM viewer engine that renders every component page's 3D tab on wiki.adom.inc: GLB loading, view cube, layers toolbar, shadows, laser-etch text, Z-up CAD framing.",+ "sample_prompts": [+ {+ "label": "Embed the viewer",+ "prompt": "Load the adom 3d viewer bundle into my page and show model.glb"+ },+ {+ "label": "Pin a version",+ "prompt": "Download the 0.4.3 viewer bundle so my tool vendors a fixed build"+ }+ ],+ "title": "Adom 3D Viewer"+}
src/ThreeDViewer.svelte+9−1@@ -882,6 +882,10 @@ let destroyed = false; let boardLayers: ReturnType<typeof installBoardLayers> | undefined; let pinFinish: ReturnType<typeof installPinFinish> | undefined;+ // Hosts may call loadModel immediately after init. The scene exists before+ // this async setup installs glTF material observers, so imports must wait+ // for setup (not whenReady, which can itself wait for an initial model).+ let viewerSetup: Promise<void> | undefined; async function initViewer() { if (!canvas || !container) return; await AdomStatics.init(canvas, zUp);@@ -1053,6 +1057,8 @@ } async function importModelFromUrl(url: string): Promise<any> {+ await viewerSetup;+ if (destroyed) return null; const scene = AdomStatics.scene; if (!scene) return null; @@ -1085,6 +1091,8 @@ } async function importModelFromBytes(bytes: ArrayBufferView, options?: { extension?: string }): Promise<any> {+ await viewerSetup;+ if (destroyed) return null; const scene = AdomStatics.scene; if (!scene) return null; modelRequested = true;@@ -1833,7 +1841,7 @@ } onMount(() => {- initViewer();+ viewerSetup = initViewer(); }); onDestroy(() => {
test/board-layers.test.mjs+3@@ -78,6 +78,7 @@ const bytesVariant=(kind)=>{ const html=`<html><body style="margin:0"><div id="wrap" style="width:800px;height:600px"></div><script type="module"> await import('/adom-3d-viewer-babylon9.esm.js'); window.v=window.Adom3DViewerBabylon9.init(document.getElementById('wrap'),{zUp:true,showViewCube:false,showGround:false,showHelp:false});+await v.loadModel('/round3.glb'); await v.whenReady();window.ready=true; </script></body></html>`; const server=http.createServer((req,res)=>{@@ -101,6 +102,8 @@ try { const page=await browser.newPage();await page.setViewport({width:800,height:600}); const errors=[];page.on('pageerror',e=>errors.push(String(e))); await page.goto('http://127.0.0.1:'+server.address().port+'/');await page.waitForFunction('window.ready===true',{timeout:90000});+ const immediate=await page.evaluate(()=>v.getScene().materials.filter(m=>m.pluginManager?.getPlugin('AdomBoardLayers')?.on).length);+ assert.equal(immediate,2,'loading immediately after init keeps both board shaders'); const load=async url=>{ await page.evaluate(async u=>{await v.replaceModel(u);await Promise.race([v.getScene().whenReadyAsync(),new Promise((_,reject)=>setTimeout(()=>reject(new Error('scene readiness timed out')),60000))]);v.getScene().render();},url); return page.evaluate(()=>{
test/pin-finish.test.mjs+15−1@@ -28,12 +28,15 @@ const glb = Buffer.concat([head,text,chunk,bin]); const html = `<div id="wrap" style="width:640px;height:480px"></div><script type="module"> await import('/adom-3d-viewer-babylon9.esm.js'); window.v = Adom3DViewerBabylon9.init(document.getElementById('wrap'),{showGround:false,showViewCube:false,showHelp:false,environment:new URLSearchParams(location.search).has('none')?'none':'studio'});+const early = new URLSearchParams(location.search).get('early');+if (early === 'url') await v.loadModel('/pins');+if (early === 'bytes') await v.loadModelBytes(Uint8Array.from(atob('${glb.toString('base64')}'),c=>c.charCodeAt(0))); await v.whenReady(); window.ready = true; </script>`; const server = http.createServer((req,res)=>{ const path = new URL(req.url,'http://x').pathname; if(path==='/') {res.setHeader('Content-Type','text/html');res.setHeader('Content-Security-Policy',"default-src 'self' data:; script-src 'self' 'unsafe-inline' 'wasm-unsafe-eval'; style-src 'unsafe-inline'; img-src 'self' data:; connect-src 'self' data:");return res.end(html);}- if(path==='/pins.glb') {res.setHeader('Content-Type','model/gltf-binary');return res.end(glb);}+ if(path==='/pins.glb'||path==='/pins') {res.setHeader('Content-Type','model/gltf-binary');return res.end(glb);} const file=resolve(DIST,'.'+path); if(file.startsWith(DIST+'/')&&existsSync(file)) {res.setHeader('Content-Type',file.endsWith('.js')?'text/javascript':'application/octet-stream');return res.end(readFileSync(file));} res.writeHead(404);res.end();@@ -51,6 +54,17 @@ try { page.on('pageerror',e=>errors.push(String(e))); page.on('console',m=>{if(m.text().includes('Content Security Policy')) violations.push(m.text());}); const url='http://127.0.0.1:'+server.address().port;+ // The wiki calls loadModel immediately after init, before whenReady.+ // Cover that order for both extensionless URLs and already-available bytes.+ for (const early of ['url','bytes']) {+ await page.goto(url+'/?early='+early);await page.waitForFunction('window.ready===true',{timeout:90000});+ const applied=await page.evaluate(async()=>{+ const s=v.getScene();await s.whenReadyAsync();s.render();+ const gold=s.materials.find(m=>m.name==='AdomMachineGold');+ return {grain:!!gold?.pluginManager?.getPlugin('AdomPinGrain')?.on,reflections:!!gold?.reflectionTexture?.isReady()};+ });+ assert.deepEqual(applied,{grain:true,reflections:true},'immediate '+early+' load keeps the pin finish');+ } await page.goto(url);await page.waitForFunction('window.ready===true',{timeout:90000}); const load=async(add=false)=>page.evaluate(async additive=>{ await (additive?v.addModel('/pins.glb'):v.replaceModel('/pins.glb'));