A town simulation in pale isometric line art, implemented with Ritmo ECS and PixiJs 3D
Move the labs and scripts to PixiJS 3D, and drop three.js
Claude160ec35ae2de
diff --git a/package.json b/package.jsonindex 360efbf..c4dacce 100644--- a/package.json+++ b/package.json@@ -39,14 +39,12 @@"@typeonce/ritmo-pixi": "0.23.0","@typeonce/ritmo-render": "0.23.0","effect": "4.0.3",- "pixi.js": "^8.23.0",- "three": "^0.186.1"+ "pixi.js": "^8.23.0"},"devDependencies": {"@typeonce/oxlint-plugin-ritmo": "0.23.0","@typeonce/ritmo-devtools": "0.23.0","@types/node": "25.5.0",- "@types/three": "^0.186.0","@types/web": "^0.0.365","oxlint": "1.92.0","playwright": "^1.64.0",diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex 4529622..b1e0a43 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -32,9 +32,6 @@ importers:pixi.js:specifier: ^8.23.0version: 8.23.0- three:- specifier: ^0.186.1- version: 0.186.1devDependencies:'@typeonce/oxlint-plugin-ritmo':specifier: 0.23.0@@ -45,9 +42,6 @@ importers:'@types/node':specifier: 25.5.0version: 25.5.0- '@types/three':- specifier: ^0.186.0- version: 0.186.0'@types/web':specifier: ^0.0.365version: 0.0.365@@ -66,9 +60,6 @@ importers:packages:- '@dimforge/[email protected]':- resolution: {integrity: sha512-uekIGetywIgopfD97oDL5PfeezkFpNhwlzlaEYNOA0N6ghdsOvh/HYjSMek5Q2O1PYvRSDFcqFVJl4r4ZBwOow==}-'@oxc-project/[email protected]':resolution: {integrity: sha512-jSNrRIyvPVLL5E1z/tS5zLAprosGz/FuI1PWwEOz59j3E4TTTzSpqKb/RDGqJhhW0QHYISGXxq582wGx6T11Tw==}@@ -288,9 +279,6 @@ packages:'@rolldown/[email protected]':resolution: {integrity: sha512-2j9bGt5Jh8hj+vPtgzPtl72j0yRxHAyumoo6TNfAjsLB04UtpSvPbPcDcBMxz7n+9CYB0c1GxQFxYRg2jimqGw==}- '@tweenjs/[email protected]':- resolution: {integrity: sha512-vJmvvwFxYuGnF2axRtPYocag6Clbb5YS7kLL+SO/TeVFzHqDIWrNKYtcsPMibjDx9O+bu+psAy9NKfWklassUA==}-'@typeonce/[email protected]':resolution: {integrity: sha512-+yZ51kuYEO992kTYeIPJVY2HF7SQsYPQxFLtLbIds96xU2aW+xn/A1xAnqdnA3jO1DH2DgMV88J1H9busZBObQ==}engines: {node: '>=22.12'}@@ -351,18 +339,9 @@ packages:'@types/[email protected]':resolution: {integrity: sha512-jp2P3tQMSxWugkCUKLRPVUpGaL5MVFwF8RDuSRztfwgN1wmqJeMSbKlnEtQqU8UrhTmzEmZdu2I6v2dpp7XIxw==}- '@types/[email protected]':- resolution: {integrity: sha512-jIBvWWShCvlBqBNIZt0KAshWpvSjhkwkEu4ZUcASoAvhmrgAUI2t1dXrjSL4xXVLB4FznPrIsX3nKXFl/Dt4vA==}-- '@types/[email protected]':- resolution: {integrity: sha512-mxYSBpDC+D0pLfSP6sW4WZTcT+nrtmZcimMqnVmy36Hte3XpeYSrvgg4TRdaM1GemGog1AWzI5qL2VoIfMXbJQ==}-'@types/[email protected]':resolution: {integrity: sha512-97pWkQo8Nh+1GtYclGmxqfG9VUBdb9qMS/bEfPFTR96GKeEKahPLc8n7S1Kqq1gCR2dTwanowOionwHNRgYvng==}- '@types/[email protected]':- resolution: {integrity: sha512-h8fgEd/DpoS9CBrjEQXR+dIDraopAEfu4wYVNY2tEPwk60stPWhvZMf4Foo5FakuQ7HFZoa8WceaWFervK2Ovg==}-'@typescript/[email protected]':resolution: {integrity: sha512-MTKKkWB7p/0E9xi1d1tHtZ5PiLkGEMIq88pK2CubZjOsLtYTLqhgIgi6zepFa+9GHZ6h05NMCkQxGKiPXMxXtQ==}engines: {node: '>=16.20.0'}@@ -515,9 +494,6 @@ packages:picomatch:optional: true- resolution: {integrity: sha512-tbZNuJrLwGUp3zshBtdy4W+ORxZuIh8a5ilyIEQDC5rY1f3U20JMry0Ll3WBzU58EZKsEuJFXhb5gwv8CsPvgA==}-resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==}engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}@@ -602,9 +578,6 @@ packages:resolution: {integrity: sha512-WkUDrojuJs0xkgGf2udWxa3yGBRxPtxUkB79i6aCZLRgc7PM8fZe9TosfPDcvEpQZbuFASnHYmRLBLUbmLOIIA==}engines: {node: '>= 12.0.0'}- resolution: {integrity: sha512-oRFNWJRDA/WTrVj7NWvqa5HqE1t9MYDj2VaWirQCzCCrAd2GHrqR/sQezCxiWATPNlKTcRaPRHPJwIRoPBAp5g==}-resolution: {integrity: sha512-2oZqMAcEEiCtXWUjIGtZ71oPx1B0ZxYGTqIKsXB1wzWFhleNsCFxQuUJzgCV706bRcwPWtMGf1odmQvAcqKkIw==}@@ -662,9 +635,6 @@ packages:resolution: {integrity: sha512-KGj/8Y43x35aZVDtt+J4mK1hoLGHULMYfSkODJNQjNDC3oW1PqPoxMwo0pLUsWM/UEGzON/NxeHywEfNXNP3Vw==}engines: {node: '>=0.10.0'}- resolution: {integrity: sha512-blFeqb49wRCSGUGj7gtpfnSGHy2lwDk94RhUmS1c/hTby70kvChbWpkJ4Pm1390LqzzvTmzgXKHPEafJwCb8jA==}-resolution: {integrity: sha512-w/Te7uMUVeH0CR8vZIjr+XiN41V+30lkDdK+NRIDCUYKKuL9VcmaUEmaPISuwGhLlrTGh5yu18lENtR9axSxYw==}engines: {node: '>=12'}@@ -726,8 +696,6 @@ packages:snapshots:- '@dimforge/[email protected]': {}-'@oxc-project/[email protected]': {}'@oxlint/[email protected]':@@ -841,8 +809,6 @@ snapshots:'@rolldown/[email protected]': {}- '@tweenjs/[email protected]': {}-'@typeonce/[email protected]([email protected])':dependencies:'@oxlint/plugins': 1.88.0@@ -900,21 +866,8 @@ snapshots:dependencies:undici-types: 7.18.2- '@types/[email protected]': {}-- '@types/[email protected]':- dependencies:- '@dimforge/rapier3d-compat': 0.12.0- '@tweenjs/tween.js': 23.1.3- '@types/stats.js': 0.17.4- '@types/webxr': 0.5.24- fflate: 0.8.3- meshoptimizer: 1.1.1-'@types/[email protected]': {}- '@types/[email protected]': {}-'@typescript/[email protected]':optional: true@@ -993,8 +946,6 @@ snapshots:optionalDependencies:picomatch: 4.0.7- [email protected]: {}-optional: true@@ -1055,8 +1006,6 @@ snapshots:lightningcss-win32-arm64-msvc: 1.33.0lightningcss-win32-x64-msvc: 1.33.0- [email protected]: {}-@@ -1137,8 +1086,6 @@ snapshots:- [email protected]: {}-diff --git a/scripts/ink-assets.ts b/scripts/ink-assets.tsindex 6e93394..c9ed8b8 100644--- a/scripts/ink-assets.ts+++ b/scripts/ink-assets.ts@@ -2,52 +2,31 @@ import { mkdir, readFile, writeFile } from "node:fs/promises"import path from "node:path"import { build } from "vite"import { inkAssets } from "../src/render/pixi3d/assets/assets.ts"-import * as THREE from "three"-import { GLTFLoader } from "three/addons/loaders/GLTFLoader.js"-import { exportAsset } from "../src/render/pixi3d/assets/renderer.ts"--// GLTFExporter uses the browser's FileReader to assemble binary buffers.-// There are no textures here; only readAsArrayBuffer is needed in Node.-class BinaryReader {- result: ArrayBuffer | null = null- onloadend: (() => void) | null = null- readAsArrayBuffer(blob: Blob) {- void blob.arrayBuffer().then((buffer) => {- this.result = buffer- this.onloadend?.()- })- }-}-if (typeof globalThis.FileReader === "undefined") Object.assign(globalThis, { FileReader: BinaryReader })+import { exportAsset, readGlb } from "../src/render/pixi3d/assets/glb.ts"const output = path.resolve("output/inkline-3d")await mkdir(path.join(output, "models"), { recursive: true })const manifest = []-const loader = new GLTFLoader()for (const asset of inkAssets) {const glb = await exportAsset(asset)await writeFile(path.join(output, "models", `${asset.id}.glb`), new Uint8Array(glb))await writeFile(path.join(output, "models", `${asset.id}.json`), JSON.stringify(asset, null, 2))- const imported = await loader.parseAsync(glb, "")- if(asset.effects&&!imported.scene.getObjectByName(asset.id)?.userData.inklineSurfaceEffects)throw new Error(`${asset.id}: surface state metadata lost on export`)- if(asset.smokeEffect&&!imported.scene.getObjectByName(asset.id)?.userData.inklineSmokeEffect)throw new Error(`${asset.id}: smoke emitter metadata lost on export`)- if(asset.fountains?.length&&!imported.scene.getObjectByName(asset.id)?.userData.inklineFountains)throw new Error(`${asset.id}: fountain metadata lost on export`)+ // Read back the way any importer would: the root's effect metadata, finite geometry, unlit materials.+ const imported = readGlb(glb), root = imported.nodes.find((node) => node.name === asset.id)+ if(asset.effects&&!root?.extras?.inklineSurfaceEffects)throw new Error(`${asset.id}: surface state metadata lost on export`)+ if(asset.smokeEffect&&!root?.extras?.inklineSmokeEffect)throw new Error(`${asset.id}: smoke emitter metadata lost on export`)+ if(asset.fountains?.length&&!root?.extras?.inklineFountains)throw new Error(`${asset.id}: fountain metadata lost on export`)let meshes = 0,vertices = 0- imported.scene.traverse((object) => {- if (!(object instanceof THREE.Mesh)) return- meshes++- const position = object.geometry.getAttribute("position")- if (!position?.count) throw new Error(`${asset.id}: empty imported mesh`)- vertices += position.count- for (const n of position.array) if (!Number.isFinite(n)) throw new Error(`${asset.id}: invalid imported coordinate`)- const materials = Array.isArray(object.material) ? object.material : [object.material]- for (const material of materials) {- if (!(material instanceof THREE.MeshBasicMaterial)) throw new Error(`${asset.id}: ink material lost its unlit shading`)- material.dispose()+ for (const mesh of imported.meshes)+ for (const primitive of mesh.primitives) {+ meshes+++ const position = imported.accessor(primitive.attributes.POSITION!)+ if (!position.length) throw new Error(`${asset.id}: empty imported mesh`)+ vertices += position.length / 3+ for (const n of position) if (!Number.isFinite(n)) throw new Error(`${asset.id}: invalid imported coordinate`)+ if (!imported.materials[primitive.material!]?.extensions?.KHR_materials_unlit) throw new Error(`${asset.id}: ink material lost its unlit shading`)}- object.geometry.dispose()- })if (!meshes) throw new Error(`${asset.id}: no imported meshes`)manifest.push({id: asset.id,diff --git a/scripts/look-readme.ts b/scripts/look-readme.tsindex d79a3c5..2e5264f 100644--- a/scripts/look-readme.ts+++ b/scripts/look-readme.ts@@ -51,10 +51,7 @@ await run(1000)type Camera = { x: number; y: number; zoom: number; heading: number; elevation: number }const camera = (c: Camera) => page.evaluate((c) => {- const v = (window as any).town.view- v.heading = c.heading; v.elevation = c.elevation- v.camera.zoom = c.zoom; v.camera.updateProjectionMatrix()- v.focus(c.x, c.y)+ ;(window as any).town.view.setView(c)}, c)const town = () => page.evaluate(() => (window as any).town.snapshot()) as Promise<any>const hall = (await town()).entities.find((e: any) => e.components["Town/TownHall"]).components["Town/Tile"]diff --git a/scripts/look-ui.ts b/scripts/look-ui.tsindex 7f7fae8..12de458 100644--- a/scripts/look-ui.ts+++ b/scripts/look-ui.ts@@ -33,7 +33,7 @@ for (const [name, width, height, phone] of [["desktop", 1440, 1000, false], ["phconst settle = () => page.waitForTimeout(600)const shot = async (label: string) => { await settle(); await page.screenshot({ path: `${out}/${name}-${label}.png` }) }const at = (x: number, y: number, z = 0) => page.evaluate(([x, y, z]) => (window as any).town.view.project(x, y, z), [x, y, z]) as Promise<{ x: number; y: number }>- const look = (x: number, y: number, zoom: number) => page.evaluate(([x, y, zoom]) => { const v = (window as any).town.view; v.focus(x, y); v.camera.zoom = zoom; v.camera.updateProjectionMatrix() }, [x, y, zoom])+ const look = (x: number, y: number, zoom: number) => page.evaluate(([x, y, zoom]) => { const v = (window as any).town.view; v.setView({ ...v.view(), x, y, zoom }) }, [x, y, zoom])const pick = async (tile: Tile, z = 10) => {const p = await at(tile.x + tile.size / 2, tile.y + tile.size / 2, z)if (phone) await page.touchscreen.tap(p.x, p.y)diff --git a/scripts/look-upgrades.ts b/scripts/look-upgrades.tsindex 01f8e95..9a91f4f 100644--- a/scripts/look-upgrades.ts+++ b/scripts/look-upgrades.ts@@ -38,7 +38,7 @@ try {})await page.evaluate(() => (window as any).town.advance(1))const hall = await page.evaluate(() => (window as any).town.snapshot().entities.find((e: any) => e.components["Town/TownHall"]).components["Town/Tile"])- await page.evaluate(([x, y]) => { const v = (window as any).town.view; v.focus(x, y); v.camera.zoom = 2.2; v.camera.updateProjectionMatrix() }, [hall.x + 1.5, hall.y + 1.5])+ await page.evaluate(([x, y]) => { const v = (window as any).town.view; v.setView({ ...v.view(), x, y, zoom: 2.2 }) }, [hall.x + 1.5, hall.y + 1.5])// The gold arrow over the town hall; then its panel, the upgrade first under its status, begun from its button.await page.waitForTimeout(600)await page.screenshot({ path: `${out}/1-arrow.png` })diff --git a/src/labs/asset-lab/main.ts b/src/labs/asset-lab/main.tsindex 0044d6c..ffcc1f6 100644--- a/src/labs/asset-lab/main.ts+++ b/src/labs/asset-lab/main.ts@@ -1,5 +1,5 @@import { Application, Graphics } from "pixi.js"-import * as THREE from "three"+import type { Container3D } from "@pixi/3d"import {drawBuilding,drawCrate,@@ -25,6 +25,9 @@ import { drawPlot } from "../../render/art.ts"import { U, toScreen } from "../../game/world/iso.ts"import { inkAssets, assetCategoryTitles, type InkAsset } from "../../render/pixi3d/assets/assets.ts"import { buildAsset, exportAsset, reloadExportedAsset } from "../../render/pixi3d/assets/renderer.ts"+import { triangleCount } from "../../render/pixi3d/mesh/geometry.ts"+import type { Vec3 } from "../../render/pixi3d/mesh/vec3.ts"+import { aim, frame, labViewer, toward } from "../viewer.ts"import "./style.css"const root = document.querySelector<HTMLDivElement>("#lab")!@@ -44,14 +47,12 @@ const viewer = document.querySelector<HTMLDivElement>("#viewer")!const reference = document.querySelector<HTMLCanvasElement>("#reference")!const rotation = document.querySelector<HTMLInputElement>("#rotation")!const elevation = document.querySelector<HTMLInputElement>("#elevation")!-const renderer = new THREE.WebGLRenderer({ antialias: true, alpha: true, preserveDrawingBuffer: true })-renderer.setPixelRatio(Math.min(devicePixelRatio, 2))-renderer.setClearColor(0xf0f2ec, 0)-renderer.outputColorSpace = THREE.SRGBColorSpace-renderer.toneMapping = THREE.NoToneMapping-viewer.append(renderer.domElement)-const scene = new THREE.Scene()-const camera = new THREE.OrthographicCamera(-100, 100, 100, -100, 0.1, 4000)+const lab = await labViewer(viewer, { width: viewer.clientWidth || 1, height: viewer.clientHeight || 1 }), camera = lab.camera, scene = lab.view.root+/** Shows only `node` in the view. */+const show = (node: Container3D) => {+ for (const child of [...scene.children]) if (child !== node) scene.removeChild(child)+ if (node.parent !== scene) scene.addChild(node)+}const pixi = new Application()await pixi.init({ width: 32, height: 32, antialias: true, resolution: 3, backgroundAlpha: 0 })@@ -234,33 +235,19 @@ function render() {if (!width || !height) returnconst ref = references.get(selected.id)!const model = models.get(selected.id)!- const effectBounds=selected.smokeEffect||selected.fountains?.length?new THREE.Box3().setFromObject(model.group):null- const bounds = selected.reference?.type === "building" ? new THREE.Box3().setFromObject(model.group).getBoundingSphere(new THREE.Sphere()) : null- const vertical = Math.max(40, ref.height * 1.45, ((ref.width * height) / width) * 1.3, effectBounds?effectBounds.getSize(new THREE.Vector3()).y*1.45:0, bounds ? bounds.radius * 2.6 * Math.max(1, height / width) : 0) / zoom- renderer.setSize(width, height, false)- camera.left = (-vertical * width) / height / 2- camera.right = -camera.left- camera.top = vertical / 2- camera.bottom = -camera.top+ const [min, max] = model.bounds, centre: Vec3 = [(min[0] + max[0]) / 2, (min[1] + max[1]) / 2, (min[2] + max[2]) / 2]+ const effectBounds = selected.smokeEffect || selected.fountains?.length ? { centre, height: max[1] - min[1] } : null+ // A building is framed by the sphere round its box.+ const bounds = selected.reference?.type === "building" ? { centre, radius: Math.hypot(max[0] - min[0], max[1] - min[1], max[2] - min[2]) / 2 } : null+ const vertical = Math.max(40, ref.height * 1.45, ((ref.width * height) / width) * 1.3, effectBounds ? effectBounds.height * 1.45 : 0, bounds ? bounds.radius * 2.6 * Math.max(1, height / width) : 0) / zoom+ lab.resize(width, height)+ frame(camera, vertical / 2, width, height)const heading = ((45 + yaw) * Math.PI) / 180,altitude = (pitch * Math.PI) / 180- const target = bounds?.center ?? (effectBounds?effectBounds.getCenter(new THREE.Vector3()):new THREE.Vector3(0, -(ref.y + ref.height / 2) / Math.cos(Math.PI / 6), 0))- camera.position- .copy(target)- .add(- new THREE.Vector3(- Math.sin(heading) * Math.cos(altitude) * 1000,- Math.sin(altitude) * 1000,- Math.cos(heading) * Math.cos(altitude) * 1000- )- )- camera.lookAt(target)- camera.updateProjectionMatrix()- camera.updateMatrixWorld()+ const target: Vec3 = bounds?.centre ?? effectBounds?.centre ?? [0, -(ref.y + ref.height / 2) / Math.cos(Math.PI / 6), 0]+ aim(camera, target, toward(heading, altitude), 1000)model.updateEffects(effectTimeOverride??performance.now()/1000)- for (const { material, width: lineWidth } of model.lineMaterials) material.linewidth = lineWidth- model.updateContours(camera)- renderer.render(scene, camera)+ lab.render()const dpr = Math.min(devicePixelRatio, 2),ctx = reference.getContext("2d")!reference.width = Math.round(width * dpr)@@ -285,8 +272,7 @@ function select(id: string) {models.delete(oldest)}if (!models.has(id)) models.set(id, buildAsset(selected, { batchFaces: true }))- scene.clear()- scene.add(models.get(id)!.group)+ show(models.get(id)!.group)category.value = selected.category ?? "buildings"search.value = ""filter()@@ -363,7 +349,8 @@ root.querySelector<HTMLButtonElement>("#download-png")!.onclick = () => {ctx.fillStyle = "#f0f2ec"ctx.fillRect(0, 0, canvas.width, canvas.height)ctx.drawImage(reference, 0, 60)- ctx.drawImage(renderer.domElement, w, 60, w, h)+ render()+ ctx.drawImage(lab.canvas, w, 60, w, h)ctx.fillStyle = "#3d4943"ctx.font = "24px monospace"ctx.fillText(`${selected.title} / original`, 24, 38)@@ -375,7 +362,8 @@ root.querySelector<HTMLButtonElement>("#download-png")!.onclick = () => {// A local inspection/export bridge for reproducible visual checks and GLB delivery.const capture = (side: "reference" | "model", width = 480) => {- const input = side === "reference" ? reference : renderer.domElement+ if (side === "model") render()+ const input = side === "reference" ? reference : lab.canvasconst output = document.createElement("canvas")output.width = widthoutput.height = Math.round((width * input.height) / input.width)@@ -407,12 +395,13 @@ Object.assign(window, {exportAsset,showExported: async () => {const model = await reloadExportedAsset(selected)- scene.clear()- scene.add(model)- render()- return { meshes: model.children.length }+ show(model)+ lab.render()+ let meshes = 0+ model.traverse((node) => { if ("geometry" in node) meshes++ })+ return { meshes }},- stats: () => ({ selected: selected.id, yaw, pitch, drawCount, triangles: renderer.info.render.triangles }),+ stats: () => ({ selected: selected.id, yaw, pitch, drawCount, triangles: models.get(selected.id)?.parts.reduce((n, p) => n + triangleCount(p.part.mesh), 0) ?? 0 }),capture,captureEffect: (time:number)=>{effectTimeOverride=time;render();const image=capture("model");effectTimeOverride=null;return image}}@@ -426,5 +415,5 @@ if (import.meta.hot)cancelAnimationFrame(effectFrame)resize.disconnect()models.forEach((model) => model.dispose())- renderer.dispose()+ lab.dispose()})diff --git a/src/labs/effects-lab/main.ts b/src/labs/effects-lab/main.tsindex c440064..aed3b6b 100644--- a/src/labs/effects-lab/main.ts+++ b/src/labs/effects-lab/main.ts@@ -1,10 +1,11 @@-import * as THREE from "three"+import { Container3D } from "@pixi/3d"import { house } from "../../render/pixi3d/assets/homes.ts"import { home, type Tier } from "../../game/content/index.ts"import { U } from "../../game/world/iso.ts"import { ModelHandle,ModelPool } from "../../render/pixi3d/pool.ts"import { surfaceState,type SurfaceState } from "../../render/pixi3d/surface-state.ts"import { StructureEffects } from "../../render/pixi3d/structure-effects.ts"+import { aim, frame, labViewer, toward } from "../viewer.ts"import "./style.css"const cases: Array<{title:string;note:string;state:Partial<SurfaceState>}>=[@@ -19,48 +20,50 @@ const cases: Array<{title:string;note:string;state:Partial<SurfaceState>}>=[]const root=document.querySelector<HTMLElement>("#effects-lab")!root.innerHTML=`<header><a href="/model-review.html">Inkline Town</a><span>LIVE MATERIAL & PARTICLE STUDY</span><a href="/">Play the town ↗</a></header><section class="intro"><h1>One house.<br>Eight conditions.</h1><p>These are actual renders of the shared game mesh. Surface shaders change its condition; particles emit from its roof. Drag to turn the view.</p></section><section class="controls"><label>House <select aria-label="House tier"><option value="1">Settler cottage</option><option value="2" selected>Citizen home</option><option value="3">Townhouse</option></select></label><label>Rotation <input aria-label="Rotation" id="rotation" type="range" min="-180" max="180" value="0"><output id="angle">0°</output></label><label>Effect strength <input aria-label="Effect strength" id="strength" type="range" min="0" max="100" value="100"><output id="amount">100%</output></label><button id="pause">Pause animation</button><button id="rear">See the back</button></section><section class="grid" aria-label="House effects"></section><footer><span id="stats"></span><span>Same mesh · Surface shaders · Roof particles · Drag to rotate</span></footer>`-const grid=root.querySelector<HTMLElement>(".grid")!, renderer=new THREE.WebGLRenderer({alpha:true,antialias:true,preserveDrawingBuffer:true}),scene=new THREE.Scene(),pool=new ModelPool(),camera=new THREE.OrthographicCamera(-100,100,100,-100,0.1,4000)-renderer.setPixelRatio(Math.min(devicePixelRatio,2));renderer.outputColorSpace=THREE.SRGBColorSpace;renderer.setClearColor(0xf0f2ec,0)-renderer.domElement.className="rendering";document.body.append(renderer.domElement);scene.add(pool.root)+const grid=root.querySelector<HTMLElement>(".grid")!,pool=new ModelPool()+// One canvas over the page; each card's picture is the one view drawn into the card's rectangle.+const viewer=await labViewer(document.body,{width:innerWidth,height:innerHeight,className:"rendering"}),camera=viewer.camera,scene=viewer.view.root+scene.addChild(pool.root)const views=cases.map((c,i)=>{const card=document.createElement("article")card.innerHTML=`<div class="render-view" role="img" aria-label="${c.title}"></div><div class="caption"><h2>${c.title}</h2><p>${c.note}</p></div>`;grid.append(card)if(i===7){const b=document.createElement("button");b.textContent="Fire close-up";card.querySelector(".caption")!.append(b);b.onclick=()=>{card.classList.toggle("close-up");b.textContent=card.classList.contains("close-up")?"Back to overview":"Fire close-up";card.scrollIntoView({block:"start"})}}- const handle=new ModelHandle(pool),anchor=new THREE.Group();anchor.position.x=i*200;anchor.add(handle.root);scene.add(anchor)+ const handle=new ModelHandle(pool),anchor=new Container3D();anchor.position.x=i*200;anchor.addChild(handle.root);scene.addChild(anchor)return{card,handle,anchor,effects:null as StructureEffects|null,view:card.querySelector<HTMLElement>(".render-view")!}})-let tier:Tier=2,yaw=0,strength=1,time=0,paused=false,last=0,frame=0+let tier:Tier=2,yaw=0,strength=1,time=0,paused=false,last=0,frames=0,frameId=0function build(){const asset=house(tier,0.28,"preview",{doors:{right:true,left:false}}),H=home.tiers[tier].height,half=(home.half+(tier>=2?1:0))*U*32*Math.SQRT2views.forEach(v=>{- v.handle.use(`house/${tier}`,()=>asset);v.handle.effectBounds.set(half,H/Math.cos(Math.PI/6),0.31,1)- v.effects?.dispose();v.effects=new StructureEffects(asset,H);v.anchor.add(v.effects.group)+ v.handle.use(`house/${tier}`,()=>asset);v.handle.effectBounds=[half,H/Math.cos(Math.PI/6),0.31,1]+ v.effects?.dispose();v.effects=new StructureEffects(asset,H);v.anchor.addChild(v.effects.group)})}function stateAt(i:number){return surfaceState(Object.fromEntries(Object.entries(cases[i]!.state).map(([k,v])=>[k,v*strength])))}function update(t:number){- time=t;pool.time.value=t+ time=tviews.forEach((v,i)=>{const s=stateAt(i);v.handle.effects=s;v.effects!.set(s);v.effects!.update(t)})- scene.updateMatrixWorld(true);pool.flush()+ pool.flush()}-function aim(i:number,width:number,height:number){- const H=home.tiers[tier].height,vertical=(H+28)/Math.cos(Math.PI/6)*1.35,heading=(45+yaw)*Math.PI/180,- target=new THREE.Vector3(i*200,(H+8)/Math.cos(Math.PI/6)/2,0)- camera.top=vertical/2;camera.bottom=-camera.top;camera.left=-vertical*width/height/2;camera.right=-camera.left- camera.position.copy(target).add(new THREE.Vector3(Math.sin(heading)*866,500,Math.cos(heading)*866));camera.lookAt(target);camera.updateProjectionMatrix();camera.updateMatrixWorld()- camera.getWorldDirection(pool.viewDirection).negate()+function place(i:number,width:number,height:number){+ const H=home.tiers[tier].height,vertical=(H+28)/Math.cos(Math.PI/6)*1.35,heading=(45+yaw)*Math.PI/180+ // From 866 across and 500 up: a 30° elevation, 1000 away.+ aim(camera,[i*200,(H+8)/Math.cos(Math.PI/6)/2,0],toward(heading,Math.atan2(500,866)),1000)+ frame(camera,vertical/2,width,height)}function render(){- renderer.setSize(innerWidth,innerHeight,false);renderer.setScissorTest(false);renderer.clear();renderer.setScissorTest(true)+ viewer.resize(innerWidth,innerHeight)+ let first=trueviews.forEach((v,i)=>{const r=v.view.getBoundingClientRect();if(r.bottom<=0||r.top>=innerHeight)return- aim(i,r.width,r.height)- renderer.setViewport(r.left,innerHeight-r.bottom,r.width,r.height)- renderer.setScissor(Math.max(0,r.left),Math.max(0,innerHeight-r.bottom),Math.min(innerWidth,r.right)-Math.max(0,r.left),Math.min(innerHeight,r.bottom)-Math.max(0,r.top))- renderer.render(scene,camera)+ place(i,r.width,r.height)+ camera.viewport.set(r.left/innerWidth,r.top/innerHeight,r.width/innerWidth,r.height/innerHeight)+ viewer.app.renderer.render({container:viewer.view,clear:first});first=false})+ if(first)viewer.app.renderer.render({container:viewer.view,clear:true})+ camera.viewport.set(0,0,1,1)root.querySelector("#stats")!.textContent=`1 active house mesh · ${views.length} instances · ${time.toFixed(1)} s`- frame+++ frames++}/** Captures the same GPU scene at a reproducible animation time. */function capture(t=time,focus=false){@@ -69,14 +72,13 @@ function capture(t=time,focus=false){canvas.width=960;canvas.height=focus?680:1000;ctx.fillStyle="#f0f2ec";ctx.fillRect(0,0,canvas.width,canvas.height)ctx.fillStyle="#3d4943";ctx.font="30px Georgia";ctx.fillText("Inkline Town / effects on one house",24,40)ctx.font="12px monospace";ctx.fillText(`${home.tiers[tier].title} · shared mesh · ${t.toFixed(2)} s`,24,65)- renderer.setPixelRatio(1);renderer.setSize(width,viewHeight,false);renderer.setScissorTest(false)const indices=focus?[7]:views.map((_,i)=>i)indices.forEach((i,index)=>{- aim(i,width,viewHeight);renderer.setViewport(0,0,width,viewHeight);renderer.render(scene,camera)+ place(i,width,viewHeight)const x=index%3*width,y=85+Math.floor(index/3)*height- ctx.drawImage(renderer.domElement,x,y,width,viewHeight);ctx.fillStyle="#3d4943";ctx.font="19px Georgia";ctx.fillText(cases[i]!.title,x+20,y+viewHeight+30)+ ctx.drawImage(viewer.snapshot(width,viewHeight,1,null),x,y,width,viewHeight);ctx.fillStyle="#3d4943";ctx.font="19px Georgia";ctx.fillText(cases[i]!.title,x+20,y+viewHeight+30)})- renderer.setPixelRatio(Math.min(devicePixelRatio,2));render();return canvas.toDataURL()+ render();return canvas.toDataURL()}root.querySelector<HTMLSelectElement>("select")!.onchange=e=>{tier=Number((e.target as HTMLSelectElement).value) as Tier;build();update(time);render()}root.querySelector<HTMLInputElement>("#rotation")!.oninput=e=>{yaw=Number((e.target as HTMLInputElement).value);root.querySelector("#angle")!.textContent=`${yaw}°`;render()}@@ -88,6 +90,7 @@ grid.onpointerdown=e=>{if(!(e.target as HTMLElement).classList.contains("render-grid.onpointermove=e=>{if(drag){yaw=((drag.yaw+(e.clientX-drag.x)*0.5+540)%360)-180;render()}}grid.onpointerup=grid.onpointercancel=()=>{drag=null}build();update(0)-renderer.setAnimationLoop(now=>{const dt=last?Math.min((now-last)/1000,0.1):0;last=now;if(!paused)update(time+dt);render()})-Object.assign(window,{effectsLab:{capture,pause:()=>{paused=true},stats:()=>({tier,yaw,time,frame,templates:pool.stats().templates,activeTemplates:new Set(views.map(v=>v.handle.template)).size,models:pool.stats().models})}})-if(import.meta.hot)import.meta.hot.dispose(()=>{renderer.setAnimationLoop(null);views.forEach(v=>v.effects?.dispose());pool.dispose();renderer.dispose();renderer.domElement.remove()})+const loop=(now:number)=>{const dt=last?Math.min((now-last)/1000,0.1):0;last=now;if(!paused)update(time+dt);render();frameId=requestAnimationFrame(loop)}+frameId=requestAnimationFrame(loop)+Object.assign(window,{effectsLab:{capture,pause:()=>{paused=true},stats:()=>({tier,yaw,time,frame:frames,templates:pool.stats().templates,activeTemplates:new Set(views.map(v=>v.handle.template)).size,models:pool.stats().models})}})+if(import.meta.hot)import.meta.hot.dispose(()=>{cancelAnimationFrame(frameId);views.forEach(v=>v.effects?.dispose());pool.dispose();viewer.dispose()})diff --git a/src/labs/map-lab/main.ts b/src/labs/map-lab/main.tsindex ca3bdbc..108a536 100644--- a/src/labs/map-lab/main.ts+++ b/src/labs/map-lab/main.ts@@ -1,9 +1,12 @@-import * as THREE from "three"-import { OrbitControls } from "three/addons/controls/OrbitControls.js"+import { Plane, Vector3 } from "@pixi/3d"+import { OrbitCamera } from "@pixi/3d/extras"import { buildAsset, floorScale } from "../../render/pixi3d/assets/renderer.ts"import { inkAssets } from "../../render/pixi3d/assets/assets.ts"import { makePerson } from "../../render/pixi3d/assets/people.ts"import { testMap, districts } from "./map.ts"+import { drawCounter } from "../../render/pixi3d/scene.ts"+import { triangleCount } from "../../render/pixi3d/mesh/geometry.ts"+import { labViewer } from "../viewer.ts"import "./style.css"const root = document.querySelector<HTMLElement>("#map-lab")!@@ -23,40 +26,38 @@ root.innerHTML = `<span class="scene-note">Every model on the island · Original scale</span>`const viewport = root.querySelector<HTMLDivElement>("#viewport")!-const renderer = new THREE.WebGLRenderer({ antialias: true, alpha: false, preserveDrawingBuffer: true })-renderer.setPixelRatio(Math.min(devicePixelRatio, 2))-renderer.setClearColor(0xe2e9e6)-renderer.outputColorSpace = THREE.SRGBColorSpace-renderer.toneMapping = THREE.NoToneMapping-renderer.domElement.tabIndex = 0-renderer.domElement.setAttribute("aria-label", "3D island map. Drag to pan, right-drag to rotate, scroll to zoom.")-viewport.append(renderer.domElement)-const scene = new THREE.Scene()+const viewer = await labViewer(viewport, { width: viewport.clientWidth || 1, height: viewport.clientHeight || 1, background: 0xe2e9e6 })+const canvas = viewer.canvas, scene = viewer.view.root, camera = viewer.camera, counter = drawCounter(viewer.app.renderer)+canvas.tabIndex = 0+canvas.setAttribute("aria-label", "3D island map. Drag to pan, right-drag to rotate, scroll to zoom.")const map = buildAsset(testMap.asset, { batchFaces: true })-scene.add(map.group)+scene.addChild(map.group)const effects = testMap.effects.map((p) => {const model = buildAsset(inkAssets.find((a) => a.id === p.asset)!,{ batchFaces: true })model.group.position.set(p.x * floorScale, p.height / Math.cos(Math.PI / 6), p.y * floorScale)- scene.add(model.group)+ scene.addChild(model.group)return model})-const camera = new THREE.OrthographicCamera(-600, 600, 450, -450, 0.1, 6000)-const controls = new OrbitControls(camera, renderer.domElement)-controls.screenSpacePanning = false-controls.zoomToCursor = true-controls.minZoom = 0.65-controls.maxZoom = 28-controls.minPolarAngle = THREE.MathUtils.degToRad(25)-controls.maxPolarAngle = THREE.MathUtils.degToRad(75)-controls.panSpeed = 0.85-controls.rotateSpeed = 0.65-controls.zoomSpeed = 0.85-controls.mouseButtons = { LEFT: THREE.MOUSE.PAN, MIDDLE: THREE.MOUSE.DOLLY, RIGHT: THREE.MOUSE.ROTATE }-controls.touches = { ONE: THREE.TOUCH.PAN, TWO: THREE.TOUCH.DOLLY_PAN }-controls.listenToKeyEvents(renderer.domElement)+const degrees = (radians: number) => (radians * 180) / Math.PI, radians = (degrees: number) => (degrees * Math.PI) / 180+const controls = new OrbitCamera({+ view: viewer.view,+ target: { x: 0, y: 0, z: 0 },+ autoUpdate: false,+ screenSpacePanning: false,+ zoomToCursor: true,+ minZoom: 0.65,+ maxZoom: 28,+ minPolarAngle: radians(25),+ maxPolarAngle: radians(75),+ panSpeed: 0.85,+ rotateSpeed: 0.65,+ zoomSpeed: 0.85,+ mouseButtons: { left: "pan", middle: "zoom", right: "rotate" },+ touches: { one: "pan", two: "zoom-pan" }+})const tilt = root.querySelector<HTMLInputElement>("#tilt")!const district = root.querySelector<HTMLSelectElement>("#district")!const inspect = root.querySelector<HTMLSelectElement>("#inspect")!@@ -80,28 +81,27 @@ const actors = inkAssetsconst r = a.reference!if (r.type !== "walker") throw new Error("Actor requires walker reference")const frames = [0, 1].map((phase) => buildAsset(makePerson(a.id, a.title, r.dress, r.load, r.cart, phase), { batchFaces: true }))- frames.forEach((f) => scene.add(f.group))+ frames.forEach((f) => scene.addChild(f.group))return { frames, offset: i / 8 }})let draws = 0let mode: "pan" | "rotate" = "pan"function render() {- for (const effect of effects) effect.group.rotation.y = controls.getAzimuthalAngle() - Math.PI / 4- map.updateContours(camera)- for (const actor of actors) for (const frame of actor.frames) frame.updateContours(camera)- renderer.render(scene, camera)+ for (const effect of effects) effect.group.rotation.y = controls.azimuthAngle - Math.PI / 4+ counter.calls = counter.triangles = 0+ viewer.render()draws++- const degrees = THREE.MathUtils.radToDeg(controls.getAzimuthalAngle()) - 45- const heading = ((degrees + 540) % 360) - 180- const elevation = 90 - THREE.MathUtils.radToDeg(controls.getPolarAngle())+ const turned = degrees(controls.azimuthAngle) - 45+ const heading = ((turned + 540) % 360) - 180+ const elevation = 90 - degrees(controls.polarAngle)root.querySelector("#zoom")!.textContent = `${camera.zoom.toFixed(1)}×`root.querySelector("#heading")!.textContent = `${Math.round(heading)}°`root.querySelector<HTMLElement>("#north")!.style.transform = `rotate(${-heading}deg)`tilt.value = String(Math.round(elevation))root.querySelector("#tilt-value")!.textContent = `${Math.round(elevation)}°`}-controls.addEventListener("change", render)+controls.on("change", render)function reset() {district.value = "all"@@ -109,29 +109,25 @@ function reset() {controls.target.set(0, 0, 0)camera.position.set(1600, Math.sqrt(2) * 1600 * Math.tan(Math.PI / 6), 1600)camera.zoom = 1- camera.updateProjectionMatrix()controls.update()render()}function resize() {- const width = viewport.clientWidth,- height = viewport.clientHeight- renderer.setSize(width, height, false)+ const width = viewport.clientWidth || 1,+ height = viewport.clientHeight || 1+ viewer.resize(width, height)const viewHeight = Math.max(1350, (2150 * height) / width)- camera.top = viewHeight / 2- camera.bottom = -viewHeight / 2- camera.right = (viewHeight * width) / height / 2- camera.left = -camera.right- camera.updateProjectionMatrix()+ camera.orthographicSize = (viewHeight * width) / height / 2render()}+/** Moves the camera and its target together by `(dx, dy, dz)`. */+function shift(dx: number, dy: number, dz: number) {+ controls.target.set(controls.target.x + dx, controls.target.y + dy, controls.target.z + dz)+ camera.position.set(camera.position.x + dx, camera.position.y + dy, camera.position.z + dz)+}function focus(x: number, y: number, zoom: number) {- const next = new THREE.Vector3(x * floorScale, 0, y * floorScale)- const delta = next.clone().sub(controls.target)- controls.target.copy(next)- camera.position.add(delta)+ shift(x * floorScale - controls.target.x, -controls.target.y, y * floorScale - controls.target.z)camera.zoom = zoom- camera.updateProjectionMatrix()controls.update()render()}@@ -156,41 +152,37 @@ root.querySelector<HTMLButtonElement>("#motion")!.onclick = () => {root.querySelector("#motion")!.setAttribute("aria-pressed", String(moving))}function zoomBy(amount: number) {- camera.zoom = THREE.MathUtils.clamp(camera.zoom * amount, controls.minZoom, controls.maxZoom)- camera.updateProjectionMatrix()+ camera.zoom = Math.min(controls.maxZoom, Math.max(controls.minZoom, camera.zoom * amount))controls.update()render()}function rotateBy(angle: number) {- const offset = camera.position.clone().sub(controls.target)- offset.applyAxisAngle(new THREE.Vector3(0, 1, 0), THREE.MathUtils.degToRad(angle))- camera.position.copy(controls.target).add(offset)+ const t = controls.target, x = camera.position.x - t.x, z = camera.position.z - t.z, a = radians(angle)+ camera.position.set(t.x + x * Math.cos(a) + z * Math.sin(a), camera.position.y, t.z - x * Math.sin(a) + z * Math.cos(a))controls.update()}function setTilt(angle: number) {- const spherical = new THREE.Spherical().setFromVector3(camera.position.clone().sub(controls.target))- spherical.phi = THREE.MathUtils.degToRad(90 - angle)- camera.position.copy(controls.target).add(new THREE.Vector3().setFromSpherical(spherical))+ const t = controls.target, x = camera.position.x - t.x, y = camera.position.y - t.y, z = camera.position.z - t.z+ const r = Math.hypot(x, y, z), theta = Math.atan2(x, z), phi = radians(90 - angle)+ camera.position.set(t.x + r * Math.sin(phi) * Math.sin(theta), t.y + r * Math.cos(phi), t.z + r * Math.sin(phi) * Math.cos(theta))controls.update()}function setMode(next: "pan" | "rotate") {mode = next- controls.mouseButtons.LEFT = mode === "pan" ? THREE.MOUSE.PAN : THREE.MOUSE.ROTATE- controls.touches.ONE = mode === "pan" ? THREE.TOUCH.PAN : THREE.TOUCH.ROTATE- controls.touches.TWO = mode === "pan" ? THREE.TOUCH.DOLLY_PAN : THREE.TOUCH.DOLLY_ROTATE+ controls.mouseButtons.left = mode === "pan" ? "pan" : "rotate"+ controls.touches.one = mode === "pan" ? "pan" : "rotate"+ controls.touches.two = mode === "pan" ? "zoom-pan" : "zoom-rotate"root.querySelector("#pan")!.setAttribute("aria-pressed", String(mode === "pan"))root.querySelector("#rotate")!.setAttribute("aria-pressed", String(mode === "rotate"))- renderer.domElement.style.cursor = mode === "pan" ? "grab" : "ew-resize"+ canvas.style.cursor = mode === "pan" ? "grab" : "ew-resize"}function panBy(right: number, forward: number) {- const direction = camera.getWorldDirection(new THREE.Vector3())- direction.y = 0- direction.normalize()- const side = new THREE.Vector3().crossVectors(direction, camera.up).normalize()- const delta = side.multiplyScalar(right).add(direction.multiplyScalar(forward))- controls.target.add(delta)- camera.position.add(delta)+ // Along the ground: the camera's forward (towards its target) and its right, level.+ const fx = controls.target.x - camera.position.x, fz = controls.target.z - camera.position.z, l = Math.hypot(fx, fz) || 1+ const dx = fx / l, dz = fz / l+ shift(-dz * right + dx * forward, 0, dx * right + dz * forward)controls.update()+ render()}root.querySelector<HTMLButtonElement>("#pan")!.onclick = () => setMode("pan")root.querySelector<HTMLButtonElement>("#rotate")!.onclick = () => setMode("rotate")@@ -200,21 +192,25 @@ root.querySelector<HTMLButtonElement>("#zoom-out")!.onclick = () => zoomBy(0.8)root.querySelector<HTMLButtonElement>("#turn-left")!.onclick = () => rotateBy(-45)root.querySelector<HTMLButtonElement>("#turn-right")!.onclick = () => rotateBy(45)tilt.oninput = () => setTilt(Number(tilt.value))-renderer.domElement.addEventListener("pointerdown", () => renderer.domElement.focus({ preventScroll: true }))+canvas.addEventListener("pointerdown", () => canvas.focus({ preventScroll: true }))const onKeyDown = (event: KeyboardEvent) => {if (event.target instanceof HTMLElement && event.target.closest("input,select,button,a")) returnconst amount = 45 / camera.zoomswitch (event.key.toLowerCase()) {case "a":+ case "arrowleft":panBy(-amount, 0)breakcase "d":+ case "arrowright":panBy(amount, 0)breakcase "w":+ case "arrowup":panBy(0, amount)breakcase "s":+ case "arrowdown":panBy(0, -amount)breakcase "q":@@ -239,28 +235,25 @@ const onKeyDown = (event: KeyboardEvent) => {event.preventDefault()}window.addEventListener("keydown", onKeyDown)-const raycaster = new THREE.Raycaster()-const ground = new THREE.Plane(new THREE.Vector3(0, 1, 0), 0)-renderer.domElement.addEventListener("dblclick", (event) => {- const rect = renderer.domElement.getBoundingClientRect()- raycaster.setFromCamera(- new THREE.Vector2(((event.clientX - rect.left) / rect.width) * 2 - 1, (-(event.clientY - rect.top) / rect.height) * 2 + 1),- camera- )- const point = raycaster.ray.intersectPlane(ground, new THREE.Vector3())+const ground = new Plane(new Vector3(0, 1, 0), 0)+canvas.addEventListener("dblclick", (event) => {+ const rect = canvas.getBoundingClientRect()+ const point = viewer.view.screenToWorld({ x: ((event.clientX - rect.left) / rect.width) * viewer.width, y: ((event.clientY - rect.top) / rect.height) * viewer.height }, ground)if (point) {- const delta = point.clone().sub(controls.target)- controls.target.copy(point)- camera.position.add(delta)+ shift(point.x - controls.target.x, point.y - controls.target.y, point.z - controls.target.z)controls.update()+ render()}})let previous = 0,elapsed = 0-renderer.setAnimationLoop((now) => {+let frameId = 0+const loop = (now: number) => {+ frameId = requestAnimationFrame(loop)if (!previous) previous = nowif (moving) elapsed += Math.min(0.05, (now - previous) / 1000)previous = now+ controls.update()if (!moving && draws > 0) returnfor (const actor of actors) {const t = (elapsed * 0.035 + actor.offset) % 1,@@ -271,13 +264,13 @@ renderer.setAnimationLoop((now) => {f.group.visible = i === phasef.group.position.set(x * floorScale, 0, 4 * floorScale)f.group.rotation.y = forward ? 0 : Math.PI- f.updateContours(camera)})}map.updateEffects(elapsed)effects.forEach(e=>e.updateEffects(elapsed))- renderer.render(scene, camera)-})+ render()+}+frameId = requestAnimationFrame(loop)const resizeObserver = new ResizeObserver(resize)resizeObserver.observe(viewport)reset()@@ -289,7 +282,10 @@ Object.assign(window, {reset,focusDistrict,focus,- capture: () => renderer.domElement.toDataURL("image/webp", 0.95),+ capture: () => {+ render()+ return canvas.toDataURL("image/webp", 0.95)+ },rotateBy,zoomBy,setTilt,@@ -304,12 +300,12 @@ Object.assign(window, {trees: testMap.trees,roadCells: testMap.roads,zoom: camera.zoom,- heading: THREE.MathUtils.radToDeg(controls.getAzimuthalAngle()),- elevation: 90 - THREE.MathUtils.radToDeg(controls.getPolarAngle()),- target: controls.target.toArray().map((value) => value / floorScale),+ heading: degrees(controls.azimuthAngle),+ elevation: 90 - degrees(controls.polarAngle),+ target: [controls.target.x, controls.target.y, controls.target.z].map((value) => value / floorScale),draws,- drawCalls: renderer.info.render.calls,- triangles: renderer.info.render.triangles,+ drawCalls: counter.calls,+ triangles: counter.triangles || [map, ...effects].reduce((n, m) => n + m.parts.reduce((k, p) => k + triangleCount(p.part.mesh), 0), 0),mode})}@@ -317,12 +313,12 @@ Object.assign(window, {if (import.meta.hot)import.meta.hot.dispose(() => {- renderer.setAnimationLoop(null)- controls.dispose()+ cancelAnimationFrame(frameId)+ controls.destroy()resizeObserver.disconnect()window.removeEventListener("keydown", onKeyDown)map.dispose()effects.forEach((model) => model.dispose())actors.forEach((actor) => actor.frames.forEach((frame) => frame.dispose()))- renderer.dispose()+ viewer.dispose()})diff --git a/src/labs/model-review/main.ts b/src/labs/model-review/main.tsindex 71164e0..c780a51 100644--- a/src/labs/model-review/main.ts+++ b/src/labs/model-review/main.ts@@ -1,8 +1,9 @@-import * as THREE from "three"import { assetById } from "../../render/pixi3d/assets/assets.ts"import { buildAsset, exportAsset } from "../../render/pixi3d/assets/renderer.ts"import { kindIds } from "../../game/content/index.ts"import { ruralIds } from "../../render/pixi3d/assets/rural.ts"+import type { Vec3 } from "../../render/pixi3d/mesh/vec3.ts"+import { aim, frame as fit, labViewer, toward } from "../viewer.ts"import "./style.css"import "./handoff.css"@@ -40,38 +41,40 @@ root.innerHTML = `<header><a href="/">Inkline Town</a><span>TOWN MODEL REVIEW</s<nav aria-label="Model collections"></nav><section class="camera"><label>Turn the models <input aria-label="Model rotation" type="range" min="-180" max="180" value="0"><output>0°</output></label><button id="rear">See the back</button><button id="reset">Reset view</button><button id="sheet">Save model sheet</button><a id="sheet-link" hidden download>Download sheet ↗</a><label>View <select aria-label="View elevation"><option value="30">Street angle</option><option value="50">From above</option><option value="15">Near the ground</option></select></label></section><section class="grid" aria-label="3D models"></section><footer><a href="/proportion-review.html">Before / after proportions ↗</a> · <a href="/park-lab.html">Built park & running water ↗</a> · <a href="/effects-lab.html">Animated house effects ↗</a> · Drag a model to turn the collection · <a href="/asset-lab.html">Full asset catalogue ↗</a> · <a href="/">Play this town ↗</a></footer>`const nav = root.querySelector("nav")!, grid = root.querySelector<HTMLElement>(".grid")!, rotation = root.querySelector<HTMLInputElement>("input")!, elevation = root.querySelector<HTMLSelectElement>("select")!-const renderer = new THREE.WebGLRenderer({ alpha: true, antialias: true, preserveDrawingBuffer: true })-renderer.setPixelRatio(Math.min(devicePixelRatio, 2)); renderer.outputColorSpace = THREE.SRGBColorSpace-renderer.setClearColor(0xf0f2ec, 0); renderer.setScissorTest(true)-renderer.domElement.className = "models"; document.body.append(renderer.domElement)+// One canvas over the page; each card's picture is its model alone, drawn into the card's rectangle.+const viewer = await labViewer(document.body, { width: innerWidth, height: innerHeight, className: "models" }), camera = viewer.cameralet family: Family = "buildings", yaw = 0, pitch = 30, renders = 0let sheetUrl = ""-let models: Array<{ scene: THREE.Scene; camera: THREE.OrthographicCamera; built: ReturnType<typeof buildAsset>; view: HTMLElement; center: THREE.Vector3; size: THREE.Vector3 }> = []+let models: Array<{ built: ReturnType<typeof buildAsset>; view: HTMLElement; center: Vec3; size: Vec3 }> = []+const boxOf = ([min, max]: readonly [Vec3, Vec3]) => ({ center: [(min[0] + max[0]) / 2, (min[1] + max[1]) / 2, (min[2] + max[2]) / 2] as Vec3, size: [max[0] - min[0], max[1] - min[1], max[2] - min[2]] as Vec3 })+/** Shows `model` alone and aims the camera at it for a picture `width` × `height`. */+function place(model: (typeof models)[number], width: number, height: number) {+ for (const m of models) m.built.group.visible = m === model+ const heading = (45 + yaw) * Math.PI / 180, angle = pitch * Math.PI / 180+ aim(camera, model.center, toward(heading, angle), 1000)+ fit(camera, viewHeight(model.size, heading, angle, width / height) / 2, width, height)+ model.built.updateEffects(performance.now() / 1000)+}// Include both the tower height and the ground plane projected into the view.// Taking only the larger dimension clips the mill's foreground at street angle.-function viewHeight(size: THREE.Vector3, heading: number, angle: number, aspect: number) {- const width = Math.abs(Math.cos(heading)) * size.x + Math.abs(Math.sin(heading)) * size.z- const depth = Math.abs(Math.sin(heading)) * size.x + Math.abs(Math.cos(heading)) * size.z- const height = Math.abs(Math.cos(angle)) * size.y + Math.abs(Math.sin(angle)) * depth+function viewHeight(size: Vec3, heading: number, angle: number, aspect: number) {+ const width = Math.abs(Math.cos(heading)) * size[0] + Math.abs(Math.sin(heading)) * size[2]+ const depth = Math.abs(Math.sin(heading)) * size[0] + Math.abs(Math.cos(heading)) * size[2]+ const height = Math.abs(Math.cos(angle)) * size[1] + Math.abs(Math.sin(angle)) * depthreturn Math.max(height, width / aspect, 18) * 1.12}function render() {- renderer.setSize(innerWidth, innerHeight, false)- renderer.setScissorTest(false); renderer.clear(); renderer.setScissorTest(true)+ viewer.resize(innerWidth, innerHeight)+ let first = truefor (const model of models) {const r = model.view.getBoundingClientRect()if (r.bottom <= 0 || r.top >= innerHeight) continue- const heading = (45 + yaw) * Math.PI / 180, angle = pitch * Math.PI / 180,- vertical = viewHeight(model.size, heading, angle, r.width / r.height), camera = model.camera- camera.top = vertical / 2; camera.bottom = -camera.top; camera.left = -vertical * r.width / r.height / 2; camera.right = -camera.left- camera.position.copy(model.center).add(new THREE.Vector3(Math.sin(heading) * Math.cos(angle), Math.sin(angle), Math.cos(heading) * Math.cos(angle)).multiplyScalar(1000))- camera.lookAt(model.center); camera.updateProjectionMatrix(); camera.updateMatrixWorld()- model.built.updateContours(camera)- model.built.updateEffects(performance.now()/1000)- renderer.setViewport(r.left, innerHeight - r.bottom, r.width, r.height)- renderer.setScissor(Math.max(0, r.left), Math.max(0, innerHeight - r.bottom), Math.min(innerWidth, r.right) - Math.max(0, r.left), Math.min(innerHeight, r.bottom) - Math.max(0, r.top))- renderer.render(model.scene, camera)+ place(model, r.width, r.height)+ camera.viewport.set(r.left / innerWidth, r.top / innerHeight, r.width / innerWidth, r.height / innerHeight)+ viewer.app.renderer.render({ container: viewer.view, clear: first }); first = false}+ if (first) { for (const m of models) m.built.group.visible = false; viewer.app.renderer.render({ container: viewer.view, clear: true }) }+ camera.viewport.set(0, 0, 1, 1)root.querySelector("output")!.textContent = `${Math.round(yaw)}°`; rotation.value = String(yaw); renders++}function select(next: Family) {@@ -90,19 +93,18 @@ function select(next: Family) {const card = document.createElement("article")card.innerHTML = `<div class="card-top"><span>${String(i + 1).padStart(2, "0")}</span><a href="/asset-lab.html?asset=${id}">Inspect ↗</a></div><div class="model-view" role="img" aria-label="${asset.title} 3D model"></div><div class="caption"><h2>${asset.title}</h2><p>${asset.note}</p><button class="export">Download GLB</button></div>`grid.append(card)- const built = buildAsset(asset, {batchFaces: true}), scene = new THREE.Scene(), camera = new THREE.OrthographicCamera(-100, 100, 100, -100, 0.1, 4000)- scene.add(built.group); scene.updateMatrixWorld(true)- const bounds = new THREE.Box3().setFromObject(built.group)- models.push({built, scene, camera, view: card.querySelector<HTMLElement>(".model-view")!, center: bounds.getCenter(new THREE.Vector3()), size: bounds.getSize(new THREE.Vector3())})+ const built = buildAsset(asset, {batchFaces: true})+ viewer.view.root.addChild(built.group)+ models.push({built, view: card.querySelector<HTMLElement>(".model-view")!, ...boxOf(built.bounds)})card.querySelector<HTMLButtonElement>(".export")!.onclick = async () => {const url = URL.createObjectURL(new Blob([await exportAsset(asset)], {type: "model/gltf-binary"})), a = document.createElement("a")a.href = url; a.download = `inkline-${id}.glb`; a.click(); setTimeout(() => URL.revokeObjectURL(url), 1000)}}if (family === "milestones") {- const bounds = new THREE.Box3()- for (const model of models) bounds.union(new THREE.Box3().setFromObject(model.built.group))- for (const model of models) { bounds.getCenter(model.center); bounds.getSize(model.size) }+ const min: Vec3 = [0, 1, 2].map(k => Math.min(...models.map(m => m.built.bounds[0][k]!))) as [number, number, number]+ const max: Vec3 = [0, 1, 2].map(k => Math.max(...models.map(m => m.built.bounds[1][k]!))) as [number, number, number]+ for (const model of models) Object.assign(model, boxOf([min, max]))}nav.querySelectorAll("button").forEach(b => { b.setAttribute("aria-pressed", String(b.dataset.family === next)) })history.replaceState(null, "", `?collection=${next}`); render()@@ -120,17 +122,10 @@ root.querySelector<HTMLButtonElement>("#sheet")!.onclick = () => {ctx.fillStyle = "#f0f2ec"; ctx.fillRect(0, 0, canvas.width, canvas.height)ctx.fillStyle = "#3d4943"; ctx.font = "30px Georgia"; ctx.fillText(`Inkline Town / ${families[family].title}`, 30, 48)ctx.font = "13px monospace"; ctx.fillText(`Inkline Town · ${Math.round(yaw)}° rotation · ${pitch}° elevation`, 30, 76)- renderer.setSize(width, 270, false); renderer.setScissorTest(false)models.forEach((model, i) => {- const camera = model.camera, heading = (45 + yaw) * Math.PI / 180, angle = pitch * Math.PI / 180,- vertical = viewHeight(model.size, heading, angle, width / 270)- camera.top = vertical / 2; camera.bottom = -camera.top; camera.left = -vertical * width / 270 / 2; camera.right = -camera.left- camera.position.copy(model.center).add(new THREE.Vector3(Math.sin(heading) * Math.cos(angle), Math.sin(angle), Math.cos(heading) * Math.cos(angle)).multiplyScalar(1000))- camera.lookAt(model.center); camera.updateProjectionMatrix(); camera.updateMatrixWorld(); model.built.updateContours(camera)- model.built.updateEffects(performance.now()/1000)- renderer.setViewport(0, 0, width, 270); renderer.render(model.scene, camera)+ place(model, width, 270)const x = (i % columns) * width, y = 100 + Math.floor(i / columns) * height- ctx.drawImage(renderer.domElement, x, y, width, 270)+ ctx.drawImage(viewer.snapshot(width, 270, Math.min(devicePixelRatio, 2), null), x, y, width, 270)ctx.fillStyle = "#3d4943"; ctx.font = "21px Georgia"; ctx.fillText(assetById.get(families[family].ids[i]!)!.title, x + 24, y + 305)ctx.strokeStyle = "#cbd1c5"; ctx.strokeRect(x + 12, y + 8, width - 24, height - 20)})@@ -156,4 +151,4 @@ let effectFrame=0const animateEffects=()=>{if(families[family].ids.some(id=>assetById.get(id)?.smokeEffect||assetById.get(id)?.fountains?.length))render();effectFrame=requestAnimationFrame(animateEffects)}effectFrame=requestAnimationFrame(animateEffects)Object.assign(window, { townModelReview: { stats: () => ({ family, models: models.length, renders, yaw, pitch }) } })-if (import.meta.hot) import.meta.hot.dispose(() => { cancelAnimationFrame(effectFrame);models.forEach(m => m.built.dispose()); renderer.dispose(); renderer.domElement.remove(); removeEventListener("scroll", schedule); removeEventListener("resize", schedule) })+if (import.meta.hot) import.meta.hot.dispose(() => { cancelAnimationFrame(effectFrame);models.forEach(m => m.built.dispose()); viewer.dispose(); removeEventListener("scroll", schedule); removeEventListener("resize", schedule) })diff --git a/src/labs/model-review/proportions.ts b/src/labs/model-review/proportions.tsindex 287439e..03c150a 100644--- a/src/labs/model-review/proportions.ts+++ b/src/labs/model-review/proportions.ts@@ -1,5 +1,7 @@-import * as THREE from "three"+import { Container3D } from "@pixi/3d"import { buildAsset, vertex3 } from "../../render/pixi3d/assets/renderer.ts"+import { add, type Vec3 } from "../../render/pixi3d/mesh/vec3.ts"+import { aim, frame, labViewer, toward } from "../viewer.ts"import type { InkAsset } from "../../render/pixi3d/assets/primitives.ts"import { proportionModels, architectureIds } from "./proportion-models.ts"import { parkReviewModels } from "./park-models.ts"@@ -66,7 +68,6 @@ const notes: Record<string,string> = {const root=document.querySelector<HTMLElement>("#proportions")!root.innerHTML=`<header><div><div class="eyebrow">INKLINE TOWN / PROPORTION STUDY</div><h1>One town. One human scale.</h1><p>Every building and upgrade, plus shared furnishings and construction. The walker is unchanged. Both sides always use the same camera, ground position and zoom.</p></div><div><a href="/model-review.html?collection=handoff">Model catalogue ↗</a><p class="status" id="status">Loading the approved originals…</p></div></header><div class="layout"><aside><input aria-label="Find a model" type="search" placeholder="Find a model…"><select aria-label="Model group"><option value="all">All models</option><option value="architecture">Buildings & homes</option><option value="props">Props & construction</option></select><select aria-label="Choose model"></select><nav aria-label="All comparison models"></nav></aside><section><div class="row"><button id="previous" aria-label="Previous model">←</button><h2></h2><button id="next" aria-label="Next model">→</button></div><p class="meta" id="note"></p><div class="controls"><label>Turn <input aria-label="Model rotation" type="range" min="-180" max="180" value="0"><output>0°</output></label><label>Elevation <select aria-label="View elevation"><option value="30">Game angle</option><option value="0">Eye level</option><option value="50">From above</option></select></label><label>Zoom <input aria-label="Zoom" type="range" min=".7" max="2" step=".1" value="1"></label><label><input type="checkbox" id="town-scale"> One scale across all models</label><button id="reset">Reset view</button><button id="save">Save comparison</button></div><div class="view"><div class="captions"><span>Before · approved</span><span>After · revised</span></div><div class="divider"></div></div><div class="footer"><span id="dimensions"></span><br>Drag to turn both views together. Arrow buttons move through every model. Switch on one town scale to compare building sizes across the catalogue.<br>Before geometry is frozen at <code>a2845b4</code>. Changes are model geometry, not camera scaling.</div></section></div>`-const renderer=new THREE.WebGLRenderer({antialias:true,preserveDrawingBuffer:true})if(parksMode){document.title="Inkline Town · Park before / after"root.querySelector(".eyebrow")!.textContent="INKLINE TOWN / PARK STUDY"@@ -77,48 +78,51 @@ if(parksMode){root.querySelector(".footer code")!.textContent="f4df9d5"root.querySelector(".footer")!.lastChild!.textContent=". Changes are native model geometry."}-renderer.setPixelRatio(Math.min(devicePixelRatio,2));renderer.setClearColor(0xf0f2ec);renderer.setScissorTest(true)-const view=root.querySelector<HTMLElement>(".view")!;view.append(renderer.domElement)-const camera=new THREE.OrthographicCamera(-100,100,100,-100,.1,4000)+const view=root.querySelector<HTMLElement>(".view")!+const viewer=await labViewer(view,{width:view.clientWidth||1,height:view.clientHeight||1,background:0xf0f2ec}),camera=viewer.camera,canvas=viewer.canvasconst search=root.querySelector<HTMLInputElement>("input[type=search]")!,group=root.querySelector<HTMLSelectElement>("select[aria-label='Model group']")!,picker=root.querySelector<HTMLSelectElement>("select[aria-label='Choose model']")!,nav=root.querySelector<HTMLElement>("nav")!const rotation=root.querySelector<HTMLInputElement>("input[aria-label='Model rotation']")!,elevation=root.querySelector<HTMLSelectElement>("select[aria-label='View elevation']")!,zoom=root.querySelector<HTMLInputElement>("input[aria-label='Zoom']")!,townScale=root.querySelector<HTMLInputElement>("#town-scale")!-const geometryBounds=(a:InkAsset)=>new THREE.Box3().setFromPoints([...a.faces,...a.strokes].flatMap(f=>f.points.map(vertex3)))+type Box=[Vec3,Vec3]+const empty=():Box=>[[Infinity,Infinity,Infinity],[-Infinity,-Infinity,-Infinity]]+const expand=(box:Box,p:Vec3):Box=>[[Math.min(box[0][0],p[0]),Math.min(box[0][1],p[1]),Math.min(box[0][2],p[2])],[Math.max(box[1][0],p[0]),Math.max(box[1][1],p[1]),Math.max(box[1][2],p[2])]]+const geometryBounds=(a:InkAsset,at:Vec3=[0,0,0])=>[...a.faces,...a.strokes].flatMap(f=>f.points.map(p=>add(vertex3(p),at))).reduce(expand,empty())let before:Baseline,after=parksMode?parkReviewModels():proportionModels(),filtered=after,selected=0,yaw=0,pitch=30,drag:number|null=null-let pair:Array<{scene:THREE.Scene;built:ReturnType<typeof buildAsset>;person:ReturnType<typeof buildAsset>}>=[],bounds=new THREE.Box3()+let pair:Array<{scene:Container3D;built:ReturnType<typeof buildAsset>;person:ReturnType<typeof buildAsset>}>=[],bounds=empty()const clean=(a:InkAsset):InkAsset=>{const {smokeEffect,effects,...geometry}=a;if(!parksMode)delete geometry.fountains;return geometry}function render(){if(!pair.length)returnconst {width,height}=view.getBoundingClientRect(),w=width/2- renderer.setSize(width,height,false)+ viewer.resize(width,height)const heading=(45+yaw)*Math.PI/180,angle=pitch*Math.PI/180- const box=townScale.checked?(parksMode?new THREE.Box3(new THREE.Vector3(-180,-1,-180),new THREE.Vector3(180,70,180)):new THREE.Box3(new THREE.Vector3(-85,-1,-75),new THREE.Vector3(85,170,85))):bounds- const center=box.getCenter(new THREE.Vector3()),size=box.getSize(new THREE.Vector3())- const horizontal=Math.abs(Math.cos(heading))*size.x+Math.abs(Math.sin(heading))*size.z- const vertical=Math.cos(angle)*size.y+Math.abs(Math.sin(angle))*(Math.abs(Math.sin(heading))*size.x+Math.abs(Math.cos(heading))*size.z)+ const box:Box=townScale.checked?(parksMode?[[-180,-1,-180],[180,70,180]]:[[-85,-1,-75],[85,170,85]]):bounds+ const center:Vec3=[(box[0][0]+box[1][0])/2,(box[0][1]+box[1][1])/2,(box[0][2]+box[1][2])/2],size:Vec3=[box[1][0]-box[0][0],box[1][1]-box[0][1],box[1][2]-box[0][2]]+ const horizontal=Math.abs(Math.cos(heading))*size[0]+Math.abs(Math.sin(heading))*size[2]+ const vertical=Math.cos(angle)*size[1]+Math.abs(Math.sin(angle))*(Math.abs(Math.sin(heading))*size[0]+Math.abs(Math.cos(heading))*size[2])const extent=Math.max(vertical,horizontal/(w/height))*1.18/Number(zoom.value)- camera.top=extent/2;camera.bottom=-extent/2;camera.left=-extent*w/height/2;camera.right=-camera.left- camera.position.copy(center).add(new THREE.Vector3(Math.sin(heading)*Math.cos(angle),Math.sin(angle),Math.cos(heading)*Math.cos(angle)).multiplyScalar(1000))- camera.lookAt(center);camera.updateProjectionMatrix();camera.updateMatrixWorld()+ aim(camera,center,toward(heading,angle),1000)+ frame(camera,extent/2,w,height)pair.forEach(({scene,built,person},i)=>{- renderer.setViewport(i*w,0,w,height);renderer.setScissor(i*w,0,w,height)- for(const b of [built,person]){b.updateContours(camera);b.updateEffects(1.2)}- renderer.render(scene,camera)+ pair.forEach((p,j)=>{p.scene.visible=i===j})+ for(const b of [built,person])b.updateEffects(1.2)+ camera.viewport.set(i/2,0,1/2,1)+ viewer.app.renderer.render({container:viewer.view,clear:i===0})})+ camera.viewport.set(0,0,1,1)root.querySelector("output")!.textContent=`${yaw}°`}function select(id:string){const a=after.find(m=>m.id===id)!,b=before.models.find(m=>m.id===id)!if(!a||!b)returnselected=filtered.findIndex(m=>m.id===id)- pair.forEach(p=>{p.built.dispose();p.person.dispose()});pair=[];bounds=new THREE.Box3()+ pair.forEach(p=>{p.built.dispose();p.person.dispose();p.scene.destroy()});pair=[];bounds=empty()const half=Math.max(a.footprint??1,b.footprint??1)/2*32*Math.SQRT2- const personPosition=new THREE.Vector3(-half-6,0,half+3)+ const personPosition:Vec3=[-half-6,0,half+3]for(const asset of [b,a]){- const built=buildAsset(clean(asset),{batchFaces:true}),person=buildAsset(before.walker,{batchFaces:true}),scene=new THREE.Scene()- person.group.position.copy(personPosition);scene.add(built.group,person.group)- bounds.union(geometryBounds(asset));bounds.union(geometryBounds(before.walker).translate(personPosition))- for(const f of parksMode?asset.fountains??[]:[])bounds.expandByPoint(vertex3([f.origin[0],f.origin[1],f.origin[2]+f.nozzle+7]))+ const built=buildAsset(clean(asset),{batchFaces:true}),person=buildAsset(before.walker,{batchFaces:true}),scene=new Container3D()+ person.group.position.set(...personPosition);scene.addChild(built.group,person.group);viewer.view.root.addChild(scene)+ for(const box of [geometryBounds(asset),geometryBounds(before.walker,personPosition)])bounds=expand(expand(bounds,box[0]),box[1])+ for(const f of parksMode?asset.fountains??[]:[])bounds=expand(bounds,vertex3([f.origin[0],f.origin[1],f.origin[2]+f.nozzle+7]))pair.push({scene,built,person})}root.querySelector("h2")!.textContent=a.title@@ -141,8 +145,8 @@ function filter(){picker.disabled=!filtered.lengthif(filtered.length)select(filtered[0]!.id)else{- pair.forEach(p=>{p.built.dispose();p.person.dispose()});pair=[]- renderer.setScissorTest(false);renderer.clear();renderer.setScissorTest(true)+ pair.forEach(p=>{p.built.dispose();p.person.dispose();p.scene.destroy()});pair=[]+ viewer.render()root.querySelector("h2")!.textContent="No matching models"root.querySelector("#note")!.textContent="Try a different name or model group."root.querySelector("#dimensions")!.textContent=""@@ -153,10 +157,10 @@ search.oninput=filter;group.onchange=filter;picker.onchange=()=>select(picker.varoot.querySelector<HTMLButtonElement>("#previous")!.onclick=()=>select(filtered[(selected-1+filtered.length)%filtered.length]!.id)root.querySelector<HTMLButtonElement>("#next")!.onclick=()=>select(filtered[(selected+1)%filtered.length]!.id)root.querySelector<HTMLButtonElement>("#reset")!.onclick=()=>{yaw=0;pitch=30;rotation.value="0";elevation.value="30";zoom.value="1";townScale.checked=false;render()}-root.querySelector<HTMLButtonElement>("#save")!.onclick=()=>{const a=document.createElement("a");a.download=`inkline-${picker.value}-before-after.png`;a.href=renderer.domElement.toDataURL();a.click()}-renderer.domElement.onpointerdown=e=>{drag=e.clientX;renderer.domElement.setPointerCapture(e.pointerId)}-renderer.domElement.onpointermove=e=>{if(drag===null)return;yaw=Math.max(-180,Math.min(180,Math.round(yaw+(e.clientX-drag)*.5)));drag=e.clientX;rotation.value=String(yaw);render()}-renderer.domElement.onpointerup=()=>drag=null+root.querySelector<HTMLButtonElement>("#save")!.onclick=()=>{const a=document.createElement("a");a.download=`inkline-${picker.value}-before-after.png`;render();a.href=canvas.toDataURL();a.click()}+canvas.onpointerdown=e=>{drag=e.clientX;canvas.setPointerCapture(e.pointerId)}+canvas.onpointermove=e=>{if(drag===null)return;yaw=Math.max(-180,Math.min(180,Math.round(yaw+(e.clientX-drag)*.5)));drag=e.clientX;rotation.value=String(yaw);render()}+canvas.onpointerup=()=>drag=nullnew ResizeObserver(render).observe(view)async function start(){const requested=new URLSearchParams(location.search).get("model")@@ -169,6 +173,6 @@ async function start(){if(before.models.length!==after.length||after.some(a=>!before.models.some(b=>b.id===a.id)))throw new Error("Comparison catalogue does not match the frozen baseline")filter();if(requested&&after.some(a=>a.id===requested))select(requested)root.querySelector("#status")!.textContent=parksMode?"12 park comparisons · unchanged walker":`${architectureIds.length} building appearances · ${after.length-architectureIds.length} shared examples`- Object.assign(window,{proportionReview:{ids:after.map(a=>a.id),select,render,capture:()=>renderer.domElement.toDataURL(),stats:()=>({id:picker.value,before:before.revision,yaw,pitch,pairs:pair.length})}})+ Object.assign(window,{proportionReview:{ids:after.map(a=>a.id),select,render,capture:()=>{render();return canvas.toDataURL()},stats:()=>({id:picker.value,before:before.revision,yaw,pitch,pairs:pair.length})}})}start().catch(error=>{root.querySelector("#status")!.textContent=String(error);root.querySelector("#status")!.classList.add("error");console.error(error)})diff --git a/src/labs/park-lab/main.ts b/src/labs/park-lab/main.tsindex 490679d..37b0ca1 100644--- a/src/labs/park-lab/main.ts+++ b/src/labs/park-lab/main.ts@@ -1,32 +1,30 @@-import * as THREE from "three"import { assetById } from "../../render/pixi3d/assets/assets.ts"import { buildAsset, type BuiltAsset } from "../../render/pixi3d/assets/renderer.ts"+import { triangleCount } from "../../render/pixi3d/mesh/geometry.ts"import { builtPark, parkCells, parkSummary } from "./park.ts"+import { aim, frame, labViewer, seen, toward } from "../viewer.ts"+import type { Vec3 } from "../../render/pixi3d/mesh/vec3.ts"import "./style.css"const assets={park:builtPark(),fountain:assetById.get("park-fountain")!,statue:assetById.get("park-statue")!}type View=keyof typeof assetsconst root=document.querySelector<HTMLElement>("#park-lab")!root.innerHTML=`<header><a href="/model-review.html?collection=ornaments">Inkline Town · Parks</a><a href="/proportion-review.html?collection=parks&model=park-built">Before / after ↗</a></header><section class="intro"><h1>A park, piece by piece.</h1><p>Lawn, flower beds and walks connect two street entrances. Carved stone, framed lanterns and iron-and-timber seating give the park its character.</p></section><nav aria-label="Park review views"><button data-view="park" aria-pressed="true">Built park</button><button data-view="fountain" aria-pressed="false">Fountain close-up</button><button data-view="statue" aria-pressed="false">Statue close-up</button></nav><section class="controls"><label>Turn <input aria-label="Park rotation" type="range" min="-180" max="180" value="0"><output>0°</output></label><label>View <select aria-label="Park elevation"><option value="30">Street angle</option><option value="55">From above</option><option value="15">Near the ground</option></select></label><button id="rear">See the back</button><button id="pause">Pause water</button><button id="reset">Reset view</button></section><section class="stage" aria-label="Rendered park"></section><footer><div><h2 id="title"></h2><p id="note"></p></div><span id="summary">25 park cells · 2 entrances · 3 lamps</span></footer>`-const stage=root.querySelector<HTMLElement>(".stage")!,renderer=new THREE.WebGLRenderer({alpha:true,antialias:true,preserveDrawingBuffer:true}),scene=new THREE.Scene(),camera=new THREE.OrthographicCamera(-100,100,100,-100,0.1,4000)-renderer.setPixelRatio(Math.min(devicePixelRatio,2));renderer.setClearColor(0xf0f2ec,0);renderer.outputColorSpace=THREE.SRGBColorSpace;stage.append(renderer.domElement)-let view:View="park",yaw=0,pitch=30,time=0,paused=false,last=0,frames=0,built:BuiltAsset|null=null,bounds=new THREE.Box3()-function aim(width:number,height:number){- const target=bounds.getCenter(new THREE.Vector3()),heading=(45+yaw)*Math.PI/180,altitude=pitch*Math.PI/180- camera.position.copy(target).add(new THREE.Vector3(Math.sin(heading)*Math.cos(altitude),Math.sin(altitude),Math.cos(heading)*Math.cos(altitude)).multiplyScalar(1000));camera.lookAt(target);camera.updateMatrixWorld(true)+const stage=root.querySelector<HTMLElement>(".stage")!+const viewer=await labViewer(stage,{width:stage.clientWidth,height:stage.clientHeight}),camera=viewer.camera+let view:View="park",yaw=0,pitch=30,time=0,paused=false,frames=0,built:BuiltAsset|null=null,frameId=0+function place(width:number,height:number){+ const [min,max]=built!.bounds,target:Vec3=[(min[0]+max[0])/2,(min[1]+max[1])/2,(min[2]+max[2])/2]+ const eye=aim(camera,target,toward((45+yaw)*Math.PI/180,pitch*Math.PI/180),1000)let x=1,y=1- for(const u of [bounds.min.x,bounds.max.x])for(const v of [bounds.min.y,bounds.max.y])for(const z of [bounds.min.z,bounds.max.z]){- const p=new THREE.Vector3(u,v,z).applyMatrix4(camera.matrixWorldInverse);x=Math.max(x,Math.abs(p.x));y=Math.max(y,Math.abs(p.y))- }- const half=Math.max(y,x*height/width)*1.12- camera.top=half;camera.bottom=-half;camera.left=-half*width/height;camera.right=-camera.left;camera.updateProjectionMatrix()- built!.updateContours(camera)+ for(const [u,v] of seen(eye,target,built!.bounds)){x=Math.max(x,Math.abs(u));y=Math.max(y,Math.abs(v))}+ frame(camera,Math.max(y,x*height/width)*1.12,width,height)}function draw(width=stage.clientWidth,height=stage.clientHeight){- renderer.setSize(width,height,false);aim(width,height);built!.updateEffects(time);renderer.render(scene,camera);frames+++ viewer.resize(width,height);place(width,height);built!.updateEffects(time);viewer.render();frames++}function select(next:View){- built?.group.removeFromParent();built?.dispose();view=next;built=buildAsset(assets[view],{batchFaces:true});scene.add(built.group);bounds=new THREE.Box3().setFromObject(built.group)+ built?.dispose();view=next;built=buildAsset(assets[view],{batchFaces:true});viewer.view.root.addChild(built.group)root.querySelectorAll<HTMLButtonElement>("nav button").forEach(b=>b.setAttribute("aria-pressed",String(b.dataset.view===view)))root.querySelector("#title")!.textContent=view==="park"?"Twenty-five cells, one park":view==="fountain"?"Running water":"A founder in stone"root.querySelector("#note")!.textContent=view==="park"?assets.park.note:view==="fountain"?"Water rises above a carved upper bowl, falls into the moulded basin and makes soft ripples.":"A quiet stone bust: broad shoulders, a plain head and a stepped pedestal."@@ -34,7 +32,7 @@ function select(next:View){history.replaceState(null,"",`?view=${view}`)}function capture(t=time,width=960,height=700){- time=t;renderer.setPixelRatio(1);renderer.setClearAlpha(1);draw(width,height);const image=renderer.domElement.toDataURL();renderer.setClearAlpha(0);renderer.setPixelRatio(Math.min(devicePixelRatio,2));draw();return image+ time=t;place(width,height);built!.updateEffects(time);const image=viewer.snapshot(width,height,1,0xf0f2ec).toDataURL();draw();return image}root.querySelectorAll<HTMLButtonElement>("nav button").forEach(b=>b.onclick=()=>select(b.dataset.view as View))root.querySelector<HTMLInputElement>("input")!.oninput=e=>{yaw=Number((e.target as HTMLInputElement).value);root.querySelector("output")!.textContent=`${yaw}°`;draw()}@@ -48,6 +46,8 @@ stage.onpointermove=e=>{if(drag){yaw=((drag.yaw+(e.clientX-drag.x)*0.4+540)%360)stage.onpointerup=stage.onpointercancel=()=>{drag=null}const initial=new URLSearchParams(location.search).get("view")select(initial&&Object.hasOwn(assets,initial)?initial as View:"park")-renderer.setAnimationLoop(now=>{if(!paused&&last)time+=Math.min((now-last)/1000,0.1);last=now;draw()})-Object.assign(window,{parkLab:{capture,pause:()=>{paused=true},stats:()=>({view,yaw,pitch,time,frames,fountains:assets[view].fountains?.length??0,parkCells:parkCells.length,entrances:parkSummary.entrances,triangles:renderer.info.render.triangles})}})-if(import.meta.hot)import.meta.hot.dispose(()=>{renderer.setAnimationLoop(null);built?.dispose();renderer.dispose()})+let last=0+const loop=(now:number)=>{if(!paused&&last)time+=Math.min((now-last)/1000,0.1);last=now;draw();frameId=requestAnimationFrame(loop)}+frameId=requestAnimationFrame(loop)+Object.assign(window,{parkLab:{capture,pause:()=>{paused=true},stats:()=>({view,yaw,pitch,time,frames,fountains:assets[view].fountains?.length??0,parkCells:parkCells.length,entrances:parkSummary.entrances,triangles:built?.parts.reduce((n,p)=>n+triangleCount(p.part.mesh),0)??0})}})+if(import.meta.hot)import.meta.hot.dispose(()=>{cancelAnimationFrame(frameId);built?.dispose();viewer.dispose()})diff --git a/src/labs/service-study/main.ts b/src/labs/service-study/main.tsindex ce13d07..1f9af3b 100644--- a/src/labs/service-study/main.ts+++ b/src/labs/service-study/main.ts@@ -1,6 +1,7 @@-import * as THREE from "three"import { assetById } from "../../render/pixi3d/assets/assets.ts"import { buildAsset, exportAsset, floorScale, vertex3 } from "../../render/pixi3d/assets/renderer.ts"+import { triangleCount } from "../../render/pixi3d/mesh/geometry.ts"+import { aim, frame, labViewer } from "../viewer.ts"import "./style.css"const root = document.querySelector<HTMLElement>("#service-study")!@@ -31,23 +32,17 @@ function card(id: string, tier: string, title: string, note: string) {let yaw = 0, pitch = 30, zoom = 1, street = falseconst heading = root.querySelector<HTMLInputElement>("#heading")!const tilt = root.querySelector<HTMLInputElement>("#tilt")!-const views = [...root.querySelectorAll<HTMLElement>("[data-model]")].map(view => {+const wrap = (degrees: number) => ((((degrees + 180) % 360) + 360) % 360) - 180+const views = await Promise.all([...root.querySelectorAll<HTMLElement>("[data-model]")].map(async view => {const asset = assetById.get(view.dataset.model!)!- const renderer = new THREE.WebGLRenderer({ antialias: true, alpha: true, preserveDrawingBuffer: true })- renderer.setPixelRatio(Math.min(devicePixelRatio, 2))- renderer.outputColorSpace = THREE.SRGBColorSpace- renderer.toneMapping = THREE.NoToneMapping- renderer.setClearColor(0xf0f2ec, 0)- view.append(renderer.domElement)+ const viewer = await labViewer(view, { width: view.clientWidth || 1, height: view.clientHeight || 1 })const model = buildAsset(asset, { batchFaces: true })- const scene = new THREE.Scene()- scene.add(model.group)- const camera = new THREE.OrthographicCamera(-130, 130, 130, -130, 0.1, 4000)+ viewer.view.root.addChild(model.group)let drag: { x: number; y: number } | null = nullview.onpointerdown = e => { drag = { x: e.clientX, y: e.clientY }; view.setPointerCapture(e.pointerId) }view.onpointermove = e => {if (!drag) return- yaw = THREE.MathUtils.euclideanModulo(yaw + (e.clientX - drag.x) * 0.6 + 180, 360) - 180+ yaw = wrap(yaw + (e.clientX - drag.x) * 0.6)pitch = Math.max(15, Math.min(65, pitch + (e.clientY - drag.y) * 0.25))drag = { x: e.clientX, y: e.clientY }render()@@ -62,36 +57,28 @@ const views = [...root.querySelectorAll<HTMLElement>("[data-model]")].map(view =if (!["ArrowLeft", "ArrowRight", "ArrowUp", "ArrowDown", "Home"].includes(e.key)) returne.preventDefault()if (e.key === "Home") { yaw = 0; pitch = 30; zoom = 1 }- else if (e.key === "ArrowLeft" || e.key === "ArrowRight") yaw = THREE.MathUtils.euclideanModulo(yaw + (e.key === "ArrowLeft" ? -15 : 15) + 180, 360) - 180+ else if (e.key === "ArrowLeft" || e.key === "ArrowRight") yaw = wrap(yaw + (e.key === "ArrowLeft" ? -15 : 15))else pitch = Math.max(15, Math.min(65, pitch + (e.key === "ArrowUp" ? 5 : -5)))render()}- return { id: asset.id, view, renderer, model, scene, camera }-})+ return { id: asset.id, view, viewer, model }+}))function render() {heading.value = String(yaw)tilt.value = String(pitch)root.querySelector("#heading-value")!.textContent = `${Math.round(yaw)}°`root.querySelector("#tilt-value")!.textContent = `${Math.round(pitch)}°`- for (const { view, renderer, model, scene, camera } of views) {+ for (const { view, viewer } of views) {const width = view.clientWidth, height = view.clientHeightif (!width || !height) continue- renderer.setSize(width, height, false)+ viewer.resize(width, height)// Shared projection and ground target keep tier height differences honest.const span = (street ? 335 : 195) / zoom- camera.left = -span * width / height / 2- camera.right = -camera.left- camera.top = span / 2- camera.bottom = -camera.top- const target = vertex3([0, 0, 49])- const angle = THREE.MathUtils.degToRad(45 + yaw), altitude = THREE.MathUtils.degToRad(pitch)- camera.position.set(target.x + Math.cos(angle) * 700 * Math.cos(altitude), target.y + 700 * Math.sin(altitude), target.z + Math.sin(angle) * 700 * Math.cos(altitude))- camera.lookAt(target)- camera.updateProjectionMatrix()- for (const { material, width } of model.lineMaterials) material.linewidth = width- model.updateContours(camera)- renderer.render(scene, camera)+ const angle = ((45 + yaw) * Math.PI) / 180, altitude = (pitch * Math.PI) / 180+ aim(viewer.camera, vertex3([0, 0, 49]), [Math.cos(angle) * Math.cos(altitude), Math.sin(altitude), Math.sin(angle) * Math.cos(altitude)], 700)+ frame(viewer.camera, span / 2, width, height)+ viewer.render()}}@@ -116,10 +103,14 @@ views.forEach(({ view }) => observer.observe(view))render()Object.assign(window, { serviceStudy: {rotate: (angle: number, elevation = 30) => { yaw = angle; pitch = elevation; render() },- stats: () => ({ yaw, pitch, street, scale: floorScale, models: views.map(v => ({ id: v.id, triangles: v.renderer.info.render.triangles })) }),- capture: (id: string) => views.find(v => v.id === id)!.renderer.domElement.toDataURL("image/png")+ stats: () => ({ yaw, pitch, street, scale: floorScale, models: views.map(v => ({ id: v.id, triangles: v.model.parts.reduce((n, p) => n + triangleCount(p.part.mesh), 0) })) }),+ capture: (id: string) => {+ const v = views.find(v => v.id === id)!+ render()+ return v.viewer.canvas.toDataURL("image/png")+ }} })if (import.meta.hot) import.meta.hot.dispose(() => {observer.disconnect()- views.forEach(({ renderer, model }) => { model.dispose(); renderer.dispose() })+ views.forEach(({ viewer, model }) => { model.dispose(); viewer.dispose() })})diff --git a/src/labs/viewer.ts b/src/labs/viewer.tsnew file mode 100644index 0000000..f3c8f13--- /dev/null+++ b/src/labs/viewer.ts@@ -0,0 +1,119 @@+/**+ * The labs' shared viewer: a Pixi application with one orthographic 3D view,+ * drawn on demand, and offscreen snapshots for captures. The game's renderer+ * is `render/pixi3d/scene.ts`; the labs look at the same models without it.+ */+import { View3D, type Camera3D } from "@pixi/3d"+import { Application, RenderTexture } from "pixi.js"+import { cross, dot, normalize, scale, sub, add, type Vec3 } from "../render/pixi3d/mesh/vec3.ts"+import { channels } from "../render/pixi3d/gpu.ts"++export interface LabViewer {+ readonly app: Application+ readonly view: View3D+ readonly camera: Camera3D+ readonly canvas: HTMLCanvasElement+ /** The view's size in CSS pixels. */+ readonly width: number+ readonly height: number+ /** Sizes the canvas (CSS pixels; its buffer follows the device's pixel ratio) and the view. */+ resize(width: number, height: number): void+ render(): void+ /**+ * The view drawn offscreen at `width` × `height`, `resolution` pixels a CSS+ * pixel, on `background` (or transparent for `null`), as a canvas of its own.+ */+ snapshot(width: number, height: number, resolution?: number, background?: number | null): HTMLCanvasElement+ dispose(): void+}++export async function labViewer(mount: HTMLElement, options: { width: number; height: number; background?: number | null; className?: string }): Promise<LabViewer> {+ const background = options.background === undefined ? null : options.background+ const app = new Application()+ await app.init({+ preference: "webgl",+ antialias: true,+ backgroundColor: background ?? 0xffffff,+ backgroundAlpha: background === null ? 0 : 1,+ resolution: Math.min(devicePixelRatio || 1, 2),+ autoDensity: true,+ autoStart: false,+ preserveDrawingBuffer: true,+ width: Math.max(1, options.width),+ height: Math.max(1, options.height)+ })+ const view = new View3D({ width: Math.max(1, options.width), height: Math.max(1, options.height) })+ view.camera.useOrthographic(view.width / 2, 0.1, 14000)+ app.stage.addChild(view)+ const canvas = app.canvas+ if (options.className) canvas.className = options.className+ mount.append(canvas)+ const viewer: LabViewer = {+ app,+ view,+ camera: view.camera,+ canvas,+ get width() {+ return view.width+ },+ get height() {+ return view.height+ },+ resize(width, height) {+ width = Math.max(1, Math.round(width))+ height = Math.max(1, Math.round(height))+ if (width === view.width && height === view.height && app.renderer.width === width) return+ app.renderer.resize(width, height)+ view.setSize(width, height)+ },+ render() {+ app.render()+ },+ snapshot(width, height, resolution = 1, fill = background) {+ const before = [view.width, view.height] as const+ view.setSize(width, height)+ const target = RenderTexture.create({ width, height, resolution, antialias: true })+ const [r, g, b] = channels(fill ?? 0)+ app.renderer.render({ container: view, target, clearColor: [r, g, b, fill === null ? 0 : 1] })+ const out = document.createElement("canvas")+ out.width = Math.round(width * resolution)+ out.height = Math.round(height * resolution)+ out.getContext("2d")!.drawImage(app.renderer.extract.canvas(target) as HTMLCanvasElement, 0, 0, out.width, out.height)+ target.destroy(true)+ view.setSize(...before)+ return out+ },+ dispose() {+ app.destroy(true, { children: true })+ }+ }+ return viewer+}++/** A direction from a target towards the camera: `heading` round the vertical, `altitude` above the ground (radians). */+export const toward = (heading: number, altitude: number): Vec3 => [Math.sin(heading) * Math.cos(altitude), Math.sin(altitude), Math.cos(heading) * Math.cos(altitude)]++/** Places `camera` `distance` from `target` along `direction`, looking at it. */+export function aim(camera: Camera3D, target: Vec3, direction: Vec3, distance: number) {+ const eye = add(target, scale(normalize(direction), distance))+ camera.position.set(...eye)+ camera.lookAt({ x: target[0], y: target[1], z: target[2] })+ return eye+}++/** The box `[min, max]` as a camera at `eye` looking at `target` sees it: each corner's `[right, up]`, from the line of sight. */+export function seen(eye: Vec3, target: Vec3, box: readonly [Vec3, Vec3]): Array<[number, number]> {+ const forward = normalize(sub(target, eye)), right = normalize(cross(forward, [0, 1, 0])), up = cross(right, forward)+ const out: Array<[number, number]> = []+ for (const x of [box[0][0], box[1][0]]) for (const y of [box[0][1], box[1][1]]) for (const z of [box[0][2], box[1][2]]) {+ const p = sub([x, y, z], target)+ out.push([dot(p, right), dot(p, up)])+ }+ return out+}++/** Sets an orthographic camera to show `halfHeight` above and below its target, in a view of `width` × `height`. */+export function frame(camera: Camera3D, halfHeight: number, width: number, height: number) {+ camera.zoom = 1+ camera.orthographicSize = (halfHeight * width) / height+}diff --git a/src/render/pixi3d/scene.ts b/src/render/pixi3d/scene.tsindex 1ce0f7a..8e5ccce 100644--- a/src/render/pixi3d/scene.ts+++ b/src/render/pixi3d/scene.ts@@ -39,7 +39,7 @@ const LAND = 0xe2e9e6, FROSTED = 0xe6edf1* Counts what the GPU is asked to draw each frame (Pixi has no `renderer.info`):* draw calls, and triangles, instances included.*/-function drawCounter(renderer: Renderer) {+export function drawCounter(renderer: Renderer) {const counts = { calls: 0, triangles: 0 }const gl = "gl" in renderer ? renderer.gl : nullif (gl) {