@rig-c/review 4.0.1 → 4.1.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/docs/DESIGN.md +19 -0
- package/package.json +1 -1
- package/src/compare-html.ts +5 -5
- package/web/animation-inspection.ts +2 -0
- package/web/catalog-en.ts +18 -3
- package/web/catalog-ko.ts +39 -24
- package/web/compare-picked-tools.ts +1 -0
- package/web/compare.css +2 -4
- package/web/compare.html +1 -1
- package/web/compare.ts +2 -1
- package/web/inspection-persistence.ts +145 -22
- package/web/inspector-blocks.ts +112 -38
- package/web/interview-panel.ts +10 -3
- package/web/job-rig-screen.ts +5 -4
- package/web/job-session.ts +33 -63
- package/web/main.ts +167 -35
- package/web/part-selection.ts +5 -0
- package/web/parts-viewport-provider.ts +18 -8
- package/web/stage-comments.ts +16 -10
- package/web/styles.css +117 -39
- package/web/view-controls.ts +22 -11
- package/web/workspace-ui.ts +8 -6
package/web/main.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import {hasTransientQuestionImage} from './interview-panel.ts';
|
|
1
2
|
import {bindScenePlates,loadScenePlates,takeSample} from './scene-plates.ts';
|
|
2
3
|
import type {SceneInspection} from '../src/scene-inspection.ts';
|
|
3
4
|
import type {InterviewSubjectEntry} from '../src/joined-project.ts';
|
|
@@ -135,16 +136,23 @@ const rigStatusBar=mountStatusBar({
|
|
|
135
136
|
app.querySelector<HTMLElement>('[data-workspace-status]')!.replaceWith(rigStatusBar.footer);
|
|
136
137
|
for(const id of ['layout-state','idle-state','control-state','draft-state'])el(id).setAttribute('role','status');
|
|
137
138
|
el('layout-state').setAttribute('aria-label','Effective layout');el('renderer-state').setAttribute('aria-label','Last draw backend');el('draft-state').setAttribute('aria-live','polite');el('view-coordinates').setAttribute('aria-label','Current numeric inspection region');
|
|
138
|
-
const shell=mountWorkspaceShell({compatibility:'rigStep1',embedded:new URLSearchParams(location.search).has('stageEmbed')&&!location.pathname.endsWith('/stage-interview.html')});app.prepend(shell.header);
|
|
139
|
+
const shell=mountWorkspaceShell({compatibility:'rigStep1',pendingActRow:!!host,embedded:new URLSearchParams(location.search).has('stageEmbed')&&!location.pathname.endsWith('/stage-interview.html')});app.prepend(shell.header,...shell.actRow?[shell.actRow]:[]);
|
|
139
140
|
el('app').querySelector<HTMLElement>('[data-workspace-comment]')!.innerHTML=sharedCommentMarkup;
|
|
140
141
|
el('app').querySelector<HTMLElement>('[data-workspace-layers]')!.append(createRigLayerControls());
|
|
141
142
|
el('app').querySelector<HTMLElement>('[data-workspace-view-tools]')!.innerHTML=sharedViewToolsMarkup;
|
|
142
143
|
const controls=createViewControls({layout:'rigStep1',viewSwitch:inspectionViewSwitch(chooseInspectionView,true)}),cameraControls=el('app').querySelector<HTMLElement>('[data-workspace-camera]')!;cameraControls.append(controls.syncLabel,controls.zoomGroup!);
|
|
144
|
+
cameraControls.insertBefore(button('play'),controls.zoomGroup!);button('play').hidden=true;
|
|
143
145
|
const primaryToolbar=app.querySelector<HTMLElement>('.viewbar')!;primaryToolbar.classList.add('workspace-main-toolbar');
|
|
144
146
|
const secondaryToolbar=document.createElement('div');secondaryToolbar.className='workspace-secondary-toolbar';secondaryToolbar.append(app.querySelector<HTMLElement>('[data-workspace-layers]')!,app.querySelector<HTMLElement>('[data-workspace-view-tools]')!);primaryToolbar.after(secondaryToolbar);
|
|
145
147
|
for(const event of ['click','change'])secondaryToolbar.addEventListener(event,()=>{if(rigDifference){leaveRigDifference();renderLayout();}},true);
|
|
146
|
-
const rigInspector=mountRigInspector();
|
|
147
|
-
|
|
148
|
+
const rigInspector=mountRigInspector(document,shell.actRow??undefined);
|
|
149
|
+
if(host)rigInspector.act.hidden=true;
|
|
150
|
+
const rigAsk=panelMake('button',{className:'workspace-act-ask',id:'workspace-pending-ask',hidden:true});rigAsk.type='button';
|
|
151
|
+
const askHeadline=panelMake('span',{id:'workspace-ask-headline',className:'workspace-act-ask',hidden:true});
|
|
152
|
+
const requestChanges=panelMake('button',{id:'request-changes',type:'button',hidden:true});
|
|
153
|
+
rigInspector.act.prepend(askHeadline,rigAsk);button('save').after(requestChanges);
|
|
154
|
+
let pendingAnswers:readonly {kind:string;stage?:string}[]=[],answerSaved=false;
|
|
155
|
+
let partsAnswerBlocked:()=>boolean=()=>false;
|
|
148
156
|
mountViewportPair(el('stage-layout'));
|
|
149
157
|
const viewportState=createViewportState();
|
|
150
158
|
const partsCanvas=document.createElement('canvas'),partsReference=document.createElement('canvas');partsCanvas.width=partsCanvas.height=partsReference.width=partsReference.height=0;
|
|
@@ -156,7 +164,9 @@ if(partsOnly){partsCanvas.id='parts-canvas';el('rig-root').append(partsCanvas);e
|
|
|
156
164
|
let sceneComposite:ReturnType<typeof bindScenePlates>|undefined;
|
|
157
165
|
const activeScene=()=>sceneComposite&&data.direction&&(!stageSource||stageSource.url===inspectedModel?.url)?data.direction:undefined;
|
|
158
166
|
const sceneBox=()=>{const direction=activeScene();return direction?takeSample(direction,time).box:null;};
|
|
159
|
-
const
|
|
167
|
+
const rebuildFramingBoxes=new WeakMap<ModelAssets,PoseBounds>();
|
|
168
|
+
const viewportProvider=partsOnly?createPartsViewportProvider({el,canvas:partsCanvas,message,reference:()=>partsReference.width>0?partsReference:null,frameSize:target=>target==='reference'&&activeInterviewImage&&referenceSize?{w:referenceSize.width,h:referenceSize.height}:partsSubject?.frameSize(target)??null},viewportState):createRigViewportProvider({fitLabel:'Fit',framingBox:()=>sceneBox()??(assets?rebuildFramingBoxes.get(assets)??null:null),el,player:()=>player,assets:()=>assets,referenceSize:()=>referenceSize,view:()=>view,referenceGeneration:()=>referenceGeneration,parts:()=>parts,text,message,redrawOverlay,raster:rigRaster},viewportState);
|
|
169
|
+
const viewport=createViewportController(viewportProvider,viewportState);
|
|
160
170
|
const {fitCamera,paneFrame,availableCamera,alignCameras,renderCameraControls,setCameraSync,cameraAction,updateCamera,fitActiveCamera}=viewport;
|
|
161
171
|
// First, before any URL use: take the `#cap=` handoff into memory/session storage and strip it.
|
|
162
172
|
if(!host)connectLiveWindow(access);
|
|
@@ -266,6 +276,11 @@ function message(value: string, error = false, footerOnly = false, diagnostic?:
|
|
|
266
276
|
if (footerOnly) return;
|
|
267
277
|
// The modal makes the footer inert; the review dialog repeats the latest message for its reader.
|
|
268
278
|
text('review-message', value); el('review-message').classList.toggle('error', error);
|
|
279
|
+
if(host&&error&&rigInspector.act.hidden&&!rigInspector.answersRendered){
|
|
280
|
+
for(const node of rigInspector.act.querySelectorAll<HTMLElement>('#save,#review-status,label[for="review-status"]'))node.hidden=true;
|
|
281
|
+
rigInspector.act.hidden=false;
|
|
282
|
+
rigInspector.syncActRow?.();
|
|
283
|
+
}
|
|
269
284
|
// A background refusal names its code and origin on hover; only Submit's own catch changes the act bar.
|
|
270
285
|
if (diagnostic) el('message').title = diagnostic;
|
|
271
286
|
}
|
|
@@ -296,14 +311,18 @@ function updateSavedState(): void {
|
|
|
296
311
|
button('save').disabled = saving || draftConflict || !!readOnly || session.feedbackWarnings.length > 0;
|
|
297
312
|
button('save').title = actReadOnly ? actReadOnly : session.feedbackWarnings.length ? 'Delete feedback with validation warnings, then add it again with a valid target.' : '';
|
|
298
313
|
renderDraftState();
|
|
314
|
+
renderAnswerControls();
|
|
299
315
|
}
|
|
300
316
|
|
|
301
317
|
/** C10: the act bar renders the latest local draft status; rig only classifies it. Nothing renders before the first status. */
|
|
302
318
|
let liveIssueCount=()=>session?.feedback.length??0;
|
|
303
319
|
function renderDraftState(): void {
|
|
304
320
|
const live=host?.reviewState?.(liveIssueCount(),saving);
|
|
305
|
-
|
|
306
|
-
|
|
321
|
+
renderAnswerControls();
|
|
322
|
+
if (draftStatus === null && !live && !answerSaved) return;
|
|
323
|
+
rigInspector.actBar.setSaveState({ kind: actReadOnly ? 'read-only' : saving ? 'saving' : draftConflict ? 'failed' : dirty ? 'unsaved' : 'saved', text: draftConflict ? 'Saved draft could not be restored. Your draft has not been deleted. Download or discard it before submitting.' : answerSaved ? 'Answer saved' : draftStatus&&/^(Saved local draft was not restored|Local draft could not be saved|Local draft storage unavailable|Local draft needs explicit recovery)/.test(draftStatus)?draftStatus:actReadOnly??live??draftStatus! });
|
|
324
|
+
if(answerSaved&&!saving&&!draftConflict&&!dirty&&!actReadOnly&&(host?.record||!host)&&
|
|
325
|
+
(host?.pendingSubjects?.()??pendingAnswers).every(subject=>subject.kind==='interview-picks')&&!el('message').classList.contains('error'))message(sourceTextContent(el('dirty')),false,true);
|
|
307
326
|
}
|
|
308
327
|
|
|
309
328
|
function renderProvenance(): void {
|
|
@@ -356,6 +375,7 @@ async function chooseCheckpoint(point: Checkpoint,initial?:{referenceId?:string;
|
|
|
356
375
|
}
|
|
357
376
|
|
|
358
377
|
function renderCheckpoint(): void {
|
|
378
|
+
el('checkpoint-detail').hidden=!checkpoint;
|
|
359
379
|
text('checkpoint-title', checkpoint?.title ?? 'Review entire package');
|
|
360
380
|
text('detail-title', checkpoint?.title ?? 'No checkpoint supplied');
|
|
361
381
|
text('detail-note', checkpoint?.note ?? 'Record checkpoint notes and outcomes.');
|
|
@@ -366,6 +386,7 @@ function renderCheckpoint(): void {
|
|
|
366
386
|
|
|
367
387
|
function setView(value: typeof view): void {view=value;renderLayout();}
|
|
368
388
|
function chooseInspectionView(id:string):void {
|
|
389
|
+
if(activeInterviewImages){const image=activeInterviewImages[Number(id.replace('interview-image-',''))];if(id.startsWith('interview-image-')&&image){activeInterviewImage=image;void showReference('',image);}return;}
|
|
369
390
|
if(!partsSubject){
|
|
370
391
|
if(id==='difference'){
|
|
371
392
|
const reason=rigDifferenceReason();if(reason){message(reason,true);renderLayout();return;}
|
|
@@ -408,10 +429,12 @@ function leaveRigDifference():void {
|
|
|
408
429
|
function layoutEligibility(){return singleEligibility({rig:rigInput,reference:referenceInput,requested:view});}
|
|
409
430
|
/** Unavailable layouts stay visible but disabled with their named reason; no placeholder pane stands in for a missing input. */
|
|
410
431
|
function renderLayout():void {
|
|
432
|
+
el('play').hidden=selectedInspector()!=='playback';
|
|
411
433
|
if(rigDifference&&(rigDifferenceReason()||rigDifference.assets!==assets||rigDifference.painting!==el('reference-content').querySelector('img')))leaveRigDifference();
|
|
412
434
|
const state=layoutEligibility();effectiveView=state.effective;
|
|
413
435
|
for(const id of controls.viewModeIds)if(id!=='difference')controls.setDisabled(id,state.reasons[id as SingleLayout]??null);
|
|
414
|
-
controls.setMode(
|
|
436
|
+
if(activeInterviewImages)controls.setMode('interview-image-'+activeInterviewImages.indexOf(activeInterviewImage!));
|
|
437
|
+
else controls.setMode(rigDifference||partsSubject?.comparison().mode==='difference'?'difference':state.effective,state.effective??state.requested);
|
|
415
438
|
if(partsSubject){controls.setDisabled('difference',partsSubject.differenceAvailable()&&rigInput.state==='loaded'&&referenceInput.state==='loaded'?null:tr('PARTS_DIFFERENCE_UNAVAILABLE: missing painting_in_rig declaration or painting_in_rig.json sidecar and its bound operand.'));if(partsSubject.comparison().mode==='difference')controls.setMode('difference');}
|
|
416
439
|
if(!partsSubject){controls.setDisabled('difference',tr(rigDifferenceReason()??'')||null);if(rigDifference)controls.setMode('difference');}
|
|
417
440
|
el('reference-pane').hidden=state.effective!=='compare'&&state.effective!=='reference';el('rig-pane').hidden=state.effective!=='compare'&&state.effective!=='rig';
|
|
@@ -486,17 +509,17 @@ function renderSequenceFrame(): void {
|
|
|
486
509
|
for (const [name, joint] of Object.entries(person.joints)) { if (!joint.at || joint.state === 'missing') continue; const dot = svgNode('circle', { cx: joint.at[0], cy: joint.at[1], r: 4, fill: joint.state === 'observed' ? '#c6e6d7' : '#294535', stroke: '#c6e6d7', 'stroke-width': 1.5 }, sequenceSvg); const title = document.createElementNS(sequenceSvg.namespaceURI, 'title'); title.textContent = `${name}: ${joint.state}${joint.score === undefined ? '' : ` · score ${joint.score}`}`; dot.append(title); }
|
|
487
510
|
}
|
|
488
511
|
|
|
489
|
-
async function showReference(id: string): Promise<void> {
|
|
512
|
+
async function showReference(id: string, bound?:{name:string;src:string}): Promise<void> {
|
|
490
513
|
rigDifferenceFailure=null;leaveRigDifference();
|
|
491
514
|
const generation = ++referenceGeneration;
|
|
492
515
|
video?.pause(); video = null;controlledVideoSample=null;delete viewport.state.cameraFrames.reference; viewport.state.referenceCenter=null; referenceSize = null; sequence = null; sequenceSvg = null; selectedPerson=''; lastPoseFrame = -1; el('person-control').hidden = true;
|
|
493
516
|
const content = el('reference-content'); content.replaceChildren();
|
|
494
|
-
const reference = data.manifest.references.find(item => item.id === id);
|
|
517
|
+
const reference = bound?{id:'',label:bound.name,type:'image' as const,path:''}:data.manifest.references.find(item => item.id === id);
|
|
495
518
|
el('reference-empty').hidden = false;setReferenceInput(reference?{state:'pending'}:{state:'absent'});
|
|
496
519
|
if (!reference) { text('reference-empty', 'No reference supplied.'); text('reference-info', 'Add image, video or input-pose references to the package.'); return; }
|
|
497
520
|
text('reference-label', reference.label + (reference.type === 'pose' ? ' · Static input pose' : ' · Reference'));
|
|
498
521
|
text('reference-empty', 'Loading reference…');
|
|
499
|
-
text('reference-info', `${reference.type} · ${data.sourcePainting?.id === reference.id ? data.sourcePainting.path : reference.path}`);
|
|
522
|
+
text('reference-info', `${reference.type} · ${bound?bound.name:data.sourcePainting?.id === reference.id ? data.sourcePainting.path : reference.path}`);
|
|
500
523
|
const fail = (reason='reference could not render') => { if (generation !== referenceGeneration) return; setReferenceInput({state:'failed',reason}); el('reference-empty').hidden = false; text('reference-empty', 'Could not open the reference. Check the package files.'); };
|
|
501
524
|
try {
|
|
502
525
|
if (reference.type === 'pose') {
|
|
@@ -523,8 +546,9 @@ async function showReference(id: string): Promise<void> {
|
|
|
523
546
|
}
|
|
524
547
|
content.append(svg); el('reference-empty').hidden = true; setReferenceInput({state:'loaded'});
|
|
525
548
|
} else if (reference.type === 'image') {
|
|
526
|
-
const image = new Image(); image.draggable=false; image.alt = reference.label; image.onload = () => { if (generation !== referenceGeneration) return; referenceSize = { width: image.naturalWidth, height: image.naturalHeight }; image.width = image.naturalWidth; image.height = image.naturalHeight; el('reference-empty').hidden = true; fitCamera(); }; await new Promise<void>((resolve,reject)=>{const loaded=image.onload;const timer=setTimeout(()=>reject(new Error('Reference image load timed out')),10000);image.onload=event=>{clearTimeout(timer);if(typeof loaded==='function')loaded.call(image,event);resolve();};image.onerror=()=>{clearTimeout(timer);fail();reject(new Error('Reference image load failed'));};image.src=referenceUrl(reference);content.append(image);});
|
|
527
|
-
await image.decode(); if (generation !== referenceGeneration) return;
|
|
549
|
+
const image = new Image(); image.draggable=false; image.alt = reference.label; image.onload = () => { if (generation !== referenceGeneration) return; referenceSize = { width: image.naturalWidth, height: image.naturalHeight }; image.width = image.naturalWidth; image.height = image.naturalHeight; el('reference-empty').hidden = true; fitCamera(); }; await new Promise<void>((resolve,reject)=>{const loaded=image.onload;const timer=setTimeout(()=>reject(new Error('Reference image load timed out')),10000);image.onload=event=>{clearTimeout(timer);if(typeof loaded==='function')loaded.call(image,event);resolve();};image.onerror=()=>{clearTimeout(timer);fail();reject(new Error('Reference image load failed'));};image.src=bound?.src??referenceUrl(reference);content.append(image);});
|
|
550
|
+
await image.decode(); if (generation !== referenceGeneration) return;
|
|
551
|
+
if (!image.naturalWidth || !image.naturalHeight) throw new Error('Reference image has no renderable pixels'); setReferenceInput({state:'loaded'});
|
|
528
552
|
} else {
|
|
529
553
|
const media = document.createElement('video'); media.controls = true; media.muted = true; media.preload = 'metadata'; media.playsInline = true;
|
|
530
554
|
media.onloadedmetadata = () => { if (generation !== referenceGeneration) return; referenceSize = { width: media.videoWidth, height: media.videoHeight }; media.width = media.videoWidth; media.height = media.videoHeight; if (Number.isFinite(media.duration) && !player) duration = media.duration; el('reference-empty').hidden = true; holdVideoReference(media, generation); fitCamera(); renderTransport(); };
|
|
@@ -577,7 +601,7 @@ function renderFeedbackTargets(preserve = false): void {
|
|
|
577
601
|
function renderFrameTransport(): void {
|
|
578
602
|
const active = activeTransportClock(), clock = active?.clock ?? null;
|
|
579
603
|
const last = lastProducerFrame(clock), frame = frameAtTime(clock, time);
|
|
580
|
-
text('rig-label', rigPaneLabel({ hasPlayer: !!player, animation: player?.current ?? animation, time, frame }));
|
|
604
|
+
text('rig-label', host?.direction&&data.direction ? `Take · ${data.direction.take.duration} s` : rigPaneLabel({ hasPlayer: !!player, animation: player?.current ?? animation, time, frame }));
|
|
581
605
|
el('frame-controls').hidden = last === null;
|
|
582
606
|
if (!clock) { text('frame-label', data.report?.clock ? data.report.animation ? 'Frame unknown · report and current clip do not match' : 'Frame unknown · report animation not supplied' : 'rate unknown'); return; }
|
|
583
607
|
if (last === null) { text('frame-label', 'F? / ? · frame range unknown'); return; }
|
|
@@ -1002,6 +1026,7 @@ function downloadStrip(name: string, content: Blob): void {
|
|
|
1002
1026
|
function stripStatus(value: string, error = false): void { text('strip-status', value); el('strip-status').setAttribute('role', error ? 'alert' : 'status'); }
|
|
1003
1027
|
|
|
1004
1028
|
function updateStripControls(): void {
|
|
1029
|
+
el('strip-panel').hidden=!!readOnly||!data.manifest.references.some(reference=>reference.type==='video');
|
|
1005
1030
|
el('strip-panel').setAttribute('aria-busy', String(stripBusy));
|
|
1006
1031
|
for (const id of ['strip-scope', 'strip-reference', 'strip-format']) select(id).disabled = stripBusy;
|
|
1007
1032
|
button('strip-export').disabled = stripBusy || !!readOnly; button('strip-export').title = readOnly ?? ''; button('strip-export').textContent = stripBusy ? 'Generating strip…' : 'Download strip';
|
|
@@ -1182,6 +1207,7 @@ function bind(): void {
|
|
|
1182
1207
|
viewDisposers.push(()=>directionPanel?.dispose());
|
|
1183
1208
|
bindWorkspace(!!data.manifest.model);
|
|
1184
1209
|
overlays=new RigOverlays({canvas:el<HTMLCanvasElement>('rig-overlay'),rigRoot:el('rig-root')});
|
|
1210
|
+
verdictSubmit=button('save').onclick as ((event:MouseEvent)=>unknown)|null;
|
|
1185
1211
|
chestEditor=bindChestEditor({pane:el('rig-pane'),canvas:el('rig-overlay'),project:()=>player?rigProject():null,mapping:()=>activeChestMapping(),changed:renderChest,download:()=>{void exportChest();},apply:()=>{void applyRebuild();},reset:()=>{void resetRebuild();},message,inspector:()=>selectedInspector()});viewDisposers.push(()=>chestEditor?.dispose());
|
|
1186
1212
|
meshEditor=bindMeshEditor({pane:el('rig-pane'),canvas:el('rig-overlay'),project:()=>player?rigProject():null,mapping:()=>chestMapping,inspector:()=>selectedInspector(),source:meshSource,pause,changed:()=>redrawOverlay(false),download:doc=>{void exportMesh(doc);},apply:(doc,line)=>applyMeshDelta(doc,line),applied:()=>appliedOnStage?.schema==='rig-review-applied/3',resetBuild:()=>resetRebuild(stageWorld()),message,confirm:text=>window.confirm(tr(text)),token:name=>getComputedStyle(document.documentElement).getPropertyValue(name).trim()});viewDisposers.push(()=>meshEditor?.dispose());
|
|
1187
1213
|
weightsView=bindWeightsView({pane:el('rig-pane'),canvas:el('rig-overlay'),project:()=>player?rigProject():null,inspector:()=>selectedInspector(),slot:()=>parts?.value()?.slot??stageDraftSelection?.slot??null,
|
|
@@ -1243,7 +1269,8 @@ function bindWorkspace(hasModel=false):void {
|
|
|
1243
1269
|
viewport.state.cameraSync=workspace.defaults().defaultCameraSync;input('camera-sync').checked=viewport.state.cameraSync;input('idle-repeat').checked=workspace.defaults().defaultIdleRepeat;
|
|
1244
1270
|
appearance=bindAppearance(select('settings-theme'),workspace.defaults().theme);
|
|
1245
1271
|
bindReviewDialog();
|
|
1246
|
-
|
|
1272
|
+
screenRoot.querySelector<HTMLElement>('.inspector-body')!.append(questionPanel);
|
|
1273
|
+
inspectorBlocks=bindInspectorBlocks({sections:[el('inspector-rig'),el('inspector-playback')],available:host?.record&&(!host.record.hasPicture||!hasModel&&!partsOnly)?['feedback']:undefined,bottom:{strip:rigInspector.strip,comment:rigInspector.comments.button,panel:rigInspector.comments.panel},changed:()=>{syncQuestionImage();workspace?.refresh();persistence?.save();}});
|
|
1247
1274
|
}
|
|
1248
1275
|
async function start(): Promise<void> {
|
|
1249
1276
|
try {
|
|
@@ -1264,8 +1291,8 @@ async function start(): Promise<void> {
|
|
|
1264
1291
|
if (!data.manifest.references.length) { select('reference-select').append(option('', 'No references supplied')); select('reference-select').disabled = true; }
|
|
1265
1292
|
// Checkpoints and reference fold away when the package supplies neither.
|
|
1266
1293
|
(el('package-context') as HTMLDetailsElement).open = data.manifest.checkpoints.length > 0 || data.manifest.references.length > 0;
|
|
1267
|
-
const sourceFiles = el('source-files'); for (const file of data.manifest.authoring) { const a = document.createElement('a'); a.href = assetUrl(file.path); a.textContent = file.label; a.className = 'source-link'; a.target = '_blank'; a.rel = 'noopener'; sourceFiles.append(a); } if (!data.manifest.authoring.length) sourceFiles.textContent = 'No source files supplied';
|
|
1268
|
-
populateChestBones(); bind(); parts=new PartExplorer(el('workspace-left'),el('selected-part'),previous=>{if(rigDifference){leaveRigDifference();renderLayout();}const part=parts?.value();if(!stageCorrectionRebinding&&(previous?.side!==part?.side||previous?.slot!==part?.slot||previous?.mode!==part?.mode))stageDraftRequestToken++;if(player&&inspectionSourceState==='ready')animationPanel?.capture(player,parts?.frame('single'));else animationPanel?.capture(null,undefined);weightsView?.refresh();redrawOverlay(true);meshEditor?.selectionChanged();if(stageCorrectionPart&&!stageCorrectionRebinding&&(part?.slot??null)!==stageCorrectionPart){stageCorrectionPart=null;document.getElementById('stage-draft-label')?.remove();}animationPanel?.fromParts(part?.slot??null);meshPanel?.select(part?.slot??null);requirementsPanel?.selectionChanged();renderDropNotices();if(part){viewport.state.activeCamera='rig';if(view==='reference')setView('rig');if(selectedInspector(document)!=='playback')showInspector('rig');renderCameraControls();}if(!viewport.state.cameraRestoring&&(previous?.side!==part?.side||previous?.slot!==part?.slot))cameraAction(()=>fitActiveCamera(part?'rig':availableCamera()));persistence?.save();},part=>{select('feedback-target-kind').value='slot';renderFeedbackTargets(true);input('feedback-target-name').value=part.slot;showInspector('feedback');}); animationPanel=new AnimationInspectionPanel({host:el('animation-inspection'),stage:el('rig-viewport'),project:(x,y)=>rigProject()(x,y),enabled:()=>inspectionSourceState==='ready'&&selectedInspector(document)==='playback',pause,preview:fn=>{animAdjust=fn;if(!player)return;player.adjust=composeAdjust(composeAdjust(composeAdjust(idleAdjust,dialAdjust),turnAdjust),animAdjust);if(!inDrawRig&&player.current&&!playing){if(activeScene())seek(time);else{player.seek(time);drawRig(()=>player!.draw());}}},apply:ops=>applyAnimation(ops),reset:()=>resetAnimationBuild(),seek:exact=>{if(!Number.isFinite(exact)||exact<0||exact>duration){message('KEY_TIME_OUT_OF_DOMAIN: no substitute time was used.',true);return;}seekMarker(animation,exact,'Stored key');},select:value=>{const slot=value?.kind==='slot'?value.name:null;if((parts?.value()?.slot??null)!==slot)parts?.select(slot?{side:'single',slot,mode:parts?.value()?.mode??'context'}:null);parts?.highlightBone(value?.kind==='bone'?value.name:null);redrawOverlay(false);}});viewDisposers.push(()=>animationPanel?.dispose()); updateStripControls(); stripStatus('Choose the entered start–end frames or all feedback ranges to download. Unsubmitted feedback is included; exporting does not submit the review.'); renderFeedbackTargets(true); renderFeedbackRange(); renderCheckpoints(); renderProposals(); renderProvenance(); updateSavedState(); renderCues(); initReport();
|
|
1294
|
+
const sourceFiles = el('source-files'); for (const file of data.manifest.authoring) { const a = document.createElement('a'); a.href = assetUrl(file.path); a.textContent = file.label; a.className = 'source-link'; a.target = '_blank'; a.rel = 'noopener'; sourceFiles.append(a); } if (!data.manifest.authoring.length) sourceFiles.textContent = 'No source files supplied';sourceFiles.parentElement!.hidden=!data.manifest.authoring.length;
|
|
1295
|
+
populateChestBones(); bind(); parts=new PartExplorer(el('workspace-left'),el('selected-part'),previous=>{if(rigDifference){leaveRigDifference();renderLayout();}const part=parts?.value();if(!stageCorrectionRebinding&&(previous?.side!==part?.side||previous?.slot!==part?.slot||previous?.mode!==part?.mode))stageDraftRequestToken++;if(player&&inspectionSourceState==='ready')animationPanel?.capture(player,parts?.frame('single'));else animationPanel?.capture(null,undefined);weightsView?.refresh();redrawOverlay(true);meshEditor?.selectionChanged();if(stageCorrectionPart&&!stageCorrectionRebinding&&(part?.slot??null)!==stageCorrectionPart){stageCorrectionPart=null;document.getElementById('stage-draft-label')?.remove();}animationPanel?.fromParts(part?.slot??null);meshPanel?.select(part?.slot??null);requirementsPanel?.selectionChanged();renderDropNotices();if(part){viewport.state.activeCamera='rig';if(view==='reference')setView('rig');if(selectedInspector(document)!=='playback')showInspector('rig');renderCameraControls();}if(!viewport.state.cameraRestoring&&(previous?.side!==part?.side||previous?.slot!==part?.slot))cameraAction(()=>fitActiveCamera(part?'rig':availableCamera()));persistence?.save();},part=>{select('feedback-target-kind').value='slot';renderFeedbackTargets(true);input('feedback-target-name').value=part.slot;showInspector('feedback');}); animationPanel=new AnimationInspectionPanel({hideGateBanner:!!host?.direction,host:el('animation-inspection'),stage:el('rig-viewport'),project:(x,y)=>rigProject()(x,y),enabled:()=>inspectionSourceState==='ready'&&selectedInspector(document)==='playback',pause,preview:fn=>{animAdjust=fn;if(!player)return;player.adjust=composeAdjust(composeAdjust(composeAdjust(idleAdjust,dialAdjust),turnAdjust),animAdjust);if(!inDrawRig&&player.current&&!playing){if(activeScene())seek(time);else{player.seek(time);drawRig(()=>player!.draw());}}},apply:ops=>applyAnimation(ops),reset:()=>resetAnimationBuild(),seek:exact=>{if(!Number.isFinite(exact)||exact<0||exact>duration){message('KEY_TIME_OUT_OF_DOMAIN: no substitute time was used.',true);return;}seekMarker(animation,exact,'Stored key');},select:value=>{const slot=value?.kind==='slot'?value.name:null;if((parts?.value()?.slot??null)!==slot)parts?.select(slot?{side:'single',slot,mode:parts?.value()?.mode??'context'}:null);parts?.highlightBone(value?.kind==='bone'?value.name:null);redrawOverlay(false);}});viewDisposers.push(()=>animationPanel?.dispose()); updateStripControls(); stripStatus('Choose the entered start–end frames or all feedback ranges to download. Unsubmitted feedback is included; exporting does not submit the review.'); renderFeedbackTargets(true); renderFeedbackRange(); renderCheckpoints(); renderProposals(); renderProvenance(); updateSavedState(); renderCues(); initReport();
|
|
1269
1296
|
const requestedId = new URLSearchParams(location.search).get('checkpoint'),initial=initialReviewSelection(data.manifest,requestedId,data.explicitReference?.id,data.initialAnimation??undefined),first=initial.checkpoint;
|
|
1270
1297
|
rigInput=data.manifest.model?{state:'pending'}:{state:'absent'};renderLayout();
|
|
1271
1298
|
// A job rig subject lands in Animate before the model finishes loading (#709).
|
|
@@ -1279,10 +1306,10 @@ async function start(): Promise<void> {
|
|
|
1279
1306
|
viewport.state.activeCamera=player?'rig':'reference';if(viewport.state.cameraSync)alignCameras();renderTransport();fitCamera();
|
|
1280
1307
|
if (requestedId && !first) message(`Checkpoint "${requestedId}" is not in this package. Select one from the list.`, true);
|
|
1281
1308
|
else if (actReadOnly) message(actReadOnly, true);
|
|
1282
|
-
else if (host?.ownerActAccess) message('Not submitted');
|
|
1309
|
+
else if (host?.ownerActAccess) message('Not submitted',false,true);
|
|
1283
1310
|
else message(data.manifest.model ? 'Record review status and structured feedback while preserving sources. Motion is read only.' : 'No rig supplied. Review the available references and checkpoints.');
|
|
1284
1311
|
frameHandle=requestAnimationFrame(tick);
|
|
1285
|
-
const restored=await setupPersistence();setupComments();if(host?.direction)showRecordComments(true);else if(host?.record&&!data.manifest.model)showRecordComments();await loadRebuildStatus();void loadRequirements();renderChest();restoreEnvironment();physicsPanel?.restore();bonesPanel?.restore();cutsPanel?.restore();clothPanel?.restore();idlePanel?.restore();rigFieldsPanel?.restore();meshPanel?.restore();void refreshDensityStrip();renderIdle();if(idlePreviewOnOpen(restored,!!host)&&canRepeatIdle()&&automaticIdlePreview(assets?.animations.map(item=>item.name)??[],animation,first,!!requestedId))void playPreview();
|
|
1312
|
+
const restored=await setupPersistence();setupComments();renderPendingSubjects(host?.pendingSubjects?.()??[{kind:'review-verdict',stage:'rig-review'}]);if(host?.direction)showRecordComments(true);else if(host?.record&&!data.manifest.model)showRecordComments();await loadRebuildStatus();void loadRequirements();renderChest();restoreEnvironment();physicsPanel?.restore();bonesPanel?.restore();cutsPanel?.restore();clothPanel?.restore();idlePanel?.restore();rigFieldsPanel?.restore();meshPanel?.restore();void refreshDensityStrip();renderIdle();if(idlePreviewOnOpen(restored,!!host)&&canRepeatIdle()&&automaticIdlePreview(assets?.animations.map(item=>item.name)??[],animation,first,!!requestedId))void playPreview();
|
|
1286
1313
|
// Only an instance that serves agent control is asked for its config: a plain open has no control endpoint (#164).
|
|
1287
1314
|
if(!readOnly&&writes.control!==false)controlDispose=connectControl({sourceHash:data.sourceHash,mode:'single',route:access.route,headers:()=>access.headers(),observe:controlState,apply:applyControl,onStatus:value=>text('control-state',value)});
|
|
1288
1315
|
bindWorkspaceVisibility({key:access.key,sourceHash:data.sourceHash,pause});
|
|
@@ -1315,15 +1342,17 @@ async function startParts(opened:PartsSubjectEntry,saved:PartsSubjectSession,wri
|
|
|
1315
1342
|
};
|
|
1316
1343
|
const changed=()=>{dirty=true;text('dirty','Unsubmitted changes');el('dirty').classList.add('dirty');parts?.refreshImages();rigInspector.actBar.setSaveState({kind:'unsaved',text:'Unsubmitted changes'});renderDraftState();setSourceText(rigInspector.comments.button,`Comments (${issues.length})`);};
|
|
1317
1344
|
// A parts verdict is saved only over a drawn subject: until the first paint, or after a failed one, Save stays off.
|
|
1318
|
-
const saveBlocked=()=>!!readOnly||!!subject.legacyVerdict?.readOnly||rigInput.state!=='loaded';
|
|
1345
|
+
const saveBlocked=()=>!!readOnly||!!subject.legacyVerdict?.readOnly||rigInput.state!=='loaded'||draftConflict;
|
|
1346
|
+
partsAnswerBlocked=saveBlocked;
|
|
1319
1347
|
text('rig-empty','Loading package…');
|
|
1320
|
-
partsSubject=bindPartsSubject({data:subject,canvas:partsCanvas,referenceCanvas:partsReference,viewport,el,toolbar:primaryToolbar,commentsHost:el('comments-list-host'),issues,...host?.record?{recordComments}:{},request,base,paintingPath:host?'/review-painting':'/api/parts/painting',mesh:()=>layers.mesh,restoreMesh:on=>{layers.mesh=on;input('layer-mesh').checked=on;},images:()=>layers.images,changed:()=>{if(host?.record){recordCommentsChanged();return;}changed();},selectionChanged:()=>parts?.refreshImages(),locked:id=>submittedIssues.has(id),refusal:()=>readOnly,drawn:state=>{rigInput=state;button('save').disabled=saveBlocked();if(state.state==='failed')text('rig-empty',state.reason);text('renderer-state',state.state==='loaded'?'Parts raster drawn · Canvas2D':'Rendering failed');text('player-state',state.state==='loaded'?'Parts images · no compiled rig loaded':'Rig load failed');renderLayout();},message});
|
|
1348
|
+
partsSubject=bindPartsSubject({data:subject,canvas:partsCanvas,referenceCanvas:partsReference,viewport,el,toolbar:primaryToolbar,commentsHost:el('comments-list-host'),openComments:openReview,hasPicture:()=>!hasTransientQuestionImage(screenRoot),issues,...host?.record?{recordComments}:{},request,base,paintingPath:host?'/review-painting':'/api/parts/painting',mesh:()=>layers.mesh,restoreMesh:on=>{layers.mesh=on;input('layer-mesh').checked=on;},images:()=>layers.images,changed:()=>{if(host?.record){recordCommentsChanged();return;}changed();},selectionChanged:()=>parts?.refreshImages(),locked:id=>submittedIssues.has(id),refusal:()=>readOnly,drawn:state=>{rigInput=state;button('save').disabled=saveBlocked();renderAnswerControls();if(state.state==='failed')text('rig-empty',state.reason);text('renderer-state',state.state==='loaded'?'Parts raster drawn · Canvas2D':'Rendering failed');text('player-state',state.state==='loaded'?'Parts images · no compiled rig loaded':'Rig load failed');renderLayout();},message});
|
|
1321
1349
|
parts=new PartExplorer(el('workspace-left'),el('selected-part'),()=>{},()=>openReview());
|
|
1322
1350
|
const thumbnails=new PartThumbnails();viewDisposers.push(()=>thumbnails.dispose());
|
|
1323
1351
|
parts.registerImages({thumbnail:(icon,item,glyph)=>thumbnails.showOriginal(icon,item,()=>partsSubject!.image(item.index),glyph),items:subject.items,selected:partsSubject.selected,solo:partsSubject.solo,visible:partsSubject.visible,select:partsSubject.select,isolate:partsSubject.isolate,show:partsSubject.show});
|
|
1324
1352
|
const unavailable='PARTS_RIG_UNAVAILABLE: this parts subject has no compiled rig.';
|
|
1325
1353
|
for(const node of el('proposal-panel').children)if(node.id!=='comments-list-host')(node as HTMLElement).hidden=true;
|
|
1326
1354
|
for(const control of document.querySelectorAll<HTMLInputElement|HTMLSelectElement|HTMLButtonElement>('#checkpoint-detail input,#proposal-panel input,#proposal-panel select,#proposal-panel button,#strip-panel input,#strip-panel select,#strip-panel button'))if(!control.closest('#comments-list-host')){control.disabled=true;setSourceAttribute(control,'title',unavailable);if(control instanceof HTMLInputElement&&control.name==='outcome')control.checked=false;}
|
|
1355
|
+
el('checkpoint-detail').hidden=true;
|
|
1327
1356
|
text('detail-note',unavailable);text('checkpoint-note','');el('strip-panel').hidden=true;
|
|
1328
1357
|
text('provenance-version','Parts package, before rigging');text('provenance-rig','Not supplied');text('provenance-motion','Not supplied');
|
|
1329
1358
|
text('provenance-full',JSON.stringify({subject:'parts',sourceHash:subject.sourceHash,painting:subject.painting,images:subject.items.map(({name,imageHash})=>({name,imageHash}))},null,2));
|
|
@@ -1358,7 +1387,7 @@ async function startParts(opened:PartsSubjectEntry,saved:PartsSubjectSession,wri
|
|
|
1358
1387
|
};
|
|
1359
1388
|
viewDisposers.push(viewport.bindControls(unitScaleMessage),viewport.bindNavigation(undefined,()=>!el('stage-layout').getAttribute('aria-busy')?.includes('true')),bindLayerShortcuts(document));
|
|
1360
1389
|
const resize=viewport.observeResize();viewDisposers.push(()=>resize.disconnect());
|
|
1361
|
-
viewport.requestFit();await partsSubject.ready();text('dirty','Not submitted');message(actReadOnly??(host?.ownerActAccess?'Not submitted':'Parts ready. Source files remain unchanged.'),!!actReadOnly);referenceInput=subject.painting?{state:'loaded'}:{state:'absent'};renderLayout();
|
|
1390
|
+
viewport.requestFit();await partsSubject.ready();text('dirty','Not submitted');message(actReadOnly??(host?.ownerActAccess?'Not submitted':'Parts ready. Source files remain unchanged.'),!!actReadOnly,!!host?.ownerActAccess&&!actReadOnly);referenceInput=subject.painting?{state:'loaded'}:{state:'absent'};renderLayout();
|
|
1362
1391
|
renderPendingSubjects(host?.pendingSubjects?.()??[{kind:'parts-verdict'}]);
|
|
1363
1392
|
if(host){await restorePublicationNavigation();host.attach({recordForms:renderRecordForms,stage:()=>null,redraw:()=>partsSubject?.redraw(),message:(value,error,diagnostic)=>message(value,error,false,diagnostic),pendingSubjects:renderPendingSubjects,...host.record?{}:{incompatible:()=>navigationMissing,navigation:()=>({subject:'parts' as const,part:partsSubject!.selected(),solo:partsSubject!.solo(),view,camera:numericView()})},suspend:suspendScreen,resume:resumeScreen,dispose:disposeScreen});host.displayed();}
|
|
1364
1393
|
|
|
@@ -1384,6 +1413,7 @@ async function startRecord(interview?:InterviewSubjectEntry):Promise<void> {
|
|
|
1384
1413
|
el('rig-pane').hidden=false;el('rig-empty').hidden=false;text('rig-empty',unavailable);
|
|
1385
1414
|
for(const region of document.querySelectorAll('.inspector,.workspace-secondary-toolbar'))for(const control of region.querySelectorAll<HTMLInputElement|HTMLSelectElement|HTMLButtonElement>('input,select,textarea,button')){control.disabled=true;setSourceAttribute(control,'title',unavailable);}
|
|
1386
1415
|
if(interview){
|
|
1416
|
+
button('stage-comment').hidden=true;
|
|
1387
1417
|
button('save').disabled=true;setSourceAttribute(button('save'),'title',unavailable);
|
|
1388
1418
|
const label=()=>{setSourceText(rigAsk,t('interview.title'));recordDialog?.setAttribute('aria-label',t('interview.title'));};
|
|
1389
1419
|
label();viewDisposers.push(onLanguageChange(label));
|
|
@@ -1397,6 +1427,13 @@ async function startRecord(interview?:InterviewSubjectEntry):Promise<void> {
|
|
|
1397
1427
|
if(!interview){host!.attach({recordForms:renderRecordForms,pendingSubjects:renderPendingSubjects,stage:()=>null,redraw:()=>{},message:(value,error,diagnostic)=>message(value,error,false,diagnostic),suspend:suspendScreen,resume:resumeScreen,dispose:disposeScreen});host!.displayed();}
|
|
1398
1428
|
}
|
|
1399
1429
|
let recordDialog:HTMLDialogElement|null=null;
|
|
1430
|
+
let activeInterviewImages:readonly {name:string;src:string}[]|null=null;
|
|
1431
|
+
let activeInterviewImage:{name:string;src:string}|null=null;
|
|
1432
|
+
let releaseInterview:(()=>void)|null=null;
|
|
1433
|
+
const questionPanel=panelMake('section',{id:'workspace-interview-answer',className:'workspace-interview-panel',hidden:true});
|
|
1434
|
+
let questionForms:readonly HTMLElement[]=[];
|
|
1435
|
+
let questionFormBindings=new WeakSet<HTMLElement>();
|
|
1436
|
+
|
|
1400
1437
|
/** Reuse the form's publication binding for native record comments, without a package session. */
|
|
1401
1438
|
function restoreRecordComments(form?:HTMLFormElement):void {
|
|
1402
1439
|
if((!host?.record&&!host?.direction)||recordCommentKey)return;
|
|
@@ -1427,11 +1464,62 @@ function recordCommentsChanged():void {
|
|
|
1427
1464
|
if(!host?.record&&!host?.direction)return;
|
|
1428
1465
|
try{if(recordCommentKey)localStorage.setItem(recordCommentKey,JSON.stringify({status:select('review-status').value,publicationId:host?.direction?.publicationId??host?.record?.publicationId??recordDialog?.querySelector<HTMLFormElement>('form[data-job-ask]')?.dataset.jobPublication,sourceHash:host?.direction?.sourceHash??host!.record!.sourceHash,comments:recordComments}));}catch{/* In-memory comments remain bound to this host. */}
|
|
1429
1466
|
setSourceText(rigInspector.comments.button,`Comments (${recordComments.length})`);
|
|
1467
|
+
renderAnswerControls();
|
|
1430
1468
|
for(const form of recordDialog?.querySelectorAll('form[data-job-ask]')??[])form.dispatchEvent(new Event('input',{bubbles:true}));
|
|
1431
1469
|
}
|
|
1432
|
-
/**
|
|
1470
|
+
/** #834's transient reference viewport, owned only while the Question tab is selected. */
|
|
1471
|
+
function syncQuestionImage():void {
|
|
1472
|
+
if(disposed){releaseInterview?.();releaseInterview=null;return;}
|
|
1473
|
+
const selected=questionForms.length>0&&inspectorBlocks?.state()[selectedInspector()??'rig']==='question';
|
|
1474
|
+
if(!selected){releaseInterview?.();releaseInterview=null;return;}
|
|
1475
|
+
if(releaseInterview)return;
|
|
1476
|
+
const images=(questionForms[0] as HTMLElement&{interviewImages:readonly {name:string;src:string}[]}).interviewImages;
|
|
1477
|
+
if(!images.length)return;
|
|
1478
|
+
const previousView=view,previousCamera=structuredClone(viewport.state);viewport.cancelFit();
|
|
1479
|
+
const previousReferenceNodes=[...el('reference-content').childNodes],previousReferenceInput=referenceInput,previousReferenceSize=referenceSize;
|
|
1480
|
+
const previousMedia={video,controlledVideoSample,sequence,sequenceSvg,selectedPerson,lastPoseFrame};
|
|
1481
|
+
const previousLabels=['reference-empty','reference-label','reference-info','person-control'].map(id=>({node:el(id),html:id==='person-control'?undefined:el(id).innerHTML,hidden:el(id).hidden}));
|
|
1482
|
+
const disabled=new Map(controls.zoomButtons.concat(controls.nativeOne!).map(button=>[button,button.disabled]));
|
|
1483
|
+
for(const button of disabled.keys())button.disabled=false;
|
|
1484
|
+
const cameraBindings=button('zoom-in').onclick?[]:[viewport.bindControls(unitScaleMessage),viewport.bindNavigation()];
|
|
1485
|
+
activeInterviewImages=images;activeInterviewImage=images[0]!;
|
|
1486
|
+
const restore=controls.replaceViewSwitch({currentMode:'interview-image-0',groups:[{modes:images.map((image,index)=>({id:'interview-image-'+index,labelKey:image.name,pressed:index===0}))}],onChange:chooseInspectionView});
|
|
1487
|
+
viewport.state.cameraSync=false;viewport.state.activeCamera='reference';view='reference';questionPanel.dataset.questionImageActive='true';
|
|
1488
|
+
releaseInterview=()=>{
|
|
1489
|
+
++referenceGeneration;activeInterviewImages=null;activeInterviewImage=null;delete questionPanel.dataset.questionImageActive;restore();
|
|
1490
|
+
for(const dispose of cameraBindings)dispose();for(const [button,value]of disabled)button.disabled=value;
|
|
1491
|
+
view=previousView;referenceInput=previousReferenceInput;referenceSize=previousReferenceSize;
|
|
1492
|
+
({video,controlledVideoSample,sequence,sequenceSvg,selectedPerson,lastPoseFrame}=previousMedia);
|
|
1493
|
+
el('reference-content').replaceChildren(...previousReferenceNodes);
|
|
1494
|
+
for(const {node,html,hidden}of previousLabels){if(html!==undefined)node.innerHTML=html;node.hidden=hidden;}
|
|
1495
|
+
viewport.cancelFit();Object.assign(viewport.state,previousCamera,{cameraRestoring:true});
|
|
1496
|
+
if(!disposed){renderLayout();workspace?.refresh();}
|
|
1497
|
+
Object.assign(viewport.state,previousCamera);if(!disposed)fitCamera();
|
|
1498
|
+
};
|
|
1499
|
+
void showReference('',activeInterviewImage);
|
|
1500
|
+
}
|
|
1501
|
+
/** Pictured backdrop forms use the existing bottom controller; other record forms retain their dialog. */
|
|
1433
1502
|
function renderRecordForms(forms:readonly HTMLElement[],label='job.pending',standalone=false):void {
|
|
1434
|
-
if(
|
|
1503
|
+
if(standalone){pendingAnswers=[{kind:'interview-picks'}];}
|
|
1504
|
+
for(const form of forms){
|
|
1505
|
+
if(questionFormBindings.has(form))continue;questionFormBindings.add(form);
|
|
1506
|
+
form.addEventListener('submit',event=>{if(draftConflict||pendingAnswers.some(subject=>subject.kind.endsWith('verdict'))){event.preventDefault();event.stopImmediatePropagation();}},true);
|
|
1507
|
+
form.addEventListener('job-answer-saved',()=>{answerSaved=true;recordDialog?.close();renderDraftState();},{once:true});
|
|
1508
|
+
}
|
|
1509
|
+
const imageForms=forms.filter(form=>form.dataset.interviewMain!==undefined);
|
|
1510
|
+
if(imageForms.length){
|
|
1511
|
+
const added=!questionForms.length;
|
|
1512
|
+
if(questionForms[0]!==imageForms[0]){releaseInterview?.();releaseInterview=null;}
|
|
1513
|
+
for(const form of questionForms)if(!imageForms.includes(form)){form.dispatchEvent(new Event('job-form-dispose'));form.remove();}
|
|
1514
|
+
questionForms=imageForms;
|
|
1515
|
+
for(const form of imageForms)if(form.parentElement!==questionPanel)questionPanel.append(form);
|
|
1516
|
+
if(added){viewDisposers.push(inspectorBlocks!.register({id:'question',panel:questionPanel,label:'Question',position:'first'}));inspectorBlocks!.restore({rig:'question',playback:'question'});inspectorBlocks!.select(selectedInspector()??'rig','question');workspace?.revealInspector();}
|
|
1517
|
+
syncQuestionImage();
|
|
1518
|
+
if(imageForms.every(form=>form.dataset.interviewAnswered==='true'))answerSaved=true;
|
|
1519
|
+
rigAsk.onclick=()=>{if(draftConflict)return;inspectorBlocks?.select(selectedInspector()??'rig','question');workspace?.revealInspector();};
|
|
1520
|
+
}
|
|
1521
|
+
forms=forms.filter(form=>!imageForms.includes(form));
|
|
1522
|
+
if(!forms.length&&!recordDialog){renderDraftState();return;}
|
|
1435
1523
|
if(!recordDialog){
|
|
1436
1524
|
recordDialog=panelMake('dialog',{id:'job-record-asks',className:'workspace-drawer'});recordDialog.setAttribute('aria-label',tr(label));
|
|
1437
1525
|
const close=panelMake('button',{className:'workspace-drawer-close',type:'button'},tr('Close'));recordDialog.append(close);app.append(recordDialog);
|
|
@@ -1449,19 +1537,53 @@ function renderRecordForms(forms:readonly HTMLElement[],label='job.pending',stan
|
|
|
1449
1537
|
if(host?.record){
|
|
1450
1538
|
for(const child of el('proposal-panel').children)if(child.id!=='comments-list-host')(child as HTMLElement).hidden=true;
|
|
1451
1539
|
setSourceText(rigInspector.comments.button,`Comments (${recordComments.length})`);comments?.refresh();partsSubject?.refreshComments();
|
|
1452
|
-
button('save').
|
|
1540
|
+
button('save').onclick=()=>rigAsk.click();
|
|
1453
1541
|
}
|
|
1454
|
-
|
|
1455
|
-
rigAsk.disabled=!forms.length;
|
|
1542
|
+
renderAnswerControls();
|
|
1456
1543
|
if((standalone?added.length>0:added.some(form=>form.classList.contains('interview-answer')))&&!recordDialog.open)rigAsk.click();
|
|
1457
1544
|
}
|
|
1458
1545
|
/** The ask heading reads only already-pending subjects. It never synthesizes an agent request. */
|
|
1459
1546
|
function renderPendingSubjects(subjects:readonly {kind:string;stage?:string}[]):void {
|
|
1460
1547
|
const requests:Record<string,string>={'parts-verdict':'Check the parts and meshes.','interview-picks':'Answer these questions.','review-verdict:rig-review':'Check the rig and motion.','review-verdict:direction-review':'Check the direction.','review-verdict:image-review':'Check these images.','checkpoint':'Review this checkpoint.','signoff':'Approve this stage.','reopen':'Review the reopened stage.'};
|
|
1461
1548
|
const labels=subjects.map(subject=>requests[subject.kind+':'+subject.stage]??requests[subject.kind]).filter((label):label is string=>!!label);
|
|
1549
|
+
pendingAnswers=subjects;
|
|
1550
|
+
askHeadline.hidden=false;setSourceText(askHeadline,labels.join(' · ')||'Nothing is waiting for your answer.');
|
|
1462
1551
|
renderDraftState();
|
|
1463
|
-
rigAsk.hidden=!labels.length;setSourceText(rigAsk,labels.join(' · '));setSourceAttribute(rigAsk,'title',labels.join(' · '));
|
|
1464
1552
|
}
|
|
1553
|
+
/** Answer controls compose the existing act bar and submit handlers; act payloads stay unchanged. */
|
|
1554
|
+
function renderAnswerControls():void {
|
|
1555
|
+
const subjects=host?.pendingSubjects?.()??pendingAnswers;
|
|
1556
|
+
const verdict=subjects.some(subject=>subject.kind==='review-verdict'||subject.kind==='parts-verdict');
|
|
1557
|
+
const dialog=subjects.some(subject=>!subject.kind.endsWith('verdict'))&&!verdict;
|
|
1558
|
+
const readable=questionForms.some(form=>form.dataset.interviewAnswered==='true')||!!recordDialog?.querySelector('form.interview-answer[data-interview-answered=true] fieldset:disabled');
|
|
1559
|
+
const enabled=questionForms.some(form=>!form.querySelector('fieldset')?.disabled)||!!recordDialog?.querySelector('fieldset:not(:disabled)');
|
|
1560
|
+
const blocked=saving||draftConflict||!!actReadOnly||!!host?.unavailable;
|
|
1561
|
+
const save=button('save');
|
|
1562
|
+
if((host||subjects.some(subject=>subject.kind==='interview-picks'))&&subjects.length&&!rigInspector.actBar.saveState())rigInspector.actBar.setSaveState({kind:'unsaved',text:'Not submitted'});
|
|
1563
|
+
select('review-status').hidden=true;document.querySelector<HTMLLabelElement>('label[for="review-status"]')!.hidden=true;
|
|
1564
|
+
save.hidden=!verdict;save.classList.toggle('primary',verdict&&!(subjects.some(subject=>subject.kind==='parts-verdict')&&liveIssueCount()>0));
|
|
1565
|
+
requestChanges.classList.toggle('primary',verdict&&subjects.some(subject=>subject.kind==='parts-verdict')&&liveIssueCount()>0);
|
|
1566
|
+
requestChanges.hidden=!verdict;
|
|
1567
|
+
rigAsk.hidden=!dialog;rigAsk.classList.toggle('primary',dialog);
|
|
1568
|
+
const kind=subjects.find(subject=>!subject.kind.endsWith('verdict'))?.kind;
|
|
1569
|
+
setSourceText(rigAsk,kind==='signoff'?'Approve…':kind==='interview-picks'||readable?'Answer…':'Review…');
|
|
1570
|
+
rigAsk.disabled=(!enabled&&!readable)||(enabled&&blocked);
|
|
1571
|
+
if(verdict){
|
|
1572
|
+
const parts=subjects.some(subject=>subject.kind==='parts-verdict'),count=host?.direction?recordComments.length:liveIssueCount();
|
|
1573
|
+
setSourceText(save,'Approve');setSourceText(requestChanges,'Request changes');
|
|
1574
|
+
save.disabled=blocked||!!readOnly||!!session?.feedbackWarnings?.length||(parts&&(partsAnswerBlocked()||count>0));
|
|
1575
|
+
requestChanges.disabled=blocked||!!readOnly||!!session?.feedbackWarnings?.length||count===0||(parts&&partsAnswerBlocked());
|
|
1576
|
+
setSourceAttribute(save,'title',parts&&count>0?'Remove the flagged parts comments before approving.':'');
|
|
1577
|
+
setSourceAttribute(requestChanges,'title',count===0?'Add a comment where changes are needed.':'');
|
|
1578
|
+
if(!parts){
|
|
1579
|
+
save.onclick=event=>{session.status='approved';select('review-status').value=session.status;return verdictSubmit?.(event);};
|
|
1580
|
+
}
|
|
1581
|
+
requestChanges.onclick=()=>{if(requestChanges.disabled)return;if(parts){void save.onclick?.call(save,new PointerEvent('click'));}else{session.status='changes-requested';select('review-status').value=session.status;void verdictSubmit?.(new MouseEvent('click'));}};
|
|
1582
|
+
}
|
|
1583
|
+
for(const root of [recordDialog,...questionForms])for(const control of root?.querySelectorAll<HTMLButtonElement>('button[type="submit"]')??[])control.disabled=blocked||verdict;
|
|
1584
|
+
if(host){rigInspector.answersRendered=true;rigInspector.act.hidden=subjects.length===0;rigInspector.syncActRow?.();}
|
|
1585
|
+
}
|
|
1586
|
+
let verdictSubmit:((event:MouseEvent)=>unknown)|null=null;
|
|
1465
1587
|
/** The rig pane for a live job's still (#709): the job binds and copies it, this screen keeps its view. */
|
|
1466
1588
|
function hostStage():RigHostStage|null {
|
|
1467
1589
|
if(!player)return null;const frame=parts?.frame('single');
|
|
@@ -1520,7 +1642,7 @@ async function resumeScreen():Promise<void> {
|
|
|
1520
1642
|
suspended=false;if(!partsOnly&&(!host?.record||host.record.hasPicture))frameHandle=requestAnimationFrame(tick);ready=true;
|
|
1521
1643
|
}finally{screenRoot.inert=ready?wasInert:true;if(ready&&!disposed)document.body.dataset.ready='true';}
|
|
1522
1644
|
}
|
|
1523
|
-
function disposeScreen():void {
|
|
1645
|
+
function disposeScreen():void {releaseInterview?.();releaseInterview=null;
|
|
1524
1646
|
if(disposed)return;suspendScreen();disposed=true;lifecycle.abort();
|
|
1525
1647
|
comments?.dispose();partsSubject?.dispose();turnPad?.dispose();inspectorBlocks?.dispose();inspectorTabs?.dispose();
|
|
1526
1648
|
workspace?.dispose();controlDispose?.();appearance?.dispose();rigInspector.actBar.dispose();shell.dispose();
|
|
@@ -1532,7 +1654,7 @@ function showInspector(name:string,reveal=true):void {if(name==='feedback'){if(r
|
|
|
1532
1654
|
function bindInspector(partsSubject=false):void {
|
|
1533
1655
|
inspectorTabs?.dispose();
|
|
1534
1656
|
rigInspector.row.reveal=()=>workspace?.revealInspector();
|
|
1535
|
-
inspectorTabs=bindInspectorTabs(()=>{const mode=inspectorTabs?.state();if(mode)inspectorBlocks?.activate(mode);workspace?.afterTab();renderLayout();},()=>workspace?.beforeTab(),rigInspector.row);
|
|
1657
|
+
inspectorTabs=bindInspectorTabs(()=>{const mode=inspectorTabs?.state();if(mode)inspectorBlocks?.activate(mode);syncQuestionImage();workspace?.afterTab();renderLayout();},()=>workspace?.beforeTab(),rigInspector.row);
|
|
1536
1658
|
viewDisposers.push(bindHeaderModeAvailability(partsSubject?{model:false,parts:true}:{model:!!data.manifest.model,preRig:data.capabilities.preRig,parts:!!host?.record&&!data.manifest.model}));
|
|
1537
1659
|
for(const mode of document.querySelectorAll<HTMLButtonElement>('[data-mode]'))if(mode.dataset.mode==='rig'||mode.dataset.mode==='playback')mode.onclick=()=>showInspector(mode.dataset.mode!);
|
|
1538
1660
|
}
|
|
@@ -1564,7 +1686,7 @@ function syncPlayerLoop():void {
|
|
|
1564
1686
|
catch(error){message(errorText(error),true);}
|
|
1565
1687
|
}
|
|
1566
1688
|
function canRepeatIdle():boolean{const direction=activeScene();if(direction)return direction.take.loop;return !!player&&idleAvailable(assets?.animations.map(a=>a.name)??[],animation)&&!axisInspection&&input('idle-repeat').checked&&duration>0;}
|
|
1567
|
-
function renderIdle():void {text('idle-state',canRepeatIdle()?'Actual idle · repeat enabled':animation==='idle'?'Idle repeat paused':'Non-idle inspection · no automatic playback');}
|
|
1689
|
+
function renderIdle():void {text('idle-state',canRepeatIdle()?activeScene()&&animation&&animation!=='idle'?`${data.manifest?.animations?.find(a=>a.id===animation)?.label??animation} · repeating`:'Actual idle · repeat enabled':animation==='idle'?'Idle repeat paused':'Non-idle inspection · no automatic playback');}
|
|
1568
1690
|
async function playPreview():Promise<void> {
|
|
1569
1691
|
if((!player&&!video&&!sequence)||duration<=0)return;
|
|
1570
1692
|
const intent=++playbackIntent;desiredPlay=true;idleHeld=false;syncPlayerLoop();if(time>=duration)seek(0,{kind:'replay'});
|
|
@@ -2729,11 +2851,18 @@ async function resetRebuild(world:StageWorld|null=null):Promise<void> {
|
|
|
2729
2851
|
*/
|
|
2730
2852
|
let stageSource:{url:string;prefix:string;hash:string}|null=null;
|
|
2731
2853
|
async function swapRig(modelUrl:string,prefix:string,sha256:string,world:StageWorld|null=null):Promise<void> {
|
|
2854
|
+
const cameraRestoring=viewport.state.cameraRestoring;
|
|
2732
2855
|
stageCorrectionRebinding++;try{
|
|
2733
|
-
const keepPart=
|
|
2856
|
+
const keepPart=parts?.value()??null,keepStage=assets?.stage;
|
|
2857
|
+
const keepFramingBox=rigRaster.active()?undefined:viewportProvider.geometry('rig')?.box;
|
|
2858
|
+
const keepRigCamera=structuredClone(viewport.paneCamera('rig')),keepReferenceCamera=structuredClone(viewport.paneCamera('reference'));
|
|
2734
2859
|
const keepAnimation=animation,keepTime=time,wasPlaying=playing,keepSet=select('part-set').disabled?'':select('part-set').value;
|
|
2735
2860
|
inspectionSourceState='pending';partModel=null;pause();refreshAnimationInspection();
|
|
2736
2861
|
const next=await loadModel({modelUrl,...stageLoadInputs(modelUrl,sha256),resolvePage:(name,url)=>{const target=new URL(name,url);if(target.origin!==location.origin||!target.pathname.startsWith(prefix))throw new Error(`Model page escapes its build: ${name}`);return target.href;}}).catch(error=>{inspectionSourceState='failed';refreshAnimationInspection();throw error;});
|
|
2862
|
+
const keepFraming=!!keepStage&&!!next.stage&&(['x','y','width','height'] as const).every(key=>keepStage[key]===next.stage![key]);
|
|
2863
|
+
viewport.state.cameraRestoring=true;viewport.cancelFit();
|
|
2864
|
+
// The fit-relative zoom also depends on the first-draw framing basis, not just the declared stage.
|
|
2865
|
+
if(keepFraming&&keepFramingBox)rebuildFramingBoxes.set(next,{...keepFramingBox});
|
|
2737
2866
|
physicsPanel?.clearPreview();
|
|
2738
2867
|
pause();player?.dispose();assets?.dispose();assets=next;player=createInspectionPlayer(el('rig-root'),assets);setupChestWorld=readSetupChest(player);stageModelHash=sha256;stageSource={url:modelUrl,prefix,hash:sha256};
|
|
2739
2868
|
// A scratch build may hold another set of animations (a retarget adds one, #114): the picker lists what this build has.
|
|
@@ -2751,12 +2880,14 @@ async function swapRig(modelUrl:string,prefix:string,sha256:string,world:StageWo
|
|
|
2751
2880
|
// when none was staged — and nothing claims a clip the stage is not drawing.
|
|
2752
2881
|
else{drawRig(()=>player!.draw());animation='';duration=0;time=0;select('animation-select').value='';renderTransport();renderCues();renderIdle();}
|
|
2753
2882
|
if(environmentApplied())applyEnvironment();
|
|
2754
|
-
if(
|
|
2755
|
-
updateChestMapping();
|
|
2883
|
+
if(parts&&inspectionSourceState==='ready')parts.restoreSelection(keepPart);
|
|
2884
|
+
updateChestMapping();
|
|
2885
|
+
if(keepFraming){viewport.writeCamera('rig',keepRigCamera);viewport.writeCamera('reference',keepReferenceCamera);fitCamera();}
|
|
2886
|
+
else{viewport.state.cameraRestoring=cameraRestoring;viewport.requestFit();fitCamera();}
|
|
2756
2887
|
// The preview (#104) drives the new player once its bone setups are read (an idle Apply cleared it first).
|
|
2757
2888
|
stageDocumentSet=true;void loadModelDocument(modelUrl,sha256).then(loaded=>{if(loaded.ok&&stageModelHash===sha256)idlePanel?.model(boneSetup(loaded.document));});
|
|
2758
2889
|
if(wasPlaying)void playPreview();
|
|
2759
|
-
}finally{stageCorrectionRebinding--;directionPanel?.refresh();}
|
|
2890
|
+
}finally{viewport.state.cameraRestoring=cameraRestoring;stageCorrectionRebinding--;directionPanel?.refresh();}
|
|
2760
2891
|
}
|
|
2761
2892
|
/**
|
|
2762
2893
|
* Mesh Apply (#106): the pending `meshes.<part>` entry becomes one config patch — `replace /meshes/<part>` and nothing
|
|
@@ -2916,8 +3047,9 @@ function commentCaptureRefusal():string|null {
|
|
|
2916
3047
|
}
|
|
2917
3048
|
function setupComments():void {
|
|
2918
3049
|
if(host?.direction||host?.record){restoreRecordComments();liveIssueCount=()=>recordComments.length;if(host?.direction)dirty=dirty||recordComments.length>0;}
|
|
2919
|
-
comments=bindStageComments<CommentRow,CommentPose>({general:host?.record||host?.direction?{create:summary=>({id:crypto.randomUUID(),summary}),matches:row=>!('target' in row)}:undefined,listHost:el('comments-list-host'),toolbar:el('stage-comment').parentElement!,viewports:host?.record&&!host.record.hasPicture?{}:{rig:el('rig-viewport'),reference:el('reference-viewport')},
|
|
3050
|
+
comments=bindStageComments<CommentRow,CommentPose>({general:host?.record||host?.direction?{create:summary=>({id:crypto.randomUUID(),summary}),matches:row=>!('target' in row)}:undefined,listHost:el('comments-list-host'),openList:openReview,hasPicture:()=>!hasTransientQuestionImage(screenRoot),toolbar:el('stage-comment').parentElement!,viewports:host?.record&&!host.record.hasPicture?{}:{rig:el('rig-viewport'),reference:el('reference-viewport')},
|
|
2920
3051
|
pose:view=>{
|
|
3052
|
+
if(hasTransientQuestionImage(screenRoot))return null;
|
|
2921
3053
|
if(view!=='rig'&&view!=='reference')return null;const workspaceMode=document.querySelector<HTMLElement>('[data-mode][aria-pressed="true"]')?.dataset.mode;if(workspaceMode!=='rig'&&workspaceMode!=='playback')return null;const camera=numericView().cameras[view],pane=el(view+'-viewport');if(!camera||pane.clientWidth<=0||pane.clientHeight<=0)return null;
|
|
2922
3054
|
const renderer=player?.renderer;const current=time,index=frameAtTime(activeFrameClock(),current),referenceId=view==='reference'?select('reference-select').value||null:null,referenceHash=referenceId?data.referenceHashes?.[referenceId]??(data.explicitReference?.id===referenceId?data.explicitReference.sha256:null):null;
|
|
2923
3055
|
return {mode:workspaceMode==='playback'?'animate':'setup',capture:{pane,root:view==='rig'?el('rig-root'):undefined,images:view==='reference'||layers.images,canvas:view==='rig'&&renderer instanceof CanvasRenderer?renderer.canvas:undefined,backend:renderer instanceof CanvasRenderer?renderer.backendActive:renderer?.meshBackendActive??'canvas2d'},camera,frame:index===null?null:{index,basis:'producer'},...(index===null?{timeBasis:timeOnlyBasis}:{}),time:current,animation:animation||null,turn:turnPad?.snapshot()??null,sourceHash:data.sourceHash,modelHash:view==='reference'?null:stageModelHash,referenceHash,referenceId,rig:data.manifest.id,...(view==='reference'?{media:video??el('reference-content').querySelector('img')??undefined}:{posed:parts?.frame('single'),assets:assets??undefined})} as CommentPose;
|
package/web/part-selection.ts
CHANGED
|
@@ -82,6 +82,11 @@ export class PartInspection {
|
|
|
82
82
|
value():ControlPart|null {const part=this.live();if(!part)return null;const state=this.sides.get(part.side),identity=partIdentity(state?.identity??null,part.slot);return {...part,...(identity?{identity}:{} )};}
|
|
83
83
|
assertIdentity(expected:ControlPart|null|undefined):void {if(!expected)return;this.validate(expected);const actual=partIdentity(this.sides.get(expected.side)?.identity??null,expected.slot);if(!actual)throw new Error(`PART_IDENTITY_UNAVAILABLE: ${expected.side} / ${expected.slot} has no held public snapshot`);if(expected.identity&&JSON.stringify(actual)!==JSON.stringify(parsePartIdentity(expected.identity)))throw new Error(`PART_IDENTITY_MISMATCH: ${expected.side} / ${expected.slot} no longer resolves the bookmarked skin/attachment/set/reason`);}
|
|
84
84
|
validate(value:ControlPart|null|undefined):void {if(!value)return;parseControlPart(value);const state=this.sides.get(value.side);if(!state||!state.entries.some(e=>e.slot===value.slot))throw new Error(`PART_UNAVAILABLE: ${value.side} / ${value.slot}`);}
|
|
85
|
+
/** An in-place rebuild keeps the subject, not the old attachment identity; removed or refused slots become Whole rig. */
|
|
86
|
+
restoreSelection(value:ControlPart|null):void {
|
|
87
|
+
const available=value&&this.sides.get(value.side)?.entries.some(entry=>entry.slot===value.slot);
|
|
88
|
+
try{this.select(available?{side:value.side,slot:value.slot,mode:value.mode}:null);}catch{this.select(null);}
|
|
89
|
+
}
|
|
85
90
|
select(value:ControlPart|null):void {this.validate(value);const refusal=value?this.refused.get(value.side):undefined;if(refusal)throw new Error(`PARTS_UNAVAILABLE: ${value!.side} / ${refusal.message}`);const next=value?{side:value.side,slot:value.slot,mode:value.mode}:null,previous=this.selected;try{for(const [side,state]of this.sides)if(state.frame)state.player.renderer.render(selectedFrame(state.frame,next,side));}catch(error){for(const [side,state]of this.sides)if(state.frame)state.player.renderer.render(selectedFrame(state.frame,previous,side));throw error;}this.selected=next;}
|
|
86
91
|
/** Called inside the successful draw boundary, before compare submission is measured complete. */
|
|
87
92
|
present(side:ControlPart['side']):void {const state=this.sides.get(side);if(!state)return;this.commit(side,state,this.capture(state));}
|
|
@@ -55,7 +55,7 @@ export function createPartsViewport(host:PartsViewportHost){const state=createVi
|
|
|
55
55
|
|
|
56
56
|
import type {partsViewJson} from '../src/parts-view.ts';
|
|
57
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';
|
|
58
|
+
import {paintAssembly,paintMesh,paintOverlay,paintPaintingCrop,pickAssembly,type Box} from './parts-render.ts';
|
|
59
59
|
import {bindStageComments,type CommentCodec,type CommentUiPose,type CommentRow} from './stage-comments.ts';
|
|
60
60
|
import {parsePartsIssue,assertPartsIssueBinding,snapImageRegion,type PartsIssue} from '../src/parts-comment.ts';
|
|
61
61
|
import {projectMark,unprojectMark,region} from '../src/stage-comment.ts';
|
|
@@ -81,11 +81,11 @@ interface PartsPose extends CommentUiPose {item:Item;sourceHash:string;view:Part
|
|
|
81
81
|
/** Source-specific pixels and evidence. Shell, list, toolbar, controller and act stay in main.ts. */
|
|
82
82
|
export function bindPartsSubject(host:{
|
|
83
83
|
data:PartsSubjectData;canvas:HTMLCanvasElement;referenceCanvas:HTMLCanvasElement;viewport:ViewportController;
|
|
84
|
-
el:ViewportProvider['el'];toolbar:HTMLElement;commentsHost:HTMLElement;issues:PartsIssue[];recordComments?:CommentRow[];
|
|
84
|
+
el:ViewportProvider['el'];toolbar:HTMLElement;commentsHost:HTMLElement;openComments?:()=>void;hasPicture?:()=>boolean;issues:PartsIssue[];recordComments?:CommentRow[];
|
|
85
85
|
request:(path:string,init?:RequestInit)=>Promise<Response>;base:string;paintingPath:string;
|
|
86
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
87
|
}) {
|
|
88
|
-
const data=host.data,hidden=new Set<string>(),images=new Map<number,Promise<HTMLImageElement>>();
|
|
88
|
+
const data=host.data,hidden=new Set<string>(),images=new Map<number,Promise<HTMLImageElement>>(),loaded=new Map<string,HTMLImageElement>(),assemblyAlpha=new Map<string,{box:Box;alpha:Uint8ClampedArray}>();
|
|
89
89
|
let selected:string|null=null,solo=false,comparison:PartsComparison=defaultPartsComparison(),token=0,disposed=false,busy=false,failed=false;
|
|
90
90
|
let drawnFrame:{w:number;h:number}|null=null,drawnReferenceFrame:{w:number;h:number}|null=null;
|
|
91
91
|
let drawnRegion:Box|null=null,drawnSolo=false;
|
|
@@ -98,7 +98,8 @@ export function bindPartsSubject(host:{
|
|
|
98
98
|
const image=await loadViewportImage(await host.request(path));
|
|
99
99
|
if(disposed)throw new Error('PARTS_PAINT_FAILED');return image;
|
|
100
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;};
|
|
101
|
+
const image=(entry:Item)=>{let pending=images.get(entry.index);if(!pending){pending=loadImage(`${host.base}/image/${entry.index}`).then(img=>{loaded.set(entry.name,img);return img;});images.set(entry.index,pending);}return pending;};
|
|
102
|
+
const sourceAlpha=(entry:Item,img:HTMLImageElement)=>{const cached=assemblyAlpha.get(entry.name);if(cached)return cached;const c=makeCanvas(entry.w,entry.h),rgba=(c.getContext('2d')!.drawImage(img,0,0),c.getContext('2d')!.getImageData(0,0,c.width,c.height).data),alpha=new Uint8ClampedArray(c.width*c.height);for(let i=0;i<alpha.length;i++)alpha[i]=rgba[i*4+3]!;const layer={box:{...entry,w:c.width,h:c.height},alpha};assemblyAlpha.set(entry.name,layer);return layer;};
|
|
102
103
|
const painting=()=>original??=loadImage(host.paintingPath);
|
|
103
104
|
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
105
|
const sourceItems=()=>new Map(data.items.map(item=>[item.name,{...item,imageHash:item.imageHash!}]));
|
|
@@ -115,7 +116,7 @@ export function bindPartsSubject(host:{
|
|
|
115
116
|
try{
|
|
116
117
|
if(data.mode!=='parts'||!data.items.length)throw new Error('PARTS_IMAGE_UNAVAILABLE');
|
|
117
118
|
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:
|
|
119
|
+
const layers=await Promise.all(shown.map(async entry=>{const img=await image(entry);loaded.set(entry.name,img);return {box:entry,image:img};}));
|
|
119
120
|
let reference:HTMLCanvasElement|null=null;
|
|
120
121
|
if(data.painting&&data.rigSize){
|
|
121
122
|
const original=await painting();
|
|
@@ -154,7 +155,16 @@ export function bindPartsSubject(host:{
|
|
|
154
155
|
signature:pose=>[pose.sourceHash,pose.item.name,pose.item.imageHash,pose.view],
|
|
155
156
|
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
157
|
label:raw=>{const issue=parsePartsIssue(raw,false,true,false);return `${issue.parts.map(part=>part.name).join(', ')} · ${issue.summary}`;},
|
|
157
|
-
chips:(pose,
|
|
158
|
+
chips:(pose,screen,existing)=>{
|
|
159
|
+
const visible=data.items.filter(item=>!hidden.has(item.name)),candidates=pose.view.mode==='assembled'?visible.map(item=>item.name):[];
|
|
160
|
+
if(existing)return {selected:parsePartsIssue(existing,false,true,false).parts.map(part=>part.name),candidates};
|
|
161
|
+
if(pose.view.mode==='item')return {selected:[pose.item.name],candidates};
|
|
162
|
+
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}));
|
|
163
|
+
const hits=new Set<string>(),layers=visible.flatMap(box=>{const img=loaded.get(box.name);return img?[sourceAlpha(box,img)]:[];});
|
|
164
|
+
const stepX=Math.max(1,r.width/32),stepY=Math.max(1,r.height/32);
|
|
165
|
+
for(let y=r.y+.5;y<r.y+r.height;y+=stepY)for(let x=r.x+.5;x<r.x+r.width;x+=stepX){const hit=pickAssembly(layers,x,y);if(hit)hits.add(hit.name);}
|
|
166
|
+
return {selected:visible.filter(item=>hits.has(item.name)).map(item=>item.name),candidates};
|
|
167
|
+
},
|
|
158
168
|
create:async(pose,_view,screen,crop,_bookmark,summary,parts)=>{
|
|
159
169
|
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
170
|
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});
|
|
@@ -166,7 +176,7 @@ export function bindPartsSubject(host:{
|
|
|
166
176
|
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
177
|
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
178
|
};
|
|
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,
|
|
179
|
+
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,openList:host.openComments,hasPicture:host.hasPicture,toggle:host.el<HTMLButtonElement>('stage-comment'),viewports:{rig:host.el('rig-viewport')},pose,pause:async()=>{},bookmark:()=>null,
|
|
170
180
|
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
181
|
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
182
|
return {
|
|
@@ -186,7 +196,7 @@ export function bindPartsSubject(host:{
|
|
|
186
196
|
comparison:()=>comparison,setComparison:(mode:PartsComparison['mode'])=>{comparison=mode==='difference'?{mode,opacity:comparison.opacity,threshold:0}:{mode,opacity:comparison.opacity};redraw();},
|
|
187
197
|
opacity:(value:number)=>{comparison.opacity=value;redraw();},paint,redraw,
|
|
188
198
|
async ready(){if(data.painting)host.viewport.state.cameraSync=true;await paint();},
|
|
189
|
-
dispose(){disposed=true;++token;comments?.dispose();images.clear();},
|
|
199
|
+
dispose(){disposed=true;++token;comments?.dispose();images.clear();loaded.clear();assemblyAlpha.clear();},
|
|
190
200
|
};
|
|
191
201
|
}
|
|
192
202
|
|