@rig-c/review 1.16.7 → 1.17.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +2 -1
- package/docs/DESIGN.md +11 -0
- package/docs/REVIEW_PACKAGE.md +53 -0
- package/docs/WORKFLOWS.md +52 -0
- package/package.json +7 -7
- package/skills/rig-review/SKILL.md +50 -0
- package/src/entry.ts +59 -0
- package/src/job-act.ts +164 -0
- package/src/job-api.ts +275 -0
- package/src/job-cli.ts +120 -0
- package/src/job-contract.ts +521 -0
- package/src/job-front.ts +443 -0
- package/src/job-session.ts +352 -0
- package/src/job-source.ts +291 -0
- package/src/job-store.ts +163 -0
- package/src/job-worker.ts +56 -0
- package/web/catalog-en.ts +66 -0
- package/web/catalog-ko.ts +66 -0
- package/web/job-session.ts +1623 -0
- package/web/parts.ts +28 -19
- package/web/scene-plates.ts +95 -0
- package/web/stage-nav.ts +28 -7
- package/web/styles.css +27 -2
package/web/parts.ts
CHANGED
|
@@ -67,7 +67,7 @@ function load(src: string): Promise<HTMLImageElement> {
|
|
|
67
67
|
});
|
|
68
68
|
}
|
|
69
69
|
const itemImage = (item: Item) => load(`${partsApi}/image/${item.index}`);
|
|
70
|
-
const pageImage = (name: string) => { const page = state.data
|
|
70
|
+
const pageImage = (name: string) => { const page = state.data?.pages.find(p => p.name === name); return page ? load(`${partsApi}/page/${page.index}`) : Promise.reject(new Error('PARTS_PAINT_FAILED')); };
|
|
71
71
|
|
|
72
72
|
function setCanvas(canvas: HTMLCanvasElement, w: number, h: number): CanvasRenderingContext2D {
|
|
73
73
|
canvas.width = w; canvas.height = h;
|
|
@@ -86,18 +86,23 @@ function overlayBox(x: number, y: number, w: number, h: number): HTMLDivElement
|
|
|
86
86
|
}
|
|
87
87
|
|
|
88
88
|
let paintToken = 0;
|
|
89
|
-
let paintFailure:string|null=null;
|
|
89
|
+
let paintFailure:string|null=null,paintReset=false;
|
|
90
90
|
async function paint():Promise<void>{
|
|
91
91
|
const token=++paintToken;painting=true;
|
|
92
92
|
try{
|
|
93
93
|
await paintRaster(token);if(token!==paintToken)return;
|
|
94
94
|
await paintReference(token);if(token!==paintToken)return;
|
|
95
|
-
|
|
95
|
+
if(paintFailure)$('pv-save-status').textContent='';paintFailure=null;viewport?.fitCamera();commentUi?.refresh();
|
|
96
96
|
}catch(error){
|
|
97
97
|
if(token!==paintToken)return;
|
|
98
|
-
|
|
99
|
-
const canvas=$<HTMLCanvasElement>('pv-canvas');canvas.getContext('2d')?.clearRect(0,0,canvas.width,canvas.height)
|
|
100
|
-
|
|
98
|
+
const failure=error instanceof Error&&error.message.startsWith('PARTS_DIFFERENCE_')?error.message:'PARTS_PAINT_FAILED: view could not be rendered; select the part to retry';
|
|
99
|
+
const canvas=$<HTMLCanvasElement>('pv-canvas');canvas.getContext('2d')?.clearRect(0,0,canvas.width,canvas.height);
|
|
100
|
+
const ref=$<HTMLCanvasElement>('pv-reference') as HTMLCanvasElement|null;if(ref){if(canvas.width>0&&canvas.height>0){ref.width=canvas.width;ref.height=canvas.height;}ref.getContext('2d')?.clearRect(0,0,ref.width,ref.height);}
|
|
101
|
+
$('pv-overlay').replaceChildren();$('pv-caption').textContent=t(failure);$('pv-save-status').textContent=t(failure);
|
|
102
|
+
painting=false;paintFailure=null;paintReset=true;
|
|
103
|
+
try{viewport?.writeCamera?.('rig',{zoom:1,center:null});viewport?.writeCamera?.('reference',{zoom:1,center:null});viewport?.fitCamera();}
|
|
104
|
+
finally{paintReset=false;paintFailure=failure;}
|
|
105
|
+
commentUi?.refresh();
|
|
101
106
|
}finally{if(token===paintToken)painting=false;}
|
|
102
107
|
}
|
|
103
108
|
const assemblyAlpha=new Map<string,Uint8ClampedArray>();
|
|
@@ -114,13 +119,14 @@ function partFrame(data:ViewData,item:Item) {
|
|
|
114
119
|
return item;
|
|
115
120
|
}
|
|
116
121
|
|
|
117
|
-
function rasterFrame(data:ViewData,item:Item) {
|
|
122
|
+
function rasterFrame(data:ViewData,item:Item):{x:number;y:number;w:number;h:number}|null {
|
|
118
123
|
if(data.mode==='parts')return partFrame(data,item);
|
|
119
124
|
if(state.view==='page') {
|
|
120
|
-
const page=data.pages[state.page]
|
|
121
|
-
return {x:0,y:0,w:page.width,h:page.height};
|
|
125
|
+
const page=data.pages[state.page];
|
|
126
|
+
return page?{x:0,y:0,w:page.width,h:page.height}:null;
|
|
122
127
|
}
|
|
123
|
-
const page=data.pages.find(p=>p.name===item.page)
|
|
128
|
+
const page=data.pages.find(p=>p.name===item.page);
|
|
129
|
+
if(!page)return null;
|
|
124
130
|
const x=Math.max(0,item.x-REGION_MARGIN),y=Math.max(0,item.y-REGION_MARGIN);
|
|
125
131
|
const right=Math.min(page.width,item.x+item.w+REGION_MARGIN);
|
|
126
132
|
const bottom=Math.min(page.height,item.y+item.h+REGION_MARGIN);
|
|
@@ -132,7 +138,9 @@ async function paintRaster(token:number): Promise<void> {
|
|
|
132
138
|
if (!data || !data.items.length) return;
|
|
133
139
|
const canvas = $<HTMLCanvasElement>('pv-canvas'), overlay = $('pv-overlay'), caption = $('pv-caption');
|
|
134
140
|
const item = data.items[state.selected]!;
|
|
135
|
-
const
|
|
141
|
+
const frame=rasterFrame(data,item);
|
|
142
|
+
if(!frame)throw new Error('PARTS_PAINT_FAILED');
|
|
143
|
+
const {x,y,w,h}=frame;
|
|
136
144
|
if(state.view==='assembled'&&data.mode==='parts'&&data.rigSize){
|
|
137
145
|
const shown=data.items.filter(i=>!state.hidden.has(i.name));
|
|
138
146
|
const layers=await Promise.all(shown.map(async box=>({box,image:await itemImage(box)})));
|
|
@@ -357,16 +365,16 @@ function renderMesh(): void {
|
|
|
357
365
|
function select(index: number): void {
|
|
358
366
|
queueMicrotask(renderCorrections);
|
|
359
367
|
const data = state.data!;
|
|
360
|
-
const changed=state.selected!==index;state.selected = index;if(changed&&viewport&&state.view!=='assembled'){viewport.writeCamera('rig',{zoom:1,center:null});viewport.writeCamera('reference',{zoom:1,center:null});}
|
|
361
|
-
commentUi?.refresh();
|
|
362
368
|
const item = data.items[index]!;
|
|
363
369
|
if (item.page !== undefined) state.page = data.pages.findIndex(p => p.name === item.page);
|
|
370
|
+
const changed=state.selected!==index;state.selected = index;if((changed||paintFailure)&&viewport&&state.view!=='assembled'){viewport.writeCamera('rig',{zoom:1,center:null});viewport.writeCamera('reference',{zoom:1,center:null});}
|
|
371
|
+
commentUi?.refresh();
|
|
364
372
|
renderList(); renderFlags(); renderVerdict(); renderMesh(); renderComparison(); void paint();
|
|
365
373
|
}
|
|
366
374
|
|
|
367
375
|
function setView(view: 'item' | 'page' | 'assembled'): void {
|
|
368
376
|
if(view==='assembled'&&(state.data?.mode!=='parts'||!state.data.rigSize))return;
|
|
369
|
-
if(state.view!==view&&viewport){viewport.writeCamera('rig',{zoom:1,center:null});viewport.writeCamera('reference',{zoom:1,center:null});}
|
|
377
|
+
if((state.view!==view||paintFailure)&&viewport){viewport.writeCamera('rig',{zoom:1,center:null});viewport.writeCamera('reference',{zoom:1,center:null});}
|
|
370
378
|
if(view!=='item'&&state.comparison.mode==='difference')state.comparison={mode:'part',opacity:state.comparison.opacity};
|
|
371
379
|
state.view = view;renderMesh();renderComparison();$('rig-label').textContent=t(view==='assembled'?'Assembled':'Selected part');commentUi?.refresh();
|
|
372
380
|
for (const b of document.querySelectorAll<HTMLButtonElement>('[data-pv-view]')) b.setAttribute('aria-pressed', String(b.dataset.pvView === view));
|
|
@@ -427,8 +435,9 @@ async function boot(): Promise<void> {
|
|
|
427
435
|
viewport=createPartsViewport({el:$,canvas:$<HTMLCanvasElement>('pv-canvas'),message:(msg)=>{$('pv-save-status').textContent=t(msg);},reference:()=>state.data?.painting?$<HTMLCanvasElement>('pv-reference'):null,
|
|
428
436
|
frameSize:target=>{
|
|
429
437
|
const data=state.data,item=data?.items[state.selected];
|
|
430
|
-
if(!data||!item)return null;
|
|
431
|
-
return
|
|
438
|
+
if(!data||!item||paintReset)return null;
|
|
439
|
+
if(paintFailure)return {w:0,h:0};
|
|
440
|
+
return target==='rig'?rasterFrame(data,item)??{w:0,h:0}:data.painting?partFrame(data,item):null;
|
|
432
441
|
},
|
|
433
442
|
});viewport.bindControls();
|
|
434
443
|
$('native-one').onclick=()=>viewport!.cameraAction(()=>viewport!.updateCamera(viewport!.availableCamera()??'rig',{zoom:1,pan:{x:0,y:0}}));
|
|
@@ -448,7 +457,7 @@ async function boot(): Promise<void> {
|
|
|
448
457
|
const res = await fetch(access.route(partsApi), { headers: stageHeaders() });
|
|
449
458
|
const data = await res.json() as ViewData & { error?: string };
|
|
450
459
|
if (!res.ok) { const status=$('pv-load');status.textContent=t(data.error??'Load failed.');status.dataset.result='refused';return; }
|
|
451
|
-
state.data = data;if(!data.differenceAvailable)document.querySelector('[data-pv-comparison="difference"]')?.remove();if(stageEmbedded)for(const item of data.items)if(item.mesh)state.meshShown.add(item.name);$('reference-empty').textContent=data.painting?'':t('PARTS_REFERENCE_UNAVAILABLE: supply --painting to compare the original painting');$('reference-empty').hidden=!!data.painting;if(data.painting)viewport.state.cameraSync=true;comments.push(...data.verdict?.comments??[]);setupPartsComments();viewport.bindNavigation(undefined,()=>!commentUi?.active());viewport.observeResize();
|
|
460
|
+
state.data = data;if(!data.differenceAvailable)document.querySelector('[data-pv-comparison="difference"]')?.remove();if(stageEmbedded)for(const item of data.items)if(item.mesh)state.meshShown.add(item.name);$('reference-empty').textContent=data.painting?'':t('PARTS_REFERENCE_UNAVAILABLE: supply --painting to compare the original painting');$('reference-empty').hidden=!!data.painting;if(data.painting)viewport.state.cameraSync=true;comments.push(...data.verdict?.comments??[]);setupPartsComments();viewport.bindNavigation(undefined,()=>!commentUi?.active()&&!paintFailure);viewport.observeResize();
|
|
452
461
|
if(stageEmbedded&&data.joinedVerdictBinding){
|
|
453
462
|
document.querySelector<HTMLElement>('.pv-verdict')!.hidden=false;
|
|
454
463
|
$('pv-approve-all').hidden=true;
|
|
@@ -530,7 +539,7 @@ function setupPartsComments():void {
|
|
|
530
539
|
};
|
|
531
540
|
const pose=():PartsPose|null=>{const data=state.data,item=data?.items[state.selected],camera=viewport?.numericView().cameras.rig;if(!data||!item||!camera||data.mode!=='parts'||state.view!=='item')return null;return {mode:'parts',camera,item:{...item},sourceHash:data.sourceHash,view:{camera:{zoom:camera.zoom,center:{...camera.center},viewport:{...camera.viewport}},cameraSync:viewport!.state.cameraSync,referenceCamera:(()=>{const c=viewport!.numericView().cameras.reference;return c?{zoom:c.zoom,center:{...c.center},viewport:{...c.viewport}}:null;})(),background:state.bg,alpha:state.alpha,footprints:state.footprints,mesh:state.meshShown.has(item.name),comparison:{...state.comparison}},capture:{pane:$('rig-viewport'),root:$('rig-root'),images:true,canvas:$<HTMLCanvasElement>('pv-canvas'),backend:'canvas2d',nearest:true}};};
|
|
532
541
|
commentUi=bindStageComments({toolbar:document.querySelector<HTMLElement>('.pv-toolbar')!,viewports:{rig:$('rig-viewport')},pose,pause:async()=>{},bookmark:()=>null,
|
|
533
|
-
restore:async(raw)=>{const res=await fetch(access.route(partsApi),{headers:stageHeaders()});const current=await res.json() as ViewData&{error?:string};if(!res.ok||current.sourceHash!==state.data?.sourceHash)throw new Error(current.error??'PARTS_COMMENT_STALE_SOURCE');const b=raw as {part:string;imageHash:string;sourceHash:string;view:PartsComment['view']},item=state.data!.items.find(i=>i.name===b.part);if(!item||item.imageHash!==b.imageHash||state.data!.sourceHash!==b.sourceHash)throw new Error('PARTS_COMMENT_STALE_SOURCE: reopen the bound source');setView('item');$('pv-assemble').setAttribute('aria-pressed','false');select(item.index);state.bg=b.view.background;state.alpha=b.view.alpha;state.footprints=b.view.footprints;state.comparison={...(b.view.comparison??defaultPartsComparison())};if(state.comparison.mode==='difference')state.differenceThreshold=state.comparison.threshold;renderComparison();if(b.view.mesh)state.meshShown.add(item.name);else state.meshShown.delete(item.name);$<HTMLSelectElement>('pv-bg').value=state.bg;$<HTMLInputElement>('pv-alpha').checked=state.alpha;$<HTMLInputElement>('pv-footprints').checked=state.footprints;renderMesh();viewport!.state.cameraRestoring=true;try{await paint();viewport!.writeCamera('rig',{zoom:b.view.camera.zoom,center:{...b.view.camera.center}});if(b.view.referenceCamera)viewport!.writeCamera('reference',{zoom:b.view.referenceCamera.zoom,center:{...b.view.referenceCamera.center}});viewport!.state.cameraSync=b.view.cameraSync;viewport!.fitCamera();}finally{viewport!.state.cameraRestoring=false;}},
|
|
542
|
+
restore:async(raw)=>{const res=await fetch(access.route(partsApi),{headers:stageHeaders()});const current=await res.json() as ViewData&{error?:string};if(!res.ok||current.sourceHash!==state.data?.sourceHash)throw new Error(current.error??'PARTS_COMMENT_STALE_SOURCE');const b=raw as {part:string;imageHash:string;sourceHash:string;view:PartsComment['view']},item=state.data!.items.find(i=>i.name===b.part);if(!item||item.imageHash!==b.imageHash||state.data!.sourceHash!==b.sourceHash)throw new Error('PARTS_COMMENT_STALE_SOURCE: reopen the bound source');setView('item');$('pv-assemble').setAttribute('aria-pressed','false');select(item.index);state.bg=b.view.background;state.alpha=b.view.alpha;state.footprints=b.view.footprints;state.comparison={...(b.view.comparison??defaultPartsComparison())};if(state.comparison.mode==='difference')state.differenceThreshold=state.comparison.threshold;renderComparison();if(b.view.mesh)state.meshShown.add(item.name);else state.meshShown.delete(item.name);$<HTMLSelectElement>('pv-bg').value=state.bg;$<HTMLInputElement>('pv-alpha').checked=state.alpha;$<HTMLInputElement>('pv-footprints').checked=state.footprints;renderMesh();viewport!.state.cameraRestoring=true;try{await paint();if(!paintFailure){viewport!.writeCamera('rig',{zoom:b.view.camera.zoom,center:{...b.view.camera.center}});if(b.view.referenceCamera)viewport!.writeCamera('reference',{zoom:b.view.referenceCamera.zoom,center:{...b.view.referenceCamera.center}});viewport!.state.cameraSync=b.view.cameraSync;viewport!.fitCamera();}}finally{viewport!.state.cameraRestoring=false;}},
|
|
534
543
|
feedback:()=>comments,locked:()=>false,add:c=>comments.push(c),changed:()=>renderVerdict(),error:m=>{$('pv-save-status').textContent=t(m);},blocked:()=>painting,refusal:()=>paintFailure??(state.view==='assembled'?'PARTS_COMMENT_UNAVAILABLE: select the individual part view to comment':null)??(state.data?.mode!=='parts'||stageEmbedded?'PARTS_COMMENT_UNAVAILABLE: original part image required':null),codec});
|
|
535
544
|
}
|
|
536
545
|
|
|
@@ -560,7 +569,7 @@ async function restoreStageParts(saved:StagePartsState):Promise<void>{
|
|
|
560
569
|
const index=stagePartsSelectionIndex(state.data,saved);
|
|
561
570
|
viewport.state.cameraRestoring=true;state.bg=saved.bg;state.alpha=saved.alpha;state.footprints=saved.footprints;state.view=saved.view;
|
|
562
571
|
if(saved.mesh)state.meshShown.add(saved.part);else state.meshShown.delete(saved.part);
|
|
563
|
-
select(index);await paint();viewport.writeCamera('rig',saved.rig);if(state.data.painting)viewport.writeCamera('reference',saved.reference);viewport.state.cameraSync=saved.cameraSync;viewport.fitCamera();
|
|
572
|
+
select(index);await paint();if(!paintFailure){viewport.writeCamera('rig',saved.rig);if(state.data.painting)viewport.writeCamera('reference',saved.reference);viewport.state.cameraSync=saved.cameraSync;viewport.fitCamera();}
|
|
564
573
|
}catch{const status=$('pv-load');status.hidden=false;status.dataset.result='refused';status.textContent=t('STAGE_DRAFT_MISMATCH: separated parts and draft mesh identity differ.');document.querySelector<HTMLElement>('.pv-layout')!.hidden=true;}
|
|
565
574
|
finally{viewport.state.cameraRestoring=false;}
|
|
566
575
|
}
|
|
@@ -0,0 +1,95 @@
|
|
|
1
|
+
type Rect = Readonly<{ x: number; y: number; width: number; height: number }>;
|
|
2
|
+
|
|
3
|
+
type Plate = Readonly<{
|
|
4
|
+
image: HTMLImageElement | null;
|
|
5
|
+
width: number;
|
|
6
|
+
height: number;
|
|
7
|
+
rect: Rect;
|
|
8
|
+
}>;
|
|
9
|
+
|
|
10
|
+
type Frame = Readonly<{
|
|
11
|
+
clip: Rect;
|
|
12
|
+
background: Plate | null;
|
|
13
|
+
foreground: Plate | null;
|
|
14
|
+
rigTransform: readonly [number, number, number, number, number, number];
|
|
15
|
+
drawRig: (ctx: CanvasRenderingContext2D) => void;
|
|
16
|
+
}>;
|
|
17
|
+
|
|
18
|
+
function validateRect(rect: Rect, name: string): void {
|
|
19
|
+
if (!rect || ![rect.x, rect.y, rect.width, rect.height, rect.x + rect.width,
|
|
20
|
+
rect.y + rect.height].every(Number.isFinite) || rect.width <= 0 || rect.height <= 0) {
|
|
21
|
+
throw new Error(`SCENE_RECT_INVALID: ${name}`);
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
function validatePlate(plate: Plate | null, name: string): asserts plate is Plate & { image: HTMLImageElement } {
|
|
26
|
+
if (!plate?.image) throw new Error(`SCENE_PLATE_REQUIRED: ${name}`);
|
|
27
|
+
const { image, width, height } = plate;
|
|
28
|
+
if (!image.complete || image.naturalWidth <= 0 || image.naturalHeight <= 0) {
|
|
29
|
+
throw new Error(`SCENE_PLATE_NOT_READY: ${name}`);
|
|
30
|
+
}
|
|
31
|
+
if (!Number.isSafeInteger(width) || !Number.isSafeInteger(height) || width <= 0 || height <= 0 ||
|
|
32
|
+
image.naturalWidth !== width || image.naturalHeight !== height) {
|
|
33
|
+
throw new Error(`SCENE_PLATE_DIMENSIONS: ${name}`);
|
|
34
|
+
}
|
|
35
|
+
validateRect(plate.rect, name);
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
/**
|
|
39
|
+
* Internal drawing inputs. The caller owns source binding and supplies decoded images.
|
|
40
|
+
* Clip and plate rectangles use target-canvas pixels, independent of its current transform.
|
|
41
|
+
* The explicit matrix maps the synchronous rig callback's coordinates to those pixels.
|
|
42
|
+
* A runtime drawing exception can leave a cleared or partially drawn frame.
|
|
43
|
+
* The caller MUST render offscreen and commit only the completed frame to the live canvas.
|
|
44
|
+
* drawRig must be synchronous and balance its own save/restore calls.
|
|
45
|
+
* The callback owns its current-path changes. Canvas save/restore does not restore that path.
|
|
46
|
+
*/
|
|
47
|
+
export function renderScenePlates(ctx: CanvasRenderingContext2D, frame: Frame): void {
|
|
48
|
+
const { background, foreground, clip, rigTransform, drawRig } = frame;
|
|
49
|
+
// Complete validation precedes every canvas operation, including clearing the held frame.
|
|
50
|
+
validatePlate(background, 'background');
|
|
51
|
+
validatePlate(foreground, 'foreground');
|
|
52
|
+
validateRect(clip, 'clip');
|
|
53
|
+
if (!rigTransform || rigTransform.length !== 6 || !Array.from(rigTransform).every(Number.isFinite)) {
|
|
54
|
+
throw new Error('SCENE_TRANSFORM_INVALID');
|
|
55
|
+
}
|
|
56
|
+
const [a, b, c, d, e, f] = rigTransform;
|
|
57
|
+
const determinant = a * d - b * c;
|
|
58
|
+
if (!Number.isFinite(determinant) || determinant === 0) throw new Error('SCENE_TRANSFORM_INVALID');
|
|
59
|
+
if (typeof drawRig !== 'function') throw new Error('SCENE_DRAW_RIG_REQUIRED');
|
|
60
|
+
|
|
61
|
+
// Use a separate Path2D for clipping. Existing clipping still applies.
|
|
62
|
+
const path = new Path2D();
|
|
63
|
+
path.rect(clip.x, clip.y, clip.width, clip.height);
|
|
64
|
+
ctx.save();
|
|
65
|
+
try {
|
|
66
|
+
ctx.setTransform(1, 0, 0, 1, 0, 0);
|
|
67
|
+
ctx.globalAlpha = 1;
|
|
68
|
+
ctx.globalCompositeOperation = 'source-over';
|
|
69
|
+
ctx.filter = 'none';
|
|
70
|
+
ctx.shadowColor = 'transparent';
|
|
71
|
+
ctx.shadowBlur = 0;
|
|
72
|
+
ctx.shadowOffsetX = 0;
|
|
73
|
+
ctx.shadowOffsetY = 0;
|
|
74
|
+
ctx.clip(path);
|
|
75
|
+
ctx.clearRect(clip.x, clip.y, clip.width, clip.height);
|
|
76
|
+
|
|
77
|
+
const back = background.rect;
|
|
78
|
+
ctx.drawImage(background.image, 0, 0, background.width, background.height,
|
|
79
|
+
back.x, back.y, back.width, back.height);
|
|
80
|
+
|
|
81
|
+
ctx.save();
|
|
82
|
+
try {
|
|
83
|
+
ctx.setTransform(a, b, c, d, e, f);
|
|
84
|
+
drawRig(ctx);
|
|
85
|
+
} finally {
|
|
86
|
+
ctx.restore();
|
|
87
|
+
}
|
|
88
|
+
|
|
89
|
+
const front = foreground.rect;
|
|
90
|
+
ctx.drawImage(foreground.image, 0, 0, foreground.width, foreground.height,
|
|
91
|
+
front.x, front.y, front.width, front.height);
|
|
92
|
+
} finally {
|
|
93
|
+
ctx.restore();
|
|
94
|
+
}
|
|
95
|
+
}
|
package/web/stage-nav.ts
CHANGED
|
@@ -46,13 +46,33 @@ export function bindStageNav(options:{preRig?:boolean;interviewOnly?:boolean;int
|
|
|
46
46
|
const status=document.createElement('p');status.setAttribute('role','status');panel.append(status);
|
|
47
47
|
let interview:HTMLIFrameElement|undefined,interviewError:string|null=null,entry=0;
|
|
48
48
|
const sourcePicker=document.getElementById('mode-build-picker');
|
|
49
|
+
const attr=(el:Element,name:string)=>typeof el.getAttribute==='function'?el.getAttribute(name):null;
|
|
50
|
+
const setOrRemove=(el:Element,name:string,value:string|null)=>{if(value===null)el.removeAttribute?.(name);else el.setAttribute(name,value);};
|
|
51
|
+
const modeSwitches=[...document.querySelectorAll<HTMLElement>('.mode-switch')].map(el=>({el,hidden:Boolean(el.hidden)}));
|
|
52
|
+
const modeControls=[...document.querySelectorAll<HTMLButtonElement>('[data-mode],[data-inspector]')].map(button=>({
|
|
53
|
+
button,disabled:Boolean(button.disabled),title:attr(button,'title'),pressed:attr(button,'aria-pressed'),selected:attr(button,'aria-selected'),
|
|
54
|
+
}));
|
|
55
|
+
const pickerState=sourcePicker?{hidden:Boolean(sourcePicker.hidden),label:attr(sourcePicker,'aria-label')}:null;
|
|
49
56
|
const frames=new Map<string,HTMLIFrameElement>();let lastFrame:HTMLIFrameElement|null=null;let current:ReviewStage=(options.partsOnly||options.preRig)?1:3;
|
|
50
57
|
const workspace=document.querySelector<HTMLElement>(options.partsOnly?'.pv-layout':'.layout');const wasInert=workspace?.inert??false;
|
|
58
|
+
const reasonFor=(stage:ReviewStage)=>stageReason(stage,options.model,!!options.direction,!!options.interview,options.preRig);
|
|
51
59
|
const buttons=reviewStages.map((label,index)=>{const button=document.createElement('button');button.type='button';button.dataset.reviewStage=String(index+1);button.onclick=()=>show(index+1 as ReviewStage);host.append(button);return button;});
|
|
52
|
-
const mesh=document.createElement('button');mesh.type='button';mesh.onclick=()=>{show(3);options.setup?.();};panel.append(mesh);
|
|
53
|
-
const
|
|
60
|
+
const mesh=document.createElement('button');mesh.type='button';mesh.onclick=()=>{if(reasonFor(3))return;show(3);options.setup?.();};panel.append(mesh);
|
|
61
|
+
const syncRigControls=()=>{
|
|
62
|
+
const rigReason=reasonFor(3),refused=Boolean(reasonFor(current));
|
|
63
|
+
if(refused)document.documentElement.dataset.stageRefused='true';else delete document.documentElement.dataset.stageRefused;
|
|
64
|
+
for(const item of modeSwitches)item.el.hidden=current!==3||Boolean(rigReason)?true:item.hidden;
|
|
65
|
+
if(sourcePicker&&pickerState&&rigReason&¤t===3)sourcePicker.hidden=true;
|
|
66
|
+
if(!rigReason)return;
|
|
67
|
+
const reasonText=t(rigReason);
|
|
68
|
+
for(const item of modeControls){
|
|
69
|
+
item.button.disabled=true;item.button.title=reasonText;item.button.setAttribute('title',reasonText);
|
|
70
|
+
if(item.pressed!==null&&attr(item.button,'aria-pressed')!=='false')item.button.setAttribute('aria-pressed','false');
|
|
71
|
+
if(item.selected!==null&&attr(item.button,'aria-selected')!=='false')item.button.setAttribute('aria-selected','false');
|
|
72
|
+
}
|
|
73
|
+
};
|
|
74
|
+
const render=()=>{buttons.forEach((b,i)=>{b.textContent=t(reviewStages[i]!);b.setAttribute('aria-current',current===i+1?'step':'false');});host.setAttribute('aria-label',t('Inspection stages'));if(sourcePicker)sourcePicker.setAttribute('aria-label',t(current===1?'Atlas source build':'Picked build for Setup and Animate'));mesh.textContent=t('Open setup mesh instruments');syncRigControls();};
|
|
54
75
|
const place=()=>{panel.style.top=`${(host.closest('header')??host).getBoundingClientRect().bottom}px`;};
|
|
55
|
-
const reasonFor=(stage:ReviewStage)=>stageReason(stage,options.model,!!options.direction,!!options.interview,options.preRig);
|
|
56
76
|
const setFrameLanguage=(frame:HTMLIFrameElement)=>frame.contentWindow?.postMessage({type:'review-stage-language',language:getLanguage()},location.origin);
|
|
57
77
|
async function showInterview(revision:number) {
|
|
58
78
|
try {
|
|
@@ -80,7 +100,7 @@ export function bindStageNav(options:{preRig?:boolean;interviewOnly?:boolean;int
|
|
|
80
100
|
options.direction?.(stage===4);
|
|
81
101
|
panel.hidden=!reason&&(stage===(options.partsOnly?1:3)||stage===4)&&!options.preRig;
|
|
82
102
|
if(workspace)workspace.inert=!panel.hidden||wasInert;
|
|
83
|
-
status.textContent=reason?t(reason):stage===1&&!options.partsOnly?t(options.correction||options.preRig?'Draft rig · structure evidence only':'Atlas inspection, read only — inspected package. Applied scratch atlas, pre-rig parts, mesh sign-off and draft corrections are unavailable here.'):'';mesh.hidden=stage!==1
|
|
103
|
+
status.textContent=reason?t(reason):stage===1&&!options.partsOnly?t(options.correction||options.preRig?'Draft rig · structure evidence only':'Atlas inspection, read only — inspected package. Applied scratch atlas, pre-rig parts, mesh sign-off and draft corrections are unavailable here.'):'';mesh.hidden=stage!==1||Boolean(reasonFor(3))||!!options.partsOnly;
|
|
84
104
|
for(const frame of frames.values())frame.hidden=true;
|
|
85
105
|
if(interview)interview.hidden=true;
|
|
86
106
|
panel.classList.remove('with-interview');
|
|
@@ -93,15 +113,16 @@ export function bindStageNav(options:{preRig?:boolean;interviewOnly?:boolean;int
|
|
|
93
113
|
const correction=async(event:MessageEvent)=>{if(event.origin!==location.origin||![...frames.values()].some(f=>f.contentWindow===event.source)||event.data?.type!=='review-stage-correction'||!options.correction)return;const r=event.data;if(typeof r.part!=='string'||typeof r.sourceHash!=='string'||typeof r.buildId!=='string'||!['chest','mesh','delta'].includes(r.instrument))return;try{await options.correction(r);show(3);}catch(error){status.textContent=error instanceof Error?error.message:String(error);}};
|
|
94
114
|
window.addEventListener('message',correction);
|
|
95
115
|
// Legacy Setup/Animate/Compare selectors keep their IDs, payloads and behavior.
|
|
96
|
-
const legacy=()=>
|
|
116
|
+
const legacy=(event?:Event)=>{if(reasonFor(3)){event?.preventDefault?.();event?.stopImmediatePropagation?.();syncRigControls();return;}show(3);};
|
|
117
|
+
modeControls.forEach(({button})=>button.addEventListener('click',legacy,true));
|
|
97
118
|
// A side choice reuses the canonical closed A/B picker, then reveals that side's retained atlas.
|
|
98
119
|
let pickingSource=false;
|
|
99
120
|
const sourceChanged=()=>{if(current!==1)return;pickingSource=true;show(1);queueMicrotask(()=>{pickingSource=false;});};
|
|
100
121
|
sourcePicker?.querySelectorAll('[data-build-side]').forEach(button=>button.addEventListener('click',sourceChanged));
|
|
101
122
|
// Legacy bookmark/control restoration writes these canonical attributes even when a mode is unchanged.
|
|
102
|
-
const canonical=new MutationObserver(()=>{if(current!==3&&!options.partsOnly&&!options.preRig&&!pickingSource)show(3);});
|
|
123
|
+
const canonical=new MutationObserver(()=>{if(reasonFor(3)){syncRigControls();return;}if(current!==3&&!options.partsOnly&&!options.preRig&&!pickingSource)show(3);});
|
|
103
124
|
document.querySelectorAll('[data-inspector]').forEach(button=>canonical.observe(button,{attributes:true,attributeFilter:['aria-selected','aria-pressed']}));
|
|
104
125
|
const language=onLanguageChange(()=>{render();if(!panel.hidden)status.textContent=t(reasonFor(current)??(current===2?(interviewError??(interview&&!interview.hidden?'':'interview.loading')):current===1&&(options.correction||options.preRig)?'Draft rig · structure evidence only':current===1?'Atlas inspection, read only — inspected package. Applied scratch atlas, pre-rig parts, mesh sign-off and draft corrections are unavailable here.':''));for(const f of frames.values()){f.title=t('Parts and atlas inspection');setFrameLanguage(f);}if(interview){interview.title=t('interview.title');setFrameLanguage(interview);}});
|
|
105
126
|
window.addEventListener('resize',place);show(current);
|
|
106
|
-
return ()=>{entry++;window.removeEventListener('message',correction);language();canonical.disconnect();sourcePicker?.querySelectorAll('[data-build-side]').forEach(button=>button.removeEventListener('click',sourceChanged));delete document.documentElement.dataset.inspectionStage;if(workspace)workspace.inert=wasInert;panel.remove();window.removeEventListener('resize',place);
|
|
127
|
+
return ()=>{entry++;window.removeEventListener('message',correction);language();canonical.disconnect();sourcePicker?.querySelectorAll('[data-build-side]').forEach(button=>button.removeEventListener('click',sourceChanged));delete document.documentElement.dataset.inspectionStage;delete document.documentElement.dataset.stageRefused;for(const item of modeSwitches)item.el.hidden=item.hidden;if(sourcePicker&&pickerState){sourcePicker.hidden=pickerState.hidden;setOrRemove(sourcePicker,'aria-label',pickerState.label);}if(reasonFor(3))for(const item of modeControls){item.button.disabled=item.disabled;item.button.title=item.title??'';setOrRemove(item.button,'title',item.title);setOrRemove(item.button,'aria-pressed',item.pressed);setOrRemove(item.button,'aria-selected',item.selected);}if(workspace)workspace.inert=wasInert;buttons.forEach(b=>b.remove());panel.remove();window.removeEventListener('resize',place);modeControls.forEach(({button})=>button.removeEventListener('click',legacy,true));};
|
|
107
128
|
}
|
package/web/styles.css
CHANGED
|
@@ -411,10 +411,10 @@ main{position:relative}.toolbar{anchor-name:--stage-comment-bar}#stage-comment{w
|
|
|
411
411
|
.topbar,.pv-top{flex-wrap:wrap}
|
|
412
412
|
|
|
413
413
|
/* Setup/Animate/Compare are instruments within stage 3, never additional primary stages. */
|
|
414
|
-
:root[data-inspection-stage]:not([data-inspection-stage="3"]) .mode-switch{display:none}
|
|
414
|
+
:root[data-inspection-stage]:not([data-inspection-stage="3"]) .mode-switch,:root[data-stage-refused="true"] .mode-switch{display:none}
|
|
415
415
|
:root[data-inspection-stage="1"] #mode-build-picker{display:flex!important}
|
|
416
416
|
:root[data-inspection-stage="1"] #mode-build-picker>.eyebrow{display:none}
|
|
417
|
-
:root[data-inspection-stage="2"] #mode-build-picker,:root[data-inspection-stage="4"] #mode-build-picker{display:none!important}
|
|
417
|
+
:root[data-inspection-stage="2"] #mode-build-picker,:root[data-inspection-stage="4"] #mode-build-picker,:root[data-stage-refused="true"] #mode-build-picker{display:none!important}
|
|
418
418
|
#direction-panel{flex:none;max-height:40%;overflow:auto;padding:.5rem .75rem;overflow-wrap:anywhere}
|
|
419
419
|
#direction-panel ul{margin:.4rem 0;padding-inline-start:1.4rem}
|
|
420
420
|
#direction-authored-body{display:none;flex:1;min-height:0;overflow:auto;white-space:pre-wrap;overflow-wrap:anywhere;margin:0;padding:.75rem}
|
|
@@ -437,3 +437,28 @@ main{position:relative}.toolbar{anchor-name:--stage-comment-bar}#stage-comment{w
|
|
|
437
437
|
.review-stage-panel.with-interview { grid-template: min-content repeat(2, minmax(420px, 1fr)) / minmax(0, 1fr); }
|
|
438
438
|
.review-stage-panel.with-interview > .review-interview-frame { grid-area: 3 / 1; }
|
|
439
439
|
}
|
|
440
|
+
|
|
441
|
+
/* Persistent job inspection uses the canonical pair and camera controls. */
|
|
442
|
+
body.job-window{display:grid;grid-template-rows:auto auto minmax(0,1fr);height:100dvh;overflow:hidden}
|
|
443
|
+
.job-window .job-header{display:flex;align-items:center;gap:12px;padding:10px 16px;background:var(--rv-bar);border-bottom:1px solid var(--border)}
|
|
444
|
+
.job-window .job-header h1{font-size:16px;margin:0;flex:1;min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
|
|
445
|
+
.job-window .job-header select{width:auto;flex:0 0 auto;max-width:12rem}
|
|
446
|
+
.job-window .job-notice{padding:8px 16px;margin:0;color:var(--fg-soft);background:var(--rv-panel);border-bottom:1px solid var(--border)}
|
|
447
|
+
.job-window .job-notice[data-failed=true]{color:var(--fail)}
|
|
448
|
+
.job-window .job-inspection{display:grid;grid-template-columns:230px minmax(0,1fr);grid-template-rows:minmax(250px,1fr) minmax(100px,30dvh);min-height:0;overflow:hidden}
|
|
449
|
+
.job-window .job-sidebar{grid-row:1/-1;overflow:auto;padding:12px;border-right:1px solid var(--border);background:var(--rv-panel);min-width:0}
|
|
450
|
+
.job-window .job-sidebar select,.job-window .job-sidebar img{max-width:100%}
|
|
451
|
+
.job-window .job-stage{display:flex;flex-direction:column;min-height:0;min-width:0}
|
|
452
|
+
.job-window .job-stage #stage-layout{height:auto;flex:1;min-height:180px}
|
|
453
|
+
.job-window .job-stage .viewbar,.job-window .job-transport{flex:none;display:flex;gap:8px;align-items:center;flex-wrap:wrap;padding:8px}
|
|
454
|
+
.job-window .job-forms{overflow:auto;border-top:1px solid var(--border);padding:12px;background:var(--rv-panel)}
|
|
455
|
+
.job-window .job-forms form{margin:0 0 12px;padding:12px;border:1px solid var(--border);border-radius:var(--radius)}
|
|
456
|
+
.job-window .job-forms fieldset{border:0;padding:0;min-width:0}
|
|
457
|
+
.job-window .job-forms label{display:block;margin:6px 0}
|
|
458
|
+
.job-window .job-forms textarea{display:block;width:100%;min-height:64px;box-sizing:border-box}
|
|
459
|
+
.job-window .job-forms .job-source,.job-window .job-history{overflow-wrap:anywhere;font-family:var(--font-mono);font-size:11px;color:var(--fg-muted)}
|
|
460
|
+
.job-window .job-history{white-space:pre-wrap;color:var(--warn)}
|
|
461
|
+
.job-window .job-direction{white-space:pre-wrap;overflow-wrap:anywhere}
|
|
462
|
+
.job-window .job-part-images{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:6px}
|
|
463
|
+
.job-window .job-part-images img{width:100%;height:auto;background:var(--rv-media-bg)}
|
|
464
|
+
@media(max-width:780px){.job-window .job-inspection{grid-template-columns:160px minmax(0,1fr)}.job-window .job-stage #stage-layout{grid-template-columns:minmax(0,1fr);grid-template-rows:repeat(2,minmax(0,1fr))}}
|