@rig-c/review 3.7.0 → 4.0.1
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 +3 -3
- package/docs/DESIGN.md +145 -74
- package/docs/PANELS.md +20 -12
- package/docs/PARTS_VIEW.md +133 -76
- package/docs/REVIEW_PACKAGE.md +446 -100
- package/docs/STABILITY.md +132 -198
- package/docs/WORKFLOWS.md +41 -120
- package/package.json +4 -3
- package/skills/rig-review/SKILL.md +41 -27
- package/src/build.ts +10 -2
- package/src/cli.ts +17 -16
- package/src/comment-crops.ts +6 -1
- package/src/compare-html.ts +22 -24
- package/src/compare-server.ts +1 -1
- package/src/compare-session.ts +41 -3
- package/src/correction-handoff.ts +27 -4
- package/src/create-pin-gate.ts +3 -0
- package/src/direction-inspection.ts +6 -2
- package/src/feedback-export.ts +68 -1
- package/src/front.ts +5 -200
- package/src/handoff.ts +1 -1
- package/src/interview-routes.ts +1 -1
- package/src/interview-scene.ts +3 -3
- package/src/job-act.ts +77 -73
- package/src/job-api.ts +326 -13
- package/src/job-checkpoint-evidence.ts +113 -0
- package/src/job-cli.ts +27 -14
- package/src/job-contract.ts +284 -62
- package/src/job-front.ts +192 -61
- package/src/job-host.ts +23 -4
- package/src/job-session.ts +109 -24
- package/src/job-source.ts +227 -58
- package/src/job-store.ts +80 -6
- package/src/job-worker.ts +1 -47
- package/src/joined-project.ts +61 -4
- package/src/manifest.ts +32 -4
- package/src/open-workspace.ts +12 -12
- package/src/open.ts +19 -12
- package/src/parts-comment-crops.ts +126 -31
- package/src/parts-comment.ts +351 -28
- package/src/parts-server.ts +19 -7
- package/src/parts-view.ts +588 -109
- package/src/scene-inspection.ts +50 -0
- package/src/server.ts +31 -22
- package/src/session.ts +58 -0
- package/src/stage-comment.ts +48 -1
- package/src/stage-parts.ts +23 -11
- package/web/animation-inspection.ts +1 -1
- package/web/bones-panel.ts +1 -3
- package/web/catalog-en.ts +175 -39
- package/web/catalog-ko.ts +175 -39
- package/web/cloth-panel.ts +1 -2
- package/web/compare.css +3 -13
- package/web/compare.html +3 -3
- package/web/compare.ts +69 -64
- package/web/cuts-panel.ts +1 -3
- package/web/density-strip-panel.ts +1 -2
- package/web/direction-panel.ts +22 -6
- package/web/i18n.ts +13 -1
- package/web/idle-panel.ts +1 -2
- package/web/index.html +1 -5
- package/web/inspection-persistence.ts +2 -1
- package/web/inspector-blocks.ts +149 -40
- package/web/instance-access.ts +24 -5
- package/web/interview-panel.ts +224 -175
- package/web/job-rig-capture.ts +164 -21
- package/web/job-rig-screen.ts +344 -0
- package/web/job-session.ts +611 -1443
- package/web/main.ts +614 -151
- package/web/mesh-panel.ts +1 -2
- package/web/owner-workspace.ts +88 -109
- package/web/part-selection.ts +47 -6
- package/web/part-thumbnails.ts +20 -6
- package/web/parts-render.ts +26 -19
- package/web/parts-viewport-provider.ts +181 -7
- package/web/physics-panel.ts +1 -2
- package/web/readings-panel.ts +1 -2
- package/web/requirements-panel.ts +1 -3
- package/web/retained-frame-stage.ts +105 -0
- package/web/retarget-panel.ts +2 -3
- package/web/rig-fields-panel.ts +1 -2
- package/web/rig-host.ts +64 -0
- package/web/rig-viewport-provider.ts +65 -16
- package/web/scene-plates.ts +57 -4
- package/web/stage-comments.ts +103 -46
- package/web/styles.css +117 -63
- package/web/view-controls.ts +201 -12
- package/web/viewport-capture.ts +12 -2
- package/web/viewport-controller.ts +107 -27
- package/web/viewport-pair.ts +2 -1
- package/web/workspace-preferences.ts +5 -4
- package/web/workspace-ui.ts +151 -19
- package/src/front-worker.ts +0 -2
- package/src/interview-server.ts +0 -54
- package/src/job-hub.ts +0 -304
- package/src/job-image-set.ts +0 -50
- package/web/interview.css +0 -28
- package/web/interview.html +0 -17
- package/web/interview.ts +0 -40
- package/web/job-hub.css +0 -14
- package/web/job-hub.html +0 -5
- package/web/job-hub.ts +0 -179
- package/web/owner-workspace.css +0 -14
- package/web/owner-workspace.html +0 -5
- package/web/parts-flags.ts +0 -48
- package/web/parts.css +0 -104
- package/web/parts.html +0 -49
- package/web/parts.ts +0 -604
- package/web/stage-nav.ts +0 -136
|
@@ -1,9 +1,16 @@
|
|
|
1
1
|
/** Native image policy for the canonical pair. Camera gestures and writes belong to viewport-controller. */
|
|
2
|
-
import {createViewportController,createViewportState,type CameraTarget,type ViewportProvider} from './viewport-controller.ts';
|
|
2
|
+
import {createViewportController,createViewportState,type ViewportState,type ViewportController,type CameraTarget,type ViewportProvider} from './viewport-controller.ts';
|
|
3
3
|
import {t} from './i18n.ts';
|
|
4
4
|
|
|
5
|
-
|
|
6
|
-
|
|
5
|
+
interface PartsFrame {w:number;h:number;world?:{box:{x:number;y:number;width:number;height:number};origin:{x:number;y:number};scale:{x:number;y:number}}}
|
|
6
|
+
/** Decode the response already checked by the caller, without retaining an object URL. */
|
|
7
|
+
export async function loadViewportImage(response:Response):Promise<HTMLImageElement>{
|
|
8
|
+
const url=URL.createObjectURL(await response.blob());
|
|
9
|
+
try{const image=new Image();image.src=url;await image.decode();return image;}
|
|
10
|
+
finally{URL.revokeObjectURL(url);}
|
|
11
|
+
}
|
|
12
|
+
export interface PartsViewportHost {el:ViewportProvider['el'];canvas:HTMLCanvasElement;message:ViewportProvider['message'];reference:()=>HTMLCanvasElement|null;frameSize:(target:CameraTarget)=>PartsFrame|null}
|
|
13
|
+
export function createPartsViewportProvider(host:PartsViewportHost,state:ViewportState):ViewportProvider {
|
|
7
14
|
let dimensionProbe:HTMLCanvasElement|undefined;
|
|
8
15
|
const ordinaryExtent=(value:number)=>Number.isInteger(value)&&value>=0&&value<=0x7fffffff;
|
|
9
16
|
const canvasSize=(size:{w:number;h:number})=>{
|
|
@@ -14,17 +21,184 @@ export function createPartsViewport(host:{el:ViewportProvider['el'];canvas:HTMLC
|
|
|
14
21
|
return {width:probe.width,height:probe.height};
|
|
15
22
|
};
|
|
16
23
|
const provider:ViewportProvider={el:host.el,message:host.message,nativeScale:true,
|
|
24
|
+
get absoluteSync(){return !!host.frameSize('rig')?.world;},
|
|
17
25
|
panes:(['rig','reference'] as const).map(target=>({target,viewport:host.el(target+'-viewport'),pane:host.el(target+'-pane')})),
|
|
18
26
|
geometry:target=>{
|
|
19
27
|
const declared=host.frameSize(target);
|
|
20
28
|
const size=declared?canvasSize(declared):target==='rig'?host.canvas:host.reference();
|
|
21
29
|
if(!size)return null;
|
|
22
30
|
const {width,height}=size;
|
|
23
|
-
return {space:'image',box:{x:0,y:0,width,height},marginX:24,marginY:24};
|
|
31
|
+
return {space:'image',box:declared?.world?.box??{x:0,y:0,width,height},marginX:24,marginY:24};
|
|
32
|
+
},
|
|
33
|
+
layoutKey:()=>JSON.stringify([host.frameSize('rig'),host.frameSize('reference'),state.cameraSync,host.canvas.width,host.canvas.height,host.reference()?.width??0,host.reference()?.height??0,host.el('rig-viewport').clientWidth,host.el('rig-viewport').clientHeight]),selection:()=>({selected:false,bounds:null}),
|
|
34
|
+
render:controller=>{
|
|
35
|
+
// Translated controls can wrap the toolbar and resize its sibling panes.
|
|
36
|
+
controller.renderCameraControls();
|
|
37
|
+
for(const target of ['rig','reference'] as const){
|
|
38
|
+
const frame=controller.paneFrame(target);if(!frame)continue;
|
|
39
|
+
const c=controller.paneCamera(target),center=c.center??frame.center;
|
|
40
|
+
const root=host.el(target==='rig'?'rig-root':'reference-content');
|
|
41
|
+
const world=host.frameSize(target)?.world,origin=world?.origin??{x:0,y:0},scale=world?.scale??{x:1,y:1};
|
|
42
|
+
root.style.left=`${frame.width/2+(origin.x-center.x)*c.zoom}px`;
|
|
43
|
+
root.style.top=`${frame.height/2+(origin.y-center.y)*c.zoom}px`;
|
|
44
|
+
root.style.transform=scale.x===1&&scale.y===1?`scale(${c.zoom})`:`scale(${c.zoom*scale.x},${c.zoom*scale.y})`;
|
|
45
|
+
if(target==='rig'){state.rigScale=c.zoom;state.displayedCenter={...center};}
|
|
46
|
+
}
|
|
24
47
|
},
|
|
25
|
-
layoutKey:()=>[host.canvas.width,host.canvas.height,host.reference()?.width??0,host.reference()?.height??0,host.el('rig-viewport').clientWidth,host.el('rig-viewport').clientHeight].join(':'),selection:()=>({selected:false,bounds:null}),
|
|
26
|
-
render:controller=>{for(const target of ['rig','reference'] as const){const frame=controller.paneFrame(target);if(!frame)continue;const c=controller.paneCamera(target),center=c.center??frame.center,root=host.el(target==='rig'?'rig-root':'reference-content');root.style.left=`${frame.width/2-center.x*c.zoom}px`;root.style.top=`${frame.height/2-center.y*c.zoom}px`;root.style.transform=`scale(${c.zoom})`;if(target==='rig'){state.rigScale=c.zoom;state.displayedCenter={...center};}}controller.renderCameraControls();},
|
|
27
48
|
renderControls:controller=>{const zoom=controller.paneCamera(controller.availableCamera()??'rig').zoom;host.el('zoom-value').textContent=zoom===1?t('1:1'):`${(zoom*100).toFixed(1)}%`;host.el('native-one').setAttribute('aria-pressed',String(zoom===1));(host.el('camera-sync') as HTMLInputElement).checked=state.cameraSync;host.el('fit').textContent=t('Fit');}
|
|
28
49
|
};
|
|
29
|
-
return
|
|
50
|
+
return provider;
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
/** Compatibility for module consumers; the review screen selects this provider on its one controller. */
|
|
54
|
+
export function createPartsViewport(host:PartsViewportHost){const state=createViewportState();state.cameraSync=false;return createViewportController(createPartsViewportProvider(host,state),state);}
|
|
55
|
+
|
|
56
|
+
import type {partsViewJson} from '../src/parts-view.ts';
|
|
57
|
+
import {defaultPartsComparison,paintingRectangle,differencePixels,assertOriginalPaintingSize,type PartsComparison} from '../src/parts-comparison.ts';
|
|
58
|
+
import {paintAssembly,paintMesh,paintOverlay,paintPaintingCrop,type Box} from './parts-render.ts';
|
|
59
|
+
import {bindStageComments,type CommentCodec,type CommentUiPose,type CommentRow} from './stage-comments.ts';
|
|
60
|
+
import {parsePartsIssue,assertPartsIssueBinding,snapImageRegion,type PartsIssue} from '../src/parts-comment.ts';
|
|
61
|
+
import {projectMark,unprojectMark,region} from '../src/stage-comment.ts';
|
|
62
|
+
import {EMIT_UNPINNED_CREATE_FIELDS} from '../src/create-pin-gate.ts';
|
|
63
|
+
/** U5 uses the same native raster paint path as a parts subject, with the whole rig as one operand. */
|
|
64
|
+
export function paintRigDifference(canvas:HTMLCanvasElement,still:HTMLCanvasElement,painting:HTMLImageElement) {
|
|
65
|
+
assertOriginalPaintingSize(painting.naturalWidth,painting.naturalHeight,[still.width,still.height],1);
|
|
66
|
+
const original=Object.assign(document.createElement('canvas'),{width:still.width,height:still.height});
|
|
67
|
+
original.getContext('2d')!.drawImage(painting,0,0);
|
|
68
|
+
const raster=(source:HTMLCanvasElement)=>({width:source.width,height:source.height,data:new Uint8Array(source.getContext('2d')!.getImageData(0,0,source.width,source.height).data)});
|
|
69
|
+
const difference=differencePixels(raster(still),{x:0,y:0,w:still.width,h:still.height},raster(original),[],0,false);
|
|
70
|
+
const pixels=Object.assign(document.createElement('canvas'),{width:difference.width,height:difference.height});
|
|
71
|
+
pixels.getContext('2d')!.putImageData(new ImageData(new Uint8ClampedArray(difference.data),difference.width,difference.height),0,0);
|
|
72
|
+
canvas.width=difference.width;canvas.height=difference.height;
|
|
73
|
+
paintAssembly(canvas.getContext('2d')!,canvas.width,canvas.height,[{box:{name:'',index:0,x:0,y:0,w:canvas.width,h:canvas.height},image:pixels}],{bg:'checker',alpha:false,transparent:true});
|
|
74
|
+
return {count:difference.count,compared:difference.compared};
|
|
75
|
+
}
|
|
76
|
+
export type PartsSubjectData=ReturnType<typeof partsViewJson>;
|
|
77
|
+
export interface PartsSubjectEntry {subject:'parts';parts:PartsSubjectData}
|
|
78
|
+
export interface PartsSubjectSession {subject:'parts';issues:PartsIssue[]}
|
|
79
|
+
type Item=PartsSubjectData['items'][number];
|
|
80
|
+
interface PartsPose extends CommentUiPose {item:Item;sourceHash:string;view:PartsIssue['view']}
|
|
81
|
+
/** Source-specific pixels and evidence. Shell, list, toolbar, controller and act stay in main.ts. */
|
|
82
|
+
export function bindPartsSubject(host:{
|
|
83
|
+
data:PartsSubjectData;canvas:HTMLCanvasElement;referenceCanvas:HTMLCanvasElement;viewport:ViewportController;
|
|
84
|
+
el:ViewportProvider['el'];toolbar:HTMLElement;commentsHost:HTMLElement;issues:PartsIssue[];recordComments?:CommentRow[];
|
|
85
|
+
request:(path:string,init?:RequestInit)=>Promise<Response>;base:string;paintingPath:string;
|
|
86
|
+
mesh:()=>boolean;restoreMesh:(on:boolean)=>void;images:()=>boolean;changed:()=>void;selectionChanged:()=>void;locked:(id:string)=>boolean;refusal:()=>string|null;drawn:(input:{state:'loaded'}|{state:'failed';reason:string})=>void;message:ViewportProvider['message'];
|
|
87
|
+
}) {
|
|
88
|
+
const data=host.data,hidden=new Set<string>(),images=new Map<number,Promise<HTMLImageElement>>();
|
|
89
|
+
let selected:string|null=null,solo=false,comparison:PartsComparison=defaultPartsComparison(),token=0,disposed=false,busy=false,failed=false;
|
|
90
|
+
let drawnFrame:{w:number;h:number}|null=null,drawnReferenceFrame:{w:number;h:number}|null=null;
|
|
91
|
+
let drawnRegion:Box|null=null,drawnSolo=false;
|
|
92
|
+
let original:Promise<HTMLImageElement>|null=null,comments:ReturnType<typeof bindStageComments<CommentRow,PartsPose>>|null=null;
|
|
93
|
+
const makeCanvas=(w:number,h:number)=>Object.assign(document.createElement('canvas'),{width:w,height:h});
|
|
94
|
+
const item=()=>data.items.find(item=>item.name===selected)??data.items[0]!;
|
|
95
|
+
const assembled=()=>!solo||selected===null;
|
|
96
|
+
const box=():Box=>assembled()&&data.rigSize?{name:'',index:0,x:0,y:0,w:data.rigSize[0],h:data.rigSize[1]}:item();
|
|
97
|
+
const loadImage=async(path:string):Promise<HTMLImageElement>=>{
|
|
98
|
+
const image=await loadViewportImage(await host.request(path));
|
|
99
|
+
if(disposed)throw new Error('PARTS_PAINT_FAILED');return image;
|
|
100
|
+
};
|
|
101
|
+
const image=(entry:Item)=>{let pending=images.get(entry.index);if(!pending){pending=loadImage(`${host.base}/image/${entry.index}`);images.set(entry.index,pending);}return pending;};
|
|
102
|
+
const painting=()=>original??=loadImage(host.paintingPath);
|
|
103
|
+
const partsBinding=(names:readonly string[])=>names.map(name=>{const entry=data.items.find(item=>item.name===name);if(!entry?.imageHash)throw new Error('PARTS_COMMENT_PART_MISMATCH');return {name,imageHash:entry.imageHash};});
|
|
104
|
+
const sourceItems=()=>new Map(data.items.map(item=>[item.name,{...item,imageHash:item.imageHash!}]));
|
|
105
|
+
async function prepare(issue:PartsIssue):Promise<PartsIssue>{
|
|
106
|
+
if(!EMIT_UNPINNED_CREATE_FIELDS&&Object.hasOwn(issue.view,'visibleLayers')){const {visibleLayers:_ignored,...view}=issue.view;issue={...issue,view};}
|
|
107
|
+
const bound=parsePartsIssue(issue,false,false,false);assertPartsIssueBinding(bound,sourceItems(),data.sourceHash);
|
|
108
|
+
const response=await host.request(`${host.base}/comment`,{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify(bound)});
|
|
109
|
+
if(disposed)throw new Error('PARTS_COMMENT_STALE_SOURCE');return parsePartsIssue((await response.json()).comment,true,false,false);
|
|
110
|
+
}
|
|
111
|
+
/** Paint a frozen navigation generation, then publish it. A failed or superseded draw never leaves stale pixels targetable. */
|
|
112
|
+
async function paint():Promise<void>{
|
|
113
|
+
const navigation=++token;busy=true;comments?.refresh();host.el('stage-layout').setAttribute('aria-busy','true');
|
|
114
|
+
const bitmaps:ImageBitmap[]=[];
|
|
115
|
+
try{
|
|
116
|
+
if(data.mode!=='parts'||!data.items.length)throw new Error('PARTS_IMAGE_UNAVAILABLE');
|
|
117
|
+
const frame=box(),referenceBox=selected===null?null:item(),shown=assembled()?data.items.filter(item=>!hidden.has(item.name)):[item()];
|
|
118
|
+
const layers=await Promise.all(shown.map(async entry=>({box:entry,image:await image(entry)})));
|
|
119
|
+
let reference:HTMLCanvasElement|null=null;
|
|
120
|
+
if(data.painting&&data.rigSize){
|
|
121
|
+
const original=await painting();
|
|
122
|
+
reference=makeCanvas(referenceBox?.w??original.naturalWidth,referenceBox?.h??original.naturalHeight);
|
|
123
|
+
if(referenceBox)paintPaintingCrop(reference.getContext('2d')!,original,paintingRectangle(referenceBox,data.rigSize,data.painting),referenceBox.w,referenceBox.h,'checker');
|
|
124
|
+
else reference.getContext('2d')!.drawImage(original,0,0);
|
|
125
|
+
}
|
|
126
|
+
const raster=makeCanvas(frame.w,frame.h),ctx=raster.getContext('2d')!;
|
|
127
|
+
if(comparison.mode==='difference'){
|
|
128
|
+
const differences=[];
|
|
129
|
+
for(const entry of shown){const response=await host.request(`${host.base}/difference/${entry.index}?threshold=${comparison.threshold}&footprints=false`);const bitmap=await createImageBitmap(await response.blob());bitmaps.push(bitmap);differences.push({box:assembled()?entry:{...entry,x:0,y:0},image:bitmap});}
|
|
130
|
+
paintAssembly(ctx,frame.w,frame.h,differences,{bg:'checker',alpha:false,transparent:true});
|
|
131
|
+
}else if(comparison.mode==='overlay'&&data.painting&&data.rigSize){
|
|
132
|
+
const original=await painting();
|
|
133
|
+
if(assembled()){
|
|
134
|
+
paintPaintingCrop(ctx,original,paintingRectangle(frame,data.rigSize,data.painting),frame.w,frame.h,'checker');
|
|
135
|
+
const composite=makeCanvas(frame.w,frame.h);paintAssembly(composite.getContext('2d')!,frame.w,frame.h,layers,{bg:'checker',alpha:false,transparent:true});
|
|
136
|
+
ctx.globalAlpha=comparison.opacity;if(host.images())ctx.drawImage(composite,0,0);ctx.globalAlpha=1;
|
|
137
|
+
}else if(host.images())paintOverlay(ctx,item(),layers[0]!.image,original,paintingRectangle(item(),data.rigSize,data.painting),comparison.opacity,'checker');
|
|
138
|
+
}else if(host.images())paintAssembly(ctx,frame.w,frame.h,layers.map(layer=>assembled()?layer:{...layer,box:{...layer.box,x:0,y:0}}),{bg:'checker',alpha:false,transparent:true});
|
|
139
|
+
if(host.mesh())for(const layer of layers){if(!layer.box.mesh)continue;ctx.save();if(assembled())ctx.translate(layer.box.x,layer.box.y);paintMesh(ctx,layer.image,layer.box.w,layer.box.h,layer.box.mesh,makeCanvas,{tint:selected===null||selected===layer.box.name});ctx.restore();}
|
|
140
|
+
if(disposed||navigation!==token)return;
|
|
141
|
+
host.canvas.width=frame.w;host.canvas.height=frame.h;host.canvas.getContext('2d')!.drawImage(raster,0,0);
|
|
142
|
+
const selectionChanged=drawnRegion?.name!==referenceBox?.name||drawnSolo!==!assembled();
|
|
143
|
+
drawnRegion=referenceBox;drawnSolo=!assembled();
|
|
144
|
+
if(reference){host.referenceCanvas.width=reference.width;host.referenceCanvas.height=reference.height;host.referenceCanvas.getContext('2d')!.drawImage(reference,0,0);drawnReferenceFrame={w:reference.width,h:reference.height};}
|
|
145
|
+
drawnFrame={w:frame.w,h:frame.h};failed=false;host.drawn({state:'loaded'});host.el('rig-empty').hidden=true;host.el('rig-label').textContent=t(assembled()?'Assembled parts':'Selected part');
|
|
146
|
+
if(data.painting&&host.viewport.state.cameraSync&&selectionChanged)host.viewport.requestFit();
|
|
147
|
+
host.viewport.fitCamera();comments?.refresh();
|
|
148
|
+
}catch(error){if(!disposed&&navigation===token){failed=true;drawnFrame=null;drawnReferenceFrame=null;host.drawn({state:'failed',reason:error instanceof Error?error.message:'PARTS_PAINT_FAILED'});host.canvas.getContext('2d')?.clearRect(0,0,host.canvas.width,host.canvas.height);host.referenceCanvas.getContext('2d')?.clearRect(0,0,host.referenceCanvas.width,host.referenceCanvas.height);host.message(error instanceof Error?error.message:'PARTS_PAINT_FAILED',true);throw error;}}
|
|
149
|
+
finally{for(const bitmap of bitmaps)bitmap.close();if(navigation===token){busy=false;host.el('stage-layout').setAttribute('aria-busy','false');comments?.refresh();}}
|
|
150
|
+
}
|
|
151
|
+
const redraw=()=>{void paint().catch(()=>{});};
|
|
152
|
+
const codec:CommentCodec<CommentRow,PartsPose>={
|
|
153
|
+
read:raw=>{try{const c=parsePartsIssue(raw,false,true,false),camera={space:'image' as const,center:c.view.camera.center,zoom:c.view.camera.zoom,viewport:c.view.camera.viewport,visible:{x:c.view.camera.center.x-c.view.camera.viewport.width/c.view.camera.zoom/2,y:c.view.camera.center.y-c.view.camera.viewport.height/c.view.camera.zoom/2,width:c.view.camera.viewport.width/c.view.camera.zoom,height:c.view.camera.viewport.height/c.view.camera.zoom}},r=c.view.mode==='assembled'?c.rigRegion:c.imageRegion!;return {mode:'parts',viewport:'rig',screen:region(projectMark(r,camera),projectMark({x:r.x+r.width,y:r.y+r.height},camera)),world:r,camera,crop:{...c.crop,png:c.crop.png??''},bookmark:c};}catch{return null;}},
|
|
154
|
+
signature:pose=>[pose.sourceHash,pose.item.name,pose.item.imageHash,pose.view],
|
|
155
|
+
matches:(_mark,pose,raw)=>{try{const c=parsePartsIssue(raw,false,true,false);return pose.sourceHash===c.sourceHash&&pose.view.mode===c.view.mode&&(assembled()||c.parts[0]?.name===pose.item.name);}catch{return false;}},
|
|
156
|
+
label:raw=>{const issue=parsePartsIssue(raw,false,true,false);return `${issue.parts.map(part=>part.name).join(', ')} · ${issue.summary}`;},
|
|
157
|
+
chips:(pose,_screen,existing)=>({selected:existing?parsePartsIssue(existing,false,true,false).parts.map(part=>part.name):(pose.view.mode==='item'?[pose.item.name]:[]),candidates:pose.view.mode==='assembled'?data.items.filter(item=>!hidden.has(item.name)).map(item=>item.name):[]}),
|
|
158
|
+
create:async(pose,_view,screen,crop,_bookmark,summary,parts)=>{
|
|
159
|
+
const frame=box(),r=snapImageRegion(region(unprojectMark(screen,pose.camera),unprojectMark({x:screen.x+screen.width,y:screen.y+screen.height},pose.camera),{x:0,y:0,width:frame.w,height:frame.h})),single=pose.view.mode==='item';
|
|
160
|
+
return prepare({schema:'rig-review-parts-comment/2',id:crypto.randomUUID(),summary,sourceHash:data.sourceHash,parts:partsBinding(single?[pose.item.name]:parts??[]),rigRegion:single?{...r,x:r.x+pose.item.x,y:r.y+pose.item.y}:r,imageRegion:single?r:null,view:structuredClone(pose.view),crop,nativeCrop:null});
|
|
161
|
+
},
|
|
162
|
+
update:(raw,summary,parts)=>{const existing=parsePartsIssue(raw,false,true,false);return prepare({...existing,summary,parts:existing.view.mode==='assembled'?partsBinding(parts??[]):existing.parts});},
|
|
163
|
+
};
|
|
164
|
+
const pose=():PartsPose|null=>{
|
|
165
|
+
let camera=host.viewport.numericView().cameras.rig;const entry=item();if(!camera||!entry||busy||failed||disposed)return null;
|
|
166
|
+
if(data.painting&&!assembled())camera={...camera,center:{x:camera.center.x-entry.x,y:camera.center.y-entry.y},visible:{...camera.visible,x:camera.visible.x-entry.x,y:camera.visible.y-entry.y}};
|
|
167
|
+
return {mode:'parts',item:entry,sourceHash:data.sourceHash,camera,view:{mode:assembled()?'assembled':'item',camera:{zoom:camera.zoom,center:camera.center,viewport:camera.viewport},cameraSync:host.viewport.state.cameraSync,referenceCamera:null,background:'checker',alpha:false,footprints:false,mesh:host.mesh(),comparison:{...comparison},...(assembled()&&EMIT_UNPINNED_CREATE_FIELDS?{visibleLayers:partsBinding(data.items.filter(item=>!hidden.has(item.name)).map(item=>item.name))}:{})},capture:{pane:host.el('rig-viewport'),root:host.el('rig-root'),images:true,canvas:host.canvas,backend:'canvas2d',nearest:true}};
|
|
168
|
+
};
|
|
169
|
+
comments=bindStageComments<CommentRow,PartsPose>({general:host.recordComments?{create:summary=>({id:crypto.randomUUID(),summary}),matches:row=>!('schema' in row)}:undefined,toolbar:host.toolbar,listHost:host.commentsHost,toggle:host.el<HTMLButtonElement>('stage-comment'),viewports:{rig:host.el('rig-viewport')},pose,pause:async()=>{},bookmark:()=>null,
|
|
170
|
+
restore:async raw=>{const issue=parsePartsIssue(raw,false,true,false);assertPartsIssueBinding(issue,sourceItems(),data.sourceHash);selected=issue.parts[0]!.name;solo=issue.view.mode==='item';comparison=issue.view.comparison??defaultPartsComparison();host.restoreMesh(issue.view.mesh);if(issue.view.visibleLayers){const visible=new Set(issue.view.visibleLayers.map(part=>part.name));hidden.clear();for(const item of data.items)if(!visible.has(item.name))hidden.add(item.name);}await paint();host.viewport.writeCamera('rig',data.painting&&solo?{...issue.view.camera,center:{x:issue.view.camera.center.x+item().x,y:issue.view.camera.center.y+item().y}}:issue.view.camera);host.viewport.activateCamera('rig');if(host.viewport.state.cameraSync)host.viewport.alignCameras();host.viewport.fitCamera();host.selectionChanged();},
|
|
171
|
+
feedback:()=>host.recordComments??host.issues,locked:host.locked,refusal:host.refusal,add:row=>{if(host.recordComments)host.recordComments.push(row);else host.issues.push(row as PartsIssue);},changed:host.changed,error:host.message,blocked:()=>busy||failed||disposed,busy:()=>busy,codec});
|
|
172
|
+
return {
|
|
173
|
+
frameSize:(target:CameraTarget):PartsFrame|null=>{
|
|
174
|
+
const frame=target==='rig'?drawnFrame:drawnReferenceFrame;if(!frame||!data.painting||!data.rigSize)return frame;
|
|
175
|
+
const full={x:0,y:0,w:data.rigSize[0],h:data.rigSize[1]},region=drawnRegion??full;
|
|
176
|
+
const bounds=target==='reference'||host.viewport.state.cameraSync||drawnSolo?region:full;
|
|
177
|
+
const origin=target==='reference'||drawnSolo?{x:region.x,y:region.y}:{x:0,y:0};
|
|
178
|
+
const scale=target==='reference'&&!drawnRegion?{x:region.w/frame.w,y:region.h/frame.h}:{x:1,y:1};
|
|
179
|
+
return {...frame,world:{box:{x:bounds.x,y:bounds.y,width:bounds.w,height:bounds.h},origin,scale}};
|
|
180
|
+
},
|
|
181
|
+
image:(index:number)=>{const entry=data.items.find(item=>item.index===index);if(!entry)return Promise.reject(new Error('PARTS_IMAGE_UNAVAILABLE'));return image(entry);},
|
|
182
|
+
items:()=>data.items,sourceHash:()=>data.sourceHash,refreshComments:()=>comments?.refresh(),selected:()=>selected,solo:()=>solo,visible:(name:string)=>!hidden.has(name),issues:()=>host.issues,
|
|
183
|
+
select:(name:string|null)=>{selected=name;if(name===null)solo=false;redraw();host.selectionChanged();},isolate:(value:boolean)=>{solo=value;redraw();host.selectionChanged();},
|
|
184
|
+
show:(name:string,value:boolean)=>{if(value)hidden.delete(name);else hidden.add(name);redraw();},
|
|
185
|
+
differenceAvailable:()=>data.differenceAvailable&&!!data.painting&&!failed,
|
|
186
|
+
comparison:()=>comparison,setComparison:(mode:PartsComparison['mode'])=>{comparison=mode==='difference'?{mode,opacity:comparison.opacity,threshold:0}:{mode,opacity:comparison.opacity};redraw();},
|
|
187
|
+
opacity:(value:number)=>{comparison.opacity=value;redraw();},paint,redraw,
|
|
188
|
+
async ready(){if(data.painting)host.viewport.state.cameraSync=true;await paint();},
|
|
189
|
+
dispose(){disposed=true;++token;comments?.dispose();images.clear();},
|
|
190
|
+
};
|
|
191
|
+
}
|
|
192
|
+
|
|
193
|
+
export interface StagePartsState {
|
|
194
|
+
inspectionSourceHash:string;part:string;imageHash:string;box:{x:number;y:number;w:number;h:number};mapping:{skin:string;slot:string;attachment:string};
|
|
195
|
+
rig:{zoom:number;center:{x:number;y:number}|null};reference:{zoom:number;center:{x:number;y:number}|null};cameraSync:boolean;
|
|
196
|
+
bg:string;alpha:boolean;footprints:boolean;view:'item'|'page'|'assembled';mesh:boolean;
|
|
197
|
+
}
|
|
198
|
+
/** Navigation state transfers only over exact original-art/package identity and the same draft address. */
|
|
199
|
+
export function stagePartsSelectionIndex(data:{inspectionSourceHash?:string;items:{name:string;imageHash?:string;x:number;y:number;w:number;h:number}[];draft?:{mappings:{part:string;skin:string;slot:string;attachment:string}[]}},saved:StagePartsState):number {
|
|
200
|
+
const i=data.items.findIndex(item=>item.name===saved.part&&item.imageHash===saved.imageHash&&(['x','y','w','h']as const).every(k=>item[k]===saved.box[k]));
|
|
201
|
+
const m=data.draft?.mappings.find(m=>m.part===saved.part);
|
|
202
|
+
if(i<0||data.inspectionSourceHash!==saved.inspectionSourceHash||!m||(['skin','slot','attachment']as const).some(k=>m[k]!==saved.mapping[k]))throw new Error('STAGE_DRAFT_MISMATCH');
|
|
203
|
+
return i;
|
|
30
204
|
}
|
package/web/physics-panel.ts
CHANGED
|
@@ -4,6 +4,7 @@
|
|
|
4
4
|
* Reset, the Apply status and the check readout. The panel's inputs carry no ids, so the source draft keeps only the
|
|
5
5
|
* pending-ops record (`#physics-pending`) and never counts a control per constraint.
|
|
6
6
|
*/
|
|
7
|
+
import {panelNode as node,panelMake as make} from './view-controls.ts';
|
|
7
8
|
import {applyRamp,componentValue,draftEdits,draftText,nearestChain,patchOps,physicsChains,rowControls,setEdit,TUNING_FIELDS,COMPONENT_FIELDS,type PendingEdit,type PhysicsChain,type PhysicsField,type TuningRow,type TuningTable} from '../src/physics-tuning.ts';
|
|
8
9
|
import type {PatchOp} from '../src/config-patch.ts';
|
|
9
10
|
import type {PhysicsPreviewRead} from './preview.ts';
|
|
@@ -35,8 +36,6 @@ export interface PhysicsPanel {
|
|
|
35
36
|
dispose():void;
|
|
36
37
|
}
|
|
37
38
|
|
|
38
|
-
const node=<T extends HTMLElement>(id:string)=>{const found=document.getElementById(id);if(!found)throw new Error(`Missing UI element: ${id}`);return found as T;};
|
|
39
|
-
const make=<K extends keyof HTMLElementTagNameMap>(tag:K,props:Record<string,unknown>={},...children:(Node|string)[]):HTMLElementTagNameMap[K]=>{const item=document.createElement(tag);Object.assign(item,props);item.append(...children);return item;};
|
|
40
39
|
const shown=(value:number|undefined)=>value===undefined?'—':String(Number(value.toPrecision(6)));
|
|
41
40
|
|
|
42
41
|
export function bindPhysicsPanel(deps:PhysicsPanelDeps):PhysicsPanel {
|
package/web/readings-panel.ts
CHANGED
|
@@ -4,6 +4,7 @@
|
|
|
4
4
|
* lines and the timeline ticks on the transport scrub — two colours, the inspected build above the scratch build — each
|
|
5
5
|
* tick a button that seeks to its frame's time. The server runs `rigc render`; this draws what came back.
|
|
6
6
|
*/
|
|
7
|
+
import {panelNode as node,panelMake as make} from './view-controls.ts';
|
|
7
8
|
import {readingTicks,ticksOnClip,TICK_EDGE,worstLine,type ReadingBuild,type ReadingRequest,type ReadingResult,type ReadingTick} from '../src/readings.ts';
|
|
8
9
|
import {scrubBox} from './scrub-box.ts';
|
|
9
10
|
|
|
@@ -23,8 +24,6 @@ export interface ReadingsPanel {
|
|
|
23
24
|
}
|
|
24
25
|
export interface ReadingsPanelDeps {run:()=>void;seek:(animation:string,frame:number,time:number|null,label:string)=>void}
|
|
25
26
|
|
|
26
|
-
const node=<T extends HTMLElement>(id:string)=>{const found=document.getElementById(id);if(!found)throw new Error(`Missing UI element: ${id}`);return found as T;};
|
|
27
|
-
const make=<K extends keyof HTMLElementTagNameMap>(tag:K,props:Record<string,unknown>={},...children:(Node|string)[]):HTMLElementTagNameMap[K]=>{const item=document.createElement(tag);Object.assign(item,props);item.append(...children);return item;};
|
|
28
27
|
/** The range input's thumb travels inside the track by about its own width; ticks sit under the thumb's centre. */
|
|
29
28
|
const THUMB=14;
|
|
30
29
|
export const EDGE=TICK_EDGE;
|
|
@@ -8,6 +8,7 @@
|
|
|
8
8
|
* A kind the rig cannot offer (no mesh slot, no ik or transform constraint, fewer than two slots) is disabled with the
|
|
9
9
|
* reason. Scene targets, stage-point targets, the part exception lists and waivers (`may_fold`) are not written here.
|
|
10
10
|
*/
|
|
11
|
+
import {panelNode as node,panelMake as make,labelledControl as labelled} from './view-controls.ts';
|
|
11
12
|
import {KIND_FIELDS,REQUIREMENT_KINDS,REQUIREMENT_NAME,REQUIREMENTS_CONTEXT_SCHEMA,requirementEntry,requirementsDocument,requirementsFileText,type BonePoint,type Requirement,type RequirementKind,type RequirementRow,type RequirementsBuild,type RequirementsContext} from '../src/requirements.ts';
|
|
12
13
|
|
|
13
14
|
export interface RequirementsCatalogView {status:'ready'|'unavailable';reason:string|null;bones:string[];slots:string[];meshes:Record<string,string[]>;slotBones:Record<string,string>;constraints:{name:string;type:'ik'|'transform';bones:string[];drives:string[]}[];animations:{name:string;duration:number|null}[];scratch:string|null}
|
|
@@ -77,10 +78,7 @@ export function measuredFor(row:RequirementRow|undefined,field:string):number|nu
|
|
|
77
78
|
if(!row)return null;if(field==='lo_degrees')return row.least;if(field==='hi_degrees')return row.greatest;return row.measured;
|
|
78
79
|
}
|
|
79
80
|
|
|
80
|
-
const node=<T extends HTMLElement>(id:string)=>{const found=document.getElementById(id);if(!found)throw new Error(`Missing UI element: ${id}`);return found as T;};
|
|
81
|
-
const make=<K extends keyof HTMLElementTagNameMap>(tag:K,props:Record<string,unknown>={},...children:(Node|string)[]):HTMLElementTagNameMap[K]=>{const item=document.createElement(tag);Object.assign(item,props);item.append(...children);return item;};
|
|
82
81
|
const options=(select:HTMLSelectElement,values:readonly string[],label=(v:string)=>v)=>{const keep=select.value;select.replaceChildren(...values.map(v=>make('option',{value:v,textContent:label(v)})));if(values.includes(keep))select.value=keep;};
|
|
83
|
-
const labelled=(text:string,control:HTMLElement)=>make('label',{},text,control);
|
|
84
82
|
|
|
85
83
|
export function bindRequirementsPanel(deps:RequirementsPanelDeps):RequirementsPanel {
|
|
86
84
|
const body=node('requirements-body');
|
|
@@ -0,0 +1,105 @@
|
|
|
1
|
+
import {panelMake} from './view-controls.ts';
|
|
2
|
+
import {mountStatusBar, mountWorkspaceShell} from './workspace-ui.ts';
|
|
3
|
+
|
|
4
|
+
/** Retains each child window and its draft; hosts supply only identity and protocol fields. */
|
|
5
|
+
export function createRetainedFrameStage<Entry extends {frame: HTMLIFrameElement}>(options: {
|
|
6
|
+
stage: HTMLElement;
|
|
7
|
+
limit(): number;
|
|
8
|
+
key(entry: Entry): string;
|
|
9
|
+
message(entry: Entry): object;
|
|
10
|
+
language(): string;
|
|
11
|
+
origin: string;
|
|
12
|
+
visibilityOrder: 'before-state' | 'after-state';
|
|
13
|
+
languageChange: 'selection' | 'visibility';
|
|
14
|
+
}) {
|
|
15
|
+
const frames = new Map<string, Entry>();
|
|
16
|
+
let selected: string | null = null, intent = 0, disposed = false;
|
|
17
|
+
function visibility(entry: Entry) {
|
|
18
|
+
entry.frame.contentWindow?.postMessage({...options.message(entry),
|
|
19
|
+
visible: options.key(entry) === selected, language: options.language()}, options.origin);
|
|
20
|
+
}
|
|
21
|
+
function showSelection() {
|
|
22
|
+
for (const entry of frames.values()) {
|
|
23
|
+
if (options.visibilityOrder === 'before-state') visibility(entry);
|
|
24
|
+
entry.frame.hidden = options.key(entry) !== selected;
|
|
25
|
+
entry.frame.inert = entry.frame.hidden;
|
|
26
|
+
entry.frame.setAttribute('aria-hidden', String(entry.frame.hidden));
|
|
27
|
+
if (options.visibilityOrder === 'after-state') visibility(entry);
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
return {
|
|
31
|
+
get selected() {return selected;},
|
|
32
|
+
get: (key: string) => frames.get(key),
|
|
33
|
+
createFrame(title: string, src: string) {
|
|
34
|
+
const frame = document.createElement('iframe'); frame.title = title; frame.hidden = true; frame.src = src;
|
|
35
|
+
return frame;
|
|
36
|
+
},
|
|
37
|
+
atLimit: () => frames.size >= options.limit(),
|
|
38
|
+
retain(entry: Entry) {frames.set(options.key(entry), entry); options.stage.append(entry.frame);},
|
|
39
|
+
beginSelection: () => ++intent,
|
|
40
|
+
isCurrent: (selection: number) => !disposed && selection === intent,
|
|
41
|
+
select(key: string) {selected = key; showSelection();},
|
|
42
|
+
visibility,
|
|
43
|
+
languageChanged() {
|
|
44
|
+
if (options.languageChange === 'selection') showSelection();
|
|
45
|
+
else for (const entry of frames.values()) visibility(entry);
|
|
46
|
+
},
|
|
47
|
+
dispose() {disposed = true;},
|
|
48
|
+
};
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
export interface RetainedSubjectItem {
|
|
52
|
+
key: string;
|
|
53
|
+
dataset: Readonly<Record<string, string>>;
|
|
54
|
+
label: string;
|
|
55
|
+
state: string;
|
|
56
|
+
detail: string | null;
|
|
57
|
+
onSelect(): void;
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
/** Shared composition preserves each host's original header status, rows and retained stage. */
|
|
61
|
+
export function mountRetainedWorkspace(options: {root: HTMLElement; kind: 'owner'}) {
|
|
62
|
+
const {root, kind} = options;
|
|
63
|
+
root.dataset.retainedWorkspace = kind;
|
|
64
|
+
const shell = mountWorkspaceShell({compatibility: 'legacyOwnerStep6'});
|
|
65
|
+
const {header, title} = shell, language = shell.language!;
|
|
66
|
+
const {message} = mountStatusBar({placement: 'inline', message: shell.status!});
|
|
67
|
+
const list = panelMake('nav', {className: 'owner-list'});
|
|
68
|
+
const stage = panelMake('main', {className: 'owner-stage'});
|
|
69
|
+
root.replaceChildren(header, list, stage);
|
|
70
|
+
function render(view: {
|
|
71
|
+
lang: string;
|
|
72
|
+
heading: string;
|
|
73
|
+
listLabel: string;
|
|
74
|
+
languageLabel: string;
|
|
75
|
+
englishLabel: string;
|
|
76
|
+
koreanLabel: string;
|
|
77
|
+
message?: string;
|
|
78
|
+
selected: string | null;
|
|
79
|
+
items: readonly RetainedSubjectItem[];
|
|
80
|
+
}) {
|
|
81
|
+
document.documentElement.lang = view.lang;
|
|
82
|
+
title.textContent = view.heading;
|
|
83
|
+
document.title = view.heading;
|
|
84
|
+
list.setAttribute('aria-label', view.listLabel);
|
|
85
|
+
language.setAttribute('aria-label', view.languageLabel);
|
|
86
|
+
language.options[0]!.textContent = view.englishLabel;
|
|
87
|
+
language.options[1]!.textContent = view.koreanLabel;
|
|
88
|
+
language.value = view.lang;
|
|
89
|
+
if (view.message !== undefined) message.textContent = view.message;
|
|
90
|
+
list.replaceChildren();
|
|
91
|
+
for (const item of view.items) {
|
|
92
|
+
const button = panelMake('button', {type: 'button'});
|
|
93
|
+
for (const [name, value] of Object.entries(item.dataset)) button.dataset[name] = value;
|
|
94
|
+
button.setAttribute('aria-pressed', String(item.key === view.selected));
|
|
95
|
+
const label = panelMake('span', {textContent: item.label});
|
|
96
|
+
label.className = 'owner-target-title';
|
|
97
|
+
const state = panelMake('span', {className: 'owner-target-status', textContent: item.state});
|
|
98
|
+
const detail = panelMake('span', {className: 'owner-target-animation', textContent: item.detail ?? ''});
|
|
99
|
+
button.append(label, state, detail);
|
|
100
|
+
button.onclick = item.onSelect;
|
|
101
|
+
list.append(button);
|
|
102
|
+
}
|
|
103
|
+
}
|
|
104
|
+
return {list, stage, language, message, render};
|
|
105
|
+
}
|
package/web/retarget-panel.ts
CHANGED
|
@@ -7,6 +7,7 @@
|
|
|
7
7
|
* its frame. The map starts from a loaded `rig-pose-map/1` file (read in the page, sent by content) or the body-18
|
|
8
8
|
* chains with no bone picked. Review authors no keys: the motion is the producer's.
|
|
9
9
|
*/
|
|
10
|
+
import {panelNode as node,panelMake as make,labelledControl} from './view-controls.ts';
|
|
10
11
|
import {DEFAULT_CLEAN,DEFAULT_FLAGS,POSE_MAP_SCHEMA,type RetargetFlags,type RetargetLine} from '../src/retarget.ts';
|
|
11
12
|
import type {RetargetJobView,RetargetStatusView,RebuildRefusal} from './rebuild-client.ts';
|
|
12
13
|
|
|
@@ -58,10 +59,8 @@ export interface RetargetPanel {
|
|
|
58
59
|
shownLines():string[];
|
|
59
60
|
}
|
|
60
61
|
|
|
61
|
-
const node=<T extends HTMLElement>(id:string)=>{const found=document.getElementById(id);if(!found)throw new Error(`Missing UI element: ${id}`);return found as T;};
|
|
62
|
-
const make=<K extends keyof HTMLElementTagNameMap>(tag:K,props:Record<string,unknown>={},...children:(Node|string)[]):HTMLElementTagNameMap[K]=>{const item=document.createElement(tag);Object.assign(item,props);item.append(...children);return item;};
|
|
63
62
|
// A checkbox reads after its box; a field after its name.
|
|
64
|
-
const labelled=(text:string,control:HTMLElement)=>control instanceof HTMLInputElement&&control.type==='checkbox'
|
|
63
|
+
const labelled=(text:string,control:HTMLElement)=>labelledControl(text,control,control instanceof HTMLInputElement&&control.type==='checkbox');
|
|
65
64
|
const numberInput=(id:string,value:number,step:string,label:string)=>{const n=make('input',{id,type:'number',step,value:String(value)});n.setAttribute('aria-label',label);return n;};
|
|
66
65
|
const checkbox=(id:string,checked=false)=>make('input',{id,type:'checkbox',checked});
|
|
67
66
|
|
package/web/rig-fields-panel.ts
CHANGED
|
@@ -7,6 +7,7 @@
|
|
|
7
7
|
* baseline guard; Reset returns to the inspected build. The source draft keeps the pending ops (`#rig-fields-pending`);
|
|
8
8
|
* the generated controls carry no ids.
|
|
9
9
|
*/
|
|
10
|
+
import {panelNode as node,panelMake as make} from './view-controls.ts';
|
|
10
11
|
import {arcBound,dragRow,readingPair,fieldsApplyEnabled,fieldsDraftEdits,fieldsDraftText,INHERIT_MODES,rigFieldOps,rigFieldsSource,seedStill,setInherit,setRegion,setStill,setStop,setTurn,stillParts,stopArcs,turnDial,TURN_DIAL_RANGE,TURN_PREVIEW_LABEL,type FieldEdit,type RigFieldsSource,type RigPoint,type StillEntry} from '../src/rig-fields.ts';
|
|
11
12
|
import type {JsonValue,PatchOp} from '../src/config-patch.ts';
|
|
12
13
|
|
|
@@ -54,8 +55,6 @@ export interface RigFieldsPanel {
|
|
|
54
55
|
place():void;restore():void;clear():void;dispose():void;
|
|
55
56
|
}
|
|
56
57
|
|
|
57
|
-
const node=<T extends HTMLElement>(id:string)=>{const found=document.getElementById(id);if(!found)throw new Error(`Missing UI element: ${id}`);return found as T;};
|
|
58
|
-
const make=<K extends keyof HTMLElementTagNameMap>(tag:K,props:Record<string,unknown>={},...children:(Node|string)[]):HTMLElementTagNameMap[K]=>{const item=document.createElement(tag);Object.assign(item,props);item.append(...children);return item;};
|
|
59
58
|
const SVG='http://www.w3.org/2000/svg';
|
|
60
59
|
const svg=<K extends keyof SVGElementTagNameMap>(tag:K,attrs:Record<string,string|number>):SVGElementTagNameMap[K]=>{const e=document.createElementNS(SVG,tag);for(const [k,v] of Object.entries(attrs))e.setAttribute(k,String(v));return e;};
|
|
61
60
|
const shown=(v:JsonValue|undefined)=>v===undefined?'(absent)':typeof v==='string'?v:JSON.stringify(v);
|
package/web/rig-host.ts
ADDED
|
@@ -0,0 +1,64 @@
|
|
|
1
|
+
/** The one review screen's host seam (#709). A live job sets it before importing the rig composition
|
|
2
|
+
* (`main.ts`): the job keeps the transport, the screen keeps its own view. Unset, the screen is the package page. */
|
|
3
|
+
import type {ModelAssets, PosedFrame} from '@rig-c/play';
|
|
4
|
+
import type {PartsIssue} from '../src/parts-comment.ts';
|
|
5
|
+
import type {PendingAskV3} from '../src/job-contract.ts';
|
|
6
|
+
import type {ReviewSession} from '../src/session.ts';
|
|
7
|
+
import type {InspectionBookmark} from './inspection-persistence.ts';
|
|
8
|
+
import type {ControlView} from '../src/control.ts';
|
|
9
|
+
import type {InstanceAccess} from './instance-access.ts';
|
|
10
|
+
import type {JobRigStage} from './job-rig-capture.ts';
|
|
11
|
+
|
|
12
|
+
/** The rig pane as the screen holds it now, for the job's still. */
|
|
13
|
+
export type RigHostStage = Omit<JobRigStage, 'source' | 'presentation'> & {
|
|
14
|
+
readonly posed: PosedFrame | undefined;
|
|
15
|
+
readonly assets: ModelAssets | null;
|
|
16
|
+
};
|
|
17
|
+
export type RigHostNavigation = {subject:'rig';bookmark:InspectionBookmark} |
|
|
18
|
+
{subject:'parts';part:string|null;solo:boolean;view:string;camera:ControlView};
|
|
19
|
+
export interface RigHostScreen {
|
|
20
|
+
navigation?():RigHostNavigation;
|
|
21
|
+
incompatible?():boolean;
|
|
22
|
+
suspend?():void;
|
|
23
|
+
resume?():void|Promise<void>;
|
|
24
|
+
dispose?():void;
|
|
25
|
+
/** Null while no rig is drawn. */
|
|
26
|
+
stage(): RigHostStage | null;
|
|
27
|
+
/** Draw the held frame again so the posed frame and the player share one generation. */
|
|
28
|
+
redraw(): void;
|
|
29
|
+
message(text: string, error?: boolean, diagnostic?: string): void;
|
|
30
|
+
pendingSubjects?(subjects:readonly PendingAskV3['subject'][]):void;
|
|
31
|
+
recordForms?(forms:readonly HTMLFormElement[]):void;
|
|
32
|
+
}
|
|
33
|
+
/** Only the content carried by an act the host has actually committed. This is local UI state, not an act field. */
|
|
34
|
+
export interface RigHostCommit {
|
|
35
|
+
readonly at: string;
|
|
36
|
+
readonly checkpoints?: ReviewSession['checkpoints'];
|
|
37
|
+
readonly review?: Pick<ReviewSession, 'status' | 'feedback'>;
|
|
38
|
+
}
|
|
39
|
+
export interface RigHost {
|
|
40
|
+
readonly subject?:'parts';
|
|
41
|
+
readonly unavailable?:string;
|
|
42
|
+
readonly direction?:{readonly publicationId:string;readonly sourceHash:string};
|
|
43
|
+
readonly navigation?:RigHostNavigation;
|
|
44
|
+
/** Derived from the displayed subject's finalized verdict; never a mode or another subject's act. */
|
|
45
|
+
reviewState?(issues:number,sending:boolean):string;
|
|
46
|
+
readonly record?:{readonly publicationId?:string;readonly label:string;readonly sourceHash:string;readonly hasPicture:boolean};
|
|
47
|
+
submitParts?(issues:readonly PartsIssue[]):Promise<string>;
|
|
48
|
+
readonly access: InstanceAccess;
|
|
49
|
+
/** UI act authority is separate from a retained backdrop's immutable source access. */
|
|
50
|
+
readonly ownerActAccess?: Pick<InstanceAccess, 'capability'>;
|
|
51
|
+
/** Existing pending subjects, for the local act heading only; no wire field. */
|
|
52
|
+
pendingSubjects?():readonly PendingAskV3['subject'][];
|
|
53
|
+
/** A read the host answers itself, or undefined to fetch it from the subject's routes. */
|
|
54
|
+
read(path: string, method: string): Promise<unknown> | undefined;
|
|
55
|
+
/** The act bar's Submit review: the session's decisions go out as the pending asks' acts. */
|
|
56
|
+
submit(session: ReviewSession, committed: (commit: RigHostCommit) => void | Promise<void>, directionWords?:string): Promise<string>;
|
|
57
|
+
attach(screen: RigHostScreen): void;
|
|
58
|
+
/** The first rig draw is on screen (or the open failed): the job acknowledges the display after it. */
|
|
59
|
+
displayed(): void;
|
|
60
|
+
failed(error: unknown): void;
|
|
61
|
+
}
|
|
62
|
+
let current: RigHost | null = null;
|
|
63
|
+
export function setRigHost(host: RigHost | null): void {current = host;}
|
|
64
|
+
export function rigHost(): RigHost | null {return current;}
|
|
@@ -1,15 +1,34 @@
|
|
|
1
1
|
/** Existing compiled rig/reference rendering for the shared inspection viewport. */
|
|
2
2
|
import type {ModelAssets,RigPlayer,PoseBounds,PosedFrame} from '@rig-c/play';
|
|
3
|
-
import type {ViewportProvider,ViewportState,ViewportController} from './viewport-controller.ts';
|
|
3
|
+
import type {CameraTarget,ViewportProvider,ViewportState,ViewportController} from './viewport-controller.ts';
|
|
4
|
+
import {cameraSignature} from './camera-view.ts';
|
|
4
5
|
import {dragImpulse} from '../src/environment.ts';
|
|
5
6
|
import {CLICK_SLOP_PX} from './stage-pick.ts';
|
|
7
|
+
import {createPartsViewportProvider,type PartsViewportHost} from './parts-viewport-provider.ts';
|
|
6
8
|
export interface RigViewportHost {
|
|
7
|
-
el:ViewportProvider['el'];player:()=>RigPlayer|null;assets:()=>ModelAssets|null;
|
|
9
|
+
fitLabel?:string;el:ViewportProvider['el'];player:()=>RigPlayer|null;assets:()=>ModelAssets|null;
|
|
8
10
|
referenceSize:()=>{width:number;height:number}|null;view:()=>string;referenceGeneration:()=>number;
|
|
9
11
|
parts:()=>{value:()=>unknown;bounds:()=>PoseBounds|null;frame?:(side:'single')=>PosedFrame|undefined}|null;
|
|
10
12
|
text:(id:string,value:string)=>void;message:ViewportProvider['message'];redrawOverlay:(fresh:boolean)=>void;
|
|
13
|
+
/** Additional compiled panes share the renderer while retaining their declared framing basis. */
|
|
14
|
+
panes?:{target:CameraTarget;viewport:HTMLElement;pane:HTMLElement;root:HTMLElement;fallback?:CameraTarget;
|
|
15
|
+
box:()=>PoseBounds|null;player:()=>RigPlayer|null;scale:(value:number)=>void}[];
|
|
16
|
+
framingBox?:()=>PoseBounds|null;
|
|
17
|
+
rigMargins?:{x:number;y:number};
|
|
18
|
+
referenceTransform?:{content:HTMLElement;mode:'relative'};
|
|
19
|
+
layoutKey?:ViewportProvider['layoutKey'];
|
|
20
|
+
cameraControls?:{zoomId?:string;targetLabel?:(target:CameraTarget|null)=>string;
|
|
21
|
+
fitLabel?:(sync:boolean)=>string;coordinatesId?:string|null};
|
|
22
|
+
selection?:ViewportProvider['selection'];
|
|
23
|
+
fitMessage?:ViewportProvider['fitMessage'];
|
|
24
|
+
pinch?:ViewportProvider['pinch'];
|
|
25
|
+
dimensionVisibility?:ViewportProvider['dimensionVisibility'];
|
|
26
|
+
/** A native Setup comparison uses the existing parts raster policy on this same controller. */
|
|
27
|
+
raster?:PartsViewportHost & {active:()=>boolean};
|
|
11
28
|
}
|
|
12
29
|
export function createRigViewportProvider(host:RigViewportHost,state:ViewportState):ViewportProvider {
|
|
30
|
+
const raster=host.raster?createPartsViewportProvider(host.raster,state):null;
|
|
31
|
+
const rasterActive=()=>!!host.raster?.active();
|
|
13
32
|
const {el,text,message,redrawOverlay}=host;const input=(id:string)=>el<HTMLInputElement>(id),button=(id:string)=>el<HTMLButtonElement>(id);
|
|
14
33
|
const framingBoxes=new WeakMap<RigPlayer,{assets:ModelAssets|null;box:PoseBounds}>();
|
|
15
34
|
function positiveBounds(box:PoseBounds|null|undefined):box is PoseBounds {
|
|
@@ -17,6 +36,7 @@ export function createRigViewportProvider(host:RigViewportHost,state:ViewportSta
|
|
|
17
36
|
}
|
|
18
37
|
function rigFramingBox():PoseBounds|null {
|
|
19
38
|
const player=host.player(),assets=host.assets();if(!player)return null;
|
|
39
|
+
const authored=host.framingBox?.();if(authored)return authored;
|
|
20
40
|
const declared=assets?.stage;
|
|
21
41
|
// A model without a positive declared stage keeps its existing live pose/filter basis.
|
|
22
42
|
if(!positiveBounds(declared))return player.bounds();
|
|
@@ -37,7 +57,12 @@ export function createRigViewportProvider(host:RigViewportHost,state:ViewportSta
|
|
|
37
57
|
}
|
|
38
58
|
function referenceFit(controller:ViewportController): void {
|
|
39
59
|
const referenceSize=host.referenceSize();const {paneFrame}=controller;
|
|
40
|
-
if
|
|
60
|
+
if(!referenceSize)return;const frame=paneFrame('reference');if (!frame) return;
|
|
61
|
+
if(host.referenceTransform){
|
|
62
|
+
const signature=cameraSignature(controller.paneCamera('reference'),frame);
|
|
63
|
+
host.referenceTransform.content.style.transform=`translate(${signature.pan.x*frame.width}px,${signature.pan.y*frame.height}px) scale(${signature.zoom})`;
|
|
64
|
+
return;
|
|
65
|
+
}
|
|
41
66
|
const viewport = el('reference-viewport'), content = el('reference-content');
|
|
42
67
|
const scale = state.referenceScale = Math.max(.001,Math.min((viewport.clientWidth - 24) / referenceSize.width, (viewport.clientHeight - 56) / referenceSize.height) * state.referenceZoom);
|
|
43
68
|
const center=state.referenceCenter??{x:referenceSize.width/2,y:referenceSize.height/2};
|
|
@@ -48,21 +73,45 @@ function referenceFit(controller:ViewportController): void {
|
|
|
48
73
|
|
|
49
74
|
function render(controller:ViewportController): void {
|
|
50
75
|
const player=host.player(),assets=host.assets();const {paneFrame,renderNumericView,renderCameraControls}=controller;
|
|
51
|
-
referenceFit(controller);renderNumericView();renderCameraControls();
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
const
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
76
|
+
if(!host.panes){referenceFit(controller);renderNumericView();renderCameraControls();}
|
|
77
|
+
const panes=host.panes??(player&&assets?[{target:'rig' as const,viewport:el('rig-viewport'),root:el('rig-root'),box:rigFramingBox,player:()=>player,scale:(value:number)=>{state.rigScale=value;}}]:[]);
|
|
78
|
+
let drawn=false;
|
|
79
|
+
for(const pane of panes){
|
|
80
|
+
const box=pane.box();if(!box||box.width<=0||box.height<=0)continue;
|
|
81
|
+
const frame=paneFrame(pane.target);if(!frame)continue;
|
|
82
|
+
const camera=controller.paneCamera(pane.target),center=camera.center??frame.center;
|
|
83
|
+
const scale=host.panes?frame.baseScale*camera.zoom:Math.max(.001,Math.min((pane.viewport.clientWidth-28)/box.width,(pane.viewport.clientHeight-58)/box.height)*camera.zoom);
|
|
84
|
+
pane.scale(scale);if(!host.panes)state.displayedCenter={...center};
|
|
85
|
+
const {root,viewport}=pane;root.style.left=`${viewport.clientWidth/2-center.x*scale}px`;root.style.top=`${viewport.clientHeight/2+center.y*scale}px`;root.style.transform=`scale(${scale})`;
|
|
86
|
+
pane.player()?.renderer.syncPixelRatio();drawn=true;
|
|
87
|
+
}
|
|
88
|
+
if(drawn||host.panes)redrawOverlay(false);
|
|
89
|
+
if(host.panes){referenceFit(controller);renderCameraControls();renderNumericView();}else if(drawn)renderNumericView();
|
|
59
90
|
}
|
|
60
91
|
|
|
61
|
-
function renderControls(controller:ViewportController):void {
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
92
|
+
function renderControls(controller:ViewportController):void {
|
|
93
|
+
const {availableCamera,paneCamera}=controller,controls=host.cameraControls;
|
|
94
|
+
input('camera-sync').checked=state.cameraSync;const target=availableCamera();
|
|
95
|
+
const label=controls?.targetLabel?.(target)??(target==='reference'?'Reference':'Rig');
|
|
96
|
+
text(controls?.zoomId??'zoom-value',`${Math.round((target?paneCamera(target).zoom:1)*100)}% · ${label}`);
|
|
97
|
+
button('fit').textContent=host.fitLabel??controls?.fitLabel?.(state.cameraSync)??(state.cameraSync?'Fit views':'Fit active');
|
|
98
|
+
if(controls?.coordinatesId!==null)text(controls?.coordinatesId??'coordinates',state.cameraSync?'Cameras synchronized · drag to pan · scroll to zoom':'Independent cameras · drag to pan · scroll to zoom');
|
|
99
|
+
}
|
|
100
|
+
return {el,message,get nativeScale(){return host.raster?rasterActive():undefined;},
|
|
101
|
+
render:controller=>rasterActive()?raster!.render(controller):render(controller),
|
|
102
|
+
renderControls:controller=>rasterActive()?raster!.renderControls(controller):renderControls(controller),
|
|
103
|
+
...(host.panes?{panes:[...host.panes,{target:'reference' as const,viewport:el('reference-viewport'),pane:el('reference-pane')}]}:{}),
|
|
104
|
+
dimensionVisibility:host.dimensionVisibility,
|
|
105
|
+
fitMargins:host.rigMargins,fitMessage:host.fitMessage,pinch:host.pinch,
|
|
106
|
+
geometry:target=>{
|
|
107
|
+
if(rasterActive())return raster!.geometry(target);
|
|
108
|
+
const rig=target!=='reference',referenceSize=host.referenceSize(),pane=host.panes?.find(p=>p.target===target);
|
|
109
|
+
const box=rig?(host.panes?(pane?.player()?pane.box():null):rigFramingBox()):referenceSize?{x:0,y:0,...referenceSize}:null;
|
|
110
|
+
if(!box)return null;const margin=rig?host.rigMargins??{x:28,y:58}:host.referenceTransform?{x:0,y:0}:{x:24,y:56};
|
|
111
|
+
return {space:rig?'world':'image',box,marginX:margin.x,marginY:margin.y};
|
|
112
|
+
},
|
|
113
|
+
layoutKey:()=>rasterActive()?'raster:'+raster!.layoutKey():(host.layoutKey?.()??(()=>{const player=host.player(),referenceSize=host.referenceSize(),view=host.view(),referenceGeneration=host.referenceGeneration();const boxKey=rigFramingBox();return ['rig','reference'].map(target=>{const v=el(target+'-viewport');return `${v.clientWidth}:${v.clientHeight}`;}).join('|')+view+referenceGeneration+!!player+JSON.stringify(referenceSize)+JSON.stringify(boxKey);})()),
|
|
114
|
+
selection:target=>rasterActive()?raster!.selection(target):(host.selection?.(target)??(()=>{const parts=host.parts(),part=parts?.value();return {selected:!!part,bounds:target==='rig'&&part?parts?.bounds()??null:null};})())
|
|
66
115
|
};
|
|
67
116
|
}
|
|
68
117
|
export function rigPanCarry(host:Pick<RigViewportHost,'player'>,state:ViewportState){return {threshold:CLICK_SLOP_PX,move:(dx:number,dy:number)=>{const player=host.player(),rigScale=state.rigScale;const impulse=dragImpulse(dx,dy,rigScale);if(impulse&&player)player.moved(impulse);}};}
|